diff --git a/apps/dav/l10n/fr.js b/apps/dav/l10n/fr.js
index acc1bcc0b0..5ba33435d9 100644
--- a/apps/dav/l10n/fr.js
+++ b/apps/dav/l10n/fr.js
@@ -70,6 +70,7 @@ OC.L10N.register(
     "Tentative" : "Provisoire",
     "Save" : "Sauvegarder",
     "Your attendance was updated successfully." : "Votre présence a été mise à jour avec succès.",
+    "Calendar server" : "Serveur de calendrier",
     "Send invitations to attendees" : "Envoyer des invitations aux participants",
     "Please make sure to properly set up the email settings above." : "Merci de vérifier d'avoir correctement configuré les paramètres de courriel ci-dessus",
     "Automatically generate a birthday calendar" : "Générer automatiquement un agenda d'anniversaire",
diff --git a/apps/dav/l10n/fr.json b/apps/dav/l10n/fr.json
index cdd00da03c..3079607e59 100644
--- a/apps/dav/l10n/fr.json
+++ b/apps/dav/l10n/fr.json
@@ -68,6 +68,7 @@
     "Tentative" : "Provisoire",
     "Save" : "Sauvegarder",
     "Your attendance was updated successfully." : "Votre présence a été mise à jour avec succès.",
+    "Calendar server" : "Serveur de calendrier",
     "Send invitations to attendees" : "Envoyer des invitations aux participants",
     "Please make sure to properly set up the email settings above." : "Merci de vérifier d'avoir correctement configuré les paramètres de courriel ci-dessus",
     "Automatically generate a birthday calendar" : "Générer automatiquement un agenda d'anniversaire",
diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js
index e6d2cd5da7..cbf4c75807 100644
--- a/apps/files_external/l10n/fr.js
+++ b/apps/files_external/l10n/fr.js
@@ -118,6 +118,7 @@ OC.L10N.register(
     "Never" : "Jamais",
     "Once every direct access" : "Une fois à chaque accès direct",
     "Read only" : "Lecture seule",
+    "External storage enables you to mount external storage services and devices as secondary Nextcloud storage devices. You may also allow users to mount their own external storage services." : "Le stockage externe vous permet de monter des périphériques et services externes en tant que périphériques de stockage secondaires sous Nextcloud. Vous pouvez aussi autoriser les utilisateurs à monter leurs propres services de stockage externes.",
     "Folder name" : "Nom du dossier",
     "External storage" : "Stockage externe",
     "Authentication" : "Authentification",
@@ -127,6 +128,7 @@ OC.L10N.register(
     "Add storage" : "Ajouter un support de stockage",
     "Advanced settings" : "Paramètres avancés",
     "Allow users to mount external storage" : "Autoriser les utilisateurs à monter des espaces de stockage externes",
+    "Global credentials can be used to authenticate with multiple external storages that have the same credentials." : "Les identifiants globaux peuvent être utilisés pour s'authentifier auprès de multiples stockages externes qui ont les mêmes identifiants.",
     "Fetching request tokens failed. Verify that your app key and secret are correct." : "L'obtention des jetons de requête a échoué. Vérifiez que votre clé d'application et votre mot de passe sont corrects.",
     "Fetching access tokens failed. Verify that your app key and secret are correct." : "L'obtention des jetons d'accès a échoué. Vérifiez que votre clé d'application et votre mot de passe sont corrects.",
     "Step 1 failed. Exception: %s" : "L’étape 1 a échoué. Exception : %s",
diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json
index 787cc7d081..3230f4c3d4 100644
--- a/apps/files_external/l10n/fr.json
+++ b/apps/files_external/l10n/fr.json
@@ -116,6 +116,7 @@
     "Never" : "Jamais",
     "Once every direct access" : "Une fois à chaque accès direct",
     "Read only" : "Lecture seule",
+    "External storage enables you to mount external storage services and devices as secondary Nextcloud storage devices. You may also allow users to mount their own external storage services." : "Le stockage externe vous permet de monter des périphériques et services externes en tant que périphériques de stockage secondaires sous Nextcloud. Vous pouvez aussi autoriser les utilisateurs à monter leurs propres services de stockage externes.",
     "Folder name" : "Nom du dossier",
     "External storage" : "Stockage externe",
     "Authentication" : "Authentification",
@@ -125,6 +126,7 @@
     "Add storage" : "Ajouter un support de stockage",
     "Advanced settings" : "Paramètres avancés",
     "Allow users to mount external storage" : "Autoriser les utilisateurs à monter des espaces de stockage externes",
+    "Global credentials can be used to authenticate with multiple external storages that have the same credentials." : "Les identifiants globaux peuvent être utilisés pour s'authentifier auprès de multiples stockages externes qui ont les mêmes identifiants.",
     "Fetching request tokens failed. Verify that your app key and secret are correct." : "L'obtention des jetons de requête a échoué. Vérifiez que votre clé d'application et votre mot de passe sont corrects.",
     "Fetching access tokens failed. Verify that your app key and secret are correct." : "L'obtention des jetons d'accès a échoué. Vérifiez que votre clé d'application et votre mot de passe sont corrects.",
     "Step 1 failed. Exception: %s" : "L’étape 1 a échoué. Exception : %s",
diff --git a/apps/workflowengine/l10n/zh_CN.js b/apps/workflowengine/l10n/zh_CN.js
index a980ac4827..1cc81c40fa 100644
--- a/apps/workflowengine/l10n/zh_CN.js
+++ b/apps/workflowengine/l10n/zh_CN.js
@@ -1,8 +1,8 @@
 OC.L10N.register(
     "workflowengine",
     {
-    "Group list is empty" : "分组列表为空",
-    "Unable to retrieve the group list" : "无法获取用户分组列表",
+    "Group list is empty" : "用户群组列表空",
+    "Unable to retrieve the group list" : "无法获取用户群组列表",
     "Saved" : "已保存",
     "Saving failed:" : "保存失败:",
     "File MIME type" : "文件MIME类型",
diff --git a/apps/workflowengine/l10n/zh_CN.json b/apps/workflowengine/l10n/zh_CN.json
index 98c3f231ab..55c6ca1677 100644
--- a/apps/workflowengine/l10n/zh_CN.json
+++ b/apps/workflowengine/l10n/zh_CN.json
@@ -1,6 +1,6 @@
 { "translations": {
-    "Group list is empty" : "分组列表为空",
-    "Unable to retrieve the group list" : "无法获取用户分组列表",
+    "Group list is empty" : "用户群组列表空",
+    "Unable to retrieve the group list" : "无法获取用户群组列表",
     "Saved" : "已保存",
     "Saving failed:" : "保存失败:",
     "File MIME type" : "文件MIME类型",
diff --git a/core/l10n/fr.js b/core/l10n/fr.js
index 6e075b5b5a..15dc0502dc 100644
--- a/core/l10n/fr.js
+++ b/core/l10n/fr.js
@@ -84,6 +84,7 @@ OC.L10N.register(
     "No" : "Non",
     "Yes" : "Oui",
     "No files in here" : "Aucun fichier",
+    "No more subfolders in here" : "Plus aucun sous-dossier ici",
     "Choose" : "Choisir",
     "Copy" : "Copier",
     "Move" : "Déplacer",
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
index aeb64374a1..891e3e813b 100644
--- a/core/l10n/fr.json
+++ b/core/l10n/fr.json
@@ -82,6 +82,7 @@
     "No" : "Non",
     "Yes" : "Oui",
     "No files in here" : "Aucun fichier",
+    "No more subfolders in here" : "Plus aucun sous-dossier ici",
     "Choose" : "Choisir",
     "Copy" : "Copier",
     "Move" : "Déplacer",
diff --git a/lib/l10n/fr.js b/lib/l10n/fr.js
index 68a65f66f5..ad429ac374 100644
--- a/lib/l10n/fr.js
+++ b/lib/l10n/fr.js
@@ -234,6 +234,7 @@ OC.L10N.register(
     "Action \"%s\" not supported or implemented." : "Action \"%s\" non supportée ou implémentée.",
     "Authentication failed, wrong token or provider ID given" : "Échec de l'authentification, jeton erroné ou identification du fournisseur donnée",
     "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Paramètres manquants pour compléter la requête. Paramètres manquants : \"%s\"",
+    "ID \"%s\" already used by cloud federation provider \"%s\"" : "L'identifiant \"%s\" est déjà utilisé par le fournisseur de cloud \"%s\"",
     "Cloud Federation Provider with ID: \"%s\" does not exist." : "Le fournisseur de cloud avec l'identifiant \"%s\" n'existe pas.",
     "Could not obtain lock type %d on \"%s\"." : "Impossible d'obtenir le verrouillage de type %d sur \"%s\".",
     "Storage unauthorized. %s" : "Espace de stockage non autorisé. %s",
diff --git a/lib/l10n/fr.json b/lib/l10n/fr.json
index e5d1654ab3..7f410a6989 100644
--- a/lib/l10n/fr.json
+++ b/lib/l10n/fr.json
@@ -232,6 +232,7 @@
     "Action \"%s\" not supported or implemented." : "Action \"%s\" non supportée ou implémentée.",
     "Authentication failed, wrong token or provider ID given" : "Échec de l'authentification, jeton erroné ou identification du fournisseur donnée",
     "Parameters missing in order to complete the request. Missing Parameters: \"%s\"" : "Paramètres manquants pour compléter la requête. Paramètres manquants : \"%s\"",
+    "ID \"%s\" already used by cloud federation provider \"%s\"" : "L'identifiant \"%s\" est déjà utilisé par le fournisseur de cloud \"%s\"",
     "Cloud Federation Provider with ID: \"%s\" does not exist." : "Le fournisseur de cloud avec l'identifiant \"%s\" n'existe pas.",
     "Could not obtain lock type %d on \"%s\"." : "Impossible d'obtenir le verrouillage de type %d sur \"%s\".",
     "Storage unauthorized. %s" : "Espace de stockage non autorisé. %s",
diff --git a/settings/l10n/zh_CN.js b/settings/l10n/zh_CN.js
index 3e7f4b49c1..46006607a3 100644
--- a/settings/l10n/zh_CN.js
+++ b/settings/l10n/zh_CN.js
@@ -109,31 +109,53 @@ OC.L10N.register(
     "Select a profile picture" : "选择头像",
     "Week starts on {fdow}" : "每周的第一天为 {fdow}",
     "Groups" : "分组",
+    "Group list is empty" : "用户分组列表空",
     "Official" : "官方",
+    "No results" : "没有相关结果",
     "Visit website" : "访问网站",
     "User documentation" : "用户文档",
     "Developer documentation" : "开发者文档",
     "This app has no minimum Nextcloud version assigned. This will be an error in the future." : "该应用没有指定支持的 Nextcloud 最低版本. 可能会在将来出现问题.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "无法安装应用, 因为无法满足下列依赖: ",
+    "{license}-licensed" : "{license}-许可协议",
+    "Disable all" : "禁用所有",
     "Enable all" : "启用所有",
+    "Download and enable" : "下载和启用",
     "Enable" : "启用",
     "The app will be downloaded from the app store" : "该应用将从应用商店下载",
     "Settings" : "设置",
+    "You do not have permissions to see the details of this user" : "您没有查看此用户详情的权限",
+    "Delete user" : "删除用户",
+    "Disable user" : "禁用用户",
+    "Enable user" : "启用用户",
+    "Resend welcome email" : "重新发送欢迎邮件",
+    "Welcome mail sent!" : "欢迎邮件已发送。",
+    "Display name" : "显示用户名",
     "Email" : "电子邮件",
     "Group admin for" : "分组管理员",
     "Language" : "语言",
     "User backend" : "用户来源",
     "Unlimited" : "无限",
     "Default quota" : "默认配额",
+    "Default language" : "默认语言",
+    "Common languages" : "通用语言",
+    "All languages" : "所有语言",
+    "You did not enter the password in time" : "您没有及时输入密码",
+    "An error occured during the request. Unable to proceed." : "请求期间发生错误。 无法继续。",
+    "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "该应用已启用, 但是需要更新. 5秒后将跳转到更新页面.",
     "App update" : "更新应用",
     "Error: This app can not be enabled because it makes the server unstable" : "错误: 无法启用应用因为它会导致服务器不稳定",
     "Your apps" : "你的应用",
+    "Active apps" : "有效的应用",
     "Disabled apps" : "禁用应用",
     "Updates" : "更新",
     "App bundles" : "应用软件包",
+    "Default quota :" : "默认限额：",
+    "Remove group" : "移除分组",
     "Admins" : "管理员",
     "Disabled users" : "已禁用的用户",
     "Everyone" : "所有人",
+    "New user" : "新用户",
     "SSL Root Certificates" : "SSL 根证书",
     "Common Name" : "通用名称",
     "Valid until" : "有效期至",
@@ -232,6 +254,8 @@ OC.L10N.register(
     "Picture provided by original account" : "原始账户图片",
     "Cancel" : "取消",
     "Choose as profile picture" : "选择个人头像",
+    "Details" : "详情",
+    "You are using <strong>%s</strong>" : "你正在使用<strong>%s</strong>",
     "You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)" : "你使用了<strong>%s</strong>的<strong>%s</strong>(<strong>%s %%</strong>)",
     "Full name" : "全名",
     "No display name set" : "不显示名称设置",
@@ -248,10 +272,12 @@ OC.L10N.register(
     "Twitter" : "Twitter",
     "Twitter handle @…" : "推特用户名@…",
     "Help translate" : "帮助翻译",
+    "Locale" : "本地",
     "Password" : "密码",
     "Current password" : "当前密码",
     "New password" : "新密码",
     "Change password" : "修改密码",
+    "Devices & sessions" : "设备和活动链接",
     "Web, desktop and mobile clients currently logged in to your account." : "您账号当前登录的 Web 页面, 桌面和客户端客户端.",
     "Device" : "设备",
     "Last activity" : "最后活跃",
@@ -284,6 +310,7 @@ OC.L10N.register(
     "Add trusted domain" : "添加信任域名",
     "All" : "全部",
     "Update to %s" : "更新为 %s",
+    "_You have %n app update pending_::_You have %n app updates pending_" : ["%n 个应用正在等待升级"],
     "No apps found for your version" : "未找到适合当前版本的应用",
     "Official apps are developed by and within the community. They offer central functionality and are ready for production use." : "官方应用由社区和内部开发. 其可以提供核心功能并保证生产用途.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "认证应用由值得信赖的开发者开发, 并通过了一个粗略的安全检查. 其在开放的代码库中活跃地维护, 他们的维护者认为在普通用途足够稳定.",
@@ -325,6 +352,7 @@ OC.L10N.register(
     "Error creating user: {message}" : "创建用户出错: {message}",
     "A valid password must be provided" : "必须提供合法的密码",
     "A valid email must be provided" : "必须提供合法的用户名",
+    "__language_name__" : "简体中文",
     "Verifying" : "正在验证",
     "Personal info" : "个人信息",
     "Sync clients" : "同步客户端",
diff --git a/settings/l10n/zh_CN.json b/settings/l10n/zh_CN.json
index 6989cc2193..04b29d30a6 100644
--- a/settings/l10n/zh_CN.json
+++ b/settings/l10n/zh_CN.json
@@ -107,31 +107,53 @@
     "Select a profile picture" : "选择头像",
     "Week starts on {fdow}" : "每周的第一天为 {fdow}",
     "Groups" : "分组",
+    "Group list is empty" : "用户分组列表空",
     "Official" : "官方",
+    "No results" : "没有相关结果",
     "Visit website" : "访问网站",
     "User documentation" : "用户文档",
     "Developer documentation" : "开发者文档",
     "This app has no minimum Nextcloud version assigned. This will be an error in the future." : "该应用没有指定支持的 Nextcloud 最低版本. 可能会在将来出现问题.",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "无法安装应用, 因为无法满足下列依赖: ",
+    "{license}-licensed" : "{license}-许可协议",
+    "Disable all" : "禁用所有",
     "Enable all" : "启用所有",
+    "Download and enable" : "下载和启用",
     "Enable" : "启用",
     "The app will be downloaded from the app store" : "该应用将从应用商店下载",
     "Settings" : "设置",
+    "You do not have permissions to see the details of this user" : "您没有查看此用户详情的权限",
+    "Delete user" : "删除用户",
+    "Disable user" : "禁用用户",
+    "Enable user" : "启用用户",
+    "Resend welcome email" : "重新发送欢迎邮件",
+    "Welcome mail sent!" : "欢迎邮件已发送。",
+    "Display name" : "显示用户名",
     "Email" : "电子邮件",
     "Group admin for" : "分组管理员",
     "Language" : "语言",
     "User backend" : "用户来源",
     "Unlimited" : "无限",
     "Default quota" : "默认配额",
+    "Default language" : "默认语言",
+    "Common languages" : "通用语言",
+    "All languages" : "所有语言",
+    "You did not enter the password in time" : "您没有及时输入密码",
+    "An error occured during the request. Unable to proceed." : "请求期间发生错误。 无法继续。",
+    "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "该应用已启用, 但是需要更新. 5秒后将跳转到更新页面.",
     "App update" : "更新应用",
     "Error: This app can not be enabled because it makes the server unstable" : "错误: 无法启用应用因为它会导致服务器不稳定",
     "Your apps" : "你的应用",
+    "Active apps" : "有效的应用",
     "Disabled apps" : "禁用应用",
     "Updates" : "更新",
     "App bundles" : "应用软件包",
+    "Default quota :" : "默认限额：",
+    "Remove group" : "移除分组",
     "Admins" : "管理员",
     "Disabled users" : "已禁用的用户",
     "Everyone" : "所有人",
+    "New user" : "新用户",
     "SSL Root Certificates" : "SSL 根证书",
     "Common Name" : "通用名称",
     "Valid until" : "有效期至",
@@ -230,6 +252,8 @@
     "Picture provided by original account" : "原始账户图片",
     "Cancel" : "取消",
     "Choose as profile picture" : "选择个人头像",
+    "Details" : "详情",
+    "You are using <strong>%s</strong>" : "你正在使用<strong>%s</strong>",
     "You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)" : "你使用了<strong>%s</strong>的<strong>%s</strong>(<strong>%s %%</strong>)",
     "Full name" : "全名",
     "No display name set" : "不显示名称设置",
@@ -246,10 +270,12 @@
     "Twitter" : "Twitter",
     "Twitter handle @…" : "推特用户名@…",
     "Help translate" : "帮助翻译",
+    "Locale" : "本地",
     "Password" : "密码",
     "Current password" : "当前密码",
     "New password" : "新密码",
     "Change password" : "修改密码",
+    "Devices & sessions" : "设备和活动链接",
     "Web, desktop and mobile clients currently logged in to your account." : "您账号当前登录的 Web 页面, 桌面和客户端客户端.",
     "Device" : "设备",
     "Last activity" : "最后活跃",
@@ -282,6 +308,7 @@
     "Add trusted domain" : "添加信任域名",
     "All" : "全部",
     "Update to %s" : "更新为 %s",
+    "_You have %n app update pending_::_You have %n app updates pending_" : ["%n 个应用正在等待升级"],
     "No apps found for your version" : "未找到适合当前版本的应用",
     "Official apps are developed by and within the community. They offer central functionality and are ready for production use." : "官方应用由社区和内部开发. 其可以提供核心功能并保证生产用途.",
     "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "认证应用由值得信赖的开发者开发, 并通过了一个粗略的安全检查. 其在开放的代码库中活跃地维护, 他们的维护者认为在普通用途足够稳定.",
@@ -323,6 +350,7 @@
     "Error creating user: {message}" : "创建用户出错: {message}",
     "A valid password must be provided" : "必须提供合法的密码",
     "A valid email must be provided" : "必须提供合法的用户名",
+    "__language_name__" : "简体中文",
     "Verifying" : "正在验证",
     "Personal info" : "个人信息",
     "Sync clients" : "同步客户端",