From d1e210319b6a5e93b5c3ee6c28271e2c4a319641 Mon Sep 17 00:00:00 2001 From: Alf Eaton Date: Wed, 19 Jan 2022 11:55:33 +0000 Subject: [PATCH] Merge pull request #6389 from overleaf/ae-github-capitalisation Fix "GitHub" capitalisation GitOrigin-RevId: 9b47d58a3d92c8dd695ca1c8f3d28ea7d6178da5 --- .../web/app/views/project/list/notifications.pug | 2 +- services/web/config/settings.defaults.js | 2 +- services/web/locales/en.json | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/services/web/app/views/project/list/notifications.pug b/services/web/app/views/project/list/notifications.pug index ee7281044a..3d238d7c1e 100644 --- a/services/web/app/views/project/list/notifications.pug +++ b/services/web/app/views/project/list/notifications.pug @@ -94,7 +94,7 @@ include ../../_mixins/reconfirm_affiliation .notification-body | Error: Your project strong {{ notification.messageOpts.projectName }} - | has gone over the 2000 file limit using an integration (e.g. Dropbox or Github)
+ | has gone over the 2000 file limit using an integration (e.g. Dropbox or GitHub)
| Please decrease the size of your project to prevent further errors. .notification-action a.pull-right.btn.btn-sm.btn-info(href="/user/settings") diff --git a/services/web/config/settings.defaults.js b/services/web/config/settings.defaults.js index df15ba34d3..6c0b0b74bd 100644 --- a/services/web/config/settings.defaults.js +++ b/services/web/config/settings.defaults.js @@ -582,7 +582,7 @@ module.exports = { right_footer: [ { - text: " Fork on Github!", + text: " Fork on GitHub!", url: 'https://github.com/overleaf/overleaf', }, ], diff --git a/services/web/locales/en.json b/services/web/locales/en.json index 9a8f37665a..cb94d4162d 100644 --- a/services/web/locales/en.json +++ b/services/web/locales/en.json @@ -9,7 +9,7 @@ "no_pdf_error_reason_output_pdf_already_exists": "This project contains a file called output.pdf. If that file exists, please rename it and compile again.", "logs_pane_info_message": "We are testing a new logs pane", "logs_pane_info_message_popup": "We are testing a new logs pane. Click here to give feedback.", - "github_symlink_error": "Your Github repository contains symbolic link files, which are not currently supported by Overleaf. Please remove these and try again.", + "github_symlink_error": "Your GitHub repository contains symbolic link files, which are not currently supported by Overleaf. Please remove these and try again.", "address_line_1": "Address", "address_line_2": "Address (line 2, optional)", "postal_code": "Postal Code", @@ -102,8 +102,8 @@ "email_does_not_belong_to_university": "We don’t recognize that domain as being affiliated with your university. Please contact us to add the affiliation.", "company_name": "Company Name", "add_company_details": "Add Company Details", - "github_timeout_error": "Syncing your Overleaf project with Github has timed out. This may be due to the overall size of your project, or the number of files/changes to sync, being too large.", - "github_large_files_error": "Merge failed: your Github repository contains files over the 50mb file size limit ", + "github_timeout_error": "Syncing your Overleaf project with GitHub has timed out. This may be due to the overall size of your project, or the number of files/changes to sync, being too large.", + "github_large_files_error": "Merge failed: your GitHub repository contains files over the 50mb file size limit ", "no_history_available": "This project doesn’t have any history yet. Please make some changes to the project and try again.", "project_approaching_file_limit": "This project is approaching the file limit", "recurly_email_updated": "Your billing email address was successfully updated", @@ -111,7 +111,7 @@ "project_has_too_many_files": "This project has reached the 2000 file limit", "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.", - "unlink_github_repository": "Unlink Github Repository", + "unlink_github_repository": "Unlink GitHub Repository", "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", "confirmation_token_invalid": "Sorry, your confirmation token is invalid or has expired. Please request a new email confirmation link.", @@ -263,7 +263,7 @@ "invalid_zip_file": "Invalid zip file", "make_primary": "Make Primary", "make_email_primary_description": "Make this the primary email, used to log in", - "github_sync_repository_not_found_description": "The linked repository has either been removed, or you no longer have access to it. You can set up sync with a new repository by cloning the project and using the ‘Github’ menu item. You can also unlink the repository from this project.", + "github_sync_repository_not_found_description": "The linked repository has either been removed, or you no longer have access to it. You can set up sync with a new repository by cloning the project and using the ‘GitHub’ menu item. You can also unlink the repository from this project.", "unarchive": "Restore", "cant_see_what_youre_looking_for_question": "Can’t see what you’re looking for?", "something_went_wrong_canceling_your_subscription": "Something went wrong canceling your subscription. Please contact support.", @@ -292,7 +292,7 @@ "not_found_error_from_the_supplied_url": "The link to open this content on Overleaf pointed to a file that could not be found. If this keeps happening for links on a particular site, please report this to them.", "too_many_requests": "Too many requests were received in a short space of time. Please wait for a few moments and try again.", "password_change_passwords_do_not_match": "Passwords do not match", - "github_for_link_shared_projects": "This project was accessed via link-sharing and won’t be synchronised with your Github unless you are invited via e-mail by the project owner.", + "github_for_link_shared_projects": "This project was accessed via link-sharing and won’t be synchronised with your GitHub unless you are invited via e-mail by the project owner.", "browsing_project_latest_for_pseudo_label": "Browsing your project’s current state", "history_label_project_current_state": "Current state", "download_project_at_this_version": "Download project at this version", @@ -1404,7 +1404,7 @@ "continue_github_merge": "I have manually merged. Continue", "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_git_folder_error": "This project contains a .git folder at the top level, indicating that it is already a git repository. The Overleaf Github sync service cannot sync git histories. Please remove the .git folder and try again.", + "github_git_folder_error": "This project contains a .git folder at the top level, indicating that it is already a git repository. The Overleaf GitHub sync service cannot sync git histories. Please remove the .git folder and try again.", "repository_name": "Repository Name", "optional": "Optional", "github_public_description": "Anyone can see this repository. You choose who can commit.",