summaryrefslogtreecommitdiffstats
path: root/i18n/en.json
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2017-04-27 09:57:26 -0300
committerGitHub <noreply@github.com>2017-04-27 09:57:26 -0300
commit4e086311ad869a2de6a115afa0ae9bf56ad8639e (patch)
tree9e429a06482fa2160b614dd6341675ec0e8a261d /i18n/en.json
parentaaff58844220331eeac1c523a8b0b9b572d5e8f5 (diff)
downloadchat-4e086311ad869a2de6a115afa0ae9bf56ad8639e.tar.gz
chat-4e086311ad869a2de6a115afa0ae9bf56ad8639e.tar.bz2
chat-4e086311ad869a2de6a115afa0ae9bf56ad8639e.zip
translations PR 20170424 (#6224)
Diffstat (limited to 'i18n/en.json')
-rw-r--r--i18n/en.json24
1 files changed, 12 insertions, 12 deletions
diff --git a/i18n/en.json b/i18n/en.json
index fa380c095..83d0b83e2 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -444,10 +444,6 @@
"translation": "Initializing command API routes"
},
{
- "id": "api.emoji.init.debug",
- "translation": "Initializing emoji API routes"
- },
- {
"id": "api.command.invite_people.desc",
"translation": "Send an email invite to your Mattermost team"
},
@@ -1006,6 +1002,10 @@
"translation": "Initializing emoji API routes"
},
{
+ "id": "api.emoji.init.debug",
+ "translation": "Initializing emoji API routes"
+ },
+ {
"id": "api.emoji.storage.app_error",
"translation": "File storage not configured properly. Please configure for either S3 or local server file storage."
},
@@ -3612,14 +3612,14 @@
"translation": "Expires in must be set"
},
{
- "id": "model.authorize.is_valid.response_type.app_error",
- "translation": "Invalid response type"
- },
- {
"id": "model.authorize.is_valid.redirect_uri.app_error",
"translation": "Invalid redirect uri"
},
{
+ "id": "model.authorize.is_valid.response_type.app_error",
+ "translation": "Invalid response type"
+ },
+ {
"id": "model.authorize.is_valid.scope.app_error",
"translation": "Invalid scope"
},
@@ -5208,14 +5208,14 @@
"translation": "You cannot update an existing Post"
},
{
- "id": "store.sql_post.search.warn",
- "translation": "Query error searching posts: %v"
- },
- {
"id": "store.sql_post.search.disabled",
"translation": "Searching has been disabled on this server. Please contact your System Administrator."
},
{
+ "id": "store.sql_post.search.warn",
+ "translation": "Query error searching posts: %v"
+ },
+ {
"id": "store.sql_post.update.app_error",
"translation": "We couldn't update the Post"
},