From 164e030d33b03cab347ddcdf064615cb9e144317 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Tue, 26 Jun 2018 22:06:01 +0200 Subject: MM-11008: Fix translation and change the code to be auto-extracted (#9009) --- i18n/en.json | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'i18n/en.json') diff --git a/i18n/en.json b/i18n/en.json index 190aa4cea..ede4f1db2 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -99,6 +99,14 @@ "id": "api.channel.add_user_to_channel.type.app_error", "translation": "Can not add user to this channel type" }, + { + "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.convert_channel_to_private.default_channel_error", "translation": "This default channel cannot be converted into a private channel." -- cgit v1.2.3-1-g7c22 From 1e6994a2abf037c1fa8872ab34de1b0627cb1ab0 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Wed, 27 Jun 2018 06:58:46 -0400 Subject: translations PR 20180625 (#8998) --- i18n/en.json | 120 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 60 insertions(+), 60 deletions(-) (limited to 'i18n/en.json') diff --git a/i18n/en.json b/i18n/en.json index ede4f1db2..7e08ad429 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1542,66 +1542,6 @@ "id": "api.slackimport.slack_import.zip.app_error", "translation": "Unable to open the Slack export zip file.\r\n" }, - { - "id": "store.sql_user.clear_all_custom_role_assignments.open_transaction.app_error", - "translation": "Failed to begin the database transaction" - }, - { - "id": "store.sql_user.clear_all_custom_role_assignments.rollback_transaction.app_error", - "translation": "Failed to rollback the database transaction" - }, - { - "id": "store.sql_user.clear_all_custom_role_assignments.select.app_error", - "translation": "Failed to retrieve the users" - }, - { - "id": "store.sql_user.clear_all_custom_role_assignments.update.app_error", - "translation": "Failed to update the user" - }, - { - "id": "store.sql_user.clear_all_custom_role_assignments.commit_transaction.app_error", - "translation": "Failed to commit the database transaction" - }, - { - "id": "store.sql_team.clear_all_custom_role_assignments.open_transaction.app_error", - "translation": "Failed to begin the database transaction" - }, - { - "id": "store.sql_team.clear_all_custom_role_assignments.rollback_transaction.app_error", - "translation": "Failed to rollback the database transaction" - }, - { - "id": "store.sql_team.clear_all_custom_role_assignments.select.app_error", - "translation": "Failed to retrieve the team members" - }, - { - "id": "store.sql_team.clear_all_custom_role_assignments.update.app_error", - "translation": "Failed to update the team member" - }, - { - "id": "store.sql_team.clear_all_custom_role_assignments.commit_transaction.app_error", - "translation": "Failed to commit the database transaction" - }, - { - "id": "store.sql_channel.clear_all_custom_role_assignments.open_transaction.app_error", - "translation": "Failed to begin the database transaction" - }, - { - "id": "store.sql_channel.clear_all_custom_role_assignments.rollback_transaction.app_error", - "translation": "Failed to rollback the database transaction" - }, - { - "id": "store.sql_channel.clear_all_custom_role_assignments.select.app_error", - "translation": "Failed to retrieve the channel members" - }, - { - "id": "store.sql_channel.clear_all_custom_role_assignments.update.app_error", - "translation": "Failed to update the channel member" - }, - { - "id": "store.sql_channel.clear_all_custom_role_assignments.commit_transaction.app_error", - "translation": "Failed to commit the database transaction" - }, { "id": "api.status.user_not_found.app_error", "translation": "User not found" @@ -5134,6 +5074,26 @@ "id": "store.sql_channel.analytics_type_count.app_error", "translation": "We couldn't get channel type counts" }, + { + "id": "store.sql_channel.clear_all_custom_role_assignments.commit_transaction.app_error", + "translation": "Failed to commit the database transaction" + }, + { + "id": "store.sql_channel.clear_all_custom_role_assignments.open_transaction.app_error", + "translation": "Failed to begin the database transaction" + }, + { + "id": "store.sql_channel.clear_all_custom_role_assignments.rollback_transaction.app_error", + "translation": "Failed to rollback the database transaction" + }, + { + "id": "store.sql_channel.clear_all_custom_role_assignments.select.app_error", + "translation": "Failed to retrieve the channel members" + }, + { + "id": "store.sql_channel.clear_all_custom_role_assignments.update.app_error", + "translation": "Failed to update the channel member" + }, { "id": "store.sql_channel.delete.channel.app_error", "translation": "We couldn't delete the channel" @@ -6118,6 +6078,26 @@ "id": "store.sql_team.analytics_team_count.app_error", "translation": "We couldn't count the teams" }, + { + "id": "store.sql_team.clear_all_custom_role_assignments.commit_transaction.app_error", + "translation": "Failed to commit the database transaction" + }, + { + "id": "store.sql_team.clear_all_custom_role_assignments.open_transaction.app_error", + "translation": "Failed to begin the database transaction" + }, + { + "id": "store.sql_team.clear_all_custom_role_assignments.rollback_transaction.app_error", + "translation": "Failed to rollback the database transaction" + }, + { + "id": "store.sql_team.clear_all_custom_role_assignments.select.app_error", + "translation": "Failed to retrieve the team members" + }, + { + "id": "store.sql_team.clear_all_custom_role_assignments.update.app_error", + "translation": "Failed to update the team member" + }, { "id": "store.sql_team.get.find.app_error", "translation": "We couldn't find the existing team" @@ -6274,6 +6254,26 @@ "id": "store.sql_user.analytics_unique_user_count.app_error", "translation": "We couldn't get the unique user count" }, + { + "id": "store.sql_user.clear_all_custom_role_assignments.commit_transaction.app_error", + "translation": "Failed to commit the database transaction" + }, + { + "id": "store.sql_user.clear_all_custom_role_assignments.open_transaction.app_error", + "translation": "Failed to begin the database transaction" + }, + { + "id": "store.sql_user.clear_all_custom_role_assignments.rollback_transaction.app_error", + "translation": "Failed to rollback the database transaction" + }, + { + "id": "store.sql_user.clear_all_custom_role_assignments.select.app_error", + "translation": "Failed to retrieve the users" + }, + { + "id": "store.sql_user.clear_all_custom_role_assignments.update.app_error", + "translation": "Failed to update the user" + }, { "id": "store.sql_user.get.app_error", "translation": "We encountered an error finding the account" -- cgit v1.2.3-1-g7c22