diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js
index 65ca0ac02d643e3939119d30de8951b65b14508d..bdaf0a19b019dbc3af7eb63de24fd92e3a836ab1 100644
--- a/apps/files_external/l10n/fr.js
+++ b/apps/files_external/l10n/fr.js
@@ -39,7 +39,7 @@ OC.L10N.register(
     "URL of identity endpoint (required for OpenStack Object Storage)" : "URL du point d'accès d'identité (requis pour le stockage OpenStack)",
     "Timeout of HTTP requests in seconds" : "Temps maximal de requête HTTP en seconde",
     "Share" : "Partager",
-    "SMB / CIFS using OC login" : "SMB / CIFS utilise le nom d'utilisateur OC",
+    "SMB / CIFS using OC login" : "SMB / CIFS en utilisant les identifiants OC",
     "Username as share" : "Nom d'utilisateur du partage",
     "URL" : "URL",
     "Secure https://" : "Sécurisation https://",
@@ -68,7 +68,7 @@ OC.L10N.register(
     "Available for" : "Disponible pour",
     "Add storage" : "Ajouter un support de stockage",
     "Delete" : "Supprimer",
-    "Enable User External Storage" : "Activer le stockage externe pour les utilisateurs",
+    "Enable User External Storage" : "Autoriser les utilisateurs à ajouter des stockages externes",
     "Allow users to mount the following external storage" : "Autorise les utilisateurs à monter les stockage externes suivants"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json
index 02abcba6dde402d636aa5a8b0f4e1c540ba6c42f..e9f1c91b30da6c3031cb8bb1731d9ad0e6a542fc 100644
--- a/apps/files_external/l10n/fr.json
+++ b/apps/files_external/l10n/fr.json
@@ -37,7 +37,7 @@
     "URL of identity endpoint (required for OpenStack Object Storage)" : "URL du point d'accès d'identité (requis pour le stockage OpenStack)",
     "Timeout of HTTP requests in seconds" : "Temps maximal de requête HTTP en seconde",
     "Share" : "Partager",
-    "SMB / CIFS using OC login" : "SMB / CIFS utilise le nom d'utilisateur OC",
+    "SMB / CIFS using OC login" : "SMB / CIFS en utilisant les identifiants OC",
     "Username as share" : "Nom d'utilisateur du partage",
     "URL" : "URL",
     "Secure https://" : "Sécurisation https://",
@@ -66,7 +66,7 @@
     "Available for" : "Disponible pour",
     "Add storage" : "Ajouter un support de stockage",
     "Delete" : "Supprimer",
-    "Enable User External Storage" : "Activer le stockage externe pour les utilisateurs",
+    "Enable User External Storage" : "Autoriser les utilisateurs à ajouter des stockages externes",
     "Allow users to mount the following external storage" : "Autorise les utilisateurs à monter les stockage externes suivants"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/fr.js b/apps/user_ldap/l10n/fr.js
index 2433d051d83f313ded464bfea146dbbd6323e9c9..74bc9533eb4b120cd438b6460e1eeb3adf988b36 100644
--- a/apps/user_ldap/l10n/fr.js
+++ b/apps/user_ldap/l10n/fr.js
@@ -76,6 +76,7 @@ OC.L10N.register(
     "Saving" : "Enregistrement...",
     "Back" : "Retour",
     "Continue" : "Poursuivre",
+    "LDAP" : "LDAP",
     "Expert" : "Expert",
     "Advanced" : "Avancé",
     "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Avertissement :</b> Les applications user_ldap et user_webdavauth sont incompatibles. Des dysfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles.",
diff --git a/apps/user_ldap/l10n/fr.json b/apps/user_ldap/l10n/fr.json
index 11a4844add6c51fda02345c09b6eadc4df2124c2..777376eced0a63d957ae190fc6eab3c13161c0be 100644
--- a/apps/user_ldap/l10n/fr.json
+++ b/apps/user_ldap/l10n/fr.json
@@ -74,6 +74,7 @@
     "Saving" : "Enregistrement...",
     "Back" : "Retour",
     "Continue" : "Poursuivre",
+    "LDAP" : "LDAP",
     "Expert" : "Expert",
     "Advanced" : "Avancé",
     "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Avertissement :</b> Les applications user_ldap et user_webdavauth sont incompatibles. Des dysfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles.",
diff --git a/apps/user_ldap/l10n/ja.js b/apps/user_ldap/l10n/ja.js
index 79315a055f1b7c2387a852562e69083063beb370..6494fbb514212eedcf678b04a6ae725847eda65b 100644
--- a/apps/user_ldap/l10n/ja.js
+++ b/apps/user_ldap/l10n/ja.js
@@ -48,6 +48,7 @@ OC.L10N.register(
     "Edit raw filter instead" : "フィルタを編集",
     "Raw LDAP filter" : "LDAP フィルタ",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "フィルタは、どの LDAP グループが %s にアクセスするかを指定します。",
+    "Test Filter" : "フィルターをテスト",
     "groups found" : "グループが見つかりました",
     "Users login with this attribute:" : "この属性でユーザーログイン:",
     "LDAP Username:" : "LDAPユーザー名:",
@@ -67,9 +68,12 @@ OC.L10N.register(
     "For anonymous access, leave DN and Password empty." : "匿名アクセスの場合は、DNとパスワードを空にしてください。",
     "One Base DN per line" : "1行に1つのベースDN",
     "You can specify Base DN for users and groups in the Advanced tab" : "拡張タブでユーザーとグループのベースDNを指定することができます。",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "自動LDAP問合せを停止。大規模な設定には適していますが、LDAPの知識がいくらか必要になります。",
+    "Manually enter LDAP filters (recommended for large directories)" : "手動でLDAPフィルターを入力(大規模ディレクトリ時のみ推奨)",
     "Limit %s access to users meeting these criteria:" : "この基準を満たすユーザーに対し %s へのアクセスを制限:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "フィルタは、どのLDAPユーザーが %s にアクセスするかを指定します。",
     "users found" : "ユーザーが見つかりました",
+    "Saving" : "保存中",
     "Back" : "戻る",
     "Continue" : "続ける",
     "LDAP" : "LDAP",
diff --git a/apps/user_ldap/l10n/ja.json b/apps/user_ldap/l10n/ja.json
index da903e15d17fb0b37f19666daae44ddab41ef001..2e714112f1931c0774df7ff3e2aec9ffeb4b16a2 100644
--- a/apps/user_ldap/l10n/ja.json
+++ b/apps/user_ldap/l10n/ja.json
@@ -46,6 +46,7 @@
     "Edit raw filter instead" : "フィルタを編集",
     "Raw LDAP filter" : "LDAP フィルタ",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "フィルタは、どの LDAP グループが %s にアクセスするかを指定します。",
+    "Test Filter" : "フィルターをテスト",
     "groups found" : "グループが見つかりました",
     "Users login with this attribute:" : "この属性でユーザーログイン:",
     "LDAP Username:" : "LDAPユーザー名:",
@@ -65,9 +66,12 @@
     "For anonymous access, leave DN and Password empty." : "匿名アクセスの場合は、DNとパスワードを空にしてください。",
     "One Base DN per line" : "1行に1つのベースDN",
     "You can specify Base DN for users and groups in the Advanced tab" : "拡張タブでユーザーとグループのベースDNを指定することができます。",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "自動LDAP問合せを停止。大規模な設定には適していますが、LDAPの知識がいくらか必要になります。",
+    "Manually enter LDAP filters (recommended for large directories)" : "手動でLDAPフィルターを入力(大規模ディレクトリ時のみ推奨)",
     "Limit %s access to users meeting these criteria:" : "この基準を満たすユーザーに対し %s へのアクセスを制限:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "フィルタは、どのLDAPユーザーが %s にアクセスするかを指定します。",
     "users found" : "ユーザーが見つかりました",
+    "Saving" : "保存中",
     "Back" : "戻る",
     "Continue" : "続ける",
     "LDAP" : "LDAP",
diff --git a/apps/user_ldap/l10n/nl.js b/apps/user_ldap/l10n/nl.js
index c74584f7512795eb29079b85645c0006d4364251..77646a90a88165f26e0d030e090d664fe2e7621a 100644
--- a/apps/user_ldap/l10n/nl.js
+++ b/apps/user_ldap/l10n/nl.js
@@ -76,6 +76,7 @@ OC.L10N.register(
     "Saving" : "Opslaan",
     "Back" : "Terug",
     "Continue" : "Verder",
+    "LDAP" : "LDAP",
     "Expert" : "Expert",
     "Advanced" : "Geavanceerd",
     "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Waarschuwing:</b> De Apps user_ldap en user_webdavauth zijn incompatible. U kunt onverwacht gedrag ervaren. Vraag uw beheerder om een van beide apps de deactiveren.",
diff --git a/apps/user_ldap/l10n/nl.json b/apps/user_ldap/l10n/nl.json
index af6246ba39d4fae6c476e076d465a603b2671c32..6f0a9ec1c0199d533cd2854d74048f38b3658340 100644
--- a/apps/user_ldap/l10n/nl.json
+++ b/apps/user_ldap/l10n/nl.json
@@ -74,6 +74,7 @@
     "Saving" : "Opslaan",
     "Back" : "Terug",
     "Continue" : "Verder",
+    "LDAP" : "LDAP",
     "Expert" : "Expert",
     "Advanced" : "Geavanceerd",
     "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Waarschuwing:</b> De Apps user_ldap en user_webdavauth zijn incompatible. U kunt onverwacht gedrag ervaren. Vraag uw beheerder om een van beide apps de deactiveren.",
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index ebe80ad8474e13d69cbb311a6fd8b415eec3af78..72862a21690c06a00640c564629087c001ae9ebd 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 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 6ecabf891f360a5703903c16a6b86eca19368335..455bbf0e3d627fd156d712103ce64dba94d72070 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 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 bf28482177272d728c2c716b6c391c11d8029027..2e4d031a46d9e7e1bf004247f2f1fdd981d9fbcd 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 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 e31d628a483e8c5060e18927baccf93e30d29ec8..c4ce2ccdbe36685d7aaa937a74fecf01c7665bbd 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 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 caa1fbec3f8dbf0b78526e55ceb2542e1421cfb2..db6c9a98fe5ff72abc6f58c39e1243ff7f05306d 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 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 ded0d7847c056fdd04efac4ab61197edc97d4bcd..0b6f1544ca46d0189aeffa52950e88d8336c53fc 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 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 d43952c51978d610e22a830f5e7603a28447e05c..d1913eb573a602afd8493ee8a296e26a8deb2ae1 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 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 ddeca8d08a2de307fadbd6f37acfa04d83167310..bcdc7f0f009c801259af6a8d2f398f63839faeb8 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 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 f3db3159c5e292bd9952e9a3d65246f25cd1adbb..ae5ba798e19e46fc67cacb967e4cb150d1102932 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 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 c90804dcd6135ffa1c95b357025cd0c1a7db9c36..75000585a1b7371533428a2c4d69aa2a4ac76ee0 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 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 49443caa42398208ec75d80b563c9ecb97309d9d..c69c23d50ffa16c0955da24bafa479226cb0e501 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 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 ee3a6ec2bb4defa3d62d7c2e7e5c109bb08c9d48..2f1e2e174262e2be3f90a7bcf1fa3672dd9a1a21 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 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/settings/l10n/fr.js b/settings/l10n/fr.js
index 07fecc6e3bd2985a566daef271505607211d8684..f2269b78eae1cac3f85ee505c2d5018e2c4d622a 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "settings",
     {
+    "Security & Setup Warnings" : "Alertes de sécurité ou de configuration",
     "Cron" : "Cron",
     "Sharing" : "Partage",
     "Security" : "Sécurité",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index f473adc4f1b866fa8bf92300ee4552382bdb9510..55fcf7a42e3b7b650909d3e9b1da5eeffac3b065 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Security & Setup Warnings" : "Alertes de sécurité ou de configuration",
     "Cron" : "Cron",
     "Sharing" : "Partage",
     "Security" : "Sécurité",
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index ef4613cb4eb5167d2da2dd46ae7e7ef8d39044e2..950f8ead76d22a3f0bec18187016799cc086d275 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "settings",
     {
+    "Security & Setup Warnings" : "Beveiligings- en instellingswaarschuwingen",
     "Cron" : "Cron",
     "Sharing" : "Delen",
     "Security" : "Beveiliging",
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index fc060810daa1058f78ab5138352e720f1a326844..d23d84847a334d8885fb2f0382d1889b9f9ecaac 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Security & Setup Warnings" : "Beveiligings- en instellingswaarschuwingen",
     "Cron" : "Cron",
     "Sharing" : "Delen",
     "Security" : "Beveiliging",