diff options
author | George Goldberg <george@gberg.me> | 2018-02-06 17:25:53 +0000 |
---|---|---|
committer | George Goldberg <george@gberg.me> | 2018-02-06 17:25:53 +0000 |
commit | 7941c30117efe1b957ac0458c2f0479e3824196d (patch) | |
tree | df791632a9dc790a6f73dec53aae3ba919ebda63 /i18n/en.json | |
parent | e1cd64613591cf5a990442a69ebf188258bd0cb5 (diff) | |
parent | 034dbc07e3068c482e654b6a1a8fcbe4b01c44f3 (diff) | |
download | chat-7941c30117efe1b957ac0458c2f0479e3824196d.tar.gz chat-7941c30117efe1b957ac0458c2f0479e3824196d.tar.bz2 chat-7941c30117efe1b957ac0458c2f0479e3824196d.zip |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'i18n/en.json')
-rw-r--r-- | i18n/en.json | 146 |
1 files changed, 73 insertions, 73 deletions
diff --git a/i18n/en.json b/i18n/en.json index 606b61181..58bfc3d86 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -153,7 +153,7 @@ }, { "id": "api.channel.add_member.added", - "translation": "%v added to the channel by %v" + "translation": "%v added to the channel by %v." }, { "id": "api.channel.add_member.find_channel.app_error", @@ -200,6 +200,14 @@ "translation": "Public Channel management and creation is restricted to Team and System Administrators." }, { + "id": "api.channel.change_channel_privacy.private_to_public", + "translation": "This channel has been converted to a Public Channel and can be joined by any team member." + }, + { + "id": "api.channel.change_channel_privacy.public_to_private", + "translation": "This channel has been converted to a Private Channel." + }, + { "id": "api.channel.create_channel.direct_channel.app_error", "translation": "Must use createDirectChannel API service for direct message channel creation" }, @@ -233,7 +241,7 @@ }, { "id": "api.channel.delete_channel.archived", - "translation": "%v has archived the channel." + "translation": "%v archived the channel." }, { "id": "api.channel.delete_channel.cannot.app_error", @@ -297,7 +305,7 @@ }, { "id": "api.channel.join_channel.post_and_forget", - "translation": "%v has joined the channel." + "translation": "%v joined the channel." }, { "id": "api.channel.leave.default.app_error", @@ -313,15 +321,7 @@ }, { "id": "api.channel.leave.left", - "translation": "%v has left the channel." - }, - { - "id": "api.channel.change_channel_privacy.private_to_public", - "translation": "This channel has been converted to a Public Channel and can be joined by any team member." - }, - { - "id": "api.channel.change_channel_privacy.public_to_private", - "translation": "This channel has been converted to a Private Channel." + "translation": "%v left the channel." }, { "id": "api.channel.post_update_channel_displayname_message_and_forget.create_post.error", @@ -369,7 +369,7 @@ }, { "id": "api.channel.remove_member.removed", - "translation": "%v was removed from the channel." + "translation": "%v removed from the channel." }, { "id": "api.channel.remove_member.unable.app_error", @@ -2184,7 +2184,7 @@ }, { "id": "api.team.add_user_to_team.added", - "translation": "%v added to the team by %v" + "translation": "%v added to the team by %v." }, { "id": "api.team.add_user_to_team.missing_parameter.app_error", @@ -2320,7 +2320,7 @@ }, { "id": "api.team.remove_user_from_team.removed", - "translation": "%v was removed from the team." + "translation": "%v removed from the team." }, { "id": "api.team.signup_team.email_disabled.app_error", @@ -3359,80 +3359,80 @@ "translation": "Missing required direct post property: user" }, { - "id": "app.import.validate_reaction_import_data.user_missing.error", - "translation": "Missing required Reaction property: User." + "id": "app.import.validate_post_import_data.channel_missing.error", + "translation": "Missing required Post property: Channel." }, { - "id": "app.import.validate_reaction_import_data.emoji_name_missing.error", - "translation": "Missing required Reaction property: EmojiName." + "id": "app.import.validate_post_import_data.create_at_missing.error", + "translation": "Missing required Post property: create_at." }, { - "id": "app.import.validate_reaction_import_data.emoji_name_length.error", - "translation": "Reaction EmojiName property is longer than the maximum permitted length." + "id": "app.import.validate_post_import_data.create_at_zero.error", + "translation": "Post CreateAt property must not be zero." }, { - "id": "app.import.validate_reaction_import_data.create_at_missing.error", - "translation": "Missing required Reaction property: create_at." + "id": "app.import.validate_post_import_data.message_length.error", + "translation": "Post Message property is longer than the maximum permitted length." }, { - "id": "app.import.validate_reaction_import_data.create_at_zero.error", - "translation": "Reaction CreateAt property must not be zero." + "id": "app.import.validate_post_import_data.message_missing.error", + "translation": "Missing required Post property: Message." }, { - "id": "app.import.validate_reaction_import_data.create_at_before_parent.error", - "translation": "Reaction CreateAt property must be greater than the parent post CreateAt." + "id": "app.import.validate_post_import_data.team_missing.error", + "translation": "Missing required Post property: Team." }, { - "id": "app.import.validate_reply_import_data.user_missing.error", - "translation": "Missing required Reply property: User." + "id": "app.import.validate_post_import_data.user_missing.error", + "translation": "Missing required Post property: User." }, { - "id": "app.import.validate_reply_import_data.message_missing.error", - "translation": "Missing required Reply property: Message." + "id": "app.import.validate_reaction_import_data.create_at_before_parent.error", + "translation": "Reaction CreateAt property must be greater than the parent post CreateAt." }, { - "id": "app.import.validate_reply_import_data.message_length.error", - "translation": "Reply Message property is longer than the maximum permitted length." + "id": "app.import.validate_reaction_import_data.create_at_missing.error", + "translation": "Missing required Reaction property: create_at." }, { - "id": "app.import.validate_reply_import_data.create_at_missing.error", - "translation": "Missing required Reply property: create_at." + "id": "app.import.validate_reaction_import_data.create_at_zero.error", + "translation": "Reaction CreateAt property must not be zero." }, { - "id": "app.import.validate_reply_import_data.create_at_zero.error", - "translation": "Reply CreateAt property must not be zero." + "id": "app.import.validate_reaction_import_data.emoji_name_length.error", + "translation": "Reaction EmojiName property is longer than the maximum permitted length." }, { - "id": "app.import.validate_reply_import_data.create_at_before_parent.error", - "translation": "Reply CreateAt property must be greater than the parent post CreateAt." + "id": "app.import.validate_reaction_import_data.emoji_name_missing.error", + "translation": "Missing required Reaction property: EmojiName." }, { - "id": "app.import.validate_post_import_data.channel_missing.error", - "translation": "Missing required Post property: Channel." + "id": "app.import.validate_reaction_import_data.user_missing.error", + "translation": "Missing required Reaction property: User." }, { - "id": "app.import.validate_post_import_data.create_at_missing.error", - "translation": "Missing required Post property: create_at." + "id": "app.import.validate_reply_import_data.create_at_before_parent.error", + "translation": "Reply CreateAt property must be greater than the parent post CreateAt." }, { - "id": "app.import.validate_post_import_data.create_at_zero.error", - "translation": "Post CreateAt property must not be zero." + "id": "app.import.validate_reply_import_data.create_at_missing.error", + "translation": "Missing required Reply property: create_at." }, { - "id": "app.import.validate_post_import_data.message_length.error", - "translation": "Post Message property is longer than the maximum permitted length." + "id": "app.import.validate_reply_import_data.create_at_zero.error", + "translation": "Reply CreateAt property must not be zero." }, { - "id": "app.import.validate_post_import_data.message_missing.error", - "translation": "Missing required Post property: Message." + "id": "app.import.validate_reply_import_data.message_length.error", + "translation": "Reply Message property is longer than the maximum permitted length." }, { - "id": "app.import.validate_post_import_data.team_missing.error", - "translation": "Missing required Post property: Team." + "id": "app.import.validate_reply_import_data.message_missing.error", + "translation": "Missing required Reply property: Message." }, { - "id": "app.import.validate_post_import_data.user_missing.error", - "translation": "Missing required Post property: User." + "id": "app.import.validate_reply_import_data.user_missing.error", + "translation": "Missing required Reply property: User." }, { "id": "app.import.validate_team_import_data.allowed_domains_length.error", @@ -3571,6 +3571,10 @@ "translation": "User Position is too long." }, { + "id": "app.import.validate_user_import_data.profile_image.error", + "translation": "Invalid profile image." + }, + { "id": "app.import.validate_user_import_data.roles_invalid.error", "translation": "User roles are not valid." }, @@ -3583,10 +3587,6 @@ "translation": "Missing require user property: username." }, { - "id": "app.import.validate_user_import_data.profile_image.error", - "translation": "Invalid profile image." - }, - { "id": "app.import.validate_user_teams_import_data.invalid_roles.error", "translation": "Invalid roles for User's Team Membership." }, @@ -4651,6 +4651,10 @@ "translation": "To must be greater than From" }, { + "id": "model.config.is_valid.atmos_camo_image_proxy_options.app_error", + "translation": "Invalid atmos/camo image proxy options for service settings. Must be set to your shared key." + }, + { "id": "model.config.is_valid.cluster_email_batching.app_error", "translation": "Unable to enable email batching when clustering is enabled." }, @@ -4763,6 +4767,10 @@ "translation": "Invalid thumbnail width for file settings. Must be a positive number." }, { + "id": "model.config.is_valid.image_proxy_type.app_error", + "translation": "Invalid image proxy type for service settings." + }, + { "id": "model.config.is_valid.ldap_basedn", "translation": "AD/LDAP field \"BaseDN\" is required." }, @@ -4823,14 +4831,6 @@ "translation": "Invalid listen address for service settings Must be set." }, { - "id": "model.config.is_valid.image_proxy_type.app_error", - "translation": "Invalid image proxy type for service settings." - }, - { - "id": "model.config.is_valid.atmos_camo_image_proxy_options.app_error", - "translation": "Invalid atmos/camo image proxy options for service settings. Must be set to your shared key." - }, - { "id": "model.config.is_valid.localization.available_locales.app_error", "translation": "Available Languages must contain Default Client Language" }, @@ -6875,26 +6875,26 @@ "translation": "We couldn't get the personal access token" }, { - "id": "store.sql_user_access_token.get_by_token.app_error", - "translation": "We couldn't get the personal access token by token" - }, - { "id": "store.sql_user_access_token.get_all.app_error", "translation": "We couldn't get all personal access tokens" }, { - "id": "store.sql_user_access_token.get_by_user.app_error", - "translation": "We couldn't get the personal access tokens by user" + "id": "store.sql_user_access_token.get_by_token.app_error", + "translation": "We couldn't get the personal access token by token" }, { - "id": "store.sql_user_access_token.search.app_error", - "translation": "We encountered an error searching user access tokens" + "id": "store.sql_user_access_token.get_by_user.app_error", + "translation": "We couldn't get the personal access tokens by user" }, { "id": "store.sql_user_access_token.save.app_error", "translation": "We couldn't save the personal access token" }, { + "id": "store.sql_user_access_token.search.app_error", + "translation": "We encountered an error searching user access tokens" + }, + { "id": "store.sql_webhooks.analytics_incoming_count.app_error", "translation": "We couldn't count the incoming webhooks" }, |