diff options
author | Martin Kraft <martinkraft@gmail.com> | 2018-05-02 07:45:20 -0400 |
---|---|---|
committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-02 07:45:20 -0400 |
commit | 7d5e85e4136b0e2e6cf902c48b186d99f0698d13 (patch) | |
tree | 84f7256de28eed0fd932f43532c218b385e09642 /i18n/en.json | |
parent | f4dcb4edf2aafca85c9af631131a77888da24bc7 (diff) | |
parent | 529807c1ba0c6b5e697d95d35b46865e22b0e62a (diff) | |
download | chat-7d5e85e4136b0e2e6cf902c48b186d99f0698d13.tar.gz chat-7d5e85e4136b0e2e6cf902c48b186d99f0698d13.tar.bz2 chat-7d5e85e4136b0e2e6cf902c48b186d99f0698d13.zip |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'i18n/en.json')
-rw-r--r-- | i18n/en.json | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/i18n/en.json b/i18n/en.json index c0c8ea184..0ff5e5378 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -2435,6 +2435,10 @@ "translation": "Permanently deleted team %v id=%v" }, { + "id": "api.team.remove_team_icon.get_team.app_error", + "translation": "An error occurred getting the team" + }, + { "id": "api.team.remove_user_from_team.missing.app_error", "translation": "The user does not appear to be part of this team." }, @@ -2459,10 +2463,6 @@ "translation": "Could not encode team icon" }, { - "id": "api.team.remove_team_icon.get_team.app_error", - "translation": "An error occurred getting the team" - }, - { "id": "api.team.set_team_icon.get_team.app_error", "translation": "An error occurred getting the team" }, @@ -2487,10 +2487,6 @@ "translation": "Unable to upload team icon. File is too large." }, { - "id": "api.team.team_icon.update.app_error", - "translation": "An error occurred updating the team icon" - }, - { "id": "api.team.set_team_icon.write_file.app_error", "translation": "Could not save team icon" }, @@ -2499,6 +2495,10 @@ "translation": "Team sign-up with email is disabled." }, { + "id": "api.team.team_icon.update.app_error", + "translation": "An error occurred updating the team icon" + }, + { "id": "api.team.update_member_roles.not_a_member", "translation": "Specified user is not a member of specified team." }, @@ -3820,7 +3820,7 @@ }, { "id": "app.plugin.activate.app_error", - "translation": "Unable to activate extracted plugin. Plugin may already exist and be activated." + "translation": "Unable to activate extracted plugin." }, { "id": "app.plugin.cluster.save_config.app_error", @@ -3855,8 +3855,8 @@ "translation": "Unable to get active plugins" }, { - "id": "app.plugin.id_length.app_error", - "translation": "Plugin Id must be less than {{.Max}} characters." + "id": "app.plugin.invalid_id.app_error", + "translation": "Plugin Id must be at least {{.Min}} characters, at most {{.Max}} characters and match {{.Regex}}." }, { "id": "app.plugin.install.app_error", |