diff --git a/models/shared/types/ownertype.go b/models/shared/types/ownertype.go index a1d46c986f9cc..8784b6822d8fc 100644 --- a/models/shared/types/ownertype.go +++ b/models/shared/types/ownertype.go @@ -23,7 +23,7 @@ func (o OwnerType) LocaleString(locale translation.Locale) string { case OwnerTypeRepository: return locale.TrString("concept_code_repository") case OwnerTypeOrganization: - return locale.TrString("concept_user_organization") + return locale.TrString("organization") } return locale.TrString("unknown") } diff --git a/modules/private/hook.go b/modules/private/hook.go index cab8c812248f3..144fa3994c424 100644 --- a/modules/private/hook.go +++ b/modules/private/hook.go @@ -28,7 +28,7 @@ type GitPushOptions map[string]string // GitPushOptions keys const ( GitPushOptionRepoPrivate = "repo.private" - GitPushOptionRepoTemplate = "repo.template" + GitPushOptionRepoTemplate = "template" ) // Bool checks for a key in the map and parses as a boolean diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index dc16d78fc7e6e..b10f079cc983a 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -7,7 +7,6 @@ sign_in = Sign In sign_in_with_provider = Sign in with %s sign_in_or = or sign_out = Sign Out -sign_up = Register link_account = Link Account register = Register version = Version @@ -52,7 +51,9 @@ webauthn_error_timeout = Timeout reached before your key could be read. Please r webauthn_reload = Reload repository = Repository +repositories = Repositories organization = Organization +organizations = Organizations mirror = Mirror new_repo = New Repository new_migrate = New Migration @@ -67,7 +68,6 @@ account_settings = Account Settings settings = Settings your_profile = Profile your_starred = Starred -your_settings = Settings all = All sources = Sources @@ -78,6 +78,7 @@ forks = Forks activities = Activities pull_requests = Pull Requests issues = Issues +milestone = Milestone milestones = Milestones ok = OK @@ -108,6 +109,13 @@ copy_error = Copy failed copy_type_unsupported = This file type cannot be copied write = Write +read = Read +owner = Owner +member = Member +members = Members +admin = Admin +collaborator = Collaborator +collaborators = Collaborators preview = Preview loading = Loading… @@ -130,8 +138,6 @@ archived = Archived concept_system_global = Global concept_user_individual = Individual -concept_code_repository = Repository -concept_user_organization = Organization show_timestamps = Show timestamps show_log_seconds = Show seconds @@ -141,6 +147,7 @@ download_logs = Download logs confirm_delete_selected = Confirm to delete all selected items? name = Name +description = Description value = Value filter = Filter @@ -151,13 +158,18 @@ filter.is_fork = Forked filter.not_fork = Not Forked filter.is_mirror = Mirrored filter.not_mirror = Not Mirrored -filter.is_template = Template filter.not_template = Not Template -filter.public = Public -filter.private = Private + +private = Private +public = Public no_results_found = No results found. +label = Label +labels = Labels + +type = Type + [search] search = Search... type_tooltip = Search type @@ -238,8 +250,6 @@ require_db_desc = Gitea requires MySQL, PostgreSQL, MSSQL, SQLite3 or TiDB (MySQ db_title = Database Settings db_type = Database Type host = Host -user = Username -password = Password db_name = Database Name db_schema = Schema db_schema_helper = Leave blank for database default ("public"). @@ -311,9 +321,6 @@ require_sign_in_view_popup = Limit page access to signed-in users. Visitors will 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 = Email Address install_btn_confirm = Install Gitea test_git_failed = Could not test 'git' command: %v sqlite3_not_available = This Gitea version does not support SQLite3. Please download the official binary version from %s (not the 'gobuild' version). @@ -346,9 +353,7 @@ env_config_keys_prompt = The following environment variables will also be applie [home] nav_menu = Navigation Menu uname_holder = Username or Email Address -password_holder = Password switch_dashboard_context = Switch Dashboard Context -my_repos = Repositories show_more_repos = Show more repositories… collaborative_repos = Collaborative Repositories my_orgs = My Organizations @@ -363,7 +368,6 @@ show_both_archived_unarchived = Showing both archived and unarchived show_only_archived = Showing only archived show_only_unarchived = Showing only unarchived -show_private = Private show_both_private_public = Showing both public and private show_only_private = Showing only private show_only_public = Showing only public @@ -371,9 +375,7 @@ show_only_public = Showing only public issues.in_your_repos = In your repositories [explore] -repos = Repositories users = Users -organizations = Organizations go_to = Go to code = Code code_last_indexed_at = Last indexed %s @@ -421,7 +423,6 @@ 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 sign in. twofa_scratch_token_incorrect = Your scratch code is incorrect. -login_userpass = Sign In login_openid = OpenID oauth_signup_tab = Register New Account oauth_signup_title = Complete New Account @@ -523,7 +524,6 @@ team_invite.text_3 = Note: This invitation was intended for %[1]s. If you were n yes = Yes no = No confirm = Confirm -cancel = Cancel modify = Update [form] @@ -625,7 +625,6 @@ admin_cannot_delete_self = You cannot delete yourself when you are an admin. Ple [user] change_avatar = Change your avatar… joined_on = Joined on %s -repositories = Repositories activity = Public Activity followers = Followers starred = Starred Repositories @@ -675,18 +674,15 @@ block.list.none = You have not blocked any users. profile = Profile account = Account appearance = Appearance -password = Password security = Security avatar = Avatar ssh_gpg_keys = SSH / GPG Keys social = Social Accounts applications = Applications orgs = Manage Organizations -repos = Repositories delete = Delete Account twofa = Two-Factor Authentication (TOTP) account_link = Linked Accounts -organization = Organizations uid = UID webauthn = Two-Factor Authentication (Security Keys) @@ -708,16 +704,12 @@ change_username = Your username has been changed. change_username_prompt = Note: Changing your username also changes your account URL. change_username_redirect_prompt = The old username will redirect until someone claims it. continue = Continue -cancel = Cancel -language = Language ui = Theme hidden_comment_types = Hidden comment types hidden_comment_types_description = Comment types checked here will not be shown inside issue pages. Checking "Label" for example removes all " added/removed