Improve English grammar and consistency. (#3614)

* Start improving English grammar and consistency.

* Apply review comments, push translation further.

* Additional review changes; expand translation.

* Undo team/organization change, further translation.

* Add site administration; review comments; merge.

* Update hardcoded branch protection string tests.

* Update hardcoded branch deletion string test.

* Update another hardcoded translation string test.

* Add my nickname to the list of translators.

* Implement @lafriks review comments.

* Remove (now) unused branch deletion warnings.

* Remove (now) unused branch deletion warnings.

6 files changed, 622 insertions, 628 deletions

diff --git a/integrations/editor_test.go b/integrations/editor_test.go
index 0722a917f0..e2dd2e1dc4 100644
--- a/integrations/editor_test.go
+++ b/integrations/editor_test.go
@@ -52,7 +52,7 @@ func TestCreateFileOnProtectedBranch(t *testing.T) {
 	// Check if master branch has been locked successfully
 	flashCookie := session.GetCookie("macaron_flash")
 	assert.NotNil(t, flashCookie)
-	assert.EqualValues(t, "success%3DBranch%2Bmaster%2Bprotect%2Boptions%2Bchanged%2Bsuccessfully.", flashCookie.Value)
+	assert.EqualValues(t, "success%3DBranch%2Bprotection%2Bfor%2Bbranch%2B%2527master%2527%2Bhas%2Bbeen%2Bupdated.", flashCookie.Value)
 
 	// Request editor page
 	req = NewRequest(t, "GET", "/user2/repo1/_new/master/")
@@ -73,7 +73,7 @@ func TestCreateFileOnProtectedBranch(t *testing.T) {
 
 	resp = session.MakeRequest(t, req, http.StatusOK)
 	// Check body for error message
-	assert.Contains(t, resp.Body.String(), "Can not commit to protected branch 'master'.")
+	assert.Contains(t, resp.Body.String(), "Cannot commit to protected branch 'master'.")
 
 	// remove the protected branch
 	csrf = GetCSRF(t, session, "/user2/repo1/settings/branches")
@@ -86,7 +86,7 @@ func TestCreateFileOnProtectedBranch(t *testing.T) {
 	// Check if master branch has been locked successfully
 	flashCookie = session.GetCookie("macaron_flash")
 	assert.NotNil(t, flashCookie)
-	assert.EqualValues(t, "success%3DBranch%2Bmaster%2Bprotect%2Boptions%2Bremoved%2Bsuccessfully", flashCookie.Value)
+	assert.EqualValues(t, "success%3DBranch%2Bprotection%2Bfor%2Bbranch%2B%2527master%2527%2Bhas%2Bbeen%2Bdisabled.", flashCookie.Value)
 
 }
 
diff --git a/integrations/pull_merge_test.go b/integrations/pull_merge_test.go
index aabb2c78fc..27f3586406 100644
--- a/integrations/pull_merge_test.go
+++ b/integrations/pull_merge_test.go
@@ -121,5 +121,5 @@ func TestPullCleanUpAfterMerge(t *testing.T) {
 	htmlDoc := NewHTMLParser(t, resp.Body)
 	resultMsg := htmlDoc.doc.Find(".ui.message>p").Text()
 
-	assert.EqualValues(t, "user1/feature/test has been deleted.", resultMsg)
+	assert.EqualValues(t, "Branch 'user1/feature/test' has been deleted.", resultMsg)
 }
diff --git a/options/locale/TRANSLATORS b/options/locale/TRANSLATORS
index 404b758e52..3d6963d8af 100644
--- a/options/locale/TRANSLATORS
+++ b/options/locale/TRANSLATORS
@@ -14,6 +14,7 @@ Antoine GIRARD <sapk AT sapk DOT fr>
 Arthur Aslanyan <arthur DOT e DOT aslanyan AT gmail DOT com>
 Aurelien Darragon <aurelien DOT darragon AT gmail DOT com>
 Barış Arda Yılmaz <ardayilmazgamer AT gmail DOT com>
+bugreport0
 Camille Baronnet <gogs AT camillebaronnet DOT fr>
 Christoph Kisfeld <christoph DOT kisfeld AT gmail DOT com>
 Cysioland
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index f1febe4b62..6f208262e2 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1,15 +1,15 @@
-app_desc = A painless self-hosted Git service
+app_desc = A painless, self-hosted Git service
 
 home = Home
 dashboard = Dashboard
 explore = Explore
 help = Help
 sign_in = Sign In
-sign_in_with = Sign in with
+sign_in_with = Sign In With
 sign_out = Sign Out
-sign_up = Sign Up
+sign_up = Register
 link_account = Link Account
-link_account_signin_or_signup = Login with existing credentials to link your existing account to this account. Or, sign up for a new one
+link_account_signin_or_signup = Sign in with existing credentials to link your existing account to this account. Or register a new one.
 register = Register
 website = Website
 version = Version
@@ -18,17 +18,17 @@ template = Template
 language = Language
 notifications = Notifications
 create_new = Create…
-user_profile_and_more = User profile and more
+user_profile_and_more = Profile and Settings…
 signed_in_as = Signed in as
-enable_javascript = This website works better with JavaScript
+enable_javascript = This website works better with JavaScript.
 
 username = Username
-email = Email
+email = Email Address
 password = Password
-re_type = Re-Type
-captcha = Captcha
-twofa = Two-factor authentication
-twofa_scratch = Two-factor scratch code
+re_type = Re-Type Password
+captcha = CAPTCHA
+twofa = Two-Factor Authentication
+twofa_scratch = Two-Factor Scratch Code
 passcode = Passcode
 
 repository = Repository
@@ -40,12 +40,12 @@ new_mirror = New Mirror
 new_fork = New Repository Fork
 new_org = New Organization
 manage_org = Manage Organizations
-admin_panel = Admin Panel
+admin_panel = Site Administration
 account_settings = Account Settings
 settings = Settings
-your_profile = Your Profile
-your_starred = Your Starred
-your_settings = Your Settings
+your_profile = Profile
+your_starred = Starred
+your_settings = Settings
 
 all = All
 sources = Sources
@@ -61,97 +61,97 @@ cancel = Cancel
 
 [install]
 install = Installation
-title = Initial configuration
-docker_helper = If you are running Gitea inside Docker, please read the <a target="_blank" rel="noopener" href="%s">guidelines</a> carefully before changing anything on this page.
-requite_db_desc = Gitea requires MySQL, MSSQL, PostgreSQL, SQLite3, or TiDB.
+title = Initial Configuration
+docker_helper = If you run Gitea inside Docker, please read the <a target="_blank" rel="noopener" href="%s">documentation</a> before changing any settings.
+requite_db_desc = Gitea requires MySQL, PostgreSQL, MSSQL, SQLite3 or TiDB.
 db_title = Database Settings
 db_type = Database Type
 host = Host
-user = User
+user = Username
 password = Password
 db_name = Database Name
-db_helper = Please use the INNODB engine with utf8_general_ci charset for MySQL.
-ssl_mode = SSL Mode
+db_helper = Note to MySQL users: please use the InnoDB storage engine and the 'utf8_general_ci' character set.
+ssl_mode = SSL
 path = Path
-sqlite_helper = The file path to the SQLite3 or TiDB database. <br>Please use the absolute path when you start as service.
-err_empty_db_path = SQLite3 or TiDB database path cannot be empty.
-err_invalid_tidb_name = TiDB database name does not allow characters "." and "-".
-no_admin_and_disable_registration = You cannot disable registration without creating an admin account.
-err_empty_admin_password = Admin password cannot be empty.
-
-general_title = General Application Settings
-app_name = Application Name
-app_name_helper = You can put your organization name here.
+sqlite_helper = File path for the SQLite3 or TiDB database.<br>Enter an absolute path if you run Gitea as a service.
+err_empty_db_path = The SQLite3 or TiDB database path cannot be empty.
+err_invalid_tidb_name = The TiDB database name cannot contain the '.' and '-' characters.
+no_admin_and_disable_registration = You cannot disable user self-registration without creating an administrator account.
+err_empty_admin_password = The administrator password cannot be empty.
+
+general_title = General Settings
+app_name = Site Title
+app_name_helper = Enter your company name here.
 repo_path = Repository Root Path
-repo_path_helper = All remote Git repositories will be saved to this directory.
-lfs_path = LFS Root Path
-lfs_path_helper = Files stored with Git LFS will be stored in this directory. Leave empty to disable LFS.
-run_user = Run User
-run_user_helper = The user must have access to Repository Root Path and run Gitea.
-domain = Domain
-domain_helper = This affects SSH clone URLs.
-ssh_port = SSH Port
-ssh_port_helper = Port number which your SSH server is using. Leave it empty to disable.
-http_port = HTTP Port
-http_port_helper = Port number which application will listen on.
-app_url = Application URL
-app_url_helper = This affects HTTP/HTTPS clone URL and some email notifications.
+repo_path_helper = Remote Git repositories will be saved to this directory.
+lfs_path = Git LFS Root Path
+lfs_path_helper = Files tracked by Git LFS will be stored in this directory. Leave empty to disable.
+run_user = Run As Username
+run_user_helper = Enter the operating system username that Gitea runs as. Note that this user must have access to the repository root path.
+domain = SSH Server Domain
+domain_helper = Domain or host address for SSH clone URLs.
+ssh_port = SSH Server Port
+ssh_port_helper = Port number your SSH server listens on. Leave empty to disable.
+http_port = Gitea HTTP Listen Port
+http_port_helper = Port number the Giteas web server will listen on.
+app_url = Gitea Base URL
+app_url_helper = Base address for HTTP(S) clone URLs and email notifications.
 log_root_path = Log Path
-log_root_path_helper = Directory to write log files to.
+log_root_path_helper = Log files will be written to this directory.
 
 optional_title = Optional Settings
-email_title = Email Service Settings
+email_title = Email Settings
 smtp_host = SMTP Host
-smtp_from = From
-smtp_from_helper = Mail from address, RFC 5322. It can be only an email address, or the "Name" <email@example.com> format.
-mailer_user = Sender User
-mailer_password = Sender Password
-register_confirm = Enable Register Confirmation
-mail_notify = Enable Mail Notifications
-server_service_title = Server and Other Services Settings
-offline_mode = Enable Offline Mode
-offline_mode_popup = Disable CDN so all resource files will be served locally.
-disable_gravatar = Disable Gravatar Service
-disable_gravatar_popup = Disable Gravatar and custom sources. All avatars must be uploaded by users or the default avatar will be used.
-federated_avatar_lookup = Enable Federated Avatars Lookup
+smtp_from = Send Email As
+smtp_from_helper = Email address Gitea will use. Enter a plain email address or use the "Name" <email@example.com> format.
+mailer_user = SMTP Username
+mailer_password = SMTP Password
+register_confirm = Require Email Confirmation to Register
+mail_notify = Enable Email Notifications
+server_service_title = Server and Third-Party Service Settings
+offline_mode = Enable Local Mode
+offline_mode_popup = Disable third-party content delivery networks and serve all resources locally.
+disable_gravatar = Disable Gravatar
+disable_gravatar_popup = Disable Gravatar and third-party avatar sources. A default avatar will be used unless a user locally uploads an avatar.
+federated_avatar_lookup = Enable Federated Avatars
 federated_avatar_lookup_popup = Enable federated avatar lookup using Libravatar.
-disable_registration = Disable Self-registration
-disable_registration_popup = "Disable self-registration; only admins will be able to create accounts."
+disable_registration = Disable Self-Registration
+disable_registration_popup = Disable user self-registration. Only administrators will be able to create new user accounts.
 openid_signin = Enable OpenID Sign-In
-openid_signin_popup = Enable user login via OpenID
-openid_signup = Enable OpenID Self-registration
-openid_signup_popup = Enable OpenID based Self-registration
-enable_captcha = Enable Captcha
+openid_signin_popup = Enable user sign-in via OpenID.
+openid_signup = Enable OpenID Self-Registration
+openid_signup_popup = Enable OpenID-based user self-registration.
+enable_captcha = Enable CAPTCHA
 enable_captcha_popup = Require a CAPTCHA for user self-registration.
-require_sign_in_view = Enable Require Sign In to View Pages
-require_sign_in_view_popup = "Only signed in users can view pages; visitors will only be able to see the sign in and up pages."
-admin_setting_desc = You do not need to create an admin account right now. The first user who registers on the site will gain admin access automatically.
-admin_title = Admin Account Settings
-admin_name = Username
+require_sign_in_view = Require Sign-In to View Pages
+require_sign_in_view_popup = Limit page access to signed-in users. Visitors will only see the 'sign in' and registration pages.
+admin_setting_desc = Creating an administrator account is optional. The first registered user will automatically become an administrator.
+admin_title = Administrator Account Settings
+admin_name = Administrator Username
 admin_password = Password
 confirm_password = Confirm Password
-admin_email = Admin Email
+admin_email = Email Address
 install_btn_confirm = Install Gitea
 test_git_failed = Could not test 'git' command: %v
-sqlite3_not_available = Your current version does not support SQLite3, please download the official binary version from %s, NOT the gobuild version.
-invalid_db_setting = Database setting is invalid: %v
-invalid_repo_path = Repository root path is invalid: %v
-run_user_not_match = Run user is not the current user: %s -> %s
+sqlite3_not_available = This Gitea version does not support SQLite3. Please download the official binary version from %s (not the 'gobuild' version).
+invalid_db_setting = The database settings are invalid: %v
+invalid_repo_path = The repository root path is invalid: %v
+run_user_not_match = The 'run as' username is not the current username: %s -> %s
 save_config_failed = Failed to save configuration: %v
-invalid_admin_setting = Admin account setting is invalid: %v
-install_success = Welcome! Thank you for choosing Gitea. Have fun. And, take care!
-invalid_log_root_path = Log root path is invalid: %v
-default_keep_email_private = Default Value for Keep Email Private
-default_keep_email_private_popup = This is the default value for the visibility of the user's email address. If set to true the email address of all new users will be hidden until the user changes his setting.
-default_allow_create_organization = Default permission value for new users to create organizations
-default_allow_create_organization_popup = This is default permission value that will be assigned for new users. If set to true new users will be allowed to create Organizations.
-default_enable_timetracking = Enable time tracking by default
-default_enable_timetracking_popup = Repositories will have time tracking enabled by default depending on this setting
-no_reply_address = No-reply Address
-no_reply_address_helper = Domain for the user's email address in git logs if he keeps his email address private. E.g. user 'joe' and 'noreply.example.org' will be 'joe@noreply.example.org'
+invalid_admin_setting = Administrator account setting is invalid: %v
+install_success = Welcome! Thank you for choosing Gitea. Have fun and take care!
+invalid_log_root_path = The log path is invalid: %v
+default_keep_email_private = Hide Email Addresses by Default
+default_keep_email_private_popup = Hide email addresses of new user accounts by default.
+default_allow_create_organization = Allow Creation of Organizations by Default
+default_allow_create_organization_popup = Allow new user accounts to create organizations by default.
+default_enable_timetracking = Enable Time Tracking by Default
+default_enable_timetracking_popup = Enable time tracking for new repositories by default.
+no_reply_address = Hidden Email Domain
+no_reply_address_helper = Domain name for users with a hidden email address. For example, the username 'joe' will be logged in Git as 'joe@noreply.example.org' if the hidden email domain is set to 'noreply.example.org'.
 
 [home]
-uname_holder = Username or email
+uname_holder = Username or Email Address
 password_holder = Password
 switch_dashboard_context = Switch Dashboard Context
 my_repos = My Repositories
@@ -170,52 +170,52 @@ users = Users
 organizations = Organizations
 search = Search
 code = Code
-repo_no_results = No matching repositories have been found.
-user_no_results = No matching users have been found.
-org_no_results = No matching organizations have been found.
-code_no_results = No code matching your search term has been found.
-code_search_results = Search results for "%s"
+repo_no_results = No matching repositories found.
+user_no_results = No matching users found.
+org_no_results = No matching organizations found.
+code_no_results = No source code matching your search term found.
+code_search_results = Search results for '%s'
 
 [auth]
-create_new_account = Create Account
+create_new_account = Register Account
 register_helper_msg = Already have an account? Sign in now!
-social_register_helper_msg = Already have an account? Join it now!
-disable_register_prompt = Sorry, registration has been disabled. Please contact the site administrator.
-disable_register_mail = Sorry, Register Mail Confirmation has been disabled.
+social_register_helper_msg = Already have an account? Link it now!
+disable_register_prompt = Registration is disabled. Please contact your site administrator.
+disable_register_mail = Email confirmation for registration is disabled.
 remember_me = Remember Me
 forgot_password_title= Forgot Password
 forgot_password = Forgot password?
-sign_up_now = Need an account? Sign up now.
+sign_up_now = Need an account? Register now.
 confirmation_mail_sent_prompt = A new confirmation email has been sent to <b>%s</b>. Please check your inbox within the next %s to complete the registration process.
 reset_password_mail_sent_prompt = A confirmation email has been sent to <b>%s</b>. Please check your inbox within the next %s to complete the password reset process.
 active_your_account = Activate Your Account
-prohibit_login = Login Prohibited
-prohibit_login_desc = Your account is prohibited to login, please contact the site administrator.
-resent_limit_prompt = Sorry, you have already requested an activation email recently. Please wait 3 minutes then try again.
+prohibit_login = Sign In Prohibited
+prohibit_login_desc = Your account is prohibited to sign 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 (<b>%s</b>). If you haven't received a confirmation email or need to resend a new one, please click on the button below.
 resend_mail = Click here to resend your activation email
 email_not_associate = The email address is not associated with any account.
 send_reset_mail = Click here to resend your password reset email
 reset_password = Reset Your Password
-invalid_code = Sorry, your confirmation code has expired or is not valid.
+invalid_code = Your confirmation code is invalid or has expired.
 reset_password_helper = Click here to reset your password
 password_too_short = Password length cannot be less then %d.
-non_local_account = Non-local accounts cannot change passwords through the Gitea web interface.
+non_local_account = Non-local users can not update their password through the Gitea web interface.
 verify = Verify
 scratch_code = Scratch code
 use_scratch_code = Use a scratch code
 twofa_scratch_used = You have used your scratch code. You have been redirected to the two-factor settings page so you may remove your device enrollment or generate a new scratch code.
-twofa_passcode_incorrect = Your passcode is incorrect. If you misplaced your device, use your scratch code to login.
+twofa_passcode_incorrect = Your passcode is incorrect. If you misplaced your device, use your scratch code to sign in.
 twofa_scratch_token_incorrect = Your scratch code is incorrect.
-login_userpass = User / Password
+login_userpass = Sign In
 login_openid = OpenID
 openid_connect_submit = Connect
 openid_connect_title = Connect to an existing account
-openid_connect_desc = The chosen OpenID URIs is not known by the system, you can join it an existing account.
+openid_connect_desc = The chosen OpenID URI is unknown. Associate it with a new account here.
 openid_register_title = Create new account
-openid_register_desc = The chosen OpenID URIs is not known by the system, you can associate it to a new account here.
-openid_signin_desc = Example URIs: https://anne.me, bob.openid.org.cn, gnusocial.net/carry
-disable_forgot_password_mail = Sorry, password reset has been disabled. Please contact the site administrator.
+openid_register_desc = The chosen OpenID URI is unknown. Associate it with a new account here.
+openid_signin_desc = Enter your OpenID URI. For example: https://anne.me, bob.openid.org.cn or gnusocial.net/carry.
+disable_forgot_password_mail = Password reset is disabled. Please contact your site administrator.
 
 [mail]
 activate_account = Please activate your account
@@ -227,14 +227,14 @@ register_notify = Welcome to Gitea
 [modal]
 yes = Yes
 no = No
-modify = Modify
+modify = Update
 
 [form]
 UserName = Username
 RepoName = Repository name
 Email = Email address
 Password = Password
-Retype = Re-type password
+Retype = Re-Type Password
 SSHTitle = SSH key name
 HttpsUrl = HTTPS URL
 PayloadUrl = Payload URL
@@ -250,9 +250,9 @@ TreeName = File path
 Content = Content
 
 require_error = ` cannot be empty.`
-alpha_dash_error = ` must be valid alphanumeric or dash(-_) characters.`
-alpha_dash_dot_error = ` must be valid alphanumeric, dash(-_) or dot characters.`
-git_ref_name_error = ` must be a well formed git reference name.`
+alpha_dash_error = ` should contain only alphanumeric, dash ('-') and underscore ('_') characters.`
+alpha_dash_dot_error = ` should contain only alphanumeric, dash ('-'), underscore ('_') and dot ('.') characters.`
+git_ref_name_error = ` must be a well-formed Git reference name.`
 size_error = ` must be size %s.`
 min_size_error = ` must contain at least %s characters.`
 max_size_error = ` must contain at most %s characters.`
@@ -260,48 +260,48 @@ email_error = ` is not a valid email address.`
 url_error = ` is not a valid URL.`
 include_error = ` must contain substring '%s'.`
 unknown_error = Unknown error:
-captcha_incorrect = CAPTCHA response is incorrect.
-password_not_match = Your chosen passwords do not match.
-
-username_been_taken = Username already taken.
-repo_name_been_taken = Repository name already used.
-org_name_been_taken = Organization name already taken.
-team_name_been_taken = Team name already taken.
-team_no_units_error = Team must have at least one unit enabled.
-email_been_used = Email already used.
-openid_been_used = OpenID address '%s' already used.
-username_password_incorrect = Incorrect username or password.
-enterred_invalid_repo_name = Please ensure that the repository name you entered is correct.
-enterred_invalid_owner_name = Please ensure that the owner name you entered is correct.
-enterred_invalid_password = Please ensure that the password you entered is correct.
+captcha_incorrect = The CAPTCHA code is incorrect.
+password_not_match = The passwords do not match.
+
+username_been_taken = The username is already taken.
+repo_name_been_taken = The repository name is already used.
+org_name_been_taken = The organization name is already taken.
+team_name_been_taken = The team name is already taken.
+team_no_units_error = Allow access to at least one repository section.
+email_been_used = The email address is already used.
+openid_been_used = The OpenID address '%s' is already used.
+username_password_incorrect = Username or password is incorrect.
+enterred_invalid_repo_name = The repository name you entered is incorrect.
+enterred_invalid_owner_name = The new owner name is not valid.
+enterred_invalid_password = The password you entered is incorrect.
 user_not_exist = The user does not exist.
-last_org_owner = Removing the last user from the owner team is not allowed because there must always be at least one owner in any given organization.
-cannot_add_org_to_team = Organization cannot be added as a team member.
+last_org_owner = You cannot remove the last user from the 'owners' team. There must be at least one owner in any given team.
+cannot_add_org_to_team = An organization cannot be added as a team member.
 
-invalid_ssh_key = Sorry, we were not able to verify your SSH key: %s
-invalid_gpg_key = Sorry, we were not able to verify your GPG key: %s
-unable_verify_ssh_key = "The ssh key could not be verified; please double-check it for any mistakes."
+invalid_ssh_key = Can not verify your SSH key: %s
+invalid_gpg_key = Can not verify your GPG key: %s
+unable_verify_ssh_key = "Can not verify the SSH key; double-check it for mistakes."
 auth_failed = Authentication failed: %v
 
-still_own_repo = "Your account still has ownership of at least one repository; you need to delete or transfer them first."
-still_has_org = "Your account still is still a member of least one organization; you need to leave them first."
-org_still_own_repo = "This organization still owns repositories; you need to delete or transfer them first."
+still_own_repo = "Your account owns one or more repositories; delete or transfer them first."
+still_has_org = "Your account is a member of one or more organizations; leave them first."
+org_still_own_repo = "This organization still owns one or more repositories; delete or transfer them first."
 
 target_branch_not_exist = Target branch does not exist.
 
 [user]
-change_avatar = Change your avatar
+change_avatar = Change your avatar…
 join_on = Joined on
 repositories = Repositories
 activity = Public Activity
 followers = Followers
-starred = Starred repositories
+starred = Starred Repositories
 following = Following
 follow = Follow
 unfollow = Unfollow
 
 form.name_reserved = The username '%s' is reserved.
-form.name_pattern_not_allowed = The username pattern '%s' is not allowed.
+form.name_pattern_not_allowed = The pattern '%s' is not allowed in a username.
 
 [settings]
 profile = Profile
@@ -310,95 +310,95 @@ security = Security
 avatar = Avatar
 ssh_gpg_keys = SSH / GPG Keys
 social = Social Accounts
-applications = Applications
-orgs = Organizations
+applications = Access Tokens
+orgs = Manage Organizations
 repos = Repositories
 delete = Delete Account
 twofa = Two-Factor Authentication
-account_link = External Accounts
-organization = Organization
+account_link = Linked Accounts
+organization = Organizations
 uid = Uid
 
 public_profile = Public Profile
-profile_desc = Your email address is public and will be used for any account related notifications and web based operations made through the web interface.
-password_username_disabled = Non-local users are not allowed to change their username. Please contact your system administrator for more details.
+profile_desc = Your email address will be used for notifications and other 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
 website = Website
 location = Location
 update_profile = Update Profile
 update_profile_success = Your profile has been updated.
-change_username = Username Changed
-change_username_prompt = This change will change the links to your account.
+change_username = Your username has been changed.
+change_username_prompt = Note: username changes also change your account URL.
 continue = Continue
 cancel = Cancel
 
-lookup_avatar_by_mail = Lookup Avatar by mail
+lookup_avatar_by_mail = Look Up 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 Setting
+update_avatar = Update Avatar
 delete_current_avatar = Delete Current Avatar
-uploaded_avatar_not_a_image = Uploaded file is not an image.
-update_avatar_success = Your avatar setting has been updated.
+uploaded_avatar_not_a_image = The uploaded file is not an image.
+update_avatar_success = Your avatar has been updated.
 
-change_password = Change Password
+change_password = Update Password
 old_password = Current Password
 new_password = New Password
-retype_new_password = Retype New Password
-password_incorrect = Current password is incorrect.
-change_password_success = Your password was successfully changed. You can now sign using your new password.
-password_change_disabled = Non-local users are not allowed to change their password through the web interface.
+retype_new_password = Re-Type New Password
+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 can not update their password through the Gitea web interface.
 
 emails = Email Addresses
-manage_emails = Manage email addresses
-manage_openid = Manage OpenID addresses
+manage_emails = Manage Email Addresses
+manage_openid = Manage OpenID Addresses
 email_desc = Your primary email address will be used for notifications and other operations.
 primary = Primary
-primary_email = Set as primary
-delete_email = Delete
-email_deletion = Delete Email
-email_deletion_desc = Deleting this email address will remove all related information from your account. Git commits using this email will remain unchanged. Do you want to continue?
-email_deletion_success = Email has been deleted successfully!
-openid_deletion = OpenID Deletion
-openid_deletion_desc = Deleting this OpenID address from your account will prevent you from signing in with it. Are you sure you want to continue ?
-openid_deletion_success = OpenID has been deleted successfully!
-add_new_email = Add new email address
-add_new_openid = Add new OpenID URI
-add_email = Add email
+primary_email = Make Primary
+delete_email = Remove
+email_deletion = Remove Email Address
+email_deletion_desc = The email address and related information will be removed from your account. Git commits by this email address will remain unchanged. Continue?
+email_deletion_success = The email address has been removed.
+openid_deletion = Remove OpenID Address
+openid_deletion_desc = Removing this OpenID address from your account will prevent you from signing in with it. Continue?
+openid_deletion_success = The OpenID address has been removed.
+add_new_email = Add New Email Address
+add_new_openid = Add New OpenID URI
+add_email = Add Email Address
 add_openid = Add OpenID URI
-add_email_confirmation_sent = A new confirmation email has been sent to '%s'. Please check your inbox within the next %s to confirm your email.
-add_email_success = Your new email address was successfully added.
-add_openid_success = Your new OpenID address was successfully added.
-keep_email_private = Keep Email Address Private
-keep_email_private_popup = Your email address will be hidden from other users if this option is set.
-openid_desc = Your OpenID addresses will let you delegate authentication to your provider of choice
+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.
+add_openid_success = The new OpenID address has been added.
+keep_email_private = Hide Email Address
+keep_email_private_popup = Your email address will be hidden from other users.
+openid_desc = OpenID lets you delegate authentication to an external provider.
 
 manage_ssh_keys = Manage SSH Keys
 manage_gpg_keys = Manage GPG Keys
 add_key = Add Key
-ssh_desc = These are the SSH keys associated with your account. Because these keys allow anyone using them to gain access to your repositories, it is very important you make sure you recognize them.
-gpg_desc = These are the GPG keys associated with your account. Because these keys allow commits to be verified, it is very important that you keep the corresponding private key safe.
+ssh_desc = These public SSH keys are associated with your account. The corresponding private keys allow full access to your repositories.
+gpg_desc = These public GPG keys are associated with your account. Keep your private keys safe as they allow commits to be verified.
 ssh_helper = <strong>Need help?</strong> Have a look at GitHub's guide to <a href="%s">create your own SSH keys</a> or solve <a href="%s">common problems</a> you may encounter using SSH.
 gpg_helper = <strong>Need help?</strong> Have a look at GitHub's guide <a href="%s">about GPG</a>.
 add_new_key = Add SSH Key
 add_new_gpg_key = Add GPG Key
-ssh_key_been_used = This public key has already been used.
-ssh_key_name_used = A public key with same name already exists.
-gpg_key_id_used = A public GPG key with same id already exists.
-gpg_no_key_email_found = None of the emails attached to the GPG key could be found.
+ssh_key_been_used = This SSH key is already added to your account.
+ssh_key_name_used = An SSH key with same name is already added to your account.
+gpg_key_id_used = A public GPG key with same ID already exists.
+gpg_no_key_email_found = This GPG key is not usable with any email address associated with your account.
 subkeys = Subkeys
 key_id = Key ID
 key_name = Key Name
 key_content = Content
-add_key_success = Your SSH key '%s' has been added.
-add_gpg_key_success = Your GPG key '%s' has been added.
-delete_key = Delete
-ssh_key_deletion = SSH Key Deletion
-gpg_key_deletion = GPG Key Deletion
-ssh_key_deletion_desc = Deleting this SSH key will revoke all access using this SSH key for your account. Do you want to continue?
-gpg_key_deletion_desc = Deleting this GPG key will unverify all commits signed with this GPG key. Are you sure you want to continue?
-ssh_key_deletion_success = The SSH key has been deleted.
-gpg_key_deletion_success = The GPG key has been deleted.
+add_key_success = The SSH key '%s' has been added.
+add_gpg_key_success = The GPG key '%s' has been added.
+delete_key = Remove
+ssh_key_deletion = Remove SSH Key
+gpg_key_deletion = Remove GPG Key
+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?
+ssh_key_deletion_success = The SSH key has been removed.
+gpg_key_deletion_success = The GPG key has been removed.
 add_on = Added on
 valid_until = Valid until
 valid_forever = Valid forever
@@ -410,87 +410,87 @@ key_state_desc = This key has been used in the last 7 days
 token_state_desc = This token has been used in the last 7 days
 show_openid = Show on profile
 hide_openid = Hide from profile
-ssh_disabled = SSH is disabled
+ssh_disabled = SSH Disabled
 
 manage_social = Manage Associated Social Accounts
-social_desc = This is a list of associated social accounts. For security reasons, please make sure you recognize all of these entries, as they can be used to log in to your account.
-unbind = Unbind
-unbind_success = Social account has been unbound from your account.
+social_desc = These social accounts are linked to your Gitea account. Make sure you recognize all of them as they can be used to sign in to your Gitea account.
+unbind = Unlink
+unbind_success = The social account has been unlinked from your Gitea account.
 
-manage_access_token = Manage Personal Access Tokens
+manage_access_token = Manage Access Tokens
 generate_new_token = Generate New Token
-tokens_desc = Tokens you have generated which can be used to access the Gitea APIs.
-new_token_desc = Each token will have full access to your account.
+tokens_desc = These tokens grant access to your account using the Gitea API.
+new_token_desc = Applications using a token have full access to your account.
 token_name = Token Name
 generate_token = Generate Token
-generate_token_success = Your access token was successfully generated! Be sure to copy it right now, because you will not be able to see it again later!
+generate_token_success = Your new token has been generated. Copy it now as it will not be shown again.
 delete_token = Delete
-access_token_deletion = Personal Access Token Deletion
-access_token_deletion_desc = Delete this personal access token will revoke access for any application using this token. Do you want to continue?
-delete_token_success = The personal access token has been removed. Don't forget to update any applications using this token.
+access_token_deletion = Delete Access Token
+access_token_deletion_desc = Deleting a token will revoke access to your account for applications using it. Continue?
+delete_token_success = The token has been deleted. Applications using it no longer have access to your account.
 
-twofa_desc = Gitea supports two-factor authentication to enhance the security of your account.
+twofa_desc = Two-factor authentication enhances the security of your account.
 twofa_is_enrolled = Your account is currently <strong>enrolled</strong> 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 scratch token
-twofa_scratch_token_regenerated = Your scratch token has been regenerated. It is now %s. Keep it in a safe place.
-twofa_enroll = Enroll into two-factor authentication
-twofa_disable_note = If needed, you can disable two-factor authentication.
-twofa_disable_desc = Disabling two-factor authentication will make your account less secure. Are you sure you want to continue?
-regenerate_scratch_token_desc = If you misplaced your scratch token, or have already used it to log in, you can reset it here.
+twofa_disable = Disable Two-Factor Authentication
+twofa_scratch_token_regenerate = Regenerate Scratch Token
+twofa_scratch_token_regenerated = Your scratch token is now %s. Store it in a safe place.
+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 scratch token or have already used it to sign in you can reset it here.
 twofa_disabled = Two-factor authentication has been disabled.
 scan_this_image = Scan this image with your authentication application:
 or_enter_secret = Or enter the secret: %s
-then_enter_passcode = And enter the passcode the application gives you:
-passcode_invalid = That passcode is invalid. Try again.
-twofa_enrolled = Your account has now been enrolled in two-factor authentication. Make sure to save your scratch token (%s), as it will only be shown once!
+then_enter_passcode = And enter the passcode shown in the application:
+passcode_invalid = The passcode is incorrect. Try again.
+twofa_enrolled = Your account has been enrolled into two-factor authentication. Store your scratch token (%s) in a safe place as it is only shown once!
 
-manage_account_links = Manage account links
-manage_account_links_desc = External accounts linked to this account
-account_links_not_available = There are currently no external accounts linked to this account
-remove_account_link = Remove linked account
-remove_account_link_desc = Removing this linked account will revoke all related access using this account. Do you want to continue?
-remove_account_link_success = Account link has been removed successfully!
+manage_account_links = Manage Linked Accounts
+manage_account_links_desc = These external accounts are linked to your Gitea account.
+account_links_not_available = There are currently no external accounts linked to your Gitea account.
+remove_account_link = Remove Linked Account
+remove_account_link_desc = Removing a linked account will revoke its access to your Gitea account. Continue?
+remove_account_link_success = The linked account has been removed.
 
 orgs_none = You are not a member of any organizations.
 repos_none = You do not own any repositories
 
 delete_account = Delete Your Account
-delete_prompt = The operation will delete your account permanently. And, this <strong>CANNOT</strong> be undone!
+delete_prompt = This operation will permanently delete your user account. It <strong>CAN NOT</strong> be undone.
 confirm_delete_account = Confirm Deletion
-delete_account_title = Account Deletion
-delete_account_desc = Are you sure you want to permanently delete this account?
+delete_account_title = Delete User Account
+delete_account_desc = Are you sure you want to permanently delete this user account?
 
 [repo]
 owner = Owner
 repo_name = Repository Name
-repo_name_helper = A good repository name is composed of short, memorable, and unique keywords.
+repo_name_helper = Good repository names use short, memorable and unique keywords.
 visibility = Visibility
-visiblity_helper = This repository is <span class="ui red text">Private</span>
-visiblity_helper_forced = Your system administrator has forced all new repositories to be <span class="ui red text">Private</span>
-visiblity_fork_helper = (Change of this value will affect all forks)
-clone_helper = Need help cloning? Visit <a target="_blank" rel="noopener" href="%s">Help</a>!
+visiblity_helper = Make Repository Private
+visiblity_helper_forced = Your site administrator forces new repositories to be private.
+visiblity_fork_helper = (Changing this will affect all forks.)
+clone_helper = Need help cloning? Visit <a target="_blank" rel="noopener" href="%s">Help</a>.
 fork_repo = Fork Repository
 fork_from = Fork From
-fork_visiblity_helper = You cannot change the visibility of a forked repository.
+fork_visiblity_helper = The visibility of a forked repository cannot be changed.
 repo_desc = Description
 repo_lang = Language
-repo_gitignore_helper = Select .gitignore templates
+repo_gitignore_helper = Select .gitignore templates.
 license = License
-license_helper = Select a license file
-readme = Readme
-readme_helper = Select a readme template
-auto_init = Initialize this repository with selected files and template
+license_helper = Select a license file.
+readme = README
+readme_helper = Select a README file template.
+auto_init = Initialize Repository (Adds .gitignore, License and README)
 create_repo = Create Repository
 default_branch = Default Branch
 mirror_prune = Prune
-mirror_prune_desc = Remove any remote-tracking references which no longer exist on the remote
-mirror_interval = Mirror interval (valid time units are "h", "m", "s")
-mirror_interval_invalid = Mirror interval is not valid
-mirror_address = Mirror Address
-mirror_address_desc = Please include any necessary user credentials in the address.
-mirror_last_synced = Last Synced
+mirror_prune_desc = Remove obsolete remote-tracking references
+mirror_interval = Mirror Interval (valid time units are 'h', 'm', 's')
+mirror_interval_invalid = The mirror interval is not valid.
+mirror_address = Clone From URL
+mirror_address_desc = Include any required authorization credentials in the URL.
+mirror_last_synced = Last Synchronized
 watchers = Watchers
 stargazers = Stargazers
 forks = Forks
@@ -499,33 +499,33 @@ reactions_more = and %d more
 
 form.reach_limit_of_creation = You have already reached your limit of %d repositories.
 form.name_reserved = The repository name '%s' is reserved.
-form.name_pattern_not_allowed = The repository name pattern '%s' is not allowed.
+form.name_pattern_not_allowed = The pattern '%s' is not allowed in a repository name.
 
-need_auth = Need Authorization
+need_auth = Clone Authorization
 migrate_type = Migration Type
 migrate_type_helper = This repository will be a <span class="text blue">mirror</span>
 migrate_repo = Migrate Repository
-migrate.clone_address = Clone Address
-migrate.clone_address_desc = This can be a HTTP/HTTPS/GIT URL
-migrate.clone_local_path = or local server path
+migrate.clone_address = Migrate / Clone From URL
+migrate.clone_address_desc = The HTTP(S) or Git 'clone' URL of an existing repository
+migrate.clone_local_path = or a local server path
 migrate.permission_denied = You are not allowed to import local repositories.
-migrate.invalid_local_path = "Invalid local path; it does not exist or is not a directory."
+migrate.invalid_local_path = "The local path is invalid. It does not exist or is not a directory."
 migrate.failed = Migration failed: %v
-migrate.lfs_mirror_unsupported = Mirroring LFS objects is not supported - use 'git lfs fetch --all' and 'git lfs push --all' instead.
+migrate.lfs_mirror_unsupported = Mirroring LFS objects is not supported - use 'git lfs fetch --all' and 'git lfs push --all' instead.
 
 mirror_from = mirror of
 forked_from = forked from
-fork_from_self = You cannot fork a repository you already own!
+fork_from_self = You cannot fork a repository you own.
 copy_link = Copy
-copy_link_success = Copied!
-copy_link_error = Press ⌘-C or Ctrl-C to copy
+copy_link_success = Link has been copied
+copy_link_error = Use ⌘C or Ctrl-C to copy
 copied = Copied OK
 unwatch = Unwatch
 watch = Watch
 unstar = Unstar
 star = Star
 fork = Fork
-download_archive = Download this repository
+download_archive = Download Repository
 
 no_desc = No Description
 quick_guide = Quick Guide
@@ -535,7 +535,7 @@ push_exist_repo = Pushing an existing repository from the command line
 bare_message = This repository does not contain any content.
 
 code = Code
-code.desc = Code is where the code is stored
+code.desc = Access source code, files, commits and branches.
 branch = Branch
 tree = Tree
 filter_branch_and_tag = Filter branch or tag
@@ -552,26 +552,26 @@ file_raw = Raw
 file_history = History
 file_view_raw = View Raw
 file_permalink = Permalink
-file_too_large = This file is too large to be shown
-video_not_supported_in_browser = Your browser doesn't support HTML5 video tag.
+file_too_large = The file is too large to be shown.
+video_not_supported_in_browser = Your browser does not support the HTML5 'video' tag.
 stored_lfs = Stored with Git LFS
-commit_graph = Commit graph
+commit_graph = Commit Graph
 
-editor.new_file = New file
-editor.upload_file = Upload file
-editor.edit_file = Edit file
+editor.new_file = New File
+editor.upload_file = Upload File
+editor.edit_file = Edit File
 editor.preview_changes = Preview Changes
-editor.cannot_edit_non_text_files = Cannot edit binary files from the web interface
-editor.edit_this_file = Edit this file
-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 before editing the file
-editor.delete_this_file = Delete this 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 successfully!
+editor.cannot_edit_non_text_files = Binary files cannot be edited in the web interface.
+editor.edit_this_file = Edit File
+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.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…
-editor.filename_help = To add directory, just type it and press /. To remove a directory, go to the beginning of the field and press backspace.
+editor.filename_help = Add a directory by typing its name followed by a slash ('/'). Remove a directory by typing backspace at the beginning of the input field.
 editor.or = or
-editor.cancel_lower = cancel
+editor.cancel_lower = Cancel
 editor.commit_changes = Commit Changes
 editor.add_tmpl = Add '%s/<filename>'
 editor.add = Add '%s'
@@ -582,38 +582,38 @@ editor.commit_directly_to_this_branch = Commit directly to the <strong class="br
 editor.create_new_branch = Create a <strong>new branch</strong> for this commit and start a pull request.
 editor.new_branch_name_desc = New branch name…
 editor.cancel = Cancel
-editor.filename_cannot_be_empty = Filename cannot be empty.
+editor.filename_cannot_be_empty = The filename cannot be empty.
 editor.branch_already_exists = Branch '%s' already exists in this repository.
-editor.directory_is_a_file = Entry '%s' in the parent path is a file not a directory in this repository.
-editor.file_is_a_symlink = The file '%s' is a symlink that cannot be modified from the web editor
-editor.filename_is_a_directory = The filename '%s' is an existing directory in this repository.
-editor.file_editing_no_longer_exists = The file '%s' you are editing no longer exists in the repository.
-editor.file_changed_while_editing = The file content has been changed since you started editing. <a target="_blank" rel="noopener" href="%s">Click here</a> to see what has been changed or <strong>press commit again</strong> to overwrite those changes.
-editor.file_already_exists = A file with name '%s' already exists in this repository.
+editor.directory_is_a_file = Directory name '%s' is already used as a filename in this repository.
+editor.file_is_a_symlink = '%s' is a symbolic link. Symbolic links cannot be edited in the web editor
+editor.filename_is_a_directory = Filename '%s' is already used as a directory name in this repository.
+editor.file_editing_no_longer_exists = The file being edited, '%s', no longer exists in this repository.
+editor.file_changed_while_editing = The file contents have changed since you started editing. <a target="_blank" rel="noopener" href="%s">Click here</a> to see them or <strong>Commit Changes again</strong> to overwrite them.
+editor.file_already_exists = A file named '%s' already exists in this repository.
 editor.no_changes_to_show = There are no changes to show.
 editor.fail_to_update_file = Failed to update/create file '%s' with error: %v
-editor.add_subdir = Add subdirectory…
+editor.add_subdir = Add a directory…
 editor.unable_to_upload_files = Failed to upload files to '%s' with error: %v
 editor.upload_files_to_dir = Upload files to '%s'
-editor.cannot_commit_to_protected_branch = Can not commit to protected branch '%s'.
+editor.cannot_commit_to_protected_branch = Cannot commit to protected branch '%s'.
 
-commits.desc = Commits show the change history of the code
+commits.desc = Browse source code change history.
 commits.commits = Commits
-commits.search = Search commits
+commits.search = Search commits…
 commits.find = Search
-commits.search_all = All branches
+commits.search_all = All Branches
 commits.author = Author
 commits.message = Message
 commits.date = Date
 commits.older = Older
 commits.newer = Newer
 commits.signed_by = Signed by
-commits.gpg_key_id = GPG key ID
+commits.gpg_key_id = GPG Key ID
 
-ext_issues = Ext Issues
-ext_issues.desc = Ext Issues link to an external issue management page
+ext_issues = Ext. Issues
+ext_issues.desc = Link to an external issue tracker.
 
-issues.desc = Issues is the place to manage tasks and bugs
+issues.desc = Organize bug reports, tasks and milestones.
 issues.new = New Issue
 issues.new.labels = Labels
 issues.new.no_label = No Label
@@ -629,13 +629,13 @@ issues.new.no_assignee = No assignee
 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.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 = There are not any labels yet. You can click on the "New Label" button above to create one or use a predefined set below.
+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 this label set
+issues.label_templates.use = Use Label Set
 issues.label_templates.fail_to_load_file = Failed to load label template file '%s': %v
 issues.add_label_at = added the <div class="ui label" style="color: %s\; background-color: %s">%s</div> label %s
 issues.remove_label_at = removed the <div class="ui label" style="color: %s\; background-color: %s">%s</div> label %s
@@ -651,11 +651,11 @@ issues.delete_branch_at = `deleted branch <b>%s</b> %s`
 issues.open_tab = %d Open
 issues.close_tab = %d Closed
 issues.filter_label = Label
-issues.filter_label_no_select = No selected label
+issues.filter_label_no_select = All labels
 issues.filter_milestone = Milestone
-issues.filter_milestone_no_select = No selected milestone
+issues.filter_milestone_no_select = All milestones
 issues.filter_assignee = Assignee
-issues.filter_assginee_no_select = No selected Assignee
+issues.filter_assginee_no_select = All assignees
 issues.filter_type = Type
 issues.filter_type.all_issues = All issues
 issues.filter_type.assigned_to_you = Assigned to you
@@ -686,9 +686,9 @@ issues.commented_at = `commented <a href="#%s">%s</a>`
 issues.delete_comment_confirm = Are you sure you want to delete this comment?
 issues.no_content = There is no content yet.
 issues.close_issue = Close
-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 <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.reopened_at = `reopened <a id="%[1]s" href="#%[1]s">%[2]s</a>`
@@ -707,10 +707,10 @@ issues.label_count = %d labels
 issues.label_open_issues = %d open issues
 issues.label_edit = Edit
 issues.label_delete = Delete
-issues.label_modify = Label Modification
-issues.label_deletion = Label Deletion
-issues.label_deletion_desc = Deleting this label will remove it from all issues. Are you sure you want to continue?
-issues.label_deletion_success = The label has been deleted successfully!
+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 = Size
@@ -720,55 +720,55 @@ 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.tracker = Time tracker
+issues.tracker = Time Tracker
 issues.start_tracking_short = Start
-issues.start_tracking = Start time tracking
+issues.start_tracking = Start Time Tracking
 issues.start_tracking_history = `started working %s`
 issues.tracking_already_started = `You have already started time tracking on this <a href="%s">issue</a>!`
 issues.stop_tracking = Stop
 issues.stop_tracking_history = `stopped working %s`
-issues.add_time = Add time manually
-issues.add_time_short = Add
+issues.add_time = Manually Add Time
+issues.add_time_short = Add Time
 issues.add_time_cancel = Cancel
 issues.add_time_history = `added spent time %s`
 issues.add_time_hours = Hours
 issues.add_time_minutes = Minutes
-issues.add_time_sum_to_small = No time was entered
+issues.add_time_sum_to_small = No time was entered.
 issues.cancel_tracking = Cancel
 issues.cancel_tracking_history = `cancelled time tracking %s`
-issues.time_spent_total = Total time spent
+issues.time_spent_total = Total Time Spent
 
-pulls.desc = Pulls management your code review and merge requests
+pulls.desc = Enable merge requests and code reviews.
 pulls.new = New Pull Request
-pulls.compare_changes = Compare Changes
-pulls.compare_changes_desc = Compare two branches and make a pull request for changes.
-pulls.compare_base = base
-pulls.compare_compare = compare
+pulls.compare_changes = New Pull Request
+pulls.compare_changes_desc = Select the branch to merge into and the branch to pull from.
+pulls.compare_base = merge into
+pulls.compare_compare = pull from
 pulls.filter_branch = Filter branch
 pulls.no_results = No results found.
-pulls.nothing_to_compare = There is nothing to compare because base and head branches are even.
-pulls.has_pull_request = `There is already a pull request between these two targets: <a href="%[1]s/pulls/%[3]d">%[2]s#%[3]d</a>`
+pulls.nothing_to_compare = These branches are equal. There is no need to create a pull request.
+pulls.has_pull_request = `A pull request between these branches already exists: <a href="%[1]s/pulls/%[3]d">%[2]s#%[3]d</a>`
 pulls.create = Create Pull Request
 pulls.title_desc = wants to merge %[1]d commits from <code>%[2]s</code> into <code>%[3]s</code>
 pulls.merged_title_desc = merged %[1]d commits from <code>%[2]s</code> into <code>%[3]s</code> %[4]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.merged = Merged
-pulls.has_merged = This pull request has been merged successfully.
-pulls.data_broken = Data of this pull request has been broken due to deletion of fork information.
-pulls.is_checking = "The conflict checking is still in progress; please refresh page in few moments."
+pulls.has_merged = The pull request has been merged.
+pulls.data_broken = This pull request is broken due to missing fork information.
+pulls.is_checking = "Merge conflict checking is in progress. Try again in few moments."
 pulls.can_auto_merge_desc = This pull request can be merged automatically.
-pulls.cannot_auto_merge_desc = This pull request cannot be merged automatically because there are conflicts.
-pulls.cannot_auto_merge_helper = Please merge manually in order to resolve the conflicts.
-pulls.no_merge_desc = This pull request can not be merged as no merge options are enabled.
-pulls.no_merge_helper = To merge this pull request enable at least one merge option in repository settings or merge pull request manually.
+pulls.cannot_auto_merge_desc = This pull request cannot be merged automatically due to conflicts.
+pulls.cannot_auto_merge_helper = Merge manually to resolve the conflicts.
+pulls.no_merge_desc = This pull request cannot be merged because all repository merge options are disabled.
+pulls.no_merge_helper = Enable merge options in the repository settings or merge the pull request manually.
 pulls.merge_pull_request = Merge Pull Request
 pulls.rebase_merge_pull_request = Rebase and Merge
 pulls.squash_merge_pull_request = Squash and Merge
-pulls.invalid_merge_option = You can not use this merge option for this pull request
-pulls.open_unmerged_pull_exists = `You cannot perform reopen operation because there is already an open pull request (#%d) from same repository with same merge information and is waiting for merging.`
+pulls.invalid_merge_option = You cannot use this merge option for this pull request.
+pulls.open_unmerged_pull_exists = `You cannot perform a reopen operation because there is a pending pull request (#%d) with identical properties.`
 
 milestones.new = New Milestone
 milestones.open_tab = %d Open
@@ -777,22 +777,22 @@ milestones.closed = Closed %s
 milestones.no_due_date = No due date
 milestones.open = Open
 milestones.close = Close
-milestones.new_subheader = Create milestones to organize your issues.
+milestones.new_subheader = Milestones organize issues and track progress.
 milestones.create = Create Milestone
 milestones.title = Title
 milestones.desc = Description
 milestones.due_date = Due Date (optional)
 milestones.clear = Clear
-milestones.invalid_due_date_format = "Due date format is invalid; must be 'yyyy-mm-dd'."
-milestones.create_success = Milestone '%s' has been created successfully!
+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_subheader = Use a good description for milestones so people won't be confused.
+milestones.edit_subheader = Milestones organize issues and track progress.
 milestones.cancel = Cancel
-milestones.modify = Modify Milestone
-milestones.edit_success = Changes of milestone '%s' has been saved successfully!
-milestones.deletion = Milestone Deletion
-milestones.deletion_desc = Deleting this milestone will remove it from all related issues. Do you want to continue?
-milestones.deletion_success = Milestone has been deleted successfully!
+milestones.modify = Update Milestone
+milestones.edit_success = Milestone '%s' has been updated.
+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.closest_due_date = Closest due date
 milestones.filter_sort.furthest_due_date = Furthest due date
 milestones.filter_sort.least_complete = Least complete
@@ -800,26 +800,26 @@ milestones.filter_sort.most_complete = Most complete
 milestones.filter_sort.most_issues = Most issues
 milestones.filter_sort.least_issues = Least issues
 
-ext_wiki = Ext Wiki
-ext_wiki.desc = Ext Wiki links to an external wiki system
+ext_wiki = Ext. Wiki
+ext_wiki.desc = Link to an external wiki.
 
 wiki = Wiki
-wiki.welcome = Welcome to the project wiki
-wiki.welcome_desc = A wiki allows you and your collaborators to easily document your project.
-wiki.desc = Wiki is a place to store documentation
-wiki.create_first_page = Create the first page
+wiki.welcome = Welcome to the Wiki.
+wiki.welcome_desc = The wiki lets you write and share documentation with collaborators.
+wiki.desc = Write and share documentation with collaborators.
+wiki.create_first_page = Create the First Page
 wiki.page = Page
 wiki.filter_page = Filter page
-wiki.new_page = Create New Page
+wiki.new_page = Page
 wiki.default_commit_message = Write a note about this page update (optional).
 wiki.save_page = Save Page
 wiki.last_commit_info = %s edited this page %s
 wiki.edit_page_button = Edit
 wiki.new_page_button = New Page
 wiki.delete_page_button = Delete Page
-wiki.delete_page_notice_1 = This will delete the page <code>"%s"</code>. Please make sure you want to delete this page.
+wiki.delete_page_notice_1 = Deleting the wiki page '%s' cannot be undone. Continue?
 wiki.page_already_exists = A wiki page with the same name already exists.
-wiki.reserved_page = The wiki page name %s is reserved, please select a different name.
+wiki.reserved_page = The wiki page name '%s' is reserved.
 wiki.pages = Pages
 wiki.last_updated = Last updated %s
 
@@ -856,9 +856,9 @@ activity.closed_issue_label = Closed
 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.unresolved_conv_desc = List of all old issues and pull requests that have changed recently but have not been resolved yet.
+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
@@ -871,9 +871,9 @@ search.results = Search results for "%s" in <a href="%s">%s</a>
 
 settings = Settings
 settings.desc = Settings is where you can manage the settings for the repository
-settings.options = Options
-settings.collaboration = Collaboration
-settings.collaboration.admin = Admin
+settings.options = Repository
+settings.collaboration = Collaborators
+settings.collaboration.admin = Administrator
 settings.collaboration.write = Write
 settings.collaboration.read = Read
 settings.collaboration.undefined = Undefined
@@ -881,168 +881,168 @@ settings.hooks = Webhooks
 settings.githooks = Git Hooks
 settings.basic_settings = Basic Settings
 settings.mirror_settings = Mirror Settings
-settings.sync_mirror = Sync Now
-settings.mirror_sync_in_progress = Mirror sync in progress. Please refresh the page to check again in a minute.
-settings.site = Official Site
+settings.sync_mirror = Synchronize Now
+settings.mirror_sync_in_progress = Mirror synchronization is in progress. Check back in a minute.
+settings.site = Website
 settings.update_settings = Update Settings
 settings.advanced_settings = Advanced Settings
-settings.wiki_desc = Enable wiki system
-settings.use_internal_wiki = Use builtin wiki
-settings.use_external_wiki = Use external wiki
+settings.wiki_desc = Enable Repository 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 = External Wiki URL is invalid
-settings.external_wiki_url_desc = Visitors will be redirected to the specified URL when they click on the tab.
-settings.issues_desc = Enable issue tracker
-settings.use_internal_issue_tracker = Use builtin issue tracker
-settings.use_external_issue_tracker = Use external issue tracker
+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.external_tracker_url_error = External Issue Tracker URL is invalid
-settings.external_tracker_url_desc = Visitors will be redirected to the specified URL when they click on the tab.
+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_issue_style = External Issue Tracker Naming Style:
+settings.tracker_issue_style = External Issue Tracker Number Format
 settings.tracker_issue_style.numeric = Numeric
 settings.tracker_issue_style.alphanumeric = Alphanumeric
-settings.tracker_url_format_desc = You can use placeholder <code>{user} {repo} {index}</code> for username, repository name and issue index.
-settings.enable_timetracker = Enable time tracker
-settings.allow_only_contributors_to_track_time = Allow only contributors to track time
-settings.pulls_desc = Enable pull requests to accept public contributions
-settings.pulls.ignore_whitespace = Ignore changes in whitespace when checking conflicts
-settings.pulls.allow_merge_commits = Allow merge commits
-settings.pulls.allow_rebase_merge = Allow rebase to merge commits
-settings.pulls.allow_squash_commits = Allow to squash commits before merging
-settings.admin_settings = Admin Settings
-settings.admin_enable_health_check = Enable health checks (git fsck) for this repo
+settings.tracker_url_format_desc = Use the placeholders <code>{user}</code>, <code>{repo}</code> and <code>{index}</code> 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.allow_merge_commits = Enable Commit Merging
+settings.pulls.allow_rebase_merge = Enable Rebasing to Merge Commits
+settings.pulls.allow_squash_commits = Enable Squashing to Merge Commits
+settings.admin_settings = Administrator Settings
+settings.admin_enable_health_check = Enable Repository Health Checks (git fsck)
 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.convert = Convert To Regular Repository
-settings.convert_desc = You can convert this mirror to a regular repository. This cannot be undone.
-settings.convert_notices_1 = - This operation will convert this repository mirror into a regular repository and cannot be undone.
-settings.convert_confirm = Confirm Conversion
-settings.convert_succeed = Repository has been converted to a 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_succeed = The mirror has been converted into a regular repository.
 settings.transfer = Transfer Ownership
-settings.transfer_desc = Transfer this repository to another user or to an organization in which you have admin rights.
-settings.transfer_notices_1 = - You will lose access if the new owner is an individual user.
-settings.transfer_notices_2 = - You will preserve access if the new owner is an organization and if you're one of the owners.
-settings.transfer_form_title = Please enter the following information to confirm your operation:
-settings.wiki_delete = Erase Wiki Data
-settings.wiki_delete_desc = Once you erase wiki data there is no going back. Please be certain.
-settings.wiki_delete_notices_1 = - This will delete and disable the wiki for %s
-settings.confirm_wiki_delete = Erase Wiki Data
-settings.wiki_deletion_success = Repository wiki data have been erased.
+settings.transfer_desc = Transfer this repository to a user or to an organization for which you have administrator rights.
+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_form_title = Enter the repository name as confirmation:
+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.wiki_deletion_success = The repository wiki data has been deleted.
 settings.delete = Delete This Repository
-settings.delete_desc = Once you delete a repository, there is no going back. Please be certain.
+settings.delete_desc = Deleting a repository is permanent and cannot be undone.
 settings.delete_notices_1 = - This operation <strong>CANNOT</strong> be undone.
-settings.delete_notices_2 = - This operation will permanently delete everything in the <strong>%s</strong> repository, including code, issues, comments, the wiki, and collaborators associations.
-settings.delete_notices_fork_1 = - All forks will become independent repositories after deletion.
-settings.deletion_success = Repository has been deleted.
-settings.update_settings_success = Repository options have been updated.
+settings.delete_notices_2 = - This operation will permanently delete the <strong>%s</strong> repository including code, issues, comments, wiki data and collaborator settings.
+settings.delete_notices_fork_1 = - Forks of this repository will become independent after deletion.
+settings.deletion_success = The repository has been deleted.
+settings.update_settings_success = The repository settings have been updated.
 settings.transfer_owner = New Owner
-settings.make_transfer = Make Transfer
-settings.transfer_succeed = Repository ownership has been transferred.
-settings.confirm_delete = Confirm Deletion
-settings.add_collaborator = Add New Collaborator
-settings.add_collaborator_success = New collaborator has been added.
-settings.delete_collaborator = Delete
-settings.collaborator_deletion = Collaborator Deletion
-settings.collaborator_deletion_desc = This user will no longer have collaboration access to this repository after deletion. Do you want to continue?
-settings.remove_collaborator_success = Collaborator has been removed.
+settings.make_transfer = Perform Transfer
+settings.transfer_succeed = The repository has been transferred.
+settings.confirm_delete = Delete Repository
+settings.add_collaborator = Add Collaborator
+settings.add_collaborator_success = The collaborator has been added.
+settings.delete_collaborator = Remove
+settings.collaborator_deletion = Remove Collaborator
+settings.collaborator_deletion_desc = Removing a collaborator will revoke their access to this repository. Continue?
+settings.remove_collaborator_success = The collaborator has been removed.
 settings.search_user_placeholder = Search user…
-settings.org_not_allowed_to_be_collaborator = Organization is not allowed to be added as a collaborator.
-settings.user_is_org_member = User is organization member who cannot be added as a collaborator.
+settings.org_not_allowed_to_be_collaborator = Organizations cannot be added as a collaborator.
+settings.user_is_org_member = The user is an organization member who cannot be added as a collaborator.
 settings.add_webhook = Add Webhook
-settings.hooks_desc = Webhooks are much like basic HTTP POST event triggers. Whenever something occurs in Gitea, we will send a notification to the target host. Learn more in the <a target="_blank" rel="noopener" href="%s">webhooks guide</a>.
-settings.webhook_deletion = Delete Webhook
-settings.webhook_deletion_desc = Deleting this webhook will remove its information and all delivery history. Are you sure you want to continue?
-settings.webhook_deletion_success = Webhook has been deleted successfully!
+settings.hooks_desc = Webhooks automatically make HTTP POST requests to a server when certain Gitea events trigger. Read more in the <a target="_blank" rel="noopener" href="%s">webhooks guide</a>.
+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_desc = Send a fake push event delivery to test your webhook settings
-settings.webhook.test_delivery_success = Test webhook has been added to the delivery queue. It may take few seconds before it shows up in the delivery history.
+settings.webhook.test_delivery_desc = Test this webhook with a fake event.
+settings.webhook.test_delivery_success = A fake event has been added to the delivery queue. It may take few seconds before it shows up in the delivery history.
 settings.webhook.request = Request
 settings.webhook.response = Response
 settings.webhook.headers = Headers
-settings.webhook.payload = Payload
+settings.webhook.payload = Content
 settings.webhook.body = Body
-settings.githooks_desc = "Git Hooks are powered by Git itself. You can edit files of supported hooks in the list below to perform custom operations."
+settings.githooks_desc = "Git hooks are powered by Git itself. You can edit 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 = Gitea will send a <code>POST</code> request to the URL you specify, along with information about the event that occurred. You can also specify what data format you would like to receive upon triggering the hook (JSON, x-www-form-urlencoded, XML, etc). More information can be found in our <a target="_blank" rel="noopener" href="%s">webhooks guide</a>.
-settings.payload_url = Payload URL
-settings.content_type = Content Type
+settings.add_webhook_desc = Gitea will send <code>POST</code> requests with a specified content type to the target URL. Read more in the <a target="_blank" rel="noopener" href="%s">webhooks guide</a>.
+settings.payload_url = Target URL
+settings.content_type = POST Content Type
 settings.secret = Secret
 settings.slack_username = Username
 settings.slack_icon_url = Icon URL
 settings.discord_username = Username
 settings.discord_icon_url = Icon URL
 settings.slack_color = Color
-settings.event_desc = When should this webhook be triggered?
-settings.event_push_only = Just the <code>push</code> event.
-settings.event_send_everything = I need <strong>everything</strong>.
-settings.event_choose = Let me choose what I need.
+settings.event_desc = Trigger On:
+settings.event_push_only = Push Events
+settings.event_send_everything = All Events
+settings.event_choose = Custom Events…
 settings.event_create = Create
-settings.event_create_desc = Branch, or tag created
+settings.event_create_desc = Branch or tag created.
 settings.event_pull_request = Pull Request
-settings.event_pull_request_desc = Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, or synchronized.
+settings.event_pull_request_desc = Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared or synchronized.
 settings.event_push = Push
-settings.event_push_desc = Git push to a repository
+settings.event_push_desc = Git push to a repository.
 settings.event_repository = Repository
-settings.event_repository_desc = Repository created or deleted
-settings.active = Active
-settings.active_helper = Information about the event which triggered the hook will be sent as well.
-settings.add_hook_success = New webhook has been added.
+settings.event_repository_desc = Repository created or deleted.
+settings.active = Include Event Details
+settings.active_helper = Add information about the triggering event to requests.
+settings.add_hook_success = The webhook has been added.
 settings.update_webhook = Update Webhook
-settings.update_hook_success = Webhook has been updated.
-settings.delete_webhook = Delete 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.add_slack_hook_desc = Add <a href="%s">Slack</a> integration to your repository.
+settings.add_slack_hook_desc = Integrate <a href="%s">Slack</a> into your repository.
 settings.slack_token = Token
 settings.slack_domain = Domain
 settings.slack_channel = Channel
-settings.add_discord_hook_desc = Add <a href="%s">Discord</a> integration to your repository.
-settings.add_dingtalk_hook_desc = Add <a href="%s">Dingtalk</a> integration to your repository.
+settings.add_discord_hook_desc = Integrate <a href="%s">Discord</a> into your repository.
+settings.add_dingtalk_hook_desc = Integrate <a href="%s">Dingtalk</a> into your repository.
 settings.deploy_keys = Deploy Keys
 settings.add_deploy_key = Add Deploy Key
-settings.deploy_key_desc = Deploy keys have read-only access. They are not the same as personal account SSH keys.
-settings.is_writable = Allow write access
-settings.is_writable_info = Can this key be used to <strong>push</strong> to this repository? Deploy keys always have pull access.
-settings.no_deploy_keys = You haven't added any deploy keys.
+settings.deploy_key_desc = Deploy keys have read-only pull access to the repository.
+settings.is_writable = Enable Write Access
+settings.is_writable_info = Allow this deploy key to <strong>push</strong> to the repository.
+settings.no_deploy_keys = There are no deploy keys yet.
 settings.title = Title
 settings.deploy_key_content = Content
-settings.key_been_used = Deploy key content has been used.
-settings.key_name_used = Deploy key with the same name already exists.
-settings.add_key_success = New deploy key '%s' has been added successfully!
-settings.deploy_key_deletion = Delete Deploy Key
-settings.deploy_key_deletion_desc = Deleting this deploy key will prevent this repository from being accessed with it. Do you want to continue?
-settings.deploy_key_deletion_success = The deploy key has been deleted successfully!
-settings.branches=Branches
-settings.protected_branch=Branch Protection
-settings.protected_branch_can_push=Allow push?
-settings.protected_branch_can_push_yes=You can push
-settings.protected_branch_can_push_no=You can not push
-settings.branch_protection = Branch Protection for <b>%s</b>
-settings.protect_this_branch = Protect this branch
-settings.protect_this_branch_desc = Disable force pushes and prevent deletion.
-settings.protect_whitelist_committers = Whitelist who can push to this branch
-settings.protect_whitelist_committers_desc = Add users or teams to this branch's whitelist. Whitelisted users bypass the typical push restrictions.
-settings.protect_whitelist_users = Users who can push to this branch
-settings.protect_whitelist_search_users = Search users
-settings.protect_whitelist_teams = Teams whose members can push to this branch.
-settings.protect_whitelist_search_teams = Search teams
-settings.protect_merge_whitelist_committers = Restrict who can merge pull requests to this branch
-settings.protect_merge_whitelist_committers_desc = Add users or teams to this branch's merge whitelist. Only whitelisted users can merge pull requests to this branch. If not checked, anyone with write permissions can merge pull requests to this branch.
-settings.protect_merge_whitelist_users = Users who can merge pull requests to this branch
-settings.protect_merge_whitelist_teams = Teams whose members can merge pull requests to this branch.
-settings.add_protected_branch=Enable protection
-settings.delete_protected_branch=Disable protection
-settings.update_protect_branch_success = Branch %s protect options changed successfully.
-settings.remove_protected_branch_success= Branch %s protect options removed successfully
-settings.protected_branch_deletion=To delete a protected branch
-settings.protected_branch_deletion_desc=Anyone with write permissions will be able to push directly to this branch. Are you sure?
-settings.default_branch_desc = The default branch is considered the "base" branch in your repository against which all pull requests and code commits are automatically made, unless you specify a different branch.
+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_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_can_push = Allow push?
+settings.protected_branch_can_push_yes = You can push
+settings.protected_branch_can_push_no = You can not push
+settings.branch_protection = Branch Protection for Branch '<b>%s</b>'
+settings.protect_this_branch = Enable Branch Protection
+settings.protect_this_branch_desc = Prevent deletion and disable Git force pushing to the branch.
+settings.protect_whitelist_committers = Enable Push Whitelist
+settings.protect_whitelist_committers_desc = Allow whitelisted users or teams to bypass push restrictions.
+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_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.add_protected_branch = Enable protection
+settings.delete_protected_branch = Disable protection
+settings.update_protect_branch_success = Branch protection for branch '%s' has been updated.
+settings.remove_protected_branch_success = Branch protection for branch '%s' has been disabled.
+settings.protected_branch_deletion = Disable Branch Protection
+settings.protected_branch_deletion_desc = Disabling branch protection allows users with write permission to push to the branch. Continue?
+settings.default_branch_desc = Select a default repository branch for pull requests and code commits:
 settings.choose_branch = Choose a branch…
-settings.no_protected_branch = There are no protected branches
+settings.no_protected_branch = There are no protected branches.
 
 diff.browse_source = Browse Source
 diff.parent = parent
@@ -1057,7 +1057,7 @@ diff.view_file = View File
 diff.file_suppressed = File diff suppressed because it is too large
 diff.too_many_files = Some files were not shown because too many files changed in this diff
 
-releases.desc = Releases is the place to manage versions of your project
+releases.desc = Track project versions and downloads.
 release.releases = Releases
 release.new_release = New Release
 release.draft = Draft
@@ -1066,53 +1066,50 @@ release.stable = Stable
 release.edit = edit
 release.ahead = <strong>%d</strong> commits to %s since this release
 release.source_code = Source Code
-release.new_subheader = Publish releases to keep track of project versions.
-release.edit_subheader = A detailed changelog can help users understand what has been changed.
+release.new_subheader = Releases organize project versions.
+release.edit_subheader = Releases organize project versions.
 release.tag_name = Tag name
 release.target = Target
-release.tag_helper = Choose an existing tag, or create a new tag.
+release.tag_helper = Choose an existing tag or create a new tag.
 release.title = Title
 release.content = Content
 release.write = Write
 release.preview = Preview
 release.loading = Loading…
-release.prerelease_desc = This is a pre-release
-release.prerelease_helper = We'll point out that this release is not production-ready.
+release.prerelease_desc = Mark as Pre-Release
+release.prerelease_helper = Mark this release unsuitable for production use.
 release.cancel = Cancel
 release.publish = Publish Release
 release.save_draft = Save Draft
-release.edit_release = Edit Release
-release.delete_release = Delete This Release
-release.deletion = Release Deletion
-release.deletion_desc = Deleting this release will delete the corresponding Git tag. You will not lose any code. Do you want to continue?
+release.edit_release = Update Release
+release.delete_release = Delete Release
+release.deletion = Delete Release
+release.deletion_desc = Deleting a release removes its Git tag from the repository. Repository contents and history remain unchanged. Continue?
 release.deletion_success = The release has been deleted.
-release.tag_name_already_exist = Release with this tag name already exists.
-release.tag_name_invalid = Tag name is not valid.
+release.tag_name_already_exist = A release with this tag name already exists.
+release.tag_name_invalid = The tag name is not valid.
 release.downloads = Downloads
 
-branch.name = Branch name
+branch.name = Branch Name
 branch.search = Search branches
-branch.already_exists = A branch named %s already exists.
+branch.already_exists = A branch named '%s' already exists.
 branch.delete_head = Delete
-branch.delete = Delete Branch %s
+branch.delete = Delete Branch '%s'
 branch.delete_html = Delete Branch
-branch.delete_desc = Deleting a branch is permanent. There is no way to undo it.
-branch.delete_notices_1 = - This operation <strong>CANNOT</strong> be undone.
-branch.delete_notices_2 = - This operation will permanently delete everything in branch %s.
-branch.delete_notices_html = - This operation will permanently delete everything in branch
-branch.deletion_success = %s has been deleted.
-branch.deletion_failed = Failed to delete branch %s.
-branch.delete_branch_has_new_commits = %s cannot be deleted because new commits have been added after merging.
+branch.delete_desc = Deleting a branch is permanent. It <strong>CANNOT</strong> be undone. Continue?
+branch.deletion_success = Branch '%s' has been deleted.
+branch.deletion_failed = Failed to delete branch '%s'.
+branch.delete_branch_has_new_commits = Branch '%s' cannot be deleted because new commits have been added after merging.
 branch.create_branch = Create branch <strong>%s</strong>
 branch.create_from = from '%s'
-branch.create_success = Branch '%s' has been created successfully!
+branch.create_success = Branch '%s' has been created.
 branch.branch_already_exists = Branch '%s' already exists in this repository.
-branch.branch_name_conflict = Branch name '%s' conflicts with already existing branch '%s'.
-branch.tag_collision = Branch '%s' can not be created as tag with same name already exists in this repository.
+branch.branch_name_conflict = Branch name '%s' conflicts with the already existing branch '%s'.
+branch.tag_collision = Branch '%s' cannot be created as a tag with same name already exists in the repository.
 branch.deleted_by = Deleted by %s
-branch.restore_success = %s successfully restored
-branch.restore_failed = Failed to restore branch %s.
-branch.protected_deletion_failed = It's not possible to delete protected branch %s.
+branch.restore_success = Branch '%s' has been restored.
+branch.restore_failed = Failed to restore branch '%s'.
+branch.protected_deletion_failed = Branch '%s' is protected. It cannot be deleted.
 
 topic.manage_topics = Manage Topics
 topic.done = Done
@@ -1120,7 +1117,7 @@ topic.done = Done
 [org]
 org_name_holder = Organization Name
 org_full_name_holder = Organization Full Name
-org_name_helper = Great organization names are short and memorable.
+org_name_helper = Organization names should be short and memorable.
 create_org = Create Organization
 repo_updated = Updated
 people = People
@@ -1132,37 +1129,37 @@ create_team = Create Team
 org_desc = Description
 team_name = Team Name
 team_desc = Description
-team_name_helper = You will use this name to mention this team in conversations.
-team_desc_helper = What is this team for?
-team_permission_desc = What permissions should this team have?
-team_unit_desc = Which units should this team have access to?
+team_name_helper = Team names should be short and memorable.
+team_desc_helper = Describe the purpose or role of the team.
+team_permission_desc = Permission
+team_unit_desc = Allow Access to Repository Sections
 
-form.name_reserved = Organization name '%s' is reserved.
-form.name_pattern_not_allowed = Organization name pattern '%s' is not allowed.
-form.create_org_not_allowed = This user is not allowed to create an organization.
+form.name_reserved = The organization name '%s' is reserved.
+form.name_pattern_not_allowed = The pattern '%s' is not allowed in an organization name.
+form.create_org_not_allowed = You are not allowed to create an organization.
 
 settings = Settings
-settings.options = Options
+settings.options = Organization
 settings.full_name = Full Name
 settings.website = Website
 settings.location = Location
 settings.update_settings = Update Settings
 settings.update_setting_success = Organization settings have been updated.
-settings.change_orgname_prompt = This change will change the links to the organization.
-settings.update_avatar_success = The organization avatar has been updated.
+settings.change_orgname_prompt = Note: changing the organization name also changes the organization's URL.
+settings.update_avatar_success = The organization's avatar has been updated.
 settings.delete = Delete Organization
 settings.delete_account = Delete This Organization
-settings.delete_prompt = The organization will be permanently removed. And, this <strong>CANNOT</strong> be undone!
+settings.delete_prompt = The organization will be permanently removed. This <strong>CANNOT</strong> be undone!
 settings.confirm_delete_account = Confirm Deletion
-settings.delete_org_title = Organization Deletion
-settings.delete_org_desc = This organization is going to be deleted permanently, are you sure you want to continue?
+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 <strong>all repositories</strong> under this organization.
 
 members.membership_visibility = Membership Visibility:
-members.public = Public
-members.public_helper = make private
-members.private = Private
-members.private_helper = make public
+members.public = Visible
+members.public_helper = make hidden
+members.private = Hidden
+members.private_helper = make visible
 members.member_role = Member Role:
 members.owner = Owner
 members.member = Member
@@ -1174,24 +1171,24 @@ members.invite_now = Invite Now
 teams.join = Join
 teams.leave = Leave
 teams.read_access = Read Access
-teams.read_access_helper = This team will be able to view and clone its repositories.
+teams.read_access_helper = Members can view and clone team repositories.
 teams.write_access = Write Access
-teams.write_access_helper = This team will be able to read and push to its repositories.
-teams.admin_access = Admin Access
-teams.admin_access_helper = This team will be able to push and pull to its repositories, as well as add other collaborators to them.
+teams.write_access_helper = Members can read and push to team repositories.
+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 <strong>all repositories</strong> and have <strong>admin rights</strong> to the organization.
+teams.owners_permission_desc = Owners have full access to <strong>all repositories</strong> and have <strong>administrator access</strong> to the organization.
 teams.members = Team Members
 teams.update_settings = Update Settings
-teams.delete_team = Delete This Team
+teams.delete_team = Delete Team
 teams.add_team_member = Add Team Member
-teams.delete_team_title = Team Deletion
-teams.delete_team_desc = Because this team will be deleted, members of this team may lose access to some repositories. Do you want to continue?
+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 <strong>Read</strong> access: members can view and clone the team's repositories.
-teams.write_permission_desc = This team grants <strong>Write</strong> access: members can read from and push to the team's repositories.
-teams.admin_permission_desc = This team grants <strong>Admin</strong> access: members can read from, push to, and add collaborators to the team's repositories.
+teams.read_permission_desc = This team grants <strong>Read</strong> access: members can view and clone team repositories.
+teams.write_permission_desc = This team grants <strong>Write</strong> access: members can read from and push to team repositories.
+teams.admin_permission_desc = This team grants <strong>Admin</strong> access: members can read from, push to and add collaborators to team repositories.
 teams.repositories = Team Repositories
 teams.search_repo_placeholder = Search repository…
 teams.add_team_repository = Add Team Repository
@@ -1200,10 +1197,10 @@ teams.add_nonexistent_repo = "The repository you're trying to add does not exist
 
 [admin]
 dashboard = Dashboard
-users = Users
+users = User Accounts
 organizations = Organizations
 repositories = Repositories
-authentication = Authentications
+authentication = Authentication Sources
 config = Configuration
 notices = System Notices
 monitor = Monitoring
@@ -1211,10 +1208,10 @@ first_page = First
 last_page = Last
 total = Total: %d
 
-dashboard.statistic = Statistics
-dashboard.operations = Operations
-dashboard.system_status = System Monitor Status
-dashboard.statistic_info = Gitea database has <b>%d</b> users, <b>%d</b> organizations, <b>%d</b> public keys, <b>%d</b> repositories, <b>%d</b> watches, <b>%d</b> stars, <b>%d</b> actions, <b>%d</b> accesses, <b>%d</b> issues, <b>%d</b> comments, <b>%d</b> social accounts, <b>%d</b> follows, <b>%d</b> mirrors, <b>%d</b> releases, <b>%d</b> login sources, <b>%d</b> webhooks, <b>%d</b> milestones, <b>%d</b> labels, <b>%d</b> hook tasks, <b>%d</b> teams, <b>%d</b> update tasks, <b>%d</b> attachments.
+dashboard.statistic = Summary
+dashboard.operations = Maintenance Operations
+dashboard.system_status = System Status
+dashboard.statistic_info = The Gitea database holds <b>%d</b> users, <b>%d</b> organizations, <b>%d</b> public keys, <b>%d</b> repositories, <b>%d</b> watches, <b>%d</b> stars, <b>%d</b> actions, <b>%d</b> accesses, <b>%d</b> issues, <b>%d</b> comments, <b>%d</b> social accounts, <b>%d</b> follows, <b>%d</b> mirrors, <b>%d</b> releases, <b>%d</b> authentication sources, <b>%d</b> webhooks, <b>%d</b> milestones, <b>%d</b> labels, <b>%d</b> hook tasks, <b>%d</b> teams, <b>%d</b> update tasks, <b>%d</b> attachments.
 dashboard.operation_name = Operation Name
 dashboard.operation_switch = Switch
 dashboard.operation_run = Run
@@ -1222,30 +1219,30 @@ dashboard.clean_unbind_oauth = Clean unbound OAuth connections
 dashboard.clean_unbind_oauth_success = All unbound OAuth connections have been deleted.
 dashboard.delete_inactivate_accounts = Delete all inactive accounts
 dashboard.delete_inactivate_accounts_success = All inactive accounts have been deleted.
-dashboard.delete_repo_archives = Delete all repositories archives
-dashboard.delete_repo_archives_success = All repositories archives have been deleted.
-dashboard.delete_missing_repos = Delete all repository records which are missing their Git files
-dashboard.delete_missing_repos_success = All repository records which are missing their Git files have been deleted.
-dashboard.git_gc_repos = Execute garbage collection on all repositories
-dashboard.git_gc_repos_success = All repositories have finished executing garbage collection.
-dashboard.resync_all_sshkeys = Rewrite '.ssh/authorized_keys' file (for Gitea SSH keys). There is no need to do this if you are using the built-in SSH server.
-dashboard.resync_all_sshkeys_success = All public keys controlled by Gitea have been rewritten.
-dashboard.resync_all_hooks = Resync pre-receive, update and post-receive hooks of all repositories.
-dashboard.resync_all_hooks_success = All repositories' pre-receive, update and post-receive hooks have been resynced.
+dashboard.delete_repo_archives = Delete all repository archives
+dashboard.delete_repo_archives_success = All repository archives have been deleted.
+dashboard.delete_missing_repos = Delete all repositories missing their Git files
+dashboard.delete_missing_repos_success = All repositories missing their Git files have been deleted.
+dashboard.git_gc_repos = Garbage collect all repositories
+dashboard.git_gc_repos_success = All repositories have finished garbage collection.
+dashboard.resync_all_sshkeys = Update the '.ssh/authorized_keys' file with Gitea SSH keys. (Not needed for the built-in SSH server.)
+dashboard.resync_all_sshkeys_success = The public SSH keys controlled by Gitea have been updated.
+dashboard.resync_all_hooks = Resynchronize pre-receive, update and post-receive hooks of all repositories.
+dashboard.resync_all_hooks_success = All pre-receive, update and post-receive repository hooks have been resynchronized.
 dashboard.reinit_missing_repos = Reinitialize all missing Git repositories for which records exist
 dashboard.reinit_missing_repos_success = All missing Git repositories for which records existed have been reinitialized.
 dashboard.sync_external_users = Synchronize external user data
-dashboard.sync_external_users_started = External user synchronization started
+dashboard.sync_external_users_started = External user data synchronization has started.
 dashboard.git_fsck = Execute health checks on all repositories
-dashboard.git_fsck_started = Repository health checks started
+dashboard.git_fsck_started = Repository health checks have started.
 dashboard.server_uptime = Server Uptime
 dashboard.current_goroutine = Current Goroutines
 dashboard.current_memory_usage = Current Memory Usage
 dashboard.total_memory_allocated = Total Memory Allocated
 dashboard.memory_obtained = Memory Obtained
 dashboard.pointer_lookup_times = Pointer Lookup Times
-dashboard.memory_allocate_times = Memory Allocate Times
-dashboard.memory_free_times = Memory Free Times
+dashboard.memory_allocate_times = Memory Allocations
+dashboard.memory_free_times = Memory Frees
 dashboard.current_heap_usage = Current Heap Usage
 dashboard.heap_memory_obtained = Heap Memory Obtained
 dashboard.heap_memory_idle = Heap Memory Idle
@@ -1268,43 +1265,43 @@ dashboard.total_gc_pause = Total GC Pause
 dashboard.last_gc_pause = Last GC Pause
 dashboard.gc_times = GC Times
 
-users.user_manage_panel = User Management Panel
-users.new_account = Create New Account
-users.name = Name
+users.user_manage_panel = User Account Management
+users.new_account = Create User Account
+users.name = Username
 users.activated = Activated
 users.admin = Admin
 users.repos = Repos
 users.created = Created
-users.last_login = Last Login
-users.never_login = Never Login
-users.send_register_notify = Send Registration Notification To User
-users.new_success = The account '%s' has been created.
+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.local = Local
-users.auth_login_name = Authentication Login Name
-users.password_helper = Leave it empty to remain unchanged.
-users.update_profile_success = Account profile has been updated.
-users.edit_account = Edit Account
-users.max_repo_creation = Maximum Repository Creation Limit
-users.max_repo_creation_desc = (Set -1 to use global default limit)
-users.is_activated =  Account activated
-users.prohibit_login = Login disabled
-users.is_admin = Administrator permissions
-users.allow_git_hook = Allowed to create git hooks
-users.allow_import_local = Allowed to import local repositories
-users.allow_create_organization = Allowed to create organizations
-users.update_profile = Update Account Profile
-users.delete_account = Delete Account
-users.still_own_repo = This user still owns one or more repositories. These repositories need to be deleted or transferred first.
-users.still_has_org = This user is still is a member of one or more organizations. This user needs to leave or delete them first.
-users.deletion_success = Account deleted successfully.
+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 = Maximal 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.allow_git_hook = May Create Git Hooks
+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.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.
+users.deletion_success = The user account has been deleted.
 
 orgs.org_manage_panel = Organization Management
 orgs.name = Name
 orgs.teams = Teams
 orgs.members = Members
-orgs.new_orga = Create Organization
+orgs.new_orga = New Organization
 
 repos.repo_manage_panel = Repository Management
 repos.owner = Owner
@@ -1315,12 +1312,12 @@ repos.stars = Stars
 repos.issues = Issues
 repos.size = Size
 
-auths.auth_manage_panel = Authentication Management
-auths.new = Add New Source
+auths.auth_manage_panel = Authentication Source Management
+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
@@ -1330,15 +1327,15 @@ auths.host = Host
 auths.port = Port
 auths.bind_dn = Bind DN
 auths.bind_password = Bind Password
-auths.bind_password_helper = Warning: This password is stored in plain text. It is highly recommended to use read-only account.
+auths.bind_password_helper = Warning: This password is stored in plain text. Use a read-only account if possible.
 auths.user_base = User Search Base
 auths.user_dn = User DN
-auths.attribute_username = Username attribute
-auths.attribute_username_placeholder = Leave empty to use sign-in form field value for username.
-auths.attribute_name = First name attribute
-auths.attribute_surname = Surname attribute
-auths.attribute_mail = Email attribute
-auths.attributes_in_bind = Fetch attributes in Bind DN context
+auths.attribute_username = Username Attribute
+auths.attribute_username_placeholder = Leave empty to use the username entered in Gitea.
+auths.attribute_name = First Name Attribute
+auths.attribute_surname = Surname Attribute
+auths.attribute_mail = Email Attribute
+auths.attributes_in_bind = Fetch Attributes in Bind DN Context
 auths.filter = User Filter
 auths.admin_filter = Admin Filter
 auths.ms_ad_sa = MS AD Search Attributes
@@ -1346,7 +1343,7 @@ auths.smtp_auth = SMTP Authentication Type
 auths.smtphost = SMTP Host
 auths.smtpport = SMTP Port
 auths.allowed_domains = Allowed Domains
-auths.allowed_domains_helper = Leave it empty to allow all domains. Multiple domains should be separated by comma ','.
+auths.allowed_domains_helper = Leave empty to allow all domains. Separate multiple domains with a comma (',').
 auths.enable_tls = Enable TLS Encryption
 auths.skip_tls_verify = Skip TLS Verify
 auths.pam_service_name = PAM Service Name
@@ -1354,7 +1351,7 @@ auths.oauth2_provider = OAuth2 Provider
 auths.oauth2_clientID = Client ID (Key)
 auths.oauth2_clientSecret = Client Secret
 auths.openIdConnectAutoDiscoveryURL = OpenID Connect Auto Discovery URL
-auths.oauth2_use_custom_url = Use custom URLs instead of default URLs
+auths.oauth2_use_custom_url = Use Custom URLs Instead of Default URLs
 auths.oauth2_tokenURL = Token URL
 auths.oauth2_authURL = Authorize URL
 auths.oauth2_profileURL = Profile URL
@@ -1364,48 +1361,48 @@ auths.tips = Tips
 auths.tips.oauth2.general = OAuth2 Authentication
 auths.tips.oauth2.general.tip = When registering a new OAuth2 authentication, the callback/redirect URL should be: <host>/user/oauth2/<Authentication Name>/callback
 auths.tip.oauth2_provider = OAuth2 Provider
-auths.tip.bitbucket = Register a new OAuth consumer on https://bitbucket.org/account/user/<your username>/oauth-consumers/new and add the permission "Account"-"Read"
+auths.tip.bitbucket = Register a new OAuth consumer on https://bitbucket.org/account/user/<your username>/oauth-consumers/new and add the permission 'Account' - 'Read'
 auths.tip.dropbox = Create a new application at https://www.dropbox.com/developers/apps
 auths.tip.facebook = Register a new application at https://developers.facebook.com/apps and add the product "Facebook Login"
 auths.tip.github = Register a new OAuth application on https://github.com/settings/applications/new
 auths.tip.gitlab = Register a new application on https://gitlab.com/profile/applications
-auths.tip.google_plus = Obtain OAuth2 client credentials from the Google API console (https://console.developers.google.com/)
+auths.tip.google_plus = Obtain OAuth2 client credentials from the Google API console at https://console.developers.google.com/
 auths.tip.openid_connect = Use the OpenID Connect Discovery URL (<server>/.well-known/openid-configuration) to specify the endpoints
-auths.tip.twitter = Go to https://dev.twitter.com/apps , create an application and ensure that the “Allow this application to be used to Sign in with Twitter” option is enabled.
-auths.edit = Edit Authentication Settings
-auths.activated = This authentication is activated
+auths.tip.twitter = Go to https://dev.twitter.com/apps, create an application and ensure that the “Allow this application to be used to Sign in with Twitter” option is enabled
+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 settings have been updated.
-auths.update = Update Authentication Settings
-auths.delete = Delete This Authentication Source
+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.delete_auth_desc = This authentication source is going to be deleted. Are you sure you want to continue?
-auths.still_in_used = This authentication source is still used by one or more users, please delete or convert them to another login source first.
-auths.deletion_success = Authentication has been deleted successfully.
-auths.login_source_exist = Login source '%s' already exists.
+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.
+auths.login_source_exist = The authentication source '%s' already exists.
 
 config.server_config = Server Configuration
-config.app_name = Application Name
-config.app_ver = Application Version
-config.app_url = Application URL
+config.app_name = Site Title
+config.app_ver = Gitea Version
+config.app_url = Gitea Base URL
 config.custom_conf = Configuration File Path
-config.domain = Domain
-config.offline_mode = Offline Mode
+config.domain = SSH Server Domain
+config.offline_mode = Local Mode
 config.disable_router_log = Disable Router Log
-config.run_user = Run User
+config.run_user = Run As Username
 config.run_mode = Run Mode
 config.git_version = Git Version
 config.repo_root_path = Repository Root Path
 config.lfs_root_path = LFS Root Path
 config.static_file_root_path = Static File Root Path
-config.log_file_root_path = Log File Root Path
+config.log_file_root_path = Log Path
 config.script_type = Script Type
 config.reverse_auth_user = Reverse Authentication User
 
 config.ssh_config = SSH Configuration
 config.ssh_enabled = Enabled
-config.ssh_start_builtin_server = Start built-in Server
-config.ssh_domain = Domain
+config.ssh_start_builtin_server = Use Built-In Server
+config.ssh_domain = Server Domain
 config.ssh_port = Port
 config.ssh_listen_port = Listen Port
 config.ssh_root_path = Root Path
@@ -1418,37 +1415,37 @@ config.db_config = Database Configuration
 config.db_type = Type
 config.db_host = Host
 config.db_name = Name
-config.db_user = User
-config.db_ssl_mode = SSL Mode
+config.db_user = Username
+config.db_ssl_mode = SSL
 config.db_ssl_mode_helper = (for "postgres" only)
 config.db_path = Path
 config.db_path_helper = (for "sqlite3" and "tidb")
 
 config.service_config = Service Configuration
-config.register_email_confirm = Require Email Confirmation
-config.disable_register = Disable Registration
-config.enable_openid_signup = Enable Registration via OpenID
-config.enable_openid_signin = Enable OpenID Sign In
+config.register_email_confirm = Require Email Confirmation to Register
+config.disable_register = Disable Self-Registration
+config.enable_openid_signup = Enable OpenID Self-Registration
+config.enable_openid_signin = Enable OpenID Sign-In
 config.show_registration_button = Show Register Button
-config.require_sign_in_view = Require Sign In View
-config.mail_notify = Mail Notification
+config.require_sign_in_view = Require Sign-In to View Pages
+config.mail_notify = Enable Email Notifications
 config.disable_key_size_check = Disable Minimum Key Size Check
-config.enable_captcha = Enable Captcha
+config.enable_captcha = Enable CAPTCHA
 config.active_code_lives = Active Code Lives
 config.reset_password_code_lives = Reset Password Code Expiry Time
-config.default_keep_email_private = Default Value for Keep Email Private
-config.default_allow_create_organization = Default permission to create organizations
-config.enable_timetracking = Enable time tracking
-config.default_enable_timetracking = Enable time tracking by default
-config.default_allow_only_contributors_to_track_time = Allow only contributors to track time by default
-config.no_reply_address = No-reply Address
+config.default_keep_email_private = Hide Email Addresses by Default
+config.default_allow_create_organization = Allow Creation of Organizations by Default
+config.enable_timetracking = Enable Time Tracking
+config.default_enable_timetracking = Enable Time Tracking by Default
+config.default_allow_only_contributors_to_track_time = Let Only Contributors Track Time
+config.no_reply_address = Hidden Email Domain
 
 config.webhook_config = Webhook Configuration
 config.queue_length = Queue Length
 config.deliver_timeout = Deliver Timeout
 config.skip_tls_verify = Skip TLS Verification
 
-config.mailer_config = Mailer Configuration
+config.mailer_config = SMTP Mailer Configuration
 config.mailer_enabled = Enabled
 config.mailer_disable_helo = Disable HELO
 config.mailer_name = Name
@@ -1456,10 +1453,10 @@ config.mailer_host = Host
 config.mailer_user = User
 config.mailer_use_sendmail = Use Sendmail
 config.mailer_sendmail_path = Sendmail Path
-config.mailer_sendmail_args = Extra arguments to Sendmail
-config.send_test_mail = Send Test Email
-config.test_mail_failed = Failed to send test email to '%s': %v
-config.test_mail_sent = Test email has been sent to '%s'.
+config.mailer_sendmail_args = Extra Arguments to Sendmail
+config.send_test_mail = Send Testing Email
+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.oauth_config = OAuth Configuration
 config.oauth_enabled = Enabled
@@ -1479,7 +1476,7 @@ config.session_life_time = Session Life Time
 config.https_only = HTTPS Only
 config.cookie_life_time = Cookie Life Time
 
-config.picture_config = Picture Configuration
+config.picture_config = Picture and Avatar Configuration
 config.picture_service = Picture Service
 config.disable_gravatar = Disable Gravatar
 config.enable_federated_avatar = Enable Federated Avatars
@@ -1504,7 +1501,7 @@ monitor.name = Name
 monitor.schedule = Schedule
 monitor.next = Next Time
 monitor.previous = Previous Time
-monitor.execute_times = Execute Times
+monitor.execute_times = Executions
 monitor.process = Running Processes
 monitor.desc = Description
 monitor.start = Start Time
@@ -1565,8 +1562,8 @@ raw_seconds = seconds
 raw_minutes = minutes
 
 [dropzone]
-default_message = Drop files or click to upload.
-invalid_input_type = You can't upload files of this type.
+default_message = Drop files or click here to upload.
+invalid_input_type = You can not upload files of this type.
 file_too_big = File size ({{filesize}} MB) exceeds the maximum size of ({{maxFilesize}} MB).
 remove_file = Remove file
 
@@ -1574,8 +1571,8 @@ remove_file = Remove file
 notifications = Notifications
 unread = Unread
 read = Read
-no_unread = You do not have any unread notifications.
-no_read = You do not have any read notifications.
+no_unread = No unread notifications.
+no_read = No read notifications.
 pin = Pin notification
 mark_as_read = Mark as read
 mark_as_unread = Mark as unread
@@ -1584,11 +1581,11 @@ mark_all_as_read = Mark all as read
 [gpg]
 error.extract_sign = Failed to extract signature
 error.generate_hash = Failed to generate hash of commit
-error.no_committer_account = No account linked to committer's email
+error.no_committer_account = No account linked to committer's email address
 error.no_gpg_keys_found = "No known key found for this signature in database"
 error.not_signed_commit = "Not a signed commit"
-error.failed_retrieval_gpg_keys = "Failed to retrieve any key attached to the committer account"
+error.failed_retrieval_gpg_keys = "Failed to retrieve any key attached to the committer's account"
 
 [units]
-error.no_unit_allowed_repo = Cannot find any unit on this repository which you are allowed to access
-error.unit_not_allowed = You are not allowed to visit this repository unit
+error.no_unit_allowed_repo = You are not allowed to access any section of this repository.
+error.unit_not_allowed = You are not allowed to access this repository section.
diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl
index c3bc04df27..e4bbc13998 100644
--- a/templates/repo/branch/list.tmpl
+++ b/templates/repo/branch/list.tmpl
@@ -73,8 +73,6 @@
 	</div>
 	<div class="content">
 		<p>{{.i18n.Tr "repo.branch.delete_desc"}}</p>
-		{{.i18n.Tr "repo.branch.delete_notices_1" | Safe}}<br>
-		{{.i18n.Tr "repo.branch.delete_notices_html"}} <span class="branch-name"></span><br>
 	</div>
 	{{template "base/delete_modal_actions" .}}
 </div>
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
index 3fb0108942..5271fcb179 100644
--- a/templates/repo/issue/view_content.tmpl
+++ b/templates/repo/issue/view_content.tmpl
@@ -138,8 +138,6 @@
 	</div>
 	<div class="content">
 		<p>{{.i18n.Tr "repo.branch.delete_desc"}}</p>
-		{{.i18n.Tr "repo.branch.delete_notices_1" | Safe}}<br>
-		{{.i18n.Tr "repo.branch.delete_notices_2" .HeadTarget}}<br>
 	</div>
 	{{template "base/delete_modal_actions" .}}
 </div>