diff --git a/services/web/frontend/extracted-translations.json b/services/web/frontend/extracted-translations.json index 04a13c7b77..4a85b12190 100644 --- a/services/web/frontend/extracted-translations.json +++ b/services/web/frontend/extracted-translations.json @@ -728,7 +728,8 @@ "github_is_no_longer_connected": "", "github_is_premium": "", "github_large_files_error": "", - "github_merge_failed": "", + "github_manual_merge_user_prompt": "", + "github_merge_failed_error": "", "github_no_master_branch_error": "", "github_private_description": "", "github_public_description": "", diff --git a/services/web/locales/en.json b/services/web/locales/en.json index b001205e82..678916d5bd 100644 --- a/services/web/locales/en.json +++ b/services/web/locales/en.json @@ -932,7 +932,8 @@ "github_is_no_longer_connected": "GitHub is no longer connected to this project.", "github_is_premium": "GitHub Sync is a premium feature", "github_large_files_error": "Merge failed: your GitHub repository contains files over the 50mb file size limit ", - "github_merge_failed": "Your changes in __appName__ and GitHub could not be automatically merged. Please manually merge the <0>__sharelatex_branch__ branch into the default branch in git. Click below to continue, after you have manually merged.", + "github_manual_merge_user_prompt": "Please manually merge the <0>__sharelatex_branch__ branch into the default branch in git. Click below to continue, after you have manually merged.", + "github_merge_failed_error": "Your changes in __appName__ and GitHub could not be automatically merged.", "github_no_master_branch_error": "This repository cannot be imported as it is missing a default branch. Please make sure the project has a default branch", "github_private_description": "You choose who can see and commit to this repository.", "github_public_description": "Anyone can see this repository. You choose who can commit.",