diff options
author | enahum <nahumhbl@gmail.com> | 2016-12-02 10:43:14 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-02 10:43:14 -0300 |
commit | c952985ffd035f95e82fef2fbc2e8bd48ab9ec3b (patch) | |
tree | f5b8c5a38ff98b76764392348c2947b1ed04a0df /i18n/en.json | |
parent | 275188ad040864823764deb8a71c1e85c9ef00b2 (diff) | |
download | chat-c952985ffd035f95e82fef2fbc2e8bd48ab9ec3b.tar.gz chat-c952985ffd035f95e82fef2fbc2e8bd48ab9ec3b.tar.bz2 chat-c952985ffd035f95e82fef2fbc2e8bd48ab9ec3b.zip |
translations PR 20161128 (#4666)
Diffstat (limited to 'i18n/en.json')
-rw-r--r-- | i18n/en.json | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/i18n/en.json b/i18n/en.json index 9981b29b9..89cf6b267 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -676,18 +676,6 @@ "translation": "Invalid {{.Name}} parameter" }, { - "id": "api.post.disabled_here", - "translation": "@here has been disabled because the channel has more than {{.Users}} users." - }, - { - "id": "api.post.disabled_all", - "translation": "@all has been disabled because the channel has more than {{.Users}} users." - }, - { - "id": "api.post.disabled_channel", - "translation": "@channel has been disabled because the channel has more than {{.Users}} users." - }, - { "id": "api.context.invalid_team_url.debug", "translation": "TeamURL accessed when not valid. Team URL should not be used in api functions or those that are team independent" }, @@ -1302,6 +1290,18 @@ "translation": "Encountered error when deleting files for post, post_id=%v, err=%v" }, { + "id": "api.post.disabled_all", + "translation": "@all has been disabled because the channel has more than {{.Users}} users." + }, + { + "id": "api.post.disabled_channel", + "translation": "@channel has been disabled because the channel has more than {{.Users}} users." + }, + { + "id": "api.post.disabled_here", + "translation": "@here has been disabled because the channel has more than {{.Users}} users." + }, + { "id": "api.post.get_message_for_notification.files_sent", "translation": { "one": "{{.Count}} file sent: {{.Filenames}}", @@ -2696,14 +2696,6 @@ "translation": "System Console is set to read-only when High Availability is enabled." }, { - "id": "ent.metrics.starting.info", - "translation": "Metrics and profiling server is listening on %v" - }, - { - "id": "ent.metrics.stopping.info", - "translation": "Metrics and profiling server is stopping on %v" - }, - { "id": "ent.cluster.starting.info", "translation": "Cluster internode communication is listening on %v with hostname=%v id=%v" }, @@ -2796,6 +2788,14 @@ "translation": "Invalid AD/LDAP Filter" }, { + "id": "ent.metrics.starting.info", + "translation": "Metrics and profiling server is listening on %v" + }, + { + "id": "ent.metrics.stopping.info", + "translation": "Metrics and profiling server is stopping on %v" + }, + { "id": "ent.mfa.activate.authenticate.app_error", "translation": "Error attempting to authenticate MFA token" }, @@ -3368,14 +3368,14 @@ "translation": "Invalid maximum channels per team for team settings. Must be a positive number." }, { - "id": "model.config.is_valid.max_notify_per_channel.app_error", - "translation": "Invalid maximum notifications per channel for team settings. Must be a positive number." - }, - { "id": "model.config.is_valid.max_file_size.app_error", "translation": "Invalid max file size for file settings. Must be a zero or positive number." }, { + "id": "model.config.is_valid.max_notify_per_channel.app_error", + "translation": "Invalid maximum notifications per channel for team settings. Must be a positive number." + }, + { "id": "model.config.is_valid.max_users.app_error", "translation": "Invalid maximum users per team for team settings. Must be a positive number." }, @@ -4080,10 +4080,6 @@ "translation": "We couldn't get channel type counts" }, { - "id": "store.sql_channel.search.app_error", - "translation": "We encountered an error searching channels" - }, - { "id": "store.sql_channel.check_open_channel_permissions.app_error", "translation": "We couldn't check the permissions" }, @@ -4252,6 +4248,10 @@ "translation": "We couldn't save the channel member" }, { + "id": "store.sql_channel.search.app_error", + "translation": "We encountered an error searching channels" + }, + { "id": "store.sql_channel.set_last_viewed_at.app_error", "translation": "We couldn't set the last viewed at time" }, |