translations PR 20170606 (#6592)

1 files changed, 13 insertions, 12 deletions

diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index dedf97d68..25c671f47 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -319,19 +319,19 @@
   "admin.general.localization.serverLocaleTitle": "Default Server Language:",
   "admin.general.log": "Logging",
   "admin.general.policy": "Policy",
-  "admin.general.policy.enableBannerTitle": "Enable Announcement Banner:",
-  "admin.general.policy.enableBannerDesc": "Enable an announcement banner across all teams.",
-  "admin.general.policy.bannerTextTitle": "Banner Text:",
-  "admin.general.policy.bannerTextDesc": "Text that will appear in the announcement banner.",
-  "admin.general.policy.bannerColorTitle": "Banner Color:",
-  "admin.general.policy.bannerTextColorTitle": "Banner Text Color:",
-  "admin.general.policy.allowBannerDismissalTitle": "Allow Banner Dismissal:",
   "admin.general.policy.allowBannerDismissalDesc": "When true, users can dismiss the banner until its next update. When false, the banner is permanently visible until it is turned off by the System Admin.",
+  "admin.general.policy.allowBannerDismissalTitle": "Allow Banner Dismissal:",
   "admin.general.policy.allowEditPostAlways": "Any time",
   "admin.general.policy.allowEditPostDescription": "Set policy on the length of time authors have to edit their messages after posting.",
   "admin.general.policy.allowEditPostNever": "Never",
   "admin.general.policy.allowEditPostTimeLimit": "seconds after posting",
   "admin.general.policy.allowEditPostTitle": "Allow users to edit their messages:",
+  "admin.general.policy.bannerColorTitle": "Banner Color:",
+  "admin.general.policy.bannerTextColorTitle": "Banner Text Color:",
+  "admin.general.policy.bannerTextDesc": "Text that will appear in the announcement banner.",
+  "admin.general.policy.bannerTextTitle": "Banner Text:",
+  "admin.general.policy.enableBannerDesc": "Enable an announcement banner across all teams.",
+  "admin.general.policy.enableBannerTitle": "Enable Announcement Banner:",
   "admin.general.policy.permissionsAdmin": "Team and System Admins",
   "admin.general.policy.permissionsAll": "All team members",
   "admin.general.policy.permissionsAllChannel": "All channel members",
@@ -1272,9 +1272,6 @@
   "delete_post.warning": "This post has {count} comment(s) on it.",
   "edit_channel_header.editHeader": "Edit the Channel Header...",
   "edit_channel_header.previewHeader": "Edit header",
-  "notify_all.title.confirm": "Confirm sending notifications to entire channel",
-  "notify_all.question": "By using @all or @channel you are about to send notifications to {totalMembers} people. Are you sure you want to do this?",
-  "notify_all.confirm": "Confirm",
   "edit_channel_header_modal.cancel": "Cancel",
   "edit_channel_header_modal.description": "Edit the text appearing next to the channel name in the channel header.",
   "edit_channel_header_modal.error": "This channel header is too long, please enter a shorter one",
@@ -1774,6 +1771,7 @@
   "mobile.routes.user_profile": "Profile",
   "mobile.routes.user_profile.send_message": "Send Message",
   "mobile.select_team.choose": "Your teams:",
+  "mobile.select_team.join_open": "Open teams you can join",
   "mobile.server_ping_failed": "Cannot connect to the server. Please check your server URL and internet connection.",
   "mobile.server_url.invalid_format": "URL must start with http:// or https://",
   "mobile.session_expired": "Session Expired: Please log in to continue receiving notifications.",
@@ -1841,6 +1839,9 @@
   "navbar_dropdown.teamSettings": "Team Settings",
   "navbar_dropdown.viewMembers": "View Members",
   "notification.dm": "Direct Message",
+  "notify_all.confirm": "Confirm",
+  "notify_all.question": "By using @all or @channel you are about to send notifications to {totalMembers} people. Are you sure you want to do this?",
+  "notify_all.title.confirm": "Confirm sending notifications to entire channel",
   "passwordRequirements": "Password Requirements:",
   "password_form.change": "Change my password",
   "password_form.click": "Click <a href={url}>here</a> to log in.",
@@ -2048,14 +2049,14 @@
   "sso_signup.team_error": "Please enter a team name",
   "suggestion.loading": "Loading...",
   "suggestion.mention.all": "CAUTION: This mentions everyone in channel",
-  "suggestion.mention.in_channel": "Channels",
-  "suggestion.mention.not_in_channel": "Other Channels",
   "suggestion.mention.channel": "Notifies everyone in the channel",
   "suggestion.mention.channels": "My Channels",
   "suggestion.mention.here": "Notifies everyone in the channel and online",
+  "suggestion.mention.in_channel": "Channels",
   "suggestion.mention.members": "Channel Members",
   "suggestion.mention.morechannels": "Other Channels",
   "suggestion.mention.nonmembers": "Not in Channel",
+  "suggestion.mention.not_in_channel": "Other Channels",
   "suggestion.mention.special": "Special Mentions",
   "suggestion.search.private": "Private Channels",
   "suggestion.search.public": "Public Channels",