diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 32aab26ffa..745f0d6628 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -34,8 +34,8 @@ password = Password access_token = Access token re_type = Confirm password captcha = CAPTCHA -twofa = Two-Factor Authentication -twofa_scratch = Two-Factor Scratch Code +twofa = Two-factor authentication +twofa_scratch = Two-factor scratch code passcode = Passcode webauthn_insert_key = Insert your security key @@ -55,15 +55,15 @@ webauthn_reload = Reload repository = Repository organization = Organization mirror = Mirror -new_repo = New Repository -new_migrate = New Migration -new_mirror = New Mirror -new_fork = New Repository Fork -new_org = New Organization -new_project = New Project -new_project_column = New Column -admin_panel = Site Administration -account_settings = Account Settings +new_repo = New repository +new_migrate = New migration +new_mirror = New mirror +new_fork = New repository fork +new_org = New organization +new_project = New project +new_project_column = New column +admin_panel = Site administration +account_settings = Account settings settings = Settings your_profile = Profile your_starred = Starred @@ -76,7 +76,7 @@ collaborative = Collaborative forks = Forks activities = Activities -pull_requests = Pull Requests +pull_requests = Pull requests issues = Issues milestones = Milestones @@ -238,7 +238,7 @@ err_admin_name_pattern_not_allowed = Administrator username is invalid, the user err_admin_name_is_invalid = Administrator Username is invalid general_title = General settings -app_name = Instance name +app_name = Instance title app_name_helper = You can enter your company name here. repo_path = Repository root path repo_path_helper = Remote Git repositories will be saved to this directory. @@ -300,7 +300,7 @@ invalid_db_setting = The database settings are invalid: %v invalid_db_table = The database table "%s" is invalid: %v invalid_repo_path = The repository root path is invalid: %v invalid_app_data_path = The app data path is invalid: %v -run_user_not_match = The "run as" username is not the current username: %s -> %s +run_user_not_match = The "user to run as" username is not the current username: %s -> %s internal_token_failed = Failed to generate internal token: %v secret_key_failed = Failed to generate secret key: %v save_config_failed = Failed to save configuration: %v @@ -392,7 +392,7 @@ allow_password_change = Require user to change password (recommended) reset_password_mail_sent_prompt = A confirmation email has been sent to %s. Please check your inbox within the next %s to complete the account recovery process. active_your_account = Activate Your Account account_activated = Account has been activated -prohibit_login = Sign In Prohibited +prohibit_login = Signing in is prohibited prohibit_login_desc = Your account is prohibited from signing in, please contact your site administrator. resent_limit_prompt = You have already requested an activation email recently. Please wait 3 minutes and try again. has_unconfirmed_mail = Hi %s, you have an unconfirmed email address (%s). If you haven't received a confirmation email or need to resend a new one, please click on the button below. @@ -464,7 +464,7 @@ activate_email.title = %s, please verify your email address activate_email.text = Please click the following link to verify your email address within %s: admin.new_user.subject = New user %s just signed up -admin.new_user.user_info = User Information +admin.new_user.user_info = User information admin.new_user.text = Please click here to manage this user from the admin panel. register_notify = Welcome to Forgejo @@ -530,7 +530,7 @@ UserName = Username RepoName = Repository name Email = Email address Password = Password -Retype = Confirm Password +Retype = Confirm password SSHTitle = SSH key name HttpsUrl = HTTPS URL PayloadUrl = Payload URL @@ -623,16 +623,16 @@ admin_cannot_delete_self = You cannot delete yourself when you are an admin. Ple change_avatar = Change your avatar… joined_on = Joined on %s repositories = Repositories -activity = Public Activity +activity = Public activity followers = Followers -block_user = Block User +block_user = Block user block_user.detail = Please understand that if you block this user, other actions will be taken. Such as: block_user.detail_1 = You are being unfollowed from this user. block_user.detail_2 = This user cannot interact with your repositories, created issues and comments. block_user.detail_3 = This user cannot add you as a collaborator, nor can you add them as a collaborator. follow_blocked_user = You cannot follow this user because you have blocked this user or this user has blocked you. -starred = Starred Repositories -watched = Watched Repositories +starred = Starred repositories +watched = Watched repositories code = Code projects = Projects overview = Overview @@ -646,7 +646,7 @@ disabled_public_activity = This user has disabled the public visibility of the a email_visibility.limited = Your email address is visible to all authenticated users email_visibility.private = Your email address is only visible to you and administrators show_on_map = Show this place on a map -settings = User Settings +settings = User settings form.name_reserved = The username "%s" is reserved. form.name_pattern_not_allowed = The pattern "%s" is not allowed in a username. @@ -659,30 +659,30 @@ appearance = Appearance password = Password security = Security avatar = Avatar -ssh_gpg_keys = SSH / GPG Keys +ssh_gpg_keys = SSH / GPG keys social = Social Accounts applications = Applications orgs = Manage organizations repos = Repositories delete = Delete Account -twofa = Two-Factor Authentication (TOTP) +twofa = Two-factor authentication (TOTP) account_link = Linked Accounts organization = Organizations uid = UID -webauthn = Two-Factor Authentication (Security Keys) -blocked_users = Blocked Users +webauthn = Two-factor authentication (Security keys) +blocked_users = Blocked users public_profile = Public profile biography_placeholder = Tell us a little bit about yourself! (You can use Markdown) location_placeholder = Share your approximate location with others profile_desc = Control how your profile is shown to other users. Your primary email address will be used for notifications, password recovery and web-based Git operations. password_username_disabled = Non-local users are not allowed to change their username. Please contact your site administrator for more details. -full_name = Full Name +full_name = Full name website = Website location = Location -update_theme = Update Theme -update_profile = Update Profile -update_language = Update Language +update_theme = Change theme +update_profile = Update profile +update_language = Change language update_language_not_found = Language "%s" is not available. update_language_success = Language has been updated. update_profile_success = Your profile has been updated. @@ -703,32 +703,32 @@ comment_type_group_milestone = Milestone comment_type_group_assignee = Assignee comment_type_group_title = Title comment_type_group_branch = Branch -comment_type_group_time_tracking = Time Tracking +comment_type_group_time_tracking = Time tracking comment_type_group_deadline = Deadline comment_type_group_dependency = Dependency -comment_type_group_lock = Lock Status +comment_type_group_lock = Lock status comment_type_group_review_request = Review request comment_type_group_pull_request_push = Added commits comment_type_group_project = Project comment_type_group_issue_ref = Issue reference saved_successfully = Your settings were saved successfully. privacy = Privacy -keep_activity_private = Hide Activity from profile page -keep_activity_private_popup = Makes the activity visible only for you and the admins +keep_activity_private = Hide activity from profile page +keep_activity_private_popup = Your activity will only be visible to you and the instance admins -lookup_avatar_by_mail = Look Up Avatar by Email Address -federated_avatar_lookup = Federated Avatar Lookup +lookup_avatar_by_mail = Lookup avatar by email address +federated_avatar_lookup = Federated avatar lookup enable_custom_avatar = Use custom avatar choose_new_avatar = Choose new avatar -update_avatar = Update Avatar -delete_current_avatar = Delete Current Avatar +update_avatar = Update avatar +delete_current_avatar = Delete current avatar uploaded_avatar_not_a_image = The uploaded file is not an image. uploaded_avatar_is_too_big = The uploaded file size (%d KiB) exceeds the maximum size (%d KiB). update_avatar_success = Your avatar has been updated. update_user_avatar_success = The user's avatar has been updated. change_password = Change password -update_password = Update Password +update_password = Update password old_password = Current password new_password = New password retype_new_password = Confirm new password @@ -736,10 +736,10 @@ password_incorrect = The current password is incorrect. change_password_success = Your password has been updated. Sign in using your new password from now on. password_change_disabled = Non-local users cannot update their password through the Forgejo web interface. -emails = Email Addresses +emails = Email addresses manage_emails = Manage email addresses manage_themes = Select default theme -manage_openid = Manage OpenID Addresses +manage_openid = Manage OpenID addresses email_desc = Your primary email address will be used for notifications, password recovery and, provided that it is not hidden, web-based Git operations. theme_desc = This will be your default theme across the site. primary = Primary @@ -760,7 +760,7 @@ openid_deletion_desc = Removing this OpenID address from your account will preve openid_deletion_success = The OpenID address has been removed. add_new_email = Add email address add_new_openid = Add New OpenID URI -add_email = Add Email Address +add_email = Add email address add_openid = Add OpenID URI add_email_confirmation_sent = A confirmation email has been sent to "%s". Please check your inbox within the next %s to confirm your email address. add_email_success = The new email address has been added. @@ -773,14 +773,14 @@ openid_desc = OpenID lets you delegate authentication to an external provider. manage_ssh_keys = Manage SSH keys manage_ssh_principals = Manage SSH Certificate Principals manage_gpg_keys = Manage GPG keys -add_key = Add Key +add_key = Add key ssh_desc = These public SSH keys are associated with your account. The corresponding private keys allow full access to your repositories. SSH keys that have been verified can be used to verify SSH-signed Git commits. principal_desc = These SSH certificate principals are associated with your account and allow full access to your repositories. gpg_desc = These public GPG keys are associated with your account and used to verify your commits. Keep your private keys safe as they allow to sign commits with your identity. ssh_helper = Need help? Have a look at the guide to create your own SSH keys or solve common problems you may encounter using SSH. gpg_helper = Need help? Have a look at the guide about GPG. -add_new_key = Add SSH Key -add_new_gpg_key = Add GPG Key +add_new_key = Add SSH key +add_new_gpg_key = Add GPG key key_content_ssh_placeholder = Begins with "ssh-ed25519", "ssh-rsa", "ecdsa-sha2-nistp256", "ecdsa-sha2-nistp384", "ecdsa-sha2-nistp521", "sk-ecdsa-sha2-nistp256@openssh.com", or "sk-ssh-ed25519@openssh.com" key_content_gpg_placeholder = Begins with "-----BEGIN PGP PUBLIC KEY BLOCK-----" add_new_principal = Add Principal @@ -791,7 +791,7 @@ gpg_key_id_used = A public GPG key with same ID already exists. gpg_no_key_email_found = This GPG key does not match any activated email address associated with your account. It may still be added if you sign the provided token. gpg_key_matched_identities = Matched Identities: gpg_key_matched_identities_long=The embedded identities in this key match the following activated email addresses for this user. Commits matching these email addresses can be verified with this key. -gpg_key_verified=Verified Key +gpg_key_verified=Verified key gpg_key_verified_long=Key has been verified with a token and can be used to verify commits matching any activated email addresses for this user in addition to any matched identities for this key. gpg_key_verify=Verify gpg_invalid_token_signature = The provided GPG key, signature and token do not match or token is out-of-date. @@ -802,7 +802,7 @@ gpg_token_code = echo "%s" | gpg -a --default-key %s --detach-sig gpg_token_signature = Armored GPG signature key_signature_gpg_placeholder = Begins with "-----BEGIN PGP SIGNATURE-----" verify_gpg_key_success = GPG key "%s" has been verified. -ssh_key_verified=Verified Key +ssh_key_verified=Verified key ssh_key_verified_long=Key has been verified with a token and can be used to verify commits matching any activated email addresses for this user. ssh_key_verify=Verify ssh_invalid_token_signature = The provided SSH key, signature or token do not match or token is out-of-date. @@ -821,8 +821,8 @@ add_key_success = The SSH key "%s" has been added. add_gpg_key_success = The GPG key "%s" has been added. add_principal_success = The SSH certificate principal "%s" has been added. delete_key = Remove -ssh_key_deletion = Remove SSH Key -gpg_key_deletion = Remove GPG Key +ssh_key_deletion = Remove SSH key +gpg_key_deletion = Remove GPG key ssh_principal_deletion = Remove SSH Certificate Principal ssh_key_deletion_desc = Removing an SSH key revokes its access to your account. Continue? gpg_key_deletion_desc = Removing a GPG key un-verifies commits signed by it. Continue? @@ -854,11 +854,11 @@ manage_access_token = Manage access tokens generate_new_token = Generate new token tokens_desc = These tokens grant access to your account using the Forgejo API. token_name = Token name -generate_token = Generate Token +generate_token = Generate token generate_token_success = Your new token has been generated. Copy it now as it will not be shown again. generate_token_name_duplicate = %s has been used as an application name already. Please use a new one. delete_token = Delete -access_token_deletion = Delete Access Token +access_token_deletion = Delete access token access_token_deletion_cancel_action = Cancel access_token_deletion_confirm_action = Delete access_token_deletion_desc = Deleting a token will revoke access to your account for applications using it. This cannot be undone. Continue? @@ -881,11 +881,11 @@ remove_oauth2_application = Remove OAuth2 Application remove_oauth2_application_desc = Removing an OAuth2 application will revoke access to all signed access tokens. Continue? remove_oauth2_application_success = The application has been deleted. create_oauth2_application = Create a new OAuth2 application -create_oauth2_application_button = Create Application +create_oauth2_application_button = Create application create_oauth2_application_success = You have successfully created a new OAuth2 application. update_oauth2_application_success = You have successfully updated the OAuth2 application. oauth2_application_name = Application name -oauth2_confidential_client = Confidential Client. Select for apps that keep the secret confidential, such as web apps. Do not select for native apps including desktop and mobile apps. +oauth2_confidential_client = Confidential client. Select for apps that keep the secret confidential, such as web apps. Do not select for native apps including desktop and mobile apps. oauth2_redirect_uris = Redirect URIs. Please use a new line for every URI. save_application = Save oauth2_client_id = Client ID @@ -909,10 +909,10 @@ twofa_desc = To protect your account against password theft, you can use a smart twofa_recovery_tip = If you lose your device, you will be able to use a single-use recovery key to regain access to your account. twofa_is_enrolled = Your account is currently enrolled in two-factor authentication. twofa_not_enrolled = Your account is not currently enrolled in two-factor authentication. -twofa_disable = Disable Two-Factor Authentication -twofa_scratch_token_regenerate = Regenerate Single-Use Recovery Key +twofa_disable = Disable two-factor authentication +twofa_scratch_token_regenerate = Regenerate single-use recovery key twofa_scratch_token_regenerated = Your single-use recovery key is now %s. Store it in a safe place, as it will not be shown again. -twofa_enroll = Enroll into Two-Factor Authentication +twofa_enroll = Enroll into two-factor authentication twofa_disable_note = You can disable two-factor authentication if needed. twofa_disable_desc = Disabling two-factor authentication will make your account less secure. Continue? regenerate_scratch_token_desc = If you misplaced your recovery key or have already used it to sign in, you can reset it here. @@ -925,9 +925,9 @@ twofa_enrolled = Your account has been successfully enrolled. Store your single- twofa_failed_get_secret = Failed to get secret. webauthn_desc = Security keys are hardware devices containing cryptographic keys. They can be used for two-factor authentication. Security keys must support the WebAuthn Authenticator standard. -webauthn_register_key = Add Security Key +webauthn_register_key = Add security key webauthn_nickname = Nickname -webauthn_delete_key = Remove Security Key +webauthn_delete_key = Remove security key webauthn_delete_key_desc = If you remove a security key you can no longer sign in with it. Continue? webauthn_key_loss_warning = If you lose your security keys, you will lose access to your account. webauthn_alternative_tip = You may want to configure an additional authentication method. @@ -946,18 +946,18 @@ orgs_none = You are not a member of any organizations. repos_none = You do not own any repositories. blocked_users_none = There are no blocked users. -delete_account = Delete Your Account +delete_account = Delete your account delete_prompt = This operation will permanently delete your user account. It CANNOT be undone. delete_with_all_comments = Your account is younger than %s. To avoid ghost comments, all issue/PR comments will be deleted with it. -confirm_delete_account = Confirm Deletion -delete_account_title = Delete User Account +confirm_delete_account = Confirm deletion +delete_account_title = Delete user account delete_account_desc = Are you sure you want to permanently delete this user account? -email_notifications.enable = Enable Email Notifications -email_notifications.onmention = Only Email on Mention -email_notifications.disable = Disable Email Notifications -email_notifications.submit = Set Email Preference -email_notifications.andyourown = And Your Own Notifications +email_notifications.enable = Enable email notifications +email_notifications.onmention = Only email on mention +email_notifications.disable = Disable email notifications +email_notifications.submit = Set email preference +email_notifications.andyourown = And your own notifications visibility = User visibility visibility.public = Public @@ -994,10 +994,10 @@ visibility = Visibility visibility_description = Only the owner or the organization members if they have rights, will be able to see it. visibility_helper = Make repository private visibility_helper_forced = Your site administrator forces new repositories to be private. -visibility_fork_helper = (Changing this will affect all forks.) +visibility_fork_helper = (Changing this will affect visibility of all forks.) clone_helper = Need help cloning? Visit Help. -fork_repo = Fork Repository -fork_from = Fork From +fork_repo = Fork repository +fork_from = Fork from already_forked = You've already forked %s fork_to_different_account = Fork to a different account fork_visibility_helper = The visibility of a forked repository cannot be changed. @@ -1010,48 +1010,48 @@ clone_in_vscodium = Clone in VSCodium download_zip = Download ZIP download_tar = Download TAR.GZ download_bundle = Download BUNDLE -generate_repo = Generate Repository -generate_from = Generate From +generate_repo = Generate repository +generate_from = Generate from repo_desc = Description repo_desc_helper = Enter short description (optional) repo_lang = Language repo_gitignore_helper = Select .gitignore templates. repo_gitignore_helper_desc = Choose which files not to track from a list of templates for common languages. Typical artifacts generated by each language's build tools are included on .gitignore by default. -issue_labels = Issue Labels +issue_labels = Issue labels issue_labels_helper = Select an issue label set. license = License license_helper = Select a license file. license_helper_desc = A license governs what others can and can't do with your code. Not sure which one is right for your project? See Choose a license. -object_format = Object Format +object_format = Object format object_format_helper = Object format of the repository. Cannot be changed later. SHA1 is most compatible. readme = README readme_helper = Select a README file template. readme_helper_desc = This is the place where you can write a complete description for your project. -auto_init = Initialize Repository (Adds .gitignore, License and README) +auto_init = Initialize repository (Adds .gitignore, License and README) trust_model_helper = Select trust model for signature verification. Possible options are: trust_model_helper_collaborator = Collaborator: Trust signatures by collaborators trust_model_helper_committer = Committer: Trust signatures that match committers trust_model_helper_collaborator_committer = Collaborator+Committer: Trust signatures by collaborators which match the committer trust_model_helper_default = Default: Use the default trust model for this installation -create_repo = Create Repository -default_branch = Default Branch +create_repo = Create repository +default_branch = Default branch default_branch_label = default default_branch_helper = The default branch is the base branch for pull requests and code commits. mirror_prune = Prune mirror_prune_desc = Remove obsolete remote-tracking references -mirror_interval = Mirror Interval (valid time units are "h", "m", "s"). 0 to disable periodic sync. (Minimum interval: %s) +mirror_interval = Mirror interval (valid time units are "h", "m", "s"). 0 to disable periodic sync. (Minimum interval: %s) mirror_interval_invalid = The mirror interval is not valid. mirror_sync = synced mirror_sync_on_commit = Sync when commits are pushed -mirror_address = Clone From URL +mirror_address = Clone from URL mirror_address_desc = Put any required credentials in the Authorization section. mirror_address_url_invalid = The provided URL is invalid. You must escape all components of the URL correctly. mirror_address_protocol_invalid = The provided URL is invalid. Only http(s):// or git:// locations can be used for mirroring. mirror_lfs = Large File Storage (LFS) mirror_lfs_desc = Activate mirroring of LFS data. -mirror_lfs_endpoint = LFS Endpoint +mirror_lfs_endpoint = LFS endpoint mirror_lfs_endpoint_desc = Sync will attempt to use the clone url to determine the LFS server. You can also specify a custom endpoint if the repository LFS data is stored somewhere else. -mirror_last_synced = Last Synchronized +mirror_last_synced = Last synchronized mirror_password_placeholder = (Unchanged) mirror_password_blank_placeholder = (Unset) mirror_password_help = Change the username to erase a stored password. @@ -1063,7 +1063,7 @@ reactions_more = and %d more unit_disabled = The site administrator has disabled this repository section. language_other = Other adopt_search = Enter username to search for unadopted repositories... (leave blank to find all) -adopt_preexisting_label = Adopt Files +adopt_preexisting_label = Adopt files adopt_preexisting = Adopt pre-existing files adopt_preexisting_content = Create repository from %s adopt_preexisting_success = Adopted files and created repository from %s @@ -1080,9 +1080,9 @@ tree_path_not_found_commit = Path %[1]s doesn't exist in commit %[2]s tree_path_not_found_branch = Path %[1]s doesn't exist in branch %[2]s tree_path_not_found_tag = Path %[1]s doesn't exist in tag %[2]s -transfer.accept = Accept Transfer +transfer.accept = Accept transfer transfer.accept_desc = Transfer to "%s" -transfer.reject = Reject Transfer +transfer.reject = Reject transfer transfer.reject_desc = Cancel transfer to "%s" transfer.no_permission_to_accept = You do not have permission to accept this transfer. transfer.no_permission_to_reject = You do not have permission to reject this transfer. @@ -1094,14 +1094,14 @@ desc.internal = Internal desc.archived = Archived desc.sha256 = SHA256 -template.items = Template Items -template.git_content = Git Content (Default Branch) -template.git_hooks = Git Hooks -template.git_hooks_tooltip = You are currently unable to modify or remove Git Hooks once added. Select this only if you trust the template repository. +template.items = Template items +template.git_content = Git content (Default branch) +template.git_hooks = Git hooks +template.git_hooks_tooltip = You are currently unable to modify or remove Git hooks once added. Select this only if you trust the template repository. template.webhooks = Webhooks template.topics = Topics template.avatar = Avatar -template.issue_labels = Issue Labels +template.issue_labels = Issue labels template.one_item = Must select at least one template item template.invalid = Must select a template repository @@ -1117,10 +1117,10 @@ form.name_pattern_not_allowed = The pattern "%s" is not allowed in a repository need_auth = Authorization migrate_options = Migration options -migrate_service = Migration Service +migrate_service = Migration service migrate_options_mirror_helper = This repository will be a mirror migrate_options_lfs = Migrate LFS files -migrate_options_lfs_endpoint.label = LFS Endpoint +migrate_options_lfs_endpoint.label = LFS endpoint migrate_options_lfs_endpoint.description = Migration will attempt to use your Git remote to determine the LFS server. You can also specify a custom endpoint if the repository LFS data is stored somewhere else. migrate_options_lfs_endpoint.description.local = A local server path is supported too. migrate_options_lfs_endpoint.placeholder = If left blank, the endpoint will be derived from the clone URL @@ -1129,10 +1129,10 @@ migrate_items_wiki = Wiki migrate_items_milestones = Milestones migrate_items_labels = Labels migrate_items_issues = Issues -migrate_items_pullrequests = Pull Requests -migrate_items_merge_requests = Merge Requests +migrate_items_pullrequests = Pull requests +migrate_items_merge_requests = Merge requests migrate_items_releases = Releases -migrate_repo = Migrate Repository +migrate_repo = Migrate repository migrate.clone_address = Migrate / Clone from URL migrate.clone_address_desc = The HTTP(S) or Git "clone" URL of an existing repository migrate.github_token_desc = You can put one or more tokens with comma separated here to make migrating faster because of GitHub API rate limit. WARN: Abusing this feature may violate the service provider's policy and lead to account blocking. @@ -1142,15 +1142,15 @@ migrate.permission_denied_blocked = You cannot import from disallowed hosts, ple migrate.invalid_local_path = The local path is invalid. It doesn't exist or is not a directory. migrate.invalid_lfs_endpoint = The LFS endpoint is not valid. migrate.failed = Migration failed: %v -migrate.migrate_items_options = Access Token is required to migrate additional items +migrate.migrate_items_options = Access token is required to migrate additional items migrated_from = Migrated from %[2]s -migrated_from_fake = Migrated From %[1]s -migrate.migrate = Migrate From %s +migrated_from_fake = Migrated from %[1]s +migrate.migrate = Migrate from %s migrate.migrating = Migrating from %s ... migrate.migrating_failed = Migrating from %s failed. migrate.migrating_failed.error = Failed to migrate: %s migrate.migrating_failed_no_addr = Migration failed. -migrate.github.description = Migrate data from github.com or other GitHub instances. +migrate.github.description = Migrate data from github.com or GitHub Enterprise server. migrate.git.description = Migrate a repository only from any Git service. migrate.gitlab.description = Migrate data from gitlab.com or other GitLab instances. migrate.forgejo.description = Migrate data from codeberg.org or other Forgejo instances. @@ -1159,14 +1159,14 @@ migrate.gogs.description = Migrate data from notabug.org or other Gogs instances migrate.onedev.description = Migrate data from code.onedev.io or other OneDev instances. migrate.codebase.description = Migrate data from codebasehq.com. migrate.gitbucket.description = Migrate data from GitBucket instances. -migrate.migrating_git = Migrating Git Data -migrate.migrating_topics = Migrating Topics -migrate.migrating_milestones = Migrating Milestones -migrate.migrating_labels = Migrating Labels -migrate.migrating_releases = Migrating Releases -migrate.migrating_issues = Migrating Issues -migrate.migrating_pulls = Migrating Pull Requests -migrate.cancel_migrating_title = Cancel Migration +migrate.migrating_git = Migrating Git data +migrate.migrating_topics = Migrating topics +migrate.migrating_milestones = Migrating milestones +migrate.migrating_labels = Migrating labels +migrate.migrating_releases = Migrating releases +migrate.migrating_issues = Migrating issues +migrate.migrating_pulls = Migrating pull requests +migrate.cancel_migrating_title = Cancel migration migrate.cancel_migrating_confirm = Do you want to cancel this migration? mirror_from = mirror of @@ -1181,11 +1181,11 @@ watch = Watch unstar = Unstar star = Star fork = Fork -download_archive = Download Repository -more_operations = More Operations +download_archive = Download repository +more_operations = More operations -no_desc = No Description -quick_guide = Quick Guide +no_desc = No description +quick_guide = Quick guide clone_this_repo = Clone this repository cite_this_repo = Cite this repository create_new_repo_command = Creating a new repository on the command line @@ -1203,7 +1203,7 @@ find_tag = Find tag branches = Branches tags = Tags issues = Issues -pulls = Pull Requests +pulls = Pull requests project_board = Projects packages = Packages actions = Actions @@ -1237,18 +1237,18 @@ ambiguous_character = `%[1]c [U+%04[1]X] can be confused with %[2]c [U+%04[2]X]` escape_control_characters = Escape unescape_control_characters = Unescape -file_copy_permalink = Copy Permalink -view_git_blame = View Git Blame +file_copy_permalink = Copy permalink +view_git_blame = View git blame video_not_supported_in_browser = Your browser does not support the HTML5 "video" tag. audio_not_supported_in_browser = Your browser does not support the HTML5 "audio" tag. stored_lfs = Stored with Git LFS symbolic_link = Symbolic link -executable_file = Executable File +executable_file = Executable file vendored = Vendored generated = Generated -commit_graph = Commit Graph +commit_graph = Commit graph commit_graph.select = Select branches -commit_graph.hide_pr_refs = Hide Pull Requests +commit_graph.hide_pr_refs = Hide pull requests commit_graph.monochrome = Mono commit_graph.color = Color commit.contained_in = This commit is contained in: @@ -1261,18 +1261,18 @@ line = line lines = lines from_comment = (comment) -editor.add_file = Add File -editor.new_file = New File -editor.upload_file = Upload File -editor.edit_file = Edit File -editor.preview_changes = Preview Changes +editor.add_file = Add file +editor.new_file = New file +editor.upload_file = Upload file +editor.edit_file = Edit file +editor.preview_changes = Preview changes editor.cannot_edit_lfs_files = LFS files cannot be edited in the web interface. editor.cannot_edit_non_text_files = Binary files cannot be edited in the web interface. -editor.edit_this_file = Edit File +editor.edit_this_file = Edit file editor.this_file_locked = File is locked editor.must_be_on_a_branch = You must be on a branch to make or propose changes to this file. editor.fork_before_edit = You must fork this repository to make or propose changes to this file. -editor.delete_this_file = Delete File +editor.delete_this_file = Delete file editor.must_have_write_access = You must have write access to make or propose changes to this file. editor.file_delete_success = File "%s" has been deleted. editor.name_your_file = Name your file… @@ -1315,8 +1315,8 @@ editor.commit_empty_file_text = The file you're about to commit is empty. Procee editor.no_changes_to_show = There are no changes to show. editor.fail_to_update_file = Failed to update/create file "%s". editor.fail_to_update_file_summary = Error Message: -editor.push_rejected_no_message = The change was rejected by the server without a message. Please check Git Hooks. -editor.push_rejected = The change was rejected by the server. Please check Git Hooks. +editor.push_rejected_no_message = The change was rejected by the server without a message. Please check Git hooks. +editor.push_rejected = The change was rejected by the server. Please check Git hooks. editor.push_rejected_summary = Full Rejection Message: editor.add_subdir = Add a directory… editor.unable_to_upload_files = Failed to upload files to "%s" with error: %v @@ -1347,8 +1347,8 @@ commits.newer = Newer commits.signed_by = Signed by commits.signed_by_untrusted_user = Signed by untrusted user commits.signed_by_untrusted_user_unmatched = Signed by untrusted user who does not match committer -commits.gpg_key_id = GPG Key ID -commits.ssh_key_fingerprint = SSH Key Fingerprint +commits.gpg_key_id = GPG key ID +commits.ssh_key_fingerprint = SSH key fingerprint commits.view_path=View at this point in history commit.operations = Operations @@ -1364,24 +1364,24 @@ commitstatus.failure = Failure commitstatus.pending = Pending commitstatus.success = Success -ext_issues = Access to External Issues +ext_issues = Access to external issues ext_issues.desc = Link to an external issue tracker. projects = Projects projects.desc = Manage issues and pulls in project boards. projects.description = Description (optional) projects.description_placeholder = Description -projects.create = Create Project +projects.create = Create project projects.title = Title -projects.new = New Project +projects.new = New project projects.new_subheader = Coordinate, track, and update your work in one place, so projects stay transparent and on schedule. projects.create_success = The project "%s" has been created. -projects.deletion = Delete Project +projects.deletion = Delete project projects.deletion_desc = Deleting a project removes it from all related issues. Continue? projects.deletion_success = The project has been deleted. -projects.edit = Edit Project +projects.edit = Edit project projects.edit_subheader = Projects organize issues and track progress. -projects.modify = Edit Project +projects.modify = Edit project projects.edit_success = Project "%s" has been updated. projects.type.none = None projects.type.basic_kanban = Basic Kanban @@ -1414,43 +1414,43 @@ issues.filter_milestones = Filter Milestone issues.filter_projects = Filter Project issues.filter_labels = Filter Label issues.filter_reviewers = Filter Reviewer -issues.new = New Issue +issues.new = New issue issues.new.title_empty = Title cannot be empty issues.new.labels = Labels -issues.new.no_label = No Label +issues.new.no_label = No label issues.new.clear_labels = Clear labels issues.new.projects = Projects issues.new.clear_projects = Clear projects issues.new.no_projects = No project -issues.new.open_projects = Open Projects -issues.new.closed_projects = Closed Projects +issues.new.open_projects = Open projects +issues.new.closed_projects = Closed projects issues.new.no_items = No items issues.new.milestone = Milestone -issues.new.no_milestone = No Milestone +issues.new.no_milestone = No milestone issues.new.clear_milestone = Clear milestone -issues.new.open_milestone = Open Milestones -issues.new.closed_milestone = Closed Milestones +issues.new.open_milestone = Open milestones +issues.new.closed_milestone = Closed milestones issues.new.assignees = Assignees issues.new.clear_assignees = Clear assignees -issues.new.no_assignees = No Assignees +issues.new.no_assignees = No assignees issues.new.no_reviewers = No reviewers -issues.choose.get_started = Get Started +issues.choose.get_started = Get started issues.choose.open_external_link = Open issues.choose.blank = Default issues.choose.blank_about = Create an issue from default template. issues.choose.ignore_invalid_templates = Invalid templates have been ignored issues.choose.invalid_templates = %v invalid template(s) found issues.choose.invalid_config = The issue config contains errors: -issues.no_ref = No Branch/Tag Specified -issues.create = Create Issue -issues.new_label = New Label +issues.no_ref = No Branch/Tag specified +issues.create = Create issue +issues.new_label = New label issues.new_label_placeholder = Label name issues.new_label_desc_placeholder = Description -issues.create_label = Create Label -issues.label_templates.title = Load a predefined set of labels -issues.label_templates.info = No labels exist yet. Create a label with "New Label" or use a predefined label set: -issues.label_templates.helper = Select a label set -issues.label_templates.use = Use Label Set +issues.create_label = Create label +issues.label_templates.title = Load a label preset +issues.label_templates.info = No labels exist yet. Create a label with "New label" or use a label preset: +issues.label_templates.helper = Select a label preset +issues.label_templates.use = Use label preset issues.label_templates.fail_to_load_file = Failed to load label template file "%s": %v issues.add_label = added the %s label %s issues.add_labels = added the %s labels %s @@ -1536,18 +1536,18 @@ issues.num_comments_1 = %d comment issues.num_comments = %d comments issues.commented_at = `commented %s` issues.delete_comment_confirm = Are you sure you want to delete this comment? -issues.context.copy_link = Copy Link -issues.context.quote_reply = Quote Reply -issues.context.reference_issue = Reference in New Issue +issues.context.copy_link = Copy link +issues.context.quote_reply = Quote reply +issues.context.reference_issue = Reference in a new issue issues.context.edit = Edit issues.context.delete = Delete issues.no_content = No description provided. -issues.close = Close Issue +issues.close = Close issue issues.comment_pull_merged_at = merged commit %[1]s into %[2]s %[3]s issues.comment_manually_pull_merged_at = manually merged commit %[1]s into %[2]s %[3]s -issues.close_comment_issue = Comment and Close +issues.close_comment_issue = Comment and close issues.reopen_issue = Reopen -issues.reopen_comment_issue = Comment and Reopen +issues.reopen_comment_issue = Comment and reopen issues.create_comment = Comment issues.closed_at = `closed this issue %[2]s` issues.reopened_at = `reopened this issue %[2]s` @@ -1585,7 +1585,7 @@ issues.label_title = Name issues.label_description = Description issues.label_color = Color issues.label_exclusive = Exclusive -issues.label_archive = Archive Label +issues.label_archive = Archive label issues.label_archived_filter = Show archived labels issues.label_archive_tooltip = Archived labels are excluded by default from the suggestions when searching by label. issues.label_exclusive_desc = Name the label scope/item to make it mutually exclusive with other scope/ labels. @@ -1594,20 +1594,20 @@ issues.label_count = %d labels issues.label_open_issues = %d open issues/pull requests issues.label_edit = Edit issues.label_delete = Delete -issues.label_modify = Edit Label -issues.label_deletion = Delete Label +issues.label_modify = Edit label +issues.label_deletion = Delete label issues.label_deletion_desc = Deleting a label removes it from all issues. Continue? issues.label_deletion_success = The label has been deleted. issues.label.filter_sort.alphabetically = Alphabetically issues.label.filter_sort.reverse_alphabetically = Reverse alphabetically issues.label.filter_sort.by_size = Smallest size issues.label.filter_sort.reverse_by_size = Largest size -issues.num_participants = %d Participants +issues.num_participants = %d participants issues.attachment.open_tab = `Click to see "%s" in a new tab` issues.attachment.download = `Click to download "%s"` issues.subscribe = Subscribe issues.unsubscribe = Unsubscribe -issues.unpin_issue = Unpin Issue +issues.unpin_issue = Unpin issue issues.max_pinned = You can't pin more issues issues.pin_comment = pinned this %s issues.unpin_comment = unpinned this %s @@ -1633,28 +1633,28 @@ issues.comment_on_locked = You cannot comment on a locked issue. issues.delete = Delete issues.delete.title = Delete this issue? issues.delete.text = Do you really want to delete this issue? (This will permanently remove all content. Consider closing it instead, if you intend to keep it archived) -issues.tracker = Time Tracker -issues.start_tracking_short = Start Timer -issues.start_tracking = Start Time Tracking +issues.tracker = Time tracker +issues.start_tracking_short = Start timer +issues.start_tracking = Start time tracking issues.start_tracking_history = `started working %s` issues.tracker_auto_close = Timer will be stopped automatically when this issue gets closed issues.tracking_already_started = `You have already started time tracking on another issue!` -issues.stop_tracking = Stop Timer +issues.stop_tracking = Stop timer issues.stop_tracking_history = `stopped working %s` issues.cancel_tracking = Discard issues.cancel_tracking_history = `canceled time tracking %s` -issues.add_time = Manually Add Time +issues.add_time = Manually add time issues.del_time = Delete this time log -issues.add_time_short = Add Time +issues.add_time_short = Add time issues.add_time_cancel = Cancel issues.add_time_history = `added spent time %s` issues.del_time_history= `deleted spent time %s` issues.add_time_hours = Hours issues.add_time_minutes = Minutes issues.add_time_sum_to_small = No time was entered. -issues.time_spent_total = Total Time Spent -issues.time_spent_from_all_authors = `Total Time Spent: %s` -issues.due_date = Due Date +issues.time_spent_total = Total time spent +issues.time_spent_from_all_authors = `Total time spent: %s` +issues.due_date = Due date issues.invalid_due_date_format = Due date format must be "yyyy-mm-dd". issues.error_modifying_due_date = Failed to modify the due date. issues.error_removing_due_date = Failed to remove the due date. @@ -1697,7 +1697,7 @@ issues.dependency.blocked_by_short = Depends on issues.dependency.remove_header = Remove Dependency issues.dependency.issue_remove_text = This will remove the dependency from this issue. Continue? issues.dependency.pr_remove_text = This will remove the dependency from this pull request. Continue? -issues.dependency.setting = Enable Dependencies For Issues and Pull Requests +issues.dependency.setting = Enable dependencies for issues and pull requests issues.dependency.add_error_same_issue = You cannot make an issue depend on itself. issues.dependency.add_error_dep_issue_not_exist = Dependent issue does not exist. issues.dependency.add_error_dep_not_exist = Dependency does not exist. @@ -1748,9 +1748,9 @@ compare.compare_base = base compare.compare_head = compare pulls.desc = Enable pull requests and code reviews. -pulls.new = New Pull Request -pulls.view = View Pull Request -pulls.compare_changes = New Pull Request +pulls.new = New pull request +pulls.view = View pull request +pulls.compare_changes = New pull request pulls.allow_edits_from_maintainers = Allow edits from maintainers pulls.allow_edits_from_maintainers_desc = Users with write access to the base branch can also push to this branch pulls.allow_edits_from_maintainers_err = Updating failed @@ -1777,13 +1777,13 @@ pulls.nothing_to_compare = These branches are equal. There is no need to create pulls.nothing_to_compare_have_tag = The selected branch/tag are equal. pulls.nothing_to_compare_and_allow_empty_pr = These branches are equal. This PR will be empty. pulls.has_pull_request = `A pull request between these branches already exists: %[2]s#%[3]d` -pulls.create = Create Pull Request +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 pulls.change_target_branch_at = `changed target branch from %s to %s %s` pulls.tab_conversation = Conversation pulls.tab_commits = Commits -pulls.tab_files = Files Changed +pulls.tab_files = Files changed pulls.reopen_to_merge = Please reopen this pull request to perform a merge. pulls.cant_reopen_deleted_branch = This pull request cannot be reopened because the branch was deleted. pulls.merged = Merged @@ -1848,9 +1848,9 @@ pulls.unrelated_histories = Merge Failed: The merge head and base do not share a pulls.merge_out_of_date = Merge Failed: Whilst generating the merge, the base was updated. Hint: Try again. pulls.head_out_of_date = Merge Failed: Whilst generating the merge, the head was updated. Hint: Try again. pulls.has_merged = Failed: The pull request has been merged, you cannot merge again or change the target branch. -pulls.push_rejected = Push Failed: The push was rejected. Review the Git Hooks for this repository. +pulls.push_rejected = Push Failed: The push was rejected. Review the Git hooks for this repository. pulls.push_rejected_summary = Full Rejection Message -pulls.push_rejected_no_message = Push Failed: The push was rejected but there was no remote message. Review the Git Hooks for this repository +pulls.push_rejected_no_message = Push Failed: The push was rejected but there was no remote message. Review the Git hooks for this repository pulls.open_unmerged_pull_exists = `You cannot perform a reopen operation because there is a pending pull request (#%d) with identical properties.` pulls.status_checking = Some checks are pending pulls.status_checks_success = All checks were successful @@ -1866,7 +1866,7 @@ pulls.update_branch_rebase = Update branch by rebase pulls.update_branch_success = Branch update was successful pulls.update_not_allowed = You are not allowed to update branch pulls.outdated_with_base_branch = This branch is out-of-date with the base branch -pulls.close = Close Pull Request +pulls.close = Close pull request pulls.closed_at = `closed this pull request %[2]s` pulls.reopened_at = `reopened this pull request %[2]s` pulls.commit_ref_at = `referenced this pull request from a commit %[2]s` @@ -1902,7 +1902,7 @@ pulls.recently_pushed_new_branches = You pushed on branch %d%% Completed -milestones.create = Create Milestone +milestones.create = Create milestone milestones.title = Title milestones.desc = Description -milestones.due_date = Due Date (optional) +milestones.due_date = Due date (optional) milestones.clear = Clear milestones.invalid_due_date_format = Due date format must be "yyyy-mm-dd". milestones.create_success = The milestone "%s" has been created. -milestones.edit = Edit Milestone +milestones.edit = Edit milestone milestones.edit_subheader = Milestones organize issues and track progress. milestones.cancel = Cancel -milestones.modify = Update Milestone +milestones.modify = Update milestone milestones.edit_success = Milestone "%s" has been updated. -milestones.deletion = Delete Milestone +milestones.deletion = Delete milestone milestones.deletion_desc = Deleting a milestone removes it from all related issues. Continue? milestones.deletion_success = The milestone has been deleted. milestones.filter_sort.earliest_due_data = Nearest due date @@ -1979,9 +1979,9 @@ wiki.original_git_entry_tooltip = View original Git file instead of using friend activity = Activity activity.navbar.pulse = Pulse -activity.navbar.code_frequency = Code Frequency +activity.navbar.code_frequency = Code frequency activity.navbar.contributors = Contributors -activity.navbar.recent_commits = Recent Commits +activity.navbar.recent_commits = Recent commits activity.period.filter_label = Period: activity.period.daily = 1 day activity.period.halfweekly = 3 days @@ -1991,38 +1991,38 @@ activity.period.quarterly = 3 months activity.period.semiyearly = 6 months activity.period.yearly = 1 year activity.overview = Overview -activity.active_prs_count_1 = %d Active Pull Request -activity.active_prs_count_n = %d Active Pull Requests -activity.merged_prs_count_1 = Merged Pull Request -activity.merged_prs_count_n = Merged Pull Requests -activity.opened_prs_count_1 = Proposed Pull Request -activity.opened_prs_count_n = Proposed Pull Requests +activity.active_prs_count_1 = %d Active pull request +activity.active_prs_count_n = %d Active pull requests +activity.merged_prs_count_1 = Merged pull request +activity.merged_prs_count_n = Merged pull requests +activity.opened_prs_count_1 = Proposed pull request +activity.opened_prs_count_n = Proposed pull requests activity.title.user_1 = %d user activity.title.user_n = %d users -activity.title.prs_1 = %d Pull request -activity.title.prs_n = %d Pull requests +activity.title.prs_1 = %d pull request +activity.title.prs_n = %d pull requests activity.title.prs_merged_by = %s merged by %s activity.title.prs_opened_by = %s proposed by %s activity.merged_prs_label = Merged activity.opened_prs_label = Proposed -activity.active_issues_count_1 = %d Active Issue -activity.active_issues_count_n = %d Active Issues -activity.closed_issues_count_1 = Closed Issue -activity.closed_issues_count_n = Closed Issues -activity.title.issues_1 = %d Issue -activity.title.issues_n = %d Issues +activity.active_issues_count_1 = %d active issue +activity.active_issues_count_n = %d active issues +activity.closed_issues_count_1 = Closed issue +activity.closed_issues_count_n = Closed issues +activity.title.issues_1 = %d issue +activity.title.issues_n = %d issues activity.title.issues_closed_from = %s closed from %s activity.title.issues_created_by = %s created by %s activity.closed_issue_label = Closed -activity.new_issues_count_1 = New Issue -activity.new_issues_count_n = New Issues +activity.new_issues_count_1 = New issue +activity.new_issues_count_n = New issues activity.new_issue_label = Opened -activity.title.unresolved_conv_1 = %d Unresolved Conversation -activity.title.unresolved_conv_n = %d Unresolved Conversations +activity.title.unresolved_conv_1 = %d unresolved conversation +activity.title.unresolved_conv_n = %d unresolved conversations activity.unresolved_conv_desc = These recently changed issues and pull requests have not been resolved yet. activity.unresolved_conv_label = Open -activity.title.releases_1 = %d Release -activity.title.releases_n = %d Releases +activity.title.releases_1 = %d release +activity.title.releases_n = %d releases activity.title.releases_published_by = %s published by %s activity.published_release_label = Published activity.no_git_activity = There has not been any commit activity in this period. @@ -2073,9 +2073,9 @@ settings.collaboration.read = Read settings.collaboration.owner = Owner settings.collaboration.undefined = Undefined settings.hooks = Webhooks -settings.githooks = Git Hooks -settings.basic_settings = Basic Settings -settings.mirror_settings = Mirror Settings +settings.githooks = Git hooks +settings.basic_settings = Basic settings +settings.mirror_settings = Mirror settings settings.mirror_settings.docs = Set up your repository to automatically synchronize commits, tags and branches with another repository. settings.mirror_settings.docs.disabled_pull_mirror.instructions = Set up your project to automatically push commits, tags and branches to another repository. Pull mirrors have been disabled by your site administrator. settings.mirror_settings.docs.disabled_push_mirror.instructions = Set up your project to automatically pull commits, tags and branches from another repository. @@ -2095,40 +2095,40 @@ settings.mirror_settings.direction.pull = Pull settings.mirror_settings.direction.push = Push settings.mirror_settings.last_update = Last update settings.mirror_settings.push_mirror.none = No push mirrors configured -settings.mirror_settings.push_mirror.remote_url = Git Remote Repository URL -settings.mirror_settings.push_mirror.add = Add Push Mirror +settings.mirror_settings.push_mirror.remote_url = Git remote repository URL +settings.mirror_settings.push_mirror.add = Add push mirror settings.mirror_settings.push_mirror.edit_sync_time = Edit mirror sync interval -settings.units.units = Repository Units +settings.units.units = Repository units settings.units.overview = Overview settings.units.add_more = Add more... -settings.sync_mirror = Synchronize Now +settings.sync_mirror = Synchronize now settings.pull_mirror_sync_in_progress = Pulling changes from the remote %s at the moment. settings.push_mirror_sync_in_progress = Pushing changes to the remote %s at the moment. settings.site = Website -settings.update_settings = Update Settings -settings.update_mirror_settings = Update Mirror Settings -settings.branches.switch_default_branch = Switch Default Branch -settings.branches.update_default_branch = Update Default Branch -settings.branches.add_new_rule = Add New Rule -settings.advanced_settings = Advanced Settings -settings.wiki_desc = Enable Repository Wiki -settings.wiki_globally_editable = Allow anyone to edit the Wiki -settings.use_internal_wiki = Use Built-In Wiki -settings.use_external_wiki = Use External Wiki -settings.external_wiki_url = External Wiki URL +settings.update_settings = Update settings +settings.update_mirror_settings = Update mirror settings +settings.branches.switch_default_branch = Switch default branch +settings.branches.update_default_branch = Update default branch +settings.branches.add_new_rule = Add new rule +settings.advanced_settings = Advanced settings +settings.wiki_desc = Enable repository wiki +settings.wiki_globally_editable = Allow anyone to edit the wiki +settings.use_internal_wiki = Use built-in wiki +settings.use_external_wiki = Use external wiki +settings.external_wiki_url = External wiki URL settings.external_wiki_url_error = The external wiki URL is not a valid URL. settings.external_wiki_url_desc = Visitors are redirected to the external wiki URL when clicking the wiki tab. -settings.issues_desc = Enable Repository Issue Tracker -settings.use_internal_issue_tracker = Use Built-In Issue Tracker -settings.use_external_issue_tracker = Use External Issue Tracker -settings.external_tracker_url = External Issue Tracker URL +settings.issues_desc = Enable repository issue tracker +settings.use_internal_issue_tracker = Use built-in issue tracker +settings.use_external_issue_tracker = Use external issue tracker +settings.external_tracker_url = External issue tracker URL settings.external_tracker_url_error = The external issue tracker URL is not a valid URL. settings.external_tracker_url_desc = Visitors are redirected to the external issue tracker URL when clicking on the issues tab. -settings.tracker_url_format = External Issue Tracker URL Format +settings.tracker_url_format = External issue tracker URL Format settings.tracker_url_format_error = The external issue tracker URL format is not a valid URL. -settings.tracker_issue_style = External Issue Tracker Number Format +settings.tracker_issue_style = External issue tracker Number Format settings.tracker_issue_style.numeric = Numeric settings.tracker_issue_style.alphanumeric = Alphanumeric settings.tracker_issue_style.regexp = Regular Expression @@ -2137,39 +2137,39 @@ settings.tracker_issue_style.regexp_pattern_desc = The first captured group will settings.tracker_url_format_desc = Use the placeholders {user}, {repo} and {index} for the username, repository name and issue index. settings.enable_timetracker = Enable time tracking settings.allow_only_contributors_to_track_time = Let only contributors track time -settings.pulls_desc = Enable Repository Pull Requests -settings.pulls.ignore_whitespace = Ignore Whitespace for Conflicts +settings.pulls_desc = Enable repository pull requests +settings.pulls.ignore_whitespace = Ignore whitespace for conflicts settings.pulls.enable_autodetect_manual_merge = Enable autodetect manual merge (Note: In some special cases, misjudgments can occur) settings.pulls.allow_rebase_update = Enable updating pull request branch by rebase settings.pulls.default_delete_branch_after_merge = Delete pull request branch after merge by default settings.pulls.default_allow_edits_from_maintainers = Allow edits from maintainers by default -settings.releases_desc = Enable Repository Releases -settings.packages_desc = Enable Repository Packages Registry -settings.projects_desc = Enable Repository Projects -settings.actions_desc = Enable Repository Actions -settings.admin_settings = Administrator Settings -settings.admin_enable_health_check = Enable Repository Health Checks (git fsck) -settings.admin_code_indexer = Code Indexer +settings.releases_desc = Enable repository releases +settings.packages_desc = Enable repository package registry +settings.projects_desc = Enable repository projects +settings.actions_desc = Enable repository actions +settings.admin_settings = Administrator settings +settings.admin_enable_health_check = Enable repository health checks (git fsck) +settings.admin_code_indexer = Code indexer settings.admin_stats_indexer = Code statistics indexer -settings.admin_indexer_commit_sha = Last Indexed SHA +settings.admin_indexer_commit_sha = Last indexed SHA settings.admin_indexer_unindexed = Unindexed -settings.reindex_button = Add to Reindex Queue -settings.reindex_requested=Reindex Requested +settings.reindex_button = Add to reindex queue +settings.reindex_requested=Reindex requested settings.admin_enable_close_issues_via_commit_in_any_branch = Close an issue via a commit made in a non default branch -settings.danger_zone = Danger Zone +settings.danger_zone = Danger zone settings.new_owner_has_same_repo = The new owner already has a repository with same name. Please choose another name. settings.new_owner_blocked_doer = The new owner has blocked you. -settings.convert = Convert to Regular Repository +settings.convert = Convert to regular repository settings.convert_desc = You can convert this mirror into a regular repository. This cannot be undone. settings.convert_notices_1 = This operation will convert the mirror into a regular repository and cannot be undone. -settings.convert_confirm = Convert Repository +settings.convert_confirm = Convert repository settings.convert_succeed = The mirror has been converted into a regular repository. -settings.convert_fork = Convert to Regular Repository +settings.convert_fork = Convert to regular repository settings.convert_fork_desc = You can convert this fork into a regular repository. This cannot be undone. settings.convert_fork_notices_1 = This operation will convert the fork into a regular repository and cannot be undone. -settings.convert_fork_confirm = Convert Repository +settings.convert_fork_confirm = Convert repository settings.convert_fork_succeed = The fork has been converted into a regular repository. -settings.transfer = Transfer Ownership +settings.transfer = Transfer ownership settings.transfer.rejected = Repository transfer was rejected. settings.transfer.success = Repository transfer was successful. settings.transfer_abort = Cancel transfer @@ -2182,13 +2182,13 @@ settings.transfer_in_progress = There is currently an ongoing transfer. Please c settings.transfer_notices_1 = - You will lose access to the repository if you transfer it to an individual user. settings.transfer_notices_2 = - You will keep access to the repository if you transfer it to an organization that you (co-)own. settings.transfer_notices_3 = - If the repository is private and is transferred to an individual user, this action makes sure that the user does have at least read permission (and changes permissions if necessary). -settings.transfer_owner = New Owner -settings.transfer_perform = Perform Transfer +settings.transfer_owner = New owner +settings.transfer_perform = Perform transfer settings.transfer_started = This repository has been marked for transfer and awaits confirmation from "%s" settings.transfer_succeed = The repository has been transferred. -settings.signing_settings = Signing Verification Settings -settings.trust_model = Signature Trust Model -settings.trust_model.default = Default Trust Model +settings.signing_settings = Signing verification settings +settings.trust_model = Signature trust model +settings.trust_model.default = Default trust model settings.trust_model.default.desc= Use the default repository trust model for this installation. settings.trust_model.collaborator = Collaborator settings.trust_model.collaborator.long = Collaborator: Trust signatures by collaborators @@ -2202,16 +2202,16 @@ settings.trust_model.collaboratorcommitter.desc = Valid signatures by collaborat settings.wiki_rename_branch_main = Normalize the Wiki branch name settings.wiki_rename_branch_main_desc = Rename the branch used internally by the Wiki to "%s". This is a permanent and cannot be undone. settings.wiki_rename_branch_main_notices_1 = This operation CANNOT be undone. -settings.wiki_rename_branch_main_notices_2 = This will premanently rename the the internal branch of %s's repository wiki. Existing checkouts will need to be updated. +settings.wiki_rename_branch_main_notices_2 = This will permanently rename the the internal branch of %s's repository wiki. Existing checkouts will need to be updated. settings.wiki_branch_rename_success = The repository wiki's branch name has been successfully normalized. settings.wiki_branch_rename_failure = Failed to normalize the repository wiki's branch name. settings.confirm_wiki_branch_rename = Rename the wiki branch -settings.wiki_delete = Delete Wiki Data +settings.wiki_delete = Delete wiki data settings.wiki_delete_desc = Deleting repository wiki data is permanent and cannot be undone. settings.wiki_delete_notices_1 = - This will permanently delete and disable the repository wiki for %s. -settings.confirm_wiki_delete = Delete Wiki Data +settings.confirm_wiki_delete = Delete wiki data settings.wiki_deletion_success = The repository wiki data has been deleted. -settings.delete = Delete This Repository +settings.delete = Delete this repository settings.delete_desc = Deleting a repository is permanent and cannot be undone. settings.delete_notices_1 = - This operation CANNOT be undone. settings.delete_notices_2 = - This operation will permanently delete the %s repository including code, issues, comments, wiki data and collaborator settings. @@ -2219,8 +2219,8 @@ settings.delete_notices_fork_1 = - Forks of this repository will become independ settings.deletion_success = The repository has been deleted. settings.update_settings_success = The repository settings have been updated. settings.update_settings_no_unit = The repository should allow at least some sort of interaction. -settings.confirm_delete = Delete Repository -settings.add_collaborator = Add Collaborator +settings.confirm_delete = Delete repository +settings.add_collaborator = Add collaborator settings.add_collaborator_success = The collaborator has been added. settings.add_collaborator_inactive_user = Cannot add an inactive user as a collaborator. settings.add_collaborator_owner = Cannot add an owner as a collaborator. @@ -2236,20 +2236,20 @@ settings.org_not_allowed_to_be_collaborator = Organizations cannot be added as a settings.change_team_access_not_allowed = Changing team access for repository has been restricted to organization owner settings.team_not_in_organization = The team is not in the same organization as the repository settings.teams = Teams -settings.add_team = Add Team +settings.add_team = Add team settings.add_team_duplicate = Team already has the repository settings.add_team_success = The team now have access to the repository. -settings.search_team = Search Team… +settings.search_team = Search team… settings.change_team_permission_tip = Team's permission is set on the team setting page and can't be changed per repository settings.delete_team_tip = This team has access to all repositories and can't be removed settings.remove_team_success = The team's access to the repository has been removed. -settings.add_webhook = Add Webhook +settings.add_webhook = Add webhook settings.add_webhook.invalid_channel_name = Webhook channel name cannot be empty and cannot contain only a # character. settings.hooks_desc = Webhooks automatically make HTTP POST requests to a server when certain Forgejo events trigger. Read more in the webhooks guide. -settings.webhook_deletion = Remove Webhook +settings.webhook_deletion = Remove webhook settings.webhook_deletion_desc = Removing a webhook deletes its settings and delivery history. Continue? settings.webhook_deletion_success = The webhook has been removed. -settings.webhook.test_delivery = Test Delivery +settings.webhook.test_delivery = Test delivery settings.webhook.test_delivery_desc = Test this webhook with a fake event. settings.webhook.test_delivery_desc_disabled = To test this webhook with a fake event, activate it. settings.webhook.request = Request @@ -2260,26 +2260,26 @@ settings.webhook.body = Body settings.webhook.replay.description = Replay this webhook. settings.webhook.replay.description_disabled = To replay this webhook, activate it. settings.webhook.delivery.success = An event has been added to the delivery queue. It may take few seconds before it shows up in the delivery history. -settings.githooks_desc = Git Hooks are powered by Git itself. You can edit hook files below to set up custom operations. +settings.githooks_desc = Git hooks are powered by Git itself. You can edit hook files below to set up 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 = Forgejo will send POST requests with a specified content type to the target URL. Read more in the webhooks guide. +settings.githook_name = Hook name +settings.githook_content = Hook content +settings.update_githook = Update hook +settings.add_webhook_desc = Forgejo will send POST requests with a specified Content-Type to the target URL. Read more in the webhooks guide. settings.payload_url = Target URL -settings.http_method = HTTP Method -settings.content_type = POST Content Type +settings.http_method = HTTP method +settings.content_type = POST content type settings.secret = Secret settings.slack_username = Username settings.slack_icon_url = Icon URL settings.slack_color = Color settings.discord_username = Username settings.discord_icon_url = Icon URL -settings.event_desc = Trigger On: -settings.event_push_only = Push Events -settings.event_send_everything = All Events -settings.event_choose = Custom Events… -settings.event_header_repository = Repository Events +settings.event_desc = Trigger on: +settings.event_push_only = Push events +settings.event_send_everything = All events +settings.event_choose = Custom events… +settings.event_header_repository = Repository events settings.event_create = Create settings.event_create_desc = Branch or tag created. settings.event_delete = Delete @@ -2294,50 +2294,50 @@ settings.event_push = Push settings.event_push_desc = Git push to a repository. settings.event_repository = Repository settings.event_repository_desc = Repository created or deleted. -settings.event_header_issue = Issue Events +settings.event_header_issue = Issue events settings.event_issues = Issues settings.event_issues_desc = Issue opened, closed, reopened, or edited. -settings.event_issue_assign = Issue Assigned +settings.event_issue_assign = Issue assigned settings.event_issue_assign_desc = Issue assigned or unassigned. -settings.event_issue_label = Issue Labeled +settings.event_issue_label = Issue labeled settings.event_issue_label_desc = Issue labels updated or cleared. -settings.event_issue_milestone = Issue Milestoned +settings.event_issue_milestone = Issue milestoned settings.event_issue_milestone_desc = Issue milestoned or demilestoned. -settings.event_issue_comment = Issue Comment +settings.event_issue_comment = Issue comment settings.event_issue_comment_desc = Issue comment created, edited, or deleted. -settings.event_header_pull_request = Pull Request Events -settings.event_pull_request = Pull Request +settings.event_header_pull_request = Pull request events +settings.event_pull_request = Pull request settings.event_pull_request_desc = Pull request opened, closed, reopened, or edited. -settings.event_pull_request_assign = Pull Request Assigned +settings.event_pull_request_assign = Pull request assigned settings.event_pull_request_assign_desc = Pull request assigned or unassigned. -settings.event_pull_request_label = Pull Request Labeled +settings.event_pull_request_label = Pull request labeled settings.event_pull_request_label_desc = Pull request labels updated or cleared. -settings.event_pull_request_milestone = Pull Request Milestoned +settings.event_pull_request_milestone = Pull request milestoned settings.event_pull_request_milestone_desc = Pull request milestoned or demilestoned. -settings.event_pull_request_comment = Pull Request Comment +settings.event_pull_request_comment = Pull request comment settings.event_pull_request_comment_desc = Pull request comment created, edited, or deleted. -settings.event_pull_request_review = Pull Request Reviewed +settings.event_pull_request_review = Pull request reviewed settings.event_pull_request_review_desc = Pull request approved, rejected, or review comment. -settings.event_pull_request_sync = Pull Request Synchronized +settings.event_pull_request_sync = Pull request synchronized settings.event_pull_request_sync_desc = Pull request synchronized. -settings.event_pull_request_review_request = Pull Request Review Requested +settings.event_pull_request_review_request = Pull request review requested settings.event_pull_request_review_request_desc = Pull request review requested or review request removed. -settings.event_pull_request_approvals = Pull Request Approvals -settings.event_pull_request_merge = Pull Request Merge +settings.event_pull_request_approvals = Pull request approvals +settings.event_pull_request_merge = Pull request merge settings.event_package = Package settings.event_package_desc = Package created or deleted in a repository. settings.branch_filter = Branch filter settings.branch_filter_desc = Branch whitelist for push, branch creation and branch deletion events, specified as glob pattern. If empty or *, events for all branches are reported. See github.com/gobwas/glob documentation for syntax. Examples: master, {master,release*}. -settings.authorization_header = Authorization Header +settings.authorization_header = Authorization header settings.authorization_header_desc = Will be included as authorization header for requests when present. Examples: %s. settings.active = Active settings.active_helper = Information about triggered events will be sent to this webhook URL. settings.add_hook_success = The webhook has been added. -settings.update_webhook = Update Webhook +settings.update_webhook = Update webhook settings.update_hook_success = The webhook has been updated. -settings.delete_webhook = Remove Webhook -settings.recent_deliveries = Recent Deliveries -settings.hook_type = Hook Type +settings.delete_webhook = Remove webhook +settings.recent_deliveries = Recent deliveries +settings.hook_type = Hook type settings.slack_token = Token settings.slack_domain = Domain settings.slack_channel = Channel @@ -2359,10 +2359,10 @@ settings.web_hook_name_packagist = Packagist settings.packagist_username = Packagist username settings.packagist_api_token = API token settings.packagist_package_url = Packagist package URL -settings.deploy_keys = Deploy Keys -settings.add_deploy_key = Add Deploy Key +settings.deploy_keys = Deploy keys +settings.add_deploy_key = Add deploy key settings.deploy_key_desc = Deploy keys have read-only pull access to the repository. -settings.is_writable = Enable Write Access +settings.is_writable = Enable write access settings.is_writable_info = Allow this deploy key to push to the repository. settings.no_deploy_keys = There are no deploy keys yet. settings.title = Title @@ -2370,37 +2370,37 @@ settings.deploy_key_content = Content settings.key_been_used = A deploy key with identical content is already in use. settings.key_name_used = A deploy key with the same name already exists. settings.add_key_success = The deploy key "%s" has been added. -settings.deploy_key_deletion = Remove Deploy Key +settings.deploy_key_deletion = Remove reploy key settings.deploy_key_deletion_desc = Removing a deploy key will revoke its access to this repository. Continue? settings.deploy_key_deletion_success = The deploy key has been removed. settings.branches = Branches -settings.protected_branch = Branch Protection -settings.protected_branch.save_rule = Save Rule -settings.protected_branch.delete_rule = Delete Rule +settings.protected_branch = Branch protection +settings.protected_branch.save_rule = Save rule +settings.protected_branch.delete_rule = Delete rule settings.protected_branch_can_push = Allow push? settings.protected_branch_can_push_yes = You can push settings.protected_branch_can_push_no = You cannot push -settings.branch_protection = Branch Protection Rules for Branch "%s" -settings.protect_this_branch = Enable Branch Protection +settings.branch_protection = Branch protection rules for branch "%s" +settings.protect_this_branch = Enable branch protection settings.protect_this_branch_desc = Prevents deletion and restricts Git pushing and merging to the branch. -settings.protect_disable_push = Disable Push +settings.protect_disable_push = Disable push settings.protect_disable_push_desc = No pushing will be allowed to this branch. -settings.protect_enable_push = Enable Push +settings.protect_enable_push = Enable push settings.protect_enable_push_desc = Anyone with write access will be allowed to push to this branch (but not force push). -settings.protect_enable_merge = Enable Merge +settings.protect_enable_merge = Enable merge settings.protect_enable_merge_desc = Anyone with write access will be allowed to merge the pull requests into this branch. -settings.protect_whitelist_committers = Whitelist Restricted Push +settings.protect_whitelist_committers = Whitelist restricted push settings.protect_whitelist_committers_desc = Only whitelisted users or teams will be allowed to push to this branch (but not force push). settings.protect_whitelist_deploy_keys = Whitelist deploy keys with write access to push. settings.protect_whitelist_users = Whitelisted users for pushing: settings.protect_whitelist_search_users = Search users… settings.protect_whitelist_teams = Whitelisted teams for pushing: settings.protect_whitelist_search_teams = Search teams… -settings.protect_merge_whitelist_committers = Enable Merge Whitelist +settings.protect_merge_whitelist_committers = Enable merge whitelist settings.protect_merge_whitelist_committers_desc = Allow only whitelisted users or teams to merge pull requests into this branch. settings.protect_merge_whitelist_users = Whitelisted users for merging: settings.protect_merge_whitelist_teams = Whitelisted teams for merging: -settings.protect_check_status_contexts = Enable Status Check +settings.protect_check_status_contexts = Enable status check settings.protect_status_check_patterns = Status check patterns: settings.protect_status_check_patterns_desc = Enter patterns to specify which status checks must pass before branches can be merged into a branch that matches this rule. Each line specifies a pattern. Patterns cannot be empty. settings.protect_check_status_contexts_desc = Require status checks to pass before merging. When enabled, commits must first be pushed to another branch, then merged or pushed directly to a branch that matches this rule after status checks have passed. If no contexts are matched, the last commit must be successful regardless of context. @@ -2418,9 +2418,9 @@ settings.dismiss_stale_approvals = Dismiss stale approvals settings.dismiss_stale_approvals_desc = When new commits that change the content of the pull request are pushed to the branch, old approvals will be dismissed. settings.ignore_stale_approvals = Ignore stale approvals settings.ignore_stale_approvals_desc = Do not count approvals that were made on older commits (stale reviews) towards how many approvals the PR has. Irrelevant if stale reviews are already dismissed. -settings.require_signed_commits = Require Signed Commits +settings.require_signed_commits = Require signed commits settings.require_signed_commits_desc = Reject pushes to this branch if they are unsigned or unverifiable. -settings.protect_branch_name_pattern = Protected Branch Name Pattern +settings.protect_branch_name_pattern = Protected branch name pattern settings.protect_branch_name_pattern_desc = Protected branch name patterns. See the documentation for pattern syntax. Examples: main, release/** settings.protect_patterns = Patterns settings.protect_protected_file_patterns = Protected file patterns (separated using semicolon ";"): @@ -2432,7 +2432,7 @@ settings.delete_protected_branch = Disable protection settings.update_protect_branch_success = Branch protection for rule "%s" has been updated. settings.remove_protected_branch_success = Branch protection for rule "%s" has been removed. settings.remove_protected_branch_failed = Removing branch protection rule "%s" failed. -settings.protected_branch_deletion = Delete Branch Protection +settings.protected_branch_deletion = Delete branch protection settings.protected_branch_deletion_desc = Disabling branch protection allows users with write permission to push to the branch. Continue? settings.block_rejected_reviews = Block merge on rejected reviews settings.block_rejected_reviews_desc = Merging will not be possible when changes are requested by official reviewers, even if there are enough approvals. @@ -2441,8 +2441,8 @@ settings.block_on_official_review_requests_desc = Merging will not be possible w settings.block_outdated_branch = Block merge if pull request is outdated settings.block_outdated_branch_desc = Merging will not be possible when head branch is behind base branch. settings.default_branch_desc = Select a default repository branch for pull requests and code commits: -settings.merge_style_desc = Merge Styles -settings.default_merge_style_desc = Default Merge Style +settings.merge_style_desc = Merge styles +settings.default_merge_style_desc = Default merge style settings.choose_branch = Choose a branch… settings.no_protected_branch = There are no protected branches. settings.edit_protected_branch = Edit @@ -2450,22 +2450,22 @@ settings.protected_branch_required_rule_name = Required rule name settings.protected_branch_duplicate_rule_name = There is already a rule for this set of branches settings.protected_branch_required_approvals_min = Required approvals cannot be negative. settings.tags = Tags -settings.tags.protection = Tag Protection -settings.tags.protection.pattern = Tag Pattern +settings.tags.protection = Tag protection +settings.tags.protection.pattern = Tag pattern settings.tags.protection.allowed = Allowed settings.tags.protection.allowed.users = Allowed users settings.tags.protection.allowed.teams = Allowed teams -settings.tags.protection.allowed.noone = No One -settings.tags.protection.create = Protect Tag +settings.tags.protection.allowed.noone = No one +settings.tags.protection.create = Add rule settings.tags.protection.none = There are no protected tags. settings.tags.protection.pattern.description = You can use a single name or a glob pattern or regular expression to match multiple tags. Read more in the protected tags guide. -settings.bot_token = Bot Token +settings.bot_token = Bot token settings.chat_id = Chat ID settings.thread_id = Thread ID settings.matrix.homeserver_url = Homeserver URL settings.matrix.room_id = Room ID -settings.matrix.message_type = Message Type -settings.archive.button = Archive Repo +settings.matrix.message_type = Message type +settings.archive.button = Archive repo settings.archive.header = Archive this repo settings.archive.text = Archiving the repo will make it entirely read-only. It will be hidden from the dashboard. Nobody (not even you!) will be able to make new commits, or open any issues or pull requests. settings.archive.success = The repo was successfully archived. @@ -2474,7 +2474,7 @@ settings.archive.error_ismirror = You cannot archive a mirrored repo. settings.archive.branchsettings_unavailable = Branch settings are not available if the repo is archived. settings.archive.tagsettings_unavailable = Tag settings are not available if the repo is archived. settings.archive.mirrors_unavailable = Mirrors are not available if the repo is archived. -settings.unarchive.button = Unarchive Repo +settings.unarchive.button = Unarchive repo settings.unarchive.header = Unarchive this repo settings.unarchive.text = Unarchiving the repo will restore its ability to receive commits and pushes, as well as new issues and pull-requests. settings.unarchive.success = The repo was successfully unarchived. @@ -2512,17 +2512,17 @@ settings.rename_branch_from=old branch name settings.rename_branch_to=new branch name settings.rename_branch=Rename branch -diff.browse_source = Browse Source +diff.browse_source = Browse source diff.parent = parent diff.commit = commit diff.git-notes = Notes -diff.data_not_available = Diff Content Not Available -diff.options_button = Diff Options -diff.show_diff_stats = Show Stats -diff.download_patch = Download Patch File -diff.download_diff = Download Diff File -diff.show_split_view = Split View -diff.show_unified_view = Unified View +diff.data_not_available = Diff content is not available +diff.options_button = Diff options +diff.show_diff_stats = Show stats +diff.download_patch = Download patch file +diff.download_diff = Download diff file +diff.show_split_view = Split view +diff.show_unified_view = Unified view diff.whitespace_button = Whitespace diff.whitespace_show_everything = Show all changes diff.whitespace_ignore_all_whitespace = Ignore whitespace when comparing lines @@ -2532,7 +2532,7 @@ diff.stats_desc = %d changed files with %d additionsCANNOT be undone! -settings.confirm_delete_account = Confirm Deletion -settings.delete_org_title = Delete Organization +settings.confirm_delete_account = Confirm deletion +settings.delete_org_title = Delete organization settings.delete_org_desc = This organization will be deleted permanently. Continue? settings.hooks_desc = Add webhooks which will be triggered for all repositories under this organization. settings.labels_desc = Add labels which can be used on issues for all repositories under this organization. -members.membership_visibility = Membership Visibility: +members.membership_visibility = Membership visibility: members.public = Visible members.public_helper = make hidden members.private = Hidden members.private_helper = make visible -members.member_role = Member Role: +members.member_role = Member role: members.owner = Owner members.member = Member members.remove = Remove @@ -2752,40 +2752,40 @@ members.remove.detail = Remove %[1]s from %[2]s? members.leave = Leave members.leave.detail = Leave %s? members.invite_desc = Add a new member to %s: -members.invite_now = Invite Now +members.invite_now = Invite now teams.join = Join teams.leave = Leave teams.leave.detail = Leave %s? teams.can_create_org_repo = Create repositories teams.can_create_org_repo_helper = Members can create new repositories in organization. Creator will get administrator access to the new repository. -teams.none_access = No Access +teams.none_access = No access teams.none_access_helper = Members cannot view or do any other action on this unit. It has no effect for public repositories. -teams.general_access = General Access +teams.general_access = General access teams.general_access_helper = Members permissions will be decided by below permission table. teams.read_access = Read teams.read_access_helper = Members can view and clone team repositories. teams.write_access = Write teams.write_access_helper = Members can read and push to team repositories. -teams.admin_access = Administrator Access +teams.admin_access = Administrator access teams.admin_access_helper = Members can pull and push to team repositories and add collaborators to them. teams.no_desc = This team has no description teams.settings = Settings teams.owners_permission_desc = Owners have full access to all repositories and have administrator access to the organization. -teams.members = Team Members -teams.update_settings = Update Settings -teams.delete_team = Delete Team -teams.add_team_member = Add Team Member +teams.members = Team members +teams.update_settings = Update settings +teams.delete_team = Delete team +teams.add_team_member = Add team member teams.invite_team_member = Invite to %s -teams.invite_team_member.list = Pending Invitations -teams.delete_team_title = Delete Team +teams.invite_team_member.list = Pending invitations +teams.delete_team_title = Delete team teams.delete_team_desc = Deleting a team revokes repository access from its members. Continue? teams.delete_team_success = The team has been deleted. teams.read_permission_desc = This team grants Read access: members can view and clone team repositories. teams.write_permission_desc = This team grants Write access: members can read from and push to team repositories. teams.admin_permission_desc = This team grants Admin access: members can read from, push to and add collaborators to team repositories. teams.create_repo_permission_desc = Additionally, this team grants Create repository permission: members can create new repositories in organization. -teams.repositories = Team Repositories +teams.repositories = Team repositories teams.search_repo_placeholder = Search repository… teams.remove_all_repos_title = Remove all team repositories teams.remove_all_repos_desc = This will remove all repositories from the team. @@ -2808,23 +2808,23 @@ teams.invite.description = Please click the button below to join the team. [admin] dashboard = Dashboard -self_check = Self Check -identity_access = Identity & Access -users = User Accounts +self_check = Self check +identity_access = Identity & access +users = User accounts organizations = Organizations -assets = Code Assets +assets = Code assets repositories = Repositories hooks = Webhooks integrations = Integrations -authentication = Authentication Sources -emails = User Emails +authentication = Authentication sources +emails = User emails config = Configuration -notices = System Notices +notices = System notices monitor = Monitoring first_page = First last_page = Last total = Total: %d -settings = Admin Settings +settings = Admin settings dashboard.new_version_hint = Forgejo %s is now available, you are running %s. Check the blog for more details. dashboard.statistic = Summary @@ -2853,9 +2853,9 @@ dashboard.delete_repo_archives.started = Delete all repository archives task sta dashboard.delete_missing_repos = Delete all repositories missing their Git files dashboard.delete_missing_repos.started = Delete all repositories missing their Git files task started. dashboard.delete_generated_repository_avatars = Delete generated repository avatars -dashboard.sync_repo_branches = Sync missed branches from git data to database -dashboard.sync_repo_tags = Sync tags from git data to database -dashboard.update_mirrors = Update Mirrors +dashboard.sync_repo_branches = Sync missed branches from Git data to database +dashboard.sync_repo_tags = Sync tags from Git data to database +dashboard.update_mirrors = Update mirrors dashboard.repo_health_check = Health check all repositories dashboard.check_repo_stats = Check all repository statistics dashboard.archive_cleanup = Delete old repository archives @@ -2911,10 +2911,10 @@ dashboard.sync_branch.started = Branches Sync started dashboard.sync_tag.started = Tags Sync started dashboard.rebuild_issue_indexer = Rebuild issue indexer -users.user_manage_panel = User account management +users.user_manage_panel = Manage user accounts users.new_account = Create User Account users.name = Username -users.full_name = Full Name +users.full_name = Full name users.activated = Activated users.admin = Admin users.restricted = Restricted @@ -2924,29 +2924,29 @@ users.remote = Remote users.2fa = 2FA users.repos = Repos users.created = Created -users.last_login = Last Sign-In -users.never_login = Never Signed-In -users.send_register_notify = Send User Registration Notification +users.last_login = Last sign-in +users.never_login = Never signed in +users.send_register_notify = Send user registration notification users.new_success = The user account "%s" has been created. users.edit = Edit -users.auth_source = Authentication Source +users.auth_source = Authentication source users.local = Local -users.auth_login_name = Authentication Sign-In Name +users.auth_login_name = Authentication sign-in name users.password_helper = Leave the password empty to keep it unchanged. users.update_profile_success = The user account has been updated. -users.edit_account = Edit User Account -users.max_repo_creation = Maximum Number of Repositories +users.edit_account = Edit user account +users.max_repo_creation = Maximum number of repositories users.max_repo_creation_desc = (Enter -1 to use the global default limit.) users.is_activated = User Account Is Activated users.prohibit_login = Disable sign-in -users.is_admin = Is Administrator -users.is_restricted = Is Restricted -users.allow_git_hook = May Create Git Hooks -users.allow_git_hook_tooltip = Git Hooks are executed as the OS user running Forgejo and will have the same level of host access. As a result, users with this special Git Hook privilege can access and modify all Forgejo repositories as well as the database used by Forgejo. Consequently they are also able to gain Forgejo administrator privileges. -users.allow_import_local = May Import Local Repositories -users.allow_create_organization = May Create Organizations -users.update_profile = Update User Account -users.delete_account = Delete User Account +users.is_admin = Is administrator +users.is_restricted = Is restricted +users.allow_git_hook = Can create Git hooks +users.allow_git_hook_tooltip = Git hooks are executed as the OS user running Forgejo and will have the same level of host access. As a result, users with this special Git hook privilege can access and modify all Forgejo repositories as well as the database used by Forgejo. Consequently they are also able to gain Forgejo administrator privileges. +users.allow_import_local = Can import local repositories +users.allow_create_organization = Can create organizations +users.update_profile = Update user account +users.delete_account = Delete user account users.cannot_delete_self = You cannot delete yourself users.still_own_repo = This user still owns one or more repositories. Delete or transfer these repositories first. users.still_has_org = This user is a member of an organization. Remove the user from any organizations first. @@ -2969,27 +2969,27 @@ users.list_status_filter.is_2fa_enabled = 2FA Enabled users.list_status_filter.not_2fa_enabled = 2FA Disabled users.details = User Details -emails.email_manage_panel = User email management +emails.email_manage_panel = Manage user emails emails.primary = Primary emails.activated = Activated emails.filter_sort.email = Email emails.filter_sort.email_reverse = Email (reverse) -emails.filter_sort.name = User Name -emails.filter_sort.name_reverse = User Name (reverse) +emails.filter_sort.name = Username +emails.filter_sort.name_reverse = Username (reverse) emails.updated = Email updated emails.not_updated = Failed to update the requested email address: %v emails.duplicate_active = This email address is already active for a different user. emails.change_email_header = Update Email Properties emails.change_email_text = Are you sure you want to update this email address? -orgs.org_manage_panel = Organization management +orgs.org_manage_panel = Manage organizations orgs.name = Name orgs.teams = Teams orgs.members = Members -orgs.new_orga = New Organization +orgs.new_orga = New organization -repos.repo_manage_panel = Repository management -repos.unadopted = Unadopted Repositories +repos.repo_manage_panel = Manage repositories +repos.unadopted = Unadopted repositories repos.unadopted.no_more = No more unadopted repositories found repos.owner = Owner repos.name = Name @@ -3001,7 +3001,7 @@ repos.issues = Issues repos.size = Size repos.lfs_size = LFS Size -packages.package_manage_panel = Package management +packages.package_manage_panel = Manage packages packages.total_size = Total Size: %s packages.unreferenced_size = Unreferenced Size: %s packages.cleanup = Clean up expired data @@ -3025,60 +3025,60 @@ systemhooks.desc = Webhooks automatically make HTTP POST requests to a server wh systemhooks.add_webhook = Add System Webhook systemhooks.update_webhook = Update System Webhook -auths.auth_manage_panel = Authentication source management -auths.new = Add Authentication Source +auths.auth_manage_panel = Manage authentication sources +auths.new = Add authentication source auths.name = Name auths.type = Type auths.enabled = Enabled -auths.syncenabled = Enable User Synchronization +auths.syncenabled = Enable user synchronization auths.updated = Updated -auths.auth_type = Authentication Type -auths.auth_name = Authentication Name -auths.security_protocol = Security Protocol +auths.auth_type = Authentication type +auths.auth_name = Authentication name +auths.security_protocol = Security protocol auths.domain = Domain auths.host = Host auths.port = Port auths.bind_dn = Bind DN -auths.bind_password = Bind Password -auths.user_base = User Search Base +auths.bind_password = Bind password +auths.user_base = User search base auths.user_dn = User DN -auths.attribute_username = Username Attribute +auths.attribute_username = Username attribute auths.attribute_username_placeholder = Leave empty to use the username entered in Forgejo. -auths.attribute_name = First Name Attribute -auths.attribute_surname = Surname Attribute -auths.attribute_mail = Email Attribute -auths.attribute_ssh_public_key = Public SSH Key Attribute -auths.attribute_avatar = Avatar Attribute -auths.attributes_in_bind = Fetch Attributes in Bind DN Context +auths.attribute_name = First name attribute +auths.attribute_surname = Surname attribute +auths.attribute_mail = Email attribute +auths.attribute_ssh_public_key = Public SSH key attribute +auths.attribute_avatar = Avatar attribute +auths.attributes_in_bind = Fetch attributes in nind DN context auths.allow_deactivate_all = Allow an empty search result to deactivate all users -auths.use_paged_search = Use Paged Search -auths.search_page_size = Page Size -auths.filter = User Filter -auths.admin_filter = Admin Filter -auths.restricted_filter = Restricted Filter -auths.restricted_filter_helper = Leave empty to not set any users as restricted. Use an asterisk ("*") to set all users that do not match Admin Filter as restricted. +auths.use_paged_search = Use paged search +auths.search_page_size = Page size +auths.filter = User filter +auths.admin_filter = Admin filter +auths.restricted_filter = Restricted filter +auths.restricted_filter_helper = Leave empty to not set any users as restricted. Use an asterisk ("*") to set all users that do not match Admin filter as restricted. auths.verify_group_membership = Verify group membership in LDAP (leave the filter empty to skip) -auths.group_search_base = Group Search Base DN -auths.group_attribute_list_users = Group Attribute Containing List Of Users -auths.user_attribute_in_group = User Attribute Listed In Group +auths.group_search_base = Group search base DN +auths.group_attribute_list_users = Group attribute containing list of users +auths.user_attribute_in_group = User attribute listed in group auths.map_group_to_team = Map LDAP groups to Organization teams (leave the field empty to skip) auths.map_group_to_team_removal = Remove users from synchronized teams if user does not belong to corresponding LDAP group auths.enable_ldap_groups = Enable LDAP groups -auths.ms_ad_sa = MS AD Search Attributes +auths.ms_ad_sa = MS AD search attributes auths.smtp_auth = SMTP authentication type auths.smtphost = SMTP host auths.smtpport = SMTP port -auths.allowed_domains = Allowed Domains +auths.allowed_domains = Allowed domains auths.allowed_domains_helper = Leave empty to allow all domains. Separate multiple domains with a comma (","). auths.skip_tls_verify = Skip TLS verification auths.force_smtps = Force SMTPS auths.force_smtps_helper = SMTPS is always used on port 465. Set this to force SMTPS on other ports. (Otherwise STARTTLS will be used on other ports if it is supported by the host.) -auths.helo_hostname = HELO Hostname +auths.helo_hostname = HELO hostname auths.helo_hostname_helper = Hostname sent with HELO. Leave blank to send current hostname. auths.disable_helo = Disable HELO -auths.pam_service_name = PAM Service Name -auths.pam_email_domain = PAM Email Domain (optional) -auths.oauth2_provider = OAuth2 Provider +auths.pam_service_name = PAM service name +auths.pam_email_domain = PAM email domain (optional) +auths.oauth2_provider = OAuth2 provider auths.oauth2_icon_url = Icon URL auths.oauth2_clientID = Client ID (Key) auths.oauth2_clientSecret = Client Secret @@ -3091,17 +3091,17 @@ auths.oauth2_emailURL = Email URL auths.skip_local_two_fa = Skip local 2FA auths.skip_local_two_fa_helper = Leaving unset means local users with 2FA set will still have to pass 2FA to log on auths.oauth2_tenant = Tenant -auths.oauth2_scopes = Additional Scopes -auths.oauth2_required_claim_name = Required Claim Name +auths.oauth2_scopes = Additional scopes +auths.oauth2_required_claim_name = Required claim name auths.oauth2_required_claim_name_helper = Set this name to restrict login from this source to users with a claim with this name -auths.oauth2_required_claim_value = Required Claim Value +auths.oauth2_required_claim_value = Required claim value auths.oauth2_required_claim_value_helper = Set this value to restrict login from this source to users with a claim with this name and value auths.oauth2_group_claim_name = Claim name providing group names for this source. (Optional) -auths.oauth2_admin_group = Group Claim value for administrator users. (Optional - requires claim name above) -auths.oauth2_restricted_group = Group Claim value for restricted users. (Optional - requires claim name above) -auths.oauth2_map_group_to_team = Map claimed groups to Organization teams. (Optional - requires claim name above) +auths.oauth2_admin_group = Group claim value for administrator users. (Optional - requires claim name above) +auths.oauth2_restricted_group = Group claim value for restricted users. (Optional - requires claim name above) +auths.oauth2_map_group_to_team = Map claimed groups to organization teams. (Optional - requires claim name above) auths.oauth2_map_group_to_team_removal = Remove users from synchronized teams if user does not belong to corresponding group. -auths.enable_auto_register = Enable Auto Registration +auths.enable_auto_register = Enable auto registration auths.sspi_auto_create_users = Automatically create users auths.sspi_auto_create_users_helper = Allow SSPI auth method to automatically create new accounts for users that login for the first time auths.sspi_auto_activate_users = Automatically activate users @@ -3113,9 +3113,10 @@ auths.sspi_separator_replacement_helper = The character to use to replace the se auths.sspi_default_language = Default user language auths.sspi_default_language_helper = Default language for users automatically created by SSPI auth method. Leave empty if you prefer language to be automatically detected. auths.tips = Tips -auths.tips.oauth2.general = OAuth2 Authentication +auths.tips.gmail_settings = Gmail settings: +auths.tips.oauth2.general = OAuth2 authentication auths.tips.oauth2.general.tip = When registering a new OAuth2 authentication, the callback/redirect URL should be: -auths.tip.oauth2_provider = OAuth2 Provider +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.nextcloud = Register a new OAuth consumer on your instance using the following menu "Settings -> Security -> OAuth 2.0 client" auths.tip.dropbox = Create a new application at https://www.dropbox.com/developers/apps @@ -3129,13 +3130,13 @@ auths.tip.discord = Register a new application on https://discordapp.com/develop auths.tip.gitea = Register a new OAuth2 application. Guide can be found at https://docs.gitea.com/development/oauth2-provider auths.tip.yandex = Create a new application at https://oauth.yandex.com/client/new. Select following permissions from the "Yandex.Passport API" section: "Access to email address", "Access to user avatar" and "Access to username, first name and surname, gender" auths.tip.mastodon = Input a custom instance URL for the mastodon instance you want to authenticate with (or use the default one) -auths.edit = Edit Authentication Source -auths.activated = This Authentication Source is Activated +auths.edit = Edit authentication source +auths.activated = This authentication source is activated auths.new_success = The authentication "%s" has been added. auths.update_success = The authentication source has been updated. -auths.update = Update Authentication Source -auths.delete = Delete Authentication Source -auths.delete_auth_title = Delete Authentication Source +auths.update = Update authentication source +auths.delete = Delete authentication source +auths.delete_auth_title = Delete authentication source auths.delete_auth_desc = Deleting an authentication source prevents users from using it to sign in. Continue? auths.still_in_used = The authentication source is still in use. Convert or delete any users using this authentication source first. auths.deletion_success = The authentication source has been deleted. @@ -3192,7 +3193,7 @@ config.db_path = Path config.service_config = Service configuration config.register_email_confirm = Require email confirmation to register config.disable_register = Disable self-registration -config.allow_only_internal_registration = Allow registration only through forgejo itself +config.allow_only_internal_registration = Allow registration only through Forgejo itself config.allow_only_external_registration = Allow registration only through external Services config.enable_openid_signup = Enable OpenID self-registration config.enable_openid_signin = Enable OpenID sign-in @@ -3221,28 +3222,28 @@ config.mailer_enabled = Enabled config.mailer_enable_helo = Enable HELO config.mailer_name = Name config.mailer_protocol = Protocol -config.mailer_smtp_addr = SMTP Addr -config.mailer_smtp_port = SMTP Port +config.mailer_smtp_addr = SMTP host +config.mailer_smtp_port = SMTP port config.mailer_user = User config.mailer_use_sendmail = Use Sendmail -config.mailer_sendmail_path = Sendmail Path +config.mailer_sendmail_path = Sendmail path config.mailer_sendmail_args = Extra Arguments to Sendmail -config.mailer_sendmail_timeout = Sendmail Timeout +config.mailer_sendmail_timeout = Sendmail timeout config.mailer_use_dummy = Dummy config.test_email_placeholder = Email (e.g. test@example.com) -config.send_test_mail = Send Testing Email +config.send_test_mail = Send test email config.send_test_mail_submit = Send -config.test_mail_failed = Failed to send a testing email to "%s": %v -config.test_mail_sent = A testing email has been sent to "%s". +config.test_mail_failed = Failed to send a test email to "%s": %v +config.test_mail_sent = A test email has been sent to "%s". -config.oauth_config = OAuth Configuration +config.oauth_config = OAuth configuration config.oauth_enabled = Enabled config.cache_config = Cache configuration config.cache_adapter = Cache adapter config.cache_interval = Cache interval -config.cache_conn = Cache Connection -config.cache_item_ttl = Cache Item TTL +config.cache_conn = Cache connection +config.cache_item_ttl = Cache item TTL config.session_config = Session configuration config.session_provider = Session provider @@ -3305,29 +3306,29 @@ monitor.queue = Queue: %s monitor.queue.name = Name monitor.queue.type = Type monitor.queue.exemplar = Exemplar Type -monitor.queue.numberworkers = Number of Workers -monitor.queue.activeworkers = Active Workers -monitor.queue.maxnumberworkers = Max Number of Workers -monitor.queue.numberinqueue = Number in Queue -monitor.queue.review_add = Review / Add Workers -monitor.queue.settings.title = Pool Settings +monitor.queue.numberworkers = Number of workers +monitor.queue.activeworkers = Active workers +monitor.queue.maxnumberworkers = Max Number of workers +monitor.queue.numberinqueue = Number in queue +monitor.queue.review_add = Review / add workers +monitor.queue.settings.title = Pool settings monitor.queue.settings.desc = Pools dynamically grow in response to their worker queue blocking. monitor.queue.settings.maxnumberworkers = Max Number of workers monitor.queue.settings.maxnumberworkers.placeholder = Currently %[1]d monitor.queue.settings.maxnumberworkers.error = Max number of workers must be a number -monitor.queue.settings.submit = Update Settings -monitor.queue.settings.changed = Settings Updated +monitor.queue.settings.submit = Update settings +monitor.queue.settings.changed = Settings updated monitor.queue.settings.remove_all_items = Remove all monitor.queue.settings.remove_all_items_done = All items in the queue have been removed. notices.system_notice_list = System notices notices.view_detail_header = Notice details notices.operations = Operations -notices.select_all = Select All -notices.deselect_all = Deselect All -notices.inverse_selection = Inverse Selection -notices.delete_selected = Delete Selected -notices.delete_all = Delete All Notices +notices.select_all = Select all +notices.deselect_all = Deselect all +notices.inverse_selection = Inverse selection +notices.delete_selected = Delete selected +notices.delete_all = Delete all notices notices.type = Type notices.type_1 = Repository notices.type_2 = Task @@ -3452,9 +3453,9 @@ dependencies = Dependencies keywords = Keywords details = Details details.author = Author -details.project_site = Project Site -details.repository_site = Repository Site -details.documentation_site = Documentation Site +details.project_site = Project website +details.repository_site = Repository website +details.documentation_site = Documentation website details.license = License assets = Assets versions = Versions @@ -3551,19 +3552,19 @@ settings.delete.notice = You are about to delete %s (%s). This operation is irre settings.delete.success = The package has been deleted. settings.delete.error = Failed to delete the package. owner.settings.cargo.title = Cargo registry index -owner.settings.cargo.initialize = Initialize Index +owner.settings.cargo.initialize = Initialize index owner.settings.cargo.initialize.description = A special index Git repository is needed to use the Cargo registry. Using this option will (re-)create the repository and configure it automatically. owner.settings.cargo.initialize.error = Failed to initialize Cargo index: %v owner.settings.cargo.initialize.success = The Cargo index was successfully created. -owner.settings.cargo.rebuild = Rebuild Index +owner.settings.cargo.rebuild = Rebuild index owner.settings.cargo.rebuild.description = Rebuilding can be useful if the index is not synchronized with the stored Cargo packages. owner.settings.cargo.rebuild.error = Failed to rebuild Cargo index: %v owner.settings.cargo.rebuild.success = The Cargo index was successfully rebuild. owner.settings.cleanuprules.title = Manage cleanup rules -owner.settings.cleanuprules.add = Add Cleanup Rule -owner.settings.cleanuprules.edit = Edit Cleanup Rule +owner.settings.cleanuprules.add = Add cleanup rule +owner.settings.cleanuprules.edit = Edit cleanup rule owner.settings.cleanuprules.none = There are no cleanup rules yet. -owner.settings.cleanuprules.preview = Cleanup Rule Preview +owner.settings.cleanuprules.preview = Cleanup rule preview owner.settings.cleanuprules.preview.overview = %d packages are scheduled to be removed. owner.settings.cleanuprules.preview.none = Cleanup rule does not match any packages. owner.settings.cleanuprules.enabled = Enabled @@ -3596,7 +3597,7 @@ deletion = Remove secret deletion.description = Removing a secret is permanent and cannot be undone. Continue? deletion.success = The secret has been removed. deletion.failed = Failed to remove secret. -management = Secrets Management +management = Manage secrets [actions] actions = Actions @@ -3613,8 +3614,8 @@ status.skipped = Skipped status.blocked = Blocked runners = Runners -runners.runner_manage_panel = Runners management -runners.new = Create new Runner +runners.runner_manage_panel = Manage runners +runners.new = Create new runner runners.new_notice = How to start a runner runners.status = Status runners.id = ID @@ -3622,7 +3623,7 @@ runners.name = Name runners.owner_type = Type runners.description = Description runners.labels = Labels -runners.last_online = Last Online Time +runners.last_online = Last online time runners.runner_title = Runner runners.task_list = Recent tasks on this runner runners.task_list.no_tasks = There is no task yet. @@ -3632,7 +3633,7 @@ runners.task_list.repository = Repository runners.task_list.commit = Commit runners.task_list.done_at = Done At runners.edit_runner = Edit Runner -runners.update_runner = Update Changes +runners.update_runner = Update changes runners.update_runner_success = Runner updated successfully runners.update_runner_failed = Failed to update runner runners.delete_runner = Delete this runner @@ -3649,7 +3650,7 @@ runners.version = Version runners.reset_registration_token = Reset registration token runners.reset_registration_token_success = Runner registration token reset successfully -runs.all_workflows = All Workflows +runs.all_workflows = All workflows runs.commit = Commit runs.scheduled = Scheduled runs.pushed_by = pushed by @@ -3667,17 +3668,17 @@ runs.no_workflows.documentation = For more information on Forgejo Actions, see < runs.no_runs = The workflow has no runs yet. runs.empty_commit_message = (empty commit message) -workflow.disable = Disable Workflow +workflow.disable = Disable workflow workflow.disable_success = Workflow "%s" disabled successfully. -workflow.enable = Enable Workflow +workflow.enable = Enable workflow workflow.enable_success = Workflow "%s" enabled successfully. workflow.disabled = Workflow is disabled. need_approval_desc = Need approval to run workflows for fork pull request. variables = Variables -variables.management = Variables Management -variables.creation = Add Variable +variables.management = Manage variables +variables.creation = Add variable variables.none = There are no variables yet. variables.deletion = Remove variable variables.deletion.description = Removing a variable is permanent and cannot be undone. Continue? @@ -3692,9 +3693,9 @@ variables.update.failed = Failed to edit variable. variables.update.success = The variable has been edited. [projects] -type-1.display_name = Individual Project -type-2.display_name = Repository Project -type-3.display_name = Organization Project +type-1.display_name = Individual project +type-2.display_name = Repository project +type-3.display_name = Organization project [git.filemode] changed_filemode = %[1]s → %[2]s diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl index 65e82ba26f..2187761828 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -438,7 +438,7 @@ {{ctx.Locale.Tr "admin.auths.tips"}}
-
GMail Settings:
+
{{ctx.Locale.Tr "admin.auths.tips.gmail_settings"}}

Host: smtp.gmail.com, Port: 587, Enable TLS Encryption: true

{{ctx.Locale.Tr "admin.auths.tips.oauth2.general"}}:
diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl index f32f77d5dc..d8935341f4 100644 --- a/templates/admin/auth/new.tmpl +++ b/templates/admin/auth/new.tmpl @@ -82,7 +82,7 @@ {{ctx.Locale.Tr "admin.auths.tips"}}
-
GMail Settings:
+
{{ctx.Locale.Tr "admin.auths.tips.gmail_settings"}}

Host: smtp.gmail.com, Port: 587, Enable TLS Encryption: true

{{ctx.Locale.Tr "admin.auths.tips.oauth2.general"}}:
diff --git a/tests/integration/repo_test.go b/tests/integration/repo_test.go index cb79a2fa9b..9f7221230b 100644 --- a/tests/integration/repo_test.go +++ b/tests/integration/repo_test.go @@ -383,7 +383,7 @@ func TestRepoHTMLTitle(t *testing.T) { defer tests.PrintCurrentTest(t)() htmlTitle := GetHTMLTitle(t, nil, "/user2/repo1/pulls") - assert.EqualValues(t, "Pull Requests - user2/repo1 - Gitea: Git with a cup of tea", htmlTitle) + assert.EqualValues(t, "Pull requests - user2/repo1 - Gitea: Git with a cup of tea", htmlTitle) }) t.Run("View pull request", func(t *testing.T) { defer tests.PrintCurrentTest(t)()