translations PR 20170807 (#7144)

* translations PR 20170807

* Fix pt-BR variable

1 files changed, 295 insertions, 295 deletions

diff --git a/i18n/en.json b/i18n/en.json
index 3b2d2662e..70a243e56 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -532,112 +532,128 @@
     "translation": "Channel header successfully updated."
   },
   {
-    "id": "api.command_collapse.desc",
-    "translation": "Turn on auto-collapsing of image previews"
+    "id": "api.command_channel_purpose.channel.app_error",
+    "translation": "Error to retrieve the current channel."
   },
   {
-    "id": "api.command_collapse.name",
-    "translation": "collapse"
+    "id": "api.command_channel_purpose.desc",
+    "translation": "Edit the channel purpose"
   },
   {
-    "id": "api.command_collapse.success",
-    "translation": "Image links now collapse by default"
+    "id": "api.command_channel_purpose.direct_group.app_error",
+    "translation": "Cannot set purpose for direct message channels. Use /header to set the header instead."
   },
   {
-    "id": "api.command_echo.create.app_error",
-    "translation": "Unable to create /echo post, err=%v"
+    "id": "api.command_channel_purpose.hint",
+    "translation": "[text]"
   },
   {
-    "id": "api.command_echo.delay.app_error",
-    "translation": "Delays must be under 10000 seconds"
+    "id": "api.command_channel_purpose.message.app_error",
+    "translation": "A message must be provided with the /purpose command."
   },
   {
-    "id": "api.command_echo.desc",
-    "translation": "Echo back text from your account"
+    "id": "api.command_channel_purpose.name",
+    "translation": "purpose"
   },
   {
-    "id": "api.command_echo.high_volume.app_error",
-    "translation": "High volume of echo request, cannot process request"
+    "id": "api.command_channel_purpose.permission.app_error",
+    "translation": "You do not have the appropriate permissions to edit the channel purpose."
   },
   {
-    "id": "api.command_echo.hint",
-    "translation": "'message' [delay in seconds]"
+    "id": "api.command_channel_purpose.update_channel.app_error",
+    "translation": "Error to update the current channel."
   },
   {
-    "id": "api.command_echo.message.app_error",
-    "translation": "A message must be provided with the /echo command."
+    "id": "api.command_channel_rename.channel.app_error",
+    "translation": "Error to retrieve the current channel."
   },
   {
-    "id": "api.command_echo.name",
-    "translation": "echo"
+    "id": "api.command_channel_rename.desc",
+    "translation": "Rename the channel"
   },
   {
-    "id": "api.command_channel_purpose.name",
-    "translation": "purpose"
+    "id": "api.command_channel_rename.direct_group.app_error",
+    "translation": "Cannot rename direct message channels."
   },
   {
-    "id": "api.command_channel_purpose.hint",
+    "id": "api.command_channel_rename.hint",
     "translation": "[text]"
   },
   {
-    "id": "api.command_channel_purpose.desc",
-    "translation": "Edit the channel purpose"
+    "id": "api.command_channel_rename.message.app_error",
+    "translation": "A message must be provided with the /rename command."
   },
   {
-    "id": "api.command_channel_purpose.channel.app_error",
-    "translation": "Error to retrieve the current channel."
+    "id": "api.command_channel_rename.name",
+    "translation": "rename"
   },
   {
-    "id": "api.command_channel_purpose.permission.app_error",
-    "translation": "You do not have the appropriate permissions to edit the channel purpose."
+    "id": "api.command_channel_rename.permission.app_error",
+    "translation": "You do not have the appropriate permissions to rename the channel."
   },
   {
-    "id": "api.command_channel_purpose.direct_group.app_error",
-    "translation": "Cannot set purpose for direct message channels. Use /header to set the header instead."
+    "id": "api.command_channel_rename.update_channel.app_error",
+    "translation": "Error to update the current channel."
   },
   {
-    "id": "api.command_channel_purpose.message.app_error",
-    "translation": "A message must be provided with the /purpose command."
+    "id": "api.command_channel_rename.update_channel.success",
+    "translation": "Channel name successfully updated."
   },
   {
-    "id": "api.command_channel_purpose.update_channel.app_error",
-    "translation": "Error to update the current channel."
+    "id": "api.command_code.desc",
+    "translation": "Display text as a code block"
   },
   {
-    "id": "api.command_channel_rename.name",
-    "translation": "rename"
+    "id": "api.command_code.hint",
+    "translation": "[text]"
   },
   {
-    "id": "api.command_channel_rename.hint",
-    "translation": "[text]"
+    "id": "api.command_code.message.app_error",
+    "translation": "A message must be provided with the /code command."
   },
   {
-    "id": "api.command_channel_rename.desc",
-    "translation": "Rename the channel"
+    "id": "api.command_code.name",
+    "translation": "code"
   },
   {
-    "id": "api.command_channel_rename.channel.app_error",
-    "translation": "Error to retrieve the current channel."
+    "id": "api.command_collapse.desc",
+    "translation": "Turn on auto-collapsing of image previews"
   },
   {
-    "id": "api.command_channel_rename.permission.app_error",
-    "translation": "You do not have the appropriate permissions to rename the channel."
+    "id": "api.command_collapse.name",
+    "translation": "collapse"
   },
   {
-    "id": "api.command_channel_rename.message.app_error",
-    "translation": "A message must be provided with the /rename command."
+    "id": "api.command_collapse.success",
+    "translation": "Image links now collapse by default"
   },
   {
-    "id": "api.command_channel_rename.update_channel.app_error",
-    "translation": "Error to update the current channel."
+    "id": "api.command_echo.create.app_error",
+    "translation": "Unable to create /echo post, err=%v"
   },
   {
-    "id": "api.command_channel_rename.update_channel.success",
-    "translation": "Channel name successfully updated."
+    "id": "api.command_echo.delay.app_error",
+    "translation": "Delays must be under 10000 seconds"
   },
   {
-    "id": "api.command_channel_rename.direct_group.app_error",
-    "translation": "Cannot rename direct message channels."
+    "id": "api.command_echo.desc",
+    "translation": "Echo back text from your account"
+  },
+  {
+    "id": "api.command_echo.high_volume.app_error",
+    "translation": "High volume of echo request, cannot process request"
+  },
+  {
+    "id": "api.command_echo.hint",
+    "translation": "'message' [delay in seconds]"
+  },
+  {
+    "id": "api.command_echo.message.app_error",
+    "translation": "A message must be provided with the /echo command."
+  },
+  {
+    "id": "api.command_echo.name",
+    "translation": "echo"
   },
   {
     "id": "api.command_expand.desc",
@@ -980,22 +996,6 @@
     "translation": "ALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\n"
   },
   {
-    "id": "api.command_code.desc",
-    "translation": "Display text as a code block"
-  },
-  {
-    "id": "api.command_code.hint",
-    "translation": "[text]"
-  },
-  {
-    "id": "api.command_code.name",
-    "translation": "code"
-  },
-  {
-    "id": "api.command_code.message.app_error",
-    "translation": "A message must be provided with the /code command."
-  },
-  {
     "id": "api.command_shrug.desc",
     "translation": "Adds ¯\\_(ツ)_/¯ to your message"
   },
@@ -2436,18 +2436,6 @@
     "translation": "[{{ .SiteName }}] Your password has been updated"
   },
   {
-    "id": "api.templates.user_access_token_body.info",
-    "translation": "A user access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account.<br>If this change wasn't initiated by you, please contact your system administrator."
-  },
-  {
-    "id": "api.templates.user_access_token_body.title",
-    "translation": "User access token added to your account"
-  },
-  {
-    "id": "api.templates.user_access_token_subject",
-    "translation": "[{{ .SiteName }}] User access token added to your account"
-  },
-  {
     "id": "api.templates.post_body.button",
     "translation": "Go To Post"
   },
@@ -2508,6 +2496,18 @@
     "translation": "[MATTERMOST] Changes to your account for Mattermost 3.0 Upgrade"
   },
   {
+    "id": "api.templates.user_access_token_body.info",
+    "translation": "A user access token was added to your account on {{ .SiteURL }}. They can be used to access {{.SiteName}} with your account.<br>If this change wasn't initiated by you, please contact your system administrator."
+  },
+  {
+    "id": "api.templates.user_access_token_body.title",
+    "translation": "User access token added to your account"
+  },
+  {
+    "id": "api.templates.user_access_token_subject",
+    "translation": "[{{ .SiteName }}] User access token added to your account"
+  },
+  {
     "id": "api.templates.username_change_body.info",
     "translation": "Your username for {{.TeamDisplayName}} has been changed to {{.NewUsername}}.<br>If you did not make this change, please contact the system administrator."
   },
@@ -2848,10 +2848,6 @@
     "translation": "Failed to send update password email successfully"
   },
   {
-    "id": "api.user.send_user_access_token.error",
-    "translation": "Failed to send user access token added email successfully"
-  },
-  {
     "id": "api.user.send_password_reset.find.app_error",
     "translation": "We couldn’t find an account with that address."
   },
@@ -2868,6 +2864,10 @@
     "translation": "Failed to send update password email successfully"
   },
   {
+    "id": "api.user.send_user_access_token.error",
+    "translation": "Failed to send user access token added email successfully"
+  },
+  {
     "id": "api.user.send_verify_email_and_forget.failed.error",
     "translation": "Failed to send verification email successfully"
   },
@@ -3116,54 +3116,6 @@
     "translation": "Invalid {{.Name}} parameter"
   },
   {
-    "id": "app.notification.subject.direct.full",
-    "translation": "[{{.SiteName}}] New Direct Message from {{.SenderDisplayName}} on {{.Month}} {{.Day}}, {{.Year}}"
-  },
-  {
-    "id": "app.notification.subject.notification.full",
-    "translation": "[{{ .SiteName }}] Notification in {{ .TeamName}} on {{.Month}} {{.Day}}, {{.Year}}"
-  },
-  {
-    "id": "app.notification.body.intro.direct.full",
-    "translation": "You have a new direct message."
-  },
-  {
-    "id": "app.notification.body.intro.direct.generic",
-    "translation": "You have a new direct message from {{.SenderName}}"
-  },
-  {
-    "id": "app.notification.body.intro.notification.full",
-    "translation": "You have a new notification."
-  },
-  {
-    "id": "app.notification.body.intro.notification.generic",
-    "translation": "You have a new notification from {{.SenderName}}"
-  },
-  {
-    "id": "app.notification.body.text.direct.full",
-    "translation": "{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
-  },
-  {
-    "id": "app.notification.body.text.direct.generic",
-    "translation": "{{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
-  },
-  {
-    "id": "app.notification.body.text.notification.full",
-    "translation": "CHANNEL: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
-  },
-  {
-    "id": "app.notification.body.text.notification.generic",
-    "translation": "{{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
-  },
-  {
-    "id": "app.user_access_token.disabled",
-    "translation": "Personal access tokens are disabled on this server. Please contact your system administrator for details."
-  },
-  {
-    "id": "app.user_access_token.invalid_or_missing",
-    "translation": "Invalid or missing token"
-  },
-  {
     "id": "app.channel.create_channel.no_team_id.app_error",
     "translation": "Must specify the team ID to create a channel"
   },
@@ -3228,24 +3180,12 @@
     "translation": "Failed to get group channel"
   },
   {
-    "id": "app.import.import_direct_post.user_not_found.error",
-    "translation": "Post user does not exist"
-  },
-  {
     "id": "app.import.import_direct_post.save_preferences.error",
     "translation": "Error importing direct post. Failed to save preferences."
   },
   {
-    "id": "app.import.import_user_channels.save_preferences.error",
-    "translation": "Error importing user channel memberships. Failed to save preferences."
-  },
-  {
-    "id": "app.import.validate_direct_channel_import_data.unknown_favoriter.error",
-    "translation": "Direct channel can only be favorited by members. \"{{.Username}}\" is not a member."
-  },
-  {
-    "id": "app.import.validate_direct_post_import_data.unknown_flagger.error",
-    "translation": "Direct post can only be flagged by members of the channel it is in. \"{{.Username}}\" is not a member."
+    "id": "app.import.import_direct_post.user_not_found.error",
+    "translation": "Post user does not exist"
   },
   {
     "id": "app.import.import_line.null_channel.error",
@@ -3280,6 +3220,10 @@
     "translation": "Error importing post. Channel with name \"{{.ChannelName}}\" could not be found."
   },
   {
+    "id": "app.import.import_post.save_preferences.error",
+    "translation": "Error importing post. Failed to save preferences."
+  },
+  {
     "id": "app.import.import_post.team_not_found.error",
     "translation": "Error importing post. Team with name \"{{.TeamName}}\" could not be found."
   },
@@ -3288,8 +3232,8 @@
     "translation": "Error importing post. User with username \"{{.Username}}\" could not be found."
   },
   {
-    "id": "app.import.import_post.save_preferences.error",
-    "translation": "Error importing post. Failed to save preferences."
+    "id": "app.import.import_user_channels.save_preferences.error",
+    "translation": "Error importing user channel memberships. Failed to save preferences."
   },
   {
     "id": "app.import.validate_channel_import_data.create_at_zero.error",
@@ -3352,6 +3296,10 @@
     "translation": "Direct channel members list contains too many items"
   },
   {
+    "id": "app.import.validate_direct_channel_import_data.unknown_favoriter.error",
+    "translation": "Direct channel can only be favorited by members. \"{{.Username}}\" is not a member."
+  },
+  {
     "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
     "translation": "Missing required direct post property: channel_members"
   },
@@ -3380,6 +3328,10 @@
     "translation": "Missing required direct post property: message"
   },
   {
+    "id": "app.import.validate_direct_post_import_data.unknown_flagger.error",
+    "translation": "Direct post can only be flagged by members of the channel it is in. \"{{.Username}}\" is not a member."
+  },
+  {
     "id": "app.import.validate_direct_post_import_data.user_missing.error",
     "translation": "Missing required direct post property: user"
   },
@@ -3464,14 +3416,14 @@
     "translation": "Invalid Desktop NotifyProps for User's Channel Membership."
   },
   {
-    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mobile.error",
-    "translation": "Invalid Mobile NotifyProps for User's Channel Membership."
-  },
-  {
     "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mark_unread.error",
     "translation": "Invalid MarkUnread NotifyProps for User's Channel Membership."
   },
   {
+    "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mobile.error",
+    "translation": "Invalid Mobile NotifyProps for User's Channel Membership."
+  },
+  {
     "id": "app.import.validate_user_channels_import_data.invalid_roles.error",
     "translation": "Invalid roles for User's Channel Membership."
   },
@@ -3508,34 +3460,22 @@
     "translation": "User nickname is too long."
   },
   {
-    "id": "app.import.validate_user_import_data.pasword_length.error",
-    "translation": "User Password has invalid length."
-  },
-  {
-    "id": "app.import.validate_user_import_data.position_length.error",
-    "translation": "User Position is too long."
-  },
-  {
-    "id": "app.import.validate_user_import_data.roles_invalid.error",
-    "translation": "User roles are not valid."
+    "id": "app.import.validate_user_import_data.notify_props_channel_trigger_invalid.error",
+    "translation": "Invalid Channel Trigger Notify Prop for user."
   },
   {
-    "id": "app.import.validate_user_import_data.username_invalid.error",
-    "translation": "Username is not valid."
+    "id": "app.import.validate_user_import_data.notify_props_comment_trigger_invalid.error",
+    "translation": "Invalid Comment Trigger Notify Prop for user."
   },
   {
-    "id": "app.import.validate_user_import_data.username_missing.error",
-    "translation": "Missing require user property: username."
+    "id": "app.import.validate_user_import_data.notify_props_desktop_duration_invalid.error",
+    "translation": "Invalid Desktop Duration Notify Prop value for user."
   },
   {
     "id": "app.import.validate_user_import_data.notify_props_desktop_invalid.error",
     "translation": "Invalid Desktop Notify Prop value for user."
   },
   {
-    "id": "app.import.validate_user_import_data.notify_props_desktop_duration_invalid.error",
-    "translation": "Invalid Desktop Duration Notify Prop value for user."
-  },
-  {
     "id": "app.import.validate_user_import_data.notify_props_desktop_sound_invalid.error",
     "translation": "Invalid Desktop Sound Notify Prop value for user."
   },
@@ -3552,92 +3492,80 @@
     "translation": "Invalid Mobile Push Status Notify Prop for user."
   },
   {
-    "id": "app.import.validate_user_import_data.notify_props_channel_trigger_invalid.error",
-    "translation": "Invalid Channel Trigger Notify Prop for user."
-  },
-  {
-    "id": "app.import.validate_user_import_data.notify_props_comment_trigger_invalid.error",
-    "translation": "Invalid Comment Trigger Notify Prop for user."
-  },
-  {
-    "id": "app.import.validate_user_teams_import_data.invalid_roles.error",
-    "translation": "Invalid roles for User's Team 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_import_data.pasword_length.error",
+    "translation": "User Password has invalid length."
   },
   {
-    "id": "authentication.roles.system_post_all.name",
-    "translation": "Post in Public, Private and Direct Channels"
+    "id": "app.import.validate_user_import_data.position_length.error",
+    "translation": "User Position is too long."
   },
   {
-    "id": "authentication.roles.system_post_all.description",
-    "translation": "A role with the permission to post in any public, private or direct channel on the system"
+    "id": "app.import.validate_user_import_data.roles_invalid.error",
+    "translation": "User roles are not valid."
   },
   {
-    "id": "authentication.roles.system_post_all_public.name",
-    "translation": "Post in Public Channels"
+    "id": "app.import.validate_user_import_data.username_invalid.error",
+    "translation": "Username is not valid."
   },
   {
-    "id": "authentication.roles.system_post_all_public.description",
-    "translation": "A role with the permission to post in any public channel on the system"
+    "id": "app.import.validate_user_import_data.username_missing.error",
+    "translation": "Missing require user property: username."
   },
   {
-    "id": "authentication.roles.team_post_all.name",
-    "translation": "Post in Public and Private Channels"
+    "id": "app.import.validate_user_teams_import_data.invalid_roles.error",
+    "translation": "Invalid roles for User's Team Membership."
   },
   {
-    "id": "authentication.roles.team_post_all.description",
-    "translation": "A role with the permission to post in any public or private channel on the team"
+    "id": "app.import.validate_user_teams_import_data.team_name_missing.error",
+    "translation": "Team name missing from User's Team Membership."
   },
   {
-    "id": "authentication.roles.team_post_all_public.name",
-    "translation": "Post in Public Channels"
+    "id": "app.notification.body.intro.direct.full",
+    "translation": "You have a new direct message."
   },
   {
-    "id": "authentication.roles.team_post_all_public.description",
-    "translation": "A role with the permission to post in any public channel on the team"
+    "id": "app.notification.body.intro.direct.generic",
+    "translation": "You have a new direct message from {{.SenderName}}"
   },
   {
-    "id": "authentication.roles.system_user_access_token.name",
-    "translation": "Personal Access Token"
+    "id": "app.notification.body.intro.notification.full",
+    "translation": "You have a new notification."
   },
   {
-    "id": "authentication.roles.system_user_access_token.description",
-    "translation": "A role with the permissions to create, read and revoke personal access tokens"
+    "id": "app.notification.body.intro.notification.generic",
+    "translation": "You have a new notification from {{.SenderName}}"
   },
   {
-    "id": "authentication.permissions.create_post_public.name",
-    "translation": "Create Posts in Public Channels"
+    "id": "app.notification.body.text.direct.full",
+    "translation": "{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
   },
   {
-    "id": "authentication.permissions.create_post_public.description",
-    "translation": "Ability to create posts in public channels"
+    "id": "app.notification.body.text.direct.generic",
+    "translation": "{{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
   },
   {
-    "id": "authentication.permissions.create_user_access_token.name",
-    "translation": "Create Personal Access Token"
+    "id": "app.notification.body.text.notification.full",
+    "translation": "CHANNEL: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
   },
   {
-    "id": "authentication.permissions.create_user_access_token.description",
-    "translation": "Ability to create personal access tokens"
+    "id": "app.notification.body.text.notification.generic",
+    "translation": "{{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
   },
   {
-    "id": "authentication.permissions.read_user_access_token.name",
-    "translation": "Read Personal Access Tokens"
+    "id": "app.notification.subject.direct.full",
+    "translation": "[{{.SiteName}}] New Direct Message from {{.SenderDisplayName}} on {{.Month}} {{.Day}}, {{.Year}}"
   },
   {
-    "id": "authentication.permissions.read_user_access_token.description",
-    "translation": "Ability to read personal access tokens' id, description and user_id fields"
+    "id": "app.notification.subject.notification.full",
+    "translation": "[{{ .SiteName }}] Notification in {{ .TeamName}} on {{.Month}} {{.Day}}, {{.Year}}"
   },
   {
-    "id": "authentication.permissions.revoke_user_access_token.name",
-    "translation": "Revoke Personal Access Token"
+    "id": "app.user_access_token.disabled",
+    "translation": "Personal access tokens are disabled on this server. Please contact your system administrator for details."
   },
   {
-    "id": "authentication.permissions.revoke_user_access_token.description",
-    "translation": "Ability to revoke personal access tokens"
+    "id": "app.user_access_token.invalid_or_missing",
+    "translation": "Invalid or missing token"
   },
   {
     "id": "authentication.permissions.create_group_channel.description",
@@ -3648,6 +3576,14 @@
     "translation": "Create Group Message"
   },
   {
+    "id": "authentication.permissions.create_post_public.description",
+    "translation": "Ability to create posts in public channels"
+  },
+  {
+    "id": "authentication.permissions.create_post_public.name",
+    "translation": "Create Posts in Public Channels"
+  },
+  {
     "id": "authentication.permissions.create_team_roles.description",
     "translation": "Ability to create new teams"
   },
@@ -3656,6 +3592,14 @@
     "translation": "Create Teams"
   },
   {
+    "id": "authentication.permissions.create_user_access_token.description",
+    "translation": "Ability to create personal access tokens"
+  },
+  {
+    "id": "authentication.permissions.create_user_access_token.name",
+    "translation": "Create Personal Access Token"
+  },
+  {
     "id": "authentication.permissions.manage_jobs.description",
     "translation": "Ability to manage jobs"
   },
@@ -3680,6 +3624,22 @@
     "translation": "Read Public Channels"
   },
   {
+    "id": "authentication.permissions.read_user_access_token.description",
+    "translation": "Ability to read personal access tokens' id, description and user_id fields"
+  },
+  {
+    "id": "authentication.permissions.read_user_access_token.name",
+    "translation": "Read Personal Access Tokens"
+  },
+  {
+    "id": "authentication.permissions.revoke_user_access_token.description",
+    "translation": "Ability to revoke personal access tokens"
+  },
+  {
+    "id": "authentication.permissions.revoke_user_access_token.name",
+    "translation": "Revoke Personal Access Token"
+  },
+  {
     "id": "authentication.permissions.team_invite_user.description",
     "translation": "Ability to invite users to a team"
   },
@@ -3696,6 +3656,46 @@
     "translation": "Use Slash Commands"
   },
   {
+    "id": "authentication.roles.system_post_all.description",
+    "translation": "A role with the permission to post in any public, private or direct channel on the system"
+  },
+  {
+    "id": "authentication.roles.system_post_all.name",
+    "translation": "Post in Public, Private and Direct Channels"
+  },
+  {
+    "id": "authentication.roles.system_post_all_public.description",
+    "translation": "A role with the permission to post in any public channel on the system"
+  },
+  {
+    "id": "authentication.roles.system_post_all_public.name",
+    "translation": "Post in Public Channels"
+  },
+  {
+    "id": "authentication.roles.system_user_access_token.description",
+    "translation": "A role with the permissions to create, read and revoke personal access tokens"
+  },
+  {
+    "id": "authentication.roles.system_user_access_token.name",
+    "translation": "Personal Access Token"
+  },
+  {
+    "id": "authentication.roles.team_post_all.description",
+    "translation": "A role with the permission to post in any public or private channel on the team"
+  },
+  {
+    "id": "authentication.roles.team_post_all.name",
+    "translation": "Post in Public and Private Channels"
+  },
+  {
+    "id": "authentication.roles.team_post_all_public.description",
+    "translation": "A role with the permission to post in any public channel on the team"
+  },
+  {
+    "id": "authentication.roles.team_post_all_public.name",
+    "translation": "Post in Public Channels"
+  },
+  {
     "id": "cli.license.critical",
     "translation": "Feature requires an enterprise license. Please contact your system administrator about upgrading your enterprise license."
   },
@@ -3788,52 +3788,52 @@
     "translation": "Compliance export started for job '{{.JobName}}' at '{{.FilePath}}'"
   },
   {
-    "id": "ent.elasticsearch.delete_post.error",
-    "translation": "Failed to delete the post"
+    "id": "ent.elasticsearch.create_client.connect_failed",
+    "translation": "Setting up Elasticsearch Client Failed"
   },
   {
-    "id": "ent.elasticsearch.index_post.error",
-    "translation": "Failed to index the post"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_create_failed",
+    "translation": "Failed to create Elasticsearch index"
   },
   {
-    "id": "ent.elasticsearch.not_started.error",
-    "translation": "Elasticsearch is not started"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_exists_failed",
+    "translation": "Failed to establish whether Elasticsearch index exists"
   },
   {
-    "id": "ent.elasticsearch.search_posts.disabled",
-    "translation": "Elasticsearch searching is disabled on this server"
+    "id": "ent.elasticsearch.create_index_if_not_exists.index_mapping_failed",
+    "translation": "Failed to setup Elasticsearch index mapping"
   },
   {
-    "id": "ent.elasticsearch.generic.disabled",
-    "translation": "Elasticsearch search is not enabled on this server"
+    "id": "ent.elasticsearch.delete_post.error",
+    "translation": "Failed to delete the post"
   },
   {
-    "id": "ent.elasticsearch.purge_indexes.delete_failed",
-    "translation": "Failed to delete Elasticsearch index"
+    "id": "ent.elasticsearch.generic.disabled",
+    "translation": "Elasticsearch search is not enabled on this server"
   },
   {
-    "id": "ent.elasticsearch.search_posts.search_failed",
-    "translation": "Search failed to complete"
+    "id": "ent.elasticsearch.index_post.error",
+    "translation": "Failed to index the post"
   },
   {
-    "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
-    "translation": "Failed to decode search results"
+    "id": "ent.elasticsearch.not_started.error",
+    "translation": "Elasticsearch is not started"
   },
   {
-    "id": "ent.elasticsearch.create_client.connect_failed",
-    "translation": "Setting up Elasticsearch Client Failed"
+    "id": "ent.elasticsearch.purge_indexes.delete_failed",
+    "translation": "Failed to delete Elasticsearch index"
   },
   {
-    "id": "ent.elasticsearch.create_index_if_not_exists.index_create_failed",
-    "translation": "Failed to create Elasticsearch index"
+    "id": "ent.elasticsearch.search_posts.disabled",
+    "translation": "Elasticsearch searching is disabled on this server"
   },
   {
-    "id": "ent.elasticsearch.create_index_if_not_exists.index_exists_failed",
-    "translation": "Failed to establish whether Elasticsearch index exists"
+    "id": "ent.elasticsearch.search_posts.search_failed",
+    "translation": "Search failed to complete"
   },
   {
-    "id": "ent.elasticsearch.create_index_if_not_exists.index_mapping_failed",
-    "translation": "Failed to setup Elasticsearch index mapping"
+    "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
+    "translation": "Failed to decode search results"
   },
   {
     "id": "ent.elasticsearch.start.index_settings_failed",
@@ -4068,14 +4068,14 @@
     "translation": "Page not found"
   },
   {
-    "id": "jobs.set_job_error.update.error",
-    "translation": "Failed to set job status to error"
-  },
-  {
     "id": "jobs.request_cancellation.status.error",
     "translation": "Could not request cancellation for job that is not in a cancelable state."
   },
   {
+    "id": "jobs.set_job_error.update.error",
+    "translation": "Failed to set job status to error"
+  },
+  {
     "id": "manaultesting.get_channel_id.no_found.debug",
     "translation": "Could not find channel: %v, %v possibilities searched"
   },
@@ -4160,18 +4160,6 @@
     "translation": "Invalid access token"
   },
   {
-    "id": "model.user_access_token.is_valid.token.app_error",
-    "translation": "Invalid access token"
-  },
-  {
-    "id": "model.user_access_token.is_valid.user_id.app_error",
-    "translation": "Invalid user id"
-  },
-  {
-    "id": "model.user_access_token.is_valid.description.app_error",
-    "translation": "Invalid description, must be 255 or less characters"
-  },
-  {
     "id": "model.access.is_valid.client_id.app_error",
     "translation": "Invalid client id"
   },
@@ -4780,22 +4768,22 @@
     "translation": "Invalid user id"
   },
   {
-    "id": "model.job.is_valid.id.app_error",
-    "translation": "Invalid job Id"
-  },
-  {
     "id": "model.job.is_valid.create_at.app_error",
     "translation": "Create at must be a valid time"
   },
   {
-    "id": "model.job.is_valid.type.app_error",
-    "translation": "Invalid job type"
+    "id": "model.job.is_valid.id.app_error",
+    "translation": "Invalid job Id"
   },
   {
     "id": "model.job.is_valid.status.app_error",
     "translation": "Invalid job status"
   },
   {
+    "id": "model.job.is_valid.type.app_error",
+    "translation": "Invalid job type"
+  },
+  {
     "id": "model.oauth.is_valid.app_id.app_error",
     "translation": "Invalid app id"
   },
@@ -5172,6 +5160,18 @@
     "translation": "Invalid username"
   },
   {
+    "id": "model.user_access_token.is_valid.description.app_error",
+    "translation": "Invalid description, must be 255 or less characters"
+  },
+  {
+    "id": "model.user_access_token.is_valid.token.app_error",
+    "translation": "Invalid access token"
+  },
+  {
+    "id": "model.user_access_token.is_valid.user_id.app_error",
+    "translation": "Invalid user id"
+  },
+  {
     "id": "model.utils.decode_json.app_error",
     "translation": "could not decode"
   },
@@ -6216,26 +6216,6 @@
     "translation": "We couldn't update the team name"
   },
   {
-    "id": "store.sql_user_access_token.get_by_user.app_error",
-    "translation": "We couldn't get the personal access tokens by user"
-  },
-  {
-    "id": "store.sql_user_access_token.get_by_token.app_error",
-    "translation": "We couldn't get the personal access token by token"
-  },
-  {
-    "id": "store.sql_user_access_token.get.app_error",
-    "translation": "We couldn't get the personal access token"
-  },
-  {
-    "id": "store.sql_user_access_token.delete.app_error",
-    "translation": "We couldn't delete the personal access token"
-  },
-  {
-    "id": "store.sql_user_access_token.save.app_error",
-    "translation": "We couldn't save the personal access token"
-  },
-  {
     "id": "store.sql_user.analytics_get_inactive_users_count.app_error",
     "translation": "We could not count the inactive users"
   },
@@ -6424,6 +6404,26 @@
     "translation": "Unable to update verify email field"
   },
   {
+    "id": "store.sql_user_access_token.delete.app_error",
+    "translation": "We couldn't delete the personal access token"
+  },
+  {
+    "id": "store.sql_user_access_token.get.app_error",
+    "translation": "We couldn't get the personal access token"
+  },
+  {
+    "id": "store.sql_user_access_token.get_by_token.app_error",
+    "translation": "We couldn't get the personal access token by token"
+  },
+  {
+    "id": "store.sql_user_access_token.get_by_user.app_error",
+    "translation": "We couldn't get the personal access tokens by user"
+  },
+  {
+    "id": "store.sql_user_access_token.save.app_error",
+    "translation": "We couldn't save the personal access token"
+  },
+  {
     "id": "store.sql_webhooks.analytics_incoming_count.app_error",
     "translation": "We couldn't count the incoming webhooks"
   },
@@ -6464,19 +6464,19 @@
     "translation": "We couldn't get the webhooks"
   },
   {
-    "id": "store.sql_webhooks.permanent_delete_incoming_by_user.app_error",
+    "id": "store.sql_webhooks.permanent_delete_incoming_by_channel.app_error",
     "translation": "We couldn't delete the webhook"
   },
   {
-    "id": "store.sql_webhooks.permanent_delete_incoming_by_channel.app_error",
+    "id": "store.sql_webhooks.permanent_delete_incoming_by_user.app_error",
     "translation": "We couldn't delete the webhook"
   },
   {
-    "id": "store.sql_webhooks.permanent_delete_outgoing_by_user.app_error",
+    "id": "store.sql_webhooks.permanent_delete_outgoing_by_channel.app_error",
     "translation": "We couldn't delete the webhook"
   },
   {
-    "id": "store.sql_webhooks.permanent_delete_outgoing_by_channel.app_error",
+    "id": "store.sql_webhooks.permanent_delete_outgoing_by_user.app_error",
     "translation": "We couldn't delete the webhook"
   },
   {
@@ -6508,6 +6508,10 @@
     "translation": "System"
   },
   {
+    "id": "utils.config.add_client_locale.app_error",
+    "translation": "Unable to load mattermost configuration file:  Adding DefaultClientLocale to AvailableLocales."
+  },
+  {
     "id": "utils.config.load_config.decoding.panic",
     "translation": "Error decoding config file={{.Filename}}, err={{.Error}}"
   },
@@ -6528,10 +6532,6 @@
     "translation": "An error occurred while saving the file to {{.Filename}}"
   },
   {
-    "id": "utils.config.add_client_locale.app_error",
-    "translation": "Unable to load mattermost configuration file:  Adding DefaultClientLocale to AvailableLocales."
-  },
-  {
     "id": "utils.config.supported_available_locales.app_error",
     "translation": "Unable to load mattermost configuration file:  AvailableLocales must include DefaultClientLocale. Setting AvailableLocales to all locales as default value."
   },