add missing locs and fix a few others (#3952)

1 files changed, 33 insertions, 29 deletions

diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 8b9e31496..2c2b63ee6 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -141,9 +141,9 @@
   "admin.audits.title": "User Activity Logs",
   "admin.authentication.email": "Email Auth",
   "admin.authentication.gitlab": "GitLab",
+  "admin.authentication.ldap": "AD/LDAP",
   "admin.authentication.oauth": "OAuth 2.0",
   "admin.authentication.saml": "SAML",
-  "admin.authentication.ldap": "AD/LDAP",
   "admin.banner.heading": "Note:",
   "admin.cluster.enableDescription": "When true, Mattermost will run in High Availability mode. Please see <a href=\"http://docs.mattermost.com/deployment/cluster.html\" target=\"_blank\">documentation</a> to learn more about configuring High Availability for Mattermost.",
   "admin.cluster.enableTitle": "Enable High Availability Mode:",
@@ -435,12 +435,12 @@
   "admin.ldap.skipCertificateVerification": "Skip Certificate Verification:",
   "admin.ldap.skipCertificateVerificationDesc": "Skips the certificate verification step for TLS or STARTTLS connections. Not recommended for production environments where TLS is required. For testing only.",
   "admin.ldap.syncFailure": "Sync Failure: {error}",
-  "admin.ldap.testFailure": "LDAP Test Failure: {error}",
-  "admin.ldap.testHelpText": "Tests if the Mattermost server can connect to the LDAP server specified. See log file for more detailed error messages.",
   "admin.ldap.syncIntervalHelpText": "LDAP Synchronization updates Mattermost user information to reflect updates on the LDAP server. For example, when a user’s name changes on the LDAP server, the change updates in Mattermost when synchronization is performed. Accounts removed from or disabled in the LDAP server have their Mattermost accounts set to “Inactive” and have their account sessions revoked. Mattermost performs synchronization on the interval entered. For example, if 60 is entered, Mattermost synchronizes every 60 minutes.",
   "admin.ldap.syncIntervalTitle": "Synchronization Interval (minutes):",
   "admin.ldap.syncNowHelpText": "Initiates an LDAP synchronization immediately.",
   "admin.ldap.sync_button": "LDAP Synchronize Now",
+  "admin.ldap.testFailure": "LDAP Test Failure: {error}",
+  "admin.ldap.testHelpText": "Tests if the Mattermost server can connect to the LDAP server specified. See log file for more detailed error messages.",
   "admin.ldap.uernameAttrDesc": "The attribute in the LDAP server that will be used to populate the username field in Mattermost. This may be the same as the ID Attribute.",
   "admin.ldap.userFilterDisc": "(Optional) Enter an LDAP Filter to use when searching for user objects. Only the users selected by the query will be able to access Mattermost. For Active Directory, the query to filter out disabled users is (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).",
   "admin.ldap.userFilterEx": "Ex. \"(objectClass=user)\"",
@@ -1061,7 +1061,7 @@
   "create_post.comment": "Comment",
   "create_post.post": "Post",
   "create_post.shortcutsNotSupported": "Keyboard shortcuts are not supported on your device.",
-  "create_post.tutorialTip": "<h4>Sending Messages</h4><p>Type here to write a message and press <strong>Enter</strong> to post it.</p><p>Click the <strong>Attachment</strong> button to upload an image or a file.</p>",
+  "create_post.tutorialTip": "<h4>Sending Messages</h4><p>Type here to write a message and press <strong>ENTER</strong> to post it.</p><p>Click the <strong>Attachment</strong> button to upload an image or a file.</p>",
   "create_post.write": "Write a message...",
   "create_team.agreement": "By proceeding to create your account and use {siteName}, you agree to our <a href='/static/help/terms.html'>Terms of Service</a> and <a href='/static/help/privacy.html'>Privacy Policy</a>. If you do not agree, you cannot use {siteName}.",
   "create_team.display_name.back": "Back to previous step",
@@ -1226,7 +1226,7 @@
   "help.composing.deleting": "## Deleting a message\nDelete a message by clicking the **[...]** icon next to any message text that you’ve composed, then click **Delete**. System and Team Admins can delete any message on their system or team.",
   "help.composing.editing": "## Editing a Message\nEdit a message by clicking the **[...]** icon next to any message text that you’ve composed, then click **Edit**. After making modifications to the message text, press **ENTER** to save the modifications. Message edits do not trigger new @mention notifications, desktop notifications or notification sounds.",
   "help.composing.linking": "## Linking to a message\nThe **Permalink** feature creates a link to any message. Sharing this link with other users in the channel lets them view the linked message in the Message Archives. Users who are not a member of the channel where the message was posted cannot view the permalink. Get the permalink to any message by clicking the **[...]** icon next to the message text  > **Permalink** > **Copy Link**.",
-  "help.composing.posting": "## Posting a Message\nWrite a message by typing into the text input box, then press **ENTER** to send it. Use **Shift + ENTER** to create a new line without sending a message. To send messages by pressing **Ctrl+Enter** go to **Main Menu > Account Settings > Send messages on Ctrl + Enter**.",
+  "help.composing.posting": "## Posting a Message\nWrite a message by typing into the text input box, then press **ENTER** to send it. Use **Shift + ENTER** to create a new line without sending a message. To send messages by pressing **CTRL+ENTER** go to **Main Menu > Account Settings > Send messages on CTRL + ENTER**.",
   "help.composing.posts": "#### Posts\nPosts can be considered parent messages. They are the messages that often start a thread of replies. Posts are composed and sent from the text input box at the bottom of the center pane.",
   "help.composing.replies": "#### Replies\nReply to a message by clicking the reply icon next to any message text. This action opens the right-hand-side (RHS) where you can see the message thread, then compose and send your reply. Replies are indented slightly in the center pane to indicate that they are child messages of a parent post.\n\nWhen composing a reply in the right-hand side, click the expand/collapse icon with two arrows at the top of the sidebar to make things easier to read.",
   "help.composing.title": "# Sending Messages\n_____",
@@ -1250,7 +1250,7 @@
   "help.formatting.lines": "## Lines\n\nCreate a line by using three `*`, `_`, or `-`.",
   "help.formatting.linkEx": "[Check out Mattermost!](https://about.mattermost.com/)",
   "help.formatting.links": "## Links\n\nCreate labeled links by putting the desired text in square brackets and the associated link in normal brackets.",
-  "help.formatting.listExample": "* list item one\n* list item two\n    * item two sub-point')",
+  "help.formatting.listExample": "* list item one\n* list item two\n    * item two sub-point",
   "help.formatting.lists": "## Lists\n\nCreate a list by using `*` or `-` as bullets. Indent a bullet point by adding two spaces in front of it.",
   "help.formatting.monokaiTheme": "**Monokai Theme**",
   "help.formatting.ordered": "Make it an ordered list by using numbers instead:",
@@ -1563,6 +1563,10 @@
   "search_results.because": "<ul><li>If you're searching a partial phrase (ex. searching \"rea\", looking for \"reach\" or \"reaction\"), append a * to your search term.</li><li>Two letter searches and common words like \"this\", \"a\" and \"is\" won't appear in search results due to excessive results returned.</li></ul>",
   "search_results.noResults": "No results found. Try again?",
   "search_results.usage": "<ul><li>Use <b>\"quotation marks\"</b> to search for phrases</li><li>Use <b>from:</b> to find posts from specific users and <b>in:</b> to find posts in specific channels</li></ul>",
+  "search_results.usageFlag1": "You haven't flagged any messages yet.",
+  "search_results.usageFlag2": "You can add a flag to messages and comments by clicking the ",
+  "search_results.usageFlag3": " icon next to the timestamp.",
+  "search_results.usageFlag4": "Flags are a way to mark messages for follow up. Your flags are personal, and cannot be seen by other users.",
   "setting_item_max.cancel": "Cancel",
   "setting_item_max.save": "Save",
   "setting_item_min.edit": "Edit",
@@ -1732,8 +1736,8 @@
   "user.settings.advance.on": "On",
   "user.settings.advance.preReleaseDesc": "Check any pre-released features you'd like to preview.  You may also need to refresh the page before the setting will take effect.",
   "user.settings.advance.preReleaseTitle": "Preview pre-release features",
-  "user.settings.advance.sendDesc": "If enabled 'Enter' inserts a new line and 'Ctrl + Enter' submits the message.",
-  "user.settings.advance.sendTitle": "Send messages on Ctrl + Enter",
+  "user.settings.advance.sendDesc": "If enabled 'ENTER' inserts a new line and 'CTRL + ENTER' submits the message.",
+  "user.settings.advance.sendTitle": "Send messages on CTRL + ENTER",
   "user.settings.advance.slashCmd_autocmp": "Enable external application to offer slash command autocomplete",
   "user.settings.advance.title": "Advanced Settings",
   "user.settings.custom_theme.awayIndicator": "Away Indicator",
@@ -1865,40 +1869,40 @@
   "user.settings.notifications.allActivity": "For all activity",
   "user.settings.notifications.channelWide": "Channel-wide mentions \"@channel\", \"@all\"",
   "user.settings.notifications.close": "Close",
- "user.settings.notifications.comments": "Reply notifications",
+  "user.settings.notifications.comments": "Reply notifications",
   "user.settings.notifications.commentsAny": "Trigger notifications on messages in reply threads that I start or participate in",
   "user.settings.notifications.commentsInfo": "In addition to notifications for when you're mentioned, select if you would like to receive notifications on reply threads.",
   "user.settings.notifications.commentsNever": "Do not trigger notifications on messages in reply threads unless I'm mentioned",
   "user.settings.notifications.commentsRoot": "Trigger notifications on messages in threads that I start",
   "user.settings.notifications.desktop": "Send desktop notifications",
-  "user.settings.notifications.desktop.mentionsFirefoxForever": "For mentions and direct messages, shown indefinitely",
-  "user.settings.notifications.desktop.mentionsFirefoxTimed": "For mentions and direct messages, shown for {seconds} seconds",
-  "user.settings.notifications.desktop.mentionsNoSoundForever": "For mentions and direct messages, without sound, shown indefinitely",
-  "user.settings.notifications.desktop.mentionsNoSoundTimed": "For mentions and direct messages, without sound, shown for {seconds} seconds",
-  "user.settings.notifications.desktop.mentionsSoundForever": "For mentions and direct messages, with sound, shown indefinitely",
-  "user.settings.notifications.desktop.mentionsSoundTimed": "For mentions and direct messages, with sound, shown for {seconds} seconds",
   "user.settings.notifications.desktop.allFirefoxForever": "For all activity, shown indefinitely",
   "user.settings.notifications.desktop.allFirefoxTimed": "For all activity, shown for {seconds} seconds",
   "user.settings.notifications.desktop.allNoSoundForever": "For all activity, without sound, shown indefinitely",
   "user.settings.notifications.desktop.allNoSoundTimed": "For all activity, without sound, shown for {seconds} seconds",
   "user.settings.notifications.desktop.allSoundForever": "For all activity, with sound, shown indefinitely",
   "user.settings.notifications.desktop.allSoundTimed": "For all activity, with sound, shown for {seconds} seconds",
-  "user.settings.notifications.desktop.title": "Desktop notifications",
-  "user.settings.notifications.desktop.unlimited": "Unlimited",
-  "user.settings.notifications.desktop.seconds": "{seconds} seconds",
-  "user.settings.notifications.desktop.durationInfo": "Sets how long desktop notifications will remain on screen.",
   "user.settings.notifications.desktop.duration": "Notification duration",
+  "user.settings.notifications.desktop.durationInfo": "Sets how long desktop notifications will remain on screen.",
+  "user.settings.notifications.desktop.mentionsFirefoxForever": "For mentions and direct messages, shown indefinitely",
+  "user.settings.notifications.desktop.mentionsFirefoxTimed": "For mentions and direct messages, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.mentionsNoSoundForever": "For mentions and direct messages, without sound, shown indefinitely",
+  "user.settings.notifications.desktop.mentionsNoSoundTimed": "For mentions and direct messages, without sound, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.mentionsSoundForever": "For mentions and direct messages, with sound, shown indefinitely",
+  "user.settings.notifications.desktop.mentionsSoundTimed": "For mentions and direct messages, with sound, shown for {seconds} seconds",
+  "user.settings.notifications.desktop.seconds": "{seconds} seconds",
   "user.settings.notifications.desktop.sound": "Notification sound",
+  "user.settings.notifications.desktop.title": "Desktop notifications",
+  "user.settings.notifications.desktop.unlimited": "Unlimited",
   "user.settings.notifications.desktopSounds": "Desktop notification sounds",
+  "user.settings.notifications.email.everyHour": "Every hour",
+  "user.settings.notifications.email.everyXMinutes": "Every {count, plural, one {minute} other {{count, number} minutes}}",
+  "user.settings.notifications.email.immediately": "Immediately",
+  "user.settings.notifications.email.never": "Never",
   "user.settings.notifications.emailBatchingInfo": "Notifications received over the time period selected are combined and sent in a single email.",
   "user.settings.notifications.emailInfo": "Email notifications are sent for mentions and direct messages when you are offline or away from {siteName} for more than 5 minutes.",
   "user.settings.notifications.emailNotifications": "Email notifications",
-  "user.settings.notifications.everyHour": "Every hour",
-  "user.settings.notifications.everyXMinutes": "Every {count, plural, one {minute} other {{count, number} minutes}}",
   "user.settings.notifications.header": "Notifications",
-  "user.settings.notifications.immediately": "Immediately",
   "user.settings.notifications.info": "Desktop notifications are available on Firefox, Safari, and Chrome.",
-  "user.settings.notifications.never": "Never",
   "user.settings.notifications.noWords": "No words configured",
   "user.settings.notifications.off": "Off",
   "user.settings.notifications.on": "On",
@@ -1932,6 +1936,7 @@
   "user.settings.security.close": "Close",
   "user.settings.security.currentPassword": "Current Password",
   "user.settings.security.currentPasswordError": "Please enter your current password.",
+  "user.settings.security.deauthorize": "Deauthorize",
   "user.settings.security.emailPwd": "Email and Password",
   "user.settings.security.gitlab": "GitLab",
   "user.settings.security.google": "Google",
@@ -1942,6 +1947,10 @@
   "user.settings.security.logoutActiveSessions": "View and Logout of Active Sessions",
   "user.settings.security.method": "Sign-in Method",
   "user.settings.security.newPassword": "New Password",
+  "user.settings.security.noApps": "No OAuth 2.0 Applications are authorized.",
+  "user.settings.security.oauthApps": "OAuth 2.0 Applications",
+  "user.settings.security.oauthAppsDescription": "Click 'Edit' to manage your OAuth 2.0 Applications",
+  "user.settings.security.oauthAppsHelp": "Applications act on your behalf to access your data based on the permissions you grant them.",
   "user.settings.security.office365": "Office 365",
   "user.settings.security.oneSignin": "You may only have one sign-in method at a time. Switching sign-in method will send an email notifying you if the change was successful.",
   "user.settings.security.password": "Password",
@@ -1986,10 +1995,5 @@
   "web.footer.terms": "Terms",
   "web.header.back": "Back",
   "web.root.signup_info": "All team communication in one place, searchable and accessible anywhere",
-  "youtube_video.notFound": "Video not found",
-  "user.settings.security.deauthorize": "Deauthorize",
-  "user.settings.security.noApps": "No OAuth 2.0 Applications are authorized.",
-  "user.settings.security.oauthApps": "OAuth 2.0 Applications",
-  "user.settings.security.oauthAppsDescription": "Click 'Edit' to manage your OAuth 2.0 Applications",
-  "user.settings.security.oauthAppsHelp": "Applications act on your behalf to access your data based on the permissions you grant them."
+  "youtube_video.notFound": "Video not found"
 }