diff --git a/apps/encryption/l10n/ja.js b/apps/encryption/l10n/ja.js
index 3919997ed6..f76b215fe1 100644
--- a/apps/encryption/l10n/ja.js
+++ b/apps/encryption/l10n/ja.js
@@ -16,7 +16,7 @@ OC.L10N.register(
     "Could not change the password. Maybe the old password was not correct." : "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。",
     "Recovery Key disabled" : "復旧キーが無効になりました。",
     "Recovery Key enabled" : "復旧キーが有効になりました。",
-    "Could not enable the recovery key, please try again or contact your administrator" : "復旧キーを有効化できませんでした。もう一度試してみるか、管理者に連絡してください。",
+    "Could not enable the recovery key, please try again or contact your administrator" : "復旧キーを有効化できませんでした。もう一度試してみるか、管理者に問い合わせてください。",
     "Could not update the private key password." : "秘密鍵のパスワードを更新できませんでした。",
     "The old password was not correct, please try again." : "古いパスワードが一致しませんでした。もう一度入力してください。",
     "The current log-in password was not correct, please try again." : "ログインパスワードが一致しませんでした。もう一度入力してください。",
diff --git a/apps/encryption/l10n/ja.json b/apps/encryption/l10n/ja.json
index c8f65e0d7b..58b32ebdd2 100644
--- a/apps/encryption/l10n/ja.json
+++ b/apps/encryption/l10n/ja.json
@@ -14,7 +14,7 @@
     "Could not change the password. Maybe the old password was not correct." : "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。",
     "Recovery Key disabled" : "復旧キーが無効になりました。",
     "Recovery Key enabled" : "復旧キーが有効になりました。",
-    "Could not enable the recovery key, please try again or contact your administrator" : "復旧キーを有効化できませんでした。もう一度試してみるか、管理者に連絡してください。",
+    "Could not enable the recovery key, please try again or contact your administrator" : "復旧キーを有効化できませんでした。もう一度試してみるか、管理者に問い合わせてください。",
     "Could not update the private key password." : "秘密鍵のパスワードを更新できませんでした。",
     "The old password was not correct, please try again." : "古いパスワードが一致しませんでした。もう一度入力してください。",
     "The current log-in password was not correct, please try again." : "ログインパスワードが一致しませんでした。もう一度入力してください。",
diff --git a/apps/files/l10n/da.js b/apps/files/l10n/da.js
index af8367560d..e039bddf6a 100644
--- a/apps/files/l10n/da.js
+++ b/apps/files/l10n/da.js
@@ -48,6 +48,7 @@ OC.L10N.register(
     "Pending" : "Afventer",
     "Unable to determine date" : "Kan ikke fastslå datoen",
     "This operation is forbidden" : "Denne operation er forbudt",
+    "This directory is unavailable, please check the logs or contact the administrator" : "Denne mappe er utilgængelig - tjek venligst loggene eller kontakt administratoren",
     "Error moving file." : "Fejl ved flytning af fil",
     "Error moving file" : "Fejl ved flytning af fil",
     "Error" : "Fejl",
diff --git a/apps/files/l10n/da.json b/apps/files/l10n/da.json
index 44c2f7aafe..f8e5b4af45 100644
--- a/apps/files/l10n/da.json
+++ b/apps/files/l10n/da.json
@@ -46,6 +46,7 @@
     "Pending" : "Afventer",
     "Unable to determine date" : "Kan ikke fastslå datoen",
     "This operation is forbidden" : "Denne operation er forbudt",
+    "This directory is unavailable, please check the logs or contact the administrator" : "Denne mappe er utilgængelig - tjek venligst loggene eller kontakt administratoren",
     "Error moving file." : "Fejl ved flytning af fil",
     "Error moving file" : "Fejl ved flytning af fil",
     "Error" : "Fejl",
diff --git a/apps/files/l10n/et_EE.js b/apps/files/l10n/et_EE.js
index 1bf4a0a5aa..bf9e8574c2 100644
--- a/apps/files/l10n/et_EE.js
+++ b/apps/files/l10n/et_EE.js
@@ -63,11 +63,13 @@ OC.L10N.register(
     "_Uploading %n file_::_Uploading %n files_" : ["Laadin üles %n faili","Laadin üles %n faili"],
     "\"{name}\" is an invalid file name." : "\"{name}\" on vigane failinimi.",
     "File name cannot be empty." : "Faili nimi ei saa olla tühi.",
+    "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} andmemaht on täis! Faile ei uuendata ega sünkroniseerita!",
     "Your storage is full, files can not be updated or synced anymore!" : "Sinu andmemaht on täis! Faile ei uuendata ega sünkroniseerita!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Su andmemaht on peaaegu täis ({usedSpacePercent}%)",
     "{dirs} and {files}" : "{dirs} ja {files}",
     "Favorited" : "Lemmikud",
     "Favorite" : "Lemmik",
+    "An error occurred while trying to update the tags" : "Siltide uuendamisel tekkis tõrge",
     "A new file or folder has been <strong>created</strong>" : "Uus fail või kataloog on <strong>loodud</strong>",
     "A file or folder has been <strong>changed</strong>" : "Fail või kataloog on <strong>muudetud</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Fail või kataloog on <strong>kustutatud</strong>",
@@ -88,6 +90,7 @@ OC.L10N.register(
     "Maximum upload size" : "Maksimaalne üleslaadimise suurus",
     "max. possible: " : "maks. võimalik: ",
     "Save" : "Salvesta",
+    "Can not be edited from here due to insufficient permissions." : "Ei saa õiguste puudumise tõttu muuta.",
     "Settings" : "Seaded",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Kasuta seda aadressi <a href=\"%s\" target=\"_blank\">oma failidele ligipääsuks WebDAV kaudu</a>",
diff --git a/apps/files/l10n/et_EE.json b/apps/files/l10n/et_EE.json
index d7b1703dfc..40fa7efca6 100644
--- a/apps/files/l10n/et_EE.json
+++ b/apps/files/l10n/et_EE.json
@@ -61,11 +61,13 @@
     "_Uploading %n file_::_Uploading %n files_" : ["Laadin üles %n faili","Laadin üles %n faili"],
     "\"{name}\" is an invalid file name." : "\"{name}\" on vigane failinimi.",
     "File name cannot be empty." : "Faili nimi ei saa olla tühi.",
+    "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} andmemaht on täis! Faile ei uuendata ega sünkroniseerita!",
     "Your storage is full, files can not be updated or synced anymore!" : "Sinu andmemaht on täis! Faile ei uuendata ega sünkroniseerita!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Su andmemaht on peaaegu täis ({usedSpacePercent}%)",
     "{dirs} and {files}" : "{dirs} ja {files}",
     "Favorited" : "Lemmikud",
     "Favorite" : "Lemmik",
+    "An error occurred while trying to update the tags" : "Siltide uuendamisel tekkis tõrge",
     "A new file or folder has been <strong>created</strong>" : "Uus fail või kataloog on <strong>loodud</strong>",
     "A file or folder has been <strong>changed</strong>" : "Fail või kataloog on <strong>muudetud</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Fail või kataloog on <strong>kustutatud</strong>",
@@ -86,6 +88,7 @@
     "Maximum upload size" : "Maksimaalne üleslaadimise suurus",
     "max. possible: " : "maks. võimalik: ",
     "Save" : "Salvesta",
+    "Can not be edited from here due to insufficient permissions." : "Ei saa õiguste puudumise tõttu muuta.",
     "Settings" : "Seaded",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Kasuta seda aadressi <a href=\"%s\" target=\"_blank\">oma failidele ligipääsuks WebDAV kaudu</a>",
diff --git a/apps/files/l10n/ja.js b/apps/files/l10n/ja.js
index 6aae198aac..154fc6d210 100644
--- a/apps/files/l10n/ja.js
+++ b/apps/files/l10n/ja.js
@@ -48,6 +48,7 @@ OC.L10N.register(
     "Pending" : "中断",
     "Unable to determine date" : "更新日不明",
     "This operation is forbidden" : "この操作は禁止されています",
+    "This directory is unavailable, please check the logs or contact the administrator" : "このディレクトリは利用できません。ログを確認するか管理者に問い合わせてください。",
     "Error moving file." : "ファイル移動でエラー",
     "Error moving file" : "ファイルの移動エラー",
     "Error" : "エラー",
diff --git a/apps/files/l10n/ja.json b/apps/files/l10n/ja.json
index 675edbb697..e82b9dfc98 100644
--- a/apps/files/l10n/ja.json
+++ b/apps/files/l10n/ja.json
@@ -46,6 +46,7 @@
     "Pending" : "中断",
     "Unable to determine date" : "更新日不明",
     "This operation is forbidden" : "この操作は禁止されています",
+    "This directory is unavailable, please check the logs or contact the administrator" : "このディレクトリは利用できません。ログを確認するか管理者に問い合わせてください。",
     "Error moving file." : "ファイル移動でエラー",
     "Error moving file" : "ファイルの移動エラー",
     "Error" : "エラー",
diff --git a/apps/files_external/l10n/ar.js b/apps/files_external/l10n/ar.js
index a4ded22fae..174b0d1d54 100644
--- a/apps/files_external/l10n/ar.js
+++ b/apps/files_external/l10n/ar.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "files_external",
     {
+    "Local" : "محلي",
     "Location" : "المكان",
     "Key" : "المفتاح",
     "Secret" : "سر",
diff --git a/apps/files_external/l10n/ar.json b/apps/files_external/l10n/ar.json
index 8900ee04f9..582813959d 100644
--- a/apps/files_external/l10n/ar.json
+++ b/apps/files_external/l10n/ar.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Local" : "محلي",
     "Location" : "المكان",
     "Key" : "المفتاح",
     "Secret" : "سر",
diff --git a/apps/files_sharing/l10n/da.js b/apps/files_sharing/l10n/da.js
index a31e6363f2..d066f010f5 100644
--- a/apps/files_sharing/l10n/da.js
+++ b/apps/files_sharing/l10n/da.js
@@ -40,6 +40,8 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s delt %1$s med dig",
     "You shared %1$s via link" : "Du delte %1$s via link",
     "Shares" : "Delt",
+    "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med mig gennem min #ownCloud Federated Cloud ID, se %s",
+    "Share with me through my #ownCloud Federated Cloud ID" : "Del med mig gennem min #ownCloud Federated Cloud ID",
     "This share is password-protected" : "Delingen er beskyttet af kodeord",
     "The password is wrong. Try again." : "Kodeordet er forkert. Prøv igen.",
     "Password" : "Kodeord",
@@ -61,8 +63,10 @@ OC.L10N.register(
     "Allow users on this server to send shares to other servers" : "Tillad brugere på denne server, at sende delinger til andre servere",
     "Allow users on this server to receive shares from other servers" : "Tillad brugere på denne server, at modtage delinger fra andre servere",
     "Federated Cloud" : "Federated Cloud",
+    "Your Federated Cloud ID:" : "Din Federated Cloud ID:",
     "Share it:" : "Del:",
     "Add it to your website:" : "Tilføj den til din hjemmeside:",
+    "Share with me via ownCloud" : "Del med mig gennem ownCloud",
     "HTML Code:" : "HTMLkode:"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/da.json b/apps/files_sharing/l10n/da.json
index b91fbf21eb..7f4ac9290d 100644
--- a/apps/files_sharing/l10n/da.json
+++ b/apps/files_sharing/l10n/da.json
@@ -38,6 +38,8 @@
     "%2$s shared %1$s with you" : "%2$s delt %1$s med dig",
     "You shared %1$s via link" : "Du delte %1$s via link",
     "Shares" : "Delt",
+    "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med mig gennem min #ownCloud Federated Cloud ID, se %s",
+    "Share with me through my #ownCloud Federated Cloud ID" : "Del med mig gennem min #ownCloud Federated Cloud ID",
     "This share is password-protected" : "Delingen er beskyttet af kodeord",
     "The password is wrong. Try again." : "Kodeordet er forkert. Prøv igen.",
     "Password" : "Kodeord",
@@ -59,8 +61,10 @@
     "Allow users on this server to send shares to other servers" : "Tillad brugere på denne server, at sende delinger til andre servere",
     "Allow users on this server to receive shares from other servers" : "Tillad brugere på denne server, at modtage delinger fra andre servere",
     "Federated Cloud" : "Federated Cloud",
+    "Your Federated Cloud ID:" : "Din Federated Cloud ID:",
     "Share it:" : "Del:",
     "Add it to your website:" : "Tilføj den til din hjemmeside:",
+    "Share with me via ownCloud" : "Del med mig gennem ownCloud",
     "HTML Code:" : "HTMLkode:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/ja.js b/apps/files_sharing/l10n/ja.js
index dde011c8b4..2e82cc5f40 100644
--- a/apps/files_sharing/l10n/ja.js
+++ b/apps/files_sharing/l10n/ja.js
@@ -59,6 +59,7 @@ OC.L10N.register(
     "Federated Cloud Sharing" : "統合されたクラウド共有",
     "Open documentation" : "ドキュメントを開く",
     "Allow users on this server to send shares to other servers" : "ユーザーがこのサーバーから他のサーバーに共有することを許可する",
-    "Allow users on this server to receive shares from other servers" : "ユーザーが他のサーバーからこのサーバーに共有することを許可する"
+    "Allow users on this server to receive shares from other servers" : "ユーザーが他のサーバーからこのサーバーに共有することを許可する",
+    "HTML Code:" : "HTMLコード:"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_sharing/l10n/ja.json b/apps/files_sharing/l10n/ja.json
index 76d8d8e896..3358379726 100644
--- a/apps/files_sharing/l10n/ja.json
+++ b/apps/files_sharing/l10n/ja.json
@@ -57,6 +57,7 @@
     "Federated Cloud Sharing" : "統合されたクラウド共有",
     "Open documentation" : "ドキュメントを開く",
     "Allow users on this server to send shares to other servers" : "ユーザーがこのサーバーから他のサーバーに共有することを許可する",
-    "Allow users on this server to receive shares from other servers" : "ユーザーが他のサーバーからこのサーバーに共有することを許可する"
+    "Allow users on this server to receive shares from other servers" : "ユーザーが他のサーバーからこのサーバーに共有することを許可する",
+    "HTML Code:" : "HTMLコード:"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/da.js b/apps/user_ldap/l10n/da.js
index d029ed1b99..a4fb384b2f 100644
--- a/apps/user_ldap/l10n/da.js
+++ b/apps/user_ldap/l10n/da.js
@@ -78,6 +78,7 @@ OC.L10N.register(
     "Verify settings" : "Verificér indstillinger",
     "1. Server" : "1. server",
     "%s. Server:" : "%s. server:",
+    "Add a new and blank configuration" : "Tilføj en ny og tom konfiguration",
     "Copy current configuration into new directory binding" : "Kopiér nuværende konfiguration ind i en ny mappetildeling",
     "Delete the current configuration" : "Slet den aktuelle konfiguration",
     "Host" : "Vært",
diff --git a/apps/user_ldap/l10n/da.json b/apps/user_ldap/l10n/da.json
index 28bcfad508..48611afbce 100644
--- a/apps/user_ldap/l10n/da.json
+++ b/apps/user_ldap/l10n/da.json
@@ -76,6 +76,7 @@
     "Verify settings" : "Verificér indstillinger",
     "1. Server" : "1. server",
     "%s. Server:" : "%s. server:",
+    "Add a new and blank configuration" : "Tilføj en ny og tom konfiguration",
     "Copy current configuration into new directory binding" : "Kopiér nuværende konfiguration ind i en ny mappetildeling",
     "Delete the current configuration" : "Slet den aktuelle konfiguration",
     "Host" : "Vært",
diff --git a/apps/user_ldap/l10n/et_EE.js b/apps/user_ldap/l10n/et_EE.js
index cfe06cf0d6..1e0057c2f4 100644
--- a/apps/user_ldap/l10n/et_EE.js
+++ b/apps/user_ldap/l10n/et_EE.js
@@ -10,15 +10,21 @@ OC.L10N.register(
     "No configuration specified" : "Seadistust pole määratletud",
     "No data specified" : "Andmeid pole määratletud",
     " Could not set configuration %s" : "Ei suutnud seadistada %s",
+    "Action does not exist" : "Toimingut pole olemas",
+    "The Base DN appears to be wrong" : "Näib, et Base DN on vale",
     "Configuration incorrect" : "Seadistus on vigane",
     "Configuration incomplete" : "Seadistus on puudulik",
     "Configuration OK" : "Seadistus on korras",
     "Select groups" : "Vali grupid",
     "Select object classes" : "Vali objekti klassid",
+    "Please check the credentials, they seem to be wrong." : "Palu nkontrolli kasutajaandmeid, need näivad olevat valed.",
     "{nthServer}. Server" : "{nthServer}. Server",
+    "More than 1.000 directory entries available." : "Saadaval on rohkem kui 1000 kataloogi sissekannet.",
     "Do you really want to delete the current Server Configuration?" : "Oled kindel, et tahad kustutada praegust serveri seadistust?",
     "Confirm Deletion" : "Kinnita kustutamine",
+    "Mode switch" : "Režiimi lüliti",
     "Select attributes" : "Vali atribuudid",
+    "User found and settings verified." : "Kasutaja leiti ja seaded on kontrollitud.",
     "_%s group found_::_%s groups found_" : ["%s grupp leitud","%s gruppi leitud"],
     "_%s user found_::_%s users found_" : ["%s kasutaja leitud","%s kasutajat leitud"],
     "Could not find the desired feature" : "Ei suuda leida soovitud funktsioonaalsust",
@@ -29,20 +35,35 @@ OC.L10N.register(
     "Test Configuration" : "Testi seadistust",
     "Help" : "Abiinfo",
     "Groups meeting these criteria are available in %s:" : "Kriteeriumiga sobivad grupid on saadaval %s:",
+    "Only these object classes:" : "Ainult neid objektide klasse:",
+    "Only from these groups:" : "Ainult neist gruppidest:",
+    "Search groups" : "Otsi gruppe",
+    "Available groups" : "Saadaolevad grupid",
+    "Selected groups" : "Validut grupid",
+    "Edit LDAP Query" : "Muuda LDAP päringut",
+    "LDAP Filter:" : "LDAP filter:",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filter määrab millised LDAP grupid saavad ligipääsu sellele %s instantsile.",
+    "Verify settings and count groups" : "Kontrolli seadeid ja loe grupid üle",
     "Other Attributes:" : "Muud atribuudid:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Määrab sisselogimisel kasutatava filtri. %%uid asendab sisselogimistegevuses kasutajanime. Näide: \"uid=%%uid\"",
+    "Test Loginname" : "Testi kasutajanime",
+    "Verify settings" : "Kontrolli seadeid",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
+    "Add a new and blank configuration" : "Lisa uus ja tühi seadistus",
+    "Delete the current configuration" : "Kustuta praegune seadistus",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Sa ei saa protokolli ära jätta, välja arvatud siis, kui sa nõuad SSL-ühendust. Sel juhul alusta eesliitega ldaps://",
     "Port" : "Port",
+    "Detect Port" : "Tuvasta port",
     "User DN" : "Kasutaja DN",
     "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "Klientkasutaja DN, kellega seotakse, nt. uid=agent,dc=näidis,dc=com. Anonüümseks ligipääsuks jäta DN ja parool tühjaks.",
     "Password" : "Parool",
     "For anonymous access, leave DN and Password empty." : "Anonüümseks ligipääsuks jäta DN ja parool tühjaks.",
     "One Base DN per line" : "Üks baas-DN rea kohta",
     "You can specify Base DN for users and groups in the Advanced tab" : "Sa saad kasutajate ja gruppide baas DN-i määrata lisavalikute vahekaardilt",
+    "Detect Base DN" : "Tuvasta Baas DN",
+    "Test Base DN" : "Testi Baas DN-i",
     "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Väldib automaatseid LDAP päringuid, Parem suurematele saitidele, aga nõuab mõningaid teadmisi LDAP kohta.",
     "Manually enter LDAP filters (recommended for large directories)" : "Sisesta LDAP filtrid automaatselt (sooitatav suurtele kataloogidele)",
     "Limit %s access to users meeting these criteria:" : "Piira %s liigpääs kriteeriumiga sobivatele kasutajatele:",
diff --git a/apps/user_ldap/l10n/et_EE.json b/apps/user_ldap/l10n/et_EE.json
index b592f01087..ea93ccb0ef 100644
--- a/apps/user_ldap/l10n/et_EE.json
+++ b/apps/user_ldap/l10n/et_EE.json
@@ -8,15 +8,21 @@
     "No configuration specified" : "Seadistust pole määratletud",
     "No data specified" : "Andmeid pole määratletud",
     " Could not set configuration %s" : "Ei suutnud seadistada %s",
+    "Action does not exist" : "Toimingut pole olemas",
+    "The Base DN appears to be wrong" : "Näib, et Base DN on vale",
     "Configuration incorrect" : "Seadistus on vigane",
     "Configuration incomplete" : "Seadistus on puudulik",
     "Configuration OK" : "Seadistus on korras",
     "Select groups" : "Vali grupid",
     "Select object classes" : "Vali objekti klassid",
+    "Please check the credentials, they seem to be wrong." : "Palu nkontrolli kasutajaandmeid, need näivad olevat valed.",
     "{nthServer}. Server" : "{nthServer}. Server",
+    "More than 1.000 directory entries available." : "Saadaval on rohkem kui 1000 kataloogi sissekannet.",
     "Do you really want to delete the current Server Configuration?" : "Oled kindel, et tahad kustutada praegust serveri seadistust?",
     "Confirm Deletion" : "Kinnita kustutamine",
+    "Mode switch" : "Režiimi lüliti",
     "Select attributes" : "Vali atribuudid",
+    "User found and settings verified." : "Kasutaja leiti ja seaded on kontrollitud.",
     "_%s group found_::_%s groups found_" : ["%s grupp leitud","%s gruppi leitud"],
     "_%s user found_::_%s users found_" : ["%s kasutaja leitud","%s kasutajat leitud"],
     "Could not find the desired feature" : "Ei suuda leida soovitud funktsioonaalsust",
@@ -27,20 +33,35 @@
     "Test Configuration" : "Testi seadistust",
     "Help" : "Abiinfo",
     "Groups meeting these criteria are available in %s:" : "Kriteeriumiga sobivad grupid on saadaval %s:",
+    "Only these object classes:" : "Ainult neid objektide klasse:",
+    "Only from these groups:" : "Ainult neist gruppidest:",
+    "Search groups" : "Otsi gruppe",
+    "Available groups" : "Saadaolevad grupid",
+    "Selected groups" : "Validut grupid",
+    "Edit LDAP Query" : "Muuda LDAP päringut",
+    "LDAP Filter:" : "LDAP filter:",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filter määrab millised LDAP grupid saavad ligipääsu sellele %s instantsile.",
+    "Verify settings and count groups" : "Kontrolli seadeid ja loe grupid üle",
     "Other Attributes:" : "Muud atribuudid:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Määrab sisselogimisel kasutatava filtri. %%uid asendab sisselogimistegevuses kasutajanime. Näide: \"uid=%%uid\"",
+    "Test Loginname" : "Testi kasutajanime",
+    "Verify settings" : "Kontrolli seadeid",
     "1. Server" : "1. Server",
     "%s. Server:" : "%s. Server:",
+    "Add a new and blank configuration" : "Lisa uus ja tühi seadistus",
+    "Delete the current configuration" : "Kustuta praegune seadistus",
     "Host" : "Host",
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Sa ei saa protokolli ära jätta, välja arvatud siis, kui sa nõuad SSL-ühendust. Sel juhul alusta eesliitega ldaps://",
     "Port" : "Port",
+    "Detect Port" : "Tuvasta port",
     "User DN" : "Kasutaja DN",
     "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "Klientkasutaja DN, kellega seotakse, nt. uid=agent,dc=näidis,dc=com. Anonüümseks ligipääsuks jäta DN ja parool tühjaks.",
     "Password" : "Parool",
     "For anonymous access, leave DN and Password empty." : "Anonüümseks ligipääsuks jäta DN ja parool tühjaks.",
     "One Base DN per line" : "Üks baas-DN rea kohta",
     "You can specify Base DN for users and groups in the Advanced tab" : "Sa saad kasutajate ja gruppide baas DN-i määrata lisavalikute vahekaardilt",
+    "Detect Base DN" : "Tuvasta Baas DN",
+    "Test Base DN" : "Testi Baas DN-i",
     "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Väldib automaatseid LDAP päringuid, Parem suurematele saitidele, aga nõuab mõningaid teadmisi LDAP kohta.",
     "Manually enter LDAP filters (recommended for large directories)" : "Sisesta LDAP filtrid automaatselt (sooitatav suurtele kataloogidele)",
     "Limit %s access to users meeting these criteria:" : "Piira %s liigpääs kriteeriumiga sobivatele kasutajatele:",
diff --git a/core/l10n/et_EE.js b/core/l10n/et_EE.js
index f02f2aebd2..b08139a1f3 100644
--- a/core/l10n/et_EE.js
+++ b/core/l10n/et_EE.js
@@ -77,6 +77,7 @@ OC.L10N.register(
     "Shared with you and the group {group} by {owner}" : "Jagatud sinu ja {group} grupiga {owner} poolt",
     "Shared with you by {owner}" : "Sinuga jagas {owner}",
     "Share with users or groups …" : "Jaga kasutajate või gruppidega ...",
+    "Share with users, groups or remote users …" : "Jaga kasutajate, gruppide või eemal olevate kasutajatega ...",
     "Share link" : "Jaga linki",
     "The public link will expire no later than {days} days after it is created" : "Avalik link aegub mitte hiljem kui pärast {days} päeva selle loomist",
     "Link" : "Link",
@@ -190,6 +191,7 @@ OC.L10N.register(
     "Finishing …" : "Lõpetamine ...",
     "Need help?" : "Vajad abi?",
     "See the documentation" : "Vaata dokumentatsiooni",
+    "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "See rakendus vajab toimimiseks JavaScripti. Palun {linkstart}luba JavaScript{linkend} ning laadi see leht uuesti.",
     "Log out" : "Logi välja",
     "Search" : "Otsi",
     "Server side authentication failed!" : "Serveripoolne autentimine ebaõnnestus!",
diff --git a/core/l10n/et_EE.json b/core/l10n/et_EE.json
index 6f4c93578b..35494783a6 100644
--- a/core/l10n/et_EE.json
+++ b/core/l10n/et_EE.json
@@ -75,6 +75,7 @@
     "Shared with you and the group {group} by {owner}" : "Jagatud sinu ja {group} grupiga {owner} poolt",
     "Shared with you by {owner}" : "Sinuga jagas {owner}",
     "Share with users or groups …" : "Jaga kasutajate või gruppidega ...",
+    "Share with users, groups or remote users …" : "Jaga kasutajate, gruppide või eemal olevate kasutajatega ...",
     "Share link" : "Jaga linki",
     "The public link will expire no later than {days} days after it is created" : "Avalik link aegub mitte hiljem kui pärast {days} päeva selle loomist",
     "Link" : "Link",
@@ -188,6 +189,7 @@
     "Finishing …" : "Lõpetamine ...",
     "Need help?" : "Vajad abi?",
     "See the documentation" : "Vaata dokumentatsiooni",
+    "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "See rakendus vajab toimimiseks JavaScripti. Palun {linkstart}luba JavaScript{linkend} ning laadi see leht uuesti.",
     "Log out" : "Logi välja",
     "Search" : "Otsi",
     "Server side authentication failed!" : "Serveripoolne autentimine ebaõnnestus!",
diff --git a/core/l10n/ja.js b/core/l10n/ja.js
index 92eb72569d..ed5dcadcb5 100644
--- a/core/l10n/ja.js
+++ b/core/l10n/ja.js
@@ -43,7 +43,7 @@ OC.L10N.register(
     "Saving..." : "保存中...",
     "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 />続けてよろしいでしょうか?",
+    "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" : "どういう操作をしているか理解しています",
     "Password can not be changed. Please contact your administrator." : "パスワードは変更できません。管理者に問い合わせてください。",
     "No" : "いいえ",
@@ -169,7 +169,7 @@ OC.L10N.register(
     "Cheers!" : "それでは！",
     "Internal Server Error" : "内部サーバエラー",
     "The server encountered an internal error and was unable to complete your request." : "サーバー内でエラーが発生したため、リクエストを完了できませんでした。",
-    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "このエラーが繰り返し表示されるようであれば、以下の技術情報を添付してサーバー管理者に報告してください。",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "このエラーが繰り返し表示されるようであれば、以下の技術情報を添付してサーバー管理者に問い合わせてください。",
     "More details can be found in the server log." : "詳細は、サーバーのログを確認してください。",
     "Technical details" : "技術詳細",
     "Remote Address: %s" : "リモートアドレス: %s",
@@ -218,10 +218,10 @@ OC.L10N.register(
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "こんにちは、<br><br>%sがあなたと »%s« を共有したことをお知らせします。<br><a href=\"%s\">それを表示</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "このownCloudインスタンスは、現在シングルユーザーモードです。",
     "This means only administrators can use the instance." : "これは、管理者のみがインスタンスを利用できることを意味しています。",
-    "Contact your system administrator if this message persists or appeared unexpectedly." : "このメッセージが引き続きもしくは予期せず現れる場合は、システム管理者に連絡してください。",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "このメッセージが引き続きもしくは予期せず現れる場合は、システム管理者に問い合わせてください。",
     "Thank you for your patience." : "しばらくお待ちください。",
     "You are accessing the server from an untrusted domain." : "信頼されていないドメインからサーバーにアクセスしています。",
-    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "管理者に連絡してください。このサーバーの管理者の場合は、\"trusted_domain\" の設定を config/config.php に設定してください。config/config.sample.php にサンプルの設定方法が記載してあります。",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "管理者に問い合わせてください。このサーバーの管理者の場合は、\"trusted_domain\" の設定を config/config.php に設定してください。config/config.sample.php にサンプルの設定方法が記載してあります。",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "環境により、下のボタンで信頼するドメインに追加する必要があるかもしれません。",
     "Add \"%s\" as trusted domain" : "\"%s\" を信頼するドメイン名に追加",
     "%s will be updated to version %s." : "%s はバージョン %s にアップデートされました。",
diff --git a/core/l10n/ja.json b/core/l10n/ja.json
index 4a92efa21f..78f68ca90b 100644
--- a/core/l10n/ja.json
+++ b/core/l10n/ja.json
@@ -41,7 +41,7 @@
     "Saving..." : "保存中...",
     "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 />続けてよろしいでしょうか?",
+    "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" : "どういう操作をしているか理解しています",
     "Password can not be changed. Please contact your administrator." : "パスワードは変更できません。管理者に問い合わせてください。",
     "No" : "いいえ",
@@ -167,7 +167,7 @@
     "Cheers!" : "それでは！",
     "Internal Server Error" : "内部サーバエラー",
     "The server encountered an internal error and was unable to complete your request." : "サーバー内でエラーが発生したため、リクエストを完了できませんでした。",
-    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "このエラーが繰り返し表示されるようであれば、以下の技術情報を添付してサーバー管理者に報告してください。",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "このエラーが繰り返し表示されるようであれば、以下の技術情報を添付してサーバー管理者に問い合わせてください。",
     "More details can be found in the server log." : "詳細は、サーバーのログを確認してください。",
     "Technical details" : "技術詳細",
     "Remote Address: %s" : "リモートアドレス: %s",
@@ -216,10 +216,10 @@
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "こんにちは、<br><br>%sがあなたと »%s« を共有したことをお知らせします。<br><a href=\"%s\">それを表示</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "このownCloudインスタンスは、現在シングルユーザーモードです。",
     "This means only administrators can use the instance." : "これは、管理者のみがインスタンスを利用できることを意味しています。",
-    "Contact your system administrator if this message persists or appeared unexpectedly." : "このメッセージが引き続きもしくは予期せず現れる場合は、システム管理者に連絡してください。",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "このメッセージが引き続きもしくは予期せず現れる場合は、システム管理者に問い合わせてください。",
     "Thank you for your patience." : "しばらくお待ちください。",
     "You are accessing the server from an untrusted domain." : "信頼されていないドメインからサーバーにアクセスしています。",
-    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "管理者に連絡してください。このサーバーの管理者の場合は、\"trusted_domain\" の設定を config/config.php に設定してください。config/config.sample.php にサンプルの設定方法が記載してあります。",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "管理者に問い合わせてください。このサーバーの管理者の場合は、\"trusted_domain\" の設定を config/config.php に設定してください。config/config.sample.php にサンプルの設定方法が記載してあります。",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "環境により、下のボタンで信頼するドメインに追加する必要があるかもしれません。",
     "Add \"%s\" as trusted domain" : "\"%s\" を信頼するドメイン名に追加",
     "%s will be updated to version %s." : "%s はバージョン %s にアップデートされました。",
diff --git a/lib/l10n/da.js b/lib/l10n/da.js
index d048063795..147a2c4024 100644
--- a/lib/l10n/da.js
+++ b/lib/l10n/da.js
@@ -45,6 +45,7 @@ OC.L10N.register(
     "File name is a reserved word" : "Filnavnet er et reserveret ord",
     "File name contains at least one invalid character" : "Filnavnet indeholder mindst ét ugyldigt tegn",
     "File name is too long" : "Filnavnet er for langt",
+    "File is currently busy, please try again later" : "Filen er i øjeblikket optaget - forsøg igen senere",
     "Can't read file" : "Kan ikke læse filen",
     "App directory already exists" : "App-mappe findes allerede",
     "Can't create app folder. Please fix permissions. %s" : "Kan ikke oprette app-mappe. Ret tilladelser. %s",
@@ -85,6 +86,7 @@ OC.L10N.register(
     "Set an admin username." : "Angiv et admin brugernavn.",
     "Set an admin password." : "Angiv et admin kodeord.",
     "Can't create or write into the data directory %s" : "Kan ikke oprette eller skrive ind i datamappen %s",
+    "Invalid Federated Cloud ID" : "Ugyldigt Federated Cloud ID",
     "%s shared »%s« with you" : "%s delte »%s« med dig",
     "%s via %s" : "%s via %s",
     "Sharing %s failed, because the backend does not allow shares from type %i" : "Deling af %s mislykkedes, fordi backenden ikke tillader delinger fra typen %i",
diff --git a/lib/l10n/da.json b/lib/l10n/da.json
index e58de5789e..14057dc10e 100644
--- a/lib/l10n/da.json
+++ b/lib/l10n/da.json
@@ -43,6 +43,7 @@
     "File name is a reserved word" : "Filnavnet er et reserveret ord",
     "File name contains at least one invalid character" : "Filnavnet indeholder mindst ét ugyldigt tegn",
     "File name is too long" : "Filnavnet er for langt",
+    "File is currently busy, please try again later" : "Filen er i øjeblikket optaget - forsøg igen senere",
     "Can't read file" : "Kan ikke læse filen",
     "App directory already exists" : "App-mappe findes allerede",
     "Can't create app folder. Please fix permissions. %s" : "Kan ikke oprette app-mappe. Ret tilladelser. %s",
@@ -83,6 +84,7 @@
     "Set an admin username." : "Angiv et admin brugernavn.",
     "Set an admin password." : "Angiv et admin kodeord.",
     "Can't create or write into the data directory %s" : "Kan ikke oprette eller skrive ind i datamappen %s",
+    "Invalid Federated Cloud ID" : "Ugyldigt Federated Cloud ID",
     "%s shared »%s« with you" : "%s delte »%s« med dig",
     "%s via %s" : "%s via %s",
     "Sharing %s failed, because the backend does not allow shares from type %i" : "Deling af %s mislykkedes, fordi backenden ikke tillader delinger fra typen %i",
diff --git a/lib/l10n/et_EE.js b/lib/l10n/et_EE.js
index 2d211f341b..0329ffd931 100644
--- a/lib/l10n/et_EE.js
+++ b/lib/l10n/et_EE.js
@@ -29,7 +29,7 @@ OC.L10N.register(
     "File name contains at least one invalid character" : "Faili nimesonvähemalt üks keelatud märk",
     "File name is too long" : "Faili nimi on liiga pikk",
     "Can't read file" : "Faili lugemine ebaõnnestus",
-    "App directory already exists" : "Rakendi kataloog on juba olemas",
+    "App directory already exists" : "Rakenduse kataloog on juba olemas",
     "Can't create app folder. Please fix permissions. %s" : "Ei saa luua rakendi kataloogi. Palun korrigeeri õigusi. %s",
     "No source specified when installing app" : "Ühegi lähteallikat pole rakendi paigalduseks määratletud",
     "No href specified when installing app from http" : "Ühtegi aadressi pole määratletud rakendi paigalduseks veebist",
diff --git a/lib/l10n/et_EE.json b/lib/l10n/et_EE.json
index c23fd35f54..f4aec4e1c5 100644
--- a/lib/l10n/et_EE.json
+++ b/lib/l10n/et_EE.json
@@ -27,7 +27,7 @@
     "File name contains at least one invalid character" : "Faili nimesonvähemalt üks keelatud märk",
     "File name is too long" : "Faili nimi on liiga pikk",
     "Can't read file" : "Faili lugemine ebaõnnestus",
-    "App directory already exists" : "Rakendi kataloog on juba olemas",
+    "App directory already exists" : "Rakenduse kataloog on juba olemas",
     "Can't create app folder. Please fix permissions. %s" : "Ei saa luua rakendi kataloogi. Palun korrigeeri õigusi. %s",
     "No source specified when installing app" : "Ühegi lähteallikat pole rakendi paigalduseks määratletud",
     "No href specified when installing app from http" : "Ühtegi aadressi pole määratletud rakendi paigalduseks veebist",
diff --git a/lib/l10n/ja.js b/lib/l10n/ja.js
index 62691dfc0f..5808a219b2 100644
--- a/lib/l10n/ja.js
+++ b/lib/l10n/ja.js
@@ -38,12 +38,14 @@ OC.L10N.register(
     "_%n minute ago_::_%n minutes ago_" : ["%n 分前"],
     "seconds ago" : "数秒前",
     "web services under your control" : "あなたが管理するウェブサービス",
+    "Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator." : "id: %sのモジュールは存在しません。アプリ設定で有効にするか、管理者に問い合わせてください。",
     "Empty filename is not allowed" : "空のファイル名は許可されていません",
     "Dot files are not allowed" : "ドットファイルは許可されていません",
     "4-byte characters are not supported in file names" : "ファイル名に4バイト文字を使用するのはサポートされていません",
     "File name is a reserved word" : "ファイル名が予約された単語です",
     "File name contains at least one invalid character" : "ファイル名に1文字以上の無効な文字が含まれています",
     "File name is too long" : "ファイル名が長すぎます",
+    "File is currently busy, please try again later" : "現在ファイルはビジーです。後でもう一度試してください。",
     "Can't read file" : "ファイルを読み込めません",
     "App directory already exists" : "アプリディレクトリはすでに存在します",
     "Can't create app folder. Please fix permissions. %s" : "アプリフォルダーを作成できませんでした。%s のパーミッションを修正してください。",
@@ -92,7 +94,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s is the item owner" : "%s の共有に失敗しました。ユーザー %s がアイテム所有者です。",
     "Sharing %s failed, because the user %s does not exist" : "%s の共有に失敗しました。ユーザー %s が存在しません。",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "%s の共有に失敗しました。ユーザー %s はどのグループにも属していません。%s は、??のメンバーです。",
-    "Sharing %s failed, because this item is already shared with %s" : "%s の共有に失敗しました。このアイテムは既に %s で共有されています。",
+    "Sharing %s failed, because this item is already shared with %s" : "%s の共有に失敗しました。このアイテムはすでに %s で共有されています。",
     "Sharing %s failed, because the group %s does not exist" : "%s の共有に失敗しました。グループ %s は存在しません。",
     "Sharing %s failed, because %s is not a member of the group %s" : "%s の共有に失敗しました。%s は、グループ %s のメンバーではありません。",
     "You need to provide a password to create a public link, only protected links are allowed" : "公開用リンクの作成にはパスワードの設定が必要です",
diff --git a/lib/l10n/ja.json b/lib/l10n/ja.json
index 9e184c5ea8..0252dd906b 100644
--- a/lib/l10n/ja.json
+++ b/lib/l10n/ja.json
@@ -36,12 +36,14 @@
     "_%n minute ago_::_%n minutes ago_" : ["%n 分前"],
     "seconds ago" : "数秒前",
     "web services under your control" : "あなたが管理するウェブサービス",
+    "Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator." : "id: %sのモジュールは存在しません。アプリ設定で有効にするか、管理者に問い合わせてください。",
     "Empty filename is not allowed" : "空のファイル名は許可されていません",
     "Dot files are not allowed" : "ドットファイルは許可されていません",
     "4-byte characters are not supported in file names" : "ファイル名に4バイト文字を使用するのはサポートされていません",
     "File name is a reserved word" : "ファイル名が予約された単語です",
     "File name contains at least one invalid character" : "ファイル名に1文字以上の無効な文字が含まれています",
     "File name is too long" : "ファイル名が長すぎます",
+    "File is currently busy, please try again later" : "現在ファイルはビジーです。後でもう一度試してください。",
     "Can't read file" : "ファイルを読み込めません",
     "App directory already exists" : "アプリディレクトリはすでに存在します",
     "Can't create app folder. Please fix permissions. %s" : "アプリフォルダーを作成できませんでした。%s のパーミッションを修正してください。",
@@ -90,7 +92,7 @@
     "Sharing %s failed, because the user %s is the item owner" : "%s の共有に失敗しました。ユーザー %s がアイテム所有者です。",
     "Sharing %s failed, because the user %s does not exist" : "%s の共有に失敗しました。ユーザー %s が存在しません。",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "%s の共有に失敗しました。ユーザー %s はどのグループにも属していません。%s は、??のメンバーです。",
-    "Sharing %s failed, because this item is already shared with %s" : "%s の共有に失敗しました。このアイテムは既に %s で共有されています。",
+    "Sharing %s failed, because this item is already shared with %s" : "%s の共有に失敗しました。このアイテムはすでに %s で共有されています。",
     "Sharing %s failed, because the group %s does not exist" : "%s の共有に失敗しました。グループ %s は存在しません。",
     "Sharing %s failed, because %s is not a member of the group %s" : "%s の共有に失敗しました。%s は、グループ %s のメンバーではありません。",
     "You need to provide a password to create a public link, only protected links are allowed" : "公開用リンクの作成にはパスワードの設定が必要です",
diff --git a/settings/l10n/da.js b/settings/l10n/da.js
index 3d93e75e86..c758c45d0f 100644
--- a/settings/l10n/da.js
+++ b/settings/l10n/da.js
@@ -186,6 +186,8 @@ OC.L10N.register(
     "Improving the config.php" : "Forbedring af config.php",
     "Theming" : "Temaer",
     "Hardening and security guidance" : "Modstanddygtighed og sikkerheds vejledning",
+    "Transactional File Locking is enabled." : "Transaktionel fillåsning er slået til.",
+    "Transactional File Locking is disabled." : "Transaktionel fillåsning er slået fra.",
     "Version" : "Version",
     "Developer documentation" : "Dokumentation for udviklere",
     "Experimental applications ahead" : "Kommende eksperimentale programmer",
diff --git a/settings/l10n/da.json b/settings/l10n/da.json
index db7da4b358..6eb722948e 100644
--- a/settings/l10n/da.json
+++ b/settings/l10n/da.json
@@ -184,6 +184,8 @@
     "Improving the config.php" : "Forbedring af config.php",
     "Theming" : "Temaer",
     "Hardening and security guidance" : "Modstanddygtighed og sikkerheds vejledning",
+    "Transactional File Locking is enabled." : "Transaktionel fillåsning er slået til.",
+    "Transactional File Locking is disabled." : "Transaktionel fillåsning er slået fra.",
     "Version" : "Version",
     "Developer documentation" : "Dokumentation for udviklere",
     "Experimental applications ahead" : "Kommende eksperimentale programmer",
diff --git a/settings/l10n/et_EE.js b/settings/l10n/et_EE.js
index 92cbcc518d..e2a018ec21 100644
--- a/settings/l10n/et_EE.js
+++ b/settings/l10n/et_EE.js
@@ -3,7 +3,9 @@ OC.L10N.register(
     {
     "APCu" : "APCu",
     "Redis" : "Redis",
+    "Security & setup warnings" : "Turva- ja paigalduse hoiatused",
     "Sharing" : "Jagamine",
+    "Server-side encryption" : "Serveripoolne krüpteerimine",
     "External Storage" : "Väline salvestuskoht",
     "Cron" : "Cron",
     "Email server" : "E-kirjade server",
@@ -47,6 +49,7 @@ OC.L10N.register(
     "Email saved" : "Kiri on salvestatud",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Oled sa kindel, et soovid lisada domeeni \"{domain}\" usaldusväärseks domeeniks?",
     "Add trusted domain" : "Lis ausaldusväärne domeen",
+    "Migration started …" : "Kolimist on alustatud ...",
     "Sending..." : "Saadan...",
     "Official" : "Ametlik",
     "Approved" : "Heaks kiidetud",
@@ -85,6 +88,7 @@ OC.L10N.register(
     "A valid username must be provided" : "Sisesta nõuetele vastav kasutajatunnus",
     "Error creating user" : "Viga kasutaja loomisel",
     "A valid password must be provided" : "Sisesta nõuetele vastav parool",
+    "A valid email must be provided" : "Sisesta kehtiv e-posti aadress",
     "__language_name__" : "Eesti",
     "Sync clients" : "Klientide sünkroniseerimine",
     "Personal info" : "Isiklik info",
@@ -119,11 +123,15 @@ OC.L10N.register(
     "Restrict users to only share with users in their groups" : "Luba kasutajatel jagada kasutajatega ainult oma grupi piires",
     "Exclude groups from sharing" : "Eemalda grupid jagamisest",
     "These groups will still be able to receive shares, but not to initiate them." : "Need grupid saavad vastu võtta jagamisi, kuid ise jagamisi algatada ei saa.",
+    "Last cron job execution: %s." : "Cron käivitati viimati %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Cron käivitati viimati %s. Midagi tunduv valesti olevat.",
     "Cron was not executed yet!" : "Cron pole kordagi käivitatud!",
     "Execute one task with each page loaded" : "Käivita toiming igal lehe laadimisel",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php on registreeritud webcron teenuses, et käivitada fail cron.php iga 15 minuti tagant üle http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Kasuta süsteemi cron teenust, et käivitada fail cron.php iga 15 minuti järel.",
+    "Enable server-side encryption" : "Luba serveripoolne krüpteerimine",
     "Enable encryption" : "Luba krüpteerimine",
+    "Select default encryption module:" : "Määra vaikimisi krüpteerimise moodul:",
     "Start migration" : "Alusta kolimist",
     "This is used for sending out notifications." : "Seda kasutatakse teadete välja saatmiseks.",
     "Send mode" : "Saatmise viis",
@@ -144,6 +152,7 @@ OC.L10N.register(
     "Download logfile" : "Laadi logifail alla",
     "More" : "Rohkem",
     "Less" : "Vähem",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Logifail on suurem kui 100 MB. Allalaadimine võib veidi aega võtta!",
     "How to do backups" : "Kuidas teha varukoopiaid",
     "Advanced monitoring" : "Lisavalikutega jälgimine",
     "Performance tuning" : "Kiiruse seadistamine",
@@ -151,6 +160,7 @@ OC.L10N.register(
     "Theming" : "Teemad",
     "Version" : "Versioon",
     "Developer documentation" : "Arendaja dokumentatsioon",
+    "Experimental applications ahead" : "Ees on katsetusjärgus rakendused",
     "by" : "lisas",
     "licensed" : "litsenseeritud",
     "Documentation:" : "Dokumentatsioon:",
@@ -200,6 +210,7 @@ OC.L10N.register(
     "Valid until" : "Kehtib kuni",
     "Issued By" : "isas",
     "Valid until %s" : "Kehtib kuni %s",
+    "Import root certificate" : "Impordi root sertifikaat",
     "Show storage location" : "Näita salvestusruumi asukohta",
     "Show last log in" : "Viimane sisselogimine",
     "Send email to new user" : "Saada uuele kasutajale e-kiri",
diff --git a/settings/l10n/et_EE.json b/settings/l10n/et_EE.json
index 3181d5dbb6..5a519eea2e 100644
--- a/settings/l10n/et_EE.json
+++ b/settings/l10n/et_EE.json
@@ -1,7 +1,9 @@
 { "translations": {
     "APCu" : "APCu",
     "Redis" : "Redis",
+    "Security & setup warnings" : "Turva- ja paigalduse hoiatused",
     "Sharing" : "Jagamine",
+    "Server-side encryption" : "Serveripoolne krüpteerimine",
     "External Storage" : "Väline salvestuskoht",
     "Cron" : "Cron",
     "Email server" : "E-kirjade server",
@@ -45,6 +47,7 @@
     "Email saved" : "Kiri on salvestatud",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Oled sa kindel, et soovid lisada domeeni \"{domain}\" usaldusväärseks domeeniks?",
     "Add trusted domain" : "Lis ausaldusväärne domeen",
+    "Migration started …" : "Kolimist on alustatud ...",
     "Sending..." : "Saadan...",
     "Official" : "Ametlik",
     "Approved" : "Heaks kiidetud",
@@ -83,6 +86,7 @@
     "A valid username must be provided" : "Sisesta nõuetele vastav kasutajatunnus",
     "Error creating user" : "Viga kasutaja loomisel",
     "A valid password must be provided" : "Sisesta nõuetele vastav parool",
+    "A valid email must be provided" : "Sisesta kehtiv e-posti aadress",
     "__language_name__" : "Eesti",
     "Sync clients" : "Klientide sünkroniseerimine",
     "Personal info" : "Isiklik info",
@@ -117,11 +121,15 @@
     "Restrict users to only share with users in their groups" : "Luba kasutajatel jagada kasutajatega ainult oma grupi piires",
     "Exclude groups from sharing" : "Eemalda grupid jagamisest",
     "These groups will still be able to receive shares, but not to initiate them." : "Need grupid saavad vastu võtta jagamisi, kuid ise jagamisi algatada ei saa.",
+    "Last cron job execution: %s." : "Cron käivitati viimati %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Cron käivitati viimati %s. Midagi tunduv valesti olevat.",
     "Cron was not executed yet!" : "Cron pole kordagi käivitatud!",
     "Execute one task with each page loaded" : "Käivita toiming igal lehe laadimisel",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php on registreeritud webcron teenuses, et käivitada fail cron.php iga 15 minuti tagant üle http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Kasuta süsteemi cron teenust, et käivitada fail cron.php iga 15 minuti järel.",
+    "Enable server-side encryption" : "Luba serveripoolne krüpteerimine",
     "Enable encryption" : "Luba krüpteerimine",
+    "Select default encryption module:" : "Määra vaikimisi krüpteerimise moodul:",
     "Start migration" : "Alusta kolimist",
     "This is used for sending out notifications." : "Seda kasutatakse teadete välja saatmiseks.",
     "Send mode" : "Saatmise viis",
@@ -142,6 +150,7 @@
     "Download logfile" : "Laadi logifail alla",
     "More" : "Rohkem",
     "Less" : "Vähem",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Logifail on suurem kui 100 MB. Allalaadimine võib veidi aega võtta!",
     "How to do backups" : "Kuidas teha varukoopiaid",
     "Advanced monitoring" : "Lisavalikutega jälgimine",
     "Performance tuning" : "Kiiruse seadistamine",
@@ -149,6 +158,7 @@
     "Theming" : "Teemad",
     "Version" : "Versioon",
     "Developer documentation" : "Arendaja dokumentatsioon",
+    "Experimental applications ahead" : "Ees on katsetusjärgus rakendused",
     "by" : "lisas",
     "licensed" : "litsenseeritud",
     "Documentation:" : "Dokumentatsioon:",
@@ -198,6 +208,7 @@
     "Valid until" : "Kehtib kuni",
     "Issued By" : "isas",
     "Valid until %s" : "Kehtib kuni %s",
+    "Import root certificate" : "Impordi root sertifikaat",
     "Show storage location" : "Näita salvestusruumi asukohta",
     "Show last log in" : "Viimane sisselogimine",
     "Send email to new user" : "Saada uuele kasutajale e-kiri",
diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js
index 2b4f4d4179..34499ded7b 100644
--- a/settings/l10n/ja.js
+++ b/settings/l10n/ja.js
@@ -30,7 +30,8 @@ OC.L10N.register(
     "Unable to change password" : "パスワードを変更できません",
     "Enabled" : "有効",
     "Not enabled" : "無効",
-    "Group already exists." : "グループは既に存在しています",
+    "Migration Completed" : "移行が完了しました",
+    "Group already exists." : "グループはすでに存在しています",
     "Unable to add group." : "グループを追加できません",
     "Unable to delete group." : "グループを削除できません",
     "log-level out of allowed range" : "ログレベルが許可された範囲を超えています",
@@ -50,7 +51,10 @@ OC.L10N.register(
     "Email saved" : "メールアドレスを保存しました",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "\"{domain}\" を信頼するドメインに追加してもよろしいでしょうか？",
     "Add trusted domain" : "信頼するドメイン名に追加",
+    "Migration in progress. Please wait until the migration is finished" : "移行の処理中です。移行が完了するまでお待ちください。",
+    "Migration started …" : "移行を開始しました…",
     "Sending..." : "送信中…",
+    "Official" : "公式",
     "Experimental" : "実験的",
     "All" : "すべて",
     "Update to %s" : "%sにアップデート",
@@ -136,6 +140,7 @@ OC.L10N.register(
     "Enable server-side encryption" : "サーバーサイド暗号化を有効に",
     "Enable encryption" : "暗号化を有効に",
     "Select default encryption module:" : "デフォルトの暗号化モジュールを選択:",
+    "Start migration" : "移行を開始",
     "This is used for sending out notifications." : "通知を送信する際に使用します。",
     "Send mode" : "送信モード",
     "Encryption" : "暗号化",
diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json
index 081116b208..dace80b1bf 100644
--- a/settings/l10n/ja.json
+++ b/settings/l10n/ja.json
@@ -28,7 +28,8 @@
     "Unable to change password" : "パスワードを変更できません",
     "Enabled" : "有効",
     "Not enabled" : "無効",
-    "Group already exists." : "グループは既に存在しています",
+    "Migration Completed" : "移行が完了しました",
+    "Group already exists." : "グループはすでに存在しています",
     "Unable to add group." : "グループを追加できません",
     "Unable to delete group." : "グループを削除できません",
     "log-level out of allowed range" : "ログレベルが許可された範囲を超えています",
@@ -48,7 +49,10 @@
     "Email saved" : "メールアドレスを保存しました",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "\"{domain}\" を信頼するドメインに追加してもよろしいでしょうか？",
     "Add trusted domain" : "信頼するドメイン名に追加",
+    "Migration in progress. Please wait until the migration is finished" : "移行の処理中です。移行が完了するまでお待ちください。",
+    "Migration started …" : "移行を開始しました…",
     "Sending..." : "送信中…",
+    "Official" : "公式",
     "Experimental" : "実験的",
     "All" : "すべて",
     "Update to %s" : "%sにアップデート",
@@ -134,6 +138,7 @@
     "Enable server-side encryption" : "サーバーサイド暗号化を有効に",
     "Enable encryption" : "暗号化を有効に",
     "Select default encryption module:" : "デフォルトの暗号化モジュールを選択:",
+    "Start migration" : "移行を開始",
     "This is used for sending out notifications." : "通知を送信する際に使用します。",
     "Send mode" : "送信モード",
     "Encryption" : "暗号化",