diff --git a/core/l10n/ast.php b/core/l10n/ast.php
index c813a5deb9e8abed1619396c212db83acac7ad3c..497467b573db8ba3a8471b774b53e117a5c2c1ef 100644
--- a/core/l10n/ast.php
+++ b/core/l10n/ast.php
@@ -36,6 +36,7 @@ $TRANSLATIONS = array(
"Choose" => "Esbillar",
"Yes" => "Sí",
"No" => "Non",
+"Ok" => "Aceutar",
"_{count} file conflict_::_{count} file conflicts_" => array("",""),
"Which files do you want to keep?" => "¿Qué ficheros quies caltener?",
"Cancel" => "Encaboxar",
@@ -48,6 +49,7 @@ $TRANSLATIONS = array(
"Shared" => "Compartíu",
"Share" => "Compartir",
"Error" => "Fallu",
+"Error while sharing" => "Fallu mientres la compartición",
"Share link" => "Compartir enllaz",
"Password" => "Contraseña",
"Send" => "Unviar",
@@ -63,6 +65,7 @@ $TRANSLATIONS = array(
"Password protected" => "Contraseña protexida",
"Email sent" => "Corréu unviáu",
"Warning" => "Avisu",
+"The object type is not specified." => "El tipu d'oxetu nun ta especificáu.",
"Delete" => "Desaniciar",
"Add" => "Amestar",
"Edit tags" => "Editar etiquetes",
diff --git a/l10n/ast/core.po b/l10n/ast/core.po
index da397dbc96e0f234378a932e769106f08ddaa8e2..7cc8da8adfa86099641528b2608787acb83d9ada 100644
--- a/l10n/ast/core.po
+++ b/l10n/ast/core.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# dixebra <davidlopezcastanon@gmail.com>, 2014
# Tornes Llume <l.lumex03.tornes@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-12 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 15:20+0000\n"
-"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n"
+"POT-Creation-Date: 2014-05-13 01:55-0400\n"
+"PO-Revision-Date: 2014-05-12 15:40+0000\n"
+"Last-Translator: dixebra <davidlopezcastanon@gmail.com>\n"
"Language-Team: Asturian (http://www.transifex.com/projects/p/owncloud/language/ast/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -209,7 +210,7 @@ msgstr "Non"
#: js/oc-dialogs.js:204
msgid "Ok"
-msgstr ""
+msgstr "Aceutar"
#: js/oc-dialogs.js:224
msgid "Error loading message template: {error}"
@@ -298,7 +299,7 @@ msgstr "Fallu"
#: js/share.js:160 js/share.js:790
msgid "Error while sharing"
-msgstr ""
+msgstr "Fallu mientres la compartición"
#: js/share.js:171
msgid "Error while unsharing"
@@ -430,7 +431,7 @@ msgstr "Avisu"
#: js/tags.js:4
msgid "The object type is not specified."
-msgstr ""
+msgstr "El tipu d'oxetu nun ta especificáu."
#: js/tags.js:13
msgid "Enter new"
diff --git a/l10n/en_GB/files_sharing.po b/l10n/en_GB/files_sharing.po
index 659fd4230ed876972b25b51bb3a23c0fcca416a3..d79515f7023eedc4a9ffca23909ebc86317622ad 100644
--- a/l10n/en_GB/files_sharing.po
+++ b/l10n/en_GB/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-11 01:55-0400\n"
-"PO-Revision-Date: 2014-05-11 05:02+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-13 01:55-0400\n"
+"PO-Revision-Date: 2014-05-12 11:15+0000\n"
+"Last-Translator: mnestis <transifex@mnestis.net>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
index 935533a1a5ff70aa9b51bfd2ed136198d2b23467..46e2ce683010c58dba56149fa70025dda01c4d2c 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/lib.po
@@ -5,6 +5,7 @@
# Translators:
# Alexander Shashkevych <alex@stunpix.com>, 2013
# jekader <jekader@gmail.com>, 2013
+# tukos <kalyuzhniy@gmail.com>, 2014
# eurekafag <rkfg@rkfg.me>, 2013
# sk.avenger <sk.avenger@adygnet.ru>, 2013
# unixoid <victor.ashirov@gmail.com>, 2013
@@ -14,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-28 01:55-0400\n"
-"PO-Revision-Date: 2014-04-28 05:55+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-05-13 01:55-0400\n"
+"PO-Revision-Date: 2014-05-13 04:27+0000\n"
+"Last-Translator: tukos <kalyuzhniy@gmail.com>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,11 +25,11 @@ msgstr ""
"Language: 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"
-#: base.php:723
+#: base.php:685
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:724
+#: base.php:686
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
@@ -83,23 +84,23 @@ msgstr "Изображение повреждено"
msgid "web services under your control"
msgstr "веб-сервисы под вашим управлением"
-#: private/files.php:232
+#: private/files.php:235
msgid "ZIP download is turned off."
msgstr "ZIP-скачивание отключено."
-#: private/files.php:233
+#: private/files.php:236
msgid "Files need to be downloaded one by one."
msgstr "Файлы должны быть загружены по одному."
-#: private/files.php:234 private/files.php:261
+#: private/files.php:237 private/files.php:264
msgid "Back to Files"
msgstr "Назад к файлам"
-#: private/files.php:259
+#: private/files.php:262
msgid "Selected files too large to generate zip file."
msgstr "Выбранные файлы слишком велики, чтобы создать zip файл."
-#: private/files.php:260
+#: private/files.php:263
msgid ""
"Please download the files separately in smaller chunks or kindly ask your "
"administrator."
@@ -175,7 +176,7 @@ msgstr "Токен просрочен. Перезагрузите страниц
#: private/json.php:74
msgid "Unknown user"
-msgstr ""
+msgstr "Неизвестный пользователь"
#: private/search/provider/file.php:18 private/search/provider/file.php:36
msgid "Files"
@@ -217,7 +218,7 @@ msgstr "Вы должны войти или в существующий акка
#: private/setup/mysql.php:12
msgid "MySQL/MariaDB username and/or password not valid"
-msgstr ""
+msgstr " Имя пользователя и/или пароль MySQL/MariaDB не действительны."
#: private/setup/mysql.php:67 private/setup/oci.php:54
#: private/setup/oci.php:121 private/setup/oci.php:144
@@ -249,7 +250,7 @@ msgstr ""
#: private/setup/mysql.php:86
msgid "Drop this user from MySQL/MariaDB"
-msgstr ""
+msgstr "Удалить данного участника из MySQL/MariaDB"
#: private/setup/mysql.php:91
#, php-format
@@ -258,7 +259,7 @@ msgstr ""
#: private/setup/mysql.php:92
msgid "Drop this user from MySQL/MariaDB."
-msgstr ""
+msgstr "Удалить данного участника из MySQL/MariaDB."
#: private/setup/oci.php:34
msgid "Oracle connection could not be established"
@@ -285,13 +286,13 @@ msgstr "Установить имя пользователя для admin."
msgid "Set an admin password."
msgstr "становит пароль для admin."
-#: private/setup.php:202
+#: private/setup.php:164
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Ваш веб сервер до сих пор не настроен правильно для возможности синхронизации файлов, похоже что проблема в неисправности интерфейса WebDAV."
-#: private/setup.php:203
+#: private/setup.php:165
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>."
@@ -349,63 +350,63 @@ msgstr ""
msgid "Share type %s is not valid for %s"
msgstr ""
-#: private/share/share.php:773
+#: private/share/share.php:774
#, php-format
msgid ""
"Setting permissions for %s failed, because the permissions exceed "
"permissions granted to %s"
msgstr ""
-#: private/share/share.php:834
+#: private/share/share.php:835
#, php-format
msgid "Setting permissions for %s failed, because the item was not found"
msgstr ""
-#: private/share/share.php:940
+#: private/share/share.php:941
#, php-format
msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
msgstr ""
-#: private/share/share.php:947
+#: private/share/share.php:948
#, php-format
msgid "Sharing backend %s not found"
msgstr ""
-#: private/share/share.php:953
+#: private/share/share.php:954
#, php-format
msgid "Sharing backend for %s not found"
msgstr ""
-#: private/share/share.php:1367
+#: private/share/share.php:1368
#, php-format
msgid "Sharing %s failed, because the user %s is the original sharer"
msgstr ""
-#: private/share/share.php:1376
+#: private/share/share.php:1377
#, php-format
msgid ""
"Sharing %s failed, because the permissions exceed permissions granted to %s"
msgstr ""
-#: private/share/share.php:1391
+#: private/share/share.php:1392
#, php-format
msgid "Sharing %s failed, because resharing is not allowed"
msgstr ""
-#: private/share/share.php:1403
+#: private/share/share.php:1404
#, php-format
msgid ""
"Sharing %s failed, because the sharing backend for %s could not find its "
"source"
msgstr ""
-#: private/share/share.php:1417
+#: private/share/share.php:1418
#, php-format
msgid ""
"Sharing %s failed, because the file could not be found in the file cache"
msgstr ""
-#: private/tags.php:193
+#: private/tags.php:183
#, php-format
msgid "Could not find category \"%s\""
msgstr "Категория \"%s\" не найдена"
@@ -478,4 +479,4 @@ msgstr "Укажите валидный пароль"
#: private/user/manager.php:246
msgid "The username is already being used"
-msgstr ""
+msgstr "Имя пользователя уже используется"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index c7664166ad49d8d9e82c2744e28ccab891c824ba..276b84a0bc248268d0681db4a218bb147c06c4da 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-12 01:55-0400\n"
+"POT-Creation-Date: 2014-05-13 01:55-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 1a34b8ad030503995e89ea7a1c0a3884343d7846..9eb0f73a11cc62af59c55cb7e649dfac5275a4e2 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-12 01:55-0400\n"
+"POT-Creation-Date: 2014-05-13 01:55-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -139,7 +139,7 @@ msgstr ""
msgid "Invalid directory."
msgstr ""
-#: appinfo/app.php:11 js/filelist.js:14
+#: appinfo/app.php:11 js/filelist.js:17
msgid "Files"
msgstr ""
@@ -173,7 +173,7 @@ msgstr ""
msgid "URL cannot be empty"
msgstr ""
-#: js/file-upload.js:562 js/filelist.js:963
+#: js/file-upload.js:562 js/filelist.js:1016
msgid "{new_name} already exists"
msgstr ""
@@ -201,61 +201,61 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: js/filelist.js:221
+#: js/filelist.js:229
msgid ""
"Your download is being prepared. This might take some time if the files are "
"big."
msgstr ""
-#: js/filelist.js:502 js/filelist.js:1422
+#: js/filelist.js:531 js/filelist.js:1475
msgid "Pending"
msgstr ""
-#: js/filelist.js:916
+#: js/filelist.js:969
msgid "Error moving file."
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:977
msgid "Error moving file"
msgstr ""
-#: js/filelist.js:924
+#: js/filelist.js:977
msgid "Error"
msgstr ""
-#: js/filelist.js:988
+#: js/filelist.js:1041
msgid "Could not rename file"
msgstr ""
-#: js/filelist.js:1122
+#: js/filelist.js:1175
msgid "Error deleting file."
msgstr ""
-#: js/filelist.js:1224 templates/index.php:67
+#: js/filelist.js:1277 templates/index.php:68
msgid "Name"
msgstr ""
-#: js/filelist.js:1225 templates/index.php:79
+#: js/filelist.js:1278 templates/index.php:81
msgid "Size"
msgstr ""
-#: js/filelist.js:1226 templates/index.php:81
+#: js/filelist.js:1279 templates/index.php:84
msgid "Modified"
msgstr ""
-#: js/filelist.js:1235 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1288 js/filesummary.js:141 js/filesummary.js:168
msgid "%n folder"
msgid_plural "%n folders"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1241 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1294 js/filesummary.js:142 js/filesummary.js:169
msgid "%n file"
msgid_plural "%n files"
msgstr[0] ""
msgstr[1] ""
-#: js/filelist.js:1330 js/filelist.js:1369
+#: js/filelist.js:1383 js/filelist.js:1422
msgid "Uploading %n file"
msgid_plural "Uploading %n files"
msgstr[0] ""
@@ -300,7 +300,7 @@ msgstr ""
msgid "%s could not be renamed"
msgstr ""
-#: lib/helper.php:14 templates/index.php:22
+#: lib/helper.php:23 templates/index.php:23
#, php-format
msgid "Upload (max. %s)"
msgstr ""
@@ -337,68 +337,68 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/index.php:5
+#: templates/index.php:6
msgid "New"
msgstr ""
-#: templates/index.php:8
+#: templates/index.php:9
msgid "New text file"
msgstr ""
-#: templates/index.php:9
+#: templates/index.php:10
msgid "Text file"
msgstr ""
-#: templates/index.php:12
+#: templates/index.php:13
msgid "New folder"
msgstr ""
-#: templates/index.php:13
+#: templates/index.php:14
msgid "Folder"
msgstr ""
-#: templates/index.php:16
+#: templates/index.php:17
msgid "From link"
msgstr ""
-#: templates/index.php:40
+#: templates/index.php:41
msgid "Deleted files"
msgstr ""
-#: templates/index.php:45
+#: templates/index.php:46
msgid "Cancel upload"
msgstr ""
-#: templates/index.php:51
+#: templates/index.php:52
msgid "You don’t have permission to upload or create files here"
msgstr ""
-#: templates/index.php:56
+#: templates/index.php:57
msgid "Nothing in here. Upload something!"
msgstr ""
-#: templates/index.php:73
+#: templates/index.php:74
msgid "Download"
msgstr ""
-#: templates/index.php:84 templates/index.php:85
+#: templates/index.php:87 templates/index.php:88
msgid "Delete"
msgstr ""
-#: templates/index.php:98
+#: templates/index.php:101
msgid "Upload too large"
msgstr ""
-#: templates/index.php:100
+#: templates/index.php:103
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
msgstr ""
-#: templates/index.php:105
+#: templates/index.php:108
msgid "Files are being scanned, please wait."
msgstr ""
-#: templates/index.php:108
+#: templates/index.php:111
msgid "Current scanning"
msgstr ""
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 9fdf9686d4c688b90e4abb27f7fb884f185ab4dc..111643588eb8a2acbc6487ff6abcbf5ee691eeb3 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-12 01:55-0400\n"
+"POT-Creation-Date: 2014-05-13 01:55-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index f3048fd5147e1e070a7dde7b531bab181c924123..c37bf8a968d3be40e2ab15ab3167a6378f4a3754 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-12 01:55-0400\n"
+"POT-Creation-Date: 2014-05-13 01:55-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index c6269882b540962a84fac51d6ecd7d41706e63ea..7013b31420c07283df35ce5ad2dad967b3cbba4a 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-12 01:55-0400\n"
+"POT-Creation-Date: 2014-05-13 01:55-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 6fb1a5fcd5e28164d7c1130d106fa328a54dbbc0..c2f44734caa7edbc9b7e6eef76b8904c6462c243 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-12 01:55-0400\n"
+"POT-Creation-Date: 2014-05-13 01:55-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -31,11 +31,11 @@ msgstr ""
msgid "Deleted files"
msgstr ""
-#: js/filelist.js:88 js/filelist.js:132 js/filelist.js:181
+#: js/filelist.js:89 js/filelist.js:133 js/filelist.js:182
msgid "Error"
msgstr ""
-#: js/trash.js:48 templates/index.php:22 templates/index.php:24
+#: js/trash.js:48 templates/index.php:23 templates/index.php:25
msgid "Restore"
msgstr ""
@@ -47,18 +47,18 @@ msgstr ""
msgid "restored"
msgstr ""
-#: templates/index.php:6
+#: templates/index.php:7
msgid "Nothing in here. Your trash bin is empty!"
msgstr ""
-#: templates/index.php:19
+#: templates/index.php:20
msgid "Name"
msgstr ""
-#: templates/index.php:30
+#: templates/index.php:31
msgid "Deleted"
msgstr ""
-#: templates/index.php:33 templates/index.php:34
+#: templates/index.php:34 templates/index.php:35
msgid "Delete"
msgstr ""
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index b2408e78221fcd3c6cbc176950c9c9d74abcb991..0c0b3d733a840d470d9f7d7d7458f81f8244dae5 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-12 01:55-0400\n"
+"POT-Creation-Date: 2014-05-13 01:55-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index ca715cedd1243f48a0e70849835e52f0cf94062f..f8dc6c225bc1dc52fb10f9d570624f6266ee6b7d 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-12 01:55-0400\n"
+"POT-Creation-Date: 2014-05-13 01:55-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,11 +18,11 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: base.php:713
+#: base.php:685
msgid "You are accessing the server from an untrusted domain."
msgstr ""
-#: base.php:714
+#: base.php:686
msgid ""
"Please contact your administrator. If you are an administrator of this "
"instance, configure the \"trusted_domain\" setting in config/config.php. An "
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index e74988309471c000079f3d772417dd5dedeebf4f..e9b9932a806dade5fa50b413fa15c821ac14324a 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-12 01:55-0400\n"
+"POT-Creation-Date: 2014-05-13 01:55-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index c266ca3240acb3857278532075544a7c38f02d5a..f9691843d069f55ab4de81fb651befc118950480 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-12 01:55-0400\n"
+"POT-Creation-Date: 2014-05-13 01:55-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 0ee28cf26980d29eecf19dfc933d44838db56ea1..c14dc4cf24804b0979a1ea90935c14e2ee24e3aa 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-12 01:55-0400\n"
+"POT-Creation-Date: 2014-05-13 01:55-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -127,25 +127,25 @@ msgstr ""
msgid "Confirm Deletion"
msgstr ""
-#: lib/wizard.php:79 lib/wizard.php:93
+#: lib/wizard.php:83 lib/wizard.php:97
#, php-format
msgid "%s group found"
msgid_plural "%s groups found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:122
+#: lib/wizard.php:130
#, php-format
msgid "%s user found"
msgid_plural "%s users found"
msgstr[0] ""
msgstr[1] ""
-#: lib/wizard.php:784 lib/wizard.php:796
+#: lib/wizard.php:825 lib/wizard.php:837
msgid "Invalid Host"
msgstr ""
-#: lib/wizard.php:984
+#: lib/wizard.php:1025
msgid "Could not find the desired feature"
msgstr ""
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index f59f5a76abf1e3bb3a599fc723d72bde243359ec..6bd299623e02572a4e08c01fd714f6aec30f773d 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 6.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-12 01:55-0400\n"
+"POT-Creation-Date: 2014-05-13 01:55-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php
index 2611fcf7a6b33a493d391bb6b258acc7c7b9f690..8b845275747a2c9f8612d558a40d4272fd706666 100644
--- a/lib/l10n/ru.php
+++ b/lib/l10n/ru.php
@@ -31,6 +31,7 @@ $TRANSLATIONS = array(
"Application is not enabled" => "Приложение не разрешено",
"Authentication error" => "Ошибка аутентификации",
"Token expired. Please reload page." => "Токен просрочен. Перезагрузите страницу.",
+"Unknown user" => "Неизвестный пользователь",
"Files" => "Файлы",
"Text" => "Текст",
"Images" => "Изображения",
@@ -39,8 +40,11 @@ $TRANSLATIONS = array(
"%s you may not use dots in the database name" => "%s Вы не можете использовать точки в имени базы данных",
"MS SQL username and/or password not valid: %s" => "Имя пользователя и/или пароль MS SQL не подходит: %s",
"You need to enter either an existing account or the administrator." => "Вы должны войти или в существующий аккаунт или под администратором.",
+"MySQL/MariaDB username and/or password not valid" => " Имя пользователя и/или пароль MySQL/MariaDB не действительны.",
"DB Error: \"%s\"" => "Ошибка БД: \"%s\"",
"Offending command was: \"%s\"" => "Вызываемая команда была: \"%s\"",
+"Drop this user from MySQL/MariaDB" => "Удалить данного участника из MySQL/MariaDB",
+"Drop this user from MySQL/MariaDB." => "Удалить данного участника из MySQL/MariaDB.",
"Oracle connection could not be established" => "соединение с Oracle не может быть установлено",
"Oracle username and/or password not valid" => "Неверное имя пользователя и/или пароль Oracle",
"Offending command was: \"%s\", name: %s, password: %s" => "Вызываемая команда была: \"%s\", имя: %s, пароль: %s",
@@ -62,6 +66,7 @@ $TRANSLATIONS = array(
"last year" => "в прошлом году",
"years ago" => "несколько лет назад",
"A valid username must be provided" => "Укажите правильное имя пользователя",
-"A valid password must be provided" => "Укажите валидный пароль"
+"A valid password must be provided" => "Укажите валидный пароль",
+"The username is already being used" => "Имя пользователя уже используется"
);
$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);";