summaryrefslogtreecommitdiffstats
path: root/i18n/en.json
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2017-02-17 12:29:39 -0300
committerGitHub <noreply@github.com>2017-02-17 12:29:39 -0300
commit2f96814a8bca991a2acba3b66c38c22cfddef769 (patch)
tree0630fe56b8c52078440672a103edf95844cca74a /i18n/en.json
parent96f01d8c6c3dae37b6046b13d39aabc6853ba826 (diff)
downloadchat-2f96814a8bca991a2acba3b66c38c22cfddef769.tar.gz
chat-2f96814a8bca991a2acba3b66c38c22cfddef769.tar.bz2
chat-2f96814a8bca991a2acba3b66c38c22cfddef769.zip
translations PR 20170213 (#5393)
Diffstat (limited to 'i18n/en.json')
-rw-r--r--i18n/en.json28
1 files changed, 8 insertions, 20 deletions
diff --git a/i18n/en.json b/i18n/en.json
index 81d4eb412..b746b3f0a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2912,6 +2912,14 @@
"translation": "Channel name missing from User's Channel Membership."
},
{
+ "id": "app.import.validate_user_channels_import_data.invalid_notify_props_desktop.error",
+ "translation": "Invalid Desktop NotifyProps for User's Channel Membership."
+ },
+ {
+ "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mark_unread.error",
+ "translation": "Invalid MarkUnread NotifyProps for User's Channel Membership."
+ },
+ {
"id": "app.import.validate_user_channels_import_data.invalid_roles.error",
"translation": "Invalid roles for User's Channel Membership."
},
@@ -2968,26 +2976,6 @@
"translation": "Team name missing from User's Team Membership."
},
{
- "id": "app.import.validate_user_channels_import_data.invalid_notify_props_desktop.error",
- "translation": "Invalid Desktop NotifyProps for User's Channel Membership."
- },
- {
- "id": "app.import.validate_user_channels_import_data.invalid_notify_props_mark_unread.error",
- "translation": "Invalid MarkUnread NotifyProps for User's Channel Membership."
- },
- {
- "id": "app.import.import_user.save_preferences.error",
- "translation": "Failed to save the provided preferences for the user."
- },
- {
- "id": "app.import.process_import_data_file_version_line.invalid_version.error",
- "translation": "Did not find a valid version type object in the first line of the import data file."
- },
- {
- "id": "app.import.bulk_import.unsupported_version.error",
- "translation": "The version of the import data file format of the provided file is not supported by this version of Mattermost."
- },
- {
"id": "authentication.permissions.create_team_roles.description",
"translation": "Ability to create new teams"
},