translations PR 20170904 (#7371)

1 files changed, 64 insertions, 46 deletions

diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index d53559826..635c619a3 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -820,11 +820,11 @@
   "admin.service.iconTitle": "Enable integrations to override profile picture icons:",
   "admin.service.insecureTlsDesc": "When true, any outgoing HTTPS requests will accept unverified, self-signed certificates. For example, outgoing webhooks to a server with a self-signed TLS certificate, using any domain, will be allowed. Note that this makes these connections susceptible to man-in-the-middle attacks.",
   "admin.service.insecureTlsTitle": "Enable Insecure Outgoing Connections: ",
-  "admin.service.internalConnectionsDesc": "In testing environments, such as when developing integrations locally on a development machine, use this setting to specify domains, IP addresses, or CIDR notations to allow internal connections. <b>Not recommended for use in production</b>, since this can allow a user to extract confidential data from your server or internal network.<br /><br />By default, user-supplied URLs such as those used for Open Graph metadata, webhooks, or slash commands will not be allowed to connect to reserved IP addresses including loopback or link-local addresses used for internal networks. Push notification, OAuth 2.0 and WebRTC server URLs are trusted and not affected by this setting.",
-  "admin.service.internalConnectionsTitle": "Allow untrusted internal connections to: ",
-  "admin.service.internalConnectionsEx": "webhooks.internal.example.com 127.0.0.1 10.0.16.0/28",
   "admin.service.integrationAdmin": "Restrict managing integrations to Admins:",
   "admin.service.integrationAdminDesc": "When true, webhooks and slash commands can only be created, edited and viewed by Team and System Admins, and OAuth 2.0 applications by System Admins. Integrations are available to all users after they have been created by the Admin.",
+  "admin.service.internalConnectionsDesc": "In testing environments, such as when developing integrations locally on a development machine, use this setting to specify domains, IP addresses, or CIDR notations to allow internal connections. <b>Not recommended for use in production</b>, since this can allow a user to extract confidential data from your server or internal network.<br /><br />By default, user-supplied URLs such as those used for Open Graph metadata, webhooks, or slash commands will not be allowed to connect to reserved IP addresses including loopback or link-local addresses used for internal networks. Push notification, OAuth 2.0 and WebRTC server URLs are trusted and not affected by this setting.",
+  "admin.service.internalConnectionsEx": "webhooks.internal.example.com 127.0.0.1 10.0.16.0/28",
+  "admin.service.internalConnectionsTitle": "Allow untrusted internal connections to: ",
   "admin.service.letsEncryptCertificateCacheFile": "Let's Encrypt Certificate Cache File:",
   "admin.service.letsEncryptCertificateCacheFileDescription": "Certificates retrieved and other data about the Let's Encrypt service will be stored in this file.",
   "admin.service.listenAddress": "Listen Address:",
@@ -1847,6 +1847,15 @@
   "mobile.custom_list.no_results": "No Results",
   "mobile.drawer.teamsTitle": "Teams",
   "mobile.edit_post.title": "Editing Message",
+  "mobile.emoji_picker.activity": "ACTIVITY",
+  "mobile.emoji_picker.custom": "CUSTOM",
+  "mobile.emoji_picker.flags": "FLAGS",
+  "mobile.emoji_picker.foods": "FOODS",
+  "mobile.emoji_picker.nature": "NATURE",
+  "mobile.emoji_picker.objects": "OBJECTS",
+  "mobile.emoji_picker.people": "PEOPLE",
+  "mobile.emoji_picker.places": "PLACES",
+  "mobile.emoji_picker.symbols": "SYMBOLS",
   "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",
@@ -1855,6 +1864,7 @@
   "mobile.file_upload.more": "More",
   "mobile.file_upload.video": "Video Library",
   "mobile.help.title": "Help",
+  "mobile.image_preview.save": "Save Image",
   "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}!",
@@ -1863,6 +1873,11 @@
   "mobile.loading_members": "Loading Members...",
   "mobile.loading_posts": "Loading Messages...",
   "mobile.login_options.choose_title": "Choose your login method",
+  "mobile.managed.blocked_by": "Blocked by {vendor}",
+  "mobile.managed.exit": "Exit",
+  "mobile.managed.jailbreak": "Jailbroken devices are not trusted by {vendor}, please exit the app.",
+  "mobile.managed.secured_by": "Secured by {vendor}",
+  "mobile.markdown.code.plusMoreLines": "+{count, number} more lines",
   "mobile.more_dms.start": "Start",
   "mobile.more_dms.title": "New Conversation",
   "mobile.notice_mobile_link": "mobile apps",
@@ -1881,6 +1896,7 @@
   "mobile.post.failed_retry": "Try Again",
   "mobile.post.failed_title": "Unable to send your message",
   "mobile.post.retry": "Refresh",
+  "mobile.post_info.add_reaction": "Add Reaction",
   "mobile.request.invalid_response": "Received invalid response from the server.",
   "mobile.routes.channelInfo": "Info",
   "mobile.routes.channelInfo.createdBy": "Created by {creator} on ",
@@ -1890,6 +1906,8 @@
   "mobile.routes.channel_members.action_message": "You must select at least one member to remove from the channel.",
   "mobile.routes.channel_members.action_message_confirm": "Are you sure you want to remove the selected members from the channel?",
   "mobile.routes.channels": "Channels",
+  "mobile.routes.code": "{language} Code",
+  "mobile.routes.code.noLanguage": "Code",
   "mobile.routes.enterServerUrl": "Enter Server URL",
   "mobile.routes.login": "Login",
   "mobile.routes.loginOptions": "Login Chooser",
@@ -2122,61 +2140,61 @@
   "setting_upload.import": "Import",
   "setting_upload.noFile": "No file selected.",
   "setting_upload.select": "Select file",
-  "shortcuts.info": "Begin a message with / for a list of all the commands at your disposal.",
-  "shortcuts.header": "Keyboard Shortcuts",
-  "shortcuts.nav.header": "Navigation",
-  "shortcuts.nav.prev": "Previous channel:\tAlt|Up",
-  "shortcuts.nav.prev.mac": "Previous channel:\t⌥|Up",
-  "shortcuts.nav.next": "Next channel:\tAlt|Down",
-  "shortcuts.nav.next.mac": "Next channel:\t⌥|Down",
-  "shortcuts.nav.unread_prev": "Previous unread channel:\tAlt|Shift|Up",
-  "shortcuts.nav.unread_prev.mac": "Previous unread channel:\t⌥|Shift|Up",
-  "shortcuts.nav.unread_next": "Next unread channel:\tAlt|Shift|Down",
-  "shortcuts.nav.unread_next.mac": "Next unread channel:\t⌥|Shift|Down",
-  "shortcuts.nav.switcher": "Quick channel switcher:\tCtrl|K",
-  "shortcuts.nav.switcher.mac": "Quick channel switcher:\t⌘|K",
-  "shortcuts.nav.direct_messages_menu": "Direct messages menu:\tCtrl|Shift|K",
-  "shortcuts.nav.direct_messages_menu.mac": "Direct messages menu:\t⌘|Shift|K",
-  "shortcuts.nav.settings": "Account settings:\tCtrl|Shift|A",
-  "shortcuts.nav.settings.mac": "Account settings:\t⌘|Shift|A",
-  "shortcuts.nav.recent_mentions": "Recent mentions:\tCtrl|Shift|M",
-  "shortcuts.nav.recent_mentions.mac": "Recent mentions:\t⌘|Shift|M",
-  "shortcuts.msgs.header": "Messages",
-  "shortcuts.msgs.mark_as_read": "Mark current channel as read:\tEsc",
-  "shortcuts.msgs.input.header": "Works inside an empty input field",
-  "shortcuts.msgs.edit": "Edit last message in channel:\tUp",
-  "shortcuts.msgs.reply": "Reply to last message in channel:\tShift|Up",
-  "shortcuts.msgs.reprint_prev": "Reprint previous message:\tCtrl|Up",
-  "shortcuts.msgs.reprint_prev.mac": "Reprint previous message:\t⌘|Up",
-  "shortcuts.msgs.reprint_next": "Reprint next message:\tCtrl|Down",
-  "shortcuts.msgs.reprint_next.mac": "Reprint next message:\t⌘|Down",
-  "shortcuts.msgs.comp.header": "Autocomplete",
-  "shortcuts.msgs.comp.username": "Username:\t@|[a-z]|Tab",
-  "shortcuts.msgs.comp.channel": "Channel:\t~|[a-z]|Tab",
-  "shortcuts.msgs.comp.emoji": "Emoji:\t:|[a-z]|Tab",
-  "shortcuts.files.header": "Files",
-  "shortcuts.files.upload": "Upload files:\tCtrl|U",
-  "shortcuts.files.upload.mac": "Upload files:\t⌘|U",
-  "shortcuts.browser.header": "Built-in Browser Commands",
-  "shortcuts.browser.channel_prev": "Back in history:\tAlt|Left",
-  "shortcuts.browser.channel_prev.mac": "Back in history:\t⌘|[",
   "shortcuts.browser.channel_next": "Forward in history:\tAlt|Right",
   "shortcuts.browser.channel_next.mac": "Forward in history:\t⌘|]",
-  "shortcuts.browser.font_increase": "Zoom in:\tCtrl|+",
-  "shortcuts.browser.font_increase.mac": "Zoom in:\t⌘|+",
+  "shortcuts.browser.channel_prev": "Back in history:\tAlt|Left",
+  "shortcuts.browser.channel_prev.mac": "Back in history:\t⌘|[",
   "shortcuts.browser.font_decrease": "Zoom out:\tCtrl|-",
   "shortcuts.browser.font_decrease.mac": "Zoom out:\t⌘|-",
-  "shortcuts.browser.input.header": "Works inside an input field",
-  "shortcuts.browser.highlight_prev": "Highlight text to the previous line:\tShift|Up",
+  "shortcuts.browser.font_increase": "Zoom in:\tCtrl|+",
+  "shortcuts.browser.font_increase.mac": "Zoom in:\t⌘|+",
+  "shortcuts.browser.header": "Built-in Browser Commands",
   "shortcuts.browser.highlight_next": "Highlight text to the next line:\tShift|Down",
+  "shortcuts.browser.highlight_prev": "Highlight text to the previous line:\tShift|Up",
+  "shortcuts.browser.input.header": "Works inside an input field",
   "shortcuts.browser.newline": "Create a new line:\tShift|Enter",
+  "shortcuts.files.header": "Files",
+  "shortcuts.files.upload": "Upload files:\tCtrl|U",
+  "shortcuts.files.upload.mac": "Upload files:\t⌘|U",
+  "shortcuts.header": "Keyboard Shortcuts",
+  "shortcuts.info": "Begin a message with / for a list of all the commands at your disposal.",
+  "shortcuts.msgs.comp.channel": "Channel:\t~|[a-z]|Tab",
+  "shortcuts.msgs.comp.emoji": "Emoji:\t:|[a-z]|Tab",
+  "shortcuts.msgs.comp.header": "Autocomplete",
+  "shortcuts.msgs.comp.username": "Username:\t@|[a-z]|Tab",
+  "shortcuts.msgs.edit": "Edit last message in channel:\tUp",
+  "shortcuts.msgs.header": "Messages",
+  "shortcuts.msgs.input.header": "Works inside an empty input field",
+  "shortcuts.msgs.mark_as_read": "Mark current channel as read:\tEsc",
+  "shortcuts.msgs.reply": "Reply to last message in channel:\tShift|Up",
+  "shortcuts.msgs.reprint_next": "Reprint next message:\tCtrl|Down",
+  "shortcuts.msgs.reprint_next.mac": "Reprint next message:\t⌘|Down",
+  "shortcuts.msgs.reprint_prev": "Reprint previous message:\tCtrl|Up",
+  "shortcuts.msgs.reprint_prev.mac": "Reprint previous message:\t⌘|Up",
+  "shortcuts.nav.direct_messages_menu": "Direct messages menu:\tCtrl|Shift|K",
+  "shortcuts.nav.direct_messages_menu.mac": "Direct messages menu:\t⌘|Shift|K",
+  "shortcuts.nav.header": "Navigation",
+  "shortcuts.nav.next": "Next channel:\tAlt|Down",
+  "shortcuts.nav.next.mac": "Next channel:\t⌥|Down",
+  "shortcuts.nav.prev": "Previous channel:\tAlt|Up",
+  "shortcuts.nav.prev.mac": "Previous channel:\t⌥|Up",
+  "shortcuts.nav.recent_mentions": "Recent mentions:\tCtrl|Shift|M",
+  "shortcuts.nav.recent_mentions.mac": "Recent mentions:\t⌘|Shift|M",
+  "shortcuts.nav.settings": "Account settings:\tCtrl|Shift|A",
+  "shortcuts.nav.settings.mac": "Account settings:\t⌘|Shift|A",
+  "shortcuts.nav.switcher": "Quick channel switcher:\tCtrl|K",
+  "shortcuts.nav.switcher.mac": "Quick channel switcher:\t⌘|K",
+  "shortcuts.nav.unread_next": "Next unread channel:\tAlt|Shift|Down",
+  "shortcuts.nav.unread_next.mac": "Next unread channel:\t⌥|Shift|Down",
+  "shortcuts.nav.unread_prev": "Previous unread channel:\tAlt|Shift|Up",
+  "shortcuts.nav.unread_prev.mac": "Previous unread channel:\t⌥|Shift|Up",
   "sidebar.channels": "PUBLIC CHANNELS",
-  "sidebar.mainMenu": "Main Menu",
   "sidebar.createChannel": "Create new public channel",
   "sidebar.createGroup": "Create new private channel",
   "sidebar.direct": "DIRECT MESSAGES",
   "sidebar.favorite": "FAVORITE CHANNELS",
   "sidebar.leave": "Leave channel",
+  "sidebar.mainMenu": "Main Menu",
   "sidebar.more": "More",
   "sidebar.moreElips": "More...",
   "sidebar.otherMembers": "Outside this team",