From 445a356d0dc958a8fb72fd9835816302260595a2 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Mon, 12 Feb 2018 23:08:38 +0000 Subject: translations PR 20180212 --- i18n/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'i18n/en.json') diff --git a/i18n/en.json b/i18n/en.json index 4365a44fb..41fd9d982 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -2703,11 +2703,11 @@ "translation": "The signup link has expired" }, { - "id": "api.user.create_user.signup_link_mismatched_invite_id.app_error", + "id": "api.user.create_user.signup_link_invalid.app_error", "translation": "The signup link does not appear to be valid" }, { - "id": "api.user.create_user.signup_link_invalid.app_error", + "id": "api.user.create_user.signup_link_mismatched_invite_id.app_error", "translation": "The signup link does not appear to be valid" }, { -- cgit v1.2.3-1-g7c22 From bda8736770f89399f4bca189bc3559f0141cab8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Tue, 13 Feb 2018 10:43:28 +0100 Subject: XYZ-111: Check max users per team on re-join after leave a team --- i18n/en.json | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'i18n/en.json') diff --git a/i18n/en.json b/i18n/en.json index 4365a44fb..cecec7e1b 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -3126,6 +3126,10 @@ "id": "api.websocket_handler.invalid_param.app_error", "translation": "Invalid {{.Name}} parameter" }, + { + "id": "app.team.join_user_to_team.max_accounts.app_error", + "translation": "This team has reached the maximum number of allowed accounts. Contact your systems administrator to set a higher limit." + }, { "id": "app.channel.create_channel.no_team_id.app_error", "translation": "Must specify the team ID to create a channel" -- cgit v1.2.3-1-g7c22 From 3fef21e350737c235e6dfc2d9f35311d65290c3e Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Mon, 12 Feb 2018 12:56:46 -0500 Subject: ICU-753 Added unit tests for messages with only push notifications --- i18n/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'i18n/en.json') diff --git a/i18n/en.json b/i18n/en.json index 4365a44fb..b31a6bd09 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1812,11 +1812,11 @@ }, { "id": "api.post.send_notifications_and_forget.push_image_only", - "translation": " Uploaded one or more files in " + "translation": " uploaded one or more files in " }, { "id": "api.post.send_notifications_and_forget.push_image_only_dm", - "translation": " Uploaded one or more files in a direct message" + "translation": " uploaded one or more files in a direct message" }, { "id": "api.post.send_notifications_and_forget.push_in", -- cgit v1.2.3-1-g7c22 From 7f93d17a5fb5e64a336c44c35b3a41a0c0047783 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Thu, 15 Feb 2018 02:04:21 +0000 Subject: translations PR 20180215 --- i18n/en.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'i18n/en.json') diff --git a/i18n/en.json b/i18n/en.json index 3f5d0b4d3..ec4450ac8 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -3126,10 +3126,6 @@ "id": "api.websocket_handler.invalid_param.app_error", "translation": "Invalid {{.Name}} parameter" }, - { - "id": "app.team.join_user_to_team.max_accounts.app_error", - "translation": "This team has reached the maximum number of allowed accounts. Contact your systems administrator to set a higher limit." - }, { "id": "app.channel.create_channel.no_team_id.app_error", "translation": "Must specify the team ID to create a channel" @@ -3694,6 +3690,10 @@ "id": "app.plugin.upload_disabled.app_error", "translation": "Plugins and/or plugin uploads have been disabled." }, + { + "id": "app.team.join_user_to_team.max_accounts.app_error", + "translation": "This team has reached the maximum number of allowed accounts. Contact your systems administrator to set a higher limit." + }, { "id": "app.user_access_token.disabled", "translation": "Personal access tokens are disabled on this server. Please contact your system administrator for details." -- cgit v1.2.3-1-g7c22