From 797b603a1f11e76348c36c17e766e97b43dd127e Mon Sep 17 00:00:00 2001
From: Nextcloud bot <bot@nextcloud.com>
Date: Sat, 4 Jan 2020 02:27:44 +0000
Subject: [PATCH] [tx-robot] updated from transifex

---
 apps/accessibility/l10n/ko.js           |  2 +-
 apps/accessibility/l10n/ko.json         |  2 +-
 apps/comments/l10n/zh_CN.js             |  8 ++++----
 apps/comments/l10n/zh_CN.json           |  8 ++++----
 apps/dav/l10n/zh_CN.js                  |  4 ++--
 apps/dav/l10n/zh_CN.json                |  4 ++--
 apps/encryption/l10n/zh_CN.js           |  2 +-
 apps/encryption/l10n/zh_CN.json         |  2 +-
 apps/files_external/l10n/zh_CN.js       |  2 +-
 apps/files_external/l10n/zh_CN.json     |  2 +-
 apps/files_versions/l10n/mk.js          |  2 +-
 apps/files_versions/l10n/mk.json        |  2 +-
 apps/settings/l10n/mk.js                |  2 +-
 apps/settings/l10n/mk.json              |  2 +-
 apps/settings/l10n/zh_CN.js             |  2 +-
 apps/settings/l10n/zh_CN.json           |  2 +-
 apps/twofactor_backupcodes/l10n/ja.js   |  1 +
 apps/twofactor_backupcodes/l10n/ja.json |  1 +
 apps/user_ldap/l10n/zh_CN.js            |  2 +-
 apps/user_ldap/l10n/zh_CN.json          |  2 +-
 apps/workflowengine/l10n/el.js          |  1 +
 apps/workflowengine/l10n/el.json        |  1 +
 core/l10n/zh_CN.js                      | 24 ++++++++++++------------
 core/l10n/zh_CN.json                    | 24 ++++++++++++------------
 lib/l10n/zh_CN.js                       |  4 ++--
 lib/l10n/zh_CN.json                     |  4 ++--
 26 files changed, 58 insertions(+), 54 deletions(-)

diff --git a/apps/accessibility/l10n/ko.js b/apps/accessibility/l10n/ko.js
index 6600afc865..6390646e54 100644
--- a/apps/accessibility/l10n/ko.js
+++ b/apps/accessibility/l10n/ko.js
@@ -21,6 +21,6 @@ OC.L10N.register(
     "Provides multiple accessibilities options to ease your use of nextcloud" : "Nextcloud 사용을 편리하게 하는 여러 접근성 옵션",
     "Themes" : "테마",
     "Fonts" : "글꼴",
-    "enabled" : "활성화"
+    "enabled" : "활성화됨"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/accessibility/l10n/ko.json b/apps/accessibility/l10n/ko.json
index a5ad33f30c..9cb613fa04 100644
--- a/apps/accessibility/l10n/ko.json
+++ b/apps/accessibility/l10n/ko.json
@@ -19,6 +19,6 @@
     "Provides multiple accessibilities options to ease your use of nextcloud" : "Nextcloud 사용을 편리하게 하는 여러 접근성 옵션",
     "Themes" : "테마",
     "Fonts" : "글꼴",
-    "enabled" : "활성화"
+    "enabled" : "활성화됨"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/comments/l10n/zh_CN.js b/apps/comments/l10n/zh_CN.js
index 6733419ac6..68cface80b 100644
--- a/apps/comments/l10n/zh_CN.js
+++ b/apps/comments/l10n/zh_CN.js
@@ -18,15 +18,15 @@ OC.L10N.register(
     "New comment …" : "新评论 ...",
     "Post" : "发布",
     "Cancel" : "取消",
-    "[Deleted user]" : "[已删除用户]",
+    "[Deleted user]" : "[已删除的用户]",
     "No comments yet, start the conversation!" : "还没有评论，开始对话吧！",
     "More comments …" : "更多评论 ...",
     "Save" : "保存",
-    "Allowed characters {count} of {max}" : "当前字数： {count}，最大允许：{max}",
+    "Allowed characters {count} of {max}" : "当前字数： {count}，最多允许：{max}",
     "Error occurred while retrieving comment with ID {id}" : "取回 ID {id} 的评论时发生错误",
     "Error occurred while updating comment with id {id}" : "更新 id 为 {id} 的评论出错",
-    "Error occurred while posting comment" : "发布评论出错",
-    "_%n unread comment_::_%n unread comments_" : ["%n 未读评论"],
+    "Error occurred while posting comment" : "发表评论时发生错误",
+    "_%n unread comment_::_%n unread comments_" : ["%n 条未读评论"],
     "_1 new comment_::_{unread} new comments_" : ["{unread} 条新评论"],
     "Comment" : "评论"
 },
diff --git a/apps/comments/l10n/zh_CN.json b/apps/comments/l10n/zh_CN.json
index f645423700..4697e89bdc 100644
--- a/apps/comments/l10n/zh_CN.json
+++ b/apps/comments/l10n/zh_CN.json
@@ -16,15 +16,15 @@
     "New comment …" : "新评论 ...",
     "Post" : "发布",
     "Cancel" : "取消",
-    "[Deleted user]" : "[已删除用户]",
+    "[Deleted user]" : "[已删除的用户]",
     "No comments yet, start the conversation!" : "还没有评论，开始对话吧！",
     "More comments …" : "更多评论 ...",
     "Save" : "保存",
-    "Allowed characters {count} of {max}" : "当前字数： {count}，最大允许：{max}",
+    "Allowed characters {count} of {max}" : "当前字数： {count}，最多允许：{max}",
     "Error occurred while retrieving comment with ID {id}" : "取回 ID {id} 的评论时发生错误",
     "Error occurred while updating comment with id {id}" : "更新 id 为 {id} 的评论出错",
-    "Error occurred while posting comment" : "发布评论出错",
-    "_%n unread comment_::_%n unread comments_" : ["%n 未读评论"],
+    "Error occurred while posting comment" : "发表评论时发生错误",
+    "_%n unread comment_::_%n unread comments_" : ["%n 条未读评论"],
     "_1 new comment_::_{unread} new comments_" : ["{unread} 条新评论"],
     "Comment" : "评论"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/dav/l10n/zh_CN.js b/apps/dav/l10n/zh_CN.js
index 0e7a3db71b..82c263d818 100644
--- a/apps/dav/l10n/zh_CN.js
+++ b/apps/dav/l10n/zh_CN.js
@@ -76,8 +76,8 @@ OC.L10N.register(
     "More options at %s" : "在%s的更多选项",
     "Contacts" : "联系人",
     "Your %s needs to be configured to use HTTPS in order to use CalDAV and CardDAV with iOS/macOS." : "您的%s 需要配置使用HTTPS以在iOS/macOS中使用CalDAV和CardDAV。",
-    "Configures a CalDAV account" : "设置一个 CalDAV 账户",
-    "Configures a CardDAV account" : "设置一个 CardDAV 账户",
+    "Configures a CalDAV account" : "配置一个 CalDAV 账号",
+    "Configures a CardDAV account" : "配置一个 CardDAV 账号",
     "WebDAV" : "WebDAV",
     "WebDAV endpoint" : "WebDAV端点",
     "Technical details" : "技术细节",
diff --git a/apps/dav/l10n/zh_CN.json b/apps/dav/l10n/zh_CN.json
index b402b55fdd..4f422c4d02 100644
--- a/apps/dav/l10n/zh_CN.json
+++ b/apps/dav/l10n/zh_CN.json
@@ -74,8 +74,8 @@
     "More options at %s" : "在%s的更多选项",
     "Contacts" : "联系人",
     "Your %s needs to be configured to use HTTPS in order to use CalDAV and CardDAV with iOS/macOS." : "您的%s 需要配置使用HTTPS以在iOS/macOS中使用CalDAV和CardDAV。",
-    "Configures a CalDAV account" : "设置一个 CalDAV 账户",
-    "Configures a CardDAV account" : "设置一个 CardDAV 账户",
+    "Configures a CalDAV account" : "配置一个 CalDAV 账号",
+    "Configures a CardDAV account" : "配置一个 CardDAV 账号",
     "WebDAV" : "WebDAV",
     "WebDAV endpoint" : "WebDAV端点",
     "Technical details" : "技术细节",
diff --git a/apps/encryption/l10n/zh_CN.js b/apps/encryption/l10n/zh_CN.js
index 11409583b5..4f7b58417c 100644
--- a/apps/encryption/l10n/zh_CN.js
+++ b/apps/encryption/l10n/zh_CN.js
@@ -37,7 +37,7 @@ OC.L10N.register(
     "The share will expire on %s." : "此共享将在 %s 过期。",
     "Cheers!" : "干杯！",
     "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "您好，<br><br>管理员已启用服务器端加密，您的文件已使用密码 <strong>%s</strong> 加密。<br><br>\n请登陆网页界面，进入个人设置中的“基础加密模块”部分，在“旧登陆密码”处输入上述密码并输入您的当前登陆密码，即可更新加密密码。<br><br>",
-    "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "加密应用程序已启用，但您的密钥未初始化，请注销并再次登录",
+    "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "加密应用已启用，但您的密钥未初始化，请登出并再次登录",
     "Encrypt the home storage" : "加密主目录储存",
     "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "启用此选项将加密存储在主存储上的所有文件，否则只会加密外部存储上的文件",
     "Enable recovery key" : "启用恢复密钥",
diff --git a/apps/encryption/l10n/zh_CN.json b/apps/encryption/l10n/zh_CN.json
index 125ec4753c..50ae4d6cf6 100644
--- a/apps/encryption/l10n/zh_CN.json
+++ b/apps/encryption/l10n/zh_CN.json
@@ -35,7 +35,7 @@
     "The share will expire on %s." : "此共享将在 %s 过期。",
     "Cheers!" : "干杯！",
     "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "您好，<br><br>管理员已启用服务器端加密，您的文件已使用密码 <strong>%s</strong> 加密。<br><br>\n请登陆网页界面，进入个人设置中的“基础加密模块”部分，在“旧登陆密码”处输入上述密码并输入您的当前登陆密码，即可更新加密密码。<br><br>",
-    "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "加密应用程序已启用，但您的密钥未初始化，请注销并再次登录",
+    "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "加密应用已启用，但您的密钥未初始化，请登出并再次登录",
     "Encrypt the home storage" : "加密主目录储存",
     "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "启用此选项将加密存储在主存储上的所有文件，否则只会加密外部存储上的文件",
     "Enable recovery key" : "启用恢复密钥",
diff --git a/apps/files_external/l10n/zh_CN.js b/apps/files_external/l10n/zh_CN.js
index 3de1f8a1d0..8d33009c02 100644
--- a/apps/files_external/l10n/zh_CN.js
+++ b/apps/files_external/l10n/zh_CN.js
@@ -28,7 +28,7 @@ OC.L10N.register(
     "Saving..." : "正在保存...",
     "Save" : "保存",
     "Empty response from the server" : "服务器响应为空",
-    "Couldn't access. Please log out and in again to activate this mount point" : "无法访问！请注销并重新登录以激活挂载点。",
+    "Couldn't access. Please log out and in again to activate this mount point" : "无法访问。 请登出并再次登录以激活此挂载点",
     "Couldn't get the information from the remote server: {code} {type}" : "无法从远程服务器获取信息：{code} {type}",
     "Couldn't get the list of external mount points: {type}" : "无法获取外部挂载点列表：{type}",
     "There was an error with message: " : "错误信息：",
diff --git a/apps/files_external/l10n/zh_CN.json b/apps/files_external/l10n/zh_CN.json
index d90f9d3ad2..83a2e26a44 100644
--- a/apps/files_external/l10n/zh_CN.json
+++ b/apps/files_external/l10n/zh_CN.json
@@ -26,7 +26,7 @@
     "Saving..." : "正在保存...",
     "Save" : "保存",
     "Empty response from the server" : "服务器响应为空",
-    "Couldn't access. Please log out and in again to activate this mount point" : "无法访问！请注销并重新登录以激活挂载点。",
+    "Couldn't access. Please log out and in again to activate this mount point" : "无法访问。 请登出并再次登录以激活此挂载点",
     "Couldn't get the information from the remote server: {code} {type}" : "无法从远程服务器获取信息：{code} {type}",
     "Couldn't get the list of external mount points: {type}" : "无法获取外部挂载点列表：{type}",
     "There was an error with message: " : "错误信息：",
diff --git a/apps/files_versions/l10n/mk.js b/apps/files_versions/l10n/mk.js
index 3c05a8e601..33b1f2c79d 100644
--- a/apps/files_versions/l10n/mk.js
+++ b/apps/files_versions/l10n/mk.js
@@ -5,7 +5,7 @@ OC.L10N.register(
     "This application automatically maintains older versions of files that are changed." : "Оваа апликација автоматски ги менаџира постарите верзии на датотеките кој се изменети.",
     "This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user’s directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the user doesn’t run out of Quota because of versions.\n\t\tIn addition to the expiry of versions, the versions app makes certain never to use more than 50% of the user’s currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation." : "Оваа апликација автоматски ги менаџира постарите верзии на датотеките кој се изменети. Кога е овозможена, скриена папка се креира во секој кориснички директориум и се користи за зачувување на постарите верзии на датотеките. Корисникот има можност да врати стара верзија од датотеката во секое време преку веб-интерфејсот, со што се преклопува постоечката верзија на датотеката. Апликацијата автоматски се грижи за верзиите за да не дојде случај да се искористи просторот за складирање на корисникот.\n\t\tПокрај истекот на верзиите, апликацијата за верзии нема да користи повеќе од 50% од тековно достапната квота за верзии. Ако зачуваните верзии ја надминат оваа граница, апликацијата ги брише најстарите верзии на датотеки сè додека не се дојде под ова ограничување. Повеќе информации се достапни во документацијата за верзии на датотеки.",
     "Failed to revert {file} to revision {timestamp}." : "Не успеав да го вратам {file} на ревизијата {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n бит","%n бајти"],
+    "_%n byte_::_%n bytes_" : ["1 бајт","%n бајти"],
     "Restore" : "Врати",
     "No other versions available" : "Не постојат други верзии"
 },
diff --git a/apps/files_versions/l10n/mk.json b/apps/files_versions/l10n/mk.json
index a4574ee46c..c85d05fd76 100644
--- a/apps/files_versions/l10n/mk.json
+++ b/apps/files_versions/l10n/mk.json
@@ -3,7 +3,7 @@
     "This application automatically maintains older versions of files that are changed." : "Оваа апликација автоматски ги менаџира постарите верзии на датотеките кој се изменети.",
     "This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user’s directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the user doesn’t run out of Quota because of versions.\n\t\tIn addition to the expiry of versions, the versions app makes certain never to use more than 50% of the user’s currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation." : "Оваа апликација автоматски ги менаџира постарите верзии на датотеките кој се изменети. Кога е овозможена, скриена папка се креира во секој кориснички директориум и се користи за зачувување на постарите верзии на датотеките. Корисникот има можност да врати стара верзија од датотеката во секое време преку веб-интерфејсот, со што се преклопува постоечката верзија на датотеката. Апликацијата автоматски се грижи за верзиите за да не дојде случај да се искористи просторот за складирање на корисникот.\n\t\tПокрај истекот на верзиите, апликацијата за верзии нема да користи повеќе од 50% од тековно достапната квота за верзии. Ако зачуваните верзии ја надминат оваа граница, апликацијата ги брише најстарите верзии на датотеки сè додека не се дојде под ова ограничување. Повеќе информации се достапни во документацијата за верзии на датотеки.",
     "Failed to revert {file} to revision {timestamp}." : "Не успеав да го вратам {file} на ревизијата {timestamp}.",
-    "_%n byte_::_%n bytes_" : ["%n бит","%n бајти"],
+    "_%n byte_::_%n bytes_" : ["1 бајт","%n бајти"],
     "Restore" : "Врати",
     "No other versions available" : "Не постојат други верзии"
 },"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"
diff --git a/apps/settings/l10n/mk.js b/apps/settings/l10n/mk.js
index 3e1bcb4b3e..333f1b5739 100644
--- a/apps/settings/l10n/mk.js
+++ b/apps/settings/l10n/mk.js
@@ -113,7 +113,7 @@ OC.L10N.register(
     "Nextcloud settings" : "Nextcloud параметри",
     "Two-factor authentication can be enforced for all\tusers and specific groups. If they do not have a two-factor provider configured, they will be unable to log into the system." : "Двофакторна автентикација може да биде задолжителна за сите\tкорисници и одредени групи. Доколку корисниците немаат поставено провајдер за двофакторна автентикација, нема да можат да се најават на системот.",
     "Enforce two-factor authentication" : "Задолжителна двофакторна автентикација",
-    "Limit to groups" : "Огранилчвање на групи",
+    "Limit to groups" : "Ограничување на групи",
     "Enforcement of two-factor authentication can be set for certain groups only." : "Задолжителна двофакторна автентикација може да се постави само за одредени групи.",
     "Two-factor authentication is enforced for all\tmembers of the following groups." : "Двофакторна автентикација е задолжителна за сите\tчленовите во следните групи.",
     "Enforced groups" : "Задолжителни групи",
diff --git a/apps/settings/l10n/mk.json b/apps/settings/l10n/mk.json
index 2332d75e96..0f451faa6e 100644
--- a/apps/settings/l10n/mk.json
+++ b/apps/settings/l10n/mk.json
@@ -111,7 +111,7 @@
     "Nextcloud settings" : "Nextcloud параметри",
     "Two-factor authentication can be enforced for all\tusers and specific groups. If they do not have a two-factor provider configured, they will be unable to log into the system." : "Двофакторна автентикација може да биде задолжителна за сите\tкорисници и одредени групи. Доколку корисниците немаат поставено провајдер за двофакторна автентикација, нема да можат да се најават на системот.",
     "Enforce two-factor authentication" : "Задолжителна двофакторна автентикација",
-    "Limit to groups" : "Огранилчвање на групи",
+    "Limit to groups" : "Ограничување на групи",
     "Enforcement of two-factor authentication can be set for certain groups only." : "Задолжителна двофакторна автентикација може да се постави само за одредени групи.",
     "Two-factor authentication is enforced for all\tmembers of the following groups." : "Двофакторна автентикација е задолжителна за сите\tчленовите во следните групи.",
     "Enforced groups" : "Задолжителни групи",
diff --git a/apps/settings/l10n/zh_CN.js b/apps/settings/l10n/zh_CN.js
index 88bf4a7ea0..093bc05bb2 100644
--- a/apps/settings/l10n/zh_CN.js
+++ b/apps/settings/l10n/zh_CN.js
@@ -99,7 +99,7 @@ OC.L10N.register(
     "Your %s account was created" : "您的账号 %s 已创建",
     "Welcome aboard" : "欢迎使用",
     "Welcome aboard %s" : "%s，欢迎使用",
-    "Welcome to your %s account, you can add, protect, and share your data." : "欢迎使用您的 %s 账号，您可以添加、保护和共享您的数据。",
+    "Welcome to your %s account, you can add, protect, and share your data." : "欢迎使用您的账号 %s ，您可以添加、保护和共享您的数据。",
     "Your username is: %s" : "您的用户名是：%s",
     "Set your password" : "设置您的密码",
     "Go to %s" : "访问 %s",
diff --git a/apps/settings/l10n/zh_CN.json b/apps/settings/l10n/zh_CN.json
index fe94c9af34..299749979a 100644
--- a/apps/settings/l10n/zh_CN.json
+++ b/apps/settings/l10n/zh_CN.json
@@ -97,7 +97,7 @@
     "Your %s account was created" : "您的账号 %s 已创建",
     "Welcome aboard" : "欢迎使用",
     "Welcome aboard %s" : "%s，欢迎使用",
-    "Welcome to your %s account, you can add, protect, and share your data." : "欢迎使用您的 %s 账号，您可以添加、保护和共享您的数据。",
+    "Welcome to your %s account, you can add, protect, and share your data." : "欢迎使用您的账号 %s ，您可以添加、保护和共享您的数据。",
     "Your username is: %s" : "您的用户名是：%s",
     "Set your password" : "设置您的密码",
     "Go to %s" : "访问 %s",
diff --git a/apps/twofactor_backupcodes/l10n/ja.js b/apps/twofactor_backupcodes/l10n/ja.js
index 58775e95b8..16ea6b8e5c 100644
--- a/apps/twofactor_backupcodes/l10n/ja.js
+++ b/apps/twofactor_backupcodes/l10n/ja.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "twofactor_backupcodes",
     {
+    "function" : "機能",
     "_" : "_",
     "An error occurred while generating your backup codes" : "バックアップコードの生成中にエラーが発生しました",
     "{name} backup codes" : "{name} バックアップコード",
diff --git a/apps/twofactor_backupcodes/l10n/ja.json b/apps/twofactor_backupcodes/l10n/ja.json
index 7d6320271a..ec944cfde2 100644
--- a/apps/twofactor_backupcodes/l10n/ja.json
+++ b/apps/twofactor_backupcodes/l10n/ja.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "function" : "機能",
     "_" : "_",
     "An error occurred while generating your backup codes" : "バックアップコードの生成中にエラーが発生しました",
     "{name} backup codes" : "{name} バックアップコード",
diff --git a/apps/user_ldap/l10n/zh_CN.js b/apps/user_ldap/l10n/zh_CN.js
index 53862566d6..b80d87b7a2 100644
--- a/apps/user_ldap/l10n/zh_CN.js
+++ b/apps/user_ldap/l10n/zh_CN.js
@@ -82,7 +82,7 @@ OC.L10N.register(
     "Verify settings and count the groups" : "验证设置和统计分组数",
     "When logging in, %s will find the user based on the following attributes:" : "登录时，%s将查找基于以下属性的用户：",
     "LDAP / AD Username:" : "LDAP/AD 用户名：",
-    "Allows login against the LDAP / AD username, which is either \"uid\" or \"sAMAccountName\" and will be detected." : "允许登录 LDAP/AD 用户名，这是“uid”或“sAMAccountName”，并将被检测到。",
+    "Allows login against the LDAP / AD username, which is either \"uid\" or \"sAMAccountName\" and will be detected." : "允许使用 LDAP / AD 用户名登录，该用户名可以是 “uid” 或 “sAMAccountName” 并将被检测到。",
     "LDAP / AD Email Address:" : "LDAP/AD 邮箱地址：",
     "Allows login against an email attribute. \"mail\" and \"mailPrimaryAddress\" allowed." : "允许根据电子邮件属性登录。 允许“mail”和“mailPrimaryAddress”。",
     "Other Attributes:" : "其他属性：",
diff --git a/apps/user_ldap/l10n/zh_CN.json b/apps/user_ldap/l10n/zh_CN.json
index a5379c2dda..50e92ac954 100644
--- a/apps/user_ldap/l10n/zh_CN.json
+++ b/apps/user_ldap/l10n/zh_CN.json
@@ -80,7 +80,7 @@
     "Verify settings and count the groups" : "验证设置和统计分组数",
     "When logging in, %s will find the user based on the following attributes:" : "登录时，%s将查找基于以下属性的用户：",
     "LDAP / AD Username:" : "LDAP/AD 用户名：",
-    "Allows login against the LDAP / AD username, which is either \"uid\" or \"sAMAccountName\" and will be detected." : "允许登录 LDAP/AD 用户名，这是“uid”或“sAMAccountName”，并将被检测到。",
+    "Allows login against the LDAP / AD username, which is either \"uid\" or \"sAMAccountName\" and will be detected." : "允许使用 LDAP / AD 用户名登录，该用户名可以是 “uid” 或 “sAMAccountName” 并将被检测到。",
     "LDAP / AD Email Address:" : "LDAP/AD 邮箱地址：",
     "Allows login against an email attribute. \"mail\" and \"mailPrimaryAddress\" allowed." : "允许根据电子邮件属性登录。 允许“mail”和“mailPrimaryAddress”。",
     "Other Attributes:" : "其他属性：",
diff --git a/apps/workflowengine/l10n/el.js b/apps/workflowengine/l10n/el.js
index aef0e0518d..cba362bbfa 100644
--- a/apps/workflowengine/l10n/el.js
+++ b/apps/workflowengine/l10n/el.js
@@ -32,6 +32,7 @@ OC.L10N.register(
     "Check %s is invalid" : "Έλεγχος %s δεν είναι έγκυρος",
     "Check #%s does not exist" : "Έλεγχος #%s δεν υπάρχει",
     "Check %s is invalid or does not exist" : "Έλεγχος %s δεν είναι έγκυρος ή δεν υπάρχει",
+    "Flow" : "Flow",
     "e.g. httpd/unix-directory" : "π.χ. httpd/unix-directory",
     "Images" : "Εικόνες",
     "PDF documents" : "Έγγραφα PDF",
diff --git a/apps/workflowengine/l10n/el.json b/apps/workflowengine/l10n/el.json
index d619a66ec6..6f8f652aea 100644
--- a/apps/workflowengine/l10n/el.json
+++ b/apps/workflowengine/l10n/el.json
@@ -30,6 +30,7 @@
     "Check %s is invalid" : "Έλεγχος %s δεν είναι έγκυρος",
     "Check #%s does not exist" : "Έλεγχος #%s δεν υπάρχει",
     "Check %s is invalid or does not exist" : "Έλεγχος %s δεν είναι έγκυρος ή δεν υπάρχει",
+    "Flow" : "Flow",
     "e.g. httpd/unix-directory" : "π.χ. httpd/unix-directory",
     "Images" : "Εικόνες",
     "PDF documents" : "Έγγραφα PDF",
diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js
index 77a913157a..59aafe5e25 100644
--- a/core/l10n/zh_CN.js
+++ b/core/l10n/zh_CN.js
@@ -148,7 +148,7 @@ OC.L10N.register(
     "User disabled" : "用户不可用",
     "We have detected multiple invalid login attempts from your IP. Therefore your next login is throttled up to 30 seconds." : "我们检测到您的 IP 进行了多次无效登录尝试。因此，请 30 秒之后再尝试。",
     "Reset password" : "重置密码",
-    "A password reset message has been sent to the e-mail address of this account. If you do not receive it, check your spam/junk folders or ask your local administrator for help." : "密码重置的电子邮件发送到此帐户的电子邮件地址。 如果您未在合理的时间内收到，请优先检查您的垃圾邮件/垃圾邮件文件夹。如果不存在此电子邮件，请咨询系统管理员。",
+    "A password reset message has been sent to the e-mail address of this account. If you do not receive it, check your spam/junk folders or ask your local administrator for help." : "密码重置的电子邮件发送到此账号的电子邮件地址。 如果您未在合理的时间内收到，请优先检查您的垃圾邮件/垃圾邮件文件夹。如果不存在此电子邮件，请咨询系统管理员。",
     "If it is not there ask your local administrator." : "如果它不在此处，请询问您的本地管理员。",
     "Couldn't send reset email. Please contact your administrator." : "未能成功发送重置邮件，请联系管理员。",
     "Password can not be changed. Please contact your administrator." : "无法修改密码，请联系管理员。",
@@ -282,7 +282,7 @@ OC.L10N.register(
     "It looks like you are trying to reinstall your Nextcloud. However the file CAN_INSTALL is missing from your config directory. Please create the file CAN_INSTALL in your config folder to continue." : "看起来您正在尝试重新安装您的Nextcloud。但您的config文件夹中没有CAN_INSTALL文件。请在您的config文件夹中创建CAN_INSTALL文件以继续。",
     "Could not remove CAN_INSTALL from the config folder. Please remove this file manually." : "无法从config文件夹中移除CAN_INSTALL文件。请手动移除此文件。",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "对于正确的操作，该应用需要使用 JavaScript。请 {linkstart}启用 JavaScript{linkend}，并重新加载页面。",
-    "Get your own free account" : "获取自己的免费账户",
+    "Get your own free account" : "获取自己的免费账号",
     "Skip to main content" : "跳过主内容",
     "Skip to navigation of app" : "跳过应用向导",
     "More apps" : "更多的应用程序",
@@ -294,29 +294,29 @@ OC.L10N.register(
     "Contacts menu" : "联系人菜单",
     "Settings menu" : "设置菜单",
     "Confirm your password" : "确认您的密码",
-    "Connect to your account" : "连接您的账户",
-    "Please log in before granting %1$s access to your %2$s account." : "在授权 %1$s 访问您的 %2$s 账户之前，请先登录。",
+    "Connect to your account" : "连接到您的账号",
+    "Please log in before granting %1$s access to your %2$s account." : "在授权 %1$s 访问您的账号 %2$s 之前，请先登录。",
     "App token" : "App 令牌",
     "Grant access" : "授权访问",
     "Alternative log in using app token" : "使用应用程序令牌替代登录",
-    "Account access" : "账户访问",
-    "You are about to grant %1$s access to your %2$s account." : "您正在授权 %1$s 访问您的 %2$s 账户。",
+    "Account access" : "账号访问",
+    "You are about to grant %1$s access to your %2$s account." : "您正在授权 %1$s 访问您的账号 %2$s 。",
     "Account connected" : "账号已连接",
     "Your client should now be connected!" : "您的客户端现在应该可以连接了！",
     "You can close this window." : "您可以关闭此窗口。",
     "This share is password-protected" : "这个共享是被密码保护的",
     "The password is wrong. Try again." : "密码错误。请重试。",
     "Two-factor authentication" : "两步验证",
-    "Enhanced security is enabled for your account. Choose a second factor for authentication:" : "您的账户已启用安全增强。请选择第二种验证方式。",
+    "Enhanced security is enabled for your account. Choose a second factor for authentication:" : "您的账号已启用安全增强。请选择第二种验证方式。",
     "Could not load at least one of your enabled two-factor auth methods. Please contact your admin." : "无法载入您启用的任何两步验证方法。请联系管理员。",
-    "Two-factor authentication is enforced but has not been configured on your account. Contact your admin for assistance." : "两步验证是强制性的，但您的账户似乎未做配置。请联系管理员获得支持。",
-    "Two-factor authentication is enforced but has not been configured on your account. Please continue to setup two-factor authentication." : "两步验证是强制性的，但您的账户未做配置。请联系管理员配置两步验证。",
+    "Two-factor authentication is enforced but has not been configured on your account. Contact your admin for assistance." : "已强制执行两步验证，但尚未在您的账号上对其进行配置。 请与您的管理员联系以获取帮助。",
+    "Two-factor authentication is enforced but has not been configured on your account. Please continue to setup two-factor authentication." : "已强制执行两步验证，但尚未在您的账号上对其进行配置。 请继续设置两步验证。",
     "Set up two-factor authentication" : "配置两步验证",
-    "Two-factor authentication is enforced but has not been configured on your account. Use one of your backup codes to log in or contact your admin for assistance." : "两步验证是强制性的，但您的账户似乎未做配置。使用您的备份代码登录或联系管理员。",
+    "Two-factor authentication is enforced but has not been configured on your account. Use one of your backup codes to log in or contact your admin for assistance." : "已强制执行两步验证，但尚未在您的账号上对其进行配置。 使用您的备用验证码之一登录或与管理员联系以获取帮助。",
     "Use backup code" : "使用备用口令",
     "Cancel log in" : "取消登录",
     "Setup two-factor authentication" : "配置两步验证",
-    "Enhanced security is enforced for your account. Choose which provider to set up:" : "您的账户已启用安全增强。请选择提供者进行配置：",
+    "Enhanced security is enforced for your account. Choose which provider to set up:" : "您的账号将获得增强的安全性。 选择要设置的提供者：",
     "Error while validating your second factor" : "验证您的第二项时出错",
     "Access through untrusted domain" : "通过不被信任的域名访问",
     "Please contact your administrator. If you are an administrator, edit the \"trusted_domains\" setting in config/config.php like the example in config.sample.php." : "请联系您的管理员。如果您就是管理员，请参照 config.sample.php 中的示例编辑 config/config.php 中的  \"trusted_domains\" 设置。",
@@ -428,7 +428,7 @@ OC.L10N.register(
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "特别当使用桌面客户端来同步文件时，不鼓励使用 SQLite。",
     "Wrong password." : "密码错误。",
     "New Password" : "新密码",
-    "We have send a password reset e-mail to the e-mail address known to us for this account. 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> 如果不存在，请咨询管理员。",
+    "We have send a password reset e-mail to the e-mail address known to us for this account. 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> 如果不存在，请咨询管理员。",
     "Search globally" : "全局搜索",
     "Your client should now be connected! You can close this window." : "您的客户端现在应该可以连接了！您可以关闭这个窗口。"
 },
diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json
index 4117c1cd2f..743bd523fd 100644
--- a/core/l10n/zh_CN.json
+++ b/core/l10n/zh_CN.json
@@ -146,7 +146,7 @@
     "User disabled" : "用户不可用",
     "We have detected multiple invalid login attempts from your IP. Therefore your next login is throttled up to 30 seconds." : "我们检测到您的 IP 进行了多次无效登录尝试。因此，请 30 秒之后再尝试。",
     "Reset password" : "重置密码",
-    "A password reset message has been sent to the e-mail address of this account. If you do not receive it, check your spam/junk folders or ask your local administrator for help." : "密码重置的电子邮件发送到此帐户的电子邮件地址。 如果您未在合理的时间内收到，请优先检查您的垃圾邮件/垃圾邮件文件夹。如果不存在此电子邮件，请咨询系统管理员。",
+    "A password reset message has been sent to the e-mail address of this account. If you do not receive it, check your spam/junk folders or ask your local administrator for help." : "密码重置的电子邮件发送到此账号的电子邮件地址。 如果您未在合理的时间内收到，请优先检查您的垃圾邮件/垃圾邮件文件夹。如果不存在此电子邮件，请咨询系统管理员。",
     "If it is not there ask your local administrator." : "如果它不在此处，请询问您的本地管理员。",
     "Couldn't send reset email. Please contact your administrator." : "未能成功发送重置邮件，请联系管理员。",
     "Password can not be changed. Please contact your administrator." : "无法修改密码，请联系管理员。",
@@ -280,7 +280,7 @@
     "It looks like you are trying to reinstall your Nextcloud. However the file CAN_INSTALL is missing from your config directory. Please create the file CAN_INSTALL in your config folder to continue." : "看起来您正在尝试重新安装您的Nextcloud。但您的config文件夹中没有CAN_INSTALL文件。请在您的config文件夹中创建CAN_INSTALL文件以继续。",
     "Could not remove CAN_INSTALL from the config folder. Please remove this file manually." : "无法从config文件夹中移除CAN_INSTALL文件。请手动移除此文件。",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "对于正确的操作，该应用需要使用 JavaScript。请 {linkstart}启用 JavaScript{linkend}，并重新加载页面。",
-    "Get your own free account" : "获取自己的免费账户",
+    "Get your own free account" : "获取自己的免费账号",
     "Skip to main content" : "跳过主内容",
     "Skip to navigation of app" : "跳过应用向导",
     "More apps" : "更多的应用程序",
@@ -292,29 +292,29 @@
     "Contacts menu" : "联系人菜单",
     "Settings menu" : "设置菜单",
     "Confirm your password" : "确认您的密码",
-    "Connect to your account" : "连接您的账户",
-    "Please log in before granting %1$s access to your %2$s account." : "在授权 %1$s 访问您的 %2$s 账户之前，请先登录。",
+    "Connect to your account" : "连接到您的账号",
+    "Please log in before granting %1$s access to your %2$s account." : "在授权 %1$s 访问您的账号 %2$s 之前，请先登录。",
     "App token" : "App 令牌",
     "Grant access" : "授权访问",
     "Alternative log in using app token" : "使用应用程序令牌替代登录",
-    "Account access" : "账户访问",
-    "You are about to grant %1$s access to your %2$s account." : "您正在授权 %1$s 访问您的 %2$s 账户。",
+    "Account access" : "账号访问",
+    "You are about to grant %1$s access to your %2$s account." : "您正在授权 %1$s 访问您的账号 %2$s 。",
     "Account connected" : "账号已连接",
     "Your client should now be connected!" : "您的客户端现在应该可以连接了！",
     "You can close this window." : "您可以关闭此窗口。",
     "This share is password-protected" : "这个共享是被密码保护的",
     "The password is wrong. Try again." : "密码错误。请重试。",
     "Two-factor authentication" : "两步验证",
-    "Enhanced security is enabled for your account. Choose a second factor for authentication:" : "您的账户已启用安全增强。请选择第二种验证方式。",
+    "Enhanced security is enabled for your account. Choose a second factor for authentication:" : "您的账号已启用安全增强。请选择第二种验证方式。",
     "Could not load at least one of your enabled two-factor auth methods. Please contact your admin." : "无法载入您启用的任何两步验证方法。请联系管理员。",
-    "Two-factor authentication is enforced but has not been configured on your account. Contact your admin for assistance." : "两步验证是强制性的，但您的账户似乎未做配置。请联系管理员获得支持。",
-    "Two-factor authentication is enforced but has not been configured on your account. Please continue to setup two-factor authentication." : "两步验证是强制性的，但您的账户未做配置。请联系管理员配置两步验证。",
+    "Two-factor authentication is enforced but has not been configured on your account. Contact your admin for assistance." : "已强制执行两步验证，但尚未在您的账号上对其进行配置。 请与您的管理员联系以获取帮助。",
+    "Two-factor authentication is enforced but has not been configured on your account. Please continue to setup two-factor authentication." : "已强制执行两步验证，但尚未在您的账号上对其进行配置。 请继续设置两步验证。",
     "Set up two-factor authentication" : "配置两步验证",
-    "Two-factor authentication is enforced but has not been configured on your account. Use one of your backup codes to log in or contact your admin for assistance." : "两步验证是强制性的，但您的账户似乎未做配置。使用您的备份代码登录或联系管理员。",
+    "Two-factor authentication is enforced but has not been configured on your account. Use one of your backup codes to log in or contact your admin for assistance." : "已强制执行两步验证，但尚未在您的账号上对其进行配置。 使用您的备用验证码之一登录或与管理员联系以获取帮助。",
     "Use backup code" : "使用备用口令",
     "Cancel log in" : "取消登录",
     "Setup two-factor authentication" : "配置两步验证",
-    "Enhanced security is enforced for your account. Choose which provider to set up:" : "您的账户已启用安全增强。请选择提供者进行配置：",
+    "Enhanced security is enforced for your account. Choose which provider to set up:" : "您的账号将获得增强的安全性。 选择要设置的提供者：",
     "Error while validating your second factor" : "验证您的第二项时出错",
     "Access through untrusted domain" : "通过不被信任的域名访问",
     "Please contact your administrator. If you are an administrator, edit the \"trusted_domains\" setting in config/config.php like the example in config.sample.php." : "请联系您的管理员。如果您就是管理员，请参照 config.sample.php 中的示例编辑 config/config.php 中的  \"trusted_domains\" 设置。",
@@ -426,7 +426,7 @@
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "特别当使用桌面客户端来同步文件时，不鼓励使用 SQLite。",
     "Wrong password." : "密码错误。",
     "New Password" : "新密码",
-    "We have send a password reset e-mail to the e-mail address known to us for this account. 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> 如果不存在，请咨询管理员。",
+    "We have send a password reset e-mail to the e-mail address known to us for this account. 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> 如果不存在，请咨询管理员。",
     "Search globally" : "全局搜索",
     "Your client should now be connected! You can close this window." : "您的客户端现在应该可以连接了！您可以关闭这个窗口。"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/lib/l10n/zh_CN.js b/lib/l10n/zh_CN.js
index 97aededa2c..71b57d85e8 100644
--- a/lib/l10n/zh_CN.js
+++ b/lib/l10n/zh_CN.js
@@ -80,7 +80,7 @@ OC.L10N.register(
     "Help" : "帮助",
     "Apps" : "应用",
     "Settings" : "设置",
-    "Log out" : "注销",
+    "Log out" : "登出",
     "Users" : "用户",
     "Unknown user" : "未知用户",
     "Overview" : "概览",
@@ -98,7 +98,7 @@ OC.L10N.register(
     "Oracle connection could not be established" : "不能建立甲骨文连接",
     "Oracle username and/or password not valid" : "Oracle 数据库用户名和/或密码无效",
     "PostgreSQL username and/or password not valid" : "PostgreSQL 数据库用户名和/或密码无效",
-    "You need to enter details of an existing account." : "您需要输入现有帐户的详细信息。",
+    "You need to enter details of an existing account." : "您需要输入现有账号的详细信息。",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X 不被支持并且 %s 在这个平台上无法正常工作。请自行承担风险！",
     "For the best results, please consider using a GNU/Linux server instead." : "为了达到最好的效果，请考虑使用 GNU/Linux 服务器。",
     "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4 GB and is highly discouraged." : "看起来这个 %s 实例运行在32位PHP环境中并且已在php.ini中配置open_basedir。这将在文件超过4GB时出现问题，我们极力反对这样做。",
diff --git a/lib/l10n/zh_CN.json b/lib/l10n/zh_CN.json
index e039b938a9..b4f5e1feaa 100644
--- a/lib/l10n/zh_CN.json
+++ b/lib/l10n/zh_CN.json
@@ -78,7 +78,7 @@
     "Help" : "帮助",
     "Apps" : "应用",
     "Settings" : "设置",
-    "Log out" : "注销",
+    "Log out" : "登出",
     "Users" : "用户",
     "Unknown user" : "未知用户",
     "Overview" : "概览",
@@ -96,7 +96,7 @@
     "Oracle connection could not be established" : "不能建立甲骨文连接",
     "Oracle username and/or password not valid" : "Oracle 数据库用户名和/或密码无效",
     "PostgreSQL username and/or password not valid" : "PostgreSQL 数据库用户名和/或密码无效",
-    "You need to enter details of an existing account." : "您需要输入现有帐户的详细信息。",
+    "You need to enter details of an existing account." : "您需要输入现有账号的详细信息。",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X 不被支持并且 %s 在这个平台上无法正常工作。请自行承担风险！",
     "For the best results, please consider using a GNU/Linux server instead." : "为了达到最好的效果，请考虑使用 GNU/Linux 服务器。",
     "It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. This will lead to problems with files over 4 GB and is highly discouraged." : "看起来这个 %s 实例运行在32位PHP环境中并且已在php.ini中配置open_basedir。这将在文件超过4GB时出现问题，我们极力反对这样做。",