diff --git a/assets/base/i18n/de.json b/assets/base/i18n/de.json
index ed9f9787f..12df818b8 100644
--- a/assets/base/i18n/de.json
+++ b/assets/base/i18n/de.json
@@ -691,6 +691,7 @@
   "admin.log.locationPlaceholder": "Einen Dateiort eingeben",
   "admin.log.locationTitle": "Log-Verzeichnis:",
   "admin.log.logSettings": "Protokoll-Einstellungen",
+  "admin.log.noteDescription": "Changing properties other than <a href=\"#EnableWebhookDebugging\">Enable Webhook Debugging</a> and <a href=\"#EnableDiagnostics\">Enable Diagnostics and Error Reporting</a> in this section will require a server restart before taking effect.",
   "admin.logs.bannerDesc": "Um Benutzer nach Benutzer-ID oder Token-ID zu suchen, wechseln Sie zu Reporting > Benutzer und fügen die ID in den Suchfilter ein.",
   "admin.logs.next": "Weiter",
   "admin.logs.prev": "Zurück",
@@ -2071,6 +2072,7 @@
   "mobile.create_channel": "Erstellen",
   "mobile.create_channel.private": "Neuer privater Kanal",
   "mobile.create_channel.public": "Neuer Öffentlicher Kanal",
+  "mobile.create_post.read_only": "This channel is read-only",
   "mobile.custom_list.no_results": "Keine Ergebnisse",
   "mobile.document_preview.failed_description": "Es trat ein Fehler beim Öffnen des Dokuments auf. Bitte stellen Sie sicher Sie haben einen Betrachter für {fileType} installiert und versuchen es erneut.\n",
   "mobile.document_preview.failed_title": "Dokument öffnen fehlgeschlagen",
@@ -2107,11 +2109,16 @@
   "mobile.extension.permission": "Mattermost benötigt Zugriff auf den Gerätespeicher, um Dateien teilen zu können.",
   "mobile.extension.posting": "Sende...",
   "mobile.extension.title": "In Mattermost teilen",
+  "mobile.failed_network_action.description": "There seems to be a problem with your internet connection. Make sure you have an active connection and try again.",
+  "mobile.failed_network_action.retry": "Erneut versuchen",
+  "mobile.failed_network_action.title": "Keine Internetverbindung",
   "mobile.file_upload.camera": "Ein Foto oder ein Video aufnehmen",
   "mobile.file_upload.library": "Foto-Bibliothek",
   "mobile.file_upload.max_warning": "Uploads sind auf maximal fünf Dateien beschränkt.",
   "mobile.file_upload.more": "Mehr",
   "mobile.file_upload.video": "Videobibliothek",
+  "mobile.flagged_posts.empty_description": "Markierungen dienen als Möglichkeit Nachrichten für eine Wiedervorlage zu markieren. Ihre Markierungen sind persönlich und können nicht von anderen Benutzern gesehen werden.",
+  "mobile.flagged_posts.empty_title": "Markierte Nachrichten",
   "mobile.help.title": "Hilfe",
   "mobile.image_preview.deleted_post_message": "Die Nachricht und die dazugehörigen Dateien wurden gelöscht. Die Vorschau wird nun geschlossen.",
   "mobile.image_preview.deleted_post_title": "Nachricht gelöscht",
@@ -2198,6 +2205,8 @@
   "mobile.post_textbox.uploadFailedDesc": "Einige Anhänge konnten nicht auf den Server hochgeladen werden. Sind Sie sicher, dass sie die Nachricht abschicken wollen?",
   "mobile.post_textbox.uploadFailedTitle": "Anhang Fehler",
   "mobile.posts_view.moreMsg": "Weitere neue Nachrichten oberhalb",
+  "mobile.recent_mentions.empty_description": "Messages containing your username and other words that trigger mentions will appear here.",
+  "mobile.recent_mentions.empty_title": "Letzte Erwähnungen",
   "mobile.rename_channel.display_name_maxLength": "Kanalname muss kürzer als {maxLength, number} Zeichen sein",
   "mobile.rename_channel.display_name_minLength": "Kanalname muss {minLength, number} oder mehr Zeichen enthalten",
   "mobile.rename_channel.display_name_required": "Kanalname ist erforderlich",
diff --git a/assets/base/i18n/en.json b/assets/base/i18n/en.json
index 3f20ad505..1cafbe0f6 100644
--- a/assets/base/i18n/en.json
+++ b/assets/base/i18n/en.json
@@ -691,6 +691,7 @@
   "admin.log.locationPlaceholder": "Enter your file location",
   "admin.log.locationTitle": "File Log Directory:",
   "admin.log.logSettings": "Log Settings",
+  "admin.log.noteDescription": "Changing properties other than <a href=\"#EnableWebhookDebugging\">Enable Webhook Debugging</a> and <a href=\"#EnableDiagnostics\">Enable Diagnostics and Error Reporting</a> in this section will require a server restart before taking effect.",
   "admin.logs.bannerDesc": "To look up users by User ID or Token ID, go to Reporting > Users and paste the ID into the search filter.",
   "admin.logs.next": "Next",
   "admin.logs.prev": "Previous",
@@ -2109,15 +2110,15 @@
   "mobile.extension.posting": "Posting...",
   "mobile.extension.title": "Share in Mattermost",
   "mobile.failed_network_action.description": "There seems to be a problem with your internet connection. Make sure you have an active connection and try again.",
-  "mobile.failed_network_action.title": "No internet connection",
   "mobile.failed_network_action.retry": "Try Again",
+  "mobile.failed_network_action.title": "No internet connection",
   "mobile.file_upload.camera": "Take Photo or Video",
   "mobile.file_upload.library": "Photo Library",
   "mobile.file_upload.max_warning": "Uploads limited to 5 files maximum.",
   "mobile.file_upload.more": "More",
   "mobile.file_upload.video": "Video Library",
-  "mobile.flagged_posts.empty_title": "No Flagged Posts",
   "mobile.flagged_posts.empty_description": "Flags are a way to mark messages for follow up. Your flags are personal, and cannot be seen by other users.",
+  "mobile.flagged_posts.empty_title": "No Flagged Posts",
   "mobile.help.title": "Help",
   "mobile.image_preview.deleted_post_message": "This post and its files have been deleted. The previewer will now be closed.",
   "mobile.image_preview.deleted_post_title": "Post Deleted",
@@ -2204,8 +2205,8 @@
   "mobile.post_textbox.uploadFailedDesc": "Some attachments failed to upload to the server, Are you sure you want to post the message?",
   "mobile.post_textbox.uploadFailedTitle": "Attachment failure",
   "mobile.posts_view.moreMsg": "More New Messages Above",
-  "mobile.recent_mentions.empty_title": "No Recent Mentions",
   "mobile.recent_mentions.empty_description": "Messages containing your username and other words that trigger mentions will appear here.",
+  "mobile.recent_mentions.empty_title": "No Recent Mentions",
   "mobile.rename_channel.display_name_maxLength": "Channel name must be less than {maxLength, number} characters",
   "mobile.rename_channel.display_name_minLength": "Channel name must be {minLength, number} or more characters",
   "mobile.rename_channel.display_name_required": "Channel name is required",
diff --git a/assets/base/i18n/es.json b/assets/base/i18n/es.json
index 57e532300..942d5fbb0 100644
--- a/assets/base/i18n/es.json
+++ b/assets/base/i18n/es.json
@@ -691,6 +691,7 @@
   "admin.log.locationPlaceholder": "Ingresar locación de archivo",
   "admin.log.locationTitle": "Directorio del Archivo de Registro:",
   "admin.log.logSettings": "Configuración de registro",
+  "admin.log.noteDescription": "Changing properties other than <a href=\"#EnableWebhookDebugging\">Enable Webhook Debugging</a> and <a href=\"#EnableDiagnostics\">Enable Diagnostics and Error Reporting</a> in this section will require a server restart before taking effect.",
   "admin.logs.bannerDesc": "Para buscar usuarios por ID del usuario o ID del Token, dirigete a Reportes > Usuarios y copia el ID en el filtro de búsqueda.",
   "admin.logs.next": "Siguiente",
   "admin.logs.prev": "Anterior",
@@ -2071,6 +2072,7 @@
   "mobile.create_channel": "Crear",
   "mobile.create_channel.private": "Nuevo Canal Privado",
   "mobile.create_channel.public": "Nuevo Canal Público",
+  "mobile.create_post.read_only": "This channel is read-only",
   "mobile.custom_list.no_results": "Sin resultados",
   "mobile.document_preview.failed_description": "Ocurrió un error al abrir el documento. Por favor verifica que tienes instalado un visor para archivos {fileType} e intenta de nuevo.\n",
   "mobile.document_preview.failed_title": "Error Abriendo Documento",
@@ -2107,11 +2109,16 @@
   "mobile.extension.permission": "Mattermost necesita acceso al almacenamiento del dispositivo para poder compartir archivos.",
   "mobile.extension.posting": "Publicando...",
   "mobile.extension.title": "Compartir en Mattermost",
+  "mobile.failed_network_action.description": "There seems to be a problem with your internet connection. Make sure you have an active connection and try again.",
+  "mobile.failed_network_action.retry": "Intentar de nuevo",
+  "mobile.failed_network_action.title": "Sin conexión a Internet",
   "mobile.file_upload.camera": "Sacar Foto o Vídeo",
   "mobile.file_upload.library": "Librería de Fotos",
   "mobile.file_upload.max_warning": "Se pueden subir un máximo de 5 archivos.",
   "mobile.file_upload.more": "Más",
   "mobile.file_upload.video": "Librería de Videos",
+  "mobile.flagged_posts.empty_description": "Las banderas son una forma de marcar los mensajes para hacerles seguimiento. Tus banderas son personales, y no puede ser vistas por otros usuarios.",
+  "mobile.flagged_posts.empty_title": "Mensajes Marcados",
   "mobile.help.title": "Ayuda",
   "mobile.image_preview.deleted_post_message": "Este mensaje y sus archivos han sido eliminados. La vista previa se cerrará.",
   "mobile.image_preview.deleted_post_title": "Mensaje Eliminado",
@@ -2198,6 +2205,8 @@
   "mobile.post_textbox.uploadFailedDesc": "Algunos archivos adjuntos no se han subido al servidor, ¿Quieres publicar el mensaje?",
   "mobile.post_textbox.uploadFailedTitle": "Error Adjuntando",
   "mobile.posts_view.moreMsg": "Más Mensajes Arriba",
+  "mobile.recent_mentions.empty_description": "Messages containing your username and other words that trigger mentions will appear here.",
+  "mobile.recent_mentions.empty_title": "Menciones recientes",
   "mobile.rename_channel.display_name_maxLength": "El nombre del canal debe tener menos de {maxLength, number} caracteres",
   "mobile.rename_channel.display_name_minLength": "El nombre del canal debe ser de {minLength, number} o más caracteres",
   "mobile.rename_channel.display_name_required": "Se requiere el nombre del canal",
diff --git a/assets/base/i18n/fr.json b/assets/base/i18n/fr.json
index 807a1e03a..9e1b2d1ca 100644
--- a/assets/base/i18n/fr.json
+++ b/assets/base/i18n/fr.json
@@ -691,6 +691,7 @@
   "admin.log.locationPlaceholder": "Spécifiez l'emplacement de votre fichier",
   "admin.log.locationTitle": "Répertoire des fichiers journaux :",
   "admin.log.logSettings": "Paramètres de journalisation (logs)",
+  "admin.log.noteDescription": "Changing properties other than <a href=\"#EnableWebhookDebugging\">Enable Webhook Debugging</a> and <a href=\"#EnableDiagnostics\">Enable Diagnostics and Error Reporting</a> in this section will require a server restart before taking effect.",
   "admin.logs.bannerDesc": "Pour rechercher des utilisateurs sur base de leur identifiant utilisateur ou de leur identifiant de jeton, allez dans Rapports > Utilisateurs et collez l'identifiant dans la barre de recherche.",
   "admin.logs.next": "Suivant",
   "admin.logs.prev": "Précédent",
@@ -2071,6 +2072,7 @@
   "mobile.create_channel": "Créer",
   "mobile.create_channel.private": "Nouveau canal privé",
   "mobile.create_channel.public": "Nouveau canal public",
+  "mobile.create_post.read_only": "This channel is read-only",
   "mobile.custom_list.no_results": "Aucun résultat",
   "mobile.document_preview.failed_description": "Une erreur s'est produite lors de l'ouverture du document. Veuillez vous assurer que vous ayez un lecteur de {fileType} installé et réessayez.\n",
   "mobile.document_preview.failed_title": "L'ouverture du document a échoué",
@@ -2107,11 +2109,16 @@
   "mobile.extension.permission": "Mattermost requiert l'accès au stockage de l'appareil pour partager des fichiers.",
   "mobile.extension.posting": "Envoi en cours...",
   "mobile.extension.title": "Partager dans Mattermost",
+  "mobile.failed_network_action.description": "There seems to be a problem with your internet connection. Make sure you have an active connection and try again.",
+  "mobile.failed_network_action.retry": "Essayez à nouveau",
+  "mobile.failed_network_action.title": "Aucune connexion internet",
   "mobile.file_upload.camera": "Prendre une photo ou une vidéo",
   "mobile.file_upload.library": "Bibliothèque de photos",
   "mobile.file_upload.max_warning": "Envois limités à maximum 5 fichiers.",
   "mobile.file_upload.more": "Plus…",
   "mobile.file_upload.video": "Bibliothèque vidéo",
+  "mobile.flagged_posts.empty_description": "Marquer un message est un bon moyen d'assurer le suivi. Marquer un message est personnel et ne peut être vu par les autres utilisateurs.",
+  "mobile.flagged_posts.empty_title": "Messages marqués d'un indicateur",
   "mobile.help.title": "Aide",
   "mobile.image_preview.deleted_post_message": "Ce message et ses fichiers ont été supprimés. L'aperçu va être fermé.",
   "mobile.image_preview.deleted_post_title": "Message supprimé",
@@ -2198,6 +2205,8 @@
   "mobile.post_textbox.uploadFailedDesc": "Some attachments failed to upload to the server, Are you sure you want to post the message?",
   "mobile.post_textbox.uploadFailedTitle": "Attachment failure",
   "mobile.posts_view.moreMsg": "Plus de nouveaux messages au-dessus",
+  "mobile.recent_mentions.empty_description": "Messages containing your username and other words that trigger mentions will appear here.",
+  "mobile.recent_mentions.empty_title": "Mentions récentes",
   "mobile.rename_channel.display_name_maxLength": "Ce champ doit faire moins de {maxLength, number} caractères",
   "mobile.rename_channel.display_name_minLength": "Le nom de canal doit faire au moins {minLength, number} caractères.",
   "mobile.rename_channel.display_name_required": "Un nom de canal est requis",
diff --git a/assets/base/i18n/it.json b/assets/base/i18n/it.json
index c4630e1db..8b3993260 100644
--- a/assets/base/i18n/it.json
+++ b/assets/base/i18n/it.json
@@ -691,6 +691,7 @@
   "admin.log.locationPlaceholder": "Immetti la posizione del tuo file",
   "admin.log.locationTitle": "Cartella file di log:",
   "admin.log.logSettings": "Impostazioni di Log",
+  "admin.log.noteDescription": "Changing properties other than <a href=\"#EnableWebhookDebugging\">Enable Webhook Debugging</a> and <a href=\"#EnableDiagnostics\">Enable Diagnostics and Error Reporting</a> in this section will require a server restart before taking effect.",
   "admin.logs.bannerDesc": "Per cercare gli utenti tramite ID utente o token di accesso, andare in Reportistica > Utenti ed incollare l'ID nel campo di ricerca.",
   "admin.logs.next": "Prossimo",
   "admin.logs.prev": "Precedente",
@@ -2071,6 +2072,7 @@
   "mobile.create_channel": "Crea",
   "mobile.create_channel.private": "Nuovo Canale Privato",
   "mobile.create_channel.public": "Nuovo Canale Pubblico",
+  "mobile.create_post.read_only": "This channel is read-only",
   "mobile.custom_list.no_results": "Nessun risultato",
   "mobile.document_preview.failed_description": "Errore durante l'apertura del documento. Assicurarsi di avere installato il visualizzatore per i file di tipo {fileType} e riprovare.\n",
   "mobile.document_preview.failed_title": "Apertura Documento fallita",
@@ -2107,11 +2109,16 @@
   "mobile.extension.permission": "Mattermost necessità di accedere alla memoria del dispositivo per condividere i file.",
   "mobile.extension.posting": "Pubblicazione in corso...",
   "mobile.extension.title": "Condividi in Mattermos",
+  "mobile.failed_network_action.description": "There seems to be a problem with your internet connection. Make sure you have an active connection and try again.",
+  "mobile.failed_network_action.retry": "Riprova",
+  "mobile.failed_network_action.title": "Nessuna connessione internet",
   "mobile.file_upload.camera": "Scatta una Foto o registra un Video",
   "mobile.file_upload.library": "Galleria Fotografica",
   "mobile.file_upload.max_warning": "Numero massimo di file caricabili limitato a 5.",
   "mobile.file_upload.more": "Più",
   "mobile.file_upload.video": "Libreria video",
+  "mobile.flagged_posts.empty_description": "Contrassegnare i messaggi è uno strumento per seguirli. I contrassegni sono personali e non sono visibili agli altri utenti.",
+  "mobile.flagged_posts.empty_title": "Pubblicazioni segnati",
   "mobile.help.title": "Aiuto",
   "mobile.image_preview.deleted_post_message": "Questa pubblicazione e i suoi file sono stati cancellati. L'anteprima verrà chiusa.",
   "mobile.image_preview.deleted_post_title": "Pubblicazione cancellata",
@@ -2198,6 +2205,8 @@
   "mobile.post_textbox.uploadFailedDesc": "Impossibile caricare alcuni allegati, sicuro di voler pubblicare il messaggio?",
   "mobile.post_textbox.uploadFailedTitle": "Allegati non caricati",
   "mobile.posts_view.moreMsg": "Aggiungere più nuovi messaggi sopra",
+  "mobile.recent_mentions.empty_description": "Messages containing your username and other words that trigger mentions will appear here.",
+  "mobile.recent_mentions.empty_title": "Citazioni Recenti",
   "mobile.rename_channel.display_name_maxLength": "Il nome del canale deve essere al massimo di {maxLength, number} caratteri",
   "mobile.rename_channel.display_name_minLength": "Il nome del canale deve essere lungo almeno {minLength, number} caratteri",
   "mobile.rename_channel.display_name_required": "È richiesto il nome del canale",
diff --git a/assets/base/i18n/ja.json b/assets/base/i18n/ja.json
index 5f4652d81..aea6be9bf 100644
--- a/assets/base/i18n/ja.json
+++ b/assets/base/i18n/ja.json
@@ -418,7 +418,7 @@
   "admin.email.pushServerEx": "例: \"http://push-test.mattermost.com\"",
   "admin.email.pushServerTitle": "プッシュ通知サーバー:",
   "admin.email.pushTitle": "プッシュ通知を有効にする: ",
-  "admin.email.requireVerificationDescription": "本番環境では有効に設定してください。有効な場合、Mattermostは利用登録をして最初にログインする前に電子メールアドレスの確認を必須にします。開発者はこれを無効に設定することで、電子メールアドレスの確認電子メールの送信を省略し、開発をより早く進められるようにできます。",
+  "admin.email.requireVerificationDescription": "本番環境では有効に設定してください。有効な場合、Mattermostは利用登録をして最初にログインする前に電子メールアドレスの確認を必須にします。開発者はこれを無効に設定することで、電子メールアドレスの確認メールの送信を省略し、開発をより早く進められるようにできます。",
   "admin.email.requireVerificationTitle": "電子メールアドレスの確認が必要: ",
   "admin.email.selfPush": "プッシュ通知サービスの場所を手入力する",
   "admin.email.skipServerCertificateVerification.description": "有効な場合、Mattermostは電子メールサーバーの証明書を検証しなくなります。",
@@ -691,6 +691,7 @@
   "admin.log.locationPlaceholder": "ファイルの場所を入力してください",
   "admin.log.locationTitle": "ログファイルの出力ディレクトリー:",
   "admin.log.logSettings": "LDAPの設定",
+  "admin.log.noteDescription": "このセクションの <a href=\"#EnableWebhookDebugging\">ウェブフックのデバッグを有効にする</a> と <a href=\"#EnableDiagnostics\">診断とエラーレポートを有効にする</a> 以外の設定の変更を有効にするには、サーバーの再起動が必要です。",
   "admin.logs.bannerDesc": "ユーザーIDかトークンIDでユーザーを検索するには、リポート > ユーザーへ行き検索フィルターにIDをペーストしてください。",
   "admin.logs.next": "次へ",
   "admin.logs.prev": "前へ",
@@ -1566,10 +1567,10 @@
   "email_signup.emailError": "有効な電子メールアドレスを入力してください。",
   "email_signup.find": "参加しているチームを探す",
   "email_verify.almost": "{siteName}: あともう少しです",
-  "email_verify.failed": " 確認電子メールが送信できませんでした。",
+  "email_verify.failed": " 確認メールが送信できませんでした。",
   "email_verify.notVerifiedBody": "電子メールアドレスを確認します。電子メールの受信ボックスを見てみてください。",
   "email_verify.resend": "電子メールを再送信する",
-  "email_verify.sent": " 確認電子メールを送信しました。",
+  "email_verify.sent": " 確認メールを送信しました。",
   "email_verify.verified": "{siteName}電子メールが確認されました",
   "email_verify.verifiedBody": "<p>あなたの電子メールアドレスは確認されました! <a href={url}>here</a>をクリックしてログインしてください。</p>",
   "emoji_list.actions": "アクション",
@@ -2071,6 +2072,7 @@
   "mobile.create_channel": "作成する",
   "mobile.create_channel.private": "新しい非公開チャンネル",
   "mobile.create_channel.public": "新しい公開チャンネル",
+  "mobile.create_post.read_only": "このチャンネルは読み取り専用です",
   "mobile.custom_list.no_results": "該当するものはありません",
   "mobile.document_preview.failed_description": "文書を開く際にエラーが発生しました。{fileType}ビューワーがインストールされていることを確認し、再度実行してください。\n",
   "mobile.document_preview.failed_title": "文書を開けませんでした",
@@ -2107,11 +2109,16 @@
   "mobile.extension.permission": "ファイルを共有するためにMattermostがデバイスへのアクセスを要求しています。",
   "mobile.extension.posting": "投稿しています…",
   "mobile.extension.title": "Mattermostで共有する",
+  "mobile.failed_network_action.description": "インターネット接続に問題があるようです。接続を確認し、再度実行してください。",
+  "mobile.failed_network_action.retry": "再実行",
+  "mobile.failed_network_action.title": "インターネット未接続",
   "mobile.file_upload.camera": "写真もしくはビデオを撮る",
   "mobile.file_upload.library": "フォトライブラリー",
   "mobile.file_upload.max_warning": "最大5ファイルまでアップロードできます。",
   "mobile.file_upload.more": "もっと",
   "mobile.file_upload.video": "ビデオライブラリー",
+  "mobile.flagged_posts.empty_description": "フラグはメッセージに追跡のためのマークを付ける一つの方法です。あなたのフラグは個人のもので、他のユーザーからは見えません。",
+  "mobile.flagged_posts.empty_title": "フラグの立てられた投稿はありません",
   "mobile.help.title": "ヘルプ",
   "mobile.image_preview.deleted_post_message": "この投稿と添付ファイルは削除されました。プレビューを閉じます。",
   "mobile.image_preview.deleted_post_title": "投稿が削除されました",
@@ -2132,7 +2139,7 @@
   "mobile.managed.jailbreak": "Jailbrokenデバイスは{vendor}から信頼されていません。アプリを終了してください。",
   "mobile.managed.secured_by": "{vendor}により保護されました",
   "mobile.markdown.code.copy_code": "コードのコピー",
-  "mobile.markdown.code.plusMoreLines": "あと {count, number} {count, plural, one {line} other {lines}} 追加できます",
+  "mobile.markdown.code.plusMoreLines": "あと {count, number} {count, plural, one {line} other {lines}} あります",
   "mobile.markdown.image.error": "読み込みに失敗した画像:",
   "mobile.markdown.image.too_large": "画像が {maxWidth} x {maxHeight} の上限を超えています:",
   "mobile.markdown.link.copy_url": "URL のコピー",
@@ -2198,6 +2205,8 @@
   "mobile.post_textbox.uploadFailedDesc": "サーバーへの添付ファイルのアップロードが失敗しました。メッセージを投稿したいかを確認してください。",
   "mobile.post_textbox.uploadFailedTitle": "添付エラー",
   "mobile.posts_view.moreMsg": "さらに新しいメッセージがあります",
+  "mobile.recent_mentions.empty_description": "あなたのユーザー名やあなたについての投稿となる単語が含まれた投稿は、ここに表示されます。",
+  "mobile.recent_mentions.empty_title": "あなたについての投稿はありません",
   "mobile.rename_channel.display_name_maxLength": "チャンネル名は {maxLength, number} 文字未満でなくてはなりません",
   "mobile.rename_channel.display_name_minLength": "チャンネル名は {minLength, number} 文字以上でなくてはなりません",
   "mobile.rename_channel.display_name_required": "チャンネル名が必要です",
@@ -2802,7 +2811,7 @@
   "user.settings.display.preferTime": "時刻の表示形式を選択します。",
   "user.settings.display.teammateNameDisplayDescription": "投稿やダイレクトメッセージ中の他のユーザーの名前の表示方法を設定します。",
   "user.settings.display.teammateNameDisplayFullname": "氏名を表示する",
-  "user.settings.display.teammateNameDisplayNicknameFullname": "ニックネームあればそれを表示する。無ければ氏名を表示する。",
+  "user.settings.display.teammateNameDisplayNicknameFullname": "ニックネームがあればそれを表示する。無ければ氏名を表示する。",
   "user.settings.display.teammateNameDisplayTitle": "チームメイトの名前の表示",
   "user.settings.display.teammateNameDisplayUsername": "ユーザー名を表示する",
   "user.settings.display.theme.applyToAllTeams": "全ての自分のチームに新しいテーマを適用する",
diff --git a/assets/base/i18n/ko.json b/assets/base/i18n/ko.json
index 9bd4e15af..4cf1f4e3d 100644
--- a/assets/base/i18n/ko.json
+++ b/assets/base/i18n/ko.json
@@ -691,6 +691,7 @@
   "admin.log.locationPlaceholder": "파일 위치를 지정하세요.",
   "admin.log.locationTitle": "파일 로그 경로:",
   "admin.log.logSettings": "로그 설정",
+  "admin.log.noteDescription": "Changing properties other than <a href=\"#EnableWebhookDebugging\">Enable Webhook Debugging</a> and <a href=\"#EnableDiagnostics\">Enable Diagnostics and Error Reporting</a> in this section will require a server restart before taking effect.",
   "admin.logs.bannerDesc": "To look up users by User ID or Token ID, go to Reporting > Users and paste the ID into the search filter.",
   "admin.logs.next": "다음",
   "admin.logs.prev": "이전",
@@ -2071,6 +2072,7 @@
   "mobile.create_channel": "Create",
   "mobile.create_channel.private": "새 비공개 채널",
   "mobile.create_channel.public": "공개 채널",
+  "mobile.create_post.read_only": "This channel is read-only",
   "mobile.custom_list.no_results": "No Results",
   "mobile.document_preview.failed_description": "An error occurred while opening the document. Please make sure you have a {fileType} viewer installed and try again.\n",
   "mobile.document_preview.failed_title": "Open Document failed",
@@ -2107,11 +2109,16 @@
   "mobile.extension.permission": "Mattermost needs access to the device storage to share files.",
   "mobile.extension.posting": "테스트 중...",
   "mobile.extension.title": "Share in Mattermost",
+  "mobile.failed_network_action.description": "There seems to be a problem with your internet connection. Make sure you have an active connection and try again.",
+  "mobile.failed_network_action.retry": "Try Again",
+  "mobile.failed_network_action.title": "No internet connection",
   "mobile.file_upload.camera": "Take Photo or Video",
   "mobile.file_upload.library": "Photo Library",
   "mobile.file_upload.max_warning": "Uploads limited to 5 files maximum.",
   "mobile.file_upload.more": "더 보기",
   "mobile.file_upload.video": "Video Library",
+  "mobile.flagged_posts.empty_description": "중요한 메시지를 따로 모아 확인할 수 있습니다. 중요 메시지는 개인별로 표시되며 다른 사람이 볼 수 없습니다.",
+  "mobile.flagged_posts.empty_title": "중요 메시지",
   "mobile.help.title": "도움말",
   "mobile.image_preview.deleted_post_message": "This post and its files have been deleted. The previewer will now be closed.",
   "mobile.image_preview.deleted_post_title": "Post Deleted",
@@ -2198,6 +2205,8 @@
   "mobile.post_textbox.uploadFailedDesc": "Some attachments failed to upload to the server, Are you sure you want to post the message?",
   "mobile.post_textbox.uploadFailedTitle": "Attachment failure",
   "mobile.posts_view.moreMsg": "More New Messages Above",
+  "mobile.recent_mentions.empty_description": "Messages containing your username and other words that trigger mentions will appear here.",
+  "mobile.recent_mentions.empty_title": "최근 멘션",
   "mobile.rename_channel.display_name_maxLength": "Channel name must be less than {maxLength, number} characters",
   "mobile.rename_channel.display_name_minLength": "Channel name must be {minLength, number} or more characters",
   "mobile.rename_channel.display_name_required": "Channel name is required",
diff --git a/assets/base/i18n/nl.json b/assets/base/i18n/nl.json
index d89600c2d..e36a8e431 100644
--- a/assets/base/i18n/nl.json
+++ b/assets/base/i18n/nl.json
@@ -691,6 +691,7 @@
   "admin.log.locationPlaceholder": "Voer uw bestand locatie in",
   "admin.log.locationTitle": "Map voor logs:",
   "admin.log.logSettings": "Log instellingen",
+  "admin.log.noteDescription": "Changing properties other than <a href=\"#EnableWebhookDebugging\">Enable Webhook Debugging</a> and <a href=\"#EnableDiagnostics\">Enable Diagnostics and Error Reporting</a> in this section will require a server restart before taking effect.",
   "admin.logs.bannerDesc": "To look up users by User ID or Token ID, go to Reporting > Users and paste the ID into the search filter.",
   "admin.logs.next": "Volgende",
   "admin.logs.prev": "Previous",
@@ -2071,6 +2072,7 @@
   "mobile.create_channel": "Create",
   "mobile.create_channel.private": "Verlaat kanaal",
   "mobile.create_channel.public": "Publieke kanalen",
+  "mobile.create_post.read_only": "This channel is read-only",
   "mobile.custom_list.no_results": "No Results",
   "mobile.document_preview.failed_description": "An error occurred while opening the document. Please make sure you have a {fileType} viewer installed and try again.\n",
   "mobile.document_preview.failed_title": "Open Document failed",
@@ -2107,11 +2109,16 @@
   "mobile.extension.permission": "Mattermost needs access to the device storage to share files.",
   "mobile.extension.posting": "Testen...",
   "mobile.extension.title": "Share in Mattermost",
+  "mobile.failed_network_action.description": "There seems to be a problem with your internet connection. Make sure you have an active connection and try again.",
+  "mobile.failed_network_action.retry": "Try Again",
+  "mobile.failed_network_action.title": "No internet connection",
   "mobile.file_upload.camera": "Take Photo or Video",
   "mobile.file_upload.library": "Photo Library",
   "mobile.file_upload.max_warning": "Uploads limited to 5 files maximum.",
   "mobile.file_upload.more": "Meer",
   "mobile.file_upload.video": "Video bibliotheek",
+  "mobile.flagged_posts.empty_description": "Flags are a way to mark messages for follow up. Your flags are personal, and cannot be seen by other users.",
+  "mobile.flagged_posts.empty_title": "Gemarkeerde Berichten",
   "mobile.help.title": "Help",
   "mobile.image_preview.deleted_post_message": "This post and its files have been deleted. The previewer will now be closed.",
   "mobile.image_preview.deleted_post_title": "Post Deleted",
@@ -2198,6 +2205,8 @@
   "mobile.post_textbox.uploadFailedDesc": "Some attachments failed to upload to the server, Are you sure you want to post the message?",
   "mobile.post_textbox.uploadFailedTitle": "Attachment failure",
   "mobile.posts_view.moreMsg": "More New Messages Above",
+  "mobile.recent_mentions.empty_description": "Messages containing your username and other words that trigger mentions will appear here.",
+  "mobile.recent_mentions.empty_title": "Recente vermeldingen",
   "mobile.rename_channel.display_name_maxLength": "Channel name must be less than {maxLength, number} characters",
   "mobile.rename_channel.display_name_minLength": "Channel name must be {minLength, number} or more characters",
   "mobile.rename_channel.display_name_required": "Channel name is required",
diff --git a/assets/base/i18n/pl.json b/assets/base/i18n/pl.json
index 22c488340..716da3604 100644
--- a/assets/base/i18n/pl.json
+++ b/assets/base/i18n/pl.json
@@ -691,6 +691,7 @@
   "admin.log.locationPlaceholder": "Wprowadź lokalizacje pliku",
   "admin.log.locationTitle": "Katalog z plikami logów:",
   "admin.log.logSettings": "Ustawienia dziennika",
+  "admin.log.noteDescription": "Changing properties other than <a href=\"#EnableWebhookDebugging\">Enable Webhook Debugging</a> and <a href=\"#EnableDiagnostics\">Enable Diagnostics and Error Reporting</a> in this section will require a server restart before taking effect.",
   "admin.logs.bannerDesc": "Aby wyszukać użytkowników według identyfikatora użytkownika, przejdź do Raportowanie > Użytkownicy i wklej identyfikator do filtra wyszukiwania.",
   "admin.logs.next": "Dalej",
   "admin.logs.prev": "Wstecz",
@@ -2071,6 +2072,7 @@
   "mobile.create_channel": "Utwórz",
   "mobile.create_channel.private": "Nowy kanał prywatny",
   "mobile.create_channel.public": "Nowy kanał publiczny",
+  "mobile.create_post.read_only": "This channel is read-only",
   "mobile.custom_list.no_results": "Brak wyników",
   "mobile.document_preview.failed_description": "An error occurred while opening the document. Please make sure you have a {fileType} viewer installed and try again.\n",
   "mobile.document_preview.failed_title": "Open Document failed",
@@ -2107,11 +2109,16 @@
   "mobile.extension.permission": "Mattermost needs access to the device storage to share files.",
   "mobile.extension.posting": "Testowanie...",
   "mobile.extension.title": "Share in Mattermost",
+  "mobile.failed_network_action.description": "There seems to be a problem with your internet connection. Make sure you have an active connection and try again.",
+  "mobile.failed_network_action.retry": "Spróbuj ponownie",
+  "mobile.failed_network_action.title": "Brak połączenia z internetem",
   "mobile.file_upload.camera": "Zrób Zdjęcie lub nagraj Film",
   "mobile.file_upload.library": "Biblioteka Zdjęć",
   "mobile.file_upload.max_warning": "Uploads limited to 5 files maximum.",
   "mobile.file_upload.more": "Więcej",
   "mobile.file_upload.video": "Biblioteka wideo",
+  "mobile.flagged_posts.empty_description": "Oznaczanie wiadomości stanowi sposób ich zapisywania \"na później\". Twoje flagi są poufne i nie są widoczne dla innych użytkowników.",
+  "mobile.flagged_posts.empty_title": "Oznaczone posty",
   "mobile.help.title": "Pomoc",
   "mobile.image_preview.deleted_post_message": "This post and its files have been deleted. The previewer will now be closed.",
   "mobile.image_preview.deleted_post_title": "Post Deleted",
@@ -2198,6 +2205,8 @@
   "mobile.post_textbox.uploadFailedDesc": "Some attachments failed to upload to the server, Are you sure you want to post the message?",
   "mobile.post_textbox.uploadFailedTitle": "Attachment failure",
   "mobile.posts_view.moreMsg": "More New Messages Above",
+  "mobile.recent_mentions.empty_description": "Messages containing your username and other words that trigger mentions will appear here.",
+  "mobile.recent_mentions.empty_title": "Ostatnie wzmianki",
   "mobile.rename_channel.display_name_maxLength": "Channel name must be less than {maxLength, number} characters",
   "mobile.rename_channel.display_name_minLength": "Channel name must be {minLength, number} or more characters",
   "mobile.rename_channel.display_name_required": "Channel name is required",
diff --git a/assets/base/i18n/pt-BR.json b/assets/base/i18n/pt-BR.json
index c411d1ebb..2e1652c2c 100644
--- a/assets/base/i18n/pt-BR.json
+++ b/assets/base/i18n/pt-BR.json
@@ -691,6 +691,7 @@
   "admin.log.locationPlaceholder": "Entre a localização do seu arquivo",
   "admin.log.locationTitle": "Diretório de Arquivo de Log:",
   "admin.log.logSettings": "Configurações de Log",
+  "admin.log.noteDescription": "Changing properties other than <a href=\"#EnableWebhookDebugging\">Enable Webhook Debugging</a> and <a href=\"#EnableDiagnostics\">Enable Diagnostics and Error Reporting</a> in this section will require a server restart before taking effect.",
   "admin.logs.bannerDesc": "Para procurar por usuário pelo ID do usuário ou token, vá em Relatórios > Usuários e cole o ID no filtro de busca.",
   "admin.logs.next": "Próximo",
   "admin.logs.prev": "Anterior",
@@ -2071,6 +2072,7 @@
   "mobile.create_channel": "Criar",
   "mobile.create_channel.private": "Novo Canal Privado",
   "mobile.create_channel.public": "Novo Canal Público",
+  "mobile.create_post.read_only": "This channel is read-only",
   "mobile.custom_list.no_results": "Nenhum Resultado",
   "mobile.document_preview.failed_description": "Um erro aconteceu durante a abertura do documento. Por favor verifique que você tem o visualizador para {fileType} instalado e tente novamente.\n",
   "mobile.document_preview.failed_title": "Falha ao Abrir o Documento",
@@ -2107,11 +2109,16 @@
   "mobile.extension.permission": "Mattermost precisa de acesso ao armazenamento do dispositivo para compartilhar arquivos.",
   "mobile.extension.posting": "Postando...",
   "mobile.extension.title": "Compartilhar no Mattermost",
+  "mobile.failed_network_action.description": "There seems to be a problem with your internet connection. Make sure you have an active connection and try again.",
+  "mobile.failed_network_action.retry": "Tentar novamente",
+  "mobile.failed_network_action.title": "Sem conexão com a internet",
   "mobile.file_upload.camera": "Tirar Foto ou Vídeo",
   "mobile.file_upload.library": "Biblioteca de Fotos",
   "mobile.file_upload.max_warning": "Upload limitado ao máximo de 5 arquivos.",
   "mobile.file_upload.more": "Mais",
   "mobile.file_upload.video": "Galeria de Videos",
+  "mobile.flagged_posts.empty_description": "As bandeiras são uma forma de marcar as mensagens para segui-la. Suas bandeiras são pessoais, e não podem ser vistas por outros usuários.",
+  "mobile.flagged_posts.empty_title": "Posts Marcados",
   "mobile.help.title": "Ajuda",
   "mobile.image_preview.deleted_post_message": "Esta mensagem e seus arquivos foram excluídos. O visualizador será fechado.",
   "mobile.image_preview.deleted_post_title": "Mensagem Deletada",
@@ -2198,6 +2205,8 @@
   "mobile.post_textbox.uploadFailedDesc": "Alguns anexos não foram enviados para o servidor. Tem certeza de que deseja postar a mensagem?",
   "mobile.post_textbox.uploadFailedTitle": "Falha no anexo",
   "mobile.posts_view.moreMsg": "Acima Mais Mensagens Novas",
+  "mobile.recent_mentions.empty_description": "Messages containing your username and other words that trigger mentions will appear here.",
+  "mobile.recent_mentions.empty_title": "Menções Recentes",
   "mobile.rename_channel.display_name_maxLength": "Nome do canal precisa ter menos de {maxLength, number} caracteres",
   "mobile.rename_channel.display_name_minLength": "Nome do canal deve ter {minLength, number} caracteres ou mais",
   "mobile.rename_channel.display_name_required": "Nome do canal é obrigatório",
diff --git a/assets/base/i18n/ru.json b/assets/base/i18n/ru.json
index afd76ebcd..494e84afe 100644
--- a/assets/base/i18n/ru.json
+++ b/assets/base/i18n/ru.json
@@ -691,6 +691,7 @@
   "admin.log.locationPlaceholder": "Укажите расположение файла",
   "admin.log.locationTitle": "Каталог с файлом журнала:",
   "admin.log.logSettings": "Настройки журнала",
+  "admin.log.noteDescription": "Changing properties other than <a href=\"#EnableWebhookDebugging\">Enable Webhook Debugging</a> and <a href=\"#EnableDiagnostics\">Enable Diagnostics and Error Reporting</a> in this section will require a server restart before taking effect.",
   "admin.logs.bannerDesc": "To look up users by User ID or Token ID, go to Reporting > Users and paste the ID into the search filter.",
   "admin.logs.next": "Далее",
   "admin.logs.prev": "Предыдущая",
@@ -2071,6 +2072,7 @@
   "mobile.create_channel": "Создать",
   "mobile.create_channel.private": "Новый приватный канал",
   "mobile.create_channel.public": "Новый публичный канал",
+  "mobile.create_post.read_only": "This channel is read-only",
   "mobile.custom_list.no_results": "Нет результатов",
   "mobile.document_preview.failed_description": "An error occurred while opening the document. Please make sure you have a {fileType} viewer installed and try again.\n",
   "mobile.document_preview.failed_title": "Open Document failed",
@@ -2107,11 +2109,16 @@
   "mobile.extension.permission": "Mattermost needs access to the device storage to share files.",
   "mobile.extension.posting": "Проверка...",
   "mobile.extension.title": "Share in Mattermost",
+  "mobile.failed_network_action.description": "There seems to be a problem with your internet connection. Make sure you have an active connection and try again.",
+  "mobile.failed_network_action.retry": "Попробовать ещё раз",
+  "mobile.failed_network_action.title": "Нет соединения с интернетом",
   "mobile.file_upload.camera": "Сделать фото или видео",
   "mobile.file_upload.library": "Библиотека изображений",
   "mobile.file_upload.max_warning": "Uploads limited to 5 files maximum.",
   "mobile.file_upload.more": "Еще",
   "mobile.file_upload.video": "Библиотека видео",
+  "mobile.flagged_posts.empty_description": "Флаги - один из способов, пометки сообщений для последующей деятельности. Ваши флаги не могут быть просмотрены другими пользователями.",
+  "mobile.flagged_posts.empty_title": "Отмеченные сообщения",
   "mobile.help.title": "Помощь",
   "mobile.image_preview.deleted_post_message": "This post and its files have been deleted. The previewer will now be closed.",
   "mobile.image_preview.deleted_post_title": "Post Deleted",
@@ -2198,6 +2205,8 @@
   "mobile.post_textbox.uploadFailedDesc": "Some attachments failed to upload to the server, Are you sure you want to post the message?",
   "mobile.post_textbox.uploadFailedTitle": "Attachment failure",
   "mobile.posts_view.moreMsg": "More New Messages Above",
+  "mobile.recent_mentions.empty_description": "Messages containing your username and other words that trigger mentions will appear here.",
+  "mobile.recent_mentions.empty_title": "Недавние упоминания",
   "mobile.rename_channel.display_name_maxLength": "Channel name must be less than {maxLength, number} characters",
   "mobile.rename_channel.display_name_minLength": "Channel name must be {minLength, number} or more characters",
   "mobile.rename_channel.display_name_required": "Channel name is required",
diff --git a/assets/base/i18n/tr.json b/assets/base/i18n/tr.json
index 48de9135f..e3de32e02 100644
--- a/assets/base/i18n/tr.json
+++ b/assets/base/i18n/tr.json
@@ -691,6 +691,7 @@
   "admin.log.locationPlaceholder": "Dosyanızın konumunu yazın",
   "admin.log.locationTitle": "Dosya Günlüğü Klasörü:",
   "admin.log.logSettings": "Günlük Ayarları",
+  "admin.log.noteDescription": "Changing properties other than <a href=\"#EnableWebhookDebugging\">Enable Webhook Debugging</a> and <a href=\"#EnableDiagnostics\">Enable Diagnostics and Error Reporting</a> in this section will require a server restart before taking effect.",
   "admin.logs.bannerDesc": "Kullanıcıları Kullanıcı Kodu ya da Erişim Koduna göre aramak için Raporlar > Kullanıcılar bölümüne giderek arama süzgecine kodu yapıştırın.",
   "admin.logs.next": "Sonraki",
   "admin.logs.prev": "Önceki",
@@ -2071,6 +2072,7 @@
   "mobile.create_channel": "Ekle",
   "mobile.create_channel.private": "Yeni Özel Kanal",
   "mobile.create_channel.public": "Yeni Herkese Açık Kanal",
+  "mobile.create_post.read_only": "This channel is read-only",
   "mobile.custom_list.no_results": "Herhangi bir sonuç bulunamadı",
   "mobile.document_preview.failed_description": "Belge açılırken bir sorun çıktı. Lütfen {fileType} türündeki dosyalar için bir görüntüleyicinin kurulmuş olduğundan emin olun ve yeniden deneyin.\n",
   "mobile.document_preview.failed_title": "Belge Açılamadı",
@@ -2107,11 +2109,16 @@
   "mobile.extension.permission": "Mattermost dosyaları paylaşabilmek için depolama aygıtlarına erişebilmelidir.",
   "mobile.extension.posting": "Gönderiliyor...",
   "mobile.extension.title": "Mattermost Üzerinde Paylaş",
+  "mobile.failed_network_action.description": "There seems to be a problem with your internet connection. Make sure you have an active connection and try again.",
+  "mobile.failed_network_action.retry": "Yeniden Dene",
+  "mobile.failed_network_action.title": "İnternet bağlantısı yok",
   "mobile.file_upload.camera": "Fotoğraf ya da Görüntü Çek",
   "mobile.file_upload.library": "Fotoğraf Kitaplığı",
   "mobile.file_upload.max_warning": "En fazla 5 dosya yüklenebilir.",
   "mobile.file_upload.more": "Diğer",
   "mobile.file_upload.video": "Görüntü Kitaplığı",
+  "mobile.flagged_posts.empty_description": "İşaretler iletileri izlemek için kullanılır. İşaretleriniz kişiseldir ve başka kullanıcılar tarafından görülemez.",
+  "mobile.flagged_posts.empty_title": "İşaretlenmiş İletiler",
   "mobile.help.title": "Yardım",
   "mobile.image_preview.deleted_post_message": "Bu ileti ve dosyaları silinmiş. Ön izleme penceresi kapatılacak.",
   "mobile.image_preview.deleted_post_title": "İleti Silinmiş",
@@ -2198,6 +2205,8 @@
   "mobile.post_textbox.uploadFailedDesc": "Bazı ek dosyaları sunucuya yüklenemedi. İletiyi göndermek istediğinize emin misiniz?",
   "mobile.post_textbox.uploadFailedTitle": "Ek dosya yüklenemedi",
   "mobile.posts_view.moreMsg": "Yukarıdaki Diğer Yeni İletiler",
+  "mobile.recent_mentions.empty_description": "Messages containing your username and other words that trigger mentions will appear here.",
+  "mobile.recent_mentions.empty_title": "Son Anmalar",
   "mobile.rename_channel.display_name_maxLength": "Kanal adı en fazla {maxLength, number} karakter uzunluğunda olmalıdır",
   "mobile.rename_channel.display_name_minLength": "Kanal adı en az {minLength, number} karakter uzunluğunda olmalıdır",
   "mobile.rename_channel.display_name_required": "Kanal adı zorunludur",
diff --git a/assets/base/i18n/zh-CN.json b/assets/base/i18n/zh-CN.json
index ed4e0e4b3..02acd779f 100644
--- a/assets/base/i18n/zh-CN.json
+++ b/assets/base/i18n/zh-CN.json
@@ -123,7 +123,7 @@
   "add_oauth_app.trusted.help": "当设为是时，OAuth 2.0 应用将被 Mattermost 服务器信任且不需用户同意授权。当设为否时，将会弹出新窗口询问用户同意或拒绝授权。",
   "add_oauth_app.url": "<b>网址</b>：{url}",
   "add_outgoing_webhook.callbackUrls": "回调URL（每行一个）",
-  "add_outgoing_webhook.callbackUrls.help": "The URL that messages will be sent to. If the URL is private, add it as a {link}.",
+  "add_outgoing_webhook.callbackUrls.help": "消息发送的网址。如果网址是私有的，请使用 {link} 新增。",
   "add_outgoing_webhook.callbackUrls.helpLinkText": "可信任的内部连接",
   "add_outgoing_webhook.callbackUrlsRequired": "需要一个或多个回调URL",
   "add_outgoing_webhook.cancel": "取消",
@@ -181,14 +181,14 @@
   "admin.cluster.OverrideHostnameDesc": "The default value of <blank> will attempt to get the Hostname from the OS or use the IP Address.  You can override the hostname of this server with this property.  It is not recommended to override the Hostname unless needed. This property can also be set to a specific IP Address if needed.",
   "admin.cluster.OverrideHostnameEx": "例如：\"app-server-01\"",
   "admin.cluster.ReadOnlyConfig": "只读配置：",
-  "admin.cluster.ReadOnlyConfigDesc": "When true, the server will reject changes made to the configuration file from the system console. When running in production it is recommened to set this to true.",
+  "admin.cluster.ReadOnlyConfigDesc": "当设为是时，服务器将拒绝从系统控制台对配置文件的更改。建议在正式环境下开启。",
   "admin.cluster.StreamingPort": "流端口：",
-  "admin.cluster.StreamingPortDesc": "The port used for streaming data between servers.",
+  "admin.cluster.StreamingPortDesc": "用在服务器之间数据流通讯的端口。",
   "admin.cluster.StreamingPortEx": "例如：\"8075\"",
-  "admin.cluster.UseExperimentalGossip": "Use Experimental Gossip:",
+  "admin.cluster.UseExperimentalGossip": "使用实验性质的 Gossip：",
   "admin.cluster.UseExperimentalGossipDesc": "When true, the server will attempt to communicate via the gossip protocol over the gossip port.  When false the server will attempt to communicate over the streaming port. When false the gossip port and protocol are still used to determine cluster health.",
   "admin.cluster.UseIpAddress": "使用 IP 地址：",
-  "admin.cluster.UseIpAddressDesc": "When true, the cluster will attempt to communicate via IP Address vs using the hostname.",
+  "admin.cluster.UseIpAddressDesc": "当设为是时，机群将尝试用 IP 地址通讯而不是主机名。",
   "admin.cluster.enableDescription": "当设为是时，Mattermost 将以高可用性模式运行。请参考<a href=\"http://docs.mattermost.com/deployment/cluster.html\" target='_blank'>文档</a>了解 Mattermost 的高可用性。",
   "admin.cluster.enableTitle": "开启高可用性模式：",
   "admin.cluster.interNodeListenAddressDesc": "服务器与其他服务器通讯的监听地址。",
@@ -233,7 +233,7 @@
   "admin.complianceExport.exportJobStartTime.title": "合规导出时间：",
   "admin.complianceExport.globalRelayCustomerType.a10.description": "A10/Type 10",
   "admin.complianceExport.globalRelayCustomerType.a9.description": "A9/Type 9",
-  "admin.complianceExport.globalRelayCustomerType.description": "Type of Global Relay customer account your organization has.",
+  "admin.complianceExport.globalRelayCustomerType.description": "您的组织拥有的 Global Relay 客户帐号类型。",
   "admin.complianceExport.globalRelayCustomerType.title": "Global Relay 客户帐号：",
   "admin.complianceExport.globalRelayEmailAddress.description": "您的 Global Relay 服务器监视的合规导入用的邮箱地址。",
   "admin.complianceExport.globalRelayEmailAddress.example": "例如 \"globalrelay@mattermost.com\"",
@@ -691,6 +691,7 @@
   "admin.log.locationPlaceholder": "输入你的文件位置",
   "admin.log.locationTitle": "日志文件目录：",
   "admin.log.logSettings": "日志设置",
+  "admin.log.noteDescription": "Changing properties other than <a href=\"#EnableWebhookDebugging\">Enable Webhook Debugging</a> and <a href=\"#EnableDiagnostics\">Enable Diagnostics and Error Reporting</a> in this section will require a server restart before taking effect.",
   "admin.logs.bannerDesc": "到 报告 > 用户 并在搜索过滤器输入 ID 以用户 ID  或令牌 ID 查找用户。",
   "admin.logs.next": "下一步",
   "admin.logs.prev": "上一页",
@@ -771,7 +772,7 @@
   "admin.plugin.id": "Id:",
   "admin.plugin.installedDesc": "已在您的 Mattermost 服务器安装的插件。预安装的插件可被停用但不能删除。",
   "admin.plugin.installedTitle": "已安装的插件：",
-  "admin.plugin.management.banner": "Plugins are disabled on your server. To enable them, go to <strong>Plugins > Configuration</strong>.",
+  "admin.plugin.management.banner": "插件在服务器上已停用。请到 <strong>插件 > 设定</strong> 开启。",
   "admin.plugin.management.title": "管理",
   "admin.plugin.name": "名称：",
   "admin.plugin.no_plugins": "没有已安装的插件。",
@@ -936,9 +937,9 @@
   "admin.service.enforceMfaDesc": "当设为是时，必须需要<a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>多重验证</a>登入。新用户将在注册时候设置多重验证。已登入并未设置多重验证的用户将重指向多重验证设置页面直到配置完成。<br/><br/>如果您的系统有 AD/LDAP 或电子邮件登入方式以外的用户，多重验证必须在 Mattermost 外的验证提供商设置。",
   "admin.service.enforceMfaTitle": "强制多重身份验证：",
   "admin.service.forward80To443": "映射端口 80 到 443:",
-  "admin.service.forward80To443Description": "Forwards all insecure traffic from port 80 to secure port 443. Not recommended when using a proxy server.",
-  "admin.service.forward80To443Description.disabled": "Forwards all insecure traffic from port 80 to secure port 443. Not recommended when using a proxy server.<br /><br />This setting cannot be enabled until your server is <a href=\"#ListenAddress\">listening</a> on port 443.",
-  "admin.service.googleDescription": "设置此钥匙以开启内嵌YouTube视频预览。如果没有此钥匙，YouTube预览仍然会在消息或评论中显示但不会显示视频标题。参见<a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target='_blank'>Google Developers Tutorial</a>教程以获得钥匙。",
+  "admin.service.forward80To443Description": "将所有不安全的通讯从端口 80 转至端口 443。使用代理服务器时不推荐。",
+  "admin.service.forward80To443Description.disabled": "将所有不安全的通讯从端口 80 转至端口 443。使用代理服务器时不推荐。<br /><br />此设定只有在服务器<a href=\"#ListenAddress\">监听</a>端口 443 时可以开启。",
+  "admin.service.googleDescription": "设置此钥匙以开启内嵌 YouTube 视频预览。如果没有此钥匙，YouTube 预览仍然会在消息或评论中显示但不会显示视频标题。参见<a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target='_blank'>Google Developers Tutorial</a> 教程以获得钥匙。",
   "admin.service.googleExample": "例如 \"7rAh6iwQCkV4cA1Gsg3fgGOXJAQ43QV\"",
   "admin.service.googleTitle": "Google API 钥匙：",
   "admin.service.iconDescription": "当设为是时，webhooks、斜杠命令以及其他整合比如 <a href=\"https://docs.mattermost.com/integrations/zapier.html\" target='_blank'>Zapier</a> 会允许修改发出信息的头像。注意：和允许整合覆盖用户名配合将可能造成用户被钓鱼攻击。",
@@ -985,7 +986,7 @@
   "admin.service.tlsKeyFile": "TLS 密钥文件：",
   "admin.service.tlsKeyFileDescription": "使用的私钥文件。",
   "admin.service.useLetsEncrypt": "使用 Let's Encrypt：",
-  "admin.service.useLetsEncryptDescription": "开启自动从 Let's Encrypt 获取证书。证书将在客户端尝试从新的域名连接时获取。此功能可以在多域名使用。",
+  "admin.service.useLetsEncryptDescription": "开启自动从 Let's Encrypt 获取证书。证书将在客户端尝试从新的域名连接时获取。此功能将可以在多域名使用。",
   "admin.service.useLetsEncryptDescription.disabled": "Enable the automatic retrieval of certificates from Let's Encrypt. The certificate will be retrieved when a client attempts to connect from a new domain. This will work with multiple domains.<br /><br />This setting cannot be enabled unless the <a href=\"#Forward80To443\">Forward port 80 to 443</a> setting is set to true.",
   "admin.service.userAccessTokensDescLabel": "名称：",
   "admin.service.userAccessTokensDescription": "当设为是时，用户可以在<strong>帐号设置 > 安全</strong>创建<a href=\"https://about.mattermost.com/default-user-access-tokens\" target=\"_blank\">个人访问令牌</a>。他们可以用来 API 验证并拥有完全帐号权限。<br/><br/>在<strong>系统控制台 > 用户</strong>页面管理哪些用户可以创建个人访问令牌。",
@@ -2071,6 +2072,7 @@
   "mobile.create_channel": "创建",
   "mobile.create_channel.private": "新私有频道",
   "mobile.create_channel.public": "新公共频道",
+  "mobile.create_post.read_only": "此频道为只读",
   "mobile.custom_list.no_results": "无结果",
   "mobile.document_preview.failed_description": "打开文档时遇到错误。请确定您已安装 {fileType} 查看器后再重试。\n",
   "mobile.document_preview.failed_title": "打开文档失败",
@@ -2107,11 +2109,16 @@
   "mobile.extension.permission": "Mattermost 需要访问储存设备以共享文件。",
   "mobile.extension.posting": "发送中...",
   "mobile.extension.title": "分享到 Mattermost",
+  "mobile.failed_network_action.description": "您的网络连接有问题。请确认您的网络连接正常后重试。",
+  "mobile.failed_network_action.retry": "重试",
+  "mobile.failed_network_action.title": "无网络连接",
   "mobile.file_upload.camera": "拍照或视频",
   "mobile.file_upload.library": "照片库",
   "mobile.file_upload.max_warning": "最多上传 5 个文件。",
   "mobile.file_upload.more": "更多",
   "mobile.file_upload.video": "视频库",
+  "mobile.flagged_posts.empty_description": "标记信息以便之后更进。您的标记是个人的，不会被他人看到。",
+  "mobile.flagged_posts.empty_title": "无已标记的信息",
   "mobile.help.title": "帮助",
   "mobile.image_preview.deleted_post_message": "此消息和它的文件已删除。预览器即将关闭。",
   "mobile.image_preview.deleted_post_title": "消息已删除",
@@ -2126,7 +2133,7 @@
   "mobile.loading_members": "正在加载成员...",
   "mobile.loading_posts": "正在加载消息...",
   "mobile.login_options.choose_title": "选择您的登入方式",
-  "mobile.long_post_title": "{channelName} - Post",
+  "mobile.long_post_title": "{channelName} - 消息",
   "mobile.managed.blocked_by": "被 {vendor} 封锁",
   "mobile.managed.exit": "退出",
   "mobile.managed.jailbreak": "越狱的设备不被 {vendor} 信任，请退出应用。",
@@ -2195,9 +2202,11 @@
   "mobile.post_textbox.empty.message": "您正在尝试发送空白消息。\n请确认有消息或至少附加一个附件。",
   "mobile.post_textbox.empty.ok": "确定",
   "mobile.post_textbox.empty.title": "空消息",
-  "mobile.post_textbox.uploadFailedDesc": "Some attachments failed to upload to the server, Are you sure you want to post the message?",
+  "mobile.post_textbox.uploadFailedDesc": "一些附件上传失败，您确定发送此消息？",
   "mobile.post_textbox.uploadFailedTitle": "附件失败",
   "mobile.posts_view.moreMsg": "以上有更多新消息",
+  "mobile.recent_mentions.empty_description": "包含您的用户名或其他触发提及的消息将会显示在此。",
+  "mobile.recent_mentions.empty_title": "无最近提及",
   "mobile.rename_channel.display_name_maxLength": "频道名必须小于 {maxLength, number} 个字符",
   "mobile.rename_channel.display_name_minLength": "频道名必须至少 {minLength, number} 个字符",
   "mobile.rename_channel.display_name_required": "频道名为必填",
@@ -2495,8 +2504,8 @@
   "setting_item_max.save": "保存",
   "setting_item_min.edit": "编辑",
   "setting_picture.cancel": "取消",
-  "setting_picture.help.profile": "Upload a picture in BMP, JPG or PNG format.",
-  "setting_picture.help.team": "Upload a team icon in BMP, JPG or PNG format.",
+  "setting_picture.help.profile": "上传一个以 BMP、JPG 或 PNG 格式的图片。",
+  "setting_picture.help.team": "上传一个以 BMP、JPG 或 PNG 格式的团队图标。",
   "setting_picture.save": "保存",
   "setting_picture.select": "选择",
   "setting_upload.import": "导入",
@@ -2812,7 +2821,7 @@
   "user.settings.display.theme.otherThemes": "查看其他的主题",
   "user.settings.display.theme.themeColors": "主题颜色",
   "user.settings.display.theme.title": "主题",
-  "user.settings.display.timezone": "Timezone",
+  "user.settings.display.timezone": "时区",
   "user.settings.display.title": "显示设置",
   "user.settings.general.checkEmail": "在{email}查看你的邮件以验证这个地址。",
   "user.settings.general.checkEmailNoAddress": "查看你的电子邮件来验证你的新地址",
@@ -3035,9 +3044,9 @@
   "user.settings.sidebar.title": "侧边栏设置",
   "user.settings.sidebar.unreadSectionDesc": "未读频道将在频道侧栏排前直到被阅读。",
   "user.settings.sidebar.unreadSectionTitle": "未读频道分组",
-  "user.settings.timezones.automatic": "Set automatically",
-  "user.settings.timezones.change": "Change timezone",
-  "user.settings.timezones.promote": "Select the timezone used for timestamps in the user interface and email notifications.",
+  "user.settings.timezones.automatic": "自动设定",
+  "user.settings.timezones.change": "更改时区",
+  "user.settings.timezones.promote": "选择在用户界面和邮件通知中使用的时区。",
   "user.settings.tokens.activate": "启用",
   "user.settings.tokens.cancel": "取消",
   "user.settings.tokens.clickToEdit": "点击 '更改' 以管理您的个人访问令牌",
@@ -3069,7 +3078,7 @@
   "user.settings.tokens.userAccessTokensNone": "无个人访问令牌。",
   "user_list.notFound": "没有找到用户",
   "user_profile.account.editSettings": "修改账户设置",
-  "user_profile.account.localTime": "Local Time: ",
+  "user_profile.account.localTime": "本地时间：",
   "user_profile.send.dm": "发送消息",
   "user_profile.webrtc.call": "开始视频通话",
   "user_profile.webrtc.offline": "此用户已离线",
diff --git a/assets/base/i18n/zh-TW.json b/assets/base/i18n/zh-TW.json
index 16ca8c157..902bab2ce 100644
--- a/assets/base/i18n/zh-TW.json
+++ b/assets/base/i18n/zh-TW.json
@@ -691,6 +691,7 @@
   "admin.log.locationPlaceholder": "輸入檔案位置",
   "admin.log.locationTitle": "記錄檔案目錄：",
   "admin.log.logSettings": "記錄檔設定值",
+  "admin.log.noteDescription": "Changing properties other than <a href=\"#EnableWebhookDebugging\">Enable Webhook Debugging</a> and <a href=\"#EnableDiagnostics\">Enable Diagnostics and Error Reporting</a> in this section will require a server restart before taking effect.",
   "admin.logs.bannerDesc": "前往 報告 > 使用者 並在搜尋過濾條件貼上 ID 以根據使用者 ID 或 Token ID 查詢使用者。",
   "admin.logs.next": "下一頁",
   "admin.logs.prev": "上一頁",
@@ -2071,6 +2072,7 @@
   "mobile.create_channel": "建立",
   "mobile.create_channel.private": "新的私人頻道",
   "mobile.create_channel.public": "新的公開頻道",
+  "mobile.create_post.read_only": "This channel is read-only",
   "mobile.custom_list.no_results": "找不到相符的結果",
   "mobile.document_preview.failed_description": "開啟文件時發生錯誤。請確定有安裝 {fileType} 觀看程式並再次嘗試。",
   "mobile.document_preview.failed_title": "開啟文件失敗",
@@ -2107,11 +2109,16 @@
   "mobile.extension.permission": "Mattermost 需要存取裝置儲存空間以分享檔案。",
   "mobile.extension.posting": "發布中...",
   "mobile.extension.title": "分享至 Mattermost",
+  "mobile.failed_network_action.description": "There seems to be a problem with your internet connection. Make sure you have an active connection and try again.",
+  "mobile.failed_network_action.retry": "重試",
+  "mobile.failed_network_action.title": "沒有網際網路連線",
   "mobile.file_upload.camera": "照相或錄影",
   "mobile.file_upload.library": "相簿",
   "mobile.file_upload.max_warning": "上傳最多 5 個檔案。",
   "mobile.file_upload.more": "更多",
   "mobile.file_upload.video": "媒體櫃",
+  "mobile.flagged_posts.empty_description": "標記是標注訊息以追蹤後續的功能。您的標記是屬於個人的，不會被其他使用者看到。",
+  "mobile.flagged_posts.empty_title": "被標記的訊息",
   "mobile.help.title": "說明",
   "mobile.image_preview.deleted_post_message": "此訊息與檔案已被刪除。預覽器將關閉。",
   "mobile.image_preview.deleted_post_title": "訊息已刪除",
@@ -2198,6 +2205,8 @@
   "mobile.post_textbox.uploadFailedDesc": "部份附加檔案上傳時失敗，請再次確定要發布此訊息？",
   "mobile.post_textbox.uploadFailedTitle": "附加檔案失敗",
   "mobile.posts_view.moreMsg": "上面還有更多的新訊息",
+  "mobile.recent_mentions.empty_description": "Messages containing your username and other words that trigger mentions will appear here.",
+  "mobile.recent_mentions.empty_title": "最近提及",
   "mobile.rename_channel.display_name_maxLength": "頻道名稱必須少於 {maxLength, number} 字",
   "mobile.rename_channel.display_name_minLength": "頻道名稱必須至少為 {minLength, number} 個字",
   "mobile.rename_channel.display_name_required": "需要頻道名稱",