Merge pull request #31501 from overleaf/cd-align-github-sync-action-buttons

Cd align GitHub sync action buttons

GitOrigin-RevId: ee4dfb3620e27e1bba0283e488bd003b66a08cd5

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": "",

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__</0> 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__</0> 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.",