translations PR 20170424 (#6224)

1 files changed, 14 insertions, 8 deletions

diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 4de4c155d..02dc7cd0a 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -699,8 +699,8 @@
   "admin.service.corsTitle": "Enable cross-origin requests from:",
   "admin.service.developerDesc": "When true, JavaScript errors are shown in a purple bar at the top of the user interface. Not recommended for use in production. ",
   "admin.service.developerTitle": "Enable Developer Mode: ",
-  "admin.service.enforceMfaTitle": "Enforce Multi-factor Authentication:",
   "admin.service.enforceMfaDesc": "When true, <a href='https://docs.mattermost.com/deployment/auth.html' target='_blank'>multi-factor authentication</a> is required for login. New users will be required to configure MFA on signup. Logged in users without MFA configured are redirected to the MFA setup page until configuration is complete.<br/><br/>If your system has users with login methods other than AD/LDAP and email, MFA must be enforced with the authentication provider outside of Mattermost.",
+  "admin.service.enforceMfaTitle": "Enforce Multi-factor Authentication:",
   "admin.service.forward80To443": "Forward port 80 to 443:",
   "admin.service.forward80To443Description": "Forwards all insecure traffic from port 80 to secure port 443",
   "admin.service.googleDescription": "Set this key to enable the display of titles for embedded YouTube video previews. Without the key, YouTube previews will still be created based on hyperlinks appearing in messages or comments but they will not show the video title. View a <a href=\"https://www.youtube.com/watch?v=Im69kzhpR3I\" target='_blank'>Google Developers Tutorial</a> for instructions on how to obtain a key.",
@@ -1138,7 +1138,6 @@
   "channel_modal.publicChannel2": "Create a new public channel anyone can join. ",
   "channel_modal.purpose": "Purpose",
   "channel_modal.purposeEx": "E.g.: \"A channel to file bugs and improvements\"",
-  "channel_notifications.push": "Send mobile push notifications",
   "channel_notifications.allActivity": "For all activity",
   "channel_notifications.allUnread": "For all unread messages",
   "channel_notifications.globalDefault": "Global default ({notifyLevel})",
@@ -1148,6 +1147,7 @@
   "channel_notifications.override": "Selecting an option other than \"Default\" will override the global notification settings. Desktop notifications are available on Firefox, Safari, and Chrome.",
   "channel_notifications.overridePush": "Selecting an option other than \"Global default\" will override the global notification settings for mobile push notifications in account settings. Push notifications must be enabled by the System Admin.",
   "channel_notifications.preferences": "Notification Preferences for ",
+  "channel_notifications.push": "Send mobile push notifications",
   "channel_notifications.sendDesktop": "Send desktop notifications",
   "channel_notifications.unreadInfo": "The channel name is bolded in the sidebar when there are unread messages. Selecting \"Only for mentions\" will bold the channel only when you are mentioned.",
   "channel_select.placeholder": "--- Select a channel ---",
@@ -1253,8 +1253,8 @@
   "edit_channel_header_modal.save": "Save",
   "edit_channel_header_modal.title": "Edit Header for {channel}",
   "edit_channel_header_modal.title_dm": "Edit Header",
-  "edit_channel_purpose_modal.body": "Describe how this channel should be used. This text appears in the channel list in the \"More...\" menu and helps others decide whether to join.",
   "edit_channel_private_purpose_modal.body": "This text appears in the \"View Info\" modal of the private channel.",
+  "edit_channel_purpose_modal.body": "Describe how this channel should be used. This text appears in the channel list in the \"More...\" menu and helps others decide whether to join.",
   "edit_channel_purpose_modal.cancel": "Cancel",
   "edit_channel_purpose_modal.error": "This channel purpose is too long, please enter a shorter one",
   "edit_channel_purpose_modal.save": "Save",
@@ -1548,15 +1548,14 @@
   "integrations.outgoingWebhook.description": "Outgoing webhooks allow external integrations to receive and respond to messages",
   "integrations.outgoingWebhook.title": "Outgoing Webhook",
   "integrations.successful": "Setup Successful",
-  "intro_messages.channel": "channel",
   "intro_messages.DM": "This is the start of your direct message history with {teammate}.<br />Direct messages and files shared here are not shown to people outside this area.",
+  "intro_messages.GM": "This is the start of your group message history with {names}.<br />Messages and files shared here are not shown to people outside this area.",
   "intro_messages.anyMember": " Any member can join and read this channel.",
   "intro_messages.beginning": "Beginning of {name}",
   "intro_messages.channel": "channel",
   "intro_messages.creator": "This is the start of the {name} {type}, created by {creator} on {date}.",
   "intro_messages.default": "<h4 class='channel-intro__title'>Beginning of {display_name}</h4><p class='channel-intro__content'><strong>Welcome to {display_name}!</strong><br/><br/>Post messages here that you want everyone to see. Everyone automatically becomes a permanent member of this channel when they join the team.</p>",
   "intro_messages.group": "private channel",
-  "intro_messages.GM": "This is the start of your group message history with {names}.<br />Messages and files shared here are not shown to people outside this area.",
   "intro_messages.group_message": "This is the start of your group message history with these teammates. Messages and files shared here are not shown to people outside this area.",
   "intro_messages.invite": "Invite others to this {type}",
   "intro_messages.inviteOthers": "Invite others to this team",
@@ -1667,7 +1666,7 @@
   "mobile.account_notifications.threads_mentions": "Mentions in threads",
   "mobile.account_notifications.threads_start": "Threads that I start",
   "mobile.account_notifications.threads_start_participate": "Threads that I start or participate in",
-  "mobile.channel_info.alertMessageDeleteChannel": "Are you sure you want to delete the {term} with {name}?",
+  "mobile.channel_info.alertMessageDeleteChannel": "Are you sure you want to delete the {term} {name}?",
   "mobile.channel_info.alertMessageLeaveChannel": "Are you sure you want to leave the {term} {name}?",
   "mobile.channel_info.alertNo": "No",
   "mobile.channel_info.alertTitleDeleteChannel": "Delete {term}",
@@ -1695,20 +1694,27 @@
   "mobile.components.select_server_view.proceed": "Proceed",
   "mobile.components.select_server_view.siteUrlPlaceholder": "https://mattermost.example.com",
   "mobile.create_channel": "Create",
-  "mobile.create_channel.private": "New Private Group",
+  "mobile.create_channel.private": "New Private Channel",
   "mobile.create_channel.public": "New Public Channel",
   "mobile.custom_list.no_results": "No Results",
   "mobile.edit_post.title": "Editing Message",
   "mobile.file_upload.camera": "Take Photo or Video",
   "mobile.file_upload.library": "Photo Library",
   "mobile.file_upload.more": "More",
+  "mobile.intro_messages.DM": "This is the start of your direct message history with {teammate}. Direct messages and files shared here are not shown to people outside this area.",
+  "mobile.intro_messages.default_message": "This is the first channel teammates see when they sign up - use it for posting updates everyone needs to know.",
+  "mobile.intro_messages.default_welcome": "Welcome to {name}!",
   "mobile.loading_channels": "Loading Channels...",
   "mobile.loading_members": "Loading Members...",
   "mobile.loading_posts": "Loading Messages...",
   "mobile.login_options.choose_title": "Choose your login method",
+  "mobile.offlineIndicator.connected": "Connected",
+  "mobile.offlineIndicator.connecting": "Connecting...",
+  "mobile.offlineIndicator.offline": "No internet connection",
   "mobile.post.cancel": "Cancel",
   "mobile.post.delete_question": "Are you sure you want to delete this post?",
   "mobile.post.delete_title": "Delete Post",
+  "mobile.post.retry": "Refresh",
   "mobile.request.invalid_response": "Received invalid response from the server.",
   "mobile.routes.channelInfo": "Info",
   "mobile.routes.channelInfo.createdBy": "Created by {creator} on ",
@@ -1749,8 +1755,8 @@
   "msg_typing.areTyping": "{users} and {last} are typing...",
   "msg_typing.isTyping": "{user} is typing...",
   "msg_typing.someone": "Someone",
-  "multiselect.go": "Go",
   "multiselect.add": "Add",
+  "multiselect.go": "Go",
   "multiselect.instructions": "Use up/down arrows to navigate and enter to select",
   "multiselect.numPeopleRemaining": "You can add {num, number} more {num, plural, =0 {people} one {person} other {people}}. ",
   "multiselect.numRemaining": "You can add {num, number} more",