diff options
author | Corey Hulen <corey@hulen.com> | 2016-02-04 19:30:23 -0800 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-02-04 19:30:23 -0800 |
commit | b6f29fd128b05049b18f066ceaa583173f91f085 (patch) | |
tree | 4af8acec1e1b8699b83e698a2fb6af9fd402b7d6 /i18n/en.json | |
parent | ccfdfdfce2f9b697baf28041193b39bceb3bd5dc (diff) | |
parent | c73345e492cd1ff82a489cc057dfbd840fb26659 (diff) | |
download | chat-b6f29fd128b05049b18f066ceaa583173f91f085.tar.gz chat-b6f29fd128b05049b18f066ceaa583173f91f085.tar.bz2 chat-b6f29fd128b05049b18f066ceaa583173f91f085.zip |
Merge pull request #2080 from ZBoxApp/PLT-7-locs
New localizations messages
Diffstat (limited to 'i18n/en.json')
-rw-r--r-- | i18n/en.json | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/i18n/en.json b/i18n/en.json index 88d857fce..aeeaf576b 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -680,14 +680,14 @@ "translation": "Error getting access token from DB before deletion" }, { - "id": "api.post.check_for_out_of_channel_mentions.message.one", - "translation": "{{.Username}} was mentioned, but they do not belong to this channel." - }, - { "id": "api.post.check_for_out_of_channel_mentions.message.multiple", "translation": "{{.Usernames}} and {{.LastUsername}} were mentioned, but they do not belong to this channel." }, { + "id": "api.post.check_for_out_of_channel_mentions.message.one", + "translation": "{{.Username}} was mentioned, but they do not belong to this channel." + }, + { "id": "api.post.create_post.bad_filename.error", "translation": "Bad filename discarded, filename=%v" }, @@ -1748,10 +1748,6 @@ "translation": "Unable to get channels" }, { - "id": "mattermost.load_license.find.warn", - "translation": "Unable to find active license" - }, - { "id": "mattermost.bulletin.subject", "translation": "Mattermost Security Bulletin" }, @@ -1768,6 +1764,10 @@ "translation": "Enterprise Enabled: %v" }, { + "id": "mattermost.load_license.find.warn", + "translation": "Unable to find active license" + }, + { "id": "mattermost.security_bulletin.error", "translation": "Failed to get security bulletin details" }, @@ -2664,6 +2664,18 @@ "translation": "We couldn't update the command" }, { + "id": "store.sql_license.get.app_error", + "translation": "We encountered an error getting the license" + }, + { + "id": "store.sql_license.get.missing.app_error", + "translation": "A license with that ID was not found" + }, + { + "id": "store.sql_license.save.app_error", + "translation": "We encountered an error saving the license" + }, + { "id": "store.sql_oauth.get_access_data.app_error", "translation": "We encountered an error finding the access token" }, @@ -2936,18 +2948,6 @@ "translation": "We encountered an error updating the system property" }, { - "id": "store.sql_license.save.app_error", - "translation": "We encountered an error saving the license" - }, - { - "id": "store.sql_license.get.app_error", - "translation": "We encountered an error getting the license" - }, - { - "id": "store.sql_license.get.missing.app_error", - "translation": "A license with that ID was not found" - }, - { "id": "store.sql_team.get.find.app_error", "translation": "We couldn't find the existing team" }, @@ -3559,4 +3559,4 @@ "id": "web.watcher_fail.error", "translation": "Failed to add directory to watcher %v" } -] +]
\ No newline at end of file |