Skip to content

Commit

Permalink
Merge branch 'rm/302676' into 'master'
Browse files Browse the repository at this point in the history
Rm/302676

See merge request kchat/webapp!652
  • Loading branch information
antonbuks committed Feb 23, 2024
2 parents d7544e3 + 5a87a9f commit 2d36401
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 0 deletions.
1 change: 1 addition & 0 deletions webapp/channels/src/i18n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -4909,6 +4909,7 @@
"shortcuts.team_nav.prev.mac": "Vorheriges Team:\t⌘|⌥|Pfeil nach oben",
"shortcuts.team_nav.switcher": "Zu Team wechseln:\tStrg|Alt|[1-9]",
"shortcuts.team_nav.switcher.mac": "Zu Team wechseln:\t⌘|⌥|[1-9]",
"advanceTextEditor.voiceMessageButton.tooltip": "Sprachnachricht",
"sidebar.allDirectMessages": "Alle Direktnachrichten",
"sidebar.createDirectMessage": "Eine Direktnachricht erstellen",
"sidebar.createUserGroup": "Erstelle neue Benutzergruppe",
Expand Down
1 change: 1 addition & 0 deletions webapp/channels/src/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -4944,6 +4944,7 @@
"shortcuts.team_nav.prev.mac": "Previous team:\t⌘|⌥|Up",
"shortcuts.team_nav.switcher": "Navigate to a specific team:\tCtrl|Alt|[1-9]",
"shortcuts.team_nav.switcher.mac": "Navigate to a specific team:\t⌘|⌥|[1-9]",
"advanceTextEditor.voiceMessageButton.tooltip": "Voice message",
"sidebar_left.add_channel_dropdown.browseChannels": "Browse Channels",
"sidebar_left.add_channel_dropdown.browseOrCreateChannels": "Browse or create channels",
"sidebar_left.add_channel_dropdown.createCategory": "Create New Category",
Expand Down
9 changes: 9 additions & 0 deletions webapp/channels/src/i18n/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -4454,6 +4454,14 @@
"shortcuts.msgs.markdown.strike.mac": "Tachar:\tShift|⌥|X",
"shortcuts.msgs.markdown.unordered": "Lista con viñetas\tShift|Alt|8",
"shortcuts.msgs.markdown.unordered.mac": "Lista con viñetas:\tShift|⌥|8",
"shortcuts.msgs.markdown.formatting.hide": "Ocultar formato:\tCtrl|Alt|T",
"shortcuts.msgs.markdown.formatting.hide.mac": "Ocultar formato:\t⌘|⌥|T",
"shortcuts.msgs.markdown.formatting.show": "Mostrar formato:\tCtrl|Alt|T",
"shortcuts.msgs.markdown.formatting.show.mac": "Mostrar formato:\t⌘|⌥|T",
"shortcuts.msgs.markdown.ordered": "Lista numerada:\tShift|Alt|7",
"shortcuts.msgs.markdown.ordered.mac": "Lista numerada:\tShift|⌥|7",
"shortcuts.msgs.markdown.preview": "Mostrar/Ocultar vista previa:\tCtrl|Alt|P",
"shortcuts.msgs.markdown.preview.mac": "Mostrar/Ocultar vista previa:\t⌘|⌥|P",
"shortcuts.msgs.reply": "Responder al último mensaje en el canal:\tShift|Arriba",
"shortcuts.msgs.reprint_next": "Vuelve a imprimir el siguiente mensaje:\tCtrl|Abajo",
"shortcuts.msgs.reprint_next.mac": "Vuelve a imprimir el siguiente mensaje:\t⌘|Abajo",
Expand Down Expand Up @@ -4491,6 +4499,7 @@
"shortcuts.team_nav.prev.mac": "Equipo anterior:\t⌘|⌥|Up",
"shortcuts.team_nav.switcher": "Cambiar a un equipo específico:\tCtrl|Alt|[1-9]",
"shortcuts.team_nav.switcher.mac": "Cambiar a un equipo específico:\t⌘|⌥|[1-9]",
"advanceTextEditor.voiceMessageButton.tooltip": "Mensaje de voz",
"sidebar.allDirectMessages": "Todos los mensajes directos",
"sidebar.createDirectMessage": "Escribir un mensaje directo",
"sidebar.createUserGroup": "Crea Nuevo Grupo de usuarios",
Expand Down
22 changes: 22 additions & 0 deletions webapp/channels/src/i18n/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -4286,6 +4286,7 @@
"shortcuts.msgs.comp.username": "Nom d'utilisateur :\t@|[a-z]|Tab",
"shortcuts.msgs.edit": "Modifier le dernier message du canal :\tHaut",
"shortcuts.msgs.header": "Messages",
"shortcuts.msgs.formatting_bar.post_priority": "Message important",
"shortcuts.msgs.input.header": "Fonctionne dans un champ de saisie vide",
"shortcuts.msgs.mark_all_as_read": "Marquer tous les messages comme lus :\tAlt|Esc",
"shortcuts.msgs.mark_all_as_read.mac": "Marquer tous les messages comme lus :\t⌥|Esc",
Expand All @@ -4296,6 +4297,26 @@
"shortcuts.msgs.markdown.italic.mac": "Italique :\tCtrl|I",
"shortcuts.msgs.markdown.link": "Lien :\tCtrl|Alt|K",
"shortcuts.msgs.markdown.link.mac": "Lien :\t⌘|Alt|K",
"shortcuts.msgs.markdown.code": "Code:\tCtrl|Alt|C",
"shortcuts.msgs.markdown.code.mac": "Code:\t⌘|⌥|C",
"shortcuts.msgs.markdown.emoji": "Emoji / Gif picker:\tCtrl|Alt|E",
"shortcuts.msgs.markdown.emoji.mac": "Emoji / Gif picker:\t⌘|⌥|E",
"shortcuts.msgs.markdown.formatting.hide": "Masquer la mise en forme:\tCtrl|Alt|T",
"shortcuts.msgs.markdown.formatting.hide.mac": "Masquer la mise en forme:\t⌘|⌥|T",
"shortcuts.msgs.markdown.formatting.show": "Afficher la mise en forme:\tCtrl|Alt|T",
"shortcuts.msgs.markdown.formatting.show.mac": "Afficher la mise en forme:\t⌘|⌥|T",
"shortcuts.msgs.markdown.h3": "Titre",
"shortcuts.msgs.markdown.h3.mac": "Titre",
"shortcuts.msgs.markdown.ordered": "Liste numérotée:\tShift|Alt|7",
"shortcuts.msgs.markdown.ordered.mac": "Liste numérotée:\tShift|⌥|7",
"shortcuts.msgs.markdown.preview": "Afficher/Masquer l'aperçu:\tCtrl|Alt|P",
"shortcuts.msgs.markdown.preview.mac": "Afficher/Masquer l'aperçu:\t⌘|⌥|P",
"shortcuts.msgs.markdown.quote": "Citation:\tShift|Alt|9",
"shortcuts.msgs.markdown.quote.mac": "Citation:\tShift|⌥|9",
"shortcuts.msgs.markdown.strike": "Barré:\tShift|Alt|X",
"shortcuts.msgs.markdown.strike.mac": "Barré:\tShift|⌥|X",
"shortcuts.msgs.markdown.unordered": "Liste à puces\tShift|Alt|8",
"shortcuts.msgs.markdown.unordered.mac": "Liste à puces:\tShift|⌥|8",
"shortcuts.msgs.reply": "Répondre au dernier message du canal :\tMaj|Haut",
"shortcuts.msgs.reprint_next": "Affiche à nouveau le message suivant :\tCtrl|Bas",
"shortcuts.msgs.reprint_next.mac": "Affiche à nouveau le message suivant :\t⌘|Bas",
Expand Down Expand Up @@ -4330,6 +4351,7 @@
"shortcuts.team_nav.prev.mac": "Équipe précédente :\t⌘|⌥|Haut",
"shortcuts.team_nav.switcher": "Naviguer vers une équipe spécifique :\tCtrl|Alt|[1-9]",
"shortcuts.team_nav.switcher.mac": "Naviguer vers une équipe spécifique :\t⌘|⌥|[1-9]",
"advanceTextEditor.voiceMessageButton.tooltip": "Message vocal",
"sidebar.allDirectMessages": "Tous les messages personnels",
"sidebar.createDirectMessage": "Créer un nouveau message personnel",
"sidebar.createUserGroup": "Créer un nouveau groupe d'utilisateurs",
Expand Down
29 changes: 29 additions & 0 deletions webapp/channels/src/i18n/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -3402,9 +3402,37 @@
"shortcuts.msgs.comp.header": "Completamento automatico",
"shortcuts.msgs.comp.last_reaction": "Reagisci all'ultimo messaggio:\tCtrl|Shift|⧵",
"shortcuts.msgs.comp.last_reaction.mac": "Reagisci all'ultimo messaggio:\t⌘|Shift|\\",
"shortcuts.msgs.markdown.bold": "Grassetto:\tCtrl|B",
"shortcuts.msgs.markdown.bold.mac": "Grassetto:\t⌘|B",
"shortcuts.msgs.markdown.header": "Formattazione",
"shortcuts.msgs.markdown.italic": "Corsivo:\tCtrl|I",
"shortcuts.msgs.markdown.italic.mac": "Corsivo:\tCtrl|I",
"shortcuts.msgs.markdown.link": "Collegamento:\tCtrl|Alt|K",
"shortcuts.msgs.markdown.link.mac": "Collegamento:\t⌘|Alt|K",
"shortcuts.msgs.markdown.code": "Codifica:\tCtrl|Alt|C",
"shortcuts.msgs.markdown.code.mac": "Codifica:\t⌘|⌥|C",
"shortcuts.msgs.markdown.emoji": "Emoji / Gif picker:\tCtrl|Alt|E",
"shortcuts.msgs.markdown.emoji.mac": "Emoji / Gif picker:\t⌘|⌥|E",
"shortcuts.msgs.markdown.formatting.hide": "Nascondi formattazione:\tCtrl|Alt|T",
"shortcuts.msgs.markdown.formatting.hide.mac": "Nascondi formattazione:\t⌘|⌥|T",
"shortcuts.msgs.markdown.formatting.show": "Mostra formattazione:\tCtrl|Alt|T",
"shortcuts.msgs.markdown.formatting.show.mac": "Mostra formattazione:\t⌘|⌥|T",
"shortcuts.msgs.markdown.h3": "Intestazione",
"shortcuts.msgs.markdown.h3.mac": "Intestazione",
"shortcuts.msgs.markdown.ordered": "Elenco numerato:\tShift|Alt|7",
"shortcuts.msgs.markdown.ordered.mac": "Elenco numerato:\tShift|⌥|7",
"shortcuts.msgs.markdown.preview": "Mostra/Nascondi anteprima:\tCtrl|Alt|P",
"shortcuts.msgs.markdown.preview.mac": "Mostra/Nascondi anteprima:\t⌘|⌥|P",
"shortcuts.msgs.markdown.quote": "Citazione:\tShift|Alt|9",
"shortcuts.msgs.markdown.quote.mac": "Citazione:\tShift|⌥|9",
"shortcuts.msgs.markdown.strike": "Barrato:\tShift|Alt|X",
"shortcuts.msgs.markdown.strike.mac": "Barrato:\tShift|⌥|X",
"shortcuts.msgs.markdown.unordered": "Elenco puntato:\tShift|Alt|8",
"shortcuts.msgs.markdown.unordered.mac": "Elenco puntato:\tShift|⌥|8",
"shortcuts.msgs.comp.username": "Nome utente:\t@|[a-z]|Tab",
"shortcuts.msgs.edit": "Modifica l'ultimo messaggio del canale:\tUp",
"shortcuts.msgs.header": "Messaggi",
"shortcuts.msgs.formatting_bar.post_priority": "Priorità del messaggio",
"shortcuts.msgs.input.header": "Lavora all'interno di un campo di testo",
"shortcuts.msgs.mark_all_as_read": "Contrassegnare tutti i messaggi come letti:\tAlt|Esc",
"shortcuts.msgs.mark_all_as_read.mac": "Contrassegnare tutti i messaggi come letti:\t⌥|Esc",
Expand Down Expand Up @@ -3440,6 +3468,7 @@
"shortcuts.team_nav.prev.mac": "Squadra precedente:\t⌘|⌥|Su",
"shortcuts.team_nav.switcher": "Passa a una squadra specifica:\tCtrl|Alt|[1-9]",
"shortcuts.team_nav.switcher.mac": "Passa a una squadra specifica:\t⌘|⌥|[1-9]",
"advanceTextEditor.voiceMessageButton.tooltip": "Messaggio vocale",
"sidebar.createDirectMessage": "Crea un nuovo messaggio diretto",
"sidebar.directchannel.you": "{displayname} (tu)",
"sidebar.team_select": "{siteName} - Unisciti a una squadra",
Expand Down

0 comments on commit 2d36401

Please sign in to comment.