From 671a4ff40210d1ca01d3d5024bcc53a178cf66b9 Mon Sep 17 00:00:00 2001 From: 0ko <0ko@noreply.codeberg.org> Date: Sun, 10 Mar 2024 19:10:29 +0500 Subject: [PATCH] [I18N] Improve English names & consistency --- options/locale/locale_en-US.ini | 167 ++++++++++++++++---------------- templates/install.tmpl | 2 +- 2 files changed, 85 insertions(+), 84 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 8216a70cb..4c5d9f1b8 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -210,15 +210,15 @@ license_desc = Go get documentation before changing any settings. require_db_desc = Forgejo requires MySQL, PostgreSQL, MSSQL, SQLite3 or TiDB (MySQL protocol). -db_title = Database Settings -db_type = Database Type +db_title = Database settings +db_type = Database type host = Host user = Username password = Password -db_name = Database Name +db_name = Database name db_schema = Schema db_schema_helper = Leave blank for database default ("public"). ssl_mode = SSL @@ -237,61 +237,62 @@ err_admin_name_is_reserved = Administrator Username is invalid, username is rese err_admin_name_pattern_not_allowed = Administrator username is invalid, the username matches a reserved pattern err_admin_name_is_invalid = Administrator Username is invalid -general_title = General Settings -app_name = Site Title +general_title = General settings +app_name = Instance name app_name_helper = You can enter your company name here. -repo_path = Repository Root Path +repo_path = Repository root path repo_path_helper = Remote Git repositories will be saved to this directory. -lfs_path = Git LFS Root Path +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 = User to run as run_user_helper = The operating system username that Forgejo runs as. Note that this user must have access to the repository root path. -domain = Server Domain +domain = Server domain domain_helper = Domain or host address for the server. -ssh_port = SSH Server Port -ssh_port_helper = Port number your SSH server listens on. Leave empty to disable. -http_port = Forgejo HTTP Listen Port -http_port_helper = Port number the Forgejos web server will listen on. -app_url = Forgejo Base URL +ssh_port = SSH server port +ssh_port_helper = Port number that will be used by the SSH server. Leave empty to disable SSH server. +http_port = HTTP listen port +http_port_helper = Port number that will be used by the Forgejo web server. +app_url = Base URL app_url_helper = Base address for HTTP(S) clone URLs and email notifications. -log_root_path = Log Path +log_root_path = Log path log_root_path_helper = Log files will be written to this directory. -optional_title = Optional Settings -email_title = Email Settings -smtp_addr = SMTP Host -smtp_port = SMTP Port -smtp_from = Send Email As +optional_title = Optional settings +email_title = Email settings +smtp_addr = SMTP host +smtp_port = SMTP port +smtp_from = Send email as smtp_from_invalid = The "Send Email As" address is invalid smtp_from_helper = Email address Forgejo will use. Enter a plain email address or use the "Name" 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 +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 = Enable federated avatars federated_avatar_lookup_popup = Enable federated avatar lookup using Libravatar. -disable_registration = Disable Self-Registration +disable_registration = Disable self-registration disable_registration_popup = Disable user self-registration. Only administrators will be able to create new user accounts. -allow_only_external_registration_popup = Allow Registration Only Through External Services -openid_signin = Enable OpenID Sign-In +allow_only_external_registration_popup = Allow registration only through external services +openid_signin = Enable OpenID sign-in openid_signin_popup = Enable user sign-in via OpenID. -openid_signup = Enable OpenID Self-Registration +openid_signup = Enable OpenID self-registration openid_signup_popup = Enable OpenID-based user self-registration. enable_captcha = Enable registration CAPTCHA enable_captcha_popup = Require a CAPTCHA for user self-registration. -require_sign_in_view = Require Sign-In to View Pages +require_sign_in_view = Require to sign-in to view instance content 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_title = Administrator account settings +admin_name = Administrator username admin_password = Password -confirm_password = Confirm Password -admin_email = Email Address +confirm_password = Confirm password +admin_email = Email address +config_location_hint = These configuration options will be saved in: install_btn_confirm = Install Forgejo test_git_failed = Could not test "git" command: %v sqlite3_not_available = This Forgejo version does not support SQLite3. Please download the official binary version from %s (not the "gobuild" version). @@ -303,22 +304,22 @@ run_user_not_match = The "run as" username is not the current username: %s -> %s internal_token_failed = Failed to generate internal token: %v secret_key_failed = Failed to generate secret key: %v save_config_failed = Failed to save configuration: %v -enable_update_checker_helper_forgejo = Periodically checks for new Forgejo versions by checking a DNS TXT record at release.forgejo.org. +enable_update_checker_helper_forgejo = It will periodically check for new Forgejo versions by checking a TXT DNS record at release.forgejo.org. invalid_admin_setting = Administrator account setting is invalid: %v invalid_log_root_path = The log path is invalid: %v -default_keep_email_private = Hide Email Addresses by Default +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 = 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 = Enable time tracking by default default_enable_timetracking_popup = Enable time tracking for new repositories by default. allow_dots_in_usernames = Allow users to use dots in their usernames. Doesn't affect existing accounts. -no_reply_address = Hidden Email Domain +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". -password_algorithm = Password Hash Algorithm +password_algorithm = Password hash algorithm invalid_password_algorithm = Invalid password hash algorithm password_algorithm_helper = Set the password hashing algorithm. Algorithms have differing requirements and strength. The argon2 algorithm is rather secure but uses a lot of memory and may be inappropriate for small systems. -enable_update_checker = Enable Update Checker +enable_update_checker = Enable update checker enable_update_checker_helper = Checks for new version releases periodically by connecting to gitea.io. env_config_keys = Environment Configuration env_config_keys_prompt = The following environment variables will also be applied to your configuration file: @@ -504,13 +505,13 @@ release.downloads = Downloads: release.download.zip = Source Code (ZIP) release.download.targz = Source Code (TAR.GZ) -repo.transfer.subject_to = %s would like to transfer "%s" to %s -repo.transfer.subject_to_you = %s would like to transfer "%s" to you +repo.transfer.subject_to = %s wants to transfer repository "%s" to %s +repo.transfer.subject_to_you = %s wants to transfer repository "%s" to you repo.transfer.to_you = you repo.transfer.body = To accept or reject it visit %s or just ignore it. -repo.collaborator.added.subject = %s added you to %s -repo.collaborator.added.text = You have been added as a collaborator of repository: +repo.collaborator.added.subject = %s added you to %s as collaborator +repo.collaborator.added.text = You have been added as a collaborator to repository: team_invite.subject = %[1]s has invited you to join the %[2]s organization team_invite.text_1 = %[1]s has invited you to join team %[2]s in organization %[3]s. @@ -1924,8 +1925,8 @@ 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.earliest_due_data = Earliest due date -milestones.filter_sort.latest_due_date = Latest due date +milestones.filter_sort.earliest_due_data = Nearest due date +milestones.filter_sort.latest_due_date = Farthest due date milestones.filter_sort.least_complete = Least complete milestones.filter_sort.most_complete = Most complete milestones.filter_sort.most_issues = Most issues @@ -2134,8 +2135,8 @@ settings.tracker_issue_style.regexp = Regular Expression settings.tracker_issue_style.regexp_pattern = Regular Expression Pattern settings.tracker_issue_style.regexp_pattern_desc = The first captured group will be used in place of {index}. settings.tracker_url_format_desc = Use the placeholders {user}, {repo} and {index} for the username, repository name and issue index. -settings.enable_timetracker = Enable Time Tracking -settings.allow_only_contributors_to_track_time = Let Only Contributors Track Time +settings.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.enable_autodetect_manual_merge = Enable autodetect manual merge (Note: In some special cases, misjudgments can occur) @@ -2937,7 +2938,7 @@ users.edit_account = Edit User Account users.max_repo_creation = Maximum Number of Repositories users.max_repo_creation_desc = (Enter -1 to use the global default limit.) users.is_activated = User Account Is Activated -users.prohibit_login = Disable Sign-In +users.prohibit_login = Disable sign-in users.is_admin = Is Administrator users.is_restricted = Is Restricted users.allow_git_hook = May Create Git Hooks @@ -3064,12 +3065,12 @@ auths.map_group_to_team = Map LDAP groups to Organization teams (leave the field auths.map_group_to_team_removal = Remove users from synchronized teams if user does not belong to corresponding LDAP group auths.enable_ldap_groups = Enable LDAP groups auths.ms_ad_sa = MS AD Search Attributes -auths.smtp_auth = SMTP Authentication Type -auths.smtphost = SMTP Host -auths.smtpport = SMTP Port +auths.smtp_auth = SMTP authentication type +auths.smtphost = SMTP host +auths.smtpport = SMTP port auths.allowed_domains = Allowed Domains auths.allowed_domains_helper = Leave empty to allow all domains. Separate multiple domains with a comma (","). -auths.skip_tls_verify = Skip TLS Verify +auths.skip_tls_verify = Skip TLS verification auths.force_smtps = Force SMTPS auths.force_smtps_helper = SMTPS is always used on port 465. Set this to force SMTPS on other ports. (Otherwise STARTTLS will be used on other ports if it is supported by the host.) auths.helo_hostname = HELO Hostname @@ -3144,40 +3145,40 @@ auths.unable_to_initialize_openid = Unable to initialize OpenID Connect Provider auths.invalid_openIdConnectAutoDiscoveryURL = Invalid Auto Discovery URL (this must be a valid URL starting with http:// or https://) config.server_config = Server configuration -config.app_name = Site Title -config.app_ver = Forgejo Version -config.app_url = Forgejo Base URL -config.custom_conf = Configuration File Path -config.custom_file_root_path = Custom File Root Path -config.domain = Server Domain -config.offline_mode = Local Mode -config.disable_router_log = Disable Router Log -config.run_user = Run As Username -config.run_mode = Run Mode -config.git_version = Git Version -config.app_data_path = App Data Path -config.repo_root_path = Repository Root Path -config.lfs_root_path = LFS Root Path -config.log_file_root_path = Log Path -config.script_type = Script Type -config.reverse_auth_user = Reverse Authentication User +config.app_name = Instance title +config.app_ver = Forgejo version +config.app_url = Base URL +config.custom_conf = Configuration file path +config.custom_file_root_path = Custom file root path +config.domain = Server domain +config.offline_mode = Local mode +config.disable_router_log = Disable router log +config.run_user = User to run as +config.run_mode = Run mode +config.git_version = Git version +config.app_data_path = App data path +config.repo_root_path = Repository root path +config.lfs_root_path = LFS 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 = Use Built-In Server -config.ssh_domain = SSH Server Domain +config.ssh_start_builtin_server = Use built-in server +config.ssh_domain = SSH server domain config.ssh_port = Port -config.ssh_listen_port = Listen Port -config.ssh_root_path = Root Path -config.ssh_key_test_path = Key Test Path -config.ssh_keygen_path = Keygen ("ssh-keygen") Path -config.ssh_minimum_key_size_check = Minimum Key Size Check -config.ssh_minimum_key_sizes = Minimum Key Sizes +config.ssh_listen_port = Listen port +config.ssh_root_path = Root path +config.ssh_key_test_path = Key test path +config.ssh_keygen_path = Keygen ("ssh-keygen") path +config.ssh_minimum_key_size_check = Minimum key size check +config.ssh_minimum_key_sizes = Minimum key sizes config.lfs_config = LFS configuration config.lfs_enabled = Enabled config.lfs_content_path = LFS content path -config.lfs_http_auth_expiry = LFS HTTP auth expiry +config.lfs_http_auth_expiry = LFS HTTP auth expiration time config.db_config = Database configuration config.db_type = Type diff --git a/templates/install.tmpl b/templates/install.tmpl index c18f25f79..b3aea39ee 100644 --- a/templates/install.tmpl +++ b/templates/install.tmpl @@ -336,7 +336,7 @@
- These configuration options will be written into: {{.CustomConfFile}} + {{ctx.Locale.Tr "install.config_location_hint"}} {{.CustomConfFile}}