diff options
| author | enahum <nahumhbl@gmail.com> | 2016-05-18 09:08:54 -0300 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-05-18 08:08:54 -0400 |
| commit | 02f8691fa4ed1df532ac1fc6a79406920282c026 (patch) | |
| tree | b9781f8d1b7ed4f0bc686823ac95905cf000d6c3 /webapp/i18n/en.json | |
| parent | 99b8eef7e373a000f35016415ba2148f939c1155 (diff) | |
| download | chat-02f8691fa4ed1df532ac1fc6a79406920282c026.tar.gz chat-02f8691fa4ed1df532ac1fc6a79406920282c026.tar.bz2 chat-02f8691fa4ed1df532ac1fc6a79406920282c026.zip | |
daily translations 20160517 (#3030)
Diffstat (limited to 'webapp/i18n/en.json')
| -rw-r--r-- | webapp/i18n/en.json | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 9c0a1d341..50f0538fc 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -449,8 +449,8 @@ "admin.sidebar.files": "Files", "admin.sidebar.general": "General", "admin.sidebar.gitlab": "GitLab", - "admin.sidebar.integrations": "Integrations", "admin.sidebar.images": "Images", + "admin.sidebar.integrations": "Integrations", "admin.sidebar.ldap": "LDAP", "admin.sidebar.license": "Edition and License", "admin.sidebar.logging": "Logging", @@ -465,9 +465,9 @@ "admin.sidebar.reports": "SITE REPORTS", "admin.sidebar.rmTeamSidebar": "Remove team from sidebar menu", "admin.sidebar.security": "Security", - "admin.sidebar.sign_up": "Sign Up", "admin.sidebar.sessions": "Sessions", "admin.sidebar.settings": "SETTINGS", + "admin.sidebar.sign_up": "Sign Up", "admin.sidebar.statistics": "Statistics", "admin.sidebar.storage": "Storage", "admin.sidebar.support": "Legal and Support", @@ -1308,14 +1308,14 @@ "user.settings.display.channeldisplaymode": "Select the width of the center channel.", "user.settings.display.clockDisplay": "Clock Display", "user.settings.display.fixedWidthCentered": "Fixed width, centered", - "user.settings.display.messageDisplayTitle": "Message Display", - "user.settings.display.messageDisplayDescription": "Select how messages in a channel should be displayed.", - "user.settings.display.messageDisplayClean": "Clean", - "user.settings.display.messageDisplayCompact": "Compact", "user.settings.display.fontDesc": "Select the font displayed in the Mattermost user interface.", "user.settings.display.fontTitle": "Display Font", "user.settings.display.fullScreen": "Full width", "user.settings.display.language": "Language", + "user.settings.display.messageDisplayClean": "Clean", + "user.settings.display.messageDisplayCompact": "Compact", + "user.settings.display.messageDisplayDescription": "Select how messages in a channel should be displayed.", + "user.settings.display.messageDisplayTitle": "Message Display", "user.settings.display.militaryClock": "24-hour clock (example: 16:00)", "user.settings.display.nameOptsDesc": "Set how to display other user's names in posts and the Direct Messages list.", "user.settings.display.normalClock": "12-hour clock (example: 4:00 PM)", |