From 266ebf82001bd1daadadfad61c7c576e6adaccab Mon Sep 17 00:00:00 2001 From: Lauris BH Date: Wed, 1 Nov 2017 18:03:10 +0200 Subject: [PATCH] Revert en-US locale (#2821) --- options/locale/locale_en-US.ini | 110 ++++++++++++++++---------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index d9358df753..86b64946c2 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -62,7 +62,7 @@ cancel = Cancel [install] install = Installation title = Initial configuration -docker_helper = If you are running Gitea inside Docker, please read the guidelines carefully before changing anything on this page. +docker_helper = If you are running Gitea inside Docker, please read the guidelines carefully before changing anything on this page. requite_db_desc = Gitea requires MySQL, PostgreSQL, SQLite3, or TiDB. db_title = Database Settings db_type = Database Type @@ -116,7 +116,7 @@ disable_gravatar_popup = Disable Gravatar and custom sources. All avatars must b federated_avatar_lookup = Enable Federated Avatars Lookup federated_avatar_lookup_popup = Enable federated avatar lookup using Libravatar. disable_registration = Disable Self-registration -disable_registration_popup = "Disable self-registration; only admins will be able to create accounts. +disable_registration_popup = "Disable self-registration; only admins will be able to create accounts." openid_signin = Enable OpenID Sign-In openid_signin_popup = Enable user login via OpenID openid_signup = Enable OpenID Self-registration @@ -124,7 +124,7 @@ openid_signup_popup = Enable OpenID based Self-registration enable_captcha = Enable Captcha enable_captcha_popup = Require a CAPTCHA for user self-registration. require_sign_in_view = Enable Require Sign In to View Pages -require_sign_in_view_popup = "Only signed in users can view pages; visitors will only be able to see the sign in and up pages. +require_sign_in_view_popup = "Only signed in users can view pages; visitors will only be able to see the sign in and up pages." admin_setting_desc = You do not need to create an admin account right now. The first user who registers on the site will gain admin access automatically. admin_title = Admin Account Settings admin_name = Username @@ -277,12 +277,12 @@ cannot_add_org_to_team = Organization cannot be added as a team member. invalid_ssh_key = Sorry, we were not able to verify your SSH key: %s invalid_gpg_key = Sorry, we were not able to verify your GPG key: %s -unable_verify_ssh_key = "The ssh key could not be verified; please double-check it for any mistakes. +unable_verify_ssh_key = "The ssh key could not be verified; please double-check it for any mistakes." auth_failed = Authentication failed: %v -still_own_repo = "Your account still has ownership of at least one repository; you need to delete or transfer them first. -still_has_org = "Your account still is still a member of least one organization; you need to leave them first. -org_still_own_repo = "This organization still owns repositories; you need to delete or transfer them first. +still_own_repo = "Your account still has ownership of at least one repository; you need to delete or transfer them first." +still_has_org = "Your account still is still a member of least one organization; you need to leave them first." +org_still_own_repo = "This organization still owns repositories; you need to delete or transfer them first." target_branch_not_exist = Target branch does not exist. @@ -375,8 +375,8 @@ manage_gpg_keys = Manage GPG Keys add_key = Add Key ssh_desc = These are the SSH keys associated with your account. Because these keys allow anyone using them to gain access to your repositories, it is very important you make sure you recognize them. gpg_desc = These are the GPG keys associated with your account. Because these keys allow commits to be verified, it is very important that you keep the corresponding private key safe. -ssh_helper = Need help? Have a look at GitHub's guide to create your own SSH keys or solve common problems you may encounter using SSH. -gpg_helper = Need help? Have a look at GitHub's guide about GPG. +ssh_helper = Need help? Have a look at GitHub's guide to create your own SSH keys or solve common problems you may encounter using SSH. +gpg_helper = Need help? Have a look at GitHub's guide about GPG. add_new_key = Add SSH Key add_new_gpg_key = Add GPG Key ssh_key_been_used = This public key has already been used. @@ -461,10 +461,10 @@ owner = Owner repo_name = Repository Name repo_name_helper = A good repository name is composed of short, memorable, and unique keywords. visibility = Visibility -visiblity_helper = This repository is Private -visiblity_helper_forced = Your system administrator has forced all new repositories to be Private +visiblity_helper = This repository is Private +visiblity_helper_forced = Your system administrator has forced all new repositories to be Private visiblity_fork_helper = (Change of this value will affect all forks) -clone_helper = Need help cloning? Visit Help! +clone_helper = Need help cloning? Visit Help! fork_repo = Fork Repository fork_from = Fork From fork_visiblity_helper = You cannot change the visibility of a forked repository. @@ -495,13 +495,13 @@ form.name_pattern_not_allowed = The repository name pattern '%s' is not allowed. need_auth = Need Authorization migrate_type = Migration Type -migrate_type_helper = This repository will be a mirror +migrate_type_helper = This repository will be a mirror migrate_repo = Migrate Repository migrate.clone_address = Clone Address migrate.clone_address_desc = This can be a HTTP/HTTPS/GIT URL migrate.clone_local_path = or local server path migrate.permission_denied = You are not allowed to import local repositories. -migrate.invalid_local_path = "Invalid local path; it does not exist or is not a directory. +migrate.invalid_local_path = "Invalid local path; it does not exist or is not a directory." migrate.failed = Migration failed: %v migrate.lfs_mirror_unsupported = Mirroring LFS objects is not supported - use 'git lfs fetch --all' and 'git lfs push --all' instead. @@ -569,7 +569,7 @@ editor.add = Add '%s' editor.update = Update '%s' editor.delete = Delete '%s' editor.commit_message_desc = Add an optional extended description... -editor.commit_directly_to_this_branch = Commit directly to the %s branch. +editor.commit_directly_to_this_branch = Commit directly to the %s branch. editor.create_new_branch = Create a new branch for this commit and start a pull request. editor.new_branch_name_desc = New branch name... editor.cancel = Cancel @@ -579,7 +579,7 @@ editor.directory_is_a_file = Entry '%s' in the parent path is a file not a direc editor.file_is_a_symlink = The file '%s' is a symlink that cannot be modified from the web editor editor.filename_is_a_directory = The filename '%s' is an existing directory in this repository. editor.file_editing_no_longer_exists = The file '%s' you are editing no longer exists in the repository. -editor.file_changed_while_editing = The file content has been changed since you started editing. Click here to see what has been changed or press commit again to overwrite those changes. +editor.file_changed_while_editing = The file content has been changed since you started editing. Click here to see what has been changed or press commit again to overwrite those changes. editor.file_already_exists = A file with name '%s' already exists in this repository. editor.no_changes_to_show = There are no changes to show. editor.fail_to_update_file = Failed to update/create file '%s' with error: %v @@ -627,8 +627,8 @@ issues.label_templates.info = There are not any labels yet. You can click on the issues.label_templates.helper = Select a label set issues.label_templates.use = Use this label set issues.label_templates.fail_to_load_file = Failed to load label template file '%s': %v -issues.add_label_at = `added the
%s
label %s` -issues.remove_label_at = `removed the
%s
label %s` +issues.add_label_at = `added the
%s
label %s` +issues.remove_label_at = `removed the
%s
label %s` issues.add_milestone_at = `added this to the %s milestone %s` issues.change_milestone_at = `modified the milestone from %s to %s %s` issues.remove_milestone_at = `removed this from the %s milestone %s` @@ -665,14 +665,14 @@ issues.action_milestone = Milestone issues.action_milestone_no_select = No milestone issues.action_assignee = Assignee issues.action_assignee_no_select = No assignee -issues.opened_by = opened %[1]s by %[3]s +issues.opened_by = opened %[1]s by %[3]s issues.opened_by_fake = opened %[1]s by %[2]s issues.previous = Previous issues.next = Next issues.open_title = Open issues.closed_title = Closed issues.num_comments = %d comments -issues.commented_at = `commented %s` +issues.commented_at = `commented %s` issues.delete_comment_confirm = Are you sure you want to delete this comment? issues.no_content = There is no content yet. issues.close_issue = Close @@ -680,13 +680,13 @@ issues.close_comment_issue = Comment and close issues.reopen_issue = Reopen issues.reopen_comment_issue = Comment and reopen issues.create_comment = Comment -issues.closed_at = `closed %[2]s` -issues.reopened_at = `reopened %[2]s` -issues.commit_ref_at = `referenced this issue from a commit %[2]s` +issues.closed_at = `closed %[2]s` +issues.reopened_at = `reopened %[2]s` +issues.commit_ref_at = `referenced this issue from a commit %[2]s` issues.poster = Poster issues.collaborator = Collaborator issues.owner = Owner -issues.sign_in_require_desc = Sign in to join this conversation. +issues.sign_in_require_desc = Sign in to join this conversation. issues.edit = Edit issues.cancel = Cancel issues.save = Save @@ -713,7 +713,7 @@ issues.tracker = Time tracker issues.start_tracking_short = Start issues.start_tracking = Start time tracking issues.start_tracking_history = `started working %s` -issues.tracking_already_started = `You have already started time tracking on this issue!` +issues.tracking_already_started = `You have already started time tracking on this issue!` issues.stop_tracking = Stop issues.stop_tracking_history = `stopped working %s` issues.add_time = Add time manually @@ -736,7 +736,7 @@ pulls.compare_compare = compare pulls.filter_branch = Filter branch pulls.no_results = No results found. pulls.nothing_to_compare = There is nothing to compare because base and head branches are even. -pulls.has_pull_request = `There is already a pull request between these two targets: %[2]s#%[3]d` +pulls.has_pull_request = `There is already a pull request between these two targets: %[2]s#%[3]d` pulls.create = Create Pull Request pulls.title_desc = wants to merge %[1]d commits from %[2]s into %[3]s pulls.merged_title_desc = merged %[1]d commits from %[2]s into %[3]s %[4]s @@ -747,7 +747,7 @@ pulls.reopen_to_merge = Please reopen this pull request to perform a merge. pulls.merged = Merged pulls.has_merged = This pull request has been merged successfully. pulls.data_broken = Data of this pull request has been broken due to deletion of fork information. -pulls.is_checking = "The conflict checking is still in progress; please refresh page in few moments. +pulls.is_checking = "The conflict checking is still in progress; please refresh page in few moments." pulls.can_auto_merge_desc = This pull request can be merged automatically. pulls.cannot_auto_merge_desc = This pull request cannot be merged automatically because there are conflicts. pulls.cannot_auto_merge_helper = Please merge manually in order to resolve the conflicts. @@ -767,7 +767,7 @@ milestones.title = Title milestones.desc = Description milestones.due_date = Due Date (optional) milestones.clear = Clear -milestones.invalid_due_date_format = "Due date format is invalid; must be 'yyyy-mm-dd'. +milestones.invalid_due_date_format = "Due date format is invalid; must be 'yyyy-mm-dd'." milestones.create_success = Milestone '%s' has been created successfully! milestones.edit = Edit Milestone milestones.edit_subheader = Use a good description for milestones so people won't be confused. @@ -850,7 +850,7 @@ activity.published_release_label = Published search = Search search.search_repo = Search repository -search.results = Search results for "%s" in %s +search.results = Search results for "%s" in %s settings = Settings settings.desc = Settings is where you can manage the settings for the repository @@ -926,7 +926,7 @@ settings.search_user_placeholder = Search user... settings.org_not_allowed_to_be_collaborator = Organization is not allowed to be added as a collaborator. settings.user_is_org_member = User is organization member who cannot be added as a collaborator. settings.add_webhook = Add Webhook -settings.hooks_desc = Webhooks are much like basic HTTP POST event triggers. Whenever something occurs in Gitea, we will send a notification to the target host. Learn more in the webhooks guide. +settings.hooks_desc = Webhooks are much like basic HTTP POST event triggers. Whenever something occurs in Gitea, we will send a notification to the target host. Learn more in the webhooks guide. settings.webhook_deletion = Delete Webhook settings.webhook_deletion_desc = Deleting this webhook will remove its information and all delivery history. Are you sure you want to continue? settings.webhook_deletion_success = Webhook has been deleted successfully! @@ -938,12 +938,12 @@ settings.webhook.response = Response settings.webhook.headers = Headers settings.webhook.payload = Payload settings.webhook.body = Body -settings.githooks_desc = "Git Hooks are powered by Git itself. You can edit files of supported hooks in the list below to perform custom operations. +settings.githooks_desc = "Git Hooks are powered by Git itself. You can edit files of supported hooks in the list below to perform custom operations." settings.githook_edit_desc = If the hook is inactive, sample content will be presented. Leaving content to an empty value will disable this hook. settings.githook_name = Hook Name settings.githook_content = Hook Content settings.update_githook = Update Hook -settings.add_webhook_desc = Gitea will send a POST request to the URL you specify, along with information about the event that occurred. You can also specify what data format you would like to receive upon triggering the hook (JSON, x-www-form-urlencoded, XML, etc). More information can be found in our webhooks guide. +settings.add_webhook_desc = Gitea will send a POST request to the URL you specify, along with information about the event that occurred. You can also specify what data format you would like to receive upon triggering the hook (JSON, x-www-form-urlencoded, XML, etc). More information can be found in our webhooks guide. settings.payload_url = Payload URL settings.content_type = Content Type settings.secret = Secret @@ -972,11 +972,11 @@ settings.update_hook_success = Webhook has been updated. settings.delete_webhook = Delete Webhook settings.recent_deliveries = Recent Deliveries settings.hook_type = Hook Type -settings.add_slack_hook_desc = Add Slack integration to your repository. +settings.add_slack_hook_desc = Add Slack integration to your repository. settings.slack_token = Token settings.slack_domain = Domain settings.slack_channel = Channel -settings.add_discord_hook_desc = Add Discord integration to your repository. +settings.add_discord_hook_desc = Add Discord integration to your repository. settings.deploy_keys = Deploy Keys settings.add_deploy_key = Add Deploy Key settings.deploy_key_desc = Deploy keys have read-only access. They are not the same as personal account SSH keys. @@ -1161,7 +1161,7 @@ teams.repositories = Team Repositories teams.search_repo_placeholder = Search repository... teams.add_team_repository = Add Team Repository teams.remove_repo = Remove -teams.add_nonexistent_repo = "The repository you're trying to add does not exist; please create it first. +teams.add_nonexistent_repo = "The repository you're trying to add does not exist; please create it first." [admin] dashboard = Dashboard @@ -1327,9 +1327,9 @@ auths.tips = Tips auths.tips.oauth2.general = OAuth2 Authentication auths.tips.oauth2.general.tip = When registering a new OAuth2 authentication, the callback/redirect URL should be: /user/oauth2//callback auths.tip.oauth2_provider = OAuth2 Provider -auths.tip.bitbucket = Register a new OAuth consumer on https://bitbucket.org/account/user//oauth-consumers/new and add the permission "Account"-"Read +auths.tip.bitbucket = Register a new OAuth consumer on https://bitbucket.org/account/user//oauth-consumers/new and add the permission "Account"-"Read" auths.tip.dropbox = Create a new application at https://www.dropbox.com/developers/apps -auths.tip.facebook = Register a new application at https://developers.facebook.com/apps and add the product "Facebook Login +auths.tip.facebook = Register a new application at https://developers.facebook.com/apps and add the product "Facebook Login" auths.tip.github = Register a new OAuth application on https://github.com/settings/applications/new auths.tip.gitlab = Register a new application on https://gitlab.com/profile/applications auths.tip.google_plus = Obtain OAuth2 client credentials from the Google API console (https://console.developers.google.com/) @@ -1487,21 +1487,21 @@ notices.op = Op. notices.delete_success = The system notices have been deleted. [action] -create_repo = created repository %s -rename_repo = renamed repository from %[1]s to %[3]s -commit_repo = pushed to %[3]s at %[4]s -create_issue = `opened issue %s#%[2]s` -close_issue = `closed issue %s#%[2]s` -reopen_issue = `reopened issue %s#%[2]s` -create_pull_request = `created pull request %s#%[2]s` -close_pull_request = `closed pull request %s#%[2]s` -reopen_pull_request = `reopened pull request %s#%[2]s` -comment_issue = `commented on issue %s#%[2]s` -merge_pull_request = `merged pull request %s#%[2]s` -transfer_repo = transferred repository %s to %s -push_tag = pushed tag %[2]s to %[3]s -delete_tag = deleted tag %[2]s from %[3]s -delete_branch = deleted branch %[2]s from %[3]s +create_repo = created repository %s +rename_repo = renamed repository from %[1]s to %[3]s +commit_repo = pushed to %[3]s at %[4]s +create_issue = `opened issue %s#%[2]s` +close_issue = `closed issue %s#%[2]s` +reopen_issue = `reopened issue %s#%[2]s` +create_pull_request = `created pull request %s#%[2]s` +close_pull_request = `closed pull request %s#%[2]s` +reopen_pull_request = `reopened pull request %s#%[2]s` +comment_issue = `commented on issue %s#%[2]s` +merge_pull_request = `merged pull request %s#%[2]s` +transfer_repo = transferred repository %s to %s +push_tag = pushed tag %[2]s to %[3]s +delete_tag = deleted tag %[2]s from %[3]s +delete_branch = deleted branch %[2]s from %[3]s compare_commits = Compare %d commits [tool] @@ -1546,9 +1546,9 @@ mark_as_unread = Mark as unread error.extract_sign = Failed to extract signature error.generate_hash = Failed to generate hash of commit error.no_committer_account = No account linked to committer's email -error.no_gpg_keys_found = "No known key found for this signature in database -error.not_signed_commit = "Not a signed commit -error.failed_retrieval_gpg_keys = "Failed to retrieve any key attached to the committer account +error.no_gpg_keys_found = "No known key found for this signature in database" +error.not_signed_commit = "Not a signed commit" +error.failed_retrieval_gpg_keys = "Failed to retrieve any key attached to the committer account" [units] error.no_unit_allowed_repo = Cannot find any unit on this repository which you are allowed to access