daily translations 20160615 (#3348)

6 files changed, 87 insertions, 47 deletions

diff --git a/i18n/de.json b/i18n/de.json
index c18908f83..f1ecd1464 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -200,6 +200,10 @@
     "translation": "Sie haben nicht die erforderichen Zugriffsrechte"
   },
   {
+    "id": "api.channel.get_channel.wrong_team.app_error",
+    "translation": "There is no channel with channel_id={{.ChannelId}} on team with team_id={{.TeamId}}"
+  },
+  {
     "id": "api.channel.get_channel_counts.app_error",
     "translation": "Die Anzahl der Channels konnte aus der Datenbank nicht ermittelt werden"
   },
@@ -573,15 +577,15 @@
   },
   {
     "id": "api.emoji.create.duplicate.app_error",
-    "translation": "Unable to create emoji. Another emoji with the same name already exists."
+    "translation": "Das Emoji kann nicht erstellt werden. Ein anderes Emoji mit dem selben Namen existiert bereits."
   },
   {
     "id": "api.emoji.create.parse.app_error",
-    "translation": "Unable to create emoji. Image exceeds maximum file size."
+    "translation": "Das Emoji kann nicht erstellt werden. Das Bild überschreitet die zulässige maximale Dateigröße."
   },
   {
     "id": "api.emoji.create.permissions.app_error",
-    "translation": "Die Berechtigungen für den Lösch-Befehl sind ungeeignet"
+    "translation": "Keine passenden Berechtigungen um das Emoji zu erstellen."
   },
   {
     "id": "api.emoji.create.too_large.app_error",
@@ -589,7 +593,7 @@
   },
   {
     "id": "api.emoji.delete.permissions.app_error",
-    "translation": "Die Berechtigungen für den Lösch-Befehl sind ungeeignet"
+    "translation": "Keine passenden Berechtigungen um das Emoji zu löschen."
   },
   {
     "id": "api.emoji.disabled.app_error",
@@ -597,11 +601,11 @@
   },
   {
     "id": "api.emoji.get_image.decode.app_error",
-    "translation": "Unable to decode image file for emoji."
+    "translation": "Die Bilddatei für das Emoji kann nicht dekodiert werden."
   },
   {
     "id": "api.emoji.get_image.read.app_error",
-    "translation": "Unable to read image file for emoji."
+    "translation": "Die Bilddatei für das Emoji kann nicht gelesen werden."
   },
   {
     "id": "api.emoji.init.debug",
@@ -613,11 +617,11 @@
   },
   {
     "id": "api.emoji.upload.image.app_error",
-    "translation": "Unable to create emoji. File must be a PNG, JPEG, or GIF."
+    "translation": "Das Emoji kann nicht erstellt werden. Die Datei muss vom Typ PNG, JPEG oder GIF sein."
   },
   {
     "id": "api.emoji.upload.large_image.app_error",
-    "translation": "Unable to create emoji. Image exceeds maximum dimensions."
+    "translation": "Das Emoji kann nicht erstellt werden. Das Bild überschreitet die maximalen Maße."
   },
   {
     "id": "api.export.json.app_error",
@@ -1609,7 +1613,7 @@
   },
   {
     "id": "api.user.create_oauth_user.already_attached.app_error",
-    "translation": "There is already an account associated with that email address using a sign in method other than {{.Service}}. Please sign in using {{.Auth}}."
+    "translation": "Mit dieser E-Mail-Adresse ist bereits ein Account verknüpft, der nicht die Anmeldemethode {{.Service}} verwendet. Bitte verwenden Sie {{.Auth}} zum anmelden."
   },
   {
     "id": "api.user.create_oauth_user.already_used.app_error",
@@ -2369,11 +2373,11 @@
   },
   {
     "id": "model.client.create_emoji.emoji.app_error",
-    "translation": "Unable to attach emoji data to request"
+    "translation": "Das Bild kann der Anfrage nicht beigefügt werden "
   },
   {
     "id": "model.client.create_emoji.image.app_error",
-    "translation": "Unable to attach image to request"
+    "translation": "Das Bild kann der Anfrage nicht beigefügt werden "
   },
   {
     "id": "model.client.create_emoji.writer.app_error",
@@ -2565,11 +2569,11 @@
   },
   {
     "id": "model.emoji.id.app_error",
-    "translation": "Ungültige root ID"
+    "translation": "Ungültige Emoji ID"
   },
   {
     "id": "model.emoji.name.app_error",
-    "translation": "Name muss 2 oder mehr Kleinbuchstaben haben"
+    "translation": "Der Name darf aus 1 bis 64 Kleinbuchstaben bestehen"
   },
   {
     "id": "model.emoji.update_at.app_error",
@@ -3273,27 +3277,27 @@
   },
   {
     "id": "store.sql_emoji.delete.app_error",
-    "translation": "Wir konnten die Nachricht nicht löschen"
+    "translation": "Wir konnten das Emoji nicht löschen"
   },
   {
     "id": "store.sql_emoji.delete.no_results",
-    "translation": "We couldn’t find the emoji to delete"
+    "translation": "Wir konnten das zu löschende Emoji nicht finden"
   },
   {
     "id": "store.sql_emoji.get.app_error",
-    "translation": "Wir konnten die Nachricht nicht finden"
+    "translation": "Wir konnten das Emoji nicht abrufen"
   },
   {
     "id": "store.sql_emoji.get_all.app_error",
-    "translation": "Wir konnten die Nachricht nicht finden"
+    "translation": "Wir konnten das Emoji nicht abrufen"
   },
   {
     "id": "store.sql_emoji.get_by_name.app_error",
-    "translation": "Wir konnten die Nachricht nicht finden"
+    "translation": "Wir konnten das Emoji nicht abrufen"
   },
   {
     "id": "store.sql_emoji.save.app_error",
-    "translation": "Wir konnten die Nachricht nicht speichern"
+    "translation": "Wir konnten das Emoji nicht speichern "
   },
   {
     "id": "store.sql_license.get.app_error",
@@ -3816,6 +3820,10 @@
     "translation": "Wir konnten die Authentifikationsdaten nicht aktualisieren"
   },
   {
+    "id": "store.sql_user.update_auth_data.email_exists.app_error",
+    "translation": "Unable to switch account to {{.Service}}. An account using the email {{.Email}} already exists."
+  },
+  {
     "id": "store.sql_user.update_failed_pwd_attempts.app_error",
     "translation": "Es konnte failed_attempts nicht aktualisiert werden"
   },
diff --git a/i18n/en.json b/i18n/en.json
index 62cf3a38b..792e12969 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3816,14 +3816,14 @@
     "translation": "This username is already taken. Please choose another."
   },
   {
-    "id": "store.sql_user.update_auth_data.email_exists.app_error",
-    "translation": "Unable to switch account to {{.Service}}. An account using the email {{.Email}} already exists."
-  },
-  {
     "id": "store.sql_user.update_auth_data.app_error",
     "translation": "We couldn't update the auth data"
   },
   {
+    "id": "store.sql_user.update_auth_data.email_exists.app_error",
+    "translation": "Unable to switch account to {{.Service}}. An account using the email {{.Email}} already exists."
+  },
+  {
     "id": "store.sql_user.update_failed_pwd_attempts.app_error",
     "translation": "We couldn't update the failed_attempts"
   },
diff --git a/i18n/es.json b/i18n/es.json
index a3df51c6f..247119839 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -200,6 +200,10 @@
     "translation": "No tienes los permisos apropiados"
   },
   {
+    "id": "api.channel.get_channel.wrong_team.app_error",
+    "translation": "No hay ningún canal con channel_id={{.ChannelId}} en el equipo con team_id={{.TeamId}}"
+  },
+  {
     "id": "api.channel.get_channel_counts.app_error",
     "translation": "No se puede obtener el contador del canal desde la base de datos"
   },
@@ -3816,6 +3820,10 @@
     "translation": "No pudimos actualizar la data de autorización"
   },
   {
+    "id": "store.sql_user.update_auth_data.email_exists.app_error",
+    "translation": "No se puede cambiar la cuenta a {{.Servicio}}. Ya existe una cuenta con el correo electrónico {{.Email}}."
+  },
+  {
     "id": "store.sql_user.update_failed_pwd_attempts.app_error",
     "translation": "No pudimos actualizar el campo failed_attempts"
   },
diff --git a/i18n/fr.json b/i18n/fr.json
index 0cae56cd1..a4f71c8bd 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -200,6 +200,10 @@
     "translation": "Vous n'avez pas les permissions nécessaires"
   },
   {
+    "id": "api.channel.get_channel.wrong_team.app_error",
+    "translation": "There is no channel with channel_id={{.ChannelId}} on team with team_id={{.TeamId}}"
+  },
+  {
     "id": "api.channel.get_channel_counts.app_error",
     "translation": "Impossible d'obtenir le nombre de canaux depuis la base de données"
   },
@@ -3816,6 +3820,10 @@
     "translation": "Nous n'avons pas pu mettre à jour les données d'authentification"
   },
   {
+    "id": "store.sql_user.update_auth_data.email_exists.app_error",
+    "translation": "Unable to switch account to {{.Service}}. An account using the email {{.Email}} already exists."
+  },
+  {
     "id": "store.sql_user.update_failed_pwd_attempts.app_error",
     "translation": "Nous n'avons pas pu mettre à jour failed_attempts"
   },
diff --git a/i18n/ja.json b/i18n/ja.json
index b48aad932..31f54a879 100644
--- a/i18n/ja.json
+++ b/i18n/ja.json
@@ -200,6 +200,10 @@
     "translation": "あなたには必要な権限が付与されていません"
   },
   {
+    "id": "api.channel.get_channel.wrong_team.app_error",
+    "translation": "There is no channel with channel_id={{.ChannelId}} on team with team_id={{.TeamId}}"
+  },
+  {
     "id": "api.channel.get_channel_counts.app_error",
     "translation": "データベースからチャンネル数を取得できませんでした"
   },
@@ -3816,6 +3820,10 @@
     "translation": "認証データを更新できませんでした"
   },
   {
+    "id": "store.sql_user.update_auth_data.email_exists.app_error",
+    "translation": "Unable to switch account to {{.Service}}. An account using the email {{.Email}} already exists."
+  },
+  {
     "id": "store.sql_user.update_failed_pwd_attempts.app_error",
     "translation": "failed_attemptsを更新できませんでした"
   },
diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json
index 52268bf35..fc96fe55f 100644
--- a/i18n/pt-BR.json
+++ b/i18n/pt-BR.json
@@ -200,6 +200,10 @@
     "translation": "Você não tem a permissão apropriada"
   },
   {
+    "id": "api.channel.get_channel.wrong_team.app_error",
+    "translation": "There is no channel with channel_id={{.ChannelId}} on team with team_id={{.TeamId}}"
+  },
+  {
     "id": "api.channel.get_channel_counts.app_error",
     "translation": "Não é possível obter o número de canais do banco de dados"
   },
@@ -301,7 +305,7 @@
   },
   {
     "id": "api.command.disabled.app_error",
-    "translation": "Os comandos foram desabilitados para o administrador do sistema."
+    "translation": "Os comandos foram desabilitados pelo administrador do sistema."
   },
   {
     "id": "api.command.duplicate_trigger.app_error",
@@ -573,39 +577,39 @@
   },
   {
     "id": "api.emoji.create.duplicate.app_error",
-    "translation": "Unable to create emoji. Another emoji with the same name already exists."
+    "translation": "Não foi possível criar o emoji. Outro emoji com o mesmo nome já existe."
   },
   {
     "id": "api.emoji.create.parse.app_error",
-    "translation": "Unable to create emoji. Image exceeds maximum file size."
+    "translation": "Não foi possível criar o emoji. Imagem excede o tamanho máximo do arquivo."
   },
   {
     "id": "api.emoji.create.permissions.app_error",
-    "translation": "Permissões inadequadas para deletar o comando"
+    "translation": "Permissões inadequadas para criar emoji."
   },
   {
     "id": "api.emoji.create.too_large.app_error",
-    "translation": "Unable to create emoji. Could not understand request."
+    "translation": "Não foi possível criar o emoji. A requisição não foi entendida."
   },
   {
     "id": "api.emoji.delete.permissions.app_error",
-    "translation": "Permissões inadequadas para deletar o comando"
+    "translation": "Permissões inadequadas para deletar emoji."
   },
   {
     "id": "api.emoji.disabled.app_error",
-    "translation": "Os comandos foram desabilitados para o administrador do sistema."
+    "translation": "Emoji personalizado foi desabilitados pelo o administrador do sistema."
   },
   {
     "id": "api.emoji.get_image.decode.app_error",
-    "translation": "Unable to decode image file for emoji."
+    "translation": "Não foi possível decodificar arquivo de imagem para emoji."
   },
   {
     "id": "api.emoji.get_image.read.app_error",
-    "translation": "Unable to read image file for emoji."
+    "translation": "Não foi possível ler arquivo de imagem para emoji."
   },
   {
     "id": "api.emoji.init.debug",
-    "translation": "Inicializando post api routes"
+    "translation": "Inicializando emoji api routes"
   },
   {
     "id": "api.emoji.storage.app_error",
@@ -613,11 +617,11 @@
   },
   {
     "id": "api.emoji.upload.image.app_error",
-    "translation": "Unable to create emoji. File must be a PNG, JPEG, or GIF."
+    "translation": "Não foi possível criar o emoji. Arquivo precisa ser um PNG, JPEG ou GIF."
   },
   {
     "id": "api.emoji.upload.large_image.app_error",
-    "translation": "Unable to create emoji. Image exceeds maximum dimensions."
+    "translation": "Não foi possível criar o emoji. A imagem excede as dimensões máximas."
   },
   {
     "id": "api.export.json.app_error",
@@ -1609,7 +1613,7 @@
   },
   {
     "id": "api.user.create_oauth_user.already_attached.app_error",
-    "translation": "There is already an account associated with that email address using a sign in method other than {{.Service}}. Please sign in using {{.Auth}}."
+    "translation": "Já existe uma conta associada a esse endereço de e-mail usando um método de login diferente de {{.Service}}. Por favor faça login usando {{.Auth}}."
   },
   {
     "id": "api.user.create_oauth_user.already_used.app_error",
@@ -2369,15 +2373,15 @@
   },
   {
     "id": "model.client.create_emoji.emoji.app_error",
-    "translation": "Unable to attach emoji data to request"
+    "translation": "Não é possível anexar dados emoji ao pedido"
   },
   {
     "id": "model.client.create_emoji.image.app_error",
-    "translation": "Unable to attach image to request"
+    "translation": "Não é possível anexar a imagem ao pedido"
   },
   {
     "id": "model.client.create_emoji.writer.app_error",
-    "translation": "Unable to write request"
+    "translation": "Não foi possível escrever o pedido"
   },
   {
     "id": "model.client.login.app_error",
@@ -2565,11 +2569,11 @@
   },
   {
     "id": "model.emoji.id.app_error",
-    "translation": "Id raiz inválida"
+    "translation": "Id do emoji inválido"
   },
   {
     "id": "model.emoji.name.app_error",
-    "translation": "Nome deve ter 2 ou mais caracteres alfanuméricos em minúsculas"
+    "translation": "Nome deve ter de 1 a 64 caracteres alfanuméricos minusculos"
   },
   {
     "id": "model.emoji.update_at.app_error",
@@ -3273,27 +3277,27 @@
   },
   {
     "id": "store.sql_emoji.delete.app_error",
-    "translation": "Não foi possível deletar o post"
+    "translation": "Não foi possível deletar o emoji"
   },
   {
     "id": "store.sql_emoji.delete.no_results",
-    "translation": "We couldn’t find the emoji to delete"
+    "translation": "Não foi possível encontrar o emoji para deletar"
   },
   {
     "id": "store.sql_emoji.get.app_error",
-    "translation": "Não foi obter o post"
+    "translation": "Não foi obter o emoji"
   },
   {
     "id": "store.sql_emoji.get_all.app_error",
-    "translation": "Não foi obter o post"
+    "translation": "Não foi obter o emoji"
   },
   {
     "id": "store.sql_emoji.get_by_name.app_error",
-    "translation": "Não foi obter o post"
+    "translation": "Não foi obter o emoji"
   },
   {
     "id": "store.sql_emoji.save.app_error",
-    "translation": "Não foi possível salvar o Post"
+    "translation": "Não foi possível salvar o emoji"
   },
   {
     "id": "store.sql_license.get.app_error",
@@ -3816,6 +3820,10 @@
     "translation": "Não foi possível atualizar os dados de autenticação"
   },
   {
+    "id": "store.sql_user.update_auth_data.email_exists.app_error",
+    "translation": "Unable to switch account to {{.Service}}. An account using the email {{.Email}} already exists."
+  },
+  {
     "id": "store.sql_user.update_failed_pwd_attempts.app_error",
     "translation": "Não foi possível atualizar o failed_attempts"
   },