From 3b57422c5fb6f6631a96c1c6a5d730b1db6e4b2a Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Tue, 1 May 2018 11:07:56 -0300
Subject: translations PR 20180430 (#8696)

---
 i18n/de.json    | 20 ++++++++++++--------
 i18n/en.json    | 16 ++++++++--------
 i18n/es.json    | 30 +++++++++++++++++-------------
 i18n/fr.json    | 20 ++++++++++++--------
 i18n/it.json    | 30 +++++++++++++++++-------------
 i18n/ja.json    | 28 ++++++++++++++++------------
 i18n/ko.json    | 20 ++++++++++++--------
 i18n/nl.json    | 20 ++++++++++++--------
 i18n/pl.json    | 20 ++++++++++++--------
 i18n/pt-BR.json | 20 ++++++++++++--------
 i18n/ru.json    | 20 ++++++++++++--------
 i18n/tr.json    | 20 ++++++++++++--------
 i18n/zh-CN.json | 24 ++++++++++++++----------
 i18n/zh-TW.json | 20 ++++++++++++--------
 14 files changed, 180 insertions(+), 128 deletions(-)

(limited to 'i18n')

diff --git a/i18n/de.json b/i18n/de.json
index 7989b875a..09f87dc22 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -2434,6 +2434,10 @@
     "id": "api.team.permanent_delete_team.deleted.warn",
     "translation": "Team permanent gelöscht %v id=%v"
   },
+  {
+    "id": "api.team.remove_team_icon.get_team.app_error",
+    "translation": "An error occurred getting the team"
+  },
   {
     "id": "api.team.remove_user_from_team.missing.app_error",
     "translation": "Der Benutzer scheint nicht Teil dieses Teams zu sein."
@@ -2490,6 +2494,10 @@
     "id": "api.team.signup_team.email_disabled.app_error",
     "translation": "Team-Anmeldung mit einer E-Mail-Adresse ist deaktiviert."
   },
+  {
+    "id": "api.team.team_icon.update.app_error",
+    "translation": "An error occurred updating the team icon"
+  },
   {
     "id": "api.team.update_member_roles.not_a_member",
     "translation": "Der angegebene Benutzer ist kein Mitglied des angegebenen Teams."
@@ -4690,6 +4698,10 @@
     "id": "model.channel_member_history.is_valid.user_id.app_error",
     "translation": "Ungültige Benutzer-ID"
   },
+  {
+    "id": "model.client.command.parse.app_error",
+    "translation": "Konnte eingehende Daten nicht verarbeiten"
+  },
   {
     "id": "model.client.connecting.app_error",
     "translation": "Beim Verbinden mit dem Server ist ein Fehler aufgetreten"
@@ -5770,10 +5782,6 @@
     "id": "store.sql.closing.info",
     "translation": "Schließe SqlStore"
   },
-  {
-    "id": "store.sql.column_exists.critical",
-    "translation": "Fehler beim Prüfen ob Spalte existiert %v"
-  },
   {
     "id": "store.sql.column_exists_missing_driver.critical",
     "translation": "Fehler beim Überprüfen ob Spalte existiert aufgrund fehlendem Treiber"
@@ -5862,10 +5870,6 @@
     "id": "store.sql.table_column_type.critical",
     "translation": "Fehler beim Lesen des Datentyps für Spalte %s von Tabelle %s: %v"
   },
-  {
-    "id": "store.sql.table_exists.critical",
-    "translation": "Fehler beim Überprüfen ob Tabelle existiert %v"
-  },
   {
     "id": "store.sql.too_short_ciphertext",
     "translation": "Ciphertext zu kurz"
diff --git a/i18n/en.json b/i18n/en.json
index a3ba5c4f3..0afaa326c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2434,6 +2434,10 @@
     "id": "api.team.permanent_delete_team.deleted.warn",
     "translation": "Permanently deleted team %v id=%v"
   },
+  {
+    "id": "api.team.remove_team_icon.get_team.app_error",
+    "translation": "An error occurred getting the team"
+  },
   {
     "id": "api.team.remove_user_from_team.missing.app_error",
     "translation": "The user does not appear to be part of this team."
@@ -2458,10 +2462,6 @@
     "id": "api.team.set_team_icon.encode.app_error",
     "translation": "Could not encode team icon"
   },
-  {
-    "id": "api.team.remove_team_icon.get_team.app_error",
-    "translation": "An error occurred getting the team"
-  },
   {
     "id": "api.team.set_team_icon.get_team.app_error",
     "translation": "An error occurred getting the team"
@@ -2486,10 +2486,6 @@
     "id": "api.team.set_team_icon.too_large.app_error",
     "translation": "Unable to upload team icon. File is too large."
   },
-  {
-    "id": "api.team.team_icon.update.app_error",
-    "translation": "An error occurred updating the team icon"
-  },
   {
     "id": "api.team.set_team_icon.write_file.app_error",
     "translation": "Could not save team icon"
@@ -2498,6 +2494,10 @@
     "id": "api.team.signup_team.email_disabled.app_error",
     "translation": "Team sign-up with email is disabled."
   },
+  {
+    "id": "api.team.team_icon.update.app_error",
+    "translation": "An error occurred updating the team icon"
+  },
   {
     "id": "api.team.update_member_roles.not_a_member",
     "translation": "Specified user is not a member of specified team."
diff --git a/i18n/es.json b/i18n/es.json
index b012b5e94..b22a62bbc 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -944,7 +944,7 @@
   },
   {
     "id": "api.command_mute.desc",
-    "translation": "Apaga las notificaciones de escritorio, correo electrónico y push para el canal actual o el [canal] especificado."
+    "translation": "Apaga las notificaciones de escritorio, correo electrónico y a dispositivos móviles para el canal actual o el [canal] especificado."
   },
   {
     "id": "api.command_mute.error",
@@ -1896,7 +1896,7 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.clear_push_notification.debug",
-    "translation": "Limpiando notificaciones push a %v con el channel_id '%v'"
+    "translation": "Limpiando notificaciones dispositivos móviles para %v con el channel_id '%v'"
   },
   {
     "id": "api.post.send_notifications_and_forget.files.error",
@@ -1948,7 +1948,7 @@
   },
   {
     "id": "api.post.send_notifications_and_forget.push_notification.error",
-    "translation": "Error al enviar push device_id={{.DeviceId}}, err={{.Error}}"
+    "translation": "Error al enviar notificación al dispositivo móvil device_id={{.DeviceId}}, err={{.Error}}"
   },
   {
     "id": "api.post.send_notifications_and_forget.sent",
@@ -2434,6 +2434,10 @@
     "id": "api.team.permanent_delete_team.deleted.warn",
     "translation": "Equipo eliminado permanentemente %v id=%v"
   },
+  {
+    "id": "api.team.remove_team_icon.get_team.app_error",
+    "translation": "An error occurred getting the team"
+  },
   {
     "id": "api.team.remove_user_from_team.missing.app_error",
     "translation": "El usuario no parece ser parte de este equipo."
@@ -2490,6 +2494,10 @@
     "id": "api.team.signup_team.email_disabled.app_error",
     "translation": "El registro a equipos por correo electrónico está inhabilitado."
   },
+  {
+    "id": "api.team.team_icon.update.app_error",
+    "translation": "An error occurred updating the team icon"
+  },
   {
     "id": "api.team.update_member_roles.not_a_member",
     "translation": "Usuario especificado no es un miembro de equipo especificado."
@@ -3728,7 +3736,7 @@
   },
   {
     "id": "app.import.validate_user_import_data.notify_props_mobile_push_status_invalid.error",
-    "translation": "La propiedad de notificación del estatus del usuario para recibir mediante push no es válida."
+    "translation": "La propiedad de notificación del estatus del usuario para recibir notificaciones a dispositivos móviles no es válida."
   },
   {
     "id": "app.import.validate_user_import_data.pasword_length.error",
@@ -4656,7 +4664,7 @@
   },
   {
     "id": "model.channel_member.is_valid.push_level.app_error",
-    "translation": "Nivel para la notificación push no es válido"
+    "translation": "Nivel para la notificación a dispositivos móviles no es válido"
   },
   {
     "id": "model.channel_member.is_valid.role.app_error",
@@ -4690,6 +4698,10 @@
     "id": "model.channel_member_history.is_valid.user_id.app_error",
     "translation": "Id de usuario no válido"
   },
+  {
+    "id": "model.client.command.parse.app_error",
+    "translation": "No se puede analizar la data entrante"
+  },
   {
     "id": "model.client.connecting.app_error",
     "translation": "Encontramos un error mientras conectabamos al servidor"
@@ -5770,10 +5782,6 @@
     "id": "store.sql.closing.info",
     "translation": "Cerrando SqlStore"
   },
-  {
-    "id": "store.sql.column_exists.critical",
-    "translation": "Falla al revisar si la columna existe %v"
-  },
   {
     "id": "store.sql.column_exists_missing_driver.critical",
     "translation": "Falla al revisar si la columna existe porque el controlador no se encuentra"
@@ -5862,10 +5870,6 @@
     "id": "store.sql.table_column_type.critical",
     "translation": "Falla al obtener el tipo de dato de la columna %s de la tabla %s: %v"
   },
-  {
-    "id": "store.sql.table_exists.critical",
-    "translation": "Falla al revisar si la tabla existe %v"
-  },
   {
     "id": "store.sql.too_short_ciphertext",
     "translation": "ciphertext muy corto"
diff --git a/i18n/fr.json b/i18n/fr.json
index b8df8fcf1..700b1b856 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -2434,6 +2434,10 @@
     "id": "api.team.permanent_delete_team.deleted.warn",
     "translation": "Équipe %v supprimée définitivement id=%v"
   },
+  {
+    "id": "api.team.remove_team_icon.get_team.app_error",
+    "translation": "An error occurred getting the team"
+  },
   {
     "id": "api.team.remove_user_from_team.missing.app_error",
     "translation": "L'utilisateur n'appartient pas à cette équipe."
@@ -2490,6 +2494,10 @@
     "id": "api.team.signup_team.email_disabled.app_error",
     "translation": "L'inscription avec une adresse e-mail est désactivée."
   },
+  {
+    "id": "api.team.team_icon.update.app_error",
+    "translation": "An error occurred updating the team icon"
+  },
   {
     "id": "api.team.update_member_roles.not_a_member",
     "translation": "L'utilisateur spécifié n'est pas un membre de l'équipe spécifiée."
@@ -4690,6 +4698,10 @@
     "id": "model.channel_member_history.is_valid.user_id.app_error",
     "translation": "Id utilisateur invalide"
   },
+  {
+    "id": "model.client.command.parse.app_error",
+    "translation": "Impossible d'interpréter les données entrantes"
+  },
   {
     "id": "model.client.connecting.app_error",
     "translation": "Une erreur est survenue durant la connexion au serveur"
@@ -5770,10 +5782,6 @@
     "id": "store.sql.closing.info",
     "translation": "Fermeture de SqlStore"
   },
-  {
-    "id": "store.sql.column_exists.critical",
-    "translation": "Échec de la vérification de l'existence de la colonne %v"
-  },
   {
     "id": "store.sql.column_exists_missing_driver.critical",
     "translation": "Échec de la vérification de l'existence de la colonne en raison d'un driver manquant"
@@ -5862,10 +5870,6 @@
     "id": "store.sql.table_column_type.critical",
     "translation": "Échec du chargement du type de données pour la colonne %s de la table %s : %v"
   },
-  {
-    "id": "store.sql.table_exists.critical",
-    "translation": "Échec de la vérification de l'existence de la table %v"
-  },
   {
     "id": "store.sql.too_short_ciphertext",
     "translation": "ciphertext trop court"
diff --git a/i18n/it.json b/i18n/it.json
index 724d69c09..422fe5c32 100644
--- a/i18n/it.json
+++ b/i18n/it.json
@@ -217,11 +217,11 @@
   },
   {
     "id": "api.channel.convert_channel_to_private.default_channel_error",
-    "translation": "This default channel cannot be converted into a private channel."
+    "translation": "Questo canale predefinito non può essere convertito in un canale privato."
   },
   {
     "id": "api.channel.convert_channel_to_private.private_channel_error",
-    "translation": "The channel requested to convert is already a private channel."
+    "translation": "Il canale da convertire è già un canale privato."
   },
   {
     "id": "api.channel.create_channel.direct_channel.app_error",
@@ -2434,6 +2434,10 @@
     "id": "api.team.permanent_delete_team.deleted.warn",
     "translation": "Gruppo eliminato permanentemente %v id=%v"
   },
+  {
+    "id": "api.team.remove_team_icon.get_team.app_error",
+    "translation": "An error occurred getting the team"
+  },
   {
     "id": "api.team.remove_user_from_team.missing.app_error",
     "translation": "L'utente non è membro di questo gruppo."
@@ -2490,6 +2494,10 @@
     "id": "api.team.signup_team.email_disabled.app_error",
     "translation": "L'iscrizione al gruppo con email è disabilitata."
   },
+  {
+    "id": "api.team.team_icon.update.app_error",
+    "translation": "An error occurred updating the team icon"
+  },
   {
     "id": "api.team.update_member_roles.not_a_member",
     "translation": "L'utente indicato non è membro del gruppo specificato."
@@ -2852,7 +2860,7 @@
   },
   {
     "id": "api.user.create_user.missing_token.app_error",
-    "translation": "Missing Token."
+    "translation": "Token mancante."
   },
   {
     "id": "api.user.create_user.no_open_server",
@@ -4690,6 +4698,10 @@
     "id": "model.channel_member_history.is_valid.user_id.app_error",
     "translation": "Id utente non valido"
   },
+  {
+    "id": "model.client.command.parse.app_error",
+    "translation": "Impossibile analizzare i dati in ingresso"
+  },
   {
     "id": "model.client.connecting.app_error",
     "translation": "E' stato riscontrato un errore durante la connessione al server"
@@ -5770,10 +5782,6 @@
     "id": "store.sql.closing.info",
     "translation": "Chiusura SqlStore"
   },
-  {
-    "id": "store.sql.column_exists.critical",
-    "translation": "Fallimento nel controllo se la colonna esiste %v"
-  },
   {
     "id": "store.sql.column_exists_missing_driver.critical",
     "translation": "Controllo se la colonna esiste fallita a causa di un driver mancante"
@@ -5862,10 +5870,6 @@
     "id": "store.sql.table_column_type.critical",
     "translation": "Impossibile ottenere il tipo di dato per la colonna %s dalla tabella %s: %v"
   },
-  {
-    "id": "store.sql.table_exists.critical",
-    "translation": "Impossibile controllare se la tabella esiste %v"
-  },
   {
     "id": "store.sql.too_short_ciphertext",
     "translation": "testo cifrario troppo corto"
@@ -6688,7 +6692,7 @@
   },
   {
     "id": "store.sql_role.permanent_delete_all.app_error",
-    "translation": "We could not permanently delete all the roles"
+    "translation": "Impossibile eliminare definitivamente tutti i ruoli"
   },
   {
     "id": "store.sql_role.save.insert.app_error",
@@ -6808,7 +6812,7 @@
   },
   {
     "id": "store.sql_system.permanent_delete_by_name.app_error",
-    "translation": "We could not permanently delete the system table entry"
+    "translation": "Impossibile eliminare definitivamente questa voce dalla tabella di sistema"
   },
   {
     "id": "store.sql_system.save.app_error",
diff --git a/i18n/ja.json b/i18n/ja.json
index 9f1014e85..f3db111ae 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -217,11 +217,11 @@
   },
   {
     "id": "api.channel.convert_channel_to_private.default_channel_error",
-    "translation": "This default channel cannot be converted into a private channel."
+    "translation": "このデフォルトチャンネルは非公開チャンネルに変更できません。"
   },
   {
     "id": "api.channel.convert_channel_to_private.private_channel_error",
-    "translation": "The channel requested to convert is already a private channel."
+    "translation": "変更しようとしているチャンネルはすでに非公開チャンネルです。"
   },
   {
     "id": "api.channel.create_channel.direct_channel.app_error",
@@ -2434,6 +2434,10 @@
     "id": "api.team.permanent_delete_team.deleted.warn",
     "translation": "チーム%vを完全に削除しました id=%v"
   },
+  {
+    "id": "api.team.remove_team_icon.get_team.app_error",
+    "translation": "An error occurred getting the team"
+  },
   {
     "id": "api.team.remove_user_from_team.missing.app_error",
     "translation": "ユーザーはこのチームの一員ではありません。"
@@ -2490,6 +2494,10 @@
     "id": "api.team.signup_team.email_disabled.app_error",
     "translation": "電子メールによるチームへの利用登録は無効です。"
   },
+  {
+    "id": "api.team.team_icon.update.app_error",
+    "translation": "An error occurred updating the team icon"
+  },
   {
     "id": "api.team.update_member_roles.not_a_member",
     "translation": "指定されたユーザーは指定されたチームに所属していません。"
@@ -2960,7 +2968,7 @@
   },
   {
     "id": "api.user.login_ldap.disabled.app_error",
-    "translation": "AD/LDAPはこのサーバーでは有効ではありません"
+    "translation": "AD/LDAPはこのサーバーでは有効化されていません"
   },
   {
     "id": "api.user.login_ldap.need_id.app_error",
@@ -4168,7 +4176,7 @@
   },
   {
     "id": "ent.elasticsearch.generic.disabled",
-    "translation": "このサーバーではElasticsearchによる検索は無効です。"
+    "translation": "このサーバーではElasticsearchによる検索は有効化されていません"
   },
   {
     "id": "ent.elasticsearch.index_post.error",
@@ -4690,6 +4698,10 @@
     "id": "model.channel_member_history.is_valid.user_id.app_error",
     "translation": "不正なユーザーIDです"
   },
+  {
+    "id": "model.client.command.parse.app_error",
+    "translation": "外部からのデータを解析できません"
+  },
   {
     "id": "model.client.connecting.app_error",
     "translation": "サーバーに接続中にエラーになりました"
@@ -5770,10 +5782,6 @@
     "id": "store.sql.closing.info",
     "translation": "SqlStoreを閉じています"
   },
-  {
-    "id": "store.sql.column_exists.critical",
-    "translation": "列が存在するか確認できませんでした %v"
-  },
   {
     "id": "store.sql.column_exists_missing_driver.critical",
     "translation": "ドライバーがなかったので列が存在するか確認できませんでした"
@@ -5862,10 +5870,6 @@
     "id": "store.sql.table_column_type.critical",
     "translation": "列%s(テーブル%s)のデータ形式を取得できません: %v"
   },
-  {
-    "id": "store.sql.table_exists.critical",
-    "translation": "テーブルが存在するか確認できませんでした %v"
-  },
   {
     "id": "store.sql.too_short_ciphertext",
     "translation": "ciphertextが短過ぎます"
diff --git a/i18n/ko.json b/i18n/ko.json
index 97b7e362f..f8dae9567 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -2434,6 +2434,10 @@
     "id": "api.team.permanent_delete_team.deleted.warn",
     "translation": "팀이 완전히 삭제되었습니다. %v id=%v"
   },
+  {
+    "id": "api.team.remove_team_icon.get_team.app_error",
+    "translation": "An error occurred getting the team"
+  },
   {
     "id": "api.team.remove_user_from_team.missing.app_error",
     "translation": "The user does not appear to be part of this team."
@@ -2490,6 +2494,10 @@
     "id": "api.team.signup_team.email_disabled.app_error",
     "translation": "이메일을 통한 팀 가입이 비활성화 되어있습니다."
   },
+  {
+    "id": "api.team.team_icon.update.app_error",
+    "translation": "An error occurred updating the team icon"
+  },
   {
     "id": "api.team.update_member_roles.not_a_member",
     "translation": "지정된 사용자는 지정된 팀의 멤버가 아닙니다."
@@ -4690,6 +4698,10 @@
     "id": "model.channel_member_history.is_valid.user_id.app_error",
     "translation": "잘못된 사용자 ID"
   },
+  {
+    "id": "model.client.command.parse.app_error",
+    "translation": "Unable to parse incoming data"
+  },
   {
     "id": "model.client.connecting.app_error",
     "translation": "We encountered an error while connecting to the server"
@@ -5770,10 +5782,6 @@
     "id": "store.sql.closing.info",
     "translation": "Closing SqlStore"
   },
-  {
-    "id": "store.sql.column_exists.critical",
-    "translation": "Failed to check if column exists %v"
-  },
   {
     "id": "store.sql.column_exists_missing_driver.critical",
     "translation": "Failed to check if column exists because of missing driver"
@@ -5862,10 +5870,6 @@
     "id": "store.sql.table_column_type.critical",
     "translation": "Failed to get data type for column %s from table %s: %v"
   },
-  {
-    "id": "store.sql.table_exists.critical",
-    "translation": "Failed to check if table exists %v"
-  },
   {
     "id": "store.sql.too_short_ciphertext",
     "translation": "ciphertext too short"
diff --git a/i18n/nl.json b/i18n/nl.json
index e2009bf1f..93c2d7485 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -2434,6 +2434,10 @@
     "id": "api.team.permanent_delete_team.deleted.warn",
     "translation": "Team %v is permanent verwijderd, id=%v"
   },
+  {
+    "id": "api.team.remove_team_icon.get_team.app_error",
+    "translation": "An error occurred getting the team"
+  },
   {
     "id": "api.team.remove_user_from_team.missing.app_error",
     "translation": "De gebruiker is geen onderdeel van dit team"
@@ -2490,6 +2494,10 @@
     "id": "api.team.signup_team.email_disabled.app_error",
     "translation": "Team aanmelding via e-mail is uitgeschakeld."
   },
+  {
+    "id": "api.team.team_icon.update.app_error",
+    "translation": "An error occurred updating the team icon"
+  },
   {
     "id": "api.team.update_member_roles.not_a_member",
     "translation": "Specified user is not a member of specified team."
@@ -4690,6 +4698,10 @@
     "id": "model.channel_member_history.is_valid.user_id.app_error",
     "translation": "Ongeldige gebruikers id"
   },
+  {
+    "id": "model.client.command.parse.app_error",
+    "translation": "Kan binnenkomende data niet verwerken"
+  },
   {
     "id": "model.client.connecting.app_error",
     "translation": "Er is een probleem opgetreden tijdens het verbinden met de server"
@@ -5770,10 +5782,6 @@
     "id": "store.sql.closing.info",
     "translation": "Afsluiten van Sql opslag"
   },
-  {
-    "id": "store.sql.column_exists.critical",
-    "translation": "Fout bij controle of de kolom bestaat %v"
-  },
   {
     "id": "store.sql.column_exists_missing_driver.critical",
     "translation": "Stuurprogramma mist bij het controleren of de kolom bestaat"
@@ -5862,10 +5870,6 @@
     "id": "store.sql.table_column_type.critical",
     "translation": "Fout bij het ophalen van data type voor kolom %s uit tabel %s: %v"
   },
-  {
-    "id": "store.sql.table_exists.critical",
-    "translation": "Fout bij controle of de tabel bestaat %v"
-  },
   {
     "id": "store.sql.too_short_ciphertext",
     "translation": "encryptietext is te kort"
diff --git a/i18n/pl.json b/i18n/pl.json
index 85d6d1366..808ba034c 100644
--- a/i18n/pl.json
+++ b/i18n/pl.json
@@ -2434,6 +2434,10 @@
     "id": "api.team.permanent_delete_team.deleted.warn",
     "translation": "Trwałe usuwanie zespołu %v id=%v"
   },
+  {
+    "id": "api.team.remove_team_icon.get_team.app_error",
+    "translation": "An error occurred getting the team"
+  },
   {
     "id": "api.team.remove_user_from_team.missing.app_error",
     "translation": "Użytkownik nie należy do tego zespołu."
@@ -2490,6 +2494,10 @@
     "id": "api.team.signup_team.email_disabled.app_error",
     "translation": "Zapisy do zespołu za pomocą email są wyłączone."
   },
+  {
+    "id": "api.team.team_icon.update.app_error",
+    "translation": "An error occurred updating the team icon"
+  },
   {
     "id": "api.team.update_member_roles.not_a_member",
     "translation": "Wskazany użytkownik nie jest członkiem określonego zespołu."
@@ -4690,6 +4698,10 @@
     "id": "model.channel_member_history.is_valid.user_id.app_error",
     "translation": "Nieprawidłowy identyfikator użytkownika"
   },
+  {
+    "id": "model.client.command.parse.app_error",
+    "translation": "Unable to parse incoming data"
+  },
   {
     "id": "model.client.connecting.app_error",
     "translation": "Napotkano błąd podczas podłączania się do serwera"
@@ -5770,10 +5782,6 @@
     "id": "store.sql.closing.info",
     "translation": "Zamykanie SqlStore"
   },
-  {
-    "id": "store.sql.column_exists.critical",
-    "translation": "Nie udało się sprawdzić czy kolumna istnieje %v"
-  },
   {
     "id": "store.sql.column_exists_missing_driver.critical",
     "translation": "Nie udało się sprawdzić czy kolumna istnieje gdyż brakuje sterownika"
@@ -5862,10 +5870,6 @@
     "id": "store.sql.table_column_type.critical",
     "translation": "Nie udało się pobrać typu danych dla kolumny %s z tabeli %s: %v"
   },
-  {
-    "id": "store.sql.table_exists.critical",
-    "translation": "Nie udało się sprawdzić czy tabela istnieje %v"
-  },
   {
     "id": "store.sql.too_short_ciphertext",
     "translation": "szyfrogram zbyt krótki"
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index d50f0b6cc..64b63b80f 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -2434,6 +2434,10 @@
     "id": "api.team.permanent_delete_team.deleted.warn",
     "translation": "Equipe permanentemente deletada %v id=%v"
   },
+  {
+    "id": "api.team.remove_team_icon.get_team.app_error",
+    "translation": "An error occurred getting the team"
+  },
   {
     "id": "api.team.remove_user_from_team.missing.app_error",
     "translation": "O usuário não parece ser parte desta equipe."
@@ -2490,6 +2494,10 @@
     "id": "api.team.signup_team.email_disabled.app_error",
     "translation": "Inscrição com e-mail na equipe está desativado."
   },
+  {
+    "id": "api.team.team_icon.update.app_error",
+    "translation": "An error occurred updating the team icon"
+  },
   {
     "id": "api.team.update_member_roles.not_a_member",
     "translation": "Usuário especificado não é um membro da equipe especificada."
@@ -4690,6 +4698,10 @@
     "id": "model.channel_member_history.is_valid.user_id.app_error",
     "translation": "Id do usuário inválido"
   },
+  {
+    "id": "model.client.command.parse.app_error",
+    "translation": "Não é possível processar os dados de entrada"
+  },
   {
     "id": "model.client.connecting.app_error",
     "translation": "Encontramos um erro enquanto conectava ao servidor"
@@ -5770,10 +5782,6 @@
     "id": "store.sql.closing.info",
     "translation": "Fechando SqlStore"
   },
-  {
-    "id": "store.sql.column_exists.critical",
-    "translation": "Falha ao verificar se a coluna existe %v"
-  },
   {
     "id": "store.sql.column_exists_missing_driver.critical",
     "translation": "Falha ao verificar se a couna existe devido a falta do driver"
@@ -5862,10 +5870,6 @@
     "id": "store.sql.table_column_type.critical",
     "translation": "Falha ao obter o tipo de dado da coluna %s para a tabela %s: %v"
   },
-  {
-    "id": "store.sql.table_exists.critical",
-    "translation": "Falha ao verificar se a tabela existe %v"
-  },
   {
     "id": "store.sql.too_short_ciphertext",
     "translation": "ciphertext muito curto"
diff --git a/i18n/ru.json b/i18n/ru.json
index 5dbb414b8..b75ca719a 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -2434,6 +2434,10 @@
     "id": "api.team.permanent_delete_team.deleted.warn",
     "translation": "Команда %v id=%v безвозвратно удалена"
   },
+  {
+    "id": "api.team.remove_team_icon.get_team.app_error",
+    "translation": "An error occurred getting the team"
+  },
   {
     "id": "api.team.remove_user_from_team.missing.app_error",
     "translation": "Пользователь неактивен для участия в этой команде."
@@ -2490,6 +2494,10 @@
     "id": "api.team.signup_team.email_disabled.app_error",
     "translation": "Вход в команду с электронной почтой отключен."
   },
+  {
+    "id": "api.team.team_icon.update.app_error",
+    "translation": "An error occurred updating the team icon"
+  },
   {
     "id": "api.team.update_member_roles.not_a_member",
     "translation": "Указанный пользователь не является участником указанной группы."
@@ -4690,6 +4698,10 @@
     "id": "model.channel_member_history.is_valid.user_id.app_error",
     "translation": "Недопустимый идентификатор пользователя"
   },
+  {
+    "id": "model.client.command.parse.app_error",
+    "translation": "Невозможно разобрать входящие данные"
+  },
   {
     "id": "model.client.connecting.app_error",
     "translation": "Мы обнаружили ошибку при подключении к серверу"
@@ -5770,10 +5782,6 @@
     "id": "store.sql.closing.info",
     "translation": "Закрытие SqlStore"
   },
-  {
-    "id": "store.sql.column_exists.critical",
-    "translation": "Не удалось проверить, существует ли колонка %v"
-  },
   {
     "id": "store.sql.column_exists_missing_driver.critical",
     "translation": "Не удалось проверить существование колонки по причине отсутствующего драйвера"
@@ -5862,10 +5870,6 @@
     "id": "store.sql.table_column_type.critical",
     "translation": "Не удалось получить тип данных колонки %s из таблицы %s: %v"
   },
-  {
-    "id": "store.sql.table_exists.critical",
-    "translation": "Не удалось проверить, существует ли таблица %v"
-  },
   {
     "id": "store.sql.too_short_ciphertext",
     "translation": "шифротекст слишком короток"
diff --git a/i18n/tr.json b/i18n/tr.json
index a15c4131a..39287f339 100644
--- a/i18n/tr.json
+++ b/i18n/tr.json
@@ -2434,6 +2434,10 @@
     "id": "api.team.permanent_delete_team.deleted.warn",
     "translation": "%v takımı kalıcı olarak silindi. Kod: %v"
   },
+  {
+    "id": "api.team.remove_team_icon.get_team.app_error",
+    "translation": "An error occurred getting the team"
+  },
   {
     "id": "api.team.remove_user_from_team.missing.app_error",
     "translation": "Kullanıcı bu takımın bir üyesi gibi görünmüyor."
@@ -2490,6 +2494,10 @@
     "id": "api.team.signup_team.email_disabled.app_error",
     "translation": "E-posta ile takım hesabı açma özelliği devre dışı bırakılmış."
   },
+  {
+    "id": "api.team.team_icon.update.app_error",
+    "translation": "An error occurred updating the team icon"
+  },
   {
     "id": "api.team.update_member_roles.not_a_member",
     "translation": "Belirtilen kullanıcı belirtilen takımın üyesi değil."
@@ -4690,6 +4698,10 @@
     "id": "model.channel_member_history.is_valid.user_id.app_error",
     "translation": "Kullanıcı kodu geçersiz"
   },
+  {
+    "id": "model.client.command.parse.app_error",
+    "translation": "Gelen veriler işlenemedi"
+  },
   {
     "id": "model.client.connecting.app_error",
     "translation": "Sunucuya bağlanılırken bir sorun çıktı"
@@ -5770,10 +5782,6 @@
     "id": "store.sql.closing.info",
     "translation": "SqlStore kapatılıyor"
   },
-  {
-    "id": "store.sql.column_exists.critical",
-    "translation": "%v sütununun var olup olmadığı denetlenemedi"
-  },
   {
     "id": "store.sql.column_exists_missing_driver.critical",
     "translation": "Sütunun var olup olmadığı eksik sürücü nedeniyle denetlenemedi"
@@ -5862,10 +5870,6 @@
     "id": "store.sql.table_column_type.critical",
     "translation": "%s sütunu %s tablosu için veri türü alınamadı: %v"
   },
-  {
-    "id": "store.sql.table_exists.critical",
-    "translation": "%v tablosunun var olup olmadığı denetlenemedi"
-  },
   {
     "id": "store.sql.too_short_ciphertext",
     "translation": "şifreleme metni çok kısa"
diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json
index 5d017b81b..dc0042cbf 100644
--- a/i18n/zh-CN.json
+++ b/i18n/zh-CN.json
@@ -217,11 +217,11 @@
   },
   {
     "id": "api.channel.convert_channel_to_private.default_channel_error",
-    "translation": "This default channel cannot be converted into a private channel."
+    "translation": "默认频道无法转换成私有频道。"
   },
   {
     "id": "api.channel.convert_channel_to_private.private_channel_error",
-    "translation": "The channel requested to convert is already a private channel."
+    "translation": "请求转换的频道已经是私有频道。"
   },
   {
     "id": "api.channel.create_channel.direct_channel.app_error",
@@ -2434,6 +2434,10 @@
     "id": "api.team.permanent_delete_team.deleted.warn",
     "translation": "永久删除团队 %v id=%v"
   },
+  {
+    "id": "api.team.remove_team_icon.get_team.app_error",
+    "translation": "An error occurred getting the team"
+  },
   {
     "id": "api.team.remove_user_from_team.missing.app_error",
     "translation": "此用户似乎不属于此团队。"
@@ -2490,6 +2494,10 @@
     "id": "api.team.signup_team.email_disabled.app_error",
     "translation": "使用电子邮件注册团队被禁用。"
   },
+  {
+    "id": "api.team.team_icon.update.app_error",
+    "translation": "An error occurred updating the team icon"
+  },
   {
     "id": "api.team.update_member_roles.not_a_member",
     "translation": "指定的用户不属于指定的团队。"
@@ -4690,6 +4698,10 @@
     "id": "model.channel_member_history.is_valid.user_id.app_error",
     "translation": "无效用户 id"
   },
+  {
+    "id": "model.client.command.parse.app_error",
+    "translation": "无法解析传入数据"
+  },
   {
     "id": "model.client.connecting.app_error",
     "translation": "在连接到服务器时，我们遇到了一个错误"
@@ -5770,10 +5782,6 @@
     "id": "store.sql.closing.info",
     "translation": "关闭 SqlStore"
   },
-  {
-    "id": "store.sql.column_exists.critical",
-    "translation": "未能检查列是否存在 %v"
-  },
   {
     "id": "store.sql.column_exists_missing_driver.critical",
     "translation": "未能检查因为缺少驱动程序列是否存在"
@@ -5862,10 +5870,6 @@
     "id": "store.sql.table_column_type.critical",
     "translation": "未能获得列的数据类型 %s 从表 %s: %v"
   },
-  {
-    "id": "store.sql.table_exists.critical",
-    "translation": "未能检查表是否存在 %v"
-  },
   {
     "id": "store.sql.too_short_ciphertext",
     "translation": "密文太短"
diff --git a/i18n/zh-TW.json b/i18n/zh-TW.json
index c9734fe48..8b32404a1 100644
--- a/i18n/zh-TW.json
+++ b/i18n/zh-TW.json
@@ -2434,6 +2434,10 @@
     "id": "api.team.permanent_delete_team.deleted.warn",
     "translation": "已永久刪除團隊 %v id=%v"
   },
+  {
+    "id": "api.team.remove_team_icon.get_team.app_error",
+    "translation": "An error occurred getting the team"
+  },
   {
     "id": "api.team.remove_user_from_team.missing.app_error",
     "translation": "此使用者似乎不屬於此團隊。"
@@ -2490,6 +2494,10 @@
     "id": "api.team.signup_team.email_disabled.app_error",
     "translation": "使用電子郵件註冊團隊已被停用。"
   },
+  {
+    "id": "api.team.team_icon.update.app_error",
+    "translation": "An error occurred updating the team icon"
+  },
   {
     "id": "api.team.update_member_roles.not_a_member",
     "translation": "指定的使用者不是指定團隊的成員。"
@@ -4690,6 +4698,10 @@
     "id": "model.channel_member_history.is_valid.user_id.app_error",
     "translation": "無效的使用者 ID"
   },
+  {
+    "id": "model.client.command.parse.app_error",
+    "translation": "無法解析流入的資料"
+  },
   {
     "id": "model.client.connecting.app_error",
     "translation": "連接伺服器時遇到錯誤"
@@ -5770,10 +5782,6 @@
     "id": "store.sql.closing.info",
     "translation": "正在關閉 SqlStore"
   },
-  {
-    "id": "store.sql.column_exists.critical",
-    "translation": "檢查欄位是否存在失敗 %v"
-  },
   {
     "id": "store.sql.column_exists_missing_driver.critical",
     "translation": "因為找不到驅動，檢查欄位是否存在失敗"
@@ -5862,10 +5870,6 @@
     "id": "store.sql.table_column_type.critical",
     "translation": "取得資料類型失敗，欄位 %s 資料表 %s : %v"
   },
-  {
-    "id": "store.sql.table_exists.critical",
-    "translation": "檢查資料表是否存在失敗 %v"
-  },
   {
     "id": "store.sql.too_short_ciphertext",
     "translation": "密文太短"
-- 
cgit v1.2.3-1-g7c22


From 1e6553704d372f82e937094721d3b83ccb3fa6de Mon Sep 17 00:00:00 2001
From: Jesse Hallam <jesse.hallam@gmail.com>
Date: Tue, 1 May 2018 10:34:12 -0400
Subject: MM-8622: improved plugin error handling (#8692)

* don't report an error on plugin activation if already active

* improved plugin logging events

Log an error when a plugin's ServeHTTP fails, or when it unexpectedly
terminates.

Restart a plugin at most three times, allowing its failure to later
bubble up under the "failed to stay running" status.

* clarified plugin activation/deactivation

Avoid repeatedly activating when any configuration bit changes. Improved
logging.

* constrain plugin ids to ^[a-zA-Z0-9-_\.]+$ and enforce minimum length

Previously, the plugin id was used unsanitized to relocate the plugin
bundle, which allowed writing outside the `plugins/` directory by using
an `id` containing `../`.

Similarly, an empty string was accepted as an id and led to unexpected
error messages.

* remove plugins by manifest path, not id

If the id within the manifest ever diverges from the actual plugin
location, it becomes impossible to remove via the API. Instead, if the
plugin is found by id, remove the path containing the manifest.

* ignore plugins with nil manifests

If a plugin was detected, but had a manifest that couldn't be parsed, it
will be left nil but still be listed among the packages. Skip over these
in most cases to avoid segfaults.

* leverage mlog more effectively for plugins

* build issues
---
 i18n/en.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'i18n')

diff --git a/i18n/en.json b/i18n/en.json
index 0afaa326c..d4a08b07a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3812,7 +3812,7 @@
   },
   {
     "id": "app.plugin.activate.app_error",
-    "translation": "Unable to activate extracted plugin. Plugin may already exist and be activated."
+    "translation": "Unable to activate extracted plugin."
   },
   {
     "id": "app.plugin.cluster.save_config.app_error",
@@ -3847,8 +3847,8 @@
     "translation": "Unable to get active plugins"
   },
   {
-    "id": "app.plugin.id_length.app_error",
-    "translation": "Plugin Id must be less than {{.Max}} characters."
+    "id": "app.plugin.invalid_id.app_error",
+    "translation": "Plugin Id must be at least {{.Min}} characters, at most {{.Max}} characters and match {{.Regex}}."
   },
   {
     "id": "app.plugin.install.app_error",
-- 
cgit v1.2.3-1-g7c22