Merge branch 'master' into move-datadirectory-checks

5 files changed, 63 insertions, 70 deletions

diff --git a/l10n/ru_RU/core.po b/l10n/ru_RU/core.po
index a785898d1c2..7ecd789d863 100644
--- a/l10n/ru_RU/core.po
+++ b/l10n/ru_RU/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
@@ -208,7 +208,6 @@ msgid "Password protect"
 msgstr "Защитить паролем"
 
 #: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
 msgid "Password"
 msgstr "Пароль"
 
@@ -565,17 +564,3 @@ msgstr "следующий"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Предупреждение системы безопасности!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Пожалуйста, проверьте свой ​​пароль. <br/>По соображениям безопасности Вам может быть иногда предложено ввести пароль еще раз."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Проверить"
diff --git a/l10n/ru_RU/files_versions.po b/l10n/ru_RU/files_versions.po
index 241dfcc0e91..440d5bbecb0 100644
--- a/l10n/ru_RU/files_versions.po
+++ b/l10n/ru_RU/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-11-17 00:01+0100\n"
-"PO-Revision-Date: 2012-11-16 07:25+0000\n"
-"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
@@ -18,22 +18,10 @@ msgstr ""
 "Language: ru_RU\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Срок действия всех версий истекает"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "История"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Версии"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Это приведет к удалению всех существующих версий резервной копии Ваших файлов"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Файлы управления версиями"
diff --git a/l10n/ru_RU/lib.po b/l10n/ru_RU/lib.po
index 5ca45d27ad2..be65ac1f023 100644
--- a/l10n/ru_RU/lib.po
+++ b/l10n/ru_RU/lib.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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-15 09:27+0000\n"
-"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
@@ -18,51 +18,55 @@ msgstr ""
 "Language: ru_RU\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "Помощь"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "Персональный"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "Настройки"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "Пользователи"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "Приложения"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "Админ"
 
-#: files.php:332
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "Загрузка ZIP выключена."
 
-#: files.php:333
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "Файлы должны быть загружены один за другим."
 
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "Обратно к файлам"
 
-#: files.php:357
+#: files.php:390
 msgid "Selected files too large to generate zip file."
 msgstr "Выбранные файлы слишком велики для генерации zip-архива."
 
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Приложение не запущено"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Ошибка аутентификации"
 
@@ -82,55 +86,55 @@ msgstr "Текст"
 msgid "Images"
 msgstr "Изображения"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "секунд назад"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "1 минуту назад"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d минут назад"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "1 час назад"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "%d часов назад"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "сегодня"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "вчера"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "%d дней назад"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "в прошлом месяце"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "%d месяцев назад"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "в прошлом году"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "год назад"
 
diff --git a/l10n/ru_RU/user_ldap.po b/l10n/ru_RU/user_ldap.po
index 4a514279ab3..ef2d84ebcb1 100644
--- a/l10n/ru_RU/user_ldap.po
+++ b/l10n/ru_RU/user_ldap.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-12-19 00:03+0100\n"
-"PO-Revision-Date: 2012-12-18 08:59+0000\n"
-"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
@@ -27,9 +27,9 @@ msgstr "<b>Предупреждение:</b> Приложения user_ldap и u
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Предупреждение:</b> Необходимый PHP LDAP-модуль не установлен, backend не будет работать. Пожалуйста, обратитесь к системному администратору, чтобы установить его."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
 
 #: templates/settings.php:15
 msgid "Host"
@@ -45,6 +45,10 @@ msgid "Base DN"
 msgstr "База DN"
 
 #: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Вы можете задать Base DN для пользователей и групп во вкладке «Дополнительно»"
 
@@ -115,10 +119,18 @@ msgstr "Порт"
 msgid "Base User Tree"
 msgstr "Базовое дерево пользователей"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Базовое дерево групп"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Связь член-группа"
diff --git a/l10n/ru_RU/user_webdavauth.po b/l10n/ru_RU/user_webdavauth.po
index 5308dbe4c2d..a14bb9d28ed 100644
--- a/l10n/ru_RU/user_webdavauth.po
+++ b/l10n/ru_RU/user_webdavauth.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-21 00:10+0100\n"
-"PO-Revision-Date: 2012-12-20 06:57+0000\n"
-"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
@@ -19,13 +19,17 @@ msgstr ""
 "Language: ru_RU\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr "URL: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
 msgstr ""