Translations for RC5 (#4004)

9 files changed, 1449 insertions, 1401 deletions

diff --git a/i18n/de.json b/i18n/de.json
index e9fbd66c4..0bc232a79 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -637,11 +637,11 @@
   },
   {
     "id": "api.command_shortcuts.nav",
-    "translation": "#### Tastenkürzel\n\n#### Navigation\n\nAlt+Hoch: Vorheriger Kanal oder Direktnachricht in der linken Seitenleiste\nAlt+Runter: Nächster Kanal oder Direktnachricht in der linken Seitenleiste\nAlt+Shift+Hoch: Vorheriger Kanal oder Direktnachricht in der linken Seitenleiste mit ungelesenen Nachrichteb\nAlt+Shift+Runter: Nächster Kanal oder Direktnachricht in der linken Seitenleiste mit ungelesenen Nachrichteb\nStrg+K: Einen Kanal Schnellwechseldialog anzeigen\nStrg+Shift+A: Benutzereinstellungen öffnen\nStrg+Shift+M: Die letzten Nennungen öffnen\n\n"
+    "translation": "#### Tastenkürzel\n\n#### Navigation\n\nAlt+Hoch: Vorheriger Kanal oder Direktnachricht in der linken Seitenleiste\nAlt+Runter: Nächster Kanal oder Direktnachricht in der linken Seitenleiste\nAlt+Shift+Hoch: Vorheriger Kanal oder Direktnachricht in der linken Seitenleiste mit ungelesenen Nachrichten\nAlt+Shift+Runter: Nächster Kanal oder Direktnachricht in der linken Seitenleiste mit ungelesenen Nachrichten\nStrg+K: Einen Kanal Schnellwechseldialog anzeigen\nStrg+Shift+A: Benutzereinstellungen öffnen\nStrg+Shift+M: Die letzten Erwähnungen öffnen\n\n"
   },
   {
     "id": "api.command_shortcuts.nav_mac",
-    "translation": "#### Tastenkürzel\n\n#### Navigation\n\nAlt+Hoch: Vorheriger Kanal oder Direktnachricht in der linken Seitenleiste\nAlt+Runter: Nächster Kanal oder Direktnachricht in der linken Seitenleiste\nAlt+Shift+Hoch: Vorheriger Kanal oder Direktnachricht in der linken Seitenleiste mit ungelesenen Nachrichteb\nAlt+Shift+Runter: Nächster Kanal oder Direktnachricht in der linken Seitenleiste mit ungelesenen Nachrichteb\nCmd+K: Einen Kanal Schnellwechseldialog anzeigen\nCmd+Shift+A: Benutzereinstellungen öffnen\nCmd+Shift+M: Die letzten Nennungen öffnen\n\n"
+    "translation": "#### Tastenkürzel\n\n#### Navigation\n\nAlt+Hoch: Vorheriger Kanal oder Direktnachricht in der linken Seitenleiste\nAlt+Runter: Nächster Kanal oder Direktnachricht in der linken Seitenleiste\nAlt+Shift+Hoch: Vorheriger Kanal oder Direktnachricht in der linken Seitenleiste mit ungelesenen Nachrichten\nAlt+Shift+Runter: Nächster Kanal oder Direktnachricht in der linken Seitenleiste mit ungelesenen Nachrichten\nCmd+K: Einen Kanal Schnellwechseldialog anzeigen\nCmd+Shift+A: Benutzereinstellungen öffnen\nCmd+Shift+M: Die letzten Erwähnungen öffnen\n\n"
   },
   {
     "id": "api.command_shrug.desc",
@@ -1333,7 +1333,7 @@
   },
   {
     "id": "api.post.update_mention_count_and_forget.update_error",
-    "translation": "Fehler beim Aktualisieren der Nennungenanzahl, post_id=%v channel_id=%v err=%v"
+    "translation": "Fehler beim Aktualisieren der Erwähnungsanzahl, post_id=%v channel_id=%v err=%v"
   },
   {
     "id": "api.post.update_post.find.app_error",
@@ -1477,7 +1477,7 @@
   },
   {
     "id": "api.slackimport.slack_convert_user_mentions.compile_regexp_failed.warn",
-    "translation": "Konnte Regex Match für @Nennung für Slack Benutzer {{.UserID}} {{.Username}} nicht erstellen"
+    "translation": "Konnte Regex Match für @Erwähnung für Slack Benutzer {{.UserID}} {{.Username}} nicht erstellen"
   },
   {
     "id": "api.slackimport.slack_import.log",
@@ -2457,7 +2457,7 @@
   },
   {
     "id": "ent.ldap.disabled.app_error",
-    "translation": "LDAP deaktiviert oder Lizenz unterstützt kein LDAP."
+    "translation": "AD/LDAP deaktiviert oder Lizenz unterstützt kein AD/LDAP."
   },
   {
     "id": "ent.ldap.do_login.bind_admin_user.app_error",
@@ -2556,6 +2556,10 @@
     "translation": "Kann Benutzer nicht auf AD/LDAP Server finden: "
   },
   {
+    "id": "ent.saml.attribute.app_error",
+    "translation": "SAML login was unsuccessful because one of the attributes is incorrect. Please contact your System Administrator."
+  },
+  {
     "id": "ent.saml.build_request.app_error",
     "translation": "Bei der Verbindung zum Identitäten Anbieter trat ein Fehler auf. Bitte kontaktieren Sie Ihren Systemadministrator."
   },
@@ -3793,7 +3797,7 @@
   },
   {
     "id": "store.sql_channel.increment_mention_count.app_error",
-    "translation": "Konnte Nennungsanzahl nicht erhöhen"
+    "translation": "Konnte Erwähnungenanzahl nicht erhöhen"
   },
   {
     "id": "store.sql_channel.permanent_delete_by_team.app_error",
diff --git a/i18n/es.json b/i18n/es.json
index c16e84f4a..fb7082907 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -2457,7 +2457,7 @@
   },
   {
     "id": "ent.ldap.disabled.app_error",
-    "translation": "LDAP deshabilitado o la licencia no es compatible con LDAP."
+    "translation": "AD/LDAP deshabilitado o la licencia no es compatible con AD/LDAP."
   },
   {
     "id": "ent.ldap.do_login.bind_admin_user.app_error",
@@ -2556,6 +2556,10 @@
     "translation": "No se puede encontrar el usuario en el servidor AD/LDAP: "
   },
   {
+    "id": "ent.saml.attribute.app_error",
+    "translation": "SAML login was unsuccessful because one of the attributes is incorrect. Please contact your System Administrator."
+  },
+  {
     "id": "ent.saml.build_request.app_error",
     "translation": "Se ha producido un error mientras se inicia la solicitud al Proveedor de Identidad. Por favor, póngase en contacto con su Administrador del Sistema."
   },
diff --git a/i18n/fr.json b/i18n/fr.json
index 6bd8cd83f..23e02b41a 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -353,7 +353,7 @@
   },
   {
     "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.errord",
-    "translation": "Unable to get the unread count for user_id=%v and channel_id=%v, err=%v"
+    "translation": "Impossible de récupérer le nombre de messages non lus pour user_id=%v et channel_id=%v, err=%v"
   },
   {
     "id": "api.command.admin_only.app_error",
@@ -605,11 +605,11 @@
   },
   {
     "id": "api.command_shortcuts.browser",
-    "translation": "#### Built-in Browser Commands\n\nALT+LEFT: Previous channel in your history\nALT+RIGHT: Next channel in your history\nCTRL+PLUS: Increase font size (zoom in)\nCTRL+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+    "translation": "#### Intégré dans le navigateur de commandes\n\nALT+GAUCHE: Chaîne précédente dans votre histoire\nALT+DROITE: Canal suivant dans votre histoire\nCTRL+PLUS: Augmentation de la taille de la police (zoom avant)\nCTRL+MOINS: Diminution de la taille de la police (zoom arrière)\nMAJ+HAUT (dans le champ de saisie): Sélectionner le texte à la ligne précédente\nMAJ+BAS (dans le champ de saisie): Sélectionner le texte à la ligne suivante\nMAJ+ENTRÉE (dans le champ de saisie): Créer une nouvelle ligne\n"
   },
   {
     "id": "api.command_shortcuts.browser_mac",
-    "translation": "#### Built-in Browser Commands\n\nCMD+[: Previous channel in your history\nCMD+]: Next channel in your history\nCMD+PLUS: Increase font size (zoom in)\nCMD+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+    "translation": "#### Intégré dans le navigateur de commandes\n\nCMD+[: Canal précédent dans votre histoire\nCMD+]: Canal suivant dans votre histoire\nCMD+PLUS: Augmentation de la taille de la police (zoom avant)\nCMD+MOINS: Diminution de la taille de la police (zoom arrière)\nMAJ+HAUT (dans le champ de saisie): Sélectionner le texte à la ligne précédente\nMAJ+flèche vers le BAS (dans le champ de saisie): Sélectionner le texte à la ligne suivante\nMAJ+ENTRÉE (dans le champ de saisie): Créer une nouvelle ligne\n"
   },
   {
     "id": "api.command_shortcuts.desc",
@@ -625,11 +625,11 @@
   },
   {
     "id": "api.command_shortcuts.msgs",
-    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCTRL+UP (in empty input field): Reprint the previous message or slash command you entered\nCTRL+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+    "translation": "#### Messages\n\nESC: Marque tous les messages du canal courant comme lus\nCTRL+HAUT (dans un champ de saisie vide): Réaffiche le message précédent ou la commande slash que vous avez précédemment tapés\nCTRL+BAS (dans un champ de saisie vide): Réaffiche le message suivant ou la commande slash que vous avez précédemment saisis\nHAUT (dans un champ de saisie vide): Édite le dernier message que vous avez saisi dans le canal courant\n@[caractère]+TAB: Suggère le @nom d'utilisateur commençant par [caractère]\n:[caractère]+TAB: Suggère des émoticônes commençant par [caractère]\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs_mac",
-    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCMD+UP (in empty input field): Reprint the previous message or slash command you entered\nCMD+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+    "translation": "#### Messages\n\nESC: Marque tous les messages du canal courant comme lus\nCMD+Haut (dans un champ d'édition vide): Affiche à nouveau le message ou la commande slash précédent que vous avez saisis\nCMD+Bas (dans un champ d'édition vide): Affiche à nouveau le message ou la commande slash suivant que vous avez saisis\nHaut (dans un champ d'édition vide): Edite le dernier message que vous avez saisi dans le canal courant\n@[caractère]+TAB: Complète automatiquement le @nom d'utilisateur commençant par [caractère]\n:[caractère]+TAB: Complète automatiquement l'émoticône commençant par [caractère]\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
@@ -637,11 +637,11 @@
   },
   {
     "id": "api.command_shortcuts.nav",
-    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCTRL+K: Open a quick channel switcher dialog\nCTRL+SHIFT+A: Open account settings\nCTRL+SHIFT+M: Open recent mentions\n\n"
+    "translation": "### Raccourcis clavier\n\n#### Navigation\n\nALT+HAUT: Canal ou message privé dans la barre latérale gauche\nALT+BAS: Canal ou message privé suivant dans la barre latérale gauche\nALT+MAJ+HAUT: Canal ou message privé précédent dans la barre latérale de gauche comportant des messages non lus\nALT+MAJ+BAS: Canal ou message privé suivant dans la barre latérale de gauche comportant des messages non lus\nCMD+K: Ouvre une boîte de dialogue permettant de changer de canal rapidement\nCMD+MAJ+A: Ouvre les paramètres du compte\nCMD+MAJ+M: Ouvre les mentions récentes\n\n"
   },
   {
     "id": "api.command_shortcuts.nav_mac",
-    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCMD+K: Open a quick channel switcher dialog\nCMD+SHIFT+A: Open account settings\nCMD+SHIFT+M: Open recent mentions\n\n"
+    "translation": "### Raccourcis clavier\n\n#### Navigation\n\nALT+HAUT: Canal ou message privé dans la barre latérale gauche\nALT+BAS: Canal ou message privé suivant dans la barre latérale gauche\nALT+MAJ+UP: Canal ou message privé précédent dans la barre latérale de gauche comportant des messages non lus\nALT+MAJ+DOWN: Canal ou message privé suivant dans la barre latérale de gauche comportant des messages non lus\nCMD+K: Ouvre une boîte de dialogue permettant de changer de canal rapidement\nCMD+MAJ+A: Ouvre les paramètres du compte\nCMD+MAJ+M: Ouvre les mentions récentes\n\n"
   },
   {
     "id": "api.command_shrug.desc",
@@ -701,7 +701,7 @@
   },
   {
     "id": "api.email_batching.add_notification_email_to_batch.channel_full.app_error",
-    "translation": "Email batching job's receiving channel was full. Please increase the EmailBatchingBufferSize."
+    "translation": "Le canal recevant les courriels envoyés par lot est plein. Veuillez augmenter le paramètre EmailBatchingBufferSize."
   },
   {
     "id": "api.email_batching.add_notification_email_to_batch.disabled.app_error",
@@ -709,15 +709,15 @@
   },
   {
     "id": "api.email_batching.check_pending_emails.finished_running",
-    "translation": "Email batching job ran. %v user(s) still have notifications pending."
+    "translation": "Le job d'envoi de courriels par lot vient de s'exécuter. %v utilisateur(s) ont encore des notifications en attente."
   },
   {
     "id": "api.email_batching.check_pending_emails.status.app_error",
-    "translation": "Unable to find status of recipient for batched email notification"
+    "translation": "Impossible de trouver le statut du destinataire pour l'envoi par lot des notifications par courriel"
   },
   {
     "id": "api.email_batching.render_batched_post.channel.app_error",
-    "translation": "Unable to find channel of post for batched email notification"
+    "translation": "Impossible de trouver le canal du message pour l'envoi par lot des notifications par courriel"
   },
   {
     "id": "api.email_batching.render_batched_post.date",
@@ -733,7 +733,7 @@
   },
   {
     "id": "api.email_batching.render_batched_post.sender.app_error",
-    "translation": "Unable to find sender of post for batched email notification"
+    "translation": "Impossible de trouver l’expéditeur du message pour l'envoi de courriels groupés"
   },
   {
     "id": "api.email_batching.send_batched_email_notification.body_text",
@@ -744,7 +744,7 @@
   },
   {
     "id": "api.email_batching.send_batched_email_notification.preferences.app_error",
-    "translation": "Unable to find display preferences of recipient for batched email notification"
+    "translation": "Impossible de trouver les préférences d'affichage du destinataire pour l'envoi de courriels groupés"
   },
   {
     "id": "api.email_batching.send_batched_email_notification.send.app_error",
@@ -753,53 +753,53 @@
   {
     "id": "api.email_batching.send_batched_email_notification.subject",
     "translation": {
-      "one": "[{{.SiteName}}] New Notification for {{.Month}} {{.Day}}, {{.Year}}",
-      "other": "[{{.SiteName}}] New Notifications for {{.Month}} {{.Day}}, {{.Year}}"
+      "one": "[{{.SiteName}}] New Notification for {{.Day}} {{.Month}}, {{.Year}}",
+      "other": "[{{.SiteName}}] New Notifications for {{.Day}} {{.Month}}, {{.Year}}"
     }
   },
   {
     "id": "api.email_batching.send_batched_email_notification.user.app_error",
-    "translation": "Unable to find recipient for batched email notification"
+    "translation": "Impossible de trouver un destinataire pour l'envoi de courriels groupés"
   },
   {
     "id": "api.email_batching.start.starting",
-    "translation": "Email batching job starting. Checking for pending emails every %v seconds."
+    "translation": "Début de l'envoi de courriels groupés. Vérification des courriels en attente toutes les %v secondes."
   },
   {
     "id": "api.emoji.create.duplicate.app_error",
-    "translation": "Impossible de créer cet Emoji. Un autre Emoji du même nom existe déjà."
+    "translation": "Impossible de créer cette émoticône. Une autre émoticône du même nom existe déjà."
   },
   {
     "id": "api.emoji.create.parse.app_error",
-    "translation": "Impossible de créer un emoji. Impossible de comprendre la requête."
+    "translation": "Impossible de créer l'émoticône. Impossible de comprendre la requête."
   },
   {
     "id": "api.emoji.create.permissions.app_error",
-    "translation": "Droits insuffisants pour créer des Emoji."
+    "translation": "Droits insuffisants pour créer des émoticônes."
   },
   {
     "id": "api.emoji.create.too_large.app_error",
-    "translation": "Impossible de créer un emoji. L'image doit faire moins de 64Ko."
+    "translation": "Impossible de créer l'émoticône. L'image doit faire moins de 64Kio."
   },
   {
     "id": "api.emoji.delete.permissions.app_error",
-    "translation": "Droits insuffisants pour supprimer des Emoji."
+    "translation": "Droits insuffisants pour supprimer des émoticônes."
   },
   {
     "id": "api.emoji.disabled.app_error",
-    "translation": "Les Emoji ont été désactivées par l'administrateur."
+    "translation": "Les émoticônes ont été désactivées par l'administrateur."
   },
   {
     "id": "api.emoji.get_image.decode.app_error",
-    "translation": "Impossible de décoder le fichier image pour emoji."
+    "translation": "Impossible de décoder le fichier image pour l'émoticône."
   },
   {
     "id": "api.emoji.get_image.read.app_error",
-    "translation": "Impossible de décoder le fichier image pour emoji."
+    "translation": "Impossible de décoder le fichier image pour l'émoticône."
   },
   {
     "id": "api.emoji.init.debug",
-    "translation": "Initialisation des routes de l'api des messages"
+    "translation": "Initialisation des routes de l'api des émoticônes"
   },
   {
     "id": "api.emoji.storage.app_error",
@@ -807,11 +807,11 @@
   },
   {
     "id": "api.emoji.upload.image.app_error",
-    "translation": "Impossible de créer emoji. Le fichier doit être un PNG, JPG ou GIF."
+    "translation": "Impossible de créer l'émoticône. Le fichier doit être un PNG, JPG ou GIF."
   },
   {
     "id": "api.emoji.upload.large_image.app_error",
-    "translation": "Impossible de créer un emoji. L'image doit faire au plus 128x128 pixels."
+    "translation": "Impossible de créer l'émoticône. L'image doit faire au plus 128x128 pixels."
   },
   {
     "id": "api.file.file_upload.exceeds",
@@ -1175,7 +1175,7 @@
   },
   {
     "id": "api.post.delete_flagged_post.app_error.warn",
-    "translation": "Unable to delete flagged post preference when deleting post, err=%v"
+    "translation": "Impossible de supprimer les préférences du message lorsque celui-ci est en train d'être supprimé, err=%v"
   },
   {
     "id": "api.post.delete_post.permissions.app_error",
@@ -1261,11 +1261,11 @@
   },
   {
     "id": "api.post.notification.member_profile.warn",
-    "translation": "Unable to get profile for channel member, user_id=%v"
+    "translation": "Impossible d'obtenir le profil pour le membre du canal, user_id=%v"
   },
   {
     "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
-    "translation": "Clearing push notification to %v with channel_id %v"
+    "translation": "Suppression de la notification push pour %v avec channel_id %v"
   },
   {
     "id": "api.post.send_notifications_and_forget.comment_thread.error",
@@ -1273,7 +1273,7 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.get_teams.error",
-    "translation": "Failed to get teams when sending cross-team DM user_id=%v, err=%v"
+    "translation": "Impossible d'obtenir les équipes lors de l'envoi d'un message privé entre équipes user_id=%v, err=%v"
   },
   {
     "id": "api.post.send_notifications_and_forget.mention_body",
@@ -1477,7 +1477,7 @@
   },
   {
     "id": "api.slackimport.slack_convert_user_mentions.compile_regexp_failed.warn",
-    "translation": "Failed to compile the @mention matching regular expression for Slack user {{.UserID}} {{.Username}}"
+    "translation": "Échec de la compilation de la @mention correspondant à l'expression régulière pour l'utilisateur Slack {{.UserID}} {{.Username}}"
   },
   {
     "id": "api.slackimport.slack_import.log",
@@ -1801,7 +1801,7 @@
   },
   {
     "id": "api.templates.upgrade_30_body.info",
-    "translation": "<h3 style='font-weight: normal; margin-top: 10px;'>YOUR DUPLICATE ACCOUNTS HAVE BEEN UPDATED</h3>Your Mattermost server is being upgraded to Version 3.0, which lets you use a single account across multiple teams.<br/><br/>You are receiving this email because the upgrade process has detected your account had the same email or username as other accounts on the server.<br/><br/>The following updates have been made: <br/><br/>{{if .EmailChanged }}- The duplicate email of an account on the `/{{.TeamName}}` team was changed to `{{.Email}}`. You will need to use email and password to login, you can use this new email address for login.<br/><br/>{{end}}{{if .UsernameChanged }}- The duplicate username of an account on the team site `/{{.TeamName}}` has been changed to `{{.Username}}` to avoid confusion with other accounts.<br/><br/>{{end}} RECOMMENDED ACTION: <br/><br/>It is recommended that you login to your teams used by your duplicate accounts and add your primary account to the team and any public channels and private groups which you wish to continue using. <br/><br/>This gives your primary account access to all public channel and private group history. You can continue to access the direct message history of your duplicate accounts by logging in with their credentials. <br/><br/>FOR MORE INFORMATION: <br/><br/>For more information on the upgrade to Mattermost 3.0 please see: <a href='http://www.mattermost.org/upgrading-to-mattermost-3-0/'>http://www.mattermost.org/upgrading-to-mattermost-3-0/</a><br/><br/>"
+    "translation": "<h3 style='font-weight: normal; margin-top: 10px;'>VOS COMPTES DUPLIQUES ONT ETE MIS A NIVEAU</h3>Votre serveur Mattermost a été mis à niveau vers la version 3.0, qui vous permet d'utiliser un seul compte pour plusieurs équipes.<br/><br/>Vous recevez cet email parce que le processus de mise à niveau a détecté que votre compte utilisait la même adresse email ou le même nom d'utilisateur que d'autres comptes présents sur le serveur.<br/><br/>Les mises à niveau suivantes ont été effectuées : <br/><br/>{{if .EmailChanged }}- Une adresse email dupliquée d'un compte de l'équipe `/{{.TeamName}}` a été changé en `{{.Email}}`. Vous devrez utiliser cette nouvelle adresse email la prochaine fois que vous vous connecterez à l'aide de votre adresse email et mot de passe.<br/><br/>{{end}}{{if .UsernameChanged }}- Un nom d'utilisateur en doublon d'un compte de l'équipe `/{{.TeamName}}` a été changé en `{{.Username}}` pour éviter toute confusion avec d'autres comptes.<br/><br/>{{end}} ACTION RECOMMANDÉE : <br/><br/>Il est nécessaire que vous vous connectiez aux équipes qui utilisent vos comptes dupliqués de façon à ajouter votre compte principal à cette équipe et ainsi pouvoir continuer à utiliser vos groupes publics et privés.<br/><br/>De cette façon, votre compte principal aura accès à l'entièreté de l'historique des canaux publics et privés. Vous pouvez continuer à utiliser l'historique des messages privés en utilisant vos comptes dupliqués en vous connectant à l'aide de leurs paramètres d'authentification. <br/><br/>POUR PLUS D'INFORMATION: <br/><br/>Pour plus d'information sur la mise à niveau vers Mattermost 3.0, veuillez vous référer à : <a href='http://www.mattermost.org/upgrading-to-mattermost-3-0/'>http://www.mattermost.org/upgrading-to-mattermost-3-0/</a><br/><br/>"
   },
   {
     "id": "api.templates.upgrade_30_subject.info",
@@ -2389,47 +2389,47 @@
   },
   {
     "id": "ent.cluster.config_changed.info",
-    "translation": "Cluster configuration has changed for id=%v.  Attempting to restart cluster service.  To ensure the cluster is configured correctly you should not rely on this restart because we detected a core configuration change."
+    "translation": "La configuration de cluster a changé pour id=%v.  Tentative de redémarrage du service cluster.  Pour vous assurer que le cluster est correctement configuré, vous ne devriez pas vous fier à ce redémarrage, car un changement notable de configuration a été détecté."
   },
   {
     "id": "ent.cluster.debug_fail.debug",
-    "translation": "Cluster send failed at `%v` detail=%v, extra=%v, retry number=%v"
+    "translation": "Le cluster a renvoyé échec à `%v` detail=%v, extra=%v, retry number=%v"
   },
   {
     "id": "ent.cluster.final_fail.error",
-    "translation": "Cluster send final fail at `%v` detail=%v, extra=%v, retry number=%v"
+    "translation": "Le cluster a renvoyé échec final à `%v` detail=%v, extra=%v, retry number=%v"
   },
   {
     "id": "ent.cluster.incompatible.warn",
-    "translation": "Potential incompatible version detected for clustering with %v"
+    "translation": "Version potentiellement incompatible détectée pour le cluster avec %v"
   },
   {
     "id": "ent.cluster.incompatible_config.warn",
-    "translation": "Potential incompatible config detected for clustering with %v"
+    "translation": "Configuration potentiellement incompatible détectée pour une mise en cluster avec %v"
   },
   {
     "id": "ent.cluster.licence_disable.app_error",
-    "translation": "Fonctionnalité de conformité désactivée par la licence courante. Veuillez contacter votre administrateur système concernant la mise à niveau de votre licence entreprise."
+    "translation": "La fonctionnalité de mise en clusters est désactivée par la licence actuellement utilisée. Veuillez contacter votre administrateur système à propos d'une mise à niveau vers la licence entreprise."
   },
   {
     "id": "ent.cluster.ping_failed.info",
-    "translation": "Cluster ping failed with hostname=%v on=%v with id=%v"
+    "translation": "Le ping du cluster a échoué avec le nom d'hôte=%v sur=%v avec id=%v"
   },
   {
     "id": "ent.cluster.ping_success.info",
-    "translation": "Cluster ping successful with hostname=%v on=%v with id=%v self=%v"
+    "translation": "Le ping du cluster a réussi avec le nom d'hôte=%v sur=%v avec l'id=%v self=%v"
   },
   {
     "id": "ent.cluster.save_config.error",
-    "translation": "System Console is set to read-only when High Availability is enabled."
+    "translation": "La Console Système est en lecture-seule lorsque le mode Haute Disponibilité est activé."
   },
   {
     "id": "ent.cluster.starting.info",
-    "translation": "Cluster internode communication is listening on %v with hostname=%v id=%v"
+    "translation": "La communication entre noeuds de cluster écoute sur %v avec le nom d'hôte=%v id=%v"
   },
   {
     "id": "ent.cluster.stopping.info",
-    "translation": "Cluster internode communication is stopping on %v with hostname=%v id=%v"
+    "translation": "La communication entre noeuds de cluster s'est arrêtée sur %v avec le nom d'hôte=%v id=%v"
   },
   {
     "id": "ent.compliance.licence_disable.app_error",
@@ -2453,11 +2453,11 @@
   },
   {
     "id": "ent.emoji.licence_disable.app_error",
-    "translation": "Emoji personnalisés désactivés par la licence courante. Veuillez contacter votre administrateur système concernant la mise à niveau de votre licence entreprise."
+    "translation": "Les émoticônes personnalisées sont désactivées par la licence actuellement utilisée. Veuillez contacter votre administrateur système à propos d'une mise à niveau vers la licence entreprise."
   },
   {
     "id": "ent.ldap.disabled.app_error",
-    "translation": "AD/LDAP disabled or licence does not support AD/LDAP."
+    "translation": "AD/LDAP désactivé ou votre licence ne supporte pas AD/LDAP."
   },
   {
     "id": "ent.ldap.do_login.bind_admin_user.app_error",
@@ -2556,6 +2556,10 @@
     "translation": "Impossible de trouver l'utilisateur sur le serveur LDAP : "
   },
   {
+    "id": "ent.saml.attribute.app_error",
+    "translation": "SAML login was unsuccessful because one of the attributes is incorrect. Please contact your System Administrator."
+  },
+  {
     "id": "ent.saml.build_request.app_error",
     "translation": "Erreur lors de la requête au fournisseur d'identité. Veuillez contacter votre administrateur système."
   },
@@ -2861,7 +2865,7 @@
   },
   {
     "id": "model.client.create_emoji.emoji.app_error",
-    "translation": "Impossible d'attacher un Emoji à la requête"
+    "translation": "Impossible d'attacher une émoticône à la requête"
   },
   {
     "id": "model.client.create_emoji.image.app_error",
@@ -2949,15 +2953,15 @@
   },
   {
     "id": "model.config.is_valid.cluster_email_batching.app_error",
-    "translation": "Unable to enable email batching when clustering is enabled"
+    "translation": "Impossible d'activer l'envoi de courriels groupé lorsque le clustering est activé"
   },
   {
     "id": "model.config.is_valid.email_batching_buffer_size.app_error",
-    "translation": "Invalid email batching buffer size for email settings.  Must be zero or a positive number."
+    "translation": "Taille du buffer d'envoi de courriels groupé invalide. Doit être 0 ou un nombre positif."
   },
   {
     "id": "model.config.is_valid.email_batching_interval.app_error",
-    "translation": "Invalid email batching interval for email settings.  Must be 30 seconds or more."
+    "translation": "Intervalle d'envoi de courriels groupé invalide pour les réglages de courriels. Doit être égal ou supérieur à 30 secondes."
   },
   {
     "id": "model.config.is_valid.email_reset_salt.app_error",
@@ -3137,7 +3141,7 @@
   },
   {
     "id": "model.config.is_valid.site_url_email_batching.app_error",
-    "translation": "Unable to enable email batching when SiteURL isn't set."
+    "translation": "Impossible d'activer l'envoi de courriels groupé si SiteURL n'est pas défini."
   },
   {
     "id": "model.config.is_valid.sitename_length.app_error",
@@ -3169,7 +3173,7 @@
   },
   {
     "id": "model.emoji.id.app_error",
-    "translation": "Id emoji invalide"
+    "translation": "Id d'émoticône invalide"
   },
   {
     "id": "model.emoji.name.app_error",
@@ -4289,7 +4293,7 @@
   },
   {
     "id": "store.sql_status.get_team_statuses.app_error",
-    "translation": "Encountered an error retrieving all statuses from the team members"
+    "translation": "Une erreur est survenue lors de la récupération de tous les statuts des membres de l'équipe"
   },
   {
     "id": "store.sql_status.get_total_active_users_count.app_error",
@@ -4689,7 +4693,7 @@
   },
   {
     "id": "utils.diagnostic.analytics_not_found.app_error",
-    "translation": "Analytics not initialized"
+    "translation": "Analytics non initialisé"
   },
   {
     "id": "utils.i18n.loaded",
diff --git a/i18n/ja.json b/i18n/ja.json
index ebbe46d97..088518649 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -2457,7 +2457,7 @@
   },
   {
     "id": "ent.ldap.disabled.app_error",
-    "translation": "LDAPが無効化されている、またはライセンスがLDAPをサポートしていません。"
+    "translation": "AD/LDAPが無効化されている、またはライセンスがAD/LDAPをサポートしていません。"
   },
   {
     "id": "ent.ldap.do_login.bind_admin_user.app_error",
@@ -2556,6 +2556,10 @@
     "translation": "AD/LDAPサーバー上でユーザを見つけることができませんでした: "
   },
   {
+    "id": "ent.saml.attribute.app_error",
+    "translation": "SAML login was unsuccessful because one of the attributes is incorrect. Please contact your System Administrator."
+  },
+  {
     "id": "ent.saml.build_request.app_error",
     "translation": "認証プロバイダーへのリクエストを初期化する際にエラーが発生しました。システム管理者に連絡してください。"
   },
diff --git a/i18n/ko.json b/i18n/ko.json
index 8314a021e..fc1bad3b4 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -333,7 +333,7 @@
   },
   {
     "id": "api.channel.remove_member.user.app_error",
-    "translation": "추가할 사용자를 찾는 데 실패하였습니다"
+    "translation": "제거할 사용자를 찾는 데 실패하였습니다"
   },
   {
     "id": "api.channel.remove_user_from_channel.deleted.app_error",
@@ -605,11 +605,11 @@
   },
   {
     "id": "api.command_shortcuts.browser",
-    "translation": "#### 브라우저 내장 단축키\n\nALT+LEFT: 이전 채널\nALT+RIGHT: 다음 채널\nCTRL+PLUS: 폰트 사이즈 키우기 (zoom in)\nCTRL+MINUS: 폰트 사이즈 줄이기 (zoom out)\n(입력 필드에서)SHIFT+UP: 이전 줄까지 선택\n(입력 필드에서)SHIFT+DOWN: 다음 줄 까지 선택\n(입력 필드에서)SHIFT+ENTER: 줄 바꿈\n"
+    "translation": "#### 브라우저 내장 단축키\n\nALT+LEFT: 이전 채널\nALT+RIGHT: 다음 채널\nCTRL+PLUS: 폰트 사이즈 키우기 (zoom in)\nCTRL+MINUS: 폰트 사이즈 줄이기 (zoom out)\n(입력란에서)SHIFT+UP: 이전 줄까지 선택\n(입력란에서)SHIFT+DOWN: 다음 줄 까지 선택\n(입력란에서)SHIFT+ENTER: 줄 바꿈\n"
   },
   {
     "id": "api.command_shortcuts.browser_mac",
-    "translation": "#### 브라우저 내장 단축키\n\nCMD+[: 이전 채널\nCMD+]: 다음 채널\nCMD+PLUS: 폰트 사이즈 키우기 (zoom in)\nCMD+MINUS: 폰트 사이즈 줄이기 (zoom out)\n(입력 필드에서)SHIFT+UP: 이전 줄까지 선택\n(입력 필드에서)SHIFT+DOWN: 다음 줄 까지 선택\n(입력 필드에서)SHIFT+ENTER: 줄 바꿈\n"
+    "translation": "#### 브라우저 내장 단축키\n\nCMD+[: 이전 채널\nCMD+]: 다음 채널\nCMD+PLUS: 폰트 사이즈 키우기 (zoom in)\nCMD+MINUS: 폰트 사이즈 줄이기 (zoom out)\n(입력란에서)SHIFT+UP: 이전 줄까지 선택\n(입력란에서)SHIFT+DOWN: 다음 줄 까지 선택\n(입력란에서)SHIFT+ENTER: 줄 바꿈\n"
   },
   {
     "id": "api.command_shortcuts.desc",
@@ -625,7 +625,7 @@
   },
   {
     "id": "api.command_shortcuts.msgs",
-    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCTRL+UP (in empty input field): Reprint the previous message or slash command you entered\nCTRL+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+    "translation": "#### 메시지\n\nESC: 현재 채널의 모든 메시지를 읽음으로 표시\n(빈 입력란에서)CTRL+UP: 바로 이전에 입력했던 메시지나 명령어를 다시 입력합니다.\n(빈 입력란에서)CTRL+DOWN: 바로 이전에 입력했던 메시지나 명령어를 다시 입력합니다.\n(빈 입력란에서)UP: 현재 채널에 가장 최근 메시지를 편집합니다.\n@[character]+TAB: [character]로 시작하는 @사용자명을 자동완성합니다.\n:[character]+TAB: [character]로 시작하는 이모티콘을 자동완성합니다.\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs_mac",
@@ -725,7 +725,7 @@
   },
   {
     "id": "api.email_batching.render_batched_post.direct_message",
-    "translation": "신규 메시지"
+    "translation": "개인 메시지"
   },
   {
     "id": "api.email_batching.render_batched_post.go_to_post",
@@ -1055,7 +1055,7 @@
   },
   {
     "id": "api.oauth.get_access_token.bad_grant.app_error",
-    "translation": "invalid_request: 잘못된 response_type"
+    "translation": "invalid_request: 잘못된 grant_type"
   },
   {
     "id": "api.oauth.get_access_token.credentials.app_error",
@@ -1309,11 +1309,11 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.debug",
-    "translation": "Sending push notification to %v wi msg of '%v'"
+    "translation": "%v에게 다음 내용으로 푸시 알림 발송 '%v'"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
-    "translation": "발신 실패한 푸시 알림 id=%v, err=%v"
+    "translation": "푸시 알림 발송 실패 device_id=%v, err=%v"
   },
   {
     "id": "api.post.send_notifications_and_forget.send.error",
@@ -1509,7 +1509,7 @@
   },
   {
     "id": "api.status.init.debug",
-    "translation": "post API 경로 초기화 중"
+    "translation": "상태 API 루트를 초기화 중"
   },
   {
     "id": "api.status.last_activity.error",
@@ -2001,7 +2001,7 @@
   },
   {
     "id": "api.user.email_to_ldap.not_available.app_error",
-    "translation": "이 서버에서 LDAP을 사용할 수 없습니다."
+    "translation": "이 서버에서 AD/LDAP을 사용할 수 없습니다."
   },
   {
     "id": "api.user.generate_mfa_qr.not_available.app_error",
@@ -2021,11 +2021,11 @@
   },
   {
     "id": "api.user.ldap_to_email.not_available.app_error",
-    "translation": "이 서버에서 LDAP을 사용할 수 없습니다."
+    "translation": "이 서버에서 AD/LDAP을 사용할 수 없습니다."
   },
   {
     "id": "api.user.ldap_to_email.not_ldap_account.app_error",
-    "translation": "이 사용자 계정은 LDAP을 사용하지 않습니다."
+    "translation": "이 사용자 계정은 AD/LDAP을 사용하지 않습니다."
   },
   {
     "id": "api.user.login.blank_pwd.app_error",
@@ -2069,7 +2069,7 @@
   },
   {
     "id": "api.user.login_ldap.disabled.app_error",
-    "translation": "이 서버에서 LDAP을 사용할 수 없습니다."
+    "translation": "이 서버에서 AD/LDAP이 활성화되지 않았습니다."
   },
   {
     "id": "api.user.login_ldap.need_id.app_error",
@@ -2461,7 +2461,7 @@
   },
   {
     "id": "ent.ldap.do_login.bind_admin_user.app_error",
-    "translation": "LDAP 서버에 연결할 수 없습니다. 계정을 확인하세요."
+    "translation": "AD/LDAP 서버에 연결할 수 없습니다. 연결된 사용자명과 비밀번호 속성을 확인해보세요."
   },
   {
     "id": "ent.ldap.do_login.invalid_password.app_error",
@@ -2469,7 +2469,7 @@
   },
   {
     "id": "ent.ldap.do_login.licence_disable.app_error",
-    "translation": "LDAP 기능을 활성화 하려면 엔터프라이즈 라이센스가 필요합니다. 시스템 관리자에게 업그레이드를 문의해보세요."
+    "translation": "AD/LDAP 기능을 활성화 하려면 엔터프라이즈 라이센스가 필요합니다. 시스템 관리자에게 업그레이드를 문의해보세요."
   },
   {
     "id": "ent.ldap.do_login.matched_to_many_users.app_error",
@@ -2477,11 +2477,11 @@
   },
   {
     "id": "ent.ldap.do_login.search_ldap_server.app_error",
-    "translation": "LDAP 서버를 검색하는데 실패했습니다."
+    "translation": "AD/LDAP 서버를 검색하는데 실패했습니다."
   },
   {
     "id": "ent.ldap.do_login.unable_to_connect.app_error",
-    "translation": "LDAP 서버에 연결하는데 실패했습니다."
+    "translation": "AD/LDAP 서버에 연결할 수 없습니다."
   },
   {
     "id": "ent.ldap.do_login.unable_to_create_user.app_error",
@@ -2489,27 +2489,27 @@
   },
   {
     "id": "ent.ldap.do_login.user_filtered.app_error",
-    "translation": "Your LDAP account does not have permission to use this Mattermost server. Please ask your System Administrator to check the LDAP user filter."
+    "translation": "AD/LDAP 계정이 Mattermost 서버를 사용하기 위한 권한이 없습니다. 시스템 관리자에게 AD/LDAP 사용자 필터 확인을 문의해보세요."
   },
   {
     "id": "ent.ldap.do_login.user_not_registered.app_error",
-    "translation": "User not registered on LDAP server"
+    "translation": "사용자가 AD/LDAP 서버에 등록되어 있지 않습니다."
   },
   {
     "id": "ent.ldap.mattermost_user_update",
-    "translation": "Mattermost 사용자가 LDAP 서버에 의해 변경되었습니다."
+    "translation": "Mattermost 사용자가 AD/LDAP 서버에 의해 변경되었습니다."
   },
   {
     "id": "ent.ldap.syncdone.info",
-    "translation": "LDAP 동기화 완료"
+    "translation": "AD/LDAP 동기화 완료"
   },
   {
     "id": "ent.ldap.syncronize.get_all.app_error",
-    "translation": "Unable to get all users using LDAP"
+    "translation": "AD/LDAP에서 사용자를 불러올 수 없습니다."
   },
   {
     "id": "ent.ldap.validate_filter.app_error",
-    "translation": "잘못된 LDAP 필터"
+    "translation": "잘못된 AD/LDAP 필터"
   },
   {
     "id": "ent.mfa.activate.authenticate.app_error",
@@ -2549,11 +2549,15 @@
   },
   {
     "id": "ent.migration.migratetoldap.duplicate_field",
-    "translation": "Unable to migrate LDAP users with specified field. Duplicate entry detected. Please remove all duplcates and try again."
+    "translation": "AD/LDAP 사용자를 마이그레이션 할 수 없습니다. 중복된 엔트리가 있습니다. 모든 중복을 제거한 후 다시 시도해보세요."
   },
   {
     "id": "ent.migration.migratetoldap.user_not_found",
-    "translation": "Unable to find user on LDAP server: "
+    "translation": "AD/LDAP 서버에서 사용자를 찾을 수 없음: "
+  },
+  {
+    "id": "ent.saml.attribute.app_error",
+    "translation": "SAML login was unsuccessful because one of the attributes is incorrect. Please contact your System Administrator."
   },
   {
     "id": "ent.saml.build_request.app_error",
@@ -2617,7 +2621,7 @@
   },
   {
     "id": "ent.saml.service_disable.app_error",
-    "translation": "MFA를 설정하지 않았거나 서버에서 지원하지 않습니다"
+    "translation": "SAML이 설정되지 않았거나 서버에서 지원하지 않습니다"
   },
   {
     "id": "ent.saml.update_saml_user.unable_error",
@@ -2845,7 +2849,7 @@
   },
   {
     "id": "model.channel_member.is_valid.role.app_error",
-    "translation": "올바르지 않은 형식"
+    "translation": "잘못된 권한"
   },
   {
     "id": "model.channel_member.is_valid.unread_level.app_error",
@@ -2913,7 +2917,7 @@
   },
   {
     "id": "model.command.is_valid.url.app_error",
-    "translation": "올바르지 않은 형식"
+    "translation": "잘못된 URL"
   },
   {
     "id": "model.command.is_valid.url_http.app_error",
@@ -2921,7 +2925,7 @@
   },
   {
     "id": "model.command.is_valid.user_id.app_error",
-    "translation": "올바르지 않은 형식"
+    "translation": "잘못된 사용자 ID"
   },
   {
     "id": "model.compliance.is_valid.create_at.app_error",
@@ -2937,7 +2941,7 @@
   },
   {
     "id": "model.compliance.is_valid.id.app_error",
-    "translation": "잘못된 Id"
+    "translation": "잘못된 ID"
   },
   {
     "id": "model.compliance.is_valid.start_at.app_error",
@@ -3009,31 +3013,31 @@
   },
   {
     "id": "model.config.is_valid.ldap_basedn",
-    "translation": "LDAP field \"BaseDN\" is required."
+    "translation": "AD/LDAP의 \"BaseDN\" 항목이 필요합니다."
   },
   {
     "id": "model.config.is_valid.ldap_bind_password",
-    "translation": "LDAP field \"Bind Password\" is required."
+    "translation": "AD/LDAP의 \"Bind Password\" 항목이 필요합니다."
   },
   {
     "id": "model.config.is_valid.ldap_bind_username",
-    "translation": "LDAP field \"Bind Username\" is required."
+    "translation": "AD/LDAP의 \"Bind Username\" 항목이 필요합니다."
   },
   {
     "id": "model.config.is_valid.ldap_email",
-    "translation": "LDAP field \"Email Attribute\" is required."
+    "translation": "AD/LDAP의 \"Email Attribute\" 항목이 필요합니다."
   },
   {
     "id": "model.config.is_valid.ldap_firstname",
-    "translation": "LDAP field \"First Name Attribute\" is required."
+    "translation": "AD/LDAP의 \"First Name Attribute\" 항목이 필요합니다."
   },
   {
     "id": "model.config.is_valid.ldap_id",
-    "translation": "LDAP field \"ID Attribute\" is required."
+    "translation": "AD/LDAP의 \"ID Attribute\" 항목이 필요합니다."
   },
   {
     "id": "model.config.is_valid.ldap_lastname",
-    "translation": "LDAP field \"Last Name Attribute\" is required."
+    "translation": "AD/LDAP의 \"Last Name Attribute\" 항목이 필요합니다."
   },
   {
     "id": "model.config.is_valid.ldap_max_page_size.app_error",
@@ -3053,7 +3057,7 @@
   },
   {
     "id": "model.config.is_valid.ldap_server",
-    "translation": "LDAP field \"LDAP Server\" is required."
+    "translation": "AD/LDAP의 \"LDAP Server\" 항목이 필요합니다."
   },
   {
     "id": "model.config.is_valid.ldap_sync_interval.app_error",
@@ -3061,7 +3065,7 @@
   },
   {
     "id": "model.config.is_valid.ldap_username",
-    "translation": "LDAP field \"Username Attribute\" is required."
+    "translation": "AD/LDAP의 \"Username Attribute\" 항목이 필요합니다."
   },
   {
     "id": "model.config.is_valid.listen_address.app_error",
@@ -3301,7 +3305,7 @@
   },
   {
     "id": "model.outgoing_hook.is_valid.user_id.app_error",
-    "translation": "올바르지 않은 형식"
+    "translation": "잘못된 사용자 ID"
   },
   {
     "id": "model.outgoing_hook.is_valid.words.app_error",
@@ -3317,7 +3321,7 @@
   },
   {
     "id": "model.post.is_valid.filenames.app_error",
-    "translation": "올바르지 않은 형식"
+    "translation": "잘못된 파일명"
   },
   {
     "id": "model.post.is_valid.hashtags.app_error",
@@ -3325,7 +3329,7 @@
   },
   {
     "id": "model.post.is_valid.id.app_error",
-    "translation": "잘못된 Id"
+    "translation": "잘못된 ID"
   },
   {
     "id": "model.post.is_valid.msg.app_error",
@@ -3405,11 +3409,11 @@
   },
   {
     "id": "model.team.is_valid.id.app_error",
-    "translation": "잘못된 Id"
+    "translation": "잘못된 ID"
   },
   {
     "id": "model.team.is_valid.name.app_error",
-    "translation": "올바르지 않은 형식"
+    "translation": "잘못된 이름"
   },
   {
     "id": "model.team.is_valid.reserved.app_error",
diff --git a/i18n/nl.json b/i18n/nl.json
index e79ed60eb..9fea9d530 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -625,11 +625,11 @@
   },
   {
     "id": "api.command_shortcuts.msgs",
-    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCTRL+UP (in empty input field): Reprint the previous message or slash command you entered\nCTRL+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+    "translation": "#### Berichten\n\nESC: Markeer alle berichten in het huidige kanaal als gelezen\nCTRL+UP (in een leeg invoer veld): Herhaal het vorige bericht of slash commando U heeft gegeven\nCTRL+DOWN (in een leeg invoer veld): Herhaal het volgende bericht of slash commando U heeft gegeven\nUP (in een leeg invoer veld): Bewerk jouw laatste bericht in het huidige kanaal\n@[karakter]+TAB: Autocomplete @gebruikersnaam begint met [karakter]\n:[karakter]+TAB: Autocomplete emoji begint met [karakter]\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs_mac",
-    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCMD+UP (in empty input field): Reprint the previous message or slash command you entered\nCMD+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+    "translation": "#### Berichten\n\nESC: Markeer alle berichten in het huidige kanaal als gelezen\nCTRL+UP (in een leeg invoer veld): Herhaal het vorige bericht of slash commando U heeft gegeven\nCTRL+DOWN (in een leeg invoer veld): Herhaal het volgende bericht of slash commando U heeft gegeven\nUP (in een leeg invoer veld): Bewerk jouw laatste bericht in het huidige kanaal\n@[karakter]+TAB: Autocomplete @gebruikersnaam begint met [karakter]\n:[karakter]+TAB: Autocomplete emoji begint met [karakter]\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
@@ -637,11 +637,11 @@
   },
   {
     "id": "api.command_shortcuts.nav",
-    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCTRL+K: Open a quick channel switcher dialog\nCTRL+SHIFT+A: Open account settings\nCTRL+SHIFT+M: Open recent mentions\n\n"
+    "translation": "### Keyboard Sneltoetsen\n\n#### Navigatie\n\nALT+UP: Vorig kanaal of direct bericht in linker zijbalk\nALT+DOWN: Volgend kanaal of direct bericht in linker zijbalk\nALT+SHIFT+UP: Vorig kanaal of direct bericht in linker zijbalk met ongelezen berichten\nALT+SHIFT+DOWN: Volgend kanaal of direct bericht in linker zijbalk met ongelezen berichten\nCTRL+K: Open een snelle kanaal wisselaar\nCTRL+SHIFT+A: Open account instellingen\nCTRL+SHIFT+M: Open recente vermeldingen\n\n"
   },
   {
     "id": "api.command_shortcuts.nav_mac",
-    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCMD+K: Open a quick channel switcher dialog\nCMD+SHIFT+A: Open account settings\nCMD+SHIFT+M: Open recent mentions\n\n"
+    "translation": "### Keyboard Sneltoetsen\n\n#### Navigatie\n\nALT+UP: Vorig kanaal of direct bericht in linker zijbalk\nALT+DOWN: Volgend kanaal of direct bericht in linker zijbalk\nALT+SHIFT+UP: Vorig kanaal of direct bericht in linker zijbalk met ongelezen berichten\nALT+SHIFT+DOWN: Volgend kanaal of direct bericht in linker zijbalk met ongelezen berichten\nCTRL+K: Open een snelle kanaal wisselaar\nCTRL+SHIFT+A: Open account instellingen\nCTRL+SHIFT+M: Open recente vermeldingen\n\n"
   },
   {
     "id": "api.command_shrug.desc",
@@ -705,15 +705,15 @@
   },
   {
     "id": "api.email_batching.add_notification_email_to_batch.disabled.app_error",
-    "translation": "Publieke links zijn uitgeschakeld door de systeembeheerder"
+    "translation": "Bulk emails zijn uitgeschakeld door de systeembeheerder"
   },
   {
     "id": "api.email_batching.check_pending_emails.finished_running",
-    "translation": "Email batching job ran. %v user(s) still have notifications pending."
+    "translation": "Bulk emails job heeft gelopen. %v gebruiker(s) hebben notificaties in afwachting."
   },
   {
     "id": "api.email_batching.check_pending_emails.status.app_error",
-    "translation": "Kon de verzender van bericht voor batch email notificatie niet vinden."
+    "translation": "Kon de status of ontvanger voor batch email notificatie niet vinden."
   },
   {
     "id": "api.email_batching.render_batched_post.channel.app_error",
@@ -753,17 +753,17 @@
   {
     "id": "api.email_batching.send_batched_email_notification.subject",
     "translation": {
-      "one": "[{{.SiteName}}] New Notification for {{.Month}} {{.Day}}, {{.Year}}",
-      "other": "[{{.SiteName}}] New Notifications for {{.Month}} {{.Day}}, {{.Year}}"
+      "one": "[{{.SiteName}}] Nieuwe Notificatie voor {{.Month}} {{.Day}}, {{.Year}}",
+      "other": "[{{.SiteName}}] Nieuwe Notificaties voor {{.Month}} {{.Day}}, {{.Year}}"
     }
   },
   {
     "id": "api.email_batching.send_batched_email_notification.user.app_error",
-    "translation": "Kon de verzender van bericht voor batch email notificatie niet vinden."
+    "translation": "Kon de ontvanger voor batch email notificatie niet vinden."
   },
   {
     "id": "api.email_batching.start.starting",
-    "translation": "Email batching job starting. Checking for pending emails every %v seconds."
+    "translation": "Bulk email job is gestart. Controleren van wachtende e-mails iedere %v secondes."
   },
   {
     "id": "api.emoji.create.duplicate.app_error",
@@ -1039,7 +1039,7 @@
   },
   {
     "id": "api.oauth.complete_oauth.missing_code.app_error",
-    "translation": "The service provider {{.service}} did not provide an authorization code in the redirect URL.\n\nFor [Google Apps](https://docs.mattermost.com/deployment/sso-google.html) make sure your administrator enabled the Google+ API.\n\nFor [Office 365](https://docs.mattermost.com/deployment/sso-office.html) make sure the administrator of your Microsoft organization has enabled the Mattermost app.\n\nFor [GitLab](https://docs.mattermost.com/deployment/sso-gitlab.html) please make sure you followed the setup instructions.\n\nIf you reviewed the above and are still having trouble with configuration, you may post in our [Troubleshooting forum](https://forum.mattermost.org/c/general/trouble-shoot) where we'll be happy to help with issues during setup."
+    "translation": "De service provider {{.service}} heeft geen autorisatie code gegeven in de doorrstuur URL.\n\nVoor [Google Apps](https://docs.mattermost.com/deployment/sso-google.html) wees zeker dat Uw beheerder de Google+ API heeft aangezet.\n\nVoor [Office 365](https://docs.mattermost.com/deployment/sso-office.html) wees zeker dat Uw beheerder van Uw Microsoft domein de Mattermost app heeft aangezet.\n\nVor [GitLab](https://docs.mattermost.com/deployment/sso-gitlab.html) wees zeker dat U onderstaande instructies heeft gevolgd.\n\nIf you reviewed the above and are still having trouble with configuration, you may post in our [Troubleshooting forum](https://forum.mattermost.org/c/general/trouble-shoot) where we'll be happy to help with issues during setup."
   },
   {
     "id": "api.oauth.delete.permissions.app_error",
@@ -1111,7 +1111,7 @@
   },
   {
     "id": "api.oauth.regenerate_secret.app_error",
-    "translation": "Onvoldoende rechten voor het verwijderen van de OAuth2 applicatie"
+    "translation": "Onvoldoende rechten voor het hergenereren van de OAuth2 Applicatie Secret"
   },
   {
     "id": "api.oauth.register_oauth_app.turn_off.app_error",
@@ -1175,7 +1175,7 @@
   },
   {
     "id": "api.post.delete_flagged_post.app_error.warn",
-    "translation": "Unable to delete flagged post preference when deleting post, err=%v"
+    "translation": "Niet mogelijk om gemarkeerde berichten te verwijderen bij verwijderen van bericht, err=%v"
   },
   {
     "id": "api.post.delete_post.permissions.app_error",
@@ -1191,8 +1191,8 @@
   {
     "id": "api.post.get_message_for_notification.images_sent",
     "translation": {
-      "one": "{{.Count}} bestand verzonden: {{.Filenames}}",
-      "other": "{{.Count}} bestanden verzonden: {{.Filenames}}"
+      "one": "{{.Count}} afbeelding verzonden: {{.Filenames}}",
+      "other": "{{.Count}} afbeeldingen verzonden: {{.Filenames}}"
     }
   },
   {
@@ -1261,11 +1261,11 @@
   },
   {
     "id": "api.post.notification.member_profile.warn",
-    "translation": "Unable to get profile for channel member, user_id=%v"
+    "translation": "Niet mogelijk om profiel voor kanaal lid op te halen, user_id=%v"
   },
   {
     "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
-    "translation": "Clearing push notification to %v with channel_id %v"
+    "translation": "Verwijderen van push notificatie aan %v met kanaal_id %v"
   },
   {
     "id": "api.post.send_notifications_and_forget.comment_thread.error",
@@ -1273,7 +1273,7 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.get_teams.error",
-    "translation": "Failed to get teams when sending cross-team DM user_id=%v, err=%v"
+    "translation": "Mislukt om teams op te halen bij versturen van cross-team DM user_id=%v, err=%v"
   },
   {
     "id": "api.post.send_notifications_and_forget.mention_body",
@@ -1309,11 +1309,11 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.debug",
-    "translation": "Verzenden van notificatie naar %v wi bericht van '%v'"
+    "translation": "Verzenden van push notificatie naar %v met bericht van '%v'"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
-    "translation": "Het versturen van een push bericht is mislukt. notificationid=%v, fout=%v"
+    "translation": "Het versturen van een push bericht is mislukt, device_id=%v, err=%v"
   },
   {
     "id": "api.post.send_notifications_and_forget.send.error",
@@ -1477,7 +1477,7 @@
   },
   {
     "id": "api.slackimport.slack_convert_user_mentions.compile_regexp_failed.warn",
-    "translation": "Failed to compile the @mention matching regular expression for Slack user {{.UserID}} {{.Username}}"
+    "translation": "Mislukt om de @vermelding te maken met reguliere expressie voor Slack gebruiker {{.UserID}} {{.Username}}"
   },
   {
     "id": "api.slackimport.slack_import.log",
@@ -1745,11 +1745,11 @@
   },
   {
     "id": "api.templates.post_subject_in_channel",
-    "translation": "{{.SubjectText}} op {{.TeamDisplayName}} om {{.Month}} {{.Day}} {{.Year}}"
+    "translation": "{{.SubjectText}} in {{.TeamDisplayName}} {{.ChannelName}}) op {{.Month}} {{.Day}} {{.Year}}"
   },
   {
     "id": "api.templates.post_subject_in_direct_message",
-    "translation": "{{.SubjectText}} op {{.TeamDisplayName}} om {{.Month}} {{.Day}} {{.Year}}"
+    "translation": "{{.SubjectText}} in {{.TeamDisplayName}} van {{.SenderDisplayName}} op {{.Month}} {{.Day}} {{.Year}}"
   },
   {
     "id": "api.templates.reset_body.button",
@@ -2001,7 +2001,7 @@
   },
   {
     "id": "api.user.email_to_ldap.not_available.app_error",
-    "translation": "LDAP is niet beschikbaar op deze server"
+    "translation": "AD/LDAP is niet beschikbaar op deze server"
   },
   {
     "id": "api.user.generate_mfa_qr.not_available.app_error",
@@ -2021,11 +2021,11 @@
   },
   {
     "id": "api.user.ldap_to_email.not_available.app_error",
-    "translation": "LDAP is niet beschikbaar op deze server"
+    "translation": "AS/LDAP is niet beschikbaar op deze server"
   },
   {
     "id": "api.user.ldap_to_email.not_ldap_account.app_error",
-    "translation": "Dit gebruikers account gebruikt geen LDAP"
+    "translation": "Dit gebruikers account gebruikt geen AD/LDAP"
   },
   {
     "id": "api.user.login.blank_pwd.app_error",
@@ -2069,7 +2069,7 @@
   },
   {
     "id": "api.user.login_ldap.disabled.app_error",
-    "translation": "LDAP is niet beschikbaar op deze server"
+    "translation": "AD/LDAP is niet beschikbaar op deze server"
   },
   {
     "id": "api.user.login_ldap.need_id.app_error",
@@ -2077,7 +2077,7 @@
   },
   {
     "id": "api.user.login_ldap.not_available.app_error",
-    "translation": "LDAP is niet beschikbaar op deze server"
+    "translation": "AD/LDAP is niet beschikbaar op deze server"
   },
   {
     "id": "api.user.oauth_to_email.context.app_error",
@@ -2161,7 +2161,7 @@
   },
   {
     "id": "api.user.update_active.no_deactivate_ldap.app_error",
-    "translation": "Je kan niet de activatie status veranderen van LDAP account. Wijzig dit via de LDAP server."
+    "translation": "Je kan niet de activatie status veranderen van AD/LDAP account. Wijzig dit via de AD/LDAP server."
   },
   {
     "id": "api.user.update_active.permissions.app_error",
@@ -2457,11 +2457,11 @@
   },
   {
     "id": "ent.ldap.disabled.app_error",
-    "translation": "AD/LDAP disabled or licence does not support AD/LDAP."
+    "translation": "AD/LDAP uitgeschakeld of licentie ondersteund geen AD/LDAP."
   },
   {
     "id": "ent.ldap.do_login.bind_admin_user.app_error",
-    "translation": "Kan verbinding maken met de LDAP server. Controleer de opgegeven gebruikersnaam en wachtwoord."
+    "translation": "Kan geen verbinding maken met de AD/LDAP server. Controleer de opgegeven Bindgebruikersnaam en Bindwachtwoord."
   },
   {
     "id": "ent.ldap.do_login.invalid_password.app_error",
@@ -2469,7 +2469,7 @@
   },
   {
     "id": "ent.ldap.do_login.licence_disable.app_error",
-    "translation": "LDAP functionaliteit is uitgeschakeld met de huidige licentie. Neem contact op met de beheerder voor een upgrade van de licentie."
+    "translation": "AD/LDAP functionaliteit is uitgeschakeld met de huidige licentie. Neem contact op met de beheerder voor een upgrade van de licentie."
   },
   {
     "id": "ent.ldap.do_login.matched_to_many_users.app_error",
@@ -2477,11 +2477,11 @@
   },
   {
     "id": "ent.ldap.do_login.search_ldap_server.app_error",
-    "translation": "Kan niet zoeken op de LDAP server"
+    "translation": "Kan niet zoeken op de AD/LDAP server"
   },
   {
     "id": "ent.ldap.do_login.unable_to_connect.app_error",
-    "translation": "Kan niet verbinden met de LDAP server"
+    "translation": "Kan niet verbinden met de AD/LDAP server"
   },
   {
     "id": "ent.ldap.do_login.unable_to_create_user.app_error",
@@ -2489,27 +2489,27 @@
   },
   {
     "id": "ent.ldap.do_login.user_filtered.app_error",
-    "translation": "Je LDAP account heeft niet de juiste permissies om van deze Mattermost server gebruik te maken. Vraag je Systeembeheerder om het LDAP gebruikersfilter te controleren."
+    "translation": "Je AD/LDAP account heeft niet de juiste permissies om van deze Mattermost server gebruik te maken. Vraag je Systeembeheerder om het AD/LDAP gebruikersfilter te controleren."
   },
   {
     "id": "ent.ldap.do_login.user_not_registered.app_error",
-    "translation": "Gebruiker is niet bekend op de LDAP server"
+    "translation": "Gebruiker is niet bekend op de AD/LDAP server"
   },
   {
     "id": "ent.ldap.mattermost_user_update",
-    "translation": "Mattermost gebruiker is bijgewerkt door de LDAP server."
+    "translation": "Mattermost gebruiker is bijgewerkt door de AD/LDAP server."
   },
   {
     "id": "ent.ldap.syncdone.info",
-    "translation": "LDAP Synchronisatie voltooid"
+    "translation": "AD/LDAP Synchronisatie voltooid"
   },
   {
     "id": "ent.ldap.syncronize.get_all.app_error",
-    "translation": "Niet mogelijk alle gebruikers te krijgen via LDAP"
+    "translation": "Niet mogelijk alle gebruikers te krijgen via AD/LDAP"
   },
   {
     "id": "ent.ldap.validate_filter.app_error",
-    "translation": "Ongeldig LDAP filter"
+    "translation": "Ongeldig AD/LDAP filter"
   },
   {
     "id": "ent.mfa.activate.authenticate.app_error",
@@ -2549,11 +2549,15 @@
   },
   {
     "id": "ent.migration.migratetoldap.duplicate_field",
-    "translation": "Niet mogelijk om LDAP gebruikers te migreren met het opgegeven veld. Dubbele vermelding ontdekt. Verwijder alle dubbele vermeldingen en probeer opnieuw."
+    "translation": "Niet mogelijk om AD/LDAP gebruikers te migreren met het opgegeven veld. Dubbele vermelding ontdekt. Verwijder alle dubbele vermeldingen en probeer opnieuw."
   },
   {
     "id": "ent.migration.migratetoldap.user_not_found",
-    "translation": "Kon gebruiker niet vinden op de LDAP server: "
+    "translation": "Kon gebruiker niet vinden op de AD/LDAP server: "
+  },
+  {
+    "id": "ent.saml.attribute.app_error",
+    "translation": "SAML login was unsuccessful because one of the attributes is incorrect. Please contact your System Administrator."
   },
   {
     "id": "ent.saml.build_request.app_error",
@@ -2949,15 +2953,15 @@
   },
   {
     "id": "model.config.is_valid.cluster_email_batching.app_error",
-    "translation": "Unable to enable email batching when clustering is enabled"
+    "translation": "Niet mogelijk om bulk email aan te zetten als clustering aan staat."
   },
   {
     "id": "model.config.is_valid.email_batching_buffer_size.app_error",
-    "translation": "Invalid email batching buffer size for email settings.  Must be zero or a positive number."
+    "translation": "Verkeerde buffer grootte bij bulk email instellingen. Moet 0 zijn of een positief nummer."
   },
   {
     "id": "model.config.is_valid.email_batching_interval.app_error",
-    "translation": "Invalid email batching interval for email settings.  Must be 30 seconds or more."
+    "translation": "Verkeerde interval bij bulk email instellingen. Moet 30 secondes of meer zijn."
   },
   {
     "id": "model.config.is_valid.email_reset_salt.app_error",
@@ -2981,7 +2985,7 @@
   },
   {
     "id": "model.config.is_valid.file_preview_height.app_error",
-    "translation": "Ongeldige voorvertonings hoogte voor bestand instellingen. Moet 0 of groter zijn."
+    "translation": "Ongeldige voorvertonings-hoogte voor bestand instellingen.  Moet 0 of groter zijn."
   },
   {
     "id": "model.config.is_valid.file_preview_width.app_error",
@@ -3009,31 +3013,31 @@
   },
   {
     "id": "model.config.is_valid.ldap_basedn",
-    "translation": "LDAP veld \"BaseDN\" is verplicht."
+    "translation": "AD/LDAP veld \"BaseDN\" is verplicht."
   },
   {
     "id": "model.config.is_valid.ldap_bind_password",
-    "translation": "LDAP veld \"Bind Password\" is verplicht"
+    "translation": "AD/LDAP veld \"Bind Password\" is verplicht"
   },
   {
     "id": "model.config.is_valid.ldap_bind_username",
-    "translation": "LDAP veld \"Bind Username\" is verplicht."
+    "translation": "AD/LDAP veld \"Bind Username\" is verplicht."
   },
   {
     "id": "model.config.is_valid.ldap_email",
-    "translation": "LDAP veld \"Email Attribute\" is verplicht."
+    "translation": "AD/LDAP veld \"Email Attribute\" is verplicht."
   },
   {
     "id": "model.config.is_valid.ldap_firstname",
-    "translation": "LDAP veld \"First Name Attribute\" is verplicht."
+    "translation": "AD/LDAP veld \"First Name Attribute\" is verplicht."
   },
   {
     "id": "model.config.is_valid.ldap_id",
-    "translation": "LDAP veld \"ID Attribute\" is verplicht."
+    "translation": "AD/LDAP veld \"ID Attribute\" is verplicht."
   },
   {
     "id": "model.config.is_valid.ldap_lastname",
-    "translation": "LDAP veld \"Last Name Attribute\" is verplicht."
+    "translation": "AD/LDAP veld \"Last Name Attribute\" is verplicht."
   },
   {
     "id": "model.config.is_valid.ldap_max_page_size.app_error",
@@ -3041,19 +3045,19 @@
   },
   {
     "id": "model.config.is_valid.ldap_required.app_error",
-    "translation": "Verplicht LDAP veld is niet ingevuld."
+    "translation": "Verplicht AD/LDAP veld is niet ingevuld."
   },
   {
     "id": "model.config.is_valid.ldap_required.app_error",
-    "translation": "Verplicht LDAP veld is niet ingevuld."
+    "translation": "Verplicht AD/LDAP veld is niet ingevuld."
   },
   {
     "id": "model.config.is_valid.ldap_security.app_error",
-    "translation": "Ongeldige verbindings instelling bij LDAP instellingen. Keuze uit; '', 'TLS' of 'STARTTLS'"
+    "translation": "Ongeldige verbindings instelling bij AD/LDAP instellingen. Keuze uit; '', 'TLS' of 'STARTTLS'"
   },
   {
     "id": "model.config.is_valid.ldap_server",
-    "translation": "LDAP veld \"LDAP Server\" is verplicht."
+    "translation": "AD/LDAP veld \"AD/LDAP Server\" is verplicht."
   },
   {
     "id": "model.config.is_valid.ldap_sync_interval.app_error",
@@ -3061,7 +3065,7 @@
   },
   {
     "id": "model.config.is_valid.ldap_username",
-    "translation": "LDAP veld \"Username Attribute\" is verplicht."
+    "translation": "AD/LDAP veld \"Username Attribute\" is verplicht."
   },
   {
     "id": "model.config.is_valid.listen_address.app_error",
@@ -3137,7 +3141,7 @@
   },
   {
     "id": "model.config.is_valid.site_url_email_batching.app_error",
-    "translation": "Unable to enable email batching when SiteURL isn't set."
+    "translation": "Niet mogelijk om bulk email aan te zetten als de SiteURL niet is ingevuld."
   },
   {
     "id": "model.config.is_valid.sitename_length.app_error",
@@ -4001,7 +4005,7 @@
   },
   {
     "id": "store.sql_oauth.get_access_data_by_user_for_app.app_error",
-    "translation": "Er is een probleem opgetreden bij het ophalen van het access token"
+    "translation": "Er is een probleem opgetreden bij het ophalen van alle access tokens"
   },
   {
     "id": "store.sql_oauth.get_app.find.app_error",
@@ -4289,7 +4293,7 @@
   },
   {
     "id": "store.sql_status.get_team_statuses.app_error",
-    "translation": "Encountered an error retrieving all statuses from the team members"
+    "translation": "Fout bij het ophalen van de statussen van alle team leden"
   },
   {
     "id": "store.sql_status.get_total_active_users_count.app_error",
@@ -4317,7 +4321,7 @@
   },
   {
     "id": "store.sql_system.get_version.app_error",
-    "translation": "We couldn't get the database version"
+    "translation": "We konden de database versie niet ophalen"
   },
   {
     "id": "store.sql_system.save.app_error",
@@ -4473,7 +4477,7 @@
   },
   {
     "id": "store.sql_user.get_unread_count_for_channel.app_error",
-    "translation": "Het aantal ongelezen berichten voor de gebruiker kan niet geteld worden"
+    "translation": "Het aantal ongelezen berichten voor de gebruiker en kanaal kan niet geteld worden"
   },
   {
     "id": "store.sql_user.migrate_theme.critical",
@@ -4497,7 +4501,7 @@
   },
   {
     "id": "store.sql_user.save.email_exists.ldap_app_error",
-    "translation": "Dit account gebruikt geen LDAP authenticatie. Log in met e-mail en wachtwoord."
+    "translation": "Dit account gebruikt geen AD/LDAP authenticatie. Log in met e-mail en wachtwoord."
   },
   {
     "id": "store.sql_user.save.email_exists.saml_app_error",
@@ -4533,7 +4537,7 @@
   },
   {
     "id": "store.sql_user.update.can_not_change_ldap.app_error",
-    "translation": "Velden die gezet zijn door LDAP kunnen niet gewijzigd worden"
+    "translation": "Velden die gezet zijn door AD/LDAP kunnen niet gewijzigd worden"
   },
   {
     "id": "store.sql_user.update.email_taken.app_error",
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index eb01b0192..896e2f32f 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -2457,7 +2457,7 @@
   },
   {
     "id": "ent.ldap.disabled.app_error",
-    "translation": "LDAP desabilitado ou licença não suporta LDAP."
+    "translation": "AD/LDAP desabilitado ou licença não suporta AD/LDAP."
   },
   {
     "id": "ent.ldap.do_login.bind_admin_user.app_error",
@@ -2556,6 +2556,10 @@
     "translation": "Não foi possível localizar usuário no servidor AD/LDAP: "
   },
   {
+    "id": "ent.saml.attribute.app_error",
+    "translation": "SAML login was unsuccessful because one of the attributes is incorrect. Please contact your System Administrator."
+  },
+  {
     "id": "ent.saml.build_request.app_error",
     "translation": "Ocorreu um erro ao iniciar a solicitação para o Provedor de Identidade. Entre em contato com o Administrador do Sistema."
   },
diff --git a/i18n/zh_CN.json b/i18n/zh_CN.json
index 4008483f6..843390a2f 100644
--- a/i18n/zh_CN.json
+++ b/i18n/zh_CN.json
@@ -1,419 +1,419 @@
 [
   {
     "id": "April",
-    "translation": "April"
+    "translation": "四月"
   },
   {
     "id": "August",
-    "translation": "August"
+    "translation": "八月"
   },
   {
     "id": "December",
-    "translation": "December"
+    "translation": "十二月"
   },
   {
     "id": "February",
-    "translation": "February"
+    "translation": "二月"
   },
   {
     "id": "January",
-    "translation": "January"
+    "translation": "一月"
   },
   {
     "id": "July",
-    "translation": "July"
+    "translation": "七月"
   },
   {
     "id": "June",
-    "translation": "June"
+    "translation": "六月"
   },
   {
     "id": "March",
-    "translation": "March"
+    "translation": "三月"
   },
   {
     "id": "May",
-    "translation": "May"
+    "translation": "五月"
   },
   {
     "id": "November",
-    "translation": "November"
+    "translation": "十一月"
   },
   {
     "id": "October",
-    "translation": "October"
+    "translation": "十月"
   },
   {
     "id": "September",
-    "translation": "September"
+    "translation": "九月"
   },
   {
     "id": "api.admin.add_certificate.array.app_error",
-    "translation": "Empty array under 'certificate' in request"
+    "translation": "请求中‘certificate’为空数组"
   },
   {
     "id": "api.admin.add_certificate.no_file.app_error",
-    "translation": "No file under 'certificate' in request"
+    "translation": "请求中'certificate'下的文件不存在"
   },
   {
     "id": "api.admin.add_certificate.open.app_error",
-    "translation": "Could not open certificate file"
+    "translation": "无法打开证书文件"
   },
   {
     "id": "api.admin.add_certificate.saving.app_error",
-    "translation": "Could not save certificate file"
+    "translation": "无法保存证书文件"
   },
   {
     "id": "api.admin.file_read_error",
-    "translation": "Error reading log file"
+    "translation": "读取日志文件出错"
   },
   {
     "id": "api.admin.get_brand_image.not_available.app_error",
-    "translation": "Custom branding is not configured or supported on this server"
+    "translation": "此服务器不支持或没有正确配置自定义品牌"
   },
   {
     "id": "api.admin.get_brand_image.storage.app_error",
-    "translation": "Image storage is not configured."
+    "translation": "未配置图像存储器。"
   },
   {
     "id": "api.admin.init.debug",
-    "translation": "Initializing admin api routes"
+    "translation": "初始化管理员API路由"
   },
   {
     "id": "api.admin.recycle_db_end.warn",
-    "translation": "Finished recycling the database connection"
+    "translation": "数据库连接重用完成"
   },
   {
     "id": "api.admin.recycle_db_start.warn",
-    "translation": "Attempting to recycle the database connection"
+    "translation": "正在尝试重用数据库连接"
   },
   {
     "id": "api.admin.remove_certificate.delete.app_error",
-    "translation": "An error occurred while deleting the certificate. Make sure the file config/{{.Filename}} exists."
+    "translation": "删除证书时发生错误。请确定config/{{.Filename}}文件已存在。"
   },
   {
     "id": "api.admin.saml.metadata.app_error",
-    "translation": "An error occurred while building Service Provider Metadata"
+    "translation": "创建服务商元数据时发生错误"
   },
   {
     "id": "api.admin.test_email.body",
-    "translation": "<br/><br/><br/>It appears your Mattermost email is setup correctly!"
+    "translation": "<br/><br/><br/>看来你的Mattermost邮箱设置成功！"
   },
   {
     "id": "api.admin.test_email.missing_server",
-    "translation": "SMTP Server is required"
+    "translation": "需要SMTP服务器"
   },
   {
     "id": "api.admin.test_email.reenter_password",
-    "translation": "The SMTP server, port, or username has changed. Please re-enter the SMTP password to test connection."
+    "translation": "SMTP 服务器地址、端口或者用户名已经被修改。请重新输入 SMTP 密码进行连接测试。"
   },
   {
     "id": "api.admin.test_email.subject",
-    "translation": "Mattermost - Testing Email Settings"
+    "translation": "Mattermost - 测试邮箱设置"
   },
   {
     "id": "api.admin.upload_brand_image.array.app_error",
-    "translation": "Empty array under 'image' in request"
+    "translation": "请求中图片为空"
   },
   {
     "id": "api.admin.upload_brand_image.no_file.app_error",
-    "translation": "No file under 'image' in request"
+    "translation": "请求中缺失图片文件"
   },
   {
     "id": "api.admin.upload_brand_image.not_available.app_error",
-    "translation": "Custom branding is not configured or supported on this server"
+    "translation": "此服务器不支持或没有正确配置自定义品牌"
   },
   {
     "id": "api.admin.upload_brand_image.parse.app_error",
-    "translation": "Could not parse multipart form"
+    "translation": "不能解析混合表单"
   },
   {
     "id": "api.admin.upload_brand_image.storage.app_error",
-    "translation": "Unable to upload image. Image storage is not configured."
+    "translation": "不能上传图片。图片存储没有配置。"
   },
   {
     "id": "api.admin.upload_brand_image.too_large.app_error",
-    "translation": "Unable to upload file. File is too large."
+    "translation": "无法上传文件。文件太大。"
   },
   {
     "id": "api.api.init.parsing_templates.debug",
-    "translation": "Parsing server templates at %v"
+    "translation": "解析服务模板 %v"
   },
   {
     "id": "api.api.init.parsing_templates.error",
-    "translation": "Failed to parse server templates %v"
+    "translation": "解析服务模板出错 %v"
   },
   {
     "id": "api.api.render.error",
-    "translation": "Error rendering template %v err=%v"
+    "translation": "渲染模板出错 %v err=%v"
   },
   {
     "id": "api.channel.add_member.added",
-    "translation": "%v added to the channel by %v"
+    "translation": "%v 由 %v 邀请加入频道"
   },
   {
     "id": "api.channel.add_member.find_channel.app_error",
-    "translation": "Failed to find channel"
+    "translation": "未找到频道"
   },
   {
     "id": "api.channel.add_member.find_user.app_error",
-    "translation": "Failed to find user to be added"
+    "translation": "未找到要添加的用户"
   },
   {
     "id": "api.channel.add_member.user_adding.app_error",
-    "translation": "Failed to find user doing the adding"
+    "translation": "查找用户执行添加时出错"
   },
   {
     "id": "api.channel.add_user.to.channel.failed.app_error",
-    "translation": "Failed to add user to channel"
+    "translation": "添加用户到频道出错"
   },
   {
     "id": "api.channel.add_user.to.channel.failed.deleted.app_error",
-    "translation": "Failed to add user to channel because they have been removed from the team."
+    "translation": "无法将用户添加到频道，因为用户已从团队中移除。"
   },
   {
     "id": "api.channel.add_user_to_channel.deleted.app_error",
-    "translation": "The channel has been archived or deleted"
+    "translation": "该频道已归档或者被删除"
   },
   {
     "id": "api.channel.add_user_to_channel.type.app_error",
-    "translation": "Can not add user to this channel type"
+    "translation": "不能添加用户到该频道类型"
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_system_admin.app_error",
-    "translation": "Private Group management and creation is restricted to System Administrators."
+    "translation": "只有系统管理能创建与管理私有群组。"
   },
   {
     "id": "api.channel.can_manage_channel.private_restricted_team_admin.app_error",
-    "translation": "Private Group management and creation is restricted to Team and System Administrators."
+    "translation": "只有团体和系统管理员能管理与创建私有群组。"
   },
   {
     "id": "api.channel.can_manage_channel.public_restricted_system_admin.app_error",
-    "translation": "Public Channel management and creation is restricted to System Administrators."
+    "translation": "只有系统管理员能创建公开频道。"
   },
   {
     "id": "api.channel.can_manage_channel.public_restricted_team_admin.app_error",
-    "translation": "Public Channel management and creation is restricted to Team and System Administrators."
+    "translation": "只有团队和系统管理员能创建与管理公开频道。"
   },
   {
     "id": "api.channel.create_channel.direct_channel.app_error",
-    "translation": "Must use createDirectChannel api service for direct message channel creation"
+    "translation": "创建私信频道必须使用createDirectChannel接口服务"
   },
   {
     "id": "api.channel.create_channel.invalid_character.app_error",
-    "translation": "Invalid character '__' in channel name for non-direct channel"
+    "translation": "非直接频道的频道名不能出现无效字符 '__'"
   },
   {
     "id": "api.channel.create_default_channels.off_topic",
-    "translation": "Off-Topic"
+    "translation": "闲聊频道"
   },
   {
     "id": "api.channel.create_default_channels.town_square",
-    "translation": "Town Square"
+    "translation": "公共频道"
   },
   {
     "id": "api.channel.create_direct_channel.invalid_user.app_error",
-    "translation": "Invalid other user id "
+    "translation": "无效的其他用户ID"
   },
   {
     "id": "api.channel.delete_channel.archived",
-    "translation": "%v has archived the channel."
+    "translation": "%v 已归档该频道。"
   },
   {
     "id": "api.channel.delete_channel.cannot.app_error",
-    "translation": "Cannot delete the default channel {{.Channel}}"
+    "translation": "不能删除默认频道 {{.Channel}}"
   },
   {
     "id": "api.channel.delete_channel.deleted.app_error",
-    "translation": "The channel has been archived or deleted"
+    "translation": "该频道已归档或者被删除"
   },
   {
     "id": "api.channel.delete_channel.failed_post.error",
-    "translation": "Failed to post archive message %v"
+    "translation": "发布归档消息失败 %v"
   },
   {
     "id": "api.channel.delete_channel.failed_send.app_error",
-    "translation": "Failed to send archive message"
+    "translation": "发送归档消息失败"
   },
   {
     "id": "api.channel.delete_channel.incoming_webhook.error",
-    "translation": "Encountered error deleting incoming webhook, id=%v"
+    "translation": "删除传入的webhook出错, id=%v"
   },
   {
     "id": "api.channel.delete_channel.outgoing_webhook.error",
-    "translation": "Encountered error deleting outgoing webhook, id=%v"
+    "translation": "删除传出的webhook出错, id=%v"
   },
   {
     "id": "api.channel.delete_channel.permissions.app_error",
-    "translation": "You do not have the appropriate permissions"
+    "translation": "您没有对应的权限"
   },
   {
     "id": "api.channel.get_channel.wrong_team.app_error",
-    "translation": "There is no channel with channel_id={{.ChannelId}} on team with team_id={{.TeamId}}"
+    "translation": "不存在团队team_id={{.TeamId}}, 频道 channel_id={{.ChannelId}}"
   },
   {
     "id": "api.channel.get_channel_counts.app_error",
-    "translation": "Unable to get channel counts from the database"
+    "translation": "不能从数据库中获取频道数"
   },
   {
     "id": "api.channel.get_channel_extra_info.deleted.app_error",
-    "translation": "The channel has been archived or deleted"
+    "translation": "该频道已归档或者被删除"
   },
   {
     "id": "api.channel.get_channel_extra_info.member_limit.app_error",
-    "translation": "Failed to parse member limit"
+    "translation": "解析成员限制失败"
   },
   {
     "id": "api.channel.get_channels.error",
-    "translation": "Error in getting users profile for id=%v forcing logout"
+    "translation": "获取用户配置出错 for id=%v 强制注销"
   },
   {
     "id": "api.channel.init.debug",
-    "translation": "Initializing channel api routes"
+    "translation": "初始化频道API路由"
   },
   {
     "id": "api.channel.join_channel.permissions.app_error",
-    "translation": "You do not have the appropriate permissions"
+    "translation": "您没有对应的权限"
   },
   {
     "id": "api.channel.join_channel.post_and_forget",
-    "translation": "%v has joined the channel."
+    "translation": "%v 已经加入到该频道。"
   },
   {
     "id": "api.channel.leave.default.app_error",
-    "translation": "Cannot leave the default channel {{.Channel}}"
+    "translation": "不能退出默认频道 {{.Channel}}"
   },
   {
     "id": "api.channel.leave.direct.app_error",
-    "translation": "Cannot leave a direct message channel"
+    "translation": "不能退出私信频道"
   },
   {
     "id": "api.channel.leave.last_member.app_error",
-    "translation": "You're the only member left, try removing the Private Group instead of leaving."
+    "translation": "你是本组最后一人，请删除私有组而不是离开。"
   },
   {
     "id": "api.channel.leave.left",
-    "translation": "%v has left the channel."
+    "translation": "%v 已经退出该频道。"
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.join_leave.error",
-    "translation": "Failed to post join/leave message %v"
+    "translation": "发布添加/退出消息失败 %v"
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.removed",
-    "translation": "%s removed the channel header (was: %s)"
+    "translation": "%s 删除了频道标题 (原为: %s)"
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.retrieve_user.error",
-    "translation": "Failed to retrieve user while trying to save update channel header message %v"
+    "translation": "尝试保存更新的频道标题消息 %v 时获取用户信息失败"
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.updated_from",
-    "translation": "%s updated the channel header from: %s to: %s"
+    "translation": "%s 将频道标题从 %s 更新为 %s"
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.updated_to",
-    "translation": "%s updated the channel header to: %s"
+    "translation": "%s 更新频道标题为: %s"
   },
   {
     "id": "api.channel.post_user_add_remove_message_and_forget.error",
-    "translation": "Failed to post join/leave message %v"
+    "translation": "发布添加或者退出消息失败 %v"
   },
   {
     "id": "api.channel.remove_member.permissions.app_error",
-    "translation": "You do not have the appropriate permissions "
+    "translation": "您没有对应的权限"
   },
   {
     "id": "api.channel.remove_member.removed",
-    "translation": "%v was removed from the channel."
+    "translation": "%v 已从频道移出。"
   },
   {
     "id": "api.channel.remove_member.unable.app_error",
-    "translation": "Unable to remove user."
+    "translation": "无法移除用户。"
   },
   {
     "id": "api.channel.remove_member.user.app_error",
-    "translation": "Failed to find user to be removed"
+    "translation": "未找到要删除的用户"
   },
   {
     "id": "api.channel.remove_user_from_channel.deleted.app_error",
-    "translation": "The channel has been archived or deleted"
+    "translation": "该频道已归档或者被删除"
   },
   {
     "id": "api.channel.update_channel.deleted.app_error",
-    "translation": "The channel has been archived or deleted"
+    "translation": "该频道已归档或者被删除"
   },
   {
     "id": "api.channel.update_channel.permission.app_error",
-    "translation": "You do not have the appropriate permissions"
+    "translation": "您没有对应的权限"
   },
   {
     "id": "api.channel.update_channel.tried.app_error",
-    "translation": "Tried to perform an invalid update of the default channel {{.Channel}}"
+    "translation": "对默认频道试图执行一个无效的更新 {{.Channel}}"
   },
   {
     "id": "api.channel.update_last_viewed_at.get_unread_count_for_channel.errord",
-    "translation": "Unable to get the unread count for user_id=%v and channel_id=%v, err=%v"
+    "translation": "无法获取 user_id=%v 以及 channel_id=%v 的未读数量，err=%v"
   },
   {
     "id": "api.command.admin_only.app_error",
-    "translation": "Integrations have been limited to admins only."
+    "translation": "集成只限于管理员。"
   },
   {
     "id": "api.command.delete.app_error",
-    "translation": "Inappropriate permissions to delete command"
+    "translation": "无删除权限"
   },
   {
     "id": "api.command.disabled.app_error",
-    "translation": "Commands have been disabled by the system admin."
+    "translation": "命令已经被系统管理员禁用。"
   },
   {
     "id": "api.command.duplicate_trigger.app_error",
-    "translation": "This trigger word is already in use. Please choose another word."
+    "translation": "触发词已经使用。请选择其它单词。"
   },
   {
     "id": "api.command.execute_command.debug",
-    "translation": "Executing cmd=%v userId=%v"
+    "translation": "执行 cmd=%v userId=%v"
   },
   {
     "id": "api.command.execute_command.failed.app_error",
-    "translation": "Command with a trigger of '{{.Trigger}}' failed"
+    "translation": "带触发 '{{.Trigger}}' 的命令失败"
   },
   {
     "id": "api.command.execute_command.failed_empty.app_error",
-    "translation": "Command with a trigger of '{{.Trigger}}' returned an empty response"
+    "translation": "触发 '{{.Trigger}}' 返回一个空响应"
   },
   {
     "id": "api.command.execute_command.failed_resp.app_error",
-    "translation": "Command with a trigger of '{{.Trigger}}' returned response {{.Status}}"
+    "translation": "触发 '{{.Trigger}}' 返回响应状态 {{.Status}}"
   },
   {
     "id": "api.command.execute_command.not_found.app_error",
-    "translation": "Command with a trigger of '{{.Trigger}}' not found"
+    "translation": "触发 '{{.Trigger}}' 没有找到"
   },
   {
     "id": "api.command.execute_command.save.app_error",
-    "translation": "An error while saving the command response to the channel"
+    "translation": "保存命令响应到频道时出错"
   },
   {
     "id": "api.command.execute_command.start.app_error",
-    "translation": "No command trigger found"
+    "translation": "没有找到控制触发器"
   },
   {
     "id": "api.command.init.debug",
-    "translation": "Initializing command api routes"
+    "translation": "初始化控制API路由"
   },
   {
     "id": "api.command.invite_people.desc",
-    "translation": "Send an email invite to your Mattermost team"
+    "translation": "发送一封邀请邮件给你的Mattermost团队"
   },
   {
     "id": "api.command.invite_people.email_off",
-    "translation": "Email has not been configured, no invite(s) sent"
+    "translation": "邮件没有配置，没发送邀请"
   },
   {
     "id": "api.command.invite_people.fail",
-    "translation": "Encountered an error sending email invite(s)"
+    "translation": "邀请邮件发送错误"
   },
   {
     "id": "api.command.invite_people.hint",
@@ -425,123 +425,123 @@
   },
   {
     "id": "api.command.invite_people.no_email",
-    "translation": "Please specify one or more valid email addresses"
+    "translation": "请输入一个或更多有效的电子邮件地址"
   },
   {
     "id": "api.command.invite_people.sent",
-    "translation": "Email invite(s) sent"
+    "translation": "邮件邀请已发送"
   },
   {
     "id": "api.command.regen.app_error",
-    "translation": "Inappropriate permissions to regenerate command token"
+    "translation": "没有重新生成命令令牌的权限"
   },
   {
     "id": "api.command_away.desc",
-    "translation": "Set your status away"
+    "translation": "设置您的状态设为离开"
   },
   {
     "id": "api.command_away.name",
-    "translation": "away"
+    "translation": "离开"
   },
   {
     "id": "api.command_away.success",
-    "translation": "You are now away"
+    "translation": "您现在离开了"
   },
   {
     "id": "api.command_collapse.desc",
-    "translation": "Turn on auto-collapsing of image previews"
+    "translation": "打开图像预览自动折叠"
   },
   {
     "id": "api.command_collapse.name",
-    "translation": "collapse"
+    "translation": "折叠"
   },
   {
     "id": "api.command_echo.create.app_error",
-    "translation": "Unable to create /echo post, err=%v"
+    "translation": "不能创建 /echo 帖文，err=%v"
   },
   {
     "id": "api.command_echo.delay.app_error",
-    "translation": "Delays must be under 10000 seconds"
+    "translation": "延迟必须在10000秒内"
   },
   {
     "id": "api.command_echo.desc",
-    "translation": "Echo back text from your account"
+    "translation": "从您的帐号返回文本"
   },
   {
     "id": "api.command_echo.high_volume.app_error",
-    "translation": "High volume of echo request, cannot process request"
+    "translation": "高容量的回声请求，不能处理请求"
   },
   {
     "id": "api.command_echo.hint",
-    "translation": "'message' [delay in seconds]"
+    "translation": "'信息' [延迟秒数]"
   },
   {
     "id": "api.command_echo.name",
-    "translation": "echo"
+    "translation": "回应"
   },
   {
     "id": "api.command_expand.desc",
-    "translation": "Turn off auto-collapsing of image previews"
+    "translation": "关闭图像预览自动折叠"
   },
   {
     "id": "api.command_expand.name",
-    "translation": "expand"
+    "translation": "展开"
   },
   {
     "id": "api.command_expand_collapse.fail.app_error",
-    "translation": "An error occured while expanding previews"
+    "translation": "放大预览时发生了错误"
   },
   {
     "id": "api.command_join.desc",
-    "translation": "Join the open channel"
+    "translation": "添加到公开频道"
   },
   {
     "id": "api.command_join.fail.app_error",
-    "translation": "An error occured while joining the channel."
+    "translation": "加入频道时出错。"
   },
   {
     "id": "api.command_join.hint",
-    "translation": "[channel-name]"
+    "translation": "[频道名称]"
   },
   {
     "id": "api.command_join.list.app_error",
-    "translation": "An error occured while listing channels."
+    "translation": "列出频道时出错。"
   },
   {
     "id": "api.command_join.missing.app_error",
-    "translation": "We couldn't find the channel"
+    "translation": "我们没有找到该频道"
   },
   {
     "id": "api.command_join.name",
-    "translation": "join"
+    "translation": "加入"
   },
   {
     "id": "api.command_join.success",
-    "translation": "Joined channel."
+    "translation": "已加入频道。"
   },
   {
     "id": "api.command_logout.desc",
-    "translation": "Logout of Mattermost"
+    "translation": "注销Mattermost"
   },
   {
     "id": "api.command_logout.fail_message",
-    "translation": "Failed to log out"
+    "translation": "注销失败"
   },
   {
     "id": "api.command_logout.name",
-    "translation": "logout"
+    "translation": "注销"
   },
   {
     "id": "api.command_logout.success_message",
-    "translation": "Logging out..."
+    "translation": "注销中..."
   },
   {
     "id": "api.command_me.desc",
-    "translation": "Do an action"
+    "translation": "执行一个操作"
   },
   {
     "id": "api.command_me.hint",
-    "translation": "[message]"
+    "translation": "[信息]"
   },
   {
     "id": "api.command_me.name",
@@ -549,107 +549,107 @@
   },
   {
     "id": "api.command_msg.desc",
-    "translation": "Send Direct Message to a user"
+    "translation": "直接发送消息给用户"
   },
   {
     "id": "api.command_msg.dm_fail.app_error",
-    "translation": "An error occured while creating the direct message."
+    "translation": "创建私信时发生错误。"
   },
   {
     "id": "api.command_msg.fail.app_error",
-    "translation": "An error occured while messaging the user."
+    "translation": "发送用户消息时发生错误。"
   },
   {
     "id": "api.command_msg.hint",
-    "translation": "@[username] 'message'"
+    "translation": "@用户名 '你想发送的消息'"
   },
   {
     "id": "api.command_msg.list.app_error",
-    "translation": "An error occured while listing users."
+    "translation": "列出用户时出错。"
   },
   {
     "id": "api.command_msg.missing.app_error",
-    "translation": "We couldn't find the user"
+    "translation": "无法找到用户"
   },
   {
     "id": "api.command_msg.name",
-    "translation": "message"
+    "translation": "消息"
   },
   {
     "id": "api.command_msg.success",
-    "translation": "Messaged user."
+    "translation": "消息已发送给用户。"
   },
   {
     "id": "api.command_offline.desc",
-    "translation": "Set your status offline"
+    "translation": "设置您的状态设为离线"
   },
   {
     "id": "api.command_offline.name",
-    "translation": "offline"
+    "translation": "离线"
   },
   {
     "id": "api.command_offline.success",
-    "translation": "You are now offline"
+    "translation": "您现在离线了"
   },
   {
     "id": "api.command_online.desc",
-    "translation": "Set your status online"
+    "translation": "设置您的状态设为在线"
   },
   {
     "id": "api.command_online.name",
-    "translation": "online"
+    "translation": "在线"
   },
   {
     "id": "api.command_online.success",
-    "translation": "You are now online"
+    "translation": "您现在在线了"
   },
   {
     "id": "api.command_shortcuts.browser",
-    "translation": "#### Built-in Browser Commands\n\nALT+LEFT: Previous channel in your history\nALT+RIGHT: Next channel in your history\nCTRL+PLUS: Increase font size (zoom in)\nCTRL+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+    "translation": "#### 浏览器自带命令\n\nALT+向左键：您历史里的上一个频道\nALT+向右键：您历史里的下一个频道\nCTRL+加号：加大字体大小 (放大)\nCTRL+减号：减小字体大小 (缩小)\nSHIFT+向上键 (在输入框)：高亮字到上一行\nSHIFT+向下键 (在输入框)：高亮字到下一行\nSHIFT+回车 (在输入框)：创建新一行\n"
   },
   {
     "id": "api.command_shortcuts.browser_mac",
-    "translation": "#### Built-in Browser Commands\n\nCMD+[: Previous channel in your history\nCMD+]: Next channel in your history\nCMD+PLUS: Increase font size (zoom in)\nCMD+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n"
+    "translation": "#### 浏览器自带命令\n\nCMD +[：您历史里的上一个频道\nCMD +]：您历史里的下一个频道\nCMD +加号：加大字体大小 (放大)\nCMD +减号：减小字体大小 (缩小)\nSHIFT+向上键 (在输入框)：高亮字到上一行\nSHIFT+向下键 (在输入框)：高亮字到下一行\nSHIFT+回车 (在输入框)：创建新一行\n"
   },
   {
     "id": "api.command_shortcuts.desc",
-    "translation": "Displays a list of keyboard shortcuts"
+    "translation": "显示快捷键列表"
   },
   {
     "id": "api.command_shortcuts.files",
-    "translation": "#### Files\n\nCTRL+U: Upload file(s)\n\n"
+    "translation": "#### 文件\n\nCTRL+U：上传文件\n\n"
   },
   {
     "id": "api.command_shortcuts.files_mac",
-    "translation": "#### Files\n\nCMD+U: Upload file(s)\n\n"
+    "translation": "#### 文件\n\nCMD+U：上传文件\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs",
-    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCTRL+UP (in empty input field): Reprint the previous message or slash command you entered\nCTRL+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+    "translation": "#### 消息\n\nESC：标此频道所有消息为已读\nCTRL+向上键 (在空输入框)：重输入您上个输入的消息或斜杠命令\nCTRL+向下键 (在空输入框)：重输入您下个输入的消息或斜杠命令\n向上键 (在空输入框)：编辑你在本频道发的上一条消息\n@[字]+TAB：自动完成以[字]开头的 @用户名\n:[字]+TAB: 自动完成以[字]开头的表情符\n\n"
   },
   {
     "id": "api.command_shortcuts.msgs_mac",
-    "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\nCMD+UP (in empty input field): Reprint the previous message or slash command you entered\nCMD+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+    "translation": "#### 消息\n\nESC：标此频道所有消息为已读\nCMD +向上键 (在空输入框)：重输入您上个输入的消息或斜杠命令\nCMD +向下键 (在空输入框)：重输入您下个输入的消息或斜杠命令\n向上键 (在空输入框)：编辑你在本频道发的上一条消息\n@[字]+TAB：自动完成以[字]开头的 @用户名\n:[字]+TAB: 自动完成以[字]开头的表情符\n\n"
   },
   {
     "id": "api.command_shortcuts.name",
-    "translation": "shortcuts"
+    "translation": "快捷键"
   },
   {
     "id": "api.command_shortcuts.nav",
-    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCTRL+K: Open a quick channel switcher dialog\nCTRL+SHIFT+A: Open account settings\nCTRL+SHIFT+M: Open recent mentions\n\n"
+    "translation": "### 键盘快捷键\n\n#### 导航\n\nALT+向上键：左栏中上一频道或私信\nALT+向下键：左栏中下一频道或私信\nALT+SHIFT+向上键：左栏中上一个有未读消息的频道或私信\nALT+SHIFT+向下键：左栏中下一个有未读消息的频道或私信\nCTRL+K：打开快速频道切换对话框\nCTRL+SHIFT+A：打开帐号设定\nCTRL+SHIFT+M：打开最近提及\n\n"
   },
   {
     "id": "api.command_shortcuts.nav_mac",
-    "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCMD+K: Open a quick channel switcher dialog\nCMD+SHIFT+A: Open account settings\nCMD+SHIFT+M: Open recent mentions\n\n"
+    "translation": "### 键盘快捷键\n\n#### 导航\n\nALT+向上键：左栏中上一频道或私信\nALT+向下键：左栏中下一频道或私信\nALT+SHIFT+向上键：左栏中上一个有未读消息的频道或私信\nALT+SHIFT+向下键：左栏中下一个有未读消息的频道或私信\nCMD +K：打开快速频道切换对话框\nCMD +SHIFT+A：打开帐号设定\nCMD +SHIFT+M：打开最近提及\n\n"
   },
   {
     "id": "api.command_shrug.desc",
-    "translation": "Adds ¯\\_(ツ)_/¯ to your message"
+    "translation": "添加 ¯\\_(ツ)_/¯ 到你的消息"
   },
   {
     "id": "api.command_shrug.hint",
-    "translation": "[message]"
+    "translation": "[信息]"
   },
   {
     "id": "api.command_shrug.name",
@@ -657,67 +657,67 @@
   },
   {
     "id": "api.context.404.app_error",
-    "translation": "Sorry, we could not find the page."
+    "translation": "对不起，我们找不到该页面。"
   },
   {
     "id": "api.context.invalid_param.app_error",
-    "translation": "Invalid {{.Name}} parameter"
+    "translation": "无效 {{.Name}} 参数"
   },
   {
     "id": "api.context.invalid_team_url.debug",
-    "translation": "TeamURL accessed when not valid. Team URL should not be used in api functions or those that are team independent"
+    "translation": "团队URL访问无效。团队URL不能在api函数或者和不相干的团队中使用"
   },
   {
     "id": "api.context.invalid_token.error",
-    "translation": "Invalid session token=%v, err=%v"
+    "translation": "无效的会话令牌=%v，err=%v"
   },
   {
     "id": "api.context.last_activity_at.error",
-    "translation": "Failed to update LastActivityAt for user_id=%v and session_id=%v, err=%v"
+    "translation": "不能更新LastActivityAt user_id=%v and session_id=%v, err=%v"
   },
   {
     "id": "api.context.log.error",
-    "translation": "%v:%v code=%v rid=%v uid=%v ip=%v %v [details: %v]"
+    "translation": "%v:%v code=%v rid=%v uid=%v ip=%v %v [详情: %v]"
   },
   {
     "id": "api.context.permissions.app_error",
-    "translation": "You do not have the appropriate permissions"
+    "translation": "您没有对应的权限"
   },
   {
     "id": "api.context.session_expired.app_error",
-    "translation": "Invalid or expired session, please login again."
+    "translation": "无效或过期的会话，请重新登录。"
   },
   {
     "id": "api.context.system_permissions.app_error",
-    "translation": "You do not have the appropriate permissions (system)"
+    "translation": "您没有对应的权限 (系统)"
   },
   {
     "id": "api.context.token_provided.app_error",
-    "translation": "Session is not OAuth but token was provided in the query string"
+    "translation": "会话不是OAuth但是查询字符串中提供的令牌"
   },
   {
     "id": "api.context.unknown.app_error",
-    "translation": "An unknown error has occurred. Please contact support."
+    "translation": "发生未知错误。请联系我们。"
   },
   {
     "id": "api.email_batching.add_notification_email_to_batch.channel_full.app_error",
-    "translation": "Email batching job's receiving channel was full. Please increase the EmailBatchingBufferSize."
+    "translation": "批量电子邮件任务接收频道已满。请提高EmailBatchingBufferSize。"
   },
   {
     "id": "api.email_batching.add_notification_email_to_batch.disabled.app_error",
-    "translation": "Email batching has been disabled by the system administrator"
+    "translation": "系统管理员禁用了批量电子邮件"
   },
   {
     "id": "api.email_batching.check_pending_emails.finished_running",
-    "translation": "Email batching job ran. %v user(s) still have notifications pending."
+    "translation": "批量电子邮件已运行。%v 位用户仍有通知未定。"
   },
   {
     "id": "api.email_batching.check_pending_emails.status.app_error",
-    "translation": "Unable to find status of recipient for batched email notification"
+    "translation": "无法找到批量电子邮件通知收件人状态"
   },
   {
     "id": "api.email_batching.render_batched_post.channel.app_error",
-    "translation": "Unable to find channel of post for batched email notification"
+    "translation": "无法找到批量电子邮件通知信息的频道"
   },
   {
     "id": "api.email_batching.render_batched_post.date",
@@ -725,643 +725,655 @@
   },
   {
     "id": "api.email_batching.render_batched_post.direct_message",
-    "translation": "Direct Message"
+    "translation": "私信"
   },
   {
     "id": "api.email_batching.render_batched_post.go_to_post",
-    "translation": "Go to Post"
+    "translation": "转至发文"
   },
   {
     "id": "api.email_batching.render_batched_post.sender.app_error",
-    "translation": "Unable to find sender of post for batched email notification"
+    "translation": "无法找到批量电子邮件通知发送人"
   },
   {
     "id": "api.email_batching.send_batched_email_notification.body_text",
-    "translation": ""
+    "translation": {
+      "one": "你有一条新消息。您有{{.Count}}条新消息。",
+      "other": ""
+    }
   },
   {
     "id": "api.email_batching.send_batched_email_notification.preferences.app_error",
-    "translation": "Unable to find display preferences of recipient for batched email notification"
+    "translation": "无法找到批量电子邮件通知收件人显示偏好"
   },
   {
     "id": "api.email_batching.send_batched_email_notification.send.app_error",
-    "translation": "Failed to send batched email notification to %v: %v"
+    "translation": "发送批量电子邮件通知到 %v 失败: %v"
   },
   {
     "id": "api.email_batching.send_batched_email_notification.subject",
-    "translation": ""
+    "translation": {
+      "one": "[{{.SiteName}}] {{.Month}} {{.Day}}, {{.Year}} 的新通知[{{.SiteName}}] {{.Month}} {{.Day}}, {{.Year}} 的新通知",
+      "other": ""
+    }
   },
   {
     "id": "api.email_batching.send_batched_email_notification.user.app_error",
-    "translation": "Unable to find recipient for batched email notification"
+    "translation": "无法找到批量电子邮件通知收件人"
   },
   {
     "id": "api.email_batching.start.starting",
-    "translation": "Email batching job starting. Checking for pending emails every %v seconds."
+    "translation": "批量电子邮件任务已开始。每 %v 秒检查待发电子邮件中。"
   },
   {
     "id": "api.emoji.create.duplicate.app_error",
-    "translation": "Unable to create emoji. Another emoji with the same name already exists."
+    "translation": "无法创建表情符号。另一个具有相同名称的表情符号已存在。"
   },
   {
     "id": "api.emoji.create.parse.app_error",
-    "translation": "Unable to create emoji. Could not understand request."
+    "translation": "无法创建表情符。无法理解请求。"
   },
   {
     "id": "api.emoji.create.permissions.app_error",
-    "translation": "Inappropriate permissions to create emoji."
+    "translation": "无创建表情符权限。"
   },
   {
     "id": "api.emoji.create.too_large.app_error",
-    "translation": "Unable to create emoji. Image must be less than 64 KB in size."
+    "translation": "无法创建表情符。图片必须小于64KB。"
   },
   {
     "id": "api.emoji.delete.permissions.app_error",
-    "translation": "Inappropriate permissions to delete emoji."
+    "translation": "无删除表情符权限。"
   },
   {
     "id": "api.emoji.disabled.app_error",
-    "translation": "Custom emoji have been disabled by the system admin."
+    "translation": "自定义表情符号已被系统管理员禁用。"
   },
   {
     "id": "api.emoji.get_image.decode.app_error",
-    "translation": "Unable to decode image file for emoji."
+    "translation": "无法解码表情符号图像文件。"
   },
   {
     "id": "api.emoji.get_image.read.app_error",
-    "translation": "Unable to read image file for emoji."
+    "translation": "无法读取表情图像文件。"
   },
   {
     "id": "api.emoji.init.debug",
-    "translation": "Initializing emoji api routes"
+    "translation": "正在初始化表情符api路径"
   },
   {
     "id": "api.emoji.storage.app_error",
-    "translation": "File storage not configured properly. Please configure for either S3 or local server file storage."
+    "translation": "文件存储没有正确配置。请配置S3或本地文件存储服务。"
   },
   {
     "id": "api.emoji.upload.image.app_error",
-    "translation": "Unable to create emoji. File must be a PNG, JPEG, or GIF."
+    "translation": "无法创建表情符号。文件类型必须是PNG，JPEG，或GIF。"
   },
   {
     "id": "api.emoji.upload.large_image.app_error",
-    "translation": "Unable to create emoji. Image must be at most 128 by 128 pixels."
+    "translation": "无法创建表情符。图片长宽不能超过128像素。"
   },
   {
     "id": "api.file.file_upload.exceeds",
-    "translation": "File exceeds max image size."
+    "translation": "文件超过最大图像大小。"
   },
   {
     "id": "api.file.file_upload.exceeds",
-    "translation": "File exceeds max image size."
+    "translation": "文件超过最大图像大小。"
   },
   {
     "id": "api.file.get_file.not_found.app_error",
-    "translation": "Could not find file."
+    "translation": "不能找到文件。"
   },
   {
     "id": "api.file.get_file.public_disabled.app_error",
-    "translation": "Public links have been disabled by the system administrator"
+    "translation": "系统管理员禁用了公开的链接"
   },
   {
     "id": "api.file.get_file.public_invalid.app_error",
-    "translation": "The public link does not appear to be valid"
+    "translation": "公共链接不显示是有效的"
   },
   {
     "id": "api.file.get_public_link.disabled.app_error",
-    "translation": "Public links have been disabled"
+    "translation": "公共链接已经被禁用"
   },
   {
     "id": "api.file.handle_images_forget.decode.error",
-    "translation": "Unable to decode image channelId=%v userId=%v filename=%v err=%v"
+    "translation": "不能解码图片 channelId=%v userId=%v filename=%v err=%v"
   },
   {
     "id": "api.file.handle_images_forget.encode_jpeg.error",
-    "translation": "Unable to encode image as jpeg channelId=%v userId=%v filename=%v err=%v"
+    "translation": "不能编码图片为 jpeg channelId=%v userId=%v filename=%v err=%v"
   },
   {
     "id": "api.file.handle_images_forget.encode_preview.error",
-    "translation": "Unable to encode image as preview jpg channelId=%v userId=%v filename=%v err=%v"
+    "translation": "不能编码图片为预览jpg channelId=%v userId=%v filename=%v err=%v"
   },
   {
     "id": "api.file.handle_images_forget.upload_preview.error",
-    "translation": "Unable to upload preview channelId=%v userId=%v filename=%v err=%v"
+    "translation": "不能上传预览 channelId=%v userId=%v filename=%v err=%v"
   },
   {
     "id": "api.file.handle_images_forget.upload_thumb.error",
-    "translation": "Unable to upload thumbnail channelId=%v userId=%v filename=%v err=%v"
+    "translation": "不能上传缩略图 channelId=%v userId=%v filename=%v err=%v"
   },
   {
     "id": "api.file.init.debug",
-    "translation": "Initializing file api routes"
+    "translation": "初始化文件API路由"
   },
   {
     "id": "api.file.move_file.configured.app_error",
-    "translation": "File storage not configured properly. Please configure for either S3 or local server file storage."
+    "translation": "文件存储没有正确配置。请配置S3或本地文件存储服务。"
   },
   {
     "id": "api.file.move_file.delete_from_s3.app_error",
-    "translation": "Unable to delete file from S3."
+    "translation": "不能从S3上删除文件。"
   },
   {
     "id": "api.file.move_file.get_from_s3.app_error",
-    "translation": "Unable to get file from S3."
+    "translation": "不能从S3上获取文件。"
   },
   {
     "id": "api.file.move_file.rename.app_error",
-    "translation": "Unable to move file locally."
+    "translation": "无法移动本地文件。"
   },
   {
     "id": "api.file.open_file_write_stream.configured.app_error",
-    "translation": "File storage not configured properly. Please configure for either S3 or local server file storage."
+    "translation": "没有配置文件存储。请配置S3或本地服务器的文件存储。"
   },
   {
     "id": "api.file.open_file_write_stream.creating_dir.app_error",
-    "translation": "Encountered an error creating the directory for the new file"
+    "translation": "创建新文件的目录时遇到错误"
   },
   {
     "id": "api.file.open_file_write_stream.local_server.app_error",
-    "translation": "Encountered an error writing to local server storage"
+    "translation": "写入本地存储时遇到错误"
   },
   {
     "id": "api.file.open_file_write_stream.s3.app_error",
-    "translation": "S3 is not supported."
+    "translation": "不支持 S3。"
   },
   {
     "id": "api.file.read_file.configured.app_error",
-    "translation": "File storage not configured properly. Please configure for either S3 or local server file storage."
+    "translation": "没有配置文件存储。请配置S3或本地服务器的文件存储。"
   },
   {
     "id": "api.file.read_file.get.app_error",
-    "translation": "Unable to get file from S3"
+    "translation": "不能从S3上获取文件"
   },
   {
     "id": "api.file.read_file.reading_local.app_error",
-    "translation": "Encountered an error reading from local server storage"
+    "translation": "读取本地存储时遇到错误"
   },
   {
     "id": "api.file.upload_file.image.app_error",
-    "translation": "Unable to upload image file."
+    "translation": "不能上传图片文件。"
   },
   {
     "id": "api.file.upload_file.large_image.app_error",
-    "translation": "Unable to upload image file. File is too large."
+    "translation": "不能上传图片文件。文件太大。"
   },
   {
     "id": "api.file.upload_file.storage.app_error",
-    "translation": "Unable to upload file. Image storage is not configured."
+    "translation": "不能上传文件。图片存储没有配置。"
   },
   {
     "id": "api.file.upload_file.too_large.app_error",
-    "translation": "Unable to upload file. File is too large."
+    "translation": "不能上传文件。文件太大。"
   },
   {
     "id": "api.file.write_file.configured.app_error",
-    "translation": "File storage not configured properly. Please configure for either S3 or local server file storage."
+    "translation": "没有配置文件存储。请配置S3或本地服务器的文件存储。"
   },
   {
     "id": "api.file.write_file.s3.app_error",
-    "translation": "Encountered an error writing to S3"
+    "translation": "写入到S3时遇到错误"
   },
   {
     "id": "api.file.write_file_locally.create_dir.app_error",
-    "translation": "Encountered an error creating the directory for the new file"
+    "translation": "创建新文件的目录时遇到错误"
   },
   {
     "id": "api.file.write_file_locally.writing.app_error",
-    "translation": "Encountered an error writing to local server storage"
+    "translation": "写入本地存储时遇到错误"
   },
   {
     "id": "api.general.init.debug",
-    "translation": "Initializing general api routes"
+    "translation": "正在初始化通用api路由"
   },
   {
     "id": "api.import.import_post.saving.debug",
-    "translation": "Error saving post. user=%v, message=%v"
+    "translation": "保存信息时出错。user=%v，message=%v"
   },
   {
     "id": "api.import.import_user.join_team.error",
-    "translation": "Failed to join team when importing err=%v"
+    "translation": "导入时加入团队错误 err=%v"
   },
   {
     "id": "api.import.import_user.joining_default.error",
-    "translation": "Encountered an issue joining default channels user_id=%s, team_id=%s, err=%v"
+    "translation": "加入默认频道时遇到一个问题 user_id=%s, team_id=%s, err=%v"
   },
   {
     "id": "api.import.import_user.saving.error",
-    "translation": "Error saving user. err=%v"
+    "translation": "保存用户出错. err=%v"
   },
   {
     "id": "api.import.import_user.set_email.error",
-    "translation": "Failed to set email verified err=%v"
+    "translation": "设置电子邮件验证失败 err=%v"
   },
   {
     "id": "api.license.add_license.array.app_error",
-    "translation": "Empty array under 'license' in request"
+    "translation": "请求中‘许可证’空数组"
   },
   {
     "id": "api.license.add_license.expired.app_error",
-    "translation": "License is either expired or has not yet started."
+    "translation": "许可证已经过期或者尚未启用。"
   },
   {
     "id": "api.license.add_license.invalid.app_error",
-    "translation": "Invalid license file."
+    "translation": "无效的授权文件。"
   },
   {
     "id": "api.license.add_license.invalid_count.app_error",
-    "translation": "Unable to count total unique users."
+    "translation": "不能计算不重复用户总数。"
   },
   {
     "id": "api.license.add_license.no_file.app_error",
-    "translation": "No file under 'license' in request"
+    "translation": "请求中没有'许可证'文件"
   },
   {
     "id": "api.license.add_license.open.app_error",
-    "translation": "Could not open license file"
+    "translation": "不能打开许可证文件"
   },
   {
     "id": "api.license.add_license.save.app_error",
-    "translation": "License did not save properly."
+    "translation": "许可证没有正确保存。"
   },
   {
     "id": "api.license.add_license.save_active.app_error",
-    "translation": "Active license ID did not save properly."
+    "translation": "有效许可证ID没有正确保存。"
   },
   {
     "id": "api.license.add_license.unique_users.app_error",
-    "translation": "This license only supports {{.Users}} users, when your system has {{.Count}} unique users. Unique users are counted distinctly by email address. You can see total user count under Site Reports -> View Statistics."
+    "translation": "该许可证只支持 {{.Users}} 用户，当你的系统有 {{.Count}} 唯一用户。唯一用户通过邮件地址计算。你可以从站点报告 -> 查看统计查看总数量。"
   },
   {
     "id": "api.license.init.debug",
-    "translation": "Initializing license api routes"
+    "translation": "初始化许可证API路由"
   },
   {
     "id": "api.license.remove_license.remove.app_error",
-    "translation": "License did not remove properly."
+    "translation": "许可证未正确删除。"
   },
   {
     "id": "api.oauth.allow_oauth.bad_client.app_error",
-    "translation": "invalid_request: Bad client_id"
+    "translation": "invalid_request：错误的 client_id"
   },
   {
     "id": "api.oauth.allow_oauth.bad_redirect.app_error",
-    "translation": "invalid_request: Missing or bad redirect_uri"
+    "translation": "invalid_request：丢失或者错误的 redirect_uri"
   },
   {
     "id": "api.oauth.allow_oauth.bad_response.app_error",
-    "translation": "invalid_request: Bad response_type"
+    "translation": "invalid_request：错误的 response_type"
   },
   {
     "id": "api.oauth.allow_oauth.database.app_error",
-    "translation": "server_error: Error accessing the database"
+    "translation": "server_error：访问数据库时出错"
   },
   {
     "id": "api.oauth.allow_oauth.redirect_callback.app_error",
-    "translation": "invalid_request: Supplied redirect_uri did not match registered callback_url"
+    "translation": "invalid_request：提供的 redirect_uri 不匹配注册的 callback_url"
   },
   {
     "id": "api.oauth.allow_oauth.turn_off.app_error",
-    "translation": "The system admin has turned off OAuth2 Service Provider."
+    "translation": "系统管理员已经关闭了 OAuth2 验证服务商。"
   },
   {
     "id": "api.oauth.authorize_oauth.disabled.app_error",
-    "translation": "The system admin has turned off OAuth2 Service Provider."
+    "translation": "系统管理员已经关闭了 OAuth2 验证服务商。"
   },
   {
     "id": "api.oauth.authorize_oauth.missing.app_error",
-    "translation": "Missing one or more of response_type, client_id, or redirect_uri"
+    "translation": "response_type, client_id, 或 redirect_uri 至少却一项"
   },
   {
     "id": "api.oauth.complete_oauth.missing_code.app_error",
-    "translation": "The service provider {{.service}} did not provide an authorization code in the redirect URL.\n\nFor [Google Apps](https://docs.mattermost.com/deployment/sso-google.html) make sure your administrator enabled the Google+ API.\n\nFor [Office 365](https://docs.mattermost.com/deployment/sso-office.html) make sure the administrator of your Microsoft organization has enabled the Mattermost app.\n\nFor [GitLab](https://docs.mattermost.com/deployment/sso-gitlab.html) please make sure you followed the setup instructions.\n\nIf you reviewed the above and are still having trouble with configuration, you may post in our [Troubleshooting forum](https://forum.mattermost.org/c/general/trouble-shoot) where we'll be happy to help with issues during setup."
+    "translation": "服务提供商 {{.service}} 没有在重指向网址中提供授权码。\n\n如使用 [Google Apps](https://docs.mattermost.com/deployment/sso-google.html)，请确定您的管理员在 Google+ API 已启用。\n\n如使用 [Office 365](https://docs.mattermost.com/deployment/sso-office.html)，请确定您微软组织管理员已启用 Mattermost 应用。\n\n如使用 [GitLab](https://docs.mattermost.com/deployment/sso-gitlab.html)，请确定您根据设置说明完成设定。\n\n如果您已确认上面说明但仍由配置问题，您可以发帖到[故障排除论坛](https://forum.mattermost.org/c/general/trouble-shoot) ，我们会很乐意帮你排除设置问题。"
   },
   {
     "id": "api.oauth.delete.permissions.app_error",
-    "translation": "Inappropriate permissions to delete the OAuth2 App"
+    "translation": "没有权限删除 OAuth2 应用"
   },
   {
     "id": "api.oauth.get_access_token.bad_client_id.app_error",
-    "translation": "invalid_request: Bad client_id"
+    "translation": "invalid_request：错误的 client_id"
   },
   {
     "id": "api.oauth.get_access_token.bad_client_secret.app_error",
-    "translation": "invalid_request: Missing client_secret"
+    "translation": "invalid_request：缺少 client_secret"
   },
   {
     "id": "api.oauth.get_access_token.bad_grant.app_error",
-    "translation": "invalid_request: Bad grant_type"
+    "translation": "invalid_request：错误的 grant_type"
   },
   {
     "id": "api.oauth.get_access_token.credentials.app_error",
-    "translation": "invalid_client: Invalid client credentials"
+    "translation": "invalid_client：无效的用户凭证"
   },
   {
     "id": "api.oauth.get_access_token.disabled.app_error",
-    "translation": "The system admin has turned off OAuth2 Service Provider."
+    "translation": "系统管理员已经关闭了 OAuth2 验证服务商。"
   },
   {
     "id": "api.oauth.get_access_token.expired_code.app_error",
-    "translation": "invalid_grant: Invalid or expired authorization code"
+    "translation": "invalid_grant：无效或过期授权码"
   },
   {
     "id": "api.oauth.get_access_token.internal.app_error",
-    "translation": "server_error: Encountered internal server error while accessing database"
+    "translation": "server_error：访问数据库时遇到了内部服务器错误"
   },
   {
     "id": "api.oauth.get_access_token.internal_saving.app_error",
-    "translation": "server_error: Encountered internal server error while saving access token to database"
+    "translation": "server_error：在保存访问令牌到数据库时遇到了内部服务器错误"
   },
   {
     "id": "api.oauth.get_access_token.internal_session.app_error",
-    "translation": "server_error: Encountered internal server error while saving session to database"
+    "translation": "server_error：在保存会话到数据库时遇到了内部服务器错误"
   },
   {
     "id": "api.oauth.get_access_token.internal_user.app_error",
-    "translation": "server_error: Encountered internal server error while pulling user from database"
+    "translation": "server_error：从数据库中读取用户时遇到了内部服务器错误"
   },
   {
     "id": "api.oauth.get_access_token.missing_code.app_error",
-    "translation": "invalid_request: Missing code"
+    "translation": "invalid_request：缺少编号"
   },
   {
     "id": "api.oauth.get_access_token.missing_refresh_token.app_error",
-    "translation": "invalid_request: Missing refresh_token"
+    "translation": "invalid_request：缺少 refresh_token"
   },
   {
     "id": "api.oauth.get_access_token.redirect_uri.app_error",
-    "translation": "invalid_request: Supplied redirect_uri does not match authorization code redirect_uri"
+    "translation": "invalid_request：提供的 redirect_uri 不匹配授权码 redirect_uri"
   },
   {
     "id": "api.oauth.get_access_token.refresh_token.app_error",
-    "translation": "invalid_grant: Invalid refresh token"
+    "translation": "invalid_grant：无效的续期令牌"
   },
   {
     "id": "api.oauth.get_auth_data.find.error",
-    "translation": "Couldn't find auth code for code=%s"
+    "translation": "不能找到认证码 code=%s"
   },
   {
     "id": "api.oauth.init.debug",
-    "translation": "Initializing oauth api routes"
+    "translation": "初始化认证API路由"
   },
   {
     "id": "api.oauth.regenerate_secret.app_error",
-    "translation": "Inappropriate permissions to regenerate the OAuth2 App Secret"
+    "translation": "没有权限重新生成 OAuth2 应用秘钥"
   },
   {
     "id": "api.oauth.register_oauth_app.turn_off.app_error",
-    "translation": "The system admin has turned off OAuth2 Service Provider."
+    "translation": "系统管理员已经关闭的 OAuth2 服务商。"
   },
   {
     "id": "api.oauth.revoke_access_token.del_session.app_error",
-    "translation": "Error deleting session from DB"
+    "translation": "从数据库删除会话出错Error deleting session from DB"
   },
   {
     "id": "api.oauth.revoke_access_token.del_token.app_error",
-    "translation": "Error deleting access token from DB"
+    "translation": "从数据库删除访问令牌遇到错误"
   },
   {
     "id": "api.oauth.revoke_access_token.get.app_error",
-    "translation": "Error getting access token from DB before deletion"
+    "translation": "删除前从数据库获取访问令牌遇到错误"
   },
   {
     "id": "api.oauth.singup_with_oauth.disabled.app_error",
-    "translation": "User sign-up is disabled."
+    "translation": "用户注册已停用。"
   },
   {
     "id": "api.oauth.singup_with_oauth.expired_link.app_error",
-    "translation": "The signup link has expired"
+    "translation": "注册链接已过期"
   },
   {
     "id": "api.oauth.singup_with_oauth.invalid_link.app_error",
-    "translation": "The signup link does not appear to be valid"
+    "translation": "注册链接无效"
   },
   {
     "id": "api.post.check_for_out_of_channel_mentions.message.multiple",
-    "translation": "{{.Usernames}} and {{.LastUsername}} were mentioned, but they did not receive notifications because they do not belong to this channel."
+    "translation": "{{.Usernames}}和{{.LastUsername}}被提到了，但是他们不会收到通知，因为他们不在这个频道。"
   },
   {
     "id": "api.post.check_for_out_of_channel_mentions.message.one",
-    "translation": "{{.Username}} was mentioned, but they did not receive a notification because they do not belong to this channel."
+    "translation": "{{.Username}}被提到了，但是他因不在此频道而不会收到通知。"
   },
   {
     "id": "api.post.create_post.bad_filename.error",
-    "translation": "Bad filename discarded, filename=%v"
+    "translation": "坏文件名已去除，filename=%v"
   },
   {
     "id": "api.post.create_post.channel_root_id.app_error",
-    "translation": "Invalid ChannelId for RootId parameter"
+    "translation": "RootId参数无效ChannelId"
   },
   {
     "id": "api.post.create_post.last_viewed.error",
-    "translation": "Encountered error updating last viewed, channel_id=%s, user_id=%s, err=%v"
+    "translation": "更新最近浏览记录遇到错误，channel_id=%s, user_id=%s, err=%v"
   },
   {
     "id": "api.post.create_post.parent_id.app_error",
-    "translation": "Invalid ParentId parameter"
+    "translation": "无效的ParentId参数"
   },
   {
     "id": "api.post.create_post.root_id.app_error",
-    "translation": "Invalid RootId parameter"
+    "translation": "无效的RootId参数"
   },
   {
     "id": "api.post.create_webhook_post.creating.app_error",
-    "translation": "Error creating post"
+    "translation": "创建信息时出错"
   },
   {
     "id": "api.post.delete_flagged_post.app_error.warn",
-    "translation": "Unable to delete flagged post preference when deleting post, err=%v"
+    "translation": "无法在删除信息时删除标记偏好，err=%v"
   },
   {
     "id": "api.post.delete_post.permissions.app_error",
-    "translation": "You do not have the appropriate permissions"
+    "translation": "您没有对应的权限"
   },
   {
     "id": "api.post.get_message_for_notification.files_sent",
-    "translation": ""
+    "translation": {
+      "one": "{{.Count}} 文件已发送：{{.Filenames}}{{.Count}} 文件已发送：{{.Filenames}}",
+      "other": ""
+    }
   },
   {
     "id": "api.post.get_message_for_notification.images_sent",
-    "translation": ""
+    "translation": {
+      "one": "{{.Count}} 图片已发送：{{.Filenames}}{{.Count}} 图片已发送：{{.Filenames}}",
+      "other": ""
+    }
   },
   {
     "id": "api.post.get_out_of_channel_mentions.regex.error",
-    "translation": "Failed to compile @mention regex user_id=%v, err=%v"
+    "translation": "编译 @提到 正则表达式出错 user_id=%v, err=%v"
   },
   {
     "id": "api.post.get_post.permissions.app_error",
-    "translation": "You do not have the appropriate permissions"
+    "translation": "您没有对应的权限"
   },
   {
     "id": "api.post.handle_post_events_and_forget.channel.error",
-    "translation": "Encountered error getting channel, channel_id=%s, err=%v"
+    "translation": "获取频道时遇到错误, channel_id=%s, err=%v"
   },
   {
     "id": "api.post.handle_post_events_and_forget.members.error",
-    "translation": "Failed to get channel members channel_id=%v err=%v"
+    "translation": "未获取到频道成员 channel_id=%v err=%v"
   },
   {
     "id": "api.post.handle_post_events_and_forget.profiles.error",
-    "translation": "Failed to retrieve user profiles team_id=%v, err=%v"
+    "translation": "检索用户配置文件失败 team_id=%v, err=%v"
   },
   {
     "id": "api.post.handle_post_events_and_forget.team.error",
-    "translation": "Encountered error getting team, team_id=%s, err=%v"
+    "translation": "获取团队时遇到错误, team_id=%s, err=%v"
   },
   {
     "id": "api.post.handle_post_events_and_forget.user.error",
-    "translation": "Encountered error getting user, user_id=%s, err=%v"
+    "translation": "获取用户时遇到错误, user_id=%s, err=%v"
   },
   {
     "id": "api.post.handle_webhook_events_and_forget.create_post.error",
-    "translation": "Failed to create response post, err=%v"
+    "translation": "创建响应请求失败, err=%v"
   },
   {
     "id": "api.post.handle_webhook_events_and_forget.event_post.error",
-    "translation": "Event POST failed, err=%s"
+    "translation": "事件发布失败, err=%s"
   },
   {
     "id": "api.post.handle_webhook_events_and_forget.getting.error",
-    "translation": "Encountered error getting webhooks by team, err=%v"
+    "translation": "通过团队获取webhooks遇到错误, err=%v"
   },
   {
     "id": "api.post.init.debug",
-    "translation": "Initializing post api routes"
+    "translation": "初始化post api路由"
   },
   {
     "id": "api.post.make_direct_channel_visible.get_2_members.error",
-    "translation": "Failed to get 2 members for a direct channel channel_id=%v"
+    "translation": "获取私聊频道的2个用户失败 channel_id=%v"
   },
   {
     "id": "api.post.make_direct_channel_visible.get_members.error",
-    "translation": "Failed to get channel members channel_id=%v err=%v"
+    "translation": "获取频道成员失败 channel_id=%v err=%v"
   },
   {
     "id": "api.post.make_direct_channel_visible.save_pref.error",
-    "translation": "Failed to save direct channel preference user_id=%v other_user_id=%v err=%v"
+    "translation": "保存私信频道设置失败 user_id=%v other_user_id=%v err=%v"
   },
   {
     "id": "api.post.make_direct_channel_visible.update_pref.error",
-    "translation": "Failed to update direct channel preference user_id=%v other_user_id=%v err=%v"
+    "translation": "更新私信频道设置失败 user_id=%v other_user_id=%v err=%v"
   },
   {
     "id": "api.post.notification.here.warn",
-    "translation": "Unable to send notification to online users with @here, err=%v"
+    "translation": "无法发送通知到的用户在线@here, err=%v"
   },
   {
     "id": "api.post.notification.member_profile.warn",
-    "translation": "Unable to get profile for channel member, user_id=%v"
+    "translation": "无法获取频道成员个人资料，user_id=%v"
   },
   {
     "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
-    "translation": "Clearing push notification to %v with channel_id %v"
+    "translation": "清除 %v 拥有 channel_id %v 的通知中"
   },
   {
     "id": "api.post.send_notifications_and_forget.comment_thread.error",
-    "translation": "Failed to retrieve comment thread posts in notifications root_post_id=%v, err=%v"
+    "translation": "在发送通知时获取注解内容时失败 root_post_id=%v, err=%v"
   },
   {
     "id": "api.post.send_notifications_and_forget.get_teams.error",
-    "translation": "Failed to get teams when sending cross-team DM user_id=%v, err=%v"
+    "translation": "发送跨团队私信时获取团队失败 user_id=%v，err=%v"
   },
   {
     "id": "api.post.send_notifications_and_forget.mention_body",
-    "translation": "You have one new mention."
+    "translation": "您有一个新的提及。"
   },
   {
     "id": "api.post.send_notifications_and_forget.mention_subject",
-    "translation": "New Mention"
+    "translation": "新的提及"
   },
   {
     "id": "api.post.send_notifications_and_forget.message_body",
-    "translation": "You have one new message."
+    "translation": "你有一个新消息。"
   },
   {
     "id": "api.post.send_notifications_and_forget.message_subject",
-    "translation": "New Direct Message"
+    "translation": "新私信"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_in",
-    "translation": " in "
+    "translation": "在"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_mention",
-    "translation": " mentioned you in "
+    "translation": " 提到你在 "
   },
   {
     "id": "api.post.send_notifications_and_forget.push_message",
-    "translation": " sent you a direct message"
+    "translation": " 发送给你一个私信"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_non_mention",
-    "translation": " posted in "
+    "translation": "发布在"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.debug",
-    "translation": "Sending push notification to %v with msg of '%v'"
+    "translation": "发送拥有信息 '%v' 的推送通知到 %v"
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
-    "translation": "Failed to send push device_id=%v, err=%v"
+    "translation": "发送推送失败 device_id=%v, err=%v"
   },
   {
     "id": "api.post.send_notifications_and_forget.send.error",
-    "translation": "Failed to send mention email successfully email=%v err=%v"
+    "translation": "发送电子邮件失败 email=%v err=%v"
   },
   {
     "id": "api.post.send_notifications_and_forget.sent",
-    "translation": "{{.Prefix}} {{.Filenames}} sent"
+    "translation": "{{.Prefix}} {{.Filenames}} 发送"
   },
   {
     "id": "api.post.send_notifications_and_forget.sessions.error",
-    "translation": "Failed to retrieve sessions in notifications id=%v, err=%v"
+    "translation": "未能检索通知中的会话 id=%v, err=%v"
   },
   {
     "id": "api.post.send_notifications_and_forget.user_id.error",
-    "translation": "Post user_id not returned by GetProfiles user_id=%v"
+    "translation": "通过GetProfiles请求user_id没有返回值 user_id=%v"
   },
   {
     "id": "api.post.update_mention_count_and_forget.update_error",
-    "translation": "Failed to update mention count, post_id=%v channel_id=%v err=%v"
+    "translation": "更新提及数失败 user_id=%v channel_id=%v err=%v"
   },
   {
     "id": "api.post.update_post.find.app_error",
-    "translation": "We couldn't find the existing post or comment to update."
+    "translation": "我们找不到现有的信息或评论去更新。"
   },
   {
     "id": "api.post.update_post.permissions.app_error",
-    "translation": "You do not have the appropriate permissions"
+    "translation": "您没有对应的权限"
   },
   {
     "id": "api.post.update_post.permissions_details.app_error",
-    "translation": "Already deleted id={{.PostId}}"
+    "translation": "已经删除 id={{.PostId}}"
   },
   {
     "id": "api.post.update_post.system_message.app_error",
-    "translation": "Unable to update system message"
+    "translation": "无法更新系统消息"
   },
   {
     "id": "api.post_get_post_by_id.get.app_error",
-    "translation": "Unable to get post"
+    "translation": "不能获取一个请求"
   },
   {
     "id": "api.preference.delete_preferences.decode.app_error",
-    "translation": "Unable to decode preferences from request"
+    "translation": "无法解码偏好请求"
   },
   {
     "id": "api.preference.delete_preferences.user_id.app_error",
-    "translation": "Unable to delete preferences for other user"
+    "translation": "不能删除其他用户偏好"
   },
   {
     "id": "api.preference.init.debug",
-    "translation": "Initializing preference api routes"
+    "translation": "初始化优先级api路由"
   },
   {
     "id": "api.preference.save_preferences.decode.app_error",
-    "translation": "Unable to decode preferences from request"
+    "translation": "不能从请求中解码优先级"
   },
   {
     "id": "api.preference.save_preferences.set.app_error",
-    "translation": "Unable to set preferences for other user"
+    "translation": "不能对其他用户设置优先级"
   },
   {
     "id": "api.preference.save_preferences.set_details.app_error",
@@ -1369,3562 +1381,3566 @@
   },
   {
     "id": "api.saml.save_certificate.app_error",
-    "translation": "Certificate did not save properly."
+    "translation": "证书没有正确保存。"
   },
   {
     "id": "api.server.new_server.init.info",
-    "translation": "Server is initializing..."
+    "translation": "服务正在初始化..."
   },
   {
     "id": "api.server.start_server.listening.info",
-    "translation": "Server is listening on %v"
+    "translation": "服务正在监听 %v"
   },
   {
     "id": "api.server.start_server.rate.info",
-    "translation": "RateLimiter is enabled"
+    "translation": "RateLimiter 已启用"
   },
   {
     "id": "api.server.start_server.rate.warn",
-    "translation": "RateLimitSettings not configured properly using VaryByHeader and disabling VaryByRemoteAddr"
+    "translation": "RateLimitSettings配置没有正确使用VaryByHeader并禁用VaryByRemoteAddr"
   },
   {
     "id": "api.server.start_server.starting.critical",
-    "translation": "Error starting server, err:%v"
+    "translation": "启动服务出错, err:%v"
   },
   {
     "id": "api.server.start_server.starting.info",
-    "translation": "Starting Server..."
+    "translation": "启动服务..."
   },
   {
     "id": "api.server.start_server.starting.panic",
-    "translation": "Error starting server "
+    "translation": "启动服务出错 "
   },
   {
     "id": "api.server.stop_server.stopped.info",
-    "translation": "Server stopped"
+    "translation": "服务器已停止"
   },
   {
     "id": "api.server.stop_server.stopping.info",
-    "translation": "Stopping Server..."
+    "translation": "正在停止服务..."
   },
   {
     "id": "api.slackimport.slack_add_channels.added",
-    "translation": "\r\n Channels Added \r\n"
+    "translation": "\r\n 频道已添加 \r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.failed_to_add_user",
-    "translation": "Failed to add user to channel: {{.Username}}\r\n"
+    "translation": "加入频道错误：{{.Username}}\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed",
-    "translation": "Failed to import: {{.DisplayName}}\r\n"
+    "translation": "导入失败: {{.DisplayName}}\r\n"
   },
   {
     "id": "api.slackimport.slack_add_channels.import_failed.debug",
-    "translation": "Failed to import: %s"
+    "translation": "导入失败: %s"
   },
   {
     "id": "api.slackimport.slack_add_channels.merge",
-    "translation": "Merged with existing channel: {{.DisplayName}}\r\n"
+    "translation": "合并现有频道: {{.DisplayName}}\r\n"
   },
   {
     "id": "api.slackimport.slack_add_posts.bot.warn",
-    "translation": "Slack bot posts are not imported yet"
+    "translation": "Slack 机器人的信息未被导入"
   },
   {
     "id": "api.slackimport.slack_add_posts.msg_no_usr.debug",
-    "translation": "Message without user"
+    "translation": "未知用户消息"
   },
   {
     "id": "api.slackimport.slack_add_posts.unsupported.warn",
-    "translation": "Unsupported post type: %v, %v"
+    "translation": "不支持的邮件类型: %v, %v"
   },
   {
     "id": "api.slackimport.slack_add_posts.user_no_exists.debug",
-    "translation": "User: %v does not exist!"
+    "translation": "用户：%v 不存在！"
   },
   {
     "id": "api.slackimport.slack_add_posts.without_user.debug",
-    "translation": "Message without user"
+    "translation": "未知用户消息"
   },
   {
     "id": "api.slackimport.slack_add_users.created",
-    "translation": "\r\n Users Created\r\n"
+    "translation": "\r\n 用户创建 \r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.email_pwd",
-    "translation": "Email, Password: {{.Email}}, {{.Password}}\r\n"
+    "translation": "Email, 密码: {{.Email}}, {{.Password}}\r\n"
   },
   {
     "id": "api.slackimport.slack_add_users.unable_import",
-    "translation": "Unable to import user: {{.Username}}\r\n"
+    "translation": "不能导入用户: {{.Username}}\r\n"
   },
   {
     "id": "api.slackimport.slack_convert_timestamp.bad.warn",
-    "translation": "Bad timestamp detected"
+    "translation": "检测到错误的时间"
   },
   {
     "id": "api.slackimport.slack_convert_user_mentions.compile_regexp_failed.warn",
-    "translation": "Failed to compile the @mention matching regular expression for Slack user {{.UserID}} {{.Username}}"
+    "translation": "给 Slack 用户 {{.UserID}} {{.Username}} 编译 @提及 正规表达式时失败"
   },
   {
     "id": "api.slackimport.slack_import.log",
-    "translation": "Mattermost Slack Import Log\r\n"
+    "translation": "Mattermost Slack 导入日志 \r\n"
   },
   {
     "id": "api.slackimport.slack_import.note1",
-    "translation": "- Some posts may not have been imported because they where not supported by this importer.\r\n"
+    "translation": "- 有些信息可能未被导入因为导入程序不支持他们。\r\n"
   },
   {
     "id": "api.slackimport.slack_import.note2",
-    "translation": "- Slack bot posts are currently not supported.\r\n"
+    "translation": "- Slack 机器人信息现在不支持。\r\n"
   },
   {
     "id": "api.slackimport.slack_import.notes",
-    "translation": "\r\n Notes \r\n"
+    "translation": "\r\n 注释 \r\n"
   },
   {
     "id": "api.slackimport.slack_import.open.app_error",
-    "translation": "Unable to open: {{.Filename}}"
+    "translation": "不能打开: {{.Filename}}"
   },
   {
     "id": "api.slackimport.slack_import.team_fail",
-    "translation": "Failed to get team to import into.\r\n"
+    "translation": "导入时无法获取团队。\r\n"
   },
   {
     "id": "api.slackimport.slack_import.zip.app_error",
-    "translation": "Unable to open zip file"
+    "translation": "不能打开zip文件"
   },
   {
     "id": "api.status.init.debug",
-    "translation": "Initializing status api routes"
+    "translation": "初始化状态 API 路由"
   },
   {
     "id": "api.status.last_activity.error",
-    "translation": "Failed to update LastActivityAt for user_id=%v and session_id=%v, err=%v"
+    "translation": "更新 user_id=%v 和 session_id=%v 的 LastActivityAt 失败，err=%v"
   },
   {
     "id": "api.status.save_status.error",
-    "translation": "Failed to save status for user_id=%v, err=%v"
+    "translation": "保存 user_id=%v 状态时失败，err=%v"
   },
   {
     "id": "api.team.create_team.email_disabled.app_error",
-    "translation": "Team sign-up with email is disabled."
+    "translation": "使用电子邮件注册团队被禁用。"
   },
   {
     "id": "api.team.create_team_from_signup.email_disabled.app_error",
-    "translation": "Team sign-up with email is disabled."
+    "translation": "使用电子邮件注册团队被禁用。"
   },
   {
     "id": "api.team.create_team_from_signup.expired_link.app_error",
-    "translation": "The signup link has expired"
+    "translation": "注册链接已过期"
   },
   {
     "id": "api.team.create_team_from_signup.invalid_link.app_error",
-    "translation": "The signup link does not appear to be valid"
+    "translation": "注册链接无效"
   },
   {
     "id": "api.team.create_team_from_signup.unavailable.app_error",
-    "translation": "This URL is unavailable. Please try another."
+    "translation": "该URL无效。请尝试其他。"
   },
   {
     "id": "api.team.email_teams.sending.error",
-    "translation": "An error occurred while sending an email in emailTeams err=%v"
+    "translation": "邮件团队发送email时出现错误 err=%v"
   },
   {
     "id": "api.team.get_invite_info.not_open_team",
-    "translation": "Invite is invalid because this is not an open team."
+    "translation": "不能邀请进入非开放团队。"
   },
   {
     "id": "api.team.import_team.admin.app_error",
-    "translation": "Only a team admin can import data."
+    "translation": "只有团队管理员才能导入数据。"
   },
   {
     "id": "api.team.import_team.array.app_error",
-    "translation": "Empty array under 'file' in request"
+    "translation": "请求中 'file' 为空数组"
   },
   {
     "id": "api.team.import_team.integer.app_error",
-    "translation": "Filesize not an integer"
+    "translation": "文件大小不是一个整数"
   },
   {
     "id": "api.team.import_team.no_file.app_error",
-    "translation": "No file under 'file' in request"
+    "translation": "请求中‘file’，文件不存在"
   },
   {
     "id": "api.team.import_team.open.app_error",
-    "translation": "Could not open file"
+    "translation": "不能打开文件"
   },
   {
     "id": "api.team.import_team.parse.app_error",
-    "translation": "Could not parse multipart form"
+    "translation": "不能解析混合表单"
   },
   {
     "id": "api.team.import_team.unavailable.app_error",
-    "translation": "Filesize unavilable"
+    "translation": "文件大小无效"
   },
   {
     "id": "api.team.init.debug",
-    "translation": "Initializing team api routes"
+    "translation": "初始化团队api路由"
   },
   {
     "id": "api.team.invite_members.admin",
-    "translation": "administrator"
+    "translation": "管理员"
   },
   {
     "id": "api.team.invite_members.already.app_error",
-    "translation": "This person is already on your team"
+    "translation": "此人已经在你的团队中"
   },
   {
     "id": "api.team.invite_members.member",
-    "translation": "member"
+    "translation": "成员"
   },
   {
     "id": "api.team.invite_members.no_one.app_error",
-    "translation": "No one to invite."
+    "translation": "没有人可邀请。"
   },
   {
     "id": "api.team.invite_members.restricted_system_admin.app_error",
-    "translation": "Inviting new users to a team is restricted to System Administrators."
+    "translation": "只有系统管理员能邀请新用户至团队。"
   },
   {
     "id": "api.team.invite_members.restricted_team_admin.app_error",
-    "translation": "Inviting new users to a team is restricted to Team and System Administrators."
+    "translation": "只有团队管理员或系统管理员能邀请新用户至团队。"
   },
   {
     "id": "api.team.invite_members.send.error",
-    "translation": "Failed to send invite email successfully err=%v"
+    "translation": "发送邀请邮件失败 err=%v"
   },
   {
     "id": "api.team.invite_members.sending.info",
-    "translation": "sending invitation to %v %v"
+    "translation": "发送邀请给 %v %v"
   },
   {
     "id": "api.team.is_team_creation_allowed.disabled.app_error",
-    "translation": "Team creation has been disabled. Please ask your systems administrator for details."
+    "translation": "团队创建被禁用。详细请询问您的系统管理员。"
   },
   {
     "id": "api.team.is_team_creation_allowed.domain.app_error",
-    "translation": "Email must be from a specific domain (e.g. @example.com). Please ask your systems administrator for details."
+    "translation": "电子邮件必须来自指定域名 (例如 @example.com)。详情请询问您的系统管理员。"
   },
   {
     "id": "api.team.permanent_delete_team.attempting.warn",
-    "translation": "Attempting to permanently delete team %v id=%v"
+    "translation": "试图永久删除团队 %v id=%v"
   },
   {
     "id": "api.team.permanent_delete_team.deleted.warn",
-    "translation": "Permanently deleted team %v id=%v"
+    "translation": "永久删除团队 %v id=%v"
   },
   {
     "id": "api.team.remove_user_from_team.missing.app_error",
-    "translation": "The user does not appear to be part of this team."
+    "translation": "此用户似乎不属于此团队。"
   },
   {
     "id": "api.team.signup_team.email_disabled.app_error",
-    "translation": "Team sign-up with email is disabled."
+    "translation": "使用电子邮件注册团队被禁用。"
   },
   {
     "id": "api.team.update_team.permissions.app_error",
-    "translation": "You do not have the appropriate permissions"
+    "translation": "您没有对应的权限"
   },
   {
     "id": "api.templates.email_change_body.info",
-    "translation": "Your email address for {{.TeamDisplayName}} has been changed to {{.NewEmail}}.<br>If you did not make this change, please contact the system administrator."
+    "translation": "您的邮箱地址从 {{.TeamDisplayName}} 修改为 {{.NewEmail}}。<br>如果您没有做过这个修改，请联系系统管理员。"
   },
   {
     "id": "api.templates.email_change_body.title",
-    "translation": "You updated your email"
+    "translation": "您更新了您的邮箱"
   },
   {
     "id": "api.templates.email_change_subject",
-    "translation": "Your email address has changed for {{.TeamDisplayName}}"
+    "translation": "您的邮箱地址修改为 {{.TeamDisplayName}}"
   },
   {
     "id": "api.templates.email_change_verify_body.button",
-    "translation": "Verify Email"
+    "translation": "校验邮箱"
   },
   {
     "id": "api.templates.email_change_verify_body.info",
-    "translation": "To finish updating your email address for {{.TeamDisplayName}}, please click the link below to confirm this is the right address."
+    "translation": "请点击下面的链接确认这是正确的地址，以完成在{{.TeamDisplayName}}的电子邮件地址更新。"
   },
   {
     "id": "api.templates.email_change_verify_body.title",
-    "translation": "You updated your email"
+    "translation": "您已更新电子邮件地址"
   },
   {
     "id": "api.templates.email_change_verify_subject",
-    "translation": "Verify new email address for {{.TeamDisplayName}}"
+    "translation": "验证在 {{.TeamDisplayName}} 上的新电子邮件地址"
   },
   {
     "id": "api.templates.email_footer",
-    "translation": "To change your notification preferences, log in to your team site and go to Account Settings > Notifications."
+    "translation": "要更改您的通知偏好设定，登录到您的团队站点后至帐号设置 > 通知。"
   },
   {
     "id": "api.templates.email_info",
-    "translation": "Any questions at all, mail us any time: <a href='mailto:{{.SupportEmail}}' style='text-decoration: none; color:#2389D7;'>{{.SupportEmail}}</a>.<br>Best wishes,<br>The {{.SiteName}} Team<br>"
+    "translation": "有任何问题请随时给我们发送电子邮件: <a href='mailto:{{.SupportEmail}}' style='text-decoration: none; color:#2389D7;'>{{.SupportEmail}}</a>.<br>最美好的祝福,<br> {{.SiteName}} 团队<br>"
   },
   {
     "id": "api.templates.email_organization",
-    "translation": "Sent by "
+    "translation": "发送人 "
   },
   {
     "id": "api.templates.error.link",
-    "translation": "Go back to Mattermost"
+    "translation": "返回到Mattermost"
   },
   {
     "id": "api.templates.error.title",
-    "translation": "{{ .SiteName }} needs your help:"
+    "translation": "{{ .SiteName }} 需要你的帮助："
   },
   {
     "id": "api.templates.find_teams_body.found",
-    "translation": "Your request to find teams associated with your email found the following:"
+    "translation": "查找跟您电子邮件有关的团队如下："
   },
   {
     "id": "api.templates.find_teams_body.not_found",
-    "translation": "We could not find any teams for the given email."
+    "translation": "我们没找从提供的电子邮件找到任何团队。"
   },
   {
     "id": "api.templates.find_teams_body.title",
-    "translation": "Finding teams"
+    "translation": "查找团队"
   },
   {
     "id": "api.templates.find_teams_subject",
-    "translation": "Your {{ .SiteName }} Teams"
+    "translation": "你在 {{ .SiteName }} 的团队"
   },
   {
     "id": "api.templates.invite_body.button",
-    "translation": "Join Team"
+    "translation": "加入团队"
   },
   {
     "id": "api.templates.invite_body.extra_info",
-    "translation": "Mattermost lets you share messages and files from your PC or phone, with instant search and archiving. After you’ve joined <strong>{{.TeamDisplayName}}</strong>, you can sign-in to your new team and access these features anytime from the web address:<br/><br/><a href='{{.TeamURL}}'>{{.TeamURL}}</a>"
+    "translation": "Mattermost允许您通过电脑、电话分享消息和文件，即时查找和归档. 当你加入 <strong>{{.TeamDisplayName}}</strong>后, 你可以登录到你的新团队，并在任何时候从网络地址访问这些功能:<br/><br/><a href='{{.TeamURL}}'>{{.TeamURL}}</a>"
   },
   {
     "id": "api.templates.invite_body.info",
-    "translation": "The team {{.SenderStatus}} <strong>{{.SenderName}}</strong>, has invited you to join <strong>{{.TeamDisplayName}}</strong>."
+    "translation": "团队 {{.SenderStatus}} <strong>{{.SenderName}}</strong>，邀请您加入 <strong>{{.TeamDisplayName}}</strong>。"
   },
   {
     "id": "api.templates.invite_body.title",
-    "translation": "You've been invited"
+    "translation": "您已经被邀请"
   },
   {
     "id": "api.templates.invite_subject",
-    "translation": "{{ .SenderName }} invited you to join {{ .TeamDisplayName }} Team on {{.SiteName}}"
+    "translation": "{{ .SenderName }} 邀请您加入 {{ .TeamDisplayName }} 团队在 {{.SiteName}}"
   },
   {
     "id": "api.templates.password_change_body.info",
-    "translation": "Your password has been updated for {{.TeamDisplayName}} on {{ .TeamURL }} by {{.Method}}.<br>If this change wasn't initiated by you, please contact your system administrator."
+    "translation": "您的密码已经被更新 {{.TeamDisplayName}} 在 {{ .TeamURL }} 通过 {{.Method}}.<br>如果这个变更不是由你发起的，请联系你的系统管理员."
   },
   {
     "id": "api.templates.password_change_body.title",
-    "translation": "Your password has been updated"
+    "translation": "您更新了您的密码"
   },
   {
     "id": "api.templates.password_change_subject",
-    "translation": "Your password has been updated for {{.TeamDisplayName}} on {{ .SiteName }}"
+    "translation": "您的密码已经被更新 {{.TeamDisplayName}} 在 {{ .SiteName }}"
   },
   {
     "id": "api.templates.post_body.button",
-    "translation": "Go To Post"
+    "translation": "转至发文"
   },
   {
     "id": "api.templates.post_body.info",
-    "translation": "CHANNEL: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
+    "translation": "频道: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
   },
   {
     "id": "api.templates.post_subject_in_channel",
-    "translation": "{{.SubjectText}} in {{.TeamDisplayName}} ({{.ChannelName}}) on {{.Month}} {{.Day}}, {{.Year}}"
+    "translation": "{{.SubjectText}} 在 {{.TeamDisplayName}} ({{.ChannelName}}) 于 {{.Month}} {{.Day}}, {{.Year}}"
   },
   {
     "id": "api.templates.post_subject_in_direct_message",
-    "translation": "{{.SubjectText}} in {{.TeamDisplayName}} from {{.SenderDisplayName}} on {{.Month}} {{.Day}}, {{.Year}}"
+    "translation": "{{.SubjectText}} 在 {{.TeamDisplayName}} 来自 {{.SenderDisplayName}} 于 {{.Month}} {{.Day}}, {{.Year}}"
   },
   {
     "id": "api.templates.reset_body.button",
-    "translation": "Reset Password"
+    "translation": "重设密码"
   },
   {
     "id": "api.templates.reset_body.info",
-    "translation": "To change your password, click \"Reset Password\" below.<br>If you did not mean to reset your password, please ignore this email and your password will remain the same. The password reset link expires in 24 hours."
+    "translation": "修改您的密码, 点击 \"重设密码\" 下面.<br>如果你不打算重置您的密码，请忽略此电子邮件和您的密码将保持不变。密码重置链接在24小时内到期."
   },
   {
     "id": "api.templates.reset_body.title",
-    "translation": "You requested a password reset"
+    "translation": "您请求密码重设"
   },
   {
     "id": "api.templates.reset_subject",
-    "translation": "Reset your password"
+    "translation": "重设您的密码"
   },
   {
     "id": "api.templates.signin_change_email.body.method_email",
-    "translation": "email and password"
+    "translation": "邮箱和密码"
   },
   {
     "id": "api.templates.signin_change_email.body.title",
-    "translation": "You updated your sign-in method"
+    "translation": "您更新了您的登录方式"
   },
   {
     "id": "api.templates.signup_team_body.button",
-    "translation": "Set up your team"
+    "translation": "设置您的团队"
   },
   {
     "id": "api.templates.signup_team_body.info",
-    "translation": "{{ .SiteName }} is one place for all your team communication, searchable and available anywhere.<br>You'll get more out of {{ .SiteName }} when your team is in constant communication--let's get them on board."
+    "translation": "{{ .SiteName }} 是所有团队沟通的一个地方, 可在任何地方搜索和有效.<br>您会得到更多的 {{ .SiteName }} 当您的团队在不断沟通--在看板上获取."
   },
   {
     "id": "api.templates.signup_team_body.title",
-    "translation": "Thanks for creating a team!"
+    "translation": "感谢创造一个团队！"
   },
   {
     "id": "api.templates.signup_team_subject",
-    "translation": "{{ .SiteName }} Team Setup"
+    "translation": "{{ .SiteName }} 团队设置"
   },
   {
     "id": "api.templates.singin_change_email.body.info",
-    "translation": "You updated your sign-in method on {{ .SiteName }} to {{.Method}}.<br>If this change wasn't initiated by you, please contact your system administrator."
+    "translation": "您在 {{.SiteName}} 更新了登录方式为 {{.Method}}。<br>如果这个变更不是由您发起的，请联系您的系统管理员。"
   },
   {
     "id": "api.templates.singin_change_email.subject",
-    "translation": "You updated your sign-in method on {{ .SiteName }}"
+    "translation": "你已经更新您的登录方法{{ .SiteName }}"
   },
   {
     "id": "api.templates.upgrade_30_body.info",
-    "translation": "<h3 style='font-weight: normal; margin-top: 10px;'>YOUR DUPLICATE ACCOUNTS HAVE BEEN UPDATED</h3>Your Mattermost server is being upgraded to Version 3.0, which lets you use a single account across multiple teams.<br/><br/>You are receiving this email because the upgrade process has detected your account had the same email or username as other accounts on the server.<br/><br/>The following updates have been made: <br/><br/>{{if .EmailChanged }}- The duplicate email of an account on the `/{{.TeamName}}` team was changed to `{{.Email}}`. You will need to use email and password to login, you can use this new email address for login.<br/><br/>{{end}}{{if .UsernameChanged }}- The duplicate username of an account on the team site `/{{.TeamName}}` has been changed to `{{.Username}}` to avoid confusion with other accounts.<br/><br/>{{end}} RECOMMENDED ACTION: <br/><br/>It is recommended that you login to your teams used by your duplicate accounts and add your primary account to the team and any public channels and private groups which you wish to continue using. <br/><br/>This gives your primary account access to all public channel and private group history. You can continue to access the direct message history of your duplicate accounts by logging in with their credentials. <br/><br/>FOR MORE INFORMATION: <br/><br/>For more information on the upgrade to Mattermost 3.0 please see: <a href='http://www.mattermost.org/upgrading-to-mattermost-3-0/'>http://www.mattermost.org/upgrading-to-mattermost-3-0/</a><br/><br/>"
+    "translation": "<h3 style='font-weight: normal; margin-top: 10px;'>您的多重帐号已更新</h3>您的 Mattermost 伺服器正在升级到版本 3.0，从此您可以在多个团队中使用同一个帐号。<br/><br/>您收到此邮件因为升级过程中发现您的邮箱地址或用户名和另外个帐号重复。<br/><br/>改动如下：<br/><br/>{{if .EmailChanged }}- 在 `/{{.TeamName}}` 团队中重复电子邮件已改为 `{{.Email}}`。你可以使用此新的电子邮件地址和密码登入。<br/><br/>{{end}}{{if .UsernameChanged }}- 在 `/{{.TeamName}}` 团队中重复用户名已改为 `{{.Username}}` 亿避免与其他帐号混淆。<br/><br/>{{end}} 建议操作： <br/><br/>建议您登入重复帐号的团队并将主帐号添加到想继续使用的团队，公开频道以及私有群组。<br/><br/>这样您可以用主帐号访问所有公开频道以及私有群组的历史。您可以继续登入重复帐号来获取私信历史。<br/><br/>更多咨询： <br/><br/>关于更多升级到 Mattermost 3.0 的相关咨询，请参见：<a href='http://www.mattermost.org/upgrading-to-mattermost-3-0/'>http://www.mattermost.org/upgrading-to-mattermost-3-0/</a><br/><br/>"
   },
   {
     "id": "api.templates.upgrade_30_subject.info",
-    "translation": "[MATTERMOST] Changes to your account for Mattermost 3.0 Upgrade"
+    "translation": "[MATTERMOST]更改你的账号，以便升级到3.0"
   },
   {
     "id": "api.templates.username_change_body.info",
-    "translation": "Your username for {{.TeamDisplayName}} has been changed to {{.NewUsername}}.<br>If you did not make this change, please contact the system administrator."
+    "translation": "您在 {{.TeamDisplayName}} 的用户名已更改为 {{.NewUsername}}。<br>如果这个变更不是由您发起的，请联系系统管理员。"
   },
   {
     "id": "api.templates.username_change_body.title",
-    "translation": "You updated your username"
+    "translation": "您更新了您的用户名"
   },
   {
     "id": "api.templates.username_change_subject",
-    "translation": "Your username has changed for {{.TeamDisplayName}}"
+    "translation": "您在 {{.TeamDisplayName}} 的用户名已更改"
   },
   {
     "id": "api.templates.verify_body.button",
-    "translation": "Verify Email"
+    "translation": "验证邮箱"
   },
   {
     "id": "api.templates.verify_body.info",
-    "translation": "Please verify your email address by clicking below."
+    "translation": "请通过以下链接来验证您的电子邮件地址。"
   },
   {
     "id": "api.templates.verify_body.title",
-    "translation": "You've joined {{ .ServerURL }}"
+    "translation": "您已加入 {{ .ServerURL }}"
   },
   {
     "id": "api.templates.verify_subject",
-    "translation": "[{{ .SiteName }}] Email Verification"
+    "translation": "[{{ .SiteName }}] 电子邮件地址验证"
   },
   {
     "id": "api.templates.welcome_body.app_download_info",
-    "translation": "For the best experience, download the apps for PC, Mac, iOS and Android from:"
+    "translation": "为了更好的体验，请下载 PC、Mac、iOS、安卓平台应用："
   },
   {
     "id": "api.templates.welcome_body.button",
-    "translation": "Verify Email"
+    "translation": "验证邮箱"
   },
   {
     "id": "api.templates.welcome_body.info",
-    "translation": "Please verify your email address by clicking below."
+    "translation": "请通过以下链接来验证您的电子邮件地址。"
   },
   {
     "id": "api.templates.welcome_body.info2",
-    "translation": "You can sign in from:"
+    "translation": "你可以登入从："
   },
   {
     "id": "api.templates.welcome_body.info3",
-    "translation": "Mattermost lets you share messages and files from your PC or phone, with instant search and archiving."
+    "translation": "Mattermost允许您通过PC或手机分享信息和文件，即时搜索和归档."
   },
   {
     "id": "api.templates.welcome_body.title",
-    "translation": "You've joined {{ .ServerURL }}"
+    "translation": "您已加入 {{ .ServerURL }}"
   },
   {
     "id": "api.templates.welcome_subject",
-    "translation": "You joined {{ .ServerURL }}"
+    "translation": "您已加入 {{ .ServerURL }}"
   },
   {
     "id": "api.user.activate_mfa.email_and_ldap_only.app_error",
-    "translation": "MFA is not available for this account type"
+    "translation": "此帐户类型不支持多重验证"
   },
   {
     "id": "api.user.add_direct_channels_and_forget.failed.error",
-    "translation": "Failed to add direct channel preferences for user user_id=%s, team_id=%s, err=%v"
+    "translation": "添加用户私聊频道偏好设置失败 user_id=%s, team_id=%s, err=%v"
   },
   {
     "id": "api.user.authorize_oauth_user.bad_response.app_error",
-    "translation": "Bad response from token request"
+    "translation": "令牌请求得到错误的回复"
   },
   {
     "id": "api.user.authorize_oauth_user.bad_token.app_error",
-    "translation": "Bad token type"
+    "translation": "错误的令牌类型"
   },
   {
     "id": "api.user.authorize_oauth_user.invalid_state.app_error",
-    "translation": "Invalid state"
+    "translation": "无效状态"
   },
   {
     "id": "api.user.authorize_oauth_user.invalid_state_team.app_error",
-    "translation": "Invalid state; missing team name"
+    "translation": "无效状态; 缺少团队名称"
   },
   {
     "id": "api.user.authorize_oauth_user.missing.app_error",
-    "translation": "Missing access token"
+    "translation": "缺少访问令牌"
   },
   {
     "id": "api.user.authorize_oauth_user.service.app_error",
-    "translation": "Token request to {{.Service}} failed"
+    "translation": "令牌请求到 {{.Service}} 失败"
   },
   {
     "id": "api.user.authorize_oauth_user.token_failed.app_error",
-    "translation": "Token request failed"
+    "translation": "令牌请求失败"
   },
   {
     "id": "api.user.authorize_oauth_user.unsupported.app_error",
-    "translation": "Unsupported OAuth service provider"
+    "translation": "不支持的认证服务商"
   },
   {
     "id": "api.user.check_user_login_attempts.too_many.app_error",
-    "translation": "Your account is locked because of too many failed password attempts. Please reset your password."
+    "translation": "您的账号因为多次的密码尝试而被锁定。请重设您的密码。"
   },
   {
     "id": "api.user.check_user_mfa.bad_code.app_error",
-    "translation": "Invalid MFA token."
+    "translation": "无效的多重验证令牌。"
   },
   {
     "id": "api.user.check_user_mfa.not_available.app_error",
-    "translation": "MFA is not configured or supported on this server"
+    "translation": "此服务器没有配置或者不支持多重验证"
   },
   {
     "id": "api.user.check_user_password.invalid.app_error",
-    "translation": "Login failed because of invalid password"
+    "translation": "无效密码登录失败"
   },
   {
     "id": "api.user.complete_switch_with_oauth.blank_email.app_error",
-    "translation": "Blank email"
+    "translation": "空白电子邮件"
   },
   {
     "id": "api.user.complete_switch_with_oauth.parse.app_error",
-    "translation": "Could not parse auth data out of {{.Service}} user object"
+    "translation": "无法解析数据验证 {{.Service}} 用户对象"
   },
   {
     "id": "api.user.complete_switch_with_oauth.unavailable.app_error",
-    "translation": "{{.Service}} SSO through OAuth 2.0 not available on this server"
+    "translation": "本服务器不支持通过OAuth 2.0的{{.Service}} SSO"
   },
   {
     "id": "api.user.create_oauth_user.already_attached.app_error",
-    "translation": "There is already an account associated with that email address using a sign in method other than {{.Service}}. Please sign in using {{.Auth}}."
+    "translation": "已经有一个电子邮件帐号使用了不同于{{.Service}}的方法进行登录。请使用{{.Auth}}进行登录。"
   },
   {
     "id": "api.user.create_oauth_user.already_used.app_error",
-    "translation": "This {{.Service}} account has already been used to sign up"
+    "translation": "这个{{.Service}}账号已经使用"
   },
   {
     "id": "api.user.create_oauth_user.create.app_error",
-    "translation": "Could not create user out of {{.Service}} user object"
+    "translation": "无法创建用户 {{.Service}} 用户对象"
   },
   {
     "id": "api.user.create_oauth_user.not_available.app_error",
-    "translation": "{{.Service}} SSO through OAuth 2.0 not available on this server"
+    "translation": "本服务器不支持通过OAuth 2.0的{{.Service}} SSO"
   },
   {
     "id": "api.user.create_profile_image.default_font.app_error",
-    "translation": "Could not create default profile image font"
+    "translation": "无法创建默认配置文件的字体"
   },
   {
     "id": "api.user.create_profile_image.encode.app_error",
-    "translation": "Could not encode default profile image"
+    "translation": "无法编码默认配置文件"
   },
   {
     "id": "api.user.create_profile_image.initial.app_error",
-    "translation": "Could not add user initial to default profile picture"
+    "translation": "不能添加用户初始默认配置文件"
   },
   {
     "id": "api.user.create_user.accepted_domain.app_error",
-    "translation": "The email you provided does not belong to an accepted domain. Please contact your administrator or sign up with a different email."
+    "translation": "您提供的电子邮件不属于允许的域名。请与您的管理员联系或使用一个不同的电子邮件注册。"
   },
   {
     "id": "api.user.create_user.joining.error",
-    "translation": "Encountered an issue joining default channels user_id=%s, team_id=%s, err=%v"
+    "translation": "加入默认通道遇到一个问题 user_id=%s, team_id=%s, err=%v"
   },
   {
     "id": "api.user.create_user.no_open_server",
-    "translation": "This server does not allow open signups.  Please speak with your Administrator to receive an invitation."
+    "translation": "这个服务员不允许注册。请与管理员联系，获取邀请。"
   },
   {
     "id": "api.user.create_user.save.error",
-    "translation": "Couldn't save the user err=%v"
+    "translation": "无法保存这个用户 err=%v"
   },
   {
     "id": "api.user.create_user.signup_email_disabled.app_error",
-    "translation": "User sign-up with email is disabled."
+    "translation": "已停用电子邮件注册。"
   },
   {
     "id": "api.user.create_user.signup_link_expired.app_error",
-    "translation": "The signup link has expired"
+    "translation": "注册连接已经失效"
   },
   {
     "id": "api.user.create_user.signup_link_invalid.app_error",
-    "translation": "The signup link does not appear to be valid"
+    "translation": "注册链接无效"
   },
   {
     "id": "api.user.create_user.team_name.app_error",
-    "translation": "Invalid team name"
+    "translation": "无效团队名称"
   },
   {
     "id": "api.user.create_user.tutorial.error",
-    "translation": "Encountered error saving tutorial preference, err=%v"
+    "translation": "保存偏好设置指南出错, err=%v"
   },
   {
     "id": "api.user.create_user.verified.error",
-    "translation": "Failed to set email verified err=%v"
+    "translation": "未能设置电子邮件验证 err=%v"
   },
   {
     "id": "api.user.email_to_ldap.not_available.app_error",
-    "translation": "AD/LDAP not available on this server"
+    "translation": "AD/LDAP 在本服务器上不可用"
   },
   {
     "id": "api.user.generate_mfa_qr.not_available.app_error",
-    "translation": "MFA not configured or available on this server"
+    "translation": "此服务器没有配置或者不支持多重验证"
   },
   {
     "id": "api.user.get_authorization_code.unsupported.app_error",
-    "translation": "Unsupported OAuth service provider"
+    "translation": "不支持的 OAuth 服务商"
   },
   {
     "id": "api.user.get_me.getting.error",
-    "translation": "Error in getting users profile for id=%v forcing logout"
+    "translation": "获取用户配置文件中的错误 id=%v 强制注销"
   },
   {
     "id": "api.user.init.debug",
-    "translation": "Initializing user api routes"
+    "translation": "初始化用户api路由"
   },
   {
     "id": "api.user.ldap_to_email.not_available.app_error",
-    "translation": "AD/LDAP not available on this server"
+    "translation": "AD/LDAP 在本服务器上不可用"
   },
   {
     "id": "api.user.ldap_to_email.not_ldap_account.app_error",
-    "translation": "This user account does not use AD/LDAP"
+    "translation": "此账户没有使用 AD/LDAP"
   },
   {
     "id": "api.user.login.blank_pwd.app_error",
-    "translation": "Password field must not be blank"
+    "translation": "密码字段不能为空白"
   },
   {
     "id": "api.user.login.inactive.app_error",
-    "translation": "Login failed because your account has been set to inactive.  Please contact an administrator."
+    "translation": "您的帐号因被停用而登入失败。请联系系统管理员。"
   },
   {
     "id": "api.user.login.invalid_credentials",
-    "translation": "User ID or password incorrect."
+    "translation": "用户ID或密码错误。"
   },
   {
     "id": "api.user.login.not_provided.app_error",
-    "translation": "Either user id or team name and user email must be provided"
+    "translation": "必须提供用户id或团队名称和用户电子邮件"
   },
   {
     "id": "api.user.login.not_verified.app_error",
-    "translation": "Login failed because email address has not been verified"
+    "translation": "登录失败，因为电子邮件地址没有被验证"
   },
   {
     "id": "api.user.login.revoking.app_error",
-    "translation": "Revoking sessionId=%v for userId=%v re-login with same device Id"
+    "translation": "撤销 sessionId=%v 为 userId=%v 同一个设备id重登陆"
   },
   {
     "id": "api.user.login.use_auth_service.app_error",
-    "translation": "Please sign in using {{.AuthService}}"
+    "translation": "请使用 {{.AuthService}} 登录"
   },
   {
     "id": "api.user.login_by_oauth.not_available.app_error",
-    "translation": "{{.Service}} SSO through OAuth 2.0 not available on this server"
+    "translation": "本服务器不支持通过OAuth 2.0的{{.Service}} SSO"
   },
   {
     "id": "api.user.login_by_oauth.parse.app_error",
-    "translation": "Could not parse auth data out of {{.Service}} user object"
+    "translation": "无法解析数据验证 {{.Service}} 用户对象"
   },
   {
     "id": "api.user.login_ldap.blank_pwd.app_error",
-    "translation": "Password field must not be blank"
+    "translation": "密码字段不能为空白"
   },
   {
     "id": "api.user.login_ldap.disabled.app_error",
-    "translation": "AD/LDAP not enabled on this server"
+    "translation": "AD/LDAP 未在本服务器上不开启"
   },
   {
     "id": "api.user.login_ldap.need_id.app_error",
-    "translation": "Need an ID"
+    "translation": "需要ID"
   },
   {
     "id": "api.user.login_ldap.not_available.app_error",
-    "translation": "AD/LDAP not available on this server"
+    "translation": "AD/LDAP 在本服务器上不可用"
   },
   {
     "id": "api.user.oauth_to_email.context.app_error",
-    "translation": "Update password failed because context user_id did not match provided user's id"
+    "translation": "更新密码失败因为 user_id 不匹配用户ID"
   },
   {
     "id": "api.user.permanent_delete_user.attempting.warn",
-    "translation": "Attempting to permanently delete account %v id=%v"
+    "translation": "试图永久删除帐户 %v id=%v"
   },
   {
     "id": "api.user.permanent_delete_user.deleted.warn",
-    "translation": "Permanently deleted account %v id=%v"
+    "translation": "永久删除帐户 %v id=%v"
   },
   {
     "id": "api.user.permanent_delete_user.system_admin.warn",
-    "translation": "You are deleting %v that is a system administrator.  You may need to set another account as the system administrator using the command line tools."
+    "translation": "你在删除系统管理员 %v。您可能需要使用命令行工具设置另一个帐户作为系统管理员。"
   },
   {
     "id": "api.user.reset_password.invalid_link.app_error",
-    "translation": "The reset password link does not appear to be valid"
+    "translation": "重置密码链接不显示有效"
   },
   {
     "id": "api.user.reset_password.link_expired.app_error",
-    "translation": "The password reset link has expired"
+    "translation": "密码重置链接已过期"
   },
   {
     "id": "api.user.reset_password.method",
-    "translation": "using a reset password link"
+    "translation": "使用重置密码链接"
   },
   {
     "id": "api.user.reset_password.sso.app_error",
-    "translation": "Cannot reset password for SSO accounts"
+    "translation": "不能重置SSO账户密码"
   },
   {
     "id": "api.user.reset_password.wrong_team.app_error",
-    "translation": "Trying to reset password for user on wrong team."
+    "translation": "试图在错误的团队上重置密码。"
   },
   {
     "id": "api.user.saml.not_available.app_error",
-    "translation": "SAML is not configured or supported on this server."
+    "translation": "此服务器没有正确配置或者不支持 SAML。"
   },
   {
     "id": "api.user.send_email_change_email_and_forget.error",
-    "translation": "Failed to send email change notification email successfully err=%v"
+    "translation": "未能发送电子邮件通知电子邮件成功 err=%v"
   },
   {
     "id": "api.user.send_email_change_username_and_forget.error",
-    "translation": "Failed to send username change notification email successfully err=%v"
+    "translation": "未能发送用户名更改通知邮件 err=%v"
   },
   {
     "id": "api.user.send_email_change_verify_email_and_forget.error",
-    "translation": "Failed to send email change verification email successfully err=%v"
+    "translation": "未能发送电子邮件更改验证电子邮件成功 err=%v"
   },
   {
     "id": "api.user.send_password_change_email_and_forget.error",
-    "translation": "Failed to send update password email successfully err=%v"
+    "translation": "未能发送更新密码电子邮件成功 err=%v"
   },
   {
     "id": "api.user.send_password_reset.find.app_error",
-    "translation": "We couldn’t find an account with that address."
+    "translation": "我们无法找该地址的帐号。"
   },
   {
     "id": "api.user.send_password_reset.send.app_error",
-    "translation": "Failed to send password reset email successfully"
+    "translation": "未能发送密码重置电子邮件成功"
   },
   {
     "id": "api.user.send_password_reset.sso.app_error",
-    "translation": "Cannot reset password for SSO accounts"
+    "translation": "不能重置SSO账户密码"
   },
   {
     "id": "api.user.send_sign_in_change_email_and_forget.error",
-    "translation": "Failed to send update password email successfully err=%v"
+    "translation": "未能发送更新密码电子邮件成功 err=%v"
   },
   {
     "id": "api.user.send_verify_email_and_forget.failed.error",
-    "translation": "Failed to send verification email successfully err=%v"
+    "translation": "未能发送验证电子邮件成功 err=%v"
   },
   {
     "id": "api.user.send_welcome_email_and_forget.failed.error",
-    "translation": "Failed to send welcome email successfully err=%v"
+    "translation": "未能成功发送欢迎电子邮件 err=%v"
   },
   {
     "id": "api.user.update_active.no_deactivate_ldap.app_error",
-    "translation": "You can not modify the activation status of AD/LDAP accounts. Please modify through the AD/LDAP server."
+    "translation": "您无法修改 AD/LDAP 帐号的激活状态。请到 AD/LDAP 服务器上修改。"
   },
   {
     "id": "api.user.update_active.permissions.app_error",
-    "translation": "You do not have the appropriate permissions"
+    "translation": "您没有对应的权限"
   },
   {
     "id": "api.user.update_mfa.not_available.app_error",
-    "translation": "MFA not configured or available on this server"
+    "translation": "此服务器没有配置或者不支持多重验证"
   },
   {
     "id": "api.user.update_password.context.app_error",
-    "translation": "Update password failed because context user_id did not match props user_id"
+    "translation": "更新密码失败因为 user_id 提供用户ID不匹配"
   },
   {
     "id": "api.user.update_password.failed.app_error",
-    "translation": "Update password failed"
+    "translation": "更新密码失败"
   },
   {
     "id": "api.user.update_password.incorrect.app_error",
-    "translation": "The \"Current Password\" you entered is incorrect. Please check that Caps Lock is off and try again."
+    "translation": "\"当前密码\" 输入有误。请检查大写锁是否关闭后再试一次。"
   },
   {
     "id": "api.user.update_password.menu",
-    "translation": "using the settings menu"
+    "translation": "使用设置菜单"
   },
   {
     "id": "api.user.update_password.oauth.app_error",
-    "translation": "Update password failed because the user is logged in through an OAuth service"
+    "translation": "因为用户登录通过OAuth服务更新密码失败"
   },
   {
     "id": "api.user.update_password.valid_account.app_error",
-    "translation": "Update password failed because we couldn't find a valid account"
+    "translation": "更新密码失败，因为我们无法找到有效的帐户"
   },
   {
     "id": "api.user.update_roles.one_admin.app_error",
-    "translation": "There must be at least one active admin"
+    "translation": "必须至少有一个启用的管理"
   },
   {
     "id": "api.user.update_roles.permissions.app_error",
-    "translation": "You do not have the appropriate permissions"
+    "translation": "您没有合适的权限"
   },
   {
     "id": "api.user.update_roles.system_admin_needed.app_error",
-    "translation": "The system admin role is needed for this action"
+    "translation": "此操作需要系统管理员"
   },
   {
     "id": "api.user.update_roles.system_admin_set.app_error",
-    "translation": "The system admin role can only be set by another system admin"
+    "translation": "系统管理员的角色只能由另一个系统管理员设置"
   },
   {
     "id": "api.user.update_roles.team_admin_needed.app_error",
-    "translation": "The team admin role is needed for this action"
+    "translation": "此操作需要团队系统管理员"
   },
   {
     "id": "api.user.upload_profile_user.array.app_error",
-    "translation": "Empty array under 'image' in request"
+    "translation": "根据“图像”请求的空数组"
   },
   {
     "id": "api.user.upload_profile_user.decode.app_error",
-    "translation": "Could not decode profile image"
+    "translation": "无法解码配置文件"
   },
   {
     "id": "api.user.upload_profile_user.decode_config.app_error",
-    "translation": "Could not decode profile image config."
+    "translation": "无法解码头像设定。"
   },
   {
     "id": "api.user.upload_profile_user.encode.app_error",
-    "translation": "Could not encode profile image"
+    "translation": "无法编码图像"
   },
   {
     "id": "api.user.upload_profile_user.no_file.app_error",
-    "translation": "No file under 'image' in request"
+    "translation": "请求中图像不是文件"
   },
   {
     "id": "api.user.upload_profile_user.open.app_error",
-    "translation": "Could not open image file"
+    "translation": "无法打开图像文件"
   },
   {
     "id": "api.user.upload_profile_user.parse.app_error",
-    "translation": "Could not parse multipart form"
+    "translation": "无法解析多形式表单"
   },
   {
     "id": "api.user.upload_profile_user.storage.app_error",
-    "translation": "Unable to upload file. Image storage is not configured."
+    "translation": "无法上传文件。未配置图像存储。"
   },
   {
     "id": "api.user.upload_profile_user.too_large.app_error",
-    "translation": "Unable to upload profile image. File is too large."
+    "translation": "无法上传头像。文件太大。"
   },
   {
     "id": "api.user.upload_profile_user.upload_profile.app_error",
-    "translation": "Couldn't upload profile image"
+    "translation": "无法上传配置文件"
   },
   {
     "id": "api.user.verify_email.bad_link.app_error",
-    "translation": "Bad verify email link."
+    "translation": "非法确认邮件链接。"
   },
   {
     "id": "api.web_hub.start.stopping.debug",
-    "translation": "stopping %v connections"
+    "translation": "停止 %v 连接"
   },
   {
     "id": "api.web_socket.connect.error",
-    "translation": "websocket connect err: %v"
+    "translation": "websocket连接 err: %v"
   },
   {
     "id": "api.web_socket.connect.upgrade.app_error",
-    "translation": "Failed to upgrade websocket connection"
+    "translation": "未能升级WebSocket连接"
   },
   {
     "id": "api.web_socket.init.debug",
-    "translation": "Initializing web socket api routes"
+    "translation": "初始化Web Socket API路由"
   },
   {
     "id": "api.web_socket_handler.log.error",
-    "translation": "%v:%v seq=%v uid=%v %v [details: %v]"
+    "translation": "%v:%v seq=%v uid=%v %v [详情: %v]"
   },
   {
     "id": "api.web_socket_router.log.error",
-    "translation": "websocket routing error: seq=%v uid=%v %v [details: %v]"
+    "translation": "websocket 路由错误: seq=%v uid=%v %v [详情: %v]"
   },
   {
     "id": "api.web_team_hun.start.debug",
-    "translation": "team hub stopping for teamId=%v"
+    "translation": "团队枢纽停止 teamId=%v"
   },
   {
     "id": "api.webhook.create_incoming.disabled.app_errror",
-    "translation": "Incoming webhooks have been disabled by the system admin."
+    "translation": "传入的webhooks已被系统管理员禁用。"
   },
   {
     "id": "api.webhook.create_outgoing.disabled.app_error",
-    "translation": "Outgoing webhooks have been disabled by the system admin."
+    "translation": "传出的webhooks已被系统管理员禁用。"
   },
   {
     "id": "api.webhook.create_outgoing.intersect.app_error",
-    "translation": "Outgoing webhooks from the same channel cannot have the same trigger words/callback URLs."
+    "translation": "同一频道的传出 webhooks 不能具有同样的触发词/回调URLs。"
   },
   {
     "id": "api.webhook.create_outgoing.not_open.app_error",
-    "translation": "Outgoing webhooks can only be created for public channels."
+    "translation": "只有公共频道可以创建传出 webhooks。"
   },
   {
     "id": "api.webhook.create_outgoing.permissions.app_error",
-    "translation": "Inappropriate permissions to create outcoming webhook."
+    "translation": "没有权限创建对外webhook。"
   },
   {
     "id": "api.webhook.create_outgoing.triggers.app_error",
-    "translation": "Either trigger_words or channel_id must be set"
+    "translation": "无论是trigger_words或channel_id必须设置"
   },
   {
     "id": "api.webhook.delete_incoming.disabled.app_errror",
-    "translation": "Incoming webhooks have been disabled by the system admin."
+    "translation": "传入的webhooks已被系统管理员禁用。"
   },
   {
     "id": "api.webhook.delete_incoming.permissions.app_errror",
-    "translation": "Inappropriate permissions to delete incoming webhook"
+    "translation": "没有权限删除传入的webhook"
   },
   {
     "id": "api.webhook.delete_outgoing.disabled.app_error",
-    "translation": "Outgoing webhooks have been disabled by the system admin."
+    "translation": "传出的webhooks已被系统管理员禁用。"
   },
   {
     "id": "api.webhook.delete_outgoing.permissions.app_error",
-    "translation": "Inappropriate permissions to delete outcoming webhook"
+    "translation": "没有权限删除对外webhook"
   },
   {
     "id": "api.webhook.get_incoming.disabled.app_error",
-    "translation": "Incoming webhooks have been disabled by the system admin."
+    "translation": "传入的webhooks已被系统管理员禁用。"
   },
   {
     "id": "api.webhook.get_outgoing.disabled.app_error",
-    "translation": "Outgoing webhooks have been disabled by the system admin."
+    "translation": "传出的webhooks已被系统管理员禁用。"
   },
   {
     "id": "api.webhook.incoming.debug",
-    "translation": "Incoming webhook received. Content="
+    "translation": "收到传入的webhook。内容="
   },
   {
     "id": "api.webhook.incoming.debug.error",
-    "translation": "Could not read payload of incoming webhook."
+    "translation": "不能读取传入的webhook的负载。"
   },
   {
     "id": "api.webhook.init.debug",
-    "translation": "Initializing webhook api routes"
+    "translation": "初始化webhook api路由"
   },
   {
     "id": "api.webhook.regen_outgoing_token.disabled.app_error",
-    "translation": "Outgoing webhooks have been disabled by the system admin."
+    "translation": "传出的webhooks已被系统管理员禁用。"
   },
   {
     "id": "api.webhook.regen_outgoing_token.permissions.app_error",
-    "translation": "Inappropriate permissions to regenerate outcoming webhook token"
+    "translation": "没有权限重新生成传出webhook令牌"
   },
   {
     "id": "api.websocket_handler.invalid_param.app_error",
-    "translation": "Invalid {{.Name}} parameter"
+    "translation": "无效的参数 {{.Name}}"
   },
   {
     "id": "cli.license.critical",
-    "translation": "Feature requires an enterprise license. Please contact your system administrator about upgrading your enterprise license."
+    "translation": "此功能需要企业授权。请联系您的系统管理员关于升级您的企业许可证。"
   },
   {
     "id": "ent.brand.save_brand_image.decode.app_error",
-    "translation": "Unable to decode image."
+    "translation": "无法解码图像。"
   },
   {
     "id": "ent.brand.save_brand_image.decode_config.app_error",
-    "translation": "Unable to decode image config."
+    "translation": "无法解码图像配置。"
   },
   {
     "id": "ent.brand.save_brand_image.encode.app_error",
-    "translation": "Unable to encode image as PNG."
+    "translation": "无法解码PNG格式图像。"
   },
   {
     "id": "ent.brand.save_brand_image.open.app_error",
-    "translation": "Unable to open the image."
+    "translation": "无法打开图片文件。"
   },
   {
     "id": "ent.brand.save_brand_image.save_image.app_error",
-    "translation": "Unable to save image"
+    "translation": "无法保存图片"
   },
   {
     "id": "ent.brand.save_brand_image.too_large.app_error",
-    "translation": "Unable to open image. Image is too large."
+    "translation": "无法打开图像文件。图像过大。"
   },
   {
     "id": "ent.cluster.config_changed.info",
-    "translation": "Cluster configuration has changed for id=%v.  Attempting to restart cluster service.  To ensure the cluster is configured correctly you should not rely on this restart because we detected a core configuration change."
+    "translation": "id=%v 的机群设定已更改。尝试重启机群服务中。为了确保机群设置正确您不应该依赖此重启因为我们检测到一核心配置改动。"
   },
   {
     "id": "ent.cluster.debug_fail.debug",
-    "translation": "Cluster send failed at `%v` detail=%v, extra=%v, retry number=%v"
+    "translation": "机群发送失败在 `%v` detail=%v, extra=%v, retry number=%v"
   },
   {
     "id": "ent.cluster.final_fail.error",
-    "translation": "Cluster send final fail at `%v` detail=%v, extra=%v, retry number=%v"
+    "translation": "机群发送最终失败在 `%v` detail=%v, extra=%v, retry number=%v"
   },
   {
     "id": "ent.cluster.incompatible.warn",
-    "translation": "Potential incompatible version detected for clustering with %v"
+    "translation": "%v 的机群检测到可能不兼容的版本"
   },
   {
     "id": "ent.cluster.incompatible_config.warn",
-    "translation": "Potential incompatible config detected for clustering with %v"
+    "translation": "%v 的机群检测到可能不兼容的设置"
   },
   {
     "id": "ent.cluster.licence_disable.app_error",
-    "translation": "Clustering functionality disabled by current license. Please contact your system administrator about upgrading your enterprise license."
+    "translation": "当前许可证禁用了机群功能。请联系您的系统管理员关于升级您的企业许可证。"
   },
   {
     "id": "ent.cluster.ping_failed.info",
-    "translation": "Cluster ping failed with hostname=%v on=%v with id=%v"
+    "translation": "机群ping失败 hostname=%v on=%v id=%v"
   },
   {
     "id": "ent.cluster.ping_success.info",
-    "translation": "Cluster ping successful with hostname=%v on=%v with id=%v self=%v"
+    "translation": "机群ping成功 hostname=%v on=%v id=%v self=%v"
   },
   {
     "id": "ent.cluster.save_config.error",
-    "translation": "System Console is set to read-only when High Availability is enabled."
+    "translation": "系统控制台在高可用性开启时设为只读。"
   },
   {
     "id": "ent.cluster.starting.info",
-    "translation": "Cluster internode communication is listening on %v with hostname=%v id=%v"
+    "translation": "机群互连节点通讯以 hostname=%v id=%v 监听在 %v"
   },
   {
     "id": "ent.cluster.stopping.info",
-    "translation": "Cluster internode communication is stopping on %v with hostname=%v id=%v"
+    "translation": "机群互连节点通讯以 hostname=%v id=%v 在 %v 停止中"
   },
   {
     "id": "ent.compliance.licence_disable.app_error",
-    "translation": "Compliance functionality disabled by current license. Please contact your system administrator about upgrading your enterprise license."
+    "translation": "当前许可证禁用了合规功能。请联系您的系统管理员关于升级您的企业许可证。"
   },
   {
     "id": "ent.compliance.run_failed.error",
-    "translation": "Compliance export failed for job '{{.JobName}}' at '{{.FilePath}}'"
+    "translation": "导出合规的'{{.JobName}}'在'{{.FilePath}}'的任务失败"
   },
   {
     "id": "ent.compliance.run_finished.info",
-    "translation": "Compliance export finished for job '{{.JobName}}' exported {{.Count}} records to '{{.FilePath}}'"
+    "translation": "依据'{{.FilePath}}'导出{{.JobName}}'任务导出审核完成了{{.Count}}'。"
   },
   {
     "id": "ent.compliance.run_limit.warning",
-    "translation": "Compliance export warning for job '{{.JobName}}' too many rows returned truncating to 30,000 at '{{.FilePath}}'"
+    "translation": "任务'{{.JobName}}'的导出审核警告：'{{.FilePath}}'过多行返回截断至第30,000行"
   },
   {
     "id": "ent.compliance.run_started.info",
-    "translation": "Compliance export started for job '{{.JobName}}' at '{{.FilePath}}'"
+    "translation": "导出审核自'{{.FilePath}}'的'{{.JobName}}'任务开始"
   },
   {
     "id": "ent.emoji.licence_disable.app_error",
-    "translation": "Custom emoji restrictions disabled by current license. Please contact your system administrator about upgrading your enterprise license."
+    "translation": "当前许可证禁用了自定义表情符。请联系您的系统管理员关于升级您的企业许可证。"
   },
   {
     "id": "ent.ldap.disabled.app_error",
-    "translation": "AD/LDAP disabled or licence does not support AD/LDAP."
+    "translation": "AD/LDAP 已禁用或许可证不支持 AD/LDAP。"
   },
   {
     "id": "ent.ldap.do_login.bind_admin_user.app_error",
-    "translation": "Unable to bind to AD/LDAP server. Check BindUsername and BindPassword."
+    "translation": "无法绑定到 AD/LDAP 服务器。请检查 BindUsername 和 BindPassword。"
   },
   {
     "id": "ent.ldap.do_login.invalid_password.app_error",
-    "translation": "Invalid Password"
+    "translation": "无效的密码"
   },
   {
     "id": "ent.ldap.do_login.licence_disable.app_error",
-    "translation": "AD/LDAP functionality disabled by current license. Please contact your system administrator about upgrading your enterprise license."
+    "translation": "当前许可证无法使用 AD/LDAP 功能，请联系您的系统管理员关于升级您的企业许可证。"
   },
   {
     "id": "ent.ldap.do_login.matched_to_many_users.app_error",
-    "translation": "Username given matches multiple users"
+    "translation": "提供的用户名有多个用户"
   },
   {
     "id": "ent.ldap.do_login.search_ldap_server.app_error",
-    "translation": "Failed to search AD/LDAP server"
+    "translation": "搜索 AD/LDAP 服务器失败"
   },
   {
     "id": "ent.ldap.do_login.unable_to_connect.app_error",
-    "translation": "Unable to connect to AD/LDAP server"
+    "translation": "无法连接到 AD/LDAP 服务"
   },
   {
     "id": "ent.ldap.do_login.unable_to_create_user.app_error",
-    "translation": "Credentials valid but unable to create user."
+    "translation": "凭据有效但无法创建用户。"
   },
   {
     "id": "ent.ldap.do_login.user_filtered.app_error",
-    "translation": "Your AD/LDAP account does not have permission to use this Mattermost server. Please ask your System Administrator to check the AD/LDAP user filter."
+    "translation": "您的 AD/LDAP 账号没有使用此 Mattermost 服务器的权限。请向您的系统管理员询问确认 AD/LDAP 用户过滤器。"
   },
   {
     "id": "ent.ldap.do_login.user_not_registered.app_error",
-    "translation": "User not registered on AD/LDAP server"
+    "translation": "用户没有在 AD/LDAP 服务器注册"
   },
   {
     "id": "ent.ldap.mattermost_user_update",
-    "translation": "Mattermost user was updated by AD/LDAP server."
+    "translation": "Mattermost 用户已被 AD/LDAP 服务器更新。"
   },
   {
     "id": "ent.ldap.syncdone.info",
-    "translation": "AD/LDAP Synchronization completed"
+    "translation": "AD/LDAP 同步完成"
   },
   {
     "id": "ent.ldap.syncronize.get_all.app_error",
-    "translation": "Unable to get all users using AD/LDAP"
+    "translation": "无法使用 AD/LDAP 得到所有用户"
   },
   {
     "id": "ent.ldap.validate_filter.app_error",
-    "translation": "Invalid AD/LDAP Filter"
+    "translation": "无效的 AD/LDAP 筛选器"
   },
   {
     "id": "ent.mfa.activate.authenticate.app_error",
-    "translation": "Error attempting to authenticate MFA token"
+    "translation": "尝试验证多重验证令牌时出现错误"
   },
   {
     "id": "ent.mfa.activate.bad_token.app_error",
-    "translation": "Invalid MFA token"
+    "translation": "无效的多重验证令牌"
   },
   {
     "id": "ent.mfa.activate.save_active.app_erro",
-    "translation": "Unable to update MFA active status for the user"
+    "translation": "无法为用户更新多重验证启用状态"
   },
   {
     "id": "ent.mfa.deactivate.save_active.app_erro",
-    "translation": "Unable to update MFA active status for the user"
+    "translation": "无法为用户更新多重验证启用状态"
   },
   {
     "id": "ent.mfa.deactivate.save_secret.app_error",
-    "translation": "Error clearing the MFA secret"
+    "translation": "清除多重验证密码时出错"
   },
   {
     "id": "ent.mfa.generate_qr_code.create_code.app_error",
-    "translation": "Error generating QR code"
+    "translation": "QR 码生成出错"
   },
   {
     "id": "ent.mfa.generate_qr_code.save_secret.app_error",
-    "translation": "Error saving the MFA secret"
+    "translation": "多重验证密码保存时出错"
   },
   {
     "id": "ent.mfa.license_disable.app_error",
-    "translation": "Your license does not support using multi-factor authentication"
+    "translation": "您的许可证不支持使用多重因素认证"
   },
   {
     "id": "ent.mfa.validate_token.authenticate.app_error",
-    "translation": "Error trying to authenticate MFA token"
+    "translation": "尝试验证多重验证令牌时出现错误"
   },
   {
     "id": "ent.migration.migratetoldap.duplicate_field",
-    "translation": "Unable to migrate AD/LDAP users with specified field. Duplicate entry detected. Please remove all duplcates and try again."
+    "translation": "无法移植拥有制定栏的 AD/LDAP 用户。发现重复条目。请删除所有重复后再试。"
   },
   {
     "id": "ent.migration.migratetoldap.user_not_found",
-    "translation": "Unable to find user on AD/LDAP server: "
+    "translation": "未在 AD/LDAP 服务器上找到用户："
+  },
+  {
+    "id": "ent.saml.attribute.app_error",
+    "translation": "SAML login was unsuccessful because one of the attributes is incorrect. Please contact your System Administrator."
   },
   {
     "id": "ent.saml.build_request.app_error",
-    "translation": "An error occurred while initiating the request to the Identity Provider. Please contact your System Administrator."
+    "translation": "尝试向身份提供商请求时发生错误。请联系您的系统管理员。"
   },
   {
     "id": "ent.saml.build_request.encoding.app_error",
-    "translation": "An error occurred while encoding the request for the Identity Provider. Please contact your System Administrator."
+    "translation": "尝试编码身份提供商请求时发生错误。请联系您的系统管理员。"
   },
   {
     "id": "ent.saml.build_request.encoding_signed.app_error",
-    "translation": "An error occurred while encoding the signed request for the Identity Provider. Please contact your System Administrator."
+    "translation": "尝试编码签名的身份提供商请求时发生错误。请联系您的系统管理员。"
   },
   {
     "id": "ent.saml.configure.app_error",
-    "translation": "An error occurred while configuring SAML Service Provider, err=%v"
+    "translation": "设置SAML服务提供商时发生错误，err=%v"
   },
   {
     "id": "ent.saml.configure.encryption_not_enabled.app_error",
-    "translation": "SAML login was unsuccessful because encryption is not enabled. Please contact your System Administrator."
+    "translation": "SAML登入因加密未开启而失败。请联系您的系统管理员。"
   },
   {
     "id": "ent.saml.configure.load_idp_cert.app_error",
-    "translation": "Identity Provider Public Certificate File was not found. Please contact your System Administrator."
+    "translation": "身份认证提供商公共证书文件没有被发现。请与系统管理员联系。"
   },
   {
     "id": "ent.saml.configure.load_private_key.app_error",
-    "translation": "SAML login was unsuccessful because the Service Provider Private Key was not found. Please contact your System Administrator."
+    "translation": "SAML登录失败，因为服务提供商私钥没有被发现。请与系统管理员联系。"
   },
   {
     "id": "ent.saml.configure.load_public_cert.app_error",
-    "translation": "Service Provider Public Certificate File was not found. Please contact your System Administrator."
+    "translation": "无法找到身份认证提供商公共证书文件。请联系您的系统管理员。"
   },
   {
     "id": "ent.saml.configure.not_encrypted_response.app_error",
-    "translation": "SAML login was unsuccessful as the Identity Provider response is not encrypted. Please contact your System Administrator."
+    "translation": "SAML登录因身份服务提供商回应未加密而失败。请联系您的系统管理员。"
   },
   {
     "id": "ent.saml.do_login.decrypt.app_error",
-    "translation": "SAML login was unsuccessful because an error occurred while decrypting the response from the Identity Provider. Please contact your System Administrator."
+    "translation": "SAML登入因解码身份服务提供商回复发生错误而失败。请联系您的系统管理员。"
   },
   {
     "id": "ent.saml.do_login.empty_response.app_error",
-    "translation": "We received an empty response from the Identity Provider"
+    "translation": "我们收到留一份来自身份提供商的空白请求"
   },
   {
     "id": "ent.saml.do_login.parse.app_error",
-    "translation": "An error occurred while parsing the response from the Identity Provider. Please contact your System Administrator."
+    "translation": "尝试解析身份提供商回复时发生错误。请联系您的系统管理员。"
   },
   {
     "id": "ent.saml.do_login.validate.app_error",
-    "translation": "An error occurred while validating the response from the Identity Provider. Please contact your System Administrator."
+    "translation": "尝试验证身份提供商回复时发生错误。请联系您的系统管理员。"
   },
   {
     "id": "ent.saml.license_disable.app_error",
-    "translation": "Your license does not support SAML authentication."
+    "translation": "您的证书不支持 SAML 验证。"
   },
   {
     "id": "ent.saml.metadata.app_error",
-    "translation": "An error occurred while building Service Provider Metadata."
+    "translation": "创建服务商元数据时发生错误。"
   },
   {
     "id": "ent.saml.service_disable.app_error",
-    "translation": "SAML is not configured or supported on this server."
+    "translation": "本服务器未设定或支持 SAML。"
   },
   {
     "id": "ent.saml.update_saml_user.unable_error",
-    "translation": "Unable to update existing SAML user. Allowing login anyway. err=%v"
+    "translation": "无法更新现有SAML用户。仍允许登入。err=%v"
   },
   {
     "id": "error.generic.link_message",
-    "translation": "Back to Mattermost"
+    "translation": "返回到 Mattermost"
   },
   {
     "id": "error.generic.message",
-    "translation": "An error has occoured."
+    "translation": "出现一个错误。"
   },
   {
     "id": "error.generic.title",
-    "translation": "Error"
+    "translation": "出错"
   },
   {
     "id": "error.not_found.link_message",
-    "translation": "Back to Mattermost"
+    "translation": "返回到Mattermost"
   },
   {
     "id": "error.not_found.message",
-    "translation": "The page you were trying to reach does not exist."
+    "translation": "您试图访问的页面不存在。"
   },
   {
     "id": "error.not_found.title",
-    "translation": "Page not found"
+    "translation": "未找到该页面"
   },
   {
     "id": "leave_team_modal.desc",
-    "translation": "You will be removed from all public channels and private groups.  If the team is private you will not be able to rejoin the team.  Are you sure?"
+    "translation": "您将会从所有公开频道和私有组中移除。如果团队是私有的你将无法再加入。您确定吗？"
   },
   {
     "id": "leave_team_modal.no",
-    "translation": "No"
+    "translation": "不"
   },
   {
     "id": "leave_team_modal.title",
-    "translation": "Leave the team?"
+    "translation": "退出团队？"
   },
   {
     "id": "leave_team_modal.yes",
-    "translation": "Yes"
+    "translation": "是"
   },
   {
     "id": "manaultesting.get_channel_id.no_found.debug",
-    "translation": "Could not find channel: %v, %v possibilites searched"
+    "translation": "找不到频道：%v，已搜索 %v 可能性"
   },
   {
     "id": "manaultesting.get_channel_id.unable.debug",
-    "translation": "Unable to get channels"
+    "translation": "无法获得频道"
   },
   {
     "id": "manaultesting.manual_test.create.info",
-    "translation": "Creating user and team"
+    "translation": "创建用户和团队"
   },
   {
     "id": "manaultesting.manual_test.parse.app_error",
-    "translation": "Unable to parse URL"
+    "translation": "无法解析网址"
   },
   {
     "id": "manaultesting.manual_test.setup.info",
-    "translation": "Setting up for manual test..."
+    "translation": "手动测试的设置..."
   },
   {
     "id": "manaultesting.manual_test.uid.debug",
-    "translation": "No uid in url"
+    "translation": "URL 中没有 UID"
   },
   {
     "id": "manaultesting.test_autolink.info",
-    "translation": "Manual Auto Link Test"
+    "translation": "手动自动连接测试"
   },
   {
     "id": "manaultesting.test_autolink.unable.app_error",
-    "translation": "Unable to get channels"
+    "translation": "无法获得频道"
   },
   {
     "id": "mattermost.bulletin.subject",
-    "translation": "Mattermost Security Bulletin"
+    "translation": "Mattermost 安全公告"
   },
   {
     "id": "mattermost.config_file",
-    "translation": "Loaded config file from %v"
+    "translation": "从 %v 加载配置文件"
   },
   {
     "id": "mattermost.current_version",
-    "translation": "Current version is %v (%v/%v/%v/%v)"
+    "translation": "当前版本是 %v (%v/%v/%v/%v)"
   },
   {
     "id": "mattermost.entreprise_enabled",
-    "translation": "Enterprise Enabled: %v"
+    "translation": "企业启用: %v"
   },
   {
     "id": "mattermost.load_license.find.warn",
-    "translation": "Unable to find active license"
+    "translation": "找不到有效的许可证"
   },
   {
     "id": "mattermost.security_bulletin.error",
-    "translation": "Failed to get security bulletin details"
+    "translation": "未能获得安全公告详细信息"
   },
   {
     "id": "mattermost.security_bulletin_read.error",
-    "translation": "Failed to read security bulletin details"
+    "translation": "未能读取安全公告详细信息"
   },
   {
     "id": "mattermost.security_checks.debug",
-    "translation": "Checking for security update from Mattermost"
+    "translation": "检查 Mattermost 安全更新中"
   },
   {
     "id": "mattermost.security_info.error",
-    "translation": "Failed to get security update information from Mattermost."
+    "translation": "未能从 Mattermost 获得安全更新信息。"
   },
   {
     "id": "mattermost.send_bulletin.info",
-    "translation": "Sending security bulletin for %v to %v"
+    "translation": "发送安全公告从 %v 到 %v"
   },
   {
     "id": "mattermost.system_admins.error",
-    "translation": "Failed to get system admins for security update information from Mattermost."
+    "translation": "未能从Mattermost安全更新信息获取系统管理员。"
   },
   {
     "id": "mattermost.working_dir",
-    "translation": "Current working directory is %v"
+    "translation": "当前工作目录是 %v"
   },
   {
     "id": "model.access.is_valid.access_token.app_error",
-    "translation": "Invalid access token"
+    "translation": "无效的访问令牌"
   },
   {
     "id": "model.access.is_valid.client_id.app_error",
-    "translation": "Invalid client id"
+    "translation": "无效客户端id"
   },
   {
     "id": "model.access.is_valid.redirect_uri.app_error",
-    "translation": "Invalid redirect uri"
+    "translation": "无效重定向uri"
   },
   {
     "id": "model.access.is_valid.refresh_token.app_error",
-    "translation": "Invalid refresh token"
+    "translation": "无效刷新令牌"
   },
   {
     "id": "model.access.is_valid.user_id.app_error",
-    "translation": "Invalid user id"
+    "translation": "无效用户id"
   },
   {
     "id": "model.authorize.is_valid.auth_code.app_error",
-    "translation": "Invalid authorization code"
+    "translation": "无效的授权码"
   },
   {
     "id": "model.authorize.is_valid.client_id.app_error",
-    "translation": "Invalid client id"
+    "translation": "无效客户端id"
   },
   {
     "id": "model.authorize.is_valid.create_at.app_error",
-    "translation": "Create at must be a valid time"
+    "translation": "创建时必须有效时间"
   },
   {
     "id": "model.authorize.is_valid.expires.app_error",
-    "translation": "Expires in must be set"
+    "translation": "过期必须设置"
   },
   {
     "id": "model.authorize.is_valid.redirect_uri.app_error",
-    "translation": "Invalid redirect uri"
+    "translation": "无效重定向uri"
   },
   {
     "id": "model.authorize.is_valid.scope.app_error",
-    "translation": "Invalid scope"
+    "translation": "无效范围"
   },
   {
     "id": "model.authorize.is_valid.state.app_error",
-    "translation": "Invalid state"
+    "translation": "无效状态"
   },
   {
     "id": "model.authorize.is_valid.user_id.app_error",
-    "translation": "Invalid user id"
+    "translation": "无效用户id"
   },
   {
     "id": "model.channel.is_valid.2_or_more.app_error",
-    "translation": "Name must be 2 or more lowercase alphanumeric characters"
+    "translation": "名称必须是2个或以上的小写字母"
   },
   {
     "id": "model.channel.is_valid.create_at.app_error",
-    "translation": "Create at must be a valid time"
+    "translation": "创建时必须是有效时间"
   },
   {
     "id": "model.channel.is_valid.creator_id.app_error",
-    "translation": "Invalid creator id"
+    "translation": "无效创建者id"
   },
   {
     "id": "model.channel.is_valid.display_name.app_error",
-    "translation": "Invalid display name"
+    "translation": "无效显示名"
   },
   {
     "id": "model.channel.is_valid.header.app_error",
-    "translation": "Invalid header"
+    "translation": "无效标题"
   },
   {
     "id": "model.channel.is_valid.id.app_error",
-    "translation": "Invalid Id"
+    "translation": "无效Id"
   },
   {
     "id": "model.channel.is_valid.name.app_error",
-    "translation": "Invalid name"
+    "translation": "无效名称"
   },
   {
     "id": "model.channel.is_valid.purpose.app_error",
-    "translation": "Invalid purpose"
+    "translation": "无效用途"
   },
   {
     "id": "model.channel.is_valid.type.app_error",
-    "translation": "Invalid type"
+    "translation": "无效类型"
   },
   {
     "id": "model.channel.is_valid.update_at.app_error",
-    "translation": "Update at must be a valid time"
+    "translation": "更新时必须是有效时间"
   },
   {
     "id": "model.channel_member.is_valid.channel_id.app_error",
-    "translation": "Invalid channel id"
+    "translation": "无效的频道id"
   },
   {
     "id": "model.channel_member.is_valid.notify_level.app_error",
-    "translation": "Invalid notify level"
+    "translation": "无效通知级别"
   },
   {
     "id": "model.channel_member.is_valid.role.app_error",
-    "translation": "Invalid role"
+    "translation": "无效角色"
   },
   {
     "id": "model.channel_member.is_valid.unread_level.app_error",
-    "translation": "Invalid mark unread level"
+    "translation": "无效的未读标记级别"
   },
   {
     "id": "model.channel_member.is_valid.user_id.app_error",
-    "translation": "Invalid user id"
+    "translation": "无效用户id"
   },
   {
     "id": "model.client.connecting.app_error",
-    "translation": "We encountered an error while connecting to the server"
+    "translation": "在连接到服务器时，我们遇到了一个错误"
   },
   {
     "id": "model.client.create_emoji.emoji.app_error",
-    "translation": "Unable to attach emoji data to request"
+    "translation": "无法附加表情符号数据请求"
   },
   {
     "id": "model.client.create_emoji.image.app_error",
-    "translation": "Unable to attach image to request"
+    "translation": "无法请求附加图像"
   },
   {
     "id": "model.client.create_emoji.writer.app_error",
-    "translation": "Unable to write request"
+    "translation": "无法写入请求"
   },
   {
     "id": "model.client.login.app_error",
-    "translation": "Authentication tokens didn't match"
+    "translation": "认证令牌不匹配"
   },
   {
     "id": "model.command.is_valid.create_at.app_error",
-    "translation": "Create at must be a valid time"
+    "translation": "创建时必须是有效时间"
   },
   {
     "id": "model.command.is_valid.description.app_error",
-    "translation": "Invalid description"
+    "translation": "无效的描述"
   },
   {
     "id": "model.command.is_valid.display_name.app_error",
-    "translation": "Invalid display name"
+    "translation": "无效的显示名称"
   },
   {
     "id": "model.command.is_valid.id.app_error",
-    "translation": "Invalid Id"
+    "translation": "无效Id"
   },
   {
     "id": "model.command.is_valid.method.app_error",
-    "translation": "Invalid Method"
+    "translation": "无效方式"
   },
   {
     "id": "model.command.is_valid.team_id.app_error",
-    "translation": "Invalid team id"
+    "translation": "无效团队id"
   },
   {
     "id": "model.command.is_valid.token.app_error",
-    "translation": "Invalid token"
+    "translation": "无效的令牌"
   },
   {
     "id": "model.command.is_valid.trigger.app_error",
-    "translation": "Invalid trigger"
+    "translation": "无效的触发"
   },
   {
     "id": "model.command.is_valid.update_at.app_error",
-    "translation": "Update at must be a valid time"
+    "translation": "更新时必须是有效时间"
   },
   {
     "id": "model.command.is_valid.url.app_error",
-    "translation": "Invalid url"
+    "translation": "无效url"
   },
   {
     "id": "model.command.is_valid.url_http.app_error",
-    "translation": "Invalid URL. Must be a valid URL and start with http:// or https://"
+    "translation": "无效URL. URL必须以http:// or https://开头"
   },
   {
     "id": "model.command.is_valid.user_id.app_error",
-    "translation": "Invalid user id"
+    "translation": "无效用户id"
   },
   {
     "id": "model.compliance.is_valid.create_at.app_error",
-    "translation": "Create at must be a valid time"
+    "translation": "创建时间必须为有效时间"
   },
   {
     "id": "model.compliance.is_valid.desc.app_error",
-    "translation": "Invalid description"
+    "translation": "无效的描述"
   },
   {
     "id": "model.compliance.is_valid.end_at.app_error",
-    "translation": "To must be a valid time"
+    "translation": "必须是一个有效时间"
   },
   {
     "id": "model.compliance.is_valid.id.app_error",
-    "translation": "Invalid Id"
+    "translation": "无效Id"
   },
   {
     "id": "model.compliance.is_valid.start_at.app_error",
-    "translation": "From must be a valid time"
+    "translation": "必须来自一个有效的时间"
   },
   {
     "id": "model.compliance.is_valid.start_end_at.app_error",
-    "translation": "To must be greater than From"
+    "translation": "必须比From参数大"
   },
   {
     "id": "model.config.is_valid.cluster_email_batching.app_error",
-    "translation": "Unable to enable email batching when clustering is enabled"
+    "translation": "当机群启用时没法启动批量电子邮件"
   },
   {
     "id": "model.config.is_valid.email_batching_buffer_size.app_error",
-    "translation": "Invalid email batching buffer size for email settings.  Must be zero or a positive number."
+    "translation": "无效的批量电子邮件缓存大小设定。必须为零或者正整数。"
   },
   {
     "id": "model.config.is_valid.email_batching_interval.app_error",
-    "translation": "Invalid email batching interval for email settings.  Must be 30 seconds or more."
+    "translation": "无效的批量电子邮件间隔设定。必须至少30秒。"
   },
   {
     "id": "model.config.is_valid.email_reset_salt.app_error",
-    "translation": "Invalid password reset salt for email settings.  Must be 32 chars or more."
+    "translation": "邮箱设定中无效的密码重置盐值。至少32位及以上字符。"
   },
   {
     "id": "model.config.is_valid.email_salt.app_error",
-    "translation": "Invalid invite salt for email settings.  Must be 32 chars or more."
+    "translation": "邮箱设定中无效的邀请盐值。至少32位及以上字符。"
   },
   {
     "id": "model.config.is_valid.email_security.app_error",
-    "translation": "Invalid connection security for email settings.  Must be '', 'TLS', or 'STARTTLS'"
+    "translation": "电子邮件设置的无效连接安全性.  必须 '', 'TLS', 或者 'STARTTLS'"
   },
   {
     "id": "model.config.is_valid.encrypt_sql.app_error",
-    "translation": "Invalid at rest encrypt key for SQL settings.  Must be 32 chars or more."
+    "translation": "无效的SQL加密秘钥设置。至少32位及以上字符。"
   },
   {
     "id": "model.config.is_valid.file_driver.app_error",
-    "translation": "Invalid driver name for file settings.  Must be 'local' or 'amazons3'"
+    "translation": "文件设置中驱动名无效。必须为 'local' 或 'amazons3'"
   },
   {
     "id": "model.config.is_valid.file_preview_height.app_error",
-    "translation": "Invalid preview height for file settings.  Must be zero or a positive number."
+    "translation": "文件设置中文件预览高度无效。必须是0或者正整数。"
   },
   {
     "id": "model.config.is_valid.file_preview_width.app_error",
-    "translation": "Invalid preview width for file settings.  Must be a positive number."
+    "translation": "文件设置中文件预览宽度无效。必须是正整数。"
   },
   {
     "id": "model.config.is_valid.file_profile_height.app_error",
-    "translation": "Invalid profile height for file settings.  Must be a positive number."
+    "translation": "文件设置中个人档案高度无效。必须是正整数。"
   },
   {
     "id": "model.config.is_valid.file_profile_width.app_error",
-    "translation": "Invalid profile width for file settings.  Must be a positive number."
+    "translation": "文件设置中个人档案宽度无效。必须是正整数。"
   },
   {
     "id": "model.config.is_valid.file_salt.app_error",
-    "translation": "Invalid public link salt for file settings.  Must be 32 chars or more."
+    "translation": "文件设置中的公共链接盐无效。必须至少32位字符。"
   },
   {
     "id": "model.config.is_valid.file_thumb_height.app_error",
-    "translation": "Invalid thumbnail height for file settings.  Must be a positive number."
+    "translation": "文件设置中无效的缩略图高度。必须是正数。"
   },
   {
     "id": "model.config.is_valid.file_thumb_width.app_error",
-    "translation": "Invalid thumbnail width for file settings.  Must be a positive number."
+    "translation": "文件设置时缩略图宽度无效。必须是正数。"
   },
   {
     "id": "model.config.is_valid.ldap_basedn",
-    "translation": "AD/LDAP field \"BaseDN\" is required."
+    "translation": "AD/LDAP 栏 \"BaseDN\" 为必须。"
   },
   {
     "id": "model.config.is_valid.ldap_bind_password",
-    "translation": "AD/LDAP field \"Bind Password\" is required."
+    "translation": "AD/LDAP 栏 \"绑定密码\" 为必填。"
   },
   {
     "id": "model.config.is_valid.ldap_bind_username",
-    "translation": "AD/LDAP field \"Bind Username\" is required."
+    "translation": "AD/LDAP 栏 \"绑定用户名\" 为必填。"
   },
   {
     "id": "model.config.is_valid.ldap_email",
-    "translation": "AD/LDAP field \"Email Attribute\" is required."
+    "translation": "AD/LDAP 栏 \"电子邮件\" 为必填。"
   },
   {
     "id": "model.config.is_valid.ldap_firstname",
-    "translation": "AD/LDAP field \"First Name Attribute\" is required."
+    "translation": "AD/LDAP 栏 \"名\" 为必填。"
   },
   {
     "id": "model.config.is_valid.ldap_id",
-    "translation": "AD/LDAP field \"ID Attribute\" is required."
+    "translation": "AD/LDAP 栏 \"ID\" 为必填。"
   },
   {
     "id": "model.config.is_valid.ldap_lastname",
-    "translation": "AD/LDAP field \"Last Name Attribute\" is required."
+    "translation": "AD/LDAP 栏 \"姓氏\" 为必填。"
   },
   {
     "id": "model.config.is_valid.ldap_max_page_size.app_error",
-    "translation": "Invalid max page size value."
+    "translation": "无效的最大页面值。"
   },
   {
     "id": "model.config.is_valid.ldap_required.app_error",
-    "translation": "Required AD/LDAP field missing."
+    "translation": "缺少必需 AD/LDAP 栏。"
   },
   {
     "id": "model.config.is_valid.ldap_required.app_error",
-    "translation": "Required AD/LDAP field missing."
+    "translation": "缺少必需 AD/LDAP 栏。"
   },
   {
     "id": "model.config.is_valid.ldap_security.app_error",
-    "translation": "Invalid connection security for AD/LDAP settings.  Must be '', 'TLS', or 'STARTTLS'"
+    "translation": "无效的 AD/LDAP 安全连接设置，必须是\"TLS\"或者\"STARTTLS\""
   },
   {
     "id": "model.config.is_valid.ldap_server",
-    "translation": "AD/LDAP field \"AD/LDAP Server\" is required."
+    "translation": "AD/LDAP 栏 \"AD/LDAP 服务器\" 为必填。"
   },
   {
     "id": "model.config.is_valid.ldap_sync_interval.app_error",
-    "translation": "Invalid sync interval time. Must be at least one minute."
+    "translation": "无效的同步间隔时间。同步时间必须至少一分钟。"
   },
   {
     "id": "model.config.is_valid.ldap_username",
-    "translation": "AD/LDAP field \"Username Attribute\" is required."
+    "translation": "AD/LDAP 栏 \"用户名\" 为必填。"
   },
   {
     "id": "model.config.is_valid.listen_address.app_error",
-    "translation": "Invalid listen address for service settings Must be set."
+    "translation": "无效的服务设置时监听地址，必须设置此项。"
   },
   {
     "id": "model.config.is_valid.login_attempts.app_error",
-    "translation": "Invalid maximum login attempts for service settings.  Must be a positive number."
+    "translation": "无效的最大尝试登录数服务设置。必须是正整数。"
   },
   {
     "id": "model.config.is_valid.max_file_size.app_error",
-    "translation": "Invalid max file size for file settings. Must be a zero or positive number."
+    "translation": "文件设置中最大大小无效。必须是0或者正整数。"
   },
   {
     "id": "model.config.is_valid.max_users.app_error",
-    "translation": "Invalid maximum users per team for team settings.  Must be a positive number."
+    "translation": "团队设置中每团队的最大用户数无效。必须是正整数。"
   },
   {
     "id": "model.config.is_valid.password_length.app_error",
-    "translation": "Minimum password length must be a whole number greater than or equal to {{.MinLength}} and less than or equal to {{.MaxLength}}."
+    "translation": "最短密码长度必须为整数大于或等于 {{.MinLength}} 以及小于或等于 {{.MaxLength}}。"
   },
   {
     "id": "model.config.is_valid.password_length_max_min.app_error",
-    "translation": "Maximum password length must be greater than or equal to minimum password length."
+    "translation": "密码最大长度必须大于或等于最短长度。"
   },
   {
     "id": "model.config.is_valid.rate_mem.app_error",
-    "translation": "Invalid memory store size for rate limit settings.  Must be a positive number"
+    "translation": "用于速率的内存大小设置无效。必须是正整数"
   },
   {
     "id": "model.config.is_valid.rate_sec.app_error",
-    "translation": "Invalid per sec for rate limit settings.  Must be a positive number"
+    "translation": "速率限制设置无效。必须是正整数"
   },
   {
     "id": "model.config.is_valid.restrict_direct_message.app_error",
-    "translation": "Invalid direct message restriction.  Must be 'any', or 'team'"
+    "translation": "无效的私信限制。必须为 'any' 或 'team'"
   },
   {
     "id": "model.config.is_valid.saml_assertion_consumer_service_url.app_error",
-    "translation": "Service Provider Login URL must be a valid URL and start with http:// or https://."
+    "translation": "服务提供商登入网址必须为有效URL并且以 http:// 或 https:// 开头。"
   },
   {
     "id": "model.config.is_valid.saml_email_attribute.app_error",
-    "translation": "Invalid Email attribute. Must be set."
+    "translation": "无效的电子邮件属性。此属性必须设定。"
   },
   {
     "id": "model.config.is_valid.saml_idp_cert.app_error",
-    "translation": "Identity Provider Public Certificate missing. Did you forget to upload it?"
+    "translation": "找不到身份识别提供商公开凭证。您忘了上传？"
   },
   {
     "id": "model.config.is_valid.saml_idp_descriptor_url.app_error",
-    "translation": "Identity Provider Issuer URL must be a valid URL and start with http:// or https://."
+    "translation": "身份提供商签发网址必须为有效URL并且以 http:// 或 https:// 开头。"
   },
   {
     "id": "model.config.is_valid.saml_idp_url.app_error",
-    "translation": "SAML SSO URL must be a valid URL and start with http:// or https://."
+    "translation": "SAML SSO网址必须为有效URL并且以 http:// 或 https:// 开头。"
   },
   {
     "id": "model.config.is_valid.saml_private_key.app_error",
-    "translation": "Service Provider Private Key missing. Did you forget to upload it?"
+    "translation": "找不到服务提供商私钥。您忘了上传？"
   },
   {
     "id": "model.config.is_valid.saml_public_cert.app_error",
-    "translation": "Service Provider Public Certificate missing. Did you forget to upload it?"
+    "translation": "找不到服务提供商公开凭证。您忘了上传？"
   },
   {
     "id": "model.config.is_valid.saml_username_attribute.app_error",
-    "translation": "Invalid Username attribute. Must be set."
+    "translation": "无效的用户名属性。此属性必须设定。"
   },
   {
     "id": "model.config.is_valid.site_url.app_error",
-    "translation": "Site URL must be a valid URL and start with http:// or https://"
+    "translation": "站点网址必须为有效URL并且以 http:// 或 https:// 开头"
   },
   {
     "id": "model.config.is_valid.site_url_email_batching.app_error",
-    "translation": "Unable to enable email batching when SiteURL isn't set."
+    "translation": "当SiteURL未设置时没法启动批量电子邮件。"
   },
   {
     "id": "model.config.is_valid.sitename_length.app_error",
-    "translation": "Site name must be less than or equal to {{.MaxLength}} characters."
+    "translation": "站点名必须小于或等于 {{.MaxLength}} 个字符。"
   },
   {
     "id": "model.config.is_valid.sql_data_src.app_error",
-    "translation": "Invalid data source for SQL settings.  Must be set."
+    "translation": "SQL 设置中的数据源无效。必须设定。"
   },
   {
     "id": "model.config.is_valid.sql_driver.app_error",
-    "translation": "Invalid driver name for SQL settings.  Must be 'mysql' or 'postgres'"
+    "translation": "SQL 设置中的驱动名无效。必须是 'mysql' 或者 'postgres'"
   },
   {
     "id": "model.config.is_valid.sql_idle.app_error",
-    "translation": "Invalid maximum idle connection for SQL settings.  Must be a positive number."
+    "translation": "SQL 设置中的最大的空闲连接数无效。必须是正整数。"
   },
   {
     "id": "model.config.is_valid.sql_max_conn.app_error",
-    "translation": "Invalid maximum open connection for SQL settings.  Must be a positive number."
+    "translation": "SQL 设置中最大开启连接数无效。必须是正整数。"
   },
   {
     "id": "model.emoji.create_at.app_error",
-    "translation": "Create at must be a valid time"
+    "translation": "创建日期必须为效时间"
   },
   {
     "id": "model.emoji.creator_id.app_error",
-    "translation": "Invalid creator id"
+    "translation": "无效创建者id"
   },
   {
     "id": "model.emoji.id.app_error",
-    "translation": "Invalid emoji id"
+    "translation": "无效的表情符 ID"
   },
   {
     "id": "model.emoji.name.app_error",
-    "translation": "Name must be 1 to 64 lowercase alphanumeric characters"
+    "translation": "名称必须在1至64个的小写英文数字"
   },
   {
     "id": "model.emoji.update_at.app_error",
-    "translation": "Update at must be a valid time"
+    "translation": "更新时必须是有效时间"
   },
   {
     "id": "model.file_info.get.gif.app_error",
-    "translation": "Could not decode gif."
+    "translation": "不能解码gif。"
   },
   {
     "id": "model.incoming_hook.channel_id.app_error",
-    "translation": "Invalid channel id"
+    "translation": "无效的频道id"
   },
   {
     "id": "model.incoming_hook.create_at.app_error",
-    "translation": "Create at must be a valid time"
+    "translation": "创建时必须是有效时间"
   },
   {
     "id": "model.incoming_hook.description.app_error",
-    "translation": "Invalid description"
+    "translation": "无效描述"
   },
   {
     "id": "model.incoming_hook.display_name.app_error",
-    "translation": "Invalid display name"
+    "translation": "无效显示名"
   },
   {
     "id": "model.incoming_hook.id.app_error",
-    "translation": "Invalid Id"
+    "translation": "无效Id"
   },
   {
     "id": "model.incoming_hook.team_id.app_error",
-    "translation": "Invalid team id"
+    "translation": "无效的团队id"
   },
   {
     "id": "model.incoming_hook.update_at.app_error",
-    "translation": "Update at must be a valid time"
+    "translation": "更新时必须是有效时间"
   },
   {
     "id": "model.incoming_hook.user_id.app_error",
-    "translation": "Invalid user id"
+    "translation": "无效用户id"
   },
   {
     "id": "model.oauth.is_valid.app_id.app_error",
-    "translation": "Invalid app id"
+    "translation": "无效应用 id"
   },
   {
     "id": "model.oauth.is_valid.callback.app_error",
-    "translation": "Callback URL must be a valid URL and start with http:// or https://."
+    "translation": "回调网址必须为有效URL并且以 http:// 或 https:// 开头。"
   },
   {
     "id": "model.oauth.is_valid.client_secret.app_error",
-    "translation": "Invalid client secret"
+    "translation": "无效客户端秘钥"
   },
   {
     "id": "model.oauth.is_valid.create_at.app_error",
-    "translation": "Create at must be a valid time"
+    "translation": "创建时必须是有效时间"
   },
   {
     "id": "model.oauth.is_valid.creator_id.app_error",
-    "translation": "Invalid creator id"
+    "translation": "无效创建者id"
   },
   {
     "id": "model.oauth.is_valid.description.app_error",
-    "translation": "Invalid description"
+    "translation": "无效描述"
   },
   {
     "id": "model.oauth.is_valid.homepage.app_error",
-    "translation": "Homepage must be a valid URL and start with http:// or https://."
+    "translation": "首页网址必须为有效URL并且以 http:// 或 https:// 开头。"
   },
   {
     "id": "model.oauth.is_valid.icon_url.app_error",
-    "translation": "Icon URL must be a valid URL and start with http:// or https://."
+    "translation": "图标网址必须为有效URL并且以 http:// 或 https:// 开头。"
   },
   {
     "id": "model.oauth.is_valid.name.app_error",
-    "translation": "Invalid name"
+    "translation": "无效名称"
   },
   {
     "id": "model.oauth.is_valid.update_at.app_error",
-    "translation": "Update at must be a valid time"
+    "translation": "更新时必须是有效时间"
   },
   {
     "id": "model.outgoing_hook.is_valid.callback.app_error",
-    "translation": "Invalid callback urls"
+    "translation": "无效回调网址"
   },
   {
     "id": "model.outgoing_hook.is_valid.channel_id.app_error",
-    "translation": "Invalid channel id"
+    "translation": "无效的频道id"
   },
   {
     "id": "model.outgoing_hook.is_valid.create_at.app_error",
-    "translation": "Create at must be a valid time"
+    "translation": "创建时必须是有效时间"
   },
   {
     "id": "model.outgoing_hook.is_valid.description.app_error",
-    "translation": "Invalid description"
+    "translation": "无效描述"
   },
   {
     "id": "model.outgoing_hook.is_valid.display_name.app_error",
-    "translation": "Invalid display name"
+    "translation": "无效显示名"
   },
   {
     "id": "model.outgoing_hook.is_valid.id.app_error",
-    "translation": "Invalid Id"
+    "translation": "无效Id"
   },
   {
     "id": "model.outgoing_hook.is_valid.team_id.app_error",
-    "translation": "Invalid team id"
+    "translation": "无效团队id"
   },
   {
     "id": "model.outgoing_hook.is_valid.token.app_error",
-    "translation": "Invalid token"
+    "translation": "无效的令牌"
   },
   {
     "id": "model.outgoing_hook.is_valid.trigger_words.app_error",
-    "translation": "Invalid trigger words"
+    "translation": "无效的触发关键词"
   },
   {
     "id": "model.outgoing_hook.is_valid.update_at.app_error",
-    "translation": "Update at must be a valid time"
+    "translation": "更新时必须是有效时间"
   },
   {
     "id": "model.outgoing_hook.is_valid.url.app_error",
-    "translation": "Invalid callback URLs. Each must be a valid URL and start with http:// or https://"
+    "translation": "无效回调urls. 正确的URL必须是以http:// 或者 https://开始"
   },
   {
     "id": "model.outgoing_hook.is_valid.user_id.app_error",
-    "translation": "Invalid user id"
+    "translation": "无效用户id"
   },
   {
     "id": "model.outgoing_hook.is_valid.words.app_error",
-    "translation": "Invalid trigger words"
+    "translation": "无效的触发关键词"
   },
   {
     "id": "model.post.is_valid.channel_id.app_error",
-    "translation": "Invalid channel id"
+    "translation": "无效的频道id"
   },
   {
     "id": "model.post.is_valid.create_at.app_error",
-    "translation": "Create at must be a valid time"
+    "translation": "创建时必须是有效时间"
   },
   {
     "id": "model.post.is_valid.filenames.app_error",
-    "translation": "Invalid filenames"
+    "translation": "无效文件名"
   },
   {
     "id": "model.post.is_valid.hashtags.app_error",
-    "translation": "Invalid hashtags"
+    "translation": "无效标签"
   },
   {
     "id": "model.post.is_valid.id.app_error",
-    "translation": "Invalid Id"
+    "translation": "无效Id"
   },
   {
     "id": "model.post.is_valid.msg.app_error",
-    "translation": "Invalid message"
+    "translation": "无效消息"
   },
   {
     "id": "model.post.is_valid.original_id.app_error",
-    "translation": "Invalid original id"
+    "translation": "无效原始id"
   },
   {
     "id": "model.post.is_valid.parent_id.app_error",
-    "translation": "Invalid parent id"
+    "translation": "无效父id"
   },
   {
     "id": "model.post.is_valid.props.app_error",
-    "translation": "Invalid props"
+    "translation": "无效属性"
   },
   {
     "id": "model.post.is_valid.root_id.app_error",
-    "translation": "Invalid root id"
+    "translation": "无效根id"
   },
   {
     "id": "model.post.is_valid.root_parent.app_error",
-    "translation": "Invalid root id must be set if parent id set"
+    "translation": "如果父id设置必须设置根id,无效的根id"
   },
   {
     "id": "model.post.is_valid.type.app_error",
-    "translation": "Invalid type"
+    "translation": "无效类型"
   },
   {
     "id": "model.post.is_valid.update_at.app_error",
-    "translation": "Update at must be a valid time"
+    "translation": "更新时必须是有效时间"
   },
   {
     "id": "model.post.is_valid.user_id.app_error",
-    "translation": "Invalid user id"
+    "translation": "无效用户id"
   },
   {
     "id": "model.preference.is_valid.category.app_error",
-    "translation": "Invalid category"
+    "translation": "无效分类"
   },
   {
     "id": "model.preference.is_valid.id.app_error",
-    "translation": "Invalid user id"
+    "translation": "无效用户id"
   },
   {
     "id": "model.preference.is_valid.name.app_error",
-    "translation": "Invalid name"
+    "translation": "无效名称"
   },
   {
     "id": "model.preference.is_valid.theme.app_error",
-    "translation": "Invalid theme"
+    "translation": "无效主题"
   },
   {
     "id": "model.preference.is_valid.value.app_error",
-    "translation": "Value is too long"
+    "translation": "值过长"
   },
   {
     "id": "model.team.is_valid.characters.app_error",
-    "translation": "Name must be 4 or more lowercase alphanumeric characters"
+    "translation": "名称必须是4个及以上的小写字母"
   },
   {
     "id": "model.team.is_valid.company.app_error",
-    "translation": "Invalid company name"
+    "translation": "无效的公司名"
   },
   {
     "id": "model.team.is_valid.create_at.app_error",
-    "translation": "Create at must be a valid time"
+    "translation": "创建时必须是有效时间"
   },
   {
     "id": "model.team.is_valid.domains.app_error",
-    "translation": "Invalid allowed domains"
+    "translation": "无效允许域"
   },
   {
     "id": "model.team.is_valid.email.app_error",
-    "translation": "Invalid email"
+    "translation": "无效邮箱"
   },
   {
     "id": "model.team.is_valid.id.app_error",
-    "translation": "Invalid Id"
+    "translation": "无效Id"
   },
   {
     "id": "model.team.is_valid.name.app_error",
-    "translation": "Invalid name"
+    "translation": "无效名称"
   },
   {
     "id": "model.team.is_valid.reserved.app_error",
-    "translation": "This URL is unavailable. Please try another."
+    "translation": "这个网址是不可用。请尝试另一个。"
   },
   {
     "id": "model.team.is_valid.type.app_error",
-    "translation": "Invalid type"
+    "translation": "无效类型"
   },
   {
     "id": "model.team.is_valid.update_at.app_error",
-    "translation": "Update at must be a valid time"
+    "translation": "更新时必须是有效时间"
   },
   {
     "id": "model.team.is_valid.url.app_error",
-    "translation": "Invalid URL Identifier"
+    "translation": "无效的网址标识"
   },
   {
     "id": "model.team_member.is_valid.role.app_error",
-    "translation": "Invalid role"
+    "translation": "无效角色"
   },
   {
     "id": "model.team_member.is_valid.team_id.app_error",
-    "translation": "Invalid team id"
+    "translation": "无效团队id"
   },
   {
     "id": "model.team_member.is_valid.user_id.app_error",
-    "translation": "Invalid user id"
+    "translation": "无效用户id"
   },
   {
     "id": "model.user.is_valid.auth_data.app_error",
-    "translation": "Invalid auth data"
+    "translation": "无效的认证数据"
   },
   {
     "id": "model.user.is_valid.auth_data_pwd.app_error",
-    "translation": "Invalid user, password and auth data cannot both be set"
+    "translation": "无效的用户名，密码和验证数据不能都设置"
   },
   {
     "id": "model.user.is_valid.auth_data_type.app_error",
-    "translation": "Invalid user, auth data must be set with auth type"
+    "translation": "无效的用户，认证数据必须设置认证类型"
   },
   {
     "id": "model.user.is_valid.create_at.app_error",
-    "translation": "Create at must be a valid time"
+    "translation": "创建时必须是有效时间"
   },
   {
     "id": "model.user.is_valid.email.app_error",
-    "translation": "Invalid email"
+    "translation": "无效邮箱"
   },
   {
     "id": "model.user.is_valid.first_name.app_error",
-    "translation": "Invalid first name"
+    "translation": "无效的名字"
   },
   {
     "id": "model.user.is_valid.id.app_error",
-    "translation": "Invalid user id"
+    "translation": "无效用户id"
   },
   {
     "id": "model.user.is_valid.last_name.app_error",
-    "translation": "Invalid last name"
+    "translation": "无效的姓氏"
   },
   {
     "id": "model.user.is_valid.nickname.app_error",
-    "translation": "Invalid nickname"
+    "translation": "无效的昵称"
   },
   {
     "id": "model.user.is_valid.pwd.app_error",
-    "translation": "Your password must contain at least {{.Min}} characters."
+    "translation": "你的密码需要至少 {{.Min}} 字符。"
   },
   {
     "id": "model.user.is_valid.pwd_lowercase.app_error",
-    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter."
+    "translation": "您的密码必须包含至少 {{.Min}} 字符元且至少有一个小写字母。"
   },
   {
     "id": "model.user.is_valid.pwd_lowercase_number.app_error",
-    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter and at least one number."
+    "translation": "您的密码必须包含至少 {{.Min}} 个字符且至少有一个小写字母以及一个数字。"
   },
   {
     "id": "model.user.is_valid.pwd_lowercase_number_symbol.app_error",
-    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\")."
+    "translation": "您的密码必须包含至少 {{.Min}} 个字符且至少有一个小写字母，一个数字，以及一个符号（如\"~!@#$%^&*()\"）。"
   },
   {
     "id": "model.user.is_valid.pwd_lowercase_symbol.app_error",
-    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter and at least one symbol (e.g. \"~!@#$%^&*()\")."
+    "translation": "您的密码必须包含至少 {{.Min}} 个字符且至少有一个小写字母以及一个符号（如\"~!@#$%^&*()\"）。"
   },
   {
     "id": "model.user.is_valid.pwd_lowercase_uppercase.app_error",
-    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter and at least one uppercase letter."
+    "translation": "您的密码必须包含至少 {{.Min}} 个字符且至少有一个小写字母以及一个大写字母。"
   },
   {
     "id": "model.user.is_valid.pwd_lowercase_uppercase_number.app_error",
-    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter, at least one uppercase letter, and at least one number."
+    "translation": "您的密码必须包含至少 {{.Min}} 个字符且至少有一个小写字母，一个大写字母，以及一个数字。"
   },
   {
     "id": "model.user.is_valid.pwd_lowercase_uppercase_number_symbol.app_error",
-    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter, at least one uppercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\")."
+    "translation": "您的密码必须包含至少 {{.Min}} 个字符且至少有一个小写字母，一个大写字母，一个数字，以及一个符号（如\"~!@#$%^&*()\"）。"
   },
   {
     "id": "model.user.is_valid.pwd_lowercase_uppercase_symbol.app_error",
-    "translation": "Your password must contain at least {{.Min}} characters made up of at least one lowercase letter, at least one uppercase letter, and at least one symbol (e.g. \"~!@#$%^&*()\")."
+    "translation": "您的密码必须包含至少 {{.Min}} 个字符且至少有一个小写字母，一个大写字母，以及一个符号（如\"~!@#$%^&*()\"）。"
   },
   {
     "id": "model.user.is_valid.pwd_number.app_error",
-    "translation": "Your password must contain at least {{.Min}} characters made up of at least one number."
+    "translation": "您的密码必须包含至少 {{.Min}} 个字符且至少有一个数字。"
   },
   {
     "id": "model.user.is_valid.pwd_number_symbol.app_error",
-    "translation": "Your password must contain at least {{.Min}} characters made up of at least one number and at least one symbol (e.g. \"~!@#$%^&*()\")."
+    "translation": "您的密码必须包含至少 {{.Min}} 个字符且至少有一个数字以及一个符号（如\"~!@#$%^&*()\"）。"
   },
   {
     "id": "model.user.is_valid.pwd_symbol.app_error",
-    "translation": "Your password must contain at least {{.Min}} characters made up of at least one symbol (e.g. \"~!@#$%^&*()\")."
+    "translation": "您的密码必须包含至少 {{.Min}} 个字符且至少有一个符号（如\"~!@#$%^&*()\"）。"
   },
   {
     "id": "model.user.is_valid.pwd_uppercase.app_error",
-    "translation": "Your password must contain at least {{.Min}} characters made up of at least one uppercase letter."
+    "translation": "您的密码必须包含至少 {{.Min}} 个字符且至少有一个大写字母。"
   },
   {
     "id": "model.user.is_valid.pwd_uppercase_number.app_error",
-    "translation": "Your password must contain at least {{.Min}} characters made up of at least one uppercase letter and at least one number."
+    "translation": "您的密码必须包含至少 {{.Min}} 个字符且至少有一个大写字母以及一个数字。"
   },
   {
     "id": "model.user.is_valid.pwd_uppercase_number_symbol.app_error",
-    "translation": "Your password must contain at least {{.Min}} characters made up of at least one uppercase letter, at least one number, and at least one symbol (e.g. \"~!@#$%^&*()\")."
+    "translation": "您的密码必须包含至少 {{.Min}} 个字符且至少有一个大写字母，一个数字，以及一个符号（如\"~!@#$%^&*()\"）。"
   },
   {
     "id": "model.user.is_valid.pwd_uppercase_symbol.app_error",
-    "translation": "Your password must contain at least {{.Min}} characters made up of at least one uppercase letter and at least one symbol (e.g. \"~!@#$%^&*()\")."
+    "translation": "您的密码必须包含至少 {{.Min}} 个字元且至少有一个大写字母以及一个符号（如\"~!@#$%^&*()\"）。"
   },
   {
     "id": "model.user.is_valid.team_id.app_error",
-    "translation": "Invalid team id"
+    "translation": "无效团队id"
   },
   {
     "id": "model.user.is_valid.update_at.app_error",
-    "translation": "Update at must be a valid time"
+    "translation": "更新时必须是有效时间"
   },
   {
     "id": "model.user.is_valid.username.app_error",
-    "translation": "Invalid username"
+    "translation": "无效用户名"
   },
   {
     "id": "model.utils.decode_json.app_error",
-    "translation": "could not decode"
+    "translation": "无法解码"
   },
   {
     "id": "store.sql.alter_column_type.critical",
-    "translation": "Failed to alter column type %v"
+    "translation": "栏目类型%v修改失败"
   },
   {
     "id": "store.sql.check_index.critical",
-    "translation": "Failed to check index %v"
+    "translation": "检查索引失败 %v"
   },
   {
     "id": "store.sql.closing.info",
-    "translation": "Closing SqlStore"
+    "translation": "关闭 SqlStore"
   },
   {
     "id": "store.sql.column_exists.critical",
-    "translation": "Failed to check if column exists %v"
+    "translation": "未能检查列是否存在 %v"
   },
   {
     "id": "store.sql.column_exists_missing_driver.critical",
-    "translation": "Failed to check if column exists because of missing driver"
+    "translation": "未能检查因为缺少驱动程序列是否存在"
   },
   {
     "id": "store.sql.convert_encrypt_string_map",
-    "translation": "FromDb: Unable to convert EncryptStringMap to *string"
+    "translation": "来自数据库：不能从 EncryptStringMap 转换到 *string"
   },
   {
     "id": "store.sql.convert_string_array",
-    "translation": "FromDb: Unable to convert StringArray to *string"
+    "translation": "来自数据库：不能从 StringArray 转换到 *string"
   },
   {
     "id": "store.sql.convert_string_interface",
-    "translation": "FromDb: Unable to convert StringInterface to *string"
+    "translation": "来自数据库：不能从 StringInterface 转换到 *string"
   },
   {
     "id": "store.sql.convert_string_map",
-    "translation": "FromDb: Unable to convert StringMap to *string"
+    "translation": "来自数据库：不能从 StringMap 转换到 *string"
   },
   {
     "id": "store.sql.create_column.critical",
-    "translation": "Failed to create column %v"
+    "translation": "创建列 %v 失败"
   },
   {
     "id": "store.sql.create_column_missing_driver.critical",
-    "translation": "Failed to create column because of missing driver"
+    "translation": "未能创建列，因为缺少驱动程序"
   },
   {
     "id": "store.sql.create_index.critical",
-    "translation": "Failed to create index %v"
+    "translation": "创建索引失败 %v"
   },
   {
     "id": "store.sql.create_index_missing_driver.critical",
-    "translation": "Failed to create index because of missing driver"
+    "translation": "未能创建索引，因为缺少驱动程序"
   },
   {
     "id": "store.sql.creating_tables.critical",
-    "translation": "Error creating database tables: %v"
+    "translation": "创建数据库表出错：%v"
   },
   {
     "id": "store.sql.dialect_driver.critical",
-    "translation": "Failed to create dialect specific driver"
+    "translation": "创建方言专用驱动程序失败"
   },
   {
     "id": "store.sql.dialect_driver.panic",
-    "translation": "Failed to create dialect specific driver %v"
+    "translation": "创建方言专用驱动程序失败 %v"
   },
   {
     "id": "store.sql.drop_column.critical",
-    "translation": "Failed to drop column %v"
+    "translation": "未能删除列 %v"
   },
   {
     "id": "store.sql.incorrect_mac",
-    "translation": "Incorrect MAC for the given ciphertext"
+    "translation": "对于给定的密文不正确的MAC"
   },
   {
     "id": "store.sql.maxlength_column.critical",
-    "translation": "Failed to get max length of column %v"
+    "translation": "未能获取列的最大长度%v"
   },
   {
     "id": "store.sql.open_conn.critical",
-    "translation": "Failed to open sql connection to err:%v"
+    "translation": "打开数据库连接失败 err:%v"
   },
   {
     "id": "store.sql.open_conn.panic",
-    "translation": "Failed to open sql connection %v"
+    "translation": "打开数据库连接失败 %v"
   },
   {
     "id": "store.sql.ping.critical",
-    "translation": "Failed to ping db err:%v"
+    "translation": "ping数据库失败 err:%v"
   },
   {
     "id": "store.sql.pinging.info",
-    "translation": "Pinging sql %v database"
+    "translation": "Pinging sql %v 数据库"
   },
   {
     "id": "store.sql.read_replicas_not_licensed.critical",
-    "translation": "More than 1 read replica functionality disabled by current license. Please contact your system administrator about upgrading your enterprise license."
+    "translation": "当前许可证禁止大于1个读取复制。请联系您的系统管理员关于升级您的企业许可证。"
   },
   {
     "id": "store.sql.remove_index.critical",
-    "translation": "Failed to remove index %v"
+    "translation": "删除索引 %v 失败"
   },
   {
     "id": "store.sql.rename_column.critical",
-    "translation": "Failed to rename column %v"
+    "translation": "列重命名失败 %v"
   },
   {
     "id": "store.sql.schema_out_of_date.warn",
-    "translation": "The database schema version of %v appears to be out of date"
+    "translation": "数据库结构版本 %v 似乎过旧"
   },
   {
     "id": "store.sql.schema_set.info",
-    "translation": "The database schema has been set to version %v"
+    "translation": "数据库结构版本设为 %v"
   },
   {
     "id": "store.sql.schema_upgrade_attempt.warn",
-    "translation": "Attempting to upgrade the database schema version to %v"
+    "translation": "试图将数据库结构版本升级到 %v"
   },
   {
     "id": "store.sql.schema_version.critical",
-    "translation": "The database schema version of %v cannot be upgraded.  You must not skip a version."
+    "translation": "数据库结构版本 %v 不能升级。你不能跳过一个版本。"
   },
   {
     "id": "store.sql.short_ciphertext",
-    "translation": "short ciphertext"
+    "translation": "短密文"
   },
   {
     "id": "store.sql.table_column_type.critical",
-    "translation": "Failed to get data type for column %s from table %s: %v"
+    "translation": "未能获得列的数据类型 %s 从表 %s: %v"
   },
   {
     "id": "store.sql.table_exists.critical",
-    "translation": "Failed to check if table exists %v"
+    "translation": "未能检查表是否存在 %v"
   },
   {
     "id": "store.sql.too_short_ciphertext",
-    "translation": "ciphertext too short"
+    "translation": "密文太短"
   },
   {
     "id": "store.sql.upgraded.warn",
-    "translation": "The database schema has been upgraded to version %v"
+    "translation": "数据库模式版本已经升级到 %v"
   },
   {
     "id": "store.sql_audit.get.finding.app_error",
-    "translation": "We encountered an error finding the audits"
+    "translation": "我们查找审计时遇到一个错误"
   },
   {
     "id": "store.sql_audit.get.limit.app_error",
-    "translation": "Limit exceeded for paging"
+    "translation": "已达到分页限制"
   },
   {
     "id": "store.sql_audit.permanent_delete_by_user.app_error",
-    "translation": "We encountered an error deleting the audits"
+    "translation": "我们删除审核时遇到了一个错误"
   },
   {
     "id": "store.sql_audit.save.saving.app_error",
-    "translation": "We encountered an error saving the audit"
+    "translation": "我们保持审核时出错"
   },
   {
     "id": "store.sql_channel.analytics_type_count.app_error",
-    "translation": "We couldn't get channel type counts"
+    "translation": "我们无法获取频道类型数"
   },
   {
     "id": "store.sql_channel.check_open_channel_permissions.app_error",
-    "translation": "We couldn't check the permissions"
+    "translation": "我们不能检查权限"
   },
   {
     "id": "store.sql_channel.check_permissions.app_error",
-    "translation": "We couldn't check the permissions"
+    "translation": "我们不能检查权限"
   },
   {
     "id": "store.sql_channel.check_permissions_by_name.app_error",
-    "translation": "We couldn't check the permissions"
+    "translation": "我们不能检查权限"
   },
   {
     "id": "store.sql_channel.delete.channel.app_error",
-    "translation": "We couldn't delete the channel"
+    "translation": "我们无法删除频道"
   },
   {
     "id": "store.sql_channel.extra_updated.app_error",
-    "translation": "Problem updating members last updated time"
+    "translation": "更新成员上次更新时间出现问题"
   },
   {
     "id": "store.sql_channel.get.existing.app_error",
-    "translation": "We couldn't find the existing channel"
+    "translation": "我们找不到现有的频道"
   },
   {
     "id": "store.sql_channel.get.find.app_error",
-    "translation": "We encountered an error finding the channel"
+    "translation": "我们查找该频道时遇到了一个错误"
   },
   {
     "id": "store.sql_channel.get_all.app_error",
-    "translation": "We couldn't get all the channels"
+    "translation": "我们无法获取所有的频道"
   },
   {
     "id": "store.sql_channel.get_by_name.existing.app_error",
-    "translation": "We couldn't find the existing channel"
+    "translation": "找不到现有的频道"
   },
   {
     "id": "store.sql_channel.get_by_name.missing.app_error",
-    "translation": "Channel does not exist"
+    "translation": "频道不存在"
   },
   {
     "id": "store.sql_channel.get_channel_counts.get.app_error",
-    "translation": "We couldn't get the channel counts"
+    "translation": "我们无法获取频道数"
   },
   {
     "id": "store.sql_channel.get_channels.get.app_error",
-    "translation": "We couldn't get the channels"
+    "translation": "我们无法获取频道"
   },
   {
     "id": "store.sql_channel.get_channels.not_found.app_error",
-    "translation": "No channels were found"
+    "translation": "没有找到频道"
   },
   {
     "id": "store.sql_channel.get_extra_members.app_error",
-    "translation": "We couldn't get the extra info for channel members"
+    "translation": "我们无法获得额外的信息频道成员"
   },
   {
     "id": "store.sql_channel.get_member.app_error",
-    "translation": "We couldn't get the channel member"
+    "translation": "我们无法获得该频道成员"
   },
   {
     "id": "store.sql_channel.get_member.missing.app_error",
-    "translation": "No channel member found for that user id and channel id"
+    "translation": "无法找到与此用户id和频道id相关联的频道成员"
   },
   {
     "id": "store.sql_channel.get_member_count.app_error",
-    "translation": "We couldn't get the channel member count"
+    "translation": "我们无法获得该频道成员数"
   },
   {
     "id": "store.sql_channel.get_members.app_error",
-    "translation": "We couldn't get the channel members"
+    "translation": "我们无法获得该频道成员"
   },
   {
     "id": "store.sql_channel.get_more_channels.get.app_error",
-    "translation": "We couldn't get the channels"
+    "translation": "我们无法获得该频道"
   },
   {
     "id": "store.sql_channel.increment_mention_count.app_error",
-    "translation": "We couldn't increment the mention count"
+    "translation": "我们不能增加提及数"
   },
   {
     "id": "store.sql_channel.permanent_delete_by_team.app_error",
-    "translation": "We couldn't delete the channels"
+    "translation": "我们无法删除频道"
   },
   {
     "id": "store.sql_channel.permanent_delete_members_by_user.app_error",
-    "translation": "We couldn't remove the channel member"
+    "translation": "我们无法删除频道成员"
   },
   {
     "id": "store.sql_channel.remove_member.app_error",
-    "translation": "We couldn't remove the channel member"
+    "translation": "我们无法删除频道成员"
   },
   {
     "id": "store.sql_channel.save.commit_transaction.app_error",
-    "translation": "Unable to commit transaction"
+    "translation": "不能提交事务"
   },
   {
     "id": "store.sql_channel.save.direct_channel.app_error",
-    "translation": "Use SaveDirectChannel to create a direct channel"
+    "translation": "使用 SaveDirectChannel 创建私聊频道"
   },
   {
     "id": "store.sql_channel.save.open_transaction.app_error",
-    "translation": "Unable to open transaction"
+    "translation": "不能打开事务"
   },
   {
     "id": "store.sql_channel.save_channel.current_count.app_error",
-    "translation": "Failed to get current channel count"
+    "translation": "获取当前频道数失败"
   },
   {
     "id": "store.sql_channel.save_channel.existing.app_error",
-    "translation": "Must call update for exisiting channel"
+    "translation": "必须对现有的频道更新"
   },
   {
     "id": "store.sql_channel.save_channel.exists.app_error",
-    "translation": "A channel with that URL already exists"
+    "translation": "已存在使用该 URL 的频道"
   },
   {
     "id": "store.sql_channel.save_channel.limit.app_error",
-    "translation": "You've reached the limit of the number of allowed channels."
+    "translation": "您已经达到了允许的频道数量上限。"
   },
   {
     "id": "store.sql_channel.save_channel.previously.app_error",
-    "translation": "A channel with that URL was previously created"
+    "translation": "先前已创建使用该 URL 的频道"
   },
   {
     "id": "store.sql_channel.save_channel.save.app_error",
-    "translation": "We couldn't save the channel"
+    "translation": "我们无法保存该频道"
   },
   {
     "id": "store.sql_channel.save_direct_channel.add_members.app_error",
-    "translation": "Unable to add direct channel members"
+    "translation": "不能添加私聊频道成员"
   },
   {
     "id": "store.sql_channel.save_direct_channel.commit.app_error",
-    "translation": "Unable to commit transaction"
+    "translation": "不能提交事务"
   },
   {
     "id": "store.sql_channel.save_direct_channel.not_direct.app_error",
-    "translation": "Not a direct channel attempted to be created with SaveDirectChannel"
+    "translation": "不能试图用SaveDirectChannel创建私聊频道"
   },
   {
     "id": "store.sql_channel.save_direct_channel.open_transaction.app_error",
-    "translation": "Unable to open transaction"
+    "translation": "不能开启事务"
   },
   {
     "id": "store.sql_channel.save_member.commit_transaction.app_error",
-    "translation": "Unable to commit transaction"
+    "translation": "不能提交事务"
   },
   {
     "id": "store.sql_channel.save_member.exists.app_error",
-    "translation": "A channel member with that id already exists"
+    "translation": "该频道成员 id 已存在"
   },
   {
     "id": "store.sql_channel.save_member.open_transaction.app_error",
-    "translation": "Unable to open transaction"
+    "translation": "不能开启事务"
   },
   {
     "id": "store.sql_channel.save_member.save.app_error",
-    "translation": "We couldn't save the channel member"
+    "translation": "我们无法保存这个频道成员"
   },
   {
     "id": "store.sql_channel.set_last_viewed_at.app_error",
-    "translation": "We couldn't set the last viewed at time"
+    "translation": "我们不能更新最后查看时间"
   },
   {
     "id": "store.sql_channel.update.app_error",
-    "translation": "We couldn't update the channel"
+    "translation": "我们无法更新这个频道"
   },
   {
     "id": "store.sql_channel.update.exists.app_error",
-    "translation": "A channel with that handle already exists"
+    "translation": "已存在使用该识别名的频道"
   },
   {
     "id": "store.sql_channel.update.previously.app_error",
-    "translation": "A channel with that handle was previously created"
+    "translation": "先前已创建过使用该识别名的频道"
   },
   {
     "id": "store.sql_channel.update.updating.app_error",
-    "translation": "We encountered an error updating the channel"
+    "translation": "我们无法更新这个频道"
   },
   {
     "id": "store.sql_channel.update_last_viewed_at.app_error",
-    "translation": "We couldn't update the last viewed at time"
+    "translation": "我们不能更新最后查看时间"
   },
   {
     "id": "store.sql_channel.update_member.app_error",
-    "translation": "We encountered an error updating the channel member"
+    "translation": "我们更新频道成员遇到了一个错误"
   },
   {
     "id": "store.sql_command.analytics_command_count.app_error",
-    "translation": "We couldn't count the commands"
+    "translation": "我们无法计算指令数量"
   },
   {
     "id": "store.sql_command.save.delete.app_error",
-    "translation": "We couldn't delete the command"
+    "translation": "我们无法删除命令"
   },
   {
     "id": "store.sql_command.save.delete_perm.app_error",
-    "translation": "We couldn't delete the command"
+    "translation": "我们无法删除命令"
   },
   {
     "id": "store.sql_command.save.get.app_error",
-    "translation": "We couldn't get the command"
+    "translation": "我们无法获取这个命令"
   },
   {
     "id": "store.sql_command.save.get_team.app_error",
-    "translation": "We couldn't get the commands"
+    "translation": "我们无法获取这个命令"
   },
   {
     "id": "store.sql_command.save.saving.app_error",
-    "translation": "We couldn't save the Command"
+    "translation": "我们无法保存这个命令"
   },
   {
     "id": "store.sql_command.save.saving_overwrite.app_error",
-    "translation": "You cannot overwrite an existing Command"
+    "translation": "您不能覆盖一个已存在的命令"
   },
   {
     "id": "store.sql_command.save.update.app_error",
-    "translation": "We couldn't update the command"
+    "translation": "我们无法更新这个命令"
   },
   {
     "id": "store.sql_compliance.get.finding.app_error",
-    "translation": "We encountered an error retrieving the compliance reports"
+    "translation": "我们获取合规报告时遇到错误"
   },
   {
     "id": "store.sql_compliance.save.saving.app_error",
-    "translation": "We encountered an error saving the compliance report"
+    "translation": "我们保存合规报告时遇到错误"
   },
   {
     "id": "store.sql_emoji.delete.app_error",
-    "translation": "We couldn't delete the emoji"
+    "translation": "我们无法删除此表情符"
   },
   {
     "id": "store.sql_emoji.delete.no_results",
-    "translation": "We couldn’t find the emoji to delete"
+    "translation": "找不到要删除的表情符号"
   },
   {
     "id": "store.sql_emoji.get.app_error",
-    "translation": "We couldn't get the emoji"
+    "translation": "我们无法获取此表情符"
   },
   {
     "id": "store.sql_emoji.get_all.app_error",
-    "translation": "We couldn't get the emoji"
+    "translation": "我们无法获取此表情符"
   },
   {
     "id": "store.sql_emoji.get_by_name.app_error",
-    "translation": "We couldn't get the emoji"
+    "translation": "我们无法获取此表情符"
   },
   {
     "id": "store.sql_emoji.save.app_error",
-    "translation": "We couldn't save the emoji"
+    "translation": "我们无法保存此表情符"
   },
   {
     "id": "store.sql_license.get.app_error",
-    "translation": "We encountered an error getting the license"
+    "translation": "我们获取许可证时出现一个错误"
   },
   {
     "id": "store.sql_license.get.missing.app_error",
-    "translation": "A license with that ID was not found"
+    "translation": "许可证ID未找到"
   },
   {
     "id": "store.sql_license.save.app_error",
-    "translation": "We encountered an error saving the license"
+    "translation": "我们保存许可证时出现一个错误"
   },
   {
     "id": "store.sql_oauth.delete.commit_transaction.app_error",
-    "translation": "Unable to commit transaction"
+    "translation": "无法提交事务"
   },
   {
     "id": "store.sql_oauth.delete.open_transaction.app_error",
-    "translation": "Unable to open transaction to delete the OAuth2 app"
+    "translation": "无法开启删除 OAuth2 应用事物"
   },
   {
     "id": "store.sql_oauth.delete.rollback_transaction.app_error",
-    "translation": "Unable to rollback transaction to delete the OAuth2 App"
+    "translation": "无法回滚删除 OAuth2 应用事物"
   },
   {
     "id": "store.sql_oauth.delete_app.app_error",
-    "translation": "An error occurred while deleting the OAuth2 App"
+    "translation": "删除 OAuth2 应用时遇到错误"
   },
   {
     "id": "store.sql_oauth.get_access_data.app_error",
-    "translation": "We encountered an error finding the access token"
+    "translation": "我们查找访问令牌时遇到一个错误"
   },
   {
     "id": "store.sql_oauth.get_access_data_by_user_for_app.app_error",
-    "translation": "We encountered an error finding all the access tokens"
+    "translation": "我们查找访问令牌时遇到一个错误"
   },
   {
     "id": "store.sql_oauth.get_app.find.app_error",
-    "translation": "We couldn't find the requested app"
+    "translation": "我们无法查找请求的应用"
   },
   {
     "id": "store.sql_oauth.get_app.finding.app_error",
-    "translation": "We encountered an error finding the app"
+    "translation": "我们查找这个app出现错误"
   },
   {
     "id": "store.sql_oauth.get_app_by_user.find.app_error",
-    "translation": "We couldn't find any existing apps"
+    "translation": "我们无法查找一些存在的apps"
   },
   {
     "id": "store.sql_oauth.get_apps.find.app_error",
-    "translation": "An error occurred while finding the OAuth2 Apps"
+    "translation": "寻找 OAuth2 应用时遇到错误"
   },
   {
     "id": "store.sql_oauth.get_auth_data.find.app_error",
-    "translation": "We couldn't find the existing authorization code"
+    "translation": "我们找不到现有的授权码"
   },
   {
     "id": "store.sql_oauth.get_auth_data.finding.app_error",
-    "translation": "We encountered an error finding the authorization code"
+    "translation": "我们查找授权码遇到了一个错误"
   },
   {
     "id": "store.sql_oauth.get_previous_access_data.app_error",
-    "translation": "We encountered an error finding the access token"
+    "translation": "我们查找访问令牌时遇到一个错误"
   },
   {
     "id": "store.sql_oauth.permanent_delete_auth_data_by_user.app_error",
-    "translation": "We couldn't remove the authorization code"
+    "translation": "我们无法删除授权码"
   },
   {
     "id": "store.sql_oauth.remove_access_data.app_error",
-    "translation": "We couldn't remove the access token"
+    "translation": "我们无法删除这个访问令牌"
   },
   {
     "id": "store.sql_oauth.remove_auth_data.app_error",
-    "translation": "We couldn't remove the authorization code"
+    "translation": "我们无法删除授权码"
   },
   {
     "id": "store.sql_oauth.save_access_data.app_error",
-    "translation": "We couldn't save the access token."
+    "translation": "我们无法保存这个访问令牌。"
   },
   {
     "id": "store.sql_oauth.save_app.existing.app_error",
-    "translation": "Must call update for exisiting app"
+    "translation": "必须更新现有的app"
   },
   {
     "id": "store.sql_oauth.save_app.save.app_error",
-    "translation": "We couldn't save the app."
+    "translation": "我们不能保存这个应用。"
   },
   {
     "id": "store.sql_oauth.save_auth_data.app_error",
-    "translation": "We couldn't save the authorization code."
+    "translation": "我们无法保存授权码。"
   },
   {
     "id": "store.sql_oauth.update_access_data.app_error",
-    "translation": "We encountered an error updating the access token"
+    "translation": "我们更新访问令牌时遇到一个错误"
   },
   {
     "id": "store.sql_oauth.update_app.find.app_error",
-    "translation": "We couldn't find the existing app to update"
+    "translation": "我们找不到现有的app更新"
   },
   {
     "id": "store.sql_oauth.update_app.finding.app_error",
-    "translation": "We encountered an error finding the app"
+    "translation": "我们查找app遇到了一个错误"
   },
   {
     "id": "store.sql_oauth.update_app.update.app_error",
-    "translation": "We couldn't update the app"
+    "translation": "我们不能更新这个app"
   },
   {
     "id": "store.sql_oauth.update_app.updating.app_error",
-    "translation": "We encountered an error updating the app"
+    "translation": "我们更新这个app出现一个错误"
   },
   {
     "id": "store.sql_post.analytics_posts_count.app_error",
-    "translation": "We couldn't get post counts"
+    "translation": "我们无法获取邮件数"
   },
   {
     "id": "store.sql_post.analytics_posts_count_by_day.app_error",
-    "translation": "We couldn't get post counts by day"
+    "translation": "我们无法通过天获取邮件数"
   },
   {
     "id": "store.sql_post.analytics_user_counts_posts_by_day.app_error",
-    "translation": "We couldn't get user counts with posts"
+    "translation": "我们无法通过邮件获取用户数"
   },
   {
     "id": "store.sql_post.delete.app_error",
-    "translation": "We couldn't delete the post"
+    "translation": "我们不能删除这个邮件"
   },
   {
     "id": "store.sql_post.get.app_error",
-    "translation": "We couldn't get the post"
+    "translation": "我们无法获取这个邮件"
   },
   {
     "id": "store.sql_post.get_parents_posts.app_error",
-    "translation": "We couldn't get the parent post for the channel"
+    "translation": "我们无法获取这个频道的父信息"
   },
   {
     "id": "store.sql_post.get_posts.app_error",
-    "translation": "Limit exceeded for paging"
+    "translation": "分页限制"
   },
   {
     "id": "store.sql_post.get_posts_around.get.app_error",
-    "translation": "We couldn't get the posts for the channel"
+    "translation": "我们无法获取这个频道的信息"
   },
   {
     "id": "store.sql_post.get_posts_around.get_parent.app_error",
-    "translation": "We couldn't get the parent posts for the channel"
+    "translation": "我们无法获取这个频道的父信息"
   },
   {
     "id": "store.sql_post.get_posts_since.app_error",
-    "translation": "We couldn't get the posts for the channel"
+    "translation": "我们无法获取这个频道的信息"
   },
   {
     "id": "store.sql_post.get_root_posts.app_error",
-    "translation": "We couldn't get the posts for the channel"
+    "translation": "我们无法获取这个频道的信息"
   },
   {
     "id": "store.sql_post.permanent_delete.app_error",
-    "translation": "We couldn't delete the post"
+    "translation": "我们无法删除这个邮件"
   },
   {
     "id": "store.sql_post.permanent_delete_all_comments_by_user.app_error",
-    "translation": "We couldn't delete the comments for user"
+    "translation": "我们不能删除用户的评论"
   },
   {
     "id": "store.sql_post.permanent_delete_by_user.app_error",
-    "translation": "We couldn't select the posts to delete for the user"
+    "translation": "我们不能为用户选择要删除的信息"
   },
   {
     "id": "store.sql_post.permanent_delete_by_user.too_many.app_error",
-    "translation": "We couldn't select the posts to delete for the user (too many), please re-run"
+    "translation": "我们不能为用户选择要删除的信息（数量太多），请重新运行"
   },
   {
     "id": "store.sql_post.save.app_error",
-    "translation": "We couldn't save the Post"
+    "translation": "我们无法保存这个邮件"
   },
   {
     "id": "store.sql_post.save.existing.app_error",
-    "translation": "You cannot update an existing Post"
+    "translation": "您不能更新一个村庄的邮件"
   },
   {
     "id": "store.sql_post.search.app_error",
-    "translation": "We encountered an error while searching for posts"
+    "translation": "我们在搜索邮件时出现一个错误"
   },
   {
     "id": "store.sql_post.update.app_error",
-    "translation": "We couldn't update the Post"
+    "translation": "我们不能更新这个邮件"
   },
   {
     "id": "store.sql_preference.delete.app_error",
-    "translation": "We encountered an error while deleting preferences"
+    "translation": "我们删除偏好设置时出现错误"
   },
   {
     "id": "store.sql_preference.delete_unused_features.debug",
-    "translation": "Deleting any unused pre-release features"
+    "translation": "删除任何未使用的预发行功能"
   },
   {
     "id": "store.sql_preference.get.app_error",
-    "translation": "We encountered an error while finding preferences"
+    "translation": "我们在查找偏好设置时遇到了一个错误"
   },
   {
     "id": "store.sql_preference.get_all.app_error",
-    "translation": "We encountered an error while finding preferences"
+    "translation": "我们在查找偏好设置时遇到了一个错误"
   },
   {
     "id": "store.sql_preference.get_category.app_error",
-    "translation": "We encountered an error while finding preferences"
+    "translation": "我们在查找偏好设置时遇到了一个错误"
   },
   {
     "id": "store.sql_preference.insert.exists.app_error",
-    "translation": "A preference with that user id, category, and name already exists"
+    "translation": "一个带用户id,分类，名称的偏好设置已经存在"
   },
   {
     "id": "store.sql_preference.insert.save.app_error",
-    "translation": "We couldn't save the preference"
+    "translation": "我们无法保存这个偏好设置We couldn't save the preference"
   },
   {
     "id": "store.sql_preference.is_feature_enabled.app_error",
-    "translation": "We encountered an error while finding a pre release feature preference"
+    "translation": "我们查找一个预发布偏好设置时出现问题"
   },
   {
     "id": "store.sql_preference.permanent_delete_by_user.app_error",
-    "translation": "We encountered an error while deleteing preferences"
+    "translation": "我们删除偏好设置时出现一个错误"
   },
   {
     "id": "store.sql_preference.save.commit_transaction.app_error",
-    "translation": "Unable to commit transaction to save preferences"
+    "translation": "保存偏好设置时无法提交事务"
   },
   {
     "id": "store.sql_preference.save.missing_driver.app_error",
-    "translation": "We encountered an error while updating preferences"
+    "translation": "我们更新偏好设置时出现一个错误"
   },
   {
     "id": "store.sql_preference.save.open_transaction.app_error",
-    "translation": "Unable to open transaction to save preferences"
+    "translation": "保存偏好设置时不能打开事务"
   },
   {
     "id": "store.sql_preference.save.rollback_transaction.app_error",
-    "translation": "Unable to rollback transaction to save preferences"
+    "translation": "保存偏好设置时不能回滚事务"
   },
   {
     "id": "store.sql_preference.save.updating.app_error",
-    "translation": "We encountered an error while updating preferences"
+    "translation": "我们更新偏好设置时出现一个错误"
   },
   {
     "id": "store.sql_preference.update.app_error",
-    "translation": "We couldn't update the preference"
+    "translation": "我们无法更新这个偏好设置"
   },
   {
     "id": "store.sql_session.analytics_session_count.app_error",
-    "translation": "We couldn't count the sessions"
+    "translation": "我们无法计算会话数量"
   },
   {
     "id": "store.sql_session.cleanup_expired_sessions.app_error",
-    "translation": "We encountered an error while deleting expired user sessions"
+    "translation": "我们删除过期用户会话时出错"
   },
   {
     "id": "store.sql_session.get.app_error",
-    "translation": "We encountered an error finding the session"
+    "translation": "我们查找这个会话时出错"
   },
   {
     "id": "store.sql_session.get_sessions.app_error",
-    "translation": "We encountered an error while finding user sessions"
+    "translation": "我们查找用户会话时出错"
   },
   {
     "id": "store.sql_session.get_sessions.error",
-    "translation": "Failed to cleanup sessions in getSessions err=%v"
+    "translation": "清空会话失败 err=%v"
   },
   {
     "id": "store.sql_session.permanent_delete_sessions_by_user.app_error",
-    "translation": "We couldn't remove all the sessions for the user"
+    "translation": "我们无法删除该用户所有的会话"
   },
   {
     "id": "store.sql_session.remove.app_error",
-    "translation": "We couldn't remove the session"
+    "translation": "我们无法删除这个会话"
   },
   {
     "id": "store.sql_session.remove_all_sessions_for_team.app_error",
-    "translation": "We couldn't remove all the sessions"
+    "translation": "我们无法删除所有会话"
   },
   {
     "id": "store.sql_session.save.app_error",
-    "translation": "We couldn't save the session"
+    "translation": "我们无法保存这个会话"
   },
   {
     "id": "store.sql_session.save.cleanup.error",
-    "translation": "Failed to cleanup sessions in Save err=%v"
+    "translation": "保存时清空会话失败 err=%v"
   },
   {
     "id": "store.sql_session.save.existing.app_error",
-    "translation": "Cannot update existing session"
+    "translation": "不能更新现有会话"
   },
   {
     "id": "store.sql_session.update_device_id.app_error",
-    "translation": "We couldn't update the device id"
+    "translation": "我们无法更新这个设备id"
   },
   {
     "id": "store.sql_session.update_last_activity.app_error",
-    "translation": "We couldn't update the last_activity_at"
+    "translation": "我们无法更新 last_activity_at"
   },
   {
     "id": "store.sql_session.update_roles.app_error",
-    "translation": "We couldn't update the roles"
+    "translation": "我们无法更新角色"
   },
   {
     "id": "store.sql_status.get.app_error",
-    "translation": "Encountered an error retrieving the status"
+    "translation": "获取状态时遇到错误"
   },
   {
     "id": "store.sql_status.get.missing.app_error",
-    "translation": "No entry for that status exists"
+    "translation": "该状态没有对应的数据"
   },
   {
     "id": "store.sql_status.get_online.app_error",
-    "translation": "Encountered an error retrieving all the online statuses"
+    "translation": "获取所有在线状态时发生错误"
   },
   {
     "id": "store.sql_status.get_online_away.app_error",
-    "translation": "Encountered an error retrieving all the online/away statuses"
+    "translation": "获取所有在线/离开状态时遇到错误"
   },
   {
     "id": "store.sql_status.get_team_statuses.app_error",
-    "translation": "Encountered an error retrieving all statuses from the team members"
+    "translation": "获取所有团队成员状态时遇到错误"
   },
   {
     "id": "store.sql_status.get_total_active_users_count.app_error",
-    "translation": "We could not count the active users"
+    "translation": "我们无法计算启用的用户数"
   },
   {
     "id": "store.sql_status.reset_all.app_error",
-    "translation": "Encountered an error resetting all the statuses"
+    "translation": "重置所有状态时遇到错误"
   },
   {
     "id": "store.sql_status.save.app_error",
-    "translation": "Encountered an error saving the status"
+    "translation": "保存状态时遇到错误"
   },
   {
     "id": "store.sql_status.update.app_error",
-    "translation": "Encountered an error updating the status"
+    "translation": "更新状态时遇到错误"
   },
   {
     "id": "store.sql_system.get.app_error",
-    "translation": "We encountered an error finding the system properties"
+    "translation": "我们再查找系统属性遇到了一个错误"
   },
   {
     "id": "store.sql_system.get_by_name.app_error",
-    "translation": "We couldn't find the system variable."
+    "translation": "我们找不到该系统变量。"
   },
   {
     "id": "store.sql_system.get_version.app_error",
-    "translation": "We couldn't get the database version"
+    "translation": "我们无法获得数据库版本"
   },
   {
     "id": "store.sql_system.save.app_error",
-    "translation": "We encountered an error saving the system property"
+    "translation": "我们保存系统属性时遇到了一个错误"
   },
   {
     "id": "store.sql_system.update.app_error",
-    "translation": "We encountered an error updating the system property"
+    "translation": "我们更新系统属性时遇到了一个错误"
   },
   {
     "id": "store.sql_team.analytics_team_count.app_error",
-    "translation": "We couldn't count the teams"
+    "translation": "我们无法计算团队数"
   },
   {
     "id": "store.sql_team.get.find.app_error",
-    "translation": "We couldn't find the existing team"
+    "translation": "我们找不到已存在的团队"
   },
   {
     "id": "store.sql_team.get.finding.app_error",
-    "translation": "We encountered an error finding the team"
+    "translation": "我们查找团队时遇到错误"
   },
   {
     "id": "store.sql_team.get_all.app_error",
-    "translation": "We could not get all teams"
+    "translation": "我们无法获取所有的团队"
   },
   {
     "id": "store.sql_team.get_all_team_listing.app_error",
-    "translation": "We could not get all teams"
+    "translation": "我们无法获取所有的团队"
   },
   {
     "id": "store.sql_team.get_by_invite_id.find.app_error",
-    "translation": "We couldn't find the existing team"
+    "translation": "我们无法查找这个存在的团队"
   },
   {
     "id": "store.sql_team.get_by_invite_id.finding.app_error",
-    "translation": "We couldn't find the existing team"
+    "translation": "我们无法查找这个存在的团队"
   },
   {
     "id": "store.sql_team.get_by_name.app_error",
-    "translation": "We couldn't find the existing team"
+    "translation": "我们无法查找这个存在的团队"
   },
   {
     "id": "store.sql_team.get_member.app_error",
-    "translation": "We couldn't get the team member"
+    "translation": "我们无法获得频道成员"
   },
   {
     "id": "store.sql_team.get_member.missing.app_error",
-    "translation": "No team member found for that user id and team id"
+    "translation": "无法找到此用户id和团队id相关联的团队成员"
   },
   {
     "id": "store.sql_team.get_members.app_error",
-    "translation": "We couldn't get the team members"
+    "translation": "我们无法获得频道成员"
   },
   {
     "id": "store.sql_team.get_teams_for_email.app_error",
-    "translation": "We encountered a problem when looking up teams"
+    "translation": "我们查找团队时遇到了一个问题"
   },
   {
     "id": "store.sql_team.permanent_delete.app_error",
-    "translation": "We couldn't delete the existing team"
+    "translation": "我们不能删除现有的团队"
   },
   {
     "id": "store.sql_team.remove_member.app_error",
-    "translation": "We couldn't remove the team member"
+    "translation": "我们无法删除频道成员"
   },
   {
     "id": "store.sql_team.save.app_error",
-    "translation": "We couldn't save the team"
+    "translation": "我们无法保存团队"
   },
   {
     "id": "store.sql_team.save.domain_exists.app_error",
-    "translation": "A team with that domain already exists"
+    "translation": "该网域的团队已存在"
   },
   {
     "id": "store.sql_team.save.existing.app_error",
-    "translation": "Must call update for exisiting team"
+    "translation": "必须对现有的团队执行更新"
   },
   {
     "id": "store.sql_team.save_member.exists.app_error",
-    "translation": "A team member with that id already exists"
+    "translation": "拥有此id的团队成员已存在"
   },
   {
     "id": "store.sql_team.save_member.save.app_error",
-    "translation": "We couldn't save the team member"
+    "translation": "我们无法保存该频道成员"
   },
   {
     "id": "store.sql_team.update.app_error",
-    "translation": "We couldn't update the team"
+    "translation": "我们无法更新该团队"
   },
   {
     "id": "store.sql_team.update.find.app_error",
-    "translation": "We couldn't find the existing team to update"
+    "translation": "我们没找到已存在的团队来更新"
   },
   {
     "id": "store.sql_team.update.finding.app_error",
-    "translation": "We encountered an error finding the team"
+    "translation": "我们查找该团队时遇到一个错误"
   },
   {
     "id": "store.sql_team.update.updating.app_error",
-    "translation": "We encountered an error updating the team"
+    "translation": "我们更新该团队时遇到一个错误"
   },
   {
     "id": "store.sql_team.update_display_name.app_error",
-    "translation": "We couldn't update the team name"
+    "translation": "我们无法更新团队名称"
   },
   {
     "id": "store.sql_user.analytics_unique_user_count.app_error",
-    "translation": "We couldn't get the unique user count"
+    "translation": "我们无法获得不重复的用户数量"
   },
   {
     "id": "store.sql_user.get.app_error",
-    "translation": "We encountered an error finding the account"
+    "translation": "我们查找帐户遇到了一个错误"
   },
   {
     "id": "store.sql_user.get_all_using_auth_service.other.app_error",
-    "translation": "We encountered an error trying to find all the accounts using a specific authentication type."
+    "translation": "我们查找使用特定验证方式的帐号时遇到错误。"
   },
   {
     "id": "store.sql_user.get_by_auth.missing_account.app_error",
-    "translation": "We couldn't find an existing account matching your authentication type for this team. This team may require an invite from the team owner to join."
+    "translation": "我们没找到符合您的验证方式的帐号。此团队或许需要从团队拥有者获得邀请才可加入。"
   },
   {
     "id": "store.sql_user.get_by_auth.other.app_error",
-    "translation": "We encountered an error trying to find the account by authentication type."
+    "translation": "我们在尝试通过身份验证类型找到账户时遇到一个问题。"
   },
   {
     "id": "store.sql_user.get_by_username.app_error",
-    "translation": "We couldn't find an existing account matching your username for this team. This team may require an invite from the team owner to join."
+    "translation": "我们无法在这个团队中找到一个匹配您用户名的现有帐户。此团队或许需要从团队拥有者获得邀请才可加入。"
   },
   {
     "id": "store.sql_user.get_for_login.app_error",
-    "translation": "We couldn't find an existing account matching your credentials. This team may require an invite from the team owner to join."
+    "translation": "我们无法在这个团队中找到一个匹配您帐号的用户。此团队或许需要从团队拥有者获得邀请才可加入。"
   },
   {
     "id": "store.sql_user.get_for_login.multiple_users",
-    "translation": "We found multiple users matching your credentials and were unable to log you in. Please contact an administrator."
+    "translation": "我们发现多个用户的登陆凭据与你匹配，因此禁用了你的登陆权限。请与管理员联系。"
   },
   {
     "id": "store.sql_user.get_profiles.app_error",
-    "translation": "We encountered an error while finding user profiles"
+    "translation": "我们查找用户配置文件遇到了一个错误"
   },
   {
     "id": "store.sql_user.get_sysadmin_profiles.app_error",
-    "translation": "We encountered an error while finding user profiles"
+    "translation": "我们查找用户配置文件遇到了一个错误"
   },
   {
     "id": "store.sql_user.get_total_users_count.app_error",
-    "translation": "We could not count the users"
+    "translation": "我们无法计算用户数"
   },
   {
     "id": "store.sql_user.get_unread_count.app_error",
-    "translation": "We could not get the unread message count for the user"
+    "translation": "我们无法为用户获取到未读信息数量"
   },
   {
     "id": "store.sql_user.get_unread_count_for_channel.app_error",
-    "translation": "We could not get the unread message count for the user and channel"
+    "translation": "我们无法为用户和频道获取未读信息数量"
   },
   {
     "id": "store.sql_user.migrate_theme.critical",
-    "translation": "Failed to migrate User.ThemeProps to Preferences table %v"
+    "translation": "移植 User.ThemeProps 到 Preferences 表 %v 时失败"
   },
   {
     "id": "store.sql_user.missing_account.const",
-    "translation": "We couldn't find an existing account matching your email address for this team. This team may require an invite from the team owner to join."
+    "translation": "我们无法从这个团队找到一个现有匹配您的电子邮件的帐户。此团队或许需要从团队拥有者获得邀请才可加入。"
   },
   {
     "id": "store.sql_user.permanent_delete.app_error",
-    "translation": "We couldn't delete the existing account"
+    "translation": "我们无法删除现有的用户"
   },
   {
     "id": "store.sql_user.save.app_error",
-    "translation": "We couldn't save the account."
+    "translation": "我们无法保存用户。"
   },
   {
     "id": "store.sql_user.save.email_exists.app_error",
-    "translation": "An account with that email already exists."
+    "translation": "已有帐号使用该电子邮件。"
   },
   {
     "id": "store.sql_user.save.email_exists.ldap_app_error",
-    "translation": "This account does not use AD/LDAP authentication. Please sign in using email and password."
+    "translation": "这个账号不使用 AD/LDAP 验证。请使用电子邮件和密码登陆。"
   },
   {
     "id": "store.sql_user.save.email_exists.saml_app_error",
-    "translation": "This account does not use SAML authentication. Please sign in using email and password."
+    "translation": "这个账号不使用LDAP验证。请使用电子邮件和密码登陆。"
   },
   {
     "id": "store.sql_user.save.existing.app_error",
-    "translation": "Must call update for exisiting user"
+    "translation": "必须对现有的用户更新"
   },
   {
     "id": "store.sql_user.save.max_accounts.app_error",
-    "translation": "This team has reached the maximum number of allowed accounts. Contact your systems administrator to set a higher limit."
+    "translation": "这个团队已经达到允许的最大用户数量。请与系统管理员联系以设置更高的限制。"
   },
   {
     "id": "store.sql_user.save.member_count.app_error",
-    "translation": "Failed to get current team member count"
+    "translation": "未能获得当前的团队成员计数"
   },
   {
     "id": "store.sql_user.save.username_exists.app_error",
-    "translation": "An account with that username already exists."
+    "translation": "使用该用户名的账户已存在。"
   },
   {
     "id": "store.sql_user.save.username_exists.ldap_app_error",
-    "translation": "An account with that username already exists. Please contact your Administrator."
+    "translation": "使用此用户名的帐号已经存在。请与您的管理员联系。"
   },
   {
     "id": "store.sql_user.save.username_exists.saml_app_error",
-    "translation": "An account with that username already exists. Please contact your Administrator."
+    "translation": "已有帐号使用该用户名。请联系您的管理员。"
   },
   {
     "id": "store.sql_user.update.app_error",
-    "translation": "We couldn't update the account"
+    "translation": "我们无法更新用户"
   },
   {
     "id": "store.sql_user.update.can_not_change_ldap.app_error",
-    "translation": "Can not change fields set by AD/LDAP"
+    "translation": "无法更改 AD/LDAP 设定的字段"
   },
   {
     "id": "store.sql_user.update.email_taken.app_error",
-    "translation": "This email is already taken. Please choose another."
+    "translation": "该邮箱已被使用。请重新选择。"
   },
   {
     "id": "store.sql_user.update.find.app_error",
-    "translation": "We couldn't find the existing account to update"
+    "translation": "我们没法查找已存在的帐号以更新"
   },
   {
     "id": "store.sql_user.update.finding.app_error",
-    "translation": "We encountered an error finding the account"
+    "translation": "我们查找该用户时遇到一个错误"
   },
   {
     "id": "store.sql_user.update.updating.app_error",
-    "translation": "We encountered an error updating the account"
+    "translation": "我们更新用户时遇到了一个错误"
   },
   {
     "id": "store.sql_user.update.username_taken.app_error",
-    "translation": "This username is already taken. Please choose another."
+    "translation": "这个用户名已被使用。请重新选择。"
   },
   {
     "id": "store.sql_user.update_auth_data.app_error",
-    "translation": "We couldn't update the auth data"
+    "translation": "我们无法更新认证数据"
   },
   {
     "id": "store.sql_user.update_auth_data.email_exists.app_error",
-    "translation": "Unable to switch account to {{.Service}}. An account using the email {{.Email}} already exists."
+    "translation": "不能切换至 {{.Service}}账号。 使用此邮件{{.Email}}的账号已经存在。"
   },
   {
     "id": "store.sql_user.update_failed_pwd_attempts.app_error",
-    "translation": "We couldn't update the failed_attempts"
+    "translation": "我们无法更新 failed_attempts"
   },
   {
     "id": "store.sql_user.update_last_activity.app_error",
-    "translation": "We couldn't update the last_activity_at"
+    "translation": "我们无法更新 last_activity_at"
   },
   {
     "id": "store.sql_user.update_last_picture_update.app_error",
-    "translation": "We couldn't update the update_at"
+    "translation": "我们无法更新 update_at"
   },
   {
     "id": "store.sql_user.update_last_ping.app_error",
-    "translation": "We couldn't update the last_ping_at"
+    "translation": "我们无法更新 last_ping_at"
   },
   {
     "id": "store.sql_user.update_mfa_active.app_error",
-    "translation": "We encountered an error updating the user's MFA active status"
+    "translation": "我们在更新用户的多重验证使用状态时遇到一个错误"
   },
   {
     "id": "store.sql_user.update_mfa_secret.app_error",
-    "translation": "We encountered an error updating the user's MFA secret"
+    "translation": "我们在更新用户的多重验证密码时遇到一个错误"
   },
   {
     "id": "store.sql_user.update_password.app_error",
-    "translation": "We couldn't update the user password"
+    "translation": "我们无法更新用户密码"
   },
   {
     "id": "store.sql_user.verify_email.app_error",
-    "translation": "Unable to update verify email field"
+    "translation": "无法更新验证电子邮件字段"
   },
   {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
-    "translation": "We couldn't count the incoming webhooks"
+    "translation": "我们无法计算传入的 webhooks"
   },
   {
     "id": "store.sql_webhooks.analytics_outgoing_count.app_error",
-    "translation": "We couldn't count the outgoing webhooks"
+    "translation": "我们无法计算传出的 webhooks"
   },
   {
     "id": "store.sql_webhooks.delete_incoming.app_error",
-    "translation": "We couldn't delete the webhook"
+    "translation": "我们无法删除 webhook"
   },
   {
     "id": "store.sql_webhooks.delete_outgoing.app_error",
-    "translation": "We couldn't delete the webhook"
+    "translation": "我们无法删除 webhook"
   },
   {
     "id": "store.sql_webhooks.get_incoming.app_error",
-    "translation": "We couldn't get the webhook"
+    "translation": "我们不能获取 webhook"
   },
   {
     "id": "store.sql_webhooks.get_incoming_by_channel.app_error",
-    "translation": "We couldn't get the webhooks"
+    "translation": "我们不能获取 webhooks"
   },
   {
     "id": "store.sql_webhooks.get_incoming_by_user.app_error",
-    "translation": "We couldn't get the webhook"
+    "translation": "我们不能获取 webhook"
   },
   {
     "id": "store.sql_webhooks.get_outgoing.app_error",
-    "translation": "We couldn't get the webhook"
+    "translation": "我们不能获取 webhook"
   },
   {
     "id": "store.sql_webhooks.get_outgoing_by_channel.app_error",
-    "translation": "We couldn't get the webhooks"
+    "translation": "我们不能获取 webhooks"
   },
   {
     "id": "store.sql_webhooks.get_outgoing_by_team.app_error",
-    "translation": "We couldn't get the webhooks"
+    "translation": "我们不能获取 webhooks"
   },
   {
     "id": "store.sql_webhooks.permanent_delete_incoming_by_user.app_error",
-    "translation": "We couldn't delete the webhook"
+    "translation": "我们无法删除 webhook"
   },
   {
     "id": "store.sql_webhooks.permanent_delete_outgoing_by_user.app_error",
-    "translation": "We couldn't delete the webhook"
+    "translation": "我们无法删除 webhook"
   },
   {
     "id": "store.sql_webhooks.save_incoming.app_error",
-    "translation": "We couldn't save the IncomingWebhook"
+    "translation": "我们不能保存传入的 webhook"
   },
   {
     "id": "store.sql_webhooks.save_incoming.existing.app_error",
-    "translation": "You cannot overwrite an existing IncomingWebhook"
+    "translation": "您不能覆盖现有的传入的 webhook"
   },
   {
     "id": "store.sql_webhooks.save_outgoing.app_error",
-    "translation": "We couldn't save the OutgoingWebhook"
+    "translation": "我们不能保存传出的 webhook"
   },
   {
     "id": "store.sql_webhooks.save_outgoing.override.app_error",
-    "translation": "You cannot overwrite an existing OutgoingWebhook"
+    "translation": "你不能覆盖现有的传出的 webhook"
   },
   {
     "id": "store.sql_webhooks.update_outgoing.app_error",
-    "translation": "We couldn't update the webhook"
+    "translation": "我们不能更新 webhook"
   },
   {
     "id": "system.message.name",
-    "translation": "System"
+    "translation": "系统"
   },
   {
     "id": "utils.config.load_config.decoding.panic",
-    "translation": "Error decoding config file={{.Filename}}, err={{.Error}}"
+    "translation": "解码配置出错 file={{.Filename}}, err={{.Error}}"
   },
   {
     "id": "utils.config.load_config.getting.panic",
-    "translation": "Error getting config info file={{.Filename}}, err={{.Error}}"
+    "translation": "获取配置信息时出错 file={{.Filename}}, err={{.Error}}"
   },
   {
     "id": "utils.config.load_config.opening.panic",
-    "translation": "Error opening config file={{.Filename}}, err={{.Error}}"
+    "translation": "打开配置错误 file={{.Filename}}, err={{.Error}}"
   },
   {
     "id": "utils.config.load_config.validating.panic",
-    "translation": "Error validating config file={{.Filename}}, err={{.Error}}"
+    "translation": "验证配置错误 file={{.Filename}}, err={{.Error}}"
   },
   {
     "id": "utils.config.save_config.saving.app_error",
-    "translation": "An error occurred while saving the file to {{.Filename}}"
+    "translation": "保存文件时出错 {{.Filename}}"
   },
   {
     "id": "utils.diagnostic.analytics_not_found.app_error",
-    "translation": "Analytics not initialized"
+    "translation": "解析未初始化"
   },
   {
     "id": "utils.i18n.loaded",
-    "translation": "Loaded system translations for '%v' from '%v'"
+    "translation": "加载系统翻译 '%v' 从 '%v'"
   },
   {
     "id": "utils.iru.with_evict",
-    "translation": "Must provide a positive size"
+    "translation": "必须提供一个正数大小"
   },
   {
     "id": "utils.license.load_license.invalid.warn",
-    "translation": "No valid enterprise license found"
+    "translation": "未发现有效企业许可证"
   },
   {
     "id": "utils.license.remove_license.unable.error",
-    "translation": "Unable to remove license file, err=%v"
+    "translation": "无法删除许可证文件, err=%v"
   },
   {
     "id": "utils.license.validate_license.decode.error",
-    "translation": "Encountered error decoding license, err=%v"
+    "translation": "解码许可证遇到错误, err=%v"
   },
   {
     "id": "utils.license.validate_license.invalid.error",
-    "translation": "Invalid signature, err=%v"
+    "translation": "无效签名, err=%v"
   },
   {
     "id": "utils.license.validate_license.not_long.error",
-    "translation": "Signed license not long enough"
+    "translation": "签名许可证长度不够"
   },
   {
     "id": "utils.license.validate_license.signing.error",
-    "translation": "Encountered error signing license, err=%v"
+    "translation": "遇到错误签名许可证, err=%v"
   },
   {
     "id": "utils.mail.connect_smtp.open.app_error",
-    "translation": "Failed to open connection"
+    "translation": "打开连接失败"
   },
   {
     "id": "utils.mail.connect_smtp.open_tls.app_error",
-    "translation": "Failed to open TLS connection"
+    "translation": "未能打开TLS连接"
   },
   {
     "id": "utils.mail.new_client.auth.app_error",
-    "translation": "Failed to authenticate on SMTP server"
+    "translation": "无法验证SMTP服务器"
   },
   {
     "id": "utils.mail.new_client.open.error",
-    "translation": "Failed to open a connection to SMTP server %v"
+    "translation": "无法打开一个SMTP服务器连接 %v"
   },
   {
     "id": "utils.mail.send_mail.close.app_error",
-    "translation": "Failed to close connection to SMTP server"
+    "translation": "未能关闭连接到SMTP服务器"
   },
   {
     "id": "utils.mail.send_mail.from_address.app_error",
-    "translation": "Failed to add from email address"
+    "translation": "未能从电子邮件地址添加"
   },
   {
     "id": "utils.mail.send_mail.msg.app_error",
-    "translation": "Failed to write email message"
+    "translation": "写电子邮件失败"
   },
   {
     "id": "utils.mail.send_mail.msg_data.app_error",
-    "translation": "Failed to add email messsage data"
+    "translation": "无法添加电子邮件信息数据"
   },
   {
     "id": "utils.mail.send_mail.sending.debug",
-    "translation": "sending mail to %v with subject of '%v'"
+    "translation": "发送邮件到 %v 主题 '%v'"
   },
   {
     "id": "utils.mail.send_mail.to_address.app_error",
-    "translation": "Failed to add to email address"
+    "translation": "添加邮箱地址失败"
   },
   {
     "id": "utils.mail.test.configured.error",
-    "translation": "SMTP server settings do not appear to be configured properly err=%v details=%v"
+    "translation": "SMTP服务器设置配置错误 err=%v details=%v"
   },
   {
     "id": "utils.mail.test.configured.error",
-    "translation": "SMTP server settings do not appear to be configured properly err=%v details=%v"
+    "translation": "SMTP服务器设置配置错误 err=%v details=%v"
   },
   {
     "id": "web.admin_console.title",
-    "translation": "Admin Console"
+    "translation": "管理控制台"
   },
   {
     "id": "web.authorize_oauth.title",
-    "translation": "Authorize Application"
+    "translation": "授权申请"
   },
   {
     "id": "web.check_browser_compatibility.app_error",
-    "translation": "Your current browser is not supported, please upgrade to one of the following browsers: Google Chrome 21 or higher, Internet Explorer 11 or higher, FireFox 14 or higher, Safari 9 or higher"
+    "translation": "你当前的浏览器不支持, 请升级到下列浏览器之一: Chrome 21及以上, Internet Explorer 11及以上, FireFox 14及以上, Safari 9及以上"
   },
   {
     "id": "web.claim_account.team.error",
-    "translation": "Couldn't find team name=%v, err=%v"
+    "translation": "不能找到团队 name=%v, err=%v"
   },
   {
     "id": "web.claim_account.title",
-    "translation": "Claim Account"
+    "translation": "认领账户"
   },
   {
     "id": "web.claim_account.user.error",
-    "translation": "Couldn't find user teamid=%v, email=%v, err=%v"
+    "translation": "不能找到用户 teamid=%v, email=%v, err=%v"
   },
   {
     "id": "web.create_dir.error",
-    "translation": "Failed to create directory watcher %v"
+    "translation": "创建目录监视器失败 %v"
   },
   {
     "id": "web.dir_fail.error",
-    "translation": "Failed in directory watcher %v"
+    "translation": "目录中的监视器失败 %v"
   },
   {
     "id": "web.do_load_channel.error",
-    "translation": "Error in getting users profile for id=%v forcing logout"
+    "translation": "获取用户配置文件时出错 id=%v 强制注销"
   },
   {
     "id": "web.doc.title",
-    "translation": "Documentation"
+    "translation": "文档"
   },
   {
     "id": "web.email_verified.title",
-    "translation": "Email Verified"
+    "translation": "邮箱验证"
   },
   {
     "id": "web.find_team.title",
-    "translation": "Find Team"
+    "translation": "查找团队"
   },
   {
     "id": "web.header.back",
-    "translation": "Back"
+    "translation": "返回"
   },
   {
     "id": "web.incoming_webhook.channel.app_error",
-    "translation": "Couldn't find the channel"
+    "translation": "找不到该频道"
   },
   {
     "id": "web.incoming_webhook.disabled.app_error",
-    "translation": "Incoming webhooks have been disabled by the system admin."
+    "translation": "传入webhooks已经被系统管理员禁用。"
   },
   {
     "id": "web.incoming_webhook.invalid.app_error",
-    "translation": "Invalid webhook"
+    "translation": "无效webhook"
   },
   {
     "id": "web.incoming_webhook.parse.app_error",
-    "translation": "Unable to parse incoming data"
+    "translation": "无法解析传入数据"
   },
   {
     "id": "web.incoming_webhook.permissions.app_error",
-    "translation": "Inappropriate channel permissions"
+    "translation": "不合适的频道权限"
   },
   {
     "id": "web.incoming_webhook.text.app_error",
-    "translation": "No text specified"
+    "translation": "未指定文本"
   },
   {
     "id": "web.incoming_webhook.user.app_error",
-    "translation": "Couldn't find the user"
+    "translation": "不能找到用户"
   },
   {
     "id": "web.init.debug",
-    "translation": "Initializing web routes"
+    "translation": "初始化web routes"
   },
   {
     "id": "web.login.error",
-    "translation": "Couldn't find team name=%v, err=%v"
+    "translation": "不能找到团队 name=%v, err=%v"
   },
   {
     "id": "web.login.login_title",
-    "translation": "Login"
+    "translation": "登录"
   },
   {
     "id": "web.login_with_oauth.invalid_team.app_error",
-    "translation": "Invalid team name"
+    "translation": "无效团队名称"
   },
   {
     "id": "web.parsing_templates.debug",
-    "translation": "Parsing templates at %v"
+    "translation": "解析模板 %v"
   },
   {
     "id": "web.parsing_templates.error",
-    "translation": "Failed to parse templates %v"
+    "translation": "解析模板失败 %v"
   },
   {
     "id": "web.post_permalink.app_error",
-    "translation": "Invalid Post ID"
+    "translation": "无效Post ID"
   },
   {
     "id": "web.reparse_templates.info",
-    "translation": "Re-parsing templates because of modified file %v"
+    "translation": "修改文件后重新解析模板 %v"
   },
   {
     "id": "web.reset_password.expired_link.app_error",
-    "translation": "The password reset link has expired"
+    "translation": "密码重置链接已过期"
   },
   {
     "id": "web.reset_password.invalid_link.app_error",
-    "translation": "The reset link does not appear to be valid"
+    "translation": "重置链接不会生效"
   },
   {
     "id": "web.root.home_title",
-    "translation": "Home"
+    "translation": "首页"
   },
   {
     "id": "web.root.singup_title",
-    "translation": "Signup"
+    "translation": "注册"
   },
   {
     "id": "web.signup_team_complete.invalid_link.app_error",
-    "translation": "The signup link does not appear to be valid"
+    "translation": "注册链接无效"
   },
   {
     "id": "web.signup_team_complete.link_expired.app_error",
-    "translation": "The signup link has expired"
+    "translation": "注册链接已过期"
   },
   {
     "id": "web.signup_team_complete.title",
-    "translation": "Complete Team Sign Up"
+    "translation": "完成的团队注册"
   },
   {
     "id": "web.signup_team_confirm.title",
-    "translation": "Signup Email Sent"
+    "translation": "注册电子邮件发送"
   },
   {
     "id": "web.signup_user_complete.link_expired.app_error",
-    "translation": "The signup link has expired"
+    "translation": "注册链接已过期"
   },
   {
     "id": "web.signup_user_complete.link_invalid.app_error",
-    "translation": "The signup link does not appear to be valid"
+    "translation": "注册链接无效"
   },
   {
     "id": "web.signup_user_complete.no_invites.app_error",
-    "translation": "The team type doesn't allow open invites"
+    "translation": "团队类型不允许公开邀请"
   },
   {
     "id": "web.signup_user_complete.title",
-    "translation": "Complete User Sign Up"
+    "translation": "完成用户注册"
   },
   {
     "id": "web.singup_with_oauth.invalid_team.app_error",
-    "translation": "Invalid team name"
+    "translation": "无效团队名称"
   },
   {
     "id": "web.watcher_fail.error",
-    "translation": "Failed to add directory to watcher %v"
+    "translation": "无法添加目录给观察者 %v"
   }
 ]
diff --git a/i18n/zh_TW.json b/i18n/zh_TW.json
index 932c20750..2910d9962 100644
--- a/i18n/zh_TW.json
+++ b/i18n/zh_TW.json
@@ -2457,7 +2457,7 @@
   },
   {
     "id": "ent.ldap.disabled.app_error",
-    "translation": "已停用 LDAP 或授權不支援 LDAP。"
+    "translation": "已停用 AD/LDAP 或授權不支援 AD/LDAP。"
   },
   {
     "id": "ent.ldap.do_login.bind_admin_user.app_error",
@@ -2556,6 +2556,10 @@
     "translation": "找不到使用者，AD/LDAP 伺服器："
   },
   {
+    "id": "ent.saml.attribute.app_error",
+    "translation": "SAML login was unsuccessful because one of the attributes is incorrect. Please contact your System Administrator."
+  },
+  {
     "id": "ent.saml.build_request.app_error",
     "translation": "建立與身分識別提供者連接的要求時發生錯誤。請聯繫系統管理員。"
   },