summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-10-17 09:06:39 -0300
committerChristopher Speller <crspeller@gmail.com>2016-10-17 08:06:39 -0400
commitfbd1aa654c4d6762fe653d2b8499617cb81b6b74 (patch)
treec720ec575000cc1a9a456e6bdb9f549a8fdf1167
parente18e41d29d32ae8e3e7879765a403f552e85af1f (diff)
downloadchat-fbd1aa654c4d6762fe653d2b8499617cb81b6b74.tar.gz
chat-fbd1aa654c4d6762fe653d2b8499617cb81b6b74.tar.bz2
chat-fbd1aa654c4d6762fe653d2b8499617cb81b6b74.zip
Fix a couple of strings in localization (#4228)
-rw-r--r--i18n/en.json2
-rw-r--r--webapp/i18n/en.json2
2 files changed, 2 insertions, 2 deletions
diff --git a/i18n/en.json b/i18n/en.json
index 5ef941cfd..4e213d446 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -625,7 +625,7 @@
},
{
"id": "api.command_shortcuts.msgs",
- "translation": "#### Messages\n\n#### Messages\n\nALT+[click on a message]: Set a message as your oldest unread message in the current channel\nESC: Mark all messages in the current channel as read\nCTRL+UP (in empty input field): Reprint the previous message or slash command you entered\nCTRL+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
+ "translation": "#### Messages\n\nALT+[click on a message]: Set a message as your oldest unread message in the current channel\nESC: Mark all messages in the current channel as read\nCTRL+UP (in empty input field): Reprint the previous message or slash command you entered\nCTRL+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n"
},
{
"id": "api.command_shortcuts.msgs_mac",
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 81dc5cdc3..75787f8ae 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -1989,7 +1989,7 @@
"user.settings.security.google": "Google",
"user.settings.security.lastUpdated": "Last updated {date} at {time}",
"user.settings.security.ldap": "AD/LDAP",
- "user.settings.security.loginGitlab": "Login done through Gitlab",
+ "user.settings.security.loginGitlab": "Login done through GitLab",
"user.settings.security.loginLdap": "Login done through AD/LDAP",
"user.settings.security.logoutActiveSessions": "View and Logout of Active Sessions",
"user.settings.security.method": "Sign-in Method",