From 8da5a22b9eb3f5b37312842fae0080d21838d24b Mon Sep 17 00:00:00 2001 From: Wyatt Smith Date: Wed, 14 Jun 2023 08:51:50 -0700 Subject: [PATCH 1/2] Merge private instance and federation error messages --- translations/en.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/translations/en.json b/translations/en.json index 3d5b09d..8dccfb3 100644 --- a/translations/en.json +++ b/translations/en.json @@ -490,7 +490,6 @@ "remove_two_factor": "Remove 2-factor authentication", "two_factor_token": "2FA Token", "jump_to_content": "Jump to content", - "cant_enable_private_instance_if_federation_enabled": "Can't enable private instance if federation is also enabled", - "cant_enable_federation_if_private_instance": "Can't enable federation if private instance is also enabled" + "cant_enable_private_instance_and_federation_together": "Can't enable private instance and federation together", } From ecfcab8cf4c5f4d731c40e83a380546cf8666289 Mon Sep 17 00:00:00 2001 From: Wyatt Smith Date: Wed, 14 Jun 2023 08:53:42 -0700 Subject: [PATCH 2/2] Json comma --- translations/en.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/translations/en.json b/translations/en.json index 8dccfb3..55fb5dc 100644 --- a/translations/en.json +++ b/translations/en.json @@ -490,6 +490,5 @@ "remove_two_factor": "Remove 2-factor authentication", "two_factor_token": "2FA Token", "jump_to_content": "Jump to content", - "cant_enable_private_instance_and_federation_together": "Can't enable private instance and federation together", - + "cant_enable_private_instance_and_federation_together": "Can't enable private instance and federation together" }