diff options
author | enahum <nahumhbl@gmail.com> | 2017-05-26 09:22:05 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-26 09:22:05 -0400 |
commit | c84bb160ce3a57385fb894c8f6df57314f191975 (patch) | |
tree | 9b3f8b5ce1f9263019807c9c44418ca4e80cf0ec /i18n/en.json | |
parent | 00f48a1908ea80ba88bda78399a3bbfed57b2e9b (diff) | |
download | chat-c84bb160ce3a57385fb894c8f6df57314f191975.tar.gz chat-c84bb160ce3a57385fb894c8f6df57314f191975.tar.bz2 chat-c84bb160ce3a57385fb894c8f6df57314f191975.zip |
translations PR 20170522 (#6475)
Diffstat (limited to 'i18n/en.json')
-rw-r--r-- | i18n/en.json | 96 |
1 files changed, 48 insertions, 48 deletions
diff --git a/i18n/en.json b/i18n/en.json index 21c0126d1..e5c475d99 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1450,6 +1450,10 @@ "translation": "The signup link does not appear to be valid" }, { + "id": "api.opengraph.init.debug", + "translation": "Initializing open graph protocol api routes" + }, + { "id": "api.post.check_for_out_of_channel_mentions.message.multiple", "translation": "{{.Usernames}} and {{.LastUsername}} were mentioned, but they did not receive notifications because they do not belong to this channel." }, @@ -1700,10 +1704,6 @@ "translation": "Initializing reactions api routes" }, { - "id": "api.opengraph.init.debug", - "translation": "Initializing open graph protocol api routes" - }, - { "id": "api.reaction.list_reactions.mismatched_channel_id.app_error", "translation": "Failed to get reactions because channel ID does not match post ID in the URL" }, @@ -2468,6 +2468,14 @@ "translation": "Encountered an issue joining default channels user_id=%s, team_id=%s, err=%v" }, { + "id": "api.user.create_user.missing_hash_or_data.app_error", + "translation": "Missing Hash or URL query data." + }, + { + "id": "api.user.create_user.missing_invite_id.app_error", + "translation": "Missing Invite Id." + }, + { "id": "api.user.create_user.no_open_server", "translation": "This server does not allow open signups. Please speak with your Administrator to receive an invitation." }, @@ -2480,14 +2488,6 @@ "translation": "User sign-up with email is disabled." }, { - "id": "api.user.create_user.missing_invite_id.app_error", - "translation": "Missing Invite Id." - }, - { - "id": "api.user.create_user.missing_hash_or_data.app_error", - "translation": "Missing Hash or URL query data." - }, - { "id": "api.user.create_user.signup_link_expired.app_error", "translation": "The signup link has expired" }, @@ -3308,36 +3308,36 @@ "translation": "Compliance export started for job '{{.JobName}}' at '{{.FilePath}}'" }, { - "id": "ent.elasticsearch.start.connect_failed", - "translation": "Setting up ElasticSearch Client Failed" + "id": "ent.elasticsearch.search_posts.disabled", + "translation": "ElasticSearch searching is disabled on this server" }, { - "id": "ent.elasticsearch.start.index_exists_failed", - "translation": "Failed to establish whether ElasticSearch index exists" + "id": "ent.elasticsearch.search_posts.search_failed", + "translation": "Search failed to complete" }, { - "id": "ent.elasticsearch.start.index_create_failed", - "translation": "Failed to create ElasticSearch index" + "id": "ent.elasticsearch.search_posts.unmarshall_post_failed", + "translation": "Failed to decode search results" }, { - "id": "ent.elasticsearch.start.index_settings_failed", - "translation": "Failed to set ElasticSearch index settings" + "id": "ent.elasticsearch.start.connect_failed", + "translation": "Setting up ElasticSearch Client Failed" }, { - "id": "ent.elasticsearch.start.index_mapping_failed", - "translation": "Failed to setup ElasticSearch index mapping" + "id": "ent.elasticsearch.start.index_create_failed", + "translation": "Failed to create ElasticSearch index" }, { - "id": "ent.elasticsearch.search_posts.disabled", - "translation": "ElasticSearch searching is disabled on this server" + "id": "ent.elasticsearch.start.index_exists_failed", + "translation": "Failed to establish whether ElasticSearch index exists" }, { - "id": "ent.elasticsearch.search_posts.search_failed", - "translation": "Search failed to complete" + "id": "ent.elasticsearch.start.index_mapping_failed", + "translation": "Failed to setup ElasticSearch index mapping" }, { - "id": "ent.elasticsearch.search_posts.unmarshall_post_failed", - "translation": "Failed to decode search results" + "id": "ent.elasticsearch.start.index_settings_failed", + "translation": "Failed to set ElasticSearch index settings" }, { "id": "ent.emoji.licence_disable.app_error", @@ -3892,24 +3892,24 @@ "translation": "To must be greater than From" }, { + "id": "model.config.is_valid.cluster_email_batching.app_error", + "translation": "Unable to enable email batching when clustering is enabled." + }, + { "id": "model.config.is_valid.elastic_search.connection_url.app_error", "translation": "Elastic Search ConnectionUrl setting must be provided when Elastic Search indexing is enabled." }, { - "id": "model.config.is_valid.elastic_search.username.app_error", - "translation": "Elastic Search Username setting must be provided when Elastic Search indexing is enabled." + "id": "model.config.is_valid.elastic_search.enable_searching.app_error", + "translation": "Elastic Search IndexingEnabled setting must be set to true when Elastic Search SearchEnabled is set to true." }, { "id": "model.config.is_valid.elastic_search.password.app_error", "translation": "Elastic Search Password setting must be provided when Elastic Search indexing is enabled." }, { - "id": "model.config.is_valid.elastic_search.enable_searching.app_error", - "translation": "Elastic Search IndexingEnabled setting must be set to true when Elastic Search SearchEnabled is set to true." - }, - { - "id": "model.config.is_valid.cluster_email_batching.app_error", - "translation": "Unable to enable email batching when clustering is enabled." + "id": "model.config.is_valid.elastic_search.username.app_error", + "translation": "Elastic Search Username setting must be provided when Elastic Search indexing is enabled." }, { "id": "model.config.is_valid.email_batching_buffer_size.app_error", @@ -5252,10 +5252,6 @@ "translation": "We couldn't get the post" }, { - "id": "store.sql_post.get_posts_by_ids.app_error", - "translation": "We couldn't get the posts" - }, - { "id": "store.sql_post.get_parents_posts.app_error", "translation": "We couldn't get the parent post for the channel" }, @@ -5272,6 +5268,10 @@ "translation": "We couldn't get the parent posts for the channel" }, { + "id": "store.sql_post.get_posts_by_ids.app_error", + "translation": "We couldn't get the posts" + }, + { "id": "store.sql_post.get_posts_created_att.app_error", "translation": "We couldn't get the posts for the channel" }, @@ -5984,6 +5984,10 @@ "translation": "Encountered error signing license, err=%v" }, { + "id": "utils.mail.connect_smtp.helo.app_error", + "translation": "Failed to set HELO" + }, + { "id": "utils.mail.connect_smtp.open.app_error", "translation": "Failed to open connection" }, @@ -5991,23 +5995,19 @@ "id": "utils.mail.connect_smtp.open_tls.app_error", "translation": "Failed to open TLS connection" }, - { - "id": "utils.mail.connect_smtp.helo.app_error", - "translation": "Failed to set HELO" - }, { "id": "utils.mail.new_client.auth.app_error", "translation": "Failed to authenticate on SMTP server" }, { - "id": "utils.mail.new_client.open.error", - "translation": "Failed to open a connection to SMTP server %v" - }, - { "id": "utils.mail.new_client.helo.error", "translation": "Failed to to set the HELO to SMTP server %v" }, { + "id": "utils.mail.new_client.open.error", + "translation": "Failed to open a connection to SMTP server %v" + }, + { "id": "utils.mail.send_mail.close.app_error", "translation": "Failed to close connection to SMTP server" }, |