From 847c181ec9b73e51daf39efc5c597eff2e7cdb31 Mon Sep 17 00:00:00 2001 From: Jesse Hallam Date: Wed, 23 May 2018 14:26:35 -0400 Subject: MM-8622: Improved plugin error reporting (#8737) * allow `Wait()`ing on the supervisor In the event the plugin supervisor shuts down a plugin for crashing too many times, the new `Wait()` interface allows the `ActivatePlugin` to accept a callback function to trigger when `supervisor.Wait()` returns. If the supervisor shuts down normally, this callback is invoked with a nil error, otherwise any error reported by the supervisor is passed along. * improve plugin activation/deactivation logic Avoid triggering activation of previously failed-to-start plugins just becase something in the configuration changed. Now, intelligently compare the global enable bit as well as the each individual plugin's enabled bit. * expose store to manipulate PluginStatuses * expose API to fetch plugin statuses * keep track of whether or not plugin sandboxing is supported * transition plugin statuses * restore error on plugin activation if already active * don't initialize test plugins until successfully loaded * emit websocket events when plugin statuses change * skip pruning if already initialized * MM-8622: maintain plugin statuses in memory Switch away from persisting plugin statuses to the database, and maintain in memory instead. This will be followed by a cluster interface to query the in-memory status of plugin statuses from all cluster nodes. At the same time, rename `cluster_discovery_id` on the `PluginStatus` model object to `cluster_id`. * MM-8622: aggregate plugin statuses across cluster * fetch cluster plugin statuses when emitting websocket notification * address unit test fixes after rebasing * relax (poor) racey unit test re: supervisor.Wait() * make store-mocks --- i18n/en.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'i18n') diff --git a/i18n/en.json b/i18n/en.json index 24e49278c..9f008a64b 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -3854,6 +3854,10 @@ "id": "app.plugin.deactivate.app_error", "translation": "Unable to deactivate plugin" }, + { + "id": "app.plugin.delete_plugin_status_state.app_error", + "translation": "Unable to delete plugin status state." + }, { "id": "app.plugin.disabled.app_error", "translation": "Plugins have been disabled. Please check your logs for details." @@ -3898,10 +3902,18 @@ "id": "app.plugin.not_installed.app_error", "translation": "Plugin is not installed" }, + { + "id": "app.plugin.prepackaged.app_error", + "translation": "Cannot install prepackaged plugin" + }, { "id": "app.plugin.remove.app_error", "translation": "Unable to delete plugin" }, + { + "id": "app.plugin.set_plugin_status_state.app_error", + "translation": "Unable to set plugin status state." + }, { "id": "app.plugin.upload_disabled.app_error", "translation": "Plugins and/or plugin uploads have been disabled." @@ -4798,6 +4810,10 @@ "id": "model.client.writer.app_error", "translation": "Unable to build multipart request" }, + { + "id": "model.cluster.is_valid.id.app_error", + "translation": "Invalid Id" + }, { "id": "model.command.is_valid.create_at.app_error", "translation": "Create at must be a valid time" -- cgit v1.2.3-1-g7c22 From 47f3c064db885c2cb2e75c195ea24e2ef687891d Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Thu, 24 May 2018 08:25:52 -0400 Subject: translations PR 20180522 (#8837) * translations PR 20180522 * Fix italian translation --- i18n/de.json | 36 ++++++++++++++++++++++++++++++++---- i18n/en.json | 40 ++++++++++++++++++++-------------------- i18n/es.json | 50 +++++++++++++++++++++++++++++++++++++++----------- i18n/fr.json | 36 ++++++++++++++++++++++++++++++++---- i18n/it.json | 46 +++++++++++++++++++++++++++++++++++++--------- i18n/ja.json | 36 ++++++++++++++++++++++++++++++++---- i18n/ko.json | 42 +++++++++++++++++++++++++++++++++++------- i18n/nl.json | 42 +++++++++++++++++++++++++++++++++++------- i18n/pl.json | 42 +++++++++++++++++++++++++++++++++++------- i18n/pt-BR.json | 48 ++++++++++++++++++++++++++++++++++++++---------- i18n/ru.json | 42 +++++++++++++++++++++++++++++++++++------- i18n/tr.json | 54 +++++++++++++++++++++++++++++++++++++++++------------- i18n/zh-CN.json | 50 +++++++++++++++++++++++++++++++++++++++----------- i18n/zh-TW.json | 36 ++++++++++++++++++++++++++++++++---- 14 files changed, 482 insertions(+), 118 deletions(-) (limited to 'i18n') diff --git a/i18n/de.json b/i18n/de.json index df7f4ab21..58c4829e8 100644 --- a/i18n/de.json +++ b/i18n/de.json @@ -822,6 +822,10 @@ "id": "api.command_invite.permission.app_error", "translation": "Sie haben nicht die nötigen Berechtigungen um {{.User}} dem Kanal {{.Channel}} hinzuzufügen." }, + { + "id": "api.command_invite.private_channel.app_error", + "translation": "Could not find the channel {{.Channel}}. Please use the channel handle to identify channels." + }, { "id": "api.command_invite.success", "translation": "{{.User}} wurde dem Kanal {{.Channel}} hinzugefügt." @@ -3778,6 +3782,14 @@ "id": "app.notification.body.intro.direct.generic", "translation": "Sie haben eine neue Direktnachricht von {{.SenderName}}" }, + { + "id": "app.notification.body.intro.group_message.full", + "translation": "Sie haben eine neue Direktnachricht." + }, + { + "id": "app.notification.body.intro.group_message.generic", + "translation": "Sie haben eine neue Direktnachricht von {{.SenderName}}" + }, { "id": "app.notification.body.intro.notification.full", "translation": "Sie haben eine neue Benachrichtigung." @@ -3794,6 +3806,14 @@ "id": "app.notification.body.text.direct.generic", "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Day}}. {{.Month}}" }, + { + "id": "app.notification.body.text.group_message.full", + "translation": "KANAL: {{.ChannelName}}
{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Day}}.{{.Month}}" + }, + { + "id": "app.notification.body.text.group_message.generic", + "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Day}}. {{.Month}}" + }, { "id": "app.notification.body.text.notification.full", "translation": "KANAL: {{.ChannelName}}
{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Day}}.{{.Month}}" @@ -3806,6 +3826,14 @@ "id": "app.notification.subject.direct.full", "translation": "[{{.SiteName}}] Neue Direktnachricht von {{.SenderDisplayName}} am {{.Day}}.{{.Month}}.{{.Year}}" }, + { + "id": "app.notification.subject.group_message.full", + "translation": "[{{ .SiteName }}] Benachrichtigung in {{ .TeamName}} am {{.Day}}.{{.Month}}.{{.Year}}" + }, + { + "id": "app.notification.subject.group_message.generic", + "translation": "[{{.SiteName}}] Neue Benachrichtigung für {{.Day}}. {{.Month}} {{.Year}}" + }, { "id": "app.notification.subject.notification.full", "translation": "[{{ .SiteName }}] Benachrichtigung in {{ .TeamName}} am {{.Day}}.{{.Month}}.{{.Year}}" @@ -5022,6 +5050,10 @@ "id": "model.config.is_valid.ldap_lastname", "translation": "AD/LDAP-Feld \"Nachnameattribut\" ist erforderlich." }, + { + "id": "model.config.is_valid.ldap_login_id", + "translation": "AD/LDAP-Feld \"ID Attribut\" ist erforderlich." + }, { "id": "model.config.is_valid.ldap_max_page_size.app_error", "translation": "Ungültiger Wert für die MaxPageSize." @@ -5922,10 +5954,6 @@ "id": "store.sql_channel.delete.channel.app_error", "translation": "Der Kanal konnte nicht gelöscht werden" }, - { - "id": "store.sql_channel.extra_updated.app_error", - "translation": "Problem beim Aktualisieren des zuletzt Aktualisiert Zeitpunkt für Mitglied" - }, { "id": "store.sql_channel.get.existing.app_error", "translation": "Der bestehende Kanal konnte nicht gefunden werden" diff --git a/i18n/en.json b/i18n/en.json index 9f008a64b..d802eb76b 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -3782,14 +3782,6 @@ "id": "app.notification.body.intro.direct.generic", "translation": "You have a new Direct Message from @{{.SenderName}}" }, - { - "id": "app.notification.body.intro.notification.full", - "translation": "You have a new notification." - }, - { - "id": "app.notification.body.intro.notification.generic", - "translation": "You have a new notification from @{{.SenderName}}" - }, { "id": "app.notification.body.intro.group_message.full", "translation": "You have a new Group Message." @@ -3798,6 +3790,14 @@ "id": "app.notification.body.intro.group_message.generic", "translation": "You have a new Group Message from @{{.SenderName}}" }, + { + "id": "app.notification.body.intro.notification.full", + "translation": "You have a new notification." + }, + { + "id": "app.notification.body.intro.notification.generic", + "translation": "You have a new notification from @{{.SenderName}}" + }, { "id": "app.notification.body.text.direct.full", "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" @@ -3807,29 +3807,25 @@ "translation": "{{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" }, { - "id": "app.notification.body.text.notification.full", + "id": "app.notification.body.text.group_message.full", "translation": "Channel: {{.ChannelName}}
@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" }, { - "id": "app.notification.body.text.notification.generic", + "id": "app.notification.body.text.group_message.generic", "translation": "{{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" }, { - "id": "app.notification.body.text.group_message.full", + "id": "app.notification.body.text.notification.full", "translation": "Channel: {{.ChannelName}}
@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" }, { - "id": "app.notification.body.text.group_message.generic", + "id": "app.notification.body.text.notification.generic", "translation": "{{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" }, { "id": "app.notification.subject.direct.full", "translation": "[{{.SiteName}}] New Direct Message from @{{.SenderDisplayName}} on {{.Month}} {{.Day}}, {{.Year}}" }, - { - "id": "app.notification.subject.notification.full", - "translation": "[{{ .SiteName }}] Notification in {{ .TeamName}} on {{.Month}} {{.Day}}, {{.Year}}" - }, { "id": "app.notification.subject.group_message.full", "translation": "[{{ .SiteName }}] New Group Message in {{ .ChannelName}} on {{.Month}} {{.Day}}, {{.Year}}" @@ -3838,6 +3834,10 @@ "id": "app.notification.subject.group_message.generic", "translation": "[{{ .SiteName }}] New Group Message on {{.Month}} {{.Day}}, {{.Year}}" }, + { + "id": "app.notification.subject.notification.full", + "translation": "[{{ .SiteName }}] Notification in {{ .TeamName}} on {{.Month}} {{.Day}}, {{.Year}}" + }, { "id": "app.plugin.activate.app_error", "translation": "Unable to activate extracted plugin." @@ -5062,14 +5062,14 @@ "id": "model.config.is_valid.ldap_id", "translation": "AD/LDAP field \"ID Attribute\" is required." }, - { - "id": "model.config.is_valid.ldap_login_id", - "translation": "AD/LDAP field \"Login ID Attribute\" is required." - }, { "id": "model.config.is_valid.ldap_lastname", "translation": "AD/LDAP field \"Last Name Attribute\" is required." }, + { + "id": "model.config.is_valid.ldap_login_id", + "translation": "AD/LDAP field \"Login ID Attribute\" is required." + }, { "id": "model.config.is_valid.ldap_max_page_size.app_error", "translation": "Invalid max page size value." diff --git a/i18n/es.json b/i18n/es.json index 0fb44ec97..af93e16ec 100644 --- a/i18n/es.json +++ b/i18n/es.json @@ -822,6 +822,10 @@ "id": "api.command_invite.permission.app_error", "translation": "No tienes suficientes permisos para agregar a {{.User}} en {{.Channel}}." }, + { + "id": "api.command_invite.private_channel.app_error", + "translation": "No se pudo encontrar el canal {{.Channel}}. Por favor utiliza el identificador del canal." + }, { "id": "api.command_invite.success", "translation": "{{.User}} agregado al canal {{.Channel}}." @@ -3772,11 +3776,19 @@ }, { "id": "app.notification.body.intro.direct.full", - "translation": "Tienes un nuevo mensaje directo." + "translation": "Tienes un nuevo Mensaje Directo." }, { "id": "app.notification.body.intro.direct.generic", - "translation": "Tienes un nuevo mensaje directo de {{.SenderName}}" + "translation": "Tienes un nuevo Mensaje Directo de @{{.SenderName}}" + }, + { + "id": "app.notification.body.intro.group_message.full", + "translation": "Tienes un nuevo Mensaje de Grupo." + }, + { + "id": "app.notification.body.intro.group_message.generic", + "translation": "Tienes un nuevo mensaje de Grupo de @{{.SenderName}}" }, { "id": "app.notification.body.intro.notification.full", @@ -3784,19 +3796,27 @@ }, { "id": "app.notification.body.intro.notification.generic", - "translation": "Tienes una nueva notificación de {{.SenderName}}" + "translation": "Tienes una nueva notificación de @{{.SenderName}}" }, { "id": "app.notification.body.text.direct.full", - "translation": "{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Day}} {{.Month}}" + "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Day}} {{.Month}}" }, { "id": "app.notification.body.text.direct.generic", "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Day}} {{.Month}}" }, + { + "id": "app.notification.body.text.group_message.full", + "translation": "Canal: {{.ChannelName}}
@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Day}} {{.Month}}" + }, + { + "id": "app.notification.body.text.group_message.generic", + "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Day}} {{.Month}}" + }, { "id": "app.notification.body.text.notification.full", - "translation": "Canal: {{.ChannelName}}
{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Day}} {{.Month}}" + "translation": "Canal: {{.ChannelName}}
@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Day}} {{.Month}}" }, { "id": "app.notification.body.text.notification.generic", @@ -3804,7 +3824,15 @@ }, { "id": "app.notification.subject.direct.full", - "translation": "[{{.SiteName}}] Nuevo Mensaje Directo de {{.SenderDisplayName}} el {{.Day}} {{.Month}}, {{.Year}}" + "translation": "[{{.SiteName}}] Nuevo Mensaje Directo de @{{.SenderDisplayName}} el {{.Day}} {{.Month}}, {{.Year}}" + }, + { + "id": "app.notification.subject.group_message.full", + "translation": "[{{ .SiteName }}] Nuevo Mensaje de Grupo en {{ .TeamName}} el {{.Day}} {{.Month}}, {{.Year}}" + }, + { + "id": "app.notification.subject.group_message.generic", + "translation": "[{{.SiteName}}] Nuevo Mensaje de Grupo el {{.Day}} {{.Month}}, {{.Year}}" }, { "id": "app.notification.subject.notification.full", @@ -5022,6 +5050,10 @@ "id": "model.config.is_valid.ldap_lastname", "translation": "El campo AD/LDAP \"Atributo Apellido\" es obligatorio." }, + { + "id": "model.config.is_valid.ldap_login_id", + "translation": "El campo AD/LDAP \"Atributo Login ID\" es obligatorio." + }, { "id": "model.config.is_valid.ldap_max_page_size.app_error", "translation": "El valor del tamaño de página no es válido." @@ -5196,7 +5228,7 @@ }, { "id": "model.config.is_valid.site_url.app_error", - "translation": "URL del Sitio debe ser una URL válida y empezar con http:// o https://." + "translation": "URL del Sitio debe estar asignado, ser una URL válida y empezar con http:// o https://." }, { "id": "model.config.is_valid.site_url_email_batching.app_error", @@ -5922,10 +5954,6 @@ "id": "store.sql_channel.delete.channel.app_error", "translation": "No pudimos eliminar el canal" }, - { - "id": "store.sql_channel.extra_updated.app_error", - "translation": "Problema actualizando el último momento de actualización de los miembros" - }, { "id": "store.sql_channel.get.existing.app_error", "translation": "No pudimos encontrar el canal" diff --git a/i18n/fr.json b/i18n/fr.json index c408bc60d..7fca34fd0 100644 --- a/i18n/fr.json +++ b/i18n/fr.json @@ -822,6 +822,10 @@ "id": "api.command_invite.permission.app_error", "translation": "Vous n'avez pas les permissions nécessaires pour ajouter {{.User}} dans {{.Channel}}." }, + { + "id": "api.command_invite.private_channel.app_error", + "translation": "Could not find the channel {{.Channel}}. Please use the channel handle to identify channels." + }, { "id": "api.command_invite.success", "translation": "{{.User}} a été ajouté dans {{.Channel}}." @@ -3778,6 +3782,14 @@ "id": "app.notification.body.intro.direct.generic", "translation": "Vous avez un nouveau message personnel de {{.SenderName}}" }, + { + "id": "app.notification.body.intro.group_message.full", + "translation": "Vous avez un nouveau message personnel." + }, + { + "id": "app.notification.body.intro.group_message.generic", + "translation": "Vous avez un nouveau message personnel de {{.SenderName}}" + }, { "id": "app.notification.body.intro.notification.full", "translation": "Vous avez une nouvelle notification." @@ -3794,6 +3806,14 @@ "id": "app.notification.body.text.direct.generic", "translation": "{{.Day}}/{{.Month}}, {{.Hour}}:{{.Minute}} {{.Timezone}}" }, + { + "id": "app.notification.body.text.group_message.full", + "translation": "CANAL : {{.ChannelName}}
{{.SenderName}} - {{.Day}}/{{.Month}}, {{.Hour}}:{{.Minute}} {{.TimeZone}}" + }, + { + "id": "app.notification.body.text.group_message.generic", + "translation": "{{.Day}}/{{.Month}}, {{.Hour}}:{{.Minute}} {{.Timezone}}" + }, { "id": "app.notification.body.text.notification.full", "translation": "CANAL : {{.ChannelName}}
{{.SenderName}} - {{.Day}}/{{.Month}}, {{.Hour}}:{{.Minute}} {{.TimeZone}}" @@ -3806,6 +3826,14 @@ "id": "app.notification.subject.direct.full", "translation": "[{{.SiteName}}] Nouveau message personnel de {{.SenderDisplayName}} du {{.Day}}/{{.Month}}/{{.Year}}" }, + { + "id": "app.notification.subject.group_message.full", + "translation": "[{{.SiteName}}] Notification dans {{.TeamName}} le {{.Day}}/{{.Month}}/{{.Year}}" + }, + { + "id": "app.notification.subject.group_message.generic", + "translation": "[{{.SiteName}}] New Notification for {{.Day}} {{.Month}}, {{.Year}}" + }, { "id": "app.notification.subject.notification.full", "translation": "[{{.SiteName}}] Notification dans {{.TeamName}} le {{.Day}}/{{.Month}}/{{.Year}}" @@ -5022,6 +5050,10 @@ "id": "model.config.is_valid.ldap_lastname", "translation": "Le champ AD/LDAP \"Last Name Attribute\" est obligatoire." }, + { + "id": "model.config.is_valid.ldap_login_id", + "translation": "Le champ AD/LDAP \"ID Attribute\" est obligatoire." + }, { "id": "model.config.is_valid.ldap_max_page_size.app_error", "translation": "Valeur de la taille maximale de page invalide." @@ -5922,10 +5954,6 @@ "id": "store.sql_channel.delete.channel.app_error", "translation": "Impossible de supprimer le canal" }, - { - "id": "store.sql_channel.extra_updated.app_error", - "translation": "Problème de mise à jour de la date de dernière mise à jour des membres" - }, { "id": "store.sql_channel.get.existing.app_error", "translation": "Impossible de trouver le canal existant" diff --git a/i18n/it.json b/i18n/it.json index a96329287..b063ffbb9 100644 --- a/i18n/it.json +++ b/i18n/it.json @@ -822,6 +822,10 @@ "id": "api.command_invite.permission.app_error", "translation": "Non si hanno permessi sufficienti per aggiungere {{.User}} in {{.Channel}}." }, + { + "id": "api.command_invite.private_channel.app_error", + "translation": "Impossibile trovare il canale {{.Channel}}. Utilizzare il gestore canale per identificarli." + }, { "id": "api.command_invite.success", "translation": "{{.User}} aggiunto al canale {{.Channel}}." @@ -3776,7 +3780,15 @@ }, { "id": "app.notification.body.intro.direct.generic", - "translation": "Hai un nuovo messaggio diretto da {{.SenderName}}" + "translation": "Hai un nuovo messaggio diretto da @{{.SenderName}}" + }, + { + "id": "app.notification.body.intro.group_message.full", + "translation": "Hai un nuovo messaggio di gruppo." + }, + { + "id": "app.notification.body.intro.group_message.generic", + "translation": "Hai un nuovo messaggio di gruppo da @{{.SenderName}}" }, { "id": "app.notification.body.intro.notification.full", @@ -3784,19 +3796,27 @@ }, { "id": "app.notification.body.intro.notification.generic", - "translation": "Hai una nuova notifica da {{.SenderName}}" + "translation": "Hai una nuova notifica da @{{.SenderName}}" }, { "id": "app.notification.body.text.direct.full", - "translation": "{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Day}}/{{.Month}}" + "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}" }, { "id": "app.notification.body.text.direct.generic", "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Day}}/{{.Month}}" }, + { + "id": "app.notification.body.text.group_message.full", + "translation": "Canale: {{.ChannelName}}
@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" + }, + { + "id": "app.notification.body.text.group_message.generic", + "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}" + }, { "id": "app.notification.body.text.notification.full", - "translation": "CANALE: {{.ChannelName}}
{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Day}} {{.Month}}" + "translation": "Canale: {{.ChannelName}}
@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" }, { "id": "app.notification.body.text.notification.generic", @@ -3804,7 +3824,15 @@ }, { "id": "app.notification.subject.direct.full", - "translation": "[{{.SiteName}}] Nuovo messaggio diretto da {{.SenderDisplayName}} il {{.Day}}/{{.Month}}/{{.Year}}" + "translation": "[{{.SiteName}}] Nuovo messaggio diretto da @{{.SenderDisplayName}} il {{.Month}} {{.Day}}, {{.Year}}" + }, + { + "id": "app.notification.subject.group_message.full", + "translation": "[{{ .SiteName }}] Nuovo messaggio di gruppo in {{ .ChannelName}} del {{.Month}} {{.Day}}, {{.Year}}" + }, + { + "id": "app.notification.subject.group_message.generic", + "translation": "[{{.SiteName}}] Nuovo messaggio di gruppo on {{.Month}} {{.Day}}, {{.Year}}" }, { "id": "app.notification.subject.notification.full", @@ -5022,6 +5050,10 @@ "id": "model.config.is_valid.ldap_lastname", "translation": "Il campo AD/LDAP \"Last Name Attribute\" è richiesto." }, + { + "id": "model.config.is_valid.ldap_login_id", + "translation": "Il campo AD/LDAP \"Login ID Attribute\" è richiesto." + }, { "id": "model.config.is_valid.ldap_max_page_size.app_error", "translation": "Valore non valido: dimensione massima pagina." @@ -5922,10 +5954,6 @@ "id": "store.sql_channel.delete.channel.app_error", "translation": "Non è possibile cancellare il canale" }, - { - "id": "store.sql_channel.extra_updated.app_error", - "translation": "Problema nell'aggiornamento dell'ultimo aggiornamento utenti" - }, { "id": "store.sql_channel.get.existing.app_error", "translation": "Non è possibile trovare il canale" diff --git a/i18n/ja.json b/i18n/ja.json index 2458d7c09..daa007a3a 100644 --- a/i18n/ja.json +++ b/i18n/ja.json @@ -822,6 +822,10 @@ "id": "api.command_invite.permission.app_error", "translation": "{{.User}} を {{.Channel}} に追加する権限がありません。" }, + { + "id": "api.command_invite.private_channel.app_error", + "translation": "Could not find the channel {{.Channel}}. Please use the channel handle to identify channels." + }, { "id": "api.command_invite.success", "translation": "{{.User}} がチャンネル {{.Channel}} に追加されました。" @@ -3778,6 +3782,14 @@ "id": "app.notification.body.intro.direct.generic", "translation": "{{.SenderName}} からの新しいダイレクトメッセージがあります" }, + { + "id": "app.notification.body.intro.group_message.full", + "translation": "新しいダイレクトメッセージがあります。" + }, + { + "id": "app.notification.body.intro.group_message.generic", + "translation": "{{.SenderName}} からの新しいダイレクトメッセージがあります" + }, { "id": "app.notification.body.intro.notification.full", "translation": "新しい通知があります。" @@ -3794,6 +3806,14 @@ "id": "app.notification.body.text.direct.generic", "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}" }, + { + "id": "app.notification.body.text.group_message.full", + "translation": "チャンネル: {{.ChannelName}}
{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" + }, + { + "id": "app.notification.body.text.group_message.generic", + "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}" + }, { "id": "app.notification.body.text.notification.full", "translation": "チャンネル: {{.ChannelName}}
{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" @@ -3806,6 +3826,14 @@ "id": "app.notification.subject.direct.full", "translation": "[{{ .SiteName}}] {{.Month}} {{.Day}}, {{.Year}} {{.SenderDisplayName}} からの新しいダイレクトメッセージ" }, + { + "id": "app.notification.subject.group_message.full", + "translation": "[{{.SiteName}}] {{.Month}} {{.Day}}, {{.Year}} {{.TeamName}}の通知" + }, + { + "id": "app.notification.subject.group_message.generic", + "translation": "[{{.SiteName}}] {{.Month}} {{.Day}}, {{.Year}} の新着通知[{{.SiteName}}] {{.Month}} {{.Day}}, {{.Year}} の新着通知" + }, { "id": "app.notification.subject.notification.full", "translation": "[{{.SiteName}}] {{.Month}} {{.Day}}, {{.Year}} {{.TeamName}}の通知" @@ -5022,6 +5050,10 @@ "id": "model.config.is_valid.ldap_lastname", "translation": "AD/LDAP項目 \"苗字(ラストネーム)の属性値\" は必須です。" }, + { + "id": "model.config.is_valid.ldap_login_id", + "translation": "AD/LDAP項目 \"ID属性値\" は必須です。" + }, { "id": "model.config.is_valid.ldap_max_page_size.app_error", "translation": "最大ページサイズの値が不正です。" @@ -5922,10 +5954,6 @@ "id": "store.sql_channel.delete.channel.app_error", "translation": "チャンネルを削除できませんでした" }, - { - "id": "store.sql_channel.extra_updated.app_error", - "translation": "メンバーの最終更新時刻の更新に問題があります" - }, { "id": "store.sql_channel.get.existing.app_error", "translation": "チャンネルが見付かりませんでした" diff --git a/i18n/ko.json b/i18n/ko.json index cd5e8b9dd..d9c06ffca 100644 --- a/i18n/ko.json +++ b/i18n/ko.json @@ -822,6 +822,10 @@ "id": "api.command_invite.permission.app_error", "translation": "{{.Channel}} 에 {{.User}}를 추가할 권한이 없습니다." }, + { + "id": "api.command_invite.private_channel.app_error", + "translation": "Could not find the channel {{.Channel}}. Please use the channel handle to identify channels." + }, { "id": "api.command_invite.success", "translation": "{{.Channel}} 채널에 {{.User}} 가 추가되었습니다." @@ -3776,7 +3780,15 @@ }, { "id": "app.notification.body.intro.direct.generic", - "translation": "You have a new direct message from {{.SenderName}}" + "translation": "You have a new Direct Message from @{{.SenderName}}" + }, + { + "id": "app.notification.body.intro.group_message.full", + "translation": "한개의 신규 메시지가 있습니다." + }, + { + "id": "app.notification.body.intro.group_message.generic", + "translation": "You have a new Group Message from @{{.SenderName}}" }, { "id": "app.notification.body.intro.notification.full", @@ -3784,7 +3796,7 @@ }, { "id": "app.notification.body.intro.notification.generic", - "translation": "You have a new notification from {{.SenderName}}" + "translation": "You have a new notification from @{{.SenderName}}" }, { "id": "app.notification.body.text.direct.full", @@ -3794,6 +3806,14 @@ "id": "app.notification.body.text.direct.generic", "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}" }, + { + "id": "app.notification.body.text.group_message.full", + "translation": "채널: {{.ChannelName}}
{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" + }, + { + "id": "app.notification.body.text.group_message.generic", + "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}" + }, { "id": "app.notification.body.text.notification.full", "translation": "채널: {{.ChannelName}}
{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" @@ -3806,9 +3826,17 @@ "id": "app.notification.subject.direct.full", "translation": "[{{.SiteName}}] {{.SenderDisplayName}} (으)로부터 {{.Month}} {{.Day}}, {{.Year}} 에 새로운 개인 메시지가 왔습니다." }, + { + "id": "app.notification.subject.group_message.full", + "translation": "[{{.SiteName}}] {{.SenderDisplayName}} (으)로부터 {{.Month}} {{.Day}}, {{.Year}} 에 새로운 개인 메시지가 왔습니다." + }, + { + "id": "app.notification.subject.group_message.generic", + "translation": "[{{.SiteName}}] 새 알림 {{.Month}} {{.Day}}, {{.Year}}" + }, { "id": "app.notification.subject.notification.full", - "translation": "[{{ .SiteName }}] Notification in {{ .TeamName}} on {{.Month}} {{.Day}}, {{.Year}}" + "translation": "[{{.SiteName}}] {{.SenderDisplayName}} (으)로부터 {{.Month}} {{.Day}}, {{.Year}} 에 새로운 개인 메시지가 왔습니다." }, { "id": "app.plugin.activate.app_error", @@ -5022,6 +5050,10 @@ "id": "model.config.is_valid.ldap_lastname", "translation": "AD/LDAP의 \"Last Name Attribute\" 항목이 필요합니다." }, + { + "id": "model.config.is_valid.ldap_login_id", + "translation": "AD/LDAP의 \"ID Attribute\" 항목이 필요합니다." + }, { "id": "model.config.is_valid.ldap_max_page_size.app_error", "translation": "Invalid max page size value." @@ -5922,10 +5954,6 @@ "id": "store.sql_channel.delete.channel.app_error", "translation": "채널을 삭제하지 못했습니다." }, - { - "id": "store.sql_channel.extra_updated.app_error", - "translation": "Problem updating members last updated time" - }, { "id": "store.sql_channel.get.existing.app_error", "translation": "존재하는 채널을 찾지 못했습니다." diff --git a/i18n/nl.json b/i18n/nl.json index 1294dae85..14edb8d66 100644 --- a/i18n/nl.json +++ b/i18n/nl.json @@ -822,6 +822,10 @@ "id": "api.command_invite.permission.app_error", "translation": "You don't have enough permissions to add {{.User}} in {{.Channel}}." }, + { + "id": "api.command_invite.private_channel.app_error", + "translation": "Could not find the channel {{.Channel}}. Please use the channel handle to identify channels." + }, { "id": "api.command_invite.success", "translation": "{{.User}} added to {{.Channel}} channel." @@ -3776,7 +3780,15 @@ }, { "id": "app.notification.body.intro.direct.generic", - "translation": "You have a new direct message from {{.SenderName}}" + "translation": "You have a new Direct Message from @{{.SenderName}}" + }, + { + "id": "app.notification.body.intro.group_message.full", + "translation": "U heeft een nieuw bericht." + }, + { + "id": "app.notification.body.intro.group_message.generic", + "translation": "You have a new Group Message from @{{.SenderName}}" }, { "id": "app.notification.body.intro.notification.full", @@ -3784,7 +3796,7 @@ }, { "id": "app.notification.body.intro.notification.generic", - "translation": "You have a new notification from {{.SenderName}}" + "translation": "You have a new notification from @{{.SenderName}}" }, { "id": "app.notification.body.text.direct.full", @@ -3794,6 +3806,14 @@ "id": "app.notification.body.text.direct.generic", "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}" }, + { + "id": "app.notification.body.text.group_message.full", + "translation": "KANAAL: {{.ChannelName}}
{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" + }, + { + "id": "app.notification.body.text.group_message.generic", + "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}" + }, { "id": "app.notification.body.text.notification.full", "translation": "KANAAL: {{.ChannelName}}
{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" @@ -3806,9 +3826,17 @@ "id": "app.notification.subject.direct.full", "translation": "[{{.SiteName}}] Nieuw direct bericht van {{.SenderDisplayName}} op {{.Month}} {{.Day}} {{.Year}}" }, + { + "id": "app.notification.subject.group_message.full", + "translation": "[{{.SiteName}}] Nieuw direct bericht van {{.SenderDisplayName}} op {{.Month}} {{.Day}} {{.Year}}" + }, + { + "id": "app.notification.subject.group_message.generic", + "translation": "[{{.SiteName}}] Nieuwe Notificatie voor {{.Month}} {{.Day}}, {{.Year}}" + }, { "id": "app.notification.subject.notification.full", - "translation": "[{{ .SiteName }}] Notification in {{ .TeamName}} on {{.Month}} {{.Day}}, {{.Year}}" + "translation": "[{{.SiteName}}] Nieuw direct bericht van {{.SenderDisplayName}} op {{.Month}} {{.Day}} {{.Year}}" }, { "id": "app.plugin.activate.app_error", @@ -5022,6 +5050,10 @@ "id": "model.config.is_valid.ldap_lastname", "translation": "AD/LDAP veld \"Last Name Attribute\" is verplicht." }, + { + "id": "model.config.is_valid.ldap_login_id", + "translation": "AD/LDAP veld \"ID Attribute\" is verplicht." + }, { "id": "model.config.is_valid.ldap_max_page_size.app_error", "translation": "Ongeldige max page size waarde." @@ -5922,10 +5954,6 @@ "id": "store.sql_channel.delete.channel.app_error", "translation": "Het kanaal kan niet verwijderd worden" }, - { - "id": "store.sql_channel.extra_updated.app_error", - "translation": "Probleem bij het bijwerken van de leden laatst bijgewerkte tijd" - }, { "id": "store.sql_channel.get.existing.app_error", "translation": "Het kanaal kon niet gevonden worden" diff --git a/i18n/pl.json b/i18n/pl.json index 3f03eabb6..aa95466a5 100644 --- a/i18n/pl.json +++ b/i18n/pl.json @@ -822,6 +822,10 @@ "id": "api.command_invite.permission.app_error", "translation": "You don't have enough permissions to add {{.User}} in {{.Channel}}." }, + { + "id": "api.command_invite.private_channel.app_error", + "translation": "Could not find the channel {{.Channel}}. Please use the channel handle to identify channels." + }, { "id": "api.command_invite.success", "translation": "{{.User}} added to {{.Channel}} channel." @@ -3776,7 +3780,15 @@ }, { "id": "app.notification.body.intro.direct.generic", - "translation": "You have a new direct message from {{.SenderName}}" + "translation": "You have a new Direct Message from @{{.SenderName}}" + }, + { + "id": "app.notification.body.intro.group_message.full", + "translation": "Masz nową wiadomość." + }, + { + "id": "app.notification.body.intro.group_message.generic", + "translation": "You have a new Group Message from @{{.SenderName}}" }, { "id": "app.notification.body.intro.notification.full", @@ -3784,7 +3796,7 @@ }, { "id": "app.notification.body.intro.notification.generic", - "translation": "You have a new notification from {{.SenderName}}" + "translation": "You have a new notification from @{{.SenderName}}" }, { "id": "app.notification.body.text.direct.full", @@ -3794,6 +3806,14 @@ "id": "app.notification.body.text.direct.generic", "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}" }, + { + "id": "app.notification.body.text.group_message.full", + "translation": "KANAŁ: {{.ChannelName}}
{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" + }, + { + "id": "app.notification.body.text.group_message.generic", + "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}" + }, { "id": "app.notification.body.text.notification.full", "translation": "KANAŁ: {{.ChannelName}}
{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" @@ -3806,9 +3826,17 @@ "id": "app.notification.subject.direct.full", "translation": "Nowa wiadomość grupowa od {{ .SenderDisplayName}} {{.Month}} {{.Day}}, {{.Year}}" }, + { + "id": "app.notification.subject.group_message.full", + "translation": "Nowa wiadomość grupowa od {{ .SenderDisplayName}} {{.Month}} {{.Day}}, {{.Year}}" + }, + { + "id": "app.notification.subject.group_message.generic", + "translation": "Nowe powiadomienie [{{.SiteName}}] z {{.Month}} {{.Day}}, {{.Year}}" + }, { "id": "app.notification.subject.notification.full", - "translation": "[{{ .SiteName }}] Notification in {{ .TeamName}} on {{.Month}} {{.Day}}, {{.Year}}" + "translation": "Nowa wiadomość grupowa od {{ .SenderDisplayName}} {{.Month}} {{.Day}}, {{.Year}}" }, { "id": "app.plugin.activate.app_error", @@ -5022,6 +5050,10 @@ "id": "model.config.is_valid.ldap_lastname", "translation": "Pole AD/LDAP \"Last Name Attribute\" jest wymagane." }, + { + "id": "model.config.is_valid.ldap_login_id", + "translation": "Pole AD/LDAP \"ID Attribute\" jest wymagane." + }, { "id": "model.config.is_valid.ldap_max_page_size.app_error", "translation": "Nieprawidłowy maksymalny rozmiar strony." @@ -5922,10 +5954,6 @@ "id": "store.sql_channel.delete.channel.app_error", "translation": "Nie możemy usunąć kanału" }, - { - "id": "store.sql_channel.extra_updated.app_error", - "translation": "Problem podczas aktualizowania daty ostatniej aktualizacji uczestników" - }, { "id": "store.sql_channel.get.existing.app_error", "translation": "Nie mogliśmy znaleźć istniejącego kanału" diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json index 290bea915..5b299756a 100644 --- a/i18n/pt-BR.json +++ b/i18n/pt-BR.json @@ -822,6 +822,10 @@ "id": "api.command_invite.permission.app_error", "translation": "Você não tem permissão suficiente para adicionar {{.User}} em {{.Channel}}." }, + { + "id": "api.command_invite.private_channel.app_error", + "translation": "Não foi possível encontrar o canal {{.Channel}}. Por favor utilize o identificador de canais para descobrir canais." + }, { "id": "api.command_invite.success", "translation": "{{.User}} adicionado ao canal {{.Channel}}." @@ -3772,11 +3776,19 @@ }, { "id": "app.notification.body.intro.direct.full", - "translation": "Você tem uma nova mensagem direta." + "translation": "Você tem uma nova Mensagem Direta." }, { "id": "app.notification.body.intro.direct.generic", - "translation": "Você tem uma nova mensagem direta de {{.SenderName}}" + "translation": "Você tem uma nova Mensagem Direta de @{{.SenderName}}" + }, + { + "id": "app.notification.body.intro.group_message.full", + "translation": "Você tem uma nova Mensagem de Grupo." + }, + { + "id": "app.notification.body.intro.group_message.generic", + "translation": "Você tem uma nova Mensagem de Grupo de @{{.SenderName}}" }, { "id": "app.notification.body.intro.notification.full", @@ -3784,19 +3796,27 @@ }, { "id": "app.notification.body.intro.notification.generic", - "translation": "Você tem uma nova notificação de {{.SenderName}}" + "translation": "Você tem uma nova notificação de @{{.SenderName}}" }, { "id": "app.notification.body.text.direct.full", - "translation": "{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Day}} {{.Month}}" + "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Day}} {{.Month}}" }, { "id": "app.notification.body.text.direct.generic", "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Day}} {{.Month}}" }, + { + "id": "app.notification.body.text.group_message.full", + "translation": "Canal: {{.ChannelName}}
@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Day}} {{.Month}}" + }, + { + "id": "app.notification.body.text.group_message.generic", + "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Day}} {{.Month}}" + }, { "id": "app.notification.body.text.notification.full", - "translation": "CANAL: {{.ChannelName}}
{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Day}} {{.Month}}" + "translation": "Canal: {{.ChannelName}}
@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Day}} {{.Month}}" }, { "id": "app.notification.body.text.notification.generic", @@ -3804,7 +3824,15 @@ }, { "id": "app.notification.subject.direct.full", - "translation": "[{{.SiteName}}] Nova Mensagem Direta de {{.SenderDisplayName}} em {{.Day}} {{.Month}}, {{.Year}}" + "translation": "[{{.SiteName}}] Nova Mensagem Direta de @{{.SenderDisplayName}} em {{.Day}} {{.Month}}, {{.Year}}" + }, + { + "id": "app.notification.subject.group_message.full", + "translation": "[{{ .SiteName }}] Nova Mensagem do Grupo {{ .ChannelName}} em {{.Day}} {{.Month}}, {{.Year}}" + }, + { + "id": "app.notification.subject.group_message.generic", + "translation": "[{{.SiteName}}] Nova Mensagem de Grupo em {{.Day}} {{.Month}}, {{.Year}}" }, { "id": "app.notification.subject.notification.full", @@ -5022,6 +5050,10 @@ "id": "model.config.is_valid.ldap_lastname", "translation": "O campo \"Last Name Attribute\" do AD/LDAP é requerido." }, + { + "id": "model.config.is_valid.ldap_login_id", + "translation": "O campo \"Login ID Attribute\" do AD/LDAP é obrigatório." + }, { "id": "model.config.is_valid.ldap_max_page_size.app_error", "translation": "Valor do tamanho de página máximo inválido." @@ -5922,10 +5954,6 @@ "id": "store.sql_channel.delete.channel.app_error", "translation": "Não foi possível deletar o canal" }, - { - "id": "store.sql_channel.extra_updated.app_error", - "translation": "Problema ao atualizar membros na última atualização" - }, { "id": "store.sql_channel.get.existing.app_error", "translation": "Não foi possível encontrar o canal existente" diff --git a/i18n/ru.json b/i18n/ru.json index 445d4a9f9..e34d1b8b0 100644 --- a/i18n/ru.json +++ b/i18n/ru.json @@ -822,6 +822,10 @@ "id": "api.command_invite.permission.app_error", "translation": "У вас недостаточно прав для добавления {{.User}} в {{.Channel}}." }, + { + "id": "api.command_invite.private_channel.app_error", + "translation": "Could not find the channel {{.Channel}}. Please use the channel handle to identify channels." + }, { "id": "api.command_invite.success", "translation": "{{.User}} добавлен в канал {{.Channel}}." @@ -3776,7 +3780,15 @@ }, { "id": "app.notification.body.intro.direct.generic", - "translation": "You have a new direct message from {{.SenderName}}" + "translation": "You have a new Direct Message from @{{.SenderName}}" + }, + { + "id": "app.notification.body.intro.group_message.full", + "translation": "У вас есть новое личное сообщение." + }, + { + "id": "app.notification.body.intro.group_message.generic", + "translation": "You have a new Group Message from @{{.SenderName}}" }, { "id": "app.notification.body.intro.notification.full", @@ -3784,7 +3796,7 @@ }, { "id": "app.notification.body.intro.notification.generic", - "translation": "You have a new notification from {{.SenderName}}" + "translation": "You have a new notification from @{{.SenderName}}" }, { "id": "app.notification.body.text.direct.full", @@ -3794,6 +3806,14 @@ "id": "app.notification.body.text.direct.generic", "translation": "{{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" }, + { + "id": "app.notification.body.text.group_message.full", + "translation": "КАНАЛ: {{.ChannelName}}
{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" + }, + { + "id": "app.notification.body.text.group_message.generic", + "translation": "{{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" + }, { "id": "app.notification.body.text.notification.full", "translation": "КАНАЛ: {{.ChannelName}}
{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" @@ -3806,9 +3826,17 @@ "id": "app.notification.subject.direct.full", "translation": "[{{.SiteName}}] Новое личное сообщение от {{.SenderDisplayName}} в {{.Month}} {{.Day}}, {{.Year}}" }, + { + "id": "app.notification.subject.group_message.full", + "translation": "[{{.SiteName}}] Новое личное сообщение от {{.SenderDisplayName}} в {{.Month}} {{.Day}}, {{.Year}}" + }, + { + "id": "app.notification.subject.group_message.generic", + "translation": "[{{.SiteName}}] Новое уведомление за {{.Day}} {{.Month}}, {{.Year}}" + }, { "id": "app.notification.subject.notification.full", - "translation": "[{{ .SiteName }}] Notification in {{ .TeamName}} on {{.Month}} {{.Day}}, {{.Year}}" + "translation": "[{{.SiteName}}] Новое личное сообщение от {{.SenderDisplayName}} в {{.Month}} {{.Day}}, {{.Year}}" }, { "id": "app.plugin.activate.app_error", @@ -5022,6 +5050,10 @@ "id": "model.config.is_valid.ldap_lastname", "translation": "Требуется поле AD/LDAP \"Last Name Attribute\"." }, + { + "id": "model.config.is_valid.ldap_login_id", + "translation": "Требуется поле AD/LDAP \"ID Attribute\"." + }, { "id": "model.config.is_valid.ldap_max_page_size.app_error", "translation": "Неверное значение максимального размера страницы." @@ -5922,10 +5954,6 @@ "id": "store.sql_channel.delete.channel.app_error", "translation": "Неудачная попытка удалить канал" }, - { - "id": "store.sql_channel.extra_updated.app_error", - "translation": "Проблема с обновлением времени последнего входа участника" - }, { "id": "store.sql_channel.get.existing.app_error", "translation": "Не удалось найти существующий канал" diff --git a/i18n/tr.json b/i18n/tr.json index 852bebad2..091f358ef 100644 --- a/i18n/tr.json +++ b/i18n/tr.json @@ -788,7 +788,7 @@ }, { "id": "api.command_invite.channel.error", - "translation": "{{.Channel}} kanalı belirlenemedi. Lütfen kanalları belirtmek için [channel handle] kullanın (https://about.mattermost.com/default-channel-handle-documentation)." + "translation": "{{.Channel}} kanalı belirlenemedi. Lütfen kanalları belirtmek için [kanal kısaltması] kullanın (https://about.mattermost.com/default-channel-handle-documentation)." }, { "id": "api.command_invite.desc", @@ -822,6 +822,10 @@ "id": "api.command_invite.permission.app_error", "translation": "{{.User}} kullanıcısını {{.Channel}} kanalına eklemek için yeterli izinleriniz yok." }, + { + "id": "api.command_invite.private_channel.app_error", + "translation": "{{.Channel}} kanalı bulunamadı. Lütfen kanalları belirtmek için kanal kısaltması kullanın." + }, { "id": "api.command_invite.success", "translation": "{{.User}} kullanıcısı {{.Channel}} kanalına eklendi." @@ -948,7 +952,7 @@ }, { "id": "api.command_mute.error", - "translation": "{{.Channel}} kanalı belirlenemedi. Lütfen kanalları belirtmek için [channel handle](https://about.mattermost.com/default-channel-handle-documentation) kullanın." + "translation": "{{.Channel}} kanalı belirlenemedi. Lütfen kanalları belirtmek için [kanal kısaltması](https://about.mattermost.com/default-channel-handle-documentation) kullanın." }, { "id": "api.command_mute.hint", @@ -960,7 +964,7 @@ }, { "id": "api.command_mute.no_channel.error", - "translation": "Belirtilen kanal bulunamadı. Lütfen kanalları belirtmek için [channel handle] kullanın (https://about.mattermost.com/default-channel-handle-documentation)." + "translation": "Belirtilen kanal bulunamadı. Lütfen kanalları belirtmek için [kanal kısaltması] kullanın (https://about.mattermost.com/default-channel-handle-documentation)." }, { "id": "api.command_mute.not_member.error", @@ -3772,11 +3776,19 @@ }, { "id": "app.notification.body.intro.direct.full", - "translation": "Yeni bir doğrudan iletiniz var." + "translation": "Yeni bir Doğrudan İletiniz var." }, { "id": "app.notification.body.intro.direct.generic", - "translation": "{{.SenderName}} tarafından gönderilen yeni bir doğrudan iletiniz var." + "translation": "@{{.SenderName}} tarafından gönderilen yeni bir Doğrudan İletiniz var." + }, + { + "id": "app.notification.body.intro.group_message.full", + "translation": "Yeni bir Grup İletiniz var." + }, + { + "id": "app.notification.body.intro.group_message.generic", + "translation": "@{{.SenderName}} tarafından gönderilen yeni bir Grup İletiniz var." }, { "id": "app.notification.body.intro.notification.full", @@ -3784,19 +3796,27 @@ }, { "id": "app.notification.body.intro.notification.generic", - "translation": "{{.SenderName}} tarafından gönderilen yeni bir bildiriminiz var." + "translation": "@{{.SenderName}} tarafından gönderilen yeni bir bildiriminiz var." }, { "id": "app.notification.body.text.direct.full", - "translation": "{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" + "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" }, { "id": "app.notification.body.text.direct.generic", "translation": "{{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" }, + { + "id": "app.notification.body.text.group_message.full", + "translation": "Kanal: {{.ChannelName}}
@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" + }, + { + "id": "app.notification.body.text.group_message.generic", + "translation": "{{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" + }, { "id": "app.notification.body.text.notification.full", - "translation": "KANAL: {{.ChannelName}}
{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" + "translation": "Kanal: {{.ChannelName}}
@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" }, { "id": "app.notification.body.text.notification.generic", @@ -3804,7 +3824,15 @@ }, { "id": "app.notification.subject.direct.full", - "translation": "[{{.SiteName}}] {{ .SenderDisplayName}} tarafından {{.Month}} {{.Day}}, {{.Year}} tarihinde yeni doğrudan ileti" + "translation": "[{{.SiteName}}] @{{ .SenderDisplayName}} tarafından {{.Month}} {{.Day}}, {{.Year}} tarihinde yeni bir Doğrudan İleti gönderildi" + }, + { + "id": "app.notification.subject.group_message.full", + "translation": "[{{ .SiteName }}] {{ .ChannelName}} grubuna {{.Month}} {{.Day}}, {{.Year}} tarihinde yeni bir Grup İletisi gönderildi" + }, + { + "id": "app.notification.subject.group_message.generic", + "translation": "[{{.SiteName}}] sitesinde {{.Month}} {{.Day}}, {{.Year}} tarihinde yeni bir Grup İletisi gönderildi" }, { "id": "app.notification.subject.notification.full", @@ -5022,6 +5050,10 @@ "id": "model.config.is_valid.ldap_lastname", "translation": "\"Soyad Özniteliği\" AD/LDAP alanı zorunludur." }, + { + "id": "model.config.is_valid.ldap_login_id", + "translation": "\"Oturum Açma Kodu Özniteliği\" AD/LDAP alanı zorunludur." + }, { "id": "model.config.is_valid.ldap_max_page_size.app_error", "translation": "En büyük sayfa boyutu değeri geçersiz." @@ -5922,10 +5954,6 @@ "id": "store.sql_channel.delete.channel.app_error", "translation": "Kanal silinemedi" }, - { - "id": "store.sql_channel.extra_updated.app_error", - "translation": "Üyelerin son güncellenme zamanları güncellenirken sorun çıktı" - }, { "id": "store.sql_channel.get.existing.app_error", "translation": "Var olan kanal bulunamadı" diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json index 4c9a11deb..43825d869 100644 --- a/i18n/zh-CN.json +++ b/i18n/zh-CN.json @@ -822,6 +822,10 @@ "id": "api.command_invite.permission.app_error", "translation": "您没有足够的权限在 {{.Channel}} 添加 {{.User}}。" }, + { + "id": "api.command_invite.private_channel.app_error", + "translation": "无法找到频道 {{.Channel}}。请使用频道识别查找频道。" + }, { "id": "api.command_invite.success", "translation": "已添加 {{.User}} 到 {{.Channel}} 频道。" @@ -3772,11 +3776,19 @@ }, { "id": "app.notification.body.intro.direct.full", - "translation": "你有一条新消息。" + "translation": "你有一条新私信。" }, { "id": "app.notification.body.intro.direct.generic", - "translation": "您有来自 {{.SenderName}} 的新私信" + "translation": "您有来自 @{{.SenderName}} 的新私信" + }, + { + "id": "app.notification.body.intro.group_message.full", + "translation": "你有一条新团体消息。" + }, + { + "id": "app.notification.body.intro.group_message.generic", + "translation": "您有来自 @{{.SenderName}} 的新团体消息" }, { "id": "app.notification.body.intro.notification.full", @@ -3784,19 +3796,27 @@ }, { "id": "app.notification.body.intro.notification.generic", - "translation": "您有来自 {{.SenderName}} 的新通知" + "translation": "您有来自 @{{.SenderName}} 的新通知" }, { "id": "app.notification.body.text.direct.full", - "translation": "{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" + "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" }, { "id": "app.notification.body.text.direct.generic", "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}" }, + { + "id": "app.notification.body.text.group_message.full", + "translation": "频道：{{.ChannelName}}
@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" + }, + { + "id": "app.notification.body.text.group_message.generic", + "translation": "{{.Hour}}:{{.Minute}} {{.Timezone}}, {{.Month}} {{.Day}}" + }, { "id": "app.notification.body.text.notification.full", - "translation": "频道: {{.ChannelName}}
{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" + "translation": "频道：{{.ChannelName}}
@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" }, { "id": "app.notification.body.text.notification.generic", @@ -3804,7 +3824,15 @@ }, { "id": "app.notification.subject.direct.full", - "translation": "[{{.SiteName}}] 来自 {{ .SenderDisplayName}} 的新私信消息于 {{.Month}} {{.Day}}, {{.Year}}" + "translation": "[{{.SiteName}}] 来自 @{{ .SenderDisplayName}} 于 {{.Month}} {{.Day}}, {{.Year}} 发送的新私信消息" + }, + { + "id": "app.notification.subject.group_message.full", + "translation": "[{{ .SiteName }}] 在 [{{ .SiteName }}] 于 {{.Month}} {{.Day}}, {{.Year}} 的新团体消息" + }, + { + "id": "app.notification.subject.group_message.generic", + "translation": "[{{.SiteName}}] 于 {{.Month}} {{.Day}}, {{.Year}} 的新团体消息" }, { "id": "app.notification.subject.notification.full", @@ -5022,6 +5050,10 @@ "id": "model.config.is_valid.ldap_lastname", "translation": "AD/LDAP 栏 \"姓氏\" 为必填。" }, + { + "id": "model.config.is_valid.ldap_login_id", + "translation": "AD/LDAP 栏 \"登入 ID 属性\" 为必填。" + }, { "id": "model.config.is_valid.ldap_max_page_size.app_error", "translation": "无效的最大页面值。" @@ -5196,7 +5228,7 @@ }, { "id": "model.config.is_valid.site_url.app_error", - "translation": "站点网址必须为有效URL并且以 http:// 或 https:// 开头" + "translation": "站点网址必须为有效的 URL 并以 http:// 或 https:// 开头" }, { "id": "model.config.is_valid.site_url_email_batching.app_error", @@ -5922,10 +5954,6 @@ "id": "store.sql_channel.delete.channel.app_error", "translation": "我们无法删除频道" }, - { - "id": "store.sql_channel.extra_updated.app_error", - "translation": "更新成员上次更新时间出现问题" - }, { "id": "store.sql_channel.get.existing.app_error", "translation": "我们找不到现有的频道" diff --git a/i18n/zh-TW.json b/i18n/zh-TW.json index c76f097ba..82ec3587e 100644 --- a/i18n/zh-TW.json +++ b/i18n/zh-TW.json @@ -822,6 +822,10 @@ "id": "api.command_invite.permission.app_error", "translation": "沒有足夠的權限將 {{.User}} 新增至 {{.Channel}}。" }, + { + "id": "api.command_invite.private_channel.app_error", + "translation": "Could not find the channel {{.Channel}}. Please use the channel handle to identify channels." + }, { "id": "api.command_invite.success", "translation": "已將 {{.User}} 新增至 {{.Channel}} 頻道。" @@ -3778,6 +3782,14 @@ "id": "app.notification.body.intro.direct.generic", "translation": "您有 1 筆新的直接傳訊，來自{{.SenderName}}。" }, + { + "id": "app.notification.body.intro.group_message.full", + "translation": "您有 1 筆新的直接傳訊。" + }, + { + "id": "app.notification.body.intro.group_message.generic", + "translation": "您有 1 筆新的直接傳訊，來自{{.SenderName}}。" + }, { "id": "app.notification.body.intro.notification.full", "translation": "您有一筆新通知。" @@ -3794,6 +3806,14 @@ "id": "app.notification.body.text.direct.generic", "translation": "{{.Month}} {{.Day}}，{{.Hour}}:{{.Minute}} {{.Timezone}}" }, + { + "id": "app.notification.body.text.group_message.full", + "translation": "頻道：{{.ChannelName}}
{{.SenderName}} - {{.Month}} {{.Day}}，{{.Hour}}:{{.Minute}} {{.Timezone}}" + }, + { + "id": "app.notification.body.text.group_message.generic", + "translation": "{{.Month}} {{.Day}}，{{.Hour}}:{{.Minute}} {{.Timezone}}" + }, { "id": "app.notification.body.text.notification.full", "translation": "頻道：{{.ChannelName}}
{{.SenderName}} - {{.Month}} {{.Day}}，{{.Hour}}:{{.Minute}} {{.Timezone}}" @@ -3806,6 +3826,14 @@ "id": "app.notification.subject.direct.full", "translation": "[{{.SiteName}}] 來自 {{.SenderDisplayName}} 的直接傳訊，發於 {{.Year}} {{.Month}} {{.Day}}" }, + { + "id": "app.notification.subject.group_message.full", + "translation": "[{{.SiteName}}] 來自 {{.TeamName}} 的通知，發於 {{.Year}} {{.Month}} {{.Day}}" + }, + { + "id": "app.notification.subject.group_message.generic", + "translation": "[{{.SiteName}}] {{.Year}} {{.Month}} {{.Day}} 的新通知[{{.SiteName}}] {{.Year}} {{.Month}} {{.Day}} 的新通知" + }, { "id": "app.notification.subject.notification.full", "translation": "[{{.SiteName}}] 來自 {{.TeamName}} 的通知，發於 {{.Year}} {{.Month}} {{.Day}}" @@ -5022,6 +5050,10 @@ "id": "model.config.is_valid.ldap_lastname", "translation": "AD/LDAP 欄位 \"姓氏屬性\" 為必須欄位。" }, + { + "id": "model.config.is_valid.ldap_login_id", + "translation": "AD/LDAP 欄位 \"ID 的屬性\" 為必須欄位。" + }, { "id": "model.config.is_valid.ldap_max_page_size.app_error", "translation": "無效的最大分頁大小。" @@ -5922,10 +5954,6 @@ "id": "store.sql_channel.delete.channel.app_error", "translation": "無法刪除頻道" }, - { - "id": "store.sql_channel.extra_updated.app_error", - "translation": "更新成員的最後更新時間時遇到問題" - }, { "id": "store.sql_channel.get.existing.app_error", "translation": "找不到現有的頻道" -- cgit v1.2.3-1-g7c22