summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-05-06 14:37:56 -0300
committerCorey Hulen <corey@hulen.com>2016-05-06 10:37:56 -0700
commitd3f360974bb03993245191e824b38cb17794c40f (patch)
tree1dbcbb1e99e615347b7cf73d6590eb5d28e2c934 /i18n
parent0cfcf5c5decc89a8a8070272f92da0c0ae49693d (diff)
downloadchat-d3f360974bb03993245191e824b38cb17794c40f.tar.gz
chat-d3f360974bb03993245191e824b38cb17794c40f.tar.bz2
chat-d3f360974bb03993245191e824b38cb17794c40f.zip
Spanish locs and sort files by id (#2913)
Diffstat (limited to 'i18n')
-rw-r--r--i18n/en.json16
-rw-r--r--i18n/es.json4
2 files changed, 12 insertions, 8 deletions
diff --git a/i18n/en.json b/i18n/en.json
index df8cf4c2b..9013dbea9 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -380,6 +380,10 @@
"translation": "Logout of Mattermost"
},
{
+ "id": "api.command_logout.fail_message",
+ "translation": "Failed to log out"
+ },
+ {
"id": "api.command_logout.name",
"translation": "logout"
},
@@ -388,10 +392,6 @@
"translation": "Logging out..."
},
{
- "id": "api.command_logout.fail_message",
- "translation": "Failed to log out"
- },
- {
"id": "api.command_me.desc",
"translation": "Do an action"
},
@@ -2308,10 +2308,6 @@
"translation": "Invalid connection security for LDAP settings. Must be '', 'TLS', or 'STARTTLS'"
},
{
- "id": "model.config.is_valid.restrict_direct_message.app_error",
- "translation": "Invalid direct message restriction. Must be 'any', or 'team'"
- },
- {
"id": "model.config.is_valid.listen_address.app_error",
"translation": "Invalid listen address for service settings Must be set."
},
@@ -2332,6 +2328,10 @@
"translation": "Invalid per sec for rate limit settings. Must be a positive number"
},
{
+ "id": "model.config.is_valid.restrict_direct_message.app_error",
+ "translation": "Invalid direct message restriction. Must be 'any', or 'team'"
+ },
+ {
"id": "model.config.is_valid.sql_data_src.app_error",
"translation": "Invalid data source for SQL settings. Must be set."
},
diff --git a/i18n/es.json b/i18n/es.json
index 5836644d8..54438b879 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -380,6 +380,10 @@
"translation": "Salir de Mattermost"
},
{
+ "id": "api.command_logout.fail_message",
+ "translation": "Falla al cerrar la sesiĆ³n"
+ },
+ {
"id": "api.command_logout.name",
"translation": "salir"
},