[tx-robot] updated from transifex

24 files changed, 119 insertions, 76 deletions

diff --git a/apps/files/l10n/tg_TJ.php b/apps/files/l10n/tg_TJ.php
new file mode 100644
index 00000000000..0157af093e9
--- /dev/null
+++ b/apps/files/l10n/tg_TJ.php
@@ -0,0 +1,7 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/pt_PT.php b/apps/files_external/l10n/pt_PT.php
index bd8971e8da7..9a12aebae45 100644
--- a/apps/files_external/l10n/pt_PT.php
+++ b/apps/files_external/l10n/pt_PT.php
@@ -47,6 +47,7 @@ $TRANSLATIONS = array(
 "Error configuring Google Drive storage" => "Erro ao configurar o armazenamento do Google Drive",
 "Personal" => "Pessoal",
 "System" => "Sistema",
+"(group)" => "(grupo)",
 "Saved" => "Guardado",
 "<b>Note:</b> " => "<b>Aviso:</b> ",
 " and " => "e",
diff --git a/apps/user_ldap/l10n/tg_TJ.php b/apps/user_ldap/l10n/tg_TJ.php
new file mode 100644
index 00000000000..3a1e002311c
--- /dev/null
+++ b/apps/user_ldap/l10n/tg_TJ.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%s group found_::_%s groups found_" => array("",""),
+"_%s user found_::_%s users found_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 67d110c7ea1..ada6e70080d 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -88,7 +88,7 @@ $TRANSLATIONS = array(
 "Send" => "Senden",
 "Set expiration date" => "Setze ein Ablaufdatum",
 "Expiration date" => "Ablaufdatum",
-"Adding user..." => "Füge Nutzer hinzu...",
+"Adding user..." => "Benutzer wird hinzugefügt …",
 "group" => "Gruppe",
 "Resharing is not allowed" => "Weiterverteilen ist nicht erlaubt",
 "Shared in {item} with {user}" => "Für {user} in {item} freigegeben",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index 8d242a1047c..84d15a31de7 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -88,7 +88,7 @@ $TRANSLATIONS = array(
 "Send" => "Senden",
 "Set expiration date" => "Ein Ablaufdatum setzen",
 "Expiration date" => "Ablaufdatum",
-"Adding user..." => "Füge Nutzer hinzu...",
+"Adding user..." => "Benutzer wird hinzugefügt …",
 "group" => "Gruppe",
 "Resharing is not allowed" => "Das Weiterverteilen ist nicht erlaubt",
 "Shared in {item} with {user}" => "Freigegeben in {item} von {user}",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index d6a940f6cfd..67bca0bb43c 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -87,6 +87,7 @@ $TRANSLATIONS = array(
 "Send" => "Enviar",
 "Set expiration date" => "Especificar data de expiração",
 "Expiration date" => "Data de expiração",
+"Adding user..." => "A adicionar utilizador...",
 "group" => "grupo",
 "Resharing is not allowed" => "Não é permitido partilhar de novo",
 "Shared in {item} with {user}" => "Partilhado em {item} com {user}",
@@ -148,6 +149,11 @@ $TRANSLATIONS = array(
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Olá,\n\napenas para informar que %s partilhou »%s« consigo.\nConsulte aqui: %s\n",
 "The share will expire on %s." => "Esta partilha vai expirar em %s.",
 "Cheers!" => "Parabéns!",
+"The server encountered an internal error and was unable to complete your request." => "O servidor encontrou um erro interno e não conseguiu concluir o seu pedido.",
+"Technical details" => "Detalhes técnicos",
+"Remote Address: %s" => "Endereço remoto: %s",
+"Message: %s" => "Mensagem: %s",
+"File: %s" => "Ficheiro: %s",
 "Security Warning" => "Aviso de Segurança",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "A sua versão do PHP é vulnerável ao ataque Byte Null (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Por favor atualize a sua versão PHP instalada para usar o %s com segurança.",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index ce8ab0ea96f..3528de072a2 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -88,6 +88,7 @@ $TRANSLATIONS = array(
 "Send" => "Отправить",
 "Set expiration date" => "Установить срок доступа",
 "Expiration date" => "Дата окончания",
+"Adding user..." => "Добавляем пользователя...",
 "group" => "группа",
 "Resharing is not allowed" => "Общий доступ не разрешен",
 "Shared in {item} with {user}" => "Общий доступ к {item} с {user}",
diff --git a/core/l10n/tg_TJ.php b/core/l10n/tg_TJ.php
new file mode 100644
index 00000000000..aff098dff1f
--- /dev/null
+++ b/core/l10n/tg_TJ.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"_{count} file conflict_::_{count} file conflicts_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 35477fb7b6f..fdb733b75ea 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-09-29 01:54-0400\n"
+"POT-Creation-Date: 2014-09-30 01:54-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"
@@ -566,14 +566,14 @@ msgstr ""
 msgid "New Password"
 msgstr ""
 
-#: setup/controller.php:139
+#: setup/controller.php:144
 #, php-format
 msgid ""
 "Mac OS X is not supported and %s will not work properly on this platform. "
 "Use it at your own risk! "
 msgstr ""
 
-#: setup/controller.php:143
+#: setup/controller.php:148
 msgid "For the best results, please consider using a GNU/Linux server instead."
 msgstr ""
 
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 3ba2e61c8f4..5b68e034ec3 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-09-29 01:54-0400\n"
+"POT-Creation-Date: 2014-09-30 01:54-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_encryption.pot b/l10n/templates/files_encryption.pot
index c21d1bbc2b5..735fac4dcef 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-09-29 01:54-0400\n"
+"POT-Creation-Date: 2014-09-30 01:54-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"
@@ -130,31 +130,31 @@ msgstr ""
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:22 templates/settings-personal.php:52
+#: templates/settings-admin.php:23 templates/settings-personal.php:53
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:30 templates/settings-personal.php:60
+#: templates/settings-admin.php:32 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:35
+#: templates/settings-admin.php:37
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:41
+#: templates/settings-admin.php:43
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:48
+#: templates/settings-admin.php:50
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:54
+#: templates/settings-admin.php:56
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:59
+#: templates/settings-admin.php:61
 msgid "Change Password"
 msgstr ""
 
@@ -194,10 +194,10 @@ msgid ""
 "files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:61
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:62
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 09f4c7834f3..e312cbe281b 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-09-29 01:54-0400\n"
+"POT-Creation-Date: 2014-09-30 01:54-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 ff140e8bc06..89b43288bde 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-09-29 01:54-0400\n"
+"POT-Creation-Date: 2014-09-30 01:54-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"
@@ -33,15 +33,15 @@ msgstr ""
 msgid "Couldn't add remote share"
 msgstr ""
 
-#: appinfo/app.php:36 js/app.js:34
+#: appinfo/app.php:39 js/app.js:34
 msgid "Shared with you"
 msgstr ""
 
-#: appinfo/app.php:48 js/app.js:53
+#: appinfo/app.php:51 js/app.js:53
 msgid "Shared with others"
 msgstr ""
 
-#: appinfo/app.php:57 js/app.js:72
+#: appinfo/app.php:60 js/app.js:72
 msgid "Shared by link"
 msgstr ""
 
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 8b307059bde..ced8b6d5804 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-09-29 01:54-0400\n"
+"POT-Creation-Date: 2014-09-30 01:54-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_versions.pot b/l10n/templates/files_versions.pot
index 3a66b295714..50f0c3c927e 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-09-29 01:54-0400\n"
+"POT-Creation-Date: 2014-09-30 01:54-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 b5da5ec3d5d..71926d00606 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-09-29 01:54-0400\n"
+"POT-Creation-Date: 2014-09-30 01:54-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"
@@ -273,126 +273,126 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:494
+#: private/share/share.php:505
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:501
+#: private/share/share.php:512
 #, php-format
 msgid "You are not allowed to share %s"
 msgstr ""
 
-#: private/share/share.php:531
+#: private/share/share.php:542
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:537
+#: private/share/share.php:548
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:546
+#: private/share/share.php:557
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s "
 "is a member of"
 msgstr ""
 
-#: private/share/share.php:559 private/share/share.php:587
+#: private/share/share.php:570 private/share/share.php:598
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:567
+#: private/share/share.php:578
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:574
+#: private/share/share.php:585
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:628
+#: private/share/share.php:639
 msgid ""
 "You need to provide a password to create a public link, only protected links "
 "are allowed"
 msgstr ""
 
-#: private/share/share.php:657
+#: private/share/share.php:668
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:664
+#: private/share/share.php:675
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:866
+#: private/share/share.php:899
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:927
+#: private/share/share.php:960
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:965
+#: private/share/share.php:998
 #, php-format
 msgid ""
 "Cannot set expiration date. Shares cannot expire later than %s after they "
 "have been shared"
 msgstr ""
 
-#: private/share/share.php:973
+#: private/share/share.php:1006
 msgid "Cannot set expiration date. Expiration date is in the past"
 msgstr ""
 
-#: private/share/share.php:1098
+#: private/share/share.php:1132
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:1105
+#: private/share/share.php:1139
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:1111
+#: private/share/share.php:1145
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1529
+#: private/share/share.php:1812
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1538
+#: private/share/share.php:1822
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1554
+#: private/share/share.php:1838
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1566
+#: private/share/share.php:1852
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1580
+#: private/share/share.php:1866
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index af8cf4fb947..e155a6485d3 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-09-29 01:54-0400\n"
+"POT-Creation-Date: 2014-09-30 01:54-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"
@@ -232,126 +232,126 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: share/share.php:494
+#: share/share.php:505
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: share/share.php:501
+#: share/share.php:512
 #, php-format
 msgid "You are not allowed to share %s"
 msgstr ""
 
-#: share/share.php:531
+#: share/share.php:542
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: share/share.php:537
+#: share/share.php:548
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: share/share.php:546
+#: share/share.php:557
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s "
 "is a member of"
 msgstr ""
 
-#: share/share.php:559 share/share.php:587
+#: share/share.php:570 share/share.php:598
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: share/share.php:567
+#: share/share.php:578
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: share/share.php:574
+#: share/share.php:585
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: share/share.php:628
+#: share/share.php:639
 msgid ""
 "You need to provide a password to create a public link, only protected links "
 "are allowed"
 msgstr ""
 
-#: share/share.php:657
+#: share/share.php:668
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: share/share.php:664
+#: share/share.php:675
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: share/share.php:866
+#: share/share.php:899
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: share/share.php:927
+#: share/share.php:960
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: share/share.php:965
+#: share/share.php:998
 #, php-format
 msgid ""
 "Cannot set expiration date. Shares cannot expire later than %s after they "
 "have been shared"
 msgstr ""
 
-#: share/share.php:973
+#: share/share.php:1006
 msgid "Cannot set expiration date. Expiration date is in the past"
 msgstr ""
 
-#: share/share.php:1098
+#: share/share.php:1132
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: share/share.php:1105
+#: share/share.php:1139
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: share/share.php:1111
+#: share/share.php:1145
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: share/share.php:1529
+#: share/share.php:1812
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: share/share.php:1538
+#: share/share.php:1822
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: share/share.php:1554
+#: share/share.php:1838
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: share/share.php:1566
+#: share/share.php:1852
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: share/share.php:1580
+#: share/share.php:1866
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index d964efc8da6..951e504b54e 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-09-29 01:54-0400\n"
+"POT-Creation-Date: 2014-09-30 01:54-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 5f02d05a2f1..f8c95b7d85b 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-09-29 01:54-0400\n"
+"POT-Creation-Date: 2014-09-30 01:54-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"
@@ -157,11 +157,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:392 lib/wizard.php:1128
+#: lib/wizard.php:394 lib/wizard.php:1130
 msgid "Could not find the desired feature"
 msgstr ""
 
-#: lib/wizard.php:935 lib/wizard.php:947
+#: lib/wizard.php:937 lib/wizard.php:949
 msgid "Invalid Host"
 msgstr ""
 
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 1e06e443871..3baec3d793d 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-09-29 01:54-0400\n"
+"POT-Creation-Date: 2014-09-30 01:54-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/pt_PT.php b/lib/l10n/pt_PT.php
index 6351dcde734..20cfef8a2cb 100644
--- a/lib/l10n/pt_PT.php
+++ b/lib/l10n/pt_PT.php
@@ -50,6 +50,7 @@ $TRANSLATIONS = array(
 "PostgreSQL username and/or password not valid" => "Nome de utilizador/password do PostgreSQL inválido",
 "Set an admin username." => "Definir um nome de utilizador de administrador",
 "Set an admin password." => "Definiar uma password de administrador",
+"Can't create or write into the data directory %s" => "Não é possível criar ou escrever a directoria data %s",
 "%s shared »%s« with you" => "%s partilhado »%s« consigo",
 "Sharing %s failed, because the file does not exist" => "A partilha de %s falhou, porque o ficheiro não existe",
 "You are not allowed to share %s" => "Não está autorizado a partilhar %s",
diff --git a/lib/l10n/tg_TJ.php b/lib/l10n/tg_TJ.php
new file mode 100644
index 00000000000..15f78e0bce6
--- /dev/null
+++ b/lib/l10n/tg_TJ.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index 38e93ab2f86..ac318109742 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -67,6 +67,7 @@ $TRANSLATIONS = array(
 "So-so password" => "Password aceitável",
 "Good password" => "Password Forte",
 "Strong password" => "Password muito forte",
+"Valid until {date}" => "Válido até {date}",
 "Delete" => "Eliminar",
 "Decrypting files... Please wait, this can take some time." => "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo.",
 "Delete encryption keys permanently." => "Excluir as chaves encriptadas de forma permanente.",
@@ -117,6 +118,7 @@ $TRANSLATIONS = array(
 "We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Recomendamos fortemente que instale no seu sistema todos os pacotes necessários para suportar os seguintes locales: %s.",
 "URL generation in notification emails" => "Geração URL em e-mails de notificação",
 "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Se a sua instalação não está instalada na raiz do domínio e usa o sistema cron, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwritewebroot\" no ficheiro config.php para o caminho webroot da sua instalação (sugestão: \"%s\")",
+"No problems found" => "Nenhum problema encontrado",
 "Please double check the <a href='%s'>installation guides</a>." => "Por favor verifique <a href='%s'>installation guides</a>.",
 "Cron" => "Cron",
 "Last cron was executed at %s." => "O ultimo cron foi executado em %s.",
@@ -199,6 +201,8 @@ $TRANSLATIONS = array(
 "Language" => "Idioma",
 "Help translate" => "Ajude a traduzir",
 "SSL root certificates" => "Certificados SSL de raiz",
+"Valid until" => "Válido até",
+"Valid until %s" => "Válido até %s",
 "Import Root Certificate" => "Importar Certificado Root",
 "The encryption app is no longer enabled, please decrypt all your files" => "A aplicação de encriptação já não está ativa, por favor desincripte todos os seus ficheiros",
 "Log-in password" => "Password de entrada",
@@ -206,6 +210,8 @@ $TRANSLATIONS = array(
 "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "As suas chaves de encriptação foram movidas para um local de segurança. Em caso de algo correr mal você pode restaurar as chaves.  Só deve eliminar as chaves permanentemente se tiver certeza absoluta que os ficheiros são decrepitados correctamente.",
 "Restore Encryption Keys" => "Restaurar as chaves de encriptação",
 "Delete Encryption Keys" => "Apagar as chaves de encriptação",
+"Show storage location" => "Mostrar a localização do armazenamento",
+"Show last log in" => "Mostrar ultimo acesso de entrada",
 "Login Name" => "Nome de utilizador",
 "Create" => "Criar",
 "Admin Recovery Password" => "Recuperar password de administrador",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 2e6273e806c..e9f41756919 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -111,11 +111,13 @@ $TRANSLATIONS = array(
 "Your PHP version is outdated" => "Ваша версия PHP устарела",
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Ваша версия PHP устарела. Мы настоятельно рекомендуем  обновиться до 5.3.8 или новее,  так как старые версии работают не корректно. Вполне возможно, что эта установка не работает должным образом.",
 "PHP charset is not set to UTF-8" => "Кодировка PHP не совпадает с UTF-8",
+"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "Кодировка PHP не совпадает с UTF-8. Это может вызвать трудности с именами файлов, содержащими нелатинские символы. Мы настоятельно рекомендуем сменить значение переменной default_charset в файле php.ini на UTF-8.",
 "Locale not working" => "Локализация не работает",
 "System locale can not be set to a one which supports UTF-8." => "Невозможно установить системную локаль, поддерживающую UTF-8",
 "This means that there might be problems with certain characters in file names." => "Это значит, что могут быть проблемы с некоторыми символами в именах файлов.",
 "We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Мы настоятельно рекомендуем установить требуемые пакеты в систему, для поддержки одной из следующих локалей: %s.",
 "URL generation in notification emails" => "Генерирование URL в уведомляющих электронных письмах",
+"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Если ваша копия ownCloud установлена не в корне домена и использует планировщик cron системы, возможны проблемы с правильной генерацией URL. Чтобы избежать этого, установите опцию verwritewebroot файла config.php равной пути папки установки. (Вероятно, это \"%s\".)",
 "Connectivity checks" => "Проверка соединения",
 "No problems found" => "Проблемы не найдены",
 "Please double check the <a href='%s'>installation guides</a>." => "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>.",