From b8b7c97a41921625d5ca74743c9cd72d07e2c70f Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Mon, 23 Jun 2014 01:54:38 -0400
Subject: [PATCH] [tx-robot] updated from transifex

---
 apps/files_encryption/l10n/pt_PT.php |   1 +
 apps/files_external/l10n/de.php      |   2 +-
 apps/files_external/l10n/de_DE.php   |   2 +-
 apps/user_ldap/l10n/pt_PT.php        |  11 ++-
 core/l10n/ja.php                     |   4 +
 l10n/de/files_external.po            |   8 +-
 l10n/de/settings.po                  |  30 ++++----
 l10n/de_DE/files_external.po         |  11 +--
 l10n/de_DE/settings.po               |  22 +++---
 l10n/ja/core.po                      |  48 ++++++------
 l10n/ja/files_sharing.po             |   6 +-
 l10n/ja/lib.po                       |   8 +-
 l10n/ja/settings.po                  | 106 +++++++++++++--------------
 l10n/pt_PT/files_encryption.po       |   8 +-
 l10n/pt_PT/user_ldap.po              |  25 ++++---
 l10n/templates/core.pot              |   2 +-
 l10n/templates/files.pot             |   2 +-
 l10n/templates/files_encryption.pot  |   2 +-
 l10n/templates/files_external.pot    |   2 +-
 l10n/templates/files_sharing.pot     |   2 +-
 l10n/templates/files_trashbin.pot    |   2 +-
 l10n/templates/files_versions.pot    |   2 +-
 l10n/templates/lib.pot               |   2 +-
 l10n/templates/private.pot           |   2 +-
 l10n/templates/settings.pot          |   2 +-
 l10n/templates/user_ldap.pot         |   2 +-
 l10n/templates/user_webdavauth.pot   |   2 +-
 lib/l10n/ja.php                      |   1 +
 settings/l10n/de.php                 |   8 +-
 settings/l10n/ja.php                 |   5 ++
 30 files changed, 175 insertions(+), 155 deletions(-)

diff --git a/apps/files_encryption/l10n/pt_PT.php b/apps/files_encryption/l10n/pt_PT.php
index 433c15e193..8bb0b3cc4f 100644
--- a/apps/files_encryption/l10n/pt_PT.php
+++ b/apps/files_encryption/l10n/pt_PT.php
@@ -17,6 +17,7 @@ $TRANSLATIONS = array(
 "Following users are not set up for encryption:" => "Os utilizadores seguintes não estão marcados para cifragem:",
 "Initial encryption started... This can take some time. Please wait." => "A encriptação inicial começou... Pode demorar algum tempo. Aguarde, por favor.",
 "Initial encryption running... Please try again later." => "Criptografia inicial em execução ... Por favor, tente novamente mais tarde. ",
+"Go directly to your %spersonal settings%s." => "Ir directo para %sdefinições pessoais%s.",
 "Encryption" => "Encriptação",
 "Enable recovery key (allow to recover users files in case of password loss):" => "Active a chave de recuperação (permite recuperar os ficheiros no caso de perda da password):",
 "Recovery key password" => "Chave de recuperação da conta",
diff --git a/apps/files_external/l10n/de.php b/apps/files_external/l10n/de.php
index eccfd70a5d..9a7818b92d 100644
--- a/apps/files_external/l10n/de.php
+++ b/apps/files_external/l10n/de.php
@@ -35,7 +35,7 @@ $TRANSLATIONS = array(
 "URL of identity endpoint (required for OpenStack Object Storage)" => "URL des Identitätsendpunktes (Erforderlich für Openstack-Objektspeicher)",
 "Timeout of HTTP requests in seconds (optional)" => "Zeitüberschreitung von HTTP-Anfragen in Sekunden (Optional)",
 "Share" => "Teilen",
-"SMB / CIFS using OC login" => "´",
+"SMB / CIFS using OC login" => "SMB / CIFS mit OC-Login",
 "Username as share" => "Benutzername als Freigabe",
 "URL" => "URL",
 "Secure https://" => "Sicherer HTTPS://",
diff --git a/apps/files_external/l10n/de_DE.php b/apps/files_external/l10n/de_DE.php
index b752d635b1..bf67b5035f 100644
--- a/apps/files_external/l10n/de_DE.php
+++ b/apps/files_external/l10n/de_DE.php
@@ -35,7 +35,7 @@ $TRANSLATIONS = array(
 "URL of identity endpoint (required for OpenStack Object Storage)" => "URL des Identitätsendpunktes (Erforderlich für Openstack-Objektspeicher)",
 "Timeout of HTTP requests in seconds (optional)" => "Zeitüberschreitung von HTTP-Anfragen in Sekunden (Optional)",
 "Share" => "Teilen",
-"SMB / CIFS using OC login" => "Zeitüberschreitung von HTTP-Anfragen in Sekunden (Optional)",
+"SMB / CIFS using OC login" => "SMB / CIFS mit OC-Login",
 "Username as share" => "Benutzername als Freigabe",
 "URL" => "URL",
 "Secure https://" => "Sicherer HTTPS://",
diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php
index 5f4b3d5c15..e701ed0b24 100644
--- a/apps/user_ldap/l10n/pt_PT.php
+++ b/apps/user_ldap/l10n/pt_PT.php
@@ -26,8 +26,8 @@ $TRANSLATIONS = array(
 "Select groups" => "Seleccionar grupos",
 "Select object classes" => "Selecionar classes de objetos",
 "Select attributes" => "Selecionar atributos",
-"Connection test succeeded" => "Teste de conecção passado com sucesso.",
-"Connection test failed" => "Erro no teste de conecção.",
+"Connection test succeeded" => "Teste de ligação com sucesso.",
+"Connection test failed" => "Erro no teste de ligação.",
 "Do you really want to delete the current Server Configuration?" => "Deseja realmente apagar as configurações de servidor actuais?",
 "Confirm Deletion" => "Confirmar a operação de apagar",
 "_%s group found_::_%s groups found_" => array("%s grupo encontrado","%s grupos encontrados"),
@@ -41,12 +41,14 @@ $TRANSLATIONS = array(
 "Save" => "Guardar",
 "Test Configuration" => "Testar a configuração",
 "Help" => "Ajuda",
+"Groups meeting these criteria are available in %s:" => "Grupos que satisfazerem estes critérios estão disponíveis em %s:",
 "only those object classes:" => "apenas essas classes de objetos:",
 "only from those groups:" => "apenas desses grupos:",
 "Edit raw filter instead" => "Editar filtro raw em vez disso",
 "Raw LDAP filter" => "Filtro LDAP Raw",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "O filtro especifica quais grupos LDAP devem ter acesso à instância %s.",
 "groups found" => "grupos encontrados",
+"Users login with this attribute:" => "Utilizadores entrar com este atributo:",
 "LDAP Username:" => "Nome de utilizador LDAP:",
 "LDAP Email Address:" => "Endereço de correio eletrónico LDAP:",
 "Other Attributes:" => "Outros Atributos:",
@@ -83,6 +85,7 @@ $TRANSLATIONS = array(
 "Only connect to the replica server." => "Ligar apenas ao servidor de réplicas.",
 "Case insensitive LDAP server (Windows)" => "Servidor LDAP (Windows) não é sensível a maiúsculas.",
 "Turn off SSL certificate validation." => "Desligar a validação de certificado SSL.",
+"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Não recomendado, use-o somente para teste! ligação só funciona com esta opção, importar o certificado SSL do servidor LDAP para o seu servidor %s.",
 "Cache Time-To-Live" => "Cache do tempo de vida dos objetos no servidor",
 "in seconds. A change empties the cache." => "em segundos. Uma alteração esvazia a cache.",
 "Directory Settings" => "Definições de directorias",
@@ -98,6 +101,10 @@ $TRANSLATIONS = array(
 "One Group Base DN per line" => "Uma base de grupo DN por linha",
 "Group Search Attributes" => "Atributos de pesquisa de grupo",
 "Group-Member association" => "Associar utilizador ao grupo.",
+"Nested Groups" => "Grupos agrupados",
+"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Quando habilitado os grupos, os grupos são suportados. (Só funciona se o atributo de membro de grupo contém DNs.)",
+"Paging chunksize" => "Bloco de paginação",
+"Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" => "Tamanho do bloco usado para pesquisas LDAP paginados que podem retornar resultados volumosos como utilizador ou grupo de enumeração. (Defini-lo 0 desactiva paginada das pesquisas LDAP nessas situações.)",
 "Special Attributes" => "Atributos especiais",
 "Quota Field" => "Quota",
 "Quota Default" => "Quota padrão",
diff --git a/core/l10n/ja.php b/core/l10n/ja.php
index d33031337c..d9ef2593c5 100644
--- a/core/l10n/ja.php
+++ b/core/l10n/ja.php
@@ -48,6 +48,9 @@ $TRANSLATIONS = array(
 "last year" => "1年前",
 "years ago" => "数年前",
 "Couldn't send reset email. Please contact your administrator." => "リセットメールを送信できませんでした。管理者に問い合わせてください。",
+"The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." => "パスワードをリセットする、このリンクをクリックするとメールを送信します。しばらく経ってもメールが届かなかった場合は、スパム/ジャンクフォルダを確認してください。<br>それでも見つからなかった場合は、管理者に問合せてください。",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "ファイルが暗号化されています。リカバリーキーが有効でない場合は、パスワードをリセットした後にあなたのデータを元に戻す方法はありません。<br />どういうことか分からない場合は、操作を継続する前に管理者に連絡してください。<br />続けてよろしいでしょうか?",
+"I know what I'm doing" => "どういう操作をしているか理解しています",
 "Reset password" => "パスワードをリセット",
 "Password can not be changed. Please contact your administrator." => "パスワードは変更できません。管理者に問い合わせてください。",
 "Yes" => "はい",
@@ -183,6 +186,7 @@ $TRANSLATIONS = array(
 "Please change your password to secure your account again." => "アカウント保護のため、パスワードを再度変更してください。",
 "Server side authentication failed!" => "サーバーサイドの認証に失敗しました！",
 "Please contact your administrator." => "管理者に問い合わせてください。",
+"Forgot your password? Reset it!" => "パスワードを忘れましたか？リセットします！",
 "remember" => "パスワードを保存",
 "Log in" => "ログイン",
 "Alternative Logins" => "代替ログイン",
diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po
index bca8097d05..87cbdff4f3 100644
--- a/l10n/de/files_external.po
+++ b/l10n/de/files_external.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-14 01:54-0400\n"
-"PO-Revision-Date: 2014-06-13 16:01+0000\n"
+"POT-Creation-Date: 2014-06-23 01:54-0400\n"
+"PO-Revision-Date: 2014-06-22 19:21+0000\n"
 "Last-Translator: kabum <uu.kabum@gmail.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -167,7 +167,7 @@ msgstr "Teilen"
 
 #: appinfo/app.php:138
 msgid "SMB / CIFS using OC login"
-msgstr "´"
+msgstr "SMB / CIFS mit OC-Login"
 
 #: appinfo/app.php:142
 msgid "Username as share"
@@ -213,7 +213,7 @@ msgstr "Persönlich"
 msgid "System"
 msgstr "System"
 
-#: js/settings.js:318 js/settings.js:325
+#: js/settings.js:320 js/settings.js:327
 msgid "Saved"
 msgstr "Gespeichert"
 
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index f5c9ee6d09..a4873da91f 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 06:20+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2014-06-23 01:54-0400\n"
+"PO-Revision-Date: 2014-06-22 16:29+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -327,7 +327,7 @@ msgstr "Ein gültiger Gruppenname muss angegeben werden"
 msgid "deleted {groupName}"
 msgstr "{groupName} gelöscht"
 
-#: js/users/groups.js:206 js/users/users.js:255
+#: js/users/groups.js:206 js/users/users.js:265
 msgid "undo"
 msgstr "rückgängig machen"
 
@@ -347,31 +347,31 @@ msgstr "Gruppenadministrator"
 msgid "Delete"
 msgstr "Löschen"
 
-#: js/users/users.js:84 templates/users/part.userlist.php:98
+#: js/users/users.js:85 templates/users/part.userlist.php:98
 msgid "never"
 msgstr "niemals"
 
-#: js/users/users.js:254
+#: js/users/users.js:264
 msgid "deleted {userName}"
 msgstr "{userName} gelöscht"
 
-#: js/users/users.js:371
+#: js/users/users.js:381
 msgid "add group"
 msgstr "Gruppe hinzufügen"
 
-#: js/users/users.js:568
+#: js/users/users.js:578
 msgid "A valid username must be provided"
 msgstr "Es muss ein gültiger Benutzername angegeben werden"
 
-#: js/users/users.js:569 js/users/users.js:575 js/users/users.js:590
+#: js/users/users.js:579 js/users/users.js:585 js/users/users.js:600
 msgid "Error creating user"
 msgstr "Beim Anlegen des Benutzers ist ein Fehler aufgetreten"
 
-#: js/users/users.js:574
+#: js/users/users.js:584
 msgid "A valid password must be provided"
 msgstr "Es muss ein gültiges Passwort angegeben werden"
 
-#: js/users/users.js:598
+#: js/users/users.js:608
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Warnung: Das Benutzerverzeichnis für den Benutzer  \"{user}\" existiert bereits"
 
@@ -441,7 +441,7 @@ msgid ""
 "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 "Dein Datenverzeichnis und deine Dateien sind möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten dir dringend, dass du deinen Webserver dahingehend konfigurierst, dass dein Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder du verschiebst das Datenverzeichnis außerhalb des Wurzelverzeichnisses des Webservers."
+msgstr "Dein Datenverzeichnis und deine Dateien sind möglicherweise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten dir dringend, dass du deinen Webserver dahingehend konfigurierst, dass dein Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder du verschiebst das Datenverzeichnis ausserhalb des Wurzelverzeichnisses des Webservers."
 
 #: templates/admin.php:75 templates/admin.php:90
 msgid "Setup Warning"
@@ -534,7 +534,7 @@ msgid ""
 "installation of 3rd party apps don´t work. Accessing files from remote and "
 "sending of notification emails might also not work. We suggest to enable "
 "internet connection for this server if you want to have all features."
-msgstr "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen."
+msgstr "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren, wenn Sie alle Funktionen nutzen wollen."
 
 #: templates/admin.php:189
 msgid "Cron"
@@ -612,7 +612,7 @@ msgstr "Erlaubt erneutes Teilen"
 
 #: templates/admin.php:276
 msgid "Restrict users to only share with users in their groups"
-msgstr "c"
+msgstr "Erlaube Nutzern nur das Teilen in ihrer Gruppe"
 
 #: templates/admin.php:281
 msgid "Allow users to send mail notification for shared files"
@@ -921,7 +921,7 @@ msgstr "Admin-Wiederherstellungspasswort"
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
-msgstr "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen"
+msgstr "Gib das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen"
 
 #: templates/users/part.createuser.php:32
 msgid "Search Users and Groups"
diff --git a/l10n/de_DE/files_external.po b/l10n/de_DE/files_external.po
index 4ff00c7164..45cafd5573 100644
--- a/l10n/de_DE/files_external.po
+++ b/l10n/de_DE/files_external.po
@@ -7,13 +7,14 @@
 # Mario Siegmann <mario_siegmann@web.de>, 2014
 # stefanniedermann <stefan.niedermann@googlemail.com>, 2014
 # Tristan <blobbyjj@ymail.com>, 2013
+# kabum <uu.kabum@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 12:00+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2014-06-23 01:54-0400\n"
+"PO-Revision-Date: 2014-06-22 19:21+0000\n"
+"Last-Translator: kabum <uu.kabum@gmail.com>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -167,7 +168,7 @@ msgstr "Teilen"
 
 #: appinfo/app.php:138
 msgid "SMB / CIFS using OC login"
-msgstr "Zeitüberschreitung von HTTP-Anfragen in Sekunden (Optional)"
+msgstr "SMB / CIFS mit OC-Login"
 
 #: appinfo/app.php:142
 msgid "Username as share"
@@ -213,7 +214,7 @@ msgstr "Persönlich"
 msgid "System"
 msgstr "System"
 
-#: js/settings.js:318 js/settings.js:325
+#: js/settings.js:320 js/settings.js:327
 msgid "Saved"
 msgstr "Gespeichert"
 
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index 6e269529ac..f859997a0f 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-18 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 06:20+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2014-06-23 01:54-0400\n"
+"PO-Revision-Date: 2014-06-22 15:44+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -327,7 +327,7 @@ msgstr "Ein gültiger Gruppenname muss angegeben werden"
 msgid "deleted {groupName}"
 msgstr "{groupName} gelöscht"
 
-#: js/users/groups.js:206 js/users/users.js:255
+#: js/users/groups.js:206 js/users/users.js:265
 msgid "undo"
 msgstr "rückgängig machen"
 
@@ -347,31 +347,31 @@ msgstr "Gruppenadministrator"
 msgid "Delete"
 msgstr "Löschen"
 
-#: js/users/users.js:84 templates/users/part.userlist.php:98
+#: js/users/users.js:85 templates/users/part.userlist.php:98
 msgid "never"
 msgstr "niemals"
 
-#: js/users/users.js:254
+#: js/users/users.js:264
 msgid "deleted {userName}"
 msgstr "{userName} gelöscht"
 
-#: js/users/users.js:371
+#: js/users/users.js:381
 msgid "add group"
 msgstr "Gruppe hinzufügen"
 
-#: js/users/users.js:568
+#: js/users/users.js:578
 msgid "A valid username must be provided"
 msgstr "Es muss ein gültiger Benutzername angegeben werden"
 
-#: js/users/users.js:569 js/users/users.js:575 js/users/users.js:590
+#: js/users/users.js:579 js/users/users.js:585 js/users/users.js:600
 msgid "Error creating user"
 msgstr "Beim Erstellen des Benutzers ist ein Fehler aufgetreten"
 
-#: js/users/users.js:574
+#: js/users/users.js:584
 msgid "A valid password must be provided"
 msgstr "Es muss ein gültiges Passwort angegeben werden"
 
-#: js/users/users.js:598
+#: js/users/users.js:608
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Warnung: Das Benutzerverzeichnis für den Benutzer  \"{user}\" existiert bereits"
 
diff --git a/l10n/ja/core.po b/l10n/ja/core.po
index f44f9c25c3..e4d6a21511 100644
--- a/l10n/ja/core.po
+++ b/l10n/ja/core.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-16 01:54-0400\n"
-"PO-Revision-Date: 2014-06-16 04:10+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
+"POT-Creation-Date: 2014-06-23 01:54-0400\n"
+"PO-Revision-Date: 2014-06-22 10:21+0000\n"
+"Last-Translator: YANO Tetsu <tetuyano+transi@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -227,7 +227,7 @@ msgid ""
 "The link to reset your password has been sent to your email. If you do not "
 "receive it within a reasonable amount of time, check your spam/junk "
 "folders.<br>If it is not there ask your local administrator."
-msgstr ""
+msgstr "パスワードをリセットする、このリンクをクリックするとメールを送信します。しばらく経ってもメールが届かなかった場合は、スパム/ジャンクフォルダを確認してください。<br>それでも見つからなかった場合は、管理者に問合せてください。"
 
 #: js/lostpassword.js:7
 msgid ""
@@ -235,11 +235,11 @@ msgid ""
 "will be no way to get your data back after your password is reset.<br />If "
 "you are not sure what to do, please contact your administrator before you "
 "continue. <br />Do you really want to continue?"
-msgstr ""
+msgstr "ファイルが暗号化されています。リカバリーキーが有効でない場合は、パスワードをリセットした後にあなたのデータを元に戻す方法はありません。<br />どういうことか分からない場合は、操作を継続する前に管理者に連絡してください。<br />続けてよろしいでしょうか?"
 
 #: js/lostpassword.js:10
 msgid "I know what I'm doing"
-msgstr ""
+msgstr "どういう操作をしているか理解しています"
 
 #: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9
 msgid "Reset password"
@@ -249,74 +249,74 @@ msgstr "パスワードをリセット"
 msgid "Password can not be changed. Please contact your administrator."
 msgstr "パスワードは変更できません。管理者に問い合わせてください。"
 
-#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
+#: js/oc-dialogs.js:109 js/oc-dialogs.js:257
 msgid "Yes"
 msgstr "はい"
 
-#: js/oc-dialogs.js:119 js/oc-dialogs.js:260
+#: js/oc-dialogs.js:119 js/oc-dialogs.js:267
 msgid "No"
 msgstr "いいえ"
 
-#: js/oc-dialogs.js:198
+#: js/oc-dialogs.js:204
 msgid "Choose"
 msgstr "選択"
 
-#: js/oc-dialogs.js:224
+#: js/oc-dialogs.js:231
 msgid "Error loading file picker template: {error}"
 msgstr "ファイル選択テンプレートの読み込みエラー: {error}"
 
-#: js/oc-dialogs.js:277
+#: js/oc-dialogs.js:284
 msgid "Ok"
 msgstr "OK"
 
-#: js/oc-dialogs.js:297
+#: js/oc-dialogs.js:304
 msgid "Error loading message template: {error}"
 msgstr "メッセージテンプレートの読み込みエラー: {error}"
 
-#: js/oc-dialogs.js:425
+#: js/oc-dialogs.js:432
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] "{count} ファイルが競合"
 
-#: js/oc-dialogs.js:439
+#: js/oc-dialogs.js:446
 msgid "One file conflict"
 msgstr "1ファイルが競合"
 
-#: js/oc-dialogs.js:445
+#: js/oc-dialogs.js:452
 msgid "New Files"
 msgstr "新しいファイル"
 
-#: js/oc-dialogs.js:446
+#: js/oc-dialogs.js:453
 msgid "Already existing files"
 msgstr "既存のファイル"
 
-#: js/oc-dialogs.js:448
+#: js/oc-dialogs.js:455
 msgid "Which files do you want to keep?"
 msgstr "どちらのファイルを保持しますか？"
 
-#: js/oc-dialogs.js:449
+#: js/oc-dialogs.js:456
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
 msgstr "両方のバージョンを選択した場合は、ファイル名の後ろに数字を追加したファイルのコピーを作成します。"
 
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:464
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: js/oc-dialogs.js:467
+#: js/oc-dialogs.js:474
 msgid "Continue"
 msgstr "続ける"
 
-#: js/oc-dialogs.js:514 js/oc-dialogs.js:527
+#: js/oc-dialogs.js:521 js/oc-dialogs.js:534
 msgid "(all selected)"
 msgstr "(すべて選択)"
 
-#: js/oc-dialogs.js:517 js/oc-dialogs.js:531
+#: js/oc-dialogs.js:524 js/oc-dialogs.js:538
 msgid "({count} selected)"
 msgstr "({count} 選択)"
 
-#: js/oc-dialogs.js:539
+#: js/oc-dialogs.js:546
 msgid "Error loading file exists template"
 msgstr "既存ファイルのテンプレートの読み込みエラー"
 
@@ -829,7 +829,7 @@ msgstr "管理者に問い合わせてください。"
 
 #: templates/login.php:50
 msgid "Forgot your password? Reset it!"
-msgstr ""
+msgstr "パスワードを忘れましたか？リセットします！"
 
 #: templates/login.php:55
 msgid "remember"
diff --git a/l10n/ja/files_sharing.po b/l10n/ja/files_sharing.po
index 22ab1969d4..32b251b196 100644
--- a/l10n/ja/files_sharing.po
+++ b/l10n/ja/files_sharing.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-19 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 06:12+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-23 01:54-0400\n"
+"PO-Revision-Date: 2014-06-22 10:27+0000\n"
+"Last-Translator: YANO Tetsu <tetuyano+transi@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/l10n/ja/lib.po b/l10n/ja/lib.po
index df9876dc5e..b4ee28f918 100644
--- a/l10n/ja/lib.po
+++ b/l10n/ja/lib.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-17 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-23 01:54-0400\n"
+"PO-Revision-Date: 2014-06-22 10:31+0000\n"
+"Last-Translator: YANO Tetsu <tetuyano+transi@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -64,7 +64,7 @@ msgstr "\"%s\" へのアップグレードに失敗しました。"
 msgid ""
 "App \\\"%s\\\" can't be installed because it is not compatible with this "
 "version of ownCloud."
-msgstr ""
+msgstr "アプリ \\\"%s\\\" をインストールできません。現在の owncloud のバージョンと互換性がありません。"
 
 #: private/app.php:1147
 msgid "No app name specified"
diff --git a/l10n/ja/settings.po b/l10n/ja/settings.po
index 2fe28f281d..003faecf27 100644
--- a/l10n/ja/settings.po
+++ b/l10n/ja/settings.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-17 01:54-0400\n"
-"PO-Revision-Date: 2014-06-17 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-23 01:54-0400\n"
+"PO-Revision-Date: 2014-06-22 10:31+0000\n"
+"Last-Translator: YANO Tetsu <tetuyano+transi@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,15 +53,15 @@ msgstr "メールを送信しました"
 msgid "You need to set your user email before being able to send test emails."
 msgstr "ユーザーメールを設定して初めて、テストメールを送信することができるようになります。"
 
-#: admin/controller.php:116 templates/admin.php:350
+#: admin/controller.php:116 templates/admin.php:337
 msgid "Send mode"
 msgstr "送信モード"
 
-#: admin/controller.php:118 templates/admin.php:363 templates/personal.php:144
+#: admin/controller.php:118 templates/admin.php:350 templates/personal.php:144
 msgid "Encryption"
 msgstr "暗号化"
 
-#: admin/controller.php:120 templates/admin.php:387
+#: admin/controller.php:120 templates/admin.php:374
 msgid "Authentication method"
 msgstr "認証方法"
 
@@ -116,7 +116,7 @@ msgstr "暗号化キーを完全に削除できませんでした。owncloud.log
 
 #: ajax/installapp.php:18 ajax/uninstallapp.php:18
 msgid "Couldn't remove app."
-msgstr ""
+msgstr "アプリが削除できませんでした。"
 
 #: ajax/lostpassword.php:12
 msgid "Email saved"
@@ -199,7 +199,7 @@ msgstr "バックエンドはパスワード変更をサポートしていませ
 msgid "Unable to change password"
 msgstr "パスワードを変更できません"
 
-#: js/admin.js:126
+#: js/admin.js:127
 msgid "Sending..."
 msgstr "送信中…"
 
@@ -217,7 +217,7 @@ msgstr "{appversion} にアップデート"
 
 #: js/apps.js:90
 msgid "Uninstall App"
-msgstr ""
+msgstr "アプリをアンインストール"
 
 #: js/apps.js:96 js/apps.js:158 js/apps.js:191
 msgid "Disable"
@@ -261,15 +261,15 @@ msgstr "アップデート済み"
 
 #: js/apps.js:233
 msgid "Uninstalling ...."
-msgstr ""
+msgstr "アンインストール中 ...."
 
 #: js/apps.js:236
 msgid "Error while uninstalling app"
-msgstr ""
+msgstr "アプリをアンインストール中にエラーが発生"
 
 #: js/apps.js:237 templates/apps.php:56
 msgid "Uninstall"
-msgstr ""
+msgstr "アンインストール"
 
 #: js/personal.js:256
 msgid "Select a profile picture"
@@ -323,11 +323,11 @@ msgstr "有効なグループ名を指定する必要があります"
 msgid "deleted {groupName}"
 msgstr "{groupName} を削除しました"
 
-#: js/users/groups.js:206 js/users/users.js:255
+#: js/users/groups.js:206 js/users/users.js:265
 msgid "undo"
 msgstr "元に戻す"
 
-#: js/users/users.js:37 templates/admin.php:302
+#: js/users/users.js:37 templates/admin.php:292
 #: templates/users/part.createuser.php:12 templates/users/part.userlist.php:10
 #: templates/users/part.userlist.php:41
 msgid "Groups"
@@ -343,31 +343,31 @@ msgstr "グループ管理者"
 msgid "Delete"
 msgstr "削除"
 
-#: js/users/users.js:84 templates/users/part.userlist.php:98
+#: js/users/users.js:85 templates/users/part.userlist.php:98
 msgid "never"
 msgstr "無し"
 
-#: js/users/users.js:254
+#: js/users/users.js:264
 msgid "deleted {userName}"
 msgstr "{userName} を削除しました"
 
-#: js/users/users.js:371
+#: js/users/users.js:381
 msgid "add group"
 msgstr "グループを追加"
 
-#: js/users/users.js:568
+#: js/users/users.js:578
 msgid "A valid username must be provided"
 msgstr "有効なユーザー名を指定する必要があります"
 
-#: js/users/users.js:569 js/users/users.js:575 js/users/users.js:590
+#: js/users/users.js:579 js/users/users.js:585 js/users/users.js:600
 msgid "Error creating user"
 msgstr "ユーザー作成エラー"
 
-#: js/users/users.js:574
+#: js/users/users.js:584
 msgid "A valid password must be provided"
 msgstr "有効なパスワードを指定する必要があります"
 
-#: js/users/users.js:598
+#: js/users/users.js:608
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "警告: ユーザー \"{user}\" のホームディレクトリはすでに存在します"
 
@@ -570,23 +570,23 @@ msgstr "システムのcronサービスを利用して15分ごとにcron.phpフ
 msgid "Sharing"
 msgstr "共有"
 
-#: templates/admin.php:240
+#: templates/admin.php:238
 msgid "Allow apps to use the Share API"
 msgstr "アプリからの共有APIの利用を許可する"
 
-#: templates/admin.php:247
+#: templates/admin.php:243
 msgid "Allow users to share via link"
 msgstr "URLリンクで共有を許可する"
 
-#: templates/admin.php:251
+#: templates/admin.php:249
 msgid "Enforce password protection"
 msgstr "常にパスワード保護を有効にする"
 
-#: templates/admin.php:254
+#: templates/admin.php:252
 msgid "Allow public uploads"
 msgstr "パブリックなアップロードを許可する"
 
-#: templates/admin.php:258
+#: templates/admin.php:256
 msgid "Set default expiration date"
 msgstr "有効期限の既定値を設定"
 
@@ -602,116 +602,116 @@ msgstr "æ—¥"
 msgid "Enforce expiration date"
 msgstr "有効期限を反映させる"
 
-#: templates/admin.php:276
+#: templates/admin.php:271
 msgid "Allow resharing"
 msgstr "再共有を許可する"
 
-#: templates/admin.php:283
+#: templates/admin.php:276
 msgid "Restrict users to only share with users in their groups"
 msgstr "グループ内のユーザーでのみ共有するように制限する"
 
-#: templates/admin.php:290
+#: templates/admin.php:281
 msgid "Allow users to send mail notification for shared files"
 msgstr "共有ファイルに関するメール通知の送信をユーザーに許可する"
 
-#: templates/admin.php:297
+#: templates/admin.php:286
 msgid "Exclude groups from sharing"
 msgstr "共有可能なグループから除外"
 
-#: templates/admin.php:308
+#: templates/admin.php:298
 msgid ""
 "These groups will still be able to receive shares, but not to initiate them."
 msgstr "このグループでは、フォルダ共有を開始することはできませんが、共有されたフォルダを参照することはできます。"
 
-#: templates/admin.php:316
+#: templates/admin.php:303
 msgid "Security"
 msgstr "セキュリティ"
 
-#: templates/admin.php:327
+#: templates/admin.php:314
 msgid "Enforce HTTPS"
 msgstr "常にHTTPSを使用する"
 
-#: templates/admin.php:329
+#: templates/admin.php:316
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "クライアントから %sへの接続を常に暗号化します。"
 
-#: templates/admin.php:335
+#: templates/admin.php:322
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "強制的なSSL接続を有効/無効にするには、HTTPS経由で %s へ接続してください。"
 
-#: templates/admin.php:345
+#: templates/admin.php:332
 msgid "Email Server"
 msgstr "メールサーバー"
 
-#: templates/admin.php:347
+#: templates/admin.php:334
 msgid "This is used for sending out notifications."
 msgstr "これは通知の送信に使われます。"
 
-#: templates/admin.php:378
+#: templates/admin.php:365
 msgid "From address"
 msgstr "アドレスから"
 
-#: templates/admin.php:379
+#: templates/admin.php:366
 msgid "mail"
 msgstr "メール"
 
-#: templates/admin.php:400
+#: templates/admin.php:387
 msgid "Authentication required"
 msgstr "要求される認証"
 
-#: templates/admin.php:404
+#: templates/admin.php:391
 msgid "Server address"
 msgstr "サーバーアドレス"
 
-#: templates/admin.php:408
+#: templates/admin.php:395
 msgid "Port"
 msgstr "ポート"
 
-#: templates/admin.php:413
+#: templates/admin.php:400
 msgid "Credentials"
 msgstr "資格情報"
 
-#: templates/admin.php:414
+#: templates/admin.php:401
 msgid "SMTP Username"
 msgstr "SMTP ユーザー名"
 
-#: templates/admin.php:417
+#: templates/admin.php:404
 msgid "SMTP Password"
 msgstr "SMTP パスワード"
 
-#: templates/admin.php:421
+#: templates/admin.php:408
 msgid "Test email settings"
 msgstr "メール設定をテスト"
 
-#: templates/admin.php:422
+#: templates/admin.php:409
 msgid "Send email"
 msgstr "メールを送信"
 
-#: templates/admin.php:427
+#: templates/admin.php:414
 msgid "Log"
 msgstr "ログ"
 
-#: templates/admin.php:428
+#: templates/admin.php:415
 msgid "Log level"
 msgstr "ログレベル"
 
-#: templates/admin.php:460
+#: templates/admin.php:447
 msgid "More"
 msgstr "もっと見る"
 
-#: templates/admin.php:461
+#: templates/admin.php:448
 msgid "Less"
 msgstr "閉じる"
 
-#: templates/admin.php:467 templates/personal.php:196
+#: templates/admin.php:454 templates/personal.php:196
 msgid "Version"
 msgstr "バージョン"
 
-#: templates/admin.php:471 templates/personal.php:199
+#: templates/admin.php:458 templates/personal.php:199
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
diff --git a/l10n/pt_PT/files_encryption.po b/l10n/pt_PT/files_encryption.po
index 1687ea5846..c48a54d5bc 100644
--- a/l10n/pt_PT/files_encryption.po
+++ b/l10n/pt_PT/files_encryption.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-14 01:54-0400\n"
-"PO-Revision-Date: 2014-06-14 05:54+0000\n"
-"Last-Translator: I Robot\n"
+"POT-Creation-Date: 2014-06-23 01:54-0400\n"
+"PO-Revision-Date: 2014-06-22 17:41+0000\n"
+"Last-Translator: Fernando Moura <moura232@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -111,7 +111,7 @@ msgstr "Criptografia inicial em execução ... Por favor, tente novamente mais t
 #: templates/invalid_private_key.php:8
 #, php-format
 msgid "Go directly to your %spersonal settings%s."
-msgstr ""
+msgstr "Ir directo para %sdefinições pessoais%s."
 
 #: templates/settings-admin.php:2 templates/settings-personal.php:2
 msgid "Encryption"
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index 556ea81b64..c4ba6fda41 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.po
@@ -6,15 +6,16 @@
 # Bruno Martins <inactive+skorzen@transifex.com>, 2013
 # Carlos Moreira <crolidge@gmail.com>, 2014
 # Daniel Pinto <daniel@mouxy.net>, 2013
+# Fernando Moura <moura232@gmail.com>, 2014
 # Helder Meneses <helder.meneses@gmail.com>, 2013-2014
 # Andrew_Melim <nokostya.translation@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-19 01:54-0400\n"
-"PO-Revision-Date: 2014-06-18 06:12+0000\n"
-"Last-Translator: Andrew_Melim <nokostya.translation@gmail.com>\n"
+"POT-Creation-Date: 2014-06-23 01:54-0400\n"
+"PO-Revision-Date: 2014-06-22 18:11+0000\n"
+"Last-Translator: Fernando Moura <moura232@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -133,11 +134,11 @@ msgstr "Selecionar atributos"
 
 #: js/settings.js:848
 msgid "Connection test succeeded"
-msgstr "Teste de conecção passado com sucesso."
+msgstr "Teste de ligação com sucesso."
 
 #: js/settings.js:855
 msgid "Connection test failed"
-msgstr "Erro no teste de conecção."
+msgstr "Erro no teste de ligação."
 
 #: js/settings.js:864
 msgid "Do you really want to delete the current Server Configuration?"
@@ -200,7 +201,7 @@ msgstr "Ajuda"
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
 msgid "Groups meeting these criteria are available in %s:"
-msgstr ""
+msgstr "Grupos que satisfazerem estes critérios estão disponíveis em %s:"
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
@@ -236,7 +237,7 @@ msgstr "grupos encontrados"
 
 #: templates/part.wizard-loginfilter.php:4
 msgid "Users login with this attribute:"
-msgstr ""
+msgstr "Utilizadores entrar com este atributo:"
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
@@ -405,7 +406,7 @@ msgstr "Desligar a validação de certificado SSL."
 msgid ""
 "Not recommended, use it for testing only! If connection only works with this"
 " option, import the LDAP server's SSL certificate in your %s server."
-msgstr ""
+msgstr "Não recomendado, use-o somente para teste! ligação só funciona com esta opção, importar o certificado SSL do servidor LDAP para o seu servidor %s."
 
 #: templates/settings.php:28
 msgid "Cache Time-To-Live"
@@ -469,24 +470,24 @@ msgstr "Associar utilizador ao grupo."
 
 #: templates/settings.php:39
 msgid "Nested Groups"
-msgstr ""
+msgstr "Grupos agrupados"
 
 #: templates/settings.php:39
 msgid ""
 "When switched on, groups that contain groups are supported. (Only works if "
 "the group member attribute contains DNs.)"
-msgstr ""
+msgstr "Quando habilitado os grupos, os grupos são suportados. (Só funciona se o atributo de membro de grupo contém DNs.)"
 
 #: templates/settings.php:40
 msgid "Paging chunksize"
-msgstr ""
+msgstr "Bloco de paginação"
 
 #: templates/settings.php:40
 msgid ""
 "Chunksize used for paged LDAP searches that may return bulky results like "
 "user or group enumeration. (Setting it 0 disables paged LDAP searches in "
 "those situations.)"
-msgstr ""
+msgstr "Tamanho do bloco usado para pesquisas LDAP paginados que podem retornar resultados volumosos como utilizador ou grupo de enumeração. (Defini-lo 0 desactiva paginada das pesquisas LDAP nessas situações.)"
 
 #: templates/settings.php:42
 msgid "Special Attributes"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 97badb6465..8af2abce8e 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-06-22 01:54-0400\n"
+"POT-Creation-Date: 2014-06-23 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.pot b/l10n/templates/files.pot
index da1e227208..7ed0fb5c2c 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-06-22 01:54-0400\n"
+"POT-Creation-Date: 2014-06-23 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 c06c6945e8..17a092959d 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-06-22 01:54-0400\n"
+"POT-Creation-Date: 2014-06-23 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_external.pot b/l10n/templates/files_external.pot
index 3cfe4ee44c..932754d023 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-06-22 01:54-0400\n"
+"POT-Creation-Date: 2014-06-23 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 eb8a01c91e..039348b408 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-06-22 01:54-0400\n"
+"POT-Creation-Date: 2014-06-23 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_trashbin.pot b/l10n/templates/files_trashbin.pot
index 0bbbabe897..111f73e55e 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-06-22 01:54-0400\n"
+"POT-Creation-Date: 2014-06-23 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 6afb9a1703..5dcdeb841b 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-06-22 01:54-0400\n"
+"POT-Creation-Date: 2014-06-23 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 664585b2ee..ce0f5b9c59 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-06-22 01:54-0400\n"
+"POT-Creation-Date: 2014-06-23 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/private.pot b/l10n/templates/private.pot
index 940c254016..cde3a045e4 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-06-22 01:54-0400\n"
+"POT-Creation-Date: 2014-06-23 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/settings.pot b/l10n/templates/settings.pot
index f6c46b3ee9..d553a013a2 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-06-22 01:54-0400\n"
+"POT-Creation-Date: 2014-06-23 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 1c0780fd0e..84e11d5886 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-06-22 01:54-0400\n"
+"POT-Creation-Date: 2014-06-23 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_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index dc2368a92e..26ae98f484 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-06-22 01:54-0400\n"
+"POT-Creation-Date: 2014-06-23 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/ja.php b/lib/l10n/ja.php
index 29a1ae102e..aa779d62ce 100644
--- a/lib/l10n/ja.php
+++ b/lib/l10n/ja.php
@@ -8,6 +8,7 @@ $TRANSLATIONS = array(
 "Users" => "ユーザー",
 "Admin" => "管理",
 "Failed to upgrade \"%s\"." => "\"%s\" へのアップグレードに失敗しました。",
+"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "アプリ \\\"%s\\\" をインストールできません。現在の owncloud のバージョンと互換性がありません。",
 "No app name specified" => "アプリ名が未指定",
 "Unknown filetype" => "不明なファイルタイプ",
 "Invalid image" => "無効な画像",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 57b9e77685..1e6dfa77ff 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -96,7 +96,7 @@ $TRANSLATIONS = array(
 "TLS" => "TLS",
 "Security Warning" => "Sicherheitswarnung",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Du greifst auf %s via HTTP zu. Wir empfehlen Dir dringend, Deinen Server so konfigurieren, dass stattdessen HTTPS verlangt wird.",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file 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." => "Dein Datenverzeichnis und deine Dateien sind möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten dir dringend, dass du deinen Webserver dahingehend konfigurierst, dass dein Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder du verschiebst das Datenverzeichnis außerhalb des Wurzelverzeichnisses des Webservers.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file 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." => "Dein Datenverzeichnis und deine Dateien sind möglicherweise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten dir dringend, dass du deinen Webserver dahingehend konfigurierst, dass dein Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder du verschiebst das Datenverzeichnis ausserhalb des Wurzelverzeichnisses des Webservers.",
 "Setup Warning" => "Einrichtungswarnung",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
 "Please double check the <a href=\"%s\">installation guides</a>." => "Bitte prüfe nochmals die <a href=\"%s\">Installationsanleitungen</a>.",
@@ -113,7 +113,7 @@ $TRANSLATIONS = array(
 "This means that there might be problems with certain characters in file names." => "Dies bedeutet, dass Probleme mit bestimmten Zeichen in den Dateinamen geben kann.",
 "We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.",
 "Internet connection not working" => "Keine Netzwerkverbindung",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen.",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren, wenn Sie alle Funktionen nutzen wollen.",
 "Cron" => "Cron",
 "Last cron was executed at %s." => "Letzter Cron wurde um %s ausgeführt.",
 "Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Letzter Cron wurde um %s ausgeführt. Dies ist mehr als eine Stunde her, möglicherweise liegt ein Fehler vor.",
@@ -131,7 +131,7 @@ $TRANSLATIONS = array(
 "days" => "Tagen",
 "Enforce expiration date" => "Ablaufdatum erzwingen",
 "Allow resharing" => "Erlaubt erneutes Teilen",
-"Restrict users to only share with users in their groups" => "c",
+"Restrict users to only share with users in their groups" => "Erlaube Nutzern nur das Teilen in ihrer Gruppe",
 "Allow users to send mail notification for shared files" => "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden",
 "Exclude groups from sharing" => "Gruppen von Freigaben ausschließen",
 "These groups will still be able to receive shares, but not to initiate them." => "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
@@ -203,7 +203,7 @@ $TRANSLATIONS = array(
 "Login Name" => "Loginname",
 "Create" => "Anlegen",
 "Admin Recovery Password" => "Admin-Wiederherstellungspasswort",
-"Enter the recovery password in order to recover the users files during password change" => "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
+"Enter the recovery password in order to recover the users files during password change" => "Gib das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
 "Search Users and Groups" => "Nutzer und Gruppen suchen",
 "Add Group" => "Gruppe hinzufügen",
 "Group" => "Gruppe",
diff --git a/settings/l10n/ja.php b/settings/l10n/ja.php
index d9a8e0f56d..7c55e4da42 100644
--- a/settings/l10n/ja.php
+++ b/settings/l10n/ja.php
@@ -21,6 +21,7 @@ $TRANSLATIONS = array(
 "Couldn't decrypt your files, check your password and try again" => "ファイルを復号化することができませんでした。パスワードを確認のうえ再試行してください。",
 "Encryption keys deleted permanently" => "暗号化キーは完全に削除されます",
 "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "暗号化キーを完全に削除できませんでした。owncloud.logを確認するか、管理者に問い合わせてください。",
+"Couldn't remove app." => "アプリが削除できませんでした。",
 "Email saved" => "メールアドレスを保存しました",
 "Invalid email" => "無効なメールアドレス",
 "Unable to delete group" => "グループを削除できません",
@@ -43,6 +44,7 @@ $TRANSLATIONS = array(
 "User Documentation" => "ユーザードキュメント",
 "Admin Documentation" => "管理者ドキュメント",
 "Update to {appversion}" => "{appversion} にアップデート",
+"Uninstall App" => "アプリをアンインストール",
 "Disable" => "無効",
 "Enable" => "有効にする",
 "Please wait...." => "しばらくお待ちください。",
@@ -53,6 +55,9 @@ $TRANSLATIONS = array(
 "Error" => "エラー",
 "Update" => "アップデート",
 "Updated" => "アップデート済み",
+"Uninstalling ...." => "アンインストール中 ....",
+"Error while uninstalling app" => "アプリをアンインストール中にエラーが発生",
+"Uninstall" => "アンインストール",
 "Select a profile picture" => "プロファイル画像を選択",
 "Very weak password" => "非常に弱いパスワード",
 "Weak password" => "弱いパスワード",
-- 
GitLab