translations PR 20161128 (#4666)

i18n/ja.json

@@ -822,8 +822,20 @@
     "translation": "絵文字を作成できません。ファイルはPNGまたはJPEG、GIFにしてください。"
   },
   {
-    "id": "api.emoji.upload.large_image.app_error",
-    "translation": "絵文字を作成できません。画像は128x128ピクセル以内である必要があります。"
+    "id": "api.emoji.upload.large_image.decode_error",
+    "translation": "Unable to create emoji. An error occurred when trying to decode the image."
+  },
+  {
+    "id": "api.emoji.upload.large_image.encode_error",
+    "translation": "Unable to create emoji. An error occurred when trying to encode the image."
+  },
+  {
+    "id": "api.emoji.upload.large_image.gif_decode_error",
+    "translation": "Unable to create emoji. An error occurred when trying to decode the GIF image."
+  },
+  {
+    "id": "api.emoji.upload.large_image.gif_encode_error",
+    "translation": "Unable to create emoji. An error occurred when trying to encode the GIF image."
   },
   {
     "id": "api.file.get_file.public_disabled.app_error",
@@ -1273,6 +1285,18 @@
     "id": "api.post.delete_post_files.app_error.warn",
     "translation": "投稿のファイルを削除する際にエラーが発生しました post_id=%v, err=%v"
   },
+  {
+    "id": "api.post.disabled_all",
+    "translation": "@all has been disabled because the channel has more than {{.Users}} users."
+  },
+  {
+    "id": "api.post.disabled_channel",
+    "translation": "@channel has been disabled because the channel has more than {{.Users}} users."
+  },
+  {
+    "id": "api.post.disabled_here",
+    "translation": "@here has been disabled because the channel has more than {{.Users}} users."
+  },
   {
     "id": "api.post.get_message_for_notification.files_sent",
     "translation": {
@@ -1619,6 +1643,10 @@
     "id": "api.slackimport.slack_add_users.merge_existing",
     "translation": "既に存在するユーザーとマージしました: {{.Email}}, {{.Username}}\r\n"
   },
+  {
+    "id": "api.slackimport.slack_add_users.merge_existing_failed",
+    "translation": "Tried to merge user with existing account: {{.Email}}, {{.Username}}, but failed to add the user to this team.\r\n"
+  },
   {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "ユーザーをインポートできません: {{.Username}}\r\n"
@@ -2739,6 +2767,14 @@
     "id": "ent.ldap.validate_filter.app_error",
     "translation": "不正なAD/LDAPフィルターです"
   },
+  {
+    "id": "ent.metrics.starting.info",
+    "translation": "Metrics and profiling server is listening on %v"
+  },
+  {
+    "id": "ent.metrics.stopping.info",
+    "translation": "Metrics and profiling server is stopping on %v"
+  },
   {
     "id": "ent.mfa.activate.authenticate.app_error",
     "translation": "MFAトークンを認証できません"
@@ -3315,6 +3351,10 @@
     "id": "model.config.is_valid.max_file_size.app_error",
     "translation": "ファイル設定の最大ファイルサイズが不正です。ゼロ以上の数を指定してください。"
   },
+  {
+    "id": "model.config.is_valid.max_notify_per_channel.app_error",
+    "translation": "チーム設定のチーム毎の最大チャンネル数が不正です。正の数を指定してください。"
+  },
   {
     "id": "model.config.is_valid.max_users.app_error",
     "translation": "チーム設定のチーム毎の最大ユーザー数が不正です。正の数を指定してください。"
@@ -4167,6 +4207,10 @@
     "id": "store.sql_channel.save_member.save.app_error",
     "translation": "チャンネルのメンバーを保存できませんでした"
   },
+  {
+    "id": "store.sql_channel.search.app_error",
+    "translation": "チャンネルを更新する際にエラーが発生しました"
+  },
   {
     "id": "store.sql_channel.set_last_viewed_at.app_error",
     "translation": "最終閲覧日時を更新できませんでした"