Преглед изворни кода

Merge pull request #6434 from overleaf/ta-github-sync-default-branch-translation

Remove References to Master Branch in GitHub Sync Translations

GitOrigin-RevId: 711885bc6c09f89d9dd052bd5b739024e641a74b
Timothée Alby пре 4 година
родитељ
комит
64423936b9
1 измењених фајлова са 3 додато и 3 уклоњено
  1. 3 3
      services/web/locales/en.json

+ 3 - 3
services/web/locales/en.json

@@ -113,10 +113,10 @@
   "recurly_email_update_needed": "Your billing email address is currently <0>__recurlyEmail__</0>. If needed you can update your billing address to <1>__userEmail__</1>.",
   "recurly_email_update_needed": "Your billing email address is currently <0>__recurlyEmail__</0>. If needed you can update your billing address to <1>__userEmail__</1>.",
   "project_has_too_many_files": "This project has reached the 2000 file limit",
   "project_has_too_many_files": "This project has reached the 2000 file limit",
   "processing_your_request": "Please wait while we process your request.",
   "processing_your_request": "Please wait while we process your request.",
-  "github_repository_diverged": "The master branch of the linked repository has been force-pushed. Pulling GitHub changes after a force push can cause Overleaf and GitHub to get out of sync. You might need to push changes after pulling to get back in sync.",
+  "github_repository_diverged": "The default branch of the linked repository has been force-pushed. Pulling GitHub changes after a force push can cause Overleaf and GitHub to get out of sync. You might need to push changes after pulling to get back in sync.",
   "unlink_github_repository": "Unlink GitHub Repository",
   "unlink_github_repository": "Unlink GitHub Repository",
   "unlinking": "Unlinking",
   "unlinking": "Unlinking",
-  "github_no_master_branch_error": "This repository cannot be imported as it is missing the master branch. Please make sure the project has a master branch",
+  "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",
   "confirmation_token_invalid": "Sorry, your confirmation token is invalid or has expired. Please request a new email confirmation link.",
   "confirmation_token_invalid": "Sorry, your confirmation token is invalid or has expired. Please request a new email confirmation link.",
   "confirmation_link_broken": "Sorry, something is wrong with your confirmation link. Please try copy and pasting the link from the bottom of your confirmation email.",
   "confirmation_link_broken": "Sorry, something is wrong with your confirmation link. Please try copy and pasting the link from the bottom of your confirmation email.",
   "duplicate_file": "Duplicate File",
   "duplicate_file": "Duplicate File",
@@ -1404,7 +1404,7 @@
   "recent_commits_in_github": "Recent commits in GitHub",
   "recent_commits_in_github": "Recent commits in GitHub",
   "sync_project_to_github": "Sync project to GitHub",
   "sync_project_to_github": "Sync project to GitHub",
   "sync_project_to_github_explanation": "Any changes you have made in __appName__ will be committed and merged with any updates in GitHub.",
   "sync_project_to_github_explanation": "Any changes you have made in __appName__ will be committed and merged with any updates in GitHub.",
-  "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 <1>__master_branch__</1> branch in git. Click below to continue, after you have manually merged.",
+  "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.",
   "continue_github_merge": "I have manually merged. Continue",
   "continue_github_merge": "I have manually merged. Continue",
   "export_project_to_github": "Export Project to GitHub",
   "export_project_to_github": "Export Project to GitHub",
   "github_validation_check": "Please check that the repository name is valid, and that you have permission to create the repository.",
   "github_validation_check": "Please check that the repository name is valid, and that you have permission to create the repository.",