Removed unrelated changes in locales

options/locale/locale_en-US.ini

@@ -9,7 +9,7 @@ sign_in_with = Sign in with
 sign_out = Sign Out
 sign_up = Sign Up
 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 = Login with existing credentials to link your existing account to this account, or sign up for a new one
 register = Register
 website = Website
 version = Version
@@ -91,7 +91,7 @@ run_user_helper = The user must have access to Repository Root Path and run Gite
 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.
+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
@@ -116,7 +116,7 @@ disable_gravatar_popup = Disable Gravatar and custom sources. All avatars must b
 federated_avatar_lookup = Enable Federated Avatars Lookup
 federated_avatar_lookup_popup = Enable federated avatar lookup using Libravatar.
 disable_registration = Disable Self-registration
-disable_registration_popup = "Disable self-registration; only admins will be able to create accounts."
+disable_registration_popup = Disable user self-registration, only admin can create accounts.
 openid_signin = Enable OpenID Sign-In
 openid_signin_popup = Enable user login via OpenID
 openid_signup = Enable OpenID Self-registration
@@ -124,7 +124,7 @@ openid_signup_popup = Enable OpenID based Self-registration
 enable_captcha = Enable Captcha
 enable_captcha_popup = Require a CAPTCHA for user self-registration.
 require_sign_in_view = Enable Require Sign In to View Pages
-require_sign_in_view_popup = "Only signed in users can view pages; visitors will only be able to see the sign in and up pages."
+require_sign_in_view_popup = Only signed in users can view pages, visitors will only be able to see sign in/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
@@ -139,7 +139,7 @@ invalid_repo_path = Repository root path is invalid: %v
 run_user_not_match = Run user is not the current user: %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!
+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.
@@ -274,15 +274,16 @@ enterred_invalid_password = Please ensure the that password you entered is corre
 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.
+cannot_invite_org_to_org = Organization cannot be invited as an organization member.
 
 invalid_ssh_key = Sorry, we were not able to verify your SSH key: %s
 invalid_gpg_key = Sorry, we were not able to verify your GPG key: %s
-unable_verify_ssh_key = "The ssh key could not be verified; please double-check it for any mistakes."
+unable_verify_ssh_key = The ssh key could not be verified, please double-check it for any mistakes.
 auth_failed = Authentication failed: %v
 
-still_own_repo = "Your account still has ownership of at least one repository; you need to delete or transfer them first."
-still_has_org = "Your account still is still a member of least one organization; you need to leave them first."
-org_still_own_repo = "This organization still owns repositories; you need to delete or transfer them first."
+still_own_repo = Your account still has ownership of at least one repository, you need to delete or transfer them first.
+still_has_org = Your account still is still a member of least one organization, you need to leave them first.
+org_still_own_repo = This organization still owns repositories, you need to delete or transfer them first.
 
 target_branch_not_exist = Target branch does not exist.
 
@@ -303,7 +304,6 @@ form.name_pattern_not_allowed = The username pattern '%s' is not allowed.
 [settings]
 profile = Profile
 password = Password
-security = Security
 avatar = Avatar
 ssh_gpg_keys = SSH / GPG Keys
 social = Social Accounts
@@ -451,7 +451,7 @@ 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 = The operation will delete your account permanently, and <strong>CANNOT</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?
@@ -501,9 +501,9 @@ migrate.clone_address = Clone Address
 migrate.clone_address_desc = This can be a HTTP/HTTPS/GIT URL
 migrate.clone_local_path = or local server path
 migrate.permission_denied = You are not allowed to import local repositories.
-migrate.invalid_local_path = "Invalid local path; it does not exist or is not a directory."
+migrate.invalid_local_path = Invalid local path, it does not exist or 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
@@ -748,7 +748,6 @@ issues.dependency.add_error_dep_not_exist = Dependend issue does not exist!
 issues.dependency.add_error_dep_exists = Dependency already exists!
 issues.dependency.add_error_dep_not_same_repo = Both issues must be in the same repo!
 
-
 pulls.desc = Pulls management your code review and merge requests
 pulls.new = New Pull Request
 pulls.compare_changes = Compare Changes
@@ -769,7 +768,7 @@ pulls.reopen_to_merge = Please reopen this pull request to perform a merge.
 pulls.merged = Merged
 pulls.has_merged = This pull request has been merged successfully.
 pulls.data_broken = Data of this pull request has been broken due to deletion of fork information.
-pulls.is_checking = "The conflict checking is still in progress; please refresh page in few moments."
+pulls.is_checking = The conflict checking is still in progress, please refresh page in few moments.
 pulls.can_auto_merge_desc = This pull request can be merged automatically.
 pulls.cannot_auto_merge_desc = This pull request cannot be merged automatically because there are conflicts.
 pulls.cannot_auto_merge_helper = Please merge manually in order to resolve the conflicts.
@@ -789,7 +788,7 @@ milestones.title = Title
 milestones.desc = Description
 milestones.due_date = Due Date (optional)
 milestones.clear = Clear
-milestones.invalid_due_date_format = "Due date format is invalid; must be 'yyyy-mm-dd'."
+milestones.invalid_due_date_format = Due date format is invalid, must be 'yyyy-mm-dd'.
 milestones.create_success = Milestone '%s' has been created successfully!
 milestones.edit = Edit Milestone
 milestones.edit_subheader = Use a good description for milestones so people won't be confused.
@@ -828,52 +827,6 @@ wiki.page_already_exists = A wiki page with the same name already exists.
 wiki.pages = Pages
 wiki.last_updated = Last updated %s
 
-activity = Activity
-activity.period.filter_label = Period:
-activity.period.daily = 1 day
-activity.period.halfweekly = 3 days
-activity.period.weekly = 1 week
-activity.period.monthly = 1 month
-activity.overview = Overview
-activity.active_prs_count_1 = <strong>%d</strong> Active Pull Request
-activity.active_prs_count_n = <strong>%d</strong> Active Pull Requests
-activity.merged_prs_count_1 = Merged Pull Request
-activity.merged_prs_count_n = Merged Pull Requests
-activity.opened_prs_count_1 = Proposed Pull Request
-activity.opened_prs_count_n = Proposed Pull Requests
-activity.title.user_1 = %d user
-activity.title.user_n = %d users
-activity.title.prs_1 = %d Pull request
-activity.title.prs_n = %d Pull requests
-activity.title.prs_merged_by = %s merged by %s
-activity.title.prs_opened_by = %s proposed by %s
-activity.merged_prs_label = Merged
-activity.opened_prs_label = Proposed
-activity.active_issues_count_1 = <strong>%d</strong> Active Issue
-activity.active_issues_count_n = <strong>%d</strong> Active Issues
-activity.closed_issues_count_1 = Closed Issue
-activity.closed_issues_count_n = Closed Issues
-activity.title.issues_1 = %d Issue
-activity.title.issues_n = %d Issues
-activity.title.issues_closed_by = %s closed by %s
-activity.title.issues_created_by = %s created by %s
-activity.closed_issue_label = Closed
-activity.new_issues_count_1 = New Issue
-activity.new_issues_count_n = New Issues
-activity.new_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.unresolved_conv_label = Open
-activity.title.releases_1 = %d Release
-activity.title.releases_n = %d Releases
-activity.title.releases_published_by = %s published by %s
-activity.published_release_label = Published
-
-search = Search
-search.search_repo = Search repository
-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
@@ -960,7 +913,7 @@ settings.webhook.response = Response
 settings.webhook.headers = Headers
 settings.webhook.payload = Payload
 settings.webhook.body = Body
-settings.githooks_desc = "Git Hooks are powered by Git itself. You can edit files of supported hooks in the list below to perform custom operations."
+settings.githooks_desc = Git Hooks are powered by Git itself, you can edit files of supported hooks in the list below to perform custom operations.
 settings.githook_edit_desc = If the hook is inactive, sample content will be presented. Leaving content to an empty value will disable this hook.
 settings.githook_name = Hook Name
 settings.githook_content = Hook Content
@@ -1081,29 +1034,13 @@ release.tag_name_already_exist = Release with this tag name already exists.
 release.tag_name_invalid = Tag name is not valid.
 release.downloads = Downloads
 
-branch.name = Branch name
-branch.search = Search branches
-branch.already_exists = A branch named %s already exists.
-branch.delete_head = Delete
 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.create_branch = Create branch <strong>%s</strong>
-branch.create_from = from '%s'
-branch.create_success = Branch '%s' has been created successfully!
-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.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.
 
 [org]
 org_name_holder = Organization Name
@@ -1112,6 +1049,7 @@ org_name_helper = Great organization names are short and memorable.
 create_org = Create Organization
 repo_updated = Updated
 people = People
+invite_someone = Invite Someone
 teams = Teams
 lower_members = members
 lower_repositories = repositories
@@ -1139,7 +1077,7 @@ settings.change_orgname_prompt = This change will change the links to the organi
 settings.update_avatar_success = The organization 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, and 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?
@@ -1183,7 +1121,7 @@ teams.repositories = Team Repositories
 teams.search_repo_placeholder = Search repository...
 teams.add_team_repository = Add Team Repository
 teams.remove_repo = Remove
-teams.add_nonexistent_repo = "The repository you're trying to add does not exist; please create it first."
+teams.add_nonexistent_repo = The repository you're trying to add does not exist, please create it first.
 
 [admin]
 dashboard = Dashboard
@@ -1198,7 +1136,7 @@ first_page = First
 last_page = Last
 total = Total: %d
 
-dashboard.statistic = Statistics
+dashboard.statistic = Statistic
 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.
@@ -1215,8 +1153,8 @@ dashboard.delete_missing_repos = Delete all repository records which are missing
 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_sshkeys = Rewrite '.ssh/authorized_keys' file (for Gitea SSH keys)
+dashboard.resync_all_sshkeys_success = All public keys 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.reinit_missing_repos = Reinitialize all missing Git repositories for which records exist
@@ -1273,17 +1211,17 @@ 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.is_activated = This account has completed activation
+users.prohibit_login = This account is blocked from logging in
+users.is_admin = This account has administrator permissions
+users.allow_git_hook = This account has permission to create Git hooks
+users.allow_import_local = This account has permissions to import local repositories
+users.allow_create_organization = This account has permissions 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.delete_account = Delete This Account
+users.still_own_repo = This account still owns one or more repositories, you need to delete or transfer them first.
+users.still_has_org = This account still is a member of one or more organizations, you need to leave or delete the organizations first.
+users.deletion_success = Account has been deleted successfully.
 
 orgs.org_manage_panel = Organization Management
 orgs.name = Name
@@ -1315,7 +1253,7 @@ 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. Do not use a highly privileged account.
 auths.user_base = User Search Base
 auths.user_dn = User DN
 auths.attribute_username = Username attribute
@@ -1350,13 +1288,13 @@ 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.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.dropbox = Create a new App on https://www.dropbox.com/developers/apps
+auths.tip.facebook = Register a new App on 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.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.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.new_success = The authentication '%s' has been added.
@@ -1364,9 +1302,9 @@ auths.update_success = The authentication settings have been updated.
 auths.update = Update Authentication Settings
 auths.delete = Delete This 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.delete_auth_desc = This authentication source will be deleted, are you sure you want to continue?
+auths.still_in_used = This authentication source is still used by some users, please delete or convert these users to another login type first.
+auths.deletion_success = Authentication has been deleted successfully!
 auths.login_source_exist = Login source '%s' already exists.
 
 config.server_config = Server Configuration
@@ -1438,9 +1376,6 @@ config.mailer_disable_helo = Disable HELO
 config.mailer_name = Name
 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'.