translations PR 20170703 (#6836)

* translations PR 20170703

* Fix bad merge

1 files changed, 10 insertions, 4 deletions

diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 0bb7f4231..37f636bab 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -881,12 +881,12 @@
   "admin.team.restrictTitle": "Restrict account creation to specified email domains:",
   "admin.team.restrict_direct_message_any": "Any user on the Mattermost server",
   "admin.team.restrict_direct_message_team": "Any member of the team",
-  "admin.team.siteNameDescription": "Name of service shown in login screens and UI.",
-  "admin.team.siteNameExample": "E.g.: \"Mattermost\"",
-  "admin.team.siteNameTitle": "Site Name:",
   "admin.team.showFullname": "Show first and last name (default)",
   "admin.team.showNickname": "Show nickname if one exists, otherwise show first and last name",
   "admin.team.showUsername": "Show username",
+  "admin.team.siteNameDescription": "Name of service shown in login screens and UI.",
+  "admin.team.siteNameExample": "E.g.: \"Mattermost\"",
+  "admin.team.siteNameTitle": "Site Name:",
   "admin.team.teamCreationDescription": "When false, only System Administrators can create teams.",
   "admin.team.teamCreationTitle": "Enable Team Creation: ",
   "admin.team.teammateNameDisplay": "Teammate Name Display:",
@@ -1116,13 +1116,13 @@
   "channel_invite.close": "Close",
   "channel_loader.connection_error": "There appears to be a problem with your internet connection.",
   "channel_loader.posted": "Posted",
+  "channel_loader.postedImage": " posted an image",
   "channel_loader.socketError": "Please check connection, Mattermost unreachable. If issue persists, ask administrator to <a href=\"https://about.mattermost.com/default-websocket-port-help\" target=\"_blank\">check WebSocket port</a>.",
   "channel_loader.someone": "Someone",
   "channel_loader.something": " did something new",
   "channel_loader.unknown_error": "We received an unexpected status code from the server.",
   "channel_loader.uploadedFile": " uploaded a file",
   "channel_loader.uploadedImage": " uploaded an image",
-  "channel_loader.postedImage": " posted an image",
   "channel_loader.wrote": " wrote: ",
   "channel_members_dropdown.channel_admin": "Channel Admin",
   "channel_members_dropdown.channel_member": "Channel Member",
@@ -1720,6 +1720,9 @@
   "mobile.custom_list.no_results": "No Results",
   "mobile.drawer.teamsTitle": "Teams",
   "mobile.edit_post.title": "Editing Message",
+  "mobile.error_handler.button": "Relaunch",
+  "mobile.error_handler.description": "\nClick relaunch to open the app again. After restart, you can report the problem from the settings menu.\n",
+  "mobile.error_handler.title": "Unexpected error occurred",
   "mobile.file_upload.camera": "Take Photo or Video",
   "mobile.file_upload.library": "Photo Library",
   "mobile.file_upload.more": "More",
@@ -1771,6 +1774,9 @@
   "mobile.select_team.join_open": "Open teams you can join",
   "mobile.select_team.no_teams": "There are no available teams for you to join.",
   "mobile.server_ping_failed": "Cannot connect to the server. Please check your server URL and internet connection.",
+  "mobile.server_upgrade.button": "OK",
+  "mobile.server_upgrade.description": "\nA server upgrade is required to use the Mattermost app. Please ask your System Administrator for details.\n",
+  "mobile.server_upgrade.title": "Server upgrade required",
   "mobile.server_url.invalid_format": "URL must start with http:// or https://",
   "mobile.session_expired": "Session Expired: Please log in to continue receiving notifications.",
   "mobile.settings.team_selection": "Team Selection",