translations PR 20170206 (#5319)

* translations PR 20170206

* Fix platform zh_TW

1 files changed, 98 insertions, 98 deletions

diff --git a/i18n/en.json b/i18n/en.json
index 572a972ee..9aa39dfa4 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -208,10 +208,6 @@
     "translation": "Cannot create more than {{.MaxChannelsPerTeam}} channels for current team"
   },
   {
-    "id": "app.channel.create_channel.no_team_id.app_error",
-    "translation": "Must specify the team ID to create a channel"
-  },
-  {
     "id": "api.channel.create_default_channels.off_topic",
     "translation": "Off-Topic"
   },
@@ -800,16 +796,12 @@
     "translation": "Sorry, we could not find the page."
   },
   {
-    "id": "api.context.invalid_param.app_error",
-    "translation": "Invalid {{.Name}} parameter"
-  },
-  {
     "id": "api.context.invalid_body_param.app_error",
     "translation": "Invalid or missing {{.Name}} in request body"
   },
   {
-    "id": "api.context.invalid_url_param.app_error",
-    "translation": "Invalid or missing {{.Name}} parameter in request URL"
+    "id": "api.context.invalid_param.app_error",
+    "translation": "Invalid {{.Name}} parameter"
   },
   {
     "id": "api.context.invalid_session.error",
@@ -824,6 +816,10 @@
     "translation": "Invalid session token={{.Token}}, err={{.Error}}"
   },
   {
+    "id": "api.context.invalid_url_param.app_error",
+    "translation": "Invalid or missing {{.Name}} parameter in request URL"
+  },
+  {
     "id": "api.context.invalidate_all_caches",
     "translation": "Purging all caches"
   },
@@ -2772,6 +2768,10 @@
     "translation": "Invalid {{.Name}} parameter"
   },
   {
+    "id": "app.channel.create_channel.no_team_id.app_error",
+    "translation": "Must specify the team ID to create a channel"
+  },
+  {
     "id": "app.channel.post_update_channel_purpose_message.post.error",
     "translation": "Failed to post channel purpose message"
   },
@@ -2792,22 +2792,26 @@
     "translation": "%s updated the channel purpose to: %s"
   },
   {
-    "id": "app.import.bulk_import.json_decode.error",
-    "translation": "JSON decode of line failed."
-  },
-  {
     "id": "app.import.bulk_import.file_scan.error",
     "translation": "Error reading import data file."
   },
   {
-    "id": "app.import.import_line.null_team.error",
-    "translation": "Import data line has type \"team\" but the team object is null."
+    "id": "app.import.bulk_import.json_decode.error",
+    "translation": "JSON decode of line failed."
+  },
+  {
+    "id": "app.import.import_channel.team_not_found.error",
+    "translation": "Error importing channel. Team with name \"{{.TeamName}}\" could not be found."
   },
   {
     "id": "app.import.import_line.null_channel.error",
     "translation": "Import data line has type \"channel\" but the channel object is null."
   },
   {
+    "id": "app.import.import_line.null_team.error",
+    "translation": "Import data line has type \"team\" but the team object is null."
+  },
+  {
     "id": "app.import.import_line.null_user.error",
     "translation": "Import data line has type \"user\" but the user object is null."
   },
@@ -2816,124 +2820,116 @@
     "translation": "Import data line has unknown type \"{{.Type}}\"."
   },
   {
-    "id": "app.import.validate_team_import_data.name_missing.error",
-    "translation": "Missing required team property: name."
-  },
-  {
-    "id": "app.import.validate_team_import_data.name_length.error",
-    "translation": "Team name is too long."
-  },
-  {
-    "id": "app.import.validate_team_import_data.name_reserved.error",
-    "translation": "Team name contains reserved word."
+    "id": "app.import.validate_channel_import_data.create_at_zero.error",
+    "translation": "Channel create_at must not be 0 if provided."
   },
   {
-    "id": "app.import.validate_team_import_data.name_characters.error",
-    "translation": "Team name contains invalid characters."
+    "id": "app.import.validate_channel_import_data.display_name_length.error",
+    "translation": "Channel display_name is not within permitted length constraints."
   },
   {
-    "id": "app.import.validate_team_import_data.display_name_missing.error",
-    "translation": "Missing required team property: display_name"
+    "id": "app.import.validate_channel_import_data.display_name_missing.error",
+    "translation": "Missing required channel property: display_name."
   },
   {
-    "id": "app.import.validate_team_import_data.display_name_length.error",
-    "translation": "Team display_name is not within permitted length constraints."
+    "id": "app.import.validate_channel_import_data.header_length.error",
+    "translation": "Channel header is too long."
   },
   {
-    "id": "app.import.validate_team_import_data.type_missing.error",
-    "translation": "Missing required team property: type"
+    "id": "app.import.validate_channel_import_data.name_characters.error",
+    "translation": "Channel name contains invalid characters."
   },
   {
-    "id": "app.import.validate_team_import_data.type_invalid.error",
-    "translation": "Team type is not valid."
+    "id": "app.import.validate_channel_import_data.name_length.error",
+    "translation": "Channel name is too long."
   },
   {
-    "id": "app.import.validate_team_import_data.create_at_zero.error",
-    "translation": "Team create_at must not be 0 if provided."
+    "id": "app.import.validate_channel_import_data.name_missing.error",
+    "translation": "Missing required channel property: name"
   },
   {
-    "id": "app.import.validate_team_import_data.description_length.error",
-    "translation": "Team description is too long."
+    "id": "app.import.validate_channel_import_data.purpose_length.error",
+    "translation": "Channel purpose is too long."
   },
   {
-    "id": "app.import.validate_team_import_data.allowed_domains_length.error",
-    "translation": "Team allowed_domains is too long."
+    "id": "app.import.validate_channel_import_data.team_missing.error",
+    "translation": "Missing required channel property: team"
   },
   {
-    "id": "app.import.import_channel.team_not_found.error",
-    "translation": "Error importing channel. Team with name \"{{.TeamName}}\" could not be found."
+    "id": "app.import.validate_channel_import_data.type_invalid.error",
+    "translation": "Channel type is invalid."
   },
   {
-    "id": "app.import.validate_channel_import_data.team_missing.error",
-    "translation": "Missing required channel property: team"
+    "id": "app.import.validate_channel_import_data.type_missing.error",
+    "translation": "Missing required channel property: type."
   },
   {
-    "id": "app.import.validate_channel_import_data.name_missing.error",
-    "translation": "Missing required channel property: name"
+    "id": "app.import.validate_team_import_data.allowed_domains_length.error",
+    "translation": "Team allowed_domains is too long."
   },
   {
-    "id": "app.import.validate_channel_import_data.name_length.error",
-    "translation": "Channel name is too long."
+    "id": "app.import.validate_team_import_data.create_at_zero.error",
+    "translation": "Team create_at must not be 0 if provided."
   },
   {
-    "id": "app.import.validate_channel_import_data.name_characters.error",
-    "translation": "Channel name contains invalid characters."
+    "id": "app.import.validate_team_import_data.description_length.error",
+    "translation": "Team description is too long."
   },
   {
-    "id": "app.import.validate_channel_import_data.display_name_missing.error",
-    "translation": "Missing required channel property: display_name."
+    "id": "app.import.validate_team_import_data.display_name_length.error",
+    "translation": "Team display_name is not within permitted length constraints."
   },
   {
-    "id": "app.import.validate_channel_import_data.display_name_length.error",
-    "translation": "Channel display_name is not within permitted length constraints."
+    "id": "app.import.validate_team_import_data.display_name_missing.error",
+    "translation": "Missing required team property: display_name"
   },
   {
-    "id": "app.import.validate_channel_import_data.type_missing.error",
-    "translation": "Missing required channel property: type."
+    "id": "app.import.validate_team_import_data.name_characters.error",
+    "translation": "Team name contains invalid characters."
   },
   {
-    "id": "app.import.validate_channel_import_data.type_invalid.error",
-    "translation": "Channel type is invalid."
+    "id": "app.import.validate_team_import_data.name_length.error",
+    "translation": "Team name is too long."
   },
   {
-    "id": "app.import.validate_channel_import_data.create_at_zero.error",
-    "translation": "Channel create_at must not be 0 if provided."
+    "id": "app.import.validate_team_import_data.name_missing.error",
+    "translation": "Missing required team property: name."
   },
   {
-    "id": "app.import.validate_channel_import_data.header_length.error",
-    "translation": "Channel header is too long."
+    "id": "app.import.validate_team_import_data.name_reserved.error",
+    "translation": "Team name contains reserved word."
   },
   {
-    "id": "app.import.validate_channel_import_data.purpose_length.error",
-    "translation": "Channel purpose is too long."
+    "id": "app.import.validate_team_import_data.type_invalid.error",
+    "translation": "Team type is not valid."
   },
   {
-    "id": "app.import.validate_user_import_data.username_missing.error",
-    "translation": "Missing require user property: username."
+    "id": "app.import.validate_team_import_data.type_missing.error",
+    "translation": "Missing required team property: type"
   },
   {
-    "id": "app.import.validate_user_import_data.username_invalid.error",
-    "translation": "Username is not valid."
+    "id": "app.import.validate_user_channels_import_data.channel_name_missing.error",
+    "translation": "Channel name missing from User's Channel Membership."
   },
   {
-    "id": "app.import.validate_user_import_data.email_missing.error",
-    "translation": "Missing required user property: email."
+    "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
+    "translation": "Invalid roles for User's Channel Membership."
   },
   {
-    "id": "app.import.validate_user_import_data.email_length.error",
-    "translation": "User email has an invalid length."
+    "id": "app.import.validate_user_import_data.auth_data_length.error",
+    "translation": "User AuthData is too long."
   },
   {
     "id": "app.import.validate_user_import_data.auth_service_length.error",
     "translation": "User AuthService should not be empty if it is provided."
   },
   {
-    "id": "app.import.validate_user_import_data.auth_data_length.error",
-    "translation": "User AuthData is too long."
+    "id": "app.import.validate_user_import_data.email_length.error",
+    "translation": "User email has an invalid length."
   },
   {
-    "id": "app.import.validate_user_import_data.nickname_length.error",
-    "translation": "User nickname is too long."
+    "id": "app.import.validate_user_import_data.email_missing.error",
+    "translation": "Missing required user property: email."
   },
   {
     "id": "app.import.validate_user_import_data.first_name_length.error",
@@ -2944,6 +2940,10 @@
     "translation": "User Last Name is too long."
   },
   {
+    "id": "app.import.validate_user_import_data.nickname_length.error",
+    "translation": "User nickname is too long."
+  },
+  {
     "id": "app.import.validate_user_import_data.position_length.error",
     "translation": "User Position is too long."
   },
@@ -2952,20 +2952,20 @@
     "translation": "User roles are not valid."
   },
   {
-    "id": "app.import.validate_user_teams_import_data.team_name_missing.error",
-    "translation": "Team name missing from User's Team Membership."
+    "id": "app.import.validate_user_import_data.username_invalid.error",
+    "translation": "Username is not valid."
   },
   {
-    "id": "app.import.validate_user_teams_import_data.invalid_roles.error",
-    "translation": "Invalid roles for User's Team Membership."
+    "id": "app.import.validate_user_import_data.username_missing.error",
+    "translation": "Missing require user property: username."
   },
   {
-    "id": "app.import.validate_user_channels_import_data.channel_name_missing.error",
-    "translation": "Channel name missing from User's Channel Membership."
+    "id": "app.import.validate_user_teams_import_data.invalid_roles.error",
+    "translation": "Invalid roles for User's Team Membership."
   },
   {
-    "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
-    "translation": "Invalid roles for User's Channel Membership."
+    "id": "app.import.validate_user_teams_import_data.team_name_missing.error",
+    "translation": "Team name missing from User's Team Membership."
   },
   {
     "id": "app.import.validate_user_channels_import_data.invalid_notify_props_desktop.error",
@@ -3612,10 +3612,6 @@
     "translation": "To must be greater than From"
   },
   {
-    "id": "model.config.is_valid.time_between_user_typing.app_error",
-    "translation": "Time between user typing updates should not be set to less than 1000 milliseconds."
-  },
-  {
     "id": "model.config.is_valid.cluster_email_batching.app_error",
     "translation": "Unable to enable email batching when clustering is enabled."
   },
@@ -3844,6 +3840,10 @@
     "translation": "Invalid maximum open connection for SQL settings.  Must be a positive number."
   },
   {
+    "id": "model.config.is_valid.time_between_user_typing.app_error",
+    "translation": "Time between user typing updates should not be set to less than 1000 milliseconds."
+  },
+  {
     "id": "model.config.is_valid.webrtc_gateway_admin_secret.app_error",
     "translation": "WebRTC Gateway Admin Secret must be set."
   },
@@ -4564,14 +4564,14 @@
     "translation": "We couldn't increment the mention count"
   },
   {
-    "id": "store.sql_channel.permanent_delete_by_team.app_error",
-    "translation": "We couldn't delete the channels"
-  },
-  {
     "id": "store.sql_channel.permanent_delete.app_error",
     "translation": "We couldn't delete the channel"
   },
   {
+    "id": "store.sql_channel.permanent_delete_by_team.app_error",
+    "translation": "We couldn't delete the channels"
+  },
+  {
     "id": "store.sql_channel.permanent_delete_members_by_user.app_error",
     "translation": "We couldn't remove the channel member"
   },
@@ -4928,14 +4928,14 @@
     "translation": "We couldn't delete the post"
   },
   {
-    "id": "store.sql_post.permanent_delete_by_channel.app_error",
-    "translation": "We couldn't delete the posts by channel"
-  },
-  {
     "id": "store.sql_post.permanent_delete_all_comments_by_user.app_error",
     "translation": "We couldn't delete the comments for user"
   },
   {
+    "id": "store.sql_post.permanent_delete_by_channel.app_error",
+    "translation": "We couldn't delete the posts by channel"
+  },
+  {
     "id": "store.sql_post.permanent_delete_by_user.app_error",
     "translation": "We couldn't select the posts to delete for the user"
   },