diff --git a/apps/encryption/l10n/es.js b/apps/encryption/l10n/es.js
index 6b49b3917fd98b0b135e82db8a895bae69a02df8..1dadb88064ac1de71b9856967fc46eaf35426a70 100644
--- a/apps/encryption/l10n/es.js
+++ b/apps/encryption/l10n/es.js
@@ -32,6 +32,7 @@ OC.L10N.register(
     "The share will expire on %s." : "El objeto dejará de ser compartido el %s.",
     "Cheers!" : "¡Saludos!",
     "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hola,\n<br><br>\nEl administrador ha habilitado el cifrado del lado servidor. Sus archivos serán cifrados usando como contraseña:   <strong>%s</strong>\n<br><br>\nPor favor, identifíquese en la interfaz web, vaya a la sección 'Modulo básico de cifrado' de sus opciones personales y actualice su contraseña tecleando esta contraseña en el campo 'contraseña antigua' e introduciendo la nueva en su correspondiente campo.<br><br>",
+    "Encrypt the home storage" : "Encriptar el almacenamiento personal",
     "Enable recovery key" : "Activa la clave de recuperación",
     "Disable recovery key" : "Desactiva la clave de recuperación",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La clave de recuperación es una clave de cifrado extra que se usa para cifrar ficheros. Permite la recuperación de los ficheros de un usuario si él o ella olvida su contraseña.",
diff --git a/apps/encryption/l10n/es.json b/apps/encryption/l10n/es.json
index 3f21b4c09a00f9dcec0df966f19bfcf96273a0f0..5cf2b12ce5f408881af67d54246e3c7e9320348e 100644
--- a/apps/encryption/l10n/es.json
+++ b/apps/encryption/l10n/es.json
@@ -30,6 +30,7 @@
     "The share will expire on %s." : "El objeto dejará de ser compartido el %s.",
     "Cheers!" : "¡Saludos!",
     "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hola,\n<br><br>\nEl administrador ha habilitado el cifrado del lado servidor. Sus archivos serán cifrados usando como contraseña:   <strong>%s</strong>\n<br><br>\nPor favor, identifíquese en la interfaz web, vaya a la sección 'Modulo básico de cifrado' de sus opciones personales y actualice su contraseña tecleando esta contraseña en el campo 'contraseña antigua' e introduciendo la nueva en su correspondiente campo.<br><br>",
+    "Encrypt the home storage" : "Encriptar el almacenamiento personal",
     "Enable recovery key" : "Activa la clave de recuperación",
     "Disable recovery key" : "Desactiva la clave de recuperación",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La clave de recuperación es una clave de cifrado extra que se usa para cifrar ficheros. Permite la recuperación de los ficheros de un usuario si él o ella olvida su contraseña.",
diff --git a/apps/files/l10n/pt_BR.js b/apps/files/l10n/pt_BR.js
index ed838e122eed180719acb9291c3ebad6be1d7dc5..e3200d28a278a322c63045205dd2c3d0d4a2588a 100644
--- a/apps/files/l10n/pt_BR.js
+++ b/apps/files/l10n/pt_BR.js
@@ -34,7 +34,7 @@ OC.L10N.register(
     "Download" : "Baixar",
     "Rename" : "Renomear",
     "Delete" : "Excluir",
-    "Disconnect storage" : "Desconectar armazenagem",
+    "Disconnect storage" : "Desconectar armazenamento",
     "Unshare" : "Descompartilhar",
     "Details" : "Detalhes",
     "Select" : "Selecionar",
@@ -42,6 +42,17 @@ OC.L10N.register(
     "Unable to determine date" : "Impossível determinar a data",
     "This operation is forbidden" : "Esta operação é proibida",
     "This directory is unavailable, please check the logs or contact the administrator" : "Este diretório não está disponível, por favor, verifique os logs ou entre em contato com o administrador",
+    "Could not move \"{file}\", target exists" : "Não foi possível mover o \"{file}\", o alvo já existe",
+    "Could not move \"{file}\"" : "Não foi possível mover \"{file}\"",
+    "{newName} already exists" : "{newName} já existe",
+    "Could not rename \"{fileName}\", it does not exist any more" : "Não foi possível renomear \"{fileName}\", ele já não existe",
+    "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "O nome \"{targetName}\" já está sendo usado na pasta  \"{dir}\". Por favor escolha um outro nome.",
+    "Could not rename \"{fileName}\"" : "Não foi possível renomear \"{fileName}\"",
+    "Could not create file \"{file}\"" : "Não foi possível criar o arquivo \"{file}\"",
+    "Could not create file \"{file}\" because it already exists" : "Não foi possível criar o arquivo \"{file}\" porque ele já existe",
+    "Could not create folder \"{dir}\"" : "Não foi possível criar a pasta \"{dir}\"",
+    "Could not create folder \"{dir}\" because it already exists" : "Não foi possível criar a pasta \"{dir}\" porque ela já existe",
+    "Error deleting file \"{fileName}\"." : "Ocorreu um erro ao apagar o arquivo \"{fileName}\".",
     "No entries in this folder match '{filter}'" : "Nenhuma entrada nesta pasta coincide com '{filter}'",
     "Name" : "Nome",
     "Size" : "Tamanho",
diff --git a/apps/files/l10n/pt_BR.json b/apps/files/l10n/pt_BR.json
index d1fcf01ed64f55ac4753c23ddb7b998fb4bc5cba..0aa0e94e87c41c172a08f3c50608cf73ed11bf9c 100644
--- a/apps/files/l10n/pt_BR.json
+++ b/apps/files/l10n/pt_BR.json
@@ -32,7 +32,7 @@
     "Download" : "Baixar",
     "Rename" : "Renomear",
     "Delete" : "Excluir",
-    "Disconnect storage" : "Desconectar armazenagem",
+    "Disconnect storage" : "Desconectar armazenamento",
     "Unshare" : "Descompartilhar",
     "Details" : "Detalhes",
     "Select" : "Selecionar",
@@ -40,6 +40,17 @@
     "Unable to determine date" : "Impossível determinar a data",
     "This operation is forbidden" : "Esta operação é proibida",
     "This directory is unavailable, please check the logs or contact the administrator" : "Este diretório não está disponível, por favor, verifique os logs ou entre em contato com o administrador",
+    "Could not move \"{file}\", target exists" : "Não foi possível mover o \"{file}\", o alvo já existe",
+    "Could not move \"{file}\"" : "Não foi possível mover \"{file}\"",
+    "{newName} already exists" : "{newName} já existe",
+    "Could not rename \"{fileName}\", it does not exist any more" : "Não foi possível renomear \"{fileName}\", ele já não existe",
+    "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "O nome \"{targetName}\" já está sendo usado na pasta  \"{dir}\". Por favor escolha um outro nome.",
+    "Could not rename \"{fileName}\"" : "Não foi possível renomear \"{fileName}\"",
+    "Could not create file \"{file}\"" : "Não foi possível criar o arquivo \"{file}\"",
+    "Could not create file \"{file}\" because it already exists" : "Não foi possível criar o arquivo \"{file}\" porque ele já existe",
+    "Could not create folder \"{dir}\"" : "Não foi possível criar a pasta \"{dir}\"",
+    "Could not create folder \"{dir}\" because it already exists" : "Não foi possível criar a pasta \"{dir}\" porque ela já existe",
+    "Error deleting file \"{fileName}\"." : "Ocorreu um erro ao apagar o arquivo \"{fileName}\".",
     "No entries in this folder match '{filter}'" : "Nenhuma entrada nesta pasta coincide com '{filter}'",
     "Name" : "Nome",
     "Size" : "Tamanho",
diff --git a/apps/files_external/l10n/es.js b/apps/files_external/l10n/es.js
index 6d8bf0d313995f3c84c7db8132d783cd187b0a2a..804e75526bd365566f0514a1c9eda225d848dd96 100644
--- a/apps/files_external/l10n/es.js
+++ b/apps/files_external/l10n/es.js
@@ -36,6 +36,7 @@ OC.L10N.register(
     "(group)" : "(grupo)",
     "Admin defined" : "Admin definido",
     "Saved" : "Guardado",
+    "There was an error with message: " : "Hubo un error con el mensaje:",
     "Access key" : "Clave de acceso",
     "Secret key" : "Clave secreta",
     "None" : "Ninguno",
diff --git a/apps/files_external/l10n/es.json b/apps/files_external/l10n/es.json
index bf0624e96dbeba8c76b602d94d469b7300cd3330..86148cf3b0cb0e539037228f991f3f69a8bc7f9c 100644
--- a/apps/files_external/l10n/es.json
+++ b/apps/files_external/l10n/es.json
@@ -34,6 +34,7 @@
     "(group)" : "(grupo)",
     "Admin defined" : "Admin definido",
     "Saved" : "Guardado",
+    "There was an error with message: " : "Hubo un error con el mensaje:",
     "Access key" : "Clave de acceso",
     "Secret key" : "Clave secreta",
     "None" : "Ninguno",
diff --git a/apps/files_external/l10n/ja.js b/apps/files_external/l10n/ja.js
index 8d50794e5b6cbf2c8da45889edb8d8e379ba8892..dc31bdb1807db61598d6a070f4c25feed589043f 100644
--- a/apps/files_external/l10n/ja.js
+++ b/apps/files_external/l10n/ja.js
@@ -36,6 +36,10 @@ OC.L10N.register(
     "(group)" : "(グループ)",
     "Admin defined" : "管理者設定済",
     "Saved" : "保存されました",
+    "Empty response from the server" : "サーバーから空の応答がありました",
+    "Couldn't access. Please logout and login to activate this mount point" : "アクセス出来ませんでした｡このマウントポイントを有効にするには一度ログアウトしてからログインしてください。",
+    "There was an error with message: " : "メッセージ付きのエラーが発生しました：",
+    "goto-external-storage" : "外部ストレージに行く",
     "Access key" : "アクセスキー",
     "Secret key" : "シークレットキー",
     "Builtin" : "ビルトイン",
diff --git a/apps/files_external/l10n/ja.json b/apps/files_external/l10n/ja.json
index b704504b0881b1ad87df913f22d3a1f2269634b6..6e7f00d6a57a4ebfb10dde360ef65e69345cefb3 100644
--- a/apps/files_external/l10n/ja.json
+++ b/apps/files_external/l10n/ja.json
@@ -34,6 +34,10 @@
     "(group)" : "(グループ)",
     "Admin defined" : "管理者設定済",
     "Saved" : "保存されました",
+    "Empty response from the server" : "サーバーから空の応答がありました",
+    "Couldn't access. Please logout and login to activate this mount point" : "アクセス出来ませんでした｡このマウントポイントを有効にするには一度ログアウトしてからログインしてください。",
+    "There was an error with message: " : "メッセージ付きのエラーが発生しました：",
+    "goto-external-storage" : "外部ストレージに行く",
     "Access key" : "アクセスキー",
     "Secret key" : "シークレットキー",
     "Builtin" : "ビルトイン",
diff --git a/core/l10n/es.js b/core/l10n/es.js
index fd8df5f6c2f9340c24eb374b60c4a31433697590..2967d07b3d04f36e4837dbaab051542bdf8c6d34 100644
--- a/core/l10n/es.js
+++ b/core/l10n/es.js
@@ -8,13 +8,20 @@ OC.L10N.register(
     "Maintenance mode is kept active" : "El modo mantenimiento aún está activo.",
     "Updating database schema" : "Actualizando el esquema del base de datos",
     "Updated database" : "Base de datos actualizada",
+    "Checking whether the database schema can be updated (this can take a long time depending on the database size)" : "Comprobar si se puede actualizar el esquema de la base de datos (esto puede tardar bastante tiempo, dependiendo del tamaño de la base de datos)",
     "Checked database schema update" : "Actualización del esquema de base de datos revisado",
+    "Checking updates of apps" : "Comprobar actualizaciones de apps",
+    "Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)" : "Comprobar si se puede actualizar el esquema de la base de datos %s (esto puede tardar bastante tiempo, dependiendo del tamaño de la base de datos)",
     "Checked database schema update for apps" : "Comprobada la actualización del esquema de la base de datos para aplicaciones",
     "Updated \"%s\" to %s" : "Se ha actualizado \"%s\" a %s",
     "Repair warning: " : "Advertencia de reparación:",
     "Repair error: " : "Error que reparar:",
     "Set log level to debug - current level: \"%s\"" : "Establecer nivel de registro para depurar - nivel actual: \"%s\"",
     "Reset log level to  \"%s\"" : "Restablecer nivel de registro a \"%s\"",
+    "Starting code integrity check" : "Comenzando comprobación de integridad de código",
+    "Finished code integrity check" : "Terminando comprobación de integridad de código",
+    "%s (3rdparty)" : "%s (tercer parte)",
+    "%s (incompatible)" : "%s (incompatible)",
     "Following apps have been disabled: %s" : "Siguiendo aplicaciones ha sido deshabilitado: %s",
     "Already up to date" : "Ya actualizado",
     "File is too big" : "El archivo es demasiado grande",
@@ -256,6 +263,7 @@ OC.L10N.register(
     "Please try again or contact your administrator." : "Por favor reintente nuevamente o contáctese con su administrador.",
     "Log in" : "Ingresar",
     "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Restablecerla?",
+    "Wrong password." : "Contraseña incorrecta.",
     "Stay logged in" : "Permanecer autenticado",
     "Alternative Logins" : "Inicios de sesión alternativos",
     "This ownCloud instance is currently in single user mode." : "Esta instalación de ownCloud se encuentra en modo de usuario único.",
diff --git a/core/l10n/es.json b/core/l10n/es.json
index a3ad1e2a9a4dad8328fe5d2edf9b2c73682dbb2c..d7350cc3333bf35ee7c3fa64274577d141772da4 100644
--- a/core/l10n/es.json
+++ b/core/l10n/es.json
@@ -6,13 +6,20 @@
     "Maintenance mode is kept active" : "El modo mantenimiento aún está activo.",
     "Updating database schema" : "Actualizando el esquema del base de datos",
     "Updated database" : "Base de datos actualizada",
+    "Checking whether the database schema can be updated (this can take a long time depending on the database size)" : "Comprobar si se puede actualizar el esquema de la base de datos (esto puede tardar bastante tiempo, dependiendo del tamaño de la base de datos)",
     "Checked database schema update" : "Actualización del esquema de base de datos revisado",
+    "Checking updates of apps" : "Comprobar actualizaciones de apps",
+    "Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)" : "Comprobar si se puede actualizar el esquema de la base de datos %s (esto puede tardar bastante tiempo, dependiendo del tamaño de la base de datos)",
     "Checked database schema update for apps" : "Comprobada la actualización del esquema de la base de datos para aplicaciones",
     "Updated \"%s\" to %s" : "Se ha actualizado \"%s\" a %s",
     "Repair warning: " : "Advertencia de reparación:",
     "Repair error: " : "Error que reparar:",
     "Set log level to debug - current level: \"%s\"" : "Establecer nivel de registro para depurar - nivel actual: \"%s\"",
     "Reset log level to  \"%s\"" : "Restablecer nivel de registro a \"%s\"",
+    "Starting code integrity check" : "Comenzando comprobación de integridad de código",
+    "Finished code integrity check" : "Terminando comprobación de integridad de código",
+    "%s (3rdparty)" : "%s (tercer parte)",
+    "%s (incompatible)" : "%s (incompatible)",
     "Following apps have been disabled: %s" : "Siguiendo aplicaciones ha sido deshabilitado: %s",
     "Already up to date" : "Ya actualizado",
     "File is too big" : "El archivo es demasiado grande",
@@ -254,6 +261,7 @@
     "Please try again or contact your administrator." : "Por favor reintente nuevamente o contáctese con su administrador.",
     "Log in" : "Ingresar",
     "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Restablecerla?",
+    "Wrong password." : "Contraseña incorrecta.",
     "Stay logged in" : "Permanecer autenticado",
     "Alternative Logins" : "Inicios de sesión alternativos",
     "This ownCloud instance is currently in single user mode." : "Esta instalación de ownCloud se encuentra en modo de usuario único.",
diff --git a/core/l10n/ja.js b/core/l10n/ja.js
index 9d700b71d2570db3c7ef8a8b78698bced78ea46d..f2874659f679cbfd4561b1c7464cd2fa283d0053 100644
--- a/core/l10n/ja.js
+++ b/core/l10n/ja.js
@@ -18,6 +18,8 @@ OC.L10N.register(
     "Repair error: " : "修復エラー:",
     "Set log level to debug - current level: \"%s\"" : "ログレベルをデバッグにセットします - 現在のレベル: \"%s\"",
     "Reset log level to  \"%s\"" : "ログレベルを \"%s\" にリセットします。",
+    "Starting code integrity check" : "コード整合性の確認を開始",
+    "Finished code integrity check" : "コード整合性の確認が終了",
     "%s (3rdparty)" : "%s (サードパーティー)",
     "%s (incompatible)" : "%s (非互換)",
     "Following apps have been disabled: %s" : "以下のアプリが無効にされています: %s",
@@ -77,6 +79,7 @@ OC.L10N.register(
     "Oct." : "10月",
     "Nov." : "11月",
     "Dec." : "12月",
+    "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">コード整合性の確認で問題が発生しました。詳しくはこちら…</a>",
     "Settings" : "設定",
     "Saving..." : "保存中...",
     "seconds ago" : "数秒前",
@@ -116,6 +119,7 @@ OC.L10N.register(
     "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "ご利用のPHPのバージョン ({version}) は、<a href=\"{phpLink}\">PHPでサポート</a> されていません。 我々は、PHPから提供されている新しいバージョンにアップグレードし、それによるセキュリティの確保とパフォーマンスのメリットを受けられることを強くお勧めします。",
     "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "リバースプロキシのヘッダー設定が間違っているか、または信頼されたプロキシからownCloudにアクセスしていません。もし、信頼されたプロキシからアクセスしているのでないなら、セキュリティに問題があり、ownCloudを詐称したIPアドレスから攻撃者に対して見えるよう許可していることになります。詳細な情報は、<a href=\"{docLink}\">ドキュメント</a>を確認してください。",
     "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached は分散キャッシュとして設定されていますが、間違った\"memcache\"のPHPモジュールがインストールされています。  \\OC\\Memcache\\Memcached は、\"memcached\" のみをサポートしていますが、\"memcache\" ではありません。<a href=\"{wikiLink}\">memcached wiki で両方のモジュール</a> を見てください。",
+    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "いくつかのファイルで整合性の確認が取れませんでした。この問題を解決するための詳細情報が<a href=\"{docLink}\">ドキュメント</a>にあります｡ (<a href=\"{codeIntegrityDownloadEndpoint}\">不適正ファイルのリスト…</a> / <a href=\"{rescanEndpoint}\">再スキャン…</a>)",
     "Error occurred while checking server setup" : "サーバー設定のチェック中にエラーが発生しました",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" HTTP ヘッダは \"{expected}\" に設定されていません。これは潜在的なセキュリティリスクもしくはプライバシーリスクとなる可能性があるため、この設定を見直すことをおすすめします。",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "\"Strict-Transport-Security\" HTTP ヘッダが最小値の \"{seconds}\" 秒に設定されていません。 セキュリティを強化するため、<a href=\"{docUrl}\">security tips</a>を参照して、HSTS を有効にすることをおすすめします。",
@@ -187,6 +191,7 @@ OC.L10N.register(
     "Couldn't reset password because the token is invalid" : "トークンが無効なため、パスワードをリセットできませんでした",
     "Couldn't reset password because the token is expired" : "トークンが期限切れのため、パスワードをリセットできませんでした",
     "Couldn't send reset email. Please make sure your username is correct." : "リセットメールを送信できませんでした。ユーザー名が正しいことを確認してください。",
+    "Could not send reset email because there is no email address for this username. Please contact your administrator." : "このユーザー名に紐付けられたメールアドレスがないため、リセットメールを送信できませんでした。管理者に問い合わせてください。",
     "%s password reset" : "%s パスワードリセット",
     "Use the following link to reset your password: {link}" : "パスワードをリセットするには次のリンクをクリックしてください: {link}",
     "New password" : "新しいパスワードを入力",
diff --git a/core/l10n/ja.json b/core/l10n/ja.json
index 68930ad01c3ac2e69637c3878e4f634ee86b50f5..8b1b077361b4b3cd5da1d67801504c55713aae22 100644
--- a/core/l10n/ja.json
+++ b/core/l10n/ja.json
@@ -16,6 +16,8 @@
     "Repair error: " : "修復エラー:",
     "Set log level to debug - current level: \"%s\"" : "ログレベルをデバッグにセットします - 現在のレベル: \"%s\"",
     "Reset log level to  \"%s\"" : "ログレベルを \"%s\" にリセットします。",
+    "Starting code integrity check" : "コード整合性の確認を開始",
+    "Finished code integrity check" : "コード整合性の確認が終了",
     "%s (3rdparty)" : "%s (サードパーティー)",
     "%s (incompatible)" : "%s (非互換)",
     "Following apps have been disabled: %s" : "以下のアプリが無効にされています: %s",
@@ -75,6 +77,7 @@
     "Oct." : "10月",
     "Nov." : "11月",
     "Dec." : "12月",
+    "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">コード整合性の確認で問題が発生しました。詳しくはこちら…</a>",
     "Settings" : "設定",
     "Saving..." : "保存中...",
     "seconds ago" : "数秒前",
@@ -114,6 +117,7 @@
     "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "ご利用のPHPのバージョン ({version}) は、<a href=\"{phpLink}\">PHPでサポート</a> されていません。 我々は、PHPから提供されている新しいバージョンにアップグレードし、それによるセキュリティの確保とパフォーマンスのメリットを受けられることを強くお勧めします。",
     "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "リバースプロキシのヘッダー設定が間違っているか、または信頼されたプロキシからownCloudにアクセスしていません。もし、信頼されたプロキシからアクセスしているのでないなら、セキュリティに問題があり、ownCloudを詐称したIPアドレスから攻撃者に対して見えるよう許可していることになります。詳細な情報は、<a href=\"{docLink}\">ドキュメント</a>を確認してください。",
     "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached は分散キャッシュとして設定されていますが、間違った\"memcache\"のPHPモジュールがインストールされています。  \\OC\\Memcache\\Memcached は、\"memcached\" のみをサポートしていますが、\"memcache\" ではありません。<a href=\"{wikiLink}\">memcached wiki で両方のモジュール</a> を見てください。",
+    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "いくつかのファイルで整合性の確認が取れませんでした。この問題を解決するための詳細情報が<a href=\"{docLink}\">ドキュメント</a>にあります｡ (<a href=\"{codeIntegrityDownloadEndpoint}\">不適正ファイルのリスト…</a> / <a href=\"{rescanEndpoint}\">再スキャン…</a>)",
     "Error occurred while checking server setup" : "サーバー設定のチェック中にエラーが発生しました",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" HTTP ヘッダは \"{expected}\" に設定されていません。これは潜在的なセキュリティリスクもしくはプライバシーリスクとなる可能性があるため、この設定を見直すことをおすすめします。",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "\"Strict-Transport-Security\" HTTP ヘッダが最小値の \"{seconds}\" 秒に設定されていません。 セキュリティを強化するため、<a href=\"{docUrl}\">security tips</a>を参照して、HSTS を有効にすることをおすすめします。",
@@ -185,6 +189,7 @@
     "Couldn't reset password because the token is invalid" : "トークンが無効なため、パスワードをリセットできませんでした",
     "Couldn't reset password because the token is expired" : "トークンが期限切れのため、パスワードをリセットできませんでした",
     "Couldn't send reset email. Please make sure your username is correct." : "リセットメールを送信できませんでした。ユーザー名が正しいことを確認してください。",
+    "Could not send reset email because there is no email address for this username. Please contact your administrator." : "このユーザー名に紐付けられたメールアドレスがないため、リセットメールを送信できませんでした。管理者に問い合わせてください。",
     "%s password reset" : "%s パスワードリセット",
     "Use the following link to reset your password: {link}" : "パスワードをリセットするには次のリンクをクリックしてください: {link}",
     "New password" : "新しいパスワードを入力",
diff --git a/lib/l10n/ja.js b/lib/l10n/ja.js
index 21375b53925d5049dc64013a972233953758827c..b21abe31b4e871460e0b0aaec357ad59c3e73ad5 100644
--- a/lib/l10n/ja.js
+++ b/lib/l10n/ja.js
@@ -147,6 +147,10 @@ OC.L10N.register(
     "Data directory (%s) is invalid" : "データディレクトリ (%s) は無効です",
     "Please check that the data directory contains a file \".ocdata\" in its root." : "データディレクトリに \".ocdata\" ファイルが含まれていることを確認してください。",
     "Could not obtain lock type %d on \"%s\"." : "\"%s\" で %d タイプのロックを取得できませんでした。",
-    "Storage not available" : "ストレージが利用できません"
+    "Storage unauthorized. %s" : "権限のないストレージです。 %s",
+    "Storage incomplete configuration. %s" : "設定が未完了のストレージです。 %s",
+    "Storage connection error. %s" : "ストレージへの接続エラー｡ %s",
+    "Storage not available" : "ストレージが利用できません",
+    "Storage connection timeout. %s" : "ストレージへの接続がタイムアウト。 %s"
 },
 "nplurals=1; plural=0;");
diff --git a/lib/l10n/ja.json b/lib/l10n/ja.json
index 204eb63787b86a08da6c8b0c96c784d792c6fe70..acc0911859224346f3722efa3b727565e22e9720 100644
--- a/lib/l10n/ja.json
+++ b/lib/l10n/ja.json
@@ -145,6 +145,10 @@
     "Data directory (%s) is invalid" : "データディレクトリ (%s) は無効です",
     "Please check that the data directory contains a file \".ocdata\" in its root." : "データディレクトリに \".ocdata\" ファイルが含まれていることを確認してください。",
     "Could not obtain lock type %d on \"%s\"." : "\"%s\" で %d タイプのロックを取得できませんでした。",
-    "Storage not available" : "ストレージが利用できません"
+    "Storage unauthorized. %s" : "権限のないストレージです。 %s",
+    "Storage incomplete configuration. %s" : "設定が未完了のストレージです。 %s",
+    "Storage connection error. %s" : "ストレージへの接続エラー｡ %s",
+    "Storage not available" : "ストレージが利用できません",
+    "Storage connection timeout. %s" : "ストレージへの接続がタイムアウト。 %s"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
index e7ea47e6b7d36f49f8183c7c2fd59a035bf9fdc0..9949b4f7d8e0adece67ef96f83780cc1186af83d 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -191,6 +191,7 @@ OC.L10N.register(
     "More" : "Mais",
     "Less" : "Menos",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "O arquivo de log é maior que 100 MB. Baixar esse arquivo requer algum tempo!",
+    "What to log" : "O que colocar no log",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite é usada como base de dados. Para instalações maiores recomendamos mudar para um backend de banco de dados diferente.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Especialmente quando se utiliza o cliente de desktop para sincronização de arquivos o uso de SQLite é desencorajado.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Para migrar para outro banco de dados usar a ferramenta de linha de comando: 'db occ: converter-type', verifique a <a target=\"_blank\" href=\"%s\">documentação ↗</a>.",
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
index 89fd6bbbb19cd09a0c99a39245bdf0648a6b554b..6cb18294c066cd224dcb55fcc194db9ce26c22f7 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -189,6 +189,7 @@
     "More" : "Mais",
     "Less" : "Menos",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "O arquivo de log é maior que 100 MB. Baixar esse arquivo requer algum tempo!",
+    "What to log" : "O que colocar no log",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite é usada como base de dados. Para instalações maiores recomendamos mudar para um backend de banco de dados diferente.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Especialmente quando se utiliza o cliente de desktop para sincronização de arquivos o uso de SQLite é desencorajado.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Para migrar para outro banco de dados usar a ferramenta de linha de comando: 'db occ: converter-type', verifique a <a target=\"_blank\" href=\"%s\">documentação ↗</a>.",