summaryrefslogtreecommitdiffstats
path: root/i18n/en.json
diff options
context:
space:
mode:
Diffstat (limited to 'i18n/en.json')
-rw-r--r--i18n/en.json128
1 files changed, 68 insertions, 60 deletions
diff --git a/i18n/en.json b/i18n/en.json
index 190aa4cea..7e08ad429 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -100,6 +100,14 @@
"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."
},
@@ -1535,66 +1543,6 @@
"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"
},
@@ -5127,6 +5075,26 @@
"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"
},
@@ -6111,6 +6079,26 @@
"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"
},
@@ -6267,6 +6255,26 @@
"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"
},