diff --git a/apps/accessibility/l10n/da.js b/apps/accessibility/l10n/da.js
index a213627719e873c8eb3a3fb41fa76776e84b21c9..e86f7e59188ecd529f8f16ad279748e15d0a93f6 100644
--- a/apps/accessibility/l10n/da.js
+++ b/apps/accessibility/l10n/da.js
@@ -2,10 +2,13 @@ OC.L10N.register(
     "accessibility",
     {
     "Dark theme" : "Mørk tema",
+    "Enable dark theme" : "Aktiver Mørk tema",
     "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Et mørk tema, venligere for øjnene ved at dæmpe lysstyrken. Det er stadig under udvikling så indberet venligst alle problemer du måtte finde.",
     "High contrast mode" : "Højkontrasttilstand",
+    "Enable high contrast mode" : "aktiver højkontrasttilstand",
     "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "En højkontrasttilstand letter navigationen. Presentation af lavere kvalitet, men tydeligere.",
     "Dyslexia font" : "Skrifftype for ordblinde",
+    "Enable dyslexia font" : "aktiver skrifftype for ordblinde",
     "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic er en gratis skrifttype designet til at undgå læsefejl pga. ordblindhed",
     "Accessibility" : "Handicapvenlig",
     "Accessibility options for nextcloud" : "Handicapvenlige indstillinger for nextcloud",
diff --git a/apps/accessibility/l10n/da.json b/apps/accessibility/l10n/da.json
index 6cea3f6a7a9896881bc53bfff24b56420e35df06..168deaa95a16f2f6666f1cfbc1a942093c9f01f7 100644
--- a/apps/accessibility/l10n/da.json
+++ b/apps/accessibility/l10n/da.json
@@ -1,9 +1,12 @@
 { "translations": {
     "Dark theme" : "Mørk tema",
+    "Enable dark theme" : "Aktiver Mørk tema",
     "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "Et mørk tema, venligere for øjnene ved at dæmpe lysstyrken. Det er stadig under udvikling så indberet venligst alle problemer du måtte finde.",
     "High contrast mode" : "Højkontrasttilstand",
+    "Enable high contrast mode" : "aktiver højkontrasttilstand",
     "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "En højkontrasttilstand letter navigationen. Presentation af lavere kvalitet, men tydeligere.",
     "Dyslexia font" : "Skrifftype for ordblinde",
+    "Enable dyslexia font" : "aktiver skrifftype for ordblinde",
     "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic er en gratis skrifttype designet til at undgå læsefejl pga. ordblindhed",
     "Accessibility" : "Handicapvenlig",
     "Accessibility options for nextcloud" : "Handicapvenlige indstillinger for nextcloud",
diff --git a/apps/accessibility/l10n/zh_TW.js b/apps/accessibility/l10n/zh_TW.js
index 5c0308a9cb349a3f65bf24b9619c0b90013e1b25..d426fbb9ded99a60b81098398e0389312822272e 100644
--- a/apps/accessibility/l10n/zh_TW.js
+++ b/apps/accessibility/l10n/zh_TW.js
@@ -2,24 +2,27 @@ OC.L10N.register(
     "accessibility",
     {
     "Dark theme" : "黑暗主題",
-    "Enable dark theme" : "開啟深色模式",
+    "Enable dark theme" : "啟用黑暗主題",
     "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "黑暗風格的主題，通過降低整體亮度來舒緩對您眼睛的刺激。黑暗主題仍在開發中，如發現任何問題，煩請報告。",
     "High contrast mode" : "高對比度模式",
-    "Enable high contrast mode" : "開啟高對比模式",
+    "Enable high contrast mode" : "開啟高對比度模式",
     "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "高對比度模式會降低界面質量，但會提高清晰度，有助您瀏覽。",
     "Dyslexia font" : "閱讀障礙字體",
+    "Enable dyslexia font" : "啟用閱讀障礙字型",
     "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic 是一種免費的字型，目的在降低因拼音文字閱讀障礙引起的一些常見閱讀錯誤。",
     "Accessibility" : "協助工具",
     "Accessibility options for nextcloud" : "Nextcloud 協助工具設定",
     "Provides multiple accessibilities options to ease your use of Nextcloud" : "提供多種協助工具使您更易於操作 Nextcloud",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "如果您發現任何一個問題，請不要猶豫並在 {issuetracker} 通知我們，我們的追蹤器{linkend}。並且如果您想參與，請參加 {designteam}",
+    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "我們非常重視無障礙存取。我們遵循網路標準，並透過檢查來確保所有內容皆可在沒有滑鼠或輔助軟體（例如螢幕閱讀器）的情況下使用。我們目標是能達到 {guidelines}網頁內容可及性指引{linkend} 2.1 版的 AA 等級，加上高對比度主題甚至還能到 AAA 等級。",
+    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "如果您發現任何一個問題，請不要猶豫並請在 {issuetracker}我們的問題追蹤系統{linkend} 回報。而如果您想參與，歡迎加入 {designteam}我們的設計團隊{linked}！",
     "High contrast theme" : "高對比主題",
     "A high contrast theme to ease your navigation. Visual quality will be reduced but clarity will be increased." : "使用高對比度主題以便於頁面導覽。提高操作理解程度，但視覺質感會下降。",
     "Dark theme (beta)" : "黑暗主題（測試）",
     "Web Content Accessibility Guidelines" : "網路內容協助工具指南",
     "our issue tracker" : "問題追蹤",
     "our design team" : "我們的設計團隊",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}. And if you want to get involved, come join {designteam}!" : "如果您發現任何一個問題，請不要猶豫並在 {issuetracker} 通知我們。並且如果您想參與，請參加  {designteam}",
+    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines} 2.1 on AA level, with the high contrast theme even on AAA level." : "我們非常重視無障礙存取。我們遵循網路標準，並透過檢查來確保所有內容皆可在沒有滑鼠或輔助軟體（例如螢幕閱讀器）的情況下使用。我們目標是能達到 {guidelines}  2.1 版的 AA 等級，加上高對比度主題甚至還能到 AAA 等級。",
+    "If you find any issues, don’t hesitate to report them on {issuetracker}. And if you want to get involved, come join {designteam}!" : "如果您發現任何一個問題，請不要猶豫並在 {issuetracker} 通知我們。並且如果您想參與，請加入 {designteam}！",
     "Enable" : "啟用"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/accessibility/l10n/zh_TW.json b/apps/accessibility/l10n/zh_TW.json
index 1e4a06b70a08bf21280be8887f0048fc43b07f68..0ba49668ce4bb2b436547cd123bc9e9fc18a36dd 100644
--- a/apps/accessibility/l10n/zh_TW.json
+++ b/apps/accessibility/l10n/zh_TW.json
@@ -1,23 +1,26 @@
 { "translations": {
     "Dark theme" : "黑暗主題",
-    "Enable dark theme" : "開啟深色模式",
+    "Enable dark theme" : "啟用黑暗主題",
     "A dark theme to ease your eyes by reducing the overall luminosity and brightness. It is still under development, so please report any issues you may find." : "黑暗風格的主題，通過降低整體亮度來舒緩對您眼睛的刺激。黑暗主題仍在開發中，如發現任何問題，煩請報告。",
     "High contrast mode" : "高對比度模式",
-    "Enable high contrast mode" : "開啟高對比模式",
+    "Enable high contrast mode" : "開啟高對比度模式",
     "A high contrast mode to ease your navigation. Visual quality will be reduced but clarity will be increased." : "高對比度模式會降低界面質量，但會提高清晰度，有助您瀏覽。",
     "Dyslexia font" : "閱讀障礙字體",
+    "Enable dyslexia font" : "啟用閱讀障礙字型",
     "OpenDyslexic is a free typeface/font designed to mitigate some of the common reading errors caused by dyslexia." : "OpenDyslexic 是一種免費的字型，目的在降低因拼音文字閱讀障礙引起的一些常見閱讀錯誤。",
     "Accessibility" : "協助工具",
     "Accessibility options for nextcloud" : "Nextcloud 協助工具設定",
     "Provides multiple accessibilities options to ease your use of Nextcloud" : "提供多種協助工具使您更易於操作 Nextcloud",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "如果您發現任何一個問題，請不要猶豫並在 {issuetracker} 通知我們，我們的追蹤器{linkend}。並且如果您想參與，請參加 {designteam}",
+    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines}Web Content Accessibility Guidelines{linkend} 2.1 on AA level, with the high contrast theme even on AAA level." : "我們非常重視無障礙存取。我們遵循網路標準，並透過檢查來確保所有內容皆可在沒有滑鼠或輔助軟體（例如螢幕閱讀器）的情況下使用。我們目標是能達到 {guidelines}網頁內容可及性指引{linkend} 2.1 版的 AA 等級，加上高對比度主題甚至還能到 AAA 等級。",
+    "If you find any issues, don’t hesitate to report them on {issuetracker}our issue tracker{linkend}. And if you want to get involved, come join {designteam}our design team{linkend}!" : "如果您發現任何一個問題，請不要猶豫並請在 {issuetracker}我們的問題追蹤系統{linkend} 回報。而如果您想參與，歡迎加入 {designteam}我們的設計團隊{linked}！",
     "High contrast theme" : "高對比主題",
     "A high contrast theme to ease your navigation. Visual quality will be reduced but clarity will be increased." : "使用高對比度主題以便於頁面導覽。提高操作理解程度，但視覺質感會下降。",
     "Dark theme (beta)" : "黑暗主題（測試）",
     "Web Content Accessibility Guidelines" : "網路內容協助工具指南",
     "our issue tracker" : "問題追蹤",
     "our design team" : "我們的設計團隊",
-    "If you find any issues, don’t hesitate to report them on {issuetracker}. And if you want to get involved, come join {designteam}!" : "如果您發現任何一個問題，請不要猶豫並在 {issuetracker} 通知我們。並且如果您想參與，請參加  {designteam}",
+    "Universal access is very important to us. We follow web standards and check to make everything usable also without mouse, and assistive software such as screenreaders. We aim to be compliant with the {guidelines} 2.1 on AA level, with the high contrast theme even on AAA level." : "我們非常重視無障礙存取。我們遵循網路標準，並透過檢查來確保所有內容皆可在沒有滑鼠或輔助軟體（例如螢幕閱讀器）的情況下使用。我們目標是能達到 {guidelines}  2.1 版的 AA 等級，加上高對比度主題甚至還能到 AAA 等級。",
+    "If you find any issues, don’t hesitate to report them on {issuetracker}. And if you want to get involved, come join {designteam}!" : "如果您發現任何一個問題，請不要猶豫並在 {issuetracker} 通知我們。並且如果您想參與，請加入 {designteam}！",
     "Enable" : "啟用"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js
index 6ad35c322a8bfdbed973b1f5410e214d3f694e6c..ac1846cbde16510c5282f4301f0854d8107c6049 100644
--- a/apps/files/l10n/fr.js
+++ b/apps/files/l10n/fr.js
@@ -59,6 +59,7 @@ OC.L10N.register(
     "Could not create file \"{file}\"" : "Impossible de créer le fichier \"{file}\"",
     "Could not create file \"{file}\" because it already exists" : "Impossible de créer le fichier \"{file}\" car il existe déjà",
     "Could not create folder \"{dir}\" because it already exists" : "Impossible de créer le dossier \"{dir}\" car il existe déjà",
+    "Could not fetch file details \"{file}\"" : "Impossible de récupérer les détails du fichier \"{file}\"",
     "Error deleting file \"{fileName}\"." : "Erreur à la suppression du fichier \"{fileName}\".",
     "No search results in other folders for {tag}{filter}{endtag}" : "Aucun résultat dans d'autres dossiers pour {tag}{filter}{endtag}",
     "Name" : "Nom",
diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json
index fc33d07093474b09ba747bab23505db4e44c8cba..2972cdc8a9f9a503f1835f04bfc72b9389a33c62 100644
--- a/apps/files/l10n/fr.json
+++ b/apps/files/l10n/fr.json
@@ -57,6 +57,7 @@
     "Could not create file \"{file}\"" : "Impossible de créer le fichier \"{file}\"",
     "Could not create file \"{file}\" because it already exists" : "Impossible de créer le fichier \"{file}\" car il existe déjà",
     "Could not create folder \"{dir}\" because it already exists" : "Impossible de créer le dossier \"{dir}\" car il existe déjà",
+    "Could not fetch file details \"{file}\"" : "Impossible de récupérer les détails du fichier \"{file}\"",
     "Error deleting file \"{fileName}\"." : "Erreur à la suppression du fichier \"{fileName}\".",
     "No search results in other folders for {tag}{filter}{endtag}" : "Aucun résultat dans d'autres dossiers pour {tag}{filter}{endtag}",
     "Name" : "Nom",
diff --git a/apps/files_external/l10n/zh_TW.js b/apps/files_external/l10n/zh_TW.js
index 592c631c59c06450aee4a055aee75cc64d766440..5110e6412bc3ba9a0919b20d9f3b60f0b4a0687d 100644
--- a/apps/files_external/l10n/zh_TW.js
+++ b/apps/files_external/l10n/zh_TW.js
@@ -67,7 +67,10 @@ OC.L10N.register(
     "Domain" : "網域名稱",
     "Rackspace" : "Rackspace",
     "API key" : "API金鑰",
+    "Log-in credentials, save in database" : "登入憑證，儲存於資料庫",
     "Username and password" : "使用者帳號和密碼",
+    "Log-in credentials, save in session" : "登入憑證，儲存於工作階段",
+    "User entered, store in database" : "使用者登入，儲存於資料庫",
     "RSA public key" : "RSA 公開金鑰",
     "Public key" : "公開金鑰",
     "Amazon S3" : "Amazon S3",
diff --git a/apps/files_external/l10n/zh_TW.json b/apps/files_external/l10n/zh_TW.json
index 2fb68f8233873280870d9e977ce81c1b13121a9f..295ffb0ce74989b807e98dd1d88fbf5dac3b1e03 100644
--- a/apps/files_external/l10n/zh_TW.json
+++ b/apps/files_external/l10n/zh_TW.json
@@ -65,7 +65,10 @@
     "Domain" : "網域名稱",
     "Rackspace" : "Rackspace",
     "API key" : "API金鑰",
+    "Log-in credentials, save in database" : "登入憑證，儲存於資料庫",
     "Username and password" : "使用者帳號和密碼",
+    "Log-in credentials, save in session" : "登入憑證，儲存於工作階段",
+    "User entered, store in database" : "使用者登入，儲存於資料庫",
     "RSA public key" : "RSA 公開金鑰",
     "Public key" : "公開金鑰",
     "Amazon S3" : "Amazon S3",
diff --git a/apps/settings/l10n/fr.js b/apps/settings/l10n/fr.js
index f72a4691bc7d19a7f3dfb328de53cb70bdf03ab4..444bf1c1daabe4bd346c2ef82c3cd9ac2c5b2593 100644
--- a/apps/settings/l10n/fr.js
+++ b/apps/settings/l10n/fr.js
@@ -330,6 +330,7 @@ OC.L10N.register(
     "Background jobs" : "Tâches de fond",
     "Last job execution ran %s. Something seems wrong." : "Quelque chose s'est mal passé lors de l'exécution de la dernière tâche %s.",
     "Some jobs haven’t been executed since %s. Please consider increasing the execution frequency." : "Certaines tâches n'ont pas été exécutées depuis %s. Vous pourriez augmenter la fréquence d'exécution.",
+    "Some jobs didn’t execute since %s. Please consider switching to system cron." : "Certaines tâches n’ont pas été exécutées depuis 1%s. Veuillez envisager de passer à un système cron.",
     "Last job ran %s." : "Dernière tâche exécutée %s.",
     "Background job didn’t run yet!" : "La tâche de fond n'a pas encore tourné!",
     "For optimal performance it's important to configure background jobs correctly. For bigger instances 'Cron' is the recommended setting. Please see the documentation for more information." : "Afin d'optimiser au mieux la performance de votre instance, il est important de configurer correctement les travaux en arrière-plan. 'Cron' est le paramètre recommandé pour les instances de taille importante. Veuillez vous référer à la documentation Nextcloud pour plus d'informations à ce sujet.",
diff --git a/apps/settings/l10n/fr.json b/apps/settings/l10n/fr.json
index 8a394cde6c277dda4b89adcead78dd67d1259636..d9ec27922486e9880831148893b7945d2f2ca95f 100644
--- a/apps/settings/l10n/fr.json
+++ b/apps/settings/l10n/fr.json
@@ -328,6 +328,7 @@
     "Background jobs" : "Tâches de fond",
     "Last job execution ran %s. Something seems wrong." : "Quelque chose s'est mal passé lors de l'exécution de la dernière tâche %s.",
     "Some jobs haven’t been executed since %s. Please consider increasing the execution frequency." : "Certaines tâches n'ont pas été exécutées depuis %s. Vous pourriez augmenter la fréquence d'exécution.",
+    "Some jobs didn’t execute since %s. Please consider switching to system cron." : "Certaines tâches n’ont pas été exécutées depuis 1%s. Veuillez envisager de passer à un système cron.",
     "Last job ran %s." : "Dernière tâche exécutée %s.",
     "Background job didn’t run yet!" : "La tâche de fond n'a pas encore tourné!",
     "For optimal performance it's important to configure background jobs correctly. For bigger instances 'Cron' is the recommended setting. Please see the documentation for more information." : "Afin d'optimiser au mieux la performance de votre instance, il est important de configurer correctement les travaux en arrière-plan. 'Cron' est le paramètre recommandé pour les instances de taille importante. Veuillez vous référer à la documentation Nextcloud pour plus d'informations à ce sujet.",
diff --git a/apps/settings/l10n/zh_TW.js b/apps/settings/l10n/zh_TW.js
index 55373dc9e642088eba1a8ff6348b550950a9923d..83f65a2866fb00b7a7eb469663828157f5ec35b9 100644
--- a/apps/settings/l10n/zh_TW.js
+++ b/apps/settings/l10n/zh_TW.js
@@ -206,6 +206,7 @@ OC.L10N.register(
     "Enable server-side encryption" : "啟用伺服器端加密",
     "Please read carefully before activating server-side encryption: " : "在您啟動伺服器端加密之前，請仔細閱讀：",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "一旦加密模式啟動，從各地上傳到伺服器端的檔案都會被加密，若日後要停用加密，需要加密模組的支援，而且所有的設定（例如：還原金鑰）都正確",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "單獨加密不能保證系統安全性。請參考加密 App 運作原理，及支援之使用案例的文件，以取得更多資訊。",
     "Be aware that encryption always increases the file size." : "請注意，加密一定會增加檔案的大小",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "定時備份您的資料沒有壞處，若您有啟用加密，請確保您也有備份加密金鑰",
     "This is the final warning: Do you really want to enable encryption?" : "這是最後的警告：請問您真的要開啟加密模式？",
diff --git a/apps/settings/l10n/zh_TW.json b/apps/settings/l10n/zh_TW.json
index fcda49cb51e7e6959391643af92545682a275763..85724b3e212df03dce71ff88513bf50774646fa6 100644
--- a/apps/settings/l10n/zh_TW.json
+++ b/apps/settings/l10n/zh_TW.json
@@ -204,6 +204,7 @@
     "Enable server-side encryption" : "啟用伺服器端加密",
     "Please read carefully before activating server-side encryption: " : "在您啟動伺服器端加密之前，請仔細閱讀：",
     "Once encryption is enabled, all files uploaded to the server from that point forward will be encrypted at rest on the server. It will only be possible to disable encryption at a later date if the active encryption module supports that function, and all pre-conditions (e.g. setting a recover key) are met." : "一旦加密模式啟動，從各地上傳到伺服器端的檔案都會被加密，若日後要停用加密，需要加密模組的支援，而且所有的設定（例如：還原金鑰）都正確",
+    "Encryption alone does not guarantee security of the system. Please see documentation for more information about how the encryption app works, and the supported use cases." : "單獨加密不能保證系統安全性。請參考加密 App 運作原理，及支援之使用案例的文件，以取得更多資訊。",
     "Be aware that encryption always increases the file size." : "請注意，加密一定會增加檔案的大小",
     "It is always good to create regular backups of your data, in case of encryption make sure to backup the encryption keys along with your data." : "定時備份您的資料沒有壞處，若您有啟用加密，請確保您也有備份加密金鑰",
     "This is the final warning: Do you really want to enable encryption?" : "這是最後的警告：請問您真的要開啟加密模式？",
diff --git a/apps/user_ldap/l10n/fr.js b/apps/user_ldap/l10n/fr.js
index d0737092dd9ad8bf9292bbeca3d75ee048504c10..70f9f360c57609375e514feae873957556fb6a42 100644
--- a/apps/user_ldap/l10n/fr.js
+++ b/apps/user_ldap/l10n/fr.js
@@ -176,6 +176,7 @@ OC.L10N.register(
     "Email Field" : "Champ Email",
     "Set the user's email from their LDAP attribute. Leave it empty for default behaviour." : "Définissez le courrier électronique de l'utilisateur à partir de leur attribut LDAP. Laissez le champ vide pour appliquer le comportement par défaut.",
     "User Home Folder Naming Rule" : "Règle de nommage du répertoire utilisateur",
+    "Leave empty for username (default). Otherwise, specify an LDAP/AD attribute." : "Laisser vide pour le nom d’utilisateur (par défaut). Sinon, spécifiez un attribut LDAP/AD.",
     "\"$home\" Placeholder Field" : "\"$home\" Champ Placeholder",
     "$home in an external storage configuration will be replaced with the value of the specified attribute" : "$home dans la configuration du stockage externe sera remplacé avec la valeur de l'attribut spécifié",
     "Internal Username" : "Nom d'utilisateur interne",
diff --git a/apps/user_ldap/l10n/fr.json b/apps/user_ldap/l10n/fr.json
index 9096e0038e40ed2c0b1c62030538d96bf3c45050..4b92bffe1aec0a2a5d044591b68090f5d58b7897 100644
--- a/apps/user_ldap/l10n/fr.json
+++ b/apps/user_ldap/l10n/fr.json
@@ -174,6 +174,7 @@
     "Email Field" : "Champ Email",
     "Set the user's email from their LDAP attribute. Leave it empty for default behaviour." : "Définissez le courrier électronique de l'utilisateur à partir de leur attribut LDAP. Laissez le champ vide pour appliquer le comportement par défaut.",
     "User Home Folder Naming Rule" : "Règle de nommage du répertoire utilisateur",
+    "Leave empty for username (default). Otherwise, specify an LDAP/AD attribute." : "Laisser vide pour le nom d’utilisateur (par défaut). Sinon, spécifiez un attribut LDAP/AD.",
     "\"$home\" Placeholder Field" : "\"$home\" Champ Placeholder",
     "$home in an external storage configuration will be replaced with the value of the specified attribute" : "$home dans la configuration du stockage externe sera remplacé avec la valeur de l'attribut spécifié",
     "Internal Username" : "Nom d'utilisateur interne",
diff --git a/apps/user_ldap/l10n/zh_TW.js b/apps/user_ldap/l10n/zh_TW.js
index aa3c49a5b635b6ed971c9e70aeb532a4f098919a..c5668132211337fae86529cc73a3853f550bb9e6 100644
--- a/apps/user_ldap/l10n/zh_TW.js
+++ b/apps/user_ldap/l10n/zh_TW.js
@@ -58,6 +58,7 @@ OC.L10N.register(
     "Invalid Host" : "無效的Host",
     "Test Configuration" : "測試此設定",
     "Help" : "說明",
+    "Only these object classes:" : "只有這些物件類別：",
     "Only from these groups:" : "只從這些群組:",
     "Search groups" : "搜尋群組",
     "Available groups" : "可用的群組",
@@ -117,6 +118,7 @@ OC.L10N.register(
     "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "可以選擇性設定備用主機，必須是 LDAP/AD 中央伺服器的複本。",
     "Backup (Replica) Port" : "備用（複本）連接埠",
     "Disable Main Server" : "停用主伺服器",
+    "Only connect to the replica server." : "只能連線至複製伺服器。",
     "Turn off SSL certificate validation." : "關閉 SSL 憑證檢查",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "不建議，請僅在測試時使用！如果連線只能在此設定下工作，請匯入LDAP伺服器的SSL認證到您的伺服器%s上",
     "Cache Time-To-Live" : "快取的存活時間",
@@ -124,6 +126,7 @@ OC.L10N.register(
     "Directory Settings" : "目錄設定",
     "User Display Name Field" : "使用者顯示名稱欄位",
     "The LDAP attribute to use to generate the user's display name." : "LDAP設定值，用於產生使用者的顯示名稱",
+    "Optional. An LDAP attribute to be added to the display name in brackets. Results in e.g. »John Doe (john.doe@example.org)«." : "選填。要加進顯示名稱中括號的 LDAP 屬性。例如 »John Doe (john.doe@example.org)«。",
     "Base User Tree" : "Base User Tree",
     "One User Base DN per line" : "一行一個使用者 Base DN",
     "User Search Attributes" : "User Search Attributes",
@@ -143,8 +146,10 @@ OC.L10N.register(
     "Internal Username" : "內部使用者名稱",
     "Internal Username Attribute:" : "內部使用者名稱屬性:",
     "Override UUID detection" : "偵測覆寫UUID",
+    "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "預設情況下，UUID 屬性會自動偵測。UUID 屬性用來準確識別 LDAP 使用者及群組。此外，如果未在上方指定，內部使用者名稱會基於 UUID 建立。您能覆蓋設定並直接指定屬性，但一定要確保指定的屬性能被使用者及群組取得且唯一。留空則執行預設行為。變更只會對新映射 (加入) 的 LDAP 使用者及群組生效。",
     "UUID Attribute for Users:" : "使用者的UUID值:",
     "UUID Attribute for Groups:" : "群組的UUID值:",
+    "Clear Groupname-LDAP Group Mapping" : "清除 群組名稱-LDAP 群組映射",
     "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "使用者名稱請留白(預設)。若不留白請指定一個LDAP/AD屬性。"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/user_ldap/l10n/zh_TW.json b/apps/user_ldap/l10n/zh_TW.json
index a10ee9b25a041a4e19bcaba6ad734b104a086346..a96e30807734ea509ee7c4b910808e0e185138b7 100644
--- a/apps/user_ldap/l10n/zh_TW.json
+++ b/apps/user_ldap/l10n/zh_TW.json
@@ -56,6 +56,7 @@
     "Invalid Host" : "無效的Host",
     "Test Configuration" : "測試此設定",
     "Help" : "說明",
+    "Only these object classes:" : "只有這些物件類別：",
     "Only from these groups:" : "只從這些群組:",
     "Search groups" : "搜尋群組",
     "Available groups" : "可用的群組",
@@ -115,6 +116,7 @@
     "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "可以選擇性設定備用主機，必須是 LDAP/AD 中央伺服器的複本。",
     "Backup (Replica) Port" : "備用（複本）連接埠",
     "Disable Main Server" : "停用主伺服器",
+    "Only connect to the replica server." : "只能連線至複製伺服器。",
     "Turn off SSL certificate validation." : "關閉 SSL 憑證檢查",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "不建議，請僅在測試時使用！如果連線只能在此設定下工作，請匯入LDAP伺服器的SSL認證到您的伺服器%s上",
     "Cache Time-To-Live" : "快取的存活時間",
@@ -122,6 +124,7 @@
     "Directory Settings" : "目錄設定",
     "User Display Name Field" : "使用者顯示名稱欄位",
     "The LDAP attribute to use to generate the user's display name." : "LDAP設定值，用於產生使用者的顯示名稱",
+    "Optional. An LDAP attribute to be added to the display name in brackets. Results in e.g. »John Doe (john.doe@example.org)«." : "選填。要加進顯示名稱中括號的 LDAP 屬性。例如 »John Doe (john.doe@example.org)«。",
     "Base User Tree" : "Base User Tree",
     "One User Base DN per line" : "一行一個使用者 Base DN",
     "User Search Attributes" : "User Search Attributes",
@@ -141,8 +144,10 @@
     "Internal Username" : "內部使用者名稱",
     "Internal Username Attribute:" : "內部使用者名稱屬性:",
     "Override UUID detection" : "偵測覆寫UUID",
+    "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "預設情況下，UUID 屬性會自動偵測。UUID 屬性用來準確識別 LDAP 使用者及群組。此外，如果未在上方指定，內部使用者名稱會基於 UUID 建立。您能覆蓋設定並直接指定屬性，但一定要確保指定的屬性能被使用者及群組取得且唯一。留空則執行預設行為。變更只會對新映射 (加入) 的 LDAP 使用者及群組生效。",
     "UUID Attribute for Users:" : "使用者的UUID值:",
     "UUID Attribute for Groups:" : "群組的UUID值:",
+    "Clear Groupname-LDAP Group Mapping" : "清除 群組名稱-LDAP 群組映射",
     "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "使用者名稱請留白(預設)。若不留白請指定一個LDAP/AD屬性。"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/workflowengine/l10n/de.js b/apps/workflowengine/l10n/de.js
index cc03add02f29d200b79061c29e02beea9827b6de..0a04b13db25f798606291c420819b0d11e94f06c 100644
--- a/apps/workflowengine/l10n/de.js
+++ b/apps/workflowengine/l10n/de.js
@@ -48,7 +48,7 @@ OC.L10N.register(
     "Select a comparator" : "Wähle einen Komparator",
     "Select a file type" : "Dateityp auswählen",
     "e.g. httpd/unix-directory" : "z.B. httpd/unix-directory",
-    "Folder" : "Benötigt keine Übersetzung. Für iOS wird nur die formelle Übersetzung verwendet (de_DE).",
+    "Folder" : "Ordner",
     "Images" : "Bilder",
     "Office documents" : "Office Dokumente",
     "PDF documents" : "PDF-Dokumente",
diff --git a/apps/workflowengine/l10n/de.json b/apps/workflowengine/l10n/de.json
index 335acd85d735bc7dd3009e4816ea1119b91e1993..4e300d41ae05649b3ed43b88f0af1a0a636aa0a5 100644
--- a/apps/workflowengine/l10n/de.json
+++ b/apps/workflowengine/l10n/de.json
@@ -46,7 +46,7 @@
     "Select a comparator" : "Wähle einen Komparator",
     "Select a file type" : "Dateityp auswählen",
     "e.g. httpd/unix-directory" : "z.B. httpd/unix-directory",
-    "Folder" : "Benötigt keine Übersetzung. Für iOS wird nur die formelle Übersetzung verwendet (de_DE).",
+    "Folder" : "Ordner",
     "Images" : "Bilder",
     "Office documents" : "Office Dokumente",
     "PDF documents" : "PDF-Dokumente",