From 80fde2d8d1a0f70a62416241a9bf9c8e4f0ac489 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Tue, 25 Sep 2012 12:04:15 +0200 Subject: [PATCH 1/9] Sharing update: take over reshares and thus don't fail --- apps/files_sharing/appinfo/update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php index dc8c8dd73f..857d091487 100644 --- a/apps/files_sharing/appinfo/update.php +++ b/apps/files_sharing/appinfo/update.php @@ -21,7 +21,7 @@ if (version_compare($installedVersion, '0.3', '<')) { if ($row['permissions'] == 0) { $permissions = OCP\Share::PERMISSION_READ; } else { - $permissions = OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE; + $permissions = OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE | OCP\Share::PERMISSION_SHARE; if ($itemType == 'folder') { $permissions |= OCP\Share::PERMISSION_CREATE; } From 7b8c7aaf0d851823f8b602fa875bea9d2f701c2d Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Tue, 25 Sep 2012 18:01:56 +0200 Subject: [PATCH 2/9] Add missing Sharing permission --- apps/files_sharing/appinfo/update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php index 857d091487..21f23c652d 100644 --- a/apps/files_sharing/appinfo/update.php +++ b/apps/files_sharing/appinfo/update.php @@ -19,7 +19,7 @@ if (version_compare($installedVersion, '0.3', '<')) { $itemType = 'file'; } if ($row['permissions'] == 0) { - $permissions = OCP\Share::PERMISSION_READ; + $permissions = OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE; } else { $permissions = OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE | OCP\Share::PERMISSION_SHARE; if ($itemType == 'folder') { From c4fc291fa78ba620900dfd6106fc8528473f2a54 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Tue, 25 Sep 2012 19:57:40 +0200 Subject: [PATCH 3/9] Passwords containing a ":" don't work with this explode Thanks to mETz --- lib/base.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/base.php b/lib/base.php index 6b4dd789b2..f6afc8fe2f 100644 --- a/lib/base.php +++ b/lib/base.php @@ -303,14 +303,14 @@ class OC{ //set http auth headers for apache+php-cgi work around if (isset($_SERVER['HTTP_AUTHORIZATION']) && preg_match('/Basic\s+(.*)$/i', $_SERVER['HTTP_AUTHORIZATION'], $matches)) { - list($name, $password) = explode(':', base64_decode($matches[1])); + list($name, $password) = explode(':', base64_decode($matches[1]), 2); $_SERVER['PHP_AUTH_USER'] = strip_tags($name); $_SERVER['PHP_AUTH_PW'] = strip_tags($password); } //set http auth headers for apache+php-cgi work around if variable gets renamed by apache if (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION']) && preg_match('/Basic\s+(.*)$/i', $_SERVER['REDIRECT_HTTP_AUTHORIZATION'], $matches)) { - list($name, $password) = explode(':', base64_decode($matches[1])); + list($name, $password) = explode(':', base64_decode($matches[1]), 2); $_SERVER['PHP_AUTH_USER'] = strip_tags($name); $_SERVER['PHP_AUTH_PW'] = strip_tags($password); } From 737a6730db884c22f01d54be36fa687442ce40df Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Tue, 25 Sep 2012 17:57:54 +0200 Subject: [PATCH 4/9] Add OC_Files::searchByMime function Include shared files in result --- lib/files.php | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/lib/files.php b/lib/files.php index 052d798805..ac999a9bd1 100644 --- a/lib/files.php +++ b/lib/files.php @@ -108,7 +108,24 @@ class OC_Files { return $files; } - + public static function searchByMime($mimetype_filter) { + $files = array(); + $dirs_to_check = array(''); + while (!empty($dirs_to_check)) { + // get next subdir to check + $dir = array_pop($dirs_to_check); + $dir_content = self::getDirectoryContent($dir, $mimetype_filter); + foreach($dir_content as $file) { + if ($file['type'] == 'file') { + $files[] = $dir.'/'.$file['name']; + } + else { + $dirs_to_check[] = $dir.'/'.$file['name']; + } + } + } + return $files; + } /** * return the content of a file or return a zip file containning multiply files From 5855355faac7926c6b79a61b2706b555e21f3543 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Wed, 26 Sep 2012 02:06:37 +0200 Subject: [PATCH 5/9] [tx-robot] updated from transifex --- apps/files/l10n/sl.php | 1 + apps/files/l10n/zh_CN.php | 1 + apps/files_external/l10n/da.php | 14 ++++++- apps/files_sharing/l10n/sl.php | 2 + apps/files_versions/l10n/da.php | 5 ++- apps/files_versions/l10n/sl.php | 1 + apps/user_ldap/l10n/da.php | 1 + core/l10n/ru_RU.php | 13 +++++++ core/l10n/sl.php | 1 + l10n/da/files_external.po | 48 ++++++++++++------------ l10n/da/files_versions.po | 13 ++++--- l10n/da/settings.po | 42 ++++++++++----------- l10n/da/user_ldap.po | 11 +++--- l10n/fr/files.po | 6 +-- l10n/ru_RU/core.po | 58 ++++++++++++++--------------- l10n/sl/core.po | 34 ++++++++--------- l10n/sl/files.po | 26 ++++++------- l10n/sl/files_sharing.po | 10 ++--- l10n/sl/files_versions.po | 8 ++-- l10n/sl/settings.po | 10 ++--- l10n/templates/core.pot | 2 +- l10n/templates/files.pot | 2 +- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 24 ++++++------ l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 10 ++--- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 2 +- l10n/zh_CN/files.po | 26 ++++++------- settings/l10n/da.php | 17 +++++++++ settings/l10n/sl.php | 2 + 32 files changed, 227 insertions(+), 171 deletions(-) diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php index a3b5ceeff6..910d30da1a 100644 --- a/apps/files/l10n/sl.php +++ b/apps/files/l10n/sl.php @@ -9,6 +9,7 @@ "Files" => "Datoteke", "Unshare" => "Odstrani iz souporabe", "Delete" => "Izbriši", +"Rename" => "Preimenuj", "already exists" => "že obstaja", "replace" => "nadomesti", "suggest name" => "predlagaj ime", diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php index 67289f8f48..3e9e7826ce 100644 --- a/apps/files/l10n/zh_CN.php +++ b/apps/files/l10n/zh_CN.php @@ -9,6 +9,7 @@ "Files" => "文件", "Unshare" => "取消分享", "Delete" => "删除", +"Rename" => "重命名", "already exists" => "已经存在", "replace" => "替换", "suggest name" => "建议名称", diff --git a/apps/files_external/l10n/da.php b/apps/files_external/l10n/da.php index 64647b6989..e4f1b9bb5e 100644 --- a/apps/files_external/l10n/da.php +++ b/apps/files_external/l10n/da.php @@ -2,5 +2,17 @@ "External Storage" => "Ekstern opbevaring", "Mount point" => "Monteringspunkt", "Backend" => "Backend", -"Configuration" => "Opsætning" +"Configuration" => "Opsætning", +"Options" => "Valgmuligheder", +"Applicable" => "Kan anvendes", +"Add mount point" => "Tilføj monteringspunkt", +"None set" => "Ingen sat", +"All Users" => "Alle brugere", +"Groups" => "Grupper", +"Users" => "Brugere", +"Delete" => "Slet", +"Enable User External Storage" => "Aktiver ekstern opbevaring for brugere", +"Allow users to mount their own external storage" => "Tillad brugere at montere deres egne eksterne opbevaring", +"SSL root certificates" => "SSL-rodcertifikater", +"Import Root Certificate" => "Importer rodcertifikat" ); diff --git a/apps/files_sharing/l10n/sl.php b/apps/files_sharing/l10n/sl.php index 5e7d2d5004..6d5556ea4b 100644 --- a/apps/files_sharing/l10n/sl.php +++ b/apps/files_sharing/l10n/sl.php @@ -1,6 +1,8 @@ "Geslo", "Submit" => "Pošlji", +"%s shared the folder %s with you" => "%s je dal v souporabo z vami mapo %s", +"%s shared the file %s with you" => "%s je dal v souporabo z vami datoteko %s", "Download" => "Prenesi", "No preview available for" => "Predogled ni na voljo za", "web services under your control" => "spletne storitve pod vašim nadzorom" diff --git a/apps/files_versions/l10n/da.php b/apps/files_versions/l10n/da.php index 6a69fdbe4c..bc02b47f2a 100644 --- a/apps/files_versions/l10n/da.php +++ b/apps/files_versions/l10n/da.php @@ -1,5 +1,8 @@ "Lad alle versioner udløbe", +"History" => "Historik", "Versions" => "Versioner", -"This will delete all existing backup versions of your files" => "Dette vil slette alle eksisterende backupversioner af dine filer" +"This will delete all existing backup versions of your files" => "Dette vil slette alle eksisterende backupversioner af dine filer", +"Files Versioning" => "Versionering af filer", +"Enable" => "Aktiver" ); diff --git a/apps/files_versions/l10n/sl.php b/apps/files_versions/l10n/sl.php index 9984bcb5e8..056a17decf 100644 --- a/apps/files_versions/l10n/sl.php +++ b/apps/files_versions/l10n/sl.php @@ -1,5 +1,6 @@ "Zastaraj vse različice", +"History" => "Zgodovina", "Versions" => "Različice", "This will delete all existing backup versions of your files" => "To bo izbrisalo vse obstoječe različice varnostnih kopij vaših datotek", "Files Versioning" => "Sledenje različicam", diff --git a/apps/user_ldap/l10n/da.php b/apps/user_ldap/l10n/da.php index f01c7b7110..f0589b33a9 100644 --- a/apps/user_ldap/l10n/da.php +++ b/apps/user_ldap/l10n/da.php @@ -1,5 +1,6 @@ "Host", +"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du kan udelade protokollen, medmindre du skal bruge SSL. Start i så fald med ldaps://", "Base DN" => "Base DN", "Password" => "Kodeord", "Port" => "Port", diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php index 6dc4dfea76..563a261e5d 100644 --- a/core/l10n/ru_RU.php +++ b/core/l10n/ru_RU.php @@ -15,13 +15,26 @@ "October" => "Октябрь", "November" => "Ноябрь", "December" => "Декабрь", +"Choose" => "Выбрать", "Cancel" => "Отмена", "No" => "Нет", "Yes" => "Да", "Ok" => "Да", "No categories selected for deletion." => "Нет категорий, выбранных для удаления.", "Error" => "Ошибка", +"Error while sharing" => "Ошибка создания общего доступа", +"Error while unsharing" => "Ошибка отключения общего доступа", +"Error while changing permissions" => "Ошибка при изменении прав доступа", +"Shared with you and the group %s by %s" => "Общий доступ для Вас и группы %s к %s", +"Password protect" => "Защитить паролем", "Password" => "Пароль", +"No people found" => "Не найдено людей", +"Unshare" => "Отключить общий доступ", +"access control" => "контроль доступа", +"create" => "создать", +"update" => "обновить", +"delete" => "удалить", +"share" => "сделать общим", "ownCloud password reset" => "Переназначение пароля", "Use the following link to reset your password: {link}" => "Воспользуйтесь следующей ссылкой для переназначения пароля: {link}", "You will receive a link to reset your password via Email." => "Вы получите ссылку для восстановления пароля по электронной почте.", diff --git a/core/l10n/sl.php b/core/l10n/sl.php index a87c6785dd..2c8ff34e63 100644 --- a/core/l10n/sl.php +++ b/core/l10n/sl.php @@ -22,6 +22,7 @@ "No categories selected for deletion." => "Za izbris ni bila izbrana nobena kategorija.", "Error" => "Napaka", "Password" => "Geslo", +"Password protected" => "Zaščiteno z geslom", "ownCloud password reset" => "Ponastavitev gesla ownCloud", "Use the following link to reset your password: {link}" => "Uporabite sledečo povezavo za ponastavitev gesla: {link}", "You will receive a link to reset your password via Email." => "Na e-pošto boste prejeli povezavo s katero lahko ponastavite vaše geslo.", diff --git a/l10n/da/files_external.po b/l10n/da/files_external.po index ad6623daea..a37fa55a6f 100644 --- a/l10n/da/files_external.po +++ b/l10n/da/files_external.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-24 02:01+0200\n" -"PO-Revision-Date: 2012-09-23 09:05+0000\n" +"POT-Creation-Date: 2012-09-26 02:02+0200\n" +"PO-Revision-Date: 2012-09-25 14:09+0000\n" "Last-Translator: Morten Juhl-Johansen Zölde-Fejér \n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" @@ -36,48 +36,48 @@ msgstr "Opsætning" #: templates/settings.php:10 msgid "Options" -msgstr "" +msgstr "Valgmuligheder" #: templates/settings.php:11 msgid "Applicable" -msgstr "" +msgstr "Kan anvendes" #: templates/settings.php:23 msgid "Add mount point" -msgstr "" +msgstr "Tilføj monteringspunkt" #: templates/settings.php:54 templates/settings.php:62 msgid "None set" -msgstr "" +msgstr "Ingen sat" #: templates/settings.php:63 msgid "All Users" -msgstr "" +msgstr "Alle brugere" #: templates/settings.php:64 msgid "Groups" -msgstr "" +msgstr "Grupper" #: templates/settings.php:69 msgid "Users" -msgstr "" +msgstr "Brugere" -#: templates/settings.php:77 templates/settings.php:96 +#: templates/settings.php:77 templates/settings.php:107 msgid "Delete" -msgstr "" +msgstr "Slet" + +#: templates/settings.php:87 +msgid "Enable User External Storage" +msgstr "Aktiver ekstern opbevaring for brugere" #: templates/settings.php:88 -msgid "SSL root certificates" -msgstr "" - -#: templates/settings.php:102 -msgid "Import Root Certificate" -msgstr "" - -#: templates/settings.php:108 -msgid "Enable User External Storage" -msgstr "" - -#: templates/settings.php:109 msgid "Allow users to mount their own external storage" -msgstr "" +msgstr "Tillad brugere at montere deres egne eksterne opbevaring" + +#: templates/settings.php:99 +msgid "SSL root certificates" +msgstr "SSL-rodcertifikater" + +#: templates/settings.php:113 +msgid "Import Root Certificate" +msgstr "Importer rodcertifikat" diff --git a/l10n/da/files_versions.po b/l10n/da/files_versions.po index dea4d1ccbf..3e6898ddd4 100644 --- a/l10n/da/files_versions.po +++ b/l10n/da/files_versions.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Morten Juhl-Johansen Zölde-Fejér , 2012. # , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-22 01:14+0200\n" -"PO-Revision-Date: 2012-09-21 23:15+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-26 02:02+0200\n" +"PO-Revision-Date: 2012-09-25 14:07+0000\n" +"Last-Translator: Morten Juhl-Johansen Zölde-Fejér \n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,7 +25,7 @@ msgstr "Lad alle versioner udløbe" #: js/versions.js:16 msgid "History" -msgstr "" +msgstr "Historik" #: templates/settings-personal.php:4 msgid "Versions" @@ -36,8 +37,8 @@ msgstr "Dette vil slette alle eksisterende backupversioner af dine filer" #: templates/settings.php:3 msgid "Files Versioning" -msgstr "" +msgstr "Versionering af filer" #: templates/settings.php:4 msgid "Enable" -msgstr "" +msgstr "Aktiver" diff --git a/l10n/da/settings.po b/l10n/da/settings.po index fa494fbcb0..4d59eb30b5 100644 --- a/l10n/da/settings.po +++ b/l10n/da/settings.po @@ -5,7 +5,7 @@ # Translators: # , 2012. # , 2011. -# Morten Juhl-Johansen Zölde-Fejér , 2011, 2012. +# Morten Juhl-Johansen Zölde-Fejér , 2011-2012. # Pascal d'Hermilly , 2011. # , 2012. # , 2012. @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-19 02:02+0200\n" -"PO-Revision-Date: 2012-09-19 00:03+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-26 02:03+0200\n" +"PO-Revision-Date: 2012-09-25 14:04+0000\n" +"Last-Translator: Morten Juhl-Johansen Zölde-Fejér \n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,15 +36,15 @@ msgstr "Adgangsfejl" #: ajax/creategroup.php:19 msgid "Group already exists" -msgstr "" +msgstr "Gruppen findes allerede" #: ajax/creategroup.php:28 msgid "Unable to add group" -msgstr "" +msgstr "Gruppen kan ikke oprettes" #: ajax/enableapp.php:14 msgid "Could not enable app. " -msgstr "" +msgstr "Applikationen kunne ikke aktiveres." #: ajax/lostpassword.php:14 msgid "Email saved" @@ -64,11 +64,11 @@ msgstr "Ugyldig forespørgsel" #: ajax/removegroup.php:16 msgid "Unable to delete group" -msgstr "" +msgstr "Gruppen kan ikke slettes" #: ajax/removeuser.php:22 msgid "Unable to delete user" -msgstr "" +msgstr "Bruger kan ikke slettes" #: ajax/setlanguage.php:18 msgid "Language changed" @@ -77,12 +77,12 @@ msgstr "Sprog ændret" #: ajax/togglegroups.php:25 #, php-format msgid "Unable to add user to group %s" -msgstr "" +msgstr "Brugeren kan ikke tilføjes til gruppen %s" #: ajax/togglegroups.php:31 #, php-format msgid "Unable to remove user from group %s" -msgstr "" +msgstr "Brugeren kan ikke fjernes fra gruppen %s" #: js/apps.js:27 js/apps.js:61 msgid "Disable" @@ -111,7 +111,7 @@ msgid "" "strongly suggest that you configure your webserver in a way that the data " "directory is no longer accessible or you move the data directory outside the" " webserver document root." -msgstr "" +msgstr "Din datamappe og dine filer er formentligt tilgængelige fra internettet.\n.htaccess-filen, som ownCloud leverer, fungerer ikke. Vi anbefaler stærkt, at du opsætter din server på en måde, så datamappen ikke længere er direkte tilgængelig, eller at du flytter datamappen udenfor serverens tilgængelige rodfilsystem." #: templates/admin.php:31 msgid "Cron" @@ -119,23 +119,23 @@ msgstr "Cron" #: templates/admin.php:37 msgid "Execute one task with each page loaded" -msgstr "" +msgstr "Udfør en opgave med hver side indlæst" #: templates/admin.php:43 msgid "" "cron.php is registered at a webcron service. Call the cron.php page in the " "owncloud root once a minute over http." -msgstr "" +msgstr "cron.php er registreret hos en webcron-tjeneste. Kald cron.php-siden i ownClouds rodmappe en gang i minuttet over http." #: templates/admin.php:49 msgid "" "Use systems cron service. Call the cron.php file in the owncloud folder via " "a system cronjob once a minute." -msgstr "" +msgstr "vend systemets cron-tjeneste. Kald cron.php-filen i ownCloud-mappen ved hjælp af systemets cronjob en gang i minuttet." #: templates/admin.php:56 msgid "Sharing" -msgstr "" +msgstr "Deling" #: templates/admin.php:61 msgid "Enable Share API" @@ -159,7 +159,7 @@ msgstr "Tillad gendeling" #: templates/admin.php:74 msgid "Allow users to share items shared with them again" -msgstr "" +msgstr "Tillad brugere at dele elementer, som er blevet delt med dem, videre til andre" #: templates/admin.php:79 msgid "Allow users to share with anyone" @@ -185,7 +185,7 @@ msgid "" "licensed under the AGPL." -msgstr "" +msgstr "Udviklet af ownClouds community, og kildekoden er underlagt licensen AGPL." #: templates/apps.php:10 msgid "Add your App" @@ -201,7 +201,7 @@ msgstr "Se applikationens side på apps.owncloud.com" #: templates/apps.php:30 msgid "-licensed by " -msgstr "" +msgstr "-licenseret af " #: templates/help.php:9 msgid "Documentation" @@ -230,7 +230,7 @@ msgstr "Svar" #: templates/personal.php:8 #, php-format msgid "You have used %s of the available %s" -msgstr "" +msgstr "Du har brugt %s af de tilgængelige %s" #: templates/personal.php:12 msgid "Desktop and Mobile Syncing Clients" @@ -242,7 +242,7 @@ msgstr "Download" #: templates/personal.php:19 msgid "Your password was changed" -msgstr "" +msgstr "Din adgangskode blev ændret" #: templates/personal.php:20 msgid "Unable to change your password" diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po index 1d87e55405..1d331efa3c 100644 --- a/l10n/da/user_ldap.po +++ b/l10n/da/user_ldap.po @@ -3,20 +3,21 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Morten Juhl-Johansen Zölde-Fejér , 2012. # , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-29 02:01+0200\n" -"PO-Revision-Date: 2012-08-29 00:03+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-26 02:02+0200\n" +"PO-Revision-Date: 2012-09-25 14:13+0000\n" +"Last-Translator: Morten Juhl-Johansen Zölde-Fejér \n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: da\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 msgid "Host" @@ -25,7 +26,7 @@ msgstr "Host" #: templates/settings.php:8 msgid "" "You can omit the protocol, except you require SSL. Then start with ldaps://" -msgstr "" +msgstr "Du kan udelade protokollen, medmindre du skal bruge SSL. Start i så fald med ldaps://" #: templates/settings.php:9 msgid "Base DN" diff --git a/l10n/fr/files.po b/l10n/fr/files.po index d19fc27b6b..49840aa6bb 100644 --- a/l10n/fr/files.po +++ b/l10n/fr/files.po @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-24 02:01+0200\n" -"PO-Revision-Date: 2012-09-23 22:37+0000\n" -"Last-Translator: Romain DEP. \n" +"POT-Creation-Date: 2012-09-26 02:02+0200\n" +"PO-Revision-Date: 2012-09-25 14:38+0000\n" +"Last-Translator: phx675 \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/l10n/ru_RU/core.po b/l10n/ru_RU/core.po index 5c5a1d4a79..b82844da9c 100644 --- a/l10n/ru_RU/core.po +++ b/l10n/ru_RU/core.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-22 01:14+0200\n" -"PO-Revision-Date: 2012-09-21 23:14+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-26 02:02+0200\n" +"PO-Revision-Date: 2012-09-25 13:35+0000\n" +"Last-Translator: AnnaSch \n" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,61 +30,61 @@ msgstr "Нет категории для добавления?" msgid "This category already exists: " msgstr "Эта категория уже существует:" -#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55 +#: js/js.js:213 templates/layout.user.php:54 templates/layout.user.php:55 msgid "Settings" msgstr "Настройки" -#: js/js.js:642 +#: js/js.js:645 msgid "January" msgstr "Январь" -#: js/js.js:642 +#: js/js.js:645 msgid "February" msgstr "Февраль" -#: js/js.js:642 +#: js/js.js:645 msgid "March" msgstr "Март" -#: js/js.js:642 +#: js/js.js:645 msgid "April" msgstr "Апрель" -#: js/js.js:642 +#: js/js.js:645 msgid "May" msgstr "Май" -#: js/js.js:642 +#: js/js.js:645 msgid "June" msgstr "Июнь" -#: js/js.js:643 +#: js/js.js:646 msgid "July" msgstr "Июль" -#: js/js.js:643 +#: js/js.js:646 msgid "August" msgstr "Август" -#: js/js.js:643 +#: js/js.js:646 msgid "September" msgstr "Сентябрь" -#: js/js.js:643 +#: js/js.js:646 msgid "October" msgstr "Октябрь" -#: js/js.js:643 +#: js/js.js:646 msgid "November" msgstr "Ноябрь" -#: js/js.js:643 +#: js/js.js:646 msgid "December" msgstr "Декабрь" #: js/oc-dialogs.js:123 msgid "Choose" -msgstr "" +msgstr "Выбрать" #: js/oc-dialogs.js:143 js/oc-dialogs.js:163 msgid "Cancel" @@ -112,20 +112,20 @@ msgstr "Ошибка" #: js/share.js:103 msgid "Error while sharing" -msgstr "" +msgstr "Ошибка создания общего доступа" #: js/share.js:114 msgid "Error while unsharing" -msgstr "" +msgstr "Ошибка отключения общего доступа" #: js/share.js:121 msgid "Error while changing permissions" -msgstr "" +msgstr "Ошибка при изменении прав доступа" #: js/share.js:130 #, perl-format msgid "Shared with you and the group %s by %s" -msgstr "" +msgstr "Общий доступ для Вас и группы %s к %s" #: js/share.js:132 #, perl-format @@ -142,7 +142,7 @@ msgstr "" #: js/share.js:143 msgid "Password protect" -msgstr "" +msgstr "Защитить паролем" #: js/share.js:147 templates/installation.php:30 templates/login.php:13 msgid "Password" @@ -163,7 +163,7 @@ msgstr "" #: js/share.js:184 msgid "No people found" -msgstr "" +msgstr "Не найдено людей" #: js/share.js:210 msgid "Resharing is not allowed" @@ -176,7 +176,7 @@ msgstr "" #: js/share.js:267 msgid "Unshare" -msgstr "" +msgstr "Отключить общий доступ" #: js/share.js:275 msgid "can edit" @@ -184,23 +184,23 @@ msgstr "" #: js/share.js:277 msgid "access control" -msgstr "" +msgstr "контроль доступа" #: js/share.js:280 msgid "create" -msgstr "" +msgstr "создать" #: js/share.js:283 msgid "update" -msgstr "" +msgstr "обновить" #: js/share.js:286 msgid "delete" -msgstr "" +msgstr "удалить" #: js/share.js:289 msgid "share" -msgstr "" +msgstr "сделать общим" #: js/share.js:313 js/share.js:463 msgid "Password protected" diff --git a/l10n/sl/core.po b/l10n/sl/core.po index 933feb6207..e704fbbd40 100644 --- a/l10n/sl/core.po +++ b/l10n/sl/core.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-22 01:14+0200\n" -"PO-Revision-Date: 2012-09-21 23:14+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-26 02:02+0200\n" +"PO-Revision-Date: 2012-09-25 19:10+0000\n" +"Last-Translator: Peter Peroša \n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,55 +32,55 @@ msgstr "Ni kategorije za dodajanje?" msgid "This category already exists: " msgstr "Ta kategorija že obstaja:" -#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55 +#: js/js.js:213 templates/layout.user.php:54 templates/layout.user.php:55 msgid "Settings" msgstr "Nastavitve" -#: js/js.js:642 +#: js/js.js:645 msgid "January" msgstr "januar" -#: js/js.js:642 +#: js/js.js:645 msgid "February" msgstr "februar" -#: js/js.js:642 +#: js/js.js:645 msgid "March" msgstr "marec" -#: js/js.js:642 +#: js/js.js:645 msgid "April" msgstr "april" -#: js/js.js:642 +#: js/js.js:645 msgid "May" msgstr "maj" -#: js/js.js:642 +#: js/js.js:645 msgid "June" msgstr "junij" -#: js/js.js:643 +#: js/js.js:646 msgid "July" msgstr "julij" -#: js/js.js:643 +#: js/js.js:646 msgid "August" msgstr "avgust" -#: js/js.js:643 +#: js/js.js:646 msgid "September" msgstr "september" -#: js/js.js:643 +#: js/js.js:646 msgid "October" msgstr "oktober" -#: js/js.js:643 +#: js/js.js:646 msgid "November" msgstr "november" -#: js/js.js:643 +#: js/js.js:646 msgid "December" msgstr "december" @@ -206,7 +206,7 @@ msgstr "" #: js/share.js:313 js/share.js:463 msgid "Password protected" -msgstr "" +msgstr "Zaščiteno z geslom" #: js/share.js:485 msgid "Error setting expiration date" diff --git a/l10n/sl/files.po b/l10n/sl/files.po index e20cbd0fdc..17941788fc 100644 --- a/l10n/sl/files.po +++ b/l10n/sl/files.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-22 01:13+0200\n" -"PO-Revision-Date: 2012-09-21 23:14+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-26 02:02+0200\n" +"PO-Revision-Date: 2012-09-25 19:05+0000\n" +"Last-Translator: Peter Peroša \n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -64,41 +64,41 @@ msgstr "Izbriši" #: js/fileactions.js:182 msgid "Rename" -msgstr "" +msgstr "Preimenuj" -#: js/filelist.js:188 js/filelist.js:190 +#: js/filelist.js:190 js/filelist.js:192 msgid "already exists" msgstr "že obstaja" -#: js/filelist.js:188 js/filelist.js:190 +#: js/filelist.js:190 js/filelist.js:192 msgid "replace" msgstr "nadomesti" -#: js/filelist.js:188 +#: js/filelist.js:190 msgid "suggest name" msgstr "predlagaj ime" -#: js/filelist.js:188 js/filelist.js:190 +#: js/filelist.js:190 js/filelist.js:192 msgid "cancel" msgstr "ekliči" -#: js/filelist.js:237 js/filelist.js:239 +#: js/filelist.js:239 js/filelist.js:241 msgid "replaced" msgstr "nadomeščen" -#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273 +#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275 msgid "undo" msgstr "razveljavi" -#: js/filelist.js:239 +#: js/filelist.js:241 msgid "with" msgstr "z" -#: js/filelist.js:271 +#: js/filelist.js:273 msgid "unshared" msgstr "odstranjeno iz souporabe" -#: js/filelist.js:273 +#: js/filelist.js:275 msgid "deleted" msgstr "izbrisano" diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po index 3003e48ccd..4fdbda00e6 100644 --- a/l10n/sl/files_sharing.po +++ b/l10n/sl/files_sharing.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-22 01:14+0200\n" -"PO-Revision-Date: 2012-09-21 23:15+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-26 02:02+0200\n" +"PO-Revision-Date: 2012-09-25 19:08+0000\n" +"Last-Translator: Peter Peroša \n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,12 +29,12 @@ msgstr "Pošlji" #: templates/public.php:9 #, php-format msgid "%s shared the folder %s with you" -msgstr "" +msgstr "%s je dal v souporabo z vami mapo %s" #: templates/public.php:11 #, php-format msgid "%s shared the file %s with you" -msgstr "" +msgstr "%s je dal v souporabo z vami datoteko %s" #: templates/public.php:14 templates/public.php:30 msgid "Download" diff --git a/l10n/sl/files_versions.po b/l10n/sl/files_versions.po index ec3807cf82..974c8de546 100644 --- a/l10n/sl/files_versions.po +++ b/l10n/sl/files_versions.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-22 01:14+0200\n" -"PO-Revision-Date: 2012-09-21 23:15+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-26 02:02+0200\n" +"PO-Revision-Date: 2012-09-25 19:09+0000\n" +"Last-Translator: Peter Peroša \n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,7 +24,7 @@ msgstr "Zastaraj vse različice" #: js/versions.js:16 msgid "History" -msgstr "" +msgstr "Zgodovina" #: templates/settings-personal.php:4 msgid "Versions" diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po index 6ac9bae10f..f82aa4ec64 100644 --- a/l10n/sl/settings.po +++ b/l10n/sl/settings.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-19 02:02+0200\n" -"PO-Revision-Date: 2012-09-19 00:03+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-26 02:03+0200\n" +"PO-Revision-Date: 2012-09-25 19:07+0000\n" +"Last-Translator: Peter Peroša \n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -225,7 +225,7 @@ msgstr "Odgovor" #: templates/personal.php:8 #, php-format msgid "You have used %s of the available %s" -msgstr "" +msgstr "Uporabili ste %s od razpoložljivih %s" #: templates/personal.php:12 msgid "Desktop and Mobile Syncing Clients" @@ -237,7 +237,7 @@ msgstr "Prenesi" #: templates/personal.php:19 msgid "Your password was changed" -msgstr "" +msgstr "Vaše geslo je bilo spremenjeno" #: templates/personal.php:20 msgid "Unable to change your password" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 777b908ad1..cc9d5b2b7f 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-25 02:02+0200\n" +"POT-Creation-Date: 2012-09-26 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 2f30248e1a..8d9cdf31d5 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-25 02:02+0200\n" +"POT-Creation-Date: 2012-09-26 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 1819d067a9..8ff1127f02 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-25 02:02+0200\n" +"POT-Creation-Date: 2012-09-26 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 6cd3a3f7d6..4365469ac0 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-25 02:02+0200\n" +"POT-Creation-Date: 2012-09-26 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -61,22 +61,22 @@ msgstr "" msgid "Users" msgstr "" -#: templates/settings.php:77 templates/settings.php:96 +#: templates/settings.php:77 templates/settings.php:107 msgid "Delete" msgstr "" -#: templates/settings.php:88 -msgid "SSL root certificates" -msgstr "" - -#: templates/settings.php:102 -msgid "Import Root Certificate" -msgstr "" - -#: templates/settings.php:108 +#: templates/settings.php:87 msgid "Enable User External Storage" msgstr "" -#: templates/settings.php:109 +#: templates/settings.php:88 msgid "Allow users to mount their own external storage" msgstr "" + +#: templates/settings.php:99 +msgid "SSL root certificates" +msgstr "" + +#: templates/settings.php:113 +msgid "Import Root Certificate" +msgstr "" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index 5e8a2a3929..c7fda2aad6 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-25 02:02+0200\n" +"POT-Creation-Date: 2012-09-26 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index dbd3b16a90..0a5f60fe03 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-25 02:02+0200\n" +"POT-Creation-Date: 2012-09-26 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index 43ed734b65..0e5e32e2e1 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-25 02:02+0200\n" +"POT-Creation-Date: 2012-09-26 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -41,19 +41,19 @@ msgstr "" msgid "Admin" msgstr "" -#: files.php:310 +#: files.php:327 msgid "ZIP download is turned off." msgstr "" -#: files.php:311 +#: files.php:328 msgid "Files need to be downloaded one by one." msgstr "" -#: files.php:311 files.php:336 +#: files.php:328 files.php:353 msgid "Back to Files" msgstr "" -#: files.php:335 +#: files.php:352 msgid "Selected files too large to generate zip file." msgstr "" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index 4dfbc78644..5d41818593 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-25 02:03+0200\n" +"POT-Creation-Date: 2012-09-26 02:03+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index be05146826..915d0a218b 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-25 02:02+0200\n" +"POT-Creation-Date: 2012-09-26 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po index 36473aea1c..3f7578b770 100644 --- a/l10n/zh_CN/files.po +++ b/l10n/zh_CN/files.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-22 01:13+0200\n" -"PO-Revision-Date: 2012-09-21 23:14+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-26 02:02+0200\n" +"PO-Revision-Date: 2012-09-25 13:53+0000\n" +"Last-Translator: hanfeng \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -64,41 +64,41 @@ msgstr "删除" #: js/fileactions.js:182 msgid "Rename" -msgstr "" +msgstr "重命名" -#: js/filelist.js:188 js/filelist.js:190 +#: js/filelist.js:190 js/filelist.js:192 msgid "already exists" msgstr "已经存在" -#: js/filelist.js:188 js/filelist.js:190 +#: js/filelist.js:190 js/filelist.js:192 msgid "replace" msgstr "替换" -#: js/filelist.js:188 +#: js/filelist.js:190 msgid "suggest name" msgstr "建议名称" -#: js/filelist.js:188 js/filelist.js:190 +#: js/filelist.js:190 js/filelist.js:192 msgid "cancel" msgstr "取消" -#: js/filelist.js:237 js/filelist.js:239 +#: js/filelist.js:239 js/filelist.js:241 msgid "replaced" msgstr "已经替换" -#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273 +#: js/filelist.js:239 js/filelist.js:241 js/filelist.js:273 js/filelist.js:275 msgid "undo" msgstr "撤销" -#: js/filelist.js:239 +#: js/filelist.js:241 msgid "with" msgstr "随着" -#: js/filelist.js:271 +#: js/filelist.js:273 msgid "unshared" msgstr "已取消分享" -#: js/filelist.js:273 +#: js/filelist.js:275 msgid "deleted" msgstr "已经删除" diff --git a/settings/l10n/da.php b/settings/l10n/da.php index 9ad77eb0c1..4549bcc9d3 100644 --- a/settings/l10n/da.php +++ b/settings/l10n/da.php @@ -1,37 +1,54 @@ "Kunne ikke indlæse listen fra App Store", "Authentication error" => "Adgangsfejl", +"Group already exists" => "Gruppen findes allerede", +"Unable to add group" => "Gruppen kan ikke oprettes", +"Could not enable app. " => "Applikationen kunne ikke aktiveres.", "Email saved" => "Email adresse gemt", "Invalid email" => "Ugyldig email adresse", "OpenID Changed" => "OpenID ændret", "Invalid request" => "Ugyldig forespørgsel", +"Unable to delete group" => "Gruppen kan ikke slettes", +"Unable to delete user" => "Bruger kan ikke slettes", "Language changed" => "Sprog ændret", +"Unable to add user to group %s" => "Brugeren kan ikke tilføjes til gruppen %s", +"Unable to remove user from group %s" => "Brugeren kan ikke fjernes fra gruppen %s", "Disable" => "Deaktiver", "Enable" => "Aktiver", "Saving..." => "Gemmer...", "__language_name__" => "Dansk", "Security Warning" => "Sikkerhedsadvarsel", +"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Din datamappe og dine filer er formentligt tilgængelige fra internettet.\n.htaccess-filen, som ownCloud leverer, fungerer ikke. Vi anbefaler stærkt, at du opsætter din server på en måde, så datamappen ikke længere er direkte tilgængelig, eller at du flytter datamappen udenfor serverens tilgængelige rodfilsystem.", "Cron" => "Cron", +"Execute one task with each page loaded" => "Udfør en opgave med hver side indlæst", +"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php er registreret hos en webcron-tjeneste. Kald cron.php-siden i ownClouds rodmappe en gang i minuttet over http.", +"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "vend systemets cron-tjeneste. Kald cron.php-filen i ownCloud-mappen ved hjælp af systemets cronjob en gang i minuttet.", +"Sharing" => "Deling", "Enable Share API" => "Aktiver dele API", "Allow apps to use the Share API" => "Tillad apps a bruge dele APIen", "Allow links" => "Tillad links", "Allow users to share items to the public with links" => "Tillad brugere at dele elementer med offentligheden med links", "Allow resharing" => "Tillad gendeling", +"Allow users to share items shared with them again" => "Tillad brugere at dele elementer, som er blevet delt med dem, videre til andre", "Allow users to share with anyone" => "Tillad brugere at dele med hvem som helst", "Allow users to only share with users in their groups" => "Tillad kun deling med brugere i brugerens egen gruppe", "Log" => "Log", "More" => "Mere", +"Developed by the ownCloud community, the source code is licensed under the AGPL." => "Udviklet af ownClouds community, og kildekoden er underlagt licensen AGPL.", "Add your App" => "Tilføj din App", "Select an App" => "Vælg en App", "See application page at apps.owncloud.com" => "Se applikationens side på apps.owncloud.com", +"-licensed by " => "-licenseret af ", "Documentation" => "Dokumentation", "Managing Big Files" => "Håndter store filer", "Ask a question" => "Stil et spørgsmål", "Problems connecting to help database." => "Problemer med at forbinde til hjælpe-databasen.", "Go there manually." => "Gå derhen manuelt.", "Answer" => "Svar", +"You have used %s of the available %s" => "Du har brugt %s af de tilgængelige %s", "Desktop and Mobile Syncing Clients" => "Synkroniserings programmer for desktop og mobil", "Download" => "Download", +"Your password was changed" => "Din adgangskode blev ændret", "Unable to change your password" => "Ude af stand til at ændre dit kodeord", "Current password" => "Nuværende adgangskode", "New password" => "Ny adgangskode", diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php index 9fbf376dea..7f23d9dbc9 100644 --- a/settings/l10n/sl.php +++ b/settings/l10n/sl.php @@ -45,8 +45,10 @@ "Problems connecting to help database." => "Težave pri povezovanju s podatkovno zbirko pomoči.", "Go there manually." => "Pojdi tja ročno.", "Answer" => "Odgovor", +"You have used %s of the available %s" => "Uporabili ste %s od razpoložljivih %s", "Desktop and Mobile Syncing Clients" => "Namizni in mobilni odjemalci za sinhronizacijo", "Download" => "Prenesi", +"Your password was changed" => "Vaše geslo je bilo spremenjeno", "Unable to change your password" => "Vašega gesla ni bilo mogoče spremeniti.", "Current password" => "Trenutno geslo", "New password" => "Novo geslo", From 2bdf89f4d4d754c4cb4e1498b977085a67269460 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Tue, 25 Sep 2012 23:18:36 -0400 Subject: [PATCH 6/9] Stop autocomplete selection event propogration so share dropdown doesn't disappear, fixes bug oc-1773 --- core/js/share.js | 1 + 1 file changed, 1 insertion(+) diff --git a/core/js/share.js b/core/js/share.js index c105a27dc0..edd9142c38 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -191,6 +191,7 @@ OC.Share={ event.preventDefault(); }, select: function(event, selected) { + event.stopPropagation(); var itemType = $('#dropdown').data('item-type'); var itemSource = $('#dropdown').data('item-source'); var shareType = selected.item.value.shareType; From f967bfc9566c2b5a6ca393f1ac5e2e8b0ff1ac7e Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Tue, 25 Sep 2012 23:54:46 -0400 Subject: [PATCH 7/9] Properly format the share expiration time for the database, fixes bug oc-1779 --- lib/public/share.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/public/share.php b/lib/public/share.php index b215d7f938..6ef984732b 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -418,11 +418,16 @@ class Share { } public static function setExpirationDate($itemType, $itemSource, $date) { - if ($item = self::getItems($itemType, $itemSource, null, null, \OC_User::getUser(), self::FORMAT_NONE, null, 1, false)) { - error_log('setting'); - $query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `expiration` = ? WHERE `id` = ?'); - $query->execute(array($date, $item['id'])); - return true; + if ($items = self::getItems($itemType, $itemSource, null, null, \OC_User::getUser(), self::FORMAT_NONE, null, -1, false)) { + if (!empty($items)) { + $date = new \DateTime($date); + $date = date('Y-m-d H:i', $date->format('U') - $date->getOffset()); + $query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `expiration` = ? WHERE `id` = ?'); + foreach ($items as $item) { + $query->execute(array($date, $item['id'])); + } + return true; + } } return false; } From 00103d730fe2ce57ee389fd7d219847d8cb015a3 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Wed, 26 Sep 2012 00:04:27 -0400 Subject: [PATCH 8/9] Show share expiration date set for shared item --- core/js/share.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/core/js/share.js b/core/js/share.js index edd9142c38..e45dc7dd42 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -166,6 +166,9 @@ OC.Share={ OC.Share.addShareWith(share.share_type, share.share_with, share.permissions, possiblePermissions, false); } } + if (share.expiration.length > 0) { + OC.Share.showExpirationDate(share.expiration); + } }); } $('#shareWith').autocomplete({minLength: 2, source: function(search, response) { @@ -322,6 +325,15 @@ OC.Share={ }, dirname:function(path) { return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, ''); + }, + showExpirationDate:function(date) { + $('#expirationCheckbox').attr('checked', true); + $('#expirationDate').before('
'); + $('#expirationDate').val(date); + $('#expirationDate').show(); + $('#expirationDate').datepicker({ + dateFormat : 'dd-mm-yy' + }); } } @@ -468,11 +480,7 @@ $(document).ready(function() { $('#expirationCheckbox').live('click', function() { if (this.checked) { - $('#expirationDate').before('
'); - $('#expirationDate').show(); - $('#expirationDate').datepicker({ - dateFormat : 'dd-mm-yy' - }); + OC.Share.showExpirationDate(''); } else { $('#expirationDate').hide(); } From b4e40b1c21fc3cd465a467278b4960565e07ca0d Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Wed, 26 Sep 2012 00:09:35 -0400 Subject: [PATCH 9/9] Fix unsetting share expiration date --- core/js/share.js | 9 ++++++++- lib/public/share.php | 8 ++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/core/js/share.js b/core/js/share.js index e45dc7dd42..36ee39d8ea 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -482,7 +482,14 @@ $(document).ready(function() { if (this.checked) { OC.Share.showExpirationDate(''); } else { - $('#expirationDate').hide(); + var itemType = $('#dropdown').data('item-type'); + var itemSource = $('#dropdown').data('item-source'); + $.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setExpirationDate', itemType: itemType, itemSource: itemSource, date: '' }, function(result) { + if (!result || result.status !== 'success') { + OC.dialogs.alert(t('core', 'Error'), t('core', 'Error unsetting expiration date')); + } + $('#expirationDate').hide(); + }); } }); diff --git a/lib/public/share.php b/lib/public/share.php index 6ef984732b..1039d6f0db 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -420,8 +420,12 @@ class Share { public static function setExpirationDate($itemType, $itemSource, $date) { if ($items = self::getItems($itemType, $itemSource, null, null, \OC_User::getUser(), self::FORMAT_NONE, null, -1, false)) { if (!empty($items)) { - $date = new \DateTime($date); - $date = date('Y-m-d H:i', $date->format('U') - $date->getOffset()); + if ($date == '') { + $date = null; + } else { + $date = new \DateTime($date); + $date = date('Y-m-d H:i', $date->format('U') - $date->getOffset()); + } $query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `expiration` = ? WHERE `id` = ?'); foreach ($items as $item) { $query->execute(array($date, $item['id']));