summaryrefslogtreecommitdiffstats
path: root/webapp/i18n/en.json
diff options
context:
space:
mode:
Diffstat (limited to 'webapp/i18n/en.json')
-rwxr-xr-xwebapp/i18n/en.json8
1 files changed, 4 insertions, 4 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 08497a42f..68b898e7e 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -1721,11 +1721,11 @@
"post_info.mobile.flag": "Flag",
"post_info.mobile.unflag": "Unflag",
"post_info.permalink": "Permalink",
+ "post_info.pin": "Pin to channel",
+ "post_info.pinned": "Pinned",
"post_info.reply": "Reply",
"post_info.system": "System",
- "post_info.pin": "Pin to channel",
"post_info.unpin": "Un-pin from channel",
- "post_info.pinned": "Pinned",
"post_message_view.edited": "(edited)",
"posts_view.loadMore": "Load more messages",
"posts_view.newMsg": "New Messages",
@@ -2193,6 +2193,7 @@
"user.settings.push_notification.send": "Send mobile push notifications",
"user.settings.push_notification.status": "Trigger push notifications when",
"user.settings.push_notification.status_info": "Notification alerts are only pushed to your mobile device when your online status matches the selection above.",
+ "user.settings.security.active": "Active",
"user.settings.security.close": "Close",
"user.settings.security.currentPassword": "Current Password",
"user.settings.security.currentPasswordError": "Please enter your current password.",
@@ -2200,6 +2201,7 @@
"user.settings.security.emailPwd": "Email and Password",
"user.settings.security.gitlab": "GitLab",
"user.settings.security.google": "Google",
+ "user.settings.security.inactive": "Inactive",
"user.settings.security.lastUpdated": "Last updated {date} at {time}",
"user.settings.security.ldap": "AD/LDAP",
"user.settings.security.loginGitlab": "Login done through GitLab",
@@ -2250,8 +2252,6 @@
"user.settings.security.switchSaml": "Switch to using SAML SSO",
"user.settings.security.title": "Security Settings",
"user.settings.security.viewHistory": "View Access History",
- "user.settings.security.active": "Active",
- "user.settings.security.inactive": "Inactive",
"user_list.notFound": "No users found",
"user_profile.send.dm": "Send Message",
"user_profile.webrtc.call": "Start Video Call",