diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-04-05 09:02:31 -0400 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-04-05 09:02:31 -0400 |
commit | da686718a5e56db8fdbed2b41520fceb00519c49 (patch) | |
tree | 3178e5c10b93bdd2f92d9e8f33733bfa6b1167bf /i18n/en.json | |
parent | a9458480d5615f233e1665081eb11a45974ba774 (diff) | |
parent | 2e12b1e7938e67cc280d23cf780b36de29dac0be (diff) | |
download | chat-da686718a5e56db8fdbed2b41520fceb00519c49.tar.gz chat-da686718a5e56db8fdbed2b41520fceb00519c49.tar.bz2 chat-da686718a5e56db8fdbed2b41520fceb00519c49.zip |
Merge pull request #2635 from ZBoxApp/es-locs
Localization: Added missing spanish strings. Sort localization files …
Diffstat (limited to 'i18n/en.json')
-rw-r--r-- | i18n/en.json | 112 |
1 files changed, 56 insertions, 56 deletions
diff --git a/i18n/en.json b/i18n/en.json index 0dca6ca04..a4c84a462 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -316,38 +316,6 @@ "translation": "echo" }, { - "id": "api.command_msg.desc", - "translation": "Send Direct Message to a user" - }, - { - "id": "api.command_msg.fail.app_error", - "translation": "An error occured while messaging the user." - }, - { - "id": "api.command_msg.dm_fail.app_error", - "translation": "An error occured while creating the direct message." - }, - { - "id": "api.command_msg.hint", - "translation": "@[username] 'message'" - }, - { - "id": "api.command_msg.list.app_error", - "translation": "An error occured while listing users." - }, - { - "id": "api.command_msg.missing.app_error", - "translation": "We couldn't find the user" - }, - { - "id": "api.command_msg.name", - "translation": "message" - }, - { - "id": "api.command_msg.success", - "translation": "Messaged user." - }, - { "id": "api.command_join.desc", "translation": "Join the open channel" }, @@ -400,6 +368,38 @@ "translation": "me" }, { + "id": "api.command_msg.desc", + "translation": "Send Direct Message to a user" + }, + { + "id": "api.command_msg.dm_fail.app_error", + "translation": "An error occured while creating the direct message." + }, + { + "id": "api.command_msg.fail.app_error", + "translation": "An error occured while messaging the user." + }, + { + "id": "api.command_msg.hint", + "translation": "@[username] 'message'" + }, + { + "id": "api.command_msg.list.app_error", + "translation": "An error occured while listing users." + }, + { + "id": "api.command_msg.missing.app_error", + "translation": "We couldn't find the user" + }, + { + "id": "api.command_msg.name", + "translation": "message" + }, + { + "id": "api.command_msg.success", + "translation": "Messaged user." + }, + { "id": "api.command_shrug.desc", "translation": "Adds ¯\\_(ツ)_/¯ to your message" }, @@ -1860,6 +1860,30 @@ "translation": "Error trying to authenticate MFA token" }, { + "id": "error.generic.link_message", + "translation": "Back to Mattermost" + }, + { + "id": "error.generic.message", + "translation": "An error has occoured." + }, + { + "id": "error.generic.title", + "translation": "Error" + }, + { + "id": "error.not_found.link_message", + "translation": "Back to Mattermost" + }, + { + "id": "error.not_found.message", + "translation": "The page you where trying to reach does not exist." + }, + { + "id": "error.not_found.title", + "translation": "Page not found" + }, + { "id": "manaultesting.get_channel_id.no_found.debug", "translation": "Could not find channel: %v, %v possibilites searched" }, @@ -3794,29 +3818,5 @@ { "id": "web.watcher_fail.error", "translation": "Failed to add directory to watcher %v" - }, - { - "id": "error.not_found.title", - "translation": "Page not found" - }, - { - "id": "error.not_found.message", - "translation": "The page you where trying to reach does not exist." - }, - { - "id": "error.not_found.link_message", - "translation": "Back to Mattermost" - }, - { - "id": "error.generic.title", - "translation": "Error" - }, - { - "id": "error.generic.message", - "translation": "An error has occoured." - }, - { - "id": "error.generic.link_message", - "translation": "Back to Mattermost" } ] |