Add latest spanish translations (#2836)

1 files changed, 60 insertions, 60 deletions

diff --git a/i18n/en.json b/i18n/en.json
index b1087b8fb..138a1ace1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -656,6 +656,10 @@
     "translation": "Error saving post. user=%v, message=%v"
   },
   {
+    "id": "api.import.import_user.join_team.error",
+    "translation": "Failed to join team when importing err=%v"
+  },
+  {
     "id": "api.import.import_user.joining_default.error",
     "translation": "Encountered an issue joining default channels user_id=%s, team_id=%s, err=%v"
   },
@@ -668,10 +672,6 @@
     "translation": "Failed to set email verified err=%v"
   },
   {
-    "id": "api.import.import_user.join_team.error",
-    "translation": "Failed to join team when importing err=%v"
-  },
-  {
     "id": "api.license.add_license.array.app_error",
     "translation": "Empty array under 'license' in request"
   },
@@ -988,6 +988,10 @@
     "translation": "\r\n Channels Added \r\n"
   },
   {
+    "id": "api.slackimport.slack_add_channels.failed_to_add_user",
+    "translation": "Failed to add user to channel: {{.Username}}\r\n"
+  },
+  {
     "id": "api.slackimport.slack_add_channels.import_failed",
     "translation": "Failed to import: {{.DisplayName}}\r\n"
   },
@@ -1000,10 +1004,6 @@
     "translation": "Merged with existing channel: {{.DisplayName}}\r\n"
   },
   {
-    "id": "api.slackimport.slack_add_channels.failed_to_add_user",
-    "translation": "Failed to add user to channel: {{.Username}}\r\n"
-  },
-  {
     "id": "api.slackimport.slack_add_posts.bot.warn",
     "translation": "Slack bot posts are not imported yet"
   },
@@ -1044,10 +1044,6 @@
     "translation": "Mattermost Slack Import Log\r\n"
   },
   {
-    "id": "api.slackimport.slack_import.team_fail",
-    "translation": "Failed to get team to import into.\r\n"
-  },
-  {
     "id": "api.slackimport.slack_import.note1",
     "translation": "- Some posts may not have been imported because they where not supported by this importer.\r\n"
   },
@@ -1064,6 +1060,10 @@
     "translation": "Unable to open: {{.Filename}}"
   },
   {
+    "id": "api.slackimport.slack_import.team_fail",
+    "translation": "Failed to get team to import into.\r\n"
+  },
+  {
     "id": "api.slackimport.slack_import.zip.app_error",
     "translation": "Unable to open zip file"
   },
@@ -1324,14 +1324,6 @@
     "translation": "{{ .SiteName }} Team Setup"
   },
   {
-    "id": "api.templates.upgrade_30_subject.info",
-    "translation": "[MATTERMOST] Changes to your account for Mattermost 3.0 Upgrade"
-  },
-  {
-    "id": "api.templates.upgrade_30_body.info",
-    "translation": "<h3 style='font-weight: normal; margin-top: 10px;'>YOUR DUPLICATE ACCOUNTS HAVE BEEN UPDATED</h3>Your Mattermost server is being upgraded to Version 3.0, which lets you use a single account across multiple teams.<br/><br/>You are receiving this email because the upgrade process has detected your account had the same email or username as other accounts on the server.<br/><br/>The following updates have been made: <br/><br/>{{if .EmailChanged }}- The duplicate email of an account on the `/{{.TeamName}}` team was changed to `{{.Email}}`. If you use email and password to login, you can use this new email address for login.<br/><br/>{{end}}{{if .UsernameChanged }}- The duplicate username of an account on the team site `/{{.TeamName}}` has been changed to `{{.Username}}` to avoid confusion with other accounts.<br/><br/>{{end}} RECOMMENDED ACTION: <br/><br/>It is recommended that you login to your teams used by your duplicate accounts and add your primary account to the team and any public channels and private groups which you wish to continue using. <br/><br/>This gives your primary account access to all public channel and private group history. You can continue to access the direct message history of your duplicate accounts by logging in with their credentials. <br/><br/>FOR MORE INFORMATION: <br/><br/>For more information on the upgrade to Mattermost 3.0 please see: <a href='http://www.mattermost.org/upgrading-to-mattermost-3-0/'>http://www.mattermost.org/upgrading-to-mattermost-3-0/</a><br/><br/>"
-  },
-  {
     "id": "api.templates.singin_change_email.body.info",
     "translation": "You updated your sign-in method for on {{ .SiteName }} to {{.Method}}.<br>If this change wasn't initiated by you, please contact your system administrator."
   },
@@ -1340,6 +1332,14 @@
     "translation": "You updated your sign-in method on {{ .SiteName }}"
   },
   {
+    "id": "api.templates.upgrade_30_body.info",
+    "translation": "<h3 style='font-weight: normal; margin-top: 10px;'>YOUR DUPLICATE ACCOUNTS HAVE BEEN UPDATED</h3>Your Mattermost server is being upgraded to Version 3.0, which lets you use a single account across multiple teams.<br/><br/>You are receiving this email because the upgrade process has detected your account had the same email or username as other accounts on the server.<br/><br/>The following updates have been made: <br/><br/>{{if .EmailChanged }}- The duplicate email of an account on the `/{{.TeamName}}` team was changed to `{{.Email}}`. If you use email and password to login, you can use this new email address for login.<br/><br/>{{end}}{{if .UsernameChanged }}- The duplicate username of an account on the team site `/{{.TeamName}}` has been changed to `{{.Username}}` to avoid confusion with other accounts.<br/><br/>{{end}} RECOMMENDED ACTION: <br/><br/>It is recommended that you login to your teams used by your duplicate accounts and add your primary account to the team and any public channels and private groups which you wish to continue using. <br/><br/>This gives your primary account access to all public channel and private group history. You can continue to access the direct message history of your duplicate accounts by logging in with their credentials. <br/><br/>FOR MORE INFORMATION: <br/><br/>For more information on the upgrade to Mattermost 3.0 please see: <a href='http://www.mattermost.org/upgrading-to-mattermost-3-0/'>http://www.mattermost.org/upgrading-to-mattermost-3-0/</a><br/><br/>"
+  },
+  {
+    "id": "api.templates.upgrade_30_subject.info",
+    "translation": "[MATTERMOST] Changes to your account for Mattermost 3.0 Upgrade"
+  },
+  {
     "id": "api.templates.verify_body.button",
     "translation": "Verify Email"
   },
@@ -1472,10 +1472,6 @@
     "translation": "Could not add user initial to default profile picture"
   },
   {
-    "id": "api.user.create_user.no_open_server",
-    "translation": "This server does not allow open signups.  Please speak with your Administrator to receive an invitation."
-  },
-  {
     "id": "api.user.create_user.accepted_domain.app_error",
     "translation": "The email you provided does not belong to an accepted domain. Please contact your administrator or sign up with a different email."
   },
@@ -1484,6 +1480,10 @@
     "translation": "Encountered an issue joining default channels user_id=%s, team_id=%s, err=%v"
   },
   {
+    "id": "api.user.create_user.no_open_server",
+    "translation": "This server does not allow open signups.  Please speak with your Administrator to receive an invitation."
+  },
+  {
     "id": "api.user.create_user.save.error",
     "translation": "Couldn't save the user err=%v"
   },
@@ -1784,6 +1784,10 @@
     "translation": "Incoming webhooks have been disabled by the system admin."
   },
   {
+    "id": "api.webhook.create_outgoing.disabled.app_error",
+    "translation": "Outgoing webhooks have been disabled by the system admin."
+  },
+  {
     "id": "api.webhook.create_outgoing.not_open.app_error",
     "translation": "Outgoing webhooks can only be created for public channels."
   },
@@ -1792,10 +1796,6 @@
     "translation": "Inappropriate permissions to create outcoming webhook."
   },
   {
-    "id": "api.webhook.create_outgoing.disabled.app_error",
-    "translation": "Outgoing webhooks have been disabled by the system admin."
-  },
-  {
     "id": "api.webhook.create_outgoing.triggers.app_error",
     "translation": "Either trigger_words or channel_id must be set"
   },
@@ -2148,18 +2148,6 @@
     "translation": "Invalid type"
   },
   {
-    "id": "model.team_member.is_valid.team_id.app_error",
-    "translation": "Invalid team id"
-  },
-  {
-    "id": "model.team_member.is_valid.user_id.app_error",
-    "translation": "Invalid user id"
-  },
-  {
-    "id": "model.team_member.is_valid.role.app_error",
-    "translation": "Invalid role"
-  },
-  {
     "id": "model.channel.is_valid.update_at.app_error",
     "translation": "Update at must be a valid time"
   },
@@ -2592,6 +2580,18 @@
     "translation": "Invalid URL Identifier"
   },
   {
+    "id": "model.team_member.is_valid.role.app_error",
+    "translation": "Invalid role"
+  },
+  {
+    "id": "model.team_member.is_valid.team_id.app_error",
+    "translation": "Invalid team id"
+  },
+  {
+    "id": "model.team_member.is_valid.user_id.app_error",
+    "translation": "Invalid user id"
+  },
+  {
     "id": "model.user.is_valid.auth_data.app_error",
     "translation": "Invalid auth data"
   },
@@ -2868,14 +2868,14 @@
     "translation": "We couldn't get all the channels"
   },
   {
-    "id": "store.sql_channel.get_member.missing.app_error",
-    "translation": "No channel member found for that user id and channel id"
-  },
-  {
     "id": "store.sql_channel.get_member.app_error",
     "translation": "We couldn't get the channel member"
   },
   {
+    "id": "store.sql_channel.get_member.missing.app_error",
+    "translation": "No channel member found for that user id and channel id"
+  },
+  {
     "id": "store.sql_channel.get_member_count.app_error",
     "translation": "We couldn't get the channel member count"
   },
@@ -2996,22 +2996,6 @@
     "translation": "We encountered an error updating the channel member"
   },
   {
-    "id": "store.sql_team.save_member.exists.app_error",
-    "translation": "A team member with that id already exists"
-  },
-  {
-    "id": "store.sql_team.save_member.save.app_error",
-    "translation": "We couldn't save the team member"
-  },
-  {
-    "id": "store.sql_team.get_members.app_error",
-    "translation": "We couldn't get the team members"
-  },
-  {
-    "id": "store.sql_team.remove_member.app_error",
-    "translation": "We couldn't remove the team member"
-  },
-  {
     "id": "store.sql_command.analytics_command_count.app_error",
     "translation": "We couldn't count the commands"
   },
@@ -3380,6 +3364,10 @@
     "translation": "We couldn't find the existing team"
   },
   {
+    "id": "store.sql_team.get_members.app_error",
+    "translation": "We couldn't get the team members"
+  },
+  {
     "id": "store.sql_team.get_teams_for_email.app_error",
     "translation": "We encountered a problem when looking up teams"
   },
@@ -3388,6 +3376,10 @@
     "translation": "We couldn't delete the existing team"
   },
   {
+    "id": "store.sql_team.remove_member.app_error",
+    "translation": "We couldn't remove the team member"
+  },
+  {
     "id": "store.sql_team.save.app_error",
     "translation": "We couldn't save the team"
   },
@@ -3400,6 +3392,14 @@
     "translation": "Must call update for exisiting team"
   },
   {
+    "id": "store.sql_team.save_member.exists.app_error",
+    "translation": "A team member with that id already exists"
+  },
+  {
+    "id": "store.sql_team.save_member.save.app_error",
+    "translation": "We couldn't save the team member"
+  },
+  {
     "id": "store.sql_team.update.app_error",
     "translation": "We couldn't update the team"
   },