translations PR 20170102 (#4929)

21 files changed, 1353 insertions, 383 deletions

diff --git a/i18n/de.json b/i18n/de.json
index 82dbbe39a..03cea6f10 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -572,10 +572,6 @@
     "translation": "Abmelden"
   },
   {
-    "id": "api.command_logout.success_message",
-    "translation": "Abmeldung läuft..."
-  },
-  {
     "id": "api.command_me.desc",
     "translation": "Führe eine Aktion aus"
   },
@@ -644,44 +640,144 @@
     "translation": "Sie sind nun online"
   },
   {
-    "id": "api.command_shortcuts.browser",
-    "translation": "#### Eingebaute Browser-Befehle\n\nAlt+Links: Vorheriger Kanal in Ihrem Verlauf\nAlt+Rechts: Nächster Kanal in Ihrem Verlauf\nStrg+Plus: Schriftgröße vergrößern (hineinzoomen)\nStrg+Minus: Schriftgröße verkleinern (herauszoomen)\nShift+Hoch (im Eingabefeld): Text bis zur vorherigen Zeile markieren\nShift+Runter (im Eingabefeld): Text bis zur nächsten Zeile markieren\nShift+Enter (im Eingabefeld): Eine neue Zeile erstellen\n"
+    "id": "api.command_shortcuts.browser.channel_next",
+    "translation": "{{.ChannelNextCmd}}: Nächster Kanal in Ihrem Verlauf\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_next.cmd",
+    "translation": "ALT+RECHTS"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_next.cmd_mac",
+    "translation": "CMD+RECHTS"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_prev",
+    "translation": "{{.ChannelPrevCmd}}: Vorheriger Kanal in Ihrem Verlauf\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_prev.cmd",
+    "translation": "ALT+LINKS"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_prev.cmd_mac",
+    "translation": "CMD+LINKS"
+  },
+  {
+    "id": "api.command_shortcuts.browser.font_decrease",
+    "translation": "{{.CmdOrCtrl}}+MINUS: Schriftgröße verkleinern (herauszoomen)\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.font_increase",
+    "translation": "{{.CmdOrCtrl}}+PLUS: Schriftgröße erhöhen (hineinzoomen)\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.header",
+    "translation": "#### Eingebaute Browser-Befehle\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.highlight_next",
+    "translation": "SHIFT+RUNTER (im Eingabefeld): Text bis zur nächsten Zeile auswählen\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.highlight_prev",
+    "translation": "SHIFT+HOCH (im Eingabefeld): Text bis zur vorherigen Zeile auswählen\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.newline",
+    "translation": "SHIFT+ENTER (im Eingabefeld): Einen Zeilenumbruch einfügen\n"
+  },
+  {
+    "id": "api.command_shortcuts.cmd",
+    "translation": "CMD"
   },
   {
-    "id": "api.command_shortcuts.browser_mac",
-    "translation": "#### Eingebaute Browser-Befehle\n\nCmd+[: Vorheriger Kanal in Ihrem Verlauf\nCmd+]: Nächster Kanal in Ihrem Verlauf\nCmd+Plus: Schriftgröße erhöhen (hineinzoomen)\nCmd+Minus: Schriftgröße verkleinern (herauszoomen)\nShift+Hoch (im Eingabefeld): Text bis zur vorherigen Zeile markieren\nShift+Runter (im Eingabefeld): Text bis zur nächsten Zeile markieren\nShift+Enter (im Eingabefeld): Eine neue Zeile erstellen\n"
+    "id": "api.command_shortcuts.ctrl",
+    "translation": "STRG"
   },
   {
     "id": "api.command_shortcuts.desc",
     "translation": "Eine Liste der Tastaturkürzel anzeigen"
   },
   {
-    "id": "api.command_shortcuts.files",
-    "translation": "#### Dateien\n\nStrg+U: Datei(en) hochladen\n\n"
+    "id": "api.command_shortcuts.files.header",
+    "translation": "#### Dateien\n\n"
   },
   {
-    "id": "api.command_shortcuts.files_mac",
-    "translation": "#### Dateien\n\nCmd+U: Datei(en) hochladen\n\n"
+    "id": "api.command_shortcuts.files.upload",
+    "translation": "{{.CmdOrCtrl}}+U: Datei(en) hochladen\n\n"
   },
   {
-    "id": "api.command_shortcuts.msgs",
-    "translation": "#### Mitteilungen\n\nEsc: Alle Mitteilungen im aktuellen Kanal als gelesen markieren\nStrg+Hoch (in leerem Eingabefeld): Vorherige Mitteilung oder Slash-Befehl anzeigen\nStrg+Runter (in leerem Eingabefeld): Nächste Mitteilung oder Slash-Befehl anzeigen\nHoch (in leerem Eingabefeld): Die letzte Nachricht im aktuellen Kanal bearbeiten\n@[Zeichen]+Tab: @Benutzername beginnend mit [Zeichen] vervollständigen\n~[Zeichen]+Tab: Kanal beginnend mit [Zeichen] vervollständigen\n:[Zeichen]+Tab: Emoji beginnend mit [Zeichen] vervollständigen\n\n"
+    "id": "api.command_shortcuts.header",
+    "translation": "### Tastenkombinationen\n\n"
   },
   {
-    "id": "api.command_shortcuts.msgs_mac",
-    "translation": "#### Nachrichten\n\nEsc: Alle Mitteilungen im aktuellen Kanal als gelesen markieren\nCmd+Hoch (in leerem Eingabefeld): Vorherige Mitteilung oder Slash-Befehl anzeigen\nCmd+Runter (in leerem Eingabefeld): Nächste Mitteilung oder Slash-Befehl anzeigen\nHoch (in leerem Eingabefeld): Ihre letzte Nachricht im aktuellen Kanal bearbeiten\n@[Zeichen]+Tab: @Benutzername beginnend mit [Zeichen] vervollständigen\n~[Zeichen]+Tab: Kanal beginnend mit [Zeichen] vervollständigen\n:[Zeichen]+Tab: Emoji beginnend mit [Zeichen] vervollständigen\n\n"
+    "id": "api.command_shortcuts.msgs.comp_channel",
+    "translation": "~[Zeichen]+TAB: Den Kanal beginnend mit [Zeichen] autovervollständigen\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.comp_emoji",
+    "translation": ":[Zeichen]+TAB: Emoji beginnend mit [Zeichen] autovervollständigen\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.comp_username",
+    "translation": "@[Zeichen]+TAB: @Benutzername beginnend mit [Zeichen] autovervollständigen\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.edit",
+    "translation": "HOCH (im leeren Eingabefeld): Editieren Sie Ihre letzte Nachricht im aktuellen Kanal\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.header",
+    "translation": "#### Mitteilungen\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.mark_as_read",
+    "translation": "ESC: Alle Nachrichten im aktuellen Kanal als gelesen markieren\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.reprint_next",
+    "translation": "{{.CmdOrCtrl}}+HOCH (im leeren Eingabefeld): Die letzte Nachricht oder den letzten Slash-Befehl anzeigen\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.reprint_prev",
+    "translation": "{{.CmdOrCtrl}}+HOCH (im leeren Eingabefeld): Die letzte Nachricht oder den letzten Slash-Befehl anzeigen\n"
   },
   {
     "id": "api.command_shortcuts.name",
     "translation": "Tastenkürzel"
   },
   {
-    "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 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.header",
+    "translation": "#### Navigation\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.next",
+    "translation": "ALT+RUNTER: Nächsten Kanal oder Direktnachricht in der linken Seitenleiste\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.prev",
+    "translation": "ALT+HOCH: Vorheriger Kanal oder Direktnachricht in der linken Seitenleiste\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.recent_mentions",
+    "translation": "{{.CmdOrCtrl}}+SHIFT+M: Letzten Erwähnungen öffnen\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.settings",
+    "translation": "{{.CmdOrCtrl}}+SHIFT+A: Kontoeinstellungen öffnen\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.switcher",
+    "translation": "{{.CmdOrCtrl}}+K: Den Kanalschnellwechsler öffnen\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.unread_next",
+    "translation": "ALT+SHIFT+RUNTER: Nächster Kanal oder Direktnachricht mit ungelesenen Nachrichten in der linken Seitenleiste\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 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_shortcuts.nav.unread_prev",
+    "translation": "ALT+SHIFT+HOCH: Vorheriger Kanal oder Direktnachricht mit ungelesenen Nachrichten in der linken Seitenleiste\n"
   },
   {
     "id": "api.command_shrug.desc",
diff --git a/i18n/en.json b/i18n/en.json
index a9dc90013..6d52036bf 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -640,18 +640,6 @@
     "translation": "You are now online"
   },
   {
-    "id": "api.command_shortcuts.browser.channel_prev",
-    "translation": "{{.ChannelPrevCmd}}: Previous channel in your history\n"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev.cmd",
-    "translation": "ALT+LEFT"
-  },
-  {
-    "id": "api.command_shortcuts.browser.channel_prev.cmd_mac",
-    "translation": "CMD+["
-  },
-  {
     "id": "api.command_shortcuts.browser.channel_next",
     "translation": "{{.ChannelNextCmd}}: Next channel in your history\n"
   },
@@ -664,26 +652,38 @@
     "translation": "CMD+]"
   },
   {
-    "id": "api.command_shortcuts.browser.font_increase",
-    "translation": "{{.CmdOrCtrl}}+PLUS: Increase font size (zoom in)\n"
+    "id": "api.command_shortcuts.browser.channel_prev",
+    "translation": "{{.ChannelPrevCmd}}: Previous channel in your history\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_prev.cmd",
+    "translation": "ALT+LEFT"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_prev.cmd_mac",
+    "translation": "CMD+["
   },
   {
     "id": "api.command_shortcuts.browser.font_decrease",
     "translation": "{{.CmdOrCtrl}}+MINUS: Decrease font size (zoom out)\n"
   },
   {
-    "id": "api.command_shortcuts.browser.header",
-    "translation": "#### Built-in Browser Commands\n\n"
+    "id": "api.command_shortcuts.browser.font_increase",
+    "translation": "{{.CmdOrCtrl}}+PLUS: Increase font size (zoom in)\n"
   },
   {
-    "id": "api.command_shortcuts.browser.highlight_prev",
-    "translation": "SHIFT+UP (in input field): Highlight text to the previous line\n"
+    "id": "api.command_shortcuts.browser.header",
+    "translation": "#### Built-in Browser Commands\n\n"
   },
   {
     "id": "api.command_shortcuts.browser.highlight_next",
     "translation": "SHIFT+DOWN (in input field): Highlight text to the next line\n"
   },
   {
+    "id": "api.command_shortcuts.browser.highlight_prev",
+    "translation": "SHIFT+UP (in input field): Highlight text to the previous line\n"
+  },
+  {
     "id": "api.command_shortcuts.browser.newline",
     "translation": "SHIFT+ENTER (in input field): Create a new line\n"
   },
@@ -736,14 +736,14 @@
     "translation": "ESC: Mark all messages in the current channel as read\n"
   },
   {
-    "id": "api.command_shortcuts.msgs.reprint_prev",
-    "translation": "{{.CmdOrCtrl}}+UP (in empty input field): Reprint the previous message or slash command you entered\n"
-  },
-  {
     "id": "api.command_shortcuts.msgs.reprint_next",
     "translation": "{{.CmdOrCtrl}}+DOWN (in empty input field): Reprint the next message or slash command you entered\n"
   },
   {
+    "id": "api.command_shortcuts.msgs.reprint_prev",
+    "translation": "{{.CmdOrCtrl}}+UP (in empty input field): Reprint the previous message or slash command you entered\n"
+  },
+  {
     "id": "api.command_shortcuts.name",
     "translation": "shortcuts"
   },
@@ -772,14 +772,14 @@
     "translation": "{{.CmdOrCtrl}}+K: Open a quick channel switcher dialog\n"
   },
   {
-    "id": "api.command_shortcuts.nav.unread_prev",
-    "translation": "ALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\n"
-  },
-  {
     "id": "api.command_shortcuts.nav.unread_next",
     "translation": "ALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\n"
   },
   {
+    "id": "api.command_shortcuts.nav.unread_prev",
+    "translation": "ALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\n"
+  },
+  {
     "id": "api.command_shrug.desc",
     "translation": "Adds ¯\\_(ツ)_/¯ to your message"
   },
diff --git a/i18n/es.json b/i18n/es.json
index e2af6ee58..9fd52e88a 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -572,10 +572,6 @@
     "translation": "salir"
   },
   {
-    "id": "api.command_logout.success_message",
-    "translation": "Cerrando sesión..."
-  },
-  {
     "id": "api.command_me.desc",
     "translation": "Hacer una acción"
   },
@@ -644,44 +640,144 @@
     "translation": "Ahora estás disponible"
   },
   {
-    "id": "api.command_shortcuts.browser",
-    "translation": "#### Comandos incluidos en el Navegador\n\nALT+IZQ: Canal anterior en tu historial\nALT+DER: Canal siguiente en tu historial\nCTRL+MAS: Incrementa el tamaño de las letras (hace zoom)\nCTRL+MENOS: Reduce el tamaño de las letras (quita zoom)\nSHIFT+ARRIBA (en el cuadro de texto): Selecciona el texto en las lineas de arriba\nSHIFT+ABAJO (en el cuadro de texto): Selecciona el texto en las lineas de abajo\nSHIFT+RETORNO (en el cuadro de texto): Crea una nueva línea\n"
+    "id": "api.command_shortcuts.browser.channel_next",
+    "translation": "{{.ChannelNextCmd}}: canal Siguiente en el historial\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_next.cmd",
+    "translation": "ALT+DER"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_next.cmd_mac",
+    "translation": "CMD+]"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_prev",
+    "translation": "{{.ChannelPrevCmd}}: canal Anterior en el historial\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_prev.cmd",
+    "translation": "ALT+IZQ"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_prev.cmd_mac",
+    "translation": "CMD+["
+  },
+  {
+    "id": "api.command_shortcuts.browser.font_decrease",
+    "translation": "{{.CmdOrCtrl}}+MENOS: Disminuir tamaño de la fuente (alejar)\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.font_increase",
+    "translation": "{{.CmdOrCtrl}}+MAS: Aumentar tamaño de la fuente (acercar)\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.header",
+    "translation": "#### Comandos incluidos en el Navegador\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.highlight_next",
+    "translation": "MAYUS+ABAJO (en el cuadro de texto): Selecciona el texto de las linea siguiente\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.highlight_prev",
+    "translation": "MAYUS+ARRIBA (en el cuadro de texto): Selecciona el texto de las línea anterior\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.newline",
+    "translation": "MAYUS+RETORNO (en el cuadro de texto): Crea una nueva línea\n"
+  },
+  {
+    "id": "api.command_shortcuts.cmd",
+    "translation": "CMD"
   },
   {
-    "id": "api.command_shortcuts.browser_mac",
-    "translation": "#### Comandos incluidos en el Navegador\n\nCMD+[: Canal anterior en tu historial\nCMD+]: Canal siguiente en tu historial\nCMD+MAS: Incrementa el tamaño de las letras (hace zoom)\nCMD+MENOS: Reduce el tamaño de las letras (quita zoom)\nSHIFT+ARRIBA (en el cuadro de texto): Selecciona el texto en las lineas de arriba\nSHIFT+ABAJO (en el cuadro de texto): Selecciona el texto en las lineas de abajo\nSHIFT+RETORNO (en el cuadro de texto): Crea una nueva línea\n"
+    "id": "api.command_shortcuts.ctrl",
+    "translation": "CTRL"
   },
   {
     "id": "api.command_shortcuts.desc",
     "translation": "Muestra una lista de los accesos rápidos de teclado"
   },
   {
-    "id": "api.command_shortcuts.files",
-    "translation": "#### Archivos\n\nCTRL+U: Subir archivo(s)\n\n"
+    "id": "api.command_shortcuts.files.header",
+    "translation": "#### Archivos\n\n"
   },
   {
-    "id": "api.command_shortcuts.files_mac",
-    "translation": "#### Archivos\n\nCMD+U: Subir archivo(s)\n\n"
+    "id": "api.command_shortcuts.files.upload",
+    "translation": "{{.CmdOrCtrl}}+U: Subir archivo(s)\n\n"
   },
   {
-    "id": "api.command_shortcuts.msgs",
-    "translation": "#### Mensajes\n\nESC: Marca todos los mensajes como leídos en el canal actual\nCTRL+ARRIBA (con el cuadro de texto vacío): Reimprime el último mensaje o comando de barra que ingresaste\nCTRL+ABAJO (con el cuadro de texto vacío): Reimprime el siguiente mensaje o comando de barra que ingresaste\nARRIBA (con el cuadro de texto vacío): Edita tu último mensaje en el canal en el que te encuentras\n@[carácter]+TAB: Auto completa @nombre que comience por [carácter]\n~[carácter]+TAB: Autocompleta el canal que comience por [carácter]\n:[carácter]+TAB: Auto completa el emoji que comience por [carácter]\n\n"
+    "id": "api.command_shortcuts.header",
+    "translation": "### Atajos de Teclado\n\n"
   },
   {
-    "id": "api.command_shortcuts.msgs_mac",
-    "translation": "#### Mensajes\n\nESC: Marca todos los mensajes como leídos en el canal actual\nCMD+ARRIBA (con el cuadro de texto vacío): Reimprime el último mensaje o comando de barra que ingresaste\nCMD+ABAJO (con el cuadro de texto vacío): Reimprime el siguiente mensaje o comando de barra que ingresaste\nARRIBA (con el cuadro de texto vacío): Edita tu último mensaje en el canal en el que te encuentras\n@[carácter]+TAB: Auto completa @nombre que comience por [carácter]\n~[carácter]+TAB: Autocompleta el canal que comience por [carácter]\n:[carácter]+TAB: Auto completa el emoji que comience por [carácter]\n\n"
+    "id": "api.command_shortcuts.msgs.comp_channel",
+    "translation": "~[carácter]+TAB: Auto completa el canal que comience por [carácter]\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.comp_emoji",
+    "translation": ":[carácter]+TAB: Auto completa el emoticon que comience por [carácter]\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.comp_username",
+    "translation": "@[carácter]+TAB: Auto completa @nombre que comience por [carácter]\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.edit",
+    "translation": "ARRIBA (con el cuadro de texto vacío): Edita el último mensaje en el canal actual\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.header",
+    "translation": "#### Mensajes\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.mark_as_read",
+    "translation": "ESC: Marca todos los mensajes como leídos en el canal actual\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.reprint_next",
+    "translation": "{{.CmdOrCtrl}}+ABAJO (con el cuadro de texto vacío): Reimprime el siguiente mensaje o comando de barra que ingresaste\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.reprint_prev",
+    "translation": "{{.CmdOrCtrl}}+ARRIBA (con el cuadro de texto vacío): Reimprime el último mensaje o comando de barra que ingresaste\n"
   },
   {
     "id": "api.command_shortcuts.name",
     "translation": "accesos rápidos de teclado"
   },
   {
-    "id": "api.command_shortcuts.nav",
-    "translation": "### Atajos de Teclado\n\n#### Navegación\n\nALT+ARRIBA: Canal o mensaje directo previo en la barra lateral izquierda\nALT+ABAJO: Canal o mensaje directo siguiente en la barra lateral izquierda\nALT+MAYUS+ARRIBA: Canal o mensaje directo previo en la barra lateral izquierda con mensajes no leídos\nALT+MAYUS+ABAJO: Canal o mensaje directo siguiente en la barra lateral izquierda con mensajes no leídos\nCTRL+K: Abre un cuadro de dialogo para cambiar rápidamente de canal\nCTRL+MAYUS+A: Abre la configuración de la cuenta\nCTRL+MAYUS+M: Abre las menciones recientes\n\n"
+    "id": "api.command_shortcuts.nav.header",
+    "translation": "#### Navegación\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.next",
+    "translation": "ALT+ABAJO: Canal o mensaje directo siguiente en la barra lateral izquierda\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.prev",
+    "translation": "ALT+ARRIBA: Canal o mensaje directo previo en la barra lateral izquierda\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.recent_mentions",
+    "translation": "{{.CmdOrCtrl}}+MAYUS+M: Abre las menciones recientes\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.settings",
+    "translation": "{{.CmdOrCtrl}}+MAYUS+A: Abre la configuración de la cuenta\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.switcher",
+    "translation": "{{.CmdOrCtrl}}+K: Abre un cuadro de dialogo para cambiar rápidamente de canal\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.unread_next",
+    "translation": "ALT+MAYUS+ABAJO: Canal o mensaje directo siguiente en la barra lateral izquierda con mensajes no leídos\n"
   },
   {
-    "id": "api.command_shortcuts.nav_mac",
-    "translation": "### Atajos de Teclado\n\n#### Navegación\n\nALT+ARRIBA: Canal o mensaje directo previo en la barra lateral izquierda\nALT+ABAJO: Canal o mensaje directo siguiente en la barra lateral izquierda\nALT+MAYUS+ARRIBA: Canal o mensaje directo previo en la barra lateral izquierda con mensajes no leídos\nALT+MAYUS+ABAJO: Canal o mensaje directo siguiente en la barra lateral izquierda con mensajes no leídos\nCMD+K: Abre un cuadro de dialogo para cambiar rápidamente de canal\nCMD+MAYUS+A: Abre la configuración de la cuenta\nCMD+MAYUS+M: Abre las menciones recientes\n\n"
+    "id": "api.command_shortcuts.nav.unread_prev",
+    "translation": "ALT+MAYUS+ARRIBA: Canal o mensaje directo previo en la barra lateral izquierda con mensajes no leídos\n"
   },
   {
     "id": "api.command_shrug.desc",
diff --git a/i18n/fr.json b/i18n/fr.json
index 63a746c1d..b86bc3d6e 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -572,10 +572,6 @@
     "translation": "quitter"
   },
   {
-    "id": "api.command_logout.success_message",
-    "translation": "Déconnexion en cours..."
-  },
-  {
     "id": "api.command_me.desc",
     "translation": "Effectuer une action"
   },
@@ -644,44 +640,144 @@
     "translation": "Vous êtes maintenant en ligne"
   },
   {
-    "id": "api.command_shortcuts.browser",
-    "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.channel_next",
+    "translation": "{{.ChannelNextCmd}}: Next channel in your history\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_next.cmd",
+    "translation": "ALT+RIGHT"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_next.cmd_mac",
+    "translation": "CMD+]"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_prev",
+    "translation": "{{.ChannelPrevCmd}}: Previous channel in your history\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_prev.cmd",
+    "translation": "ALT+LEFT"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_prev.cmd_mac",
+    "translation": "CMD+["
+  },
+  {
+    "id": "api.command_shortcuts.browser.font_decrease",
+    "translation": "{{.CmdOrCtrl}}+MINUS: Decrease font size (zoom out)\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.font_increase",
+    "translation": "{{.CmdOrCtrl}}+PLUS: Increase font size (zoom in)\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.header",
+    "translation": "#### Built-in Browser Commands\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.highlight_next",
+    "translation": "SHIFT+DOWN (in input field): Highlight text to the next line\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.highlight_prev",
+    "translation": "SHIFT+UP (in input field): Highlight text to the previous line\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.newline",
+    "translation": "SHIFT+ENTER (in input field): Create a new line\n"
+  },
+  {
+    "id": "api.command_shortcuts.cmd",
+    "translation": "CMD"
   },
   {
-    "id": "api.command_shortcuts.browser_mac",
-    "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.ctrl",
+    "translation": "CTRL"
   },
   {
     "id": "api.command_shortcuts.desc",
     "translation": "Raccourcis clavier"
   },
   {
-    "id": "api.command_shortcuts.files",
-    "translation": "#### Fichiers\n\nCTRL+U: Télécharger des fichiers\n\n"
+    "id": "api.command_shortcuts.files.header",
+    "translation": "#### Files\n\n"
   },
   {
-    "id": "api.command_shortcuts.files_mac",
-    "translation": "#### Fichiers\n\nCMD+U: Télécharger des fichiers\n\n"
+    "id": "api.command_shortcuts.files.upload",
+    "translation": "{{.CmdOrCtrl}}+U: Upload file(s)\n\n"
   },
   {
-    "id": "api.command_shortcuts.msgs",
-    "translation": "#### Messages\n\nESC : Marque tous les messages du canal actuel comme lus\nCTRL+HAUT (dans un champ de saisie vide) : Affiche le message précédent ou la commande slash précédemment saisis\nCTRL+BAS (dans un champ de saisie vide): Affiche le message suivant ou la commande slash que vous avez précédemment saisis\nHAUT (dans un champ de saisie vide): Édite votre dernier message du canal actuel\n@[caractère]+TAB: Complète automatiquement le nom d'@utilisateur commençant par [caractère]\n#[caractère]+TAB: Complète automatiquement le nom de canal 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.header",
+    "translation": "### Keyboard Shortcuts\n\n"
   },
   {
-    "id": "api.command_shortcuts.msgs_mac",
-    "translation": "#### Messages\n\nESC : Marque tous les messages du canal actuel comme lus\nCTRL+HAUT (dans un champ de saisie vide) : Affiche le message précédent ou la commande slash précédemment saisis\nCTRL+BAS (dans un champ de saisie vide): Affiche le message suivant ou la commande slash que vous avez précédemment saisis\nHAUT (dans un champ de saisie vide): Édite votre dernier message du canal actuel\n@[caractère]+TAB: Complète automatiquement le nom d'@utilisateur commençant par [caractère]\n#[caractère]+TAB: Complète automatiquement le nom de canal 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.msgs.comp_channel",
+    "translation": "~[character]+TAB: Autocomplete channel beginning with [character]\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.comp_emoji",
+    "translation": ":[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.comp_username",
+    "translation": "@[character]+TAB: Autocomplete @username beginning with [character]\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.edit",
+    "translation": "UP (in empty input field): Edit your last message in the current channel\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.header",
+    "translation": "#### Messages\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.mark_as_read",
+    "translation": "ESC: Mark all messages in the current channel as read\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.reprint_next",
+    "translation": "{{.CmdOrCtrl}}+DOWN (in empty input field): Reprint the next message or slash command you entered\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.reprint_prev",
+    "translation": "{{.CmdOrCtrl}}+UP (in empty input field): Reprint the previous message or slash command you entered\n"
   },
   {
     "id": "api.command_shortcuts.name",
     "translation": "raccourcis clavier"
   },
   {
-    "id": "api.command_shortcuts.nav",
-    "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.header",
+    "translation": "#### Navigation\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.next",
+    "translation": "ALT+DOWN: Next channel or direct message in left hand sidebar\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.prev",
+    "translation": "ALT+UP: Previous channel or direct message in left hand sidebar\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.recent_mentions",
+    "translation": "{{.CmdOrCtrl}}+SHIFT+M: Open recent mentions\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.settings",
+    "translation": "{{.CmdOrCtrl}}+SHIFT+A: Open account settings\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.switcher",
+    "translation": "{{.CmdOrCtrl}}+K: Open a quick channel switcher dialog\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.unread_next",
+    "translation": "ALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\n"
   },
   {
-    "id": "api.command_shortcuts.nav_mac",
-    "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.unread_prev",
+    "translation": "ALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\n"
   },
   {
     "id": "api.command_shrug.desc",
diff --git a/i18n/ja.json b/i18n/ja.json
index 6dcc6a51d..41f45ca08 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -572,10 +572,6 @@
     "translation": "ログアウト"
   },
   {
-    "id": "api.command_logout.success_message",
-    "translation": "ログアウト中です…"
-  },
-  {
     "id": "api.command_me.desc",
     "translation": "アクションを実行する"
   },
@@ -644,44 +640,144 @@
     "translation": "あなたはオンライン状態です"
   },
   {
-    "id": "api.command_shortcuts.browser",
-    "translation": "#### 内蔵ブラウザーコマンド\n\nALT+左: 履歴の前のチャンネル\nALT+右: 履歴の次のチャンネル\nCTRL+プラス: フォントを大きくする(ズームイン)\nCTRL+マイナス: フォントを小さくする(ズームアウト)\nSHIFT+UP (入力欄で): 一つ上の行のテキストをハイライトする\nSHIFT+DOWN (入力欄で): 一つ下の行のテキストをハイライトする\nSHIFT+ENTER (入力欄で): 改行する\n"
+    "id": "api.command_shortcuts.browser.channel_next",
+    "translation": "{{.ChannelNextCmd}}: 履歴の次のチャンネル\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_next.cmd",
+    "translation": "ALT+右"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_next.cmd_mac",
+    "translation": "CMD+]"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_prev",
+    "translation": "{{.ChannelPrevCmd}}: 履歴の前のチャンネル\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_prev.cmd",
+    "translation": "ALT+左"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_prev.cmd_mac",
+    "translation": "CMD+["
+  },
+  {
+    "id": "api.command_shortcuts.browser.font_decrease",
+    "translation": "{{.CmdOrCtrl}}+マイナス: フォントを小さくする(ズームアウト)\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.font_increase",
+    "translation": "{{.CmdOrCtrl}}+プラス: フォントを大きくする(ズームイン)\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.header",
+    "translation": "#### 内蔵ブラウザーコマンド\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.highlight_next",
+    "translation": "SHIFT+DOWN (入力欄で): 一つ下の行のテキストをハイライトする\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.highlight_prev",
+    "translation": "SHIFT+UP (入力欄で): 一つ上の行のテキストをハイライトする\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.newline",
+    "translation": "SHIFT+ENTER (入力欄で): 改行する\n"
+  },
+  {
+    "id": "api.command_shortcuts.cmd",
+    "translation": "CMD"
   },
   {
-    "id": "api.command_shortcuts.browser_mac",
-    "translation": "#### 内蔵ブラウザーコマンド\n\nCMD+[: 履歴の前のチャンネル\nCMD+]: 履歴の次のチャンネル\nCMD+プラス: フォントを大きくする(ズームイン)\nCMD+マイナス: フォントを小さくする(ズームアウト)\nSHIFT+UP (入力欄で): 一つ上の行のテキストをハイライトする\nSHIFT+DOWN (入力欄で): 一つ下の行のテキストをハイライトする\nSHIFT+ENTER (入力欄で): 改行する\n"
+    "id": "api.command_shortcuts.ctrl",
+    "translation": "CTRL"
   },
   {
     "id": "api.command_shortcuts.desc",
     "translation": "キーボードショートカットのリストを表示する"
   },
   {
-    "id": "api.command_shortcuts.files",
-    "translation": "#### ファイル\n\nCTRL+U: ファイルをアップロードする\n\n"
+    "id": "api.command_shortcuts.files.header",
+    "translation": "#### ファイル\n\n"
   },
   {
-    "id": "api.command_shortcuts.files_mac",
-    "translation": "#### ファイル\n\nCMD+U: ファイルをアップロードする\n\n"
+    "id": "api.command_shortcuts.files.upload",
+    "translation": "{{.CmdOrCtrl}}+U: ファイルをアップロードする\n\n"
   },
   {
-    "id": "api.command_shortcuts.msgs",
-    "translation": "#### メッセージ\n\nESC: 現在のチャンネルの全てのメッセージを既読にする\nCTRL+UP (空白の入力欄で): 一つ前に入力したメッセージやスラッシュコマンドを呼び出す\nCTRL+DOWN (空白の入力欄で): 一つ次に入力したメッセージやスラッシュコマンドを呼び出す\nUP (空白の入力欄で): 現在のチャンネルの最新のメッセージを修正する\n@[文字]+TAB: [文字]で始まる@usernameを自動補完する\n~[文字]+TAB: [文字]で始まるチャンネルを自動補完する\n:[文字]+TAB: [文字]で始まる絵文字を自動補完する\n\n"
+    "id": "api.command_shortcuts.header",
+    "translation": "### キーボードショートカット\n\n"
   },
   {
-    "id": "api.command_shortcuts.msgs_mac",
-    "translation": "#### メッセージ\n\nESC: 現在のチャンネルの全てのメッセージを既読にする\nCMD+UP (空白の入力欄で): 一つ前に入力したメッセージやスラッシュコマンドを呼び出す\nCMD+DOWN (空白の入力欄で): 一つ次に入力したメッセージやスラッシュコマンドを呼び出す\nUP (空白の入力欄で): 現在のチャンネルの最新のメッセージを修正する\n@[文字]+TAB: [文字]で始まる@usernameを自動補完する\n~[文字]+TAB: [文字]で始まるチャンネルを自動補完する\n:[文字]+TAB: [文字]で始まる絵文字を自動補完する\n\n"
+    "id": "api.command_shortcuts.msgs.comp_channel",
+    "translation": "~[文字]+TAB: [文字]で始まるチャンネルを自動補完する\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.comp_emoji",
+    "translation": ":[文字]+TAB: [文字]で始まる絵文字を自動補完する\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.comp_username",
+    "translation": "@[文字]+TAB: [文字]で始まる @ユーザー名 を自動補完する\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.edit",
+    "translation": "UP (空白の入力欄で): 現在のチャンネルの最新のメッセージを修正する\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.header",
+    "translation": "#### メッセージ\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.mark_as_read",
+    "translation": "ESC: 現在のチャンネルの全てのメッセージを既読にする\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.reprint_next",
+    "translation": "{{.CmdOrCtrl}}+DOWN (空白の入力欄で): 一つ次に入力したメッセージやスラッシュコマンドを呼び出す\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.reprint_prev",
+    "translation": "{{.CmdOrCtrl}}+UP (空白の入力欄で): 一つ前に入力したメッセージやスラッシュコマンドを呼び出す\n"
   },
   {
     "id": "api.command_shortcuts.name",
     "translation": "ショートカット"
   },
   {
-    "id": "api.command_shortcuts.nav",
-    "translation": "### キーボードショートカット\n\n#### 移動\n\nALT+UP: 左側のサイドバーの前のチャンネルまたはダイレクトメッセージに移動する\nALT+DOWN: 左側のサイドバーの次のチャンネルまたはダイレクトメッセージに移動する\nALT+SHIFT+UP: 左側のサイドバーの未読のメッセージのある前のチャンネルまたはダイレクトメッセージに移動する\nALT+SHIFT+DOWN: 左側のサイドバーの未読のメッセージのある次のチャンネルまたはダイレクトメッセージに移動する\nCTRL+K: 高速チャンネル切り替えダイアログボックスを開く\nCTRL+SHIFT+A: アカウント設定を開く\nCTRL+SHIFT+M: 最近の自分についての投稿を開く\n\n"
+    "id": "api.command_shortcuts.nav.header",
+    "translation": "#### 移動\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.next",
+    "translation": "ALT+DOWN: 左側のサイドバーの次のチャンネルまたはダイレクトメッセージに移動する\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.prev",
+    "translation": "ALT+UP: 左側のサイドバーの前のチャンネルまたはダイレクトメッセージに移動する\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.recent_mentions",
+    "translation": "{{.CmdOrCtrl}}+SHIFT+M: 最近の自分についての投稿を開く\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.settings",
+    "translation": "{{.CmdOrCtrl}}+SHIFT+A: アカウント設定を開く\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.switcher",
+    "translation": "{{.CmdOrCtrl}}+K: 高速チャンネル切り替えダイアログボックスを開く\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.unread_next",
+    "translation": "ALT+SHIFT+DOWN: 左側のサイドバーの未読のメッセージのある次のチャンネルまたはダイレクトメッセージに移動する\n"
   },
   {
-    "id": "api.command_shortcuts.nav_mac",
-    "translation": "### キーボードショートカット\n\n#### 移動\n\nALT+UP: 左側のサイドバーの前のチャンネルまたはダイレクトメッセージに移動する\nALT+DOWN: 左側のサイドバーの次のチャンネルまたはダイレクトメッセージに移動する\nALT+SHIFT+UP: 左側のサイドバーの未読のメッセージのある前のチャンネルまたはダイレクトメッセージに移動する\nALT+SHIFT+DOWN: 左側のサイドバーの未読のメッセージのある次のチャンネルまたはダイレクトメッセージに移動する\nCMD+K: 高速チャンネル切り替えダイアログボックスを開く\nCMD+SHIFT+A: アカウント設定を開く\nCMD+SHIFT+M: 最近の自分についての投稿を開く\n\n"
+    "id": "api.command_shortcuts.nav.unread_prev",
+    "translation": "ALT+SHIFT+UP: 左側のサイドバーの未読のメッセージのある前のチャンネルまたはダイレクトメッセージに移動する\n"
   },
   {
     "id": "api.command_shrug.desc",
diff --git a/i18n/ko.json b/i18n/ko.json
index b116d5103..54e98e845 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -572,10 +572,6 @@
     "translation": "로그아웃"
   },
   {
-    "id": "api.command_logout.success_message",
-    "translation": "로그아웃하는 중..."
-  },
-  {
     "id": "api.command_me.desc",
     "translation": "액션 실행"
   },
@@ -644,44 +640,144 @@
     "translation": "이제 온라인 상태입니다."
   },
   {
-    "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"
+    "id": "api.command_shortcuts.browser.channel_next",
+    "translation": "{{.ChannelNextCmd}}: Next channel in your history\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_next.cmd",
+    "translation": "ALT+RIGHT"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_next.cmd_mac",
+    "translation": "CMD+]"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_prev",
+    "translation": "{{.ChannelPrevCmd}}: Previous channel in your history\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_prev.cmd",
+    "translation": "ALT+LEFT"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_prev.cmd_mac",
+    "translation": "CMD+["
+  },
+  {
+    "id": "api.command_shortcuts.browser.font_decrease",
+    "translation": "{{.CmdOrCtrl}}+MINUS: Decrease font size (zoom out)\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.font_increase",
+    "translation": "{{.CmdOrCtrl}}+PLUS: Increase font size (zoom in)\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.header",
+    "translation": "#### Built-in Browser Commands\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.highlight_next",
+    "translation": "SHIFT+DOWN (in input field): Highlight text to the next line\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.highlight_prev",
+    "translation": "SHIFT+UP (in input field): Highlight text to the previous line\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.newline",
+    "translation": "SHIFT+ENTER (in input field): Create a new line\n"
+  },
+  {
+    "id": "api.command_shortcuts.cmd",
+    "translation": "CMD"
   },
   {
-    "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"
+    "id": "api.command_shortcuts.ctrl",
+    "translation": "CTRL"
   },
   {
     "id": "api.command_shortcuts.desc",
     "translation": "단축키 목록을 표시합니다."
   },
   {
-    "id": "api.command_shortcuts.files",
-    "translation": "#### 파일\n\nCTRL+U: 파일 업로드\n\n"
+    "id": "api.command_shortcuts.files.header",
+    "translation": "#### Files\n\n"
   },
   {
-    "id": "api.command_shortcuts.files_mac",
-    "translation": "#### 파일\n\nCMD+U: 파일 업로드\n\n"
+    "id": "api.command_shortcuts.files.upload",
+    "translation": "{{.CmdOrCtrl}}+U: Upload file(s)\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 channel beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+    "id": "api.command_shortcuts.header",
+    "translation": "### Keyboard Shortcuts\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 channel beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+    "id": "api.command_shortcuts.msgs.comp_channel",
+    "translation": "~[character]+TAB: Autocomplete channel beginning with [character]\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.comp_emoji",
+    "translation": ":[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.comp_username",
+    "translation": "@[character]+TAB: Autocomplete @username beginning with [character]\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.edit",
+    "translation": "UP (in empty input field): Edit your last message in the current channel\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.header",
+    "translation": "#### Messages\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.mark_as_read",
+    "translation": "ESC: Mark all messages in the current channel as read\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.reprint_next",
+    "translation": "{{.CmdOrCtrl}}+DOWN (in empty input field): Reprint the next message or slash command you entered\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.reprint_prev",
+    "translation": "{{.CmdOrCtrl}}+UP (in empty input field): Reprint the previous message or slash command you entered\n"
   },
   {
     "id": "api.command_shortcuts.name",
     "translation": "단축키"
   },
   {
-    "id": "api.command_shortcuts.nav",
-    "translation": "### 키보드 단축키\n\n#### 탐색\n\nALT+UP: 왼쪽 사이드바의 이전 채널이나 개인 메시지\nALT+DOWN: 왼쪽 사이드바의 다음 채널이나 개인 메시지\nALT+SHIFT+UP: 왼쪽 사이드바의 읽지 않은 이전 채널이나 개인 메시지\nALT+SHIFT+DOWN: 왼쪽 사이드바의 읽지 않은 다음 채널이나 개인 메시지\nCTRL+K: 빠른 채널 변경 창 열기\nCTRL+SHIFT+A: 계정 설정 열기\nCTRL+SHIFT+M: 최근 멘션 열기\n\n"
+    "id": "api.command_shortcuts.nav.header",
+    "translation": "#### Navigation\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.next",
+    "translation": "ALT+DOWN: Next channel or direct message in left hand sidebar\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.prev",
+    "translation": "ALT+UP: Previous channel or direct message in left hand sidebar\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.recent_mentions",
+    "translation": "{{.CmdOrCtrl}}+SHIFT+M: Open recent mentions\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.settings",
+    "translation": "{{.CmdOrCtrl}}+SHIFT+A: Open account settings\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.switcher",
+    "translation": "{{.CmdOrCtrl}}+K: Open a quick channel switcher dialog\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.unread_next",
+    "translation": "ALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\n"
   },
   {
-    "id": "api.command_shortcuts.nav_mac",
-    "translation": "### 키보드 단축키\n\n#### 탐색\n\nALT+UP: 왼쪽 사이드바의 이전 채널이나 개인 메시지\nALT+DOWN: 왼쪽 사이드바의 다음 채널이나 개인 메시지\nALT+SHIFT+UP: 왼쪽 사이드바의 읽지 않은 이전 채널이나 개인 메시지\nALT+SHIFT+DOWN: 왼쪽 사이드바의 읽지 않은 다음 채널이나 개인 메시지\nCMD+K: 빠른 채널 변경 창 열기\nCMD+SHIFT+A: 계정 설정 열기\nCMD+SHIFT+M: 최근 멘션 열기\n\n"
+    "id": "api.command_shortcuts.nav.unread_prev",
+    "translation": "ALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\n"
   },
   {
     "id": "api.command_shrug.desc",
diff --git a/i18n/nl.json b/i18n/nl.json
index cd9e9b252..7efc9c491 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -572,10 +572,6 @@
     "translation": "uitloggen"
   },
   {
-    "id": "api.command_logout.success_message",
-    "translation": "Uitloggen..."
-  },
-  {
     "id": "api.command_me.desc",
     "translation": "Een actie uitvoeren"
   },
@@ -644,44 +640,144 @@
     "translation": "Je bent nu online"
   },
   {
-    "id": "api.command_shortcuts.browser",
-    "translation": "#### Ingebouwde Blader Commando's\n\nALT+LEFT: Vorig Kanaal in jouw geschiedenis\nALT+RIGHT: Volgens Kanaal in jouw geschiedenis\nCTRL+PLUS: Vergroot lettertype grootte (inzoomen)\nCTRL+MINUS: Verklein lettertype grootte (uitzooment)\nSHIFT+UP (in invoer veld): Benadruk tekst in de vorige lijn\nSHIFT+DOWN (in invoer veld): Benadruk tekst op de volgende lijn\nSHIFT+ENTER (in invoer veld): Maak een nieuwe lijn\n"
+    "id": "api.command_shortcuts.browser.channel_next",
+    "translation": "{{.ChannelNextCmd}}: Next channel in your history\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_next.cmd",
+    "translation": "ALT+RIGHT"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_next.cmd_mac",
+    "translation": "CMD+]"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_prev",
+    "translation": "{{.ChannelPrevCmd}}: Previous channel in your history\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_prev.cmd",
+    "translation": "ALT+LEFT"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_prev.cmd_mac",
+    "translation": "CMD+["
+  },
+  {
+    "id": "api.command_shortcuts.browser.font_decrease",
+    "translation": "{{.CmdOrCtrl}}+MINUS: Decrease font size (zoom out)\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.font_increase",
+    "translation": "{{.CmdOrCtrl}}+PLUS: Increase font size (zoom in)\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.header",
+    "translation": "#### Built-in Browser Commands\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.highlight_next",
+    "translation": "SHIFT+DOWN (in input field): Highlight text to the next line\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.highlight_prev",
+    "translation": "SHIFT+UP (in input field): Highlight text to the previous line\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.newline",
+    "translation": "SHIFT+ENTER (in input field): Create a new line\n"
+  },
+  {
+    "id": "api.command_shortcuts.cmd",
+    "translation": "CMD"
   },
   {
-    "id": "api.command_shortcuts.browser_mac",
-    "translation": "#### Ingebouwde Blader Commando's\n\nALT+LEFT: Vorig Kanaal in jouw geschiedenis\nALT+RIGHT: Volgens Kanaal in jouw geschiedenis\nCTRL+PLUS: Vergroot lettertype grootte (inzoomen)\nCTRL+MINUS: Verklein lettertype grootte (uitzooment)\nSHIFT+UP (in invoer veld): Benadruk tekst in de vorige lijn\nSHIFT+DOWN (in invoer veld): Benadruk tekst op de volgende lijn\nSHIFT+ENTER (in invoer veld): Maak een nieuwe lijn\n"
+    "id": "api.command_shortcuts.ctrl",
+    "translation": "CTRL"
   },
   {
     "id": "api.command_shortcuts.desc",
     "translation": "Toon een lijst met snelkoppelingen"
   },
   {
-    "id": "api.command_shortcuts.files",
-    "translation": "#### Bestanden\n\nCTRL+U: Upload bestanden\n\n"
+    "id": "api.command_shortcuts.files.header",
+    "translation": "#### Files\n\n"
   },
   {
-    "id": "api.command_shortcuts.files_mac",
-    "translation": "#### Bestanden\n\nCMD+U: Upload bestand(en)\n\n"
+    "id": "api.command_shortcuts.files.upload",
+    "translation": "{{.CmdOrCtrl}}+U: Upload file(s)\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 channel beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+    "id": "api.command_shortcuts.header",
+    "translation": "### Keyboard Shortcuts\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 channel beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+    "id": "api.command_shortcuts.msgs.comp_channel",
+    "translation": "~[character]+TAB: Autocomplete channel beginning with [character]\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.comp_emoji",
+    "translation": ":[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.comp_username",
+    "translation": "@[character]+TAB: Autocomplete @username beginning with [character]\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.edit",
+    "translation": "UP (in empty input field): Edit your last message in the current channel\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.header",
+    "translation": "#### Messages\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.mark_as_read",
+    "translation": "ESC: Mark all messages in the current channel as read\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.reprint_next",
+    "translation": "{{.CmdOrCtrl}}+DOWN (in empty input field): Reprint the next message or slash command you entered\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.reprint_prev",
+    "translation": "{{.CmdOrCtrl}}+UP (in empty input field): Reprint the previous message or slash command you entered\n"
   },
   {
     "id": "api.command_shortcuts.name",
     "translation": "Snelkoppelingen"
   },
   {
-    "id": "api.command_shortcuts.nav",
-    "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.header",
+    "translation": "#### Navigation\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.next",
+    "translation": "ALT+DOWN: Next channel or direct message in left hand sidebar\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.prev",
+    "translation": "ALT+UP: Previous channel or direct message in left hand sidebar\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.recent_mentions",
+    "translation": "{{.CmdOrCtrl}}+SHIFT+M: Open recent mentions\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.settings",
+    "translation": "{{.CmdOrCtrl}}+SHIFT+A: Open account settings\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.switcher",
+    "translation": "{{.CmdOrCtrl}}+K: Open a quick channel switcher dialog\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.unread_next",
+    "translation": "ALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\n"
   },
   {
-    "id": "api.command_shortcuts.nav_mac",
-    "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.unread_prev",
+    "translation": "ALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\n"
   },
   {
     "id": "api.command_shrug.desc",
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index f736e6dab..4946d58fc 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -73,7 +73,7 @@
   },
   {
     "id": "api.admin.init.debug",
-    "translation": "Inicializando admin api routes"
+    "translation": "Inicializando as rotas da API admin"
   },
   {
     "id": "api.admin.recycle_db_end.warn",
@@ -197,7 +197,7 @@
   },
   {
     "id": "api.channel.create_channel.direct_channel.app_error",
-    "translation": "Deve usar a api de serviço createDirectChannel para criação do canal de mensagens diretas"
+    "translation": "Deve-se usar a API de serviço createDirectChannel para criação do canal de mensagens diretas"
   },
   {
     "id": "api.channel.create_channel.invalid_character.app_error",
@@ -217,7 +217,7 @@
   },
   {
     "id": "api.channel.create_direct_channel.invalid_user.app_error",
-    "translation": "Inválido outro id de usuário "
+    "translation": "ID do outro usuário inválida  "
   },
   {
     "id": "api.channel.delete_channel.archived",
@@ -273,7 +273,7 @@
   },
   {
     "id": "api.channel.init.debug",
-    "translation": "Inicializando channel api routes"
+    "translation": "Inicializando as rotas da API channel"
   },
   {
     "id": "api.channel.join_channel.permissions.app_error",
@@ -381,7 +381,7 @@
   },
   {
     "id": "api.command.delete.app_error",
-    "translation": "Permissões inadequadas para deletar o comando"
+    "translation": "Permissões inadequadas para o comando de deletar"
   },
   {
     "id": "api.command.disabled.app_error",
@@ -421,7 +421,7 @@
   },
   {
     "id": "api.command.init.debug",
-    "translation": "Inicializando command api routes"
+    "translation": "Inicializando as rotas da API command"
   },
   {
     "id": "api.command.invite_people.desc",
@@ -453,7 +453,7 @@
   },
   {
     "id": "api.command.regen.app_error",
-    "translation": "Permissões inadequadas para re-gerar o token de comando"
+    "translation": "Permissões inadequadas para re-gerar o token de comandos"
   },
   {
     "id": "api.command.team_mismatch.app_error",
@@ -461,7 +461,7 @@
   },
   {
     "id": "api.command.update.app_error",
-    "translation": "Permissões inadequadas para atualizar o comando"
+    "translation": "Permissões inadequadas para o comando atualizar"
   },
   {
     "id": "api.command_away.desc",
@@ -529,7 +529,7 @@
   },
   {
     "id": "api.command_expand_collapse.fail.app_error",
-    "translation": "Um erro ocorreu ao expandir o preview"
+    "translation": "Um erro ocorreu ao expandir as visualizações"
   },
   {
     "id": "api.command_join.desc",
@@ -537,7 +537,7 @@
   },
   {
     "id": "api.command_join.fail.app_error",
-    "translation": "Ocorreu um erro enquanto juntava ao canal."
+    "translation": "Ocorreu um erro enquanto conectava ao canal."
   },
   {
     "id": "api.command_join.hint",
@@ -572,10 +572,6 @@
     "translation": "logout"
   },
   {
-    "id": "api.command_logout.success_message",
-    "translation": "Saindo..."
-  },
-  {
     "id": "api.command_me.desc",
     "translation": "Fazer uma ação"
   },
@@ -593,11 +589,11 @@
   },
   {
     "id": "api.command_msg.dm_fail.app_error",
-    "translation": "Ocorreu um erro durante a criação da mensagem direta."
+    "translation": "Um erro ocorreu durante a criação da mensagem direta."
   },
   {
     "id": "api.command_msg.fail.app_error",
-    "translation": "Ocorreu um erro durante a mensagem do usuário."
+    "translation": "Um erro ocorreu durante o envio da mensagem ao usuário."
   },
   {
     "id": "api.command_msg.hint",
@@ -644,44 +640,144 @@
     "translation": "Você está agora conectado"
   },
   {
-    "id": "api.command_shortcuts.browser",
-    "translation": "#### Comandos Nativos do Navegador\n\nALT+ESQUERDA: Canal anterior no seu histórico\nALT+DIREITA: Próximo canal no seu histórico\nCTRL+MAIS: Aumenta o tamanho da fonte (zoom in)\nCTRL+MENOS: Diminui o tamanho da fonte (zoom out)\nSHIFT+CIMA (no campo de entrada): Seleciona o texto até a linha anterior\nSHIFT+BAIXO (no campo de entrada): Seleciona o texto até a próxima linha\nSHIFT+ENTER (no campo de entrada): Cria nova linha\n"
+    "id": "api.command_shortcuts.browser.channel_next",
+    "translation": "{{.ChannelNextCmd}}: Próximo canal no seu histórico\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_next.cmd",
+    "translation": "ALT+DIR"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_next.cmd_mac",
+    "translation": "CMD+]"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_prev",
+    "translation": "{{.ChannelPrevCmd}}: Canal anterior no seu histórico\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_prev.cmd",
+    "translation": "ALT+ESQ"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_prev.cmd_mac",
+    "translation": "CMD+["
+  },
+  {
+    "id": "api.command_shortcuts.browser.font_decrease",
+    "translation": "{{.CmdOrCtrl}}+MENOS: Reduz o tamanho da fonte (zoom out)\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.font_increase",
+    "translation": "{{.CmdOrCtrl}}+MAIS: Aumenta o tamanho da fonte (zoom in)\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.header",
+    "translation": "#### Comandos Nativos do Navegador\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.highlight_next",
+    "translation": "SHIFT+BAIXO (no campo de entrada): Seleciona o texto da próxima linha\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.highlight_prev",
+    "translation": "SHIFT+CIMA (no campo de entrada): Seleciona o texto da linha anterior\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.newline",
+    "translation": "SHIFT+ENTER (no campo de entrada): Cria uma nova linha\n"
+  },
+  {
+    "id": "api.command_shortcuts.cmd",
+    "translation": "CMD"
   },
   {
-    "id": "api.command_shortcuts.browser_mac",
-    "translation": "#### Comandos Nativos do Navegador\n\nCMD+[: Canal anterior no seu histórico\nCMD+]: Próximo canal no seu histórico\nCMD+MAIS: Aumenta o tamanho da fonte (zoom in)\nCMD+MENOS: Diminui o tamanho da fonte (zoom out)\nSHIFT+CIMA (no campo de entrada): Seleciona o texto até a linha anterior\nSHIFT+BAIXO (no campo de entrada): Seleciona o texto até a próxima linha\nSHIFT+ENTER (no campo de entrada): Cria nova linha\n"
+    "id": "api.command_shortcuts.ctrl",
+    "translation": "CTRL"
   },
   {
     "id": "api.command_shortcuts.desc",
     "translation": "Mostrar a lista de atalhos"
   },
   {
-    "id": "api.command_shortcuts.files",
-    "translation": "#### Arquivos\n\nCTRL+U: Enviar arquivo(s)\n\n"
+    "id": "api.command_shortcuts.files.header",
+    "translation": "#### Arquivos\n\n"
   },
   {
-    "id": "api.command_shortcuts.files_mac",
-    "translation": "#### Arquivos\n\nCMD+U: Enviar arquivo(s)\n\n"
+    "id": "api.command_shortcuts.files.upload",
+    "translation": "{{.CmdOrCtrl}}+U: Envia arquivo(s)\n\n"
   },
   {
-    "id": "api.command_shortcuts.msgs",
-    "translation": "#### Mensagens\n\nESC: Marcar todas as mensagens do canal atual como lidas\nCTRL+CIMA (no campo de entrada vazio): Mostra a última mensagem ou comando digitado\nCTRL+BAIXO (no campo de entrada vazio): Mostra a próxima mensagem ou comando digitado\nCIMA (no campo de entrada vazio): Edita sua última mensagem no canal atual\n@[caractere]+TAB: Autocompleta o @usuário começado com [caractere]\n~[caractere]+TAB: Autocompleta o canal começado com [caractere]\n:[caractere]+TAB: Autocompleta o emoji começado com [caractere]\n\n"
+    "id": "api.command_shortcuts.header",
+    "translation": "### Atalhos do Teclado\n\n"
   },
   {
-    "id": "api.command_shortcuts.msgs_mac",
-    "translation": "#### Mensagens\n\nESC: Marcar todas as mensagens do canal atual como lidas\nCMD+CIMA (no campo vazio de entrada): Mostra a última mensagem ou comando digitado\nCMD+BAIXO (no campo vazio de entrada): Mostra a próxima mensagem ou comando digitado\nCIMA (no campo vazio de entrada): Edita sua última mensagem no canal atual\n@[caractere]+TAB: Autocompleta @usuário começado com [caractere]\n~[caractere]+TAB: Autocompleta o canal começado com [caractere]\n:[caractere]+TAB: Autocompleta o emoji começado com [caractere]\n\n"
+    "id": "api.command_shortcuts.msgs.comp_channel",
+    "translation": "~[caractere]+TAB: Autocompleta o canal começado com o [caractere]\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.comp_emoji",
+    "translation": ":[caractere]+TAB: Autocompleta o emoji começado com o [caractere]\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.comp_username",
+    "translation": "@[caractere]+TAB: Autocompleta @usuário começado com o [caractere]\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.edit",
+    "translation": "CIMA (no campo de entrada vazio): Edita sua última mensagem no canal atual\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.header",
+    "translation": "#### Mensagens\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.mark_as_read",
+    "translation": "ESC: Marca todas as mensagens no canal atual como lida\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.reprint_next",
+    "translation": "{{.CmdOrCtrl}}+BAIXO (no campo de entrada vazio): Reimprime a próxima mensagem ou o comando slash inserido\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.reprint_prev",
+    "translation": "{{.CmdOrCtrl}}+CIMA (no campo de entrada vazio): Reimprime a mensagem anterior ou o comando slash inserido\n"
   },
   {
     "id": "api.command_shortcuts.name",
     "translation": "atalhos"
   },
   {
-    "id": "api.command_shortcuts.nav",
-    "translation": "### Atalhos do Teclado\n\n#### Navegação\n\nALT+CIMA: Canal ou mensagem direta anterior na barra lateral esquerda\nALT+BAIXO: Próximo canal ou mensagem direta na barra lateral esquerda\nALT+SHIFT+CIMA: Canal anterior ou mensagem direta na barra lateral esquerda com mensagens não lidas\nALT+SHIFT+BAIXO: Próximo canal ou mensagem direta na barra lateral esquerda com mensagens não lidas\nCTRL+K: Abra uma janela de troca rápida de canal\nCTRL+SHIFT+A: Abre as configurações de conta\nCTRL+SHIFT+M: Abre as menções recentes\n\n"
+    "id": "api.command_shortcuts.nav.header",
+    "translation": "#### Navegação\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.next",
+    "translation": "ALT+BAIXO: Próximo canal ou mensagem direta na barra lateral esquerda\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.prev",
+    "translation": "ALT+CIMA: Canal ou mensagem direta anterior na barra lateral esquerda\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.recent_mentions",
+    "translation": "{{.CmdOrCtrl}}+SHIFT+M: Abre as menções recentes\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.settings",
+    "translation": "{{.CmdOrCtrl}}+SHIFT+A: Abre as configurações de conta\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.switcher",
+    "translation": "{{.CmdOrCtrl}}+K: Abra uma janela de troca rápida de canal\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.unread_next",
+    "translation": "ALT+SHIFT+DOWN: Próximo canal ou mensagem direta na barra lateral esquerda com mensagens não lidas\n"
   },
   {
-    "id": "api.command_shortcuts.nav_mac",
-    "translation": "### Atalhos do Teclado\n\n#### Navegação\n\nALT+CIMA: Canal ou mensagem direta anterior na barra lateral esquerda\nALT+BAIXO: Próximo canal ou mensagem direta na barra lateral esquerda\nALT+SHIFT+CIMA: Canal anterior ou mensagem direta na barra lateral esquerda com mensagens não lidas\nALT+SHIFT+BAIXO: Próximo canal ou mensagem direta na barra lateral esquerda com mensagens não lidas\nCMD+K: Abra uma janela de troca rápida de canal\nCMD+SHIFT+A: Abre as configurações de conta\nCMD+SHIFT+M: Abre as menções recentes\n\n"
+    "id": "api.command_shortcuts.nav.unread_prev",
+    "translation": "ALT+SHIFT+UP: Canal anterior ou mensagem direta na barra lateral esquerda com mensagens não lidas\n"
   },
   {
     "id": "api.command_shrug.desc",
@@ -705,7 +801,7 @@
   },
   {
     "id": "api.context.invalid_team_url.debug",
-    "translation": "TeamURL acessado quando não é válido. Equipe de URL não devem ser usados em funções de api ou aqueles que são de equipes independentes"
+    "translation": "A URL da equipe foi acessada de forma inválida. A URL da equipe não deve ser utilizada em funções de API ou aquelas funções que são independente da equipe."
   },
   {
     "id": "api.context.invalid_token.error",
@@ -855,7 +951,7 @@
   },
   {
     "id": "api.emoji.init.debug",
-    "translation": "Inicializando emoji api routes"
+    "translation": "Inicializando as rotas de API emoji"
   },
   {
     "id": "api.emoji.storage.app_error",
@@ -943,7 +1039,7 @@
   },
   {
     "id": "api.file.init.debug",
-    "translation": "Inicializando file api routes"
+    "translation": "Inicializando as rotas de API file"
   },
   {
     "id": "api.file.migrate_filenames_to_file_infos.channel.app_error",
@@ -1075,7 +1171,7 @@
   },
   {
     "id": "api.general.init.debug",
-    "translation": "Inicializando as rotas gerais da api"
+    "translation": "Inicializando as rotas de API general"
   },
   {
     "id": "api.import.import_post.saving.debug",
@@ -1135,7 +1231,7 @@
   },
   {
     "id": "api.license.init.debug",
-    "translation": "Inicializando license api routes"
+    "translation": "Inicializando as rotas de API license"
   },
   {
     "id": "api.license.remove_license.remove.app_error",
@@ -1179,7 +1275,7 @@
   },
   {
     "id": "api.oauth.delete.permissions.app_error",
-    "translation": "Permissão inapropriada para deletar o App OAuth2"
+    "translation": "Permissões inadequadas para deletar o App OAuth2"
   },
   {
     "id": "api.oauth.get_access_token.bad_client_id.app_error",
@@ -1243,11 +1339,11 @@
   },
   {
     "id": "api.oauth.init.debug",
-    "translation": "Inicializando oauth api routes"
+    "translation": "Inicializando as rotas de API oauth"
   },
   {
     "id": "api.oauth.regenerate_secret.app_error",
-    "translation": "Permissão inapropriada para gerar novo OAuth2 App Secret"
+    "translation": "Permissões inadequadas para gerar novo OAuth2 App Secret"
   },
   {
     "id": "api.oauth.register_oauth_app.turn_off.app_error",
@@ -1401,7 +1497,7 @@
   },
   {
     "id": "api.post.init.debug",
-    "translation": "Inicializando post api routes"
+    "translation": "Inicializando as rotas de API post"
   },
   {
     "id": "api.post.make_direct_channel_visible.get_2_members.error",
@@ -1533,7 +1629,7 @@
   },
   {
     "id": "api.preference.init.debug",
-    "translation": "Inicializando preference api routes"
+    "translation": "Inicializando as rotas de API preference"
   },
   {
     "id": "api.preference.save_preferences.decode.app_error",
@@ -1549,19 +1645,19 @@
   },
   {
     "id": "api.reaction.delete_reaction.mismatched_channel_id.app_error",
-    "translation": "Failed to delete reaction because channel ID does not match post ID in the URL"
+    "translation": "Falha ao deletar a reação devido ao ID do canal não corresponder com o ID do post na URL"
   },
   {
     "id": "api.reaction.init.debug",
-    "translation": "Inicializando reactions api routes"
+    "translation": "Inicializando as rotas de API reactions"
   },
   {
     "id": "api.reaction.list_reactions.mismatched_channel_id.app_error",
-    "translation": "Failed to get reactions because channel ID does not match post ID in the URL"
+    "translation": "Falha ao obter as reações devido ao ID do canal não corresponder com o ID do post na URL"
   },
   {
     "id": "api.reaction.save_reaction.mismatched_channel_id.app_error",
-    "translation": "Failed to save reaction because channel ID does not match post ID in the URL"
+    "translation": "Falha ao salvar a reação devido ao ID do canal não corresponder com o ID do post na URL"
   },
   {
     "id": "api.reaction.send_reaction_event.post.app_error",
@@ -1789,7 +1885,7 @@
   },
   {
     "id": "api.status.init.debug",
-    "translation": "Inicializando status api routes"
+    "translation": "Inicializando as rotas de API status"
   },
   {
     "id": "api.status.last_activity.error",
@@ -1853,11 +1949,11 @@
   },
   {
     "id": "api.team.import_team.unavailable.app_error",
-    "translation": "Malformed request: filesize field is not present."
+    "translation": "Requisição mal formada: campo filesize não está presente."
   },
   {
     "id": "api.team.init.debug",
-    "translation": "Inicializando team api routes"
+    "translation": "Inicializando as rotas de API team"
   },
   {
     "id": "api.team.invite_members.admin",
@@ -2321,7 +2417,7 @@
   },
   {
     "id": "api.user.init.debug",
-    "translation": "Inicializando user api routes"
+    "translation": "Inicializando as rotas de API user"
   },
   {
     "id": "api.user.ldap_to_email.not_available.app_error",
@@ -2345,7 +2441,7 @@
   },
   {
     "id": "api.user.login.not_provided.app_error",
-    "translation": "Must provide either user ID, or team name and user email"
+    "translation": "Deve fornecer o ID do usuário ou o nome da equipe e o e-mail do usuário"
   },
   {
     "id": "api.user.login.not_verified.app_error",
@@ -2581,7 +2677,7 @@
   },
   {
     "id": "api.web_socket.init.debug",
-    "translation": "Inicializando web socket api routes"
+    "translation": "Inicializando as rotas de API web socket"
   },
   {
     "id": "api.web_socket_handler.log.error",
@@ -2653,7 +2749,7 @@
   },
   {
     "id": "api.webhook.init.debug",
-    "translation": "Inicializando webhook api routes"
+    "translation": "Inicializando as rotas de API webhook"
   },
   {
     "id": "api.webhook.regen_outgoing_token.disabled.app_error",
@@ -2661,7 +2757,7 @@
   },
   {
     "id": "api.webhook.regen_outgoing_token.permissions.app_error",
-    "translation": "Permissões inadequadas para re-gerar o token do webhook de saída"
+    "translation": "Permissões inadequadas para gerar novo token do webhook de saída"
   },
   {
     "id": "api.webrtc.disabled.app_error",
@@ -2669,7 +2765,7 @@
   },
   {
     "id": "api.webrtc.init.debug",
-    "translation": "Inicializando WebRTC api routes"
+    "translation": "Inicializando as rotas de API WebRTC"
   },
   {
     "id": "api.webrtc.register_token.app_error",
@@ -3037,7 +3133,7 @@
   },
   {
     "id": "manaultesting.manual_test.uid.debug",
-    "translation": "Sem uid na url"
+    "translation": "Sem uid na URL"
   },
   {
     "id": "manaultesting.test_autolink.info",
@@ -3249,7 +3345,7 @@
   },
   {
     "id": "model.command.is_valid.team_id.app_error",
-    "translation": "Inválido equipe id"
+    "translation": "ID da equipe inválido"
   },
   {
     "id": "model.command.is_valid.token.app_error",
@@ -3265,7 +3361,7 @@
   },
   {
     "id": "model.command.is_valid.url.app_error",
-    "translation": "Invalid URL"
+    "translation": "URL inválida"
   },
   {
     "id": "model.command.is_valid.url_http.app_error",
@@ -3609,7 +3705,7 @@
   },
   {
     "id": "model.incoming_hook.team_id.app_error",
-    "translation": "Inválido equipe id"
+    "translation": "ID da equipe inválido"
   },
   {
     "id": "model.incoming_hook.update_at.app_error",
@@ -3661,7 +3757,7 @@
   },
   {
     "id": "model.outgoing_hook.is_valid.callback.app_error",
-    "translation": "Urls de retorno de chamada inválidas"
+    "translation": "URLs de retorno de chamada inválidas"
   },
   {
     "id": "model.outgoing_hook.is_valid.channel_id.app_error",
@@ -3685,7 +3781,7 @@
   },
   {
     "id": "model.outgoing_hook.is_valid.team_id.app_error",
-    "translation": "Inválido equipe id"
+    "translation": "ID da equipe inválido"
   },
   {
     "id": "model.outgoing_hook.is_valid.token.app_error",
@@ -3757,7 +3853,7 @@
   },
   {
     "id": "model.post.is_valid.root_parent.app_error",
-    "translation": "Inválido root id deve ser definido se parent id for"
+    "translation": "ID raiz inválida deve ser definida se o ID pai for definido"
   },
   {
     "id": "model.post.is_valid.type.app_error",
@@ -3861,7 +3957,7 @@
   },
   {
     "id": "model.team_member.is_valid.team_id.app_error",
-    "translation": "Inválido equipe id"
+    "translation": "ID da equipe inválido"
   },
   {
     "id": "model.team_member.is_valid.user_id.app_error",
@@ -3973,7 +4069,7 @@
   },
   {
     "id": "model.user.is_valid.team_id.app_error",
-    "translation": "Inválido equipe id"
+    "translation": "ID da equipe inválido"
   },
   {
     "id": "model.user.is_valid.update_at.app_error",
@@ -4065,19 +4161,19 @@
   },
   {
     "id": "store.sql.open_conn.critical",
-    "translation": "Falha ao abrir a conexão sql err:%v"
+    "translation": "Falha ao abrir a conexão SQL err:%v"
   },
   {
     "id": "store.sql.open_conn.panic",
-    "translation": "Falha ao abrir a conexão sql %v"
+    "translation": "Falha ao abrir a conexão SQL %v"
   },
   {
     "id": "store.sql.ping.critical",
-    "translation": "Falha para ping db err:%v"
+    "translation": "Falha ao pingar no DB err:%v"
   },
   {
     "id": "store.sql.pinging.info",
-    "translation": "Pingando banco de dados sql %v"
+    "translation": "Pingando banco de dados SQL %v"
   },
   {
     "id": "store.sql.read_replicas_not_licensed.critical",
@@ -4213,7 +4309,7 @@
   },
   {
     "id": "store.sql_channel.get_member.missing.app_error",
-    "translation": "Nenhum membro canal encontrado para esse id de usuário e id de canal"
+    "translation": "Nenhum membro canal encontrado para esse ID de usuário e ID de canal"
   },
   {
     "id": "store.sql_channel.get_member_count.app_error",
@@ -4309,7 +4405,7 @@
   },
   {
     "id": "store.sql_channel.save_member.exists.app_error",
-    "translation": "Um membro do canal com este id já existe"
+    "translation": "Um membro do canal com este ID já existe"
   },
   {
     "id": "store.sql_channel.save_member.open_transaction.app_error",
@@ -4877,7 +4973,7 @@
   },
   {
     "id": "store.sql_team.get_member.missing.app_error",
-    "translation": "Nenhum membro encontrado para esse id de usuário e id de equipe"
+    "translation": "Nenhum membro encontrado para esse ID de usuário e ID de equipe"
   },
   {
     "id": "store.sql_team.get_member_count.app_error",
@@ -4921,7 +5017,7 @@
   },
   {
     "id": "store.sql_team.save_member.exists.app_error",
-    "translation": "Um membro do canal com este id já existe"
+    "translation": "Um membro da equipe com este ID já existe"
   },
   {
     "id": "store.sql_team.save_member.save.app_error",
@@ -5033,7 +5129,7 @@
   },
   {
     "id": "store.sql_user.save.existing.app_error",
-    "translation": "Deve chamar update para o usuário existente"
+    "translation": "Deve chamar atualização para o usuário existente"
   },
   {
     "id": "store.sql_user.save.max_accounts.app_error",
@@ -5309,7 +5405,7 @@
   },
   {
     "id": "web.check_browser_compatibility.app_error",
-    "translation": "Seu navegador atual não é suportado, por favor atualize para um dos seguintes browsers: Google Chrome 21 ou superior, Internet Explorer 11 ou superior, FireFox 14 ou superior, Safari 9 ou superior"
+    "translation": "Seu navegador atual não é suportado, por favor atualize para um dos seguintes browsers: Google Chrome 21 ou superior, Internet Explorer 11 ou superior, Firefox 14 ou superior, Safari 9 ou superior"
   },
   {
     "id": "web.claim_account.team.error",
@@ -5353,7 +5449,7 @@
   },
   {
     "id": "web.incoming_webhook.attachment.app_error",
-    "translation": "Maximum attachments length is {{.Max}} characters, received size is {{.Actual}}"
+    "translation": "Máximo tamanho dos anexos é de {{.Max}} caracteres, tamanho recebido é de {{.Actual}}"
   },
   {
     "id": "web.incoming_webhook.channel.app_error",
@@ -5381,7 +5477,7 @@
   },
   {
     "id": "web.incoming_webhook.text.length.app_error",
-    "translation": "Maximum text length is {{.Max}} characters, received size is {{.Actual}}"
+    "translation": "Tamanho máximo do texto é de {{.Max}} caracteres, tamanho recebido é de {{.Actual}}"
   },
   {
     "id": "web.incoming_webhook.user.app_error",
diff --git a/i18n/ru.json b/i18n/ru.json
index 5970909d8..e9a72525a 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -572,10 +572,6 @@
     "translation": "выйти"
   },
   {
-    "id": "api.command_logout.success_message",
-    "translation": "Выход из системы..."
-  },
-  {
     "id": "api.command_me.desc",
     "translation": "Выполнить действие"
   },
@@ -644,44 +640,144 @@
     "translation": "Вы сейчас в сети"
   },
   {
-    "id": "api.command_shortcuts.browser",
-    "translation": "#### Встроенные команды браузера\n\nALT+LEFT: Предыдущий канал в вашей истории\nALT+RIGHT: Следующий канал в вашей истории\nCTRL+PLUS: Увеличить размер шрифта (приблизить)\nCTRL+MINUS: Уменьшить размер шрифта (отдалить)\nSHIFT+UP (в поле ввода): Подсветить текст до предыдущей строки\nSHIFT+DOWN (в поле ввода): Подсветить текст до следующей строки\nSHIFT+ENTER (в поле ввода): Создать новую линию\n"
+    "id": "api.command_shortcuts.browser.channel_next",
+    "translation": "{{.ChannelNextCmd}}: Next channel in your history\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_next.cmd",
+    "translation": "ALT+RIGHT"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_next.cmd_mac",
+    "translation": "CMD+]"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_prev",
+    "translation": "{{.ChannelPrevCmd}}: Previous channel in your history\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_prev.cmd",
+    "translation": "ALT+LEFT"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_prev.cmd_mac",
+    "translation": "CMD+["
+  },
+  {
+    "id": "api.command_shortcuts.browser.font_decrease",
+    "translation": "{{.CmdOrCtrl}}+MINUS: Decrease font size (zoom out)\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.font_increase",
+    "translation": "{{.CmdOrCtrl}}+PLUS: Increase font size (zoom in)\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.header",
+    "translation": "#### Built-in Browser Commands\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.highlight_next",
+    "translation": "SHIFT+DOWN (in input field): Highlight text to the next line\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.highlight_prev",
+    "translation": "SHIFT+UP (in input field): Highlight text to the previous line\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.newline",
+    "translation": "SHIFT+ENTER (in input field): Create a new line\n"
+  },
+  {
+    "id": "api.command_shortcuts.cmd",
+    "translation": "CMD"
   },
   {
-    "id": "api.command_shortcuts.browser_mac",
-    "translation": "#### Встроенные команды браузера\n\nCMD+[: Предыдущий канал в вашей истории\nCMD+]: Следующий канал в вашей истории\nCMD+PLUS: Увеличить размер шрифта (приблизить)\nCMD+MINUS: Уменьшить размер шрифта (отдалить)\nSHIFT+UP (в поле ввода): Подсветить текст до предыдущей строки\nSHIFT+DOWN (в поле ввода): Подсветить текст до следующей строки\nSHIFT+ENTER (в поле ввода): Создать новую линию\n"
+    "id": "api.command_shortcuts.ctrl",
+    "translation": "CTRL"
   },
   {
     "id": "api.command_shortcuts.desc",
     "translation": "Отображает список сочетаний клавиш"
   },
   {
-    "id": "api.command_shortcuts.files",
-    "translation": "#### Файлы\n\nCTRL+U: Загрузить файл(-ы)\n\n"
+    "id": "api.command_shortcuts.files.header",
+    "translation": "#### Файлы\n\n"
   },
   {
-    "id": "api.command_shortcuts.files_mac",
-    "translation": "#### Файлы\n\nCMD+U: Загрузить файл(ы)\n\n"
+    "id": "api.command_shortcuts.files.upload",
+    "translation": "{{.CmdOrCtrl}}+U: Upload file(s)\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 channel beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+    "id": "api.command_shortcuts.header",
+    "translation": "### Горячие клавиши\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 channel beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+    "id": "api.command_shortcuts.msgs.comp_channel",
+    "translation": "~[character]+TAB: Autocomplete channel beginning with [character]\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.comp_emoji",
+    "translation": ":[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.comp_username",
+    "translation": "@[character]+TAB: Autocomplete @username beginning with [character]\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.edit",
+    "translation": "UP (in empty input field): Edit your last message in the current channel\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.header",
+    "translation": "#### Сообщения\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.mark_as_read",
+    "translation": "ESC: Mark all messages in the current channel as read\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.reprint_next",
+    "translation": "{{.CmdOrCtrl}}+DOWN (in empty input field): Reprint the next message or slash command you entered\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.reprint_prev",
+    "translation": "{{.CmdOrCtrl}}+UP (in empty input field): Reprint the previous message or slash command you entered\n"
   },
   {
     "id": "api.command_shortcuts.name",
     "translation": "комбинации клавиш"
   },
   {
-    "id": "api.command_shortcuts.nav",
-    "translation": "### Сочетания клавиш\n\n#### Навигация\n\nALT+UP: Предыдущий канал или личное сообщение в левой боковой панели\nALT+DOWN: Следующий канал или личное сообщение в левой боковой панели\nALT+SHIFT+UP: Предыдущий канал или личное сообщение в левой боковой панели с непрочитанными сообщениями\nALT+SHIFT+DOWN: Следующий канал или личное сообщение в левой боковой панели с непрочитанными сообщениями\nCTRL+K: Открыть диалог быстрого переключения каналов\nCTRL+SHIFT+A: Открыть настройки учетной записи\nCTRL+SHIFT+M: Открыть последние упоминания\n\n"
+    "id": "api.command_shortcuts.nav.header",
+    "translation": "#### Навигация\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.next",
+    "translation": "ALT+DOWN: Next channel or direct message in left hand sidebar\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.prev",
+    "translation": "ALT+UP: Previous channel or direct message in left hand sidebar\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.recent_mentions",
+    "translation": "{{.CmdOrCtrl}}+SHIFT+M: Open recent mentions\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.settings",
+    "translation": "{{.CmdOrCtrl}}+SHIFT+A: Open account settings\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.switcher",
+    "translation": "{{.CmdOrCtrl}}+K: Open a quick channel switcher dialog\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.unread_next",
+    "translation": "ALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\n"
   },
   {
-    "id": "api.command_shortcuts.nav_mac",
-    "translation": "### Сочетания клавиш\n\n#### Навигация\n\nALT+UP: Предыдущий канал или личное сообщение в левой боковой панели\nALT+DOWN: Следующий канал или личное сообщение в левой боковой панели\nALT+SHIFT+UP: Предыдущий канал или личное сообщение в левой боковой панели с непрочитанными сообщениями\nALT+SHIFT+DOWN: Следующий канал или личное сообщение в левой боковой панели с непрочитанными сообщениями\nCMD+K: Открыть диалог быстрого переключения каналов\nCMD+SHIFT+A: Открыть настройки учетной записи\nCMD+SHIFT+M: Открыть последние упоминания\n\n"
+    "id": "api.command_shortcuts.nav.unread_prev",
+    "translation": "ALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\n"
   },
   {
     "id": "api.command_shrug.desc",
@@ -4077,7 +4173,7 @@
   },
   {
     "id": "store.sql.pinging.info",
-    "translation": "Проверка sql-соединения c базой данных %v"
+    "translation": "Проверка соединения c базой данных %v"
   },
   {
     "id": "store.sql.read_replicas_not_licensed.critical",
diff --git a/i18n/zh_CN.json b/i18n/zh_CN.json
index b7dfea577..7223cdabf 100644
--- a/i18n/zh_CN.json
+++ b/i18n/zh_CN.json
@@ -572,10 +572,6 @@
     "translation": "注销"
   },
   {
-    "id": "api.command_logout.success_message",
-    "translation": "注销中..."
-  },
-  {
     "id": "api.command_me.desc",
     "translation": "执行一个操作"
   },
@@ -644,44 +640,144 @@
     "translation": "您现在在线了"
   },
   {
-    "id": "api.command_shortcuts.browser",
-    "translation": "#### 浏览器自带命令\n\nALT+向左键：您历史里的上一个频道\nALT+向右键：您历史里的下一个频道\nCTRL+加号：加大字体大小 (放大)\nCTRL+减号：减小字体大小 (缩小)\nSHIFT+向上键 (在输入框)：高亮字到上一行\nSHIFT+向下键 (在输入框)：高亮字到下一行\nSHIFT+回车 (在输入框)：创建新一行\n"
+    "id": "api.command_shortcuts.browser.channel_next",
+    "translation": "{{.ChannelNextCmd}}: Next channel in your history\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_next.cmd",
+    "translation": "ALT+RIGHT"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_next.cmd_mac",
+    "translation": "CMD+]"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_prev",
+    "translation": "{{.ChannelPrevCmd}}: Previous channel in your history\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_prev.cmd",
+    "translation": "ALT+LEFT"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_prev.cmd_mac",
+    "translation": "CMD+["
+  },
+  {
+    "id": "api.command_shortcuts.browser.font_decrease",
+    "translation": "{{.CmdOrCtrl}}+MINUS: Decrease font size (zoom out)\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.font_increase",
+    "translation": "{{.CmdOrCtrl}}+PLUS: Increase font size (zoom in)\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.header",
+    "translation": "#### Built-in Browser Commands\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.highlight_next",
+    "translation": "SHIFT+DOWN (in input field): Highlight text to the next line\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.highlight_prev",
+    "translation": "SHIFT+UP (in input field): Highlight text to the previous line\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.newline",
+    "translation": "SHIFT+ENTER (in input field): Create a new line\n"
+  },
+  {
+    "id": "api.command_shortcuts.cmd",
+    "translation": "CMD"
   },
   {
-    "id": "api.command_shortcuts.browser_mac",
-    "translation": "#### 浏览器自带命令\n\nCMD +[：您历史里的上一个频道\nCMD +]：您历史里的下一个频道\nCMD +加号：加大字体大小 (放大)\nCMD +减号：减小字体大小 (缩小)\nSHIFT+向上键 (在输入框)：高亮字到上一行\nSHIFT+向下键 (在输入框)：高亮字到下一行\nSHIFT+回车 (在输入框)：创建新一行\n"
+    "id": "api.command_shortcuts.ctrl",
+    "translation": "CTRL"
   },
   {
     "id": "api.command_shortcuts.desc",
     "translation": "显示快捷键列表"
   },
   {
-    "id": "api.command_shortcuts.files",
-    "translation": "#### 文件\n\nCTRL+U：上传文件\n\n"
+    "id": "api.command_shortcuts.files.header",
+    "translation": "#### Files\n\n"
   },
   {
-    "id": "api.command_shortcuts.files_mac",
-    "translation": "#### 文件\n\nCMD+U：上传文件\n\n"
+    "id": "api.command_shortcuts.files.upload",
+    "translation": "{{.CmdOrCtrl}}+U: Upload file(s)\n\n"
   },
   {
-    "id": "api.command_shortcuts.msgs",
-    "translation": "#### 消息\n\nESC：标当前频道所有消息为已读\nCTRL+向上键 (在空输入栏)：重用您输入的上一条消息或斜杠命令\nCTRL+向下键 (在空输入栏)：重用您输入的下一条消息或斜杠命令\n向上键 (在空输入栏)：修改您当前频道的上一条消息\n@[字符]+TAB：自动完成以[字符]开头的 @用户名\n~[字符]+TAB：自动完成以[字符]开头的频道\n:[字符]+TAB：自动完成以[字符]开头的表情符\n\n"
+    "id": "api.command_shortcuts.header",
+    "translation": "### Keyboard Shortcuts\n\n"
   },
   {
-    "id": "api.command_shortcuts.msgs_mac",
-    "translation": "#### 消息\n\nESC：标当前频道所有消息为已读\nCMD+向上键 (在空输入栏)：重用您输入的上一条消息或斜杠命令\nCMD+向下键 (在空输入栏)：重用您输入的下一条消息或斜杠命令\n向上键 (在空输入栏)：修改您当前频道的上一条消息\n@[字符]+TAB：自动完成以[字符]开头的 @用户名\n~[字符]+TAB：自动完成以[字符]开头的频道\n:[字符]+TAB：自动完成以[字符]开头的表情符\n\n"
+    "id": "api.command_shortcuts.msgs.comp_channel",
+    "translation": "~[character]+TAB: Autocomplete channel beginning with [character]\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.comp_emoji",
+    "translation": ":[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.comp_username",
+    "translation": "@[character]+TAB: Autocomplete @username beginning with [character]\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.edit",
+    "translation": "UP (in empty input field): Edit your last message in the current channel\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.header",
+    "translation": "#### Messages\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.mark_as_read",
+    "translation": "ESC: Mark all messages in the current channel as read\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.reprint_next",
+    "translation": "{{.CmdOrCtrl}}+DOWN (in empty input field): Reprint the next message or slash command you entered\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.reprint_prev",
+    "translation": "{{.CmdOrCtrl}}+UP (in empty input field): Reprint the previous message or slash command you entered\n"
   },
   {
     "id": "api.command_shortcuts.name",
     "translation": "快捷键"
   },
   {
-    "id": "api.command_shortcuts.nav",
-    "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.header",
+    "translation": "#### Navigation\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.next",
+    "translation": "ALT+DOWN: Next channel or direct message in left hand sidebar\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.prev",
+    "translation": "ALT+UP: Previous channel or direct message in left hand sidebar\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.recent_mentions",
+    "translation": "{{.CmdOrCtrl}}+SHIFT+M: Open recent mentions\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.settings",
+    "translation": "{{.CmdOrCtrl}}+SHIFT+A: Open account settings\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.switcher",
+    "translation": "{{.CmdOrCtrl}}+K: Open a quick channel switcher dialog\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.unread_next",
+    "translation": "ALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\n"
   },
   {
-    "id": "api.command_shortcuts.nav_mac",
-    "translation": "### 键盘快捷键\n\n#### 导航\n\nALT+向上键：左栏中上一频道或私信\nALT+向下键：左栏中下一频道或私信\nALT+SHIFT+向上键：左栏中上一个有未读消息的频道或私信\nALT+SHIFT+向下键：左栏中下一个有未读消息的频道或私信\nCMD +K：打开快速频道切换对话框\nCMD +SHIFT+A：打开帐号设定\nCMD +SHIFT+M：打开最近提及\n\n"
+    "id": "api.command_shortcuts.nav.unread_prev",
+    "translation": "ALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\n"
   },
   {
     "id": "api.command_shrug.desc",
diff --git a/i18n/zh_TW.json b/i18n/zh_TW.json
index e06fd898a..a3f8c5fae 100644
--- a/i18n/zh_TW.json
+++ b/i18n/zh_TW.json
@@ -301,7 +301,7 @@
   },
   {
     "id": "api.channel.post_update_channel_displayname_message_and_forget.create_post.error",
-    "translation": "Failed to post displayname update message %v"
+    "translation": "發送顯示名稱更新訊息時失敗 %v"
   },
   {
     "id": "api.channel.post_update_channel_displayname_message_and_forget.retrieve_user.error",
@@ -337,7 +337,7 @@
   },
   {
     "id": "api.channel.remove.default.app_error",
-    "translation": "無法退出預設的頻道 {{.Channel}}"
+    "translation": "無法將使用者從預設的頻道移除 {{.Channel}}"
   },
   {
     "id": "api.channel.remove_member.permissions.app_error",
@@ -509,7 +509,7 @@
   },
   {
     "id": "api.command_echo.message.app_error",
-    "translation": "A message must be provided with the /echo command."
+    "translation": "使用 /echo 命令必須提供訊息。"
   },
   {
     "id": "api.command_echo.name",
@@ -572,10 +572,6 @@
     "translation": "登出"
   },
   {
-    "id": "api.command_logout.success_message",
-    "translation": "登出..."
-  },
-  {
     "id": "api.command_me.desc",
     "translation": "執行動作"
   },
@@ -644,44 +640,144 @@
     "translation": "現在狀態為「上線」"
   },
   {
-    "id": "api.command_shortcuts.browser",
-    "translation": "#### 瀏覽器內建命令\n\nALT+LEFT：瀏覽紀錄的前一個頻道\nALT+RIGHT：瀏覽紀錄的下一個頻道\nCTRL+PLUS：增加字體尺寸(放大)\nCTRL+MINUS：減少字體尺寸(縮小)\nSHIFT+UP (在輸入欄)：標記現在到上一行同位置之間的文字\nSHIFT+DOWN (在輸入欄)：標記現在到下一行同位置之間的文字\nSHIFT+ENTER (在輸入欄)：新增一行\n"
+    "id": "api.command_shortcuts.browser.channel_next",
+    "translation": "{{.ChannelNextCmd}}：紀錄的下一個頻道\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_next.cmd",
+    "translation": "ALT+RIGHT"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_next.cmd_mac",
+    "translation": "CMD+]"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_prev",
+    "translation": "{{.ChannelPrevCmd}}：紀錄的前一個頻道\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_prev.cmd",
+    "translation": "ALT+LEFT"
+  },
+  {
+    "id": "api.command_shortcuts.browser.channel_prev.cmd_mac",
+    "translation": "CMD+["
+  },
+  {
+    "id": "api.command_shortcuts.browser.font_decrease",
+    "translation": "{{.CmdOrCtrl}}+MINUS：減少字體尺寸(縮小)\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.font_increase",
+    "translation": "{{.CmdOrCtrl}}+PLUS：增加字體尺寸(放大)\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.header",
+    "translation": "#### 瀏覽器內建命令\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.highlight_next",
+    "translation": "SHIFT+DOWN (在輸入欄)：標記現在到下一行同位置之間的文字\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.highlight_prev",
+    "translation": "SHIFT+UP (在輸入欄)：標記現在到上一行同位置之間的文字\n"
+  },
+  {
+    "id": "api.command_shortcuts.browser.newline",
+    "translation": "SHIFT+ENTER (在輸入欄)：新增一行\n"
+  },
+  {
+    "id": "api.command_shortcuts.cmd",
+    "translation": "CMD"
   },
   {
-    "id": "api.command_shortcuts.browser_mac",
-    "translation": "#### 瀏覽器內建命令\n\nCMD+[：瀏覽紀錄的前一個頻道\nCMD+]：瀏覽紀錄的下一個頻道\nCMD+PLUS：增加字體尺寸(放大)\nCMD+MINUS：減少字體尺寸(縮小)\nSHIFT+UP (在輸入欄)：標記現在到上一行同位置之間的文字\nSHIFT+DOWN (在輸入欄)：標記現在到下一行同位置之間的文字\nSHIFT+ENTER (在輸入欄)：新增一行\n"
+    "id": "api.command_shortcuts.ctrl",
+    "translation": "CTRL"
   },
   {
     "id": "api.command_shortcuts.desc",
     "translation": "顯示鍵盤快捷鍵列表"
   },
   {
-    "id": "api.command_shortcuts.files",
-    "translation": "#### 檔案\n\nCTRL+U：上傳檔案\n\n"
+    "id": "api.command_shortcuts.files.header",
+    "translation": "#### 檔案\n\n"
   },
   {
-    "id": "api.command_shortcuts.files_mac",
-    "translation": "#### 檔案\n\nCMD+U：上傳檔案\n\n"
+    "id": "api.command_shortcuts.files.upload",
+    "translation": "{{.CmdOrCtrl}}+U：上傳檔案\n\n"
   },
   {
-    "id": "api.command_shortcuts.msgs",
-    "translation": "#### 訊息\n\nESC：將當前頻道所有訊息設為已讀\nCTRL+UP (在空的輸入欄)：顯示上一個您輸入的訊息或是斜線命令\nCTRL+DOWN (在空的輸入欄)：顯示下一個您輸入的訊息或是斜線命令\nUP (在空的輸入欄)：編輯當前頻道您的上一個訊息\n@[文字]+TAB：自動完成以[文字]起始的@使用者帳號\n~[文字]+TAB：自動完成以[文字]起始的頻道\n:[文字]+TAB：自動完成以[文字]起始的顏文字\n\n"
+    "id": "api.command_shortcuts.header",
+    "translation": "### 鍵盤快捷鍵\n\n"
   },
   {
-    "id": "api.command_shortcuts.msgs_mac",
-    "translation": "#### 訊息\n\nESC：將當前頻道所有訊息設為已讀\nCMD+UP (在空的輸入欄)：顯示上一個您輸入的訊息或是斜線命令\nCMD+DOWN (在空的輸入欄)：顯示下一個您輸入的訊息或是斜線命令\nUP (在空的輸入欄)：編輯當前頻道您的上一個訊息\n@[文字]+TAB：自動完成以[文字]起始的@使用者帳號\n~[文字]+TAB：自動完成以[文字]起始的頻道\n:[文字]+TAB：自動完成以[文字]起始的顏文字\n\n"
+    "id": "api.command_shortcuts.msgs.comp_channel",
+    "translation": "~[文字]+TAB：自動完成以[文字]起始的頻道\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.comp_emoji",
+    "translation": ":[文字]+TAB：自動完成以[文字]起始的顏文字\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.comp_username",
+    "translation": "@[文字]+TAB：自動完成以[文字]起始的@使用者帳號\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.edit",
+    "translation": "UP (在空的輸入欄)：編輯當前頻道您的上一個訊息\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.header",
+    "translation": "#### 訊息\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.mark_as_read",
+    "translation": "ESC：將當前頻道所有訊息設為已讀\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.reprint_next",
+    "translation": "{{.CmdOrCtrl}}+DOWN (在空的輸入欄)：顯示下一個您輸入的訊息或是斜線命令\n"
+  },
+  {
+    "id": "api.command_shortcuts.msgs.reprint_prev",
+    "translation": "{{.CmdOrCtrl}}+UP (在空的輸入欄)：顯示上一個您輸入的訊息或是斜線命令\n"
   },
   {
     "id": "api.command_shortcuts.name",
     "translation": "快捷鍵"
   },
   {
-    "id": "api.command_shortcuts.nav",
-    "translation": "### 鍵盤快捷鍵\n\n#### 瀏覽\n\nALT+UP：側邊欄裡面上一個頻道或直接訊息\nALT+DOWN：側邊欄裡面下一個頻道或直接訊息\nALT+SHIFT+UP：側邊欄裡面上一個有未讀訊息的頻道或直接訊息\nALT+SHIFT+DOWN：側邊欄裡面下一個有未讀訊息的頻道或直接訊息\nCTRL+K：開啟快速切換頻道對話框\nCTRL+SHIFT+A：開啟帳號設定\nCTRL+SHIFT+M：開啟最近提及您的訊息\n\n"
+    "id": "api.command_shortcuts.nav.header",
+    "translation": "#### 瀏覽\n\n"
   },
   {
-    "id": "api.command_shortcuts.nav_mac",
-    "translation": "### 鍵盤快捷鍵\n\n#### 瀏覽\n\nALT+UP：側邊欄裡面上一個頻道或直接訊息\nALT+DOWN：側邊欄裡面下一個頻道或直接訊息\nALT+SHIFT+UP：側邊欄裡面上一個有未讀訊息的頻道或直接訊息\nALT+SHIFT+DOWN：側邊欄裡面下一個有未讀訊息的頻道或直接訊息\nCMD+K：開啟快速切換頻道對話框\nCMD+SHIFT+A：開啟帳號設定\nCMD+SHIFT+M：開啟最近提及您的訊息\n\n"
+    "id": "api.command_shortcuts.nav.next",
+    "translation": "ALT+DOWN：側邊欄裡面下一個頻道或直接訊息\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.prev",
+    "translation": "ALT+UP：側邊欄裡面上一個頻道或直接訊息\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.recent_mentions",
+    "translation": "{{.CmdOrCtrl}}+SHIFT+M：開啟最近提及您的訊息\n\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.settings",
+    "translation": "{{.CmdOrCtrl}}+SHIFT+A：開啟帳號設定\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.switcher",
+    "translation": "{{.CmdOrCtrl}}+K：開啟快速切換頻道對話框\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.unread_next",
+    "translation": "ALT+SHIFT+DOWN：側邊欄裡面下一個有未讀訊息的頻道或直接訊息\n"
+  },
+  {
+    "id": "api.command_shortcuts.nav.unread_prev",
+    "translation": "ALT+SHIFT+UP：側邊欄裡面上一個有未讀訊息的頻道或直接訊息\n"
   },
   {
     "id": "api.command_shrug.desc",
@@ -729,7 +825,7 @@
   },
   {
     "id": "api.context.missing_teamid.app_error",
-    "translation": "Missing Team Id"
+    "translation": "找不到團隊 ID"
   },
   {
     "id": "api.context.permissions.app_error",
@@ -1549,19 +1645,19 @@
   },
   {
     "id": "api.reaction.delete_reaction.mismatched_channel_id.app_error",
-    "translation": "Failed to delete reaction because channel ID does not match post ID in the URL"
+    "translation": "由於URL中的頻道 ID 與文章 ID 不相符，刪除互動失敗"
   },
   {
     "id": "api.reaction.init.debug",
-    "translation": "初始化管理 API 路徑"
+    "translation": "初始化互動 API 路徑"
   },
   {
     "id": "api.reaction.list_reactions.mismatched_channel_id.app_error",
-    "translation": "Failed to get reactions because channel ID does not match post ID in the URL"
+    "translation": "由於URL中的頻道 ID 與文章 ID 不相符，讀取互動失敗"
   },
   {
     "id": "api.reaction.save_reaction.mismatched_channel_id.app_error",
-    "translation": "Failed to save reaction because channel ID does not match post ID in the URL"
+    "translation": "由於URL中的頻道 ID 與文章 ID 不相符，儲存互動失敗"
   },
   {
     "id": "api.reaction.send_reaction_event.post.app_error",
@@ -1853,7 +1949,7 @@
   },
   {
     "id": "api.team.import_team.unavailable.app_error",
-    "translation": "Malformed request: filesize field is not present."
+    "translation": "要求格式錯誤：沒有檔案大小欄位。"
   },
   {
     "id": "api.team.init.debug",
@@ -2345,7 +2441,7 @@
   },
   {
     "id": "api.user.login.not_provided.app_error",
-    "translation": "Must provide either user ID, or team name and user email"
+    "translation": "必須提供使用者 ID 或團隊名稱與使用者電子郵件"
   },
   {
     "id": "api.user.login.not_verified.app_error",
@@ -3065,7 +3161,7 @@
   },
   {
     "id": "mattermost.load_license.find.warn",
-    "translation": "License key from https://mattermost.com required to unlock enterprise features."
+    "translation": "需要來自 https://mattermost.com 的授權金鑰以解鎖企業功能。"
   },
   {
     "id": "mattermost.security_bulletin.error",
@@ -3265,7 +3361,7 @@
   },
   {
     "id": "model.command.is_valid.url.app_error",
-    "translation": "Invalid URL"
+    "translation": "無效的 URL"
   },
   {
     "id": "model.command.is_valid.url_http.app_error",
@@ -3757,7 +3853,7 @@
   },
   {
     "id": "model.post.is_valid.root_parent.app_error",
-    "translation": "若上層 ID 已設定則根 ID 也必須設定否則為非法"
+    "translation": "若上層 ID 已設定則根 ID 也必須設定否則無效"
   },
   {
     "id": "model.post.is_valid.type.app_error",
@@ -3905,7 +4001,7 @@
   },
   {
     "id": "model.user.is_valid.position.app_error",
-    "translation": "Invalid position: must not be longer than 35 characters."
+    "translation": "無效的位置：不能超過35個字元。"
   },
   {
     "id": "model.user.is_valid.pwd.app_error",
@@ -4897,7 +4993,7 @@
   },
   {
     "id": "store.sql_team.get_unread.app_error",
-    "translation": "We couldn't get the teams unread messages"
+    "translation": "無法取得團隊未讀訊息"
   },
   {
     "id": "store.sql_team.permanent_delete.app_error",
@@ -5353,7 +5449,7 @@
   },
   {
     "id": "web.incoming_webhook.attachment.app_error",
-    "translation": "Maximum attachments length is {{.Max}} characters, received size is {{.Actual}}"
+    "translation": "附件最大大小為 {{.Max}} 字元，已接收大小為 {{.Actual}}"
   },
   {
     "id": "web.incoming_webhook.channel.app_error",
@@ -5381,7 +5477,7 @@
   },
   {
     "id": "web.incoming_webhook.text.length.app_error",
-    "translation": "Maximum text length is {{.Max}} characters, received size is {{.Actual}}"
+    "translation": "文字最長可為 {{.Max}} 字元，已接收大小為 {{.Actual}}"
   },
   {
     "id": "web.incoming_webhook.user.app_error",
diff --git a/webapp/i18n/de.json b/webapp/i18n/de.json
index 5bcfed8a0..54f04996b 100644
--- a/webapp/i18n/de.json
+++ b/webapp/i18n/de.json
@@ -2162,6 +2162,7 @@
   "user.settings.security.title": "Sicherheitseinstellungen",
   "user.settings.security.viewHistory": "Zeige Zugriffshistorie",
   "user_list.notFound": "Keine Benutzer gefunden",
+  "user_profile.send.dm": "Nachricht versenden",
   "user_profile.webrtc.call": "Videoanruf starten",
   "user_profile.webrtc.offline": "Der Benutzer ist offline",
   "user_profile.webrtc.unavailable": "Neuer Anruf nicht möglich bis ihr bestehender Anruf beendet ist",
diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json
index 81ac9965c..36a8c9475 100644
--- a/webapp/i18n/es.json
+++ b/webapp/i18n/es.json
@@ -1655,7 +1655,7 @@
   "post_info.reply": "Responder",
   "posts_view.loadMore": "Cargar más mensajes",
   "posts_view.newMsg": "Nuevos Mensajes",
-  "posts_view.newMsgBelow": "{count} {count, plural, one {nuevo mensaje} other {nuevos mensajes}} ▼",
+  "posts_view.newMsgBelow": "{count, plural, one {Nuevo mensaje} other {Nuevos mensajes}} ▼",
   "reaction.clickToAdd": "(clic para agregar)",
   "reaction.clickToRemove": "(clic para quitar)",
   "reaction.othersReacted": "{otherUsers, number} {otherUsers, plural, one {usuario} other {usuarios}}",
@@ -2162,6 +2162,7 @@
   "user.settings.security.title": "Configuración de Seguridad",
   "user.settings.security.viewHistory": "Visualizar historial de acceso",
   "user_list.notFound": "No se encontraron usuarios",
+  "user_profile.send.dm": "Send Message",
   "user_profile.webrtc.call": "Iniciar llamada de vídeo",
   "user_profile.webrtc.offline": "El usuario está desconectado",
   "user_profile.webrtc.unavailable": "No se puede realizar una nueva llamada hasta que la llamada actual finalice",
diff --git a/webapp/i18n/fr.json b/webapp/i18n/fr.json
index 984f8cc46..2bf3d6ea9 100644
--- a/webapp/i18n/fr.json
+++ b/webapp/i18n/fr.json
@@ -1655,7 +1655,7 @@
   "post_info.reply": "Répondre",
   "posts_view.loadMore": "Charger plus de messages",
   "posts_view.newMsg": "Nouveaux messages",
-  "posts_view.newMsgBelow": "{count} new {count, plural, one {message} other {messages}} below",
+  "posts_view.newMsgBelow": "New {count, plural, one {message} other {messages}} below",
   "reaction.clickToAdd": "(click to add)",
   "reaction.clickToRemove": "(click to remove)",
   "reaction.othersReacted": "{otherUsers, number} {otherUsers, plural, one {user} other {users}}",
@@ -2162,6 +2162,7 @@
   "user.settings.security.title": "Paramètres de sécurité",
   "user.settings.security.viewHistory": "Voir l'historique des accès",
   "user_list.notFound": "Aucun utilisateur trouvé.",
+  "user_profile.send.dm": "Send Message",
   "user_profile.webrtc.call": "Démarrer un appel vidéo",
   "user_profile.webrtc.offline": "The user is offline",
   "user_profile.webrtc.unavailable": "Passer un nouvel appel n'est pas possible tant que l'appel en cours n'a pas été terminé",
diff --git a/webapp/i18n/ja.json b/webapp/i18n/ja.json
index 51039d035..b13de981e 100644
--- a/webapp/i18n/ja.json
+++ b/webapp/i18n/ja.json
@@ -941,60 +941,60 @@
   "analytics.team.title": "{team}チームの使用統計",
   "analytics.team.totalPosts": "総投稿数",
   "analytics.team.totalUsers": "総ユーザー数",
-  "audit_table.accountActive": "アカウントを有効にした",
-  "audit_table.accountInactive": "アカウントは無効になりました",
+  "audit_table.accountActive": "アカウントが有効になりました",
+  "audit_table.accountInactive": "アカウントが無効になりました",
   "audit_table.action": "アクション",
-  "audit_table.attemptedAllowOAuthAccess": "新しいOAuthサービスアクセスを許可した",
-  "audit_table.attemptedLicenseAdd": "新しいライセンスを追加した",
-  "audit_table.attemptedLogin": "ログインした",
-  "audit_table.attemptedOAuthToken": "新しいOAuthアクセストークンを取得した",
-  "audit_table.attemptedPassword": "パスワードを変更した",
-  "audit_table.attemptedRegisterApp": "ID {id}で新しいOAuthアプリケーションを登録した",
-  "audit_table.attemptedReset": "パスワードを初期化した",
-  "audit_table.attemptedWebhookCreate": "ウェブフックを作成した",
-  "audit_table.attemptedWebhookDelete": "ウェブフックを削除した",
+  "audit_table.attemptedAllowOAuthAccess": "新しいOAuthサービスアクセスを許可しました",
+  "audit_table.attemptedLicenseAdd": "新しいライセンスを追加しました",
+  "audit_table.attemptedLogin": "ログインしました",
+  "audit_table.attemptedOAuthToken": "新しいOAuthアクセストークンを取得しました",
+  "audit_table.attemptedPassword": "パスワードを変更しました",
+  "audit_table.attemptedRegisterApp": "ID {id}で新しいOAuthアプリケーションを登録しました",
+  "audit_table.attemptedReset": "パスワードを初期化しました",
+  "audit_table.attemptedWebhookCreate": "ウェブフックを作成しました",
+  "audit_table.attemptedWebhookDelete": "ウェブフックを削除しました",
   "audit_table.by": " {username}による",
   "audit_table.byAdmin": " システム管理者による",
-  "audit_table.channelCreated": "{channelName}チャンネル/グループを作成した",
-  "audit_table.channelDeleted": "URL {url}のチャンネル/グループを削除した",
-  "audit_table.establishedDM": "{username}のダイレクトメッセージチャンネルを作成した",
-  "audit_table.failedExpiredLicenseAdd": "有効期間外のため新しいライセンスを追加できなかった",
-  "audit_table.failedInvalidLicenseAdd": "不正なライセンスを追加できなかった",
-  "audit_table.failedLogin": "ログインに失敗した",
-  "audit_table.failedOAuthAccess": "新しいOAuthサービスアクセスへのアクセスを許可するのに失敗した- リダイレクトURIが過去に登録されたコールバックを合致しません",
+  "audit_table.channelCreated": "{channelName}チャンネル/グループを作成しました",
+  "audit_table.channelDeleted": "URL {url}のチャンネル/グループを削除しました",
+  "audit_table.establishedDM": "{username}のダイレクトメッセージチャンネルを作成しました",
+  "audit_table.failedExpiredLicenseAdd": "有効期間外のため新しいライセンスを追加できませんでした",
+  "audit_table.failedInvalidLicenseAdd": "不正なライセンスを追加できませんでした",
+  "audit_table.failedLogin": "ログインに失敗しました",
+  "audit_table.failedOAuthAccess": "新しいOAuthサービスへのアクセスを許可できませんでした - リダイレクトURIが過去に登録されたコールバックと一致しません",
   "audit_table.failedPassword": "パスワードの変更に失敗しました - OAuthでログインしていたユーザーのパスワードを更新しようとしました",
-  "audit_table.failedWebhookCreate": "ウェブフックの作成に失敗した - チャンネルへの権限が不正です",
+  "audit_table.failedWebhookCreate": "ウェブフックの作成に失敗しました - チャンネルへの権限が不正です",
   "audit_table.failedWebhookDelete": "ウェブフックの削除に失敗しました - 不適切な状態です",
-  "audit_table.headerUpdated": "{channelName}チャンネル/グループヘッダーを更新した",
+  "audit_table.headerUpdated": "{channelName}チャンネル/グループヘッダーを更新しました",
   "audit_table.ip": "IPアドレス",
-  "audit_table.licenseRemoved": "ライセンスを削除した",
+  "audit_table.licenseRemoved": "ライセンスが正常に削除されました",
   "audit_table.loginAttempt": " (ログイン試行)",
   "audit_table.loginFailure": " (ログイン失敗)",
-  "audit_table.logout": "ログアウトした",
+  "audit_table.logout": "ログアウトしました",
   "audit_table.member": "メンバー",
-  "audit_table.nameUpdated": "{channelName}チャンネル/グループの名称を更新した",
-  "audit_table.oauthTokenFailed": "OAuthアクセストークン{token}の取得に失敗した",
-  "audit_table.revokedAll": "チームの現在の全てのセッションを削除した",
-  "audit_table.sentEmail": "パスワードを初期化するために{email}へ電子メールを送信した",
+  "audit_table.nameUpdated": "{channelName}チャンネル/グループの名称を更新しました",
+  "audit_table.oauthTokenFailed": "OAuthアクセストークン{token}の取得に失敗しました",
+  "audit_table.revokedAll": "チームの現在の全てのセッションを削除しました",
+  "audit_table.sentEmail": "パスワードを初期化するために{email}へ電子メールを送信しました",
   "audit_table.session": "セッションID",
-  "audit_table.sessionRevoked": "ID{sessionId}のセッションを削除した",
-  "audit_table.successfullLicenseAdd": "新しいライセンスを追加した",
-  "audit_table.successfullLogin": "ログインした",
-  "audit_table.successfullOAuthAccess": "新しいOAuthサービスアクセスを使用した",
-  "audit_table.successfullOAuthToken": "新しいOAuthサービスを追加した",
-  "audit_table.successfullPassword": "パスワードを変更した",
-  "audit_table.successfullReset": "パスワードを初期化した",
-  "audit_table.successfullWebhookCreate": "ウェブフックを作成した",
-  "audit_table.successfullWebhookDelete": "ウェブフックを削除した",
+  "audit_table.sessionRevoked": "ID{sessionId}のセッションを削除しました",
+  "audit_table.successfullLicenseAdd": "新しいライセンスを追加しました",
+  "audit_table.successfullLogin": "ログインしました",
+  "audit_table.successfullOAuthAccess": "新しいOAuthサービスアクセスを使用しました",
+  "audit_table.successfullOAuthToken": "新しいOAuthサービスを追加しました",
+  "audit_table.successfullPassword": "パスワードを変更しました",
+  "audit_table.successfullReset": "パスワードを初期化しました",
+  "audit_table.successfullWebhookCreate": "ウェブフックを作成しました",
+  "audit_table.successfullWebhookDelete": "ウェブフックを削除しました",
   "audit_table.timestamp": "タイムスタンプ",
   "audit_table.updateGeneral": "アカウントの全般の設定を更新しました",
-  "audit_table.updateGlobalNotifications": "システム全体に関する通知の設定を更新した",
-  "audit_table.updatePicture": "プロフィール画像を更新した",
-  "audit_table.updatedRol": "ユーザーの役割を変更した。変更後: ",
-  "audit_table.userAdded": "{username}を{channelName}チャンネル/グループに追加した",
+  "audit_table.updateGlobalNotifications": "システム全体に関する通知の設定を更新しました",
+  "audit_table.updatePicture": "プロフィール画像を更新しました",
+  "audit_table.updatedRol": "ユーザーの役割を変更しました。変更後: ",
+  "audit_table.userAdded": "{username}を{channelName}チャンネル/グループに追加ししました",
   "audit_table.userId": "ユーザーID",
-  "audit_table.userRemoved": "{username}を{channelName}チャンネル/グループから削除した",
-  "audit_table.verified": "電子メールアドレスを確認した",
+  "audit_table.userRemoved": "{username}を{channelName}チャンネル/グループから削除しました",
+  "audit_table.verified": "電子メールアドレスを確認しました",
   "authorize.access": "<strong>{appName}</strong>のアクセスを許可しますか?",
   "authorize.allow": "許可する",
   "authorize.app": "<strong>{appName}</strong>アプリケーションは、あなたの基本情報にアクセスしたり、変更したりすることができるようになります。",
@@ -1009,7 +1009,7 @@
   "backstage_sidebar.integrations.oauthApps": "OAuth 2.0アプリケーション",
   "backstage_sidebar.integrations.outgoing_webhooks": "外向きのウェブフック",
   "calling_screen": "呼び出し中",
-  "center_panel.recent": "ここクリックして最近のメッセージへ移動します。 ",
+  "center_panel.recent": "ここをクリックして最近のメッセージへ移動します。 ",
   "chanel_header.addMembers": "メンバーを追加する",
   "change_url.close": "閉じる",
   "change_url.endWithLetter": "英数字で終わらせてください",
@@ -1655,7 +1655,7 @@
   "post_info.reply": "返信する",
   "posts_view.loadMore": "もっとメッセージを読み込む",
   "posts_view.newMsg": "新しいメッセージ",
-  "posts_view.newMsgBelow": "以下に {count} の新しい {count, plural, one {message} other {messages}}",
+  "posts_view.newMsgBelow": "以下に新しい {count, plural, one {message} other {messages}}があります",
   "reaction.clickToAdd": "(クリックして追加する)",
   "reaction.clickToRemove": "(クリックして削除する)",
   "reaction.othersReacted": "{otherUsers, number} {otherUsers, plural, one {user} other {users}}",
@@ -2162,6 +2162,7 @@
   "user.settings.security.title": "セキュリティーの設定",
   "user.settings.security.viewHistory": "アクセス履歴を見る",
   "user_list.notFound": "ユーザーが見付かりません",
+  "user_profile.send.dm": "メッセージを送信",
   "user_profile.webrtc.call": "ビデオ通話の開始",
   "user_profile.webrtc.offline": "ユーザーはオフラインです",
   "user_profile.webrtc.unavailable": "あなたの現在の通話を終了するまで新しい通話を利用することはできません",
diff --git a/webapp/i18n/ko.json b/webapp/i18n/ko.json
index 65e4bd77e..46125ecf2 100644
--- a/webapp/i18n/ko.json
+++ b/webapp/i18n/ko.json
@@ -1655,7 +1655,7 @@
   "post_info.reply": "답글",
   "posts_view.loadMore": "메시지 더 보기",
   "posts_view.newMsg": "새로운 메시지",
-  "posts_view.newMsgBelow": "{count} new {count, plural, one {message} other {messages}} below",
+  "posts_view.newMsgBelow": "New {count, plural, one {message} other {messages}} below",
   "reaction.clickToAdd": "(click to add)",
   "reaction.clickToRemove": "(click to remove)",
   "reaction.othersReacted": "{otherUsers, number} {otherUsers, plural, one {user} other {users}}",
@@ -2162,6 +2162,7 @@
   "user.settings.security.title": "보안 설정",
   "user.settings.security.viewHistory": "접속 내역 보기",
   "user_list.notFound": "사용자를 찾을 수 없습니다 :(",
+  "user_profile.send.dm": "Send Message",
   "user_profile.webrtc.call": "영상통화 시작",
   "user_profile.webrtc.offline": "사용자가 오프라인입니다",
   "user_profile.webrtc.unavailable": "New call unavailable until your existing call ends",
diff --git a/webapp/i18n/nl.json b/webapp/i18n/nl.json
index 4b5dfb2c6..006322d03 100644
--- a/webapp/i18n/nl.json
+++ b/webapp/i18n/nl.json
@@ -1655,7 +1655,7 @@
   "post_info.reply": "Antwoord",
   "posts_view.loadMore": "Laad meer berichten",
   "posts_view.newMsg": "Nieuwe berichten",
-  "posts_view.newMsgBelow": "{count} new {count, plural, one {message} other {messages}} below",
+  "posts_view.newMsgBelow": "New {count, plural, one {message} other {messages}} below",
   "reaction.clickToAdd": "(click to add)",
   "reaction.clickToRemove": "(click to remove)",
   "reaction.othersReacted": "{otherUsers, number} {otherUsers, plural, one {user} other {users}}",
@@ -2162,6 +2162,7 @@
   "user.settings.security.title": "Beveiligingsinstellingen",
   "user.settings.security.viewHistory": "Bekijk Toegang Geschiedenis ",
   "user_list.notFound": "Geen gebruikers gevonden",
+  "user_profile.send.dm": "Send Message",
   "user_profile.webrtc.call": "Start een video-oproep",
   "user_profile.webrtc.offline": "The user is offline",
   "user_profile.webrtc.unavailable": "New call unavailable until your existing call ends",
diff --git a/webapp/i18n/pt-BR.json b/webapp/i18n/pt-BR.json
index 10dc017da..c99aa7ddb 100644
--- a/webapp/i18n/pt-BR.json
+++ b/webapp/i18n/pt-BR.json
@@ -199,9 +199,9 @@
   "admin.compliance_table.type": "Tipo",
   "admin.compliance_table.userId": "Solicitado Por",
   "admin.connectionSecurityNone": "Nenhum",
-  "admin.connectionSecurityNoneDescription": "Mattermost irá conectar usando uma conexão insegura.",
+  "admin.connectionSecurityNoneDescription": "Mattermost irá conectar usando uma conexão não segura.",
   "admin.connectionSecurityPlain": "PLAIN",
-  "admin.connectionSecurityPlainDescription": "Mattermost irá conectar e autenticar usando uma conexão insegura.",
+  "admin.connectionSecurityPlainDescription": "Mattermost irá conectar e autenticar usando uma conexão não segura.",
   "admin.connectionSecurityStart": "STARTTLS",
   "admin.connectionSecurityStartDescription": "Obtém uma conexão insegura existente e tenta atualizá-la para uma conexão segura usando TLS.",
   "admin.connectionSecurityTest": "Testar Conexão",
@@ -545,10 +545,10 @@
   "admin.privacy.showEmailTitle": "Mostrar Endereços de Email: ",
   "admin.privacy.showFullNameDescription": "Quando falso, oculta o nome completo dos usuários dos outros usuários, incluindo donos de equipe e Administradores de Equipe. Nome de usuário é mostrado no lugar do nome completo.",
   "admin.privacy.showFullNameTitle": "Mostrar Nome Completo: ",
-  "admin.purge.button": "Purge All Caches",
+  "admin.purge.button": "Limpar todo o Cache",
   "admin.purge.loading": " Carregando...",
-  "admin.purge.purgeDescription": "This will purge all the in-memory caches for things like sessions, accounts, channels, etc. Deployments using High Availability will attempt to purge all the servers in the cluster.  Purging the caches may adversly impact performance.",
-  "admin.purge.purgeFail": "Reciclagem malsucedida: {error}",
+  "admin.purge.purgeDescription": "Isto irá limpar todo o cache da memória para as coisas como sessão, contas, canais, etc. Deployments usando Alta disponibilidade irá tentar limpar todos os servidores no cluster.   Limpar o cache pode afetar negativamente a performance.",
+  "admin.purge.purgeFail": "Limpeza mal sucedida: {error}",
   "admin.rate.enableLimiterDescription": "Quando verdadeiro, as APIs são estranguladas para as taxas especificadas abaixo.",
   "admin.rate.enableLimiterTitle": "Ativar Limitador de Velocidade: ",
   "admin.rate.httpHeaderDescription": "Quando preenchido, a limitação de velocidade varia pelo campo do cabeçalho HTTP especificado (ex. quando configurado NGINX ajustado para \"X-Real-IP\", quando configurado AmazonELB ajustado para \"X-Forwarded-For\").",
@@ -661,7 +661,7 @@
   "admin.service.corsDescription": "Ativar requisição de origem HTTP Cross dos domínios especificados. Usar \"*\" se você quiser permitir CORS de qualquer domínio ou deixe em branco para desativar.",
   "admin.service.corsEx": "http://example.com",
   "admin.service.corsTitle": "Permitir requisição cross-origin de:",
-  "admin.service.developerDesc": "Quando verdadeiro, erros Javascript são mostrados em uma barra vermelha no topo da interface de usuário. Não recomendado para uso em produção. ",
+  "admin.service.developerDesc": "Quando verdadeiro, os erros de Javascript serão mostrados em uma barra vermelha no topo da interface de usuário. Não recomendado para uso em produção. ",
   "admin.service.developerTitle": "Ativar o Modo Desenvolvedor: ",
   "admin.service.enforcMfaTitle": "Obrigar Autenticação Multi-Fator:",
   "admin.service.enforceMfaDesc": "Quando verdadeiro, os usuários no sistema serão obrigados a configurar [autenticação multi-fator]. Todos os usuários conectados serão redirecionados para a página de configuração de autenticação multi-fator até que eles adicionem MFA com êxito à sua conta.<br/><br/>É recomendável que você ative a execução durante as horas de baixo pico, quando é menos provável de ter pessoas usando o sistema. Os novos usuários serão obrigados a configurar a autenticação multi-fator quando eles se inscreverem. Após a configuração, os usuários não poderão remover a autenticação multi-fator, a menos que a execução esteja desativada.<br/><br/>Observe que a autenticação multi-fator só está disponível para contas com LDAP e métodos de login por e-mail. O Mattermost não aplicará a autenticação multi-fator para outros métodos de login. Se houver usuários em seu sistema usando outros métodos de login, é recomendável configurar e aplicar a autenticação multi-fator diretamente com o provedor SSO ou SAML.",
@@ -885,7 +885,7 @@
   "admin.webrtc.gatewayAdminUrlDescription": "Entre em http://<mattermost-webrtc-gateway-url>:<port>/admin. Certifique-se de usar HTTP ou HTTPS em sua URL, dependendo da sua configuração do servidor. Mattermost WebRTC usa esta URL para obter tokens válidos para cada ponto para estabelecer a conexão.",
   "admin.webrtc.gatewayAdminUrlExample": "Ex.: \"https://webrtc.mattermost.com:7089/admin\"",
   "admin.webrtc.gatewayAdminUrlTitle": "URL Administração do Gateway:",
-  "admin.webrtc.gatewayWebsocketUrlDescription": "Entre wss://<mattermost-webrtc-gateway-url>:<port>. Certifique-se de usar WS ou WSS em sua URL dependendo da sua configuração do servidor. Este é o websocket usado para sinalizar e estabelecer a comunicação entre os pontos.",
+  "admin.webrtc.gatewayWebsocketUrlDescription": "Digite wss://<mattermost-webrtc-gateway-url>:<port>. Certifique-se de usar WS ou WSS em sua URL dependendo da sua configuração do servidor. Este é o websocket usado para sinalizar e estabelecer a comunicação entre os pontos.",
   "admin.webrtc.gatewayWebsocketUrlExample": "Ex.: \"wss://webrtc.mattermost.com:8189\"",
   "admin.webrtc.gatewayWebsocketUrlTitle": "Gateway Websocket URL:",
   "admin.webrtc.stunUriDescription": "Digite sua STUN URI como stun:<your-stun-url>:<port>. STUN é um protocolo de rede padronizado que permite que um host de destino auxilie dispositivos para estabelecer uma conexão usando um endereço IP público se este está localizado atrás de um NAT.",
@@ -931,7 +931,7 @@
   "analytics.system.totalSessions": "Total de Sessões",
   "analytics.system.totalTeams": "Total de Equipes",
   "analytics.system.totalUsers": "Total de Usuários",
-  "analytics.system.totalWebsockets": "Websocket Conns",
+  "analytics.system.totalWebsockets": "Conexão Websocket",
   "analytics.team.activeUsers": "Usuários Ativos Com Posts",
   "analytics.team.newlyCreated": "Novos Usuários Criados",
   "analytics.team.privateGroups": "Grupos Privados",
@@ -962,7 +962,7 @@
   "audit_table.failedInvalidLicenseAdd": "Falha ao adicionar um licença inválida",
   "audit_table.failedLogin": "FALHA na tentativa de login",
   "audit_table.failedOAuthAccess": "Falha ao permitir um novo acesso ao serviço OAuth - a URI de redirecionamento não coincide com o retorno de chamada registrado anteriormente",
-  "audit_table.failedPassword": "Falha ao alterar a senha - tentado atualizar a senha do usuário que estava conectado através do oauth",
+  "audit_table.failedPassword": "Falha ao alterar a senha - tentou-se atualizar a senha do usuário que estava conectado através do OAuth",
   "audit_table.failedWebhookCreate": "Falha ao criar uma webhook - sem permissão do canal",
   "audit_table.failedWebhookDelete": "Falha ao deletar um webhook - condições inapropriadas",
   "audit_table.headerUpdated": "Atualizado o {channelName} canal/cabeçalho de grupo",
@@ -1999,7 +1999,7 @@
   "user.settings.general.notificationsExtra": "Por padrão, você receberá uma notificação de menção quando alguém digitar seu nome. Vá para definições {notify} para alterar esse padrão.",
   "user.settings.general.notificationsLink": "Notificações",
   "user.settings.general.position": "Cargo",
-  "user.settings.general.positionExtra": "Use Position for your role or job title. This will be shown in your profile popover.",
+  "user.settings.general.positionExtra": "Utilize Posição para seu papel ou cargo. Isto será mostrado no seu profile.",
   "user.settings.general.primaryEmail": "Email Primário",
   "user.settings.general.profilePicture": "Imagem do Perfil",
   "user.settings.general.title": "Definições Gerais",
@@ -2162,6 +2162,7 @@
   "user.settings.security.title": "Configurações de Segurança",
   "user.settings.security.viewHistory": "Ver Histórico de Acesso",
   "user_list.notFound": "Nenhum usuário encontrado",
+  "user_profile.send.dm": "Enviar Mensagem",
   "user_profile.webrtc.call": "Iniciar Video Chamada",
   "user_profile.webrtc.offline": "O usuário está desconectado",
   "user_profile.webrtc.unavailable": "Nova chamada não disponível até que você termine a chamada existente",
diff --git a/webapp/i18n/ru.json b/webapp/i18n/ru.json
index 3454e1d56..304d449c4 100644
--- a/webapp/i18n/ru.json
+++ b/webapp/i18n/ru.json
@@ -1655,7 +1655,7 @@
   "post_info.reply": "Ответить",
   "posts_view.loadMore": "Больше сообщений",
   "posts_view.newMsg": "Новые сообщения",
-  "posts_view.newMsgBelow": "{count} new {count, plural, one {message} other {messages}} below",
+  "posts_view.newMsgBelow": "New {count, plural, one {message} other {messages}} below",
   "reaction.clickToAdd": "(click to add)",
   "reaction.clickToRemove": "(click to remove)",
   "reaction.othersReacted": "{otherUsers, number} {otherUsers, plural, one {user} other {users}}",
@@ -2162,6 +2162,7 @@
   "user.settings.security.title": "Настройки безопасности",
   "user.settings.security.viewHistory": "Просмотр истории доступа",
   "user_list.notFound": "Пользователи не найдены",
+  "user_profile.send.dm": "Send Message",
   "user_profile.webrtc.call": "Видеовызов",
   "user_profile.webrtc.offline": "Пользователь не в сети",
   "user_profile.webrtc.unavailable": "Новый вызов недоступен до завершения текущего",
diff --git a/webapp/i18n/zh_CN.json b/webapp/i18n/zh_CN.json
index 639a0f3ea..0c358dd39 100644
--- a/webapp/i18n/zh_CN.json
+++ b/webapp/i18n/zh_CN.json
@@ -2162,6 +2162,7 @@
   "user.settings.security.title": "安全设置",
   "user.settings.security.viewHistory": "查看访问历史",
   "user_list.notFound": "没有找到用户",
+  "user_profile.send.dm": "Send Message",
   "user_profile.webrtc.call": "开始视频通话",
   "user_profile.webrtc.offline": "此用户已离线",
   "user_profile.webrtc.unavailable": "不能在结束当前通话前开新通话",
diff --git a/webapp/i18n/zh_TW.json b/webapp/i18n/zh_TW.json
index 628781e73..89977787c 100644
--- a/webapp/i18n/zh_TW.json
+++ b/webapp/i18n/zh_TW.json
@@ -435,9 +435,9 @@
   "admin.ldap.portDesc": "Masttermost 連接 AD/LDAP 伺服器的連接埠。預設為389。",
   "admin.ldap.portEx": "如：\"389\"",
   "admin.ldap.portTitle": "AD/LDAP 連接埠：",
-  "admin.ldap.positionAttrDesc": "(非必須) 用於設定 Mattermost 使用者姓氏的 AD/LDAP 伺服器屬性。",
-  "admin.ldap.positionAttrEx": "E.g.: \"title\"",
-  "admin.ldap.positionAttrTitle": "Position Attribute:",
+  "admin.ldap.positionAttrDesc": "(非必須) 用於設定 Mattermost 職位的 AD/LDAP 伺服器屬性。",
+  "admin.ldap.positionAttrEx": "如：\"title\"",
+  "admin.ldap.positionAttrTitle": "職位屬性：",
   "admin.ldap.queryDesc": "查詢 AD/LDAP 伺服器的逾時設定。如果因為 AD/LDAP 伺服器太慢而出現逾時錯誤，請加大其值。",
   "admin.ldap.queryEx": "如：\"60\"",
   "admin.ldap.queryTitle": "查詢逾時設定(秒)：",
@@ -545,10 +545,10 @@
   "admin.privacy.showEmailTitle": "顯示電子郵件地址：",
   "admin.privacy.showFullNameDescription": "若停用，將隱藏使用者的全名，包括團隊擁有者與管理員。顯示全名的地方改為顯示使用者名稱。",
   "admin.privacy.showFullNameTitle": "顯示全名：",
-  "admin.purge.button": "Purge All Caches",
+  "admin.purge.button": "清除所有快取",
   "admin.purge.loading": " 載入中...",
-  "admin.purge.purgeDescription": "This will purge all the in-memory caches for things like sessions, accounts, channels, etc. Deployments using High Availability will attempt to purge all the servers in the cluster.  Purging the caches may adversly impact performance.",
-  "admin.purge.purgeFail": "回收失敗：{error}",
+  "admin.purge.purgeDescription": "這將會清除記憶體中所有的快取資料，如工作階段、帳號、頻道等等。高可用性下的佈署將會嘗試清除叢集裡所有伺服器的快取。 清除快取可能會嚴重影響效能。",
+  "admin.purge.purgeFail": "清除失敗：{error}",
   "admin.rate.enableLimiterDescription": "若啟用，API 使用頻率會被限制成下面所指定的值。",
   "admin.rate.enableLimiterTitle": "啟用張貼頻率限制：",
   "admin.rate.httpHeaderDescription": "當有內容的時候，會根據內容指定的 HTTP 標頭欄位(如 NGINX的情況設定 \"X-Real-IP\"、AmazonELB的情況設定\"X-Forwarded-For\")改變張貼頻率限制。",
@@ -618,9 +618,9 @@
   "admin.saml.nicknameAttrDesc": "(非必須) 用於設定 Mattermost 使用者暱稱的 SAML 宣告屬性。",
   "admin.saml.nicknameAttrEx": "如：\"Nickname\"",
   "admin.saml.nicknameAttrTitle": "匿稱的屬性：",
-  "admin.saml.positionAttrDesc": "(非必須) 用於設定 Mattermost 使用者姓氏的 SAML 宣告屬性。",
-  "admin.saml.positionAttrEx": "E.g.: \"Role\"",
-  "admin.saml.positionAttrTitle": "Position Attribute:",
+  "admin.saml.positionAttrDesc": "(非必須) 用於設定 Mattermost 使用者職位的 SAML 宣告屬性。",
+  "admin.saml.positionAttrEx": "如：\"Role\"",
+  "admin.saml.positionAttrTitle": "職位屬性：",
   "admin.saml.privateKeyFileFileDesc": "用以解密來自身份識別提供者的 SAML 宣告的私鑰。",
   "admin.saml.privateKeyFileFileRemoveDesc": "移除用以解密來自身份識別提供者的 SAML 宣告的私鑰。",
   "admin.saml.privateKeyFileTitle": "服務提供者私鑰：",
@@ -1260,7 +1260,7 @@
   "filtered_user_list.countTotal": "{total}位中{count}位成員",
   "filtered_user_list.countTotalPage": "{total}位中{startCount, number} - {endCount, number}位成員",
   "filtered_user_list.member": "成員",
-  "filtered_user_list.search": "Search users",
+  "filtered_user_list.search": "搜尋使用者",
   "filtered_user_list.searchButton": "搜尋",
   "filtered_user_list.show": "過濾條件：",
   "filtered_user_list.team_only": "此團隊的成員",
@@ -1302,12 +1302,12 @@
   "get_app.iosHeader": "使用 iPhone 應用程式時 Mattermost 能有最好的表現",
   "get_app.mattermostInc": "Mattermost, Inc",
   "get_app.openMattermost": "開啟 Mattermost",
-  "get_link.clipboard": " Link copied",
+  "get_link.clipboard": " 連結已複製",
   "get_link.close": "關閉",
   "get_link.copy": "複製連結",
   "get_post_link_modal.help": "下面的連結讓已登入的使用者看您的發文。",
   "get_post_link_modal.title": "複製永久連結",
-  "get_public_link_modal.help": "The link below allows anyone to see this file without being registered on this server.",
+  "get_public_link_modal.help": "底下的連結允許任何人不需要於本伺服器註冊即可觀看此檔案。",
   "get_public_link_modal.title": "取得公開連結",
   "get_team_invite_link_modal.help": "傳送下面的連結給團隊成員，讓他們註冊此團隊站台。此連結可以讓多個團隊成員共用，在團隊管理員到團隊設定當中重新產生之前，這連結都不會改變。",
   "get_team_invite_link_modal.helpDisabled": "在您的團隊新增成員已經被關閉。請跟團隊管理員詢問詳情。",
@@ -1606,7 +1606,7 @@
   "navbar_dropdown.help": "說明",
   "navbar_dropdown.integrations": "整合",
   "navbar_dropdown.inviteMember": "邀請新成員",
-  "navbar_dropdown.join": "Join Another Team",
+  "navbar_dropdown.join": "加入其他團隊",
   "navbar_dropdown.leave": "離開團隊",
   "navbar_dropdown.logout": "登出",
   "navbar_dropdown.manageMembers": "會員管理",
@@ -1658,14 +1658,14 @@
   "posts_view.newMsgBelow": "下面還有 {count} 個新訊息",
   "reaction.clickToAdd": "(請按這裡增加)",
   "reaction.clickToRemove": "(請按這裡移除)",
-  "reaction.othersReacted": "{otherUsers, number} {otherUsers, plural, one {user} other {users}}",
-  "reaction.reacted": "{users} {reactionVerb} with {emoji}",
-  "reaction.reactionVerb.user": "reacted",
-  "reaction.reactionVerb.users": "reacted",
-  "reaction.reactionVerb.you": "reacted",
-  "reaction.reactionVerb.youAndUsers": "reacted",
-  "reaction.usersAndOthersReacted": "{users} and {otherUsers, number} other {otherUsers, plural, one {user} other {users}}",
-  "reaction.usersReacted": "{users} and {lastUser}",
+  "reaction.othersReacted": "{otherUsers, number} 位使用者",
+  "reaction.reacted": "{users} 與 {emoji} {reactionVerb}",
+  "reaction.reactionVerb.user": "已互動",
+  "reaction.reactionVerb.users": "已互動",
+  "reaction.reactionVerb.you": "已互動",
+  "reaction.reactionVerb.youAndUsers": "已互動",
+  "reaction.usersAndOthersReacted": "{users} 與 其他 {otherUsers, number} 位使用者",
+  "reaction.usersReacted": "{users} 與 {lastUser}",
   "reaction.you": "您",
   "removed_channel.channelName": "頻道",
   "removed_channel.from": "從下者中被移除：",
@@ -1856,7 +1856,7 @@
   "team_settings_modal.generalTab": "一般",
   "team_settings_modal.importTab": "匯入",
   "team_settings_modal.title": "團隊設定",
-  "team_sidebar.join": "Other teams you can join.",
+  "team_sidebar.join": "其他能加入的團隊。",
   "textbox.bold": "**粗體**",
   "textbox.edit": "編輯訊息",
   "textbox.help": "說明",
@@ -1981,7 +1981,7 @@
   "user.settings.general.emailUnchanged": "您的新電子郵件地址跟舊的一樣。",
   "user.settings.general.emptyName": "按'編輯'以增加全名",
   "user.settings.general.emptyNickname": "按'編輯'以增加暱稱",
-  "user.settings.general.emptyPosition": "Click 'Edit' to add your job title / position",
+  "user.settings.general.emptyPosition": "點選'編輯'以增加工作職稱/職位",
   "user.settings.general.field_handled_externally": "此欄位由您的登入提供者決定。如果想變更它，得經由登入提供者變更。",
   "user.settings.general.firstName": "名字",
   "user.settings.general.fullName": "全名",
@@ -1998,8 +1998,8 @@
   "user.settings.general.nicknameExtra": "暱稱讓您有個除了名字跟使用者名稱以外的稱呼。這通常使用在有多個人的名字跟使用者名稱聽起來差不多的情況。",
   "user.settings.general.notificationsExtra": "預設情況下當有人輸入您的名字時您將會收到提及通知。請到{notify}以變更設定。",
   "user.settings.general.notificationsLink": "通知",
-  "user.settings.general.position": "Position",
-  "user.settings.general.positionExtra": "Use Position for your role or job title. This will be shown in your profile popover.",
+  "user.settings.general.position": "職位",
+  "user.settings.general.positionExtra": "用職位表示您的角色或職稱。這將會顯示於個人資訊中。",
   "user.settings.general.primaryEmail": "主要電子郵件地址",
   "user.settings.general.profilePicture": "個人圖像",
   "user.settings.general.title": "一般設定",
@@ -2162,6 +2162,7 @@
   "user.settings.security.title": "安全性設定",
   "user.settings.security.viewHistory": "檢視存取紀錄",
   "user_list.notFound": "找不到任何使用者",
+  "user_profile.send.dm": "發送訊息",
   "user_profile.webrtc.call": "開始視訊通話",
   "user_profile.webrtc.offline": "使用者離線中",
   "user_profile.webrtc.unavailable": "在當前通訊結束前不能建立新的通訊",