translations PR 20170213 (#5393)

11 files changed, 153 insertions, 85 deletions

diff --git a/i18n/de.json b/i18n/de.json
index 8715d29fc..44ceebcc5 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -217,7 +217,7 @@
   },
   {
     "id": "api.channel.create_direct_channel.invalid_user.app_error",
-    "translation": "Invalid user ID for direct channel creation"
+    "translation": "Ungültige Benutzer-ID für eine Direktnachrichtenkanal Erstellung"
   },
   {
     "id": "api.channel.delete_channel.archived",
@@ -301,11 +301,11 @@
   },
   {
     "id": "api.channel.post_update_channel_displayname_message_and_forget.create_post.error",
-    "translation": "Fehler beim Senden der Anzeigenamen-Aktualisierungsnachricht %v"
+    "translation": "Fehler beim Senden der Anzeigenamen-Aktualisierungsnachricht"
   },
   {
     "id": "api.channel.post_update_channel_displayname_message_and_forget.retrieve_user.error",
-    "translation": "Fehler beim Abrufen des Nutzers während des Sicherns der Kanalüberschrift %v"
+    "translation": "Fehler beim Abrufen des Nutzers während des aktualisierens des DisplayName-Feldes"
   },
   {
     "id": "api.channel.post_update_channel_displayname_message_and_forget.updated_from",
@@ -313,7 +313,7 @@
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.post.error",
-    "translation": "Failed to post update channel header message"
+    "translation": "Fehler beim Senden der Aktualisierung der Kanalüberschrift-Mitteilung"
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.removed",
@@ -321,7 +321,7 @@
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.retrieve_user.error",
-    "translation": "Fehler beim Abrufen des Nutzers während des Sicherns der Kanalüberschrift %v"
+    "translation": "Fehler beim Abrufen des Nutzers während des aktualisierens der Kanalüberschrift"
   },
   {
     "id": "api.channel.post_update_channel_header_message_and_forget.updated_from",
@@ -333,7 +333,7 @@
   },
   {
     "id": "api.channel.post_user_add_remove_message_and_forget.error",
-    "translation": "Die Begrüßungs-/Abschiedsnachricht %v konnte nicht gesendet werden"
+    "translation": "Die Begrüßungs-/Abschiedsnachricht konnte nicht gesendet werden"
   },
   {
     "id": "api.channel.remove.default.app_error",
@@ -797,7 +797,7 @@
   },
   {
     "id": "api.context.invalid_body_param.app_error",
-    "translation": "Invalid or missing {{.Name}} in request body"
+    "translation": "Ungültiger oder fehlender {{.Name}} in Anfrage"
   },
   {
     "id": "api.context.invalid_param.app_error",
@@ -805,7 +805,7 @@
   },
   {
     "id": "api.context.invalid_session.error",
-    "translation": "Invalid session err=%v"
+    "translation": "Ungültige Sitzung err=%v"
   },
   {
     "id": "api.context.invalid_team_url.debug",
@@ -813,11 +813,11 @@
   },
   {
     "id": "api.context.invalid_token.error",
-    "translation": "Invalid session token={{.Token}}, err={{.Error}}"
+    "translation": "Ungültige Sitzung  token={{.Token}}, err={{.Error}}"
   },
   {
     "id": "api.context.invalid_url_param.app_error",
-    "translation": "Invalid or missing {{.Name}} parameter in request URL"
+    "translation": "Ungültiger oder fehlender {{.Name}} Parameter in Anfrage-URL"
   },
   {
     "id": "api.context.invalidate_all_caches",
@@ -1497,7 +1497,7 @@
   },
   {
     "id": "api.post.make_direct_channel_visible.get_2_members.error",
-    "translation": "Fehler beim Abruf der 2 Mitglieder für den Direkt-Kanal channel_id=%v"
+    "translation": "Fehler beim Abruf der 2 Mitglieder für den Direkt-Kanal channel_id={{.ChannelId}}"
   },
   {
     "id": "api.post.make_direct_channel_visible.get_members.error",
@@ -1517,7 +1517,7 @@
   },
   {
     "id": "api.post.send_notifications.user_id.debug",
-    "translation": "Post creator not in channel for the post, no notification sent post_id=%v channel_id=%v user_id=%v"
+    "translation": "Nachrichtenersteller nicht im Kanal für die Nachricht, keine Benachrichtigung versendet post_id=%v channel_id=%v user_id=%v"
   },
   {
     "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
@@ -1569,7 +1569,7 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
-    "translation": "Failed to send push device_id={{.DeviceId}}, err={{.Error}}"
+    "translation": "Fehler beim Senden der Pushnachricht device_id={{.DeviceId}}, err={{.Error}}"
   },
   {
     "id": "api.post.send_notifications_and_forget.sent",
@@ -1589,7 +1589,7 @@
   },
   {
     "id": "api.post.update_post.permissions_denied.app_error",
-    "translation": "Teamerstellung wurde deaktiviert. Bitte fragen Sie Ihren Administrator, um Details zu erfahren."
+    "translation": "Nachrichtenbearbeitung wurde deaktiviert. Bitte fragen Sie Ihren Administrator, um Details zu erfahren."
   },
   {
     "id": "api.post.update_post.permissions_details.app_error",
@@ -1597,7 +1597,7 @@
   },
   {
     "id": "api.post.update_post.permissions_time_limit.app_error",
-    "translation": "Post edit is only allowed for {{.timeLimit}} seconds. Please ask your systems administrator for details."
+    "translation": "Nachrichtenbearbeitung ist nur für {{.timeLimit}} Sekunden erlaubt. Bitte fragen Sie Ihren Administrator, um Details zu erfahren."
   },
   {
     "id": "api.post.update_post.system_message.app_error",
@@ -2257,7 +2257,7 @@
   },
   {
     "id": "api.user.add_direct_channels_and_forget.failed.error",
-    "translation": "Failed to add direct channel preferences for user user_id={{.UserId}}, team_id={{.TeamId}}, err={{.Error}}"
+    "translation": "Fehler beim Hinzufügen von Kanaleinstellungen für Benutzer user_id={{.UserId}}, team_id={{.TeamId}}, err={{.Error}}"
   },
   {
     "id": "api.user.authorize_oauth_user.bad_response.app_error",
@@ -2509,19 +2509,19 @@
   },
   {
     "id": "api.user.send_email_change_email_and_forget.error",
-    "translation": "Die E-Mail konnte nicht gesendet werden err=%v"
+    "translation": "Die E-Mail-Änderungsbenachrichtigung konnte nicht erfolgreich versendet werden"
   },
   {
     "id": "api.user.send_email_change_username_and_forget.error",
-    "translation": "Die Benachrichtigungs-E-Mail über die Änderung des Benutzernamens konnte nicht versandt werden err=%v"
+    "translation": "Die Benutzernamen-Änderungsbenachrichtigung konnte erfolgreich nicht versendet werden"
   },
   {
     "id": "api.user.send_email_change_verify_email_and_forget.error",
-    "translation": "Die Bestätigungs-E-Mail über die Änderung der E-Mail-Adresse konnte nicht versandt werden err=%v"
+    "translation": "Die Bestätigungs-E-Mail über die Änderung der E-Mail-Adresse konnte nicht versandt werden"
   },
   {
     "id": "api.user.send_password_change_email_and_forget.error",
-    "translation": "Die Bestätigungs-E-Mail über die Änderung des Passworts konnte nicht versandt werden err=%v"
+    "translation": "Die Bestätigungs-E-Mail über die Änderung des Passworts konnte nicht versandt werden"
   },
   {
     "id": "api.user.send_password_reset.find.app_error",
@@ -2537,15 +2537,15 @@
   },
   {
     "id": "api.user.send_sign_in_change_email_and_forget.error",
-    "translation": "Die Bestätigungs-E-Mail über die Änderung des Passworts konnte nicht versandt werden err=%v"
+    "translation": "Die Bestätigungs-E-Mail über die Änderung des Passworts konnte nicht versandt werden"
   },
   {
     "id": "api.user.send_verify_email_and_forget.failed.error",
-    "translation": "Die Bestätigungs-E-Mail konnte nicht versandt werden err=%v"
+    "translation": "Die Bestätigungs-E-Mail konnte nicht versandt werden"
   },
   {
     "id": "api.user.send_welcome_email_and_forget.failed.error",
-    "translation": "Die Willkommens-E-Mail konnte nicht versandt werden err=%v"
+    "translation": "Die Willkommens-E-Mail konnte nicht versandt werden"
   },
   {
     "id": "api.user.update_active.no_deactivate_ldap.app_error",
@@ -2761,7 +2761,7 @@
   },
   {
     "id": "api.websocket.invalid_session.error",
-    "translation": "Invalid session err=%v"
+    "translation": "Ungültige Sitzung err=%v"
   },
   {
     "id": "api.websocket_handler.invalid_param.app_error",
@@ -2769,7 +2769,7 @@
   },
   {
     "id": "app.channel.create_channel.no_team_id.app_error",
-    "translation": "Must specify the team ID to create a channel"
+    "translation": "Es muss eine Team-ID angegeben werden um einen Kanal zu erstellen"
   },
   {
     "id": "app.channel.post_update_channel_purpose_message.post.error",
@@ -2813,7 +2813,7 @@
   },
   {
     "id": "app.import.import_line.null_user.error",
-    "translation": "Import data line has type \"user\" but the user objcet is null."
+    "translation": "Import data line has type \"user\" but the user object is null."
   },
   {
     "id": "app.import.import_line.unknown_line_type.error",
@@ -2912,6 +2912,14 @@
     "translation": "Channel name missing from User's Channel Membership."
   },
   {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_desktop.error",
+    "translation": "Invalid Desktop NotifyProps for User's Channel Membership."
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mark_unread.error",
+    "translation": "Invalid MarkUnread NotifyProps for User's Channel Membership."
+  },
+  {
     "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
     "translation": "Invalid roles for User's Channel Membership."
   },
diff --git a/i18n/en.json b/i18n/en.json
index 81d4eb412..b746b3f0a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2912,6 +2912,14 @@
     "translation": "Channel name missing from User's Channel Membership."
   },
   {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_desktop.error",
+    "translation": "Invalid Desktop NotifyProps for User's Channel Membership."
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mark_unread.error",
+    "translation": "Invalid MarkUnread NotifyProps for User's Channel Membership."
+  },
+  {
     "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
     "translation": "Invalid roles for User's Channel Membership."
   },
@@ -2968,26 +2976,6 @@
     "translation": "Team name missing from User's Team Membership."
   },
   {
-    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_desktop.error",
-    "translation": "Invalid Desktop NotifyProps for User's Channel Membership."
-  },
-  {
-    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mark_unread.error",
-    "translation": "Invalid MarkUnread NotifyProps for User's Channel Membership."
-  },
-  {
-    "id": "app.import.import_user.save_preferences.error",
-    "translation": "Failed to save the provided preferences for the user."
-  },
-  {
-    "id": "app.import.process_import_data_file_version_line.invalid_version.error",
-    "translation": "Did not find a valid version type object in the first line of the import data file."
-  },
-  {
-    "id": "app.import.bulk_import.unsupported_version.error",
-    "translation": "The version of the import data file format of the provided file is not supported by this version of Mattermost."
-  },
-  {
     "id": "authentication.permissions.create_team_roles.description",
     "translation": "Ability to create new teams"
   },
diff --git a/i18n/es.json b/i18n/es.json
index 5e16502e4..5888a2876 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -217,7 +217,7 @@
   },
   {
     "id": "api.channel.create_direct_channel.invalid_user.app_error",
-    "translation": "Invalid user ID for direct channel creation"
+    "translation": "ID del usuario no válido para la creación del canal directo"
   },
   {
     "id": "api.channel.delete_channel.archived",
@@ -2912,6 +2912,14 @@
     "translation": "Channel name missing from User's Channel Membership."
   },
   {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_desktop.error",
+    "translation": "Invalid Desktop NotifyProps for User's Channel Membership."
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mark_unread.error",
+    "translation": "Invalid MarkUnread NotifyProps for User's Channel Membership."
+  },
+  {
     "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
     "translation": "Invalid roles for User's Channel Membership."
   },
@@ -4593,7 +4601,7 @@
   },
   {
     "id": "store.sql_channel.save_channel.exists.app_error",
-    "translation": "A channel with that name already exists on the same team"
+    "translation": "Un canal con ese nombre ya existe en el mismo equipo"
   },
   {
     "id": "store.sql_channel.save_channel.limit.app_error",
@@ -4925,7 +4933,7 @@
   },
   {
     "id": "store.sql_post.permanent_delete_by_channel.app_error",
-    "translation": "No pudimos eliminar el canal"
+    "translation": "No pudimos eliminar los mensajes de canal"
   },
   {
     "id": "store.sql_post.permanent_delete_by_user.app_error",
diff --git a/i18n/fr.json b/i18n/fr.json
index 0b1564a08..8c7392b91 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -2081,7 +2081,7 @@
   },
   {
     "id": "api.templates.invite_body.info",
-    "translation": "L'équipe {{.SenderStatus}} <strong>{{.SenderName}}</strong>, vous a invité à rejoindre <strong>{{.TeamDisplayName}}</strong>."
+    "translation": "<strong>{{.SenderName}}</strong>, {{.SenderStatus}} de l'équipe, vous invite à rejoindre <strong>{{.TeamDisplayName}}</strong>."
   },
   {
     "id": "api.templates.invite_body.title",
@@ -2813,7 +2813,7 @@
   },
   {
     "id": "app.import.import_line.null_user.error",
-    "translation": "Import data line has type \"user\" but the user objcet is null."
+    "translation": "Import data line has type \"user\" but the user object is null."
   },
   {
     "id": "app.import.import_line.unknown_line_type.error",
@@ -2912,6 +2912,14 @@
     "translation": "Channel name missing from User's Channel Membership."
   },
   {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_desktop.error",
+    "translation": "Invalid Desktop NotifyProps for User's Channel Membership."
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mark_unread.error",
+    "translation": "Invalid MarkUnread NotifyProps for User's Channel Membership."
+  },
+  {
     "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
     "translation": "Invalid roles for User's Channel Membership."
   },
diff --git a/i18n/ja.json b/i18n/ja.json
index 3262be639..07bf4fb7e 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -2813,7 +2813,7 @@
   },
   {
     "id": "app.import.import_line.null_user.error",
-    "translation": "インポートデータに \"user\" という型がありましたが、そのユーザーのオブジェクトがnullでした。"
+    "translation": "インポートデータに \"user\" という型がありましたが、そのユーザーのオブジェクトはnullです。"
   },
   {
     "id": "app.import.import_line.unknown_line_type.error",
@@ -2912,6 +2912,14 @@
     "translation": "ユーザーのチャンネルメンバーシップにチャンネル名が存在しません。"
   },
   {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_desktop.error",
+    "translation": "ユーザーのチャンネルメンバーシップのデスクトップ通知設定が不正です。"
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mark_unread.error",
+    "translation": "ユーザーのチャンネルメンバーシップの未読マーク設定が不正です。"
+  },
+  {
     "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
     "translation": "ユーザーのチャネルメンバーシップの役割が不正です。"
   },
diff --git a/i18n/ko.json b/i18n/ko.json
index 1b9ab4cde..00c8f2195 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -2813,7 +2813,7 @@
   },
   {
     "id": "app.import.import_line.null_user.error",
-    "translation": "Import data line has type \"user\" but the user objcet is null."
+    "translation": "Import data line has type \"user\" but the user object is null."
   },
   {
     "id": "app.import.import_line.unknown_line_type.error",
@@ -2912,6 +2912,14 @@
     "translation": "Channel name missing from User's Channel Membership."
   },
   {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_desktop.error",
+    "translation": "Invalid Desktop NotifyProps for User's Channel Membership."
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mark_unread.error",
+    "translation": "Invalid MarkUnread NotifyProps for User's Channel Membership."
+  },
+  {
     "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
     "translation": "Invalid roles for User's Channel Membership."
   },
diff --git a/i18n/nl.json b/i18n/nl.json
index 1c3ddf97c..b3052ae29 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -2813,7 +2813,7 @@
   },
   {
     "id": "app.import.import_line.null_user.error",
-    "translation": "Import data line has type \"user\" but the user objcet is null."
+    "translation": "Import data line has type \"user\" but the user object is null."
   },
   {
     "id": "app.import.import_line.unknown_line_type.error",
@@ -2912,6 +2912,14 @@
     "translation": "Channel name missing from User's Channel Membership."
   },
   {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_desktop.error",
+    "translation": "Invalid Desktop NotifyProps for User's Channel Membership."
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mark_unread.error",
+    "translation": "Invalid MarkUnread NotifyProps for User's Channel Membership."
+  },
+  {
     "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
     "translation": "Invalid roles for User's Channel Membership."
   },
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index b1da40064..1e2039eba 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -2813,7 +2813,7 @@
   },
   {
     "id": "app.import.import_line.null_user.error",
-    "translation": "A linha de dados de importação tem o tipo \"user\", mas o objeto user é nulo."
+    "translation": "A linha de dados de importação é do tipo \"user\" mas o objeto user é nulo."
   },
   {
     "id": "app.import.import_line.unknown_line_type.error",
@@ -2912,6 +2912,14 @@
     "translation": "Falta nome do canal em Usuário Membro do Canal."
   },
   {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_desktop.error",
+    "translation": "Invalid Desktop NotifyProps for User's Channel Membership."
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mark_unread.error",
+    "translation": "Invalid MarkUnread NotifyProps for User's Channel Membership."
+  },
+  {
     "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
     "translation": "Função inválida em Usuário Membro do Canal."
   },
diff --git a/i18n/ru.json b/i18n/ru.json
index 92d00a707..52b088c17 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -773,7 +773,7 @@
   },
   {
     "id": "api.command_shortcuts.nav.unread_next",
-    "translation": "ALT+SHIFT+ВВЕРХ: Следующий канал или диалог в левом боковом меню с непрочитанными сообщениями\n"
+    "translation": "ALT+SHIFT+ВНИЗ: Следующий канал или диалог в левом боковом меню с непрочитанными сообщениями\n"
   },
   {
     "id": "api.command_shortcuts.nav.unread_prev",
@@ -939,7 +939,7 @@
   },
   {
     "id": "api.emoji.create.too_large.app_error",
-    "translation": "Невозможно создать смайлик. Изображение должно быть не более 1 Мб."
+    "translation": "Невозможно создать эмодзи. Изображение должно быть не более 1 MB."
   },
   {
     "id": "api.emoji.delete.delete_reactions.app_error",
@@ -1027,7 +1027,7 @@
   },
   {
     "id": "api.file.get_public_link.no_post.app_error",
-    "translation": "Не удалось получить публичную ссылку на файл. Файл должен быть прикреплен к сообщению, которое может быть прочитано текущим пользователем."
+    "translation": "Не удалось получить публичную ссылку для файла. Файл должен быть прикреплен к сообщению, которое может быть прочитано текущим пользователем."
   },
   {
     "id": "api.file.handle_images_forget.decode.error",
@@ -1489,7 +1489,7 @@
   },
   {
     "id": "api.post.handle_webhook_events_and_forget.event_post.error",
-    "translation": "Ошибка отправки события, err=%s"
+    "translation": "Ошибка события POST, err=%s"
   },
   {
     "id": "api.post.init.debug",
@@ -1517,7 +1517,7 @@
   },
   {
     "id": "api.post.send_notifications.user_id.debug",
-    "translation": "Post creator not in channel for the post, no notification sent post_id=%v channel_id=%v user_id=%v"
+    "translation": "Создатель сообщения отсутствует в канале, уведомление не отправлено post_id=%v channel_id=%v user_id=%v"
   },
   {
     "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
@@ -1569,7 +1569,7 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
-    "translation": "Failed to send push device_id={{.DeviceId}}, err={{.Error}}"
+    "translation": "Не удалось отправить push-уведомление device_id={{.DeviceId}}, err={{.Error}}"
   },
   {
     "id": "api.post.send_notifications_and_forget.sent",
@@ -1757,7 +1757,7 @@
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_not_found.warn",
-    "translation": "Не найден файл с идентификатором {{.FileId}}, в экспорте из Слак, для загрузки сообщения"
+    "translation": "Не найден файл с идентификатором {{.FileId}} в экспорте из Slack для загрузки сообщения"
   },
   {
     "id": "api.slackimport.slack_add_posts.upload_file_not_in_json.warn",
@@ -2077,7 +2077,7 @@
   },
   {
     "id": "api.templates.invite_body.extra_info",
-    "translation": "Mattermost позволяет обмениваться сообщениями и файлами с компьютера или телефона, с возможностью моментального поиска и архивирования. После того, как Вы присоединитесь к команде <strong>{{.TeamDisplayName}}</strong>, Вы сможете получить доступ к этим функциям в любое время через Веб-сайт:<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",
@@ -2101,7 +2101,7 @@
   },
   {
     "id": "api.templates.mfa_change_subject",
-    "translation": "Ваша МПП обновлена на {{ .SiteName }}"
+    "translation": "Ваша MFA обновлена на {{ .SiteName }}"
   },
   {
     "id": "api.templates.mfa_deactivated_body.info",
@@ -2909,15 +2909,23 @@
   },
   {
     "id": "app.import.validate_user_channels_import_data.channel_name_missing.error",
-    "translation": "Channel name missing from User's Channel Membership."
+    "translation": "Пропущено имя канала в «Участие пользователей на каналах»"
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_desktop.error",
+    "translation": "Invalid Desktop NotifyProps for User's Channel Membership."
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mark_unread.error",
+    "translation": "Invalid MarkUnread NotifyProps for User's Channel Membership."
   },
   {
     "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
-    "translation": "Invalid roles for User's Channel Membership."
+    "translation": "Не правильные роли в «Участие пользователей на каналах»"
   },
   {
     "id": "app.import.validate_user_import_data.auth_data_length.error",
-    "translation": "User AuthData is too long."
+    "translation": "Структура AuthData пользователя слишком большая."
   },
   {
     "id": "app.import.validate_user_import_data.auth_service_length.error",
@@ -2961,11 +2969,11 @@
   },
   {
     "id": "app.import.validate_user_teams_import_data.invalid_roles.error",
-    "translation": "Invalid roles for User's Team Membership."
+    "translation": "Неправильные роли в «Участие пользователей в команде»"
   },
   {
     "id": "app.import.validate_user_teams_import_data.team_name_missing.error",
-    "translation": "Team name missing from User's Team Membership."
+    "translation": "Пропущено имя команды в «Участие пользователей в команде»"
   },
   {
     "id": "authentication.permissions.create_team_roles.description",
@@ -3605,7 +3613,7 @@
   },
   {
     "id": "model.config.is_valid.cluster_email_batching.app_error",
-    "translation": "Невозможно включить почтовые объединения при включенной кластеризации"
+    "translation": "Невозможно включить пакетную обработку почты при включенной кластеризации."
   },
   {
     "id": "model.config.is_valid.email_batching_buffer_size.app_error",
@@ -4509,7 +4517,7 @@
   },
   {
     "id": "store.sql_channel.get_deleted_by_name.existing.app_error",
-    "translation": "Не удалось найти существующий канал"
+    "translation": "Не удалось найти существующий удалённый канал"
   },
   {
     "id": "store.sql_channel.get_deleted_by_name.missing.app_error",
@@ -4557,7 +4565,7 @@
   },
   {
     "id": "store.sql_channel.permanent_delete.app_error",
-    "translation": "Неудачная попытка удалить канал"
+    "translation": "Не удалось удалить канал"
   },
   {
     "id": "store.sql_channel.permanent_delete_by_team.app_error",
@@ -4925,7 +4933,7 @@
   },
   {
     "id": "store.sql_post.permanent_delete_by_channel.app_error",
-    "translation": "Неудачная попытка удалить канал"
+    "translation": "Не удалось удалить сообщения на канале"
   },
   {
     "id": "store.sql_post.permanent_delete_by_user.app_error",
@@ -5237,7 +5245,7 @@
   },
   {
     "id": "store.sql_team.save.domain_exists.app_error",
-    "translation": "Команда с таким доменом уже существует"
+    "translation": "Команда с таким именем уже существует"
   },
   {
     "id": "store.sql_team.save.existing.app_error",
@@ -5333,7 +5341,7 @@
   },
   {
     "id": "store.sql_user.missing_account.const",
-    "translation": "Мы не смогли найти пользователя"
+    "translation": "Не удалось найти пользователя"
   },
   {
     "id": "store.sql_user.permanent_delete.app_error",
diff --git a/i18n/zh_CN.json b/i18n/zh_CN.json
index 340095750..900dc834f 100644
--- a/i18n/zh_CN.json
+++ b/i18n/zh_CN.json
@@ -217,7 +217,7 @@
   },
   {
     "id": "api.channel.create_direct_channel.invalid_user.app_error",
-    "translation": "Invalid user ID for direct channel creation"
+    "translation": "用于创建私信频道的用户 ID 无效"
   },
   {
     "id": "api.channel.delete_channel.archived",
@@ -2769,7 +2769,7 @@
   },
   {
     "id": "app.channel.create_channel.no_team_id.app_error",
-    "translation": "Must specify the team ID to create a channel"
+    "translation": "必须指定团队ID才能创建频道"
   },
   {
     "id": "app.channel.post_update_channel_purpose_message.post.error",
@@ -2909,11 +2909,19 @@
   },
   {
     "id": "app.import.validate_user_channels_import_data.channel_name_missing.error",
-    "translation": "Channel name missing from User's Channel Membership."
+    "translation": "用户频道会员资格中缺少频道名称。"
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_desktop.error",
+    "translation": "Invalid Desktop NotifyProps for User's Channel Membership."
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mark_unread.error",
+    "translation": "Invalid MarkUnread NotifyProps for User's Channel Membership."
   },
   {
     "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
-    "translation": "Invalid roles for User's Channel Membership."
+    "translation": "用户频道成员资格的角色无效。"
   },
   {
     "id": "app.import.validate_user_import_data.auth_data_length.error",
@@ -2961,11 +2969,11 @@
   },
   {
     "id": "app.import.validate_user_teams_import_data.invalid_roles.error",
-    "translation": "Invalid roles for User's Team Membership."
+    "translation": "用户团队成员资格的角色无效。"
   },
   {
     "id": "app.import.validate_user_teams_import_data.team_name_missing.error",
-    "translation": "Team name missing from User's Team Membership."
+    "translation": "用户的团队成员资格中缺少团队名称。"
   },
   {
     "id": "authentication.permissions.create_team_roles.description",
@@ -3833,7 +3841,7 @@
   },
   {
     "id": "model.config.is_valid.time_between_user_typing.app_error",
-    "translation": "Time between user typing updates should not be set to less than 1000 milliseconds."
+    "translation": "用户键入更新间隔不应设置为小于1000毫秒。"
   },
   {
     "id": "model.config.is_valid.webrtc_gateway_admin_secret.app_error",
@@ -4557,7 +4565,7 @@
   },
   {
     "id": "store.sql_channel.permanent_delete.app_error",
-    "translation": "我们无法删除频道"
+    "translation": "我们无法删除这个频道"
   },
   {
     "id": "store.sql_channel.permanent_delete_by_team.app_error",
@@ -4593,7 +4601,7 @@
   },
   {
     "id": "store.sql_channel.save_channel.exists.app_error",
-    "translation": "A channel with that name already exists on the same team"
+    "translation": "频道名称在团队中已存在"
   },
   {
     "id": "store.sql_channel.save_channel.limit.app_error",
@@ -4925,7 +4933,7 @@
   },
   {
     "id": "store.sql_post.permanent_delete_by_channel.app_error",
-    "translation": "我们无法删除频道"
+    "translation": "我们无法在频道中删除这些消息"
   },
   {
     "id": "store.sql_post.permanent_delete_by_user.app_error",
diff --git a/i18n/zh_TW.json b/i18n/zh_TW.json
index 6452df60a..6d27c6467 100644
--- a/i18n/zh_TW.json
+++ b/i18n/zh_TW.json
@@ -2912,6 +2912,14 @@
     "translation": "使用者頻道資料中缺少頻道名字。"
   },
   {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_desktop.error",
+    "translation": "Invalid Desktop NotifyProps for User's Channel Membership."
+  },
+  {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mark_unread.error",
+    "translation": "Invalid MarkUnread NotifyProps for User's Channel Membership."
+  },
+  {
     "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
     "translation": "使用者頻道資料的角色為無效資料。"
   },