translations PR 20161101 (#4406)

10 files changed, 50 insertions, 50 deletions

diff --git a/i18n/de.json b/i18n/de.json
index 9a8091546..a3cb2494a 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -1223,7 +1223,7 @@
   },
   {
     "id": "api.post.create_post.attach_files.error",
-    "translation": "Fehler beim anfügen der Dateien zu Nachricht, post_id=%s, file_ids=%v, err=%v"
+    "translation": "Fehler beim Anfügen der Dateien zu Nachricht, post_id=%s, user_id=%s, file_ids=%v, err=%v"
   },
   {
     "id": "api.post.create_post.bad_filename.error",
@@ -1532,8 +1532,8 @@
     "translation": "{{.DisplayName}} konnte nicht importiert werden\r\n"
   },
   {
-    "id": "api.slackimport.slack_add_channels.import_failed.debug",
-    "translation": "Konnte nicht importieren: %s"
+    "id": "api.slackimport.slack_add_channels.import_failed.warn",
+    "translation": "Slack Importer: Failed to import channel: %s"
   },
   {
     "id": "api.slackimport.slack_add_channels.merge",
@@ -1541,7 +1541,7 @@
   },
   {
     "id": "api.slackimport.slack_add_posts.attach_files.error",
-    "translation": "Fehler beim anfügen der Dateien zu Nachricht, post_id=%s, file_ids=%v, err=%v"
+    "translation": "Fehler beim Anfügen der Dateien zu Nachricht, post_id=%s, file_ids=%v, err=%v"
   },
   {
     "id": "api.slackimport.slack_add_posts.bot.warn",
@@ -3629,7 +3629,7 @@
   },
   {
     "id": "model.team.is_valid.characters.app_error",
-    "translation": "Name muss aus 4 oder mehr Kleinbuchstaben bestehen"
+    "translation": "Name muss 2 oder mehr Kleinbuchstaben haben"
   },
   {
     "id": "model.team.is_valid.company.app_error",
diff --git a/i18n/es.json b/i18n/es.json
index fc19b24ba..dfc00198e 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -1532,8 +1532,8 @@
     "translation": "Falla al importar: {{.DisplayName}}\r\n"
   },
   {
-    "id": "api.slackimport.slack_add_channels.import_failed.debug",
-    "translation": "Falla al importar: %s"
+    "id": "api.slackimport.slack_add_channels.import_failed.warn",
+    "translation": "Importador de Slack: no se pudo importar el canal: %s"
   },
   {
     "id": "api.slackimport.slack_add_channels.merge",
@@ -3629,7 +3629,7 @@
   },
   {
     "id": "model.team.is_valid.characters.app_error",
-    "translation": "Nombre tiene que ser de 4 o más caracteres alfanuméricos en minúsculas"
+    "translation": "Nombre debe tener 2 o más caracteres alfanuméricos en minúscula"
   },
   {
     "id": "model.team.is_valid.company.app_error",
diff --git a/i18n/fr.json b/i18n/fr.json
index d4c141aee..9c0b99f7f 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -1532,8 +1532,8 @@
     "translation": "Échec de l'import : {{.DisplayName}}\r\n"
   },
   {
-    "id": "api.slackimport.slack_add_channels.import_failed.debug",
-    "translation": "Échec de l'import : %s"
+    "id": "api.slackimport.slack_add_channels.import_failed.warn",
+    "translation": "Slack Importer: Failed to import channel: %s"
   },
   {
     "id": "api.slackimport.slack_add_channels.merge",
@@ -3629,7 +3629,7 @@
   },
   {
     "id": "model.team.is_valid.characters.app_error",
-    "translation": "Le nom doit posséder au moins 4 caractères alphanumériques minuscules"
+    "translation": "Le nom doit être composé d'au moins 2 caractères alphanumériques en minuscules."
   },
   {
     "id": "model.team.is_valid.company.app_error",
diff --git a/i18n/ja.json b/i18n/ja.json
index fdd6d4e87..6a2868f2c 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -205,7 +205,7 @@
   },
   {
     "id": "api.channel.create_channel.max_channel_limit.app_error",
-    "translation": "Cannot create more than {{.MaxChannelsPerTeam}} channels for current team"
+    "translation": "現在のチームには、{{.MaxChannelsPerTeam}}チャンネル以上作成できません"
   },
   {
     "id": "api.channel.create_default_channels.off_topic",
@@ -1532,8 +1532,8 @@
     "translation": "インポートできませんでした: {{.DisplayName}}\r\n"
   },
   {
-    "id": "api.slackimport.slack_add_channels.import_failed.debug",
-    "translation": "インポートできませんでした: %s"
+    "id": "api.slackimport.slack_add_channels.import_failed.warn",
+    "translation": "Slack Importer: Failed to import channel: %s"
   },
   {
     "id": "api.slackimport.slack_add_channels.merge",
@@ -2409,11 +2409,11 @@
   },
   {
     "id": "api.web_hub.start.starting.debug",
-    "translation": "Starting %v websocket hubs"
+    "translation": "%v ウェブソケットハブを開始しています"
   },
   {
     "id": "api.web_hub.start.stopping.debug",
-    "translation": "stopping websocket hub connections"
+    "translation": "ウェブソケットハブの接続が停止しています"
   },
   {
     "id": "api.web_socket.connect.error",
@@ -3269,7 +3269,7 @@
   },
   {
     "id": "model.config.is_valid.max_channels.app_error",
-    "translation": "チーム設定のチーム毎の最大ユーザー数が不正です。正の数を指定してください。"
+    "translation": "チーム設定のチーム毎の最大チャンネル数が不正です。正の数を指定してください。"
   },
   {
     "id": "model.config.is_valid.max_file_size.app_error",
@@ -3629,7 +3629,7 @@
   },
   {
     "id": "model.team.is_valid.characters.app_error",
-    "translation": "名前は4文字以上の小文字の英数字にしてください"
+    "translation": "名前は2文字以上の小文字の英数字にしてください"
   },
   {
     "id": "model.team.is_valid.company.app_error",
@@ -4645,15 +4645,15 @@
   },
   {
     "id": "store.sql_team.get_member_count.app_error",
-    "translation": "チャンネルのメンバーが取得できませんでした"
+    "translation": "チームのメンバーを数えることができませんでした"
   },
   {
     "id": "store.sql_team.get_members.app_error",
-    "translation": "チャンネルのメンバーが取得できませんでした"
+    "translation": "チームのメンバーが取得できませんでした"
   },
   {
     "id": "store.sql_team.get_members_by_ids.app_error",
-    "translation": "チャンネルのメンバーが取得できませんでした"
+    "translation": "チームのメンバーが取得できませんでした"
   },
   {
     "id": "store.sql_team.get_teams_for_email.app_error",
@@ -4745,7 +4745,7 @@
   },
   {
     "id": "store.sql_user.get_recently_active_users.app_error",
-    "translation": "We encountered an error while finding the recently active users"
+    "translation": "最近のアクティブユーザーを探す際にエラーが発生しました"
   },
   {
     "id": "store.sql_user.get_sysadmin_profiles.app_error",
diff --git a/i18n/ko.json b/i18n/ko.json
index 8213d4fbe..939bb7ba2 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -1473,7 +1473,7 @@
   },
   {
     "id": "api.saml.save_certificate.app_error",
-    "translation": "Certificate did not save properly."
+    "translation": "증명서가 정상적으로 저장되지 않았습니다."
   },
   {
     "id": "api.server.new_server.init.info",
@@ -1532,8 +1532,8 @@
     "translation": "추가 시 오류가 발생함: {{.DisplayName}}\r\n"
   },
   {
-    "id": "api.slackimport.slack_add_channels.import_failed.debug",
-    "translation": "가져오기 실패: %s"
+    "id": "api.slackimport.slack_add_channels.import_failed.warn",
+    "translation": "Slack Importer: Failed to import channel: %s"
   },
   {
     "id": "api.slackimport.slack_add_channels.merge",
@@ -1965,7 +1965,7 @@
   },
   {
     "id": "api.templates.username_change_subject",
-    "translation": "사용자명이 {{.TeamDisplayName}}(으)로 변경되었습니다."
+    "translation": "{{.TeamDisplayName}}에서 사용자명이 변경되었습니다."
   },
   {
     "id": "api.templates.verify_body.button",
@@ -3629,7 +3629,7 @@
   },
   {
     "id": "model.team.is_valid.characters.app_error",
-    "translation": "이름은 반드시 4글자 이상 영소문자 또는 숫자여야 합니다."
+    "translation": "이름은 반드시 2글자 이상의 영문 또는 숫자여야 합니다."
   },
   {
     "id": "model.team.is_valid.company.app_error",
diff --git a/i18n/nl.json b/i18n/nl.json
index f269c72b2..d70200e8b 100644
--- a/i18n/nl.json
+++ b/i18n/nl.json
@@ -1532,8 +1532,8 @@
     "translation": "Import is mislukt: {{.DisplayName}}\r\n"
   },
   {
-    "id": "api.slackimport.slack_add_channels.import_failed.debug",
-    "translation": "Importeren is mislukt: %s"
+    "id": "api.slackimport.slack_add_channels.import_failed.warn",
+    "translation": "Slack Importer: Failed to import channel: %s"
   },
   {
     "id": "api.slackimport.slack_add_channels.merge",
@@ -3629,7 +3629,7 @@
   },
   {
     "id": "model.team.is_valid.characters.app_error",
-    "translation": "Naam moet 4 of meer kleine letters bevatten"
+    "translation": "Naam oet 2 of meer kleine letters bevatten"
   },
   {
     "id": "model.team.is_valid.company.app_error",
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index c6b02376d..568e2f2cb 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -205,7 +205,7 @@
   },
   {
     "id": "api.channel.create_channel.max_channel_limit.app_error",
-    "translation": "Cannot create more than {{.MaxChannelsPerTeam}} channels for current team"
+    "translation": "Não é possível criar mais de {{.MaxChannelsPerTeam}} canais para a equipe atual"
   },
   {
     "id": "api.channel.create_default_channels.off_topic",
@@ -1532,8 +1532,8 @@
     "translation": "Falha ao importar: {{.DisplayName}}\r\n"
   },
   {
-    "id": "api.slackimport.slack_add_channels.import_failed.debug",
-    "translation": "Falha ao importar: %s"
+    "id": "api.slackimport.slack_add_channels.import_failed.warn",
+    "translation": "Slack Importer: Failed to import channel: %s"
   },
   {
     "id": "api.slackimport.slack_add_channels.merge",
@@ -3269,7 +3269,7 @@
   },
   {
     "id": "model.config.is_valid.max_channels.app_error",
-    "translation": "Inválido máximo de usuários por equipe em configurações de equipe.  Deve ser um número positivo."
+    "translation": "Inválido máximo de canais por equipe em configurações de equipe.  Deve ser um número positivo."
   },
   {
     "id": "model.config.is_valid.max_file_size.app_error",
@@ -3629,7 +3629,7 @@
   },
   {
     "id": "model.team.is_valid.characters.app_error",
-    "translation": "Nome deve ter 4 ou mais caracteres alfanuméricos em minúsculas"
+    "translation": "Nome deve ter 2 ou mais caracteres alfanuméricos em minúsculas"
   },
   {
     "id": "model.team.is_valid.company.app_error",
@@ -4645,7 +4645,7 @@
   },
   {
     "id": "store.sql_team.get_member_count.app_error",
-    "translation": "Não foi possível obter os membros da equipe"
+    "translation": "Não foi possível obter os número de membros da equipe"
   },
   {
     "id": "store.sql_team.get_members.app_error",
diff --git a/i18n/ru.json b/i18n/ru.json
index d0edb2ff0..092e51f01 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -1532,8 +1532,8 @@
     "translation": "Не удалось импортировать: {{.DisplayName}}\r\n"
   },
   {
-    "id": "api.slackimport.slack_add_channels.import_failed.debug",
-    "translation": "Не удалось импортировать: %s"
+    "id": "api.slackimport.slack_add_channels.import_failed.warn",
+    "translation": "Slack Importer: Failed to import channel: %s"
   },
   {
     "id": "api.slackimport.slack_add_channels.merge",
@@ -3629,7 +3629,7 @@
   },
   {
     "id": "model.team.is_valid.characters.app_error",
-    "translation": "Имя должно состоять из 4 или более строчных букв и цифр."
+    "translation": "Имя должно состоять из 2 или более строчных букв и цифр"
   },
   {
     "id": "model.team.is_valid.company.app_error",
diff --git a/i18n/zh_CN.json b/i18n/zh_CN.json
index 3f549d975..0f6bc3370 100644
--- a/i18n/zh_CN.json
+++ b/i18n/zh_CN.json
@@ -1532,8 +1532,8 @@
     "translation": "导入失败: {{.DisplayName}}\r\n"
   },
   {
-    "id": "api.slackimport.slack_add_channels.import_failed.debug",
-    "translation": "导入失败: %s"
+    "id": "api.slackimport.slack_add_channels.import_failed.warn",
+    "translation": "Slack Importer: Failed to import channel: %s"
   },
   {
     "id": "api.slackimport.slack_add_channels.merge",
@@ -3629,7 +3629,7 @@
   },
   {
     "id": "model.team.is_valid.characters.app_error",
-    "translation": "名称必须是4个及以上的小写字母"
+    "translation": "名称必须是2个或以上的小写字母"
   },
   {
     "id": "model.team.is_valid.company.app_error",
diff --git a/i18n/zh_TW.json b/i18n/zh_TW.json
index 0ba4ca8f6..97efb1ae8 100644
--- a/i18n/zh_TW.json
+++ b/i18n/zh_TW.json
@@ -205,7 +205,7 @@
   },
   {
     "id": "api.channel.create_channel.max_channel_limit.app_error",
-    "translation": "Cannot create more than {{.MaxChannelsPerTeam}} channels for current team"
+    "translation": "無法為當前團隊建立超過 {{.MaxChannelsPerTeam}} 個頻道"
   },
   {
     "id": "api.channel.create_default_channels.off_topic",
@@ -1532,8 +1532,8 @@
     "translation": "匯入失敗：{{.DisplayName}}\r\n"
   },
   {
-    "id": "api.slackimport.slack_add_channels.import_failed.debug",
-    "translation": "匯入失敗：%s"
+    "id": "api.slackimport.slack_add_channels.import_failed.warn",
+    "translation": "Slack Importer: Failed to import channel: %s"
   },
   {
     "id": "api.slackimport.slack_add_channels.merge",
@@ -2409,11 +2409,11 @@
   },
   {
     "id": "api.web_hub.start.starting.debug",
-    "translation": "Starting %v websocket hubs"
+    "translation": "啟動 %v Websocket 中樞"
   },
   {
     "id": "api.web_hub.start.stopping.debug",
-    "translation": "stopping websocket hub connections"
+    "translation": "停止 Websocket 中樞連線"
   },
   {
     "id": "api.web_socket.connect.error",
@@ -3269,7 +3269,7 @@
   },
   {
     "id": "model.config.is_valid.max_channels.app_error",
-    "translation": "團隊設定中的單一團隊最高使用者數無效。必須為正數。"
+    "translation": "團隊設定中的單一團隊最高使頻道數無效。必須為正數。"
   },
   {
     "id": "model.config.is_valid.max_file_size.app_error",
@@ -3629,7 +3629,7 @@
   },
   {
     "id": "model.team.is_valid.characters.app_error",
-    "translation": "名稱必須是4個以上的小寫英數字元"
+    "translation": "名稱必須是2個以上的小寫英數字元"
   },
   {
     "id": "model.team.is_valid.company.app_error",
@@ -4745,7 +4745,7 @@
   },
   {
     "id": "store.sql_user.get_recently_active_users.app_error",
-    "translation": "We encountered an error while finding the recently active users"
+    "translation": "在尋找近期活躍使用者時遭遇錯誤"
   },
   {
     "id": "store.sql_user.get_sysadmin_profiles.app_error",