diff --git a/.deadcode-out b/.deadcode-out index 61c5bcb055..f9bee43043 100644 --- a/.deadcode-out +++ b/.deadcode-out @@ -27,15 +27,13 @@ forgejo.org/models/db TruncateBeans InTransaction DumpTables + GetTableNames forgejo.org/models/dbfs file.renameTo Create Rename -forgejo.org/models/forgefed - GetFederationHost - forgejo.org/models/forgejo/semver GetVersion SetVersionString @@ -67,7 +65,6 @@ forgejo.org/models/user DeleteUserSetting GetFederatedUser GetFederatedUserByUserID - UpdateFederatedUser GetFollowersForUser AddFollower RemoveFollower @@ -248,6 +245,9 @@ forgejo.org/routers/web/org forgejo.org/services/context GetPrivateContext +forgejo.org/services/federation + Init + forgejo.org/services/repository IsErrForkAlreadyExist diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 28fa9e4555..3f250e5682 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -6,7 +6,7 @@ "ghcr.io/devcontainers/features/node:1": { "version": "22" }, - "ghcr.io/devcontainers/features/git-lfs:1.2.4": {}, + "ghcr.io/devcontainers/features/git-lfs:1.2.5": {}, "ghcr.io/warrenbuckley/codespace-features/sqlite:1": {} }, "customizations": { diff --git a/.forgejo/workflows/renovate.yml b/.forgejo/workflows/renovate.yml index 729cba3723..d3eac5357a 100644 --- a/.forgejo/workflows/renovate.yml +++ b/.forgejo/workflows/renovate.yml @@ -28,7 +28,7 @@ jobs: runs-on: docker container: - image: data.forgejo.org/renovate/renovate:41.17.2 + image: data.forgejo.org/renovate/renovate:41.23.2 steps: - name: Load renovate repo cache diff --git a/.golangci.yml b/.golangci.yml index 532132838d..6679a1850e 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -79,6 +79,10 @@ linters: - name: unreachable-code - name: var-declaration - name: var-naming + arguments: + - [] + - [] + - - skip-package-name-checks: true - name: redefines-builtin-id disabled: true staticcheck: diff --git a/Makefile b/Makefile index db4ec2fbd5..c09e0180eb 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ XGO_VERSION := go-1.21.x AIR_PACKAGE ?= github.com/air-verse/air@v1 # renovate: datasource=go EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/v3/cmd/editorconfig-checker@v3.3.0 # renovate: datasource=go GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.8.0 # renovate: datasource=go -GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.1.6 # renovate: datasource=go +GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.2.1 # renovate: datasource=go GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/gxz@v0.5.11 # renovate: datasource=go SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@v0.31.0 # renovate: datasource=go XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest @@ -47,7 +47,7 @@ GO_LICENSES_PACKAGE ?= github.com/google/go-licenses@v1.6.0 # renovate: datasour GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1 # renovate: datasource=go DEADCODE_PACKAGE ?= golang.org/x/tools/cmd/deadcode@v0.34.0 # renovate: datasource=go GOMOCK_PACKAGE ?= go.uber.org/mock/mockgen@v0.5.2 # renovate: datasource=go -RENOVATE_NPM_PACKAGE ?= renovate@41.17.2 # renovate: datasource=docker packageName=data.forgejo.org/renovate/renovate +RENOVATE_NPM_PACKAGE ?= renovate@41.23.2 # renovate: datasource=docker packageName=data.forgejo.org/renovate/renovate # https://github.com/disposable-email-domains/disposable-email-domains/commits/main/ DISPOSABLE_EMAILS_SHA ?= 0c27e671231d27cf66370034d7f6818037416989 # renovate: ... diff --git a/cmd/admin_auth.go b/cmd/admin_auth.go index cb95b3b3c8..91b344b1e9 100644 --- a/cmd/admin_auth.go +++ b/cmd/admin_auth.go @@ -17,6 +17,15 @@ import ( "github.com/urfave/cli/v3" ) +type ( + authService struct { + initDB func(ctx context.Context) error + createAuthSource func(context.Context, *auth_model.Source) error + updateAuthSource func(context.Context, *auth_model.Source) error + getAuthSourceByID func(ctx context.Context, id int64) (*auth_model.Source, error) + } +) + func microcmdAuthDelete() *cli.Command { return &cli.Command{ Name: "delete", @@ -60,6 +69,16 @@ func microcmdAuthList() *cli.Command { } } +// newAuthService creates a service with default functions. +func newAuthService() *authService { + return &authService{ + initDB: initDB, + createAuthSource: auth_model.CreateSource, + updateAuthSource: auth_model.UpdateSource, + getAuthSourceByID: auth_model.GetSourceByID, + } +} + func runListAuth(ctx context.Context, c *cli.Command) error { ctx, cancel := installSignals(ctx) defer cancel() diff --git a/cmd/admin_auth_ldap.go b/cmd/admin_auth_ldap.go index 997d6b3a16..9af6c331d3 100644 --- a/cmd/admin_auth_ldap.go +++ b/cmd/admin_auth_ldap.go @@ -14,15 +14,6 @@ import ( "github.com/urfave/cli/v3" ) -type ( - authService struct { - initDB func(ctx context.Context) error - createAuthSource func(context.Context, *auth.Source) error - updateAuthSource func(context.Context, *auth.Source) error - getAuthSourceByID func(ctx context.Context, id int64) (*auth.Source, error) - } -) - func commonLdapCLIFlags() []cli.Flag { return []cli.Flag{ &cli.StringFlag{ @@ -184,16 +175,6 @@ func microcmdAuthUpdateLdapSimpleAuth() *cli.Command { } } -// newAuthService creates a service with default functions. -func newAuthService() *authService { - return &authService{ - initDB: initDB, - createAuthSource: auth.CreateSource, - updateAuthSource: auth.UpdateSource, - getAuthSourceByID: auth.GetSourceByID, - } -} - // parseAuthSource assigns values on authSource according to command line flags. func parseAuthSource(c *cli.Command, authSource *auth.Source) { if c.IsSet("name") { diff --git a/cmd/admin_auth_oauth.go b/cmd/admin_auth_oauth.go index abdcd5d48a..8a756480cd 100644 --- a/cmd/admin_auth_oauth.go +++ b/cmd/admin_auth_oauth.go @@ -86,6 +86,11 @@ func oauthCLIFlags() []cli.Flag { Value: nil, Usage: "Scopes to request when to authenticate against this OAuth2 source", }, + &cli.StringFlag{ + Name: "attribute-ssh-public-key", + Value: "", + Usage: "Claim name providing SSH public keys for this source", + }, &cli.StringFlag{ Name: "required-claim-name", Value: "", @@ -127,7 +132,7 @@ func microcmdAuthAddOauth() *cli.Command { return &cli.Command{ Name: "add-oauth", Usage: "Add new Oauth authentication source", - Action: runAddOauth, + Action: newAuthService().addOauth, Flags: oauthCLIFlags(), } } @@ -136,7 +141,7 @@ func microcmdAuthUpdateOauth() *cli.Command { return &cli.Command{ Name: "update-oauth", Usage: "Update existing Oauth authentication source", - Action: runUpdateOauth, + Action: newAuthService().updateOauth, Flags: append(oauthCLIFlags()[:1], append([]cli.Flag{idFlag()}, oauthCLIFlags()[1:]...)...), } } @@ -163,6 +168,7 @@ func parseOAuth2Config(_ context.Context, c *cli.Command) *oauth2.Source { IconURL: c.String("icon-url"), SkipLocalTwoFA: c.Bool("skip-local-2fa"), Scopes: c.StringSlice("scopes"), + AttributeSSHPublicKey: c.String("attribute-ssh-public-key"), RequiredClaimName: c.String("required-claim-name"), RequiredClaimValue: c.String("required-claim-value"), GroupClaimName: c.String("group-claim-name"), @@ -173,11 +179,11 @@ func parseOAuth2Config(_ context.Context, c *cli.Command) *oauth2.Source { } } -func runAddOauth(ctx context.Context, c *cli.Command) error { +func (a *authService) addOauth(ctx context.Context, c *cli.Command) error { ctx, cancel := installSignals(ctx) defer cancel() - if err := initDB(ctx); err != nil { + if err := a.initDB(ctx); err != nil { return err } @@ -189,7 +195,7 @@ func runAddOauth(ctx context.Context, c *cli.Command) error { } } - return auth_model.CreateSource(ctx, &auth_model.Source{ + return a.createAuthSource(ctx, &auth_model.Source{ Type: auth_model.OAuth2, Name: c.String("name"), IsActive: true, @@ -197,7 +203,7 @@ func runAddOauth(ctx context.Context, c *cli.Command) error { }) } -func runUpdateOauth(ctx context.Context, c *cli.Command) error { +func (a *authService) updateOauth(ctx context.Context, c *cli.Command) error { if !c.IsSet("id") { return errors.New("--id flag is missing") } @@ -205,11 +211,11 @@ func runUpdateOauth(ctx context.Context, c *cli.Command) error { ctx, cancel := installSignals(ctx) defer cancel() - if err := initDB(ctx); err != nil { + if err := a.initDB(ctx); err != nil { return err } - source, err := auth_model.GetSourceByID(ctx, c.Int64("id")) + source, err := a.getAuthSourceByID(ctx, c.Int64("id")) if err != nil { return err } @@ -244,6 +250,10 @@ func runUpdateOauth(ctx context.Context, c *cli.Command) error { oAuth2Config.Scopes = c.StringSlice("scopes") } + if c.IsSet("attribute-ssh-public-key") { + oAuth2Config.AttributeSSHPublicKey = c.String("attribute-ssh-public-key") + } + if c.IsSet("required-claim-name") { oAuth2Config.RequiredClaimName = c.String("required-claim-name") } @@ -300,5 +310,5 @@ func runUpdateOauth(ctx context.Context, c *cli.Command) error { oAuth2Config.CustomURLMapping = customURLMapping source.Cfg = oAuth2Config - return auth_model.UpdateSource(ctx, source) + return a.updateAuthSource(ctx, source) } diff --git a/cmd/admin_auth_oauth_test.go b/cmd/admin_auth_oauth_test.go new file mode 100644 index 0000000000..ea5442e62d --- /dev/null +++ b/cmd/admin_auth_oauth_test.go @@ -0,0 +1,704 @@ +// Copyright 2025 The Forgejo Authors. All rights reserved. +// SPDX-License-Identifier: GPL-3.0-or-later + +package cmd + +import ( + "context" + "testing" + + "forgejo.org/models/auth" + "forgejo.org/modules/test" + "forgejo.org/services/auth/source/oauth2" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/urfave/cli/v3" +) + +func TestAddOauth(t *testing.T) { + // Mock cli functions to do not exit on error + defer test.MockVariableValue(&cli.OsExiter, func(code int) {})() + + // Test cases + cases := []struct { + args []string + source *auth.Source + errMsg string + }{ + // case 0 + { + args: []string{ + "oauth-test", + "--name", "oauth2 (via openidConnect) source full", + "--provider", "openidConnect", + "--key", "client id", + "--secret", "client secret", + "--auto-discover-url", "https://example.com/.well-known/openid-configuration", + "--use-custom-urls", "", + "--custom-tenant-id", "tenant id", + "--custom-auth-url", "https://example.com/auth", + "--custom-token-url", "https://example.com/token", + "--custom-profile-url", "https://example.com/profile", + "--custom-email-url", "https://example.com/email", + "--icon-url", "https://example.com/icon.svg", + "--skip-local-2fa", + "--scopes", "address", + "--scopes", "email", + "--scopes", "phone", + "--scopes", "profile", + "--attribute-ssh-public-key", "ssh_public_key", + "--required-claim-name", "can_access", + "--required-claim-value", "yes", + "--group-claim-name", "groups", + "--admin-group", "admin", + "--restricted-group", "restricted", + "--group-team-map", `{"org_a_team_1": {"organization-a": ["Team 1"]}, "org_a_all_teams": {"organization-a": ["Team 1", "Team 2", "Team 3"]}}`, + "--group-team-map-removal", + }, + source: &auth.Source{ + Type: auth.OAuth2, + Name: "oauth2 (via openidConnect) source full", + IsActive: true, + Cfg: &oauth2.Source{ + Provider: "openidConnect", + ClientID: "client id", + ClientSecret: "client secret", + OpenIDConnectAutoDiscoveryURL: "https://example.com/.well-known/openid-configuration", + CustomURLMapping: &oauth2.CustomURLMapping{ + AuthURL: "https://example.com/auth", + TokenURL: "https://example.com/token", + ProfileURL: "https://example.com/profile", + EmailURL: "https://example.com/email", + Tenant: "tenant id", + }, + IconURL: "https://example.com/icon.svg", + Scopes: []string{"address", "email", "phone", "profile"}, + AttributeSSHPublicKey: "ssh_public_key", + RequiredClaimName: "can_access", + RequiredClaimValue: "yes", + GroupClaimName: "groups", + AdminGroup: "admin", + GroupTeamMap: `{"org_a_team_1": {"organization-a": ["Team 1"]}, "org_a_all_teams": {"organization-a": ["Team 1", "Team 2", "Team 3"]}}`, + GroupTeamMapRemoval: true, + RestrictedGroup: "restricted", + SkipLocalTwoFA: true, + }, + }, + }, + // case 1 + { + args: []string{ + "oauth-test", + "--name", "oauth2 (via openidConnect) source min", + "--provider", "openidConnect", + "--auto-discover-url", "https://example.com/.well-known/openid-configuration", + }, + source: &auth.Source{ + Type: auth.OAuth2, + Name: "oauth2 (via openidConnect) source min", + IsActive: true, + Cfg: &oauth2.Source{ + Provider: "openidConnect", + OpenIDConnectAutoDiscoveryURL: "https://example.com/.well-known/openid-configuration", + Scopes: []string{}, + }, + }, + }, + // case 2 + { + args: []string{ + "oauth-test", + "--name", "oauth2 (via openidConnect) source `--use-custom-urls` required for `--custom-*` flags", + "--custom-tenant-id", "tenant id", + "--custom-auth-url", "https://example.com/auth", + "--custom-token-url", "https://example.com/token", + "--custom-profile-url", "https://example.com/profile", + "--custom-email-url", "https://example.com/email", + }, + source: &auth.Source{ + Type: auth.OAuth2, + Name: "oauth2 (via openidConnect) source `--use-custom-urls` required for `--custom-*` flags", + IsActive: true, + Cfg: &oauth2.Source{ + Scopes: []string{}, + }, + }, + }, + // case 3 + { + args: []string{ + "oauth-test", + "--name", "oauth2 (via openidConnect) source `--scopes` aggregates multiple uses", + "--provider", "openidConnect", + "--auto-discover-url", "https://example.com/.well-known/openid-configuration", + "--scopes", "address", + "--scopes", "email", + "--scopes", "phone", + "--scopes", "profile", + }, + source: &auth.Source{ + Type: auth.OAuth2, + Name: "oauth2 (via openidConnect) source `--scopes` aggregates multiple uses", + IsActive: true, + Cfg: &oauth2.Source{ + Provider: "openidConnect", + OpenIDConnectAutoDiscoveryURL: "https://example.com/.well-known/openid-configuration", + Scopes: []string{"address", "email", "phone", "profile"}, + }, + }, + }, + // case 4 + { + args: []string{ + "oauth-test", + "--name", "oauth2 (via openidConnect) source `--scopes` supports commas as separators", + "--provider", "openidConnect", + "--auto-discover-url", "https://example.com/.well-known/openid-configuration", + "--scopes", "address,email,phone,profile", + }, + source: &auth.Source{ + Type: auth.OAuth2, + Name: "oauth2 (via openidConnect) source `--scopes` supports commas as separators", + IsActive: true, + Cfg: &oauth2.Source{ + Provider: "openidConnect", + OpenIDConnectAutoDiscoveryURL: "https://example.com/.well-known/openid-configuration", + Scopes: []string{"address", "email", "phone", "profile"}, + }, + }, + }, + // case 5 + { + args: []string{ + "oauth-test", + "--name", "oauth2 (via openidConnect) source", + "--provider", "openidConnect", + }, + errMsg: "invalid Auto Discovery URL: (this must be a valid URL starting with http:// or https://)", + }, + // case 6 + { + args: []string{ + "oauth-test", + "--name", "oauth2 (via openidConnect) source", + "--provider", "openidConnect", + "--auto-discover-url", "example.com", + }, + errMsg: "invalid Auto Discovery URL: example.com (this must be a valid URL starting with http:// or https://)", + }, + } + + for n, c := range cases { + // Mock functions. + var createdAuthSource *auth.Source + service := &authService{ + initDB: func(context.Context) error { + return nil + }, + createAuthSource: func(ctx context.Context, authSource *auth.Source) error { + createdAuthSource = authSource + return nil + }, + updateAuthSource: func(ctx context.Context, authSource *auth.Source) error { + assert.FailNow(t, "should not call updateAuthSource", "case: %d", n) + return nil + }, + getAuthSourceByID: func(ctx context.Context, id int64) (*auth.Source, error) { + assert.FailNow(t, "should not call getAuthSourceByID", "case: %d", n) + return nil, nil + }, + } + + // Create a copy of command to test + app := cli.Command{} + app.Flags = microcmdAuthAddOauth().Flags + app.Action = service.addOauth + + // Run it + err := app.Run(t.Context(), c.args) + if c.errMsg != "" { + assert.EqualError(t, err, c.errMsg, "case %d: error should match", n) + } else { + require.NoError(t, err, "case %d: should have no errors", n) + assert.Equal(t, c.source, createdAuthSource, "case %d: wrong authSource", n) + } + } +} + +func TestUpdateOauth(t *testing.T) { + // Mock cli functions to do not exit on error + defer test.MockVariableValue(&cli.OsExiter, func(code int) {})() + + // Test cases + cases := []struct { + args []string + id int64 + existingAuthSource *auth.Source + authSource *auth.Source + errMsg string + }{ + // case 0 + { + args: []string{ + "oauth-test", + "--id", "23", + "--name", "oauth2 (via openidConnect) source full", + "--provider", "openidConnect", + "--key", "client id", + "--secret", "client secret", + "--auto-discover-url", "https://example.com/.well-known/openid-configuration", + "--use-custom-urls", "", + "--custom-tenant-id", "tenant id", + "--custom-auth-url", "https://example.com/auth", + "--custom-token-url", "https://example.com/token", + "--custom-profile-url", "https://example.com/profile", + "--custom-email-url", "https://example.com/email", + "--icon-url", "https://example.com/icon.svg", + "--skip-local-2fa", + "--scopes", "address", + "--scopes", "email", + "--scopes", "phone", + "--scopes", "profile", + "--attribute-ssh-public-key", "ssh_public_key", + "--required-claim-name", "can_access", + "--required-claim-value", "yes", + "--group-claim-name", "groups", + "--admin-group", "admin", + "--restricted-group", "restricted", + "--group-team-map", `{"org_a_team_1": {"organization-a": ["Team 1"]}, "org_a_all_teams": {"organization-a": ["Team 1", "Team 2", "Team 3"]}}`, + "--group-team-map-removal", + }, + id: 23, + existingAuthSource: &auth.Source{ + Type: auth.OAuth2, + Cfg: &oauth2.Source{}, + }, + authSource: &auth.Source{ + Type: auth.OAuth2, + Name: "oauth2 (via openidConnect) source full", + Cfg: &oauth2.Source{ + Provider: "openidConnect", + ClientID: "client id", + ClientSecret: "client secret", + OpenIDConnectAutoDiscoveryURL: "https://example.com/.well-known/openid-configuration", + CustomURLMapping: &oauth2.CustomURLMapping{ + AuthURL: "https://example.com/auth", + TokenURL: "https://example.com/token", + ProfileURL: "https://example.com/profile", + EmailURL: "https://example.com/email", + Tenant: "tenant id", + }, + IconURL: "https://example.com/icon.svg", + Scopes: []string{"address", "email", "phone", "profile"}, + AttributeSSHPublicKey: "ssh_public_key", + RequiredClaimName: "can_access", + RequiredClaimValue: "yes", + GroupClaimName: "groups", + AdminGroup: "admin", + GroupTeamMap: `{"org_a_team_1": {"organization-a": ["Team 1"]}, "org_a_all_teams": {"organization-a": ["Team 1", "Team 2", "Team 3"]}}`, + GroupTeamMapRemoval: true, + RestrictedGroup: "restricted", + // `--skip-local-2fa` is currently ignored. + // SkipLocalTwoFA: true, + }, + }, + }, + // case 1 + { + args: []string{ + "oauth-test", + "--id", "1", + }, + authSource: &auth.Source{ + Type: auth.OAuth2, + Cfg: &oauth2.Source{ + CustomURLMapping: &oauth2.CustomURLMapping{}, + }, + }, + }, + // case 2 + { + args: []string{ + "oauth-test", + "--id", "1", + "--name", "oauth2 (via openidConnect) source full", + }, + authSource: &auth.Source{ + Type: auth.OAuth2, + Name: "oauth2 (via openidConnect) source full", + Cfg: &oauth2.Source{ + CustomURLMapping: &oauth2.CustomURLMapping{}, + }, + }, + }, + // case 3 + { + args: []string{ + "oauth-test", + "--id", "1", + "--provider", "openidConnect", + }, + authSource: &auth.Source{ + Type: auth.OAuth2, + Cfg: &oauth2.Source{ + Provider: "openidConnect", + CustomURLMapping: &oauth2.CustomURLMapping{}, + }, + }, + }, + // case 4 + { + args: []string{ + "oauth-test", + "--id", "1", + "--key", "client id", + }, + authSource: &auth.Source{ + Type: auth.OAuth2, + Cfg: &oauth2.Source{ + ClientID: "client id", + CustomURLMapping: &oauth2.CustomURLMapping{}, + }, + }, + }, + // case 5 + { + args: []string{ + "oauth-test", + "--id", "1", + "--secret", "client secret", + }, + authSource: &auth.Source{ + Type: auth.OAuth2, + Cfg: &oauth2.Source{ + ClientSecret: "client secret", + CustomURLMapping: &oauth2.CustomURLMapping{}, + }, + }, + }, + // case 6 + { + args: []string{ + "oauth-test", + "--id", "1", + "--auto-discover-url", "https://example.com/.well-known/openid-configuration", + }, + authSource: &auth.Source{ + Type: auth.OAuth2, + Cfg: &oauth2.Source{ + OpenIDConnectAutoDiscoveryURL: "https://example.com/.well-known/openid-configuration", + CustomURLMapping: &oauth2.CustomURLMapping{}, + }, + }, + }, + // case 7 + { + args: []string{ + "oauth-test", + "--id", "1", + "--use-custom-urls", "", + "--custom-tenant-id", "tenant id", + "--custom-auth-url", "https://example.com/auth", + "--custom-token-url", "https://example.com/token", + "--custom-profile-url", "https://example.com/profile", + "--custom-email-url", "https://example.com/email", + }, + authSource: &auth.Source{ + Type: auth.OAuth2, + Cfg: &oauth2.Source{ + CustomURLMapping: &oauth2.CustomURLMapping{ + AuthURL: "https://example.com/auth", + TokenURL: "https://example.com/token", + ProfileURL: "https://example.com/profile", + EmailURL: "https://example.com/email", + Tenant: "tenant id", + }, + }, + }, + }, + // case 8 + { + args: []string{ + "oauth-test", + "--id", "1", + "--name", "oauth2 (via openidConnect) source `--use-custom-urls` required for `--custom-*` flags", + "--custom-tenant-id", "tenant id", + "--custom-auth-url", "https://example.com/auth", + "--custom-token-url", "https://example.com/token", + "--custom-profile-url", "https://example.com/profile", + "--custom-email-url", "https://example.com/email", + }, + authSource: &auth.Source{ + Type: auth.OAuth2, + Name: "oauth2 (via openidConnect) source `--use-custom-urls` required for `--custom-*` flags", + Cfg: &oauth2.Source{ + CustomURLMapping: &oauth2.CustomURLMapping{}, + }, + }, + }, + // case 9 + { + args: []string{ + "oauth-test", + "--id", "1", + "--icon-url", "https://example.com/icon.svg", + }, + authSource: &auth.Source{ + Type: auth.OAuth2, + Cfg: &oauth2.Source{ + CustomURLMapping: &oauth2.CustomURLMapping{}, + IconURL: "https://example.com/icon.svg", + }, + }, + }, + // case 10 + { + args: []string{ + "oauth-test", + "--id", "1", + "--name", "oauth2 (via openidConnect) source `--skip-local-2fa` is currently ignored", + "--skip-local-2fa", + }, + authSource: &auth.Source{ + Type: auth.OAuth2, + Name: "oauth2 (via openidConnect) source `--skip-local-2fa` is currently ignored", + Cfg: &oauth2.Source{ + CustomURLMapping: &oauth2.CustomURLMapping{}, + // `--skip-local-2fa` is currently ignored. + // SkipLocalTwoFA: true, + }, + }, + }, + // case 11 + { + args: []string{ + "oauth-test", + "--id", "1", + "--name", "oauth2 (via openidConnect) source `--scopes` aggregates multiple uses", + "--scopes", "address", + "--scopes", "email", + "--scopes", "phone", + "--scopes", "profile", + }, + authSource: &auth.Source{ + Type: auth.OAuth2, + Name: "oauth2 (via openidConnect) source `--scopes` aggregates multiple uses", + Cfg: &oauth2.Source{ + CustomURLMapping: &oauth2.CustomURLMapping{}, + Scopes: []string{"address", "email", "phone", "profile"}, + }, + }, + }, + // case 12 + { + args: []string{ + "oauth-test", + "--id", "1", + "--name", "oauth2 (via openidConnect) source `--scopes` supports commas as separators", + "--scopes", "address,email,phone,profile", + }, + authSource: &auth.Source{ + Type: auth.OAuth2, + Name: "oauth2 (via openidConnect) source `--scopes` supports commas as separators", + Cfg: &oauth2.Source{ + CustomURLMapping: &oauth2.CustomURLMapping{}, + Scopes: []string{"address", "email", "phone", "profile"}, + }, + }, + }, + // case 13 + { + args: []string{ + "oauth-test", + "--id", "1", + "--attribute-ssh-public-key", "ssh_public_key", + }, + authSource: &auth.Source{ + Type: auth.OAuth2, + Cfg: &oauth2.Source{ + CustomURLMapping: &oauth2.CustomURLMapping{}, + AttributeSSHPublicKey: "ssh_public_key", + }, + }, + }, + // case 14 + { + args: []string{ + "oauth-test", + "--id", "1", + "--required-claim-name", "can_access", + }, + authSource: &auth.Source{ + Type: auth.OAuth2, + Cfg: &oauth2.Source{ + CustomURLMapping: &oauth2.CustomURLMapping{}, + RequiredClaimName: "can_access", + }, + }, + }, + // case 15 + { + args: []string{ + "oauth-test", + "--id", "1", + "--required-claim-value", "yes", + }, + authSource: &auth.Source{ + Type: auth.OAuth2, + Cfg: &oauth2.Source{ + CustomURLMapping: &oauth2.CustomURLMapping{}, + RequiredClaimValue: "yes", + }, + }, + }, + // case 16 + { + args: []string{ + "oauth-test", + "--id", "1", + "--group-claim-name", "groups", + }, + authSource: &auth.Source{ + Type: auth.OAuth2, + Cfg: &oauth2.Source{ + CustomURLMapping: &oauth2.CustomURLMapping{}, + GroupClaimName: "groups", + }, + }, + }, + // case 17 + { + args: []string{ + "oauth-test", + "--id", "1", + "--admin-group", "admin", + }, + authSource: &auth.Source{ + Type: auth.OAuth2, + Cfg: &oauth2.Source{ + CustomURLMapping: &oauth2.CustomURLMapping{}, + AdminGroup: "admin", + }, + }, + }, + // case 18 + { + args: []string{ + "oauth-test", + "--id", "1", + "--restricted-group", "restricted", + }, + authSource: &auth.Source{ + Type: auth.OAuth2, + Cfg: &oauth2.Source{ + CustomURLMapping: &oauth2.CustomURLMapping{}, + RestrictedGroup: "restricted", + }, + }, + }, + // case 19 + { + args: []string{ + "oauth-test", + "--id", "1", + "--group-team-map", `{"org_a_team_1": {"organization-a": ["Team 1"]}, "org_a_all_teams": {"organization-a": ["Team 1", "Team 2", "Team 3"]}}`, + }, + authSource: &auth.Source{ + Type: auth.OAuth2, + Cfg: &oauth2.Source{ + CustomURLMapping: &oauth2.CustomURLMapping{}, + GroupTeamMap: `{"org_a_team_1": {"organization-a": ["Team 1"]}, "org_a_all_teams": {"organization-a": ["Team 1", "Team 2", "Team 3"]}}`, + }, + }, + }, + // case 20 + { + args: []string{ + "oauth-test", + "--id", "1", + "--group-team-map-removal", + }, + authSource: &auth.Source{ + Type: auth.OAuth2, + Cfg: &oauth2.Source{ + CustomURLMapping: &oauth2.CustomURLMapping{}, + GroupTeamMapRemoval: true, + }, + }, + }, + // case 21 + { + args: []string{ + "oauth-test", + "--id", "23", + "--group-team-map-removal=false", + }, + id: 23, + existingAuthSource: &auth.Source{ + Type: auth.OAuth2, + Cfg: &oauth2.Source{ + GroupTeamMapRemoval: true, + }, + }, + authSource: &auth.Source{ + Type: auth.OAuth2, + Cfg: &oauth2.Source{ + CustomURLMapping: &oauth2.CustomURLMapping{}, + GroupTeamMapRemoval: false, + }, + }, + }, + // case 22 + { + args: []string{ + "oauth-test", + }, + errMsg: "--id flag is missing", + }, + } + + for n, c := range cases { + // Mock functions. + var updatedAuthSource *auth.Source + service := &authService{ + initDB: func(context.Context) error { + return nil + }, + createAuthSource: func(ctx context.Context, authSource *auth.Source) error { + assert.FailNow(t, "should not call createAuthSource", "case: %d", n) + return nil + }, + updateAuthSource: func(ctx context.Context, authSource *auth.Source) error { + updatedAuthSource = authSource + return nil + }, + getAuthSourceByID: func(ctx context.Context, id int64) (*auth.Source, error) { + if c.id != 0 { + assert.Equal(t, c.id, id, "case %d: wrong id", n) + } + if c.existingAuthSource != nil { + return c.existingAuthSource, nil + } + return &auth.Source{ + Type: auth.OAuth2, + Cfg: &oauth2.Source{}, + }, nil + }, + } + + // Create a copy of command to test + app := cli.Command{} + app.Flags = microcmdAuthUpdateOauth().Flags + app.Action = service.updateOauth + + // Run it + err := app.Run(t.Context(), c.args) + if c.errMsg != "" { + assert.EqualError(t, err, c.errMsg, "case %d: error should match", n) + } else { + require.NoError(t, err, "case %d: should have no errors", n) + assert.Equal(t, c.authSource, updatedAuthSource, "case %d: wrong authSource", n) + } + } +} diff --git a/cmd/manager_logging.go b/cmd/manager_logging.go index c543afe872..c18bfa919b 100644 --- a/cmd/manager_logging.go +++ b/cmd/manager_logging.go @@ -44,6 +44,11 @@ func defaultLoggingFlags() []cli.Flag { Aliases: []string{"e"}, Usage: "Matching expression for the logger", }, + &cli.StringFlag{ + Name: "exclusion", + Aliases: []string{"x"}, + Usage: "Exclusion for the logger", + }, &cli.StringFlag{ Name: "prefix", Aliases: []string{"p"}, @@ -286,6 +291,9 @@ func commonAddLogger(ctx context.Context, c *cli.Command, mode string, vals map[ if len(c.String("expression")) > 0 { vals["expression"] = c.String("expression") } + if len(c.String("exclusion")) > 0 { + vals["exclusion"] = c.String("exclusion") + } if len(c.String("prefix")) > 0 { vals["prefix"] = c.String("prefix") } diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index 1b8d4c6697..71598663b2 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -631,6 +631,7 @@ LEVEL = Info ;LEVEL= ;FLAGS = stdflags or journald ;EXPRESSION = +;EXCLUSION = ;PREFIX = ;COLORIZE = false ;; @@ -1767,6 +1768,9 @@ LEVEL = Info ;; Use PASSWD = `your password` for quoting if you use special characters in the password. ;PASSWD = ;; +;; Alternative location to specify mailer password. You cannot specify both this and PASSWD, and must pick one +;PASSWD_URI = file:/etc/forgejo/mailer_passwd +;; ;; Send mails only in plain text, without HTML alternative ;SEND_AS_PLAIN_TEXT = false ;; @@ -1819,6 +1823,9 @@ LEVEL = Info ;; Password of the receiving account ;PASSWORD = ;; +;; Alternative location to specify password of the receiving account. You cannot specify both this and PASSWORD, and must pick one +;PASSWORD_URI = file:/etc/forgejo/email_incoming_password +;; ;; Whether the IMAP server uses TLS. ;USE_TLS = false ;; diff --git a/go.mod b/go.mod index 33ad5dbc67..139095099b 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module forgejo.org go 1.24 -toolchain go1.24.4 +toolchain go1.24.5 require ( code.forgejo.org/f3/gof3/v3 v3.11.0 @@ -24,7 +24,7 @@ require ( github.com/ProtonMail/go-crypto v1.3.0 github.com/PuerkitoBio/goquery v1.10.3 github.com/SaveTheRbtz/zstd-seekable-format-go/pkg v0.7.2 - github.com/alecthomas/chroma/v2 v2.18.0 + github.com/alecthomas/chroma/v2 v2.19.0 github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb github.com/blevesearch/bleve/v2 v2.5.2 github.com/buildkite/terminal-to-html/v3 v3.16.8 @@ -42,21 +42,21 @@ require ( github.com/go-ap/activitypub v0.0.0-20231114162308-e219254dc5c9 github.com/go-ap/jsonld v0.0.0-20221030091449-f2a191312c73 github.com/go-chi/chi/v5 v5.2.2 - github.com/go-chi/cors v1.2.1 + github.com/go-chi/cors v1.2.2 github.com/go-co-op/gocron v1.37.0 github.com/go-enry/go-enry/v2 v2.9.2 github.com/go-git/go-git/v5 v5.13.2 github.com/go-ldap/ldap/v3 v3.4.6 github.com/go-openapi/spec v0.21.0 github.com/go-sql-driver/mysql v1.9.3 - github.com/go-webauthn/webauthn v0.13.0 + github.com/go-webauthn/webauthn v0.13.1 github.com/gobwas/glob v0.2.3 github.com/gogs/chardet v0.0.0-20211120154057-b7413eaefb8f github.com/gogs/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 github.com/google/go-github/v64 v64.0.0 - github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e + github.com/google/pprof v0.0.0-20250630185457-6e76a2b096b5 github.com/google/uuid v1.6.0 github.com/gorilla/feeds v1.2.0 github.com/gorilla/sessions v1.4.0 @@ -99,13 +99,13 @@ require ( github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc gitlab.com/gitlab-org/api/client-go v0.130.1 go.uber.org/mock v0.5.2 - golang.org/x/crypto v0.39.0 + golang.org/x/crypto v0.40.0 golang.org/x/image v0.27.0 - golang.org/x/net v0.41.0 + golang.org/x/net v0.42.0 golang.org/x/oauth2 v0.30.0 - golang.org/x/sync v0.15.0 - golang.org/x/sys v0.33.0 - golang.org/x/text v0.26.0 + golang.org/x/sync v0.16.0 + golang.org/x/sys v0.34.0 + golang.org/x/text v0.27.0 google.golang.org/protobuf v1.36.4 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df gopkg.in/ini.v1 v1.67.0 @@ -170,7 +170,7 @@ require ( github.com/go-openapi/jsonpointer v0.21.1 // indirect github.com/go-openapi/jsonreference v0.21.0 // indirect github.com/go-openapi/swag v0.23.1 // indirect - github.com/go-webauthn/x v0.1.21 // indirect + github.com/go-webauthn/x v0.1.22 // indirect github.com/goccy/go-json v0.10.5 // indirect github.com/golang-jwt/jwt/v4 v4.5.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect @@ -244,7 +244,7 @@ require ( replace github.com/hashicorp/go-version => github.com/6543/go-version v1.3.1 -replace github.com/nektos/act => code.forgejo.org/forgejo/act v1.28.0 +replace github.com/nektos/act => code.forgejo.org/forgejo/act v1.29.0 replace github.com/mholt/archiver/v3 => code.forgejo.org/forgejo/archiver/v3 v3.5.1 diff --git a/go.sum b/go.sum index 45497a1b49..3c906b45c6 100644 --- a/go.sum +++ b/go.sum @@ -4,8 +4,8 @@ code.forgejo.org/f3/gof3/v3 v3.11.0 h1:f/xToKwqTgxG6PYxvewywjDQyCcyHEEJ6sZqUitFs code.forgejo.org/f3/gof3/v3 v3.11.0/go.mod h1:4FaRUNSQGBiD1M0DuB0yNv+Z2wMtlOeckgygHSSq4KQ= code.forgejo.org/forgejo-contrib/go-libravatar v0.0.0-20191008002943-06d1c002b251 h1:HTZl3CBk3ABNYtFI6TPLvJgGKFIhKT5CBk0sbOtkDKU= code.forgejo.org/forgejo-contrib/go-libravatar v0.0.0-20191008002943-06d1c002b251/go.mod h1:PphB88CPbx601QrWPMZATeorACeVmQlyv3u+uUMbSaM= -code.forgejo.org/forgejo/act v1.28.0 h1:96njNC7C1YNyjWq5OWvLZMF/nw0PMthzIA8Nwbnn7jo= -code.forgejo.org/forgejo/act v1.28.0/go.mod h1:dFuiwAmD5vyrzecysHB2kL/GM3wRpoVPl+WdbCTC8Bs= +code.forgejo.org/forgejo/act v1.29.0 h1:CPiI0LRPU0f6gUdQj1ZVax0ySc8CfegY4hiRsymdZU0= +code.forgejo.org/forgejo/act v1.29.0/go.mod h1:RPqtuaI2FkC1SVOaYCRODo5jIfoMTBVgEOOP3Sdiuh4= code.forgejo.org/forgejo/archiver/v3 v3.5.1 h1:UmmbA7D5550uf71SQjarmrn6yKwOGxtEjb3jaYYtmSE= code.forgejo.org/forgejo/archiver/v3 v3.5.1/go.mod h1:e3dqJ7H78uzsRSEACH1joayhuSyhnonssnDhppzS1L4= code.forgejo.org/forgejo/go-rpmutils v1.0.0 h1:RZGGeKt70p/WaIEL97pyT6uiiEIoN8/aLmS5Z6WmX0M= @@ -62,8 +62,8 @@ github.com/SaveTheRbtz/zstd-seekable-format-go/pkg v0.7.2/go.mod h1:JitQWJ8JuV4Y github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0= github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= github.com/alecthomas/chroma/v2 v2.2.0/go.mod h1:vf4zrexSH54oEjJ7EdB65tGNHmH3pGZmVkgTP5RHvAs= -github.com/alecthomas/chroma/v2 v2.18.0 h1:6h53Q4hW83SuF+jcsp7CVhLsMozzvQvO8HBbKQW+gn4= -github.com/alecthomas/chroma/v2 v2.18.0/go.mod h1:RVX6AvYm4VfYe/zsk7mjHueLDZor3aWCNE14TFlepBk= +github.com/alecthomas/chroma/v2 v2.19.0 h1:Im+SLRgT8maArxv81mULDWN8oKxkzboH07CHesxElq4= +github.com/alecthomas/chroma/v2 v2.19.0/go.mod h1:RVX6AvYm4VfYe/zsk7mjHueLDZor3aWCNE14TFlepBk= github.com/alecthomas/repr v0.0.0-20220113201626-b1b626ac65ae/go.mod h1:2kn6fqh/zIyPLmm3ugklbEi5hg5wS435eygvNfaDQL8= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= @@ -215,8 +215,8 @@ github.com/go-asn1-ber/asn1-ber v1.5.5/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkPro github.com/go-chi/chi/v5 v5.0.1/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/go-chi/chi/v5 v5.2.2 h1:CMwsvRVTbXVytCk1Wd72Zy1LAsAh9GxMmSNWLHCG618= github.com/go-chi/chi/v5 v5.2.2/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops= -github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4= -github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58= +github.com/go-chi/cors v1.2.2 h1:Jmey33TE+b+rB7fT8MUy1u0I4L+NARQlK6LhzKPSyQE= +github.com/go-chi/cors v1.2.2/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58= github.com/go-co-op/gocron v1.37.0 h1:ZYDJGtQ4OMhTLKOKMIch+/CY70Brbb1dGdooLEhh7b0= github.com/go-co-op/gocron v1.37.0/go.mod h1:3L/n6BkO7ABj+TrfSVXLRzsP26zmikL4ISkLQ0O8iNY= github.com/go-enry/go-enry/v2 v2.9.2 h1:giOQAtCgBX08kosrX818DCQJTCNtKwoPBGu0qb6nKTY= @@ -250,10 +250,10 @@ github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI6 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-test/deep v1.1.1 h1:0r/53hagsehfO4bzD2Pgr/+RgHqhmf+k1Bpse2cTu1U= github.com/go-test/deep v1.1.1/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE= -github.com/go-webauthn/webauthn v0.13.0 h1:cJIL1/1l+22UekVhipziAaSgESJxokYkowUqAIsWs0Y= -github.com/go-webauthn/webauthn v0.13.0/go.mod h1:Oy9o2o79dbLKRPZWWgRIOdtBGAhKnDIaBp2PFkICRHs= -github.com/go-webauthn/x v0.1.21 h1:nFbckQxudvHEJn2uy1VEi713MeSpApoAv9eRqsb9AdQ= -github.com/go-webauthn/x v0.1.21/go.mod h1:sEYohtg1zL4An1TXIUIQ5csdmoO+WO0R4R2pGKaHYKA= +github.com/go-webauthn/webauthn v0.13.1 h1:Q3/GLXsckVJUPE+BGR6ex26yRIiZ/X2ITaMeSkOftuc= +github.com/go-webauthn/webauthn v0.13.1/go.mod h1:HeaBromTjgMg1sHZOzyjEiqcrk4Og7mxafDTWDepaXI= +github.com/go-webauthn/x v0.1.22 h1:rHilV/rYXawarI0uA3uZ5nhLb30Ex8RgbVAsOSt/57o= +github.com/go-webauthn/x v0.1.22/go.mod h1:+iV9BF4OsvLYzETdc0lmQO2webTos10oH6QydSoWxDM= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM= @@ -307,8 +307,8 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/ github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= -github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs= -github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA= +github.com/google/pprof v0.0.0-20250630185457-6e76a2b096b5 h1:xhMrHhTJ6zxu3gA4enFM9MLn9AY7613teCdFnlUVbSQ= +github.com/google/pprof v0.0.0-20250630185457-6e76a2b096b5/go.mod h1:5hDyRhoBCxViHszMt12TnOpEI4VVi+U8Gm9iphldiMA= github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= @@ -585,8 +585,8 @@ golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliY golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= -golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM= -golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U= +golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM= +golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY= golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/image v0.27.0 h1:C8gA4oWU/tKkdCfYT6T2u4faJu3MeNS5O8UPWlPF61w= @@ -614,8 +614,8 @@ golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= -golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw= -golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA= +golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs= +golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8= golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI= golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -627,8 +627,8 @@ golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8= -golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw= +golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -654,8 +654,8 @@ golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= -golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA= +golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -665,8 +665,8 @@ golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= -golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg= -golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ= +golang.org/x/term v0.33.0 h1:NuFncQrRcaRvVmgRkvM3j/F00gWIAlcmlB8ACEKmGIg= +golang.org/x/term v0.33.0/go.mod h1:s18+ql9tYWp1IfpV9DmCtQDDSRBUjKaw9M1eAv5UeF0= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -677,8 +677,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= -golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M= -golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA= +golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4= +golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU= golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0= golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/models/actions/run.go b/models/actions/run.go index 55def805ed..69592120e9 100644 --- a/models/actions/run.go +++ b/models/actions/run.go @@ -284,16 +284,10 @@ func GetLatestRun(ctx context.Context, repoID int64) (*ActionRun, error) { return &run, nil } -// GetRunBefore returns the last run that completed a given timestamp (not inclusive). -func GetRunBefore(ctx context.Context, repoID int64, timestamp timeutil.TimeStamp) (*ActionRun, error) { - var run ActionRun - has, err := db.GetEngine(ctx).Where("repo_id=? AND stopped IS NOT NULL AND stoppedmalicious /'?&" + description: "Malicious label ' " + color: '#000000' + exclusive: true + num_issues: 0 + num_closed_issues: 0 + archived_unix: 0 + +- + id: 12 + repo_id: 3 + org_id: 0 + name: 'archived label<>' + color: '#000000' + exclusive: false + num_issues: 0 + num_closed_issues: 0 + archived_unix: 2991092130 diff --git a/models/fixtures/login_source.yml b/models/fixtures/login_source.yml deleted file mode 100644 index ca780a73aa..0000000000 --- a/models/fixtures/login_source.yml +++ /dev/null @@ -1 +0,0 @@ -[] # empty diff --git a/models/fixtures/protected_branch.yml b/models/fixtures/protected_branch.yml deleted file mode 100644 index ca780a73aa..0000000000 --- a/models/fixtures/protected_branch.yml +++ /dev/null @@ -1 +0,0 @@ -[] # empty diff --git a/models/fixtures/pull_auto_merge.yml b/models/fixtures/pull_auto_merge.yml deleted file mode 100644 index ca780a73aa..0000000000 --- a/models/fixtures/pull_auto_merge.yml +++ /dev/null @@ -1 +0,0 @@ -[] # empty diff --git a/models/fixtures/push_mirror.yml b/models/fixtures/push_mirror.yml deleted file mode 100644 index ca780a73aa..0000000000 --- a/models/fixtures/push_mirror.yml +++ /dev/null @@ -1 +0,0 @@ -[] # empty diff --git a/models/fixtures/repo_archiver.yml b/models/fixtures/repo_archiver.yml deleted file mode 100644 index ca780a73aa..0000000000 --- a/models/fixtures/repo_archiver.yml +++ /dev/null @@ -1 +0,0 @@ -[] # empty diff --git a/models/fixtures/repo_indexer_status.yml b/models/fixtures/repo_indexer_status.yml deleted file mode 100644 index ca780a73aa..0000000000 --- a/models/fixtures/repo_indexer_status.yml +++ /dev/null @@ -1 +0,0 @@ -[] # empty diff --git a/models/fixtures/secret.yml b/models/fixtures/secret.yml deleted file mode 100644 index ca780a73aa..0000000000 --- a/models/fixtures/secret.yml +++ /dev/null @@ -1 +0,0 @@ -[] # empty diff --git a/models/forgejo_migrations/main_test.go b/models/forgejo_migrations/main_test.go index 031fe8090d..2246e327f0 100644 --- a/models/forgejo_migrations/main_test.go +++ b/models/forgejo_migrations/main_test.go @@ -1,7 +1,7 @@ // Copyright 2023 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT -package forgejo_migrations //nolint:revive +package forgejo_migrations import ( "testing" diff --git a/models/forgejo_migrations/migrate.go b/models/forgejo_migrations/migrate.go index 737350b019..fcea69d23f 100644 --- a/models/forgejo_migrations/migrate.go +++ b/models/forgejo_migrations/migrate.go @@ -1,7 +1,7 @@ // Copyright 2023 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT -package forgejo_migrations //nolint:revive +package forgejo_migrations import ( "context" @@ -108,7 +108,9 @@ var migrations = []*Migration{ // v33 -> v34 NewMigration("Add `notify-email` column to `action_run` table", AddNotifyEmailToActionRun), // v34 -> v35 - NewMigration("Add index to `stopped` column in `action_run` table", AddIndexToActionRunStopped), + NewMigration("Noop because of https://codeberg.org/forgejo/forgejo/issues/8373", NoopAddIndexToActionRunStopped), + // v35 -> v36 + NewMigration("Fix wiki unit default permission", FixWikiUnitDefaultPermission), } // GetCurrentDBVersion returns the current Forgejo database version. diff --git a/models/forgejo_migrations/migrate_test.go b/models/forgejo_migrations/migrate_test.go index 20653929a3..9d16c9fe1c 100644 --- a/models/forgejo_migrations/migrate_test.go +++ b/models/forgejo_migrations/migrate_test.go @@ -1,7 +1,7 @@ // Copyright 2023 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT -package forgejo_migrations //nolint:revive +package forgejo_migrations import ( "testing" diff --git a/models/forgejo_migrations/v13.go b/models/forgejo_migrations/v13.go index 614f68249d..ba4183885e 100644 --- a/models/forgejo_migrations/v13.go +++ b/models/forgejo_migrations/v13.go @@ -1,7 +1,7 @@ // Copyright 2024 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT -package forgejo_migrations //nolint:revive +package forgejo_migrations import "xorm.io/xorm" diff --git a/models/forgejo_migrations/v14.go b/models/forgejo_migrations/v14.go index 53f1ef2223..65b857d343 100644 --- a/models/forgejo_migrations/v14.go +++ b/models/forgejo_migrations/v14.go @@ -1,7 +1,7 @@ // Copyright 2024 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT -package forgejo_migrations //nolint:revive +package forgejo_migrations import ( "forgejo.org/models/migrations/base" diff --git a/models/forgejo_migrations/v15.go b/models/forgejo_migrations/v15.go index 5e5588dd05..a63199ab19 100644 --- a/models/forgejo_migrations/v15.go +++ b/models/forgejo_migrations/v15.go @@ -1,7 +1,7 @@ // Copyright 2024 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT -package forgejo_migrations //nolint:revive +package forgejo_migrations import ( "time" diff --git a/models/forgejo_migrations/v16.go b/models/forgejo_migrations/v16.go index f80bfc5268..a7d4d5d590 100644 --- a/models/forgejo_migrations/v16.go +++ b/models/forgejo_migrations/v16.go @@ -1,7 +1,7 @@ // Copyright 2024 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT -package forgejo_migrations //nolint:revive +package forgejo_migrations import "xorm.io/xorm" diff --git a/models/forgejo_migrations/v17.go b/models/forgejo_migrations/v17.go index d6e2983d00..8ef6f2c681 100644 --- a/models/forgejo_migrations/v17.go +++ b/models/forgejo_migrations/v17.go @@ -1,7 +1,7 @@ // Copyright 2024 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT -package forgejo_migrations //nolint:revive +package forgejo_migrations import "xorm.io/xorm" diff --git a/models/forgejo_migrations/v18.go b/models/forgejo_migrations/v18.go index e6c1493f0e..e39b0cbf10 100644 --- a/models/forgejo_migrations/v18.go +++ b/models/forgejo_migrations/v18.go @@ -1,7 +1,7 @@ // Copyright 2024 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT -package forgejo_migrations //nolint:revive +package forgejo_migrations import "xorm.io/xorm" diff --git a/models/forgejo_migrations/v19.go b/models/forgejo_migrations/v19.go index 69b7746eb1..43d279dcb0 100644 --- a/models/forgejo_migrations/v19.go +++ b/models/forgejo_migrations/v19.go @@ -1,7 +1,7 @@ // Copyright 2024 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT -package forgejo_migrations //nolint:revive +package forgejo_migrations import "xorm.io/xorm" diff --git a/models/forgejo_migrations/v1_20/v1.go b/models/forgejo_migrations/v1_20/v1.go index 72beaf23de..f0cb125557 100644 --- a/models/forgejo_migrations/v1_20/v1.go +++ b/models/forgejo_migrations/v1_20/v1.go @@ -1,7 +1,7 @@ // Copyright 2023 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT -package forgejo_v1_20 //nolint:revive +package forgejo_v1_20 import ( "forgejo.org/modules/timeutil" diff --git a/models/forgejo_migrations/v1_20/v2.go b/models/forgejo_migrations/v1_20/v2.go index 39f3b58924..3f79ac3801 100644 --- a/models/forgejo_migrations/v1_20/v2.go +++ b/models/forgejo_migrations/v1_20/v2.go @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -package forgejo_v1_20 //nolint:revive +package forgejo_v1_20 import ( "xorm.io/xorm" diff --git a/models/forgejo_migrations/v1_20/v3.go b/models/forgejo_migrations/v1_20/v3.go index cce227e6eb..49530df556 100644 --- a/models/forgejo_migrations/v1_20/v3.go +++ b/models/forgejo_migrations/v1_20/v3.go @@ -1,7 +1,7 @@ // Copyright 2023 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT -package forgejo_v1_20 //nolint:revive +package forgejo_v1_20 import ( "forgejo.org/modules/timeutil" diff --git a/models/forgejo_migrations/v1_22/main_test.go b/models/forgejo_migrations/v1_22/main_test.go index 03c4c5272c..d6a5bdacee 100644 --- a/models/forgejo_migrations/v1_22/main_test.go +++ b/models/forgejo_migrations/v1_22/main_test.go @@ -1,7 +1,7 @@ // Copyright 2024 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import ( "testing" diff --git a/models/forgejo_migrations/v1_22/v10.go b/models/forgejo_migrations/v1_22/v10.go index 819800ae71..cf45abdd24 100644 --- a/models/forgejo_migrations/v1_22/v10.go +++ b/models/forgejo_migrations/v1_22/v10.go @@ -1,7 +1,7 @@ // Copyright 2024 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import ( "xorm.io/xorm" diff --git a/models/forgejo_migrations/v1_22/v11.go b/models/forgejo_migrations/v1_22/v11.go index 17bb592379..f0f92bd04c 100644 --- a/models/forgejo_migrations/v1_22/v11.go +++ b/models/forgejo_migrations/v1_22/v11.go @@ -1,7 +1,7 @@ // Copyright 2024 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import ( "forgejo.org/modules/timeutil" diff --git a/models/forgejo_migrations/v1_22/v12.go b/models/forgejo_migrations/v1_22/v12.go index 6822524705..51354bd3c2 100644 --- a/models/forgejo_migrations/v1_22/v12.go +++ b/models/forgejo_migrations/v1_22/v12.go @@ -1,7 +1,7 @@ // Copyright 2024 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import "xorm.io/xorm" diff --git a/models/forgejo_migrations/v1_22/v4.go b/models/forgejo_migrations/v1_22/v4.go index f1195f5f66..499d377bb4 100644 --- a/models/forgejo_migrations/v1_22/v4.go +++ b/models/forgejo_migrations/v1_22/v4.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import ( "xorm.io/xorm" diff --git a/models/forgejo_migrations/v1_22/v5.go b/models/forgejo_migrations/v1_22/v5.go index 55f9fe1338..1671d3eed2 100644 --- a/models/forgejo_migrations/v1_22/v5.go +++ b/models/forgejo_migrations/v1_22/v5.go @@ -1,7 +1,7 @@ // Copyright 2024 The Forgejo Authors c/o Codeberg e.V.. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import ( "xorm.io/xorm" diff --git a/models/forgejo_migrations/v1_22/v6.go b/models/forgejo_migrations/v1_22/v6.go index 1a4874872c..072f8e6a15 100644 --- a/models/forgejo_migrations/v1_22/v6.go +++ b/models/forgejo_migrations/v1_22/v6.go @@ -1,7 +1,7 @@ // Copyright 2024 The Forgejo Authors c/o Codeberg e.V.. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import ( "xorm.io/xorm" diff --git a/models/forgejo_migrations/v1_22/v7.go b/models/forgejo_migrations/v1_22/v7.go index b42dd1af67..e7f6eb412b 100644 --- a/models/forgejo_migrations/v1_22/v7.go +++ b/models/forgejo_migrations/v1_22/v7.go @@ -1,7 +1,7 @@ // Copyright 2024 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import ( "xorm.io/xorm" diff --git a/models/forgejo_migrations/v1_22/v8.go b/models/forgejo_migrations/v1_22/v8.go index 2d3c0c594b..f23b00d2ad 100644 --- a/models/forgejo_migrations/v1_22/v8.go +++ b/models/forgejo_migrations/v1_22/v8.go @@ -1,7 +1,7 @@ // Copyright 2024 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import ( "strings" diff --git a/models/forgejo_migrations/v1_22/v8_test.go b/models/forgejo_migrations/v1_22/v8_test.go index baaba7290f..5117dd2dfb 100644 --- a/models/forgejo_migrations/v1_22/v8_test.go +++ b/models/forgejo_migrations/v1_22/v8_test.go @@ -1,7 +1,7 @@ // Copyright 2024 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import ( "testing" diff --git a/models/forgejo_migrations/v1_22/v9.go b/models/forgejo_migrations/v1_22/v9.go index 34c2844c39..e3cdea97f2 100644 --- a/models/forgejo_migrations/v1_22/v9.go +++ b/models/forgejo_migrations/v1_22/v9.go @@ -1,7 +1,7 @@ // Copyright 2024 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import "xorm.io/xorm" diff --git a/models/forgejo_migrations/v20.go b/models/forgejo_migrations/v20.go index 8ca9e91f73..91c7b8e911 100644 --- a/models/forgejo_migrations/v20.go +++ b/models/forgejo_migrations/v20.go @@ -1,7 +1,7 @@ // Copyright 2024 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT -package forgejo_migrations //nolint:revive +package forgejo_migrations import "xorm.io/xorm" diff --git a/models/forgejo_migrations/v21.go b/models/forgejo_migrations/v21.go index 53f141b2ab..61d7950c5a 100644 --- a/models/forgejo_migrations/v21.go +++ b/models/forgejo_migrations/v21.go @@ -1,7 +1,7 @@ // Copyright 2024 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT -package forgejo_migrations //nolint:revive +package forgejo_migrations import "xorm.io/xorm" diff --git a/models/forgejo_migrations/v22.go b/models/forgejo_migrations/v22.go index eeb738799c..8078591da6 100644 --- a/models/forgejo_migrations/v22.go +++ b/models/forgejo_migrations/v22.go @@ -1,7 +1,7 @@ // Copyright 2024 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT -package forgejo_migrations //nolint:revive +package forgejo_migrations import "xorm.io/xorm" diff --git a/models/forgejo_migrations/v23.go b/models/forgejo_migrations/v23.go index 20a916a716..a79a4f3d6e 100644 --- a/models/forgejo_migrations/v23.go +++ b/models/forgejo_migrations/v23.go @@ -1,7 +1,7 @@ // Copyright 2024 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT -package forgejo_migrations //nolint:revive +package forgejo_migrations import "xorm.io/xorm" diff --git a/models/forgejo_migrations/v24.go b/models/forgejo_migrations/v24.go index ebfb5fc1c4..084a57e1ce 100644 --- a/models/forgejo_migrations/v24.go +++ b/models/forgejo_migrations/v24.go @@ -1,7 +1,7 @@ // Copyright 2024 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT -package forgejo_migrations //nolint:revive +package forgejo_migrations import "xorm.io/xorm" diff --git a/models/forgejo_migrations/v25.go b/models/forgejo_migrations/v25.go index 8e3032a40c..56cde499a3 100644 --- a/models/forgejo_migrations/v25.go +++ b/models/forgejo_migrations/v25.go @@ -1,7 +1,7 @@ // Copyright 2024 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT -package forgejo_migrations //nolint:revive +package forgejo_migrations import ( "context" diff --git a/models/forgejo_migrations/v25_test.go b/models/forgejo_migrations/v25_test.go index e7402fd021..68e71da012 100644 --- a/models/forgejo_migrations/v25_test.go +++ b/models/forgejo_migrations/v25_test.go @@ -1,7 +1,7 @@ // Copyright 2024 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT -package forgejo_migrations //nolint:revive +package forgejo_migrations import ( "testing" diff --git a/models/forgejo_migrations/v26.go b/models/forgejo_migrations/v26.go index 3292d93ffd..a0c47799c2 100644 --- a/models/forgejo_migrations/v26.go +++ b/models/forgejo_migrations/v26.go @@ -1,7 +1,7 @@ // Copyright 2024 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT -package forgejo_migrations //nolint:revive +package forgejo_migrations import "xorm.io/xorm" diff --git a/models/forgejo_migrations/v27.go b/models/forgejo_migrations/v27.go index 2efa3485a8..9cfbc64370 100644 --- a/models/forgejo_migrations/v27.go +++ b/models/forgejo_migrations/v27.go @@ -1,7 +1,7 @@ // Copyright 2024 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: GPL-3.0-or-later -package forgejo_migrations //nolint:revive +package forgejo_migrations import ( "forgejo.org/modules/timeutil" diff --git a/models/forgejo_migrations/v28.go b/models/forgejo_migrations/v28.go index cba888d2ec..19f0dcd862 100644 --- a/models/forgejo_migrations/v28.go +++ b/models/forgejo_migrations/v28.go @@ -1,7 +1,7 @@ // Copyright 2024 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT -package forgejo_migrations //nolint:revive +package forgejo_migrations import "xorm.io/xorm" diff --git a/models/forgejo_migrations/v29.go b/models/forgejo_migrations/v29.go index d0c2f723ae..92eb05e8b3 100644 --- a/models/forgejo_migrations/v29.go +++ b/models/forgejo_migrations/v29.go @@ -1,7 +1,7 @@ // Copyright 2025 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT -package forgejo_migrations //nolint:revive +package forgejo_migrations import ( "database/sql" diff --git a/models/forgejo_migrations/v30.go b/models/forgejo_migrations/v30.go index 6c41a55316..05a1dff898 100644 --- a/models/forgejo_migrations/v30.go +++ b/models/forgejo_migrations/v30.go @@ -1,7 +1,7 @@ // Copyright 2025 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT -package forgejo_migrations //nolint:revive +package forgejo_migrations import ( "time" diff --git a/models/forgejo_migrations/v30_test.go b/models/forgejo_migrations/v30_test.go index f826dab815..152fddeb47 100644 --- a/models/forgejo_migrations/v30_test.go +++ b/models/forgejo_migrations/v30_test.go @@ -1,7 +1,7 @@ // Copyright 2025 The Forgejo Authors. // SPDX-License-Identifier: GPL-3.0-or-later -package forgejo_migrations //nolint:revive +package forgejo_migrations import ( "testing" diff --git a/models/forgejo_migrations/v31.go b/models/forgejo_migrations/v31.go index fdcab21b1a..23397c7c13 100644 --- a/models/forgejo_migrations/v31.go +++ b/models/forgejo_migrations/v31.go @@ -1,7 +1,7 @@ // Copyright 2025 The Forgejo Authors. // SPDX-License-Identifier: GPL-3.0-or-later -package forgejo_migrations //nolint:revive +package forgejo_migrations import ( "xorm.io/xorm" diff --git a/models/forgejo_migrations/v31_test.go b/models/forgejo_migrations/v31_test.go index 5b4aac2a60..6d1690aae0 100644 --- a/models/forgejo_migrations/v31_test.go +++ b/models/forgejo_migrations/v31_test.go @@ -1,7 +1,7 @@ // Copyright 2025 The Forgejo Authors. // SPDX-License-Identifier: GPL-3.0-or-later -package forgejo_migrations //nolint:revive +package forgejo_migrations import ( "testing" diff --git a/models/forgejo_migrations/v32.go b/models/forgejo_migrations/v32.go index bed335ab6b..81b22c585c 100644 --- a/models/forgejo_migrations/v32.go +++ b/models/forgejo_migrations/v32.go @@ -1,7 +1,7 @@ // Copyright 2025 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: GPL-3.0-or-later -package forgejo_migrations //nolint:revive +package forgejo_migrations import ( "encoding/xml" diff --git a/models/forgejo_migrations/v32_test.go b/models/forgejo_migrations/v32_test.go index cd33de2608..24cda891bc 100644 --- a/models/forgejo_migrations/v32_test.go +++ b/models/forgejo_migrations/v32_test.go @@ -1,7 +1,7 @@ // Copyright 2025 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: GPL-3.0-or-later -package forgejo_migrations //nolint:revive +package forgejo_migrations import ( "bytes" diff --git a/models/forgejo_migrations/v33.go b/models/forgejo_migrations/v33.go index 272035fc23..b9ea8efe47 100644 --- a/models/forgejo_migrations/v33.go +++ b/models/forgejo_migrations/v33.go @@ -1,7 +1,7 @@ // Copyright 2025 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT -package forgejo_migrations //nolint:revive +package forgejo_migrations import ( "fmt" diff --git a/models/forgejo_migrations/v33_test.go b/models/forgejo_migrations/v33_test.go index 664c704bbc..1d3298da15 100644 --- a/models/forgejo_migrations/v33_test.go +++ b/models/forgejo_migrations/v33_test.go @@ -1,7 +1,7 @@ // Copyright 2025 The Forgejo Authors. // SPDX-License-Identifier: GPL-3.0-or-later -package forgejo_migrations //nolint:revive +package forgejo_migrations import ( "testing" diff --git a/models/forgejo_migrations/v34.go b/models/forgejo_migrations/v34.go index 9e958b934f..d193d799e7 100644 --- a/models/forgejo_migrations/v34.go +++ b/models/forgejo_migrations/v34.go @@ -1,7 +1,7 @@ // Copyright 2025 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: GPL-3.0-or-later -package forgejo_migrations //nolint:revive +package forgejo_migrations import "xorm.io/xorm" diff --git a/models/forgejo_migrations/v35.go b/models/forgejo_migrations/v35.go index 0fb3b43e2c..9b389fcc12 100644 --- a/models/forgejo_migrations/v35.go +++ b/models/forgejo_migrations/v35.go @@ -1,19 +1,13 @@ // Copyright 2025 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: GPL-3.0-or-later -package forgejo_migrations //nolint:revive +package forgejo_migrations import ( - "forgejo.org/modules/timeutil" - "xorm.io/xorm" ) -func AddIndexToActionRunStopped(x *xorm.Engine) error { - type ActionRun struct { - ID int64 - Stopped timeutil.TimeStamp `xorm:"index"` - } - - return x.Sync(&ActionRun{}) +// see https://codeberg.org/forgejo/forgejo/issues/8373 +func NoopAddIndexToActionRunStopped(x *xorm.Engine) error { + return nil } diff --git a/models/forgejo_migrations/v36.go b/models/forgejo_migrations/v36.go new file mode 100644 index 0000000000..1a798147cf --- /dev/null +++ b/models/forgejo_migrations/v36.go @@ -0,0 +1,55 @@ +// Copyright 2025 The Forgejo Authors. All rights reserved. +// SPDX-License-Identifier: GPL-3.0-or-later + +package forgejo_migrations + +import ( + "xorm.io/xorm" +) + +func FixWikiUnitDefaultPermission(x *xorm.Engine) error { + // Type is Unit's Type + type Type int + + // Enumerate all the unit types + const ( + TypeInvalid Type = iota // 0 invalid + TypeCode // 1 code + TypeIssues // 2 issues + TypePullRequests // 3 PRs + TypeReleases // 4 Releases + TypeWiki // 5 Wiki + TypeExternalWiki // 6 ExternalWiki + TypeExternalTracker // 7 ExternalTracker + TypeProjects // 8 Projects + TypePackages // 9 Packages + TypeActions // 10 Actions + ) + + // RepoUnitAccessMode specifies the users access mode to a repo unit + type UnitAccessMode int + + const ( + // UnitAccessModeUnset - no unit mode set + UnitAccessModeUnset UnitAccessMode = iota // 0 + // UnitAccessModeNone no access + UnitAccessModeNone // 1 + // UnitAccessModeRead read access + UnitAccessModeRead // 2 + // UnitAccessModeWrite write access + UnitAccessModeWrite // 3 + ) + _ = UnitAccessModeNone + _ = UnitAccessModeWrite + + type RepoUnit struct { + DefaultPermissions UnitAccessMode `xorm:"NOT NULL DEFAULT 0"` + } + _, err := x.Where("type = ?", TypeWiki). + Where("default_permissions = ?", UnitAccessModeRead). + Cols("default_permissions"). + Update(RepoUnit{ + DefaultPermissions: UnitAccessModeUnset, + }) + return err +} diff --git a/models/migrations/test/tests.go b/models/migrations/test/tests.go index c1f0caf19b..6be3b3c2fc 100644 --- a/models/migrations/test/tests.go +++ b/models/migrations/test/tests.go @@ -95,7 +95,8 @@ func PrepareTestEnv(t *testing.T, skip int, syncModels ...any) (*xorm.Engine, fu t.Logf("initializing fixtures from: %s", fixturesDir) if err := unittest.InitFixtures( unittest.FixturesOptions{ - Dir: fixturesDir, + Dir: fixturesDir, + SkipCleanRegistedModels: true, }, x); err != nil { t.Errorf("error whilst initializing fixtures from %s: %v", fixturesDir, err) return x, deferFn diff --git a/models/migrations/v1_10/v100.go b/models/migrations/v1_10/v100.go index 5d2fd8e244..1742bea296 100644 --- a/models/migrations/v1_10/v100.go +++ b/models/migrations/v1_10/v100.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_10 //nolint +package v1_10 import ( "net/url" diff --git a/models/migrations/v1_10/v101.go b/models/migrations/v1_10/v101.go index f023a2a0e7..6c8dfe2486 100644 --- a/models/migrations/v1_10/v101.go +++ b/models/migrations/v1_10/v101.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_10 //nolint +package v1_10 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_10/v88.go b/models/migrations/v1_10/v88.go index 7e86ac364f..eb8e81c19e 100644 --- a/models/migrations/v1_10/v88.go +++ b/models/migrations/v1_10/v88.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_10 //nolint +package v1_10 import ( "crypto/sha1" diff --git a/models/migrations/v1_10/v89.go b/models/migrations/v1_10/v89.go index d5f27ffdc6..0df2a6e17b 100644 --- a/models/migrations/v1_10/v89.go +++ b/models/migrations/v1_10/v89.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_10 //nolint +package v1_10 import "xorm.io/xorm" diff --git a/models/migrations/v1_10/v90.go b/models/migrations/v1_10/v90.go index 295d4b1c1b..5521a97e32 100644 --- a/models/migrations/v1_10/v90.go +++ b/models/migrations/v1_10/v90.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_10 //nolint +package v1_10 import "xorm.io/xorm" diff --git a/models/migrations/v1_10/v91.go b/models/migrations/v1_10/v91.go index 48cac2de70..08db6c2742 100644 --- a/models/migrations/v1_10/v91.go +++ b/models/migrations/v1_10/v91.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_10 //nolint +package v1_10 import "xorm.io/xorm" diff --git a/models/migrations/v1_10/v92.go b/models/migrations/v1_10/v92.go index 9080108594..b6c04a9234 100644 --- a/models/migrations/v1_10/v92.go +++ b/models/migrations/v1_10/v92.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_10 //nolint +package v1_10 import ( "xorm.io/builder" diff --git a/models/migrations/v1_10/v93.go b/models/migrations/v1_10/v93.go index ee59a8db39..c131be9a8d 100644 --- a/models/migrations/v1_10/v93.go +++ b/models/migrations/v1_10/v93.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_10 //nolint +package v1_10 import "xorm.io/xorm" diff --git a/models/migrations/v1_10/v94.go b/models/migrations/v1_10/v94.go index c131af162b..13b7d7b303 100644 --- a/models/migrations/v1_10/v94.go +++ b/models/migrations/v1_10/v94.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_10 //nolint +package v1_10 import "xorm.io/xorm" diff --git a/models/migrations/v1_10/v95.go b/models/migrations/v1_10/v95.go index 3b1f67fd9c..86b52026bf 100644 --- a/models/migrations/v1_10/v95.go +++ b/models/migrations/v1_10/v95.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_10 //nolint +package v1_10 import "xorm.io/xorm" diff --git a/models/migrations/v1_10/v96.go b/models/migrations/v1_10/v96.go index 3bfb770f24..bcbd618b49 100644 --- a/models/migrations/v1_10/v96.go +++ b/models/migrations/v1_10/v96.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_10 //nolint +package v1_10 import ( "path/filepath" diff --git a/models/migrations/v1_10/v97.go b/models/migrations/v1_10/v97.go index dee45b32e3..5872bb63e5 100644 --- a/models/migrations/v1_10/v97.go +++ b/models/migrations/v1_10/v97.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_10 //nolint +package v1_10 import "xorm.io/xorm" diff --git a/models/migrations/v1_10/v98.go b/models/migrations/v1_10/v98.go index bdd9aed089..d21c326459 100644 --- a/models/migrations/v1_10/v98.go +++ b/models/migrations/v1_10/v98.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_10 //nolint +package v1_10 import "xorm.io/xorm" diff --git a/models/migrations/v1_10/v99.go b/models/migrations/v1_10/v99.go index 7f287b77aa..addae66be9 100644 --- a/models/migrations/v1_10/v99.go +++ b/models/migrations/v1_10/v99.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_10 //nolint +package v1_10 import ( "forgejo.org/modules/timeutil" diff --git a/models/migrations/v1_11/v102.go b/models/migrations/v1_11/v102.go index a585d9c423..15f0c83c36 100644 --- a/models/migrations/v1_11/v102.go +++ b/models/migrations/v1_11/v102.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_11 //nolint +package v1_11 import ( "forgejo.org/models/migrations/base" diff --git a/models/migrations/v1_11/v103.go b/models/migrations/v1_11/v103.go index 53527dac58..a515710160 100644 --- a/models/migrations/v1_11/v103.go +++ b/models/migrations/v1_11/v103.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_11 //nolint +package v1_11 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_11/v104.go b/models/migrations/v1_11/v104.go index af3578ca4a..7461f0cda3 100644 --- a/models/migrations/v1_11/v104.go +++ b/models/migrations/v1_11/v104.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_11 //nolint +package v1_11 import ( "forgejo.org/models/migrations/base" diff --git a/models/migrations/v1_11/v105.go b/models/migrations/v1_11/v105.go index b91340c30a..d86973a0f6 100644 --- a/models/migrations/v1_11/v105.go +++ b/models/migrations/v1_11/v105.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_11 //nolint +package v1_11 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_11/v106.go b/models/migrations/v1_11/v106.go index ecb11cdd1e..edffe18683 100644 --- a/models/migrations/v1_11/v106.go +++ b/models/migrations/v1_11/v106.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_11 //nolint +package v1_11 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_11/v107.go b/models/migrations/v1_11/v107.go index f0bfe5862c..a158e3bb50 100644 --- a/models/migrations/v1_11/v107.go +++ b/models/migrations/v1_11/v107.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_11 //nolint +package v1_11 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_11/v108.go b/models/migrations/v1_11/v108.go index a85096234d..8f14504ceb 100644 --- a/models/migrations/v1_11/v108.go +++ b/models/migrations/v1_11/v108.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_11 //nolint +package v1_11 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_11/v109.go b/models/migrations/v1_11/v109.go index ea565ccda3..f7616aec7b 100644 --- a/models/migrations/v1_11/v109.go +++ b/models/migrations/v1_11/v109.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_11 //nolint +package v1_11 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_11/v110.go b/models/migrations/v1_11/v110.go index fce9be847e..e94a738f67 100644 --- a/models/migrations/v1_11/v110.go +++ b/models/migrations/v1_11/v110.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_11 //nolint +package v1_11 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_11/v111.go b/models/migrations/v1_11/v111.go index cc3dc0d545..6f531e4858 100644 --- a/models/migrations/v1_11/v111.go +++ b/models/migrations/v1_11/v111.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_11 //nolint +package v1_11 import ( "fmt" diff --git a/models/migrations/v1_11/v112.go b/models/migrations/v1_11/v112.go index 6112ab51a5..22054e6f68 100644 --- a/models/migrations/v1_11/v112.go +++ b/models/migrations/v1_11/v112.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_11 //nolint +package v1_11 import ( "fmt" diff --git a/models/migrations/v1_11/v113.go b/models/migrations/v1_11/v113.go index dea344a44f..a4d54f66fb 100644 --- a/models/migrations/v1_11/v113.go +++ b/models/migrations/v1_11/v113.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_11 //nolint +package v1_11 import ( "fmt" diff --git a/models/migrations/v1_11/v114.go b/models/migrations/v1_11/v114.go index 95adcee989..9467a8a90c 100644 --- a/models/migrations/v1_11/v114.go +++ b/models/migrations/v1_11/v114.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_11 //nolint +package v1_11 import ( "net/url" diff --git a/models/migrations/v1_11/v115.go b/models/migrations/v1_11/v115.go index 3d4b41017b..65094df93d 100644 --- a/models/migrations/v1_11/v115.go +++ b/models/migrations/v1_11/v115.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_11 //nolint +package v1_11 import ( "crypto/md5" diff --git a/models/migrations/v1_11/v116.go b/models/migrations/v1_11/v116.go index 85aa76c1e0..729fbad18b 100644 --- a/models/migrations/v1_11/v116.go +++ b/models/migrations/v1_11/v116.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_11 //nolint +package v1_11 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_12/v117.go b/models/migrations/v1_12/v117.go index 8eadcdef2b..73b58ca34b 100644 --- a/models/migrations/v1_12/v117.go +++ b/models/migrations/v1_12/v117.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_12 //nolint +package v1_12 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_12/v118.go b/models/migrations/v1_12/v118.go index eb022dc5e4..e8b4249743 100644 --- a/models/migrations/v1_12/v118.go +++ b/models/migrations/v1_12/v118.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_12 //nolint +package v1_12 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_12/v119.go b/models/migrations/v1_12/v119.go index 60bfe6a57d..b4bf29a935 100644 --- a/models/migrations/v1_12/v119.go +++ b/models/migrations/v1_12/v119.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_12 //nolint +package v1_12 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_12/v120.go b/models/migrations/v1_12/v120.go index 3f7ed8d373..14d515f5a7 100644 --- a/models/migrations/v1_12/v120.go +++ b/models/migrations/v1_12/v120.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_12 //nolint +package v1_12 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_12/v121.go b/models/migrations/v1_12/v121.go index 175ec9164d..a28ae4e1c9 100644 --- a/models/migrations/v1_12/v121.go +++ b/models/migrations/v1_12/v121.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_12 //nolint +package v1_12 import "xorm.io/xorm" diff --git a/models/migrations/v1_12/v122.go b/models/migrations/v1_12/v122.go index 6e31d863a1..bc1b175f6a 100644 --- a/models/migrations/v1_12/v122.go +++ b/models/migrations/v1_12/v122.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_12 //nolint +package v1_12 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_12/v123.go b/models/migrations/v1_12/v123.go index b0c3af07a3..52b10bb850 100644 --- a/models/migrations/v1_12/v123.go +++ b/models/migrations/v1_12/v123.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_12 //nolint +package v1_12 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_12/v124.go b/models/migrations/v1_12/v124.go index d2ba03ffe0..9a93f436d4 100644 --- a/models/migrations/v1_12/v124.go +++ b/models/migrations/v1_12/v124.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_12 //nolint +package v1_12 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_12/v125.go b/models/migrations/v1_12/v125.go index ec4ffaab25..7f582ecff5 100644 --- a/models/migrations/v1_12/v125.go +++ b/models/migrations/v1_12/v125.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_12 //nolint +package v1_12 import ( "fmt" diff --git a/models/migrations/v1_12/v126.go b/models/migrations/v1_12/v126.go index ca9ec3aa3f..64fd7f7478 100644 --- a/models/migrations/v1_12/v126.go +++ b/models/migrations/v1_12/v126.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_12 //nolint +package v1_12 import ( "xorm.io/builder" diff --git a/models/migrations/v1_12/v127.go b/models/migrations/v1_12/v127.go index 11a4042973..f686fa617c 100644 --- a/models/migrations/v1_12/v127.go +++ b/models/migrations/v1_12/v127.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_12 //nolint +package v1_12 import ( "fmt" diff --git a/models/migrations/v1_12/v128.go b/models/migrations/v1_12/v128.go index 6d7307f470..8fca974616 100644 --- a/models/migrations/v1_12/v128.go +++ b/models/migrations/v1_12/v128.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_12 //nolint +package v1_12 import ( "fmt" diff --git a/models/migrations/v1_12/v129.go b/models/migrations/v1_12/v129.go index cf228242b9..3e4d3aca68 100644 --- a/models/migrations/v1_12/v129.go +++ b/models/migrations/v1_12/v129.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_12 //nolint +package v1_12 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_12/v130.go b/models/migrations/v1_12/v130.go index bfa856796a..383ef47492 100644 --- a/models/migrations/v1_12/v130.go +++ b/models/migrations/v1_12/v130.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_12 //nolint +package v1_12 import ( "forgejo.org/modules/json" diff --git a/models/migrations/v1_12/v131.go b/models/migrations/v1_12/v131.go index 5184bc3590..1266c2f185 100644 --- a/models/migrations/v1_12/v131.go +++ b/models/migrations/v1_12/v131.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_12 //nolint +package v1_12 import ( "fmt" diff --git a/models/migrations/v1_12/v132.go b/models/migrations/v1_12/v132.go index 3b2b28f7ab..8b1ae6db93 100644 --- a/models/migrations/v1_12/v132.go +++ b/models/migrations/v1_12/v132.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_12 //nolint +package v1_12 import ( "fmt" diff --git a/models/migrations/v1_12/v133.go b/models/migrations/v1_12/v133.go index c9087fc8c1..69e20597d8 100644 --- a/models/migrations/v1_12/v133.go +++ b/models/migrations/v1_12/v133.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_12 //nolint +package v1_12 import "xorm.io/xorm" diff --git a/models/migrations/v1_12/v134.go b/models/migrations/v1_12/v134.go index bba996fd40..1fabdcae96 100644 --- a/models/migrations/v1_12/v134.go +++ b/models/migrations/v1_12/v134.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_12 //nolint +package v1_12 import ( "fmt" diff --git a/models/migrations/v1_12/v135.go b/models/migrations/v1_12/v135.go index 8898011df5..5df0ad7fc4 100644 --- a/models/migrations/v1_12/v135.go +++ b/models/migrations/v1_12/v135.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_12 //nolint +package v1_12 import ( "fmt" diff --git a/models/migrations/v1_12/v136.go b/models/migrations/v1_12/v136.go index e2557ae002..7d246a82be 100644 --- a/models/migrations/v1_12/v136.go +++ b/models/migrations/v1_12/v136.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_12 //nolint +package v1_12 import ( "fmt" diff --git a/models/migrations/v1_12/v137.go b/models/migrations/v1_12/v137.go index 0d86b72010..9d38483488 100644 --- a/models/migrations/v1_12/v137.go +++ b/models/migrations/v1_12/v137.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_12 //nolint +package v1_12 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_12/v138.go b/models/migrations/v1_12/v138.go index 8c8d353f40..4485adeb2d 100644 --- a/models/migrations/v1_12/v138.go +++ b/models/migrations/v1_12/v138.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_12 //nolint +package v1_12 import ( "fmt" diff --git a/models/migrations/v1_12/v139.go b/models/migrations/v1_12/v139.go index cd7963524e..51e57b984a 100644 --- a/models/migrations/v1_12/v139.go +++ b/models/migrations/v1_12/v139.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_12 //nolint +package v1_12 import ( "forgejo.org/modules/setting" diff --git a/models/migrations/v1_13/v140.go b/models/migrations/v1_13/v140.go index d74f808e9f..5bb612c098 100644 --- a/models/migrations/v1_13/v140.go +++ b/models/migrations/v1_13/v140.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_13 //nolint +package v1_13 import ( "fmt" diff --git a/models/migrations/v1_13/v141.go b/models/migrations/v1_13/v141.go index ae211e0e44..b54bc1727c 100644 --- a/models/migrations/v1_13/v141.go +++ b/models/migrations/v1_13/v141.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_13 //nolint +package v1_13 import ( "fmt" diff --git a/models/migrations/v1_13/v142.go b/models/migrations/v1_13/v142.go index 7490e0f3b4..8939f6f2f8 100644 --- a/models/migrations/v1_13/v142.go +++ b/models/migrations/v1_13/v142.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_13 //nolint +package v1_13 import ( "forgejo.org/modules/log" diff --git a/models/migrations/v1_13/v143.go b/models/migrations/v1_13/v143.go index 1f9120e2ba..6a8da8b06d 100644 --- a/models/migrations/v1_13/v143.go +++ b/models/migrations/v1_13/v143.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_13 //nolint +package v1_13 import ( "forgejo.org/modules/log" diff --git a/models/migrations/v1_13/v144.go b/models/migrations/v1_13/v144.go index 7e801eab8a..f138338514 100644 --- a/models/migrations/v1_13/v144.go +++ b/models/migrations/v1_13/v144.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_13 //nolint +package v1_13 import ( "forgejo.org/modules/log" diff --git a/models/migrations/v1_13/v145.go b/models/migrations/v1_13/v145.go index a01f577ed1..f7d3895c84 100644 --- a/models/migrations/v1_13/v145.go +++ b/models/migrations/v1_13/v145.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_13 //nolint +package v1_13 import ( "fmt" diff --git a/models/migrations/v1_13/v146.go b/models/migrations/v1_13/v146.go index a1b54ee3aa..e6a476a288 100644 --- a/models/migrations/v1_13/v146.go +++ b/models/migrations/v1_13/v146.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_13 //nolint +package v1_13 import ( "forgejo.org/modules/timeutil" diff --git a/models/migrations/v1_13/v147.go b/models/migrations/v1_13/v147.go index cc57504c74..831ef5842a 100644 --- a/models/migrations/v1_13/v147.go +++ b/models/migrations/v1_13/v147.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_13 //nolint +package v1_13 import ( "forgejo.org/modules/timeutil" diff --git a/models/migrations/v1_13/v148.go b/models/migrations/v1_13/v148.go index 7bb8ab700b..d276db3d61 100644 --- a/models/migrations/v1_13/v148.go +++ b/models/migrations/v1_13/v148.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_13 //nolint +package v1_13 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_13/v149.go b/models/migrations/v1_13/v149.go index 3a0c5909d5..c1bfe8b09e 100644 --- a/models/migrations/v1_13/v149.go +++ b/models/migrations/v1_13/v149.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_13 //nolint +package v1_13 import ( "fmt" diff --git a/models/migrations/v1_13/v150.go b/models/migrations/v1_13/v150.go index be14fd130c..471a531024 100644 --- a/models/migrations/v1_13/v150.go +++ b/models/migrations/v1_13/v150.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_13 //nolint +package v1_13 import ( "forgejo.org/models/migrations/base" diff --git a/models/migrations/v1_13/v151.go b/models/migrations/v1_13/v151.go index ff584fff67..691b86062d 100644 --- a/models/migrations/v1_13/v151.go +++ b/models/migrations/v1_13/v151.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_13 //nolint +package v1_13 import ( "context" diff --git a/models/migrations/v1_13/v152.go b/models/migrations/v1_13/v152.go index 502c82a40d..648e26446f 100644 --- a/models/migrations/v1_13/v152.go +++ b/models/migrations/v1_13/v152.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_13 //nolint +package v1_13 import "xorm.io/xorm" diff --git a/models/migrations/v1_13/v153.go b/models/migrations/v1_13/v153.go index 0b2dd3eb62..e5462fc162 100644 --- a/models/migrations/v1_13/v153.go +++ b/models/migrations/v1_13/v153.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_13 //nolint +package v1_13 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_13/v154.go b/models/migrations/v1_13/v154.go index cf31190781..89dc7821b2 100644 --- a/models/migrations/v1_13/v154.go +++ b/models/migrations/v1_13/v154.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_13 //nolint +package v1_13 import ( "forgejo.org/modules/timeutil" diff --git a/models/migrations/v1_14/main_test.go b/models/migrations/v1_14/main_test.go index c01faedc35..57cf995be1 100644 --- a/models/migrations/v1_14/main_test.go +++ b/models/migrations/v1_14/main_test.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_14 //nolint +package v1_14 import ( "testing" diff --git a/models/migrations/v1_14/v155.go b/models/migrations/v1_14/v155.go index e814f59938..505a9ae033 100644 --- a/models/migrations/v1_14/v155.go +++ b/models/migrations/v1_14/v155.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_14 //nolint +package v1_14 import ( "fmt" diff --git a/models/migrations/v1_14/v156.go b/models/migrations/v1_14/v156.go index b6dc91a054..7bbd9f4c85 100644 --- a/models/migrations/v1_14/v156.go +++ b/models/migrations/v1_14/v156.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_14 //nolint +package v1_14 import ( "fmt" diff --git a/models/migrations/v1_14/v157.go b/models/migrations/v1_14/v157.go index 7187278d29..ba69f71130 100644 --- a/models/migrations/v1_14/v157.go +++ b/models/migrations/v1_14/v157.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_14 //nolint +package v1_14 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_14/v158.go b/models/migrations/v1_14/v158.go index 3fa27cfecd..2ab3c8a1f0 100644 --- a/models/migrations/v1_14/v158.go +++ b/models/migrations/v1_14/v158.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_14 //nolint +package v1_14 import ( "errors" diff --git a/models/migrations/v1_14/v159.go b/models/migrations/v1_14/v159.go index fdd7e12449..4e921ea1c6 100644 --- a/models/migrations/v1_14/v159.go +++ b/models/migrations/v1_14/v159.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_14 //nolint +package v1_14 import ( "forgejo.org/models/migrations/base" diff --git a/models/migrations/v1_14/v160.go b/models/migrations/v1_14/v160.go index 4dea91b514..73f3798954 100644 --- a/models/migrations/v1_14/v160.go +++ b/models/migrations/v1_14/v160.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_14 //nolint +package v1_14 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_14/v161.go b/models/migrations/v1_14/v161.go index 6e904cfab6..9c850ad0c2 100644 --- a/models/migrations/v1_14/v161.go +++ b/models/migrations/v1_14/v161.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_14 //nolint +package v1_14 import ( "context" diff --git a/models/migrations/v1_14/v162.go b/models/migrations/v1_14/v162.go index 5d6d7c2e3f..ead63f16f4 100644 --- a/models/migrations/v1_14/v162.go +++ b/models/migrations/v1_14/v162.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_14 //nolint +package v1_14 import ( "forgejo.org/models/migrations/base" diff --git a/models/migrations/v1_14/v163.go b/models/migrations/v1_14/v163.go index 60fc98c0a4..06ac36cbc7 100644 --- a/models/migrations/v1_14/v163.go +++ b/models/migrations/v1_14/v163.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_14 //nolint +package v1_14 import ( "forgejo.org/models/migrations/base" diff --git a/models/migrations/v1_14/v164.go b/models/migrations/v1_14/v164.go index 54f6951427..d2fd9b8464 100644 --- a/models/migrations/v1_14/v164.go +++ b/models/migrations/v1_14/v164.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_14 //nolint +package v1_14 import ( "fmt" diff --git a/models/migrations/v1_14/v165.go b/models/migrations/v1_14/v165.go index 9315e44197..90fd2b1e46 100644 --- a/models/migrations/v1_14/v165.go +++ b/models/migrations/v1_14/v165.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_14 //nolint +package v1_14 import ( "forgejo.org/models/migrations/base" diff --git a/models/migrations/v1_14/v166.go b/models/migrations/v1_14/v166.go index e5731582fd..4c106bd7da 100644 --- a/models/migrations/v1_14/v166.go +++ b/models/migrations/v1_14/v166.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_14 //nolint +package v1_14 import ( "crypto/sha256" diff --git a/models/migrations/v1_14/v167.go b/models/migrations/v1_14/v167.go index 9d416f6a32..d77bbc401e 100644 --- a/models/migrations/v1_14/v167.go +++ b/models/migrations/v1_14/v167.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_14 //nolint +package v1_14 import ( "fmt" diff --git a/models/migrations/v1_14/v168.go b/models/migrations/v1_14/v168.go index a30a8859f7..aa93eec19b 100644 --- a/models/migrations/v1_14/v168.go +++ b/models/migrations/v1_14/v168.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_14 //nolint +package v1_14 import "xorm.io/xorm" diff --git a/models/migrations/v1_14/v169.go b/models/migrations/v1_14/v169.go index 5b81bb58b1..4f9df0d96f 100644 --- a/models/migrations/v1_14/v169.go +++ b/models/migrations/v1_14/v169.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_14 //nolint +package v1_14 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_14/v170.go b/models/migrations/v1_14/v170.go index 7b6498a3e9..a2ff4623e1 100644 --- a/models/migrations/v1_14/v170.go +++ b/models/migrations/v1_14/v170.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_14 //nolint +package v1_14 import ( "fmt" diff --git a/models/migrations/v1_14/v171.go b/models/migrations/v1_14/v171.go index 51a35a02ad..7b200e960a 100644 --- a/models/migrations/v1_14/v171.go +++ b/models/migrations/v1_14/v171.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_14 //nolint +package v1_14 import ( "fmt" diff --git a/models/migrations/v1_14/v172.go b/models/migrations/v1_14/v172.go index d49b70f5ad..c410d393f1 100644 --- a/models/migrations/v1_14/v172.go +++ b/models/migrations/v1_14/v172.go @@ -1,7 +1,7 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_14 //nolint +package v1_14 import ( "forgejo.org/modules/timeutil" diff --git a/models/migrations/v1_14/v173.go b/models/migrations/v1_14/v173.go index 2d9eee9197..7752fbe966 100644 --- a/models/migrations/v1_14/v173.go +++ b/models/migrations/v1_14/v173.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_14 //nolint +package v1_14 import ( "fmt" diff --git a/models/migrations/v1_14/v174.go b/models/migrations/v1_14/v174.go index c839e15db8..4049e43070 100644 --- a/models/migrations/v1_14/v174.go +++ b/models/migrations/v1_14/v174.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_14 //nolint +package v1_14 import ( "fmt" diff --git a/models/migrations/v1_14/v175.go b/models/migrations/v1_14/v175.go index 3cda5772a0..49fa17d046 100644 --- a/models/migrations/v1_14/v175.go +++ b/models/migrations/v1_14/v175.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_14 //nolint +package v1_14 import ( "fmt" diff --git a/models/migrations/v1_14/v176.go b/models/migrations/v1_14/v176.go index 1ed49f75fa..ef5dce9a02 100644 --- a/models/migrations/v1_14/v176.go +++ b/models/migrations/v1_14/v176.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_14 //nolint +package v1_14 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_14/v176_test.go b/models/migrations/v1_14/v176_test.go index d88ff207e7..d56b3e0470 100644 --- a/models/migrations/v1_14/v176_test.go +++ b/models/migrations/v1_14/v176_test.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_14 //nolint +package v1_14 import ( "testing" diff --git a/models/migrations/v1_14/v177.go b/models/migrations/v1_14/v177.go index 6e1838f369..96676bf8d9 100644 --- a/models/migrations/v1_14/v177.go +++ b/models/migrations/v1_14/v177.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_14 //nolint +package v1_14 import ( "fmt" diff --git a/models/migrations/v1_14/v177_test.go b/models/migrations/v1_14/v177_test.go index bffc6f92e3..0e0a67fd33 100644 --- a/models/migrations/v1_14/v177_test.go +++ b/models/migrations/v1_14/v177_test.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_14 //nolint +package v1_14 import ( "testing" diff --git a/models/migrations/v1_15/main_test.go b/models/migrations/v1_15/main_test.go index 6c04d3f5ee..4cf6d6f695 100644 --- a/models/migrations/v1_15/main_test.go +++ b/models/migrations/v1_15/main_test.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_15 //nolint +package v1_15 import ( "testing" diff --git a/models/migrations/v1_15/v178.go b/models/migrations/v1_15/v178.go index 6d236eb049..ca3a5c262e 100644 --- a/models/migrations/v1_15/v178.go +++ b/models/migrations/v1_15/v178.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_15 //nolint +package v1_15 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_15/v179.go b/models/migrations/v1_15/v179.go index b990583303..ce514cc4a9 100644 --- a/models/migrations/v1_15/v179.go +++ b/models/migrations/v1_15/v179.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_15 //nolint +package v1_15 import ( "forgejo.org/models/migrations/base" diff --git a/models/migrations/v1_15/v180.go b/models/migrations/v1_15/v180.go index 02fbd57cdb..0b68c3ceb7 100644 --- a/models/migrations/v1_15/v180.go +++ b/models/migrations/v1_15/v180.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_15 //nolint +package v1_15 import ( "forgejo.org/modules/json" diff --git a/models/migrations/v1_15/v181.go b/models/migrations/v1_15/v181.go index 2185ed0213..fb1d3d7a75 100644 --- a/models/migrations/v1_15/v181.go +++ b/models/migrations/v1_15/v181.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_15 //nolint +package v1_15 import ( "strings" diff --git a/models/migrations/v1_15/v181_test.go b/models/migrations/v1_15/v181_test.go index 4154e0b1e9..8196f751e5 100644 --- a/models/migrations/v1_15/v181_test.go +++ b/models/migrations/v1_15/v181_test.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_15 //nolint +package v1_15 import ( "strings" diff --git a/models/migrations/v1_15/v182.go b/models/migrations/v1_15/v182.go index 9ca500c0f9..f53ff11df9 100644 --- a/models/migrations/v1_15/v182.go +++ b/models/migrations/v1_15/v182.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_15 //nolint +package v1_15 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_15/v182_test.go b/models/migrations/v1_15/v182_test.go index 6865cafac4..2baf90d06a 100644 --- a/models/migrations/v1_15/v182_test.go +++ b/models/migrations/v1_15/v182_test.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_15 //nolint +package v1_15 import ( "testing" diff --git a/models/migrations/v1_15/v183.go b/models/migrations/v1_15/v183.go index aaad64c220..5684e35699 100644 --- a/models/migrations/v1_15/v183.go +++ b/models/migrations/v1_15/v183.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_15 //nolint +package v1_15 import ( "fmt" diff --git a/models/migrations/v1_15/v184.go b/models/migrations/v1_15/v184.go index 41b64d4743..fbe0dcd780 100644 --- a/models/migrations/v1_15/v184.go +++ b/models/migrations/v1_15/v184.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_15 //nolint +package v1_15 import ( "context" diff --git a/models/migrations/v1_15/v185.go b/models/migrations/v1_15/v185.go index e5878ec193..60af59edca 100644 --- a/models/migrations/v1_15/v185.go +++ b/models/migrations/v1_15/v185.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_15 //nolint +package v1_15 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_15/v186.go b/models/migrations/v1_15/v186.go index ad75822de5..55d3199335 100644 --- a/models/migrations/v1_15/v186.go +++ b/models/migrations/v1_15/v186.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_15 //nolint +package v1_15 import ( "forgejo.org/modules/timeutil" diff --git a/models/migrations/v1_15/v187.go b/models/migrations/v1_15/v187.go index b573fc52ef..fabef14779 100644 --- a/models/migrations/v1_15/v187.go +++ b/models/migrations/v1_15/v187.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_15 //nolint +package v1_15 import ( "forgejo.org/models/migrations/base" diff --git a/models/migrations/v1_15/v188.go b/models/migrations/v1_15/v188.go index 71e45cab0e..4494e6ff05 100644 --- a/models/migrations/v1_15/v188.go +++ b/models/migrations/v1_15/v188.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_15 //nolint +package v1_15 import "xorm.io/xorm" diff --git a/models/migrations/v1_16/main_test.go b/models/migrations/v1_16/main_test.go index 6f891f3e94..8c0a043be6 100644 --- a/models/migrations/v1_16/main_test.go +++ b/models/migrations/v1_16/main_test.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_16 //nolint +package v1_16 import ( "testing" diff --git a/models/migrations/v1_16/v189.go b/models/migrations/v1_16/v189.go index 1ee72d9c39..19bfcb2423 100644 --- a/models/migrations/v1_16/v189.go +++ b/models/migrations/v1_16/v189.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_16 //nolint +package v1_16 import ( "encoding/binary" diff --git a/models/migrations/v1_16/v189_test.go b/models/migrations/v1_16/v189_test.go index 90b721d5f1..9d74462a92 100644 --- a/models/migrations/v1_16/v189_test.go +++ b/models/migrations/v1_16/v189_test.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_16 //nolint +package v1_16 import ( "testing" diff --git a/models/migrations/v1_16/v190.go b/models/migrations/v1_16/v190.go index 5953802849..1eb6b6ddb4 100644 --- a/models/migrations/v1_16/v190.go +++ b/models/migrations/v1_16/v190.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_16 //nolint +package v1_16 import ( "fmt" diff --git a/models/migrations/v1_16/v191.go b/models/migrations/v1_16/v191.go index 567f88d6d1..427476b70b 100644 --- a/models/migrations/v1_16/v191.go +++ b/models/migrations/v1_16/v191.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_16 //nolint +package v1_16 import ( "forgejo.org/modules/setting" diff --git a/models/migrations/v1_16/v192.go b/models/migrations/v1_16/v192.go index 731b9fb43a..31e8c36346 100644 --- a/models/migrations/v1_16/v192.go +++ b/models/migrations/v1_16/v192.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_16 //nolint +package v1_16 import ( "forgejo.org/models/migrations/base" diff --git a/models/migrations/v1_16/v193.go b/models/migrations/v1_16/v193.go index 8d3ce7a558..a5af2de380 100644 --- a/models/migrations/v1_16/v193.go +++ b/models/migrations/v1_16/v193.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_16 //nolint +package v1_16 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_16/v193_test.go b/models/migrations/v1_16/v193_test.go index 8260acf32d..bf8d8a7dc6 100644 --- a/models/migrations/v1_16/v193_test.go +++ b/models/migrations/v1_16/v193_test.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_16 //nolint +package v1_16 import ( "testing" diff --git a/models/migrations/v1_16/v194.go b/models/migrations/v1_16/v194.go index 6aa13c50cf..2e4ed8340e 100644 --- a/models/migrations/v1_16/v194.go +++ b/models/migrations/v1_16/v194.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_16 //nolint +package v1_16 import ( "fmt" diff --git a/models/migrations/v1_16/v195.go b/models/migrations/v1_16/v195.go index 6d7e94141e..4fd42b7bd2 100644 --- a/models/migrations/v1_16/v195.go +++ b/models/migrations/v1_16/v195.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_16 //nolint +package v1_16 import ( "fmt" diff --git a/models/migrations/v1_16/v195_test.go b/models/migrations/v1_16/v195_test.go index 71234a6fb3..1fc7b51f3c 100644 --- a/models/migrations/v1_16/v195_test.go +++ b/models/migrations/v1_16/v195_test.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_16 //nolint +package v1_16 import ( "testing" diff --git a/models/migrations/v1_16/v196.go b/models/migrations/v1_16/v196.go index 7cbafc61e5..6c9caa100f 100644 --- a/models/migrations/v1_16/v196.go +++ b/models/migrations/v1_16/v196.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_16 //nolint +package v1_16 import ( "fmt" diff --git a/models/migrations/v1_16/v197.go b/models/migrations/v1_16/v197.go index 97888b2847..862bdfdcbd 100644 --- a/models/migrations/v1_16/v197.go +++ b/models/migrations/v1_16/v197.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_16 //nolint +package v1_16 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_16/v198.go b/models/migrations/v1_16/v198.go index 8b3c73addc..5d3043eb46 100644 --- a/models/migrations/v1_16/v198.go +++ b/models/migrations/v1_16/v198.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_16 //nolint +package v1_16 import ( "fmt" diff --git a/models/migrations/v1_16/v199.go b/models/migrations/v1_16/v199.go index 6adcf890af..4020352f2b 100644 --- a/models/migrations/v1_16/v199.go +++ b/models/migrations/v1_16/v199.go @@ -1,6 +1,6 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_16 //nolint +package v1_16 // We used to use a table `remote_version` to store information for updater, now we use `AppState`, so this migration task is a no-op now. diff --git a/models/migrations/v1_16/v200.go b/models/migrations/v1_16/v200.go index c08c20e51d..de57fad8fe 100644 --- a/models/migrations/v1_16/v200.go +++ b/models/migrations/v1_16/v200.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_16 //nolint +package v1_16 import ( "fmt" diff --git a/models/migrations/v1_16/v201.go b/models/migrations/v1_16/v201.go index 35e0c9f2fb..2c43698b0c 100644 --- a/models/migrations/v1_16/v201.go +++ b/models/migrations/v1_16/v201.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_16 //nolint +package v1_16 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_16/v202.go b/models/migrations/v1_16/v202.go index 6ba36152f1..d8c8fdcadc 100644 --- a/models/migrations/v1_16/v202.go +++ b/models/migrations/v1_16/v202.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_16 //nolint +package v1_16 import ( "fmt" diff --git a/models/migrations/v1_16/v203.go b/models/migrations/v1_16/v203.go index e8e6b52453..c3241cba57 100644 --- a/models/migrations/v1_16/v203.go +++ b/models/migrations/v1_16/v203.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_16 //nolint +package v1_16 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_16/v204.go b/models/migrations/v1_16/v204.go index ece03e1305..4d375307e7 100644 --- a/models/migrations/v1_16/v204.go +++ b/models/migrations/v1_16/v204.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_16 //nolint +package v1_16 import "xorm.io/xorm" diff --git a/models/migrations/v1_16/v205.go b/models/migrations/v1_16/v205.go index a064b9830d..cb452dfd7f 100644 --- a/models/migrations/v1_16/v205.go +++ b/models/migrations/v1_16/v205.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_16 //nolint +package v1_16 import ( "forgejo.org/models/migrations/base" diff --git a/models/migrations/v1_16/v206.go b/models/migrations/v1_16/v206.go index 581a7d76e9..01a9c386eb 100644 --- a/models/migrations/v1_16/v206.go +++ b/models/migrations/v1_16/v206.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_16 //nolint +package v1_16 import ( "fmt" diff --git a/models/migrations/v1_16/v207.go b/models/migrations/v1_16/v207.go index 91208f066c..19126ead1f 100644 --- a/models/migrations/v1_16/v207.go +++ b/models/migrations/v1_16/v207.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_16 //nolint +package v1_16 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_16/v208.go b/models/migrations/v1_16/v208.go index 1a11ef096a..fb643324f4 100644 --- a/models/migrations/v1_16/v208.go +++ b/models/migrations/v1_16/v208.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_16 //nolint +package v1_16 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_16/v209.go b/models/migrations/v1_16/v209.go index be3100e02a..230838647b 100644 --- a/models/migrations/v1_16/v209.go +++ b/models/migrations/v1_16/v209.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_16 //nolint +package v1_16 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_16/v210.go b/models/migrations/v1_16/v210.go index 375a008e18..f48ab11db6 100644 --- a/models/migrations/v1_16/v210.go +++ b/models/migrations/v1_16/v210.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_16 //nolint +package v1_16 import ( "crypto/ecdh" diff --git a/models/migrations/v1_16/v210_test.go b/models/migrations/v1_16/v210_test.go index f6423a5821..8454920aa0 100644 --- a/models/migrations/v1_16/v210_test.go +++ b/models/migrations/v1_16/v210_test.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_16 //nolint +package v1_16 import ( "encoding/hex" diff --git a/models/migrations/v1_17/main_test.go b/models/migrations/v1_17/main_test.go index 0a8e05ab5f..166860b3b1 100644 --- a/models/migrations/v1_17/main_test.go +++ b/models/migrations/v1_17/main_test.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_17 //nolint +package v1_17 import ( "testing" diff --git a/models/migrations/v1_17/v211.go b/models/migrations/v1_17/v211.go index 9b72c8610b..517cf19388 100644 --- a/models/migrations/v1_17/v211.go +++ b/models/migrations/v1_17/v211.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_17 //nolint +package v1_17 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_17/v212.go b/models/migrations/v1_17/v212.go index 2337adcc80..23868c0bb2 100644 --- a/models/migrations/v1_17/v212.go +++ b/models/migrations/v1_17/v212.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_17 //nolint +package v1_17 import ( "forgejo.org/modules/timeutil" diff --git a/models/migrations/v1_17/v213.go b/models/migrations/v1_17/v213.go index bb3f466e52..b2bbdf7279 100644 --- a/models/migrations/v1_17/v213.go +++ b/models/migrations/v1_17/v213.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_17 //nolint +package v1_17 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_17/v214.go b/models/migrations/v1_17/v214.go index 2268164919..1925324f0f 100644 --- a/models/migrations/v1_17/v214.go +++ b/models/migrations/v1_17/v214.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_17 //nolint +package v1_17 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_17/v215.go b/models/migrations/v1_17/v215.go index 5aae798562..431103c98e 100644 --- a/models/migrations/v1_17/v215.go +++ b/models/migrations/v1_17/v215.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_17 //nolint +package v1_17 import ( "forgejo.org/models/pull" diff --git a/models/migrations/v1_17/v216.go b/models/migrations/v1_17/v216.go index 268f472a42..37aeacb6fc 100644 --- a/models/migrations/v1_17/v216.go +++ b/models/migrations/v1_17/v216.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_17 //nolint +package v1_17 // This migration added non-ideal indices to the action table which on larger datasets slowed things down // it has been superseded by v218.go diff --git a/models/migrations/v1_17/v217.go b/models/migrations/v1_17/v217.go index 5f096d4824..fef48b7a5b 100644 --- a/models/migrations/v1_17/v217.go +++ b/models/migrations/v1_17/v217.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_17 //nolint +package v1_17 import ( "forgejo.org/modules/setting" diff --git a/models/migrations/v1_17/v218.go b/models/migrations/v1_17/v218.go index 5e3dcd0841..412d124286 100644 --- a/models/migrations/v1_17/v218.go +++ b/models/migrations/v1_17/v218.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_17 //nolint +package v1_17 import ( "forgejo.org/modules/setting" diff --git a/models/migrations/v1_17/v219.go b/models/migrations/v1_17/v219.go index e90656090f..7ca6a26be6 100644 --- a/models/migrations/v1_17/v219.go +++ b/models/migrations/v1_17/v219.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_17 //nolint +package v1_17 import ( "time" diff --git a/models/migrations/v1_17/v220.go b/models/migrations/v1_17/v220.go index 61bbf19725..4e010e5b76 100644 --- a/models/migrations/v1_17/v220.go +++ b/models/migrations/v1_17/v220.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_17 //nolint +package v1_17 import ( packages_model "forgejo.org/models/packages" diff --git a/models/migrations/v1_17/v221.go b/models/migrations/v1_17/v221.go index 84e9a238af..3ef34e3f06 100644 --- a/models/migrations/v1_17/v221.go +++ b/models/migrations/v1_17/v221.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_17 //nolint +package v1_17 import ( "encoding/base32" diff --git a/models/migrations/v1_17/v221_test.go b/models/migrations/v1_17/v221_test.go index 02607d6b32..a9c47136b2 100644 --- a/models/migrations/v1_17/v221_test.go +++ b/models/migrations/v1_17/v221_test.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_17 //nolint +package v1_17 import ( "encoding/base32" diff --git a/models/migrations/v1_17/v222.go b/models/migrations/v1_17/v222.go index ae910cbcb6..873769881e 100644 --- a/models/migrations/v1_17/v222.go +++ b/models/migrations/v1_17/v222.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_17 //nolint +package v1_17 import ( "context" diff --git a/models/migrations/v1_17/v223.go b/models/migrations/v1_17/v223.go index 7d92dcf5ae..4f5d34d841 100644 --- a/models/migrations/v1_17/v223.go +++ b/models/migrations/v1_17/v223.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_17 //nolint +package v1_17 import ( "context" diff --git a/models/migrations/v1_18/main_test.go b/models/migrations/v1_18/main_test.go index 33f5c51222..0c20934cea 100644 --- a/models/migrations/v1_18/main_test.go +++ b/models/migrations/v1_18/main_test.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_18 //nolint +package v1_18 import ( "testing" diff --git a/models/migrations/v1_18/v224.go b/models/migrations/v1_18/v224.go index f3d522b91a..6dc12020ea 100644 --- a/models/migrations/v1_18/v224.go +++ b/models/migrations/v1_18/v224.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_18 //nolint +package v1_18 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_18/v225.go b/models/migrations/v1_18/v225.go index 86bcb1323d..266eccfff8 100644 --- a/models/migrations/v1_18/v225.go +++ b/models/migrations/v1_18/v225.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_18 //nolint +package v1_18 import ( "forgejo.org/modules/setting" diff --git a/models/migrations/v1_18/v226.go b/models/migrations/v1_18/v226.go index f87e24b11d..8ed9761476 100644 --- a/models/migrations/v1_18/v226.go +++ b/models/migrations/v1_18/v226.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_18 //nolint +package v1_18 import ( "xorm.io/builder" diff --git a/models/migrations/v1_18/v227.go b/models/migrations/v1_18/v227.go index b6250fb76c..d39a010159 100644 --- a/models/migrations/v1_18/v227.go +++ b/models/migrations/v1_18/v227.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_18 //nolint +package v1_18 import ( "forgejo.org/modules/timeutil" diff --git a/models/migrations/v1_18/v228.go b/models/migrations/v1_18/v228.go index 1161c8a4c9..3f5b69734d 100644 --- a/models/migrations/v1_18/v228.go +++ b/models/migrations/v1_18/v228.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_18 //nolint +package v1_18 import ( "forgejo.org/modules/timeutil" diff --git a/models/migrations/v1_18/v229.go b/models/migrations/v1_18/v229.go index f96dde9840..00d794725f 100644 --- a/models/migrations/v1_18/v229.go +++ b/models/migrations/v1_18/v229.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_18 //nolint +package v1_18 import ( "fmt" diff --git a/models/migrations/v1_18/v229_test.go b/models/migrations/v1_18/v229_test.go index ac5e726a79..903a60c851 100644 --- a/models/migrations/v1_18/v229_test.go +++ b/models/migrations/v1_18/v229_test.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_18 //nolint +package v1_18 import ( "testing" diff --git a/models/migrations/v1_18/v230.go b/models/migrations/v1_18/v230.go index ea5b4d02e1..078fce7643 100644 --- a/models/migrations/v1_18/v230.go +++ b/models/migrations/v1_18/v230.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_18 //nolint +package v1_18 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_18/v230_test.go b/models/migrations/v1_18/v230_test.go index 7dd6675673..da31b0dc9b 100644 --- a/models/migrations/v1_18/v230_test.go +++ b/models/migrations/v1_18/v230_test.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_18 //nolint +package v1_18 import ( "testing" diff --git a/models/migrations/v1_19/main_test.go b/models/migrations/v1_19/main_test.go index 7c56926f4c..9d1c3a57ea 100644 --- a/models/migrations/v1_19/main_test.go +++ b/models/migrations/v1_19/main_test.go @@ -1,7 +1,7 @@ // Copyright 2021 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_19 //nolint +package v1_19 import ( "testing" diff --git a/models/migrations/v1_19/v231.go b/models/migrations/v1_19/v231.go index 79e46132f0..8ef1e4e743 100644 --- a/models/migrations/v1_19/v231.go +++ b/models/migrations/v1_19/v231.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_19 //nolint +package v1_19 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_19/v232.go b/models/migrations/v1_19/v232.go index 7fb4a5ac8d..2aab2cf830 100644 --- a/models/migrations/v1_19/v232.go +++ b/models/migrations/v1_19/v232.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_19 //nolint +package v1_19 import ( "forgejo.org/modules/setting" diff --git a/models/migrations/v1_19/v233.go b/models/migrations/v1_19/v233.go index 191afd4868..e62e8a9356 100644 --- a/models/migrations/v1_19/v233.go +++ b/models/migrations/v1_19/v233.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_19 //nolint +package v1_19 import ( "fmt" diff --git a/models/migrations/v1_19/v233_test.go b/models/migrations/v1_19/v233_test.go index 4dc35d1e27..3d5eac9887 100644 --- a/models/migrations/v1_19/v233_test.go +++ b/models/migrations/v1_19/v233_test.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_19 //nolint +package v1_19 import ( "testing" diff --git a/models/migrations/v1_19/v234.go b/models/migrations/v1_19/v234.go index c610a423dd..e00b1cc2b6 100644 --- a/models/migrations/v1_19/v234.go +++ b/models/migrations/v1_19/v234.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_19 //nolint +package v1_19 import ( "forgejo.org/modules/timeutil" diff --git a/models/migrations/v1_19/v235.go b/models/migrations/v1_19/v235.go index 3715de3920..297d90f65a 100644 --- a/models/migrations/v1_19/v235.go +++ b/models/migrations/v1_19/v235.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_19 //nolint +package v1_19 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_19/v236.go b/models/migrations/v1_19/v236.go index fa01a6ab80..c453f95e04 100644 --- a/models/migrations/v1_19/v236.go +++ b/models/migrations/v1_19/v236.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_19 //nolint +package v1_19 import ( "forgejo.org/modules/timeutil" diff --git a/models/migrations/v1_19/v237.go b/models/migrations/v1_19/v237.go index b23c765aa5..cf30226ccd 100644 --- a/models/migrations/v1_19/v237.go +++ b/models/migrations/v1_19/v237.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_19 //nolint +package v1_19 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_19/v238.go b/models/migrations/v1_19/v238.go index 7c912a8341..b257315319 100644 --- a/models/migrations/v1_19/v238.go +++ b/models/migrations/v1_19/v238.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_19 //nolint +package v1_19 import ( "forgejo.org/modules/timeutil" diff --git a/models/migrations/v1_19/v239.go b/models/migrations/v1_19/v239.go index 10076f2401..8f4a65be95 100644 --- a/models/migrations/v1_19/v239.go +++ b/models/migrations/v1_19/v239.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_19 //nolint +package v1_19 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_19/v240.go b/models/migrations/v1_19/v240.go index 4ca5becede..c49ce2f49a 100644 --- a/models/migrations/v1_19/v240.go +++ b/models/migrations/v1_19/v240.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_19 //nolint +package v1_19 import ( "forgejo.org/models/db" diff --git a/models/migrations/v1_19/v241.go b/models/migrations/v1_19/v241.go index a617d6fd2f..e35801a057 100644 --- a/models/migrations/v1_19/v241.go +++ b/models/migrations/v1_19/v241.go @@ -1,7 +1,7 @@ // Copyright 2022 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_19 //nolint +package v1_19 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_19/v242.go b/models/migrations/v1_19/v242.go index bbf227ef77..87ca9cf214 100644 --- a/models/migrations/v1_19/v242.go +++ b/models/migrations/v1_19/v242.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_19 //nolint +package v1_19 import ( "forgejo.org/modules/setting" diff --git a/models/migrations/v1_19/v243.go b/models/migrations/v1_19/v243.go index 55bbfafb2f..9c3f372594 100644 --- a/models/migrations/v1_19/v243.go +++ b/models/migrations/v1_19/v243.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_19 //nolint +package v1_19 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_20/main_test.go b/models/migrations/v1_20/main_test.go index f870dca429..ee5eec5ef6 100644 --- a/models/migrations/v1_20/main_test.go +++ b/models/migrations/v1_20/main_test.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_20 //nolint +package v1_20 import ( "testing" diff --git a/models/migrations/v1_20/v244.go b/models/migrations/v1_20/v244.go index 977566ad7d..76cdccaca5 100644 --- a/models/migrations/v1_20/v244.go +++ b/models/migrations/v1_20/v244.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_20 //nolint +package v1_20 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_20/v245.go b/models/migrations/v1_20/v245.go index 7e6585388b..5e034568c4 100644 --- a/models/migrations/v1_20/v245.go +++ b/models/migrations/v1_20/v245.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_20 //nolint +package v1_20 import ( "context" diff --git a/models/migrations/v1_20/v246.go b/models/migrations/v1_20/v246.go index e6340ef079..22bf723404 100644 --- a/models/migrations/v1_20/v246.go +++ b/models/migrations/v1_20/v246.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_20 //nolint +package v1_20 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_20/v247.go b/models/migrations/v1_20/v247.go index 9ed810a623..056699d744 100644 --- a/models/migrations/v1_20/v247.go +++ b/models/migrations/v1_20/v247.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_20 //nolint +package v1_20 import ( "forgejo.org/modules/log" diff --git a/models/migrations/v1_20/v248.go b/models/migrations/v1_20/v248.go index 40555210e7..4f2091e4bc 100644 --- a/models/migrations/v1_20/v248.go +++ b/models/migrations/v1_20/v248.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_20 //nolint +package v1_20 import "xorm.io/xorm" diff --git a/models/migrations/v1_20/v249.go b/models/migrations/v1_20/v249.go index d2b096bf58..0aebb2a343 100644 --- a/models/migrations/v1_20/v249.go +++ b/models/migrations/v1_20/v249.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_20 //nolint +package v1_20 import ( "forgejo.org/modules/timeutil" diff --git a/models/migrations/v1_20/v250.go b/models/migrations/v1_20/v250.go index cfcde2fc9b..e12223691f 100644 --- a/models/migrations/v1_20/v250.go +++ b/models/migrations/v1_20/v250.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_20 //nolint +package v1_20 import ( "strings" diff --git a/models/migrations/v1_20/v251.go b/models/migrations/v1_20/v251.go index c8665ba7eb..7d2d259df6 100644 --- a/models/migrations/v1_20/v251.go +++ b/models/migrations/v1_20/v251.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_20 //nolint +package v1_20 import ( "forgejo.org/modules/log" diff --git a/models/migrations/v1_20/v252.go b/models/migrations/v1_20/v252.go index bb85c78309..435cce7ebe 100644 --- a/models/migrations/v1_20/v252.go +++ b/models/migrations/v1_20/v252.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_20 //nolint +package v1_20 import ( "forgejo.org/modules/log" diff --git a/models/migrations/v1_20/v253.go b/models/migrations/v1_20/v253.go index 5f4057e9d9..73354fd485 100644 --- a/models/migrations/v1_20/v253.go +++ b/models/migrations/v1_20/v253.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_20 //nolint +package v1_20 import ( "forgejo.org/modules/log" diff --git a/models/migrations/v1_20/v254.go b/models/migrations/v1_20/v254.go index 1e26979a5b..9cdbfb3916 100644 --- a/models/migrations/v1_20/v254.go +++ b/models/migrations/v1_20/v254.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_20 //nolint +package v1_20 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_20/v255.go b/models/migrations/v1_20/v255.go index 49b0ecf220..baa3c4b6d8 100644 --- a/models/migrations/v1_20/v255.go +++ b/models/migrations/v1_20/v255.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_20 //nolint +package v1_20 import ( "forgejo.org/modules/timeutil" diff --git a/models/migrations/v1_20/v256.go b/models/migrations/v1_20/v256.go index 822153b93e..7b84c1e154 100644 --- a/models/migrations/v1_20/v256.go +++ b/models/migrations/v1_20/v256.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_20 //nolint +package v1_20 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_20/v257.go b/models/migrations/v1_20/v257.go index 70f229d73f..8045909dba 100644 --- a/models/migrations/v1_20/v257.go +++ b/models/migrations/v1_20/v257.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_20 //nolint +package v1_20 import ( "forgejo.org/modules/timeutil" diff --git a/models/migrations/v1_20/v258.go b/models/migrations/v1_20/v258.go index 47174ce805..1d3faffdae 100644 --- a/models/migrations/v1_20/v258.go +++ b/models/migrations/v1_20/v258.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_20 //nolint +package v1_20 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_20/v259.go b/models/migrations/v1_20/v259.go index f10b94fa9c..9b2b68263e 100644 --- a/models/migrations/v1_20/v259.go +++ b/models/migrations/v1_20/v259.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_20 //nolint +package v1_20 import ( "fmt" diff --git a/models/migrations/v1_20/v259_test.go b/models/migrations/v1_20/v259_test.go index 32e4aa3050..b41b6c7995 100644 --- a/models/migrations/v1_20/v259_test.go +++ b/models/migrations/v1_20/v259_test.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_20 //nolint +package v1_20 import ( "sort" diff --git a/models/migrations/v1_21/main_test.go b/models/migrations/v1_21/main_test.go index 7104887afb..3f10a39a94 100644 --- a/models/migrations/v1_21/main_test.go +++ b/models/migrations/v1_21/main_test.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_21 //nolint +package v1_21 import ( "testing" diff --git a/models/migrations/v1_21/v260.go b/models/migrations/v1_21/v260.go index 245f3011ab..b73b53bd61 100644 --- a/models/migrations/v1_21/v260.go +++ b/models/migrations/v1_21/v260.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_21 //nolint +package v1_21 import ( "forgejo.org/models/migrations/base" diff --git a/models/migrations/v1_21/v261.go b/models/migrations/v1_21/v261.go index 743bef152d..83a4927704 100644 --- a/models/migrations/v1_21/v261.go +++ b/models/migrations/v1_21/v261.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_21 //nolint +package v1_21 import ( "forgejo.org/modules/timeutil" diff --git a/models/migrations/v1_21/v262.go b/models/migrations/v1_21/v262.go index 23e900572a..6e88e29b9d 100644 --- a/models/migrations/v1_21/v262.go +++ b/models/migrations/v1_21/v262.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_21 //nolint +package v1_21 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_21/v263.go b/models/migrations/v1_21/v263.go index 2c7cbadf0d..55c418bde0 100644 --- a/models/migrations/v1_21/v263.go +++ b/models/migrations/v1_21/v263.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_21 //nolint +package v1_21 import ( "fmt" diff --git a/models/migrations/v1_21/v264.go b/models/migrations/v1_21/v264.go index 5615600072..acd2c9bb48 100644 --- a/models/migrations/v1_21/v264.go +++ b/models/migrations/v1_21/v264.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_21 //nolint +package v1_21 import ( "context" diff --git a/models/migrations/v1_21/v265.go b/models/migrations/v1_21/v265.go index 800eb95f72..b6892acc27 100644 --- a/models/migrations/v1_21/v265.go +++ b/models/migrations/v1_21/v265.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_21 //nolint +package v1_21 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_21/v266.go b/models/migrations/v1_21/v266.go index 79a5f5e14c..440549e868 100644 --- a/models/migrations/v1_21/v266.go +++ b/models/migrations/v1_21/v266.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_21 //nolint +package v1_21 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_21/v267.go b/models/migrations/v1_21/v267.go index f94696a22b..13992d8776 100644 --- a/models/migrations/v1_21/v267.go +++ b/models/migrations/v1_21/v267.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_21 //nolint +package v1_21 import ( "forgejo.org/modules/timeutil" diff --git a/models/migrations/v1_21/v268.go b/models/migrations/v1_21/v268.go index 332793ff07..b677d2383e 100644 --- a/models/migrations/v1_21/v268.go +++ b/models/migrations/v1_21/v268.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_21 //nolint +package v1_21 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_21/v269.go b/models/migrations/v1_21/v269.go index 475ec02380..042040927d 100644 --- a/models/migrations/v1_21/v269.go +++ b/models/migrations/v1_21/v269.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_21 //nolint +package v1_21 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_21/v270.go b/models/migrations/v1_21/v270.go index b9cc84d3ac..ab7c5660ba 100644 --- a/models/migrations/v1_21/v270.go +++ b/models/migrations/v1_21/v270.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_21 //nolint +package v1_21 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_21/v271.go b/models/migrations/v1_21/v271.go index f45c113c1f..e3ce2d4b74 100644 --- a/models/migrations/v1_21/v271.go +++ b/models/migrations/v1_21/v271.go @@ -1,7 +1,8 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_21 //nolint +package v1_21 + import ( "forgejo.org/modules/timeutil" diff --git a/models/migrations/v1_21/v272.go b/models/migrations/v1_21/v272.go index a729c49f1b..14c1e0c4b0 100644 --- a/models/migrations/v1_21/v272.go +++ b/models/migrations/v1_21/v272.go @@ -1,7 +1,8 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_21 //nolint +package v1_21 + import ( "xorm.io/xorm" ) diff --git a/models/migrations/v1_21/v273.go b/models/migrations/v1_21/v273.go index 1ec6ade566..d6ec80d3d5 100644 --- a/models/migrations/v1_21/v273.go +++ b/models/migrations/v1_21/v273.go @@ -1,7 +1,8 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_21 //nolint +package v1_21 + import ( "forgejo.org/modules/timeutil" diff --git a/models/migrations/v1_21/v274.go b/models/migrations/v1_21/v274.go index b74e5fed51..a1211d1fdd 100644 --- a/models/migrations/v1_21/v274.go +++ b/models/migrations/v1_21/v274.go @@ -1,7 +1,8 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_21 //nolint +package v1_21 + import ( "time" diff --git a/models/migrations/v1_21/v275.go b/models/migrations/v1_21/v275.go index 78804a59d6..2bfe5c72fa 100644 --- a/models/migrations/v1_21/v275.go +++ b/models/migrations/v1_21/v275.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_21 //nolint +package v1_21 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_21/v276.go b/models/migrations/v1_21/v276.go index 0830c3bd92..3b0bc23da7 100644 --- a/models/migrations/v1_21/v276.go +++ b/models/migrations/v1_21/v276.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_21 //nolint +package v1_21 import ( repo_model "forgejo.org/models/repo" diff --git a/models/migrations/v1_21/v277.go b/models/migrations/v1_21/v277.go index 12529160b7..0c102eddde 100644 --- a/models/migrations/v1_21/v277.go +++ b/models/migrations/v1_21/v277.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_21 //nolint +package v1_21 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_21/v278.go b/models/migrations/v1_21/v278.go index d6a462d1e7..846f228678 100644 --- a/models/migrations/v1_21/v278.go +++ b/models/migrations/v1_21/v278.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_21 //nolint +package v1_21 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_21/v279.go b/models/migrations/v1_21/v279.go index 2abd1bbe84..beb39effe1 100644 --- a/models/migrations/v1_21/v279.go +++ b/models/migrations/v1_21/v279.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_21 //nolint +package v1_21 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_22/main_test.go b/models/migrations/v1_22/main_test.go index dc991b78fe..7b05993e09 100644 --- a/models/migrations/v1_22/main_test.go +++ b/models/migrations/v1_22/main_test.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import ( "testing" diff --git a/models/migrations/v1_22/v280.go b/models/migrations/v1_22/v280.go index a8ee4a3bf7..2271cb6089 100644 --- a/models/migrations/v1_22/v280.go +++ b/models/migrations/v1_22/v280.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_22/v281.go b/models/migrations/v1_22/v281.go index 5271c786be..2eeca9be82 100644 --- a/models/migrations/v1_22/v281.go +++ b/models/migrations/v1_22/v281.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import ( "forgejo.org/modules/timeutil" diff --git a/models/migrations/v1_22/v282.go b/models/migrations/v1_22/v282.go index baad9e0916..eed64c30f7 100644 --- a/models/migrations/v1_22/v282.go +++ b/models/migrations/v1_22/v282.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_22/v283.go b/models/migrations/v1_22/v283.go index 86946d1c39..33a2513069 100644 --- a/models/migrations/v1_22/v283.go +++ b/models/migrations/v1_22/v283.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_22/v283_test.go b/models/migrations/v1_22/v283_test.go index d8e147a131..652d96ac16 100644 --- a/models/migrations/v1_22/v283_test.go +++ b/models/migrations/v1_22/v283_test.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import ( "testing" diff --git a/models/migrations/v1_22/v284.go b/models/migrations/v1_22/v284.go index 2b95078980..31b38f6aed 100644 --- a/models/migrations/v1_22/v284.go +++ b/models/migrations/v1_22/v284.go @@ -1,7 +1,8 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 + import ( "xorm.io/xorm" ) diff --git a/models/migrations/v1_22/v285.go b/models/migrations/v1_22/v285.go index a55cc17c04..fed89f670e 100644 --- a/models/migrations/v1_22/v285.go +++ b/models/migrations/v1_22/v285.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import ( "time" diff --git a/models/migrations/v1_22/v286.go b/models/migrations/v1_22/v286.go index d0489e7aeb..05247bb436 100644 --- a/models/migrations/v1_22/v286.go +++ b/models/migrations/v1_22/v286.go @@ -1,6 +1,6 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import ( "fmt" diff --git a/models/migrations/v1_22/v286_test.go b/models/migrations/v1_22/v286_test.go index c63deef495..5bb3334df2 100644 --- a/models/migrations/v1_22/v286_test.go +++ b/models/migrations/v1_22/v286_test.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import ( "testing" diff --git a/models/migrations/v1_22/v287.go b/models/migrations/v1_22/v287.go index c8b1593286..5fd901f9de 100644 --- a/models/migrations/v1_22/v287.go +++ b/models/migrations/v1_22/v287.go @@ -1,7 +1,7 @@ // Copyright 2023 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_22/v288.go b/models/migrations/v1_22/v288.go index 44e4991851..78be3b6ef2 100644 --- a/models/migrations/v1_22/v288.go +++ b/models/migrations/v1_22/v288.go @@ -1,7 +1,7 @@ // Copyright 2024 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import ( "forgejo.org/modules/timeutil" diff --git a/models/migrations/v1_22/v289.go b/models/migrations/v1_22/v289.go index b9941aadd9..78689a4ffa 100644 --- a/models/migrations/v1_22/v289.go +++ b/models/migrations/v1_22/v289.go @@ -1,7 +1,7 @@ // Copyright 2024 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import "xorm.io/xorm" diff --git a/models/migrations/v1_22/v290.go b/models/migrations/v1_22/v290.go index 594e417644..ebafab6567 100644 --- a/models/migrations/v1_22/v290.go +++ b/models/migrations/v1_22/v290.go @@ -1,7 +1,7 @@ // Copyright 2024 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import ( "forgejo.org/modules/timeutil" diff --git a/models/migrations/v1_22/v290_test.go b/models/migrations/v1_22/v290_test.go index 569d77bc16..a1907cf4d6 100644 --- a/models/migrations/v1_22/v290_test.go +++ b/models/migrations/v1_22/v290_test.go @@ -1,7 +1,7 @@ // Copyright 2024 The Forgejo Authors c/o Codeberg e.V.. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import ( "strconv" diff --git a/models/migrations/v1_22/v291.go b/models/migrations/v1_22/v291.go index 74726fae96..823a644a95 100644 --- a/models/migrations/v1_22/v291.go +++ b/models/migrations/v1_22/v291.go @@ -1,7 +1,7 @@ // Copyright 2024 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import "xorm.io/xorm" diff --git a/models/migrations/v1_22/v292.go b/models/migrations/v1_22/v292.go index beca556aee..440f48ce80 100644 --- a/models/migrations/v1_22/v292.go +++ b/models/migrations/v1_22/v292.go @@ -1,7 +1,7 @@ // Copyright 2024 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 // NOTE: noop the original migration has bug which some projects will be skip, so // these projects will have no default board. diff --git a/models/migrations/v1_22/v293.go b/models/migrations/v1_22/v293.go index 9f38c3db56..e9c9746b26 100644 --- a/models/migrations/v1_22/v293.go +++ b/models/migrations/v1_22/v293.go @@ -1,7 +1,7 @@ // Copyright 2024 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import ( "forgejo.org/modules/setting" diff --git a/models/migrations/v1_22/v293_test.go b/models/migrations/v1_22/v293_test.go index 444146737d..6b1931b761 100644 --- a/models/migrations/v1_22/v293_test.go +++ b/models/migrations/v1_22/v293_test.go @@ -1,7 +1,7 @@ // Copyright 2024 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import ( "testing" diff --git a/models/migrations/v1_22/v294.go b/models/migrations/v1_22/v294.go index 314b4519f1..6c52372306 100644 --- a/models/migrations/v1_22/v294.go +++ b/models/migrations/v1_22/v294.go @@ -1,7 +1,7 @@ // Copyright 2024 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_22/v294_test.go b/models/migrations/v1_22/v294_test.go index ef7b67ca5b..e87a4bc85f 100644 --- a/models/migrations/v1_22/v294_test.go +++ b/models/migrations/v1_22/v294_test.go @@ -1,7 +1,7 @@ // Copyright 2024 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import ( "slices" @@ -45,7 +45,8 @@ func Test_AddUniqueIndexForProjectIssue(t *testing.T) { for _, index := range tables[0].Indexes { if index.Type == schemas.UniqueType { found = true - slices.Equal(index.Cols, []string{"project_id", "issue_id"}) + slices.Sort(index.Cols) + assert.Equal(t, []string{"issue_id", "project_id"}, index.Cols) break } } diff --git a/models/migrations/v1_22/v295.go b/models/migrations/v1_22/v295.go index 17bdadb4ad..319b1a399b 100644 --- a/models/migrations/v1_22/v295.go +++ b/models/migrations/v1_22/v295.go @@ -1,7 +1,7 @@ // Copyright 2024 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import "xorm.io/xorm" diff --git a/models/migrations/v1_22/v296.go b/models/migrations/v1_22/v296.go index 1ecacab95f..75350f9f65 100644 --- a/models/migrations/v1_22/v296.go +++ b/models/migrations/v1_22/v296.go @@ -1,7 +1,7 @@ // Copyright 2024 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import "xorm.io/xorm" diff --git a/models/migrations/v1_22/v298.go b/models/migrations/v1_22/v298.go index b9f3b95ade..7700173a00 100644 --- a/models/migrations/v1_22/v298.go +++ b/models/migrations/v1_22/v298.go @@ -1,7 +1,7 @@ // Copyright 2024 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_22 //nolint +package v1_22 import "xorm.io/xorm" diff --git a/models/migrations/v1_23/main_test.go b/models/migrations/v1_23/main_test.go index 0fd90a4a67..5fb4fec999 100644 --- a/models/migrations/v1_23/main_test.go +++ b/models/migrations/v1_23/main_test.go @@ -1,7 +1,7 @@ // Copyright 2024 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_23 //nolint +package v1_23 import ( "testing" diff --git a/models/migrations/v1_23/v299.go b/models/migrations/v1_23/v299.go index f6db960c3b..73ce19c875 100644 --- a/models/migrations/v1_23/v299.go +++ b/models/migrations/v1_23/v299.go @@ -1,7 +1,7 @@ // Copyright 2024 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_23 //nolint +package v1_23 import "xorm.io/xorm" diff --git a/models/migrations/v1_23/v300.go b/models/migrations/v1_23/v300.go index f1f1cccdbf..404d8dbea8 100644 --- a/models/migrations/v1_23/v300.go +++ b/models/migrations/v1_23/v300.go @@ -1,7 +1,7 @@ // Copyright 2024 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_23 //nolint +package v1_23 import "xorm.io/xorm" diff --git a/models/migrations/v1_23/v301.go b/models/migrations/v1_23/v301.go index b7797f6c6b..f2a4d8c559 100644 --- a/models/migrations/v1_23/v301.go +++ b/models/migrations/v1_23/v301.go @@ -1,7 +1,7 @@ // Copyright 2024 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_23 //nolint +package v1_23 import "xorm.io/xorm" diff --git a/models/migrations/v1_23/v302.go b/models/migrations/v1_23/v302.go index c8ed786d63..1b056993bd 100644 --- a/models/migrations/v1_23/v302.go +++ b/models/migrations/v1_23/v302.go @@ -1,7 +1,7 @@ // Copyright 2024 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_23 //nolint +package v1_23 import ( "forgejo.org/modules/timeutil" diff --git a/models/migrations/v1_23/v303.go b/models/migrations/v1_23/v303.go index fae0131bdd..03197d2857 100644 --- a/models/migrations/v1_23/v303.go +++ b/models/migrations/v1_23/v303.go @@ -1,7 +1,7 @@ // Copyright 2025 The Forgejo Authors. // SPDX-License-Identifier: GPL-3.0-or-later -package v1_23 //nolint +package v1_23 import ( "forgejo.org/models/migrations/base" diff --git a/models/migrations/v1_23/v303_test.go b/models/migrations/v1_23/v303_test.go index f105d11830..f2c764bae3 100644 --- a/models/migrations/v1_23/v303_test.go +++ b/models/migrations/v1_23/v303_test.go @@ -1,7 +1,7 @@ // Copyright 2025 The Forgejo Authors. // SPDX-License-Identifier: GPL-3.0-or-later -package v1_23 //nolint +package v1_23 import ( "testing" diff --git a/models/migrations/v1_6/v70.go b/models/migrations/v1_6/v70.go index ec6bd09bb5..eb669f57b6 100644 --- a/models/migrations/v1_6/v70.go +++ b/models/migrations/v1_6/v70.go @@ -1,7 +1,7 @@ // Copyright 2018 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_6 //nolint +package v1_6 import ( "fmt" diff --git a/models/migrations/v1_6/v71.go b/models/migrations/v1_6/v71.go index 3706ad4406..42fe8cd1ba 100644 --- a/models/migrations/v1_6/v71.go +++ b/models/migrations/v1_6/v71.go @@ -1,7 +1,7 @@ // Copyright 2018 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_6 //nolint +package v1_6 import ( "fmt" diff --git a/models/migrations/v1_6/v72.go b/models/migrations/v1_6/v72.go index 4df2a0f6e9..7cd2331376 100644 --- a/models/migrations/v1_6/v72.go +++ b/models/migrations/v1_6/v72.go @@ -1,7 +1,7 @@ // Copyright 2018 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_6 //nolint +package v1_6 import ( "fmt" diff --git a/models/migrations/v1_7/v73.go b/models/migrations/v1_7/v73.go index b5a748aae3..e0b7a28537 100644 --- a/models/migrations/v1_7/v73.go +++ b/models/migrations/v1_7/v73.go @@ -1,7 +1,7 @@ // Copyright 2018 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_7 //nolint +package v1_7 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_7/v74.go b/models/migrations/v1_7/v74.go index f0567e3c9b..376be37a24 100644 --- a/models/migrations/v1_7/v74.go +++ b/models/migrations/v1_7/v74.go @@ -1,7 +1,7 @@ // Copyright 2018 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_7 //nolint +package v1_7 import "xorm.io/xorm" diff --git a/models/migrations/v1_7/v75.go b/models/migrations/v1_7/v75.go index fa7430970c..ef11575466 100644 --- a/models/migrations/v1_7/v75.go +++ b/models/migrations/v1_7/v75.go @@ -1,7 +1,7 @@ // Copyright 2018 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_7 //nolint +package v1_7 import ( "xorm.io/builder" diff --git a/models/migrations/v1_8/v76.go b/models/migrations/v1_8/v76.go index 61ad006a47..8d47280b41 100644 --- a/models/migrations/v1_8/v76.go +++ b/models/migrations/v1_8/v76.go @@ -1,7 +1,7 @@ // Copyright 2018 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_8 //nolint +package v1_8 import ( "fmt" diff --git a/models/migrations/v1_8/v77.go b/models/migrations/v1_8/v77.go index 8b19993924..4fe5ebe635 100644 --- a/models/migrations/v1_8/v77.go +++ b/models/migrations/v1_8/v77.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_8 //nolint +package v1_8 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_8/v78.go b/models/migrations/v1_8/v78.go index 8102b19335..840fc20d96 100644 --- a/models/migrations/v1_8/v78.go +++ b/models/migrations/v1_8/v78.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_8 //nolint +package v1_8 import ( "forgejo.org/models/migrations/base" diff --git a/models/migrations/v1_8/v79.go b/models/migrations/v1_8/v79.go index f7d2d68f96..c8e0db531f 100644 --- a/models/migrations/v1_8/v79.go +++ b/models/migrations/v1_8/v79.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_8 //nolint +package v1_8 import ( "forgejo.org/modules/setting" diff --git a/models/migrations/v1_8/v80.go b/models/migrations/v1_8/v80.go index cebbbead28..6f9df47a93 100644 --- a/models/migrations/v1_8/v80.go +++ b/models/migrations/v1_8/v80.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_8 //nolint +package v1_8 import "xorm.io/xorm" diff --git a/models/migrations/v1_8/v81.go b/models/migrations/v1_8/v81.go index 734fc24641..8152a47ad7 100644 --- a/models/migrations/v1_8/v81.go +++ b/models/migrations/v1_8/v81.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_8 //nolint +package v1_8 import ( "fmt" diff --git a/models/migrations/v1_9/v82.go b/models/migrations/v1_9/v82.go index 78a90bdde9..235c73c504 100644 --- a/models/migrations/v1_9/v82.go +++ b/models/migrations/v1_9/v82.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_9 //nolint +package v1_9 import ( "fmt" diff --git a/models/migrations/v1_9/v83.go b/models/migrations/v1_9/v83.go index fa24a92d28..9640564a44 100644 --- a/models/migrations/v1_9/v83.go +++ b/models/migrations/v1_9/v83.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_9 //nolint +package v1_9 import ( "forgejo.org/modules/timeutil" diff --git a/models/migrations/v1_9/v84.go b/models/migrations/v1_9/v84.go index c7155fe9cf..423915ae57 100644 --- a/models/migrations/v1_9/v84.go +++ b/models/migrations/v1_9/v84.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_9 //nolint +package v1_9 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_9/v85.go b/models/migrations/v1_9/v85.go index d8e9d91840..9d5adc82dd 100644 --- a/models/migrations/v1_9/v85.go +++ b/models/migrations/v1_9/v85.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_9 //nolint +package v1_9 import ( "fmt" diff --git a/models/migrations/v1_9/v86.go b/models/migrations/v1_9/v86.go index cf2725d158..9464ff0cf6 100644 --- a/models/migrations/v1_9/v86.go +++ b/models/migrations/v1_9/v86.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_9 //nolint +package v1_9 import ( "xorm.io/xorm" diff --git a/models/migrations/v1_9/v87.go b/models/migrations/v1_9/v87.go index fa01b6e5e3..81a4ebf80d 100644 --- a/models/migrations/v1_9/v87.go +++ b/models/migrations/v1_9/v87.go @@ -1,7 +1,7 @@ // Copyright 2019 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT -package v1_9 //nolint +package v1_9 import ( "xorm.io/xorm" diff --git a/models/packages/package.go b/models/packages/package.go index bdd1c74cad..c06dcf5eb3 100644 --- a/models/packages/package.go +++ b/models/packages/package.go @@ -125,7 +125,7 @@ func (pt Type) Name() string { case TypeRpm: return "RPM" case TypeAlt: - return "Alt" + return "ALT" case TypeRubyGems: return "RubyGems" case TypeSwift: diff --git a/models/repo/repo_unit.go b/models/repo/repo_unit.go index c11ad70627..e50f79e945 100644 --- a/models/repo/repo_unit.go +++ b/models/repo/repo_unit.go @@ -41,27 +41,30 @@ func (err ErrUnitTypeNotExist) Unwrap() error { } // RepoUnitAccessMode specifies the users access mode to a repo unit +// Only UnitAccessModeWrite is used by the wiki, to mark it as instance-writable type UnitAccessMode int const ( // UnitAccessModeUnset - no unit mode set UnitAccessModeUnset UnitAccessMode = iota // 0 + // UnitAccessModeNone no access - UnitAccessModeNone // 1 + // UnitAccessModeNone UnitAccessMode = 1 // UnitAccessModeRead read access - UnitAccessModeRead // 2 + // UnitAccessModeRead UnitAccessMode = 2 + // UnitAccessModeWrite write access - UnitAccessModeWrite // 3 + UnitAccessModeWrite UnitAccessMode = 3 ) func (mode UnitAccessMode) ToAccessMode(modeIfUnset perm.AccessMode) perm.AccessMode { switch mode { case UnitAccessModeUnset: return modeIfUnset - case UnitAccessModeNone: - return perm.AccessModeNone - case UnitAccessModeRead: - return perm.AccessModeRead + // case UnitAccessModeNone: + // return perm.AccessModeNone + // case UnitAccessModeRead: + // return perm.AccessModeRead case UnitAccessModeWrite: return perm.AccessModeWrite default: diff --git a/models/repo/repo_unit_test.go b/models/repo/repo_unit_test.go index a1964519bd..3d6d408fcb 100644 --- a/models/repo/repo_unit_test.go +++ b/models/repo/repo_unit_test.go @@ -34,8 +34,8 @@ func TestActionsConfig(t *testing.T) { } func TestRepoUnitAccessMode(t *testing.T) { - assert.Equal(t, perm.AccessModeNone, UnitAccessModeNone.ToAccessMode(perm.AccessModeAdmin)) - assert.Equal(t, perm.AccessModeRead, UnitAccessModeRead.ToAccessMode(perm.AccessModeAdmin)) + // assert.Equal(t, perm.AccessModeNone, UnitAccessModeNone.ToAccessMode(perm.AccessModeAdmin)) + // assert.Equal(t, perm.AccessModeRead, UnitAccessModeRead.ToAccessMode(perm.AccessModeAdmin)) assert.Equal(t, perm.AccessModeWrite, UnitAccessModeWrite.ToAccessMode(perm.AccessModeAdmin)) assert.Equal(t, perm.AccessModeRead, UnitAccessModeUnset.ToAccessMode(perm.AccessModeRead)) } diff --git a/models/unittest/fixture_loader.go b/models/unittest/fixture_loader.go index 67ef1b28df..dda5c48d35 100644 --- a/models/unittest/fixture_loader.go +++ b/models/unittest/fixture_loader.go @@ -12,6 +12,8 @@ import ( "path/filepath" "strings" + "forgejo.org/modules/container" + "gopkg.in/yaml.v3" ) @@ -32,13 +34,15 @@ type loader struct { fixtureFiles []*fixtureFile } -func newFixtureLoader(db *sql.DB, dialect string, fixturePaths []string) (*loader, error) { +func newFixtureLoader(db *sql.DB, dialect string, fixturePaths []string, allTableNames container.Set[string]) (*loader, error) { l := &loader{ db: db, dialect: dialect, fixtureFiles: []*fixtureFile{}, } + tablesWithoutFixture := allTableNames + // Load fixtures for _, fixturePath := range fixturePaths { stat, err := os.Stat(fixturePath) @@ -60,6 +64,7 @@ func newFixtureLoader(db *sql.DB, dialect string, fixturePaths []string) (*loade return nil, err } l.fixtureFiles = append(l.fixtureFiles, fixtureFile) + tablesWithoutFixture.Remove(fixtureFile.name) } } } else { @@ -71,6 +76,14 @@ func newFixtureLoader(db *sql.DB, dialect string, fixturePaths []string) (*loade } } + // Even though these tables have no fixtures, they can still be used and ensure + // they are cleaned. + for table := range tablesWithoutFixture.Seq() { + l.fixtureFiles = append(l.fixtureFiles, &fixtureFile{ + name: table, + }) + } + return l, nil } @@ -178,13 +191,13 @@ func (l *loader) Load() error { }() // Clean the table and re-insert the fixtures. - tableDeleted := map[string]struct{}{} + tableDeleted := make(container.Set[string]) for _, fixture := range l.fixtureFiles { - if _, ok := tableDeleted[fixture.name]; !ok { + if !tableDeleted.Contains(fixture.name) { if _, err := tx.Exec(fmt.Sprintf("DELETE FROM %s", l.quoteKeyword(fixture.name))); err != nil { return fmt.Errorf("cannot delete table %s: %w", fixture.name, err) } - tableDeleted[fixture.name] = struct{}{} + tableDeleted.Add(fixture.name) } for _, insertSQL := range fixture.insertSQLs { diff --git a/models/unittest/fixtures.go b/models/unittest/fixtures.go index 6dc5c8412d..829cc16466 100644 --- a/models/unittest/fixtures.go +++ b/models/unittest/fixtures.go @@ -7,10 +7,12 @@ package unittest import ( "fmt" "path/filepath" + "sync" "time" "forgejo.org/models/db" "forgejo.org/modules/auth/password/hash" + "forgejo.org/modules/container" "forgejo.org/modules/setting" "xorm.io/xorm" @@ -44,6 +46,8 @@ func OverrideFixtures(dir string) func() { } } +var allTableNames = sync.OnceValue(db.GetTableNames) + // InitFixtures initialize test fixtures for a test database func InitFixtures(opts FixturesOptions, engine ...*xorm.Engine) (err error) { e, err := GetXORMEngine(engine...) @@ -75,7 +79,12 @@ func InitFixtures(opts FixturesOptions, engine ...*xorm.Engine) (err error) { panic("Unsupported RDBMS for test") } - fixturesLoader, err = newFixtureLoader(e.DB().DB, dialect, fixturePaths) + var allTables container.Set[string] + if !opts.SkipCleanRegistedModels { + allTables = allTableNames().Clone() + } + + fixturesLoader, err = newFixtureLoader(e.DB().DB, dialect, fixturePaths, allTables) if err != nil { return err } diff --git a/models/unittest/testdb.go b/models/unittest/testdb.go index d34c9e9a0a..29ec82c55f 100644 --- a/models/unittest/testdb.go +++ b/models/unittest/testdb.go @@ -217,6 +217,10 @@ type FixturesOptions struct { Files []string Dirs []string Base string + // By default all registered models are cleaned, even if they do not have + // fixture. Enabling this will skip that and only models with fixtures are + // considered. + SkipCleanRegistedModels bool } // CreateTestEngine creates a memory database and loads the fixture data from fixturesDir diff --git a/models/user/activitypub.go b/models/user/activitypub.go index 816fd8a098..aabf2336fc 100644 --- a/models/user/activitypub.go +++ b/models/user/activitypub.go @@ -19,7 +19,7 @@ func (u *User) APActorID() string { return fmt.Sprintf("%sapi/v1/activitypub/user-id/%s", setting.AppURL, url.PathEscape(fmt.Sprintf("%d", u.ID))) } -// APActorKeyID returns the ID of the user's public key -func (u *User) APActorKeyID() string { +// KeyID returns the ID of the user's public key +func (u *User) KeyID() string { return u.APActorID() + "#main-key" } diff --git a/models/user/email_address_test.go b/models/user/email_address_test.go index 1801f57a23..85f5b16c65 100644 --- a/models/user/email_address_test.go +++ b/models/user/email_address_test.go @@ -181,3 +181,20 @@ func TestDeletePrimaryEmailAddressOfUser(t *testing.T) { assert.True(t, user_model.IsErrEmailAddressNotExist(err)) assert.Nil(t, email) } + +func TestActivateUserEmail(t *testing.T) { + defer unittest.OverrideFixtures("models/fixtures/TestActivateUserEmail")() + require.NoError(t, unittest.PrepareTestDatabase()) + + t.Run("Activate email", func(t *testing.T) { + require.NoError(t, user_model.ActivateUserEmail(t.Context(), 1001, "AnotherTestUserWithUpperCaseEmail@otto.splvs.net", true)) + + unittest.AssertExistsAndLoadBean(t, &user_model.EmailAddress{UID: 1001}, "is_activated = true") + }) + + t.Run("Deactivate email", func(t *testing.T) { + require.NoError(t, user_model.ActivateUserEmail(t.Context(), 1001, "AnotherTestUserWithUpperCaseEmail@otto.splvs.net", false)) + + unittest.AssertExistsAndLoadBean(t, &user_model.EmailAddress{UID: 1001}, "is_activated = false") + }) +} diff --git a/models/user/user.go b/models/user/user.go index eedd1db80e..b124572bb6 100644 --- a/models/user/user.go +++ b/models/user/user.go @@ -182,11 +182,11 @@ func (u *User) BeforeUpdate() { u.MaxRepoCreation = -1 } - // Organization does not need email - u.Email = strings.ToLower(u.Email) + // Ensure AvatarEmail is set for non-organization users, because organization + // are not required to have a email set. if !u.IsOrganization() { if len(u.AvatarEmail) == 0 { - u.AvatarEmail = u.Email + u.AvatarEmail = strings.ToLower(u.Email) } } diff --git a/models/user/user_repository.go b/models/user/user_repository.go index 3f24efb1fb..85f44f1598 100644 --- a/models/user/user_repository.go +++ b/models/user/user_repository.go @@ -57,14 +57,6 @@ func CreateFederatedUser(ctx context.Context, user *User, federatedUser *Federat return committer.Commit() } -func (federatedUser *FederatedUser) UpdateFederatedUser(ctx context.Context) error { - if _, err := validation.IsValid(federatedUser); err != nil { - return err - } - _, err := db.GetEngine(ctx).ID(federatedUser.ID).Cols("inbox_path").Update(federatedUser) - return err -} - func FindFederatedUser(ctx context.Context, externalID string, federationHostID int64) (*User, *FederatedUser, error) { federatedUser := new(FederatedUser) user := new(User) @@ -219,7 +211,6 @@ func RemoveFollower(ctx context.Context, followedUser *User, followingUser *Fede return err } -// TODO: We should unify Activity-pub-following and classical following (see models/user/follow.go) func IsFollowingAp(ctx context.Context, followedUser *User, followingUser *FederatedUser) (bool, error) { if res, err := validation.IsValid(followedUser); !res { return false, err diff --git a/models/user/user_test.go b/models/user/user_test.go index fd9d05653f..f9a3aa6075 100644 --- a/models/user/user_test.go +++ b/models/user/user_test.go @@ -150,7 +150,7 @@ func TestAPActorID_APActorID(t *testing.T) { func TestKeyID(t *testing.T) { user := user_model.User{ID: 1} - url := user.APActorKeyID() + url := user.KeyID() expected := "https://try.gitea.io/api/v1/activitypub/user-id/1#main-key" assert.Equal(t, expected, url) } diff --git a/modules/activitypub/client.go b/modules/activitypub/client.go index d015fb7bec..fb6fa8b543 100644 --- a/modules/activitypub/client.go +++ b/modules/activitypub/client.go @@ -89,6 +89,7 @@ func NewClientFactory() (c *ClientFactory, err error) { type APClientFactory interface { WithKeys(ctx context.Context, user *user_model.User, pubID string) (APClient, error) + WithKeysDirect(ctx context.Context, privateKey, pubID string) (APClient, error) } // Client struct @@ -103,12 +104,8 @@ type Client struct { } // NewRequest function -func (cf *ClientFactory) WithKeys(ctx context.Context, user *user_model.User, pubID string) (APClient, error) { - priv, err := GetPrivateKey(ctx, user) - if err != nil { - return nil, err - } - privPem, _ := pem.Decode([]byte(priv)) +func (cf *ClientFactory) WithKeysDirect(ctx context.Context, privateKey, pubID string) (APClient, error) { + privPem, _ := pem.Decode([]byte(privateKey)) privParsed, err := x509.ParsePKCS1PrivateKey(privPem.Bytes) if err != nil { return nil, err @@ -126,6 +123,14 @@ func (cf *ClientFactory) WithKeys(ctx context.Context, user *user_model.User, pu return &c, nil } +func (cf *ClientFactory) WithKeys(ctx context.Context, user *user_model.User, pubID string) (APClient, error) { + priv, err := GetPrivateKey(ctx, user) + if err != nil { + return nil, err + } + return cf.WithKeysDirect(ctx, priv, pubID) +} + // NewRequest function func (c *Client) newRequest(method string, b []byte, to string) (req *http.Request, err error) { buf := bytes.NewBuffer(b) @@ -149,12 +154,14 @@ func (c *Client) Post(b []byte, to string) (resp *http.Response, err error) { return nil, err } - signer, _, err := httpsig.NewSigner(c.algs, c.digestAlg, c.postHeaders, httpsig.Signature, httpsigExpirationTime) - if err != nil { - return nil, err - } - if err := signer.SignRequest(c.priv, c.pubID, req, b); err != nil { - return nil, err + if c.pubID != "" { + signer, _, err := httpsig.NewSigner(c.algs, c.digestAlg, c.postHeaders, httpsig.Signature, httpsigExpirationTime) + if err != nil { + return nil, err + } + if err := signer.SignRequest(c.priv, c.pubID, req, b); err != nil { + return nil, err + } } resp, err = c.client.Do(req) @@ -167,12 +174,15 @@ func (c *Client) Get(to string) (resp *http.Response, err error) { if req, err = c.newRequest(http.MethodGet, nil, to); err != nil { return nil, err } - signer, _, err := httpsig.NewSigner(c.algs, c.digestAlg, c.getHeaders, httpsig.Signature, httpsigExpirationTime) - if err != nil { - return nil, err - } - if err := signer.SignRequest(c.priv, c.pubID, req, nil); err != nil { - return nil, err + + if c.pubID != "" { + signer, _, err := httpsig.NewSigner(c.algs, c.digestAlg, c.getHeaders, httpsig.Signature, httpsigExpirationTime) + if err != nil { + return nil, err + } + if err := signer.SignRequest(c.priv, c.pubID, req, nil); err != nil { + return nil, err + } } resp, err = c.client.Do(req) diff --git a/modules/container/set.go b/modules/container/set.go index 70f837bc66..d3719dc552 100644 --- a/modules/container/set.go +++ b/modules/container/set.go @@ -74,3 +74,8 @@ func (s Set[T]) Values() []T { func (s Set[T]) Seq() iter.Seq[T] { return maps.Keys(s) } + +// Clone returns a identical shallow copy of this set. +func (s Set[T]) Clone() Set[T] { + return maps.Clone(s) +} diff --git a/modules/container/set_test.go b/modules/container/set_test.go index af5e9126ab..44e4847f6b 100644 --- a/modules/container/set_test.go +++ b/modules/container/set_test.go @@ -47,4 +47,11 @@ func TestSet(t *testing.T) { assert.False(t, s.IsSubset([]string{"key1"})) assert.True(t, s.IsSubset([]string{})) + + t.Run("Clone", func(t *testing.T) { + clonedSet := s.Clone() + clonedSet.Remove("key6") + assert.False(t, clonedSet.Contains("key6")) + assert.True(t, s.Contains("key6")) + }) } diff --git a/modules/git/blob.go b/modules/git/blob.go index 14ca2b1445..4eef5f0e2a 100644 --- a/modules/git/blob.go +++ b/modules/git/blob.go @@ -220,7 +220,7 @@ func (b *Blob) GuessContentType() (typesniffer.SniffedType, error) { } defer r.Close() - return typesniffer.DetectContentTypeFromReader(r) + return typesniffer.DetectContentTypeFromReader(r, b.Name()) } // GetBlob finds the blob object in the repository. diff --git a/modules/git/pushoptions/pushoptions.go b/modules/git/pushoptions/pushoptions.go index 9709a8be79..e96ba0a339 100644 --- a/modules/git/pushoptions/pushoptions.go +++ b/modules/git/pushoptions/pushoptions.go @@ -4,6 +4,7 @@ package pushoptions import ( + "encoding/base64" "fmt" "os" "strconv" @@ -109,5 +110,22 @@ func (o gitPushOptions) GetBool(key Key, def bool) bool { func (o gitPushOptions) GetString(key Key) (string, bool) { val, ok := o[string(key)] - return val, ok + if !ok { + return "", false + } + + // If the value is prefixed with `{base64}` then everything after that is very + // likely to be encoded via base64. + base64Value, found := strings.CutPrefix(val, "{base64}") + if !found { + return val, true + } + + value, err := base64.StdEncoding.DecodeString(base64Value) + if err != nil { + // Not valid base64? Return the original value. + return val, true + } + + return string(value), true } diff --git a/modules/git/pushoptions/pushoptions_test.go b/modules/git/pushoptions/pushoptions_test.go index 1cb36d9d1e..d7c50649d0 100644 --- a/modules/git/pushoptions/pushoptions_test.go +++ b/modules/git/pushoptions/pushoptions_test.go @@ -4,6 +4,7 @@ package pushoptions import ( + "encoding/base64" "fmt" "testing" @@ -92,6 +93,23 @@ func TestParse(t *testing.T) { assert.False(t, options.Parse("unknown=value")) assert.True(t, options.Empty()) }) + + t.Run("Base64 values", func(t *testing.T) { + options := New() + + description := `I contain +a +line` + assert.True(t, options.Parse(fmt.Sprintf("%s={base64}%s", AgitDescription, base64.StdEncoding.EncodeToString([]byte(description))))) + val, ok := options.GetString(AgitDescription) + assert.True(t, ok) + assert.Equal(t, description, val) + + assert.True(t, options.Parse(fmt.Sprintf("%s={base64}fooled you", AgitTitle))) + val, ok = options.GetString(AgitTitle) + assert.True(t, ok) + assert.Equal(t, "{base64}fooled you", val) + }) } func TestReadEnv(t *testing.T) { diff --git a/modules/git/repo_blame.go b/modules/git/repo_blame.go index 139cdd7be9..d812354af5 100644 --- a/modules/git/repo_blame.go +++ b/modules/git/repo_blame.go @@ -4,20 +4,46 @@ package git import ( + "errors" "fmt" + "regexp" +) + +var ( + ErrBlameFileDoesNotExist = errors.New("the blamed file does not exist") + ErrBlameFileNotEnoughLines = errors.New("the blamed file has not enough lines") + + notEnoughLinesRe = regexp.MustCompile(`^fatal: file .+ has only \d+ lines?\n$`) ) // LineBlame returns the latest commit at the given line -func (repo *Repository) LineBlame(revision, path, file string, line uint) (*Commit, error) { - res, _, err := NewCommand(repo.Ctx, "blame"). +func (repo *Repository) LineBlame(revision, file string, line uint64) (*Commit, error) { + res, _, gitErr := NewCommand(repo.Ctx, "blame"). AddOptionFormat("-L %d,%d", line, line). AddOptionValues("-p", revision). - AddDashesAndList(file).RunStdString(&RunOpts{Dir: path}) + AddDashesAndList(file).RunStdString(&RunOpts{Dir: repo.Path}) + if gitErr != nil { + stdErr := gitErr.Stderr() + + if stdErr == fmt.Sprintf("fatal: no such path %s in %s\n", file, revision) { + return nil, ErrBlameFileDoesNotExist + } + if notEnoughLinesRe.MatchString(stdErr) { + return nil, ErrBlameFileNotEnoughLines + } + + return nil, gitErr + } + + objectFormat, err := repo.GetObjectFormat() if err != nil { return nil, err } - if len(res) < 40 { - return nil, fmt.Errorf("invalid result of blame: %s", res) + + objectIDLen := objectFormat.FullLength() + if len(res) < objectIDLen { + return nil, fmt.Errorf("output of blame is invalid, cannot contain commit ID: %s", res) } - return repo.GetCommit(res[:40]) + + return repo.GetCommit(res[:objectIDLen]) } diff --git a/modules/git/repo_blame_test.go b/modules/git/repo_blame_test.go new file mode 100644 index 0000000000..126b95386d --- /dev/null +++ b/modules/git/repo_blame_test.go @@ -0,0 +1,52 @@ +// Copyright 2025 The Forgejo Authors. All rights reserved. +// SPDX-License-Identifier: GPL-3.0-or-later + +package git + +import ( + "path/filepath" + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func TestLineBlame(t *testing.T) { + t.Run("SHA1", func(t *testing.T) { + repo, err := OpenRepository(t.Context(), filepath.Join(testReposDir, "repo1_bare")) + require.NoError(t, err) + defer repo.Close() + + commit, err := repo.LineBlame("HEAD", "foo/link_short", 1) + require.NoError(t, err) + assert.Equal(t, "37991dec2c8e592043f47155ce4808d4580f9123", commit.ID.String()) + + commit, err = repo.LineBlame("HEAD", "foo/link_short", 512) + require.ErrorIs(t, err, ErrBlameFileNotEnoughLines) + assert.Nil(t, commit) + + commit, err = repo.LineBlame("HEAD", "non-existent/path", 512) + require.ErrorIs(t, err, ErrBlameFileDoesNotExist) + assert.Nil(t, commit) + }) + + t.Run("SHA256", func(t *testing.T) { + skipIfSHA256NotSupported(t) + + repo, err := OpenRepository(t.Context(), filepath.Join(testReposDir, "repo1_bare_sha256")) + require.NoError(t, err) + defer repo.Close() + + commit, err := repo.LineBlame("HEAD", "foo/link_short", 1) + require.NoError(t, err) + assert.Equal(t, "6aae864a3d1d0d6a5be0cc64028c1e7021e2632b031fd8eb82afc5a283d1c3d1", commit.ID.String()) + + commit, err = repo.LineBlame("HEAD", "foo/link_short", 512) + require.ErrorIs(t, err, ErrBlameFileNotEnoughLines) + assert.Nil(t, commit) + + commit, err = repo.LineBlame("HEAD", "non-existent/path", 512) + require.ErrorIs(t, err, ErrBlameFileDoesNotExist) + assert.Nil(t, commit) + }) +} diff --git a/modules/git/repo_branch.go b/modules/git/repo_branch.go index 3a9aa3e4e6..1e38bf2946 100644 --- a/modules/git/repo_branch.go +++ b/modules/git/repo_branch.go @@ -19,15 +19,9 @@ import ( // BranchPrefix base dir of the branch information file store on git const BranchPrefix = "refs/heads/" -// IsReferenceExist returns true if given reference exists in the repository. -func IsReferenceExist(ctx context.Context, repoPath, name string) bool { - _, _, err := NewCommand(ctx, "show-ref", "--verify").AddDashesAndList(name).RunStdString(&RunOpts{Dir: repoPath}) - return err == nil -} - // IsBranchExist returns true if given branch exists in the repository. func IsBranchExist(ctx context.Context, repoPath, name string) bool { - return IsReferenceExist(ctx, repoPath, BranchPrefix+name) + return NewCommand(ctx, "show-ref", "--verify", "--quiet").AddDashesAndList(BranchPrefix+name).Run(&RunOpts{Dir: repoPath}) == nil } // Branch represents a Git branch. diff --git a/modules/git/repo_branch_test.go b/modules/git/repo_branch_test.go index 1e0fea7cd4..e61ea6f5d7 100644 --- a/modules/git/repo_branch_test.go +++ b/modules/git/repo_branch_test.go @@ -1,4 +1,5 @@ // Copyright 2018 The Gitea Authors. All rights reserved. +// Copyright 2025 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT package git @@ -195,3 +196,17 @@ func TestRepository_IsReferenceExist(t *testing.T) { }) } } + +func TestIsBranchExist(t *testing.T) { + repo1Path := filepath.Join(testReposDir, "repo1_bare") + + assert.True(t, IsBranchExist(t.Context(), repo1Path, "branch1")) + assert.True(t, IsBranchExist(t.Context(), repo1Path, "branch2")) + assert.True(t, IsBranchExist(t.Context(), repo1Path, "master")) + + assert.False(t, IsBranchExist(t.Context(), repo1Path, "HEAD")) + assert.False(t, IsBranchExist(t.Context(), repo1Path, "153f451b9ee7fa1da317ab17a127e9fd9d384310")) + assert.False(t, IsBranchExist(t.Context(), repo1Path, "153f451b9ee7fa1da317ab17a127e9fd9d384310")) + assert.False(t, IsBranchExist(t.Context(), repo1Path, "signed-tag")) + assert.False(t, IsBranchExist(t.Context(), repo1Path, "test")) +} diff --git a/modules/httplib/serve.go b/modules/httplib/serve.go index c5f0658d4e..d385ac21c9 100644 --- a/modules/httplib/serve.go +++ b/modules/httplib/serve.go @@ -99,7 +99,7 @@ func setServeHeadersByFile(r *http.Request, w http.ResponseWriter, filePath stri Filename: path.Base(filePath), } - sniffedType := typesniffer.DetectContentType(mineBuf) + sniffedType := typesniffer.DetectContentType(mineBuf, opts.Filename) // the "render" parameter came from year 2016: 638dd24c, it doesn't have clear meaning, so I think it could be removed later isPlain := sniffedType.IsText() || r.FormValue("render") != "" diff --git a/modules/indexer/code/bleve/bleve.go b/modules/indexer/code/bleve/bleve.go index c53b7a2e6d..4c8b5f2a86 100644 --- a/modules/indexer/code/bleve/bleve.go +++ b/modules/indexer/code/bleve/bleve.go @@ -177,7 +177,7 @@ func (b *Indexer) addUpdate(ctx context.Context, batchWriter git.WriteCloserErro fileContents, err := io.ReadAll(io.LimitReader(batchReader, size)) if err != nil { return err - } else if !typesniffer.DetectContentType(fileContents).IsText() { + } else if !typesniffer.DetectContentType(fileContents, update.Filename).IsText() { // FIXME: UTF-16 files will probably fail here // Even if the file is not recognized as a "text file", we could still put its name into the indexers to make the filename become searchable, while leave the content to empty. fileContents = nil diff --git a/modules/indexer/code/elasticsearch/elasticsearch.go b/modules/indexer/code/elasticsearch/elasticsearch.go index 3903d77fe0..9b11f56fb7 100644 --- a/modules/indexer/code/elasticsearch/elasticsearch.go +++ b/modules/indexer/code/elasticsearch/elasticsearch.go @@ -144,7 +144,7 @@ func (b *Indexer) addUpdate(ctx context.Context, batchWriter git.WriteCloserErro fileContents, err := io.ReadAll(io.LimitReader(batchReader, size)) if err != nil { return nil, err - } else if !typesniffer.DetectContentType(fileContents).IsText() { + } else if !typesniffer.DetectContentType(fileContents, update.Filename).IsText() { // FIXME: UTF-16 files will probably fail here return nil, nil } diff --git a/modules/indexer/issues/bleve/bleve.go b/modules/indexer/issues/bleve/bleve.go index 8549ba8dfc..cb98f722c5 100644 --- a/modules/indexer/issues/bleve/bleve.go +++ b/modules/indexer/issues/bleve/bleve.go @@ -156,11 +156,12 @@ func (b *Indexer) Delete(_ context.Context, ids ...int64) error { func (b *Indexer) Search(ctx context.Context, options *internal.SearchOptions) (*internal.SearchResult, error) { var queries []query.Query - if options.Keyword != "" { - tokens, err := options.Tokens() - if err != nil { - return nil, err - } + tokens, err := options.Tokens() + if err != nil { + return nil, err + } + + if len(tokens) > 0 { q := bleve.NewBooleanQuery() for _, token := range tokens { innerQ := bleve.NewDisjunctionQuery( diff --git a/modules/indexer/issues/elasticsearch/elasticsearch.go b/modules/indexer/issues/elasticsearch/elasticsearch.go index d632a22b2a..311e92730e 100644 --- a/modules/indexer/issues/elasticsearch/elasticsearch.go +++ b/modules/indexer/issues/elasticsearch/elasticsearch.go @@ -149,12 +149,13 @@ func (b *Indexer) Delete(ctx context.Context, ids ...int64) error { func (b *Indexer) Search(ctx context.Context, options *internal.SearchOptions) (*internal.SearchResult, error) { query := elastic.NewBoolQuery() - if options.Keyword != "" { + tokens, err := options.Tokens() + if err != nil { + return nil, err + } + + if len(tokens) > 0 { q := elastic.NewBoolQuery() - tokens, err := options.Tokens() - if err != nil { - return nil, err - } for _, token := range tokens { innerQ := elastic.NewMultiMatchQuery(token.Term, "content", "comments").FieldWithBoost("title", 2.0).TieBreaker(0.5) if token.Fuzzy { diff --git a/modules/indexer/issues/internal/qstring.go b/modules/indexer/issues/internal/qstring.go index 6b60b4c5f6..348f7a564b 100644 --- a/modules/indexer/issues/internal/qstring.go +++ b/modules/indexer/issues/internal/qstring.go @@ -45,12 +45,9 @@ func (t *Tokenizer) next() (tk Token, err error) { // skip all leading white space for { - if r, _, err = t.in.ReadRune(); err == nil && r == ' ' { - //nolint:staticcheck,wastedassign // SA4006 the variable is used after the loop - r, _, err = t.in.ReadRune() - continue + if r, _, err = t.in.ReadRune(); err != nil || r != ' ' { + break } - break } if err != nil { return tk, err @@ -107,11 +104,17 @@ nextEnd: // Tokenize the keyword func (o *SearchOptions) Tokens() (tokens []Token, err error) { + if o.Keyword == "" { + return nil, nil + } + in := strings.NewReader(o.Keyword) it := Tokenizer{in: in} for token, err := it.next(); err == nil; token, err = it.next() { - tokens = append(tokens, token) + if token.Term != "" { + tokens = append(tokens, token) + } } if err != nil && err != io.EOF { return nil, err diff --git a/modules/indexer/issues/internal/qstring_test.go b/modules/indexer/issues/internal/qstring_test.go index 835491707c..eb4bdb306f 100644 --- a/modules/indexer/issues/internal/qstring_test.go +++ b/modules/indexer/issues/internal/qstring_test.go @@ -41,6 +41,36 @@ var testOpts = []testIssueQueryStringOpt{ }, }, }, + { + Keyword: "Hello World", + Results: []Token{ + { + Term: "Hello", + Fuzzy: true, + Kind: BoolOptShould, + }, + { + Term: "World", + Fuzzy: true, + Kind: BoolOptShould, + }, + }, + }, + { + Keyword: " Hello World ", + Results: []Token{ + { + Term: "Hello", + Fuzzy: true, + Kind: BoolOptShould, + }, + { + Term: "World", + Fuzzy: true, + Kind: BoolOptShould, + }, + }, + }, { Keyword: "+Hello +World", Results: []Token{ @@ -156,6 +186,68 @@ var testOpts = []testIssueQueryStringOpt{ }, }, }, + { + Keyword: "\\", + Results: nil, + }, + { + Keyword: "\"", + Results: nil, + }, + { + Keyword: "Hello \\", + Results: []Token{ + { + Term: "Hello", + Fuzzy: true, + Kind: BoolOptShould, + }, + }, + }, + { + Keyword: "\"\"", + Results: nil, + }, + { + Keyword: "\" World \"", + Results: []Token{ + { + Term: " World ", + Fuzzy: false, + Kind: BoolOptShould, + }, + }, + }, + { + Keyword: "\"\" World \"\"", + Results: []Token{ + { + Term: "World", + Fuzzy: true, + Kind: BoolOptShould, + }, + }, + }, + { + Keyword: "Best \"Hello World\" Ever", + Results: []Token{ + { + Term: "Best", + Fuzzy: true, + Kind: BoolOptShould, + }, + { + Term: "Hello World", + Fuzzy: false, + Kind: BoolOptShould, + }, + { + Term: "Ever", + Fuzzy: true, + Kind: BoolOptShould, + }, + }, + }, } func TestIssueQueryString(t *testing.T) { diff --git a/modules/indexer/issues/internal/tests/tests.go b/modules/indexer/issues/internal/tests/tests.go index b63957ff84..46014994a0 100644 --- a/modules/indexer/issues/internal/tests/tests.go +++ b/modules/indexer/issues/internal/tests/tests.go @@ -87,14 +87,44 @@ func TestIndexer(t *testing.T, indexer internal.Indexer) { } } +func allResults(t *testing.T, data map[int64]*internal.IndexerData, result *internal.SearchResult) { + assert.Len(t, result.Hits, len(data)) + assert.Equal(t, len(data), int(result.Total)) +} + var cases = []*testIndexerCase{ { Name: "default", SearchOptions: &internal.SearchOptions{}, - Expected: func(t *testing.T, data map[int64]*internal.IndexerData, result *internal.SearchResult) { - assert.Len(t, result.Hits, len(data)) - assert.Equal(t, len(data), int(result.Total)) + Expected: allResults, + }, + { + Name: "empty keyword", + SearchOptions: &internal.SearchOptions{ + Keyword: "", }, + Expected: allResults, + }, + { + Name: "whitespace keyword", + SearchOptions: &internal.SearchOptions{ + Keyword: " ", + }, + Expected: allResults, + }, + { + Name: "dangling slash in keyword", + SearchOptions: &internal.SearchOptions{ + Keyword: "\\", + }, + Expected: allResults, + }, + { + Name: "dangling quote in keyword", + SearchOptions: &internal.SearchOptions{ + Keyword: "\"", + }, + Expected: allResults, }, { Name: "empty", diff --git a/modules/log/event_writer.go b/modules/log/event_writer.go index 4b77e488de..32b5b582c5 100644 --- a/modules/log/event_writer.go +++ b/modules/log/event_writer.go @@ -26,6 +26,7 @@ type WriterMode struct { Flags Flags Expression string + Exclusion string StacktraceLevel Level diff --git a/modules/log/event_writer_base.go b/modules/log/event_writer_base.go index 9189ca4e90..4de2b953c7 100644 --- a/modules/log/event_writer_base.go +++ b/modules/log/event_writer_base.go @@ -68,6 +68,14 @@ func (b *EventWriterBaseImpl) Run(ctx context.Context) { } } + var exclusionRegexp *regexp.Regexp + if b.Mode.Exclusion != "" { + var err error + if exclusionRegexp, err = regexp.Compile(b.Mode.Exclusion); err != nil { + FallbackErrorf("unable to compile exclusion %q for writer %q: %v", b.Mode.Exclusion, b.Name, err) + } + } + handlePaused := func() { if pause := b.GetPauseChan(); pause != nil { select { @@ -95,6 +103,13 @@ func (b *EventWriterBaseImpl) Run(ctx context.Context) { continue } } + if exclusionRegexp != nil { + fileLineCaller := fmt.Sprintf("%s:%d:%s", event.Origin.Filename, event.Origin.Line, event.Origin.Caller) + matched := exclusionRegexp.MatchString(fileLineCaller) || exclusionRegexp.MatchString(event.Origin.MsgSimpleText) + if matched { + continue + } + } var err error switch msg := event.Msg.(type) { diff --git a/modules/log/event_writer_buffer_test.go b/modules/log/event_writer_buffer_test.go index ba9455ba69..d1e37c3673 100644 --- a/modules/log/event_writer_buffer_test.go +++ b/modules/log/event_writer_buffer_test.go @@ -31,3 +31,49 @@ func TestBufferLogger(t *testing.T) { logger.Close() assert.Contains(t, bufferWriter.Buffer.String(), expected) } + +func TestBufferLoggerWithExclusion(t *testing.T) { + prefix := "ExclusionPrefix " + level := log.INFO + message := "something" + + bufferWriter := log.NewEventWriterBuffer("test-buffer", log.WriterMode{ + Level: level, + Prefix: prefix, + Exclusion: message, + }) + + logger := log.NewLoggerWithWriters(t.Context(), "test", bufferWriter) + + logger.SendLogEvent(&log.Event{ + Level: log.INFO, + MsgSimpleText: message, + }) + logger.Close() + assert.NotContains(t, bufferWriter.Buffer.String(), message) +} + +func TestBufferLoggerWithExpressionAndExclusion(t *testing.T) { + prefix := "BothPrefix " + level := log.INFO + expression := ".*foo.*" + exclusion := ".*bar.*" + + bufferWriter := log.NewEventWriterBuffer("test-buffer", log.WriterMode{ + Level: level, + Prefix: prefix, + Expression: expression, + Exclusion: exclusion, + }) + + logger := log.NewLoggerWithWriters(t.Context(), "test", bufferWriter) + + logger.SendLogEvent(&log.Event{Level: log.INFO, MsgSimpleText: "foo expression"}) + logger.SendLogEvent(&log.Event{Level: log.INFO, MsgSimpleText: "bar exclusion"}) + logger.SendLogEvent(&log.Event{Level: log.INFO, MsgSimpleText: "foo bar both"}) + logger.SendLogEvent(&log.Event{Level: log.INFO, MsgSimpleText: "none"}) + logger.Close() + + assert.Contains(t, bufferWriter.Buffer.String(), "foo expression") + assert.NotContains(t, bufferWriter.Buffer.String(), "bar") +} diff --git a/modules/log/logger_test.go b/modules/log/logger_test.go index 6d6ceb69d7..99045b0f4f 100644 --- a/modules/log/logger_test.go +++ b/modules/log/logger_test.go @@ -143,3 +143,19 @@ func TestLoggerExpressionFilter(t *testing.T) { assert.Equal(t, []string{"foo\n", "foo bar\n", "by filename\n"}, w1.GetLogs()) } + +func TestLoggerExclusionFilter(t *testing.T) { + logger := NewLoggerWithWriters(t.Context(), "test") + + w1 := newDummyWriter("dummy-1", DEBUG, 0) + w1.Mode.Exclusion = "foo.*" + logger.AddWriters(w1) + + logger.Info("foo") + logger.Info("bar") + logger.Info("foo bar") + logger.SendLogEvent(&Event{Level: INFO, Filename: "foo.go", MsgSimpleText: "by filename"}) + logger.Close() + + assert.Equal(t, []string{"bar\n"}, w1.GetLogs()) +} diff --git a/modules/markup/markdown/goldmark.go b/modules/markup/markdown/goldmark.go index d229afa8e3..67d81488fd 100644 --- a/modules/markup/markdown/goldmark.go +++ b/modules/markup/markdown/goldmark.go @@ -9,6 +9,7 @@ import ( "strings" "forgejo.org/modules/markup" + markdownutil "forgejo.org/modules/markup/markdown/util" "forgejo.org/modules/setting" "github.com/yuin/goldmark/ast" @@ -35,8 +36,8 @@ func (g *ASTTransformer) applyElementDir(n ast.Node) { func (g *ASTTransformer) Transform(node *ast.Document, reader text.Reader, pc parser.Context) { firstChild := node.FirstChild() tocMode := "" - ctx := pc.Get(renderContextKey).(*markup.RenderContext) - rc := pc.Get(renderConfigKey).(*RenderConfig) + ctx := pc.Get(markdownutil.RenderContextKey).(*markup.RenderContext) + rc := pc.Get(markdownutil.RenderConfigKey).(*RenderConfig) tocList := make([]markup.Header, 0, 20) if rc.yamlNode != nil { diff --git a/modules/markup/markdown/markdown.go b/modules/markup/markdown/markdown.go index e811d29994..2b19e0f1c9 100644 --- a/modules/markup/markdown/markdown.go +++ b/modules/markup/markdown/markdown.go @@ -16,6 +16,7 @@ import ( "forgejo.org/modules/markup/common" "forgejo.org/modules/markup/markdown/callout" "forgejo.org/modules/markup/markdown/math" + markdownutil "forgejo.org/modules/markup/markdown/util" "forgejo.org/modules/setting" giteautil "forgejo.org/modules/util" @@ -34,11 +35,6 @@ var ( specMarkdownOnce sync.Once ) -var ( - renderContextKey = parser.NewContextKey() - renderConfigKey = parser.NewContextKey() -) - type limitWriter struct { w io.Writer sum int64 @@ -64,7 +60,7 @@ func (l *limitWriter) Write(data []byte) (int, error) { // newParserContext creates a parser.Context with the render context set func newParserContext(ctx *markup.RenderContext) parser.Context { pc := parser.NewContext(parser.WithIDs(newPrefixedIDs())) - pc.Set(renderContextKey, ctx) + pc.Set(markdownutil.RenderContextKey, ctx) return pc } @@ -192,7 +188,7 @@ func actualRender(ctx *markup.RenderContext, input io.Reader, output io.Writer) } rc.metaLength = metaLength - pc.Set(renderConfigKey, rc) + pc.Set(markdownutil.RenderConfigKey, rc) if err := converter.Convert(buf, lw, parser.WithContext(pc)); err != nil { log.Error("Unable to render: %v", err) diff --git a/modules/markup/markdown/markdown_test.go b/modules/markup/markdown/markdown_test.go index f7955115e0..c854861031 100644 --- a/modules/markup/markdown/markdown_test.go +++ b/modules/markup/markdown/markdown_test.go @@ -561,6 +561,14 @@ func TestMathBlock(t *testing.T) { "test $$a$$", `

test a

` + nl, }, + { + `\[ +[\triangle ABC] = \sqrt{s(s-a)(s-b)(s-c)} +\]`, + `

[
+[\triangle ABC] = \sqrt{s(s-a)(s-b)(s-c)}
+]

` + nl, + }, } for _, test := range testcases { @@ -568,6 +576,32 @@ func TestMathBlock(t *testing.T) { require.NoError(t, err, "Unexpected error in testcase: %q", test.testcase) assert.Equal(t, template.HTML(test.expected), res, "Unexpected result in testcase %q", test.testcase) } + + t.Run("Wiki context", func(t *testing.T) { + testcases := []struct { + testcase string + expected string + }{ + { + "$a$", + `

a

` + nl, + }, + { + `\[ +[\triangle ABC] = \sqrt{s(s-a)(s-b)(s-c)} +\]`, + `

+[\triangle ABC] = \sqrt{s(s-a)(s-b)(s-c)}
+
` + nl, + }, + } + + for _, test := range testcases { + res, err := markdown.RenderString(&markup.RenderContext{Ctx: git.DefaultContext, IsWiki: true}, test.testcase) + require.NoError(t, err, "Unexpected error in testcase: %q", test.testcase) + assert.Equal(t, template.HTML(test.expected), res, "Unexpected result in testcase %q", test.testcase) + } + }) } func TestFootnote(t *testing.T) { diff --git a/modules/markup/markdown/math/block_parser.go b/modules/markup/markdown/math/block_parser.go index 527df84975..b0fe1d588a 100644 --- a/modules/markup/markdown/math/block_parser.go +++ b/modules/markup/markdown/math/block_parser.go @@ -6,6 +6,9 @@ package math import ( "bytes" + "forgejo.org/modules/markup" + markdownutil "forgejo.org/modules/markup/markdown/util" + "github.com/yuin/goldmark/ast" "github.com/yuin/goldmark/parser" "github.com/yuin/goldmark/text" @@ -61,6 +64,13 @@ func (b *blockParser) Open(parent ast.Node, reader text.Reader, pc parser.Contex return node, parser.Close | parser.NoChildren } + ctx := pc.Get(markdownutil.RenderContextKey).(*markup.RenderContext) + if ctx.IsWiki { + reader.Advance(segment.Len() - 1) + segment.Start += 2 + node.Lines().Append(segment) + return node, parser.NoChildren + } return nil, parser.NoChildren } diff --git a/modules/markup/markdown/util/text.go b/modules/markup/markdown/util/text.go index 8a42e5835b..db6e432e79 100644 --- a/modules/markup/markdown/util/text.go +++ b/modules/markup/markdown/util/text.go @@ -7,6 +7,7 @@ import ( "bytes" "github.com/yuin/goldmark/ast" + "github.com/yuin/goldmark/parser" ) func textOfChildren(n ast.Node, src []byte, b *bytes.Buffer) { @@ -24,3 +25,8 @@ func Text(n ast.Node, src []byte) []byte { textOfChildren(n, src, &b) return b.Bytes() } + +var ( + RenderContextKey = parser.NewContextKey() + RenderConfigKey = parser.NewContextKey() +) diff --git a/modules/packages/rpm/metadata.go b/modules/packages/rpm/metadata.go index 4af9af620f..503b7b1a24 100644 --- a/modules/packages/rpm/metadata.go +++ b/modules/packages/rpm/metadata.go @@ -232,9 +232,10 @@ func getEntries(h *rpmutils.RpmHeader, namesTag, versionsTag, flagsTag int, repo case "alt": for i := range names { e := &Entry{ + Name: names[i], AltFlags: uint32(flags[i]), + Version: versions[i], } - e.Version = versions[i] entries = append(entries, e) } } diff --git a/modules/setting/incoming_email.go b/modules/setting/incoming_email.go index e592220de6..a890a4a328 100644 --- a/modules/setting/incoming_email.go +++ b/modules/setting/incoming_email.go @@ -44,9 +44,14 @@ func loadIncomingEmailFrom(rootCfg ConfigProvider) { if sec.HasKey("USER") && !sec.HasKey("USERNAME") { IncomingEmail.Username = sec.Key("USER").String() } + if sec.HasKey("PASSWD") && !sec.HasKey("PASSWORD") { - IncomingEmail.Password = sec.Key("PASSWD").String() + sec.Key("PASSWORD").SetValue(sec.Key("PASSWD").String()) } + if sec.HasKey("PASSWD_URI") && !sec.HasKey("PASSWORD_URI") { + sec.Key("PASSWORD_URI").SetValue(sec.Key("PASSWD_URI").String()) + } + IncomingEmail.Password = loadSecret(sec, "PASSWORD_URI", "PASSWORD") // Infer Port if not set if IncomingEmail.Port == 0 { diff --git a/modules/setting/incoming_email_test.go b/modules/setting/incoming_email_test.go index 6d181cae3c..4ea740bafd 100644 --- a/modules/setting/incoming_email_test.go +++ b/modules/setting/incoming_email_test.go @@ -4,6 +4,8 @@ package setting import ( + "os" + "path/filepath" "testing" "github.com/stretchr/testify/assert" @@ -35,6 +37,22 @@ func Test_loadIncomingEmailFrom(t *testing.T) { assert.Equal(t, "y0u'll n3v3r gUess th1S!!1", IncomingEmail.Password) }) + t.Run("Secrets", func(t *testing.T) { + uri := filepath.Join(t.TempDir(), "email_incoming_password") + + if err := os.WriteFile(uri, []byte("th1S gUess n3v3r y0u'll!!1"), 0o644); err != nil { + t.Fatal(err) + } + + cfg, sec := makeBaseConfig() + sec.NewKey("PASSWORD_URI", "file:"+uri) + + IncomingEmail.Password = "" + loadIncomingEmailFrom(cfg) + + assert.Equal(t, "th1S gUess n3v3r y0u'll!!1", IncomingEmail.Password) + }) + t.Run("Port settings", func(t *testing.T) { t.Run("no port, no tls", func(t *testing.T) { defer resetIncomingEmailPort()() diff --git a/modules/setting/log.go b/modules/setting/log.go index 0747ac4dac..6d069d0e9c 100644 --- a/modules/setting/log.go +++ b/modules/setting/log.go @@ -133,6 +133,7 @@ func loadLogModeByName(rootCfg ConfigProvider, loggerName, modeName string) (wri writerMode.StacktraceLevel = log.LevelFromString(ConfigInheritedKeyString(sec, "STACKTRACE_LEVEL", Log.StacktraceLogLevel.String())) writerMode.Prefix = ConfigInheritedKeyString(sec, "PREFIX") writerMode.Expression = ConfigInheritedKeyString(sec, "EXPRESSION") + writerMode.Exclusion = ConfigInheritedKeyString(sec, "EXCLUSION") // flags are updated and set below switch writerType { diff --git a/modules/setting/log_test.go b/modules/setting/log_test.go index eda6dc36af..223bd68285 100644 --- a/modules/setting/log_test.go +++ b/modules/setting/log_test.go @@ -44,6 +44,7 @@ func TestLogConfigDefault(t *testing.T) { "BufferLen": 10000, "Colorize": false, "Expression": "", + "Exclusion": "", "Flags": "stdflags", "Level": "info", "Prefix": "", @@ -83,6 +84,7 @@ logger.xorm.MODE = "BufferLen": 10000, "Colorize": false, "Expression": "", + "Exclusion": "", "Flags": "stdflags", "Level": "info", "Prefix": "", @@ -121,6 +123,7 @@ MODE = console "BufferLen": 10000, "Colorize": false, "Expression": "", + "Exclusion": "", "Flags": "stdflags", "Level": "info", "Prefix": "", @@ -168,6 +171,7 @@ ACCESS = file "BufferLen": 10000, "Colorize": false, "Expression": "", + "Exclusion": "", "Flags": "stdflags", "Level": "info", "Prefix": "", @@ -191,6 +195,7 @@ ACCESS = file "BufferLen": 10000, "Colorize": false, "Expression": "", + "Exclusion": "", "Flags": "none", "Level": "info", "Prefix": "", @@ -257,6 +262,7 @@ STDERR = true "BufferLen": 10000, "Colorize": false, "Expression": "", + "Exclusion": "", "Flags": "stdflags", "Level": "warn", "Prefix": "", @@ -270,6 +276,7 @@ STDERR = true "BufferLen": 10000, "Colorize": false, "Expression": "", + "Exclusion": "", "Flags": "stdflags", "Level": "error", "Prefix": "", @@ -287,6 +294,7 @@ STDERR = true "BufferLen": 10000, "Colorize": false, "Expression": "", + "Exclusion": "", "Flags": "none", "Level": "warn", "Prefix": "", @@ -323,6 +331,7 @@ MODE = file LEVEL = error STACKTRACE_LEVEL = fatal EXPRESSION = filter +EXCLUSION = not FLAGS = medfile PREFIX = "[Prefix] " FILE_NAME = file-xxx.log @@ -341,6 +350,7 @@ COMPRESSION_LEVEL = 4 "BufferLen": 10, "Colorize": false, "Expression": "", + "Exclusion": "", "Flags": "stdflags", "Level": "info", "Prefix": "", @@ -360,6 +370,7 @@ COMPRESSION_LEVEL = 4 "BufferLen": 10, "Colorize": false, "Expression": "filter", + "Exclusion": "not", "Flags": "medfile", "Level": "error", "Prefix": "[Prefix] ", diff --git a/modules/setting/mailer.go b/modules/setting/mailer.go index 9c004c6ce0..b43484a90f 100644 --- a/modules/setting/mailer.go +++ b/modules/setting/mailer.go @@ -147,6 +147,10 @@ func loadMailerFrom(rootCfg ConfigProvider) { if sec.HasKey("PASSWORD") && !sec.HasKey("PASSWD") { sec.Key("PASSWD").SetValue(sec.Key("PASSWORD").String()) } + if sec.HasKey("PASSWORD_URI") && !sec.HasKey("PASSWD_URI") { + sec.Key("PASSWD_URI").SetValue(sec.Key("PASSWORD_URI").String()) + } + sec.Key("PASSWD").SetValue(loadSecret(sec, "PASSWD_URI", "PASSWD")) // Set default values & validate sec.Key("NAME").MustString(AppName) diff --git a/modules/setting/mailer_test.go b/modules/setting/mailer_test.go index 4523cc91dd..47eaf3ffbb 100644 --- a/modules/setting/mailer_test.go +++ b/modules/setting/mailer_test.go @@ -4,6 +4,8 @@ package setting import ( + "os" + "path/filepath" "testing" "github.com/stretchr/testify/assert" @@ -52,6 +54,24 @@ func Test_loadMailerFrom(t *testing.T) { assert.Equal(t, "y0u'll n3v3r gUess th1S!!1", MailService.Passwd) }) + t.Run("Secrets", func(t *testing.T) { + uri := filepath.Join(t.TempDir(), "mailer_passwd") + + if err := os.WriteFile(uri, []byte("th1S gUess n3v3r y0u'll!!1"), 0o644); err != nil { + t.Fatal(err) + } + + cfg, _ := NewConfigProviderFromData("") + sec := cfg.Section("mailer") + sec.NewKey("ENABLED", "true") + sec.NewKey("PASSWD_URI", "file:"+uri) + + MailService.Passwd = "" + loadMailerFrom(cfg) + + assert.Equal(t, "th1S gUess n3v3r y0u'll!!1", MailService.Passwd) + }) + t.Run("sendmail argument sanitization", func(t *testing.T) { cfg, _ := NewConfigProviderFromData("") sec := cfg.Section("mailer") diff --git a/modules/structs/activitypub.go b/modules/structs/activitypub.go index 117eb0bed2..0cc257ff95 100644 --- a/modules/structs/activitypub.go +++ b/modules/structs/activitypub.go @@ -1,4 +1,5 @@ // Copyright 2022 The Gitea Authors. All rights reserved. +// Copyright 2024 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT package structs @@ -7,3 +8,15 @@ package structs type ActivityPub struct { Context string `json:"@context"` } + +type APRemoteFollowOption struct { + Target string `json:"target"` +} + +type APPersonFollowItem struct { + ActorID string `json:"actor_id"` + Note string `json:"note"` + + OriginalURL string `json:"original_url"` + OriginalItem string `json:"original_item"` +} diff --git a/modules/structs/attachment.go b/modules/structs/attachment.go index 0a3d4140c2..746f618cf0 100644 --- a/modules/structs/attachment.go +++ b/modules/structs/attachment.go @@ -22,6 +22,12 @@ type Attachment struct { Type string `json:"type"` } +// WebAttachment the generic attachment with mime type +type WebAttachment struct { + *Attachment + MimeType string `json:"mime_type"` +} + // EditAttachmentOptions options for editing attachments // swagger:model type EditAttachmentOptions struct { diff --git a/modules/templates/helper.go b/modules/templates/helper.go index 02b175e6f6..42b4bad83c 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -188,6 +188,7 @@ func NewFuncMap() template.FuncMap { "RenderMarkdownToHtml": RenderMarkdownToHtml, "RenderLabel": RenderLabel, "RenderLabels": RenderLabels, + "RenderUser": RenderUser, "RenderReviewRequest": RenderReviewRequest, // ----------------------------------------------------------------- diff --git a/modules/templates/util_render.go b/modules/templates/util_render.go index a4d7a82eea..48f4eb04a3 100644 --- a/modules/templates/util_render.go +++ b/modules/templates/util_render.go @@ -7,6 +7,7 @@ import ( "context" "encoding/hex" "fmt" + "html" "html/template" "math" "net/url" @@ -15,6 +16,7 @@ import ( "unicode" issues_model "forgejo.org/models/issues" + user_model "forgejo.org/models/user" "forgejo.org/modules/emoji" "forgejo.org/modules/log" "forgejo.org/modules/markup" @@ -26,7 +28,7 @@ import ( // RenderCommitMessage renders commit message with XSS-safe and special links. func RenderCommitMessage(ctx context.Context, msg string, metas map[string]string) template.HTML { - cleanMsg := template.HTMLEscapeString(msg) + cleanMsg := html.EscapeString(msg) // we can safely assume that it will not return any error, since there // shouldn't be any special HTML. fullMessage, err := markup.RenderCommitMessage(&markup.RenderContext{ @@ -63,7 +65,7 @@ func RenderCommitMessageLinkSubject(ctx context.Context, msg, urlDefault string, Ctx: ctx, DefaultLink: urlDefault, Metas: metas, - }, template.HTMLEscapeString(msgLine)) + }, html.EscapeString(msgLine)) if err != nil { log.Error("RenderCommitMessageSubject: %v", err) return template.HTML("") @@ -88,7 +90,7 @@ func RenderCommitBody(ctx context.Context, msg string, metas map[string]string) renderedMessage, err := markup.RenderCommitMessage(&markup.RenderContext{ Ctx: ctx, Metas: metas, - }, template.HTMLEscapeString(msgLine)) + }, html.EscapeString(msgLine)) if err != nil { log.Error("RenderCommitMessage: %v", err) return "" @@ -122,7 +124,7 @@ func RenderIssueTitle(ctx context.Context, text string, metas map[string]string) renderedText, err := markup.RenderIssueTitle(&markup.RenderContext{ Ctx: ctx, Metas: metas, - }, template.HTMLEscapeString(text)) + }, html.EscapeString(text)) if err != nil { log.Error("RenderIssueTitle: %v", err) return template.HTML("") @@ -132,7 +134,7 @@ func RenderIssueTitle(ctx context.Context, text string, metas map[string]string) // RenderRefIssueTitle renders referenced issue/pull title with defined post processors func RenderRefIssueTitle(ctx context.Context, text string) template.HTML { - renderedText, err := markup.RenderRefIssueTitle(&markup.RenderContext{Ctx: ctx}, template.HTMLEscapeString(text)) + renderedText, err := markup.RenderRefIssueTitle(&markup.RenderContext{Ctx: ctx}, html.EscapeString(text)) if err != nil { log.Error("RenderRefIssueTitle: %v", err) return "" @@ -150,7 +152,7 @@ func RenderLabel(ctx context.Context, locale translation.Locale, label *issues_m labelScope = label.ExclusiveScope() ) - description := emoji.ReplaceAliases(template.HTMLEscapeString(label.Description)) + description := emoji.ReplaceAliases(html.EscapeString(label.Description)) if label.IsArchived() { archivedCSSClass = "archived-label" @@ -212,7 +214,7 @@ func RenderLabel(ctx context.Context, locale translation.Locale, label *issues_m // RenderEmoji renders html text with emoji post processors func RenderEmoji(ctx context.Context, text string) template.HTML { renderedText, err := markup.RenderEmoji(&markup.RenderContext{Ctx: ctx}, - template.HTMLEscapeString(text)) + html.EscapeString(text)) if err != nil { log.Error("RenderEmoji: %v", err) return template.HTML("") @@ -263,10 +265,20 @@ func RenderLabels(ctx context.Context, locale translation.Locale, labels []*issu return template.HTML(htmlCode) } +func RenderUser(ctx context.Context, user user_model.User) template.HTML { + if user.ID > 0 { + return template.HTML(fmt.Sprintf( + "%s", + user.HomeLink(), html.EscapeString(user.GetDisplayName()))) + } + return template.HTML(fmt.Sprintf("%s", + html.EscapeString(user.GetDisplayName()))) +} + func RenderReviewRequest(users []issues_model.RequestReviewTarget) template.HTML { usernames := make([]string, 0, len(users)) for _, user := range users { - usernames = append(usernames, template.HTMLEscapeString(user.Name())) + usernames = append(usernames, html.EscapeString(user.Name())) } htmlCode := `` diff --git a/modules/templates/util_render_test.go b/modules/templates/util_render_test.go index 62e063213c..a5fb18642a 100644 --- a/modules/templates/util_render_test.go +++ b/modules/templates/util_render_test.go @@ -11,6 +11,9 @@ import ( "forgejo.org/models/db" issues_model "forgejo.org/models/issues" "forgejo.org/models/unittest" + user_model "forgejo.org/models/user" + "forgejo.org/modules/setting" + "forgejo.org/modules/test" "forgejo.org/modules/translation" "github.com/stretchr/testify/assert" @@ -215,9 +218,51 @@ func TestRenderLabels(t *testing.T) { tr := &translation.MockLocale{} label := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 1}) + labelScoped := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 7}) + labelMalicious := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 11}) + labelArchived := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 12}) - assert.Contains(t, RenderLabels(db.DefaultContext, tr, []*issues_model.Label{label}, "user2/repo1", false), - "user2/repo1/issues?labels=1") - assert.Contains(t, RenderLabels(db.DefaultContext, tr, []*issues_model.Label{label}, "user2/repo1", true), - "user2/repo1/pulls?labels=1") + rendered := RenderLabels(db.DefaultContext, tr, []*issues_model.Label{label}, "user2/repo1", false) + assert.Contains(t, rendered, "user2/repo1/issues?labels=1") + assert.Contains(t, rendered, ">label1<") + assert.Contains(t, rendered, "title='First label'") + rendered = RenderLabels(db.DefaultContext, tr, []*issues_model.Label{label}, "user2/repo1", true) + assert.Contains(t, rendered, "user2/repo1/pulls?labels=1") + assert.Contains(t, rendered, ">label1<") + rendered = RenderLabels(db.DefaultContext, tr, []*issues_model.Label{labelScoped}, "user2/repo1", false) + assert.Contains(t, rendered, "user2/repo1/issues?labels=7") + assert.Contains(t, rendered, ">scope<") + assert.Contains(t, rendered, ">label1<") + rendered = RenderLabels(db.DefaultContext, tr, []*issues_model.Label{labelMalicious}, "user2/repo1", false) + assert.Contains(t, rendered, "user2/repo1/issues?labels=11") + assert.Contains(t, rendered, "> <script>malicious</script> <") + assert.Contains(t, rendered, ">'?&<") + assert.Contains(t, rendered, "title='Malicious label ' <script>malicious</script>'") + rendered = RenderLabels(db.DefaultContext, tr, []*issues_model.Label{labelArchived}, "user2/repo1", false) + assert.Contains(t, rendered, "user2/repo1/issues?labels=12") + assert.Contains(t, rendered, ">archived label<><") + assert.Contains(t, rendered, "title='repo.issues.archived_label_description'") +} + +func TestRenderUser(t *testing.T) { + unittest.PrepareTestEnv(t) + + user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) + org := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3}) + ghost := user_model.NewGhostUser() + + assert.Contains(t, RenderUser(db.DefaultContext, *user), + "user2") + assert.Contains(t, RenderUser(db.DefaultContext, *org), + "org3") + assert.Contains(t, RenderUser(db.DefaultContext, *ghost), + "Ghost") + + defer test.MockVariableValue(&setting.UI.DefaultShowFullName, true)() + assert.Contains(t, RenderUser(db.DefaultContext, *user), + "< U<se>r Tw<o > ><") + assert.Contains(t, RenderUser(db.DefaultContext, *org), + "<<<< >> >> > >> > >>> >>") + assert.Contains(t, RenderUser(db.DefaultContext, *ghost), + "Ghost") } diff --git a/modules/test/distant_federation_server_mock.go b/modules/test/distant_federation_server_mock.go index 9bd908e2b9..ea8a69e9b4 100644 --- a/modules/test/distant_federation_server_mock.go +++ b/modules/test/distant_federation_server_mock.go @@ -10,56 +10,79 @@ import ( "net/http/httptest" "strings" "testing" + + "forgejo.org/modules/util" ) type FederationServerMockPerson struct { - ID int64 - Name string - PubKey string + ID int64 + Name string + PubKey string + PrivKey string } type FederationServerMockRepository struct { ID int64 } +type ApActorMock struct { + PrivKey string + PubKey string +} type FederationServerMock struct { + ApActor ApActorMock Persons []FederationServerMockPerson Repositories []FederationServerMockRepository LastPost string } func NewFederationServerMockPerson(id int64, name string) FederationServerMockPerson { + priv, pub, _ := util.GenerateKeyPair(3072) return FederationServerMockPerson{ - ID: id, - Name: name, - PubKey: `"-----BEGIN PUBLIC KEY-----\nMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA18H5s7N6ItZUAh9tneII\nIuZdTTa3cZlLa/9ejWAHTkcp3WLW+/zbsumlMrWYfBy2/yTm56qasWt38iY4D6ul\n` + - `CPiwhAqX3REvVq8tM79a2CEqZn9ka6vuXoDgBg/sBf/BUWqf7orkjUXwk/U0Egjf\nk5jcurF4vqf1u+rlAHH37dvSBaDjNj6Qnj4OP12bjfaY/yvs7+jue/eNXFHjzN4E\n` + - `T2H4B/yeKTJ4UuAwTlLaNbZJul2baLlHelJPAsxiYaziVuV5P+IGWckY6RSerRaZ\nAkc4mmGGtjAyfN9aewe+lNVfwS7ElFx546PlLgdQgjmeSwLX8FWxbPE5A/PmaXCs\n` + - `nx+nou+3dD7NluULLtdd7K+2x02trObKXCAzmi5/Dc+yKTzpFqEz+hLNCz7TImP/\ncK//NV9Q+X67J9O27baH9R9ZF4zMw8rv2Pg0WLSw1z7lLXwlgIsDapeMCsrxkVO4\n` + - `LXX5AQ1xQNtlssnVoUBqBrvZsX2jUUKUocvZqMGuE4hfAgMBAAE=\n-----END PUBLIC KEY-----\n"`, + ID: id, + Name: name, + PubKey: pub, + PrivKey: priv, } } +func (p *FederationServerMockPerson) KeyID(host string) string { + return fmt.Sprintf("%[1]v/api/v1/activitypub/user-id/%[2]v#main-key", host, p.ID) +} + func NewFederationServerMockRepository(id int64) FederationServerMockRepository { return FederationServerMockRepository{ ID: id, } } +func NewApActorMock() ApActorMock { + priv, pub, _ := util.GenerateKeyPair(1024) + return ApActorMock{ + PrivKey: priv, + PubKey: pub, + } +} + +func (u *ApActorMock) KeyID(host string) string { + return fmt.Sprintf("%[1]v/api/v1/activitypub/actor#main-key", host) +} + func (p FederationServerMockPerson) marshal(host string) string { return fmt.Sprintf(`{"@context":["https://www.w3.org/ns/activitystreams","https://w3id.org/security/v1"],`+ - `"id":"http://%[1]v/api/activitypub/user-id/%[2]v",`+ + `"id":"http://%[1]v/api/v1/activitypub/user-id/%[2]v",`+ `"type":"Person",`+ `"icon":{"type":"Image","mediaType":"image/png","url":"http://%[1]v/avatars/1bb05d9a5f6675ed0272af9ea193063c"},`+ `"url":"http://%[1]v/%[2]v",`+ - `"inbox":"http://%[1]v/api/activitypub/user-id/%[2]v/inbox",`+ - `"outbox":"http://%[1]v/api/activitypub/user-id/%[2]v/outbox",`+ + `"inbox":"http://%[1]v/api/v1/activitypub/user-id/%[2]v/inbox",`+ + `"outbox":"http://%[1]v/api/v1/activitypub/user-id/%[2]v/outbox",`+ `"preferredUsername":"%[3]v",`+ - `"publicKey":{"id":"http://%[1]v/api/activitypub/user-id/%[2]v#main-key",`+ - `"owner":"http://%[1]v/api/activitypub/user-id/%[2]v",`+ - `"publicKeyPem":%[4]v}}`, host, p.ID, p.Name, p.PubKey) + `"publicKey":{"id":"http://%[1]v/api/v1/activitypub/user-id/%[2]v#main-key",`+ + `"owner":"http://%[1]v/api/v1/activitypub/user-id/%[2]v",`+ + `"publicKeyPem":%[4]q}}`, host, p.ID, p.Name, p.PubKey) } func NewFederationServerMock() *FederationServerMock { return &FederationServerMock{ + ApActor: NewApActorMock(), Persons: []FederationServerMockPerson{ NewFederationServerMockPerson(15, "stargoose1"), NewFederationServerMockPerson(30, "stargoose2"), @@ -71,8 +94,18 @@ func NewFederationServerMock() *FederationServerMock { } } +func (mock *FederationServerMock) recordLastPost(t *testing.T, req *http.Request) { + buf := new(strings.Builder) + _, err := io.Copy(buf, req.Body) + if err != nil { + t.Errorf("Error reading body: %q", err) + } + mock.LastPost = strings.ReplaceAll(buf.String(), req.Host, "DISTANT_FEDERATION_HOST") +} + func (mock *FederationServerMock) DistantServer(t *testing.T) *httptest.Server { federatedRoutes := http.NewServeMux() + federatedRoutes.HandleFunc("/.well-known/nodeinfo", func(res http.ResponseWriter, req *http.Request) { // curl -H "Accept: application/json" https://federated-repo.prod.meissa.de/.well-known/nodeinfo @@ -87,30 +120,28 @@ func (mock *FederationServerMock) DistantServer(t *testing.T) *httptest.Server { `"protocols":["activitypub"],"services":{"inbound":[],"outbound":["rss2.0"]},`+ `"openRegistrations":true,"usage":{"users":{"total":14,"activeHalfyear":2}},"metadata":{}}`) }) + for _, person := range mock.Persons { federatedRoutes.HandleFunc(fmt.Sprintf("/api/v1/activitypub/user-id/%v", person.ID), func(res http.ResponseWriter, req *http.Request) { // curl -H "Accept: application/json" https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/2 fmt.Fprint(res, person.marshal(req.Host)) }) - } - for _, repository := range mock.Repositories { - federatedRoutes.HandleFunc(fmt.Sprintf("/api/v1/activitypub/repository-id/%v/inbox", repository.ID), + federatedRoutes.HandleFunc(fmt.Sprintf("POST /api/v1/activitypub/user-id/%v/inbox", person.ID), func(res http.ResponseWriter, req *http.Request) { - if req.Method != "POST" { - t.Errorf("POST expected at: %q", req.URL.EscapedPath()) - } - buf := new(strings.Builder) - _, err := io.Copy(buf, req.Body) - if err != nil { - t.Errorf("Error reading body: %q", err) - } - mock.LastPost = buf.String() + mock.recordLastPost(t, req) + }) + } + + for _, repository := range mock.Repositories { + federatedRoutes.HandleFunc(fmt.Sprintf("POST /api/v1/activitypub/repository-id/%v/inbox", repository.ID), + func(res http.ResponseWriter, req *http.Request) { + mock.recordLastPost(t, req) }) } federatedRoutes.HandleFunc("/", func(res http.ResponseWriter, req *http.Request) { - t.Errorf("Unhandled request: %q", req.URL.EscapedPath()) + t.Errorf("Unhandled %v request: %q", req.Method, req.URL.EscapedPath()) }) federatedSrv := httptest.NewServer(federatedRoutes) return federatedSrv diff --git a/modules/typesniffer/typesniffer.go b/modules/typesniffer/typesniffer.go index 262feb2b05..8cb1513a88 100644 --- a/modules/typesniffer/typesniffer.go +++ b/modules/typesniffer/typesniffer.go @@ -124,7 +124,7 @@ func (ct SniffedType) GetMimeType() string { } // DetectContentType extends http.DetectContentType with more content types. Defaults to text/unknown if input is empty. -func DetectContentType(data []byte) SniffedType { +func DetectContentType(data []byte, filename string) SniffedType { if len(data) == 0 { return SniffedType{"text/unknown"} } @@ -176,6 +176,13 @@ func DetectContentType(data []byte) SniffedType { } } + if ct == "application/octet-stream" && + filename != "" && + !strings.HasSuffix(strings.ToUpper(filename), ".LCOM") && + bytes.Contains(data, []byte("(DEFINE-FILE-INFO ")) { + ct = "text/vnd.interlisp" + } + // GLTF is unsupported by http.DetectContentType // hexdump -n 4 -C glTF.glb if bytes.HasPrefix(data, []byte("glTF")) { @@ -186,7 +193,7 @@ func DetectContentType(data []byte) SniffedType { } // DetectContentTypeFromReader guesses the content type contained in the reader. -func DetectContentTypeFromReader(r io.Reader) (SniffedType, error) { +func DetectContentTypeFromReader(r io.Reader, filename string) (SniffedType, error) { buf := make([]byte, sniffLen) n, err := util.ReadAtMost(r, buf) if err != nil { @@ -194,5 +201,5 @@ func DetectContentTypeFromReader(r io.Reader) (SniffedType, error) { } buf = buf[:n] - return DetectContentType(buf), nil + return DetectContentType(buf, filename), nil } diff --git a/modules/typesniffer/typesniffer_test.go b/modules/typesniffer/typesniffer_test.go index 176d3658bb..d2b7ed4f21 100644 --- a/modules/typesniffer/typesniffer_test.go +++ b/modules/typesniffer/typesniffer_test.go @@ -16,63 +16,63 @@ import ( func TestDetectContentTypeLongerThanSniffLen(t *testing.T) { // Pre-condition: Shorter than sniffLen detects SVG. - assert.Equal(t, "image/svg+xml", DetectContentType([]byte(``)).contentType) + assert.Equal(t, "image/svg+xml", DetectContentType([]byte(``), "").contentType) // Longer than sniffLen detects something else. - assert.NotEqual(t, "image/svg+xml", DetectContentType([]byte(``)).contentType) + assert.NotEqual(t, "image/svg+xml", DetectContentType([]byte(``), "").contentType) } func TestIsTextFile(t *testing.T) { - assert.True(t, DetectContentType([]byte{}).IsText()) - assert.True(t, DetectContentType([]byte("lorem ipsum")).IsText()) + assert.True(t, DetectContentType([]byte{}, "").IsText()) + assert.True(t, DetectContentType([]byte("lorem ipsum"), "").IsText()) } func TestIsSvgImage(t *testing.T) { - assert.True(t, DetectContentType([]byte("")).IsSvgImage()) - assert.True(t, DetectContentType([]byte(" ")).IsSvgImage()) - assert.True(t, DetectContentType([]byte(``)).IsSvgImage()) - assert.True(t, DetectContentType([]byte(``)).IsSvgImage()) + assert.True(t, DetectContentType([]byte(""), "").IsSvgImage()) + assert.True(t, DetectContentType([]byte(" "), "").IsSvgImage()) + assert.True(t, DetectContentType([]byte(``), "").IsSvgImage()) + assert.True(t, DetectContentType([]byte(``), "").IsSvgImage()) assert.True(t, DetectContentType([]byte(` - `)).IsSvgImage()) + `), "").IsSvgImage()) assert.True(t, DetectContentType([]byte(` - `)).IsSvgImage()) + `), "").IsSvgImage()) assert.True(t, DetectContentType([]byte(` - `)).IsSvgImage()) + `), "").IsSvgImage()) assert.True(t, DetectContentType([]byte(` - `)).IsSvgImage()) + `), "").IsSvgImage()) assert.True(t, DetectContentType([]byte(` - `)).IsSvgImage()) + `), "").IsSvgImage()) assert.True(t, DetectContentType([]byte(` - `)).IsSvgImage()) + `), "").IsSvgImage()) assert.True(t, DetectContentType([]byte(` - `)).IsSvgImage()) + `), "").IsSvgImage()) assert.True(t, DetectContentType([]byte(` - `)).IsSvgImage()) + `), "").IsSvgImage()) // the DetectContentType should work for incomplete data, because only beginning bytes are used for detection - assert.True(t, DetectContentType([]byte(`....`)).IsSvgImage()) + assert.True(t, DetectContentType([]byte(`....`), "").IsSvgImage()) - assert.False(t, DetectContentType([]byte{}).IsSvgImage()) - assert.False(t, DetectContentType([]byte("svg")).IsSvgImage()) - assert.False(t, DetectContentType([]byte("")).IsSvgImage()) - assert.False(t, DetectContentType([]byte("text")).IsSvgImage()) - assert.False(t, DetectContentType([]byte("")).IsSvgImage()) - assert.False(t, DetectContentType([]byte(``)).IsSvgImage()) + assert.False(t, DetectContentType([]byte{}, "").IsSvgImage()) + assert.False(t, DetectContentType([]byte("svg"), "").IsSvgImage()) + assert.False(t, DetectContentType([]byte(""), "").IsSvgImage()) + assert.False(t, DetectContentType([]byte("text"), "").IsSvgImage()) + assert.False(t, DetectContentType([]byte(""), "").IsSvgImage()) + assert.False(t, DetectContentType([]byte(``), "").IsSvgImage()) assert.False(t, DetectContentType([]byte(` - `)).IsSvgImage()) + `), "").IsSvgImage()) assert.False(t, DetectContentType([]byte(` - `)).IsSvgImage()) + `), "").IsSvgImage()) assert.False(t, DetectContentType([]byte(` @@ -80,7 +80,7 @@ func TestIsSvgImage(t *testing.T) { -`)).IsSvgImage()) +`), "").IsSvgImage()) assert.False(t, DetectContentType([]byte(` -`)).IsSvgImage()) - assert.False(t, DetectContentType([]byte(``)).IsSvgImage()) - assert.False(t, DetectContentType([]byte(``)).IsSvgImage()) +`), "").IsSvgImage()) + assert.False(t, DetectContentType([]byte(``), "").IsSvgImage()) + assert.False(t, DetectContentType([]byte(``), "").IsSvgImage()) } func TestIsPDF(t *testing.T) { pdf, _ := base64.StdEncoding.DecodeString("JVBERi0xLjYKJcOkw7zDtsOfCjIgMCBvYmoKPDwvTGVuZ3RoIDMgMCBSL0ZpbHRlci9GbGF0ZURlY29kZT4+CnN0cmVhbQp4nF3NPwsCMQwF8D2f4s2CNYk1baF0EHRwOwg4iJt/NsFb/PpevUE4Mjwe") - assert.True(t, DetectContentType(pdf).IsPDF()) - assert.False(t, DetectContentType([]byte("plain text")).IsPDF()) + assert.True(t, DetectContentType(pdf, "").IsPDF()) + assert.False(t, DetectContentType([]byte("plain text"), "").IsPDF()) } func TestIsVideo(t *testing.T) { mp4, _ := base64.StdEncoding.DecodeString("AAAAGGZ0eXBtcDQyAAAAAGlzb21tcDQyAAEI721vb3YAAABsbXZoZAAAAADaBlwX2gZcFwAAA+gA") - assert.True(t, DetectContentType(mp4).IsVideo()) - assert.False(t, DetectContentType([]byte("plain text")).IsVideo()) + assert.True(t, DetectContentType(mp4, "").IsVideo()) + assert.False(t, DetectContentType([]byte("plain text"), "").IsVideo()) } func TestIsAudio(t *testing.T) { mp3, _ := base64.StdEncoding.DecodeString("SUQzBAAAAAABAFRYWFgAAAASAAADbWFqb3JfYnJhbmQAbXA0MgBUWFhYAAAAEQAAA21pbm9yX3Zl") - assert.True(t, DetectContentType(mp3).IsAudio()) - assert.False(t, DetectContentType([]byte("plain text")).IsAudio()) + assert.True(t, DetectContentType(mp3, "").IsAudio()) + assert.False(t, DetectContentType([]byte("plain text"), "").IsAudio()) - assert.True(t, DetectContentType([]byte("ID3Toy\000")).IsAudio()) - assert.True(t, DetectContentType([]byte("ID3Toy\n====\t* hi šŸŒž, ...")).IsText()) // test ID3 tag for plain text - assert.True(t, DetectContentType([]byte("ID3Toy\n====\t* hi šŸŒž, ..."+"šŸŒ›"[0:2])).IsText()) // test ID3 tag with incomplete UTF8 char + assert.True(t, DetectContentType([]byte("ID3Toy\000"), "").IsAudio()) + assert.True(t, DetectContentType([]byte("ID3Toy\n====\t* hi šŸŒž, ..."), "").IsText()) // test ID3 tag for plain text + assert.True(t, DetectContentType([]byte("ID3Toy\n====\t* hi šŸŒž, ..."+"šŸŒ›"[0:2]), "").IsText()) // test ID3 tag with incomplete UTF8 char } func TestIsGLB(t *testing.T) { glb, _ := hex.DecodeString("676c5446") - assert.True(t, DetectContentType(glb).IsGLB()) - assert.True(t, DetectContentType(glb).Is3DModel()) - assert.False(t, DetectContentType([]byte("plain text")).IsGLB()) - assert.False(t, DetectContentType([]byte("plain text")).Is3DModel()) + assert.True(t, DetectContentType(glb, "").IsGLB()) + assert.True(t, DetectContentType(glb, "").Is3DModel()) + assert.False(t, DetectContentType([]byte("plain text"), "").IsGLB()) + assert.False(t, DetectContentType([]byte("plain text"), "").Is3DModel()) } func TestDetectContentTypeFromReader(t *testing.T) { mp3, _ := base64.StdEncoding.DecodeString("SUQzBAAAAAABAFRYWFgAAAASAAADbWFqb3JfYnJhbmQAbXA0MgBUWFhYAAAAEQAAA21pbm9yX3Zl") - st, err := DetectContentTypeFromReader(bytes.NewReader(mp3)) + st, err := DetectContentTypeFromReader(bytes.NewReader(mp3), "") require.NoError(t, err) assert.True(t, st.IsAudio()) } func TestDetectContentTypeOgg(t *testing.T) { oggAudio, _ := hex.DecodeString("4f67675300020000000000000000352f0000000000007dc39163011e01766f72626973000000000244ac0000000000000071020000000000b8014f6767530000") - st, err := DetectContentTypeFromReader(bytes.NewReader(oggAudio)) + st, err := DetectContentTypeFromReader(bytes.NewReader(oggAudio), "") require.NoError(t, err) assert.True(t, st.IsAudio()) oggVideo, _ := hex.DecodeString("4f676753000200000000000000007d9747ef000000009b59daf3012a807468656f7261030201001e00110001e000010e00020000001e00000001000001000001") - st, err = DetectContentTypeFromReader(bytes.NewReader(oggVideo)) + st, err = DetectContentTypeFromReader(bytes.NewReader(oggVideo), "") require.NoError(t, err) assert.True(t, st.IsVideo()) } @@ -148,7 +148,7 @@ func TestDetectContentTypeAvif(t *testing.T) { avifImage, err := hex.DecodeString("000000206674797061766966") require.NoError(t, err) - st, err := DetectContentTypeFromReader(bytes.NewReader(avifImage)) + st, err := DetectContentTypeFromReader(bytes.NewReader(avifImage), "") require.NoError(t, err) assert.True(t, st.IsImage()) @@ -158,10 +158,24 @@ func TestDetectContentTypeModelGLB(t *testing.T) { glb, err := hex.DecodeString("676c5446") require.NoError(t, err) - st, err := DetectContentTypeFromReader(bytes.NewReader(glb)) + st, err := DetectContentTypeFromReader(bytes.NewReader(glb), "") require.NoError(t, err) // print st for debugging assert.Equal(t, "model/gltf-binary", st.GetMimeType()) assert.True(t, st.IsGLB()) } + +func TestDetectInterlisp(t *testing.T) { + interlisp, err := base64.StdEncoding.DecodeString("ICAKKERFRklORS1GSUxFLUlORk8gHlBBQ0tBR0UgIklOVEVSTElTUCIgHlJFQURUQUJMRSAiSU5URVJMSVNQIiAeQkFTRSAxMCkKCgYB") + require.NoError(t, err) + st, err := DetectContentTypeFromReader(bytes.NewReader(interlisp), "test") + require.NoError(t, err) + assert.True(t, st.IsText()) + st, err = DetectContentTypeFromReader(bytes.NewReader(interlisp), "") + require.NoError(t, err) + assert.False(t, st.IsText()) + st, err = DetectContentTypeFromReader(bytes.NewReader(interlisp), "test.lcom") + require.NoError(t, err) + assert.False(t, st.IsText()) +} diff --git a/modules/util/string.go b/modules/util/string.go index cf50f591c6..ca3d43ec6e 100644 --- a/modules/util/string.go +++ b/modules/util/string.go @@ -95,3 +95,25 @@ func UnsafeBytesToString(b []byte) string { func UnsafeStringToBytes(s string) []byte { return unsafe.Slice(unsafe.StringData(s), len(s)) } + +// AsciiEqualFold is taken from Golang, but reimplemented here, since the original is not exposed to public +// Taken from: https://cs.opensource.google/go/go/+/refs/tags/go1.24.4:src/net/http/internal/ascii/print.go +func ASCIIEqualFold(s, t string) bool { + if len(s) != len(t) { + return false + } + for i := 0; i < len(s); i++ { + if ASCIILower(s[i]) != ASCIILower(t[i]) { + return false + } + } + return true +} + +// AsciiLower returns the ASCII lowercase version of b. +func ASCIILower(b byte) byte { + if 'A' <= b && b <= 'Z' { + return b + ('a' - 'A') + } + return b +} diff --git a/modules/util/string_test.go b/modules/util/string_test.go index 0a4a8bbcfb..1012ab32a4 100644 --- a/modules/util/string_test.go +++ b/modules/util/string_test.go @@ -45,3 +45,29 @@ func TestToSnakeCase(t *testing.T) { assert.Equal(t, expected, ToSnakeCase(input)) } } + +func TestASCIIEqualFold(t *testing.T) { + cases := map[string]struct { + First string + Second string + Expected bool + }{ + "Empty String": {First: "", Second: "", Expected: true}, + "Single Letter Ident": {First: "h", Second: "h", Expected: true}, + "Single Letter Equal": {First: "h", Second: "H", Expected: true}, + "Single Letter Unequal": {First: "h", Second: "g", Expected: false}, + "Simple Match Ident": {First: "someString", Second: "someString", Expected: true}, + "Simple Match Equal": {First: "someString", Second: "someSTRIng", Expected: true}, + "Simple Match Unequal": {First: "someString", Second: "sameString", Expected: false}, + "Different Length": {First: "abcdef", Second: "abcdefg", Expected: false}, + "Unicode Kelvin": {First: "ghijklm", Second: "GHIJ\u212ALM", Expected: false}, + } + + for name := range cases { + c := cases[name] + t.Run(name, func(t *testing.T) { + Actual := ASCIIEqualFold(c.First, c.Second) + assert.Equal(t, c.Expected, Actual) + }) + } +} diff --git a/options/locale/locale_ar.ini b/options/locale/locale_ar.ini index 15d614e8bc..ba11586b44 100644 --- a/options/locale/locale_ar.ini +++ b/options/locale/locale_ar.ini @@ -297,7 +297,7 @@ twofa_disabled = Ų¹ŁŲ·Ł‘ŁŁ„ Ų§Ł„Ų§Ų³ŲŖŁŠŲ«Ų§Ł‚ Ų§Ł„Ų«Ł†Ų§Ų¦ŁŠ. theme_desc = Ų³ŲŖŁƒŁˆŁ† Ł‡Ų°Ł‡ Ų§Ł„Ų³Ł…Ų© Ų§Ł„Ł…ŲØŲÆŲ¦ŁŠŲ© Ł„Łƒ Ų¹ŲØŲ± Ų§Ł„Ł…ŁˆŁ‚Ų¹. new_password = ŁƒŁ„Ł…Ų© Ų§Ł„Ł…Ų±ŁˆŲ± Ų§Ł„Ų¬ŲÆŁŠŲÆŲ© twofa_disable_desc = ŲŖŲ¹Ų·ŁŠŁ„ Ų§Ł„Ų§Ų³ŲŖŁŠŲ«Ų§Ł‚ Ų§Ł„Ų«Ł†Ų§Ų¦ŁŠ Ų³ŁŠŲ¬Ų¹Ł„ Ų­Ų³Ų§ŲØŁƒ Ų£Ł‚Ł„ Ų£Ł…Ų§Ł†Ł‹Ų§. Ų£ŲŖŲ±ŁŠŲÆ Ų§Ł„Ų§Ų³ŲŖŁ…Ų±Ų§Ų±ŲŸ -manage_themes = Ų§Ų®ŲŖŲ± Ų§Ł„Ų³Ł…Ų© Ų§Ł„Ł…ŲØŲÆŲ¦ŁŠŲ© +manage_themes = Ų§Ł„Ł…ŁˆŲ¶ŁˆŲ¹ Ų§Ł„Ų§ŁŲŖŲ±Ų§Ų¶ŁŠ delete_prompt = Ł‡Ų°Ł‡ Ų§Ł„Ų¹Ł…Ł„ŁŠŲ© Ų³ŲŖŲ­Ų°Ł Ų­Ų³Ų§ŲØŁƒ Ų„Ł„Ł‰ Ų§Ł„Ų£ŲØŲÆ. Ł„Ų§ ŁŠŁ…ŁƒŁ† Ų§Ł„ŲŖŲ±Ų§Ų¬Ų¹ Ų¹Ł†Ł‡Ų§ ŲØŲ¹ŲÆ Ų°Ł„Łƒ. cancel = Ų£Ł„Ųŗ repos_none = Ł„ŁŠŲ³ Ł„ŲÆŁŠŁƒ Ų£ŁŠ Ł…Ų³ŲŖŁˆŲÆŲ¹. @@ -390,7 +390,7 @@ account = Ų§Ł„Ų­Ų³Ų§ŲØ uploaded_avatar_is_too_big = Ų­Ų¬Ł… Ų§Ł„Ł…Ł„Ł Ų§Ł„Ł…Ų±ŁŁˆŲ¹ (%d ŁƒŁŠā€ŒŲØ) ŁŠŲŖŲ®Ų·Ł‰ Ų§Ł„Ų­Ų¬Ł… Ų§Ł„Ų£Ł‚ŲµŁ‰ (%d ŁƒŁŠā€ŒŲØ). biography_placeholder = Ų£Ų®ŲØŲ±Ł†Ų§ Ų“ŁŠŲ¦Ų§ Ų¹Ł† Ł†ŁŲ³Łƒ! (ŁŠŁ…ŁƒŁ†Łƒ Ų§Ų³ŲŖŲ®ŲÆŲ§Ł… Ł…Ų§Ų±ŁƒŲÆŲ§ŁˆŁ†) comment_type_group_reference = Ų§Ł„Ų„Ų“Ų§Ų±Ų§ŲŖ -orgs = Ų„ŲÆŲ§Ų±Ų© Ų§Ł„Ł…Ł†ŲøŁ…Ų§ŲŖ +orgs = Ų§Ł„Ł…Ł†ŲøŁ…Ų§ŲŖ update_profile = Ų­ŲÆŁ‘ŁŲ« Ų§Ł„Ł…Ł„Ł Ų§Ł„Ų“Ų®ŲµŁŠ profile = Ų§Ł„Ł…Ł„Ł Ų§Ł„Ų“Ų®ŲµŁŠ comment_type_group_dependency = Ų§Ł„Ų§Ų¹ŲŖŁ…Ų§ŲÆŁŠŲ§ŲŖ @@ -421,7 +421,7 @@ keep_email_private_popup = Ų³ŁŠŲ¤ŲÆŁŠ Ł‡Ų°Ų§ Ų„Ł„Ł‰ Ų„Ų®ŁŲ§Ų” Ų¹Ł†ŁˆŲ§Ł† ŲØŲ±ŁŠ ssh_key_name_used = Ł‡Ł†Ų§Łƒ Ł…ŁŲŖŲ§Ų­ SSH ŲØŁ†ŁŲ³ Ų§Ł„Ų§Ų³Ł… Ł…ŁˆŲ¬ŁˆŲÆ ŲØŲ§Ł„ŁŲ¹Ł„ Ų¹Ł„Ł‰ Ų­Ų³Ų§ŲØŁƒ. authorized_oauth2_applications = ŲŖŲ·ŲØŁŠŁ‚Ų§ŲŖ OAuth2 Ų§Ł„Ł…Ų£Ų°ŁˆŁ†Ų© uid = Ų§Ł„Ł…Ų¹Ų±Ł‘Ł Ų§Ł„Ų±Ł…Ų²ŁŠ -manage_openid = Ų„ŲÆŲ§Ų±Ų© Ų¹Ł†Ų§ŁˆŁŠŁ† OpenID +manage_openid = Ų¹Ł†Ų§ŁˆŁŠŁ† OpenID webauthn = Ų§Ų³ŲŖŁŠŲ«Ų§Ł‚ Ų«Ł†Ų§Ų¦ŁŠ (Ł…ŁŲ§ŲŖŁŠŲ­ Ų§Ł„Ų£Ł…Ų§Ł†) comment_type_group_deadline = Ų§Ł„Ł…ŁˆŲ¹ŲÆ Ų§Ł„Ł†Ł‡Ų§Ų¦ŁŠ add_key = Ų£Ų¶Ł Ł…ŁŲŖŲ§Ų­ @@ -502,6 +502,7 @@ update_oauth2_application_success = Ł„Ł‚ŲÆ Ų­ŲÆŁ‘Ų«ŲŖ ŲØŁ†Ų¬Ų§Ų­ ŲŖŲ·ŲØŁŠŁ‚ OAut oauth2_redirect_uris = Ų±ŁˆŲ§ŲØŲ· Ų„Ų¹Ų§ŲÆŲ© Ų§Ł„ŲŖŁˆŲ¬ŁŠŁ‡. Ł†Ų±Ų¬Łˆ ŁˆŲ¶Ų¹ ŁƒŁ„ Ų±Ų§ŲØŲ· ŁŁŠ Ų³Ų·Ų± ŁˆŲ­ŲÆŁ‡. remove_account_link = Ų£Ų²Ł„ Ų§Ł„Ų­Ų³Ų§ŲØ Ų§Ł„Ł…Ų±ŲØŁˆŲ· remove_account_link_success = Ų£ŁŲ²ŁŠŁ„ Ų§Ł„Ų­Ų³Ų§ŲØ Ų§Ł„Ł…Ų±ŲØŁˆŲ·. +quota = ŁƒŁˆŲŖŲ§ [org] follow_blocked_user = Ł„Ų§ ŁŠŁ…ŁƒŁ†Łƒ Ų„ŲŖŲØŲ§Ų¹ Ł‡Ų°Ł‡ Ų§Ł„Ł…Ł†ŲøŁ…Ų© Ł„Ų£Ł† Ł‡Ų°Ł‡ Ų§Ł„Ł…Ł†ŲøŁ…Ų© Ų­ŲøŲ±ŲŖŁƒ. @@ -1973,7 +1974,7 @@ component_failed_to_load = Ų­ŲÆŲ« Ų®Ų·Ų£ ŲŗŁŠŲ± Ł…ŲŖŁˆŁ‚Ų¹. [search] -org_kind = ŲØŲ­Ų« ŁŁŠ Ų§Ł„Ł…Ł†ŲøŁ…Ų§ŲŖ... +org_kind = ŲØŲ­Ų« ŁŁŠ Ų§Ł„Ł…Ł†ŲøŁ…Ų§ŲŖā€¦ code_search_unavailable = Ų§Ł„ŲØŲ­Ų« ŁŁŠ Ų§Ł„ŁƒŁˆŲÆ ŲŗŁŠŲ± Ł…ŲŖŁˆŁŲ± Ų­Ų§Ł„ŁŠŁ‹Ų§. ŁŠŲ±Ų¬Ł‰ Ų§Ł„Ų§ŲŖŲµŲ§Ł„ ŲØŁ…ŲÆŁŠŲ± Ų§Ł„Ł…ŁˆŁ‚Ų¹. search = Ų§ŲØŲ­Ų«... type_tooltip = Ł†ŁˆŲ¹ Ų§Ł„ŲØŲ­Ų« @@ -1981,13 +1982,13 @@ fuzzy = Ų£Ų¬Ų¹ŲÆ fuzzy_tooltip = Ł‚Ł… ŲØŲŖŲ¶Ł…ŁŠŁ† Ų§Ł„Ł†ŲŖŲ§Ų¦Ų¬ Ų§Ł„ŲŖŁŠ ŲŖŲŖŲ·Ų§ŲØŁ‚ Ų£ŁŠŲ¶Ł‹Ų§ Ł…Ų¹ Ł…ŲµŲ·Ł„Ų­ Ų§Ł„ŲØŲ­Ų« ŲØŲ“ŁƒŁ„ ŁˆŲ«ŁŠŁ‚ match = ŲŖŲŖŁ†Ų§Ų³ŲØ match_tooltip = Ł‚Ł… ŲØŲŖŲ¶Ł…ŁŠŁ† Ų§Ł„Ł†ŲŖŲ§Ų¦Ų¬ Ų§Ł„ŲŖŁŠ ŲŖŲ·Ų§ŲØŁ‚ Ł…ŲµŲ·Ł„Ų­ Ų§Ł„ŲØŲ­Ų« Ų§Ł„Ł…Ų­ŲÆŲÆ ŁŁ‚Ų· -repo_kind = ŲØŲ­Ų« ŁŁŠ Ų§Ł„Ł…Ų³ŲŖŁˆŲÆŲ¹Ų§ŲŖ... -user_kind = ŲØŲ­Ų« Ų¹Ł† Ų§Ł„Ł…Ų³ŲŖŲ®ŲÆŁ…ŁŠŁ†... -team_kind = ŲØŲ­Ų« Ų¹Ł† Ų§Ł„ŁŲ±Ł‚ ... -code_kind = ŲØŲ­Ų« ŁŁŠ Ų§Ł„ŁƒŁˆŲÆ... -project_kind = Ų§Ł„ŲØŲ­Ų« Ų¶Ł…Ł† Ų§Ł„Ł…Ų“Ų§Ų±ŁŠŲ¹... -branch_kind = Ų§Ł„ŲØŲ­Ų« Ų¶Ł…Ł† Ų§Ł„ŁŲ±ŁˆŲ¹... +repo_kind = ŲØŲ­Ų« ŁŁŠ Ų§Ł„Ł…Ų³ŲŖŁˆŲÆŲ¹Ų§ŲŖā€¦ +user_kind = ŲØŲ­Ų« Ų¹Ł† Ų§Ł„Ł…Ų³ŲŖŲ®ŲÆŁ…ŁŠŁ†ā€¦ +team_kind = ŲØŲ­Ų« Ų¹Ł† Ų§Ł„ŁŲ±Ł‚ā€¦ +code_kind = ŲØŲ­Ų« ŁŁŠ Ų§Ł„ŁƒŁˆŲÆā€¦ +project_kind = Ų§Ł„ŲØŲ­Ų« Ų¶Ł…Ł† Ų§Ł„Ł…Ų“Ų§Ų±ŁŠŲ¹ā€¦ +branch_kind = Ų§Ł„ŲØŲ­Ų« Ų¶Ł…Ł† Ų§Ł„ŁŲ±ŁˆŲ¹ā€¦ no_results = Ł„Ų§ ŲŖŁˆŲ¬ŲÆ Ł†ŲŖŲ§Ų¦Ų¬ Ł…Ų·Ų§ŲØŁ‚Ų©. -issue_kind = Ų§Ł„ŲØŲ­Ų« Ų¶Ł…Ł† Ų§Ł„Ų£Ų¹Ų·Ų§Ł„... -pull_kind = Ų§Ł„ŲØŲ­Ų« Ų¶Ł…Ł† Ų·Ł„ŲØŲ§ŲŖ Ų§Ł„Ų³Ų­ŲØ... +issue_kind = Ų§Ł„ŲØŲ­Ų« Ų¶Ł…Ł† Ų§Ł„Ų£Ų¹Ų·Ų§Ł„ā€¦ +pull_kind = Ų§Ł„ŲØŲ­Ų« Ų¶Ł…Ł† Ų·Ł„ŲØŲ§ŲŖ Ų§Ł„Ų³Ų­ŲØā€¦ keyword_search_unavailable = Ų§Ł„ŲØŲ­Ų« Ł…Ł† Ų®Ł„Ų§Ł„ Ų§Ł„ŁƒŁ„Ł…Ų§ŲŖ Ų§Ł„Ł…ŁŲŖŲ§Ų­ŁŠŲ© Ł„ŁŠŲ³ Ł…ŲŖŁˆŁŲ± Ų­Ų§Ł„ŁŠŲ§Ł‹. Ų±Ų¬Ų§Ų”Ų§Ł‹ ŲŖŁˆŲ§ŲµŁ„ Ł…Ų¹ Ł…Ų“Ų±Ł Ų§Ł„Ł…ŁˆŁ‚Ų¹. diff --git a/options/locale/locale_bg.ini b/options/locale/locale_bg.ini index 1b9767f674..8c69a36d52 100644 --- a/options/locale/locale_bg.ini +++ b/options/locale/locale_bg.ini @@ -141,6 +141,7 @@ webauthn_sign_in = ŠŠ°Ń‚ŠøсŠ½ŠµŃ‚Šµ Š±ŃƒŃ‚Š¾Š½Š° Š½Š° Š²Š°ŃˆŠøя ŠŗŠ»ŃŽŃ‡ Š·Š° webauthn_error = ŠŠµŃƒŃŠæŠµŃˆŠ½Š¾ ŠæрŠ¾Ń‡ŠøтŠ°Š½Šµ Š½Š° Š²Š°ŃˆŠøя ŠŗŠ»ŃŽŃ‡ Š·Š° сŠøŠ³ŃƒŃ€Š½Š¾ŃŃ‚. webauthn_unsupported_browser = Š’Š°ŃˆŠøят Š±Ń€Š°ŃƒŠ·ŃŠŃ€ Š² Š¼Š¾Š¼ŠµŠ½Ń‚Š° Š½Šµ ŠæŠ¾Š“Š“ърŠ¶Š° WebAuthn. webauthn_error_duplicated = ŠšŠ»ŃŽŃ‡ŃŠŃ‚ Š·Š° сŠøŠ³ŃƒŃ€Š½Š¾ŃŃ‚ Š½Šµ Šµ рŠ°Š·Ń€ŠµŃˆŠµŠ½ Š·Š° тŠ°Š·Šø Š·Š°ŃŠ²ŠŗŠ°. ŠœŠ¾Š»Ń, уŠ²ŠµŃ€ŠµŃ‚Šµ сŠµ, чŠµ ŠŗŠ»ŃŽŃ‡ŃŠŃ‚ Š½Šµ Šµ Š²ŠµŃ‡Šµ рŠµŠ³ŠøстрŠøрŠ°Š½. +tracked_time_summary = ŠžŠ±Š¾Š±Ń‰ŠµŠ½ŠøŠµ Š½Š° ŠæрŠ¾ŃŠ»ŠµŠ“ŠµŠ½Š¾Ń‚Š¾ Š²Ń€ŠµŠ¼Šµ Š²ŃŠŠ· Š¾ŃŠ½Š¾Š²Š° Š½Š° фŠøŠ»Ń‚Ń€ŠøтŠµ Š² сŠæŠøсъŠŗŠ° със Š·Š°Š“Š°Ń‡Šø [settings] ui = Š¢ŠµŠ¼Š° @@ -324,7 +325,7 @@ permissions_list = Š Š°Š·Ń€ŠµŃˆŠµŠ½Šøя: edit_oauth2_application = Š ŠµŠ“Š°ŠŗтŠøрŠ°Š½Šµ Š½Š° OAuth2 ŠæрŠøŠ»Š¾Š¶ŠµŠ½ŠøŠµ remove_oauth2_application = ŠŸŃ€ŠµŠ¼Š°Ń…Š²Š°Š½Šµ Š½Š° OAuth2 ŠæрŠøŠ»Š¾Š¶ŠµŠ½ŠøŠµ twofa_recovery_tip = ŠŠŗŠ¾ Š·Š°Š³ŃƒŠ±ŠøтŠµ устрŠ¾Š¹ŃŃ‚Š²Š¾Ń‚Š¾ сŠø, щŠµ Š¼Š¾Š¶ŠµŃ‚Šµ Š“Š° ŠøŠ·ŠæŠ¾Š»Š·Š²Š°Ń‚Šµ ŠŗŠ»ŃŽŃ‡ Š·Š° ŠµŠ“Š½Š¾ŠŗрŠ°Ń‚Š½Š¾ Š²ŃŠŠ·ŃŃ‚Š°Š½Š¾Š²ŃŠ²Š°Š½Šµ, Š·Š° Š“Š° сŠø Š²ŃŠŃ€Š½ŠµŃ‚Šµ Š“Š¾ŃŃ‚ŃŠŠæŠ° Š“Š¾ Š°ŠŗŠ°ŃƒŠ½Ń‚Š°. -visibility.private_tooltip = Š’ŠøŠ“ŠøŠ¼ сŠ°Š¼Š¾ Š·Š° чŠ»ŠµŠ½Š¾Š²Šµ Š½Š° Š¾Ń€Š³Š°Š½ŠøŠ·Š°Ń†ŠøŠø, Š² ŠŗŠ¾ŠøтŠ¾ учŠ°ŃŃ‚Š²Š°Ń‚Šµ +visibility.private_tooltip = Š’ŠøŠ“ŠøŠ¼ сŠ°Š¼Š¾ Š·Š° учŠ°ŃŃ‚Š½ŠøцŠø Š² Š¾Ń€Š³Š°Š½ŠøŠ·Š°Ń†ŠøŠø, Š² ŠŗŠ¾ŠøтŠ¾ учŠ°ŃŃ‚Š²Š°Ń‚Šµ quota.applies_to_user = Š”Š»ŠµŠ“Š½ŠøтŠµ ŠæрŠ°Š²ŠøŠ»Š° Š·Š° ŠŗŠ²Š¾Ń‚Š° сŠµ ŠæрŠøŠ»Š°Š³Š°Ń‚ Š·Š° Š²Š°ŃˆŠøя Š°ŠŗŠ°ŃƒŠ½Ń‚ quota.rule.no_limit = ŠŠµŠ¾Š³Ń€Š°Š½ŠøчŠµŠ½Š° hints = ŠŸŠ¾Š“сŠŗŠ°Š·ŠŗŠø @@ -380,6 +381,19 @@ hidden_comment_types = Š”ŠŗрŠøтŠø тŠøŠæŠ¾Š²Šµ ŠŗŠ¾Š¼ŠµŠ½Ń‚Š°Ń€Šø comment_type_group_lock = Š”ъстŠ¾ŃŠ½ŠøŠµ Š½Š° Š·Š°ŠŗŠ»ŃŽŃ‡Š²Š°Š½Šµ can_not_add_email_activations_pending = Š˜Š¼Š° чŠ°ŠŗŠ°Ń‰Š° Š°ŠŗтŠøŠ²Š°Ń†Šøя, Š¾ŠæŠøтŠ°Š¹Ń‚Šµ Š¾Ń‚Š½Š¾Š²Š¾ сŠ»ŠµŠ“ Š½ŃŠŗŠ¾Š»ŠŗŠ¾ Š¼ŠøŠ½ŃƒŃ‚Šø, Š°ŠŗŠ¾ ŠøсŠŗŠ°Ń‚Šµ Š“Š° Š“Š¾Š±Š°Š²ŠøтŠµ Š½Š¾Š²Š° ŠµŠ». ŠæŠ¾Ń‰Š°. storage_overview = ŠŸŃ€ŠµŠ³Š»ŠµŠ“ Š½Š° съхрŠ°Š½ŠµŠ½ŠøŠµŃ‚Š¾ +webauthn = Š”Š²ŃƒŃ„Š°ŠŗтŠ¾Ń€Š½Š¾ уŠ“Š¾ŃŃ‚Š¾Š²ŠµŃ€ŃŠ²Š°Š½Šµ (ŠšŠ»ŃŽŃ‡Š¾Š²Šµ Š·Š° сŠøŠ³ŃƒŃ€Š½Š¾ŃŃ‚) +quota.sizes.repos.public = ŠŸŃƒŠ±Š»ŠøчŠ½Šø хрŠ°Š½ŠøŠ»ŠøщŠ° +quota.sizes.repos.private = Š§Š°ŃŃ‚Š½Šø хрŠ°Š½ŠøŠ»ŠøщŠ° +quota.sizes.git.all = Git съŠ“ърŠ¶Š°Š½ŠøŠµ +quota.sizes.git.lfs = Git LFS +quota.sizes.assets.attachments.all = ŠŸŃ€ŠøŠŗŠ°Ń‡ŠµŠ½Šø фŠ°Š¹Š»Š¾Š²Šµ +quota.sizes.assets.attachments.releases = ŠŸŃ€ŠøŠŗŠ°Ń‡ŠµŠ½Šø фŠ°Š¹Š»Š¾Š²Šµ ŠŗъŠ¼ ŠøŠ·Š“Š°Š½Šøя +quota.sizes.assets.artifacts = ŠŃ€Ń‚ŠµŃ„Š°ŠŗтŠø +quota.sizes.assets.packages.all = ŠŸŠ°ŠŗŠµŃ‚Šø +quota.sizes.wiki = Š£ŠøŠŗŠø +quota.sizes.all = Š’сŠøчŠŗŠø +quota.sizes.repos.all = Š„рŠ°Š½ŠøŠ»ŠøщŠ° +quota.sizes.assets.attachments.issues = ŠŸŃ€ŠøŠŗŠ°Ń‡ŠµŠ½Šø фŠ°Š¹Š»Š¾Š²Šµ ŠŗъŠ¼ Š·Š°Š“Š°Ń‡Šø [packages] container.labels.value = Š”тŠ¾Š¹Š½Š¾ŃŃ‚ @@ -438,6 +452,112 @@ details.documentation_site = Š£ŠµŠ±ŃŠ°Š¹Ń‚ Š½Š° Š“Š¾ŠŗуŠ¼ŠµŠ½Ń‚Š°Ń†ŠøятŠ° arch.version.conflicts = Š’ ŠŗŠ¾Š½Ń„Š»ŠøŠŗт alpine.repository.branches = ŠšŠ»Š¾Š½Š¾Š²Šµ arch.pacman.repo.multi.item = ŠšŠ¾Š½Ń„ŠøŠ³ŃƒŃ€Š°Ń†Šøя Š·Š° %s +container.multi_arch = ŠžŠ” / ŠŃ€Ń…ŠøтŠµŠŗтурŠ° +rpm.repository = Š˜Š½Ń„Š¾Ń€Š¼Š°Ń†Šøя Š·Š° хрŠ°Š½ŠøŠ»ŠøщŠµŃ‚Š¾ +container.pull = Š˜Š·Š“ърŠæŠ°Š¹Ń‚Šµ Š¾Š±Ń€Š°Š·Š° Š¾Ń‚ ŠŗŠ¾Š¼Š°Š½Š“Š½Šøя рŠµŠ“: +helm.registry = ŠŠ°ŃŃ‚Ń€Š¾Š¹Ń‚Šµ тŠ¾Š·Šø рŠµŠ³Šøстър Š¾Ń‚ ŠŗŠ¾Š¼Š°Š½Š“Š½Šøя рŠµŠ“: +debian.repository.distributions = Š”ŠøстрŠøŠ±ŃƒŃ†ŠøŠø +npm.dependencies.optional = ŠžŠæцŠøŠ¾Š½Š°Š»Š½Šø Š·Š°Š²ŠøсŠøŠ¼Š¾ŃŃ‚Šø +owner.settings.cargo.title = Š˜Š½Š“ŠµŠŗс Š½Š° рŠµŠ³ŠøстърŠ° Š½Š° Cargo +owner.settings.cleanuprules.keep.pattern.container = Š’ŠµŃ€ŃŠøятŠ° latest Š²ŠøŠ½Š°Š³Šø сŠµ Š·Š°ŠæŠ°Š·Š²Š° Š·Š° Container ŠæŠ°ŠŗŠµŃ‚Šø. +owner.settings.cleanuprules.remove.pattern = ŠŸŃ€ŠµŠ¼Š°Ń…Š²Š°Š½Šµ Š½Š° Š²ŠµŃ€ŃŠøŠø, съŠ¾Ń‚Š²ŠµŃ‚стŠ²Š°Ń‰Šø Š½Š° +rpm.distros.suse = Š½Š° Š“ŠøстрŠøŠ±ŃƒŃ†ŠøŠø, Š±Š°Š·ŠøрŠ°Š½Šø Š½Š° SUSE +owner.settings.cleanuprules.preview.overview = %d ŠæŠ°ŠŗŠµŃ‚Š° сŠ° Š½Š°ŃŃ€Š¾Ń‡ŠµŠ½Šø Š·Š° ŠæрŠµŠ¼Š°Ń…Š²Š°Š½Šµ. +owner.settings.cleanuprules.preview = ŠŸŃ€ŠµŠ³Š»ŠµŠ“ Š½Š° ŠæрŠ°Š²ŠøŠ»Š¾ Š·Š° ŠæŠ¾Ń‡ŠøстŠ²Š°Š½Šµ +arch.version.properties = Š”Š²Š¾Š¹ŃŃ‚Š²Š° Š½Š° Š²ŠµŃ€ŃŠøятŠ° +conan.registry = ŠŠ°ŃŃ‚Ń€Š¾Š¹Ń‚Šµ тŠ¾Š·Šø рŠµŠ³Šøстър Š¾Ń‚ ŠŗŠ¾Š¼Š°Š½Š“Š½Šøя рŠµŠ“: +conan.details.repository = Š„рŠ°Š½ŠøŠ»ŠøщŠµ +composer.install = Š—Š° Š“Š° ŠøŠ½ŃŃ‚Š°Š»ŠøрŠ°Ń‚Šµ ŠæŠ°ŠŗŠµŃ‚Š° с Composer, ŠøŠ·ŠæъŠ»Š½ŠµŃ‚Šµ сŠ»ŠµŠ“Š½Š°Ń‚Š° ŠŗŠ¾Š¼Š°Š½Š“Š°: +chef.install = Š—Š° Š“Š° ŠøŠ½ŃŃ‚Š°Š»ŠøрŠ°Ń‚Šµ ŠæŠ°ŠŗŠµŃ‚Š°, ŠøŠ·ŠæъŠ»Š½ŠµŃ‚Šµ сŠ»ŠµŠ“Š½Š°Ń‚Š° ŠŗŠ¾Š¼Š°Š½Š“Š°: +chef.registry = ŠŠ°ŃŃ‚Ń€Š¾Š¹Ń‚Šµ тŠ¾Š·Šø рŠµŠ³Šøстър Š²ŃŠŠ² Š²Š°ŃˆŠøя фŠ°Š¹Š» ~/.chef/config.rb: +pub.install = Š—Š° Š“Š° ŠøŠ½ŃŃ‚Š°Š»ŠøрŠ°Ń‚Šµ ŠæŠ°ŠŗŠµŃ‚Š° с Dart, ŠøŠ·ŠæъŠ»Š½ŠµŃ‚Šµ сŠ»ŠµŠ“Š½Š°Ń‚Š° ŠŗŠ¾Š¼Š°Š½Š“Š°: +npm.details.tag = ŠœŠ°Ń€ŠŗŠµŃ€ +npm.install = Š—Š° Š“Š° ŠøŠ½ŃŃ‚Š°Š»ŠøрŠ°Ń‚Šµ ŠæŠ°ŠŗŠµŃ‚Š° с npm, ŠøŠ·ŠæъŠ»Š½ŠµŃ‚Šµ сŠ»ŠµŠ“Š½Š°Ń‚Š° ŠŗŠ¾Š¼Š°Š½Š“Š°: +maven.registry = ŠŠ°ŃŃ‚Ń€Š¾Š¹Ń‚Šµ тŠ¾Š·Šø рŠµŠ³Šøстър Š²ŃŠŠ² фŠ°Š¹Š»Š° Š½Š° Š²Š°ŃˆŠøя ŠæрŠ¾ŠµŠŗт pom.xml: +debian.repository.components = ŠšŠ¾Š¼ŠæŠ¾Š½ŠµŠ½Ń‚Šø +debian.install = Š—Š° Š“Š° ŠøŠ½ŃŃ‚Š°Š»ŠøрŠ°Ń‚Šµ ŠæŠ°ŠŗŠµŃ‚Š°, ŠøŠ·ŠæъŠ»Š½ŠµŃ‚Šµ сŠ»ŠµŠ“Š½Š°Ń‚Š° ŠŗŠ¾Š¼Š°Š½Š“Š°: +cran.install = Š—Š° Š“Š° ŠøŠ½ŃŃ‚Š°Š»ŠøрŠ°Ń‚Šµ ŠæŠ°ŠŗŠµŃ‚Š°, ŠøŠ·ŠæъŠ»Š½ŠµŃ‚Šµ сŠ»ŠµŠ“Š½Š°Ń‚Š° ŠŗŠ¾Š¼Š°Š½Š“Š°: +cran.registry = ŠŠ°ŃŃ‚Ń€Š¾Š¹Ń‚Šµ тŠ¾Š·Šø рŠµŠ³Šøстър Š²ŃŠŠ² Š²Š°ŃˆŠøя фŠ°Š¹Š» Rprofile.site: +rpm.distros.redhat = Š½Š° Š“ŠøстрŠøŠ±ŃƒŃ†ŠøŠø, Š±Š°Š·ŠøрŠ°Š½Šø Š½Š° RedHat +alt.registry = ŠŠ°ŃŃ‚Ń€Š¾Š¹Ń‚Šµ тŠ¾Š·Šø рŠµŠ³Šøстър Š¾Ń‚ ŠŗŠ¾Š¼Š°Š½Š“Š½Šøя рŠµŠ“: +rpm.repository.architectures = ŠŃ€Ń…ŠøтŠµŠŗтурŠø +alt.registry.install = Š—Š° Š“Š° ŠøŠ½ŃŃ‚Š°Š»ŠøрŠ°Ń‚Šµ ŠæŠ°ŠŗŠµŃ‚Š°, ŠøŠ·ŠæъŠ»Š½ŠµŃ‚Šµ сŠ»ŠµŠ“Š½Š°Ń‚Š° ŠŗŠ¾Š¼Š°Š½Š“Š°: +alt.setup = Š”Š¾Š±Š°Š²ŠµŃ‚Šµ хрŠ°Š½ŠøŠ»ŠøщŠµ ŠŗъŠ¼ сŠæŠøсъŠŗŠ° със сŠ²ŃŠŃ€Š·Š°Š½Šø хрŠ°Š½ŠøŠ»ŠøщŠ° (ŠøŠ·Š±ŠµŃ€ŠµŃ‚Šµ Š½ŠµŠ¾Š±Ń…Š¾Š“ŠøŠ¼Š°Ń‚Š° Š°Ń€Ń…ŠøтŠµŠŗтурŠ° Š²Š¼ŠµŃŃ‚Š¾ ā€ž_arch_ā€œ): +alt.repository = Š˜Š½Ń„Š¾Ń€Š¼Š°Ń†Šøя Š·Š° хрŠ°Š½ŠøŠ»ŠøщŠµŃ‚Š¾ +owner.settings.cargo.initialize.error = ŠŠµŃƒŃŠæŠµŃˆŠ½Š¾ ŠøŠ½ŠøцŠøŠ°Š»ŠøŠ·ŠøрŠ°Š½Šµ Š½Š° ŠøŠ½Š“ŠµŠŗсŠ° Š½Š° Cargo: %v +owner.settings.cargo.initialize = Š˜Š½ŠøцŠøŠ°Š»ŠøŠ·ŠøрŠ°Š½Šµ Š½Š° ŠøŠ½Š“ŠµŠŗс +settings.delete.description = Š˜Š·Ń‚Ń€ŠøŠ²Š°Š½ŠµŃ‚Š¾ Š½Š° ŠæŠ°ŠŗŠµŃ‚ Šµ трŠ°Š¹Š½Š¾ Šø Š½Šµ Š¼Š¾Š¶Šµ Š“Š° Š±ŃŠŠ“Šµ Š¾Ń‚Š¼ŠµŠ½ŠµŠ½Š¾. +alt.repository.multiple_groups = Š¢Š¾Š·Šø ŠæŠ°ŠŗŠµŃ‚ Šµ Š½Š°Š»ŠøчŠµŠ½ Š² Š½ŃŠŗŠ¾Š»ŠŗŠ¾ Š³Ń€ŃƒŠæŠø. +alt.repository.architectures = ŠŃ€Ń…ŠøтŠµŠŗтурŠø +owner.settings.chef.title = Š ŠµŠ³Šøстър Š½Š° Chef +owner.settings.cleanuprules.remove.days = ŠŸŃ€ŠµŠ¼Š°Ń…Š²Š°Š½Šµ Š½Š° Š²ŠµŃ€ŃŠøŠø, ŠæŠ¾-стŠ°Ń€Šø Š¾Ń‚ +owner.settings.cleanuprules.keep.pattern = Š—Š°ŠæŠ°Š·Š²Š°Š½Šµ Š½Š° Š²ŠµŃ€ŃŠøŠø, съŠ¾Ń‚Š²ŠµŃ‚стŠ²Š°Ń‰Šø Š½Š° +owner.settings.cleanuprules.keep.count.n = %d Š²ŠµŃ€ŃŠøŠø Š½Š° ŠæŠ°ŠŗŠµŃ‚ +owner.settings.cleanuprules.keep.count.1 = 1 Š²ŠµŃ€ŃŠøя Š½Š° ŠæŠ°ŠŗŠµŃ‚ +owner.settings.cleanuprules.keep.count = Š—Š°ŠæŠ°Š·Š²Š°Š½Šµ Š½Š° Š½Š°Š¹-Š½Š¾Š²ŠøтŠµ +owner.settings.cleanuprules.enabled = Š’ŠŗŠ»ŃŽŃ‡ŠµŠ½Š¾ +owner.settings.cleanuprules.preview.none = ŠŸŃ€Š°Š²ŠøŠ»Š¾Ń‚Š¾ Š·Š° ŠæŠ¾Ń‡ŠøстŠ²Š°Š½Šµ Š½Šµ съŠ²ŠæŠ°Š“Š° с Š½ŠøтŠ¾ ŠµŠ“ŠøŠ½ ŠæŠ°ŠŗŠµŃ‚. +owner.settings.cleanuprules.none = Š’сŠµ Š¾Ń‰Šµ Š½ŃŠ¼Š° ŠæрŠ°Š²ŠøŠ»Š° Š·Š° ŠæŠ¾Ń‡ŠøстŠ²Š°Š½Šµ. +owner.settings.cleanuprules.add = Š”Š¾Š±Š°Š²ŃŠ½Šµ Š½Š° ŠæрŠ°Š²ŠøŠ»Š¾ Š·Š° ŠæŠ¾Ń‡ŠøстŠ²Š°Š½Šµ +owner.settings.cleanuprules.title = ŠŸŃ€Š°Š²ŠøŠ»Š° Š·Š° ŠæŠ¾Ń‡ŠøстŠ²Š°Š½Šµ +owner.settings.cargo.rebuild.success = Š˜Š½Š“ŠµŠŗсът Š½Š° Cargo Š±ŠµŃˆŠµ усŠæŠµŃˆŠ½Š¾ ŠæрŠµŠøŠ·Š³Ń€Š°Š“ŠµŠ½. +alpine.registry.key = Š˜Š·Ń‚ŠµŠ³Š»ŠµŃ‚Šµ ŠæуŠ±Š»ŠøчŠ½Šøя RSA ŠŗŠ»ŃŽŃ‡ Š½Š° рŠµŠ³ŠøстърŠ° Š² ŠæŠ°ŠæŠŗŠ°Ń‚Š° /etc/apk/keys/, Š·Š° Š“Š° ŠæрŠ¾Š²ŠµŃ€ŠøтŠµ ŠæŠ¾Š“ŠæŠøсŠ° Š½Š° ŠøŠ½Š“ŠµŠŗсŠ°: +alpine.registry.info = Š˜Š·Š±ŠµŃ€ŠµŃ‚Šµ $branch Šø $repository Š¾Ń‚ сŠæŠøсъŠŗŠ° ŠæŠ¾-Š“Š¾Š»Ńƒ. +arch.version.checkdepends = Š—Š°Š²ŠøсŠøŠ¼Š¾ŃŃ‚Šø Š·Š° ŠæрŠ¾Š²ŠµŃ€ŠŗŠ°Ń‚Š° +composer.dependencies = Š—Š°Š²ŠøсŠøŠ¼Š¾ŃŃ‚Šø +swift.install = Š”Š¾Š±Š°Š²ŠµŃ‚Šµ ŠæŠ°ŠŗŠµŃ‚Š° Š²ŃŠŠ² Š²Š°ŃˆŠøя фŠ°Š¹Š» Package.swift: +settings.link.error = ŠŠµŃƒŃŠæŠµŃˆŠ½Š¾ Š¾Š±Š½Š¾Š²ŃŠ²Š°Š½Šµ Š½Š° Š²Ń€ŃŠŠ·ŠŗŠ°Ń‚Š° Š½Š° хрŠ°Š½ŠøŠ»ŠøщŠµŃ‚Š¾. +swift.install2 = Šø ŠøŠ·ŠæъŠ»Š½ŠµŃ‚Šµ сŠ»ŠµŠ“Š½Š°Ń‚Š° ŠŗŠ¾Š¼Š°Š½Š“Š°: +rpm.repository.multiple_groups = Š¢Š¾Š·Šø ŠæŠ°ŠŗŠµŃ‚ Šµ Š½Š°Š»ŠøчŠµŠ½ Š² Š½ŃŠŗŠ¾Š»ŠŗŠ¾ Š³Ń€ŃƒŠæŠø. +conda.registry = ŠŠ°ŃŃ‚Ń€Š¾Š¹Ń‚Šµ тŠ¾Š·Šø рŠµŠ³Šøстър ŠŗŠ°Ń‚Š¾ Conda хрŠ°Š½ŠøŠ»ŠøщŠµ Š²ŃŠŠ² Š²Š°ŃˆŠøя фŠ°Š¹Š» .condarc: +conda.install = Š—Š° Š“Š° ŠøŠ½ŃŃ‚Š°Š»ŠøрŠ°Ń‚Šµ ŠæŠ°ŠŗŠµŃ‚Š° с Conda, ŠøŠ·ŠæъŠ»Š½ŠµŃ‚Šµ сŠ»ŠµŠ“Š½Š°Ń‚Š° ŠŗŠ¾Š¼Š°Š½Š“Š°: +owner.settings.cargo.rebuild.error = ŠŠµŃƒŃŠæŠµŃˆŠ½Š¾ ŠæрŠµŠøŠ·Š³Ń€Š°Š¶Š“Š°Š½Šµ Š½Š° ŠøŠ½Š“ŠµŠŗсŠ° Š½Š° Cargo: %v +owner.settings.cargo.rebuild = ŠŸŃ€ŠµŠøŠ·Š³Ń€Š°Š¶Š“Š°Š½Šµ Š½Š° ŠøŠ½Š“ŠµŠŗс +settings.link.button = ŠžŠ±Š½Š¾Š²ŃŠ²Š°Š½Šµ Š½Š° Š²Ń€ŃŠŠ·ŠŗŠ°Ń‚Š° Š½Š° хрŠ°Š½ŠøŠ»ŠøщŠµŃ‚Š¾ +settings.link.select = Š˜Š·Š±ŠµŃ€ŠµŃ‚Šµ хрŠ°Š½ŠøŠ»ŠøщŠµ +debian.repository.architectures = ŠŃ€Ń…ŠøтŠµŠŗтурŠø +rpm.registry = ŠŠ°ŃŃ‚Ń€Š¾Š¹Ń‚Šµ тŠ¾Š·Šø рŠµŠ³Šøстър Š¾Ń‚ ŠŗŠ¾Š¼Š°Š½Š“Š½Šøя рŠµŠ“: +debian.registry = ŠŠ°ŃŃ‚Ń€Š¾Š¹Ń‚Šµ тŠ¾Š·Šø рŠµŠ³Šøстър Š¾Ń‚ ŠŗŠ¾Š¼Š°Š½Š“Š½Šøя рŠµŠ“: +helm.install = Š—Š° Š“Š° ŠøŠ½ŃŃ‚Š°Š»ŠøрŠ°Ń‚Šµ ŠæŠ°ŠŗŠµŃ‚Š°, ŠøŠ·ŠæъŠ»Š½ŠµŃ‚Šµ сŠ»ŠµŠ“Š½Š°Ń‚Š° ŠŗŠ¾Š¼Š°Š½Š“Š°: +swift.registry = ŠŠ°ŃŃ‚Ń€Š¾Š¹Ń‚Šµ тŠ¾Š·Šø рŠµŠ³Šøстър Š¾Ń‚ ŠŗŠ¾Š¼Š°Š½Š“Š½Šøя рŠµŠ“: +settings.link = Š”Š²ŃŠŃ€Š·Š²Š°Š½Šµ Š½Š° тŠ¾Š·Šø ŠæŠ°ŠŗŠµŃ‚ с хрŠ°Š½ŠøŠ»ŠøщŠµ +settings.link.description = ŠŠŗŠ¾ сŠ²ŃŠŃ€Š¶ŠµŃ‚Šµ ŠæŠ°ŠŗŠµŃ‚ с хрŠ°Š½ŠøŠ»ŠøщŠµ, ŠæŠ°ŠŗŠµŃ‚ŃŠŃ‚ сŠµ ŠøŠ·Š±Ń€Š¾ŃŠ²Š° Š² сŠæŠøсъŠŗŠ° с ŠæŠ°ŠŗŠµŃ‚Šø Š½Š° хрŠ°Š½ŠøŠ»ŠøщŠµŃ‚Š¾. +settings.link.success = Š’ръŠ·ŠŗŠ°Ń‚Š° Š½Š° хрŠ°Š½ŠøŠ»ŠøщŠµŃ‚Š¾ Š±ŠµŃˆŠµ усŠæŠµŃˆŠ½Š¾ Š¾Š±Š½Š¾Š²ŠµŠ½Š°. +owner.settings.cleanuprules.pattern_full_match = ŠŸŃ€ŠøŠ»Š°Š³Š°Š½Šµ Š½Š° шŠ°Š±Š»Š¾Š½Š° ŠŗъŠ¼ ŠæъŠ»Š½Š¾Ń‚Š¾ ŠøŠ¼Šµ Š½Š° ŠæŠ°ŠŗŠµŃ‚Š° +owner.settings.cleanuprules.keep.title = Š’ŠµŃ€ŃŠøŠøтŠµ, ŠŗŠ¾ŠøтŠ¾ съŠ¾Ń‚Š²ŠµŃ‚стŠ²Š°Ń‚ Š½Š° тŠµŠ·Šø ŠæрŠ°Š²ŠøŠ»Š°, сŠµ Š·Š°ŠæŠ°Š·Š²Š°Ń‚, Š“Š¾Ń€Šø Š°ŠŗŠ¾ съŠ¾Ń‚Š²ŠµŃ‚стŠ²Š°Ń‚ Š½Š° ŠæрŠ°Š²ŠøŠ»Š¾ Š·Š° ŠæрŠµŠ¼Š°Ń…Š²Š°Š½Šµ ŠæŠ¾-Š“Š¾Š»Ńƒ. +debian.repository = Š˜Š½Ń„Š¾Ń€Š¼Š°Ń†Šøя Š·Š° хрŠ°Š½ŠøŠ»ŠøщŠµŃ‚Š¾ +maven.install = Š—Š° Š“Š° ŠøŠ·ŠæŠ¾Š»Š·Š²Š°Ń‚Šµ ŠæŠ°ŠŗŠµŃ‚Š°, Š²ŠŗŠ»ŃŽŃ‡ŠµŃ‚Šµ сŠ»ŠµŠ“Š½Š¾Ń‚Š¾ Š² Š±Š»Š¾ŠŗŠ° dependencies Š²ŃŠŠ² фŠ°Š¹Š»Š° pom.xml: +nuget.install = Š—Š° Š“Š° ŠøŠ½ŃŃ‚Š°Š»ŠøрŠ°Ń‚Šµ ŠæŠ°ŠŗŠµŃ‚Š° с NuGet, ŠøŠ·ŠæъŠ»Š½ŠµŃ‚Šµ сŠ»ŠµŠ“Š½Š°Ń‚Š° ŠŗŠ¾Š¼Š°Š½Š“Š°: +alt.install = Š˜Š½ŃŃ‚Š°Š»ŠøрŠ°Š½Šµ Š½Š° ŠæŠ°ŠŗŠµŃ‚ +owner.settings.cleanuprules.edit = Š ŠµŠ“Š°ŠŗтŠøрŠ°Š½Šµ Š½Š° ŠæрŠ°Š²ŠøŠ»Š¾Ń‚Š¾ Š·Š° ŠæŠ¾Ń‡ŠøстŠ²Š°Š½Šµ +rpm.install = Š—Š° Š“Š° ŠøŠ½ŃŃ‚Š°Š»ŠøрŠ°Ń‚Šµ ŠæŠ°ŠŗŠµŃ‚Š°, ŠøŠ·ŠæъŠ»Š½ŠµŃ‚Šµ сŠ»ŠµŠ“Š½Š°Ń‚Š° ŠŗŠ¾Š¼Š°Š½Š“Š°: +pypi.install = Š—Š° Š“Š° ŠøŠ½ŃŃ‚Š°Š»ŠøрŠ°Ń‚Šµ ŠæŠ°ŠŗŠµŃ‚Š° с pip, ŠøŠ·ŠæъŠ»Š½ŠµŃ‚Šµ сŠ»ŠµŠ“Š½Š°Ń‚Š° ŠŗŠ¾Š¼Š°Š½Š“Š°: +arch.version.makedepends = Š—Š°Š²ŠøсŠøŠ¼Š¾ŃŃ‚Šø Š·Š° ŠøŠ·Š³Ń€Š°Š¶Š“Š°Š½ŠµŃ‚Š¾ +alpine.install = Š—Š° Š“Š° ŠøŠ½ŃŃ‚Š°Š»ŠøрŠ°Ń‚Šµ ŠæŠ°ŠŗŠµŃ‚Š°, ŠøŠ·ŠæъŠ»Š½ŠµŃ‚Šµ сŠ»ŠµŠ“Š½Š°Ń‚Š° ŠŗŠ¾Š¼Š°Š½Š“Š°: +desc = Š£ŠæрŠ°Š²Š»ŠµŠ½ŠøŠµ Š½Š° ŠæŠ°ŠŗŠµŃ‚ŠøтŠµ Š½Š° хрŠ°Š½ŠøŠ»ŠøщŠµŃ‚Š¾. +owner.settings.cargo.rebuild.no_index = ŠŠµ Š¼Š¾Š¶Šµ Š“Š° сŠµ ŠæрŠµŠøŠ·Š³Ń€Š°Š“Šø, Š½ŃŠ¼Š° ŠøŠ½ŠøцŠøŠ°Š»ŠøŠ·ŠøрŠ°Š½ ŠøŠ½Š“ŠµŠŗс. +owner.settings.cargo.rebuild.description = ŠŸŃ€ŠµŠøŠ·Š³Ń€Š°Š¶Š“Š°Š½ŠµŃ‚Š¾ Š¼Š¾Š¶Šµ Š“Š° Š±ŃŠŠ“Šµ ŠæŠ¾Š»ŠµŠ·Š½Š¾, Š°ŠŗŠ¾ ŠøŠ½Š“ŠµŠŗсът Š½Šµ Šµ сŠøŠ½Ń…Ń€Š¾Š½ŠøŠ·ŠøрŠ°Š½ със съхрŠ°Š½ŠµŠ½ŠøтŠµ Cargo ŠæŠ°ŠŗŠµŃ‚Šø. +owner.settings.cargo.initialize.description = ŠŠµŠ¾Š±Ń…Š¾Š“ŠøŠ¼Š¾ Šµ сŠæŠµŃ†ŠøŠ°Š»Š½Š¾ Git хрŠ°Š½ŠøŠ»ŠøщŠµ Š·Š° ŠøŠ½Š“ŠµŠŗс, Š·Š° Š“Š° сŠµ ŠøŠ·ŠæŠ¾Š»Š·Š²Š° рŠµŠ³Šøстърът Š½Š° Cargo. Š˜Š·ŠæŠ¾Š»Š·Š²Š°Š½ŠµŃ‚Š¾ Š½Š° тŠ°Š·Šø Š¾ŠæцŠøя щŠµ (ŠæрŠµ)съŠ·Š“Š°Š“Šµ хрŠ°Š½ŠøŠ»ŠøщŠµŃ‚Š¾ Šø щŠµ Š³Š¾ ŠŗŠ¾Š½Ń„ŠøŠ³ŃƒŃ€ŠøрŠ° Š°Š²Ń‚Š¾Š¼Š°Ń‚ŠøчŠ½Š¾. +pypi.requires = Š˜Š·ŠøсŠŗŠ²Š° Python +debian.registry.info = Š˜Š·Š±ŠµŃ€ŠµŃ‚Šµ $distribution Šø $component Š¾Ń‚ сŠæŠøсъŠŗŠ° ŠæŠ¾-Š“Š¾Š»Ńƒ. +alpine.registry = ŠŠ°ŃŃ‚Ń€Š¾Š¹Ń‚Šµ тŠ¾Š·Šø рŠµŠ³Šøстър, ŠŗŠ°Ń‚Š¾ Š“Š¾Š±Š°Š²ŠøтŠµ URL Š°Š“рŠµŃŠ° Š²ŃŠŠ² Š²Š°ŃˆŠøя фŠ°Š¹Š» /etc/apk/repositories: +owner.settings.cargo.initialize.success = Š˜Š½Š“ŠµŠŗсът Š½Š° Cargo Š±ŠµŃˆŠµ усŠæŠµŃˆŠ½Š¾ съŠ·Š“Š°Š“ŠµŠ½. +npm.registry = ŠŠ°ŃŃ‚Ń€Š¾Š¹Ń‚Šµ тŠ¾Š·Šø рŠµŠ³Šøстър Š²ŃŠŠ² фŠ°Š¹Š»Š° Š½Š° Š²Š°ŃˆŠøя ŠæрŠ¾ŠµŠŗт .npmrc: +owner.settings.chef.keypair = Š“ŠµŠ½ŠµŃ€ŠøрŠ°Š½Šµ Š½Š° Š“Š²Š¾Š¹ŠŗŠ° ŠŗŠ»ŃŽŃ‡Š¾Š²Šµ +owner.settings.chef.keypair.description = Š—Š°ŃŠ²ŠŗŠøтŠµ, ŠøŠ·ŠæрŠ°Ń‚ŠµŠ½Šø Š“Š¾ рŠµŠ³ŠøстърŠ° Š½Š° Chef, тряŠ±Š²Š° Š“Š° Š±ŃŠŠ“Š°Ń‚ ŠŗрŠøŠæтŠ¾Š³Ń€Š°Ń„сŠŗŠø ŠæŠ¾Š“ŠæŠøсŠ°Š½Šø ŠŗŠ°Ń‚Š¾ срŠµŠ“стŠ²Š¾ Š·Š° уŠ“Š¾ŃŃ‚Š¾Š²ŠµŃ€ŃŠ²Š°Š½Šµ. ŠŸŃ€Šø Š³ŠµŠ½ŠµŃ€ŠøрŠ°Š½Šµ Š½Š° Š“Š²Š¾Š¹ŠŗŠ° ŠŗŠ»ŃŽŃ‡Š¾Š²Šµ, сŠ°Š¼Š¾ ŠæуŠ±Š»ŠøчŠ½Šøят ŠŗŠ»ŃŽŃ‡ сŠµ съхрŠ°Š½ŃŠ²Š° Š²ŃŠŠ² Forgejo. Š§Š°ŃŃ‚Š½Šøят ŠŗŠ»ŃŽŃ‡ Š²Šø сŠµ ŠæрŠµŠ“Š¾ŃŃ‚Š°Š²Ń, Š·Š° Š“Š° сŠµ ŠøŠ·ŠæŠ¾Š»Š·Š²Š° с knife. Š“ŠµŠ½ŠµŃ€ŠøрŠ°Š½ŠµŃ‚Š¾ Š½Š° Š½Š¾Š²Š° Š“Š²Š¾Š¹ŠŗŠ° ŠŗŠ»ŃŽŃ‡Š¾Š²Šµ щŠµ ŠæрŠµŠ·Š°ŠæŠøшŠµ ŠæрŠµŠ“ŠøшŠ½Š°Ń‚Š°. +owner.settings.cleanuprules.remove.title = Š’ŠµŃ€ŃŠøŠøтŠµ, ŠŗŠ¾ŠøтŠ¾ съŠ¾Ń‚Š²ŠµŃ‚стŠ²Š°Ń‚ Š½Š° тŠµŠ·Šø ŠæрŠ°Š²ŠøŠ»Š°, сŠµ ŠæрŠµŠ¼Š°Ń…Š²Š°Ń‚, Š¾ŃŠ²ŠµŠ½ Š°ŠŗŠ¾ ŠæрŠ°Š²ŠøŠ»Š¾ ŠæŠ¾-Š³Š¾Ń€Šµ Š½Šµ ŠŗŠ°Š·Š²Š° Š“Š° сŠµ Š·Š°ŠæŠ°Š·ŃŃ‚. +nuget.registry = ŠŠ°ŃŃ‚Ń€Š¾Š¹Ń‚Šµ тŠ¾Š·Šø рŠµŠ³Šøстър Š¾Ń‚ ŠŗŠ¾Š¼Š°Š½Š“Š½Šøя рŠµŠ“: +owner.settings.cleanuprules.success.update = ŠŸŃ€Š°Š²ŠøŠ»Š¾Ń‚Š¾ Š·Š° ŠæŠ¾Ń‡ŠøстŠ²Š°Š½Šµ Šµ Š¾Š±Š½Š¾Š²ŠµŠ½Š¾. +settings.delete.notice = ŠŠ° Šæът стŠµ Š“Š° ŠøŠ·Ń‚Ń€ŠøŠµŃ‚Šµ %s (%s). Š¢Š°Š·Šø Š¾ŠæŠµŃ€Š°Ń†Šøя Šµ Š½ŠµŠ¾Š±Ń€Š°Ń‚ŠøŠ¼Š°, сŠøŠ³ŃƒŃ€Š½Šø Š»Šø стŠµ? +npm.install2 = ŠøŠ»Šø Š³Š¾ Š“Š¾Š±Š°Š²ŠµŃ‚Šµ Š²ŃŠŠ² фŠ°Š¹Š»Š° package.json: +owner.settings.cleanuprules.success.delete = ŠŸŃ€Š°Š²ŠøŠ»Š¾Ń‚Š¾ Š·Š° ŠæŠ¾Ń‡ŠøстŠ²Š°Š½Šµ Šµ ŠøŠ·Ń‚Ń€ŠøтŠ¾. +vagrant.install = Š—Š° Š“Š° Š“Š¾Š±Š°Š²ŠøтŠµ Vagrant box, ŠøŠ·ŠæъŠ»Š½ŠµŃ‚Šµ сŠ»ŠµŠ“Š½Š°Ń‚Š° ŠŗŠ¾Š¼Š°Š½Š“Š°: +nuget.dependency.framework = Š¦ŠµŠ»ŠµŠ²Š° ŠæŠ»Š°Ń‚Ń„Š¾Ń€Š¼Š° +maven.install2 = Š˜Š·ŠæъŠ»Š½ŠµŃ‚Šµ ŠæрŠµŠ· ŠŗŠ¾Š¼Š°Š½Š“Š½Šøя рŠµŠ“: +maven.download = Š—Š° Š“Š° ŠøŠ·Ń‚ŠµŠ³Š»ŠøтŠµ Š·Š°Š²ŠøсŠøŠ¼Š¾ŃŃ‚Ń‚Š°, ŠøŠ·ŠæъŠ»Š½ŠµŃ‚Šµ ŠæрŠµŠ· ŠŗŠ¾Š¼Š°Š½Š“Š½Šøя рŠµŠ“: +container.layers = Š”Š»Š¾ŠµŠ²Šµ Š½Š° Š¾Š±Ń€Š°Š·Š° +conan.install = Š—Š° Š“Š° ŠøŠ½ŃŃ‚Š°Š»ŠøрŠ°Ń‚Šµ ŠæŠ°ŠŗŠµŃ‚Š° с Conan, ŠøŠ·ŠæъŠ»Š½ŠµŃ‚Šµ сŠ»ŠµŠ“Š½Š°Ń‚Š° ŠŗŠ¾Š¼Š°Š½Š“Š°: +composer.registry = ŠŠ°ŃŃ‚Ń€Š¾Š¹Ń‚Šµ тŠ¾Š·Šø рŠµŠ³Šøстър Š²ŃŠŠ² Š²Š°ŃˆŠøя фŠ°Š¹Š» ~/.composer/config.json: [tool] hours = %d чŠ°ŃŠ° @@ -940,9 +1060,9 @@ editor.no_changes_to_show = ŠŃŠ¼Š° ŠæрŠ¾Š¼ŠµŠ½Šø Š·Š° ŠæŠ¾ŠŗŠ°Š·Š²Š°Š½Šµ. issues.choose.get_started = ŠŸŃŠŃ€Š²Šø стъŠæŠŗŠø issues.change_milestone_at = `ŠæрŠ¾Š¼ŠµŠ½Šø ŠµŃ‚Š°ŠæŠ° Š¾Ń‚ %s Š½Š° %s %s` issues.change_project_at = `ŠæрŠ¾Š¼ŠµŠ½Šø ŠæрŠ¾ŠµŠŗтŠ° Š¾Ń‚ %s Š½Š° %s %s` -issues.self_assign_at = `сŠø сŠ°Š¼Š¾-Š²ŃŠŠ·Š»Š¾Š¶Šø тŠ¾Š²Š° %s` +issues.self_assign_at = `сŠø сŠ°Š¼Š¾Š²ŃŠŠ·Š»Š¾Š¶Šø тŠ¾Š²Š° %s` issues.remove_assignee_at = `Šµ ŠæрŠµŠ¼Š°Ń…Š½Š°Ń‚ ŠŗŠ°Ń‚Š¾ ŠøŠ·ŠæъŠ»Š½ŠøтŠµŠ» Š¾Ń‚ %s %s` -issues.remove_self_assignment = `сŠµ сŠ°Š¼Š¾-ŠæрŠµŠ¼Š°Ń…Š½Š° ŠŗŠ°Ń‚Š¾ ŠøŠ·ŠæъŠ»Š½ŠøтŠµŠ» %s` +issues.remove_self_assignment = `сŠµ сŠ°Š¼Š¾ŠæрŠµŠ¼Š°Ń…Š½Š° ŠŗŠ°Ń‚Š¾ ŠøŠ·ŠæъŠ»Š½ŠøтŠµŠ» %s` issues.add_assignee_at = `Š¼Ńƒ Š±Šµ Š²ŃŠŠ·Š»Š¾Š¶ŠµŠ½Š¾ тŠ¾Š²Š° Š¾Ń‚ %s %s` pulls.merged_by = Š¾Ń‚ %[3]s Š±Šµ сŠ»ŃŃ‚Š° %[1]s pulls.merged_by_fake = Š¾Ń‚ %[2]s Š±Šµ сŠ»ŃŃ‚Š° %[1]s @@ -1272,7 +1392,7 @@ issues.review.show_resolved = ŠŸŠ¾ŠŗŠ°Š·Š²Š°Š½Šµ Š½Š° рŠµŃˆŠµŠ½Š¾ issues.review.hide_resolved = Š”ŠŗрŠøŠ²Š°Š½Šµ Š½Š° рŠµŃˆŠµŠ½Š¾ issues.review.resolve_conversation = Š ŠµŃˆŠ°Š²Š°Š½Šµ Š½Š° Š¾Š±ŃŃŠŠ¶Š“Š°Š½ŠµŃ‚Š¾ diff.comment.markdown_info = ŠŸŠ¾Š“Š“ърŠ¶Š° сŠµ стŠøŠ»ŠøŠ·ŠøрŠ°Š½Šµ с ŠœŠ°Ń€ŠŗŠ“Š°ŃƒŠ½. -diff.file_suppressed = Š Š°Š·Š»ŠøŠŗŠøтŠµ Š½Šµ сŠ° ŠæŠ¾ŠŗŠ°Š·Š°Š½Šø, Š·Š°Ń‰Š¾Ń‚Š¾ сŠ° тŠ²ŃŠŃ€Š“Šµ Š¼Š½Š¾Š³Š¾ +diff.file_suppressed = Š Š°Š·Š»ŠøŠŗŠøтŠµ Š²ŃŠŠ² фŠ°Š¹Š»Š° сŠ° ŠæŠ¾Ń‚ŠøсŠ½Š°Ń‚Šø, Š·Š°Ń‰Š¾Ń‚Š¾ сŠ° тŠ²ŃŠŃ€Š“Šµ Š¼Š½Š¾Š³Š¾ pulls.reject_count_n = %d ŠæŠ¾ŠøсŠŗŠ°Š½Šø ŠæрŠ¾Š¼ŠµŠ½Šø settings.pulls.default_allow_edits_from_maintainers = ŠŸŠ¾Š·Š²Š¾Š»ŃŠ²Š°Š½Šµ Š½Š° рŠµŠ“Š°ŠŗцŠøŠø Š¾Ń‚ ŠæŠ¾Š“Š“ърŠ¶Š°Ń‰ŠøтŠµ ŠæŠ¾ ŠæŠ¾Š“рŠ°Š·Š±ŠøрŠ°Š½Šµ fork_branch = ŠšŠ»Š¾Š½ Š·Š° ŠŗŠ»Š¾Š½ŠøрŠ°Š½Šµ Š² рŠ°Š·ŠŗŠ»Š¾Š½ŠµŠ½ŠøŠµŃ‚Š¾ @@ -1347,7 +1467,7 @@ settings.default_branch_desc = Š˜Š·Š±ŠµŃ€ŠµŃ‚Šµ стŠ°Š½Š“Š°Ń€Ń‚ŠµŠ½ ŠŗŠ»Š¾Š½ Š· settings.transfer.button = ŠŸŃ€ŠµŃ…Š²ŃŠŃ€Š»ŃŠ½Šµ Š½Š° ŠæрŠøтŠµŠ¶Š°Š½ŠøŠµŃ‚Š¾ settings.transfer.modal.title = ŠŸŃ€ŠµŃ…Š²ŃŠŃ€Š»ŃŠ½Šµ Š½Š° ŠæрŠøтŠµŠ¶Š°Š½ŠøŠµŃ‚Š¾ ambiguous_runes_line = `Š¢Š¾Š·Šø рŠµŠ“ съŠ“ърŠ¶Š° Š“Š²ŃƒŃŠ¼ŠøсŠ»ŠµŠ½Šø Š£Š½ŠøŠŗŠ¾Š“ Š·Š½Š°Ń†Šø` -ambiguous_character = `%[1]c [U+%04[1]X] Š¼Š¾Š¶Šµ Š“Š° Š±ŃŠŠ“Šµ Š¾Š±ŃŠŃ€ŠŗŠ°Š½ с %[2]c [U+%04[2]X]` +ambiguous_character = `%[1]c [U+%04[1]X] Š¼Š¾Š¶Šµ Š“Š° Š±ŃŠŠ“Šµ Š¾Š±ŃŠŃ€ŠŗŠ°Š½ със %[2]c [U+%04[2]X]` invisible_runes_header = `Š¢Š¾Š·Šø фŠ°Š¹Š» съŠ“ърŠ¶Š° Š½ŠµŠ²ŠøŠ“ŠøŠ¼Šø Š£Š½ŠøŠŗŠ¾Š“ Š·Š½Š°Ń†Šø` issues.all_title = ŠžŠ±Ń‰Š¾ issues.new.assign_to_me = Š’ŃŠŠ·Š»Š°Š³Š°Š½Šµ Š½Š° Š¼ŠµŠ½ @@ -1446,7 +1566,7 @@ generated_from = Š³ŠµŠ½ŠµŃ€ŠøрŠ°Š½Š¾ Š¾Ń‚ clear_ref = `Š˜Š·Ń‡ŠøстŠ²Š°Š½Šµ Š½Š° тŠµŠŗущŠ°Ń‚Š° ŠæрŠµŠæрŠ°Ń‚ŠŗŠ°` file_follow = ŠŸŠ¾ŃŠ»ŠµŠ“Š²Š°Š½Šµ Š½Š° сŠøŠ¼Š²Š¾Š»Š½Š°Ń‚Š° Š²Ń€ŃŠŠ·ŠŗŠ° commitstatus.failure = ŠŠµŃƒŃŠæŠµŃ… -issues.filter_label_exclude = `Š˜Š·ŠæŠ¾Š»Š·Š²Š°Š¹Ń‚Šµ alt + click/enter, Š·Š° Š“Š° ŠøŠ·ŠŗŠ»ŃŽŃ‡ŠøтŠµ ŠµŃ‚ŠøŠŗŠµŃ‚Šø` +issues.filter_label_exclude = Š˜Š·ŠæŠ¾Š»Š·Š²Š°Š¹Ń‚Šµ Alt + Click, Š·Š° Š“Š° ŠøŠ·ŠŗŠ»ŃŽŃ‡ŠøтŠµ ŠµŃ‚ŠøŠŗŠµŃ‚Šø migrate.migrating_failed = ŠœŠøŠ³Ń€ŠøрŠ°Š½ŠµŃ‚Š¾ Š¾Ń‚ %s Šµ Š½ŠµŃƒŃŠæŠµŃˆŠ½Š¾. migrate.migrating_issues = ŠœŠøŠ³Ń€ŠøрŠ°Š½Šµ Š½Š° Š·Š°Š“Š°Ń‡Šø mirror_from = Š¾Š³Š»ŠµŠ“Š°Š»Š½Š¾ Š½Š° @@ -1575,6 +1695,177 @@ migrate.migrating_failed_no_addr = ŠœŠøŠ³Ń€ŠøрŠ°Š½ŠµŃ‚Š¾ Šµ Š½ŠµŃƒŃŠæŠµŃˆŠ½Š¾. issues.force_push_compare = Š”рŠ°Š²Š½ŃŠ²Š°Š½Šµ pulls.status_checking = ŠŃŠŗŠ¾Šø ŠæрŠ¾Š²ŠµŃ€ŠŗŠø сŠ° Š² Š¾Ń‡Š°ŠŗŠ²Š°Š½Šµ pulls.nothing_to_compare = Š¢ŠµŠ·Šø ŠŗŠ»Š¾Š½Š¾Š²Šµ сŠ° рŠ°Š²Š½Šø. ŠŠµ Šµ Š½ŃƒŠ¶Š½Š¾ Š“Š° съŠ·Š“Š°Š²Š°Ń‚Šµ Š·Š°ŃŠ²ŠŗŠ° Š·Š° сŠ»ŠøŠ²Š°Š½Šµ. +admin.flags_replaced = Š¤Š»Š°Š³Š¾Š²ŠµŃ‚Šµ Š½Š° хрŠ°Š½ŠøŠ»ŠøщŠµŃ‚Š¾ сŠ° Š·Š°Š¼ŠµŠ½ŠµŠ½Šø +editor.cannot_edit_lfs_files = LFS фŠ°Š¹Š»Š¾Š²Šµ Š½Šµ Š¼Š¾Š³Š°Ń‚ Š“Š° сŠµ рŠµŠ“Š°ŠŗтŠøрŠ°Ń‚ Š² уŠµŠ± ŠøŠ½Ń‚ŠµŃ€Ń„ŠµŠ¹ŃŠ°. +commits.ssh_key_fingerprint = ŠžŃ‚ŠæŠµŃ‡Š°Ń‚ŃŠŠŗ Š½Š° SSH ŠŗŠ»ŃŽŃ‡ +issues.comment_on_locked = ŠŠµ Š¼Š¾Š¶ŠµŃ‚Šµ Š“Š° ŠŗŠ¾Š¼ŠµŠ½Ń‚ŠøрŠ°Ń‚Šµ Š·Š°ŠŗŠ»ŃŽŃ‡ŠµŠ½Š° Š·Š°Š“Š°Ń‡Š°. +commit.revert = Š’ръщŠ°Š½Šµ +migrate.cancel_migrating_title = ŠžŃ‚ŠŗŠ°Š· Š¾Ń‚ Š¼ŠøŠ³Ń€Š°Ń†ŠøятŠ° +migrate.cancel_migrating_confirm = Š˜ŃŠŗŠ°Ń‚Šµ Š»Šø Š“Š° Š¾Ń‚ŠŗŠ°Š¶ŠµŃ‚Šµ тŠ°Š·Šø Š¼ŠøŠ³Ń€Š°Ń†Šøя? +issues.choose.invalid_config = ŠšŠ¾Š½Ń„ŠøŠ³ŃƒŃ€Š°Ń†ŠøятŠ° Š½Š° Š·Š°Š“Š°Ń‡ŠøтŠµ съŠ“ърŠ¶Š° Š³Ń€ŠµŃˆŠŗŠø: +unit_disabled = ŠŠ“Š¼ŠøŠ½ŠøстрŠ°Ń‚Š¾Ń€ŃŠŃ‚ Š½Š° сŠ°Š¹Ń‚Š° Šµ ŠøŠ·ŠŗŠ»ŃŽŃ‡ŠøŠ» тŠ°Š·Šø сŠµŠŗцŠøя Š½Š° хрŠ°Š½ŠøŠ»ŠøщŠµŃ‚Š¾. +issues.blocked_by_user = ŠŠµ Š¼Š¾Š¶ŠµŃ‚Šµ Š“Š° съŠ·Š“Š°Š²Š°Ń‚Šµ Š·Š°Š“Š°Ń‡Šø Š² тŠ¾Š²Š° хрŠ°Š½ŠøŠ»ŠøщŠµ, Š·Š°Ń‰Š¾Ń‚Š¾ стŠµ Š±Š»Š¾ŠŗŠøрŠ°Š½Šø Š¾Ń‚ ŠæрŠøтŠµŠ¶Š°Ń‚ŠµŠ»Ń Š½Š° хрŠ°Š½ŠøŠ»ŠøщŠµŃ‚Š¾. +commits.signed_by = ŠŸŠ¾Š“ŠæŠøсŠ°Š½Š¾ Š¾Ń‚ +commits.signed_by_untrusted_user = ŠŸŠ¾Š“ŠæŠøсŠ°Š½Š¾ Š¾Ń‚ Š½ŠµŠ“Š¾Š²ŠµŃ€ŠµŠ½ ŠæŠ¾Ń‚Ń€ŠµŠ±ŠøтŠµŠ» +commits.signed_by_untrusted_user_unmatched = ŠŸŠ¾Š“ŠæŠøсŠ°Š½Š¾ Š¾Ń‚ Š½ŠµŠ“Š¾Š²ŠµŃ€ŠµŠ½ ŠæŠ¾Ń‚Ń€ŠµŠ±ŠøтŠµŠ», ŠŗŠ¾Š¹Ń‚Š¾ Š½Šµ съŠ²ŠæŠ°Š“Š° с ŠæŠ¾Š“Š°Š²Š°Ń‰Šøя +issues.lock.notice_1 = - Š”Ń€ŃƒŠ³Šø ŠæŠ¾Ń‚Ń€ŠµŠ±ŠøтŠµŠ»Šø Š½Šµ Š¼Š¾Š³Š°Ń‚ Š“Š° Š“Š¾Š±Š°Š²ŃŃ‚ Š½Š¾Š²Šø ŠŗŠ¾Š¼ŠµŠ½Ń‚Š°Ń€Šø ŠŗъŠ¼ тŠ°Š·Šø Š·Š°Š“Š°Ń‡Š°. +issues.unlock.notice_2 = - Š’ŠøŠ½Š°Š³Šø Š¼Š¾Š¶ŠµŃ‚Šµ Š“Š° Š·Š°ŠŗŠ»ŃŽŃ‡ŠøтŠµ тŠ°Š·Šø Š·Š°Š“Š°Ń‡Š° Š¾Ń‚Š½Š¾Š²Š¾ Š² Š±ŃŠŠ“ŠµŃ‰Šµ. +issues.unlock.title = ŠžŃ‚ŠŗŠ»ŃŽŃ‡Š²Š°Š½Šµ Š½Š° Š¾Š±ŃŃŠŠ¶Š“Š°Š½ŠµŃ‚Š¾ ŠæŠ¾ тŠ°Š·Šø Š·Š°Š“Š°Ń‡Š°. +issues.dependency.no_permission_1 = ŠŃŠ¼Š°Ń‚Šµ рŠ°Š·Ń€ŠµŃˆŠµŠ½ŠøŠµ Š“Š° ŠæрŠ¾Ń‡ŠµŃ‚ŠµŃ‚Šµ %d Š·Š°Š²ŠøсŠøŠ¼Š¾ŃŃ‚ +issues.reopen.blocked_by_user = ŠŠµ Š¼Š¾Š¶ŠµŃ‚Šµ Š“Š° Š¾Ń‚Š²Š¾Ń€ŠøтŠµ Š½Š°Š½Š¾Š²Š¾ тŠ°Š·Šø Š·Š°Š“Š°Ń‡Š°, Š·Š°Ń‰Š¾Ń‚Š¾ стŠµ Š±Š»Š¾ŠŗŠøрŠ°Š½Šø Š¾Ń‚ ŠæрŠøтŠµŠ¶Š°Ń‚ŠµŠ»Ń Š½Š° хрŠ°Š½ŠøŠ»ŠøщŠµŃ‚Š¾ ŠøŠ»Šø Š¾Ń‚ Š°Š²Ń‚Š¾Ń€Š° Š½Š° тŠ°Š·Šø Š·Š°Š“Š°Ń‡Š°. +compare.compare_base = Š¾ŃŠ½Š¾Š²Š° +compare.compare_head = срŠ°Š²Š½ŃŠ²Š°Š½Šµ +template.one_item = Š¢Ń€ŃŠ±Š²Š° Š“Š° ŠøŠ·Š±ŠµŃ€ŠµŃ‚Šµ ŠæŠ¾Š½Šµ ŠµŠ“ŠøŠ½ ŠµŠ»ŠµŠ¼ŠµŠ½Ń‚ Š¾Ń‚ шŠ°Š±Š»Š¾Š½Š° +admin.failed_to_replace_flags = ŠŠµŃƒŃŠæŠµŃˆŠ½Š° Š·Š°Š¼ŃŠ½Š° Š½Š° фŠ»Š°Š³Š¾Š²ŠµŃ‚Šµ Š½Š° хрŠ°Š½ŠøŠ»ŠøщŠµŃ‚Š¾ +mirror_interval_invalid = Š˜Š½Ń‚ŠµŃ€Š²Š°Š»ŃŠŃ‚ Š½Š° Š¾Š³Š»ŠµŠ“Š°Š»Š¾Ń‚Š¾ Š½Šµ Šµ Š²Š°Š»ŠøŠ“ŠµŠ½. +mirror_use_ssh.not_available = SSH уŠ“Š¾ŃŃ‚Š¾Š²ŠµŃ€ŃŠ²Š°Š½ŠµŃ‚Š¾ Š½Šµ Šµ Š½Š°Š»ŠøчŠ½Š¾. +mirror_address_desc = ŠŸŠ¾ŃŃ‚Š°Š²ŠµŃ‚Šµ Š²ŃŠøчŠŗŠø Š½ŠµŠ¾Š±Ń…Š¾Š“ŠøŠ¼Šø Š“Š°Š½Š½Šø Š·Š° уŠ“Š¾ŃŃ‚Š¾Š²ŠµŃ€ŃŠ²Š°Š½Šµ Š² сŠµŠŗцŠøятŠ° ā€žŠ£ŠæъŠ»Š½Š¾Š¼Š¾Ń‰Š°Š²Š°Š½Šµā€œ. +template.git_hooks = Git ŠŗуŠŗŠø +template.invalid = Š¢Ń€ŃŠ±Š²Š° Š“Š° ŠøŠ·Š±ŠµŃ€ŠµŃ‚Šµ шŠ°Š±Š»Š¾Š½Š½Š¾ хрŠ°Š½ŠøŠ»ŠøщŠµ +issues.review.outdated = ŠžŃŃ‚Š°Ń€ŃŠ» +issues.dependency.add_error_dep_issue_not_exist = Š—Š°Š²ŠøсŠøŠ¼Š°Ń‚Š° Š·Š°Š“Š°Ń‡Š° Š½Šµ същŠµŃŃ‚Š²ŃƒŠ²Š°. +template.items = Š•Š»ŠµŠ¼ŠµŠ½Ń‚Šø Š½Š° шŠ°Š±Š»Š¾Š½Š° +issues.review.dismissed = Š¾Ń‚Ń…Š²ŃŠŃ€Š»Šø рŠµŃ†ŠµŠ½Š·ŠøятŠ° Š½Š° %s %s +audio_not_supported_in_browser = Š’Š°ŃˆŠøят Š±Ń€Š°ŃƒŠ·ŃŠŃ€ Š½Šµ ŠæŠ¾Š“Š“ърŠ¶Š° HTML5 тŠ°Š³Š° ā€žaudioā€œ. +stored_lfs = Š”ъхрŠ°Š½ŠµŠ½Š¾ с Git LFS +commit_graph.select = Š˜Š·Š±ŠµŃ€ŠµŃ‚Šµ ŠŗŠ»Š¾Š½Š¾Š²Šµ +issues.content_history.options = ŠžŠæцŠøŠø +editor.commit_email = Š•Š». ŠæŠ¾Ń‰Š° Š½Š° ŠæŠ¾Š“Š°Š²Š°Š½ŠµŃ‚Š¾ +commit.revert-header = Š’ръщŠ°Š½Šµ: %s +commits.desc = Š Š°Š·Š³Š»ŠµŠ¶Š“Š°Š½Šµ Š½Š° ŠøстŠ¾Ń€ŠøятŠ° Š½Š° ŠæрŠ¾Š¼ŠµŠ½ŠøтŠµ Š² ŠæрŠ¾Š³Ń€Š°Š¼Š½Šøя ŠŗŠ¾Š“. +commits.search.tooltip = ŠœŠ¾Š¶ŠµŃ‚Šµ Š“Š° Š“Š¾Š±Š°Š²ŠøтŠµ ŠæрŠµŃ„ŠøŠŗс ŠŗъŠ¼ ŠŗŠ»ŃŽŃ‡Š¾Š²ŠøтŠµ Š“уŠ¼Šø с ā€žauthor:ā€œ, ā€žcommitter:ā€œ, ā€žafter:ā€œ ŠøŠ»Šø ā€žbefore:ā€œ, Š½Š°Šæр. ā€žrevert author:Alice before:2019-01-13ā€œ. +issues.unlock_error = ŠŠµ Š¼Š¾Š¶Šµ Š“Š° сŠµ Š¾Ń‚ŠŗŠ»ŃŽŃ‡Šø Š·Š°Š“Š°Ń‡Š°, ŠŗŠ¾ŃŃ‚Š¾ Š½Šµ Šµ Š·Š°ŠŗŠ»ŃŽŃ‡ŠµŠ½Š°. +issues.lock.unknown_reason = ŠŠµ Š¼Š¾Š¶Šµ Š“Š° сŠµ Š·Š°ŠŗŠ»ŃŽŃ‡Šø Š·Š°Š“Š°Ń‡Š° с Š½ŠµŠøŠ·Š²ŠµŃŃ‚Š½Š° ŠæрŠøчŠøŠ½Š°. +issues.cancel_tracking_history = `Š¾Ń‚Š¼ŠµŠ½Šø ŠæрŠ¾ŃŠ»ŠµŠ“яŠ²Š°Š½ŠµŃ‚Š¾ Š½Š° Š²Ń€ŠµŠ¼ŠµŃ‚Š¾ %s` +issues.dependency.add_error_dep_not_same_repo = Š˜ Š“Š²ŠµŃ‚Šµ Š·Š°Š“Š°Ń‡Šø тряŠ±Š²Š° Š“Š° сŠ° Š² ŠµŠ“Š½Š¾ Šø същŠ¾ хрŠ°Š½ŠøŠ»ŠøщŠµ. +issues.review.remove_review_requests = ŠæрŠµŠ¼Š°Ń…Š½Š° Š·Š°ŃŠ²ŠŗŠøтŠµ Š·Š° рŠµŃ†ŠµŠ½Š·Šøя Š·Š° %[1]s %[2]s +issues.review.content.empty = Š¢Ń€ŃŠ±Š²Š° Š“Š° Š¾ŃŃ‚Š°Š²ŠøтŠµ ŠŗŠ¾Š¼ŠµŠ½Ń‚Š°Ń€, ŠæŠ¾ŃŠ¾Ń‡Š²Š°Ń‰ ŠøсŠŗŠ°Š½ŠøтŠµ ŠæрŠ¾Š¼ŠµŠ½Šø. +issues.review.hide_outdated = Š”ŠŗрŠøŠ²Š°Š½Šµ Š½Š° Š¾ŃŃ‚Š°Ń€ŠµŠ»Šø +pulls.desc = Š’ŠŗŠ»ŃŽŃ‡Š²Š°Š½Šµ Š½Š° Š·Š°ŃŠ²ŠŗŠø Š·Š° сŠ»ŠøŠ²Š°Š½Šµ Šø рŠµŃ†ŠµŠ½Š·ŠøŠø Š½Š° ŠŗŠ¾Š“. +issues.review.show_outdated = ŠŸŠ¾ŠŗŠ°Š·Š²Š°Š½Šµ Š½Š° Š¾ŃŃ‚Š°Ń€ŠµŠ»Šø +ambiguous_runes_header = `Š¢Š¾Š·Šø фŠ°Š¹Š» съŠ“ърŠ¶Š° Š“Š²ŃƒŃŠ¼ŠøсŠ»ŠµŠ½Šø Š£Š½ŠøŠŗŠ¾Š“ Š·Š½Š°Ń†Šø` +admin.update_flags = ŠžŠ±Š½Š¾Š²ŃŠ²Š°Š½Šµ Š½Š° фŠ»Š°Š³Š¾Š²ŠµŃ‚Šµ +issues.dependency.blocked_by_short = Š—Š°Š²ŠøсŠø Š¾Ń‚ +mirror_lfs = Š”ъхрŠ°Š½ŠµŠ½ŠøŠµ Š½Š° Š³Š¾Š»ŠµŠ¼Šø фŠ°Š¹Š»Š¾Š²Šµ (LFS) +mirror_use_ssh.text = Š˜Š·ŠæŠ¾Š»Š·Š²Š°Š½Šµ Š½Š° SSH уŠ“Š¾ŃŃ‚Š¾Š²ŠµŃ€ŃŠ²Š°Š½Šµ +mirror_denied_combination = ŠŠµ Š¼Š¾Š¶Šµ Š“Š° сŠµ ŠøŠ·ŠæŠ¾Š»Š·Š²Š° уŠ“Š¾ŃŃ‚Š¾Š²ŠµŃ€ŃŠ²Š°Š½Šµ с ŠæуŠ±Š»ŠøчŠµŠ½ ŠŗŠ»ŃŽŃ‡ Šø ŠæŠ°Ń€Š¾Š»Š° ŠµŠ“Š½Š¾Š²Ń€ŠµŠ¼ŠµŠ½Š½Š¾. +rss.must_be_on_branch = Š¢Ń€ŃŠ±Š²Š° Š“Š° стŠµ Š½Š° ŠŗŠ»Š¾Š½, Š·Š° Š“Š° ŠøŠ¼Š°Ń‚Šµ RSS ŠµŠ¼ŠøсŠøя. +admin.manage_flags = Š£ŠæрŠ°Š²Š»ŠµŠ½ŠøŠµ Š½Š° фŠ»Š°Š³Š¾Š²ŠµŃ‚Šµ +admin.enabled_flags = Š¤Š»Š°Š³Š¾Š²Šµ, Š²ŠŗŠ»ŃŽŃ‡ŠµŠ½Šø Š·Š° хрŠ°Š½ŠøŠ»ŠøщŠµŃ‚Š¾: +mirror_password_help = ŠŸŃ€Š¾Š¼ŠµŠ½ŠµŃ‚Šµ ŠæŠ¾Ń‚Ń€ŠµŠ±ŠøтŠµŠ»ŃŠŗŠ¾Ń‚Š¾ ŠøŠ¼Šµ, Š·Š° Š“Š° ŠøŠ·Ń‚Ń€ŠøŠµŃ‚Šµ Š·Š°ŠæŠ°Š·ŠµŠ½Š° ŠæŠ°Ń€Š¾Š»Š°. +issues.review.remove_review_request = ŠæрŠµŠ¼Š°Ń…Š½Š° Š·Š°ŃŠ²ŠŗŠ°Ń‚Š° Š·Š° рŠµŃ†ŠµŠ½Š·Šøя Š·Š° %[1]s %[2]s +issues.review.outdated_description = Š”ъŠ“ърŠ¶Š°Š½ŠøŠµŃ‚Š¾ Šµ ŠæрŠ¾Š¼ŠµŠ½ŠµŠ½Š¾, сŠ»ŠµŠ“ ŠŗŠ°Ń‚Š¾ Šµ Š½Š°ŠæрŠ°Š²ŠµŠ½ тŠ¾Š·Šø ŠŗŠ¾Š¼ŠµŠ½Ń‚Š°Ń€ +issues.dependency.setting = Š’ŠŗŠ»ŃŽŃ‡Š²Š°Š½Šµ Š½Š° Š·Š°Š²ŠøсŠøŠ¼Š¾ŃŃ‚Šø Š·Š° Š·Š°Š“Š°Ń‡Šø Šø Š·Š°ŃŠ²ŠŗŠø Š·Š° сŠ»ŠøŠ²Š°Š½Šµ +issues.dependency.add_error_same_issue = ŠŠµ Š¼Š¾Š¶ŠµŃ‚Šµ Š“Š° Š½Š°ŠæрŠ°Š²ŠøтŠµ Š·Š°Š“Š°Ń‡Š° Š·Š°Š²ŠøсŠøŠ¼Š° Š¾Ń‚ сŠ°Š¼Š°Ń‚Š° Š½ŠµŃ. +issues.review.self.rejection = ŠŠµ Š¼Š¾Š¶ŠµŃ‚Šµ Š“Š° ŠæŠ¾ŠøсŠŗŠ°Ń‚Šµ ŠæрŠ¾Š¼ŠµŠ½Šø Š² сŠ¾Š±ŃŃ‚Š²ŠµŠ½Š°Ń‚Š° сŠø Š·Š°ŃŠ²ŠŗŠ° Š·Š° сŠ»ŠøŠ²Š°Š½Šµ. +issues.filter_type.all_pull_requests = Š’сŠøчŠŗŠø Š·Š°ŃŠ²ŠŗŠø Š·Š° сŠ»ŠøŠ²Š°Š½Šµ +fork_to_different_account = Š Š°Š·ŠŗŠ»Š¾Š½ŃŠ²Š°Š½Šµ Š² Š“руŠ³ Š°ŠŗŠ°ŃƒŠ½Ń‚ +mirror_sync_on_commit = Š”ŠøŠ½Ń…Ń€Š¾Š½ŠøŠ·ŠøрŠ°Š½Šµ ŠæрŠø ŠøŠ·Ń‚Š»Š°ŃŠŗŠ²Š°Š½Šµ Š½Š° ŠæŠ¾Š“Š°Š²Š°Š½Šøя +mirror_address_protocol_invalid = ŠŸŃ€ŠµŠ“Š¾ŃŃ‚Š°Š²ŠµŠ½Šøят URL Šµ Š½ŠµŠ²Š°Š»ŠøŠ“ŠµŠ½. Š”Š°Š¼Š¾ http(s):// ŠøŠ»Šø git:// Š°Š“рŠµŃŠø Š¼Š¾Š³Š°Ń‚ Š“Š° сŠµ ŠøŠ·ŠæŠ¾Š»Š·Š²Š°Ń‚ Š·Š° Š¾Š³Š»ŠµŠ“Š°Š»Š½Šø хрŠ°Š½ŠøŠ»ŠøщŠ°. +template.git_hooks_tooltip = Š’ Š¼Š¾Š¼ŠµŠ½Ń‚Š° Š½Šµ Š¼Š¾Š¶ŠµŃ‚Šµ Š“Š° ŠæрŠ¾Š¼ŠµŠ½ŃŃ‚Šµ ŠøŠ»Šø ŠæрŠµŠ¼Š°Ń…Š²Š°Ń‚Šµ Git ŠŗуŠŗŠø, сŠ»ŠµŠ“ ŠŗŠ°Ń‚Š¾ сŠ° Š“Š¾Š±Š°Š²ŠµŠ½Šø. Š˜Š·Š±ŠµŃ€ŠµŃ‚Šµ тŠ¾Š²Š° сŠ°Š¼Š¾ Š°ŠŗŠ¾ сŠµ Š“Š¾Š²ŠµŃ€ŃŠ²Š°Ń‚Šµ Š½Š° шŠ°Š±Š»Š¾Š½Š½Š¾Ń‚Š¾ хрŠ°Š½ŠøŠ»ŠøщŠµ. +editor.commit_signed_changes = ŠŸŠ¾Š“Š°Š²Š°Š½Šµ Š½Š° ŠæŠ¾Š“ŠæŠøсŠ°Š½Šø ŠæрŠ¾Š¼ŠµŠ½Šø +editor.require_signed_commit = ŠšŠ»Š¾Š½ŃŠŃ‚ ŠøŠ·ŠøсŠŗŠ²Š° ŠæŠ¾Š“ŠæŠøсŠ°Š½Š¾ ŠæŠ¾Š“Š°Š²Š°Š½Šµ +issues.desc = ŠžŃ€Š³Š°Š½ŠøŠ·ŠøрŠ°Š¹Ń‚Šµ Š“Š¾ŠŗŠ»Š°Š“Šø Š·Š° Š³Ń€ŠµŃˆŠŗŠø, Š·Š°Š“Š°Ń‡Šø Šø ŠµŃ‚Š°ŠæŠø. +issues.lock_duplicate = Š—Š°Š“Š°Ń‡Š° Š½Šµ Š¼Š¾Š¶Šµ Š“Š° Š±ŃŠŠ“Šµ Š·Š°ŠŗŠ»ŃŽŃ‡ŠµŠ½Š° Š“Š²Š° ŠæътŠø. +issues.lock.notice_2 = - Š’ŠøŠµ Šø Š“руŠ³Šø сътруŠ“Š½ŠøцŠø с Š“Š¾ŃŃ‚ŃŠŠæ Š“Š¾ тŠ¾Š²Š° хрŠ°Š½ŠøŠ»ŠøщŠµ Š²ŃŠµ Š¾Ń‰Šµ Š¼Š¾Š¶ŠµŃ‚Šµ Š“Š° Š¾ŃŃ‚Š°Š²ŃŃ‚Šµ ŠŗŠ¾Š¼ŠµŠ½Ń‚Š°Ń€Šø, ŠŗŠ¾ŠøтŠ¾ Š“руŠ³ŠøтŠµ Š“Š° Š²ŠøŠ¶Š“Š°Ń‚. +issues.due_date_invalid = ŠšŃ€Š°Š¹Š½Šøят срŠ¾Šŗ Šµ Š½ŠµŠ²Š°Š»ŠøŠ“ŠµŠ½ ŠøŠ»Šø ŠøŠ·Š²ŃŠŠ½ Š¾Š±Ń…Š²Š°Ń‚Š°. ŠœŠ¾Š»Ń, ŠøŠ·ŠæŠ¾Š»Š·Š²Š°Š¹Ń‚Šµ фŠ¾Ń€Š¼Š°Ń‚Š° ā€žŠ³Š³Š³Š³-Š¼Š¼-Š“Š“ā€œ. +mirror_interval = Š˜Š½Ń‚ŠµŃ€Š²Š°Š» Š½Š° Š¾Š³Š»ŠµŠ“Š°Š»Š¾Ń‚Š¾ (Š²Š°Š»ŠøŠ“Š½Šø ŠµŠ“ŠøŠ½ŠøцŠø Š·Š° Š²Ń€ŠµŠ¼Šµ сŠ° ā€žhā€œ, ā€žmā€œ, ā€žsā€œ). 0 Š·Š° ŠøŠ·ŠŗŠ»ŃŽŃ‡Š²Š°Š½Šµ Š½Š° ŠæŠµŃ€ŠøŠ¾Š“ŠøчŠ½Š°Ń‚Š° сŠøŠ½Ń…Ń€Š¾Š½ŠøŠ·Š°Ń†Šøя. (ŠœŠøŠ½ŠøŠ¼Š°Š»ŠµŠ½ ŠøŠ½Ń‚ŠµŃ€Š²Š°Š»: %s) +summary_card_alt = ŠšŠ°Ń€Ń‚Š° с Š¾Š±Š¾Š±Ń‰ŠµŠ½ŠøŠµ Š½Š° хрŠ°Š½ŠøŠ»ŠøщŠµ %s +file_copy_permalink = ŠšŠ¾ŠæŠøрŠ°Š½Šµ Š½Š° ŠæŠ¾ŃŃ‚Š¾ŃŠ½Š½Š° Š²Ń€ŃŠŠ·ŠŗŠ° +view_git_blame = ŠŸŃ€ŠµŠ³Š»ŠµŠ“ Š½Š° git blame +commit.revert-content = Š˜Š·Š±ŠµŃ€ŠµŃ‚Šµ ŠŗŠ»Š¾Š½, Š²ŃŠŃ€Ń…Ńƒ ŠŗŠ¾Š¹Ń‚Š¾ Š“Š° сŠµ Š²ŃŠŃ€Š½Šµ: +issues.unlock.notice_1 = - Š’сŠµŠŗŠø щŠµ Š¼Š¾Š¶Šµ Š¾Ń‚Š½Š¾Š²Š¾ Š“Š° ŠŗŠ¾Š¼ŠµŠ½Ń‚ŠøрŠ° тŠ°Š·Šø Š·Š°Š“Š°Ń‡Š°. +issues.delete.text = ŠŠ°ŠøстŠøŠ½Š° Š»Šø ŠøсŠŗŠ°Ń‚Šµ Š“Š° ŠøŠ·Ń‚Ń€ŠøŠµŃ‚Šµ тŠ°Š·Šø Š·Š°Š“Š°Ń‡Š°? (Š¢Š¾Š²Š° щŠµ ŠæрŠµŠ¼Š°Ń…Š½Šµ трŠ°Š¹Š½Š¾ цяŠ»Š¾Ń‚Š¾ съŠ“ърŠ¶Š°Š½ŠøŠµ. ŠŸŠ¾Š¼ŠøсŠ»ŠµŃ‚Šµ Š“Š°Š»Šø Š²Š¼ŠµŃŃ‚Š¾ тŠ¾Š²Š° Š“Š° Š½Šµ я Š·Š°Ń‚Š²Š¾Ń€ŠøтŠµ, Š°ŠŗŠ¾ Š²ŃŠŠ·Š½Š°Š¼ŠµŃ€ŃŠ²Š°Ń‚Šµ Š“Š° я Š·Š°ŠæŠ°Š·ŠøтŠµ Š°Ń€Ń…ŠøŠ²ŠøрŠ°Š½Š°) +issues.add_time_sum_to_small = ŠŠµ Šµ Š²ŃŠŠ²ŠµŠ“ŠµŠ½Š¾ Š²Ń€ŠµŠ¼Šµ. +issues.dependency.no_permission_n = ŠŃŠ¼Š°Ń‚Šµ рŠ°Š·Ń€ŠµŃˆŠµŠ½ŠøŠµ Š“Š° ŠæрŠ¾Ń‡ŠµŃ‚ŠµŃ‚Šµ %d Š·Š°Š²ŠøсŠøŠ¼Š¾ŃŃ‚Šø +issues.review.pending.tooltip = Š¢Š¾Š·Šø ŠŗŠ¾Š¼ŠµŠ½Ń‚Š°Ń€ Š² Š¼Š¾Š¼ŠµŠ½Ń‚Š° Š½Šµ Šµ Š²ŠøŠ“ŠøŠ¼ Š·Š° Š“руŠ³Šø ŠæŠ¾Ń‚Ń€ŠµŠ±ŠøтŠµŠ»Šø. Š—Š° Š“Š° ŠøŠ·ŠæрŠ°Ń‚ŠøтŠµ ŠøŠ·Ń‡Š°ŠŗŠ²Š°Ń‰ŠøтŠµ сŠø ŠŗŠ¾Š¼ŠµŠ½Ń‚Š°Ń€Šø, ŠøŠ·Š±ŠµŃ€ŠµŃ‚Šµ ā€ž%sā€œ -> ā€ž%s/%s/%sā€œ Š² Š³Š¾Ń€Š½Š°Ń‚Š° чŠ°ŃŃ‚ Š½Š° стрŠ°Š½ŠøцŠ°Ń‚Š°. +invisible_runes_description = `Š¢Š¾Š·Šø фŠ°Š¹Š» съŠ“ърŠ¶Š° Š½ŠµŠ²ŠøŠ“ŠøŠ¼Šø Š£Š½ŠøŠŗŠ¾Š“ Š·Š½Š°Ń†Šø, ŠŗŠ¾ŠøтŠ¾ сŠ° Š½ŠµŃ€Š°Š·Š»ŠøчŠøŠ¼Šø Š·Š° хŠ¾Ń€Š°Ń‚Š°, Š½Š¾ Š¼Š¾Š³Š°Ń‚ Š“Š° Š±ŃŠŠ“Š°Ń‚ Š¾Š±Ń€Š°Š±Š¾Ń‚ŠµŠ½Šø ŠæŠ¾ рŠ°Š·Š»ŠøчŠµŠ½ Š½Š°Ń‡ŠøŠ½ Š¾Ń‚ ŠŗŠ¾Š¼Šæютър. ŠŠŗŠ¾ сŠ¼ŃŃ‚Š°Ń‚Šµ, чŠµ тŠ¾Š²Š° Šµ уŠ¼ŠøшŠ»ŠµŠ½Š¾, Š¼Š¾Š¶ŠµŃ‚Šµ сŠæŠ¾ŠŗŠ¾Š¹Š½Š¾ Š“Š° ŠæрŠµŠ½ŠµŠ±Ń€ŠµŠ³Š½ŠµŃ‚Šµ тŠ¾Š²Š° ŠæрŠµŠ“уŠæрŠµŠ¶Š“ŠµŠ½ŠøŠµ. Š˜Š·ŠæŠ¾Š»Š·Š²Š°Š¹Ń‚Šµ Š±ŃƒŃ‚Š¾Š½Š° ā€žŠ•ŠŗрŠ°Š½ŠøрŠ°Š½Šµā€œ, Š·Š° Š“Š° Š³Šø рŠ°Š·ŠŗрŠøŠµŃ‚Šµ.` +video_not_supported_in_browser = Š’Š°ŃˆŠøят Š±Ń€Š°ŃƒŠ·ŃŠŃ€ Š½Šµ ŠæŠ¾Š“Š“ърŠ¶Š° HTML5 тŠ°Š³Š° ā€žvideoā€œ. +editor.filename_help = Š”Š¾Š±Š°Š²ŠµŃ‚Šµ Š“ŠøрŠµŠŗтŠ¾Ń€Šøя, ŠŗŠ°Ń‚Š¾ Š²ŃŠŠ²ŠµŠ“ŠµŃ‚Šµ ŠøŠ¼ŠµŃ‚Š¾ ѝ, ŠæŠ¾ŃŠ»ŠµŠ“Š²Š°Š½Š¾ Š¾Ń‚ Š½Š°ŠŗŠ»Š¾Š½ŠµŠ½Š° чŠµŃ€Ń‚Š° (ā€ž/ā€œ). ŠŸŃ€ŠµŠ¼Š°Ń…Š½ŠµŃ‚Šµ Š“ŠøрŠµŠŗтŠ¾Ń€Šøя, ŠŗŠ°Ń‚Š¾ Š½Š°Ń‚ŠøсŠ½ŠµŃ‚Šµ backspace Š² Š½Š°Ń‡Š°Š»Š¾Ń‚Š¾ Š½Š° ŠæŠ¾Š»ŠµŃ‚Š¾ Š·Š° Š²ŃŠŠ²ŠµŠ¶Š“Š°Š½Šµ. +commits.view_single_diff = ŠŸŃ€ŠµŠ³Š»ŠµŠ“ Š½Š° ŠæрŠ¾Š¼ŠµŠ½ŠøтŠµ Š² тŠ¾Š·Šø фŠ°Š¹Š», Š²ŃŠŠ²ŠµŠ“ŠµŠ½Šø Š² тŠ¾Š²Š° ŠæŠ¾Š“Š°Š²Š°Š½Šµ +issues.choose.ignore_invalid_templates = ŠŠµŠ²Š°Š»ŠøŠ“Š½ŠøтŠµ шŠ°Š±Š»Š¾Š½Šø сŠ° ŠøŠ³Š½Š¾Ń€ŠøрŠ°Š½Šø +issues.due_date_form = Š³Š³Š³Š³-Š¼Š¼-Š“Š“ +issues.dependency.no_permission.can_remove = ŠŃŠ¼Š°Ń‚Šµ рŠ°Š·Ń€ŠµŃˆŠµŠ½ŠøŠµ Š“Š° ŠæрŠ¾Ń‡ŠµŃ‚ŠµŃ‚Šµ тŠ°Š·Šø Š·Š°Š²ŠøсŠøŠ¼Š¾ŃŃ‚, Š½Š¾ Š¼Š¾Š¶ŠµŃ‚Šµ Š“Š° я ŠæрŠµŠ¼Š°Ń…Š½ŠµŃ‚Šµ +issues.review.remove_review_request_self = Š¾Ń‚ŠŗŠ°Š·Š° Š“Š° рŠµŃ†ŠµŠ½Š·ŠøрŠ° %s +mirror_use_ssh.helper = Forgejo щŠµ съŠ·Š“Š°Š“Šµ Š¾Š³Š»ŠµŠ“Š°Š»Š¾ Š½Š° хрŠ°Š½ŠøŠ»ŠøщŠµŃ‚Š¾ чрŠµŠ· Git ŠæрŠµŠ· SSH Šø щŠµ Š³ŠµŠ½ŠµŃ€ŠøрŠ° Š“Š²Š¾Š¹ŠŗŠ° ŠŗŠ»ŃŽŃ‡Š¾Š²Šµ Š·Š° Š²Š°Ń, ŠŗŠ¾Š³Š°Ń‚Š¾ ŠøŠ·Š±ŠµŃ€ŠµŃ‚Šµ тŠ°Š·Šø Š¾ŠæцŠøя. Š¢Ń€ŃŠ±Š²Š° Š“Š° сŠµ уŠ²ŠµŃ€ŠøтŠµ, чŠµ Š³ŠµŠ½ŠµŃ€ŠøрŠ°Š½Šøят ŠæуŠ±Š»ŠøчŠµŠ½ ŠŗŠ»ŃŽŃ‡ Šµ уŠæъŠ»Š½Š¾Š¼Š¾Ń‰ŠµŠ½ Š“Š° ŠøŠ·Ń‚Š»Š°ŃŠŗŠ²Š° ŠŗъŠ¼ цŠµŠ»ŠµŠ²Š¾Ń‚Š¾ хрŠ°Š½ŠøŠ»ŠøщŠµ. ŠŠµ Š¼Š¾Š¶ŠµŃ‚Šµ Š“Š° ŠøŠ·ŠæŠ¾Š»Š·Š²Š°Ń‚Šµ уŠ“Š¾ŃŃ‚Š¾Š²ŠµŃ€ŃŠ²Š°Š½Šµ, Š±Š°Š·ŠøрŠ°Š½Š¾ Š½Š° ŠæŠ°Ń€Š¾Š»Š°, ŠŗŠ¾Š³Š°Ń‚Š¾ ŠøŠ·Š±ŠøрŠ°Ń‚Šµ тŠ¾Š²Š°. +mirror_address_url_invalid = ŠŸŃ€ŠµŠ“Š¾ŃŃ‚Š°Š²ŠµŠ½Šøят URL Šµ Š½ŠµŠ²Š°Š»ŠøŠ“ŠµŠ½. Š¢Ń€ŃŠ±Š²Š° Š“Š° ŠµŠŗрŠ°Š½ŠøрŠ°Ń‚Šµ ŠæрŠ°Š²ŠøŠ»Š½Š¾ Š²ŃŠøчŠŗŠø ŠŗŠ¾Š¼ŠæŠ¾Š½ŠµŠ½Ń‚Šø Š½Š° URL Š°Š“рŠµŃŠ°. +template.git_content = Git съŠ“ърŠ¶Š°Š½ŠøŠµ (стŠ°Š½Š“Š°Ń€Ń‚ŠµŠ½ ŠŗŠ»Š¾Š½) +ambiguous_runes_description = `Š¢Š¾Š·Šø фŠ°Š¹Š» съŠ“ърŠ¶Š° Š£Š½ŠøŠŗŠ¾Š“ Š·Š½Š°Ń†Šø, ŠŗŠ¾ŠøтŠ¾ Š¼Š¾Š³Š°Ń‚ Š“Š° Š±ŃŠŠ“Š°Ń‚ Š¾Š±ŃŠŃ€ŠŗŠ°Š½Šø с Š“руŠ³Šø Š·Š½Š°Ń†Šø. ŠŠŗŠ¾ сŠ¼ŃŃ‚Š°Ń‚Šµ, чŠµ тŠ¾Š²Š° Šµ уŠ¼ŠøшŠ»ŠµŠ½Š¾, Š¼Š¾Š¶ŠµŃ‚Šµ сŠæŠ¾ŠŗŠ¾Š¹Š½Š¾ Š“Š° ŠæрŠµŠ½ŠµŠ±Ń€ŠµŠ³Š½ŠµŃ‚Šµ тŠ¾Š²Š° ŠæрŠµŠ“уŠæрŠµŠ¶Š“ŠµŠ½ŠøŠµ. Š˜Š·ŠæŠ¾Š»Š·Š²Š°Š¹Ń‚Šµ Š±ŃƒŃ‚Š¾Š½Š° ā€žŠ•ŠŗрŠ°Š½ŠøрŠ°Š½Šµā€œ, Š·Š° Š“Š° Š³Šø рŠ°Š·ŠŗрŠøŠµŃ‚Šµ.` +issues.lock.notice_3 = - Š’ŠøŠ½Š°Š³Šø Š¼Š¾Š¶ŠµŃ‚Šµ Š“Š° Š¾Ń‚ŠŗŠ»ŃŽŃ‡ŠøтŠµ тŠ°Š·Šø Š·Š°Š“Š°Ń‡Š° Š¾Ń‚Š½Š¾Š²Š¾ Š² Š±ŃŠŠ“ŠµŃ‰Šµ. +issues.lock.title = Š—Š°ŠŗŠ»ŃŽŃ‡Š²Š°Š½Šµ Š½Š° Š¾Š±ŃŃŠŠ¶Š“Š°Š½ŠµŃ‚Š¾ ŠæŠ¾ тŠ°Š·Šø Š·Š°Š“Š°Ń‡Š°. +issues.dependency.issue_batch_close_blocked = ŠŠµ Š¼Š¾Š³Š°Ń‚ Š“Š° Š±ŃŠŠ“Š°Ń‚ Š·Š°Ń‚Š²Š¾Ń€ŠµŠ½Šø Š³Ń€ŃƒŠæŠ¾Š²Š¾ ŠøŠ·Š±Ń€Š°Š½ŠøтŠµ Š·Š°Š“Š°Ń‡Šø, Š·Š°Ń‰Š¾Ń‚Š¾ Š·Š°Š“Š°Ń‡Š° #%d Š²ŃŠµ Š¾Ń‰Šµ ŠøŠ¼Š° Š¾Ń‚Š²Š¾Ń€ŠµŠ½Šø Š·Š°Š²ŠøсŠøŠ¼Š¾ŃŃ‚Šø +issues.dependency.add_error_cannot_create_circular = ŠŠµ Š¼Š¾Š¶ŠµŃ‚Šµ Š“Š° съŠ·Š“Š°Š“ŠµŃ‚Šµ Š·Š°Š²ŠøсŠøŠ¼Š¾ŃŃ‚ с Š“Š²Šµ Š·Š°Š“Š°Ń‡Šø, ŠŗŠ¾ŠøтŠ¾ сŠµ Š±Š»Š¾ŠŗŠøрŠ°Ń‚ Š²Š·Š°ŠøŠ¼Š½Š¾. +issues.review.add_review_requests = ŠæŠ¾ŠøсŠŗŠ° рŠµŃ†ŠµŠ½Š·ŠøŠø Š¾Ń‚ %[1]s %[2]s +comment.blocked_by_user = ŠšŠ¾Š¼ŠµŠ½Ń‚ŠøрŠ°Š½ŠµŃ‚Š¾ Š½Šµ Šµ Š²ŃŠŠ·Š¼Š¾Š¶Š½Š¾, Š·Š°Ń‰Š¾Ń‚Š¾ стŠµ Š±Š»Š¾ŠŗŠøрŠ°Š½Šø Š¾Ń‚ ŠæрŠøтŠµŠ¶Š°Ń‚ŠµŠ»Ń Š½Š° хрŠ°Š½ŠøŠ»ŠøщŠµŃ‚Š¾ ŠøŠ»Šø Š¾Ń‚ Š°Š²Ń‚Š¾Ń€Š°. +pulls.view = ŠŸŃ€ŠµŠ³Š»ŠµŠ“ Š½Š° Š·Š°ŃŠ²ŠŗŠ°Ń‚Š° Š·Š° сŠ»ŠøŠ²Š°Š½Šµ +pulls.no_merge_desc = Š¢Š°Š·Šø Š·Š°ŃŠ²ŠŗŠ° Š·Š° сŠ»ŠøŠ²Š°Š½Šµ Š½Šµ Š¼Š¾Š¶Šµ Š“Š° Š±ŃŠŠ“Šµ сŠ»ŃŃ‚Š°, Š·Š°Ń‰Š¾Ń‚Š¾ Š²ŃŠøчŠŗŠø Š¾ŠæцŠøŠø Š·Š° сŠ»ŠøŠ²Š°Š½Šµ Š² хрŠ°Š½ŠøŠ»ŠøщŠµŃ‚Š¾ сŠ° ŠøŠ·ŠŗŠ»ŃŽŃ‡ŠµŠ½Šø. +pulls.no_merge_wip = Š¢Š°Š·Šø Š·Š°ŃŠ²ŠŗŠ° Š·Š° сŠ»ŠøŠ²Š°Š½Šµ Š½Šµ Š¼Š¾Š¶Šµ Š“Š° Š±ŃŠŠ“Šµ сŠ»ŃŃ‚Š°, Š·Š°Ń‰Š¾Ń‚Š¾ Šµ Š¾Ń‚Š±ŠµŠ»ŃŠ·Š°Š½Š° ŠŗŠ°Ń‚Š¾ Š² ŠæрŠ¾Ń†ŠµŃ Š½Š° рŠ°Š±Š¾Ń‚Š°. +pulls.switch_comparison_type = ŠŸŃ€ŠµŠ²ŠŗŠ»ŃŽŃ‡Š²Š°Š½Šµ Š½Š° тŠøŠæŠ° срŠ°Š²Š½ŠµŠ½ŠøŠµ +pulls.has_changed_since_last_review = ŠŸŃ€Š¾Š¼ŠµŠ½ŠµŠ½Š¾ сŠ»ŠµŠ“ ŠæŠ¾ŃŠ»ŠµŠ“Š½Š°Ń‚Š° Š²Šø рŠµŃ†ŠµŠ½Š·Šøя +pulls.filter_branch = Š¤ŠøŠ»Ń‚Ń€ŠøрŠ°Š½Šµ Š½Š° ŠŗŠ»Š¾Š½ +pulls.squash_merge_pull_request = Š”ъŠ·Š“Š°Š²Š°Š½Šµ Š½Š° сŠæŠ»ŠµŃŠŗŠ°Š½Š¾ ŠæŠ¾Š“Š°Š²Š°Š½Šµ +pulls.rebase_conflict_summary = Š”ъŠ¾Š±Ń‰ŠµŠ½ŠøŠµ Š·Š° Š³Ń€ŠµŃˆŠŗŠ° +pulls.auto_merge_button_when_succeed = (ŠšŠ¾Š³Š°Ń‚Š¾ ŠæрŠ¾Š²ŠµŃ€ŠŗŠøтŠµ сŠ° усŠæŠµŃˆŠ½Šø) +pulls.auto_merge_newly_scheduled_comment = `Š½Š°ŃŃ€Š¾Ń‡Šø тŠ°Š·Šø Š·Š°ŃŠ²ŠŗŠ° Š·Š° сŠ»ŠøŠ²Š°Š½Šµ Š·Š° Š°Š²Ń‚Š¾Š¼Š°Ń‚ŠøчŠ½Š¾ сŠ»ŠøŠ²Š°Š½Šµ, ŠŗŠ¾Š³Š°Ń‚Š¾ Š²ŃŠøчŠŗŠø ŠæрŠ¾Š²ŠµŃ€ŠŗŠø сŠ° усŠæŠµŃˆŠ½Šø %[1]s` +pulls.auto_merge_canceled_schedule_comment = `Š¾Ń‚Š¼ŠµŠ½Šø Š°Š²Ń‚Š¾Š¼Š°Ń‚ŠøчŠ½Š¾Ń‚Š¾ сŠ»ŠøŠ²Š°Š½Šµ Š½Š° тŠ°Š·Šø Š·Š°ŃŠ²ŠŗŠ° Š·Š° сŠ»ŠøŠ²Š°Š½Šµ, ŠŗŠ¾Š³Š°Ń‚Š¾ Š²ŃŠøчŠŗŠø ŠæрŠ¾Š²ŠµŃ€ŠŗŠø сŠ° усŠæŠµŃˆŠ½Šø %[1]s` +pulls.merge_manually = Š ŃŠŃ‡Š½Š¾ сŠ»ŃŃ‚Š° +pulls.merge_commit_id = ID Š½Š° ŠæŠ¾Š“Š°Š²Š°Š½ŠµŃ‚Š¾ със сŠ»ŠøŠ²Š°Š½Šµ +pulls.require_signed_wont_sign = ŠšŠ»Š¾Š½ŃŠŃ‚ ŠøŠ·ŠøсŠŗŠ²Š° ŠæŠ¾Š“ŠæŠøсŠ°Š½Šø ŠæŠ¾Š“Š°Š²Š°Š½Šøя, Š½Š¾ тŠ¾Š²Š° сŠ»ŠøŠ²Š°Š½Šµ Š½ŃŠ¼Š° Š“Š° Š±ŃŠŠ“Šµ ŠæŠ¾Š“ŠæŠøсŠ°Š½Š¾ +pulls.no_merge_helper = Š’ŠŗŠ»ŃŽŃ‡ŠµŃ‚Šµ Š¾ŠæцŠøŠøтŠµ Š·Š° сŠ»ŠøŠ²Š°Š½Šµ Š² Š½Š°ŃŃ‚Ń€Š¾Š¹ŠŗŠøтŠµ Š½Š° хрŠ°Š½ŠøŠ»ŠøщŠµŃ‚Š¾ ŠøŠ»Šø сŠ»ŠµŠ¹Ń‚Šµ Š·Š°ŃŠ²ŠŗŠ°Ń‚Š° Š·Š° сŠ»ŠøŠ²Š°Š½Šµ ръчŠ½Š¾. +pulls.review_only_possible_for_full_diff = Š ŠµŃ†ŠµŠ½Š·ŠøрŠ°Š½ŠµŃ‚Š¾ Šµ Š²ŃŠŠ·Š¼Š¾Š¶Š½Š¾ сŠ°Š¼Š¾ ŠæрŠø ŠæрŠµŠ³Š»ŠµŠ“ Š½Š° ŠæъŠ»Š½ŠøтŠµ рŠ°Š·Š»ŠøŠŗŠø +pulls.push_rejected = Š˜Š·Ń‚Š»Š°ŃŠŗŠ²Š°Š½ŠµŃ‚Š¾ Šµ Š½ŠµŃƒŃŠæŠµŃˆŠ½Š¾: Š˜Š·Ń‚Š»Š°ŃŠŗŠ²Š°Š½ŠµŃ‚Š¾ Šµ Š¾Ń‚Ń…Š²ŃŠŃ€Š»ŠµŠ½Š¾. ŠŸŃ€ŠµŠ³Š»ŠµŠ“Š°Š¹Ń‚Šµ Git ŠŗуŠŗŠøтŠµ Š·Š° тŠ¾Š²Š° хрŠ°Š½ŠøŠ»ŠøщŠµ. +pulls.auto_merge_canceled_schedule = ŠŠ²Ń‚Š¾Š¼Š°Ń‚ŠøчŠ½Š¾Ń‚Š¾ сŠ»ŠøŠ²Š°Š½Šµ Šµ Š¾Ń‚Š¼ŠµŠ½ŠµŠ½Š¾ Š·Š° тŠ°Š·Šø Š·Š°ŃŠ²ŠŗŠ° Š·Š° сŠ»ŠøŠ²Š°Š½Šµ. +pulls.allow_edits_from_maintainers_err = ŠžŠ±Š½Š¾Š²ŃŠ²Š°Š½ŠµŃ‚Š¾ Šµ Š½ŠµŃƒŃŠæŠµŃˆŠ½Š¾ +pulls.auto_merge_cancel_schedule = ŠžŃ‚Š¼ŃŠ½Š° Š½Š° Š°Š²Ń‚Š¾Š¼Š°Ń‚ŠøчŠ½Š¾Ń‚Š¾ сŠ»ŠøŠ²Š°Š½Šµ +pulls.auto_merge_not_scheduled = Š¢Š°Š·Šø Š·Š°ŃŠ²ŠŗŠ° Š·Š° сŠ»ŠøŠ²Š°Š½Šµ Š½Šµ Šµ Š½Š°ŃŃ€Š¾Ń‡ŠµŠ½Š° Š·Š° Š°Š²Ń‚Š¾Š¼Š°Ń‚ŠøчŠ½Š¾ сŠ»ŠøŠ²Š°Š½Šµ. +pulls.outdated_with_base_branch = Š¢Š¾Š·Šø ŠŗŠ»Š¾Š½ Šµ Š¾ŃŃ‚Š°Ń€ŃŠ» сŠæряŠ¼Š¾ Š¾ŃŠ½Š¾Š²Š½Šøя ŠŗŠ»Š¾Š½ +pulls.update_not_allowed = ŠŃŠ¼Š°Ń‚Šµ рŠ°Š·Ń€ŠµŃˆŠµŠ½ŠøŠµ Š“Š° Š¾Š±Š½Š¾Š²ŃŠ²Š°Ń‚Šµ ŠŗŠ»Š¾Š½Š° +pulls.wrong_commit_id = ID Š½Š° ŠæŠ¾Š“Š°Š²Š°Š½ŠµŃ‚Š¾ тряŠ±Š²Š° Š“Š° Š±ŃŠŠ“Šµ ID Š½Š° ŠæŠ¾Š“Š°Š²Š°Š½Šµ Š² цŠµŠ»ŠµŠ²Šøя ŠŗŠ»Š¾Š½ +pulls.blocked_by_user = ŠŠµ Š¼Š¾Š¶ŠµŃ‚Šµ Š“Š° съŠ·Š“Š°Š“ŠµŃ‚Šµ Š·Š°ŃŠ²ŠŗŠ° Š·Š° сŠ»ŠøŠ²Š°Š½Šµ Š² тŠ¾Š²Š° хрŠ°Š½ŠøŠ»ŠøщŠµ, Š·Š°Ń‰Š¾Ń‚Š¾ стŠµ Š±Š»Š¾ŠŗŠøрŠ°Š½Šø Š¾Ń‚ ŠæрŠøтŠµŠ¶Š°Ń‚ŠµŠ»Ń Š½Š° хрŠ°Š½ŠøŠ»ŠøщŠµŃ‚Š¾. +pulls.merge_conflict_summary = Š”ъŠ¾Š±Ń‰ŠµŠ½ŠøŠµ Š·Š° Š³Ń€ŠµŃˆŠŗŠ° +pulls.editable_explanation = Š¢Š°Š·Šø Š·Š°ŃŠ²ŠŗŠ° Š·Š° сŠ»ŠøŠ²Š°Š½Šµ ŠæŠ¾Š·Š²Š¾Š»ŃŠ²Š° рŠµŠ“Š°ŠŗцŠøŠø Š¾Ń‚ ŠæŠ¾Š“Š“ърŠ¶Š°Ń‰ŠøтŠµ. ŠœŠ¾Š¶ŠµŃ‚Šµ Š“Š° Š“Š¾ŠæрŠøŠ½ŠµŃŠµŃ‚Šµ Š“ŠøрŠµŠŗтŠ½Š¾ ŠŗъŠ¼ Š½ŠµŃ. +pulls.allow_edits_from_maintainers_desc = ŠŸŠ¾Ń‚Ń€ŠµŠ±ŠøтŠµŠ»Šø с ŠæрŠ°Š²Š¾ Š½Š° Š·Š°ŠæŠøс Š² Š¾ŃŠ½Š¾Š²Š½Šøя ŠŗŠ»Š¾Š½ Š¼Š¾Š³Š°Ń‚ същŠ¾ Š“Š° ŠøŠ·Ń‚Š»Š°ŃŠŗŠ²Š°Ń‚ ŠŗъŠ¼ тŠ¾Š·Šø ŠŗŠ»Š¾Š½ +pulls.merge_conflict = Š”Š»ŠøŠ²Š°Š½ŠµŃ‚Š¾ Šµ Š½ŠµŃƒŃŠæŠµŃˆŠ½Š¾: Š’ŃŠŠ·Š½ŠøŠŗŠ½Š° ŠŗŠ¾Š½Ń„Š»ŠøŠŗт ŠæŠ¾ Š²Ń€ŠµŠ¼Šµ Š½Š° сŠ»ŠøŠ²Š°Š½ŠµŃ‚Š¾. ŠŸŠ¾Š“сŠŗŠ°Š·ŠŗŠ°: ŠžŠæŠøтŠ°Š¹Ń‚Šµ рŠ°Š·Š»ŠøчŠ½Š° стрŠ°Ń‚ŠµŠ³Šøя +pulls.has_merged = ŠŠµŃƒŃŠæŠµŃˆŠ½Š¾: Š—Š°ŃŠ²ŠŗŠ°Ń‚Š° Š·Š° сŠ»ŠøŠ²Š°Š½Šµ Šµ сŠ»ŃŃ‚Š°, Š½Šµ Š¼Š¾Š¶ŠµŃ‚Šµ Š“Š° сŠ»ŠµŠµŃ‚Šµ Š¾Ń‚Š½Š¾Š²Š¾ ŠøŠ»Šø Š“Š° ŠæрŠ¾Š¼ŠµŠ½ŠøтŠµ цŠµŠ»ŠµŠ²Šøя ŠŗŠ»Š¾Š½. +pulls.cmd_instruction_merge_warning = ŠŸŃ€ŠµŠ“уŠæрŠµŠ¶Š“ŠµŠ½ŠøŠµ: ŠŠ°ŃŃ‚Ń€Š¾Š¹ŠŗŠ°Ń‚Š° ā€žŠŠ²Ń‚Š¾Š¼Š°Ń‚ŠøчŠ½Š¾ Š¾Ń‚ŠŗрŠøŠ²Š°Š½Šµ Š½Š° ръчŠ½Š¾ сŠ»ŠøŠ²Š°Š½Šµā€œ Š½Šµ Šµ Š²ŠŗŠ»ŃŽŃ‡ŠµŠ½Š° Š·Š° тŠ¾Š²Š° хрŠ°Š½ŠøŠ»ŠøщŠµ, щŠµ тряŠ±Š²Š° Š“Š° Š¾Ń‚Š±ŠµŠ»ŠµŠ¶ŠøтŠµ тŠ°Š·Šø Š·Š°ŃŠ²ŠŗŠ° Š·Š° сŠ»ŠøŠ²Š°Š½Šµ ŠŗŠ°Ń‚Š¾ ръчŠ½Š¾ сŠ»ŃŃ‚Š° сŠ»ŠµŠ“ тŠ¾Š²Š°. +pulls.delete.title = Š”Š° сŠµ ŠøŠ·Ń‚Ń€ŠøŠµ Š»Šø тŠ°Š·Šø Š·Š°ŃŠ²ŠŗŠ° Š·Š° сŠ»ŠøŠ²Š°Š½Šµ? +pulls.push_rejected_no_message = Š˜Š·Ń‚Š»Š°ŃŠŗŠ²Š°Š½ŠµŃ‚Š¾ Šµ Š½ŠµŃƒŃŠæŠµŃˆŠ½Š¾: Š˜Š·Ń‚Š»Š°ŃŠŗŠ²Š°Š½ŠµŃ‚Š¾ Šµ Š¾Ń‚Ń…Š²ŃŠŃ€Š»ŠµŠ½Š¾, Š½Š¾ Š½ŃŠ¼Š° Š¾Ń‚Š“Š°Š»ŠµŃ‡ŠµŠ½Š¾ съŠ¾Š±Ń‰ŠµŠ½ŠøŠµ. ŠŸŃ€ŠµŠ³Š»ŠµŠ“Š°Š¹Ń‚Šµ Git ŠŗуŠŗŠøтŠµ Š·Š° тŠ¾Š²Š° хрŠ°Š½ŠøŠ»ŠøщŠµ +pulls.auto_merge_newly_scheduled = Š—Š°ŃŠ²ŠŗŠ°Ń‚Š° Š·Š° сŠ»ŠøŠ²Š°Š½Šµ Šµ Š½Š°ŃŃ€Š¾Ń‡ŠµŠ½Š° Š·Š° сŠ»ŠøŠ²Š°Š½Šµ, ŠŗŠ¾Š³Š°Ń‚Š¾ Š²ŃŠøчŠŗŠø ŠæрŠ¾Š²ŠµŃ€ŠŗŠø сŠ° усŠæŠµŃˆŠ½Šø. +pulls.delete.text = ŠŠ°ŠøстŠøŠ½Š° Š»Šø ŠøсŠŗŠ°Ń‚Šµ Š“Š° ŠøŠ·Ń‚Ń€ŠøŠµŃ‚Šµ тŠ°Š·Šø Š·Š°ŃŠ²ŠŗŠ° Š·Š° сŠ»ŠøŠ²Š°Š½Šµ? (Š¢Š¾Š²Š° щŠµ ŠæрŠµŠ¼Š°Ń…Š½Šµ трŠ°Š¹Š½Š¾ цяŠ»Š¾Ń‚Š¾ съŠ“ърŠ¶Š°Š½ŠøŠµ. ŠŸŠ¾Š¼ŠøсŠ»ŠµŃ‚Šµ Š“Š°Š»Šø Š²Š¼ŠµŃŃ‚Š¾ тŠ¾Š²Š° Š“Š° Š½Šµ я Š·Š°Ń‚Š²Š¾Ń€ŠøтŠµ, Š°ŠŗŠ¾ Š²ŃŠŠ·Š½Š°Š¼ŠµŃ€ŃŠ²Š°Ń‚Šµ Š“Š° я Š·Š°ŠæŠ°Š·ŠøтŠµ Š°Ń€Ń…ŠøŠ²ŠøрŠ°Š½Š°) +pulls.auto_merge_has_pending_schedule = %[1]s Š½Š°ŃŃ€Š¾Ń‡Šø тŠ°Š·Šø Š·Š°ŃŠ²ŠŗŠ° Š·Š° сŠ»ŠøŠ²Š°Š½Šµ Š·Š° Š°Š²Ń‚Š¾Š¼Š°Ń‚ŠøчŠ½Š¾ сŠ»ŠøŠ²Š°Š½Šµ, ŠŗŠ¾Š³Š°Ń‚Š¾ Š²ŃŠøчŠŗŠø ŠæрŠ¾Š²ŠµŃ€ŠŗŠø сŠ° усŠæŠµŃˆŠ½Šø %[2]s. +pulls.auto_merge_when_succeed = ŠŠ²Ń‚Š¾Š¼Š°Ń‚ŠøчŠ½Š¾ сŠ»ŠøŠ²Š°Š½Šµ, ŠŗŠ¾Š³Š°Ń‚Š¾ Š²ŃŠøчŠŗŠø ŠæрŠ¾Š²ŠµŃ€ŠŗŠø сŠ° усŠæŠµŃˆŠ½Šø +error.csv.invalid_field_count = ŠŠµ Š¼Š¾Š¶Šµ Š“Š° сŠµ Š²ŠøŠ·ŃƒŠ°Š»ŠøŠ·ŠøрŠ° тŠ¾Š·Šø фŠ°Š¹Š», Š·Š°Ń‰Š¾Ń‚Š¾ ŠøŠ¼Š° Š³Ń€ŠµŃˆŠµŠ½ Š±Ń€Š¾Š¹ ŠæŠ¾Š»ŠµŃ‚Š° Š½Š° рŠµŠ“ %d. +diff.bin = Š”Š’ŠžŠ˜Š§Š•Š +release.add_tag_msg = Š˜Š·ŠæŠ¾Š»Š·Š²Š°Š½Šµ Š½Š° Š·Š°Š³Š»Š°Š²ŠøŠµŃ‚Š¾ Šø съŠ“ърŠ¶Š°Š½ŠøŠµŃ‚Š¾ Š½Š° ŠøŠ·Š“Š°Š½ŠøŠµŃ‚Š¾ ŠŗŠ°Ń‚Š¾ съŠ¾Š±Ń‰ŠµŠ½ŠøŠµ Š½Š° Š¼Š°Ń€ŠŗŠµŃ€Š°. +release.hide_archive_links_helper = Š”ŠŗрŠøŠ¹Ń‚Šµ Š°Š²Ń‚Š¾Š¼Š°Ń‚ŠøчŠ½Š¾ Š³ŠµŠ½ŠµŃ€ŠøрŠ°Š½ŠøтŠµ Š°Ń€Ń…ŠøŠ²Šø с ŠæрŠ¾Š³Ń€Š°Š¼ŠµŠ½ ŠŗŠ¾Š“ Š·Š° тŠ¾Š²Š° ŠøŠ·Š“Š°Š½ŠøŠµ. ŠŠ°ŠæрŠøŠ¼ŠµŃ€, Š°ŠŗŠ¾ ŠŗŠ°Ń‡Š²Š°Ń‚Šµ сŠ²Š¾Šø сŠ¾Š±ŃŃ‚Š²ŠµŠ½Šø. +diff.data_not_available = Š”ъŠ“ърŠ¶Š°Š½ŠøŠµŃ‚Š¾ Š½Š° рŠ°Š·Š»ŠøŠŗŠøтŠµ Š½Šµ Šµ Š½Š°Š»ŠøчŠ½Š¾ +diff.has_escaped = Š¢Š¾Š·Šø рŠµŠ“ ŠøŠ¼Š° сŠŗрŠøтŠø Š£Š½ŠøŠŗŠ¾Š“ Š·Š½Š°Ń†Šø +branch.protected_deletion_failed = ŠšŠ»Š¾Š½ŃŠŃ‚ ā€ž%sā€œ Šµ Š·Š°Ń‰ŠøтŠµŠ½. ŠŠµ Š¼Š¾Š¶Šµ Š“Š° Š±ŃŠŠ“Šµ ŠøŠ·Ń‚Ń€Šøт. +branch.default_deletion_failed = ŠšŠ»Š¾Š½ŃŠŃ‚ ā€ž%sā€œ Šµ стŠ°Š½Š“Š°Ń€Ń‚Š½Šøят ŠŗŠ»Š¾Š½. ŠŠµ Š¼Š¾Š¶Šµ Š“Š° Š±ŃŠŠ“Šµ ŠøŠ·Ń‚Ń€Šøт. +diff.generated = Š³ŠµŠ½ŠµŃ€ŠøрŠ°Š½ +diff.comment.add_line_comment = Š”Š¾Š±Š°Š²ŃŠ½Šµ Š½Š° ŠŗŠ¾Š¼ŠµŠ½Ń‚Š°Ń€ ŠŗъŠ¼ рŠµŠ“ +diff.comment.add_review_comment = Š”Š¾Š±Š°Š²ŃŠ½Šµ Š½Š° ŠŗŠ¾Š¼ŠµŠ½Ń‚Š°Ń€ +diff.review.self_approve = ŠŠ²Ń‚Š¾Ń€ŠøтŠµ Š½Š° Š·Š°ŃŠ²ŠŗŠø Š·Š° сŠ»ŠøŠ²Š°Š½Šµ Š½Šµ Š¼Š¾Š³Š°Ń‚ Š“Š° Š¾Š“Š¾Š±Ń€ŃŠ²Š°Ń‚ сŠ¾Š±ŃŃ‚Š²ŠµŠ½ŠøтŠµ сŠø Š·Š°ŃŠ²ŠŗŠø +release.tag_name_protected = Š˜Š¼ŠµŃ‚Š¾ Š½Š° Š¼Š°Ń€ŠŗŠµŃ€Š° Šµ Š·Š°Ń‰ŠøтŠµŠ½Š¾. +branch.warning_rename_default_branch = ŠŸŃ€ŠµŠøŠ¼ŠµŠ½ŃƒŠ²Š°Ń‚Šµ стŠ°Š½Š“Š°Ń€Ń‚Š½Šøя ŠŗŠ»Š¾Š½. +find_file.no_matching = ŠŠµ Šµ Š½Š°Š¼ŠµŃ€ŠµŠ½ съŠ²ŠæŠ°Š“Š°Ń‰ фŠ°Š¹Š» +issues.role.member_helper = Š¢Š¾Š·Šø ŠæŠ¾Ń‚Ń€ŠµŠ±ŠøтŠµŠ» Šµ учŠ°ŃŃ‚Š½ŠøŠŗ Š² Š¾Ń€Š³Š°Š½ŠøŠ·Š°Ń†ŠøятŠ°, ŠæрŠøтŠµŠ¶Š°Š²Š°Ń‰Š° тŠ¾Š²Š° хрŠ°Š½ŠøŠ»ŠøщŠµ. +diff.image.overlay = ŠŠ°ŃŠ»Š°Š³Š²Š°Š½Šµ +diff.image.swipe = ŠŸŠ»ŃŠŠ·Š³Š°Š½Šµ +branch.included = Š’ŠŗŠ»ŃŽŃ‡ŠµŠ½ +diff.file_suppressed_line_too_long = Š Š°Š·Š»ŠøŠŗŠøтŠµ Š²ŃŠŠ² фŠ°Š¹Š»Š° сŠ° ŠæŠ¾Ń‚ŠøсŠ½Š°Ń‚Šø, Š·Š°Ń‰Š¾Ń‚Š¾ ŠµŠ“ŠøŠ½ ŠøŠ»Šø ŠæŠ¾Š²ŠµŃ‡Šµ рŠµŠ“Š¾Š²Šµ сŠ° тŠ²ŃŠŃ€Š“Šµ Š“ъŠ»Š³Šø +error.broken_git_hook = Git ŠŗуŠŗŠøтŠµ Š½Š° тŠ¾Š²Š° хрŠ°Š½ŠøŠ»ŠøщŠµ ŠøŠ·Š³Š»ŠµŠ¶Š“Š°Ń‚ ŠæŠ¾Š²Ń€ŠµŠ“ŠµŠ½Šø. ŠœŠ¾Š»Ń, ŠæŠ¾ŃŠ»ŠµŠ“Š²Š°Š¹Ń‚Šµ Š“Š¾ŠŗуŠ¼ŠµŠ½Ń‚Š°Ń†ŠøятŠ°, Š·Š° Š“Š° Š³Šø ŠæŠ¾ŠæрŠ°Š²ŠøтŠµ, сŠ»ŠµŠ“ ŠŗŠ¾ŠµŃ‚Š¾ ŠøŠ·Ń‚Š»Š°ŃŠŗŠ°Š¹Ń‚Šµ ŠæŠ¾Š“Š°Š²Š°Š½Šøя, Š·Š° Š“Š° Š¾Š±Š½Š¾Š²ŠøтŠµ стŠ°Ń‚ŃƒŃŠ°. +error.csv.unexpected = ŠŠµ Š¼Š¾Š¶Šµ Š“Š° сŠµ Š²ŠøŠ·ŃƒŠ°Š»ŠøŠ·ŠøрŠ° тŠ¾Š·Šø фŠ°Š¹Š», Š·Š°Ń‰Š¾Ń‚Š¾ съŠ“ърŠ¶Š° Š½ŠµŠ¾Ń‡Š°ŠŗŠ²Š°Š½ Š·Š½Š°Šŗ Š½Š° рŠµŠ“ %d Šø ŠŗŠ¾Š»Š¾Š½Š° %d. +topic.count_prompt = ŠŠµ Š¼Š¾Š¶ŠµŃ‚Šµ Š“Š° ŠøŠ·Š±ŠµŃ€ŠµŃ‚Šµ ŠæŠ¾Š²ŠµŃ‡Šµ Š¾Ń‚ 25 тŠµŠ¼Šø +release.hide_archive_links = Š”ŠŗрŠøŠ²Š°Š½Šµ Š½Š° Š°Š²Ń‚Š¾Š¼Š°Ń‚ŠøчŠ½Š¾ Š³ŠµŠ½ŠµŃ€ŠøрŠ°Š½ŠøтŠµ Š°Ń€Ń…ŠøŠ²Šø +diff.show_more = ŠŸŠ¾ŠŗŠ°Š·Š²Š°Š½Šµ Š½Š° Š¾Ń‰Šµ +diff.too_many_files = ŠŃŠŗŠ¾Šø фŠ°Š¹Š»Š¾Š²Šµ Š½Šµ Š±ŃŃ…Š° ŠæŠ¾ŠŗŠ°Š·Š°Š½Šø, Š·Š°Ń‰Š¾Ń‚Š¾ тŠ²ŃŠŃ€Š“Šµ Š¼Š½Š¾Š³Š¾ фŠ°Š¹Š»Š¾Š²Šµ ŠøŠ¼Š°Ń‚ ŠæрŠ¾Š¼ŠµŠ½Šø Š² тŠµŠ·Šø рŠ°Š·Š»ŠøŠŗŠø +diff.review.self_reject = ŠŠ²Ń‚Š¾Ń€ŠøтŠµ Š½Š° Š·Š°ŃŠ²ŠŗŠø Š·Š° сŠ»ŠøŠ²Š°Š½Šµ Š½Šµ Š¼Š¾Š³Š°Ń‚ Š“Š° ŠæŠ¾ŠøсŠŗŠ²Š°Ń‚ ŠæрŠ¾Š¼ŠµŠ½Šø Š² сŠ¾Š±ŃŃ‚Š²ŠµŠ½ŠøтŠµ сŠø Š·Š°ŃŠ²ŠŗŠø +branch.included_desc = Š¢Š¾Š·Šø ŠŗŠ»Š¾Š½ Šµ чŠ°ŃŃ‚ Š¾Ń‚ стŠ°Š½Š“Š°Ń€Ń‚Š½Šøя ŠŗŠ»Š¾Š½ +diff.image.side_by_side = Š•Š“Š½Š¾ Š“Š¾ Š“руŠ³Š¾ +release.summary_card_alt = ŠšŠ°Ń€Ń‚Š° с Š¾Š±Š¾Š±Ń‰ŠµŠ½ŠøŠµ Š½Š° ŠøŠ·Š“Š°Š½ŠøŠµ със Š·Š°Š³Š»Š°Š²ŠøŠµ ā€ž%sā€œ Š² хрŠ°Š½ŠøŠ»ŠøщŠµ %s +release.asset_external_url = Š’ŃŠŠ½ŃˆŠµŠ½ URL Š°Š“рŠµŃ +error.csv.too_large = ŠŠµ Š¼Š¾Š¶Šµ Š“Š° сŠµ Š²ŠøŠ·ŃƒŠ°Š»ŠøŠ·ŠøрŠ° тŠ¾Š·Šø фŠ°Š¹Š», Š·Š°Ń‰Š¾Ń‚Š¾ Šµ тŠ²ŃŠŃ€Š“Šµ Š³Š¾Š»ŃŠ¼. [modal] confirm = ŠŸŠ¾Ń‚Š²ŃŠŃ€Š¶Š“Š°Š²Š°Š½Šµ @@ -1663,18 +1954,18 @@ follow_blocked_user = ŠŠµ Š¼Š¾Š¶ŠµŃ‚Šµ Š“Š° сŠ»ŠµŠ“Š²Š°Ń‚Šµ тŠ°Š·Šø Š¾Ń€Š³Š° settings.delete_prompt = ŠžŃ€Š³Š°Š½ŠøŠ·Š°Ń†ŠøятŠ° щŠµ Š±ŃŠŠ“Šµ ŠæрŠµŠ¼Š°Ń…Š½Š°Ń‚Š° Š·Š°Š²ŠøŠ½Š°Š³Šø. Š¢Š¾Š²Š° ŠŠ• ŠœŠžŠ–Š• Š“Š° Š±ŃŠŠ“Šµ Š¾Ń‚Š¼ŠµŠ½ŠµŠ½Š¾! settings.labels_desc = Š”Š¾Š±Š°Š²ŠµŃ‚Šµ ŠµŃ‚ŠøŠŗŠµŃ‚Šø, ŠŗŠ¾ŠøтŠ¾ Š¼Š¾Š³Š°Ń‚ Š“Š° сŠµ ŠøŠ·ŠæŠ¾Š»Š·Š²Š°Ń‚ Š·Š° Š·Š°Š“Š°Ń‡Šø Š·Š° Š²ŃŠøчŠŗŠø хрŠ°Š½ŠøŠ»ŠøщŠ° Š² тŠ°Š·Šø Š¾Ń€Š³Š°Š½ŠøŠ·Š°Ń†Šøя. teams.none_access = Š‘ŠµŠ· Š“Š¾ŃŃ‚ŃŠŠæ -teams.members.none = ŠŃŠ¼Š° чŠ»ŠµŠ½Š¾Š²Šµ Š² тŠ¾Š·Šø ŠµŠŗŠøŠæ. +teams.members.none = ŠŃŠ¼Š° учŠ°ŃŃ‚Š½ŠøцŠø Š² тŠ¾Š·Šø ŠµŠŗŠøŠæ. repo_updated = ŠžŠ±Š½Š¾Š²ŠµŠ½Š¾ %s teams.delete_team_success = Š•ŠŗŠøŠæът Šµ ŠøŠ·Ń‚Ń€Šøт. teams.search_repo_placeholder = ŠŸŠ¾Ń‚ърсŠµŃ‚Šµ хрŠ°Š½ŠøŠ»ŠøщŠµā€¦ teams.delete_team_title = Š˜Š·Ń‚Ń€ŠøŠ²Š°Š½Šµ Š½Š° ŠµŠŗŠøŠæŠ° -teams.add_team_member = Š”Š¾Š±Š°Š²ŃŠ½Šµ Š½Š° чŠ»ŠµŠ½ Š½Š° ŠµŠŗŠøŠæŠ° +teams.add_team_member = Š”Š¾Š±Š°Š²ŃŠ½Šµ Š½Š° учŠ°ŃŃ‚Š½ŠøŠŗ Š² ŠµŠŗŠøŠæŠ° teams.read_access_helper = Š§Š»ŠµŠ½Š¾Š²ŠµŃ‚Šµ Š¼Š¾Š³Š°Ń‚ Š“Š° ŠæрŠµŠ³Š»ŠµŠ¶Š“Š°Ń‚ Šø ŠŗŠ»Š¾Š½ŠøрŠ°Ń‚ хрŠ°Š½ŠøŠ»ŠøщŠ°Ń‚Š° Š½Š° ŠµŠŗŠøŠæŠ°. teams.invite.description = ŠœŠ¾Š»Ń, щрŠ°ŠŗŠ½ŠµŃ‚Šµ Š²ŃŠŃ€Ń…Ńƒ Š±ŃƒŃ‚Š¾Š½Š° ŠæŠ¾-Š“Š¾Š»Ńƒ, Š·Š° Š“Š° сŠµ ŠæрŠøсъŠµŠ“ŠøŠ½ŠøтŠµ ŠŗъŠ¼ ŠµŠŗŠøŠæŠ°. teams.invite.title = ŠŸŠ¾ŠŗŠ°Š½ŠµŠ½Šø стŠµ Š“Š° сŠµ ŠæрŠøсъŠµŠ“ŠøŠ½ŠøтŠµ ŠŗъŠ¼ ŠµŠŗŠøŠæ %s Š² Š¾Ń€Š³Š°Š½ŠøŠ·Š°Ń†Šøя %s. team_permission_desc = Š Š°Š·Ń€ŠµŃˆŠµŠ½ŠøŠµ members.public_helper = Š”Š° Šµ сŠŗрŠøт -teams.members = Š§Š»ŠµŠ½Š¾Š²Šµ Š½Š° ŠµŠŗŠøŠæŠ° +teams.members = Š£Ń‡Š°ŃŃ‚Š½ŠøцŠø Š² ŠµŠŗŠøŠæŠ° teams.delete_team = Š˜Š·Ń‚Ń€ŠøŠ²Š°Š½Šµ Š½Š° ŠµŠŗŠøŠæŠ° members.owner = ŠŸŃ€ŠøтŠµŠ¶Š°Ń‚ŠµŠ» members.member_role = Š Š¾Š»Ń Š½Š° учŠ°ŃŃ‚Š½ŠøŠŗŠ°: @@ -1684,6 +1975,37 @@ teams.no_desc = Š¢Š¾Š·Šø ŠµŠŗŠøŠæ Š½ŃŠ¼Š° Š¾ŠæŠøсŠ°Š½ŠøŠµ settings.delete_org_desc = Š¢Š°Š·Šø Š¾Ń€Š³Š°Š½ŠøŠ·Š°Ń†Šøя щŠµ Š±ŃŠŠ“Šµ ŠøŠ·Ń‚Ń€ŠøтŠ° ŠæŠµŃ€Š¼Š°Š½ŠµŠ½Ń‚Š½Š¾. ŠŸŃ€Š¾Š“ъŠ»Š¶Š°Š²Š°Š½Šµ? open_dashboard = ŠžŃ‚Š²Š°Ń€ŃŠ½Šµ Š½Š° тŠ°Š±Š»Š¾Ń‚Š¾ settings.change_orgname_prompt = Š‘ŠµŠ»ŠµŠ¶ŠŗŠ°: ŠŸŃ€Š¾Š¼ŃŠ½Š°Ń‚Š° Š½Š° ŠøŠ¼ŠµŃ‚Š¾ Š½Š° Š¾Ń€Š³Š°Š½ŠøŠ·Š°Ń†ŠøятŠ° щŠµ ŠæрŠ¾Š¼ŠµŠ½Šø Šø URL Š°Š“рŠµŃŠ° Š½Š° Š²Š°ŃˆŠ°Ń‚Š° Š¾Ń€Š³Š°Š½ŠøŠ·Š°Ń†Šøя Šø щŠµ Š¾ŃŠ²Š¾Š±Š¾Š“Šø стŠ°Ń€Š¾Ń‚Š¾ ŠøŠ¼Šµ. +teams.add_duplicate_users = ŠŸŠ¾Ń‚Ń€ŠµŠ±ŠøтŠµŠ»ŃŃ‚ Š²ŠµŃ‡Šµ Šµ учŠ°ŃŃ‚Š½ŠøŠŗ Š² ŠµŠŗŠøŠæŠ°. +team_unit_disabled = (Š˜Š·ŠŗŠ»ŃŽŃ‡ŠµŠ½Š¾) +form.name_reserved = Š˜Š¼ŠµŃ‚Š¾ Š½Š° Š¾Ń€Š³Š°Š½ŠøŠ·Š°Ń†ŠøятŠ° ā€ž%sā€œ Šµ рŠµŠ·ŠµŃ€Š²ŠøрŠ°Š½Š¾. +settings.update_avatar_success = ŠŸŃ€Š¾Ń„ŠøŠ»Š½Š°Ń‚Š° сŠ½ŠøŠ¼ŠŗŠ° Š½Š° Š¾Ń€Š³Š°Š½ŠøŠ·Š°Ń†ŠøятŠ° Šµ Š¾Š±Š½Š¾Š²ŠµŠ½Š°. +teams.invite_team_member.list = Š§Š°ŠŗŠ°Ń‰Šø ŠæŠ¾ŠŗŠ°Š½Šø +teams.remove_all_repos_desc = Š¢Š¾Š²Š° щŠµ ŠæрŠµŠ¼Š°Ń…Š½Šµ Š²ŃŠøчŠŗŠø хрŠ°Š½ŠøŠ»ŠøщŠ° Š¾Ń‚ ŠµŠŗŠøŠæŠ°. +form.create_org_not_allowed = ŠŃŠ¼Š°Ń‚Šµ рŠ°Š·Ń€ŠµŃˆŠµŠ½ŠøŠµ Š“Š° съŠ·Š“Š°Š²Š°Ń‚Šµ Š¾Ń€Š³Š°Š½ŠøŠ·Š°Ń†Šøя. +form.name_pattern_not_allowed = ŠØŠ°Š±Š»Š¾Š½ŃŠŃ‚ ā€ž%sā€œ Š½Šµ Šµ рŠ°Š·Ń€ŠµŃˆŠµŠ½ Š² ŠøŠ¼Šµ Š½Š° Š¾Ń€Š³Š°Š½ŠøŠ·Š°Ń†Šøя. +members.invite_now = ŠŸŠ¾ŠŗŠ°Š½Š²Š°Š½Šµ сŠµŠ³Š° +teams.specific_repositories = ŠšŠ¾Š½ŠŗрŠµŃ‚Š½Šø хрŠ°Š½ŠøŠ»ŠøщŠ° +teams.repos.none = ŠŃŠ¼Š° хрŠ°Š½ŠøŠ»ŠøщŠ°, Š“Š¾ ŠŗŠ¾ŠøтŠ¾ тŠ¾Š·Šø ŠµŠŗŠøŠæ Š“Š° ŠøŠ¼Š° Š“Š¾ŃŃ‚ŃŠŠæ. +teams.add_all_repos_title = Š”Š¾Š±Š°Š²ŃŠ½Šµ Š½Š° Š²ŃŠøчŠŗŠø хрŠ°Š½ŠøŠ»ŠøщŠ° +settings.hooks_desc = Š”Š¾Š±Š°Š²ŠµŃ‚Šµ уŠµŠ±-ŠŗуŠŗŠø, ŠŗŠ¾ŠøтŠ¾ щŠµ сŠµ Š·Š°Š“ŠµŠ¹ŃŃ‚Š²Š°Ń‚ Š·Š° Š²ŃŠøчŠŗŠø хрŠ°Š½ŠøŠ»ŠøщŠ° Š² тŠ°Š·Šø Š¾Ń€Š³Š°Š½ŠøŠ·Š°Ń†Šøя. +teams.add_all_repos_desc = Š¢Š¾Š²Š° щŠµ Š“Š¾Š±Š°Š²Šø Š²ŃŠøчŠŗŠø хрŠ°Š½ŠøŠ»ŠøщŠ° Š½Š° Š¾Ń€Š³Š°Š½ŠøŠ·Š°Ń†ŠøятŠ° ŠŗъŠ¼ ŠµŠŗŠøŠæŠ°. +members.invite_desc = Š”Š¾Š±Š°Š²ŃŠ½Šµ Š½Š° Š½Š¾Š² учŠ°ŃŃ‚Š½ŠøŠŗ ŠŗъŠ¼ %s: +members.private = Š”ŠŗрŠøт +settings.change_orgname_redirect_prompt.with_cooldown.few = Š”тŠ°Ń€Š¾Ń‚Š¾ ŠøŠ¼Šµ Š½Š° Š¾Ń€Š³Š°Š½ŠøŠ·Š°Ń†ŠøятŠ° щŠµ Š±ŃŠŠ“Šµ Š“Š¾ŃŃ‚ŃŠŠæŠ½Š¾ Š·Š° Š²ŃŠøчŠŗŠø сŠ»ŠµŠ“ ŠæŠµŃ€ŠøŠ¾Š“ Š½Š° ŠøŠ·Ń‡Š°ŠŗŠ²Š°Š½Šµ Š¾Ń‚ %[1]d Š“Š½Šø. Š’сŠµ Š¾Ń‰Šµ Š¼Š¾Š¶ŠµŃ‚Šµ Š“Š° сŠø Š²ŃŠŃ€Š½ŠµŃ‚Šµ стŠ°Ń€Š¾Ń‚Š¾ ŠøŠ¼Šµ ŠæŠ¾ Š²Ń€ŠµŠ¼Šµ Š½Š° ŠæŠµŃ€ŠøŠ¾Š“Š° Š½Š° ŠøŠ·Ń‡Š°ŠŗŠ²Š°Š½Šµ. +team_access_desc = Š”Š¾ŃŃ‚ŃŠŠæ Š“Š¾ хрŠ°Š½ŠøŠ»ŠøщŠµ +teams.specific_repositories_helper = Š£Ń‡Š°ŃŃ‚Š½ŠøцŠøтŠµ щŠµ ŠøŠ¼Š°Ń‚ Š“Š¾ŃŃ‚ŃŠŠæ сŠ°Š¼Š¾ Š“Š¾ хрŠ°Š½ŠøŠ»ŠøщŠ°, ŠøŠ·Ń€ŠøчŠ½Š¾ Š“Š¾Š±Š°Š²ŠµŠ½Šø ŠŗъŠ¼ ŠµŠŗŠøŠæŠ°. Š˜Š·Š±ŠøрŠ°Š½ŠµŃ‚Š¾ Š½Š° тŠ¾Š²Š° Š½ŃŠ¼Š° Š°Š²Ń‚Š¾Š¼Š°Ń‚ŠøчŠ½Š¾ Š“Š° ŠæрŠµŠ¼Š°Ń…Š½Šµ хрŠ°Š½ŠøŠ»ŠøщŠ°, Š²ŠµŃ‡Šµ Š“Š¾Š±Š°Š²ŠµŠ½Šø с Š’сŠøчŠŗŠø хрŠ°Š½ŠøŠ»ŠøщŠ°. +teams.delete_team_desc = Š˜Š·Ń‚Ń€ŠøŠ²Š°Š½ŠµŃ‚Š¾ Š½Š° ŠµŠŗŠøŠæ Š¾Ń‚Š½ŠµŠ¼Š° Š“Š¾ŃŃ‚ŃŠŠæŠ° Š“Š¾ хрŠ°Š½ŠøŠ»ŠøщŠµŃ‚Š¾ Š¾Ń‚ Š½ŠµŠ³Š¾Š²ŠøтŠµ учŠ°ŃŃ‚Š½ŠøцŠø. ŠŸŃ€Š¾Š“ъŠ»Š¶Š°Š²Š°Š½Šµ? +members.membership_visibility = Š’ŠøŠ“ŠøŠ¼Š¾ŃŃ‚ Š½Š° учŠ°ŃŃ‚Š½ŠøчŠµŃŃ‚Š²Š¾Ń‚Š¾: +members.public = Š’ŠøŠ“ŠøŠ¼ +teams.all_repositories_helper = Š•ŠŗŠøŠæът ŠøŠ¼Š° Š“Š¾ŃŃ‚ŃŠŠæ Š“Š¾ Š²ŃŠøчŠŗŠø хрŠ°Š½ŠøŠ»ŠøщŠ°. Š˜Š·Š±ŠøрŠ°Š½ŠµŃ‚Š¾ Š½Š° тŠ¾Š²Š° щŠµ Š“Š¾Š±Š°Š²Šø Š²ŃŠøчŠŗŠø същŠµŃŃ‚Š²ŃƒŠ²Š°Ń‰Šø хрŠ°Š½ŠøŠ»ŠøщŠ° ŠŗъŠ¼ ŠµŠŗŠøŠæŠ°. +team_unit_desc = Š Š°Š·Ń€ŠµŃˆŠ°Š²Š°Š½Šµ Š½Š° Š“Š¾ŃŃ‚ŃŠŠæ Š“Š¾ сŠµŠŗцŠøŠø Š½Š° хрŠ°Š½ŠøŠ»ŠøщŠµŃ‚Š¾ +settings.update_setting_success = ŠŠ°ŃŃ‚Ń€Š¾Š¹ŠŗŠøтŠµ Š½Š° Š¾Ń€Š³Š°Š½ŠøŠ·Š°Ń†ŠøятŠ° сŠ° Š¾Š±Š½Š¾Š²ŠµŠ½Šø. +settings.change_orgname_redirect_prompt = Š”тŠ°Ń€Š¾Ń‚Š¾ ŠøŠ¼Šµ щŠµ сŠµ ŠæрŠµŠ½Š°ŃŠ¾Ń‡Š²Š°, Š“Š¾ŠŗŠ°Ń‚Š¾ Š½Šµ Š±ŃŠŠ“Šµ Š²Š·ŠµŃ‚Š¾. +teams.invite_team_member = ŠŸŠ¾ŠŗŠ°Š½Š²Š°Š½Šµ Š² %s +teams.admin_access = ŠŠ“Š¼ŠøŠ½ŠøстрŠ°Ń‚Š¾Ń€ŃŠŗŠø Š“Š¾ŃŃ‚ŃŠŠæ +settings.change_orgname_redirect_prompt.with_cooldown.one = Š”тŠ°Ń€Š¾Ń‚Š¾ ŠøŠ¼Šµ Š½Š° Š¾Ń€Š³Š°Š½ŠøŠ·Š°Ń†ŠøятŠ° щŠµ Š±ŃŠŠ“Šµ Š“Š¾ŃŃ‚ŃŠŠæŠ½Š¾ Š·Š° Š²ŃŠøчŠŗŠø сŠ»ŠµŠ“ ŠæŠµŃ€ŠøŠ¾Š“ Š½Š° ŠøŠ·Ń‡Š°ŠŗŠ²Š°Š½Šµ Š¾Ń‚ %[1]d Š“ŠµŠ½. Š’сŠµ Š¾Ń‰Šµ Š¼Š¾Š¶ŠµŃ‚Šµ Š“Š° сŠø Š²ŃŠŃ€Š½ŠµŃ‚Šµ стŠ°Ń€Š¾Ń‚Š¾ ŠøŠ¼Šµ ŠæŠ¾ Š²Ń€ŠµŠ¼Šµ Š½Š° ŠæŠµŃ€ŠøŠ¾Š“Š° Š½Š° ŠøŠ·Ń‡Š°ŠŗŠ²Š°Š½Šµ. +teams.add_nonexistent_repo = Š„рŠ°Š½ŠøŠ»ŠøщŠµŃ‚Š¾, ŠŗŠ¾ŠµŃ‚Š¾ сŠµ Š¾ŠæŠøтŠ²Š°Ń‚Šµ Š“Š° Š“Š¾Š±Š°Š²ŠøтŠµ, Š½Šµ същŠµŃŃ‚Š²ŃƒŠ²Š°, Š¼Š¾Š»Ń, ŠæърŠ²Š¾ Š³Š¾ съŠ·Š“Š°Š¹Ń‚Šµ. +teams.invite.by = ŠŸŠ¾ŠŗŠ°Š½ŠµŠ½ Š¾Ń‚ %s [install] admin_password = ŠŸŠ°Ń€Š¾Š»Š° @@ -1978,14 +2300,14 @@ Pronouns = ŠœŠµŃŃ‚Š¾ŠøŠ¼ŠµŠ½Šøя Biography = Š‘ŠøŠ¾Š³Ń€Š°Ń„Šøя Website = Š£ŠµŠ±ŃŠ°Š¹Ń‚ Location = ŠœŠµŃŃ‚Š¾ŠæŠ¾Š»Š¾Š¶ŠµŠ½ŠøŠµ -cannot_add_org_to_team = ŠžŃ€Š³Š°Š½ŠøŠ·Š°Ń†Šøя Š½Šµ Š¼Š¾Š¶Šµ Š“Š° Š±ŃŠŠ“Šµ Š“Š¾Š±Š°Š²ŠµŠ½Š° ŠŗŠ°Ń‚Š¾ чŠ»ŠµŠ½ Š½Š° ŠµŠŗŠøŠæ. +cannot_add_org_to_team = ŠžŃ€Š³Š°Š½ŠøŠ·Š°Ń†Šøя Š½Šµ Š¼Š¾Š¶Šµ Š“Š° Š±ŃŠŠ“Šµ Š“Š¾Š±Š°Š²ŠµŠ½Š° ŠŗŠ°Ń‚Š¾ учŠ°ŃŃ‚Š½ŠøŠŗ Š² ŠµŠŗŠøŠæ. auth_failed = ŠŠµŃƒŃŠæŠµŃˆŠ½Š¾ уŠ“Š¾ŃŃ‚Š¾Š²ŠµŃ€ŃŠ²Š°Š½Šµ: %v team_no_units_error = Š Š°Š·Ń€ŠµŃˆŠµŃ‚Šµ Š“Š¾ŃŃ‚ŃŠŠæ Š“Š¾ ŠæŠ¾Š½Šµ ŠµŠ“Š½Š° сŠµŠŗцŠøя Š½Š° хрŠ°Š½ŠøŠ»ŠøщŠµŃ‚Š¾. password_uppercase_one = ŠŸŠ¾Š½Šµ ŠµŠ“ŠøŠ½ Š³Š¾Š»ŃŠ¼ Š·Š½Š°Šŗ CommitSummary = ŠžŠ±Š¾Š±Ń‰ŠµŠ½ŠøŠµ Š½Š° ŠæŠ¾Š“Š°Š²Š°Š½ŠµŃ‚Š¾ username_error = ` Š¼Š¾Š¶Šµ Š“Š° съŠ“ърŠ¶Š° сŠ°Š¼Š¾ Š±ŃƒŠŗŠ²ŠµŠ½Š¾-цŠøфрŠ¾Š²Šø Š·Š½Š°Ń†Šø (ā€ž0-9ā€œ, ā€ža-zā€œ, ā€žA-Zā€œ), тŠøрŠµ (ā€ž-ā€œ), Š“Š¾Š»Š½Š° чŠµŃ€Ń‚Š° (ā€ž_ā€œ) Šø тŠ¾Ń‡ŠŗŠ° (ā€ž.ā€œ). ŠŠµ Š¼Š¾Š¶Šµ Š“Š° Š·Š°ŠæŠ¾Ń‡Š²Š° ŠøŠ»Šø Š·Š°Š²ŃŠŃ€ŃˆŠ²Š° с Š½Šµ-Š±ŃƒŠŗŠ²ŠµŠ½Š¾-цŠøфрŠ¾Š²Šø Š·Š½Š°Ń†Šø, ŠŗŠ°Ń‚Š¾ същŠ¾ тŠ°ŠŗŠ° сŠ° Š·Š°Š±Ń€Š°Š½ŠµŠ½Šø Šø ŠæŠ¾ŃŠ»ŠµŠ“Š¾Š²Š°Ń‚ŠµŠ»Š½Šø Š½Šµ-Š±ŃƒŠŗŠ²ŠµŠ½Š¾-цŠøфрŠ¾Š²Šø Š·Š½Š°Ń†Šø.` username_error_no_dots = ` Š¼Š¾Š¶Šµ Š“Š° съŠ“ърŠ¶Š° сŠ°Š¼Š¾ Š±ŃƒŠŗŠ²ŠµŠ½Š¾-цŠøфрŠ¾Š²Šø Š·Š½Š°Ń†Šø (ā€ž0-9ā€œ, ā€ža-zā€œ, ā€žA-Zā€œ), тŠøрŠµ (ā€ž-ā€œ) Šø Š“Š¾Š»Š½Š° чŠµŃ€Ń‚Š° (ā€ž_ā€œ). ŠŠµ Š¼Š¾Š¶Šµ Š“Š° Š·Š°ŠæŠ¾Ń‡Š²Š° ŠøŠ»Šø Š·Š°Š²ŃŠŃ€ŃˆŠ²Š° с Š½Šµ-Š±ŃƒŠŗŠ²ŠµŠ½Š¾-цŠøфрŠ¾Š²Šø Š·Š½Š°Ń†Šø, ŠŗŠ°Ń‚Š¾ същŠ¾ тŠ°ŠŗŠ° сŠ° Š·Š°Š±Ń€Š°Š½ŠµŠ½Šø Šø ŠæŠ¾ŃŠ»ŠµŠ“Š¾Š²Š°Ń‚ŠµŠ»Š½Šø Š½Šµ-Š±ŃƒŠŗŠ²ŠµŠ½Š¾-цŠøфрŠ¾Š²Šø Š·Š½Š°Ń†Šø.` -duplicate_invite_to_team = ŠŸŠ¾Ń‚Ń€ŠµŠ±ŠøтŠµŠ»ŃŃ‚ Š²ŠµŃ‡Šµ Šµ ŠæŠ¾ŠŗŠ°Š½ŠµŠ½ ŠŗŠ°Ń‚Š¾ чŠ»ŠµŠ½ Š½Š° ŠµŠŗŠøŠæŠ°. +duplicate_invite_to_team = ŠŸŠ¾Ń‚Ń€ŠµŠ±ŠøтŠµŠ»ŃŃ‚ Š²ŠµŃ‡Šµ Šµ ŠæŠ¾ŠŗŠ°Š½ŠµŠ½ ŠŗŠ°Ń‚Š¾ учŠ°ŃŃ‚Š½ŠøŠŗ Š² ŠµŠŗŠøŠæŠ°. must_use_public_key = ŠšŠ»ŃŽŃ‡ŃŠŃ‚, ŠŗŠ¾Š¹Ń‚Š¾ ŠæрŠµŠ“Š¾ŃŃ‚Š°Š²ŠøхтŠµ, Šµ чŠ°ŃŃ‚ŠµŠ½ ŠŗŠ»ŃŽŃ‡. ŠœŠ¾Š»Ń, Š½Šµ ŠŗŠ°Ń‡Š²Š°Š¹Ń‚Šµ чŠ°ŃŃ‚Š½Šøя сŠø ŠŗŠ»ŃŽŃ‡ Š½ŠøŠŗъŠ“Šµ. Š’Š¼ŠµŃŃ‚Š¾ тŠ¾Š²Š° ŠøŠ·ŠæŠ¾Š»Š·Š²Š°Š¹Ń‚Šµ ŠæуŠ±Š»ŠøчŠ½Šøя сŠø ŠŗŠ»ŃŽŃ‡. org_still_own_packages = Š¢Š°Š·Šø Š¾Ń€Š³Š°Š½ŠøŠ·Š°Ń†Šøя Š²ŃŠµ Š¾Ń‰Šµ ŠæрŠøтŠµŠ¶Š°Š²Š° ŠµŠ“ŠøŠ½ ŠøŠ»Šø ŠæŠ¾Š²ŠµŃ‡Šµ ŠæŠ°ŠŗŠµŃ‚Šø, ŠæърŠ²Š¾ Š³Šø ŠøŠ·Ń‚Ń€ŠøŠ¹Ń‚Šµ. admin_cannot_delete_self = ŠŠµ Š¼Š¾Š¶ŠµŃ‚Šµ Š“Š° ŠøŠ·Ń‚Ń€ŠøŠµŃ‚Šµ сŠµŠ±Šµ сŠø, ŠŗŠ¾Š³Š°Ń‚Š¾ стŠµ Š°Š“Š¼ŠøŠ½ŠøстрŠ°Ń‚Š¾Ń€. ŠœŠ¾Š»Ń, ŠæърŠ²Š¾ ŠæрŠµŠ¼Š°Ń…Š½ŠµŃ‚Šµ Š°Š“Š¼ŠøŠ½ŠøстрŠ°Ń‚Š¾Ń€ŃŠŗŠøтŠµ сŠø ŠæрŠøŠ²ŠøŠ»ŠµŠ³ŠøŠø. @@ -2006,7 +2328,7 @@ enterred_invalid_repo_name = Š˜Š¼ŠµŃ‚Š¾ Š½Š° хрŠ°Š½ŠøŠ»ŠøщŠµŃ‚Š¾, ŠŗŠ¾ŠµŃ‚Š¾ enterred_invalid_org_name = Š˜Š¼ŠµŃ‚Š¾ Š½Š° Š¾Ń€Š³Š°Š½ŠøŠ·Š°Ń†ŠøятŠ°, ŠŗŠ¾ŠµŃ‚Š¾ Š²ŃŠŠ²ŠµŠ“Š¾Ń…Ń‚Šµ, Šµ Š½ŠµŠæрŠ°Š²ŠøŠ»Š½Š¾. enterred_invalid_password = ŠŸŠ°Ń€Š¾Š»Š°Ń‚Š°, ŠŗŠ¾ŃŃ‚Š¾ Š²ŃŠŠ²ŠµŠ“Š¾Ń…Ń‚Šµ, Šµ Š½ŠµŠæрŠ°Š²ŠøŠ»Š½Š°. organization_leave_success = Š£ŃŠæŠµŃˆŠ½Š¾ Š½Š°ŠæусŠ½Š°Ń…Ń‚Šµ Š¾Ń€Š³Š°Š½ŠøŠ·Š°Ń†ŠøятŠ° %s. -still_has_org = Š’Š°ŃˆŠøят Š°ŠŗŠ°ŃƒŠ½Ń‚ Šµ чŠ»ŠµŠ½ Š½Š° ŠµŠ“Š½Š° ŠøŠ»Šø ŠæŠ¾Š²ŠµŃ‡Šµ Š¾Ń€Š³Š°Š½ŠøŠ·Š°Ń†ŠøŠø, ŠæърŠ²Š¾ Š³Šø Š½Š°ŠæусŠ½ŠµŃ‚Šµ. +still_has_org = Š’Š°ŃˆŠøят Š°ŠŗŠ°ŃƒŠ½Ń‚ Šµ учŠ°ŃŃ‚Š½ŠøŠŗ Š² ŠµŠ“Š½Š° ŠøŠ»Šø ŠæŠ¾Š²ŠµŃ‡Šµ Š¾Ń€Š³Š°Š½ŠøŠ·Š°Ń†ŠøŠø, ŠæърŠ²Š¾ Š³Šø Š½Š°ŠæусŠ½ŠµŃ‚Šµ. org_still_own_repo = Š¢Š°Š·Šø Š¾Ń€Š³Š°Š½ŠøŠ·Š°Ń†Šøя Š²ŃŠµ Š¾Ń‰Šµ ŠæрŠøтŠµŠ¶Š°Š²Š° ŠµŠ“Š½Š¾ ŠøŠ»Šø ŠæŠ¾Š²ŠµŃ‡Šµ хрŠ°Š½ŠøŠ»ŠøщŠ°, ŠæърŠ²Š¾ Š³Šø ŠøŠ·Ń‚Ń€ŠøŠ¹Ń‚Šµ ŠøŠ»Šø ŠæрŠµŃ…Š²ŃŠŃ€Š»ŠµŃ‚Šµ. target_branch_not_exist = Š¦ŠµŠ»ŠµŠ²Šøят ŠŗŠ»Š¾Š½ Š½Šµ същŠµŃŃ‚Š²ŃƒŠ²Š°. glob_pattern_error = ` glob шŠ°Š±Š»Š¾Š½ŃŠŃ‚ Šµ Š½ŠµŠ²Š°Š»ŠøŠ“ŠµŠ½: %s.` @@ -2016,6 +2338,17 @@ TreeName = ŠŸŃŠŃ‚ Š“Š¾ фŠ°Š¹Š»Š° AdminEmail = ŠŠ“Š¼ŠøŠ½ŠøстрŠ°Ń‚Š¾Ń€ŃŠŗŠø Š°Š“рŠµŃ Š·Š° ŠµŠ». ŠæŠ¾Ń‰Š° email_domain_is_not_allowed = Š”Š¾Š¼ŠµŠ¹Š½ŃŠŃ‚ Š½Š° Š°Š“рŠµŃŠ° Š·Š° ŠµŠ». ŠæŠ¾Ń‰Š° Š½Š° ŠæŠ¾Ń‚Ń€ŠµŠ±ŠøтŠµŠ»Ń %s Šµ Š² ŠŗŠ¾Š½Ń„Š»ŠøŠŗт с EMAIL_DOMAIN_ALLOWLIST ŠøŠ»Šø EMAIL_DOMAIN_BLOCKLIST. Š£Š²ŠµŃ€ŠµŃ‚Šµ сŠµ, чŠµ стŠµ Š²ŃŠŠ²ŠµŠ»Šø ŠæрŠ°Š²ŠøŠ»Š½Š¾ Š°Š“рŠµŃŠ° Š·Š° ŠµŠ». ŠæŠ¾Ń‰Š°. email_been_used = ŠŠ“рŠµŃŃŠŃ‚ Š·Š° ŠµŠ». ŠæŠ¾Ń‰Š° Š²ŠµŃ‡Šµ сŠµ ŠøŠ·ŠæŠ¾Š»Š·Š²Š°. +unable_verify_ssh_key = ŠŠµ Š¼Š¾Š¶Šµ Š“Š° сŠµ ŠæŠ¾Ń‚Š²ŃŠŃ€Š“Šø SSH ŠŗŠ»ŃŽŃ‡ŃŠŃ‚, ŠæрŠ¾Š²ŠµŃ€ŠµŃ‚Šµ Š³Š¾ Š¾Ń‚Š½Š¾Š²Š¾ Š·Š° Š³Ń€ŠµŃˆŠŗŠø. +enterred_invalid_owner_name = Š˜Š¼ŠµŃ‚Š¾ Š½Š° Š½Š¾Š²Šøя ŠæрŠøтŠµŠ¶Š°Ń‚ŠµŠ» Š½Šµ Šµ Š²Š°Š»ŠøŠ“Š½Š¾. +NewBranchName = Š˜Š¼Šµ Š½Š° Š½Š¾Š²Šøя ŠŗŠ»Š¾Š½ +invalid_ssh_key = ŠŠµ Š¼Š¾Š¶Šµ Š“Š° сŠµ ŠæŠ¾Ń‚Š²ŃŠŃ€Š“Šø Š²Š°ŃˆŠøят SSH ŠŗŠ»ŃŽŃ‡: %s +required_prefix = Š’ŃŠŠ²ŠµŠ“ŠµŠ½Šøят тŠµŠŗст тряŠ±Š²Š° Š“Š° Š·Š°ŠæŠ¾Ń‡Š²Š° с ā€ž%sā€œ +regex_pattern_error = ` шŠ°Š±Š»Š¾Š½ŃŠŃ‚ Š½Š° рŠµŠ³ŃƒŠ»ŃŃ€Š½Šøя ŠøŠ·Ń€Š°Š· Šµ Š½ŠµŠ²Š°Š»ŠøŠ“ŠµŠ½: %s.` +repository_files_already_exist = Š’ŠµŃ‡Šµ същŠµŃŃ‚Š²ŃƒŠ²Š°Ń‚ фŠ°Š¹Š»Š¾Š²Šµ Š·Š° тŠ¾Š²Š° хрŠ°Š½ŠøŠ»ŠøщŠµ. Š”Š²ŃŠŃ€Š¶ŠµŃ‚Šµ сŠµ със сŠøстŠµŠ¼Š½Šøя Š°Š“Š¼ŠøŠ½ŠøстрŠ°Ń‚Š¾Ń€. +repository_files_already_exist.delete = Š’ŠµŃ‡Šµ същŠµŃŃ‚Š²ŃƒŠ²Š°Ń‚ фŠ°Š¹Š»Š¾Š²Šµ Š·Š° тŠ¾Š²Š° хрŠ°Š½ŠøŠ»ŠøщŠµ. Š¢Ń€ŃŠ±Š²Š° Š“Š° Š³Šø ŠøŠ·Ń‚Ń€ŠøŠµŃ‚Šµ. +invalid_gpg_key = ŠŠµ Š¼Š¾Š¶Šµ Š“Š° сŠµ ŠæŠ¾Ń‚Š²ŃŠŃ€Š“Šø Š²Š°ŃˆŠøят GPG ŠŗŠ»ŃŽŃ‡: %s +git_ref_name_error = ` тряŠ±Š²Š° Š“Š° Šµ ŠæрŠ°Š²ŠøŠ»Š½Š¾ фŠ¾Ń€Š¼Š°Ń‚ŠøрŠ°Š½Š¾ ŠøŠ¼Šµ Š½Š° Git ŠæрŠµŠæрŠ°Ń‚ŠŗŠ°.` +last_org_owner = ŠŠµ Š¼Š¾Š¶ŠµŃ‚Šµ Š“Š° ŠæрŠµŠ¼Š°Ń…Š½ŠµŃ‚Šµ ŠæŠ¾ŃŠ»ŠµŠ“Š½Šøя ŠæŠ¾Ń‚Ń€ŠµŠ±ŠøтŠµŠ» Š¾Ń‚ ŠµŠŗŠøŠæŠ° Š½Š° ā€žŠæрŠøтŠµŠ¶Š°Ń‚ŠµŠ»ŠøтŠµā€œ. Š¢Ń€ŃŠ±Š²Š° Š“Š° ŠøŠ¼Š° ŠæŠ¾Š½Šµ ŠµŠ“ŠøŠ½ ŠæрŠøтŠµŠ¶Š°Ń‚ŠµŠ» Š·Š° Š¾Ń€Š³Š°Š½ŠøŠ·Š°Ń†Šøя. [action] close_issue = `Š·Š°Ń‚Š²Š¾Ń€Šø Š·Š°Š“Š°Ń‡Š° %[3]s#%[2]s` @@ -2035,7 +2368,7 @@ merge_pull_request = `сŠ»Ń Š·Š°ŃŠ²ŠŗŠ° Š·Š° сŠ»ŠøŠ²Š°Š½Šµ %[ auto_merge_pull_request = `сŠ»Ń Š°Š²Ń‚Š¾Š¼Š°Ń‚ŠøчŠ½Š¾ Š·Š°ŃŠ²ŠŗŠ° Š·Š° сŠ»ŠøŠ²Š°Š½Šµ %[3]s#%[2]s` watched_repo = Š·Š°ŠæŠ¾Ń‡Š½Š° Š“Š° Š½Š°Š±Š»ŃŽŠ“Š°Š²Š° %[2]s delete_tag = ŠøŠ·Ń‚Ń€Šø Š¼Š°Ń€ŠŗŠµŃ€Š° %[2]s Š¾Ń‚ %[3]s -delete_branch = ŠøŠ·Ń‚Ń€Šø ŠŗŠ»Š¾Š½Š° %[2]s Š¾Ń‚ %[3]s +delete_branch = ŠøŠ·Ń‚Ń€Šø ŠŗŠ»Š¾Š½Š° %[2]s Š¾Ń‚ %[3]s create_branch = съŠ·Š“Š°Š“Šµ ŠŗŠ»Š¾Š½ %[3]s Š½Š° %[4]s publish_release = `ŠæуŠ±Š»ŠøŠŗуŠ²Š° ŠøŠ·Š“Š°Š½ŠøŠµ %[4]s Š½Š° %[3]s` push_tag = ŠøŠ·Ń‚Š»Š°ŃŠŗŠ° Š¼Š°Ń€ŠŗŠµŃ€ %[3]s ŠŗъŠ¼ %[4]s @@ -2044,6 +2377,11 @@ reject_pull_request = `ŠæрŠµŠ“Š»Š¾Š¶Šø ŠæрŠ¾Š¼ŠµŠ½Šø Š·Š° %[3] compare_branch = Š”рŠ°Š²Š½ŃŠ²Š°Š½Šµ compare_commits_general = Š”рŠ°Š²Š½ŃŠ²Š°Š½Šµ Š½Š° ŠæŠ¾Š“Š°Š²Š°Š½Šøя compare_commits = Š”рŠ°Š²Š½ŠµŃ‚Šµ %d ŠæŠ¾Š“Š°Š²Š°Š½Šøя +transfer_repo = ŠæрŠµŃ…Š²ŃŠŃ€Š»Šø хрŠ°Š½ŠøŠ»ŠøщŠµ %s ŠŗъŠ¼ %s +mirror_sync_push = сŠøŠ½Ń…Ń€Š¾Š½ŠøŠ·ŠøрŠ° ŠæŠ¾Š“Š°Š²Š°Š½Šøя ŠŗъŠ¼ %[3]s Š½Š° %[4]s Š¾Ń‚ Š¾Š³Š»ŠµŠ“Š°Š»Š¾ +mirror_sync_create = сŠøŠ½Ń…Ń€Š¾Š½ŠøŠ·ŠøрŠ° Š½Š¾Š²Š° ŠæрŠµŠæрŠ°Ń‚ŠŗŠ° %[3]s ŠŗъŠ¼ %[4]s Š¾Ń‚ Š¾Š³Š»ŠµŠ“Š°Š»Š¾ +review_dismissed = `Š¾Ń‚Ń…Š²ŃŠŃ€Š»Šø рŠµŃ†ŠµŠ½Š·Šøя Š¾Ń‚ %[4]s Š·Š° %[3]s#%[2]s` +mirror_sync_delete = сŠøŠ½Ń…Ń€Š¾Š½ŠøŠ·ŠøрŠ° Šø ŠøŠ·Ń‚Ń€Šø ŠæрŠµŠæрŠ°Ń‚ŠŗŠ° %[2]s Š½Š° %[3]s Š¾Ń‚ Š¾Š³Š»ŠµŠ“Š°Š»Š¾ [auth] tab_openid = OpenID @@ -2177,6 +2515,14 @@ variables.management = Š£ŠæрŠ°Š²Š»ŠµŠ½ŠøŠµ Š½Š° ŠæрŠ¾Š¼ŠµŠ½Š»ŠøŠ²Šø variables.not_found = ŠŸŃ€Š¾Š¼ŠµŠ½Š»ŠøŠ²Š°Ń‚Š° Š½Šµ Šµ Š¾Ń‚ŠŗрŠøтŠ°. variables.id_not_exist = ŠŸŃ€Š¾Š¼ŠµŠ½Š»ŠøŠ²Š° с ŠøŠ“ŠµŠ½Ń‚ŠøфŠøŠŗŠ°Ń‚Š¾Ń€ %d Š½Šµ същŠµŃŃ‚Š²ŃƒŠ²Š°. runners.owner_type = Š¢ŠøŠæ +status.cancelled = ŠžŃ‚Š¼ŠµŠ½ŠµŠ½Š¾ +status.running = Š˜Š·ŠæъŠ»Š½ŃŠ²Š° сŠµ +status.success = Š£ŃŠæŠµŃˆŠ½Š¾ +status.waiting = Š˜Š·Ń‡Š°ŠŗŠ²Š° сŠµ +status.unknown = ŠŠµŠøŠ·Š²ŠµŃŃ‚Š½Š¾ +status.failure = ŠŠµŃƒŃŠæŠµŃˆŠ½Š¾ +status.skipped = ŠŸŃ€Š¾ŠæусŠ½Š°Ń‚Š¾ +unit.desc = Š£ŠæрŠ°Š²Š»ŠµŠ½ŠøŠµ Š½Š° ŠøŠ½Ń‚ŠµŠ³Ń€ŠøрŠ°Š½Šø CI/CD pipelines с Forgejo Actions. [heatmap] less = ŠŸŠ¾-Š¼Š°Š»ŠŗŠ¾ @@ -2258,3 +2604,33 @@ eib = Š•ŠøŠ‘ [translation_meta] test = Š¾ŠŗŠµŠ¹ + + +[gpg] +default_key = ŠŸŠ¾Š“ŠæŠøсŠ°Š½Š¾ с ŠŗŠ»ŃŽŃ‡ ŠæŠ¾ ŠæŠ¾Š“рŠ°Š·Š±ŠøрŠ°Š½Šµ +error.no_gpg_keys_found = ŠŠµ Šµ Š½Š°Š¼ŠµŃ€ŠµŠ½ ŠøŠ·Š²ŠµŃŃ‚ŠµŠ½ ŠŗŠ»ŃŽŃ‡ Š·Š° тŠ¾Š·Šø ŠæŠ¾Š“ŠæŠøс Š² Š±Š°Š·Š°Ń‚Š° Š“Š°Š½Š½Šø +error.not_signed_commit = ŠŠµ Šµ ŠæŠ¾Š“ŠæŠøсŠ°Š½Š¾ ŠæŠ¾Š“Š°Š²Š°Š½Šµ +error.generate_hash = ŠŠµŃƒŃŠæŠµŃˆŠ½Š¾ Š³ŠµŠ½ŠµŃ€ŠøрŠ°Š½Šµ Š½Š° хŠµŃˆ Š½Š° ŠæŠ¾Š“Š°Š²Š°Š½ŠµŃ‚Š¾ +error.extract_sign = ŠŠµŃƒŃŠæŠµŃˆŠ½Š¾ ŠøŠ·Š²Š»ŠøчŠ°Š½Šµ Š½Š° ŠæŠ¾Š“ŠæŠøс +error.probable_bad_signature = Š’ŠŠ˜ŠœŠŠŠ˜Š•! Š’ŃŠŠæрŠµŠŗŠø чŠµ ŠøŠ¼Š° ŠŗŠ»ŃŽŃ‡ с тŠ¾Š²Š° ID Š² Š±Š°Š·Š°Ń‚Š° Š“Š°Š½Š½Šø, тŠ¾Š¹ Š½Šµ ŠæŠ¾Ń‚Š²ŃŠŃ€Š¶Š“Š°Š²Š° тŠ¾Š²Š° ŠæŠ¾Š“Š°Š²Š°Š½Šµ! Š¢Š¾Š²Š° ŠæŠ¾Š“Š°Š²Š°Š½Šµ Šµ ŠŸŠžŠ”ŠžŠ—Š Š˜Š¢Š•Š›ŠŠž. +error.failed_retrieval_gpg_keys = ŠŠµŃƒŃŠæŠµŃˆŠ½Š¾ ŠøŠ·Š²Š»ŠøчŠ°Š½Šµ Š½Š° ŠŗŠ»ŃŽŃ‡, сŠ²ŃŠŃ€Š·Š°Š½ с Š°ŠŗŠ°ŃƒŠ½Ń‚Š° Š½Š° ŠæŠ¾Š“Š°Š²Š°Ń‰Šøя +error.probable_bad_default_signature = Š’ŠŠ˜ŠœŠŠŠ˜Š•! Š’ŃŠŠæрŠµŠŗŠø чŠµ ŠŗŠ»ŃŽŃ‡ŃŠŃ‚ ŠæŠ¾ ŠæŠ¾Š“рŠ°Š·Š±ŠøрŠ°Š½Šµ ŠøŠ¼Š° тŠ¾Š²Š° ID, тŠ¾Š¹ Š½Šµ ŠæŠ¾Ń‚Š²ŃŠŃ€Š¶Š“Š°Š²Š° тŠ¾Š²Š° ŠæŠ¾Š“Š°Š²Š°Š½Šµ! Š¢Š¾Š²Š° ŠæŠ¾Š“Š°Š²Š°Š½Šµ Šµ ŠŸŠžŠ”ŠžŠ—Š Š˜Š¢Š•Š›ŠŠž. +error.no_committer_account = ŠŃŠ¼Š° Š°ŠŗŠ°ŃƒŠ½Ń‚, сŠ²ŃŠŃ€Š·Š°Š½ с Š°Š“рŠµŃŠ° Š·Š° ŠµŠ». ŠæŠ¾Ń‰Š° Š½Š° ŠæŠ¾Š“Š°Š²Š°Ń‰Šøя + +[repo.permissions] +projects.read = Š§ŠµŃ‚ŠµŠ½Šµ: Š”Š¾ŃŃ‚ŃŠŠæ Š“Š¾ ŠæрŠ¾ŠµŠŗтŠ½ŠøтŠµ тŠ°Š±Š»Š° Š½Š° хрŠ°Š½ŠøŠ»ŠøщŠµŃ‚Š¾. +wiki.write = ŠŸŠøсŠ°Š½Šµ: Š”ъŠ·Š“Š°Š²Š°Š½Šµ, Š¾Š±Š½Š¾Š²ŃŠ²Š°Š½Šµ Šø ŠøŠ·Ń‚Ń€ŠøŠ²Š°Š½Šµ Š½Š° стрŠ°Š½ŠøцŠø Š² ŠøŠ½Ń‚ŠµŠ³Ń€ŠøрŠ°Š½Š¾Ń‚Š¾ уŠøŠŗŠø. +issues.read = Š§ŠµŃ‚ŠµŠ½Šµ: Š§ŠµŃ‚ŠµŠ½Šµ Šø съŠ·Š“Š°Š²Š°Š½Šµ Š½Š° Š·Š°Š“Š°Ń‡Šø Šø ŠŗŠ¾Š¼ŠµŠ½Ń‚Š°Ń€Šø. +pulls.read = Š§ŠµŃ‚ŠµŠ½Šµ: Š§ŠµŃ‚ŠµŠ½Šµ Šø съŠ·Š“Š°Š²Š°Š½Šµ Š½Š° Š·Š°ŃŠ²ŠŗŠø Š·Š° сŠ»ŠøŠ²Š°Š½Šµ. +pulls.write = ŠŸŠøсŠ°Š½Šµ: Š—Š°Ń‚Š²Š°Ń€ŃŠ½Šµ Š½Š° Š·Š°ŃŠ²ŠŗŠø Š·Š° сŠ»ŠøŠ²Š°Š½Šµ Šø уŠæрŠ°Š²Š»ŠµŠ½ŠøŠµ Š½Š° Š¼ŠµŃ‚Š°Š“Š°Š½Š½Šø ŠŗŠ°Ń‚Š¾ ŠµŃ‚ŠøŠŗŠµŃ‚Šø, ŠµŃ‚Š°ŠæŠø, ŠøŠ·ŠæъŠ»Š½ŠøтŠµŠ»Šø, ŠŗрŠ°Š¹Š½Šø срŠ¾ŠŗŠ¾Š²Šµ Šø Š·Š°Š²ŠøсŠøŠ¼Š¾ŃŃ‚Šø. +projects.write = ŠŸŠøсŠ°Š½Šµ: Š”ъŠ·Š“Š°Š²Š°Š½Šµ Šø рŠµŠ“Š°ŠŗтŠøрŠ°Š½Šµ Š½Š° ŠæрŠ¾ŠµŠŗтŠø Šø ŠŗŠ¾Š»Š¾Š½Šø. +releases.read = Š§ŠµŃ‚ŠµŠ½Šµ: ŠŸŃ€ŠµŠ³Š»ŠµŠ“ Šø ŠøŠ·Ń‚ŠµŠ³Š»ŃŠ½Šµ Š½Š° ŠøŠ·Š“Š°Š½Šøя. +wiki.read = Š§ŠµŃ‚ŠµŠ½Šµ: Š§ŠµŃ‚ŠµŠ½Šµ Š½Š° ŠøŠ½Ń‚ŠµŠ³Ń€ŠøрŠ°Š½Š¾Ń‚Š¾ уŠøŠŗŠø Šø Š½ŠµŠ³Š¾Š²Š°Ń‚Š° ŠøстŠ¾Ń€Šøя. +code.read = Š§ŠµŃ‚ŠµŠ½Šµ: Š”Š¾ŃŃ‚ŃŠŠæ Šø ŠŗŠ»Š¾Š½ŠøрŠ°Š½Šµ Š½Š° ŠŗŠ¾Š“Š° Š½Š° хрŠ°Š½ŠøŠ»ŠøщŠµŃ‚Š¾. +code.write = ŠŸŠøсŠ°Š½Šµ: Š˜Š·Ń‚Š»Š°ŃŠŗŠ²Š°Š½Šµ ŠŗъŠ¼ хрŠ°Š½ŠøŠ»ŠøщŠµŃ‚Š¾, съŠ·Š“Š°Š²Š°Š½Šµ Š½Š° ŠŗŠ»Š¾Š½Š¾Š²Šµ Šø Š¼Š°Ń€ŠŗŠµŃ€Šø. +issues.write = ŠŸŠøсŠ°Š½Šµ: Š—Š°Ń‚Š²Š°Ń€ŃŠ½Šµ Š½Š° Š·Š°Š“Š°Ń‡Šø Šø уŠæрŠ°Š²Š»ŠµŠ½ŠøŠµ Š½Š° Š¼ŠµŃ‚Š°Š“Š°Š½Š½Šø ŠŗŠ°Ń‚Š¾ ŠµŃ‚ŠøŠŗŠµŃ‚Šø, ŠµŃ‚Š°ŠæŠø, ŠøŠ·ŠæъŠ»Š½ŠøтŠµŠ»Šø, ŠŗрŠ°Š¹Š½Šø срŠ¾ŠŗŠ¾Š²Šµ Šø Š·Š°Š²ŠøсŠøŠ¼Š¾ŃŃ‚Šø. + +[units] +error.no_unit_allowed_repo = ŠŃŠ¼Š°Ń‚Šµ рŠ°Š·Ń€ŠµŃˆŠµŠ½ŠøŠµ Š·Š° Š“Š¾ŃŃ‚ŃŠŠæ Š“Š¾ Š½ŠøŠŗŠ¾Ń сŠµŠŗцŠøя Š½Š° тŠ¾Š²Š° хрŠ°Š½ŠøŠ»ŠøщŠµ. +unit = Š•Š»ŠµŠ¼ŠµŠ½Ń‚ +error.unit_not_allowed = ŠŃŠ¼Š°Ń‚Šµ рŠ°Š·Ń€ŠµŃˆŠµŠ½ŠøŠµ Š·Š° Š“Š¾ŃŃ‚ŃŠŠæ Š“Š¾ тŠ°Š·Šø сŠµŠŗцŠøя Š½Š° хрŠ°Š½ŠøŠ»ŠøщŠµŃ‚Š¾. \ No newline at end of file diff --git a/options/locale/locale_ca.ini b/options/locale/locale_ca.ini index 9cb7d5e50c..ea2af3b645 100644 --- a/options/locale/locale_ca.ini +++ b/options/locale/locale_ca.ini @@ -153,26 +153,26 @@ fuzzy = Difusa search = Cerca... type_tooltip = Tipus de cerca fuzzy_tooltip = Inclou resultats que s'assemblen al terme de la cerca -repo_kind = Cerca repos... -user_kind = Cerca usuaris... +repo_kind = Cerca reposā€¦ +user_kind = Cerca usuarisā€¦ code_search_unavailable = La cerca de codi no estĆ  disponible actualment. Si us plau concteu amb l'administrador del lloc. code_search_by_git_grep = Els resultats actuals de la cerca de codi sĆ³n proporcionats per "git grep". PodrĆ­en haver-hi millors resultats si l'administrador del lloc habilita l'indexador de codi. -package_kind = Cerca paquets... -project_kind = Cerca projectes... -branch_kind = Cerca branques... -commit_kind = Cerca commits... -runner_kind = Cerca executors... +package_kind = Cerca paquetsā€¦ +project_kind = Cerca projectesā€¦ +branch_kind = Cerca branquesā€¦ +commit_kind = Cerca commitsā€¦ +runner_kind = Cerca executorsā€¦ no_results = Cap resultat coincident trobat. keyword_search_unavailable = La cerca per paraula clau no estĆ  disponible ara mateix. Si us plau contacteu amb l'administrador del lloc. union = Paraules clau union_tooltip = Inclou resultats que encaixen amb qualsevol paraula clau separada per espais -org_kind = Cerca organitzacions... -team_kind = Cerca teams... -code_kind = Cerca codi... -pull_kind = Cerca "pulls"... +org_kind = Cerca organitzacionsā€¦ +team_kind = Cerca teamsā€¦ +code_kind = Cerca codiā€¦ +pull_kind = Cerca "pulls"ā€¦ exact = Exacte exact_tooltip = Inclou nomĆ©s resultats que sĆ³n exactament el terme de cerca -issue_kind = Cerca problemes... +issue_kind = Cerca problemesā€¦ regexp = RegExp regexp_tooltip = Interpreta el terme de cerca com una expressiĆ³ regular diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini index 830065fb64..c7770c5ea1 100644 --- a/options/locale/locale_cs-CZ.ini +++ b/options/locale/locale_cs-CZ.ini @@ -1063,7 +1063,7 @@ language.localization_project = Pomozte nĆ”m s překladem Forgejo do vaÅ”eho jaz user_block_yourself = NemÅÆžete zablokovat sami sebe. pronouns_custom_label = VlastnĆ­ zĆ”jmena change_username_redirect_prompt.with_cooldown.few = StarĆ© uživatelskĆ© jmĆ©no bude dostupnĆ© ostatnĆ­m po %[1]d dnech. Do tĆ© doby budete moci svĆ© starĆ© uživatelskĆ© jmĆ©no znovu zĆ­skat. -change_username_redirect_prompt.with_cooldown.one = StarĆ© uživatelskĆ© jmĆ©no bude dostupnĆ© ostatnĆ­m po %[1]d dni. Do tĆ© doby budete moci svĆ© starĆ© uživatelskĆ© jmĆ©no znovu zĆ­skat. +change_username_redirect_prompt.with_cooldown.one = StarĆ© uživatelskĆ© jmĆ©no bude dostupnĆ© ostatnĆ­m po %[1]d dnu. Do tĆ© doby budete moci svĆ© starĆ© uživatelskĆ© jmĆ©no znovu zĆ­skat. keep_pronouns_private = Zobrazovat zĆ”jmena pouze přihlĆ”Å”enĆ½m uživatelÅÆm keep_pronouns_private.description = Toto nastavenĆ­ skryje vaÅ”e zĆ”jmena před nĆ”vÅ”těvnĆ­ky, kteÅ™Ć­ nejsou přihlĆ”Å”eni. quota = KvĆ³ta @@ -1556,7 +1556,7 @@ issues.label_templates.info=ZatĆ­m nebyly vytvořeny Å¾Ć”dnĆ© Å”tĆ­tky. Vytvořt issues.label_templates.helper=Vyberte přednastavenĆ© značky issues.label_templates.use=PouÅ¾Ć­t přednastavenĆ© Å”tĆ­tky issues.label_templates.fail_to_load_file=Nepodařilo se načƭst soubor Å”ablony popisku ā€ž%sā€œ: %v -issues.add_label=přidal/a %s Å”tĆ­tek %s +issues.add_label=přidal/a Å”tĆ­tek %s %s issues.add_labels=přidal/a %s Å”tĆ­tky %s issues.remove_label=odstranil/a %s Å”tĆ­tek %s issues.remove_labels=odstranil/a %s Å”tĆ­tky %s @@ -1579,7 +1579,7 @@ issues.remove_ref_at=`odstranil/a referenci %s %s` issues.add_ref_at=`přidal/a referenci %s %s` issues.delete_branch_at=`odstranil/a větev %s %s` issues.filter_label=Å tĆ­tek -issues.filter_label_exclude=`Chcete-li vyloučit Å”tĆ­tky, použijte alt + click/enter` +issues.filter_label_exclude=Chcete-li vyloučit Å”tĆ­tky, použijte Alt + kliknutĆ­ issues.filter_label_no_select=VÅ”echny Å”tĆ­tky issues.filter_label_select_no_label=Bez Å”tĆ­tku issues.filter_milestone=MilnĆ­k @@ -1763,7 +1763,7 @@ issues.error_modifying_due_date=Změna termĆ­nu dokončenĆ­ selhala. issues.error_removing_due_date=OdstraněnĆ­ termĆ­nu dokončenĆ­ selhalo. issues.push_commit_1=přidal/a %d revizi %s issues.push_commits_n=přidal/a %d revize %s -issues.force_push_codes=`vynucenĆ© nahrĆ”nĆ­ %[1]s od %[2]s do %[4]s %[6]s` +issues.force_push_codes=`vynutil/a nahrĆ”nĆ­ %[1]s od %[2]s do %[4]s %[6]s` issues.force_push_compare=Porovnat issues.due_date_form=rrrr-mm-dd issues.due_date_form_add=Přidat termĆ­n dokončenĆ­ @@ -1813,7 +1813,7 @@ issues.review.approve=schvĆ”lil/a tyto změny %s issues.review.comment=posoudil/a %s issues.review.dismissed=zamĆ­tl/a posouzenĆ­ uživatele %s %s issues.review.dismissed_label=ZamĆ­tnuto -issues.review.left_comment=zanechal komentĆ”Å™ +issues.review.left_comment=zanechal/a komentĆ”Å™ issues.review.content.empty=Je potřeba zanechat poznĆ”mku s uvedenĆ­m požadovanĆ© změny (požadovanĆ½ch změn). issues.review.reject=poÅ¾Ć”dal/a o změny %s issues.review.wait=byl/a poÅ¾Ć”dĆ”n/a o posouzenĆ­ %s @@ -3058,7 +3058,7 @@ teams.invite.by=PozvĆ”nĆ­ od %s teams.invite.description=Pro připojenĆ­ k tĆ½mu klikněte na tlačƭtko nĆ­Å¾e. follow_blocked_user = Tuto organizaci nemÅÆžete sledovat, protože jste v nĆ­ zablokovĆ”ni. open_dashboard = OtevÅ™Ć­t nĆ”stěnku -settings.change_orgname_redirect_prompt.with_cooldown.one = StarĆ½ nĆ”zev organizace bude dostupnĆ½ ostatnĆ­m po %[1]d dni. Do tĆ© doby budete moci starĆ© jmĆ©no znovu zĆ­skat. +settings.change_orgname_redirect_prompt.with_cooldown.one = StarĆ½ nĆ”zev organizace bude dostupnĆ½ ostatnĆ­m po %[1]d dnu. Do tĆ© doby budete moci starĆ© jmĆ©no znovu zĆ­skat. settings.change_orgname_redirect_prompt.with_cooldown.few = StarĆ½ nĆ”zev organizace bude dostupnĆ½ ostatnĆ­m po %[1]d dnech. Do tĆ© doby budete moci starĆ½ nĆ”zev znovu zĆ­skat. [admin] @@ -3636,7 +3636,7 @@ auto_merge_pull_request=`automaticky sloučen požadavek na nataženĆ­ %s push_tag=nahrĆ”l/a značku %[3]s do %[4]s delete_tag=smazal/a značku %[2]s z %[3]s -delete_branch=smazal/a větev %[2]s z %[3]s +delete_branch=smazal/a větev %[2]s z %[3]s compare_branch=Porovnat compare_commits=Porovnat %d revizĆ­ compare_commits_general=Porovnat revize diff --git a/options/locale/locale_da.ini b/options/locale/locale_da.ini index c82779ab60..1a92305515 100644 --- a/options/locale/locale_da.ini +++ b/options/locale/locale_da.ini @@ -978,8 +978,8 @@ delete_with_all_comments = Din konto er yngre end %s. For at undgĆ„ spĆøgelsesko delete_account_title = Slet brugerkonto user_block_yourself = Du kan ikke blokere dig selv. pronouns_custom_label = Brugerdefinerede stedord -change_username_redirect_prompt.with_cooldown.one = Det gamle brugernavn vil vƦre tilgƦngeligt for alle efter en nedkĆølingsperiode pĆ„ %[1]d dag, du kan stadig krƦve det gamle brugernavn tilbage i nedkĆølingsperioden. -change_username_redirect_prompt.with_cooldown.few = Det gamle brugernavn vil vƦre tilgƦngeligt for alle efter en nedkĆølingsperiode pĆ„ %[1]d dage, du kan stadig krƦve det gamle brugernavn tilbage i nedkĆølingsperioden. +change_username_redirect_prompt.with_cooldown.one = Det gamle brugernavn vil vƦre tilgƦngeligt for alle efter en nedkĆølingsperiode pĆ„ %[1]d dag, Ć„r. Du kan stadig krƦve det gamle brugernavn tilbage i nedkĆølingsperioden. +change_username_redirect_prompt.with_cooldown.few = Det gamle brugernavn vil vƦre tilgƦngeligt for alle efter en nedkĆølingsperiode pĆ„ %[1]d dage, Ć„r. Du kan stadig krƦve det gamle brugernavn tilbage i nedkĆølingsperioden. keep_pronouns_private = Vis kun stedord til godkendte brugere keep_pronouns_private.description = Dette vil skjule dine stedord for besĆøgende, der ikke er logget ind. quota.applies_to_user = FĆølgende kvoteregler gƦlder for din konto @@ -1520,13 +1520,13 @@ issues.add_labels = tilfĆøjede %s etiketterne %s issues.add_remove_labels = tilfĆøjede %s og fjernede %s etiketter %s issues.add_milestone_at = `fĆøjede dette til %s milepƦlen %s` issues.add_project_at = `fĆøjede dette til %s- projektet %s` -issues.ref_reopening_from = `henviste til dette problem fra en pull-anmodning %[3]s, der vil genĆ„bne den, %[1]s` +issues.ref_reopening_from = `henviste til dette problem fra en pull-anmodning %[3]s, der vil genĆ„bne det, %[1]s` issues.ref_closed_from = `lukkede dette problem %[4]s %[2 ]s` issues.ref_reopened_from = `genĆ„bnede dette problem %[4]s %[2 ]s` issues.ref_from = `fra %[1]s` issues.author = Forfatter issues.commit_ref_at = `henviste til dette problem fra en commit %s` -issues.ref_issue_from = `henviste til dette problem %[3]s %[2 ]s` +issues.ref_issue_from = `henviste til dette problem %[3]s %[1]s` issues.ref_pull_from = `henviste til denne pull-anmodning %[3]s %[1]s` issues.ref_closing_from = `henviste til dette problem fra en pull-anmodning %[3]s, der vil lukke det, %[1]s` issues.author.tooltip.issue = Denne bruger er forfatteren til dette problem. @@ -1582,7 +1582,7 @@ issues.change_ref_at = `Ʀndret reference fra %s til issues.remove_ref_at = `fjernet reference %s %s` issues.add_ref_at = `tilfĆøjet reference %s %s` issues.delete_branch_at = `slettet gren %s %s` -issues.filter_label_exclude = `Brug alt + klik/enter for at ekskludere etiketter` +issues.filter_label_exclude = Brug Alt + klik for at ekskludere etiketter issues.filter_milestone = MilepƦl issues.filter_milestone_all = Alle milepƦle issues.filter_milestone_none = Ingen milepƦle @@ -2768,7 +2768,7 @@ close_pull_request = `lukket pull request %[3]s#%[2]s` starred_repo = stjernemarkerede %[2]s close_issue = `lukket problem %[3]s#%[2]s` comment_issue = `kommenterede problem %[3]s#%[2]s` -delete_branch = slettede gren %[2]s fra %[3]s +delete_branch = slettede gren %[2]s fra %[3]s compare_commits = Sammenlign %d commits compare_commits_general = Sammenlign commits review_dismissed = `afvist anmeldelse fra %[4]s for %[3]s#%[2]s` @@ -2833,8 +2833,8 @@ team_permission_desc = Tilladelse members.member = Medlem settings.change_orgname_prompt = BemƦrk: Ɔndring af organisationens navn vil ogsĆ„ Ʀndre din organisations URL og frigĆøre det gamle navn. settings.change_orgname_redirect_prompt = Det gamle navn vil omdirigere, indtil det gĆøres krav pĆ„. -settings.change_orgname_redirect_prompt.with_cooldown.one = Det gamle organisationsnavn vil vƦre tilgƦngeligt for alle efter en nedkĆølingsperiode pĆ„ %[1]d dag, du kan stadig krƦve det gamle navn tilbage i nedkĆølingsperioden. -settings.change_orgname_redirect_prompt.with_cooldown.few = Det gamle organisationsnavn vil vƦre tilgƦngeligt for alle efter en nedkĆølingsperiode pĆ„ %[1]d dage, du kan stadig krƦve det gamle navn tilbage i . +settings.change_orgname_redirect_prompt.with_cooldown.one = Det gamle organisationsnavn vil vƦre tilgƦngeligt for alle efter en nedkĆølingsperiode pĆ„ %[1]d dag, Ć„r. Du kan stadig krƦve det gamle navn tilbage i nedkĆølingsperioden. +settings.change_orgname_redirect_prompt.with_cooldown.few = Det gamle organisationsnavn vil vƦre tilgƦngeligt for alle efter en nedkĆølingsperiode pĆ„ %[1]d dage, Ć„r. Du kan stadig krƦve det gamle navn tilbage i. settings.update_avatar_success = Organisationens avatar er blevet opdateret. members.public_helper = GĆør skjult members.private = Skjult diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini index f8bfc9258a..8f4dfda0d1 100644 --- a/options/locale/locale_de-DE.ini +++ b/options/locale/locale_de-DE.ini @@ -752,7 +752,7 @@ organization=Organisationen uid=UID webauthn=Hardware-SicherheitsschlĆ¼ssel -public_profile=Ɩffentliches Profil +public_profile=Ɩffentliches profil biography_placeholder=ErzƤhle anderen ein wenig Ć¼ber dich selbst! (Markdown wird unterstĆ¼tzt) location_placeholder=Teile deinen ungefƤhren Standort mit anderen profile_desc=Ɯber dich @@ -3640,7 +3640,7 @@ auto_merge_pull_request=`fĆ¼hrte Pull-Request %[3]s#%[2]s au transfer_repo=hat Repository %s Ć¼bertragen zu %s push_tag=hat Tag %[3]s auf %[4]s gepusht delete_tag=hat Tag %[2]s in %[3]s gelƶscht -delete_branch=hat Branch %[2]s in %[3]s gelƶscht +delete_branch=hat Branch %[2]s in %[3]s gelƶscht compare_branch=Vergleichen compare_commits=Vergleiche %d Commits compare_commits_general=Commits vergleichen diff --git a/options/locale/locale_el-GR.ini b/options/locale/locale_el-GR.ini index 398a0d9ce4..116d5ba5a8 100644 --- a/options/locale/locale_el-GR.ini +++ b/options/locale/locale_el-GR.ini @@ -3563,7 +3563,7 @@ auto_merge_pull_request=`Ī±Ļ…Ļ„ĻŒĪ¼Ī±Ļ„Ī· ĻƒĻ…Ī³Ļ‡ĻŽĪ½ĪµĻ…ĻƒĪ· Ļ„ĪæĻ… pull reque transfer_repo=Ī¼ĪµĻ„Ī­Ļ†ĪµĻĪµ Ļ„Īæ repository %s ĻƒĪµ %s push_tag=ĻŽĪøĪ·ĻƒĪµ Ļ„Ī·Ī½ ĪµĻ„Ī¹ĪŗĪ­Ļ„Ī± %[3]s ĻƒĪµ %[4]s delete_tag=Ī“Ī¹Ī­Ī³ĻĪ±ĻˆĪµ Ļ„Ī·Ī½ ĪµĻ„Ī¹ĪŗĪ­Ļ„Ī± %[2]s Ī±Ļ€ĻŒ %[3]s -delete_branch=Ī“Ī¹Ī­Ī³ĻĪ±ĻˆĪµ Ļ„Īæ ĪŗĪ»Ī¬Ī“Īæ %[2]s Ī±Ļ€ĻŒ %[3]s +delete_branch=Ī“Ī¹Ī­Ī³ĻĪ±ĻˆĪµ Ļ„Īæ ĪŗĪ»Ī¬Ī“Īæ %[2]s Ī±Ļ€ĻŒ %[3]s compare_branch=Ī£ĻĪ³ĪŗĻĪ¹ĻƒĪ· compare_commits=Ī£ĻĪ³ĪŗĻĪ¹ĻƒĪ· %d commit compare_commits_general=Ī£ĻĪ³ĪŗĻĪ¹ĻƒĪ· commits @@ -3939,12 +3939,12 @@ submodule=Ī„Ļ€ĪæĪ¼ĪæĪ½Ī¬Ī“Ī± [search] code_search_unavailable = Ī— Ī±Ī½Ī±Ī¶Ī®Ļ„Ī·ĻƒĪ· ĪŗĻŽĪ“Ī¹ĪŗĪ± Ī“ĪµĪ½ ĪµĪÆĪ½Ī±Ī¹ ĪµĻ€ĪÆ Ļ„ĪæĻ… Ļ€Ī±ĻĻŒĪ½Ļ„ĪæĻ‚ Ī“Ī¹Ī±ĪøĪ­ĻƒĪ¹Ī¼Ī·. Ī Ī±ĻĪ±ĪŗĪ±Ī»ĻŽ ĪµĻ€Ī¹ĪŗĪæĪ¹Ī½Ļ‰Ī½Ī®ĻƒĻ„Īµ Ī¼Īµ Ļ„ĪæĪ½ Ī“Ī¹Ī±Ļ‡ĪµĪ¹ĻĪ¹ĻƒĻ„Ī® ĻƒĪ±Ļ‚. keyword_search_unavailable = Ī— Ī±Ī½Ī±Ī¶Ī®Ļ„Ī·ĻƒĪ· Ī¼Īµ Ļ„Ī·Ī½ Ļ‡ĻĪ®ĻƒĪ· Ī»Ī­Ī¾ĪµĻ‰Ī½-ĪŗĪ»ĪµĪ¹Ī“Ī¹ĻŽĪ½ Ī“ĪµĪ½ ĪµĪÆĪ½Ī±Ī¹ ĪµĻ€ĪÆ Ļ„ĪæĻ… Ļ€Ī±ĻĻŒĪ½Ļ„ĪæĻ‚ Ī“Ī¹Ī±ĪøĪ­ĻƒĪ¹Ī¼Ī·. Ī Ī±ĻĪ±ĪŗĪ±Ī»ĻŽ ĪµĻ€Ī¹ĪŗĪæĪ¹Ī½Ļ‰Ī½Ī®ĻƒĻ„Īµ Ī¼Īµ Ļ„ĪæĪ½ Ī“Ī¹Ī±Ļ‡ĪµĪ¹ĻĪ¹ĻƒĻ„Ī® ĻƒĪ±Ļ‚. -runner_kind = Ī‘Ī½Ī±Ī¶Ī®Ļ„Ī·ĻƒĪ· runner... +runner_kind = Ī‘Ī½Ī±Ī¶Ī®Ļ„Ī·ĻƒĪ· runnerā€¦ code_search_by_git_grep = Ī“Ī¹Ī± Ļ„Ī·Ī½ Ī±Ī½Ī±Ī¶Ī®Ļ„Ī·ĻƒĪ· ĪŗĻŽĪ“Ī¹ĪŗĪ±, Ļ‡ĻĪ·ĻƒĪ¹Ī¼ĪæĻ€ĪæĪ¹ĪµĪÆĻ„Ī±Ī¹ Ī· ĪµĪ½Ļ„ĪæĪ»Ī® Ā«git grepĀ». ĪŠĻƒĻ‰Ļ‚ Ī½Ī± Ļ€Ī±ĻĪæĻ…ĻƒĪ¹Ī±ĻƒĻ„ĪæĻĪ½ ĪŗĪ±Ī»ĻĻ„ĪµĻĪ± Ī±Ļ€ĪæĻ„ĪµĪ»Ī­ĻƒĪ¼Ī±Ļ„Ī±, Ī±Ī½ Īæ Ī“Ī¹Ī±Ļ‡ĪµĪ¹ĻĪ¹ĻƒĻ„Ī®Ļ‚ ĻƒĪ±Ļ‚ ĪµĪ½ĪµĻĪ³ĪæĻ€ĪæĪ¹Ī®ĻƒĪµĪ¹ Ī­Ī½Ī± ĪµĻ…ĻĪµĻ„Ī®ĻĪ¹Īæ Ī³Ī¹Ī± Ī±Ļ€ĪæĪøĪµĻ„Ī®ĻĪ¹Ī± (Ā«Repository IndexerĀ»). package_kind = Ī‘Ī½Ī±Ī¶Ī®Ļ„Ī·ĻƒĪ· Ļ€Ī±ĪŗĪ­Ļ„Ļ‰Ī½ā€¦ -project_kind = Ī‘Ī½Ī±Ī¶Ī®Ļ„Ī·ĻƒĪ· Ī­ĻĪ³Ļ‰Ī½... +project_kind = Ī‘Ī½Ī±Ī¶Ī®Ļ„Ī·ĻƒĪ· Ī­ĻĪ³Ļ‰Ī½ā€¦ branch_kind = Ī‘Ī½Ī±Ī¶Ī®Ļ„Ī·ĻƒĪ· ĪŗĪ»Ī¬Ī“Ļ‰Ī½ā€¦ -commit_kind = Ī‘Ī½Ī±Ī¶Ī®Ļ„Ī·ĻƒĪ· commit... +commit_kind = Ī‘Ī½Ī±Ī¶Ī®Ļ„Ī·ĻƒĪ· commitā€¦ no_results = Ī”ĪµĪ½ Ī²ĻĪ­ĪøĪ·ĪŗĪ±Ī½ ĪŗĪ±Ļ„Ī¬Ī»Ī»Ī·Ī»Ī± Ī±Ļ€ĪæĻ„ĪµĪ»Ī­ĻƒĪ¼Ī±Ļ„Ī±. search = Ī‘Ī½Ī±Ī¶Ī®Ļ„Ī·ĻƒĪ·ā€¦ type_tooltip = Ī•ĪÆĪ“ĪæĻ‚ Ī±Ī½Ī±Ī¶Ī®Ļ„Ī·ĻƒĪ·Ļ‚ @@ -3958,8 +3958,8 @@ org_kind = Ī‘Ī½Ī±Ī¶Ī®Ļ„Ī·ĻƒĪ· ĪæĻĪ³Ī±Ī½Ī¹ĻƒĪ¼ĻŽĪ½ā€¦ team_kind = Ī‘Ī½Ī±Ī¶Ī®Ļ„Ī·ĻƒĪ· ĪæĪ¼Ī±Ī“ĻŽĪ½ā€¦ code_kind = Ī‘Ī½Ī±Ī¶Ī®Ļ„Ī·ĻƒĪ· ĪŗĻŽĪ“Ī¹ĪŗĪ±ā€¦ exact_tooltip = ĪĪ± ĻƒĻ…Ī¼Ļ€ĪµĻĪ¹Ī»Ī·Ļ†ĪøĪæĻĪ½ Ī¼ĻŒĪ½Īæ Ī±Ļ€ĪæĻ„ĪµĪ»Ī­ĻƒĪ¼Ī±Ļ„Ī± Ļ€ĪæĻ… Ļ„Ī±Ī¹ĻĪ¹Ī¬Ī¶ĪæĻ…Ī½ Ī¼Īµ Ļ„ĪæĪ½ ĻŒĻĪæ Ī±Ī½Ī±Ī¶Ī®Ļ„Ī·ĻƒĪ·Ļ‚ -issue_kind = Ī‘Ī½Ī±Ī¶Ī®Ļ„Ī·ĻƒĪ· Ī¶Ī·Ļ„Ī·Ī¼Ī¬Ļ„Ļ‰Ī½... -pull_kind = Ī‘Ī½Ī±Ī¶Ī®Ļ„Ī·ĻƒĪ· pull... +issue_kind = Ī‘Ī½Ī±Ī¶Ī®Ļ„Ī·ĻƒĪ· Ī¶Ī·Ļ„Ī·Ī¼Ī¬Ļ„Ļ‰Ī½ā€¦ +pull_kind = Ī‘Ī½Ī±Ī¶Ī®Ļ„Ī·ĻƒĪ· pullā€¦ exact = Ī‘ĪŗĻĪ¹Ī²Ī®Ļ‚ milestone_kind = Ī‘Ī½Ī±Ī¶Ī®Ļ„Ī·ĻƒĪ· ĪæĻĻŒĻƒĪ·Ī¼Ļ‰Ī½... union = ĪˆĪ½Ļ‰ĻƒĪ· diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 5fd2ebd163..cce62685bf 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -3564,7 +3564,7 @@ auto_merge_pull_request = `automatically merged pull request %[3 transfer_repo = transferred repository %s to %s push_tag = pushed tag %[3]s to %[4]s delete_tag = deleted tag %[2]s from %[3]s -delete_branch = deleted branch %[2]s from %[3]s +delete_branch = deleted branch %[2]s from %[3]s compare_branch = Compare compare_commits = Compare %d commits compare_commits_general = Compare commits diff --git a/options/locale/locale_eo.ini b/options/locale/locale_eo.ini index 6393765d63..5a06120e9e 100644 --- a/options/locale/locale_eo.ini +++ b/options/locale/locale_eo.ini @@ -630,7 +630,7 @@ account = Konto ssh_gpg_keys = SSH / GPG-ŝlosiloj twofa_disable = Malaktivigi duoblan aÅ­tentikigon twofa_enroll = Ŝalti duoblan aÅ­tentikigon -orgs = Mastrumi organizaĵojn +orgs = Organizaĵoj blocked_users = Blokitaj uzantoj profile = Profilo ui = HaÅ­to @@ -686,7 +686,7 @@ verify_ssh_key_success = SSH-ŝlosilo Ā«%sĀ» jam konfirmiĝis. edit_oauth2_application = Redakti OAuth2-programon gpg_key_deletion = Forigi GPG-ŝlosilon gpg_key_matched_identities = Akordaj identecoj: -manage_themes = Elekti implicitan haÅ­ton +manage_themes = DefaÅ­lta temo ssh_key_deletion = Forigi SSH-ŝlosilon key_state_desc = Ĉi tiu ŝlosilo uziĝis dum la pasintaj 7 tagoj valid_forever = Validos dumĉiame @@ -700,7 +700,7 @@ primary = Ĉefa ssh_disabled = SSH malaktivigita update_avatar_success = Via profilbildo konserviĝis. keep_email_private = Kaŝi retpoŝtadreson -manage_openid = Mastrumi OpenID-adresojn +manage_openid = OpenID-adresoj delete_current_avatar = Forigi nunan profilbildon email_preference_set_success = Retpoŝta prefero konserviĝis sukcese. permissions_access_all = Ĉiu (publika, privata, kaj limigita) @@ -884,9 +884,9 @@ commit_kind = Serĉi enmetojnā€¦ no_results = Ne trovis kongruantajn rezultojn. exact = Ĝusta exact_tooltip = Inkluzivas nur rezultojn kongruantajn kun la ĝustaj serĉoterminoj -issue_kind = Serĉi erarojn... +issue_kind = Serĉi erarojnā€¦ regexp_tooltip = Interpretas la serĉoterminoj kiel regulesprimo fuzzy = Svaga branch_kind = Serĉi disbranĉigojnā€¦ -runner_kind = Serĉi rulantojn... -pull_kind = Serĉi tirpetojn... \ No newline at end of file +runner_kind = Serĉi rulantojnā€¦ +pull_kind = Serĉi tirpetojnā€¦ \ No newline at end of file diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini index bdafba93b4..582baeebdd 100644 --- a/options/locale/locale_es-ES.ini +++ b/options/locale/locale_es-ES.ini @@ -740,7 +740,7 @@ avatar=Avatar ssh_gpg_keys=Claves SSH / GPG social=Redes sociales applications=Aplicaciones -orgs=Administrar organizaciones +orgs=Organizaciones repos=Repositorios delete=Eliminar cuenta twofa=AutenticaciĆ³n de dos factores (TOTP) @@ -1075,8 +1075,8 @@ keep_pronouns_private = Mostrar pronombres solo a personas autenticadas storage_overview = Resumen del almacenamiento quota.sizes.assets.artifacts = Artefactos quota.sizes.assets.attachments.releases = Archivos adjuntos del lanzamiento -change_username_redirect_prompt.with_cooldown.few = El antiguo nombre de usuario estarĆ” disponible para todos despuĆ©s un periodo de tiempo de espera de %[1]d dĆ­as, aĆŗn puedes reclamar el antiguo nombre de usuario durante el periodo de tiempo de espera. -change_username_redirect_prompt.with_cooldown.one = El antiguo nombre de usuario estarĆ” disponible para todos despuĆ©s un periodo de tiempo de espera de %[1]d dĆ­a, aĆŗn puedes reclamar el antiguo nombre de usuario durante el periodo de tiempo de espera. +change_username_redirect_prompt.with_cooldown.few = El antiguo nombre de usuario estarĆ” disponible para todos despuĆ©s un periodo de tiempo de espera de %[1]d dĆ­as. AĆŗn puedes reclamar el antiguo nombre de usuario durante el periodo de tiempo de espera. +change_username_redirect_prompt.with_cooldown.one = El antiguo nombre de usuario estarĆ” disponible para todos despuĆ©s un periodo de tiempo de espera de %[1]d dĆ­a. AĆŗn puedes reclamar el antiguo nombre de usuario durante el periodo de tiempo de espera. quota.rule.exceeded = Excedido quota.rule.no_limit = Ilimitado quota.sizes.assets.all = Activos @@ -1574,7 +1574,7 @@ issues.remove_ref_at=`eliminĆ³ la referencia %s %s` issues.add_ref_at=`aƱadiĆ³ la referencia %s %s` issues.delete_branch_at=`eliminĆ³ la rama %s %s` issues.filter_label=Etiqueta -issues.filter_label_exclude=`Usa alt + clic/enter para excluir etiquetas` +issues.filter_label_exclude=Usa Alt + Click para excluir etiquetas issues.filter_label_no_select=Todas las etiquetas issues.filter_label_select_no_label=Sin etiqueta issues.filter_milestone=Hito @@ -2887,6 +2887,8 @@ pulls.delete_after_merge.head_branch.is_default = La rama actual que desea elimi summary_card_alt = Tarjeta de resumen del repositorio %s settings.pull_mirror_sync_quota_exceeded = Cuota excedida, no se empujan los cambios. archive.nocomment = No es posible hacer comentarios porque el repositorio estĆ” archivado. +sync_fork.branch_behind_one = Esta rama esta %[1]d cambios detrĆ”s de %[2]s +sync_fork.branch_behind_few = Esta rama estĆ” %[1]d confirmaciones detrĆ”s de %[2]s [graphs] component_loading = Cargando %sā€¦ @@ -3586,7 +3588,7 @@ auto_merge_pull_request=`fusionado automĆ”ticamente pull request %s a %s push_tag=hizĆ³ push la etiqueta %[3]s a %[4]s delete_tag=etiqueta eliminada %[2]s de %[3]s -delete_branch=rama %[2]s eliminada, de %[3]s +delete_branch=rama %[2]s eliminada, de %[3]s compare_branch=Comparar compare_commits=Comparar %d commits compare_commits_general=Comparar commits diff --git a/options/locale/locale_et.ini b/options/locale/locale_et.ini index e54ceadbb5..58e5776d33 100644 --- a/options/locale/locale_et.ini +++ b/options/locale/locale_et.ini @@ -145,25 +145,25 @@ fuzzy_tooltip = Lisage tulemused mis vastavad ka otsingu terminile union = MƤrksƵnad exact = TƤpne exact_tooltip = Sisaldab ainult tulemusi mis vastavad tƤpsele otsingusƵnale -repo_kind = Otsi hoidlad... -user_kind = Otsi kasutajaid... -org_kind = Otsi organisatsioone... -team_kind = Otsi meeskonnad... -code_kind = Otsi koodi... +repo_kind = Otsi hoidladā€¦ +user_kind = Otsi kasutajaidā€¦ +org_kind = Otsi organisatsiooneā€¦ +team_kind = Otsi meeskonnadā€¦ +code_kind = Otsi koodiā€¦ code_search_by_git_grep = Praeguse koodi otsingu tulemused annab "git grep". Paremaid tulemusi vƵib saada, kui saidi administraator lubab koodi indekseerija. -package_kind = Otsi pakette... -project_kind = Otsi projekte... -branch_kind = Otsi harusid... -commit_kind = Otsi kommiteid... -runner_kind = Otsi jooksjaid... +package_kind = Otsi paketteā€¦ +project_kind = Otsi projekteā€¦ +branch_kind = Otsi harusidā€¦ +commit_kind = Otsi kommiteidā€¦ +runner_kind = Otsi jooksjaidā€¦ no_results = Sobivaid tulemusi ei leitud. -issue_kind = Otsi probleeme... +issue_kind = Otsi probleemeā€¦ milestone_kind = Otsi verstapostid... type_tooltip = Otsingu tĆ¼Ć¼p code_search_unavailable = Koodide otsing ei ole praegu saadaval. Palun vƵtke Ć¼hendust saidi administraatoriga. union_tooltip = Sisaldab tulemused mis vastavad mis tahes tĆ¼hikutega eraldatud vƵtmesƵnadele keyword_search_unavailable = Otsing mƤrksƵna jƤrgi ei ole praegu saadaval. Palun vƵtke Ć¼hendust saidi administraatoriga. -pull_kind = Otsi tƵmbepƤringuid... +pull_kind = Otsi tƵmbepƤringuidā€¦ [aria] navbar = Navigatsiooniriba diff --git a/options/locale/locale_fa-IR.ini b/options/locale/locale_fa-IR.ini index dae0695495..23cb74f814 100644 --- a/options/locale/locale_fa-IR.ini +++ b/options/locale/locale_fa-IR.ini @@ -608,7 +608,7 @@ avatar=Ų¢ŁˆŲ§ŲŖŲ§Ų± ssh_gpg_keys=Ś©Ł„ŪŒŲÆā€ŒŁ‡Ų§ŪŒ SSH / GPG social=Ų­Ų³Ų§ŲØ Ł‡Ų§ŪŒ Ų§Ų¬ŲŖŁ…Ų§Ų¹ŪŒ applications=ŲØŲ±Ł†Ų§Ł…Ł‡ā€ŒŁ‡Ų§ -orgs=Ł…ŲÆŪŒŲ±ŪŒŲŖ Ų³Ų§Ų²Ł…Ų§Ł†ā€ŒŁ‡Ų§ +orgs=Ų³Ų§Ų²Ł…Ų§Ł†ā€ŒŁ‡Ų§ repos=Ł…Ų®Ų§Ų²Ł† delete=Ų­Ų°Ł Ų­Ų³Ų§ŲØ Ś©Ų§Ų±ŲØŲ±ŪŒ twofa=Ų§Ų­Ų±Ų§Ų² Ł‡ŁˆŪŒŲŖ ŲÆŁˆŚÆŲ§Ł†Ł‡ @@ -653,8 +653,8 @@ password_change_disabled=Ś©Ų§Ų±ŲØŲ±Ų§Ł† ŲŗŪŒŲ± Ł…Ų­Ł„ŪŒ Ł†Ł…ŪŒŲŖŁˆŲ§Ł†Ł†ŲÆ ŚÆŲ° emails=Ł†Ų“Ų§Ł†ŪŒā€ŒŁ‡Ų§ŪŒ Ų§ŪŒŁ…ŪŒŁ„ manage_emails=Ł…ŲÆŪŒŲ±ŪŒŲŖ Ł†Ų“Ų§Ł†ŪŒā€ŒŁ‡Ų§ŪŒ Ų§ŪŒŁ…ŪŒŁ„ -manage_themes=ŲŖŁ… Ł¾ŪŒŲ“ ŁŲ±Ų¶ Ų±Ų§ Ų§Ł†ŲŖŲ®Ų§ŲØ Ś©Ł†ŪŒŲÆ -manage_openid=Ł…ŲÆŪŒŲ±ŪŒŲŖ Ł†Ų“Ų§Ł†ŪŒā€ŒŁ‡Ų§ŪŒ OpenID +manage_themes=ŲŖŁ… Ł¾ŪŒŲ“ ŁŲ±Ų¶ +manage_openid=Ų¢ŲÆŲ±Ų³ā€ŒŁ‡Ų§ŪŒ OpenID theme_desc=Ų§ŪŒŁ† Ł¾ŁˆŲ“ŲŖŁ‡ Ł¾ŪŒŲ“ ŁŲ±Ų¶ Ų“Ł…Ų§ ŲÆŲ± Ų³Ų±Ų§Ų³Ų± Ų³Ų§ŪŒŲŖ Ł…ŪŒ ŲØŲ§Ų“ŲÆ. primary=Ų§ŲµŁ„ŪŒ activated=ŁŲ¹Ų§Ł„ Ų“ŲÆŁ‡ @@ -2766,23 +2766,23 @@ search = Ų¬Ų³ŲŖŲ¬Łˆ... fuzzy = ŲÆŲ±Ł‡Ł… fuzzy_tooltip = Ł¾ŪŒŲ§Ł…ŲÆŁ‡Ų§ŪŒŪŒ Ų±Ų§ ŲÆŲ±Ų¬ Ś©Ł†ŪŒŲÆ Ś©Ł‡ ŲÆŁ‚ŪŒŁ‚Ų§ ŲØŲ§ Ų¹ŲØŲ§Ų±ŲŖ Ų¬Ų³ŲŖŲ¬Łˆ Ł‡Ł…Ų®ŁˆŲ§Ł†ŪŒ ŲÆŲ§Ų“ŲŖŁ‡ ŲØŲ§Ų“Ł†ŲÆ regexp = Ų¹ŲØŲ§Ų±Ų§ŲŖ ŲØŲ§Ł‚Ų§Ų¹ŲÆŁ‡ -pull_kind = Ų¬Ų³ŲŖŲ¬Łˆ ŁˆŲ§Ś©Ų“ŪŒā€ŒŁ‡Ų§... +pull_kind = Ų¬Ų³ŲŖŲ¬Łˆ ŁˆŲ§Ś©Ų“ŪŒā€ŒŁ‡Ų§ā€¦ no_results = Ł†ŲŖŪŒŲ¬Ł‡ ŲÆŲ±Ų®ŁˆŲ±ŪŒ ŪŒŲ§ŁŲŖ Ł†Ų“ŲÆ. -runner_kind = Ų¬Ų³ŲŖŲ¬Łˆ ŲÆŁˆŁ†ŲÆŁ‡ā€ŒŁ‡Ų§... +runner_kind = Ų¬Ų³ŲŖŲ¬Łˆ ŲÆŁˆŁ†ŲÆŁ‡ā€ŒŁ‡Ų§ā€¦ keyword_search_unavailable = Ų¬Ų³ŲŖŲ¬Łˆ Ś©Ł„ŪŒŲÆŁˆŲ§Ś˜Ł‡ Ų§Ś©Ł†ŁˆŁ† ŲÆŲ± ŲÆŲ±Ų³ŲŖŲ±Ų³ Ł†ŪŒŲ³ŲŖ. Ł„Ų·ŁŲ§ ŲØŲ§ Ł…ŲÆŪŒŲ± Ų³Ų§ŪŒŲŖ ŲÆŲ± Ł…ŪŒŲ§Ł† ŲØŚÆŲ°Ų§Ų±ŪŒŲÆ. -repo_kind = Ų¬Ų³ŲŖŲ¬Łˆ Ł…Ų®Ų§Ų²Ł†... +repo_kind = Ų¬Ų³ŲŖŲ¬Łˆ Ł…Ų®Ų§Ų²Ł†ā€¦ regexp_tooltip = Ų§ŲµŲ·Ł„Ų§Ų­ Ų¬Ų³ŲŖŲ¬Łˆ Ų“ŲÆŁ‡ Ų±Ų§ ŲØŲ§ Ų¹ŲØŲ§Ų±Ų§ŲŖ ŲØŲ§Ł‚Ų§Ų¹ŲÆŁ‡ ŲŖŁŲ³ŪŒŲ± Ś©Ł† -user_kind = Ų¬Ų³ŲŖŲ¬Łˆ Ś©Ų§Ų±ŲØŲ±Ų§Ł†... -org_kind = Ų¬Ų³ŲŖŲ¬Łˆ Ų³Ų§Ų²Ł…Ų§Ł†ā€ŒŁ‡Ų§... -team_kind = Ų¬Ų³ŲŖŲ¬Łˆ ŚÆŲ±ŁˆŁ‡ā€ŒŁ‡Ų§... -package_kind = Ų¬Ų³ŲŖŲ¬Łˆ ŲØŲ³ŲŖŁ‡ā€ŒŁ‡Ų§... -project_kind = Ų¬Ų³ŲŖŲ¬Łˆ Ł¾Ų±ŁˆŚ˜Ł‡ā€ŒŁ‡Ų§... +user_kind = Ų¬Ų³ŲŖŲ¬Łˆ Ś©Ų§Ų±ŲØŲ±Ų§Ł†ā€¦ +org_kind = Ų¬Ų³ŲŖŲ¬Łˆ Ų³Ų§Ų²Ł…Ų§Ł†ā€ŒŁ‡Ų§ā€¦ +team_kind = Ų¬Ų³ŲŖŲ¬Łˆ ŚÆŲ±ŁˆŁ‡ā€ŒŁ‡Ų§ā€¦ +package_kind = Ų¬Ų³ŲŖŲ¬Łˆ ŲØŲ³ŲŖŁ‡ā€ŒŁ‡Ų§ā€¦ +project_kind = Ų¬Ų³ŲŖŲ¬Łˆ Ł¾Ų±ŁˆŚ˜Ł‡ā€ŒŁ‡Ų§ā€¦ code_search_unavailable = Ų¬Ų³ŲŖŲ¬ŁˆŪŒ Ś©ŲÆ Ų§Ś©Ł†ŁˆŁ† ŲÆŲ± ŲÆŲ³ŲŖŲ±Ų³ Ł†ŪŒŲ³ŲŖ. Ł„Ų·ŁŲ§ ŲØŲ§ Ł…ŲÆŪŒŲ± Ų³Ų§ŪŒŲŖ ŲÆŲ±Ł…ŪŒŲ§Ł† ŲØŚÆŲ°Ų§Ų±ŪŒŲÆ. -code_kind = Ų¬Ų³ŲŖŲ¬Łˆ Ś©ŲÆŁ‡Ų§... +code_kind = Ų¬Ų³ŲŖŲ¬Łˆ Ś©ŲÆŁ‡Ų§ā€¦ union = ŲØŁ‡Ł… Ł¾ŪŒŁˆŲ³ŲŖŚÆŪŒ union_tooltip = Ł†ŲŖŲ§ŪŒŲ¬ŪŒ Ų±Ų§ ŲÆŲ± ŲØŲ± ŲØŚÆŪŒŲ± Ś©Ł‡ ŲØŲ§ Ł‡Ų± ŪŒŚ© Ų§Ų² Ś©Ł„ŪŒŲÆŁˆŲ§Ś˜Ł‡ā€ŒŁ‡Ų§ŪŒ Ų¬ŲÆŲ§ Ų“ŲÆŁ‡ Ų§Ų² ŁŲ¶Ų§ŪŒā€ŒŲ®Ų§Ł„ŪŒ Ł…Ų·Ų§ŲØŁ‚ŲŖ ŲÆŲ§Ų±ŲÆ -branch_kind = Ų¬Ų³ŲŖŲ¬Łˆ Ų“Ų§Ų®Ł‡ā€ŒŁ‡Ų§... -commit_kind = Ų¬Ų³ŲŖŲ¬Łˆ Ų³Ł¾Ų±ŲÆŁ‡ā€ŒŁ‡Ų§... -issue_kind = Ų¬Ų³ŲŖŲ¬Łˆ Ł…Ų“Ś©Ł„Ų§ŲŖ... +branch_kind = Ų¬Ų³ŲŖŲ¬Łˆ Ų“Ų§Ų®Ł‡ā€ŒŁ‡Ų§ā€¦ +commit_kind = Ų¬Ų³ŲŖŲ¬Łˆ Ų³Ł¾Ų±ŲÆŁ‡ā€ŒŁ‡Ų§ā€¦ +issue_kind = Ų¬Ų³ŲŖŲ¬Łˆ Ł…Ų“Ś©Ł„Ų§ŲŖā€¦ exact = Ł…Łˆ ŲØŁ‡ Ł…Łˆ exact_tooltip = Ł†ŲŖŲ§ŪŒŲ¬ŪŒ Ų±Ų§ ŲÆŲ± ŲØŲ± ŲØŚÆŪŒŲ± Ś©Ł‡ Ł…Łˆ ŲØŁ‡ Ł…Łˆ ŲØŲ§ Ų§ŲµŲ·Ł„Ų§Ų­ Ų¬Ų³ŲŖŲ¬Łˆ Ų“ŲÆŁ‡ ŪŒŚ©ŪŒ ŲØŲ§Ų“ŲÆ diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini index 164a60cc8d..263fab8774 100644 --- a/options/locale/locale_fi-FI.ini +++ b/options/locale/locale_fi-FI.ini @@ -667,6 +667,12 @@ username_change_not_local_user = Ei-paikallisten kƤyttƤjien ei sallita vaihtaa admin_cannot_delete_self = Et voi poistaa itseƤsi, kun olet yllƤpitƤjƤ. Poista ensin yllƤpito-oikeudet itseltƤsi. username_claiming_cooldown = KƤyttƤjƤnimeƤ ei voi ottaa kƤyttƶƶn, koska siihen kohdistuva suojaamisjakso ei ole vielƤ pƤƤttynyt. KƤyttƤjƤnimen voi ottaa kƤyttƶƶn %[1]s. email_domain_is_not_allowed = KƤyttƤjƤn sƤhkƶpostiosoitteen %s verkkotunnus on ristiriidassa EMAIL_DOMAIN_ALLOWLIST:in tai EMAIL_DOMAIN_BLOCKLIST:in kanssa. Varmista, ettƤ olen asettanut sƤhkƶpostiosoitteen oikein. +unsupported_login_type = TƤllƤ kirjautumistavalla ei voi poistaa tunnusta. +invalid_ssh_principal = VƤƤrƤ toimija: %s +unset_password = Kirjautuneen kƤyttƤjƤn salasanaa ei ole asetettu. +invalid_group_team_map_error = ` kuvaus ei ole kelvollinen: %s` +2fa_auth_required = EtƤvierailu vaati kaksivaiheisen todennuksen. +visit_rate_limit = EtƤvierailujen pyyntƶrajoitukset. [user] @@ -1037,6 +1043,8 @@ passcode_invalid = Virheellinen pƤƤsykoodi. YritƤ uudelleen. then_enter_passcode = Kirjoita sovelluksessa nƤkyvƤ pƤƤsykoodi: gpg_key_matched_identities_long = TƤhƤn avaimeen upotetut identiteetit vastaavat tƤmƤn kƤyttƤjƤn seuraavia aktivoituja sƤhkƶpostiosoitteita. Kommitit, jotka vastaavat nƤitƤ sƤhkƶpostiosoitteita, voidaan vahvistaa tƤllƤ avaimella. twofa_failed_get_secret = Salaisuuden saaminen epƤonnistui. +uid = UID +hidden_comment_types.ref_tooltip = Kommentit missƤ tƤhƤn ongelmaan viitattiin toisesta ongelmasta/kommitista/ā€¦ [repo] owner=Omistaja @@ -2255,14 +2263,14 @@ pulls.cmd_instruction_merge_warning = Varoitus: Asetusta ā€Tunnista manu pulls.cmd_instruction_merge_desc = YhdistƤ muutokset ja pƤivitƤ Forgejossa. pulls.cannot_auto_merge_desc = TƤtƤ vetopyyntƶƤ ei voida yhdistƤƤ automaattisesti ristiriitojen vuoksi. adopt_preexisting_success = Omaksuttu tiedostot ja luotu tietovarasto lƤhteestƤ %s -issues.comment_manually_pull_merged_at = manuaalisesti yhdistetty kommitti %[1]s %[2]s tietovarastoon %[3]s +issues.comment_manually_pull_merged_at = manuaalisesti yhdisti kommitin %[1]s %[2]s tietovarastoon %[3]s pulls.cmd_instruction_merge_title = YhdistƤ pulls.has_merged = EpƤonnistui: vetopyyntƶ on yhdistetty, joten et voi yhdistƤƤ uudelleen tai muuttaa kohdehaaraa. pulls.cmd_instruction_checkout_title = Uloskuittaus pulls.cmd_instruction_checkout_desc = Kuittaa ulos uusi haara projektitietovarastostasi ja testaa muutokset. pulls.clear_merge_message_hint = YhdistƤmisviestin tyhjentƤminen poistaa vain kommittiviestin sisƤllƶn ja sƤilyttƤƤ luodut git-trailerit, kuten "Co-Authored-Byā€¦". settings.protect_check_status_contexts_desc = Vaadi tilatarkistusten lƤpƤisy ennen yhdistƤmistƤ. Kun kƤytƶssƤ, kommitit on ensin tyƶnnettƤvƤ toiseen haaraan ja sitten yhdistettƤvƤ tai tyƶnnettƤvƤ suoraan tƤtƤ sƤƤntƶƤ vastaavaan haaraan tilantarkistuksen jƤlkeen. Jos konteksteja ei lƶydy, viimeisen kommitin on oltava onnistunut kontekstista riippumatta. -issues.comment_pull_merged_at = yhdistetty kommitti %[1]s %[2]s tietovarastoon %[3]s +issues.comment_pull_merged_at = yhdisti kommitin %[1]s %[2]s haaraan %[3]s settings.pulls.enable_autodetect_manual_merge = Ota Tunnista manuaalinen yhdistƤminen automaattisesti -asetus kƤyttƶƶn (Huomaa: joissakin erityistapauksissa voi esiintyƤ virhearviointeja) pulls.no_merge_desc = TƤtƤ vetopyyntƶƤ ei voida yhdistƤƤ, koska kaikki tietovaraston yhdistƤmisvaihtoehdot ovat poistettu kƤytƶstƤ. pulls.no_merge_not_ready = TƤmƤ vetopyyntƶ ei ole valmis yhdistettƤvƤksi. Tarkista katselmoinnin tila ja tilantarkistukset. @@ -3180,7 +3188,7 @@ close_issue = `sulki ongelman %[3]s#%[2]s` merge_pull_request = `yhdisti vetopyynnƶn %[3]s#%[2]s` comment_pull = `kommentoi vetopyyntƶƤ %[3]s#%[2]s` auto_merge_pull_request = `automaattisesti yhdisti vetopyynnƶn %[3]s#%[2]s` -delete_branch = poisti haaran %[2]s tietovarastosta %[3]s +delete_branch = poisti haaran %[2]s tietovarastosta %[3]s watched_repo = aloitti tietovaraston %[2]s tarkkailun approve_pull_request = `hyvƤksyi %[3]s#%[2]s` starred_repo = lisƤsi tƤhden tietovarastolle %[2]s diff --git a/options/locale/locale_fil.ini b/options/locale/locale_fil.ini index 8c9badb04b..032b8b0435 100644 --- a/options/locale/locale_fil.ini +++ b/options/locale/locale_fil.ini @@ -699,7 +699,7 @@ security = Seguridad avatar = Avatar ssh_gpg_keys = Mga SSH / GPG key applications = Mga Aplikasyon -orgs = Ipamahala ang mga organisasyon +orgs = Mga organisasyon repos = Mga Repositoryo delete = Burahin ang account twofa = Authentikasyong two-factor (TOTP) @@ -707,7 +707,7 @@ account_link = Mga naka-link na account uid = UID webauthn = Authentikasyong two-factor (Mga security key) blocked_users = Mga hinarang na user -public_profile = Pampublikong Profile +public_profile = Pampublikong profile location_placeholder = Ibahagi ang iyong tinatayang lokasyon sa iba password_username_disabled = Ang mga di-lokal na gumagamit ay hindi pinapayagan na baguhin ang kanilang username. Mangyaring makipag-ugnayan sa iyong tagapangasiwa ng site para sa higit pang mga detalye. full_name = Buong pangalan @@ -3758,7 +3758,7 @@ close_issue = `sinara ang isyu na %[3]s#%[2]s` review_dismissed = `na-dismiss ang pagsusuri mula %[4]s para sa %[3]s#%[2]s` close_pull_request = `sinara ang hiling sa paghila na %[3]s#%[2]s` transfer_repo = nilipat ang repositoryo na %s sa %s -delete_branch = binura ang branch %[2]s mula %[3]s +delete_branch = binura ang branch %[2]s mula %[3]s mirror_sync_push = na-sync ang mga commit sa %[3]s sa %[4]s mula sa mirror mirror_sync_create = na-syng ang bagong reference %[3]s sa %[4]s mula sa mirror publish_release = `inilabas ang %[4]s sa %[3]s` diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini index 1cb7103bc0..0c9df0afa0 100644 --- a/options/locale/locale_fr-FR.ini +++ b/options/locale/locale_fr-FR.ini @@ -1579,7 +1579,7 @@ issues.remove_ref_at=`a supprimĆ© la rĆ©fĆ©rence %s %s.` issues.add_ref_at=`a ajoutĆ© la rĆ©fĆ©rence %s %s.` issues.delete_branch_at=`a supprimĆ© la branche %s %s.` issues.filter_label=Label -issues.filter_label_exclude=`Utilisez Alt + Clic/entrĆ©e pour exclure les labels.` +issues.filter_label_exclude=`Utilisez Alt + Click pour exclure les Ć©tiquettes.` issues.filter_label_no_select=Toutes les labels issues.filter_label_select_no_label=Aucun label issues.filter_milestone=Jalon @@ -3636,7 +3636,7 @@ auto_merge_pull_request=`a fusionnĆ© automatiquement la demande dā€™ajout %s vers %s push_tag=a poussĆ© lā€™Ć©tiquette %[3]s de %[4]s delete_tag=a supprimĆ© lā€™Ć©tiquette %[2]s de %[3]s -delete_branch=a supprimĆ©e la branche %[2]s de %[3]s +delete_branch=a supprimĆ©e la branche %[2]s de %[3]s compare_branch=Comparer compare_commits=Comparer %d rĆ©visions compare_commits_general=Comparer les rĆ©visions @@ -4091,4 +4091,4 @@ issues.write = Ɖcrire : Fermer des tickets et gĆ©rer les mĆ©tadonnĆ©es t pulls.read = Lire : Lire et crĆ©er des demandes de tirage. [translation_meta] -test = Ceci est une chaĆ®ne de test. Elle n'est pas affichĆ©e dans l'interface de Forgejo mais est utilisĆ©e Ć  des fins de test. N'hĆ©sitez pas Ć  entrer 'ok' pour gagner du temps (ou un fait amusant de votre choix) pour atteindre ce difficile 100 % de complĆ©tion. :-) +test = Ceci est une chaĆ®ne de test. Elle n'est pas affichĆ©e dans Forgejo mĆŖme mais est utilisĆ©e Ć  des fins de test. N'hĆ©sitez pas Ć  entrer 'ok' pour gagner du temps (ou un fait amusant de votre choix) pour atteindre ce difficile 100 % de complĆ©tion. :-) diff --git a/options/locale/locale_ga-IE.ini b/options/locale/locale_ga-IE.ini index 3bb06e8c21..1d7414a0d8 100644 --- a/options/locale/locale_ga-IE.ini +++ b/options/locale/locale_ga-IE.ini @@ -132,20 +132,20 @@ fuzzy = DoilĆ©ir fuzzy_tooltip = Cuir san Ć”ireamh torthaĆ­ a mheaitseĆ”lann an tĆ©arma cuardaigh go dlĆŗth freisin exact = Beacht exact_tooltip = NĆ­ chuir san Ć”ireamh ach torthaĆ­ a mheaitseĆ”lann leis an tĆ©arma -repo_kind = Cuardaigh stĆ³rtha... -user_kind = Cuardaigh ĆŗsĆ”ideoirĆ­... -org_kind = Cuardaigh eagraĆ­ochtaĆ­... -team_kind = Cuardaigh foirne... -code_kind = CĆ³d cuardaigh... +repo_kind = Cuardaigh stĆ³rthaā€¦ +user_kind = Cuardaigh ĆŗsĆ”ideoirĆ­ā€¦ +org_kind = Cuardaigh eagraĆ­ochtaĆ­ā€¦ +team_kind = Cuardaigh foirneā€¦ +code_kind = CĆ³d cuardaighā€¦ code_search_unavailable = NĆ­l cuardach cĆ³d ar fĆ”il faoi lĆ”thair. DĆ©an teagmhĆ”il le riarthĆ³ir an lĆ”ithreĆ”in. -package_kind = Cuardaigh pacĆ”istĆ­... -project_kind = Cuardaigh tionscadail... -branch_kind = Cuardaigh brainsĆ­... -commit_kind = Cuardaigh tiomĆ”intĆ­... -runner_kind = Cuardaigh reathaithe... +package_kind = Cuardaigh pacĆ”istĆ­ā€¦ +project_kind = Cuardaigh tionscadailā€¦ +branch_kind = Cuardaigh brainsĆ­ā€¦ +commit_kind = Cuardaigh tiomĆ”intĆ­ā€¦ +runner_kind = Cuardaigh reathaitheā€¦ no_results = NĆ­l aon torthaĆ­ meaitseĆ”la le fĆ”il. -issue_kind = Saincheisteanna cuardaigh... -pull_kind = Cuardaigh iarratais tarraingthe... +issue_kind = Saincheisteanna cuardaighā€¦ +pull_kind = Cuardaigh iarratais tarraingtheā€¦ keyword_search_unavailable = NĆ­l cuardach de rĆ©ir eochairfhocal ar fĆ”il faoi lĆ”thair. DĆ©an teagmhĆ”il le riarthĆ³ir an lĆ”ithreĆ”in. [aria] @@ -507,12 +507,12 @@ avatar = AbhatĆ”r ssh_gpg_keys = Eochracha SSH/GPG applications = Iarratais repos = StĆ³rais -delete = Scrios Cuntas +delete = Scrios cuntas twofa = FĆ­ordheimhniĆŗ DhĆ” FachtĆ³ir (TOTP) organization = EagraĆ­ochtaĆ­ uid = UID webauthn = FĆ­ordheimhniĆŗ DhĆ”-FachtĆ³ir (Eochracha SlĆ”ndĆ”la) -public_profile = PrĆ³ifĆ­l PhoiblĆ­ +public_profile = PrĆ³ifĆ­l phoiblĆ­ location_placeholder = Comhroinn do shuĆ­omh thart le daoine eile full_name = Ainm IomlĆ”n website = LĆ”ithreĆ”n GrĆ©asĆ”in @@ -2678,7 +2678,7 @@ auto_merge_pull_request = `iarratas tarraingthe cumasctha go huathoibrĆ­och %s go %s push_tag = brĆŗ %[3]s go %[4]s delete_tag = scriosta clib %[2]s Ć³ %[3]s -delete_branch = brainse scriosta %[2]s Ć³ %[3]s +delete_branch = brainse scriosta %[2]s Ć³ %[3]s compare_branch = DĆ©an comparĆ”id compare_commits = DĆ©an comparĆ”id idir tiomĆ”intĆ­ %d compare_commits_general = DĆ©an comparĆ”id idir tiomĆ”intĆ­ diff --git a/options/locale/locale_gl.ini b/options/locale/locale_gl.ini index 3854b375af..c380e9b2ff 100644 --- a/options/locale/locale_gl.ini +++ b/options/locale/locale_gl.ini @@ -196,29 +196,29 @@ link_modal.paste_reminder = Consello: Coa URL no portapapeis, podes pegala direc [search] search = Buscar... type_tooltip = Tipo de procura -repo_kind = Buscar repositorios... -user_kind = Buscar usuarios... +repo_kind = Buscar repositoriosā€¦ +user_kind = Buscar usuariosā€¦ regexp = RegExp regexp_tooltip = Interpretar o termo da procura como expresiĆ³n regular -org_kind = Procurar organizaciĆ³ns... -team_kind = Procurar equipos... -code_kind = Procurar cĆ³digo... +org_kind = Procurar organizaciĆ³nsā€¦ +team_kind = Procurar equiposā€¦ +code_kind = Procurar cĆ³digoā€¦ code_search_unavailable = A procura de cĆ³digo non estĆ” dispoƱible neste momento. Por favor contacte coa persoa responsable da administraciĆ³n da pĆ”xina. -package_kind = Buscar paquetes... +package_kind = Buscar paquetesā€¦ fuzzy = Difusa fuzzy_tooltip = IncluĆ­r resultados que tamĆ©n coincidan estreitamente co termo da procura union = Palabras clave union_tooltip = IncluĆ­r resultados correspondentes a calquera dal palabras clave separadas por espazos en branco exact = Exacta exact_tooltip = IncluĆ­r sĆ³ resultados correspondentes ao termo exacto da procura -issue_kind = Procurar incidencias... -project_kind = Buscar proxectos... -branch_kind = Buscar ramas... +issue_kind = Procurar incidenciasā€¦ +project_kind = Buscar proxectosā€¦ +branch_kind = Buscar ramasā€¦ no_results = Non se atoparon resultados coincidentes. keyword_search_unavailable = A busca por palabra clave non estĆ” dispoƱible actualmente. PĆ³Ć±ase en contacto co administrador do sitio. -commit_kind = Buscar achegas... -runner_kind = Buscar executores... -pull_kind = Buscar pulls... +commit_kind = Buscar achegasā€¦ +runner_kind = Buscar executoresā€¦ +pull_kind = Buscar pullsā€¦ [startpage] platform = Multiplataforma diff --git a/options/locale/locale_he.ini b/options/locale/locale_he.ini index 19c4815277..8a5bc86163 100644 --- a/options/locale/locale_he.ini +++ b/options/locale/locale_he.ini @@ -150,24 +150,24 @@ union = מילו×Ŗ מפ×Ŗח exact = מדויק exact_tooltip = ×Ŗוצאו×Ŗ י×Ŗאימו במדויק ל×Ŗוכן ×Ŗיב×Ŗ החיפוש regexp = ×Øג'קה -user_kind = חיפוש אנשים... -code_kind = חיפוש קוד... -team_kind = חיפוש צוו×Ŗים... +user_kind = חיפוש אנשיםā€¦ +code_kind = חיפוש קודā€¦ +team_kind = חיפוש צוו×Ŗיםā€¦ no_results = לא נמצאו ×Ŗוצאו×Ŗ. union_tooltip = ×Ŗוצאו×Ŗ יכללו לפחו×Ŗ מיל×Ŗ מפ×Ŗח אח×Ŗ; אפש×Ø ×œ×”×¤×Øיד מילו×Ŗ מפ×Ŗח עם ×Øווחים -org_kind = חיפוש א×Øגונים... -package_kind = חיפוש חבילו×Ŗ... -project_kind = חיפוש פ×Øוייקטים... -branch_kind = חיפוש ענפים... -commit_kind = חיפוש קומיטים... -issue_kind = חיפוש הוגיו×Ŗ... +org_kind = חיפוש א×Øגוניםā€¦ +package_kind = חיפוש חבילו×Ŗā€¦ +project_kind = חיפוש פ×Øוייקטיםā€¦ +branch_kind = חיפוש ענפיםā€¦ +commit_kind = חיפוש קומיטיםā€¦ +issue_kind = חיפוש הוגיו×Ŗā€¦ fuzzy_tooltip = ×Ŗוצאו×Ŗ י×Ŗאימו ל×Ŗוכן ×Ŗיב×Ŗ החיפוש בקי×Øוב; מומלׄ כנגד שגיאו×Ŗ כ×Ŗיב -repo_kind = חיפוש ק×Øפיפים... +repo_kind = חיפוש ק×Øפיפיםā€¦ code_search_by_git_grep = ×Ŗוצאו×Ŗ החיפוש יוצ×Øו על ידי "git grep"; יכול להיו×Ŗ שי×Ŗקבלו ×Ŗוצאו×Ŗ טובו×Ŗ יו×Ŗ×Ø ×× מנהלי המע×Øכ×Ŗ יפעילו א×Ŗ המפ×Ŗחן. -runner_kind = חיפוש מ×Øיצים... +runner_kind = חיפוש מ×Øיציםā€¦ keyword_search_unavailable = חיפוש מילו×Ŗ מפ×Ŗח לא זמין. נא לדווח למנהלי המע×Øכ×Ŗ. code_search_unavailable = חיפוש קוד לא זמין. נא לדווח למנהלי המע×Øכ×Ŗ. -pull_kind = חיפוש בקשו×Ŗ מיזוג... +pull_kind = חיפוש בקשו×Ŗ מיזוגā€¦ [heatmap] number_of_contributions_in_the_last_12_months = % ×Ŗ×Øומו×Ŗ ב־12 החודשים האח×Øונים @@ -384,6 +384,8 @@ allow_password_change = הכ×Øח×Ŗ המש×Ŗמש לעדכן א×Ŗ היהמ×Ŗ חש account_activated = חשבונך הופעל resent_limit_prompt = כב×Ø ×‘×™×§×©×Ŗ מייל אימו×Ŗ בשלוש×Ŗ הדקו×Ŗ האח×Øונו×Ŗ. נא לחכו×Ŗ ולנהו×Ŗ שוב. has_unconfirmed_mail = שלום %s, חשבונך משויך לכ×Ŗוב×Ŗ אימייל לא מאומ×Ŗ×Ŗ (%s). אם לא קיבל×Ŗ הודע×Ŗ אימו×Ŗ באימייל, או שא×Ŗה צ×Øיך חדשה, נא ללחוׄ על הכפ×Ŗו×Ø ×œ×ž×˜×”. +confirmation_mail_sent_prompt = אימייל אימו×Ŗ חדש נשלח ל־%s. יש לבדוק א×Ŗ ×Ŗיב×Ŗ הדוא×Ø ×•×œ×œ×—×•×„ על הלינק ×Ŗוך %s על מנ×Ŗ להשלים א×Ŗ ×Øישום החשבון. אם כ×Ŗוב×Ŗ המייל שגוייה, אפש×Ø ×œ×”×™×›× ×” לחשבון ולבקש דוא"ל אימו×Ŗ לכ×Ŗוב×Ŗ אח×Ø×Ŗ. +reset_password_mail_sent_prompt = אימייל אימו×Ŗ חדש נשלח ל־%s. יש לבדוק א×Ŗ ×Ŗיב×Ŗ הדוא×Ø ×•×œ×œ×—×•×„ על הלינק ×Ŗוך %s על מנ×Ŗ להשלים א×Ŗ ×Øישום החשבון. [settings] key_content = ×Ŗוכן @@ -661,6 +663,9 @@ issues.label_exclusive = בחי×Øה בודד×Ŗ issues.label_archive = לא×Øכיון issues.label_archived_filter = הצג×Ŗ ×Ŗוויו×Ŗ מהא×Øכיון issues.label_archive_tooltip = ×Ŗוויו×Ŗ בא×Øכיון לא מוצעו×Ŗ בחיפוש על־בהיה ×Ŗווי×Ŗ כב×Øי×Ø×Ŗ מחדל. +issues.deleted_milestone = נמחק +issues.self_assign_at = `שייךה עצמי×Ŗ %s` +issues.deleted_project = נמחק [translation_meta] test = ואהב×Ŗ ל×Øעך כמוך diff --git a/options/locale/locale_hu-HU.ini b/options/locale/locale_hu-HU.ini index 3e93ee8ba9..841fb76bbe 100644 --- a/options/locale/locale_hu-HU.ini +++ b/options/locale/locale_hu-HU.ini @@ -330,7 +330,7 @@ code_no_results=Nincs talĆ”lat a keresĆ©si kifejezĆ©sedre. code_last_indexed_at=UtoljĆ”ra indexelve: %s [auth] -create_new_account=RegisztrĆ”ciĆ³ +create_new_account=FiĆ³k regisztrĆ”lĆ”sa register_helper_msg=Van mĆ”r felhasznĆ”lĆ³i fiĆ³kja? Jelentkezzen be! social_register_helper_msg=Van mĆ”r felhasznĆ”lĆ³i fiĆ³kja? Csatlakoztassa most! disable_register_prompt=RegisztrĆ”ciĆ³ le van tiltva. KĆ©rjĆ¼k, lĆ©pjen kapcsolatba az oldal adminisztrĆ”torĆ”val. @@ -532,8 +532,8 @@ password_change_disabled=A nem helyi felhasznĆ”lĆ³k nem frissĆ­thetik jelszavuka emails=E-mail cĆ­mek manage_emails=E-mail cĆ­mek kezelĆ©se -manage_themes=VĆ”lassza ki az alapĆ©rtelmezett tĆ©mĆ”t -manage_openid=OpenID cĆ­mek kezelĆ©se +manage_themes=AlapĆ©rtelmezett tĆ©ma +manage_openid=OpenID cĆ­mek theme_desc=Ez lesz az alapĆ©rtelmezett tĆ©ma az oldalon. primary=Elsődleges activated=AktivĆ”lt @@ -1694,7 +1694,7 @@ create_repo=lĆ©trehozott tĆ”rolĆ³t: %s rename_repo=Ć”tnevezte a(z) %[1]s tĆ”rolĆ³t %[3]s-ra/re transfer_repo=Ć”thelyezett egy tĆ”rolĆ³t innen: %s ide: %s delete_tag=cĆ­mke %[2]s tƶrƶlve innen: %[3]s -delete_branch=Ć”g %[2]s tƶrƶlve innen: %[3]s +delete_branch=Ć”g %[2]s tƶrƶlve innen: %[3]s compare_branch=ƖsszehasonlĆ­tĆ”s compare_commits=%d commit ƶsszehasonlĆ­tĆ”sa compare_commits_general=Commitok ƶsszehasonlĆ­tĆ”sa @@ -1779,14 +1779,14 @@ directory = KƶnyvtĆ”r [search] search = KeresĆ©s... type_tooltip = KeresĆ©s tĆ­pusa -code_kind = KĆ³d keresĆ©se... +code_kind = KĆ³d keresĆ©seā€¦ code_search_unavailable = A kĆ³dban valĆ³ keresĆ©s jelenleg nem elĆ©rhető. KĆ©rem vegye fel a kapcsolatot az oldal adminisztrĆ”torĆ”val. -package_kind = Csomagok keresĆ©se... -project_kind = Projektek keresĆ©se... -user_kind = FelhasznĆ”lĆ³k keresĆ©se... -repo_kind = TĆ”rak keresĆ©se... -org_kind = Szervezetek keresĆ©se... -team_kind = Csapatok keresĆ©se... +package_kind = Csomagok keresĆ©seā€¦ +project_kind = Projektek keresĆ©seā€¦ +user_kind = FelhasznĆ”lĆ³k keresĆ©seā€¦ +repo_kind = TĆ”rak keresĆ©seā€¦ +org_kind = Szervezetek keresĆ©seā€¦ +team_kind = Csapatok keresĆ©seā€¦ exact = Pontos code_search_by_git_grep = A kĆ³dkeresĆ©s jelenleg a "git grep" parancsot hasznĆ”lja. Lehet, hogy jobb talĆ”latok is lennĆ©nek, ha a webhely adminisztrĆ”tora bekapcsolja a forrĆ”skĆ³d indexelĆ©sĆ©t. milestone_kind = MĆ©rfƶldkƶvek keresĆ©se... @@ -1794,8 +1794,8 @@ fuzzy_tooltip = A keresĆ©si kifejezĆ©shez hasonlĆ³ talĆ”latok mutatĆ”sa fuzzy = HasonlĆ³k union = Kulcsszavakra union_tooltip = A szĆ³kƶzzel elvĆ”lasztott kulcsszavak bĆ”rmelyikĆ©t tartalmazĆ³ talĆ”latok mutatĆ”sa -branch_kind = Ɓgak keresĆ©se... +branch_kind = Ɓgak keresĆ©seā€¦ no_results = Nincsenek megfelelő talĆ”latok. -issue_kind = Hibajegyek keresĆ©se... +issue_kind = Hibajegyek keresĆ©seā€¦ exact_tooltip = Csak a keresĆ©si kifejezĆ©st pontosan tartalmazĆ³ talĆ”latok mutatĆ”sa keyword_search_unavailable = A kulcsszĆ³ alapĆŗ keresĆ©s jelenleg nem elĆ©rhető. KĆ©rlek Ć©rtesĆ­tsd az oldal rendszergazdĆ”jĆ”t. diff --git a/options/locale/locale_id-ID.ini b/options/locale/locale_id-ID.ini index f1a392105e..c935bd9540 100644 --- a/options/locale/locale_id-ID.ini +++ b/options/locale/locale_id-ID.ini @@ -206,9 +206,9 @@ email_title = Pengaturan email smtp_from = Kirim Email Sebagai [home] -uname_holder=Nama Pengguna atau Alamat Surel +uname_holder=Nama pengguna atau alamat surel password_holder=Kata Sandi -switch_dashboard_context=Alihkan Dasbor Konteks +switch_dashboard_context=Alihkan dasbor konteks my_repos=Repositori show_more_repos=Tampilkan repositori lainnyaā€¦ collaborative_repos=Repositori Kolaboratif @@ -236,7 +236,7 @@ org_no_results=Tidak ada organisasi yang cocok ditemukan. code_no_results=Tidak ada kode sumber yang cocok dengan istilah yang anda cari. [auth] -create_new_account=Daftar Akun +create_new_account=Daftar akun register_helper_msg=Sudah memiliki akun? Masuk sekarang! social_register_helper_msg=Sudah memiliki akun? Hubungkan sekarang! disable_register_prompt=Maaf, pendaftaran telah dinonaktifkan. Silakan hubungi administrator situs. @@ -269,11 +269,11 @@ twofa_passcode_incorrect=Kata sandi Anda salah. Jika Anda salah tempatkan perang twofa_scratch_token_incorrect=Kode coretan anda tidak tepat. login_userpass=Masuk tab_openid=OpenID -oauth_signup_tab=Daftar Akun Baru -oauth_signup_submit=Akun Lengkap -oauth_signin_tab=Tautkan ke Akun yang Tersedia -oauth_signin_title=Masuk untuk Izinkan Akun Tertaut -oauth_signin_submit=Taut Akun +oauth_signup_tab=Daftar akun baru +oauth_signup_submit=Akun lengkap +oauth_signin_tab=Tautkan ke akun yang tersedia +oauth_signin_title=Masuk untuk izinkan akun tertaut +oauth_signin_submit=Taut akun openid_connect_submit=Sambungkan openid_connect_title=Sambungkan ke akun yang sudah ada openid_connect_desc=OpenID URI yang dipilih tak dikenal. Asosiasikan dengan akun baru disini. @@ -398,14 +398,14 @@ avatar=Avatar ssh_gpg_keys=Kunci SSH / GPG social=Akun Sosial applications=Aplikasi -orgs=Kelola organisasi +orgs=Organisasi repos=Repositori -delete=Hapus Akun +delete=Hapus akun twofa=Otentikasi Dua-Faktor account_link=Akun Tertaut organization=Organisasi -public_profile=Profil Publik +public_profile=Profil publik password_username_disabled=Pengguna non-lokal tidak diizinkan untuk mengubah nama pengguna mereka. Silakan hubungi administrator sistem anda untuk lebih lanjut. full_name=Nama Lengkap website=Situs Web @@ -438,8 +438,8 @@ password_change_disabled=Pengguna non-lokal tidak dapat mengganti kata sandi mer emails=Alamat Surel manage_emails=Kelola Alamat Surel -manage_themes=Pilih tema default -manage_openid=Kelola alamat OpenID +manage_themes=Tema default +manage_openid=Alamat OpenID theme_desc=Ini akan menjadi tema asal Anda pada keseluruhan situs. primary=Utama activated=Diaktifkan @@ -1368,7 +1368,7 @@ create_repo=repositori dibuat %s rename_repo=ganti nama gudang penyimpanan dari %[1]s ke %[3]s transfer_repo=ditransfer repositori %s ke %s delete_tag=tag dihapus %[2]s dari %[3]s -delete_branch=cabang dihapus %[2]s dari %[3]s +delete_branch=cabang dihapus %[2]s dari %[3]s compare_commits=Bandingkan %d melakukan [tool] @@ -1484,10 +1484,10 @@ search = Cari... type_tooltip = Tipe pencarian fuzzy_tooltip = Termasuk juga hasil yang mendekati kata pencarian exact_tooltip = Hanya menampilkan hasil yang cocok dengan istilah pencarian -repo_kind = Cari repo... -user_kind = Telusuri pengguna... -org_kind = Cari organisasi... -team_kind = Cari tim... -code_kind = Cari kode... +repo_kind = Cari repoā€¦ +user_kind = Telusuri penggunaā€¦ +org_kind = Cari organisasiā€¦ +team_kind = Cari timā€¦ +code_kind = Cari kodeā€¦ code_search_unavailable = Pencarian kode saat ini tidak tersedia. Silahkan hubungi administrator. -branch_kind = Cari cabang... +branch_kind = Cari cabangā€¦ diff --git a/options/locale/locale_is-IS.ini b/options/locale/locale_is-IS.ini index baf8286923..f3333dbea2 100644 --- a/options/locale/locale_is-IS.ini +++ b/options/locale/locale_is-IS.ini @@ -223,7 +223,7 @@ default_keep_email_private.description=Fela sjĆ”lfgefiĆ° netfƶng nĆ½rra notenda no_reply_address_helper=LĆ©n fyrir notendur meĆ° faliĆ° netfang. Til dƦmis notandanafniĆ° ā€žjoeā€œ verĆ°ur skrƔư Ć­ Git sem ā€žjoe@noreply.example.orgā€œ ef faliĆ° tƶlvupĆ³stlĆ©n er stillt Ć” ā€žnoreply.example.orgā€œ. [home] -uname_holder=Notandanafn eĆ°a Netfang +uname_holder=Notandanafn eĆ°a netfang password_holder=LykilorĆ° my_repos=HugbĆŗnaĆ°arsƶfn show_more_repos=SĆ½na fleiri hugbĆŗnaĆ°arsƶfnā€¦ @@ -255,7 +255,7 @@ org_no_results=Engar samsvarandi stofnanir fundust. code_no_results=Enginn samsvarandi frumkĆ³Ć°i fannst eftur Ć¾Ć­num leitarorĆ°um. [auth] -create_new_account=SkrĆ” Notanda +create_new_account=SkrĆ” notanda register_helper_msg=Ertu nĆŗ Ć¾egar meĆ° notanda? SkrƔưu Ć¾ig inn nĆŗna! social_register_helper_msg=Ertu nĆŗ Ć¾egar meĆ° reikning? Tengdu hann nĆŗna! manual_activation_only=HafĆ°u samband viĆ° stjĆ³rnanda vefsvƦưisins til aĆ° ljĆŗka virkjun. @@ -276,13 +276,13 @@ verify=StaĆ°festa scratch_code=SkrapkĆ³Ć°i use_scratch_code=Nota skrapkĆ³Ć°a twofa_scratch_token_incorrect=SkrapkĆ³Ć°i Ć¾inn er rangur. -login_userpass=SkrĆ” Inn +login_userpass=SkrĆ” inn tab_openid=OpenID -oauth_signup_tab=SkrĆ” NĆ½jan Notanda -oauth_signup_title=KlĆ”ra NĆ½jum Notanda -oauth_signup_submit=KlĆ”ra Notanda -oauth_signin_tab=Tengja NĆŗverandi Reikning -oauth_signin_submit=Tengja Notanda +oauth_signup_tab=SkrĆ” nĆ½jan notanda +oauth_signup_title=KlĆ”ra nĆ½jum notanda +oauth_signup_submit=KlĆ”ra notanda +oauth_signin_tab=Tengja nĆŗverandi reikning +oauth_signin_submit=Tengja notanda openid_connect_submit=Tengjast openid_register_title=SkrĆ” nĆ½jan notanda disable_forgot_password_mail=Endurheimting reiknings er Ć³virk vegna Ć¾ess aĆ° enginn tƶlvupĆ³stur er uppsettur. Vinsamlegast hafĆ°u samband viĆ° sĆ­Ć°ustjĆ³rann Ć¾inn. @@ -434,15 +434,15 @@ avatar=Notandamynd ssh_gpg_keys=SSH og GPG Lyklar social=FĆ©lagsreikningar applications=Forrit -orgs=StjĆ³rna Stofnunum +orgs=Stofnanir repos=HugbĆŗnaĆ°arsƶfn -delete=EyĆ°a Reikningi +delete=EyĆ°a reikningi twofa=TvĆ­Ć¾Ć¦tt AuĆ°kenning account_link=Tengdir Reikningar organization=Stofnanir webauthn=Ɩryggislyklar -public_profile=Opinber NotandasĆ­Ć°a +public_profile=Opinber notandasĆ­Ć°a password_username_disabled=Notendum utan staĆ°arins er ekki heimilt aĆ° breyta notendanafni sĆ­nu. Vinsamlegast hafĆ°u samband viĆ° sĆ­Ć°ustjĆ³rann Ć¾inn til aĆ° fĆ” frekari upplĆ½singar. full_name=Fullt Nafn website=VefsĆ­Ć°a diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini index d46f709cde..d9acc4c430 100644 --- a/options/locale/locale_it-IT.ini +++ b/options/locale/locale_it-IT.ini @@ -423,7 +423,7 @@ allow_password_change=Richiede all'utente di cambiare la password (scelta consig reset_password_mail_sent_prompt=Un'e-mail di conferma ĆØ stata inviata a %s. Per completare il processo di recupero dell'account, controlla la tua posta in arrivo e clicca sul link entro i prossimi %s secondi. active_your_account=Attiva il tuo account account_activated=L'account ĆØ stato attivato -prohibit_login=L'accesso ĆØ proibito +prohibit_login=L'account ĆØ sospeso resent_limit_prompt=Hai giĆ  richiesto un'e-mail d'attivazione recentemente. Si prega di attenere 3 minuti e poi riprovare. has_unconfirmed_mail=Ciao %s, hai un indirizzo di posta elettronica non confermato (%s). Se non hai ricevuto una e-mail di conferma o vuoi riceverla nuovamente, fare clic sul pulsante qui sotto. resend_mail=Clicca qui per inviare nuovamente l'e-mail di attivazione @@ -742,7 +742,7 @@ avatar=Avatar ssh_gpg_keys=Chiavi SSH / GPG social=Account Sociali applications=Applicazioni -orgs=Gestisci le organizzazioni +orgs=Organizzazioni repos=Repositori delete=Elimina account twofa=Verifica in due passaggi @@ -803,8 +803,8 @@ password_change_disabled=Gli utenti non locali non possono cambiare la loro pass emails=Indirizzi email manage_emails=Gestisci indirizzi email -manage_themes=Seleziona il tema predefinito -manage_openid=Gestisci gli indirizzi OpenID +manage_themes=Tema predefinito +manage_openid=Indirizzi OpenID theme_desc=Questo sarĆ  il tuo tema di predefinito in tutto il sito. primary=Primario activated=Attivato @@ -3624,7 +3624,7 @@ merge_pull_request=`ha fuso la richiesta di modifica %[3]s#%[2]s transfer_repo=repository %s trasferito in %s push_tag=ha inviato il tag %[3]s su %[4]s delete_tag=tag eliminato %[2]s da %[3]s -delete_branch=branch eliminato %[2]s da %[3]s +delete_branch=branch eliminato %[2]s da %[3]s compare_branch=Confronta compare_commits=Confronta %d commits compare_commits_general=Confronta commit @@ -4014,25 +4014,25 @@ type_tooltip = Tipo ricerca search = Cercaā€¦ fuzzy = Approssimativa match = Precisa -org_kind = Cerca organizzazioni... -package_kind = Ricerca pacchetti... +org_kind = Cerca organizzazioniā€¦ +package_kind = Ricerca pacchettiā€¦ code_search_unavailable = La ricerca del codice non ĆØ attualmente disponibile. Contatta l'amministratorə del sito. -code_kind = Cerca nel codice... -team_kind = Cerca team... +code_kind = Cerca nel codiceā€¦ +team_kind = Cerca teamā€¦ code_search_by_git_grep = I risultati della ricerca del codice sono forniti da "git grep". Potrebbero esserci risultati migliori se l'amministratore del sito avesse abilitato l'indicizzatore del codice. -project_kind = Ricerca progetti... -commit_kind = Ricerca commit... -branch_kind = Ricerca rami... +project_kind = Ricerca progettiā€¦ +commit_kind = Ricerca commitā€¦ +branch_kind = Ricerca ramiā€¦ no_results = Non ĆØ stato trovato alcun risultato. keyword_search_unavailable = La ricerca per parole chiave non ĆØ attualmente disponibile. Contatta l'amministratore del sito. -runner_kind = Ricerca esecutori... +runner_kind = Ricerca esecutoriā€¦ match_tooltip = Includi solo risultati che corrispondono precisamente al termine di ricerca fuzzy_tooltip = Includi anche risultati che corrispondono approssimativamente al termine di ricerca -user_kind = Cerca utenti... -repo_kind = Cerca repo... +user_kind = Cerca utentiā€¦ +repo_kind = Cerca repoā€¦ exact_tooltip = Includi solo i risultati che corrispondono esattamente al termine di ricerca -issue_kind = Cerca segnalazioni... -pull_kind = Cerca richieste... +issue_kind = Cerca segnalazioniā€¦ +pull_kind = Cerca richiesteā€¦ exact = Esatto milestone_kind = Ricerca tappe... regexp_tooltip = Interpreta i termini di ricerca come un'espressione regolare diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini index 555f5c6a75..d7c657b149 100644 --- a/options/locale/locale_ja-JP.ini +++ b/options/locale/locale_ja-JP.ini @@ -250,7 +250,7 @@ err_empty_db_path=SQLite3ć®ćƒ‡ćƒ¼ć‚æćƒ™ćƒ¼ć‚¹ćƒ‘ć‚¹ć‚’ē©ŗ恫恙悋恓ćØćÆ恧 no_admin_and_disable_registration=ē®”ē†č€…ć‚¢ć‚«ć‚¦ćƒ³ćƒˆć‚’ä½œęˆć›ćšć«ć€ć‚»ćƒ«ćƒ•ē™»éŒ²ć‚’ē„”åŠ¹ć«ć™ć‚‹ć“ćØćÆć§ćć¾ć›ć‚“ć€‚ err_empty_admin_password=ē®”ē†č€…ćƒ‘ć‚¹ćƒÆćƒ¼ćƒ‰ćÆē©ŗć«ć§ćć¾ć›ć‚“ć€‚ err_empty_admin_email=ē®”ē†č€…ć®ćƒ”ćƒ¼ćƒ«ć‚¢ćƒ‰ćƒ¬ć‚¹ćÆē©ŗć«ć§ćć¾ć›ć‚“ć€‚ -err_admin_name_is_reserved=ē®”ē†č€…ć®ćƒ¦ćƒ¼ć‚¶ćƒ¼åćŒäøę­£ć§ć™ć€‚äŗˆē“„ęøˆćæć®ćƒ¦ćƒ¼ć‚¶ćƒ¼åć§ć™ć€‚ +err_admin_name_is_reserved=ē®”ē†č€…ć®ćƒ¦ćƒ¼ć‚¶ćƒ¼åćŒäøę­£ć§ć™ć€‚äŗˆē“„ęøˆćæć®ćƒ¦ćƒ¼ć‚¶ćƒ¼åć§ć™ err_admin_name_pattern_not_allowed=ē®”ē†č€…ć®ćƒ¦ćƒ¼ć‚¶ćƒ¼åćŒäøę­£ć§ć™ć€‚ äŗˆē“„ęøˆćæć®ćƒ‘ć‚æćƒ¼ćƒ³ć«ćƒžćƒƒćƒć—ć¦ć„ć¾ć™ err_admin_name_is_invalid=ē®”ē†č€…ć®ćƒ¦ćƒ¼ć‚¶ćƒ¼åćŒäøę­£ć§ć™ @@ -1047,6 +1047,7 @@ language.title = ę—¢å®šć®č؀čŖž keep_activity_private.description = å…¬é–‹ć‚¢ć‚Æćƒ†ć‚£ćƒ“ćƒ†ć‚£ćÆ态恂ćŖ恟ćØć‚¤ćƒ³ć‚¹ć‚æćƒ³ć‚¹ē®”ē†č€…恫恮ćæč”Øē¤ŗć•ć‚Œć¾ć™ć€‚ language.description = 恓恮č؀čŖžćÆć‚¢ć‚«ć‚¦ćƒ³ćƒˆć«äæå­˜ć•ć‚Œć€ćƒ­ć‚°ć‚¤ćƒ³å¾Œć«ćƒ‡ćƒ•ć‚©ćƒ«ćƒˆćØ恗恦ä½æē”Øć•ć‚Œć¾ć™ć€‚ language.localization_project = Forgejo 悒恂ćŖćŸć®č؀čŖžć«ēæ»čØ³ć™ć‚‹ć®ć‚’ę‰‹ä¼ć£ć¦ćć ć•ć„ć€‚č©³ē“°ćÆ恓恔悉怂 +quota = ć‚Æć‚Ŗćƒ¼ć‚æ [repo] new_repo_helper=ćƒŖ惝ć‚ø惈ćƒŖ恫ćÆ态惗惭ć‚ø悧ć‚Æćƒˆć®ć™ć¹ć¦ć®ćƒ•ć‚”ć‚¤ćƒ«ćØćƒŖ惓ć‚øćƒ§ćƒ³å±„ę­“ćŒå…„ć‚Šć¾ć™ć€‚ ć™ć§ć«ć»ć‹ć®å “ę‰€ć§ćƒ›ć‚¹ćƒˆć—ć¦ć„ć¾ć™ć‹ļ¼Ÿ ćƒŖ惝ć‚ø惈ćƒŖ悒ē§»č”Œ 悂恩恆恞怂 @@ -3536,7 +3537,7 @@ auto_merge_pull_request=`ćŒćƒ—ćƒ«ćƒŖć‚Æć‚Øć‚¹ćƒˆ %[3]s#%[2]s%s 悒 %s ćøē§»č»¢ć—ć¾ć—ćŸ push_tag=恌ć‚æ悰 %[3]s 悒 %[4]s ć«ćƒ—ćƒƒć‚·ćƒ„ć—ć¾ć—ćŸ delete_tag=恌ć‚æ悰 %[2]s 悒 %[3]s ć‹ć‚‰å‰Šé™¤ć—ć¾ć—ćŸ -delete_branch=ćŒćƒ–ćƒ©ćƒ³ćƒ %[2]s 悒 %[3]s ć‹ć‚‰å‰Šé™¤ć—ć¾ć—ćŸ +delete_branch=ćŒćƒ–ćƒ©ćƒ³ćƒ %[2]s 悒 %[3]s ć‹ć‚‰å‰Šé™¤ć—ć¾ć—ćŸ compare_branch=ęÆ”č¼ƒ compare_commits=%dä»¶ć®ć‚³ćƒŸćƒƒćƒˆć‚’ęÆ”č¼ƒ compare_commits_general=ć‚³ćƒŸćƒƒćƒˆć‚’ęÆ”č¼ƒ @@ -3903,20 +3904,20 @@ submodule=ć‚µćƒ–ćƒ¢ć‚øćƒ„ćƒ¼ćƒ« [search] search = ꤜē“¢... type_tooltip = ꤜē“¢ć‚æ悤惗 -org_kind = ēµ„ē¹”ć®ę¤œē“¢... -code_kind = ć‚³ćƒ¼ćƒ‰ć®ę¤œē“¢... +org_kind = ēµ„ē¹”ć‚’ę¤œē“¢ā€¦ +code_kind = ć‚³ćƒ¼ćƒ‰ć‚’ę¤œē“¢ā€¦ fuzzy = ć‚ć„ć¾ć„ -repo_kind = ćƒŖ惝ć‚ø惈ćƒŖć®ę¤œē“¢... +repo_kind = ćƒŖ惝ć‚ø惈ćƒŖ悒ꤜē“¢ā€¦ code_search_unavailable = ć‚³ćƒ¼ćƒ‰ę¤œē“¢ćÆē¾åœØ利ē”Øć§ćć¾ć›ć‚“ć€‚ć‚µć‚¤ćƒˆē®”ē†č€…ć«ćŠå•ć„åˆć‚ć›ćć ć•ć„ć€‚ -branch_kind = ćƒ–ćƒ©ćƒ³ćƒć®ę¤œē“¢... -commit_kind = ć‚³ćƒŸćƒƒćƒˆć®ę¤œē“¢... -user_kind = ćƒ¦ćƒ¼ć‚¶ćƒ¼ć®ę¤œē“¢... -team_kind = ćƒćƒ¼ćƒ ć®ę¤œē“¢... +branch_kind = ćƒ–ćƒ©ćƒ³ćƒć‚’ę¤œē“¢ā€¦ +commit_kind = ć‚³ćƒŸćƒƒćƒˆć‚’ę¤œē“¢ā€¦ +user_kind = ćƒ¦ćƒ¼ć‚¶ćƒ¼ć‚’ę¤œē“¢ā€¦ +team_kind = ćƒćƒ¼ćƒ ć‚’ę¤œē“¢ā€¦ code_search_by_git_grep = ē¾åœØć®ć‚³ćƒ¼ćƒ‰ę¤œē“¢ēµęžœćÆ怌git grepć€ć«ć‚ˆć£ć¦ęä¾›ć•ć‚Œć¾ć™ć€‚ć‚µć‚¤ćƒˆē®”ē†č€…ćŒć‚³ćƒ¼ćƒ‰ ć‚¤ćƒ³ćƒ‡ć‚Æć‚µćƒ¼ć‚’ęœ‰åŠ¹ć«ć™ć‚‹ćØ态悈悊č‰Æ恄ēµęžœćŒå¾—ć‚‰ć‚Œć‚‹åÆčƒ½ę€§ćŒć‚ć‚Šć¾ć™ć€‚ -package_kind = ćƒ‘ćƒƒć‚±ćƒ¼ć‚øć®ę¤œē“¢... -project_kind = 惗惭ć‚ø悧ć‚Æćƒˆć®ę¤œē“¢... +package_kind = ćƒ‘ćƒƒć‚±ćƒ¼ć‚ø悒ꤜē“¢ā€¦ +project_kind = 惗惭ć‚ø悧ć‚Æ惈悒ꤜē“¢ā€¦ keyword_search_unavailable = ć‚­ćƒ¼ćƒÆćƒ¼ćƒ‰ć«ć‚ˆć‚‹ę¤œē“¢ćÆē¾åœØć”åˆ©ē”Øć„ćŸć ć‘ć¾ć›ć‚“ć€‚ć‚µć‚¤ćƒˆē®”ē†č€…ć«ćŠå•ć„åˆć‚ć›ćć ć•ć„ć€‚ -runner_kind = ćƒ©ćƒ³ćƒŠćƒ¼ć®ę¤œē“¢... +runner_kind = ćƒ©ćƒ³ćƒŠćƒ¼ć‚’ę¤œē“¢ā€¦ no_results = äø€č‡“恙悋ēµęžœćŒč¦‹ć¤ć‹ć‚Šć¾ć›ć‚“ć§ć—ćŸć€‚ fuzzy_tooltip = å…„åŠ›ć•ć‚ŒćŸčŖžå„恫čæ‘恄悂恮悂ēµęžœć«å«ć‚ć‚‹ match = äø€č‡“ @@ -3924,8 +3925,8 @@ match_tooltip = ꤜē“¢čŖžå„ć«åŽ³åÆ†ć«äø€č‡“恙悋悂恮恮ćæēµęžœć«å«ć‚ milestone_kind = ćƒžć‚¤ćƒ«ć‚¹ćƒˆćƒ¼ćƒ³ć‚’ę¤œē“¢... union_tooltip = ē©ŗē™½ć§åŒŗåˆ‡ć‚‰ć‚ŒćŸć‚­ćƒ¼ćƒÆćƒ¼ćƒ‰ć®ć„ćšć‚Œć‹ć«äø€č‡“恙悋ēµęžœć‚’å«ć‚ć‚‹ exact_tooltip = ꤜē“¢čŖžå„ćØ完å…Ø恫äø€č‡“恙悋ēµęžœć®ćæć‚’å«ć‚ć‚‹ -issue_kind = ć‚¤ć‚·ćƒ„ćƒ¼ć‚’ę¤œē“¢... -pull_kind = ćƒ—ćƒ«ć‚’ę¤œē“¢... +issue_kind = ć‚¤ć‚·ćƒ„ćƒ¼ć‚’ę¤œē“¢ā€¦ +pull_kind = ćƒ—ćƒ«ć‚’ę¤œē“¢ā€¦ exact = 完å…Øäø€č‡“ regexp_tooltip = ꤜē“¢čŖžå„ć‚’ę­£č¦č”Øē¾ćØć—ć¦č§£é‡ˆć™ć‚‹ regexp = ę­£č¦č”Øē¾ diff --git a/options/locale/locale_ko-KR.ini b/options/locale/locale_ko-KR.ini index be0400bea4..8e8d9b1d6b 100644 --- a/options/locale/locale_ko-KR.ini +++ b/options/locale/locale_ko-KR.ini @@ -588,8 +588,8 @@ password_change_disabled=ė”œģ»¬ ģœ ģ €ź°€ ģ•„ė‹Œ ź²½ģš° Forgejo ģ›¹ ģøķ„°ķŽ˜ģ“ emails=ģ“ė©”ģ¼ ģ£¼ģ†Œ manage_emails=ģ“ė©”ģ¼ ģ£¼ģ†Œ ź“€ė¦¬ -manage_themes=źø°ė³ø ķ…Œė§ˆ ģ„ ķƒ -manage_openid=OpenID ģ£¼ģ†Œ ź“€ė¦¬ +manage_themes=źø°ė³ø ķ…Œė§ˆ +manage_openid=OpenID ģ£¼ģ†Œ theme_desc=ģ“ ķ…Œė§ˆź°€ ģ‚¬ģ“ķŠø ģ „ģ²“ źø°ė³ø ķ…Œė§ˆź°€ ė©ė‹ˆė‹¤. primary=ėŒ€ķ‘œ activated=ķ™œģ„±ķ™”ėØ @@ -1900,9 +1900,9 @@ runs.commit=ģ»¤ė°‹ [search] code_search_by_git_grep = ķ˜„ģž¬ ģ½”ė“œ ź²€ģƒ‰ ź²°ź³¼ėŠ” "git grep"ģ— ģ˜ķ•“ ģ œź³µė©ė‹ˆė‹¤.ź“€ė¦¬ģžź°€ ģ½”ė“œ ģøė±ģ„œė„¼ ķ™œģ„±ķ™”ķ•˜ė©“ ė” ė‚˜ģ€ ź²°ź³¼ź°€ ģ œź³µė  ģˆ˜ ģžˆģŠµė‹ˆė‹¤. -branch_kind = ėøŒėžœģ¹˜ ź²€ģƒ‰... +branch_kind = ėøŒėžœģ¹˜ ź²€ģƒ‰ā€¦ keyword_search_unavailable = ģ§€źøˆģ€ ķ‚¤ģ›Œė“œė”œ ź²€ģƒ‰ģ“ ģ§€ģ›ė˜ģ§€ ģ•ŠģŠµė‹ˆė‹¤. ģ‚¬ģ“ķŠø ź“€ė¦¬ģžģ—ź²Œ ė¬øģ˜ķ•˜ģ‹­ģ‹œģ˜¤. -commit_kind = ģ»¤ė°‹ ź²€ģƒ‰... +commit_kind = ģ»¤ė°‹ ź²€ģƒ‰ā€¦ no_results = ģ¼ģ¹˜ķ•˜ėŠ” ź²°ź³¼ė„¼ ģ°¾ģ„ ģˆ˜ ģ—†ģŠµė‹ˆė‹¤. search = ź²€ģƒ‰ā€¦ type_tooltip = ź²€ģƒ‰ ķƒ€ģž… @@ -1910,11 +1910,11 @@ fuzzy_tooltip = ź²€ģƒ‰ģ–“ģ™€ ė°€ģ ‘ķ•˜ź²Œ ģ¼ģ¹˜ķ•˜ėŠ” ź²°ź³¼ė„ ķ¬ķ•Ø repo_kind = ģ €ģž„ģ†Œ ź²€ģƒ‰ā€¦ user_kind = ģ‚¬ģš©ģž ź²€ģƒ‰ā€¦ org_kind = ģ”°ģ§ ź²€ģƒ‰ā€¦ -team_kind = ķŒ€ ź²€ģƒ‰... -code_kind = ģ½”ė“œ ź²€ģƒ‰... +team_kind = ķŒ€ ź²€ģƒ‰ā€¦ +code_kind = ģ½”ė“œ ź²€ģƒ‰ā€¦ code_search_unavailable = ģ½”ė“œ ź²€ģƒ‰ģ€ ķ˜„ģž¬ ķ—ˆģš©ė˜ģ§€ ģ•Šģ•˜ģŠµė‹ˆė‹¤. ģ‚¬ģ“ķŠø ź“€ė¦¬ģžģ™€ ģ—°ė½ķ•˜ģ„øģš”. -package_kind = ķŒØķ‚¤ģ§€ ź²€ģƒ‰... -project_kind = ķ”„ė”œģ ķŠø ź²€ģƒ‰... +package_kind = ķŒØķ‚¤ģ§€ ź²€ģƒ‰ā€¦ +project_kind = ķ”„ė”œģ ķŠø ź²€ģƒ‰ā€¦ exact_tooltip = ź²€ģƒ‰ģ–“ģ™€ ģ •ķ™•ķ•˜ź²Œ ģ¼ģ¹˜ķ•˜ėŠ” ź²°ź³¼ė§Œ ķ¬ķ•Ø issue_kind = ģ“ģŠˆ ź²€ģƒ‰ā€¦ pull_kind = ķ’€ ź²€ģƒ‰ā€¦ diff --git a/options/locale/locale_lt.ini b/options/locale/locale_lt.ini index 868e5bff6e..9d1c938379 100644 --- a/options/locale/locale_lt.ini +++ b/options/locale/locale_lt.ini @@ -149,24 +149,24 @@ fuzzy = Tikslintinas union_tooltip = Ä®traukti rezultatus, atitinkančius bet kurÄÆ iÅ” matomą tarpą atskirtų raktažodžių exact = Tiksliai exact_tooltip = Ä®traukti tik tuos rezultatus, kurie atitinka tikslią paieÅ”kos frazę -user_kind = IeÅ”koti naudotojų... -team_kind = IeÅ”koti komandų... -code_kind = IeÅ”koti kodo... +user_kind = IeÅ”koti naudotojųā€¦ +team_kind = IeÅ”koti komandųā€¦ +code_kind = IeÅ”koti kodoā€¦ fuzzy_tooltip = Ä®traukti rezultatus, kurie taip pat labai atitinka paieÅ”kos terminą -repo_kind = IeÅ”koti saugyklų... +repo_kind = IeÅ”koti saugyklųā€¦ code_search_unavailable = Kodų paieÅ”ka Å”iuo metu nepasiekiama. Kreipkis ÄÆ svetainės administratorių. -org_kind = IeÅ”koti organizacijų... +org_kind = IeÅ”koti organizacijųā€¦ union = Bendrinis code_search_by_git_grep = Dabartiniai kodo paieÅ”kos rezultatai pateikiami atliekant ā€žgit grepā€œ. Rezultatai gali bÅ«ti geresni, jei svetainės administratorius ÄÆjungs kodo indeksuotoją. -package_kind = IeÅ”koti paketų... -project_kind = IeÅ”koti projektų... -commit_kind = IeÅ”koti ÄÆsipareigojimų... -runner_kind = IeÅ”koti vykdyklių... +package_kind = IeÅ”koti paketųā€¦ +project_kind = IeÅ”koti projektųā€¦ +commit_kind = IeÅ”koti ÄÆsipareigojimųā€¦ +runner_kind = IeÅ”koti vykdykliųā€¦ no_results = Nerasta atitinkamų rezultatų. -issue_kind = IeÅ”koti problemų... -branch_kind = IeÅ”koti Å”akų... +issue_kind = IeÅ”koti problemųā€¦ +branch_kind = IeÅ”koti Å”akųā€¦ milestone_kind = IeÅ”koti gairių... -pull_kind = IeÅ”koti sujungimų... +pull_kind = IeÅ”koti sujungimųā€¦ keyword_search_unavailable = IeÅ”koti pagal raktažodÄÆ Å”iuo metu nepasiekiamas. Susisiekite su svetainės administratoriumi. regexp = Reguliarusis reiÅ”kinys regexp_tooltip = Interpretuoti paieÅ”kos terminą kaip reguliariąją reiÅ”kinÄÆ diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini index 98baff217b..e8ee85c61a 100644 --- a/options/locale/locale_lv-LV.ini +++ b/options/locale/locale_lv-LV.ini @@ -1577,7 +1577,7 @@ issues.remove_ref_at=`noņēma atsauci no %s %s` issues.add_ref_at=`pievienoja atsauci uz %s %s` issues.delete_branch_at=`izdzēsa zaru %s %s` issues.filter_label=IezÄ«me -issues.filter_label_exclude=`Jāizmanto alt + klikŔķis/Enter, lai neiekļautu iezÄ«mes` +issues.filter_label_exclude=Jāizmanto Alt + klikŔķis, lai neiekļautu iezÄ«mes issues.filter_label_no_select=Visas iezÄ«mes issues.filter_label_select_no_label=Bez iezÄ«mes issues.filter_milestone=Atskaites punkts @@ -3635,7 +3635,7 @@ auto_merge_pull_request=`automātiski iekļāva izmaiņu pieprasÄ«jumu %s push_tag=aizgādāja birku %[3]s uz %[4]s delete_tag=izdzēsa birku %[2]s no %[3]s -delete_branch=izdzēsa zaru %[2]s no %[3]s +delete_branch=izdzēsa zaru %[2]s no %[3]s compare_branch=SalÄ«dzināt compare_commits=SalÄ«dzināt %d iesÅ«tÄ«jumus compare_commits_general=SalÄ«dzināt iesÅ«tÄ«jumus diff --git a/options/locale/locale_ml-IN.ini b/options/locale/locale_ml-IN.ini index fcc9888d8e..c4c266ad86 100644 --- a/options/locale/locale_ml-IN.ini +++ b/options/locale/locale_ml-IN.ini @@ -356,7 +356,7 @@ avatar=ą“…ą“µą“¤ą“¾ą“°ąµā€ ssh_gpg_keys=SSH / GPG ą“•ąµ€ą“•ą“³ąµā€ social=ą“øąµ‹ą“·ąµą“Æąµ½ ą“…ą“•ąµą“•ąµ—ą“£ąµą“Ÿąµą“•ąµ¾ applications=ą“…ą“Ŗąµą“²ą“æą“•ąµą“•ąµ‡ą“·ą“Øąµą“•ąµ¾ -orgs=ą“øą“‚ą“˜ą“Ÿą“Øą“•ą“³ąµ† ą“Øą“æą“Æą“Øąµą“¤ąµą“°ą“æą“•ąµą“•ąµą“• +orgs=ą“øą“‚ą“˜ą“Ÿą“Øą“•ąµ¾ repos=ą“•ą“²ą“µą“±ą“•ą“³ąµā€ delete=ą“…ą“•ąµą“•ąµ—ą“£ąµą“Ÿąµ ą“‡ą“²ąµą“²ą“¾ą“¤ą“¾ą“•ąµą“•ąµą“• twofa=ą“‡ą“°ą“Ÿąµą“Ÿ ą“˜ą“Ÿą“• ą“Ŗąµą“°ą“¾ą“®ą“¾ą“£ąµ€ą“•ą“°ą“£ą“‚ @@ -400,8 +400,8 @@ password_change_disabled=ą“Ŗąµą“°ą“¾ą“¦ąµ‡ą“¶ą“æą“• ą“‡ą“¤ą“° ą“‰ą“Ŗą“Æąµ‹ą“• emails=ą“‡-ą“®ąµ†ą“Æą“æą“²ąµā€ ą“µą“æą“²ą“¾ą“øą“™ąµą“™ą“³ąµā€ manage_emails=ą“‡ą“®ąµ†ą“Æą“æąµ½ ą“µą“æą“²ą“¾ą“øą“™ąµą“™ąµ¾ ą“Øą“æą“Æą“Øąµą“¤ąµą“°ą“æą“•ąµą“•ąµą“• -manage_themes=ą“øąµą“„ą“æą“°ą“øąµą“„ą“æą“¤ą“æ ą“Ŗąµą“°ą“®ąµ‡ą“Æą“‚ ą“¤ą“æą“°ą“žąµą“žąµ†ą“Ÿąµą“•ąµą“•ąµą“• -manage_openid=ą““ą“Ŗąµą“Ŗąµŗą“ą“”ą“æ ą“µą“æą“²ą“¾ą“øą“™ąµą“™ąµ¾ ą“Øą“æą“Æą“Øąµą“¤ąµą“°ą“æą“•ąµą“•ąµą“• +manage_themes=ą“”ą“æą“«ąµ‹ąµ¾ą“Ÿąµą“Ÿąµ ą“¤ąµ€ą“‚ +manage_openid=OpenID ą“µą“æą“²ą“¾ą“øą“™ąµą“™ąµ¾ email_desc=ą“…ą“±ą“æą“Æą“æą“Ŗąµą“Ŗąµą“•ąµ¾ą“•ąµą“•ąµą“‚ ą“®ą“±ąµą“±ąµ ą“Ŗąµą“°ą“µąµ¼ą“¤ąµą“¤ą“Øą“™ąµą“™ąµ¾ą“•ąµą“•ąµą“®ą“¾ą“Æą“æ ą“Øą“æą“™ąµą“™ą“³ąµą“Ÿąµ† ą“Ŗąµą“°ą“¾ą“„ą“®ą“æą“• ą“‡ą“®ąµ†ą“Æą“æąµ½ ą“µą“æą“²ą“¾ą“øą“‚ ą“‰ą“Ŗą“Æąµ‹ą“—ą“æą“•ąµą“•ąµą“‚. theme_desc=ą“øąµˆą“±ąµą“±ą“æą“²ąµą“Ÿą“Øąµ€ą“³ą“‚ ą“‡ą“¤ąµ ą“Øą“æą“™ąµą“™ą“³ąµą“Ÿąµ† ą“øąµą“„ą“æą“°ą“øąµą“„ą“æą“¤ą“æ ą“Ŗąµą“°ą“®ąµ‡ą“Æą“‚ ą“†ą“Æą“æą“°ą“æą“•ąµą“•ąµą“‚. primary=ą“Ŗąµą“°ą“¾ą“„ą“®ą“æą“•ą“‚ diff --git a/options/locale/locale_nb_NO.ini b/options/locale/locale_nb_NO.ini index 2c8b5cfc64..59673fd4e3 100644 --- a/options/locale/locale_nb_NO.ini +++ b/options/locale/locale_nb_NO.ini @@ -60,7 +60,7 @@ rerun = KjĆør pĆ„ nytt rerun_all = KjĆør alle jobber pĆ„ nytt save = Lagre cancel = Avbryt -forks = Forks +forks = Kopier milestones = MilepƦler ok = OK test = Test @@ -133,14 +133,42 @@ webauthn_error_duplicated = SikkerhetsnĆøkkelen er ikke tillatt for denne foresp webauthn_error_timeout = Et tidsavbrudd oppsto fĆør nĆøkkelen din kunne leses. Vennligst last inn siden pĆ„ nytt og prĆøv igjen. new_fork = Ny fork av repository collaborative = Samarbeidende +error413 = Du har brukt opp kvoten din. +issues = Saker +unpin = LĆøsne +filter.is_fork = Forks +filter.not_fork = Ikke forks +pull_requests = Pull requests +copy_branch = Kopier branch navn +error404 = Siden du forsĆøker Ć„ nĆ„ eksisterer ikke, er blitt fjernet eller du har ikke tilgang til Ć„ se den. +tracked_time_summary = Oppsummering av sporet tid basert pĆ„ problemfiltre [search] -search = SĆøk... +search = SĆøkā€¦ type_tooltip = SĆøketype fuzzy = Fuzzy union = Union regexp = RegExp exact = NĆøyaktig +team_kind = SĆøk i teamsā€¦ +code_kind = SĆøk i kodeā€¦ +package_kind = SĆøk i pakkerā€¦ +project_kind = SĆøk i prosjekterā€¦ +branch_kind = SĆøk i brancherā€¦ +commit_kind = SĆøk i commitsā€¦ +regexp_tooltip = Tolk sĆøkeordet som et regulƦruttrykk +pull_kind = SĆøk i pullsā€¦ +keyword_search_unavailable = SĆøk etter nĆøkkelord er for Ćøyeblikket ikke tilgjengelig. Kontakt administratoren. +exact_tooltip = Inkluder kun resultater som samsvarer nĆøyaktig med sĆøkeordet +repo_kind = SĆøk i repositorerā€¦ +fuzzy_tooltip = Inkluder resultater som ogsĆ„ stemmer godt overens med sĆøketermen +org_kind = SĆøk i organisasjonerā€¦ +issue_kind = SĆøk i sakerā€¦ +runner_kind = SĆøk i runnersā€¦ +no_results = Ingen treff funnet. +union_tooltip = Inkluder resultater som samsvarer med ett eller flere av nĆøkkelordene adskilt med mellomrom +code_search_unavailable = KodesĆøk er ikke tilgjengelig. Kontakt administratoren. +user_kind = SĆøk i brukereā€¦ [auth] verify = Bekreft @@ -152,4 +180,88 @@ oauth_signup_title = FullfĆør ny konto oauth_signup_submit = FullfĆør konto [home] -uname_holder = Brukernavn eller e-postadresse \ No newline at end of file +uname_holder = Brukernavn eller e-postadresse + +[heatmap] +contributions_zero = Ingen bidrag +number_of_contributions_in_the_last_12_months = %s bidrag de siste 12 mĆ„nedene +contributions_one = bidrag +contributions_format = {contributions} den {day} {month} {year} +less = Mindre +contributions_few = bidrag +more = Mer + +[editor] +buttons.heading.tooltip = Legg til overskrift +buttons.bold.tooltip = Legg til uthevet tekst +buttons.italic.tooltip = Legg til kursiv text +buttons.list.unordered.tooltip = Legg til punktliste +buttons.list.ordered.tooltip = Legg til nummerert liste +buttons.link.tooltip = Legg til link +buttons.quote.tooltip = Siter tekst +buttons.mention.tooltip = Nevn en bruker eller team +buttons.list.task.tooltip = Legg til liste over saker +buttons.code.tooltip = Legg til kode +table_modal.header = Legg til tabell +table_modal.placeholder.header = Overskrift +table_modal.placeholder.content = Innhold +table_modal.label.columns = Kolonner +buttons.new_table.tooltip = Legg til tabell +table_modal.label.rows = Rader +buttons.switch_to_legacy.tooltip = Bruk den gamle editoren istedenfor +buttons.disable_monospace_font = Deaktiver monospace font +buttons.ref.tooltip = Referanse til en sak eller pull request +buttons.indent.tooltip = Grupper elementene med et nivĆ„ +buttons.unindent.tooltip = Pakk ut elementene med et nivĆ„ +link_modal.url = Url +link_modal.description = Beskrivelse +link_modal.header = Legg til en link +buttons.enable_monospace_font = Aktiver monospace font +link_modal.paste_reminder = Tips: NĆ„r du har en URL i utklippstavlen kan du lime den direkte inn i editoren for Ć„ lage en lenke. + +[aria] +footer = Bunntekst +navbar = Navigasjonslinje +footer.links = Linker +footer.software = Om dette programmet + +[filter] +string.asc = A - Z +string.desc = Z - A + +[error] +occurred = En feil oppstod +not_found = Kunne ikke finne mĆ„let. +report_message = Hvis du mener dette er en feil i Forgejo kan du sĆøke pĆ„ Codeberg eller Ć„pne en ny sak. +network_error = Nettverks feil +server_internal = Intern server feil + +[install] +docker_helper = Dersom du bruker Forgejo med Docker, anbefales det Ć„ lese dokumentasjonen fĆør du gjĆør endringer i konfigurasjonen. +db_title = Database innstillinger +require_db_desc = Forgejo krever MySQL, PostgreSQL, SQLite3 eller TiDB (MySQL protokoll). +db_type = Database type +password = Passord +user = Brukernavn +install = Installasjon +title = FĆørstegangsoppsett +host = Server +db_name = Database navn +db_schema = Skjema +db_schema_helper = La stĆ„ tomt for databasens standardverdi ("public"). +ssl_mode = SSL +path = Sti +sqlite_helper = Sti til SQLite3-databasen.
Bruk absolutt filsti dersom Forgejo kjĆøres som en tjeneste. +reinstall_error = Du prĆøver Ć„ installere i en eksisterende Forgejo-database +reinstall_confirm_message = ƅ installere pĆ„ nytt med en eksisterende Forgejo-database kan fĆøre til problemer. I de fleste tilfeller bĆør du bruke din eksisterende "app.ini" for Ć„ kjĆøre Forgejo. Hvis du vet hva du gjĆør, og vil fortsette, bekreft fĆølgende: + +[startpage] +install = Enkel Ć„ installere +platform = Plattformuavhengig +install_desc = Du kan enkelt kjĆøre programfilen for din platform, bruke Docker, eller hente den som en ferdig pakke. +lightweight_desc = Forgejo krever lite ressurser og kan kjĆøres pĆ„ en rimelig Raspberry Pi. Spar strĆøm og miljĆøet! +app_desc = En enkel Git-tjeneste du kan drifte selv +lightweight = Lettvekt +license = ƅpen kildekode +platform_desc = Forgejo fungerer pĆ„ frie operativsystemer som Linux og FreeBSD, og stĆøtter flere CPU-arkitekturer. Velg den plattformen du foretrekker! +license_desc = Last ned Forgejo! Bli med ved Ć„ bidra for Ć„ gjĆøre prosjektet enda bedre. Ikke vƦr redd for Ć„ bli en bidragsyter! \ No newline at end of file diff --git a/options/locale/locale_nds.ini b/options/locale/locale_nds.ini index 68fe899d6e..791f1b84d3 100644 --- a/options/locale/locale_nds.ini +++ b/options/locale/locale_nds.ini @@ -568,7 +568,7 @@ organization = Vereenigungen uid = UID webauthn = Twee-Faktooren-Anmellen (Sekerheids-Slƶtels) blocked_users = Blockeert Brukers -public_profile = Publikes Profil +public_profile = Publikes profil location_placeholder = Deel waar du umslags bĆ¼st mit Annerns pronouns = Pronomens pronouns_custom = Eegene @@ -1552,7 +1552,7 @@ issues.dependency.pr_close_blocks = Deeser Haalvƶrslag blockeert dat Dichtmaken issues.dependency.issue_batch_close_blocked = Kann de utkƶƶrt Gefallens nich all tosamen dichtmaken, denn Gefall #%d hett noch open Ofhangens issues.dependency.pr_close_blocked = Du muttst all Gefallens, wat deesen Haalvƶrslag blockeren, dichtmaken, ehr du dat hier tosamenfƶhren kannst. issues.dependency.blocks_short = Blockeert -issues.dependency.blocked_by_short = Hang of vun +issues.dependency.blocked_by_short = Hangt of vun issues.dependency.remove_header = Ofhangen wegdoon issues.dependency.setting = Ofhangens fƶr Gefallens un Haalvƶrslagen anknipsen issues.dependency.add_error_same_issue = Du kannst een Gefall nich vun sik sĆ¼lvst ofhangen laten. @@ -3304,7 +3304,7 @@ comment_issue = `hett up Gefall %[3]s #%[2]s kommenteert` comment_pull = `hett up Haalvƶrslag %[3]s #%[2]s kommenteert` auto_merge_pull_request = `hett Haalvƶrslag %[3]s #%[2]s automatisk tosamenfƶhrt` transfer_repo = hett Repositorium %s na %s ƶverdragen -delete_branch = hett Twieg %[2]s vun %[3]s lƶsket +delete_branch = hett Twieg %[2]s vun %[3]s lƶsket compare_branch = Verglieken compare_commits = %d Kommitterens verglieken compare_commits_general = Kommitterens verglieken diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini index 48442bc39f..d547b5bf77 100644 --- a/options/locale/locale_nl-NL.ini +++ b/options/locale/locale_nl-NL.ini @@ -1495,7 +1495,7 @@ issues.remove_ref_at=`heeft referentie %s verwijderd %s` issues.add_ref_at=`heeft referentie %s toegevoegd %s` issues.delete_branch_at=`heeft %[2]s de branch %[1]s verwijderd.` issues.filter_label=Label -issues.filter_label_exclude=Gebruik alt + klik/voer in om labels uit te sluiten +issues.filter_label_exclude=Gebruik alt + klik om labels uit te sluiten issues.filter_label_no_select=Alle labels issues.filter_milestone=Mijlpaal issues.filter_project=Project @@ -1554,8 +1554,8 @@ issues.close_comment_issue=Sluit met commentaar issues.reopen_issue=Heropen issues.reopen_comment_issue=Heropen met commentaar issues.create_comment=Reageer -issues.closed_at=`heeft dit probleem gesloten %s` -issues.reopened_at=`heropende dit probleem %s` +issues.closed_at=`heeft deze issue gesloten %s` +issues.reopened_at=`heropende deze issue %s` issues.commit_ref_at=`verwees naar dit probleem vanuit commit %s` issues.ref_issue_from=`refereerde aan dit issue %[3]s %[1]s` issues.ref_pull_from=`refereerde aan deze pull request %[3]s %[1]s` @@ -2912,6 +2912,14 @@ comment.blocked_by_user = Commentaar geven is niet mogelijk omdat u geblokkeerd sync_fork.button = Synchroniseer sync_fork.branch_behind_one = Deze branch is %[1]d commit achter %[2]s sync_fork.branch_behind_few = Deze branch is %[1]d commits achter %[2]s +settings.event_action_failure = Mislukking +settings.event_action_failure_desc = Action run is mislukt. +settings.event_action_recover = Herstel +settings.event_action_success = Succes +settings.event_action_success_desc = Action run is geslaagd. +settings.event_header_action = Actie run evenementen +issues.filter_type.all_pull_requests = Alle pull requests +settings.event_action_recover_desc = Action run is geslaagd nadat de laatste action run in dezelfde workflow is mislukt. @@ -3617,7 +3625,7 @@ create_repo=repository aangemaakt in %s rename_repo=hernoemde repository van %[1]s naar %[3]s transfer_repo=repository verplaatst naar %s naar %s delete_tag=heeft label %[2]s van %[3]s verwijderd -delete_branch=heeft branch %[2]s in %[3]s verwijderd +delete_branch=heeft branch %[2]s in %[3]s verwijderd compare_branch=Vergelijk compare_commits=Vergelijk %d commits compare_commits_general=Vergelijk commits diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini index 189e663618..cf491d2f43 100644 --- a/options/locale/locale_pl-PL.ini +++ b/options/locale/locale_pl-PL.ini @@ -1043,8 +1043,8 @@ language.title = Domyślny język language.localization_project = PomĆ³Å¼ nam przetłumaczyć Forgejo na twĆ³j język! Dowiedz się więcej. update_hints = Zaktualizuj wskazĆ³wki update_hints_success = WskazĆ³wki zostały zaktualizowane. -change_username_redirect_prompt.with_cooldown.one = Stara nazwa użytkownika będzie dostępna dla każdego po okresie ochronnym wynoszącym %[1]d dzień, nadal możesz uzyskać z powrotem starą nazwę użytkownika podczas okresu ochronnego. -change_username_redirect_prompt.with_cooldown.few = Stara nazwa użytkownika będzie dostępna dla każdego po okresie ochronnym wynoszącym %[1]d dni, nadal możesz uzyskać z powrotem starą nazwę użytkownika podczas okresu ochronnego. +change_username_redirect_prompt.with_cooldown.one = Stara nazwa użytkownika będzie dostępna dla każdego po okresie ochronnym wynoszącym %[1]d dzień. Nadal możesz uzyskać z powrotem starą nazwę użytkownika podczas okresu ochronnego. +change_username_redirect_prompt.with_cooldown.few = Stara nazwa użytkownika będzie dostępna dla każdego po okresie ochronnym wynoszącym %[1]d dni. Nadal możesz uzyskać z powrotem starą nazwę użytkownika podczas okresu ochronnego. language.description = Ten język zostanie zapisany na twoim koncie i będzie używany jako domyślny po zalogowaniu. hidden_comment_types_description = Rodzaje komentarzy zaznaczone tutaj nie będą wyświetlały się na stronach zgłoszeń. Zaznaczenie "Etykieta" na przykład usunie wszystkie komentarze " dodał/usunął ". principal_desc = Te podmioty certyfikatu SSH będą powiązane z twoim kontem i pozwolą na pełen dostęp do twoich repozytoriĆ³w. @@ -3552,7 +3552,7 @@ create_repo=tworzy repozytorium %s rename_repo=zmienia nazwę repozytorium %[1]s na %[3]s transfer_repo=przenosi repozytorium %s do %s delete_tag=usuwa tag %[2]s z %[3]s -delete_branch=usuwa gałąÅŗ %[2]s z %[3]s +delete_branch=usuwa gałąÅŗ %[2]s z %[3]s compare_branch=PorĆ³wnaj compare_commits=PorĆ³wnaj %d commitĆ³w compare_commits_general=PorĆ³wnaj commity @@ -3951,29 +3951,29 @@ normal_file = Zwykły plik search = Wyszukaj... type_tooltip = Typ wyszukiwania fuzzy = Przybliżone -package_kind = Wyszukaj pakiety... +package_kind = Wyszukaj pakietyā€¦ fuzzy_tooltip = Uwzględnij wyniki, ktĆ³re są bliskie wyszukiwanemu hasłu match = Dopasuj match_tooltip = Uwzględniaj tylko wyniki pasujące do wyszukiwanego hasła -repo_kind = Wyszukaj repozytoria... -user_kind = Wyszukaj użytkownilkĆ³w... +repo_kind = Wyszukaj repozytoriaā€¦ +user_kind = Wyszukaj użytkownilkĆ³wā€¦ code_search_unavailable = Wyszukiwanie kodu jest obecnie niedostępne. Skontakuj sie z administratorem strony. no_results = Nie znaleziono pasujących wynikĆ³w. -org_kind = Wyszukaj organizacje... -team_kind = Wyszukaj zespoły... -code_kind = Wyszukaj kod... +org_kind = Wyszukaj organizacjeā€¦ +team_kind = Wyszukaj zespołyā€¦ +code_kind = Wyszukaj kodā€¦ code_search_by_git_grep = Obecne wyniki wyszukiwania kodu są dostarczane przez "git grep". Wyniki mogą być lepsze, jeśli administrator witryny włączy indeksator kodu. -project_kind = Wyszukaj projekty... -branch_kind = Wyszukaj gałęzie... -commit_kind = Wyszukaj commity... -runner_kind = Wyszukaj runnery... +project_kind = Wyszukaj projektyā€¦ +branch_kind = Wyszukaj gałęzieā€¦ +commit_kind = Wyszukaj commityā€¦ +runner_kind = Wyszukaj runneryā€¦ keyword_search_unavailable = Wyszukiwanie według sÅ‚Ć³w kluczowych jest obecnie niedostępne. Skontaktuj się z administratorem strony. milestone_kind = Wyszukaj kamienie milowe... union_tooltip = Uwzględnia wyniki pasujące do dowolnego słowa kluczowego rozdzielonego białymi znakami exact = Dokładne exact_tooltip = Uwzględniaj tylko wyniki pasujące do wyszukiwanego hasła -issue_kind = Wyszukaj zgłoszenia... -pull_kind = Wyszukaj pull requesty... +issue_kind = Wyszukaj zgłoszeniaā€¦ +pull_kind = Wyszukaj pull requestyā€¦ union = Unia regexp = RegExp regexp_tooltip = Interpretuj wyszukiwane hasło jako wyrażenie regularne diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini index 8de0374eb2..242b915137 100644 --- a/options/locale/locale_pt-BR.ini +++ b/options/locale/locale_pt-BR.ini @@ -1278,7 +1278,7 @@ star_guest_user=Entre para adicionar este repositĆ³rio aos favoritos. unwatch=Deixar de observar watch=Observar unstar=Retirar dos favoritos -star=Juntar aos favoritos +star=Adicionar aos favoritos fork=Fork download_archive=Baixar repositĆ³rio more_operations=Mais operaƧƵes @@ -1934,7 +1934,7 @@ pulls.status_checks_success=Todas as verificaƧƵes foram bem sucedidas pulls.status_checks_warning=Algumas verificaƧƵes reportaram avisos pulls.status_checks_failure=Algumas verificaƧƵes falharam pulls.status_checks_error=Algumas verificaƧƵes reportaram erros -pulls.status_checks_requested=ObrigatĆ”rio +pulls.status_checks_requested=ObrigatĆ³rio pulls.status_checks_details=Detalhes pulls.update_branch=Atualizar branch por merge pulls.update_branch_rebase=Atualizar branch por rebase @@ -2803,7 +2803,7 @@ mirror_use_ssh.helper = Forgejo irĆ” espelhar o repositĆ³rio via Git atravĆ©s de mirror_denied_combination = NĆ£o Ć© possĆ­vel combinar o uso de chave pĆŗblica e autenticaĆ§Ć£o baseada em senha. mirror_public_key = Chave SSH pĆŗblica mirror_use_ssh.text = Usar autenticaĆ§Ć£o por SSH -mirror_use_ssh.not_available = AutenticaĆ§Ć£o por SSH nĆ£o estĆ” disponĆ­vel. +mirror_use_ssh.not_available = A autenticaĆ§Ć£o via SSH nĆ£o estĆ” disponĆ­vel. settings.push_mirror_sync_in_progress = Fazendo push das mudanƧas para o remoto %s nesse momento. settings.federation_apapiurl = URL de federaĆ§Ć£o deste repositĆ³rio. Copie e cole isso nas ConfiguraƧƵes de FederaĆ§Ć£o de outro repositĆ³rio como uma URL de um RepositĆ³rio Seguidor. pulls.agit_explanation = Criado usando o fluxo de trabalho AGit. AGit permite que contribuidores proponham mudanƧas usando "git push" sem criar um fork ou novo branch. @@ -2817,7 +2817,7 @@ settings.mirror_settings.pushed_repository = RepositĆ³rio enviado settings.mirror_settings.docs.disabled_pull_mirror.instructions = Configure seu projeto para automaticamente fazer push de commits, tags e branches para outro repositĆ³rio. Espelhos de pull foram desativados pelo administrador do seu site. settings.mirror_settings.docs.disabled_push_mirror.instructions = Configure seu projeto para automaticamente fazer pull de commits, tags e branches de outro repositĆ³rio. settings.mirror_settings.docs.doc_link_pull_section = a seĆ§Ć£o "Fazendo pull de um repositĆ³rio remoto" da documentaĆ§Ć£o. -subscribe.pull.guest.tooltip = Entre para receber notificaƧƵes deste pull request. +subscribe.pull.guest.tooltip = Inicie a sessĆ£o para receber notificaƧƵes deste pull request. settings.pull_mirror_sync_quota_exceeded = Cota excedida, nĆ£o serĆ” feito pull das mudanƧas. settings.mirror_settings.docs.more_information_if_disabled = Saiba mais sobre espelhos de push e pull aqui: settings.transfer_quota_exceeded = O novo dono (%s) excedeu a cota. O repositĆ³rio nĆ£o foi transferido. @@ -3636,7 +3636,7 @@ auto_merge_pull_request=`fez merge automĆ”tico do pull request % transfer_repo=transferiu repositĆ³rio de %s para %s push_tag=fez push da tag %[3]s to %[4]s delete_tag=excluiu tag %[2]s de %[3]s -delete_branch=excluiu branch %[2]s de %[3]s +delete_branch=excluiu branch %[2]s de %[3]s compare_branch=Comparar compare_commits=Compare %d commits compare_commits_general=Comparar commits @@ -3900,7 +3900,7 @@ deletion=Excluir segredo deletion.description=A exclusĆ£o de um segredo Ć© permanente e nĆ£o pode ser desfeita. Continuar? deletion.success=O segredo foi excluĆ­do. deletion.failed=Falha ao excluir segredo. -management=Gerenciar segredos +management=Gerenciamento de segredos [actions] actions=AƧƵes @@ -3909,12 +3909,12 @@ unit.desc=Gerenciar pipelines integradas de CI/CD com Forgejo Actions. status.unknown=Desconhecido status.waiting=Aguardando -status.running=Rodando +status.running=Executando status.success=Sucesso status.failure=Falha -status.cancelled=Cancelado -status.skipped=Ignorado -status.blocked=Bloqueado +status.cancelled=Cancelada +status.skipped=Ignorada +status.blocked=Bloqueada runners=Runners runners.runner_manage_panel=Gerenciar runners diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini index 0e8f2d485e..6dbc92e1f5 100644 --- a/options/locale/locale_pt-PT.ini +++ b/options/locale/locale_pt-PT.ini @@ -1063,8 +1063,8 @@ language.description = Este idioma vai ser guardado na sua conta e ser usado com language.localization_project = Ajude-nos a traduzir o Forgejo para o seu idioma! Ler mais. pronouns_custom_label = Pronomes personalizados user_block_yourself = NĆ£o se pode bloquear a si prĆ³prio. -change_username_redirect_prompt.with_cooldown.one = O nome de utilizador antigo estarĆ” disponĆ­vel para todos apĆ³s um perĆ­odo de espera de %[1]d dia, podendo ainda reivindicar o nome de utilizador antigo durante o perĆ­odo de espera. -change_username_redirect_prompt.with_cooldown.few = O nome de utilizador antigo ficarĆ” disponĆ­vel para todos apĆ³s um perĆ­odo de espera de %[1]d dias, podendo ainda reivindicar o nome de utilizador antigo durante o perĆ­odo de espera. +change_username_redirect_prompt.with_cooldown.one = O nome de utilizador antigo estarĆ” disponĆ­vel para todos apĆ³s um perĆ­odo de espera de %[1]d dia. Pode ainda reivindicar o nome de utilizador antigo durante o perĆ­odo de espera. +change_username_redirect_prompt.with_cooldown.few = O nome de utilizador antigo ficarĆ” disponĆ­vel para todos apĆ³s um perĆ­odo de espera de %[1]d dias. Pode ainda reivindicar o nome de utilizador antigo durante o perĆ­odo de espera. quota.applies_to_user = As seguintes regras de quotas aplicam-se Ć  sua conta quota.sizes.assets.artifacts = Artefactos quota.rule.exceeded.helper = O tamanho total dos objectos para esta regra excedeu a quota. @@ -1583,7 +1583,7 @@ issues.remove_ref_at=`removeu a referĆŖncia %s %s` issues.add_ref_at=`adicionou a referĆŖncia %s %s` issues.delete_branch_at=`eliminou o ramo %s %s` issues.filter_label=RĆ³tulo -issues.filter_label_exclude=`Use alt + clique/enter para excluir rĆ³tulos` +issues.filter_label_exclude=Use Alt + Clique para excluir rĆ³tulos issues.filter_label_no_select=Todos os rĆ³tulos issues.filter_label_select_no_label=Sem rĆ³tulo issues.filter_milestone=Etapa @@ -2922,6 +2922,7 @@ settings.event_header_action = Eventos da execuĆ§Ć£o de aƧƵes settings.event_action_recover_desc = A execuĆ§Ć£o de aĆ§Ć£o foi bem sucedida depois da Ćŗltima execuĆ§Ć£o de aĆ§Ć£o na mesma sequĆŖncia de trabalho ter falhado. settings.event_action_success = Sucesso settings.event_action_success_desc = A ExecuĆ§Ć£o de aĆ§Ć£o foi bem sucedida. +issues.filter_type.all_pull_requests = Todos os pedidos de integraĆ§Ć£o [graphs] component_loading=A carregar %sā€¦ @@ -3057,8 +3058,8 @@ teams.invite.by=Convidado(a) por %s teams.invite.description=Clique no botĆ£o abaixo para se juntar Ć  equipa. follow_blocked_user = NĆ£o pode seguir esta organizaĆ§Ć£o porque esta organizaĆ§Ć£o bloqueou-o/a. open_dashboard = Abrir painel de controlo -settings.change_orgname_redirect_prompt.with_cooldown.one = O nome antigo da organizaĆ§Ć£o estarĆ” disponĆ­vel para todos apĆ³s um perĆ­odo de espera de %[1]d dia, podendo ainda reivindicar o nome antigo durante o perĆ­odo de espera. -settings.change_orgname_redirect_prompt.with_cooldown.few = O nome antigo da organizaĆ§Ć£o estarĆ” disponĆ­vel para todos apĆ³s um perĆ­odo de espera de %[1]d dias, podendo ainda reivindicar o nome antigo durante o perĆ­odo de espera. +settings.change_orgname_redirect_prompt.with_cooldown.one = O nome antigo da organizaĆ§Ć£o estarĆ” disponĆ­vel para todos apĆ³s um perĆ­odo de espera de %[1]d dia. Pode ainda reivindicar o nome antigo durante o perĆ­odo de espera. +settings.change_orgname_redirect_prompt.with_cooldown.few = O nome antigo da organizaĆ§Ć£o estarĆ” disponĆ­vel para todos apĆ³s um perĆ­odo de espera de %[1]d dias. Pode ainda reivindicar o nome antigo durante o perĆ­odo de espera. [admin] dashboard=Painel de controlo @@ -3636,7 +3637,7 @@ auto_merge_pull_request=`fez automaticamente a integraĆ§Ć£o constante no pedido transfer_repo=transferiu o repositĆ³rio %s para %s push_tag=enviou a etiqueta %[3]s para %[4]s delete_tag=eliminou a etiqueta %[2]de %[3]s -delete_branch=eliminou o ramo %[2]s de %[3]s +delete_branch=eliminou o ramo %[2]s de %[3]s compare_branch=Comparar compare_commits=Comparar %d comentimentos compare_commits_general=Comparar comentimentos diff --git a/options/locale/locale_ro.ini b/options/locale/locale_ro.ini index 305c34d013..06fdb45785 100644 --- a/options/locale/locale_ro.ini +++ b/options/locale/locale_ro.ini @@ -223,12 +223,12 @@ invalid_db_setting = Setările pentru bază de date sunt invalide: %v no_reply_address = Domeniu pentru adrese de email ascunse [search] -user_kind = Caută utilizatori... -team_kind = Caută echipe... -code_kind = Caută cod... -project_kind = Caută proiecte... -package_kind = Caută pachete... -org_kind = Caută organizații... +user_kind = Caută utilizatoriā€¦ +team_kind = Caută echipeā€¦ +code_kind = Caută codā€¦ +project_kind = Caută proiecteā€¦ +package_kind = Caută pacheteā€¦ +org_kind = Caută organizațiiā€¦ code_search_unavailable = Căutarea de cod nu este disponibilă momentan. Te rog contactează administratorul site-ului. keyword_search_unavailable = Căutarea după cuvĆ¢nt cheie nu este disponibilă momentan. Te rog contactează administratorul site-ului. no_results = Nu a fost găsit niciun rezultat corespunzător. diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini index 2ef1b868d4..c7cccc012c 100644 --- a/options/locale/locale_ru-RU.ini +++ b/options/locale/locale_ru-RU.ini @@ -1063,7 +1063,7 @@ language.description = Š’Ń‹Š±Ń€Š°Š½Š½Ń‹Š¹ яŠ·Ń‹Šŗ Š±ŃƒŠ“ŠµŃ‚ сŠ¾Ń…Ń€Š°Š½Ń‘Š½ language.localization_project = ŠŸŠ¾Š¼Š¾Š³ŠøтŠµ с ŠæŠµŃ€ŠµŠ²Š¾Š“Š¾Š¼ Forgejo Š½Š° сŠ²Š¾Š¹ яŠ·Ń‹Šŗ! ŠŸŠ¾Š“рŠ¾Š±Š½ŠµŠµ. user_block_yourself = ŠŠµŠ»ŃŒŠ·Ń Š·Š°Š±Š»Š¾ŠŗŠøрŠ¾Š²Š°Ń‚ŃŒ сŠµŠ±Ń. pronouns_custom_label = Š”Ń€ŃƒŠ³ŠøŠµ Š¼ŠµŃŃ‚Š¾ŠøŠ¼ŠµŠ½Šøя -change_username_redirect_prompt.with_cooldown.one = ŠŸŃ€ŠµŠ¶Š½ŠµŠµ ŠøŠ¼Ń Š±ŃƒŠ“ŠµŃ‚ Š“Š¾ŃŃ‚ŃƒŠæŠ½Š¾ Š“Š»Ń ŠøсŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Š½Šøя Š“руŠ³ŠøŠ¼ ŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŠµŠ»ŃŠ¼ ŠæŠ¾ŃŠ»Šµ ŠøстŠµŃ‡ŠµŠ½Šøя Š·Š°Ń‰Šøты Š² %[1]d Š“ŠµŠ½ŃŒ. Š’Ń‹ сŠ¼Š¾Š¶ŠµŃ‚Šµ Š²ŠµŃ€Š½ŃƒŃ‚ŃŒ ŠµŠ³Š¾ сŠµŠ±Šµ Š²Š¾ Š²Ń€ŠµŠ¼Ń срŠ¾ŠŗŠ° Š·Š°Ń‰Šøты. +change_username_redirect_prompt.with_cooldown.one = ŠŸŃ€ŠµŠ¶Š½ŠµŠµ ŠøŠ¼Ń Š±ŃƒŠ“ŠµŃ‚ Š“Š¾ŃŃ‚ŃƒŠæŠ½Š¾ Š“Š»Ń ŠøсŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Š½Šøя Š“руŠ³ŠøŠ¼ ŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŠµŠ»ŃŠ¼ ŠæŠ¾ŃŠ»Šµ ŠøстŠµŃ‡ŠµŠ½Šøя ŠæрŠ¾ŃŃ‚Š¾Ń Š² %[1]d Š“ŠµŠ½ŃŒ. Š’Ń‹ сŠ¼Š¾Š¶ŠµŃ‚Šµ Š²ŠµŃ€Š½ŃƒŃ‚ŃŒ ŠµŠ³Š¾ сŠµŠ±Šµ Š²Š¾ Š²Ń€ŠµŠ¼Ń срŠ¾ŠŗŠ° ŠæрŠ¾ŃŃ‚Š¾Ń. change_username_redirect_prompt.with_cooldown.few = ŠŸŃ€ŠµŠ¶Š½ŠµŠµ ŠøŠ¼Ń Š±ŃƒŠ“ŠµŃ‚ Š“Š¾ŃŃ‚ŃƒŠæŠ½Š¾ Š“Š»Ń ŠøсŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Š½Šøя Š“руŠ³ŠøŠ¼ ŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŠµŠ»ŃŠ¼ ŠæŠ¾ŃŠ»Šµ ŠøстŠµŃ‡ŠµŠ½Šøя Š·Š°Ń‰Šøты Š² %[1]d Š“Š½ŠµŠ¹. Š’Ń‹ сŠ¼Š¾Š¶ŠµŃ‚Šµ Š²ŠµŃ€Š½ŃƒŃ‚ŃŒ ŠµŠ³Š¾ сŠµŠ±Šµ Š²Š¾ Š²Ń€ŠµŠ¼Ń срŠ¾ŠŗŠ° Š·Š°Ń‰Šøты. keep_pronouns_private = ŠŸŠ¾ŠŗŠ°Š·Ń‹Š²Š°Ń‚ŃŒ Š¼ŠµŃŃ‚Š¾ŠøŠ¼ŠµŠ½Šøя тŠ¾Š»ŃŒŠŗŠ¾ Š·Š°Ń€ŠµŠ³ŠøстрŠøрŠ¾Š²Š°Š½Š½Ń‹Š¼ ŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŠµŠ»ŃŠ¼ keep_pronouns_private.description = ŠœŠµŃŃ‚Š¾ŠøŠ¼ŠµŠ½Šøя Š±ŃƒŠ“ут сŠŗрыты Š¾Ń‚ ŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŠµŠ»ŠµŠ¹, Š½Šµ ŠøŠ¼ŠµŃŽŃ‰Šøх учётŠ½Ń‹Ń… Š·Š°ŠæŠøсŠµŠ¹ Š½Š° сŠµŃ€Š²ŠµŃ€Šµ. @@ -1641,9 +1641,9 @@ issues.closed_at=`Š·Š°Š“Š°Ń‡Š° Š±Ń‹Š»Š° Š·Š°ŠŗрытŠ° %s` issues.reopened_at=`Š·Š°Š“Š°Ń‡Š° Š±Ń‹Š»Š° Š¾Ń‚ŠŗрытŠ° сŠ½Š¾Š²Š° %s` issues.commit_ref_at=`уŠæŠ¾Š¼ŠøŠ½Š°Š½ŠøŠµ этŠ¾Š¹ Š·Š°Š“Š°Ń‡Šø Š² ŠŗŠ¾Š¼Š¼ŠøтŠµ %s` issues.ref_issue_from=`уŠæŠ¾Š¼ŠøŠ½Š°Š½ŠøŠµ этŠ¾Š¹ Š·Š°Š“Š°Ń‡Šø %[3]s %[1]s` -issues.ref_pull_from=`уŠæŠ¾Š¼ŠøŠ½Š°Š½ŠøŠµ этŠ¾Š³Š¾ Š·Š°ŠæрŠ¾ŃŠ° сŠ»ŠøяŠ½Šøя %[3]s %[1]s` -issues.ref_closing_from=`уŠæŠ¾Š¼ŠøŠ½Š°Š½ŠøŠµ ŠøŠ· Š·Š°ŠæрŠ¾ŃŠ° Š½Š° сŠ»ŠøяŠ½ŠøŠµ %[3]s, ŠŗŠ¾Ń‚Š¾Ń€Ń‹Š¹ Š·Š°ŠŗрŠ¾ŠµŃ‚ эту Š·Š°Š“Š°Ń‡Ńƒ %[1]s` -issues.ref_reopening_from=`уŠæŠ¾Š¼ŠøŠ½Š°Š½ŠøŠµ ŠøŠ· Š·Š°ŠæрŠ¾ŃŠ° Š½Š° сŠ»ŠøяŠ½ŠøŠµ %[3]s, ŠŗŠ¾Ń‚Š¾Ń€Ń‹Š¹ ŠæŠ¾Š²Ń‚Š¾Ń€Š½Š¾ Š¾Ń‚ŠŗрŠ¾ŠµŃ‚ эту Š·Š°Š“Š°Ń‡Ńƒ %[1]s` +issues.ref_pull_from=`уŠæŠ¾Š¼ŃŠ½ŃƒŠ» этŠ¾Ń‚ Š·Š°ŠæрŠ¾Ń Š½Š° сŠ»ŠøяŠ½ŠøŠµ %[3]s %[1]s` +issues.ref_closing_from=`уŠæŠ¾Š¼ŃŠ½ŃƒŠ» эту Š·Š°Š“Š°Ń‡Ńƒ Š² Š·Š°ŠæрŠ¾ŃŠµ Š½Š° сŠ»ŠøяŠ½ŠøŠµ %[3]s, ŠŗŠ¾Ń‚Š¾Ń€Ń‹Š¹ Š·Š°ŠŗрŠ¾ŠµŃ‚ ŠµŃ‘ %[1]s` +issues.ref_reopening_from=`уŠæŠ¾Š¼ŃŠ½ŃƒŠ» эту Š·Š°Š“Š°Ń‡Ńƒ Š² Š·Š°ŠæрŠ¾ŃŠµ Š½Š° сŠ»ŠøяŠ½ŠøŠµ %[3]s, ŠŗŠ¾Ń‚Š¾Ń€Ń‹Š¹ ŠæŠµŃ€ŠµŠ¾Ń‚ŠŗрŠ¾ŠµŃ‚ эту Š·Š°Š“Š°Ń‡Ńƒ %[1]s` issues.ref_closed_from=`Š·Š°ŠŗрыŠ» этŠ¾Ń‚ Š·Š°ŠæрŠ¾Ń %[4]s %[2]s` issues.ref_reopened_from=`Š·Š°Š“Š°Ń‡Š° Š±Ń‹Š»Š° Š¾Ń‚ŠŗрытŠ° сŠ½Š¾Š²Š° %[4]s %[2]s` issues.ref_from=`ŠøŠ· %[1]s` @@ -3639,7 +3639,7 @@ auto_merge_pull_request=`Š°Š²Ń‚Š¾Š¼Š°Ń‚ŠøчŠµŃŠŗŠø ŠæрŠøŠ½ŃŃ‚ Š·Š°ŠæрŠ¾Ń Š½ transfer_repo=рŠµŠæŠ¾Š·ŠøтŠ¾Ń€ŠøŠ¹ %s Š±Ń‹Š» ŠæŠµŃ€ŠµŠ“Š°Š½: %s push_tag=Š¾Ń‚ŠæрŠ°Š²Š»ŠµŠ½ тŠµŠ³ %[3]s Š² %[4]s delete_tag=уŠ“Š°Š»Ń‘Š½ тŠµŠ³ %[2]s Š² %[3]s -delete_branch=уŠ“Š°Š»ŠµŠ½Š° Š²ŠµŃ‚Š²ŃŒ %[2]s Š² %[3]s +delete_branch=уŠ“Š°Š»ŠµŠ½Š° Š²ŠµŃ‚Š²ŃŒ %[2]s Š² %[3]s compare_branch=Š”рŠ°Š²Š½Šøть compare_commits=Š”рŠ°Š²Š½Šøть %d ŠŗŠ¾Š¼Š¼ŠøтŠ¾Š² compare_commits_general=Š”рŠ°Š²Š½Šøть ŠŗŠ¾Š¼Š¼Šøты diff --git a/options/locale/locale_si-LK.ini b/options/locale/locale_si-LK.ini index 54b0b246db..d6f4525c4d 100644 --- a/options/locale/locale_si-LK.ini +++ b/options/locale/locale_si-LK.ini @@ -482,7 +482,7 @@ avatar=ą¶…ą·€ą¶­ą·ą¶»ą·Š ssh_gpg_keys=SSH/ą¶¢ą·“ą¶“ą·“ą¶¢ą·“ ą¶ŗą¶­ą·”ą¶»ą·” social=ą·ƒą¶øą·ą¶¢ ą¶œą·’ą¶«ą·”ą¶øą·Š applications=ą¶ŗą·™ą¶Æą·”ą¶øą·Š -orgs=ą·ƒą¶‚ą·€ą·’ą¶°ą·ą¶± ą¶šą·…ą¶øą¶±ą·ą¶šą¶»ą¶«ą¶ŗ +orgs=ą·ƒą¶‚ą·€ą·’ą¶°ą·ą¶± repos=ą¶šą·ą·‚ą·Šą¶Ø delete=ą¶œą·’ą¶«ą·”ą¶ø ą¶øą¶šą¶±ą·Šą¶± twofa=ą¶Æą·Šą·€ą·’-ą·ƒą·ą¶°ą¶š ą·ƒą¶­ą·Šą¶ŗą·ą¶“ą¶±ą¶ŗ @@ -527,8 +527,8 @@ password_change_disabled=ą¶Æą·šą·ą·“ą¶ŗ ą¶±ą·œą·€ą¶± ą¶“ą¶»ą·’ą·ą·“ą¶½ą¶šą¶ŗ emails=ą·€ą·’-ą¶­ą·ą¶“ą·ą¶½ą·Š ą¶½ą·’ą¶“ą·’ą¶± manage_emails=ą·€ą·’-ą¶­ą·ą¶“ą·ą¶½ą·Š ą¶½ą·’ą¶“ą·’ą¶± ą¶šą·…ą¶øą¶±ą·ą¶šą¶»ą¶«ą¶ŗ -manage_themes=ą¶“ą·™ą¶»ą¶±ą·’ą¶øą·’ ą¶­ą·šą¶øą·ą·€ ą¶­ą·ą¶»ą¶±ą·Šą¶± -manage_openid=OpenID ą¶½ą·’ą¶“ą·’ą¶±ą¶ŗą¶±ą·Š ą¶šą·…ą¶øą¶±ą·ą¶šą¶»ą¶«ą¶ŗ ą¶šą¶»ą¶±ą·Šą¶± +manage_themes=ą¶“ą·™ą¶»ą¶±ą·’ą¶øą·’ ą¶­ą·šą¶øą·ą·€ +manage_openid=OpenID ą¶½ą·’ą¶“ą·’ą¶± theme_desc=ą¶øą·™ą¶ø ą·€ą·™ą¶¶ą·Š ą¶…ą¶©ą·€ą·’ą¶ŗ ą·„ą¶»ą·„ą· ą¶”ą¶¶ą¶œą·š ą¶“ą·™ą¶»ą¶±ą·’ą¶øą·’ ą¶­ą·šą¶øą·ą·€ ą·€ą¶±ą·” ą¶‡ą¶­. primary=ą¶“ą·Šą¶»ą·ą¶®ą¶øą·’ą¶š activated=ą·ƒą¶šą·Šą¶»ą·’ą¶ŗ @@ -2488,7 +2488,7 @@ merge_pull_request=`ą¶’ą¶šą·ą¶¶ą¶Æą·Šą¶° ą¶…ą¶Æą·’ą¶±ą·Šą¶± ą¶‰ą¶½ą·Šą¶½ą·“ą¶ø transfer_repo=ą¶øą·ą¶»ą·” ą¶šą¶»ą¶± ą¶½ą¶Æ ą¶œą¶¶ą¶©ą·ą·€ %s ą·ƒą·’ą¶§ %s push_tag=ą¶­ą¶½ą·Šą¶½ą·” ą¶§ą·ą¶œą¶ŗ %[3]s ą¶œą·š %[4]s ą¶œą·š delete_tag=ą¶øą¶šą·ą¶Æą·ą¶øą·”ą·€ą· ą¶§ą·ą¶œą¶ŗ%[2]s ą·ƒą·’ą¶§ %[3]s -delete_branch=ą¶øą¶šą·ą¶Æą·ą¶øą·– ą·ą·ą¶›ą·ą·€ %[2]s ą·ƒą·’ą¶§ %[3]s +delete_branch=ą¶øą¶šą·ą¶Æą·ą¶øą·– ą·ą·ą¶›ą·ą·€ %[2]s ą·ƒą·’ą¶§ %[3]s compare_branch=ą·ƒą·ƒą¶³ą¶±ą·Šą¶± compare_commits=%d ą·€ą·’ą·€ą¶»ą¶ŗą¶±ą·Š ą·ƒą·ƒą¶³ą· ą¶¶ą¶½ą¶±ą·Šą¶± compare_commits_general=ą·€ą·’ą·€ą¶»ą¶ŗą¶±ą·Š ą·ƒą·ƒą¶³ą· ą¶¶ą¶½ą¶±ą·Šą¶± diff --git a/options/locale/locale_sk-SK.ini b/options/locale/locale_sk-SK.ini index 0c44df326a..aa2f863b14 100644 --- a/options/locale/locale_sk-SK.ini +++ b/options/locale/locale_sk-SK.ini @@ -597,7 +597,7 @@ avatar=Avatar ssh_gpg_keys=SSH / GPG kľĆŗče social=SociĆ”lne Ćŗčty applications=AplikĆ”cie -orgs=SpravovaÅ„ organizĆ”cie +orgs=OrganizĆ”cie repos=RepozitĆ”re delete=ZmazaÅ„ Ćŗčet twofa=DvojfaktorovĆ© overenie @@ -656,8 +656,8 @@ password_change_disabled=Externe overovanĆ­ pouÅ¾Ć­vatelia nemĆ“Å¾u aktualizova emails=E-mailovĆ© adresy manage_emails=SprĆ”va e-mailovĆ½ch adries -manage_themes=Nastavenie predvolenej tĆ©my -manage_openid=SprĆ”va OpenID adries +manage_themes=PredvolenĆ” tĆ©ma +manage_openid=Adresy OpenID theme_desc=Toto bude vaÅ”a predvolenĆ” tĆ©ma vzhľadu naprieč strĆ”nkou. primary=PrimĆ”rny activated=AktivovanĆ½ diff --git a/options/locale/locale_sl.ini b/options/locale/locale_sl.ini index 608e05afa4..07ccaed259 100644 --- a/options/locale/locale_sl.ini +++ b/options/locale/locale_sl.ini @@ -133,7 +133,7 @@ reinstall_confirm_check_3 = Potrjujete, da ste popolnoma prepričani, da se ta p require_db_desc = Forgejo zahteva MySQL, PostgreSQL, SQLite3 ali TiDB (protokol MySQL). password_algorithm_helper = Nastavite algoritem za stiskanje gesla. Algoritmi imajo različne zahteve in moč. Algoritem argon2 je precej varen, vendar porabi veliko pomnilnika in je lahko neprimeren za majhne sisteme. reinstall_confirm_message = Ponovna namestitev z obstoječo zbirko podatkov Forgejo lahko povzroči več težav. V večini primerov morate za zagon programa Forgejo uporabiti obstoječi "app.ini". Če veste, kaj počnete, potrdite naslednje: -err_admin_name_is_reserved = Administrator UporabniÅ”ko ime je neveljavno, uporabniÅ”ko ime je rezervirano +err_admin_name_is_reserved = Administrator uporabniÅ”ko ime je neveljavno, uporabniÅ”ko ime je rezervirano disable_gravatar.description = Onemogočite vire avatarjev Gravatar in avatarje tretjih oseb. Uporabi se privzeti avatar, razen če uporabnik lokalno naloži avatar. install = Namestitev title = Začetna nastavitev @@ -367,7 +367,7 @@ delete = Brisanje računa uploaded_avatar_is_too_big = Velikost naložene datoteke (%d KiB) presega največjo velikost (%d KiB). webauthn = Dvofaktorsko preverjanje pristnosti (varnostni ključi) change_username_redirect_prompt = Staro uporabniÅ”ko ime bo preusmerjeno, dokler ga nekdo ne prevzame. -orgs = Upravljanje organizacij +orgs = Organizacije public_profile = Javni profil gpg_key_verified_long = Ključ je bil preverjen z žetonom in ga je mogoče uporabiti za preverjanje zavez, ki ustrezajo vsem aktiviranim e-poÅ”tnim naslovom tega uporabnika, poleg vseh ujemajočih se identitet za ta ključ. @@ -495,14 +495,14 @@ tab_openid = Odprta identiteta [home] show_both_archived_unarchived = Prikazovanje arhiviranih in nearhiviranih -switch_dashboard_context = Kontekst stikala Nadzorna ploŔča +switch_dashboard_context = Kontekst stikala nadzorna ploŔča search_repos = PoiŔčite skladiŔčeā€¦ filter_by_team_repositories = Filtriranje po skupinskih skladiŔčih show_archived = Arhivirano collaborative_repos = Sodelovalni repozitoriji my_mirrors = Moja ogledala show_only_public = Prikazovanje samo javnih -uname_holder = UporabniÅ”ko ime ali E-poÅ”tovni naslov +uname_holder = UporabniÅ”ko ime ali e-poÅ”tni naslov password_holder = Geslo my_repos = Repozitoriji show_more_repos = Prikaži več skladiŔčā€¦ diff --git a/options/locale/locale_sv-SE.ini b/options/locale/locale_sv-SE.ini index 8b43cb29b8..5b06c5e3b5 100644 --- a/options/locale/locale_sv-SE.ini +++ b/options/locale/locale_sv-SE.ini @@ -918,7 +918,7 @@ migrate.migrate_items_options=ƅtkomsttoken krƤvs fƶr att migrera ytterligare migrated_from=Migrerad frĆ„n %[2]s migrated_from_fake=Migrerad frĆ„n %[1]s migrate.migrate=Migrera frĆ„n %s -migrate.migrating=Migrerar frĆ„n %s ... +migrate.migrating=Migrerar frĆ„n %s ā€¦ migrate.migrating_failed=Migrering frĆ„n %s misslyckades. migrate.migrating_issues=Migrerar Ƥrenden @@ -2226,7 +2226,7 @@ create_repo=skapade utvecklingskatalog %s rename_repo=dƶpte om utvecklingskalatogen frĆ„n %[1]s till %[3]s transfer_repo=ƶverfƶrde utvecklingskalatogen %s till %s delete_tag=tog bort taggen %[2]s frĆ„n %[3]s -delete_branch=tog bort branchen %[2]s from %[3]s +delete_branch=tog bort branchen %[2]s from %[3]s compare_branch=JƤmfƶr compare_commits=JƤmfƶr %d commits compare_commits_general=JƤmfƶr commits @@ -2324,17 +2324,17 @@ exact = Exakt exact_tooltip = Inkludera bara resultat som exakt matchar sƶktermen repo_kind = Sƶk reponā€¦ user_kind = Sƶk anvƤndareā€¦ -code_kind = Sƶk kod... -package_kind = Sƶk paket... -runner_kind = Sƶk exekutorer... -branch_kind = Sƶk grenar... -commit_kind = Sƶk commiter... -project_kind = Sƶk projekt... +code_kind = Sƶk kodā€¦ +package_kind = Sƶk paketā€¦ +runner_kind = Sƶk exekutorerā€¦ +branch_kind = Sƶk grenarā€¦ +commit_kind = Sƶk commiterā€¦ +project_kind = Sƶk projektā€¦ search = Sƶkā€¦ type_tooltip = Sƶktyp -team_kind = Sƶk lag... +team_kind = Sƶk teamā€¦ org_kind = Sƶk organisationerā€¦ -issue_kind = Sƶk Ƥrenden... +issue_kind = Sƶk Ƥrendenā€¦ regexp_tooltip = Tolka sƶktermen som ett reguljƤrt uttryck code_search_unavailable = Kodsƶkning Ƥr fƶr nƤrvarande inte tillgƤnglig. VƤnligen kontakta webbplatsadministratƶren. fuzzy_tooltip = Inkludera resultat som Ƥr nƤrliggande till sƶktermen diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini index c07cefdab9..aa41d7dc63 100644 --- a/options/locale/locale_tr-TR.ini +++ b/options/locale/locale_tr-TR.ini @@ -163,8 +163,8 @@ new_repo.link = Yeni depo new_org.link = Yeni organizasyon error413 = Kotanızı doldurdunuz. toggle_menu = MenĆ¼yĆ¼ aƧ-kapa -new_migrate.title = Yeni geƧiş -new_migrate.link = Yeni geƧiş +new_migrate.title = Yeni gƶƧ +new_migrate.link = Yeni gƶƧ copy_path = Dizini kopyala confirm_delete_artifact = "%s" adlı Ć¶ÄŸeyi silmek istediğinizden emin misiniz? @@ -179,8 +179,9 @@ number_of_contributions_in_the_last_12_months=son 12 ayda %s katkı contributions_zero=Katkı yapılmamış less=Daha az more=Daha Fazla -contributions_one = katılım -contributions_few = katılımlar +contributions_one = katkı +contributions_few = katkı +contributions_format = {day} {month} {year} tarihinde {contributions} katkı [editor] buttons.heading.tooltip=Başlık ekle @@ -203,6 +204,12 @@ table_modal.placeholder.header = Başlık table_modal.placeholder.content = İƧerik table_modal.label.rows = Satırlar table_modal.label.columns = SĆ¼tunlar +link_modal.header = Bağlantı ekle +link_modal.url = Url +link_modal.description = AƧıklama +link_modal.paste_reminder = Ä°pucu: Panonuzdaki bir URL'yi doğrudan dĆ¼zenleyiciye yapıştırarak bir bağlantı oluşturabilirsiniz. +buttons.unindent.tooltip = Bir seviye girinti azalt +buttons.indent.tooltip = Bir seviye girinti artır [filter] string.asc=A - Z @@ -226,6 +233,7 @@ lightweight=Hafif lightweight_desc=Forgejo'nın minimal gereksinimleri Ƨok dĆ¼ÅŸĆ¼ktĆ¼r ve ucuz bir Raspberry Pi Ć¼zerinde Ƨalışabilmektedir. Makine enerjinizden tasarruf edin! license=AƧık Kaynak license_desc=Gidin ve Forgejo'yı edinin! Bu projeyi daha da iyi yapmak iƧin katkıda bulunarak bize katılın. Katkıda bulunmaktan Ƨekinmeyin! +platform_desc = Forgejo'nun Linux ve FreeBSD gibi ƶzgĆ¼r işletim sistemlerinde ve farklı CPU mimarilerinde Ƨalıştığı doğrulandı. Sevdiğinizi seƧin! [install] install=Kurulum @@ -252,9 +260,9 @@ err_empty_db_path=SQLite3 veritabanı dosya yolu boş olamaz. no_admin_and_disable_registration=Bir yƶnetici hesabı oluşturmadan kullanıcı kaydını kapatamazsınız. err_empty_admin_password=Yƶnetici parolası boş olamaz. err_empty_admin_email=Yƶnetici e-postası boş olamaz. -err_admin_name_is_reserved=Yƶnetici Kullanıcı Adı geƧersiz, bu kullanıcı adı rezerv edilen bir kelimedir +err_admin_name_is_reserved=Yƶnetici kullanıcı adı geƧersiz, bu kullanıcı adı rezerv edilen bir kelimedir err_admin_name_pattern_not_allowed=Yƶnetici kullanıcı adı geƧersiz, kullanıcı adı ayrılmış bir desenle eşleşiyor -err_admin_name_is_invalid=Yƶnetici Kullanıcı Adı geƧersiz +err_admin_name_is_invalid=Yƶnetici kullanıcı adı geƧersiz general_title=Genel ayarlar app_name=Site Başlığı @@ -344,6 +352,7 @@ enable_update_checker_helper_forgejo = release.forgejo.org adresindeki TXT DNS k allow_dots_in_usernames = Kullanıcı isimlerinde noktaya izin ver. Var olan kullanıcıları etkilemez. smtp_from_invalid = `"E-posta Olarak Gƶnder" adresi geƧersiz` +config_location_hint = Bu yapılandırma seƧenekleri şuraya kaydedilecek: [home] uname_holder=Kullanıcı adı veya e-posta adresi @@ -477,6 +486,7 @@ hint_register = Hesaba ihtiyacın var mı? Hemen kaydol. sign_in_openid = OpenID ile giriş yap hint_login = Mevcut hesabın var mı? Hemen giriş yap! use_onetime_code = Tek kullanımlık kod kullan +change_unconfirmed_email = Kayıt sırasında yanlış e-posta adresi verdiyseniz, aşağıdan değiştirebilirsiniz; yeni adresinize bir onay mesajı gƶnderilecektir. [mail] view_it_on=%s Ć¼zerinde gƶrĆ¼ntĆ¼le @@ -722,16 +732,16 @@ avatar=Avatar ssh_gpg_keys=SSH / GPG Anahtarları social=Sosyal Medya Hesapları applications=Uygulamalar -orgs=Organizasyonları Yƶnet +orgs=Kuruluşlar repos=Depolar -delete=Hesabı Sil -twofa=Ä°ki Aşamalı Doğrulama +delete=Hesabı sil +twofa=Ä°ki aşamalı doğrulama account_link=Bağlı Hesaplar organization=Organizasyonlar uid=UID webauthn=GĆ¼venlik Anahtarları -public_profile=Herkese AƧık Profil +public_profile=Herkese aƧık profil biography_placeholder=Bize kendiniz hakkında birşeyler sƶyleyin! (Markdown kullanabilirsiniz) location_placeholder=Yaklaşık konumunuzu başkalarıyla paylaşın profile_desc=Profilinizin başkalarına nasıl gƶsterildiğini yƶnetin. Ana e-posta adresiniz bildirimler, parola kurtarma ve web tabanlı Git işlemleri iƧin kullanılacaktır. @@ -796,8 +806,8 @@ password_change_disabled=Yerel olmayan kullanıcılar parolalarını Forgejo web emails=E-Posta Adresleri manage_emails=E-posta Adreslerini Yƶnet -manage_themes=Varsayılan temayı seƧ -manage_openid=OpenID Adreslerini Yƶnet +manage_themes=Varsayılan tema +manage_openid=OpenID adresleri email_desc=Ana e-posta adresiniz bildirimler, parola kurtarma ve gizlenmemişse eğer web tabanlı Git işlemleri iƧin kullanılacaktır. theme_desc=Bu, sitedeki varsayılan temanız olacak. primary=Birincil @@ -1166,7 +1176,7 @@ form.name_reserved=Depo adı "%s" rezerve edilmiş. form.name_pattern_not_allowed=Depo adında "%s" deseni kullanılamaz. need_auth=Yetkilendirme -migrate_options=GƶƧ SeƧenekleri +migrate_options=GƶƧ seƧenekleri migrate_service=GƶƧ Hizmeti migrate_options_mirror_helper=Bu depo bir yansı olacaktır migrate_options_lfs=LFS dosyalarını taşı @@ -1174,7 +1184,7 @@ migrate_options_lfs_endpoint.label=LFS UƧ Noktası migrate_options_lfs_endpoint.description=Taşıma, LFS sunucusunu belirlemek iƧin Git uzak sunucusunu kullanmaya Ƨalışacak. Eğer LFS veri deposu başka yerdeyse ƶzel bir uƧ nokta da belirtebilirsiniz. migrate_options_lfs_endpoint.description.local=Yerel bir sunucu yolu da destekleniyor. migrate_options_lfs_endpoint.placeholder=Boş bırakılırsa, uƧ nokta klon URL'sinden tĆ¼retilecektir -migrate_items=GƶƧ Ɩğeleri +migrate_items=GƶƧ Ć¶ÄŸeleri migrate_items_wiki=Wiki migrate_items_milestones=Kilometre Taşları migrate_items_labels=Etiketler @@ -1215,7 +1225,7 @@ migrate.migrating_labels=Etiketleri Taşıma migrate.migrating_releases=SĆ¼rĆ¼mleri Taşıma migrate.migrating_issues=Konuları Taşıma migrate.migrating_pulls=Değişiklik Ä°steklerini Taşıma -migrate.cancel_migrating_title=GĆ¶Ć§Ć¼ Ä°ptal Et +migrate.cancel_migrating_title=GĆ¶Ć§Ć¼ iptal et migrate.cancel_migrating_confirm=Bu gĆ¶Ć§Ć¼ iptal etmek istiyor musunuz? mirror_from=şunun yansıması @@ -1252,7 +1262,7 @@ find_tag=Etiketi bul branches=Dal tags=Etiket issues=Konular -pulls=Değişiklik Ä°stekleri +pulls=Değişiklik istekleri project_board=Projeler packages=Paketler actions=İşlemler @@ -1443,7 +1453,7 @@ projects.column.set_default=Varsayılanı Ayarla projects.column.set_default_desc=Bu sĆ¼tunu kategorize edilmemiş konular ve değişiklik istekleri iƧin varsayılan olarak ayarlayın projects.column.unset_default=Varsayılanları Geri Al projects.column.unset_default_desc=Bu sĆ¼tunu varsayılan olarak geri al -projects.column.delete=SutĆ¼n Sil +projects.column.delete=SĆ¼tunu sil projects.column.deletion_desc=Bir proje sĆ¼tununun silinmesi, ilgili tĆ¼m konuları 'Kategorize edilmemiş'e taşır. Devam edilsin mi? projects.column.color=Renk projects.open=AƧ @@ -1595,7 +1605,7 @@ issues.reopen_issue=Yeniden aƧ issues.reopen_comment_issue=Yorum Yap ve Yeniden AƧ issues.create_comment=Yorum yap issues.closed_at=`%s konusunu kapattı` -issues.reopened_at=`%s konusunu yeniden aƧtı` +issues.reopened_at=%s sorununu yeniden aƧtı issues.commit_ref_at=`%s işlemesinde bu konuyu işaret etti` issues.ref_issue_from=`bu konuya referansta bulundu %[3]s %[1]s` issues.ref_pull_from=`bu değişiklik isteğine referansta bulundu %[3]s %[1]s` @@ -1647,7 +1657,7 @@ issues.label.filter_sort.alphabetically=Alfabetik issues.label.filter_sort.reverse_alphabetically=Ters alfabetik issues.label.filter_sort.by_size=En kĆ¼Ć§Ć¼k boyut issues.label.filter_sort.reverse_by_size=En bĆ¼yĆ¼k boyut -issues.num_participants_few=%d Katılımcı +issues.num_participants_few=%d katılımcı issues.attachment.open_tab=`Yeni bir sekmede "%s" gƶrmek iƧin tıkla` issues.attachment.download=`"%s" indirmek iƧin tıkla` issues.subscribe=Abone Ol @@ -1984,7 +1994,7 @@ ext_wiki=Harici Vikiye Erişim ext_wiki.desc=Harici bir wiki'ye bağlantı. wiki=Wiki -wiki.welcome=Wiki'ye Hoşgeldiniz. +wiki.welcome=Viki'ye Hoş geldiniz. wiki.welcome_desc=Wiki, katkıcılarla belge yazmanıza ve paylaşmanıza olanak tanır. wiki.desc=Katkıcılarla belgeler yazın ve paylaşın. wiki.create_first_page=Ä°lk sayfayı oluştur @@ -2140,15 +2150,15 @@ settings.use_external_wiki=Harici Wiki Kullan settings.external_wiki_url=Harici Wiki bağlantısı settings.external_wiki_url_error=Harici wiki URL'si geƧerli bir URL değil. settings.external_wiki_url_desc=ZiyaretƧiler, wiki sekmesine tıklandığında harici wiki URL'sine yƶnlendirilir. -settings.issues_desc=Depo Konu Ä°zleyicisini Etkinleştir -settings.use_internal_issue_tracker=Yerleşik Konu Ä°zleyici Kullan -settings.use_external_issue_tracker=Harici Konu Ä°zleyici Kullan -settings.external_tracker_url=Harici Konu Ä°zleyici URLsi +settings.issues_desc=Depo sorun izleyicisini etkinleştir +settings.use_internal_issue_tracker=Yerleşik sorun izleyici kullan +settings.use_external_issue_tracker=Harici sorun izleyici kullan +settings.external_tracker_url=Harici sorun izleyici URL'si settings.external_tracker_url_error=Harici konu izleyici URL'si geƧerli bir URL değil. settings.external_tracker_url_desc=ZiyaretƧiler, konular sekmesine tıkladığında harici konu izleyici URL'sine yƶnlendirilir. -settings.tracker_url_format=Harici Konu Ä°zleyici URL BiƧimi +settings.tracker_url_format=Harici sorun izleyici URL BiƧimi settings.tracker_url_format_error=Harici konu izleyici URL biƧimi geƧerli bir URL değil. -settings.tracker_issue_style=Harici Konu Ä°zleyici Numara BiƧimi +settings.tracker_issue_style=Harici sorun izleyici Numara BiƧimi settings.tracker_issue_style.numeric=Sayısal settings.tracker_issue_style.alphanumeric=Alfanumerik settings.tracker_issue_style.regexp=DĆ¼zenli ifade @@ -2158,13 +2168,13 @@ settings.tracker_url_format_desc=Kullanıcı adı, depo adı ve yayın dizini i settings.enable_timetracker=Zaman Takibini Etkinleştir settings.allow_only_contributors_to_track_time=Sadece Katkıcılar İƧin Zaman Takibine Ä°zin Ver settings.pulls_desc=Değişiklik Ä°steklerini Etkinleştir -settings.pulls.ignore_whitespace=Ƈakışmalar iƧin Boşlukları Gƶzardı Et +settings.pulls.ignore_whitespace=Ƈakışmalar iƧin boşlukları gƶzardı et settings.pulls.enable_autodetect_manual_merge=Kendiliğinden algılamalı elle birleştirmeyi etkinleştir (Not: Bazı ƶzel durumlarda yanlış kararlar olabilir) settings.pulls.allow_rebase_update=Değişiklik isteği dalının yeniden yapılandırmayla gĆ¼ncellenmesine izin ver settings.pulls.default_delete_branch_after_merge=Varsayılan olarak birleştirmeden sonra değişiklik isteği dalını sil settings.pulls.default_allow_edits_from_maintainers=Bakımcıların dĆ¼zenlemelerine izin ver settings.releases_desc=Depo SĆ¼rĆ¼mlerini Etkinleştir -settings.packages_desc=Depo paket kĆ¼tĆ¼ÄŸĆ¼nĆ¼ etkinleştir +settings.packages_desc=Depo paket kayıt defterini etkinleştir settings.projects_desc=Depo Projelerini Etkinleştir settings.actions_desc=Depo İşlemlerini Etkinleştir settings.admin_settings=Yƶnetici Ayarları @@ -2188,7 +2198,7 @@ settings.convert_fork_desc=Bu Ƨatalı normal bir depoya dƶnĆ¼ÅŸtĆ¼rebilirsiniz settings.convert_fork_notices_1=Bu işlem Ƨatalı normal bir depoya dƶnĆ¼ÅŸtĆ¼rĆ¼r ve geri alınamaz. settings.convert_fork_confirm=Depoyu DƶnĆ¼ÅŸtĆ¼r settings.convert_fork_succeed=Ƈatal normal bir depoya dƶnĆ¼ÅŸtĆ¼rĆ¼ldĆ¼. -settings.transfer.title=Sahipliği Aktar +settings.transfer.title=Sahipliği aktar settings.transfer.rejected=Depo aktarımı reddedildi. settings.transfer.success=Depo aktarımı başarıyla tamamlandı. settings.transfer_abort=Aktarımı iptal et @@ -2448,7 +2458,7 @@ settings.block_on_official_review_requests_desc=Yeterli onay olsa bile, resmi in settings.block_outdated_branch=Değişiklik isteği gĆ¼ncel değilse birleştirmeyi engelle settings.block_outdated_branch_desc=Baş dal taban dalın arkasındayken birleştirme mĆ¼mkĆ¼n olmayacaktır. settings.default_branch_desc=Değişiklik istekleri ve kod işlemeleri iƧin varsayılan bir depo dalı seƧin: -settings.merge_style_desc=BiƧimleri Birleştir +settings.merge_style_desc=Birleştirme biƧemleri settings.default_merge_style_desc=Değişiklik istekleri iƧin varsayılan birleştirme tarzı: settings.choose_branch=Bir dal seƧā€¦ settings.no_protected_branch=Korumalı dal yok. @@ -2701,7 +2711,7 @@ settings.new_owner_blocked_doer = Yeni sahip sizi engelledi. open_with_editor = %s ile aƧ object_format = Nesne BiƧimi -mirror_sync = eşitlendi +mirror_sync = eşitlenme: stars = Yıldızlar desc.sha256 = SHA256 vendored = Sağlanmış @@ -2721,6 +2731,25 @@ settings.mirror_settings.pushed_repository = Ä°tilmiş depo settings.ignore_stale_approvals = Eskimiş onayları yoksay settings.ignore_stale_approvals_desc = Daha eski işlemelere (eski incelemelere) yapılmış olan onayları, DÄ°'nin kaƧ onayı olduğunu belirlerken sayma. Eskimiş incelemeler atıldıysa bu ilgisizdir. error.broken_git_hook = Bu deponun Git Ä°stemcileri bozuk gibi gƶzĆ¼kĆ¼yor. Onarmak iƧin lĆ¼tfen belgelere bakın, daha sonra durumu yenilemek iƧin bazı işlemeler itin. +commits.browse_further = Daha fazlasına gƶz at +settings.units.units = Birimler +commits.renamed_from = %s adından yeniden adlandırıldı +mirror_use_ssh.text = SSH yetkilendirme kullan +settings.default_update_style_desc = Temel dalın ardındaki Ƨekme isteklerini gĆ¼ncellemek iƧin kullanılan varsayılan gĆ¼ncelleme stili. +mirror_denied_combination = Ortak anahtar ve parola tabanlı kimlik doğrulama birlikte kullanılamaz. +mirror_public_key = Ortak SSH anahtarı +n_branch_few = %s dal +n_commit_few = %s gƶnderi +n_tag_few = %s etiket +settings.wiki_rename_branch_main = Viki dal adını normalleştir +mirror_use_ssh.not_available = SSH yetkilendirme kullanılamıyor. +mirror_use_ssh.helper = Forgejo, bu seƧeneği seƧtiğinizde deponuzu SSH Ć¼zerinden Git Ć¼zerinden yansıtacak ve sizin iƧin bir anahtar Ƨifti oluşturacaktır. Oluşturulan ortak anahtarın hedef depoya gƶnderilmek Ć¼zere yetkilendirildiğinden emin olmalısınız. Bunu seƧerken parola tabanlı yetkilendirme kullanamazsınız. +n_branch_one = %s dal +settings.units.add_more = Daha fazlasını etkinleştir +settings.wiki_globally_editable = Vikiyi herkesin dĆ¼zenlemesine izin ver +issues.filter_no_results_placeholder = Arama filtrelerini değiştirmeyi deneyin. +issues.filter_no_results = SonuƧ yok +issues.num_participants_one = %d katılımcı [graphs] component_loading = %s yĆ¼kleniyor... @@ -2736,7 +2765,7 @@ org_name_holder=Organizasyon Adı org_full_name_holder=Organizasyon Tam Adı org_name_helper=Organizasyon adları kısa ve hatırlanabilir olmalıdır. create_org=Organizasyon Oluştur -repo_updated=GĆ¼ncellendi %s +repo_updated=%s gĆ¼ncellendi members=Ɯyeler teams=Takımlar code=Kod @@ -2792,7 +2821,7 @@ members.membership_visibility=Ɯyelik GƶrĆ¼nĆ¼rlĆ¼ÄŸĆ¼: members.public=GƶrĆ¼nĆ¼r members.public_helper=gizle members.private=Gizlenmiş -members.private_helper=gƶrĆ¼nĆ¼r yap +members.private_helper=GƶrĆ¼nĆ¼r yap members.member_role=Ɯye RolĆ¼: members.owner=Sahibi members.member=Ɯye @@ -3311,7 +3340,7 @@ config.git_max_diff_lines=Maksimum Değişiklik Satırı (tek bir dosya iƧin) config.git_max_diff_line_characters=Maksimum Değişiklik Karakteri (tek bir satır iƧin) config.git_max_diff_files=Maksimum Değişiklik Dosyaları (gƶsterilecek) config.git_gc_args=GC ArgĆ¼manları -config.git_migrate_timeout=GƶƧ İşlemi Zaman Aşımı +config.git_migrate_timeout=GƶƧ işlemi zaman aşımı config.git_mirror_timeout=Yansı GĆ¼ncelleme Zaman Aşımı config.git_clone_timeout=Klonlama İşlemi Zaman Aşımı config.git_pull_timeout=Ƈekme İşlemi Zaman Aşımı @@ -3363,7 +3392,7 @@ monitor.queue.settings.maxnumberworkers=En fazla Ƨalışan Sayısı monitor.queue.settings.maxnumberworkers.placeholder=Şu anda %[1]d monitor.queue.settings.maxnumberworkers.error=En fazla Ƨalışan sayısı bir sayı olmalıdır monitor.queue.settings.submit=Ayarları GĆ¼ncelle -monitor.queue.settings.changed=Ayarlar GĆ¼ncellendi +monitor.queue.settings.changed=Ayarlar gĆ¼ncellendi monitor.queue.settings.remove_all_items=TĆ¼mĆ¼nĆ¼ kaldır monitor.queue.settings.remove_all_items_done=Kuyruktaki tĆ¼m Ć¶ÄŸeler kaldırıldı. @@ -3417,7 +3446,7 @@ auto_merge_pull_request=`%[3]s#%[2]s değişiklik isteği ot transfer_repo=depo %s %s'a aktarıldı push_tag=%[3]s etiketini %[4]s dalına gƶnderdi delete_tag=%[2]s etiketi %[3]s deposundan silindi -delete_branch=%[3]s deposundan %[2]s dalı silindi +delete_branch=%[3]s deposundan %[2]s dalı silindi compare_branch=Karşılaştır compare_commits=%d işlemeyi karşılaştır compare_commits_general=İşlemeleri karşılaştır @@ -3771,23 +3800,23 @@ submodule=Alt modĆ¼l [search] -project_kind = Projeleri ara... +project_kind = Projeleri araā€¦ org_kind = Organizasyonları araā€¦ team_kind = Takımları araā€¦ search = Araā€¦ code_kind = Kod araā€¦ type_tooltip = Arama tĆ¼rĆ¼ -repo_kind = Depoları ara... +repo_kind = Depoları araā€¦ user_kind = Kullanıcıları araā€¦ milestone_kind = Kilometre taşlarını ara... -branch_kind = Dalları ara... -package_kind = Paketleri ara... -commit_kind = Katkıları ara... -runner_kind = Ƈalıştırıcıları ara... +branch_kind = Dalları araā€¦ +package_kind = Paketleri araā€¦ +commit_kind = Katkıları araā€¦ +runner_kind = Ƈalıştırıcıları araā€¦ no_results = Eşleşen sonuƧ bulunamadı. code_search_unavailable = Kod araması şu anda kullanıma aƧık değildir. LĆ¼tfen site yƶneticisi ile iletişime geƧin. -issue_kind = Sorunları ara... -pull_kind = Birleştirme isteklerini ara... +issue_kind = Sorunları araā€¦ +pull_kind = Birleştirme isteklerini araā€¦ code_search_by_git_grep = Anlık kod araması sonuƧları "git grep" komutu tarafından sağlanmaktadır. Site yƶneticisinin kod endekslemesini aƧması durumunda daha iyi sonuƧlar verilmesi mĆ¼mkĆ¼n olabilir. keyword_search_unavailable = Anahtar kelime ile arama şu anda kullanıma aƧık değildir. LĆ¼tfen site yƶneticisi ile iletişime geƧin. fuzzy_tooltip = Arama terimine yakın olan eşleşmeleri dahil et @@ -3795,3 +3824,16 @@ union_tooltip = Boşlukla ayrılmış anahtar kelime eşleşmelerini dahil et exact_tooltip = Sadece arama terimiyle tam uyuşan sonuƧları dahit et. fuzzy = Bulanık exact = Tam +regexp = DĆ¼zenliÄ°fade +regexp_tooltip = Arama terimini dĆ¼zenli ifade olarak yorumla +union = Anahtar sƶzcĆ¼k + + +[munits.data] +tib = TiB +kib = KiB +pib = PiB +mib = MiB +b = B +gib = GiB +eib = EiB \ No newline at end of file diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini index faa3f2a56e..b94cb64af1 100644 --- a/options/locale/locale_uk-UA.ini +++ b/options/locale/locale_uk-UA.ini @@ -149,7 +149,7 @@ filter.not_archived = ŠŠµ Š°Ń€Ń…Ń–Š²Š¾Š²Š°Š½Š¾ filter.public = Š—Š°Š³Š°Š»ŃŒŠ½Š¾Š“Š¾ŃŃ‚ŃƒŠæŠ½Ń– filter.private = ŠŸŃ€ŠøŠ²Š°Ń‚Š½Ń– more_items = Š‘Ń–Š»ŃŒŃˆŠµ ŠæуŠ½ŠŗтіŠ² -remove_label_str = Š’ŠøŠ“Š°Š»ŠøтŠø Š¾Š±'єŠŗт Ā«%sĀ» +remove_label_str = Š’ŠøŠ“Š°Š»ŠøтŠø ŠµŠ»ŠµŠ¼ŠµŠ½Ń‚ Ā«%sĀ» new_repo.title = ŠŠ¾Š²ŠøŠ¹ рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Š¹ new_migrate.title = ŠŠ¾Š²Š° Š¼Ń–Š³Ń€Š°Ń†Ń–я new_org.title = ŠŠ¾Š²Š° Š¾Ń€Š³Š°Š½Ń–Š·Š°Ń†Ń–я @@ -195,10 +195,10 @@ buttons.list.task.tooltip = Š”Š¾Š“Š°Ń‚Šø сŠæŠøсŠ¾Šŗ Š·Š°Š²Š“Š°Š½ŃŒ buttons.heading.tooltip = Š”Š¾Š“Š°Ń‚Šø Š·Š°Š³Š¾Š»Š¾Š²Š¾Šŗ buttons.switch_to_legacy.tooltip = Š’ŠøŠŗŠ¾Ń€ŠøстŠ¾Š²ŃƒŠ²Š°Ń‚Šø Š·Š°ŃŃ‚Š°Ń€Ń–Š»ŠøŠ¹ рŠµŠ“Š°ŠŗтŠ¾Ń€ Š·Š°Š¼Ń–ŃŃ‚ŃŒ ŠæŠ¾Ń‚Š¾Ń‡Š½Š¾Š³Š¾ buttons.disable_monospace_font = Š’ŠøŠ¼ŠŗŠ½ŃƒŃ‚Šø Š¼Š¾Š½Š¾ŃˆŠøрŠøŠ½Š½ŠøŠ¹ шрŠøфт -buttons.indent.tooltip = Š’ŠŗŠ»Š°ŃŃ‚Šø ŠæрŠµŠ“Š¼ŠµŃ‚ Š½Š° Š¾Š“ŠøŠ½ ріŠ²ŠµŠ½ŃŒ -buttons.unindent.tooltip = Š’ŠøŠŗŠ»Š°ŃŃ‚Šø Š¾Š±'єŠŗт Š½Š° Š¾Š“ŠøŠ½ ріŠ²ŠµŠ½ŃŒ +buttons.indent.tooltip = Š’ŠŗŠ»Š°ŃŃ‚Šø ŠµŠ»ŠµŠ¼ŠµŠ½Ń‚ Š½Š° Š¾Š“ŠøŠ½ ріŠ²ŠµŠ½ŃŒ +buttons.unindent.tooltip = Š’ŠøŠŗŠ»Š°ŃŃ‚Šø ŠµŠ»ŠµŠ¼ŠµŠ½Ń‚ Š½Š° Š¾Š“ŠøŠ½ ріŠ²ŠµŠ½ŃŒ buttons.mention.tooltip = Š—Š³Š°Š“Š°Ń‚Šø ŠŗŠ¾Ń€ŠøстуŠ²Š°Ń‡Š° чŠø ŠŗŠ¾Š¼Š°Š½Š“у -buttons.ref.tooltip = ŠŸŠ¾ŃŠ»Š°Ń‚Šøсь Š½Š° Š·Š°Š“Š°Ń‡Ńƒ чŠø Š½Š° Š·Š°ŠæŠøт Š½Š° Š·Š»Šøття +buttons.ref.tooltip = ŠŸŠ¾ŃŠ»Š°Ń‚Šøся Š½Š° Š·Š°Š“Š°Ń‡Ńƒ чŠø Š½Š° Š·Š°ŠæŠøт Š½Š° Š·Š»Šøття buttons.enable_monospace_font = Š£Š²Ń–Š¼ŠŗŠ½ŃƒŃ‚Šø Š¼Š¾Š½Š¾ŃˆŠøрŠøŠ½Š½ŠøŠ¹ шрŠøфт buttons.new_table.tooltip = Š”Š¾Š“Š°Ń‚Šø тŠ°Š±Š»Šøцю table_modal.label.columns = Š”тŠ¾Š²Šæці @@ -348,7 +348,7 @@ app_slogan = Š“Š°ŃŠ»Š¾ ŠµŠŗŠ·ŠµŠ¼ŠæŠ»ŃŃ€Š° app_slogan_helper = Š£Š²ŠµŠ“іть Š³Š°ŃŠ»Š¾ Š²Š°ŃˆŠ¾Š³Š¾ ŠµŠŗŠ·ŠµŠ¼ŠæŠ»ŃŃ€Š° тут. Š—Š°Š»ŠøштŠµ ŠæŠ¾Ń€Š¾Š¶Š½Ń–Š¼, Š°Š±Šø Š²ŠøŠ¼ŠŗŠ½ŃƒŃ‚Šø. run_user_helper = Š†Š¼Ź¼Ń ŠŗŠ¾Ń€ŠøстуŠ²Š°Ń‡Š° Š¾ŠæŠµŃ€Š°Ń†Ń–Š¹Š½Š¾Ń— сŠøстŠµŠ¼Šø, Š²Ń–Š“ яŠŗŠ¾Š³Š¾ Š·Š°ŠæущŠµŠ½Š¾ Forgejo. Š—Š°ŃƒŠ²Š°Š¶Ń‚Šµ, щŠ¾ цŠµŠ¹ ŠŗŠ¾Ń€ŠøстуŠ²Š°Ń‡ ŠæŠ¾Š²ŠøŠ½ŠµŠ½ Š¼Š°Ń‚Šø Š“Š¾ŃŃ‚ŃƒŠæ Š“Š¾ ŠŗŠ¾Ń€ŠµŠ½ŠµŠ²Š¾Ń— тŠµŠŗŠø рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–ŃŽ. smtp_from_invalid = ŠŠ“рŠµŃŠ° Š· Ā«Š’Ń–Š“ŠæрŠ°Š²Š»ŃŃ‚Šø email Š²Ń–Š“ іŠ¼ŠµŠ½Ń–Ā» Š½ŠµŠ“іŠ¹ŃŠ½Š° -allow_dots_in_usernames = Š”Š¾Š·Š²Š¾Š»ŠøтŠø ŠŗŠ¾Ń€ŠøстуŠ²Š°Ń‡Š°Š¼ Š²ŠøŠŗŠ¾Ń€ŠøстŠ¾Š²ŃƒŠ²Š°Ń‚Šø ŠŗрŠ°ŠæŠŗŠø у сŠ²Š¾Ń—Ń… іŠ¼ŠµŠ½Š°Ń…. ŠŠµ Š²ŠæŠ»ŠøŠ²Š°Ń” Š½Š° Š¾Š±Š»Ń–ŠŗŠ¾Š²Ń– Š·Š°ŠæŠøсŠø, щŠ¾ Š²Š¶Šµ ісŠ½ŃƒŃŽŃ‚ŃŒ. +allow_dots_in_usernames = Š”Š¾Š·Š²Š¾Š»ŠøтŠø Š²ŠøŠŗŠ¾Ń€ŠøстŠ°Š½Š½Ń ŠŗрŠ°ŠæŠŗŠø Š² іŠ¼ŠµŠ½Š°Ń… ŠŗŠ¾Ń€ŠøстуŠ²Š°Ń‡Ń–Š². ŠŠµ Š²ŠæŠ»ŠøŠ²Š°Ń” Š½Š° Š¾Š±Š»Ń–ŠŗŠ¾Š²Ń– Š·Š°ŠæŠøсŠø, щŠ¾ Š²Š¶Šµ ісŠ½ŃƒŃŽŃ‚ŃŒ. invalid_password_algorithm = ŠŠµŠ“іŠ¹ŃŠ½ŠøŠ¹ Š²Š°Ń€Ń–Š°Š½Ń‚ Š°Š»Š³Š¾Ń€ŠøтŠ¼Ńƒ хŠµŃˆŃƒŠ²Š°Š½Š½Ń ŠæŠ°Ń€Š¾Š»Ń–Š² enable_update_checker_helper_forgejo = ŠŠ°ŃŠ²Š½Ń–ŃŃ‚ŃŒ Š½Š¾Š²Šøх Š²ŠµŃ€ŃŃ–Š¹ Forgejo ŠæŠµŃ€Ń–Š¾Š“ŠøчŠ½Š¾ ŠæŠµŃ€ŠµŠ²Ń–Ń€ŃŃ‚ŠøŠ¼ŠµŃ‚ŃŒŃŃ чŠµŃ€ŠµŠ· ŠæŠµŃ€ŠµŠ²Ń–Ń€Šŗу Š·Š°ŠæŠøсу TXT DNS Š½Š° release.forgejo.org. @@ -392,7 +392,7 @@ user_no_results=Š’Ń–Š“ŠæŠ¾Š²Ń–Š“Š½Šøх ŠŗŠ¾Ń€ŠøстуŠ²Š°Ń‡Ń–Š² Š½Šµ Š·Š½Š°Š¹Š“ org_no_results=Š’Ń–Š“ŠæŠ¾Š²Ń–Š“Š½Šøх Š¾Ń€Š³Š°Š½Ń–Š·Š°Ń†Ń–Š¹ Š½Šµ Š·Š½Š°Š¹Š“ŠµŠ½Š¾. code_no_results=Š’Ń–Š“ŠæŠ¾Š²Ń–Š“Š½ŠøŠ¹ ŠæŠ¾ŃˆŃƒŠŗŠ¾Š²Š¾Š¼Ńƒ Š·Š°ŠæŠøтŠ°Š½Š½ŃŽ ŠŗŠ¾Š“ Š½Šµ Š·Š½Š°Š¹Š“ŠµŠ½Š¾. code_last_indexed_at=ŠžŃŃ‚Š°Š½Š½Ń– іŠ½Š“ŠµŠŗсŠ¾Š²Š°Š½Ń– %s -relevant_repositories = Š’Ń–Š“Š¾Š±Ń€Š°Š¶Š°ŃŽŃ‚ŃŒŃŃ Š»ŠøшŠµ рŠµŠ»ŠµŠ²Š°Š½Ń‚Š½Ń– рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Ń—, ŠæŠµŃ€ŠµŠ³Š»ŃŠ½ŃƒŃ‚Šø рŠµŠ·ŃƒŠ»ŃŒŃ‚Š°Ń‚Šø Š±ŠµŠ· фіŠ»ŃŒŃ‚Ń€Ńƒ. +relevant_repositories = ŠŸŠ¾ŠŗŠ°Š·Š°Š½Š¾ Š»ŠøшŠµ рŠµŠ»ŠµŠ²Š°Š½Ń‚Š½Ń– рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Ń—, ŠæŠµŃ€ŠµŠ³Š»ŃŠ½ŃƒŃ‚Šø рŠµŠ·ŃƒŠ»ŃŒŃ‚Š°Ń‚Šø Š±ŠµŠ· фіŠ»ŃŒŃ‚Ń€Ńƒ. relevant_repositories_tooltip = ŠŸŃ€ŠøхŠ¾Š²Š°Š½Š¾ фŠ¾Ń€ŠŗŠø, Š° тŠ°ŠŗŠ¾Š¶ рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Ń— Š±ŠµŠ· тŠµŠ¼Šø, Š·Š½Š°Ń‡ŠŗŠ° Š¹ Š¾ŠæŠøсу. go_to = ŠŸŠµŃ€ŠµŠ¹Ń‚Šø Š“Š¾ stars_one = %d Š·Ń–Ń€ŠŗŠ° @@ -469,7 +469,7 @@ invalid_code_forgot_password = Š’Š°Ńˆ ŠŗŠ¾Š“ ŠæіŠ“тŠ²ŠµŃ€Š“Š¶ŠµŠ½Š½Ń Š½ŠµŠ“і reset_password_wrong_user = Š’Šø Š²Š²Ń–Š¹ŃˆŠ»Šø яŠŗ %s, Š°Š»Šµ ŠæŠ¾ŃŠøŠ»Š°Š½Š½Ń Š½Š° Š²Ń–Š“Š½Š¾Š²Š»ŠµŠ½Š½Ń Š±ŃƒŠ»Š¾ ŠæŠµŃ€ŠµŠ“Š±Š°Ń‡ŠµŠ½Šµ Š“Š»Ń %s back_to_sign_in = ŠŠ°Š·Š°Š“ Š“Š¾ Š²Ń…Š¾Š“у sign_in_openid = ŠŸŃ€Š¾Š“Š¾Š²Š¶ŠøтŠø Š· OpenID -openid_signin_desc = Š’Š²ŠµŠ“іть Š²Š°ŃˆŠµ ŠæŠ¾ŃŠøŠ»Š°Š½Š½Ń OpenID. ŠŠ°ŠæрŠøŠŗŠ»Š°Š“: alice.openid.example.org чŠø https://openid.example.org/alice. +openid_signin_desc = Š£Š²ŠµŠ“іть сŠ²Ń–Š¹ OpenID URI. ŠŠ°ŠæрŠøŠŗŠ»Š°Š“: alice.openid.example.org чŠø https://openid.example.org/alice. invalid_password = Š’Š°Ńˆ ŠæŠ°Ń€Š¾Š»ŃŒ Š½Šµ Š²Ń–Š“ŠæŠ¾Š²Ń–Š“Š°Ń” тŠ¾Š¼Ńƒ, щŠ¾ Š±ŃƒŠ² Š·Š°Š“Š°Š½ŠøŠ¹ ŠæрŠø стŠ²Š¾Ń€ŠµŠ½Š½Ń– Š¾Š±Š»Ń–ŠŗŠ¾Š²Š¾Š³Š¾ Š·Š°ŠæŠøсу. hint_login = Š’Š¶Šµ Š¼Š°Ń”Ń‚Šµ Š¾Š±Š»Ń–ŠŗŠ¾Š²ŠøŠ¹ Š·Š°ŠæŠøс? Š£Š²Ń–Š¹Š“іть Š·Š°Ń€Š°Š·! hint_register = ŠŸŠ¾Ń‚ріŠ±ŠµŠ½ Š¾Š±Š»Ń–ŠŗŠ¾Š²ŠøŠ¹ Š·Š°ŠæŠøс? Š—Š°Ń€ŠµŃ”ŃŃ‚Ń€ŃƒŠ¹Ń‚ŠµŃŃ Š·Š°Ń€Š°Š·. @@ -813,9 +813,9 @@ manage_ssh_keys=ŠšŠµŃ€ŃƒŠ²Š°Š½Š½Ń ŠŗŠ»ŃŽŃ‡Š°Š¼Šø SSH manage_ssh_principals=Š£ŠæрŠ°Š²Š»Ń–Š½Š½Ń SSH сŠµŃ€Ń‚ŠøфіŠŗŠ°Ń‚Š°Š¼Šø ŠŗŠ¾Ń€ŠøстуŠ²Š°Ń‡Ń–Š² manage_gpg_keys=ŠšŠµŃ€ŃƒŠ²Š°Š½Š½Ń ŠŗŠ»ŃŽŃ‡Š°Š¼Šø GPG add_key=Š”Š¾Š“Š°Ń‚Šø ŠŗŠ»ŃŽŃ‡ -ssh_desc=Š¦Ń– Š²Ń–Š“ŠŗрŠøті ŠŗŠ»ŃŽŃ‡Ń– SSH ŠæŠ¾Š²Ź¼ŃŠ·Š°Š½Ń– Š· Š²Š°ŃˆŠøŠ¼ Š¾Š±Š»Ń–ŠŗŠ¾Š²ŠøŠ¼ Š·Š°ŠæŠøсŠ¾Š¼. Š’Ń–Š“ŠæŠ¾Š²Ń–Š“Š½Ń– ŠæрŠøŠ²Š°Ń‚Š½Ń– ŠŗŠ»ŃŽŃ‡Ń– Š“Š¾Š·Š²Š¾Š»ŃŃŽŃ‚ŃŒ Š¾Ń‚Ń€ŠøŠ¼Š°Ń‚Šø ŠæŠ¾Š²Š½ŠøŠ¹ Š“Š¾ŃŃ‚ŃƒŠæ Š“Š¾ Š²Š°ŃˆŠøх рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Ń—Š². ŠŸŃ–Š“тŠ²ŠµŃ€Š“Š¶ŠµŠ½Ń– ŠŗŠ»ŃŽŃ‡Ń– Š¼Š¾Š¶Š½Š° Š²ŠøŠŗŠ¾Ń€ŠøстŠ°Ń‚Šø Š“Š»Ń ŠæіŠ“тŠ²ŠµŃ€Š“Š¶ŠµŠ½Š½Ń ŠŗŠ¾Š¼Ń–Ń‚Ń–Š² Git, ŠæіŠ“ŠæŠøсŠ°Š½Ń– Š· SSH. +ssh_desc=Š¦Ń– Š²Ń–Š“ŠŗрŠøті ŠŗŠ»ŃŽŃ‡Ń– SSH ŠæŠ¾Š²Ź¼ŃŠ·Š°Š½Ń– Š· Š²Š°ŃˆŠøŠ¼ Š¾Š±Š»Ń–ŠŗŠ¾Š²ŠøŠ¼ Š·Š°ŠæŠøсŠ¾Š¼. Š’Ń–Š“ŠæŠ¾Š²Ń–Š“Š½Ń– ŠæрŠøŠ²Š°Ń‚Š½Ń– ŠŗŠ»ŃŽŃ‡Ń– Š“Š¾Š·Š²Š¾Š»ŃŃŽŃ‚ŃŒ Š¾Ń‚Ń€ŠøŠ¼Š°Ń‚Šø ŠæŠ¾Š²Š½ŠøŠ¹ Š“Š¾ŃŃ‚ŃƒŠæ Š“Š¾ Š²Š°ŃˆŠøх рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Ń—Š². ŠŸŃ–Š“тŠ²ŠµŃ€Š“Š¶ŠµŠ½Ń– ŠŗŠ»ŃŽŃ‡Ń– Š¼Š¾Š¶Š½Š° Š²ŠøŠŗŠ¾Ń€ŠøстŠ°Ń‚Šø Š“Š»Ń ŠæіŠ“тŠ²ŠµŃ€Š“Š¶ŠµŠ½Š½Ń ŠŗŠ¾Š¼Ń–Ń‚Ń–Š² Git, ŠæіŠ“ŠæŠøсŠ°Š½Šøх іŠ· SSH. principal_desc=Š¦Ń– Š½Š°ŃŃ‚Ń€Š¾Š¹ŠŗŠø SSH сŠµŃ€Ń‚ŠøфіŠŗŠ°Ń‚Ń–Š² Š²ŠŗŠ°Š·Š°Š½Ń– у Š²Š°ŃˆŠ¾Š¼Ńƒ Š¾Š±Š»Ń–ŠŗŠ¾Š²Š¾Š¼Ńƒ Š·Š°ŠæŠøсі тŠ° Š½Š°Š“Š°ŃŽŃ‚ŃŒ ŠæŠ¾Š²Š½ŠøŠ¹ Š“Š¾ŃŃ‚ŃƒŠæ Š“Š¾ Š²Š°ŃˆŠøх рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Ń—Š². -gpg_desc=Š¦Ń– ŠæуŠ±Š»Ń–чŠ½Ń– ŠŗŠ»ŃŽŃ‡Ń– GPG ŠæŠ¾Š²'яŠ·Š°Š½Ń– Š· Š²Š°ŃˆŠøŠ¼ Š¾Š±Š»Ń–ŠŗŠ¾Š²ŠøŠ¼ Š·Š°ŠæŠøсŠ¾Š¼. Š¢Ń€ŠøŠ¼Š°Š¹Ń‚Šµ сŠ²Š¾Ń— ŠæрŠøŠ²Š°Ń‚Š½Ń– ŠŗŠ»ŃŽŃ‡Ń– Š² Š±ŠµŠ·ŠæŠµŃ†Ń–, Š¾ŃŠŗіŠ»ŃŒŠŗŠø Š²Š¾Š½Šø Š“Š¾Š·Š²Š¾Š»ŃŃŽŃ‚ŃŒ Š·Š“іŠ¹ŃŠ½ŃŽŠ²Š°Ń‚Šø ŠæŠµŃ€ŠµŠ²Ń–Ń€Šŗу ŠŗŠ¾Š¼Ń–Ń‚Ń–Š². +gpg_desc=Š¦Ń– ŠæуŠ±Š»Ń–чŠ½Ń– ŠŗŠ»ŃŽŃ‡Ń– GPG ŠæŠ¾Š²'яŠ·Š°Š½Ń– Š· Š²Š°ŃˆŠøŠ¼ Š¾Š±Š»Ń–ŠŗŠ¾Š²ŠøŠ¼ Š·Š°ŠæŠøсŠ¾Š¼ і Š²ŠøŠŗŠ¾Ń€ŠøстŠ¾Š²ŃƒŃŽŃ‚ŃŒŃŃ Š“Š»Ń ŠæіŠ“тŠ²ŠµŃ€Š“Š¶ŠµŠ½Š½Ń ŠŗŠ¾Š¼Ń–Ń‚Ń–Š². Š¢Ń€ŠøŠ¼Š°Š¹Ń‚Šµ сŠ²Š¾Ń— ŠæрŠøŠ²Š°Ń‚Š½Ń– ŠŗŠ»ŃŽŃ‡Ń– Š² Š±ŠµŠ·ŠæŠµŃ†Ń–, Š¾ŃŠŗіŠ»ŃŒŠŗŠø Š²Š¾Š½Šø Š“Š¾Š·Š²Š¾Š»ŃŃŽŃ‚ŃŒ ŠæіŠ“ŠæŠøсуŠ²Š°Ń‚Šø ŠŗŠ¾Š¼Ń–Ń‚Šø Š²Š°ŃˆŠøŠ¼ Š¾ŃŠ¾Š±ŠøстŠøŠ¼ ŠæіŠ“ŠæŠøсŠ¾Š¼. ssh_helper=ŠŸŠ¾Ń‚ріŠ±Š½Š° Š“Š¾ŠæŠ¾Š¼Š¾Š³Š°? Š”ŠøŠ²Ń–Ń‚ŃŒŃŃ Š³Ń–Š“ Š½Š° GitHub Š· Š³ŠµŠ½ŠµŃ€Š°Ń†Ń–Ń— ŠŗŠ»ŃŽŃ‡Ń–Š² SSH Š°Š±Š¾ Š²ŠøŠæрŠ°Š²Š»ŠµŠ½Š½Ń тŠøŠæŠ¾Š²Šøх Š½ŠµŠæŠ¾Š»Š°Š“Š¾Šŗ SSH. gpg_helper= ŠŸŠ¾Ń‚ріŠ±Š½Š° Š“Š¾ŠæŠ¾Š¼Š¾Š³Š°? ŠŸŠµŃ€ŠµŠ³Š»ŃŠ½ŃŒŃ‚Šµ ŠæŠ¾ŃŃ–Š±Š½ŠøŠŗ GitHub ŠæрŠ¾ GPG . add_new_key=Š”Š¾Š“Š°Ń‚Šø SSH ŠŗŠ»ŃŽŃ‡ @@ -893,7 +893,7 @@ manage_oauth2_applications=ŠšŠµŃ€ŃƒŠ²Š°Š½Š½Ń ŠæрŠ¾Š³Ń€Š°Š¼Š°Š¼Šø OAuth2 edit_oauth2_application=Š ŠµŠ“Š°Š³ŃƒŠ²Š°Ń‚Šø ŠæрŠ¾Š³Ń€Š°Š¼Ńƒ OAuth2 oauth2_applications_desc=ŠŸŃ€Š¾Š³Ń€Š°Š¼Šø OAuth2 Š“Š°ŃŽŃ‚ŃŒ Š¼Š¾Š¶Š»ŠøŠ²Ń–ŃŃ‚ŃŒ Š²Š°ŃˆŠøŠ¼ стŠ¾Ń€Š¾Š½Š½Ń–Š¼ ŠæрŠ¾Š³Ń€Š°Š¼Š°Š¼ Š½Š°Š“іŠ¹Š½Š¾ Š°ŃƒŃ‚ŠµŠ½Ń‚ŠøфіŠŗуŠ²Š°Ń‚Šø ŠŗŠ¾Ń€ŠøстуŠ²Š°Ń‡Ń–Š² у цьŠ¾Š¼Ńƒ ŠµŠŗŠ·ŠµŠ¼ŠæŠ»ŃŃ€Ń– Forgejo. remove_oauth2_application=Š’ŠøŠ“Š°Š»ŠøтŠø ŠæрŠ¾Š³Ń€Š°Š¼Ńƒ OAuth2 -remove_oauth2_application_desc=Š’ŠøŠ“Š°Š»ŠµŠ½Š½Ń ŠæрŠ¾Š³Ń€Š°Š¼Šø OAuth2 сŠŗŠ°ŃŠ¾Š²ŃƒŃ” Š“Š¾ŃŃ‚ŃƒŠæ Š“Š¾ Š²ŃŃ–Ń… ŠæіŠ“ŠæŠøсŠ°Š½Šøх Š¼Š°Ń€ŠŗŠµŃ€Ń–Š² Š“Š¾ŃŃ‚ŃƒŠæу. ŠŸŃ€Š¾Š“Š¾Š²Š¶ŠøтŠø? +remove_oauth2_application_desc=Š’ŠøŠ“Š°Š»ŠµŠ½Š½Ń ŠæрŠ¾Š³Ń€Š°Š¼Šø OAuth2 сŠŗŠ°ŃŃƒŃ” Š“Š¾ŃŃ‚ŃƒŠæ Š“Š¾ Š²ŃŃ–Ń… ŠæіŠ“ŠæŠøсŠ°Š½Šøх тŠ¾ŠŗŠµŠ½Ń–Š² Š“Š¾ŃŃ‚ŃƒŠæу. ŠŸŃ€Š¾Š“Š¾Š²Š¶ŠøтŠø? remove_oauth2_application_success=ŠŸŃ€Š¾Š³Ń€Š°Š¼Ńƒ Š²ŠøŠ“Š°Š»ŠµŠ½Š¾. create_oauth2_application=Š”тŠ²Š¾Ń€ŠøтŠø Š½Š¾Š²ŠøŠ¹ Š“Š¾Š“Š°Ń‚Š¾Šŗ OAuth2 create_oauth2_application_button=Š”тŠ²Š¾Ń€ŠøтŠø ŠæрŠ¾Š³Ń€Š°Š¼Ńƒ @@ -1076,6 +1076,8 @@ quota.rule.exceeded = ŠŸŠµŃ€ŠµŠ²ŠøщŠµŠ½Š¾ regenerate_token = Š—Š³ŠµŠ½ŠµŃ€ŃƒŠ²Š°Ń‚Šø Š·Š½Š¾Š²Ńƒ access_token_regeneration = Š—Š³ŠµŠ½ŠµŃ€ŃƒŠ²Š°Ń‚Šø Š½Š¾Š²ŠøŠ¹ тŠ¾ŠŗŠµŠ½ Š“Š¾ŃŃ‚ŃƒŠæу quota.sizes.assets.all = Š ŠµŃŃƒŃ€ŃŠø +access_token_regeneration_desc = Š ŠµŠ³ŠµŠ½ŠµŃ€Š°Ń†Ń–я тŠ¾ŠŗŠµŠ½Š° сŠŗŠ°ŃŃƒŃ” Š“Š¾ŃŃ‚ŃƒŠæ ŠæрŠ¾Š³Ń€Š°Š¼, яŠŗі Š²ŠøŠŗŠ¾Ń€ŠøстŠ¾Š²ŃƒŃŽŃ‚ŃŒ цŠµŠ¹ тŠ¾ŠŗŠµŠ½, Š“Š¾ Š²Š°ŃˆŠ¾Š³Š¾ Š¾Š±Š»Ń–ŠŗŠ¾Š²Š¾Š³Š¾ Š·Š°ŠæŠøсу. Š¦Šµ Š½ŠµŠ·Š²Š¾Ń€Š¾Ń‚Š½Š° Š“ія. ŠŸŃ€Š¾Š“Š¾Š²Š¶ŠøтŠø? +regenerate_token_success = Š¢Š¾ŠŗŠµŠ½ Š·Š³ŠµŠ½ŠµŃ€Š¾Š²Š°Š½Š¾ Š½Š°Š½Š¾Š²Š¾. ŠŸŃ€Š¾Š³Ń€Š°Š¼Šø, яŠŗі Š¹Š¾Š³Š¾ Š²ŠøŠŗŠ¾Ń€ŠøстŠ¾Š²ŃƒŃŽŃ‚ŃŒ, Š±Ń–Š»ŃŒŃˆŠµ Š½Šµ Š¼Š°ŃŽŃ‚ŃŒ Š“Š¾ŃŃ‚ŃƒŠæу Š“Š¾ Š²Š°ŃˆŠ¾Š³Š¾ Š¾Š±Š»Ń–ŠŗŠ¾Š²Š¾Š³Š¾ Š·Š°ŠæŠøсу; Š²Šø ŠæŠ¾Š²ŠøŠ½Š½Ń– Š²Ń–Š“Š½Š¾Š²ŠøтŠø Š“Š¾ŃŃ‚ŃƒŠæ Š·Š° Š“Š¾ŠæŠ¾Š¼Š¾Š³Š¾ŃŽ Š½Š¾Š²Š¾Š³Š¾ тŠ¾ŠŗŠµŠ½Š°. [repo] owner=Š’Š»Š°ŃŠ½ŠøŠŗ @@ -1143,7 +1145,7 @@ forks=Š¤Š¾Ń€ŠŗŠø reactions_more=Š“Š¾Š“Š°Ń‚Šø %d Š±Ń–Š»ŃŒŃˆŠµ unit_disabled=ŠŠ“Š¼Ń–Š½Ń–стрŠ°Ń‚Š¾Ń€ сŠ°Š¹Ń‚Ńƒ Š²ŠøŠ¼ŠŗŠ½ŃƒŠ² цŠµŠ¹ рŠ¾Š·Š“іŠ» рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–ŃŽ. language_other=Š†Š½ŃˆŃ– -adopt_search=Š’Š²ŠµŠ“іть іŠ¼'я ŠŗŠ¾Ń€ŠøстуŠ²Š°Ń‡_ŠŗŠø Š“Š»Ń ŠæŠ¾ŃˆŃƒŠŗу Š½ŠµŠæрŠøŠ¹Š½ŃŃ‚Šøх рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Ń—Š²ā€¦ (Š·Š°Š»ŠøштŠµ ŠæŠ¾Ń€Š¾Š¶Š½Ń–Š¼, щŠ¾Š± Š·Š½Š°Š¹Ń‚Šø Š²ŃŃ–) +adopt_search=Š£Š²ŠµŠ“іть іŠ¼'я ŠŗŠ¾Ń€ŠøстуŠ²Š°Ń‡_ŠŗŠø Š“Š»Ń ŠæŠ¾ŃˆŃƒŠŗу Š½ŠµŠæрŠøŠ¹Š½ŃŃ‚Šøх рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Ń—Š²ā€¦ (Š·Š°Š»ŠøштŠµ ŠæŠ¾Ń€Š¾Š¶Š½Ń–Š¼, щŠ¾Š± Š·Š½Š°Š¹Ń‚Šø Š²ŃŃ–) adopt_preexisting_label=ŠŸŃ€ŠøŠ¹Š½ŃŃ‚Ń– фŠ°Š¹Š»Šø adopt_preexisting=ŠŸŃ€ŠøŠ¹Š½ŃŃ‚Šø Š²Š¶Šµ ісŠ½ŃƒŃŽŃ‡Ń– фŠ°Š¹Š»Šø adopt_preexisting_content=Š”тŠ²Š¾Ń€ŠøтŠø рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Š¹ Š· %s @@ -1168,7 +1170,7 @@ desc.archived=ŠŃ€Ń…Ń–Š²Š½ŠøŠ¹ template.items=Š•Š»ŠµŠ¼ŠµŠ½Ń‚Šø шŠ°Š±Š»Š¾Š½Ńƒ template.git_content=Š’Š¼Ń–ст Git (тŠøŠæŠ¾Š²Š° Š³Ń–Š»ŠŗŠ°) -template.git_hooks=ŠŸŠµŃ€ŠµŃ…Š¾ŠæŠ»ŃŽŠ²Š°Ń‡Ń– Git +template.git_hooks=Git-хуŠŗŠø template.webhooks=Webhook'Šø template.topics=Š¢ŠµŠ¼Šø template.avatar=ŠŠ²Š°Ń‚Š°Ń€ @@ -1276,7 +1278,7 @@ file_raw=ŠŠµŃ„Š¾Ń€Š¼Š°Ń‚Š¾Š²Š°Š½ŠøŠ¹ file_history=Š†ŃŃ‚Š¾Ń€Ń–я file_view_source=ŠŸŠµŃ€ŠµŠ³Š»ŃŠ½ŃƒŃ‚Šø Š²ŠøхіŠ“Š½ŠøŠ¹ ŠŗŠ¾Š“ file_view_rendered=ŠŸŠµŃ€ŠµŠ³Š»ŃŠ½ŃƒŃ‚Šø Š²Ń–Š“рŠµŠ½Š“ŠµŃ€ŠµŠ½Š¾ -file_view_raw=ŠŸŠµŃ€ŠµŠ³Š»ŃŠ“ Raw +file_view_raw=ŠŸŠµŃ€ŠµŠ³Š»ŃŠ½ŃƒŃ‚Šø Š½ŠµŃ„Š¾Ń€Š¼Š°Ń‚Š¾Š²Š°Š½ŠøŠ¹ file_permalink=ŠŸŠ¾ŃŃ‚Ń–Š¹Š½Šµ ŠæŠ¾ŃŠøŠ»Š°Š½Š½Ń file_too_large=Š¦ŠµŠ¹ фŠ°Š¹Š» Š·Š°Š²ŠµŠ»ŠøŠŗŠøŠ¹ щŠ¾Š± Š±ŃƒŃ‚Šø ŠæŠ¾ŠŗŠ°Š·Š°Š½ŠøŠ¼. @@ -1285,7 +1287,7 @@ video_not_supported_in_browser=Š’Š°Ńˆ Š±Ń€Š°ŃƒŠ·ŠµŃ€ Š½Šµ ŠæіŠ“трŠøŠ¼ŃƒŃ” т audio_not_supported_in_browser=Š’Š°Ńˆ Š±Ń€Š°ŃƒŠ·ŠµŃ€ Š½Šµ ŠæіŠ“трŠøŠ¼ŃƒŃ” тŠµŠ³ HTML5 Ā«audioĀ». stored_lfs=Š—Š±ŠµŃ€ŠµŠ¶ŠµŠ½Š¾ Š· Git LFS symbolic_link=Š”ŠøŠ¼Š²Š¾Š»Ń–чŠ½Šµ ŠæŠ¾ŃŠøŠ»Š°Š½Š½Ń -commit_graph=Š“Ń€Š°Ń„Ń–Šŗ ŠŗŠ¾Š¼Ń–Ń‚Ń–Š² +commit_graph=Š“Ń€Š°Ń„ ŠŗŠ¾Š¼Ń–Ń‚Ń–Š² commit_graph.select=Š’ŠøŠ±ŠµŃ€Ń–Ń‚ŃŒ Š³Ń–Š»ŠŗŠø commit_graph.hide_pr_refs=ŠŸŃ€ŠøхŠ¾Š²Š°Ń‚Šø Š·Š°ŠæŠøтŠø Š½Š° Š·Š»Šøття commit_graph.monochrome=ŠœŠ¾Š½Š¾Ń…Ń€Š¾Š¼ @@ -1402,9 +1404,9 @@ issues.new.open_projects=Š’Ń–Š“ŠŗрŠøті ŠæрŠ¾Ń”ŠŗтŠø issues.new.closed_projects=Š—Š°ŠŗрŠøті ŠæрŠ¾Ń”ŠŗтŠø issues.new.no_items=ŠŠµŠ¼Š°Ń” ŠµŠ»ŠµŠ¼ŠµŠ½Ń‚Ń–Š² issues.new.milestone=Š•Ń‚Š°Šæ -issues.new.no_milestone=Š•Ń‚Š°Šæ Š²Ń–Š“сутŠ½Ń–Š¹ +issues.new.no_milestone=ŠŠµŠ¼Š°Ń” ŠµŃ‚Š°Šæу issues.new.clear_milestone=ŠžŃ‡ŠøстŠøтŠø ŠµŃ‚Š°Šæ -issues.new.open_milestone=ŠŠŗтŠøŠ²Š½Ń– ŠµŃ‚Š°ŠæŠø +issues.new.open_milestone=Š’Ń–Š“ŠŗрŠøті ŠµŃ‚Š°ŠæŠø issues.new.closed_milestone=Š—Š°ŠŗрŠøті ŠµŃ‚Š°ŠæŠø issues.new.assignees=Š’ŠøŠŗŠ¾Š½Š°Š²Ń†Ń– issues.new.clear_assignees=ŠŸŃ€ŠøŠ±Ń€Š°Ń‚Šø Š²ŠøŠŗŠ¾Š½Š°Š²Ń†Ń–Š² @@ -1504,7 +1506,7 @@ issues.closed_at=`Š·Š°ŠŗрŠøŠ²Š°Ń” цю Š·Š°Š“Š°Ń‡Ńƒ %s` issues.reopened_at=`ŠæŠ¾Š²Ń‚Š¾Ń€Š½Š¾ Š²Ń–Š“ŠŗрŠøŠ²Š°Ń” цю Š·Š°Š“Š°Ń‡Ńƒ %s` issues.commit_ref_at=`ŠæŠ¾ŃŠøŠ»Š°Ń”Ń‚ŃŒŃŃ Š½Š° цю Š·Š°Š“Š°Ń‡Ńƒ Š² ŠŗŠ¾Š¼Ń–Ń‚Ń– %s` issues.ref_issue_from=`ŠæŠ¾ŃŠøŠ»Š°Ń”Ń‚ŃŒŃŃ Š½Š° цю Š·Š°Š“Š°Ń‡Ńƒ %[3]s %[1]s` -issues.ref_pull_from=`ŠæŠ¾ŃŠøŠ»Š°Ń”Ń‚ŃŒŃŃ Š½Š° цŠµŠ¹ Š·Š°ŠæŠøт Š·Š»Šøття %[3]s %[1]s` +issues.ref_pull_from=`ŠæŠ¾ŃŠøŠ»Š°Ń”Ń‚ŃŒŃŃ Š½Š° цŠµŠ¹ Š·Š°ŠæŠøт Š½Š° Š·Š»Šøття %[3]s %[1]s` issues.ref_closing_from=`ŠæŠ¾ŃŠøŠ»Š°Ń”Ń‚ŃŒŃŃ Š² Š·Š°ŠæŠøті Š½Š° Š·Š»Šøття %[3]s, яŠŗŠøŠ¹ Š·Š°ŠŗрŠøє цю Š·Š°Š“Š°Ń‡Ńƒ, %[1]s` issues.ref_reopening_from=`ŠæŠ¾ŃŠøŠ»Š°Ń”Ń‚ŃŒŃŃ Š² Š·Š°ŠæŠøті Š½Š° Š·Š»Šøття %[3]s, яŠŗŠøŠ¹ ŠæŠ¾Š²Ń‚Š¾Ń€Š½Š¾ Š²Ń–Š“ŠŗрŠøє цю Š·Š°Š“Š°Ń‡Ńƒ, %[1]s` issues.ref_closed_from=`Š·Š°ŠŗрŠøŠ² цю Š·Š°Š“Š°Ń‡Ńƒ %[4]s %[2]s` @@ -1799,7 +1801,7 @@ wiki.delete_page_button=Š’ŠøŠ“Š°Š»ŠøтŠø стŠ¾Ń€Ń–Š½Šŗу wiki.page_already_exists=Š’Ń–Šŗі-стŠ¾Ń€Ń–Š½ŠŗŠ° Š· тŠ°ŠŗŠøŠ¼ сŠ°Š¼ŠøŠ¼ іŠ¼'яŠ¼ Š²Š¶Šµ ісŠ½ŃƒŃ”. wiki.pages=Š”тŠ¾Ń€Ń–Š½ŠŗŠø wiki.last_updated=ŠžŃŃ‚Š°Š½Š½Ń– Š¾Š½Š¾Š²Š»ŠµŠ½Š½Ń %s -wiki.page_name_desc=Š’Š²ŠµŠ“іть Š½Š°Š·Š²Ńƒ Š²Ń–Šŗі-стŠ¾Ń€Ń–Š½ŠŗŠø. Š”ŠµŃŠŗі Š·Ń– сŠæŠµŃ†Ń–Š°Š»ŃŒŠ½Šøх іŠ¼ŠµŠ½: Ā«HomeĀ», Ā«_SidebarĀ» тŠ° Ā«_FooterĀ». +wiki.page_name_desc=Š£Š²ŠµŠ“іть Š½Š°Š·Š²Ńƒ Š²Ń–Šŗі-стŠ¾Ń€Ń–Š½ŠŗŠø. Š”ŠµŃŠŗі Š·Ń– сŠæŠµŃ†Ń–Š°Š»ŃŒŠ½Šøх іŠ¼ŠµŠ½: Ā«HomeĀ», Ā«_SidebarĀ» тŠ° Ā«_FooterĀ». activity=ŠŠŗтŠøŠ²Š½Ń–ŃŃ‚ŃŒ activity.period.filter_label=ŠŸŠµŃ€Ń–Š¾Š“: @@ -1844,7 +1846,7 @@ activity.unresolved_conv_label=Š’Ń–Š“ŠŗрŠøтŠø activity.title.releases_1=%d Š²ŠøŠæусŠŗ activity.title.releases_n=%d Š²ŠøŠæусŠŗіŠ² activity.title.releases_published_by=%s Š¾ŠæуŠ±Š»Ń–ŠŗŠ¾Š²Š°Š½Š¾ %s -activity.published_release_label=ŠžŠæуŠ±Š»Ń–ŠŗŠ¾Š²Š°Š½Š¾ +activity.published_release_label=Š’ŠøŠæусŠŗ activity.no_git_activity=Š£ цŠµŠ¹ ŠæŠµŃ€Ń–Š¾Š“ Š½Šµ Š±ŃƒŠ»Š¾ Š·Š“іŠ¹ŃŠ½ŠµŠ½Š¾ Š¶Š¾Š“Š½Šøх Š“іŠ¹. activity.git_stats_exclude_merges=ŠŠµ Š²Ń€Š°Ń…Š¾Š²ŃƒŃŽŃ‡Šø Š·Š»Šøття, activity.git_stats_author_1=%d Š°Š²Ń‚Š¾Ń€ @@ -1886,7 +1888,7 @@ settings.collaboration.read=Š§ŠøтŠ°Ń‚Šø settings.collaboration.owner=Š’Š»Š°ŃŠ½ŠøŠŗ settings.collaboration.undefined=ŠŠµ Š²ŠøŠ·Š½Š°Ń‡ŠµŠ½Š¾ settings.hooks=Š’ŠµŠ±-хуŠŗŠø -settings.githooks=Git хуŠŗŠø +settings.githooks=Git-хуŠŗŠø settings.basic_settings=ŠžŃŠ½Š¾Š²Š½Ń– Š½Š°Š»Š°ŃˆŃ‚ŃƒŠ²Š°Š½Š½Ń settings.mirror_settings=ŠŠ°Š»Š°ŃˆŃ‚ŃƒŠ²Š°Š½Š½Ń Š“Š·ŠµŃ€ŠŗŠ°Š»Š° settings.mirror_settings.mirrored_repository=Š’Ń–Š“Š“Š·ŠµŃ€ŠŗŠ°Š»ŠµŠ½ŠøŠ¹ рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Š¹ @@ -1896,7 +1898,7 @@ settings.mirror_settings.direction.push=Push settings.mirror_settings.last_update=ŠžŃŃ‚Š°Š½Š½Ń” Š¾Š½Š¾Š²Š»ŠµŠ½Š½Ń settings.mirror_settings.push_mirror.none=ŠŠµ Š½Š°Š»Š°ŃˆŃ‚Š¾Š²Š°Š½Š¾ Š“Š·ŠµŃ€ŠŗŠ°Š»Š¾ push settings.mirror_settings.push_mirror.remote_url=URL Š²Ń–Š“Š“Š°Š»ŠµŠ½Š¾Š³Š¾ рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–ŃŽ Git -settings.mirror_settings.push_mirror.add=Š”Š¾Š“Š°Ń‚Šø Push Š“Š·ŠµŃ€ŠŗŠ°Š»Š¾ +settings.mirror_settings.push_mirror.add=Š”Š¾Š“Š°Ń‚Šø push-Š“Š·ŠµŃ€ŠŗŠ°Š»Š¾ settings.sync_mirror=Š”ŠøŠ½Ń…Ń€Š¾Š½Ń–Š·ŃƒŠ²Š°Ń‚Šø Š·Š°Ń€Š°Š· settings.site=Š’ŠµŠ±-сŠ°Š¹Ń‚ @@ -1927,9 +1929,9 @@ settings.pulls_desc=Š£Š²Ń–Š¼ŠŗŠ½ŃƒŃ‚Šø Š·Š°ŠæŠøтŠø Š½Š° Š·Š»Šøття Š² рŠµŠæ settings.pulls.ignore_whitespace=Š†Š³Š½Š¾Ń€ŃƒŠ²Š°Ń‚Šø ŠæрŠ¾Š±Ń–Š» у ŠŗŠ¾Š½Ń„Š»Ń–ŠŗтŠ°Ń… settings.pulls.enable_autodetect_manual_merge=Š£Š²Ń–Š¼ŠŗŠ½ŃƒŃ‚Šø Š°Š²Ń‚Š¾Š²ŠøŠ·Š½Š°Ń‡ŠµŠ½Š½Ń ручŠ½Š¾Š³Š¾ Š·Š»Šøття (ŠŸŃ€ŠøŠ¼Ń–Ń‚ŠŗŠ°: у Š“ŠµŃŠŗŠøх Š¾ŃŠ¾Š±Š»ŠøŠ²ŠøŠ¹ Š²ŠøŠæŠ°Š“ŠŗŠ°Ń… Š¼Š¾Š¶ŃƒŃ‚ŃŒ Š²ŠøŠ½ŠøŠŗŠ½ŃƒŃ‚ŃŒ ŠæŠ¾Š¼ŠøŠ»ŠŗŠø) settings.pulls.default_delete_branch_after_merge=Š’ŠøŠ“Š°Š»ŃŃ‚Šø Š³Ń–Š»Šŗу Š·Š°ŠæŠøту Š·Š»Šøття, ŠŗŠ¾Š»Šø Š¹Š¾Š³Š¾ ŠæрŠøŠ¹Š½ŃŃ‚Š¾ -settings.projects_desc=Š£Š²Ń–Š¼ŠŗŠ½ŃƒŃ‚Šø ŠæрŠ¾Ń”ŠŗтŠø у рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Ń— +settings.projects_desc=Š£Š²Ń–Š¼ŠŗŠ½ŃƒŃ‚Šø ŠæрŠ¾Ń”ŠŗтŠø Š² рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Ń— settings.admin_settings=ŠŠ°Š»Š°ŃˆŃ‚ŃƒŠ²Š°Š½Š½Ń Š°Š“Š¼Ń–Š½Ń–стрŠ°Ń‚Š¾Ń€Š° -settings.admin_enable_health_check=Š’ŠŗŠ»ŃŽŃ‡ŠøтŠø ŠæŠµŃ€ŠµŠ²Ń–Ń€ŠŗŠø ŠæрŠ°Ń†ŠµŠ·Š“Š°Ń‚Š½Š¾ŃŃ‚Ń– рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–ŃŽ (git fsck) +settings.admin_enable_health_check=Š£Š²Ń–Š¼ŠŗŠ½ŃƒŃ‚Šø ŠæŠµŃ€ŠµŠ²Ń–Ń€ŠŗŠø стŠ°Š½Ńƒ рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–ŃŽ (git fsck) settings.admin_enable_close_issues_via_commit_in_any_branch=Š—Š°ŠŗрŠøтŠø Š·Š°Š“Š°Ń‡Ńƒ Š·Š° Š“Š¾ŠæŠ¾Š¼Š¾Š³Š¾ŃŽ ŠŗŠ¾Š¼Ń–Ń‚Š°, Š·Ń€Š¾Š±Š»ŠµŠ½Š¾Š³Š¾ Š½Šµ Š² Š³Š¾Š»Š¾Š²Š½Ń–Š¹ Š³Ń–Š»Ń†Ń– settings.danger_zone=ŠŠµŠ±ŠµŠ·ŠæŠµŃ‡Š½Š° Š·Š¾Š½Š° settings.new_owner_has_same_repo=ŠŠ¾Š²ŠøŠ¹ Š²Š»Š°ŃŠ½ŠøŠŗ Š²Š¶Šµ Š¼Š°Ń” рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Š¹ Š· тŠ°ŠŗŠ¾ŃŽ Š½Š°Š·Š²Š¾ŃŽ. Š‘ŃƒŠ“ь Š»Š°ŃŠŗŠ°, Š²ŠøŠ±ŠµŃ€Ń–Ń‚ŃŒ іŠ½ŃˆŠµ іŠ¼'я. @@ -2075,7 +2077,7 @@ settings.event_pull_request_review_desc=Š—Š°ŠæŠøт Š½Š° Š·Š»Šøття схŠ²Š°Š» settings.event_pull_request_sync=Š”ŠøŠ½Ń…Ń€Š¾Š½Ń–Š·Š¾Š²Š°Š½Š¾ settings.event_pull_request_sync_desc=Š“Ń–Š»Šŗу Š°Š²Ń‚Š¾Š¼Š°Ń‚ŠøчŠ½Š¾ Š¾Š½Š¾Š²Š»ŠµŠ½Š¾ ціŠ»ŃŒŠ¾Š²Š¾ŃŽ Š³Ń–Š»ŠŗŠ¾ŃŽ. settings.branch_filter=Š¤Ń–Š»ŃŒŃ‚Ń€ Š³Ń–Š»Š¾Šŗ -settings.branch_filter_desc=Š‘Ń–Š»ŠøŠ¹ сŠæŠøсŠ¾Šŗ Š³Ń–Š»Š¾Šŗ Š“Š»Ń push, стŠ²Š¾Ń€ŠµŠ½Š½Ń Š³Ń–Š»Š¾Šŗ тŠ° Š²ŠøŠ“Š°Š»ŠµŠ½Š½Ń Š³Ń–Š»Š¾Šŗ, Š²ŠøŠ·Š½Š°Ń‡Š°Ń”Ń‚ŃŒŃŃ яŠŗ шŠ°Š±Š»Š¾Š½ glob. ŠÆŠŗщŠ¾ Š²Ń–Š½ ŠæŠ¾Ń€Š¾Š¶Š½Ń–Š¹ Š°Š±Š¾ Š¼Ń–стŠøть *, тŠ¾ рŠµŃ”ŃŃ‚Ń€ŃƒŃŽŃ‚ŃŒŃŃ ŠæŠ¾Š“ії Š“Š»Ń Š²ŃŃ–Ń… Š³Ń–Š»Š¾Šŗ. Š”ŠøŠ²Ń–Ń‚ŃŒŃŃ сŠøŠ½Ń‚Š°ŠŗсŠøс у Š“Š¾ŠŗуŠ¼ŠµŠ½Ń‚Š°Ń†Ń–Ń— Š½Š° %[2]s. ŠŠ°ŠæрŠøŠŗŠ»Š°Š“: master, {master,release*}. +settings.branch_filter_desc=Š‘Ń–Š»ŠøŠ¹ сŠæŠøсŠ¾Šŗ Š³Ń–Š»Š¾Šŗ Š“Š»Ń push, стŠ²Š¾Ń€ŠµŠ½Š½Ń Š³Ń–Š»Š¾Šŗ тŠ° Š²ŠøŠ“Š°Š»ŠµŠ½Š½Ń Š³Ń–Š»Š¾Šŗ, Š²ŠøŠ·Š½Š°Ń‡Š°Ń”Ń‚ŃŒŃŃ яŠŗ шŠ°Š±Š»Š¾Š½ glob. ŠÆŠŗщŠ¾ Š²Ń–Š½ ŠæŠ¾Ń€Š¾Š¶Š½Ń–Š¹ Š°Š±Š¾ Š¼Ń–стŠøть *, тŠ¾ рŠµŃ”ŃŃ‚Ń€ŃƒŃŽŃ‚ŃŒŃŃ ŠæŠ¾Š“ії Š“Š»Ń Š²ŃŃ–Ń… Š³Ń–Š»Š¾Šŗ. Š”ŠøŠ²Ń–Ń‚ŃŒŃŃ сŠøŠ½Ń‚Š°ŠŗсŠøс у Š“Š¾ŠŗуŠ¼ŠµŠ½Ń‚Š°Ń†Ń–Ń— %[2]s. ŠŸŃ€ŠøŠŗŠ»Š°Š“Šø: master, {master,release*}. settings.active=ŠŠŗтŠøŠ²Š½ŠøŠ¹ settings.active_helper=Š†Š½Ń„Š¾Ń€Š¼Š°Ń†Ń–ŃŽ ŠæрŠ¾ Š²ŠøŠŗŠ»ŠøŠŗŠ°Š½Ń– ŠæŠ¾Š“ії Š±ŃƒŠ“Šµ Š½Š°Š“ісŠ»Š°Š½Š¾ Š·Š° цією Š²ŠµŠ±-хуŠŗ URL-Š°Š“рŠµŃŠ¾ŃŽ. settings.add_hook_success=Š’ŠµŠ±-хуŠŗ Š±ŃƒŠ»Š¾ Š“Š¾Š“Š°Š½Š¾. @@ -2154,7 +2156,7 @@ settings.edit_protected_branch=Š ŠµŠ“Š°Š³ŃƒŠ²Š°Ń‚Šø settings.protected_branch_required_approvals_min=Š§ŠøсŠ»Š¾ Š½ŠµŠ¾Š±Ń…Ń–Š“Š½Šøх схŠ²Š°Š»ŠµŠ½ŃŒ Š½Šµ Š¼Š¾Š¶Šµ Š±ŃƒŃ‚Šø Š²Ń–Š“'єŠ¼Š½ŠøŠ¼. settings.tags=Š¢ŠµŠ³Šø settings.tags.protection=Š—Š°Ń…Šøст тŠµŠ³Ńƒ -settings.tags.protection.pattern=ŠØŠ°Š±Š»Š¾Š½ тŠµŠ³Š° +settings.tags.protection.pattern=ŠØŠ°Š±Š»Š¾Š½ тŠµŠ³Ń–Š² settings.tags.protection.allowed=Š”Š¾Š·Š²Š¾Š»ŠµŠ½Š¾ settings.tags.protection.allowed.users=Š”Š¾Š·Š²Š¾Š»ŠµŠ½Ń– ŠŗŠ¾Ń€ŠøстуŠ²Š°Ń‡Ń– settings.tags.protection.allowed.teams=Š”Š¾Š·Š²Š¾Š»ŠµŠ½Ń– ŠŗŠ¾Š¼Š°Š½Š“Šø @@ -2263,7 +2265,7 @@ release.detail=Š”ŠµŃ‚Š°Š»Ń– рŠµŠ»Ń–Š·Ńƒ release.tags=Š¢ŠµŠ³Šø release.new_release=ŠŠ¾Š²ŠøŠ¹ Š²ŠøŠæусŠŗ release.draft=Š§ŠµŃ€Š½ŠµŃ‚ŠŗŠ° -release.prerelease=ŠŸŃ€Šµ-рŠµŠ»Ń–Š· +release.prerelease=ŠŸŠ¾ŠæŠµŃ€ŠµŠ“Š½Ń–Š¹ Š²ŠøŠæусŠŗ release.stable=Š”тŠ°Š±Ń–Š»ŃŒŠ½ŠøŠ¹ release.compare=ŠŸŠ¾Ń€Ń–Š²Š½ŃŃ‚Šø release.edit=Š ŠµŠ“Š°Š³ŃƒŠ²Š°Ń‚Šø @@ -2275,15 +2277,15 @@ release.edit_subheader=ŠŸŃƒŠ±Š»Ń–ŠŗŠ°Ń†Ń–я рŠµŠ»Ń–Š·Ń–Š² Š“Š¾ŠæŠ¾Š¼Š¾Š¶Šµ Š²Š° release.tag_name=ŠŠ°Š·Š²Š° тŠµŠ³Ńƒ release.target=Š¦Ń–Š»ŃŒ release.tag_helper=Š’ŠøŠ±ŠµŃ€Ń–Ń‚ŃŒ ісŠ½ŃƒŃŽŃ‡ŠøŠ¹ тŠµŠ³ Š°Š±Š¾ стŠ²Š¾Ń€Ń–Ń‚ŃŒ Š½Š¾Š²ŠøŠ¹. -release.prerelease_desc=ŠŸŠ¾Š·Š½Š°Ń‡ŠøтŠø яŠŗ ŠæрŠµ-рŠµŠ»Ń–Š· +release.prerelease_desc=ŠŸŠ¾Š·Š½Š°Ń‡ŠøтŠø яŠŗ ŠæŠ¾ŠæŠµŃ€ŠµŠ“Š½Ń–Š¹ Š²ŠøŠæусŠŗ release.prerelease_helper=ŠŸŠ¾Š·Š½Š°Ń‡Ń‚Šµ цŠµŠ¹ Š²ŠøŠæусŠŗ Š½ŠµŠæрŠøŠ“Š°Ń‚Š½ŠøŠ¼ Š“Š»Ń ŠŸŠ ŠžŠ” Š²ŠøŠŗŠ¾Ń€ŠøстŠ°Š½Š½Ń. release.cancel=Š’Ń–Š“Š¼Ń–Š½ŠøтŠø -release.publish=ŠžŠæуŠ±Š»Ń–ŠŗуŠ²Š°Ń‚Šø рŠµŠ»Ń–Š· +release.publish=ŠžŠæуŠ±Š»Ń–ŠŗуŠ²Š°Ń‚Šø Š²ŠøŠæусŠŗ release.save_draft=Š—Š±ŠµŃ€ŠµŠ³Ń‚Šø чŠµŃ€Š½ŠµŃ‚Šŗу -release.edit_release=ŠžŠ½Š¾Š²ŠøтŠø рŠµŠ»Ń–Š· -release.delete_release=Š’ŠøŠ“Š°Š»ŠøтŠø рŠµŠ»Ń–Š· +release.edit_release=ŠžŠ½Š¾Š²ŠøтŠø Š²ŠøŠæусŠŗ +release.delete_release=Š’ŠøŠ“Š°Š»ŠøтŠø Š²ŠøŠæусŠŗ release.delete_tag=Š’ŠøŠ“Š°Š»ŠøтŠø тŠµŠ³ -release.deletion=Š’ŠøŠ“Š°Š»ŠøтŠø рŠµŠ»Ń–Š· +release.deletion=Š’ŠøŠ“Š°Š»ŠøтŠø Š²ŠøŠæусŠŗ release.deletion_success=Š ŠµŠ»Ń–Š·, Š±ŃƒŠ»Š¾ Š²ŠøŠ“Š°Š»ŠµŠ½Š¾. release.deletion_tag_desc=Š‘ŃƒŠ“Šµ Š²ŠøŠ“Š°Š»ŠµŠ½Š¾ цŠµŠ¹ тŠµŠ³ іŠ· рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–ŃŽ. Š’Š¼Ń–ст рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–я тŠ° істŠ¾Ń€Ń–я Š·Š°Š»ŠøшŠ°Ń‚ŃŒŃŃ Š½ŠµŠ·Š¼Ń–Š½Š½ŠøŠ¼Šø. ŠŸŃ€Š¾Š“Š¾Š²Š¶ŠøтŠø? release.deletion_tag_success=Š¢ŠµŠ³ Š²ŠøŠ“Š°Š»ŠµŠ½Š¾. @@ -2446,7 +2448,7 @@ settings.event_package = ŠŸŠ°ŠŗуŠ½Š¾Šŗ settings.event_package_desc = ŠŸŠ°ŠŗуŠ½Š¾Šŗ у рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Ń— стŠ²Š¾Ń€ŠµŠ½Š¾ Š°Š±Š¾ Š²ŠøŠ“Š°Š»ŠµŠ½Š¾. settings.new_owner_blocked_doer = ŠŠ¾Š²ŠøŠ¹ Š²Š»Š°ŃŠ½ŠøŠŗ Š·Š°Š±Š»Š¾ŠŗуŠ²Š°Š² Š²Š°Ń. settings.transfer_quota_exceeded = ŠŠ¾Š²ŠøŠ¹ Š²Š»Š°ŃŠ½ŠøŠŗ (%s) ŠæŠµŃ€ŠµŠ²ŠøщŠøŠ² ŠŗŠ²Š¾Ń‚Ńƒ. Š ŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Š¹ Š½Šµ ŠæŠµŃ€ŠµŠ“Š°Š½Š¾. -release.title_empty = Š—Š°Š³Š¾Š»Š¾Š²Š¾Šŗ Š½Šµ Š¼Š¾Š¶Šµ Š±ŃƒŃ‚Šø ŠæŠ¾Ń€Š¾Š¶Š½Ń–Š¼. +release.title_empty = ŠŠ°Š·Š²Š° Š½Šµ Š¼Š¾Š¶Šµ Š±ŃƒŃ‚Šø ŠæŠ¾Ń€Š¾Š¶Š½ŃŒŠ¾ŃŽ. issues.role.member_helper = Š¦ŠµŠ¹ ŠŗŠ¾Ń€ŠøстуŠ²Š°Ń‡ є чŠ»ŠµŠ½Š¾Š¼ Š¾Ń€Š³Š°Š½Ń–Š·Š°Ń†Ń–Ń—, щŠ¾ Š²Š¾Š»Š¾Š“іє цŠøŠ¼ рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Ń”Š¼. wiki.page_content = Š’Š¼Ń–ст стŠ¾Ń€Ń–Š½ŠŗŠø wiki.page_title = Š—Š°Š³Š¾Š»Š¾Š²Š¾Šŗ стŠ¾Ń€Ń–Š½ŠŗŠø @@ -2530,7 +2532,7 @@ settings.add_web_hook_desc = Š†Š½Ń‚ŠµŠ³Ń€ŃƒŠ²Š°Ń‚Šø Š£Š²Ń–Š¹Š“іть, щŠ¾Š± стŠ²Š¾Ń€ŠøтŠø Š½Š¾Š²ŠøŠ¹ Š·Š°ŠæŠøт Š½Š° Š·Š»Šøття. @@ -2541,8 +2543,8 @@ auto_init_description = ŠŸŠ¾Ń‡Š½Ń–Ń‚ŃŒ істŠ¾Ń€Ń–ŃŽ Git Š· README і Š·Š° Š±Š° new_from_template_description = ŠœŠ¾Š¶ŠµŃ‚Šµ Š²ŠøŠ±Ń€Š°Ń‚Šø Š½Š°ŃŠ²Š½ŠøŠ¹ шŠ°Š±Š»Š¾Š½ рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–ŃŽ Š½Š° цьŠ¾Š¼Ńƒ ŠµŠŗŠ·ŠµŠ¼ŠæŠ»ŃŃ€Ń– і Š·Š°ŃŃ‚Š¾ŃŃƒŠ²Š°Ń‚Šø Š¹Š¾Š³Š¾ Š½Š°Š»Š°ŃˆŃ‚ŃƒŠ²Š°Š½Š½Ń. form.string_too_long = Š”Š¾Š²Š¶ŠøŠ½Š° Š²Š²ŠµŠ“ŠµŠ½Š¾Š³Š¾ ряŠ“ŠŗŠ° Š±Ń–Š»ŃŒŃˆŠ° Š·Š° %d сŠøŠ¼Š²Š¾Š»Ń–Š². form.name_reserved = ŠŠ°Š·Š²Ńƒ рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–ŃŽ Ā«%sĀ» Š·Š°Ń€ŠµŠ·ŠµŃ€Š²Š¾Š²Š°Š½Š¾. -form.name_pattern_not_allowed = ŠØŠ°Š±Š»Š¾Š½ Ā«%sĀ» Š½Šµ Š“Š¾ŠæусŠŗŠ°Ń”Ń‚ŃŒŃŃ у Š½Š°Š·Š²Ń– рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–ŃŽ. -settings.wiki_rename_branch_main_desc = ŠŸŠµŃ€ŠµŠ¹Š¼ŠµŠ½ŃƒŠ²Š°Ń‚Šø Š²Š½ŃƒŃ‚Ń€Ń–ŃˆŠ½ŃŽ Š³Ń–Š»Šŗу, яŠŗŠ° Š²ŠøŠŗŠ¾Ń€ŠøстŠ¾Š²ŃƒŃ”Ń‚ŃŒŃŃ у Š²Ń–Šŗі, Š½Š° Ā«%sĀ». Š¦Ń Š·Š¼Ń–Š½Š° є Š¾ŃŃ‚Š°Ń‚Š¾Ń‡Š½Š¾ŃŽ і її Š½ŠµŠ¼Š¾Š¶Š»ŠøŠ²Š¾ сŠŗŠ°ŃŃƒŠ²Š°Ń‚Šø. +form.name_pattern_not_allowed = Š’ŠøрŠ°Š· Ā«%sĀ» Š½Šµ Š¼Š¾Š¶Šµ Š±ŃƒŃ‚Šø чŠ°ŃŃ‚ŠøŠ½Š¾ŃŽ Š½Š°Š·Š²Šø рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–ŃŽ. +settings.wiki_rename_branch_main_desc = ŠŸŠµŃ€ŠµŠ¹Š¼ŠµŠ½ŃƒŠ²Š°Ń‚Šø Š²Š½ŃƒŃ‚Ń€Ń–ŃˆŠ½ŃŽ Š³Ń–Š»Šŗу, яŠŗŠ° Š²ŠøŠŗŠ¾Ń€ŠøстŠ¾Š²ŃƒŃ”Ń‚ŃŒŃŃ Š“Š»Ń Š²Ń–Šŗі, Š½Š° Ā«%sĀ». Š¦Ń Š·Š¼Ń–Š½Š° є Š¾ŃŃ‚Š°Ń‚Š¾Ń‡Š½Š¾ŃŽ і її Š½ŠµŠ¼Š¾Š¶Š»ŠøŠ²Š¾ сŠŗŠ°ŃŃƒŠ²Š°Ń‚Šø. wiki.reserved_page = ŠŠ°Š·Š²Ńƒ Š²Ń–Šŗі-стŠ¾Ń€Ń–Š½ŠŗŠø Ā«%sĀ» Š·Š°Ń€ŠµŠ·ŠµŃ€Š²Š¾Š²Š°Š½Š¾. stars = Š—Ń–Ń€ŠŗŠø mirror_public_key = Š’Ń–Š“ŠŗрŠøтŠøŠ¹ SSH-ŠŗŠ»ŃŽŃ‡ @@ -2669,6 +2671,108 @@ settings.event_action_recover = Š’Ń–Š“Š½Š¾Š²Š»ŠµŠ½Š¾ commitstatus.success = Š£ŃŠæіх commitstatus.failure = Š—Š±Ń–Š¹ issues.filter_type.all_pull_requests = Š£ŃŃ– Š·Š°ŠæŠøтŠø Š½Š° Š·Š»Šøття +broken_message = ŠŠµŠ¼Š¾Š¶Š»ŠøŠ²Š¾ ŠæрŠ¾Ń‡ŠøтŠ°Ń‚Šø Š“Š°Š½Ń– Git, щŠ¾ Š»ŠµŠ¶Š°Ń‚ŃŒ Š² Š¾ŃŠ½Š¾Š²Ń– цьŠ¾Š³Š¾ рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–ŃŽ. Š—Š²ŠµŃ€Š½Ń–Ń‚ŃŒŃŃ Š“Š¾ Š°Š“Š¼Ń–Š½Ń–стрŠ°Ń‚Š¾Ń€Š° цьŠ¾Š³Š¾ ŠµŠŗŠ·ŠµŠ¼ŠæŠ»ŃŃ€Š° Š°Š±Š¾ Š²ŠøŠ“Š°Š»Ń–Ń‚ŃŒ рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Š¹. +migrate.invalid_local_path = Š›Š¾ŠŗŠ°Š»ŃŒŠ½ŠøŠ¹ шŠ»ŃŃ… Š½ŠµŠ“іŠ¹ŃŠ½ŠøŠ¹. Š’Ń–Š½ Š½Šµ ісŠ½ŃƒŃ” Š°Š±Š¾ Š½Šµ є ŠŗŠ°Ń‚Š°Š»Š¾Š³Š¾Š¼. +editor.filename_is_a_directory = ŠŠ°Š·Š²Š° фŠ°Š¹Š»Ńƒ Ā«%sĀ» уŠ¶Šµ Š²ŠøŠŗŠ¾Ń€ŠøстŠ¾Š²ŃƒŃ”Ń‚ŃŒŃŃ Š² цьŠ¾Š¼Ńƒ рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Ń— яŠŗ Š½Š°Š·Š²Š° ŠŗŠ°Ń‚Š°Š»Š¾Š³Ńƒ. +editor.filename_is_invalid = Š„ŠøŠ±Š½Š° Š½Š°Š·Š²Š° фŠ°Š¹Š»Ńƒ: Ā«%sĀ». +migrate_options_lfs_endpoint.placeholder = ŠÆŠŗщŠ¾ Š·Š°Š»ŠøшŠøтŠø ŠæŠ¾Ń€Š¾Š¶Š½Ń–Š¼, тŠ¾ ŠŗіŠ½Ń†ŠµŠ²Ńƒ тŠ¾Ń‡Šŗу Š±ŃƒŠ“Šµ Š²ŠøŠ·Š½Š°Ń‡ŠµŠ½Š¾ Š· URL-Š°Š“рŠµŃŠø ŠŗŠ»Š¾Š½Ńƒ +cite_this_repo = ŠŸŠ¾ŃŠ»Š°Ń‚Šøся Š½Š° цŠµŠ¹ рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Š¹ +editor.directory_is_a_file = ŠŠ°Š·Š²Š° ŠŗŠ°Ń‚Š°Š»Š¾Š³Ńƒ Ā«%sĀ» уŠ¶Šµ Š²ŠøŠŗŠ¾Ń€ŠøстŠ¾Š²ŃƒŃ”Ń‚ŃŒŃŃ Š² цьŠ¾Š¼Ńƒ рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Ń— яŠŗ Š½Š°Š·Š²Š° фŠ°Š¹Š»Ńƒ. +subscribe.issue.guest.tooltip = Š£Š²Ń–Š¹Š“іть, щŠ¾Š± ŠæіŠ“ŠæŠøсŠ°Ń‚Šøся Š½Š° цю Š·Š°Š“Š°Ń‡Ńƒ. +invisible_runes_header = `Š¦ŠµŠ¹ фŠ°Š¹Š» Š¼Ń–стŠøть Š½ŠµŠ²ŠøŠ“ŠøŠ¼Ń– сŠøŠ¼Š²Š¾Š»Šø Š®Š½Ń–ŠŗŠ¾Š“у` +invisible_runes_line = `Š£ цьŠ¾Š¼Ńƒ ряŠ“Šŗу є Š½ŠµŠ²ŠøŠ“ŠøŠ¼Ń– сŠøŠ¼Š²Š¾Š»Šø Š®Š½Ń–ŠŗŠ¾Š“у` +subscribe.pull.guest.tooltip = Š£Š²Ń–Š¹Š“іть, щŠ¾Š± ŠæіŠ“ŠæŠøсŠ°Ń‚Šøся Š½Š° цŠµŠ¹ Š·Š°ŠæŠøт Š½Š° Š·Š»Šøття. +ambiguous_runes_header = `Š¦ŠµŠ¹ фŠ°Š¹Š» Š¼Ń–стŠøть Š½ŠµŠ¾Š“Š½Š¾Š·Š½Š°Ń‡Š½Ń– сŠøŠ¼Š²Š¾Š»Šø Š®Š½Ń–ŠŗŠ¾Š“у` +ambiguous_runes_line = `Š£ цьŠ¾Š¼Ńƒ ряŠ“Šŗу є Š½ŠµŠ¾Š“Š½Š¾Š·Š½Š°Ń‡Š½Ń– сŠøŠ¼Š²Š¾Š»Šø Š®Š½Ń–ŠŗŠ¾Š“у` +issues.choose.invalid_config = Š£ ŠŗŠ¾Š½Ń„Ń–Š³ŃƒŃ€Š°Ń†Ń–Ń— Š·Š°Š“Š°Ń‡Ń– є ŠæŠ¾Š¼ŠøŠ»ŠŗŠø: +escape_control_characters = Escape +ambiguous_runes_description = `Š¦ŠµŠ¹ фŠ°Š¹Š» Š¼Ń–стŠøть сŠøŠ¼Š²Š¾Š»Šø Š®Š½Ń–ŠŗŠ¾Š“у, яŠŗі Š»ŠµŠ³ŠŗŠ¾ сŠæŠ»ŃƒŃ‚Š°Ń‚Šø Š· іŠ½ŃˆŠøŠ¼Šø сŠøŠ¼Š²Š¾Š»Š°Š¼Šø. ŠÆŠŗщŠ¾ тŠ°Šŗ Š·Ń€Š¾Š±Š»ŠµŠ½Š¾ Š½Š°Š²Š¼ŠøсŠ½Š¾, Š¼Š¾Š¶ŠµŃ‚Šµ іŠ³Š½Š¾Ń€ŃƒŠ²Š°Ń‚Šø цŠµ ŠæŠ¾ŠæŠµŃ€ŠµŠ“Š¶ŠµŠ½Š½Ń. Š©Š¾Š± ŠæŠ¾ŠŗŠ°Š·Š°Ń‚Šø ці сŠøŠ¼Š²Š¾Š»Šø, сŠŗŠ¾Ń€ŠøстŠ°Š¹Ń‚ŠµŃŃ ŠŗŠ½Š¾ŠæŠŗŠ¾ŃŽ Ā«EscapeĀ».` +unescape_control_characters = Unescape +invisible_runes_description = `Š¦ŠµŠ¹ фŠ°Š¹Š» Š¼Ń–стŠøть Š½ŠµŠ²ŠøŠ“ŠøŠ¼Ń– сŠøŠ¼Š²Š¾Š»Šø Š®Š½Ń–ŠŗŠ¾Š“у, яŠŗі Š»ŃŽŠ“ŠøŠ½Ń– Š½ŠµŠ¼Š¾Š¶Š»ŠøŠ²Š¾ рŠ¾Š·Ń€Ń–Š·Š½ŠøтŠø, Š°Š»Šµ яŠŗі ŠæŠ¾-ріŠ·Š½Š¾Š¼Ńƒ Š¾Š±Ń€Š¾Š±Š»ŃŃŽŃ‚ŃŒŃŃ ŠŗŠ¾Š¼Šæ'ютŠµŃ€Š¾Š¼. ŠÆŠŗщŠ¾ тŠ°Šŗ Š·Ń€Š¾Š±Š»ŠµŠ½Š¾ Š½Š°Š²Š¼ŠøсŠ½Š¾, Š¼Š¾Š¶ŠµŃ‚Šµ іŠ³Š½Š¾Ń€ŃƒŠ²Š°Ń‚Šø цŠµ ŠæŠ¾ŠæŠµŃ€ŠµŠ“Š¶ŠµŠ½Š½Ń. Š©Š¾Š± ŠæŠ¾ŠŗŠ°Š·Š°Ń‚Šø ці сŠøŠ¼Š²Š¾Š»Šø, сŠŗŠ¾Ń€ŠøстŠ°Š¹Ń‚ŠµŃŃ ŠŗŠ½Š¾ŠæŠŗŠ¾ŃŽ Ā«EscapeĀ».` +ambiguous_character = `%[1]c [U+%04[1]X] Š¼Š¾Š¶Š½Š° сŠæŠ»ŃƒŃ‚Š°Ń‚Šø Š· %[2]c [U+%04[2]X]` +settings.sourcehut_builds.secrets_helper = ŠŠ°Š“Š°Ń‚Šø Š·Š°Š²Š“Š°Š½Š½ŃŽ Š“Š¾ŃŃ‚ŃƒŠæ Š“Š¾ сŠµŠŗрŠµŃ‚Ń–Š² Š·Š±Ń–Ń€ŠŗŠø (ŠæŠ¾Ń‚ріŠ±ŠµŠ½ Š“Š¾Š·Š²Ń–Š» SECRETS:RO) +no_eol.text = Š‘ŠµŠ· EOL +settings.remove_protected_branch_failed = ŠŠµ Š²Š“Š°Š»Š¾ŃŃ Š²ŠøŠ“Š°Š»ŠøтŠø ŠæрŠ°Š²ŠøŠ»Š¾ Š·Š°Ń…Šøсту Š³Ń–Š»Š¾Šŗ Ā«%sĀ». +summary_card_alt = ŠŸŃ–Š“суŠ¼ŠŗŠ¾Š²Š° ŠŗŠ°Ń€Ń‚ŠŗŠ° рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–ŃŽ %s +issues.summary_card_alt = ŠŸŃ–Š“суŠ¼ŠŗŠ¾Š²Š° ŠŗŠ°Ń€Ń‚ŠŗŠ° Š·Š°Š“Š°Ń‡Ń– Ā«%sĀ» Š² рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Ń— %s +release.summary_card_alt = ŠŸŃ–Š“суŠ¼ŠŗŠ¾Š²Š° ŠŗŠ°Ń€Ń‚ŠŗŠ° Š²ŠøŠæусŠŗу Ā«%sĀ» Š² рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Ń— %s +release.hide_archive_links_helper = ŠŸŃ€ŠøхŠ¾Š²Š°Ń‚Šø Š“Š»Ń цьŠ¾Š³Š¾ Š²ŠøŠæусŠŗу Š°Ń€Ń…Ń–Š²Šø Š²ŠøхіŠ“Š½Š¾Š³Š¾ ŠŗŠ¾Š“у, щŠ¾ Š³ŠµŠ½ŠµŃ€ŃƒŃŽŃ‚ŃŒŃŃ Š°Š²Ń‚Š¾Š¼Š°Ń‚ŠøчŠ½Š¾. ŠŠ°ŠæрŠøŠŗŠ»Š°Š“, яŠŗщŠ¾ Š²Šø Š·Š°Š²Š°Š½Ń‚Š°Š¶ŃƒŃ”Ń‚Šµ сŠ²Š¾Ń— Š°Ń€Ń…Ń–Š²Šø. +activity.published_prerelease_label = ŠŸŃ€Šµ-рŠµŠ»Ń–Š· +release.title = ŠŠ°Š·Š²Š° Š²ŠøŠæусŠŗу +release.system_generated = Š¦Šµ Š²ŠŗŠ»Š°Š“ŠµŠ½Š½Ń Š·Š³ŠµŠ½ŠµŃ€Š¾Š²Š°Š½Š¾ Š°Š²Ń‚Š¾Š¼Š°Ń‚ŠøчŠ½Š¾. +release.hide_archive_links = ŠŸŃ€ŠøхŠ¾Š²Š°Ń‚Šø Š°Š²Ń‚Š¾Š¼Š°Ń‚ŠøчŠ½Š¾ Š³ŠµŠ½ŠµŃ€Š¾Š²Š°Š½Ń– Š°Ń€Ń…Ń–Š²Šø +branch.delete_desc = Š’ŠøŠ“Š°Š»ŠµŠ½Š½Ń Š³Ń–Š»ŠŗŠø є Š¾ŃŃ‚Š°Ń‚Š¾Ń‡Š½ŠøŠ¼. Š„Š¾Ń‡Š° Š²ŠøŠ“Š°Š»ŠµŠ½Š° Š³Ń–Š»ŠŗŠ° Š¼Š¾Š¶Šµ ісŠ½ŃƒŠ²Š°Ń‚Šø щŠµ Š“ŠµŃŠŗŠøŠ¹ чŠ°Ń Š“Š¾ тŠ¾Š³Š¾, яŠŗ її Š±ŃƒŠ“Šµ Š²ŠøŠ“Š°Š»ŠµŠ½Š¾, цю Š“ію ŠŠ•ŠœŠžŠ–Š›Š˜Š’Šž сŠŗŠ°ŃŃƒŠ²Š°Ń‚Šø Š² Š±Ń–Š»ŃŒŃˆŠ¾ŃŃ‚Ń– Š²ŠøŠæŠ°Š“ŠŗіŠ². ŠŸŃ€Š¾Š“Š¾Š²Š¶ŠøтŠø? +release.deletion_desc = Š’ŠøŠ“Š°Š»ŠµŠ½Š½Ń Š²ŠøŠæусŠŗу Š²ŠøŠ“Š°Š»ŃŃ” Š¹Š¾Š³Š¾ Š»ŠøшŠµ Š· Forgejo. ŠŸŃ€Šø цьŠ¾Š¼Ńƒ тŠµŠ³ Git, Š²Š¼Ń–ст рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–ŃŽ чŠø Š¹Š¾Š³Š¾ істŠ¾Ń€Ń–ŃŽ Š½Šµ Š±ŃƒŠ“Šµ Š·Š¼Ń–Š½ŠµŠ½Š¾. ŠŸŃ€Š¾Š“Š¾Š²Š¶ŠøтŠø? +settings.sourcehut_builds.manifest_path = ŠØŠ»ŃŃ… Š“Š¾ Š¼Š°Š½Ń–Ń„ŠµŃŃ‚Ńƒ Š·Š±Ń–Ń€ŠŗŠø +settings.wiki_branch_rename_failure = ŠŠµ Š²Š“Š°Š»Š¾ŃŃ Š½Š¾Ń€Š¼Š°Š»Ń–Š·ŃƒŠ²Š°Ń‚Šø Š½Š°Š·Š²Ńƒ Š²Ń–Šŗі-Š³Ń–Š»ŠŗŠø рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–ŃŽ. +settings.sourcehut_builds.visibility = Š’ŠøŠ“ŠøŠ¼Ń–ŃŃ‚ŃŒ Š·Š°Š²Š“Š°Š½ŃŒ +settings.unarchive.header = Š Š¾Š·Š°Ń€Ń…Ń–Š²ŃƒŠ²Š°Ń‚Šø цŠµŠ¹ рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Š¹ +settings.unarchive.success = Š ŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Š¹ усŠæішŠ½Š¾ рŠ¾Š·Š°Ń€Ń…Ń–Š²Š¾Š²Š°Š½Š¾. +diff.git-notes.remove-body = Š¦ŃŽ ŠæрŠøŠ¼Ń–Ń‚Šŗу Š±ŃƒŠ“Šµ Š²ŠøŠ“Š°Š»ŠµŠ½Š¾. +tag.ahead.target = Š“Š¾ %s ŠæісŠ»Ń цьŠ¾Š³Š¾ тŠµŠ³Ńƒ +branch.tag_collision = ŠŠµŠ¼Š¾Š¶Š»ŠøŠ²Š¾ стŠ²Š¾Ń€ŠøтŠø Š³Ń–Š»Šŗу Ā«%sĀ», Š¾ŃŠŗіŠ»ŃŒŠŗŠø у рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Ń— Š²Š¶Šµ є тŠµŠ³ іŠ· тŠ°ŠŗŠ¾ŃŽ Š½Š°Š·Š²Š¾ŃŽ. +branch.branch_name_conflict = ŠŠ°Š·Š²Š° Š³Ń–Š»ŠŗŠø Ā«%sĀ» ŠŗŠ¾Š½Ń„Š»Ń–Šŗтує Š· Š½Š°ŃŠ²Š½Š¾ŃŽ Š³Ń–Š»ŠŗŠ¾ŃŽ Ā«%sĀ». +settings.wiki_branch_rename_success = ŠŠ°Š·Š²Ńƒ Š²Ń–Šŗі-Š³Ń–Š»ŠŗŠø рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–ŃŽ усŠæішŠ½Š¾ Š½Š¾Ń€Š¼Š°Š»Ń–Š·Š¾Š²Š°Š½Š¾. +diff.has_escaped = Š£ цьŠ¾Š¼Ńƒ ряŠ“Šŗу є ŠæрŠøхŠ¾Š²Š°Š½Ń– сŠøŠ¼Š²Š¾Š»Šø Š®Š½Ń–ŠŗŠ¾Š“у +settings.unarchive.text = Š Š¾Š·Š°Ń€Ń…Ń–Š²ŃƒŠ²Š°Š½Š½Ń рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–ŃŽ Š²Ń–Š“Š½Š¾Š²Šøть Š¼Š¾Š¶Š»ŠøŠ²Ń–ŃŃ‚ŃŒ Š½Š°Š“сŠøŠ»Š°Ń‚Šø Š“Š¾ Š½ŃŒŠ¾Š³Š¾ ŠŗŠ¾Š¼Ń–Ń‚Šø і Š²ŠøŠŗŠ¾Š½ŃƒŠ²Š°Ń‚Šø push, Š° тŠ°ŠŗŠ¾Š¶ стŠ²Š¾Ń€ŃŽŠ²Š°Ń‚Šø Š·Š°Š“Š°Ń‡Ń– і Š·Š°ŠæŠøтŠø Š½Š° Š·Š»Šøття. +settings.wiki_rename_branch_main_notices_1 = Š¦ŃŽ Š¾ŠæŠµŃ€Š°Ń†Ń–ŃŽ ŠŠ•ŠœŠžŠ–Š›Š˜Š’Šž сŠŗŠ°ŃŃƒŠ²Š°Ń‚Šø. +settings.unarchive.error = Š”тŠ°Š»Š°ŃŃ ŠæŠ¾Š¼ŠøŠ»ŠŗŠ° ŠæрŠø сŠæрŠ¾Š±Ń– рŠ¾Š·Š°Ń€Ń…Ń–Š²ŃƒŠ²Š°Ń‚Šø рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Š¹. Š”Š¾ŠŗŠ»Š°Š“Š½Ń–ŃˆŃƒ іŠ½Ń„Š¾Ń€Š¼Š°Ń†Ń–ŃŽ Š“ŠøŠ². у Š¶ŃƒŃ€Š½Š°Š»Ń–. +settings.wiki_rename_branch_main = ŠŠ¾Ń€Š¼Š°Š»Ń–Š·ŃƒŠ²Š°Ń‚Šø Š½Š°Š·Š²Ńƒ Š²Ń–Šŗі-Š³Ń–Š»ŠŗŠø +settings.wiki_rename_branch_main_notices_2 = Š’Š½ŃƒŃ‚Ń€Ń–ŃˆŠ½ŃŽ Š²Ń–Šŗі-Š³Ń–Š»Šŗу рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–ŃŽ %s Š±ŃƒŠ“Šµ Š½Š°Š·Š°Š²Š¶Š“Šø ŠæŠµŃ€ŠµŠ¹Š¼ŠµŠ½Š¾Š²Š°Š½Š¾. Š†ŃŠ½ŃƒŃŽŃ‡Ń– ŠæŠµŃ€ŠµŠ²Ń–Ń€ŠŗŠø ŠæŠ¾Ń‚ріŠ±Š½Š¾ Š±ŃƒŠ“Šµ Š¾Š½Š¾Š²ŠøтŠø. +settings.pull_mirror_sync_in_progress = Š¢Ń€ŠøŠ²Š°Ń” Š¾Ń‚Ń€ŠøŠ¼Š°Š½Š½Ń Š·Š¼Ń–Š½ Š· Š²Ń–Š“Š“Š°Š»ŠµŠ½Š¾Š³Š¾ рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–ŃŽ %s. +settings.enter_repo_name = Š£Š²ŠµŠ“іть іŠ¼'я Š²Š»Š°ŃŠ½ŠøŠŗŠ° і Š½Š°Š·Š²Ńƒ рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–ŃŽ, яŠŗ ŠæŠ¾ŠŗŠ°Š·Š°Š½Š¾: +settings.pulls.allow_rebase_update = Š£Š²Ń–Š¼ŠŗŠ½ŃƒŃ‚Šø Š¾Š½Š¾Š²Š»ŠµŠ½Š½Ń Š³Ń–Š»ŠŗŠø Š·Š°ŠæŠøту Š½Š° Š·Š»Šøття Š·Š° Š“Š¾ŠæŠ¾Š¼Š¾Š³Š¾ŃŽ ŠæŠµŃ€ŠµŠ±Š°Š·ŃƒŠ²Š°Š½Š½Ń +settings.mirror_settings.docs.pulling_remote_title = ŠžŃ‚Ń€ŠøŠ¼Š°Š½Š½Ń Š· Š²Ń–Š“Š“Š°Š»ŠµŠ½Š¾Š³Š¾ рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–ŃŽ +settings.mirror_settings.docs.doc_link_pull_section = рŠ¾Š·Š“іŠ» Š“Š¾ŠŗуŠ¼ŠµŠ½Ń‚Š°Ń†Ń–Ń— Ā«ŠžŃ‚Ń€ŠøŠ¼Š°Š½Š½Ń Š· Š²Ń–Š“Š“Š°Š»ŠµŠ½Š¾Š³Š¾ рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–ŃŽĀ». +settings.pull_mirror_sync_quota_exceeded = ŠŸŠµŃ€ŠµŠ²ŠøщŠµŠ½Š¾ ŠŗŠ²Š¾Ń‚Ńƒ, Š¾Ń‚Ń€ŠøŠ¼Š°Š½Š½Ń Š·Š¼Ń–Š½ Š½ŠµŠ¼Š¾Š¶Š»ŠøŠ²Šµ. +settings.mirror_settings.push_mirror.none_ssh = ŠŠµŠ¼Š°Ń” +settings.admin_stats_indexer = Š†Š½Š“ŠµŠŗсŠ°Ń‚Š¾Ń€ стŠ°Ń‚ŠøстŠøŠŗŠø ŠŗŠ¾Š“у +settings.admin_indexer_commit_sha = ŠžŃŃ‚Š°Š½Š½Ń–Š¹ іŠ½Š“ŠµŠŗсŠ¾Š²Š°Š½ŠøŠ¹ ŠŗŠ¾Š¼Ń–Ń‚ +settings.discord_icon_url.exceeds_max_length = URL-Š°Š“рŠµŃŠ° Š·Š½Š°Ń‡ŠŗŠ° Š½Šµ Š¼Š¾Š¶Šµ Š±ŃƒŃ‚Šø Š“Š¾Š²ŃˆŠ¾ŃŽ, Š½Ń–Š¶ 2048 сŠøŠ¼Š²Š¾Š»Šø +settings.protect_invalid_status_check_pattern = ŠŠµŠ“іŠ¹ŃŠ½ŠøŠ¹ шŠ°Š±Š»Š¾Š½ ŠæŠµŃ€ŠµŠ²Ń–Ń€ŠŗŠø стŠ°Š½Ńƒ: Ā«%sĀ». +settings.protect_no_valid_status_check_patterns = ŠŠµŠ¼Š°Ń” Š“іŠ¹ŃŠ½Šøх шŠ°Š±Š»Š¾Š½Ń–Š² ŠæŠµŃ€ŠµŠ²Ń–Ń€ŠŗŠø стŠ°Š½Ńƒ. +settings.admin_indexer_unindexed = ŠŠµ іŠ½Š“ŠµŠŗсŠ¾Š²Š°Š½Š¾ +settings.push_mirror_sync_in_progress = Š¢Ń€ŠøŠ²Š°Ń” Š½Š°Š“сŠøŠ»Š°Š½Š½Ń Š·Š¼Ń–Š½ Š“Š¾ Š²Ń–Š“Š“Š°Š»ŠµŠ½Š¾Š³Š¾ рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–ŃŽ %s. +settings.releases_desc = Š£Š²Ń–Š¼ŠŗŠ½ŃƒŃ‚Šø Š²ŠøŠæусŠŗŠø Š² рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Ń— +settings.admin_code_indexer = Š†Š½Š“ŠµŠŗсŠ°Ń‚Š¾Ń€ ŠŗŠ¾Š“у +settings.protect_status_check_patterns_desc = Š£Š²ŠµŠ“іть шŠ°Š±Š»Š¾Š½Šø, щŠ¾Š± Š²ŠŗŠ°Š·Š°Ń‚Šø, яŠŗі ŠæŠµŃ€ŠµŠ²Ń–Ń€ŠŗŠø стŠ°Š½Ńƒ ŠæŠ¾Š²ŠøŠ½Š½Ń– ŠæрŠ¾Š¹Ń‚Šø Š³Ń–Š»ŠŗŠø, ŠæŠµŃ€Ńˆ Š½Ń–Š¶ їх Š±ŃƒŠ“Šµ Š¾Š±'єŠ“Š½Š°Š½Š¾ у Š³Ń–Š»Šŗу, щŠ¾ Š²Ń–Š“ŠæŠ¾Š²Ń–Š“Š°Ń” цьŠ¾Š¼Ńƒ ŠæрŠ°Š²ŠøŠ»Ńƒ. ŠšŠ¾Š¶ŠµŠ½ ряŠ“Š¾Šŗ Š²ŠøŠ·Š½Š°Ń‡Š°Ń” шŠ°Š±Š»Š¾Š½. ŠØŠ°Š±Š»Š¾Š½Šø Š½Šµ Š¼Š¾Š¶ŃƒŃ‚ŃŒ Š±ŃƒŃ‚Šø ŠæŠ¾Ń€Š¾Š¶Š½Ń–Š¼Šø. +settings.add_webhook.invalid_path = ŠØŠ»ŃŃ… Š½Šµ ŠæŠ¾Š²ŠøŠ½ŠµŠ½ Š¼Ń–стŠøтŠø чŠ°ŃŃ‚ŠøŠ½Šø Ā«.Ā» Š°Š±Š¾ Ā«..Ā» і Š½Šµ ŠæŠ¾Š²ŠøŠ½ŠµŠ½ Š±ŃƒŃ‚Šø ŠæŠ¾Ń€Š¾Š¶Š½Ń–Š¼. Š’Ń–Š½ Š½Šµ Š¼Š¾Š¶Šµ ŠæŠ¾Ń‡ŠøŠ½Š°Ń‚Šøся Š°Š±Š¾ Š·Š°ŠŗіŠ½Ń‡ŃƒŠ²Š°Ń‚Šøся ŠŗŠ¾ŃŠ¾ŃŽ рŠøсŠŗŠ¾ŃŽ. +settings.matrix.access_token_helper = Š ŠµŠŗŠ¾Š¼ŠµŠ½Š“ується стŠ²Š¾Ń€ŠøтŠø Š¾ŠŗрŠµŠ¼ŠøŠ¹ Š¾Š±Š»Ń–ŠŗŠ¾Š²ŠøŠ¹ Š·Š°ŠæŠøс Matrix. Š¢Š¾ŠŗŠµŠ½ Š“Š¾ŃŃ‚ŃƒŠæу Š¼Š¾Š¶Š½Š° Š¾Ń‚Ń€ŠøŠ¼Š°Ń‚Šø у Š²ŠµŠ±ŠŗŠ»Ń–Ń”Š½Ń‚Ń– Element (у ŠæрŠøŠ²Š°Ń‚Š½Ń–Š¹/іŠ½ŠŗŠ¾Š³Š½Ń–Ń‚Š¾ Š²ŠŗŠ»Š°Š“ці): User menu (Š²Š³Š¾Ń€Ń– Š»Ń–Š²Š¾Ń€ŃƒŃ‡) > All settings > Help & About > Advanced > Access Token (ŠæіŠ“ URL-Š°Š“рŠµŃŠ¾ŃŽ Homeserver). Š—Š°ŠŗрŠøŠ¹Ń‚Šµ ŠæрŠøŠ²Š°Ń‚Š½Ńƒ Š²ŠŗŠ»Š°Š“Šŗу (Š²ŠøхіŠ“ іŠ· сŠøстŠµŠ¼Šø Š·Ń€Š¾Š±Šøть тŠ¾ŠŗŠµŠ½ Š½ŠµŠ“іŠ¹ŃŠ½ŠøŠ¼). +settings.protect_patterns = ŠØŠ°Š±Š»Š¾Š½Šø +settings.sourcehut_builds.access_token_helper = Š¢Š¾ŠŗŠµŠ½ Š“Š¾ŃŃ‚ŃƒŠæу, яŠŗŠøŠ¹ Š¼Š°Ń” Š“Š¾Š·Š²Ń–Š» JOBS:RW. Š—Š³ŠµŠ½ŠµŃ€ŃƒŠ¹Ń‚Šµ тŠ¾ŠŗŠµŠ½ builds.sr.ht Š°Š±Š¾ тŠ¾ŠŗŠµŠ½ builds.sr.ht Š· Š“Š¾ŃŃ‚ŃƒŠæŠ¾Š¼ Š“Š¾ сŠµŠŗрŠµŃ‚Ń–Š² Š½Š° meta.sr.ht. +editor.unable_to_upload_files = ŠŠµ Š²Š“Š°Š»Š¾ŃŃ Š·Š°Š²Š°Š½Ń‚Š°Š¶ŠøтŠø фŠ°Š¹Š»Šø Š² Ā«%sĀ» чŠµŃ€ŠµŠ· ŠæŠ¾Š¼ŠøŠ»Šŗу: %v +view_git_blame = ŠŸŠµŃ€ŠµŠ³Š»ŃŠ½ŃƒŃ‚Šø git blame +commits.ssh_key_fingerprint = Š’Ń–Š“Š±ŠøтŠ¾Šŗ ŠŗŠ»ŃŽŃ‡Š° SSH +settings.web_hook_name_telegram = Telegram +pulls.status_checks_hide_all = ŠŸŃ€ŠøхŠ¾Š²Š°Ń‚Šø Š²ŃŃ– ŠæŠµŃ€ŠµŠ²Ń–Ń€ŠŗŠø +settings.thread_id = Thread ID +settings.matrix.room_id_helper = ID ŠŗіŠ¼Š½Š°Ń‚Šø Š¼Š¾Š¶Š½Š° Š¾Ń‚Ń€ŠøŠ¼Š°Ń‚Šø у Š²ŠµŠ±ŠŗŠ»Ń–Ń”Š½Ń‚Ń– Element: Room Settings > Advanced > Internal room ID. ŠŸŃ€ŠøŠŗŠ»Š°Š“: %s. +editor.push_rejected_no_message = Š—Š¼Ń–Š½Ńƒ Š²Ń–Š“хŠøŠ»ŠµŠ½Š¾ сŠµŃ€Š²ŠµŃ€Š¾Š¼ Š±ŠµŠ· ŠæŠ¾Š²Ń–Š“Š¾Š¼Š»ŠµŠ½Š½Ń. Š‘ŃƒŠ“ь Š»Š°ŃŠŗŠ°, ŠæŠµŃ€ŠµŠ²Ń–ртŠµ Git-хуŠŗŠø. +editor.upload_files_to_dir = Š—Š°Š²Š°Š½Ń‚Š°Š¶ŠøтŠø фŠ°Š¹Š»Šø Š² Ā«%sĀ» +issues.filter_sort.relevance = Š—Š° Š²Ń–Š“ŠæŠ¾Š²Ń–Š“Š½Ń–стю +editor.cannot_commit_to_protected_branch = ŠŠµŠ¼Š¾Š¶Š»ŠøŠ²Š¾ Š·Š“іŠ¹ŃŠ½ŠøтŠø ŠŗŠ¾Š¼Ń–Ń‚ Š“Š¾ Š·Š°Ń…ŠøщŠµŠ½Š¾Ń— Š³Ń–Š»ŠŗŠø Ā«%sĀ». +editor.file_deleting_no_longer_exists = Š¤Š°Š¹Š» Ā«%sĀ», яŠŗŠøŠ¹ Š²Šø Š²ŠøŠ“Š°Š»ŃŃ”Ń‚Šµ, Š±Ń–Š»ŃŒŃˆŠµ Š½Šµ ісŠ½ŃƒŃ” у цьŠ¾Š¼Ńƒ рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Ń—. +editor.file_editing_no_longer_exists = Š¤Š°Š¹Š» Ā«%sĀ», яŠŗŠøŠ¹ Š²Šø рŠµŠ“Š°Š³ŃƒŃ”Ń‚Šµ, Š±Ń–Š»ŃŒŃˆŠµ Š½Šµ ісŠ½ŃƒŃ” у цьŠ¾Š¼Ńƒ рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Ń—. +diff.show_file_tree = ŠŸŠ¾ŠŗŠ°Š·Š°Ń‚Šø Š“ŠµŃ€ŠµŠ²Š¾ фŠ°Š¹Š»Ń–Š² +milestones.filter_sort.name = Š—Š° Š½Š°Š·Š²Š¾ŃŽ +pulls.allow_edits_from_maintainers_err = ŠŠµ Š²Š“Š°Š»Š¾ŃŃ Š¾Š½Š¾Š²ŠøтŠø +pulls.has_viewed_file = ŠŸŠµŃ€ŠµŠ³Š»ŃŠ½ŃƒŃ‚Š¾ +editor.file_already_exists = Š¤Š°Š¹Š» іŠ· Š½Š°Š·Š²Š¾ŃŽ Ā«%sĀ» Š²Š¶Šµ є у цьŠ¾Š¼Ńƒ рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Ń—. +commits.view_path = ŠŸŠµŃ€ŠµŠ³Š»ŃŠ½ŃƒŃ‚Šø Š½Š° цьŠ¾Š¼Ńƒ ŠµŃ‚Š°Šæі істŠ¾Ń€Ń–Ń— +editor.push_rejected = Š—Š¼Ń–Š½Ńƒ Š²Ń–Š“хŠøŠ»ŠµŠ½Š¾ сŠµŃ€Š²ŠµŃ€Š¾Š¼. Š‘ŃƒŠ“ь Š»Š°ŃŠŗŠ°, ŠæŠµŃ€ŠµŠ²Ń–ртŠµ Git-хуŠŗŠø. +commits.renamed_from = ŠŸŠµŃ€ŠµŠ¹Š¼ŠµŠ½Š¾Š²Š°Š½Š¾ Š· %s +diff.hide_file_tree = ŠŸŃ€ŠøхŠ¾Š²Š°Ń‚Šø Š“ŠµŃ€ŠµŠ²Š¾ фŠ°Š¹Š»Ń–Š² +pulls.viewed_files_label = %[1]d Š· %[2]d фŠ°Š¹Š»Ń–Š² ŠæŠµŃ€ŠµŠ³Š»ŃŠ½ŃƒŃ‚Š¾ +settings.protected_branch_duplicate_rule_name = Š”Š»Ń цьŠ¾Š³Š¾ Š½Š°Š±Š¾Ń€Ńƒ Š³Ń–Š»Š¾Šŗ уŠ¶Šµ є ŠæрŠ°Š²ŠøŠ»Š¾ +settings.mirror_settings.push_mirror.edit_sync_time = Š—Š¼Ń–Š½ŠøтŠø іŠ½Ń‚ŠµŃ€Š²Š°Š» сŠøŠ½Ń…Ń€Š¾Š½Ń–Š·Š°Ń†Ń–Ń— Š“Š·ŠµŃ€ŠŗŠ°Š»Š° +wiki.delete_page_notice_1 = Š’ŠøŠ“Š°Š»ŠµŠ½Š½Ń Š²Ń–Šŗі-стŠ¾Ń€Ń–Š½ŠŗŠø Ā«%sĀ» Š½ŠµŠ¼Š¾Š¶Š»ŠøŠ²Š¾ сŠŗŠ°ŃŃƒŠ²Š°Ń‚Šø. ŠŸŃ€Š¾Š“Š¾Š²Š¶ŠøтŠø? +issues.label_archived_filter = ŠŸŠ¾ŠŗŠ°Š·Š°Ń‚Šø Š°Ń€Ń…Ń–Š²Š¾Š²Š°Š½Ń– Š¼Ń–Ń‚ŠŗŠø +milestones.new_subheader = Š•Ń‚Š°ŠæŠø Š“Š¾ŠæŠ¾Š¼Š°Š³Š°ŃŽŃ‚ŃŒ Š¾Ń€Š³Š°Š½Ń–Š·ŃƒŠ²Š°Ń‚Šø Š·Š°Š“Š°Ń‡Ń– тŠ° Š²Ń–Š“стŠµŠ¶ŃƒŠ²Š°Ń‚Šø ŠæрŠ¾Š³Ń€ŠµŃ їх Š²ŠøŠŗŠ¾Š½Š°Š½Š½Ń. +issues.closed_by_fake = Š²Ń–Š“ %[2]s Š·Š°ŠŗрŠøтŠ¾ %[1]s +issues.closed_by = Š²Ń–Š“ %[3]s Š·Š°ŠŗрŠøтŠ¾ %[1]s +issues.action_check = ŠŸŠ¾ŃŃ‚Š°Š²ŠøтŠø/Š·Š½ŃŃ‚Šø ŠæŠ¾Š·Š½Š°Ń‡Šŗу +issues.action_check_all = ŠŸŠ¾ŃŃ‚Š°Š²ŠøтŠø/Š·Š½ŃŃ‚Šø ŠæŠ¾Š·Š½Š°Ń‡Šŗу Š· усіх ŠµŠ»ŠµŠ¼ŠµŠ½Ń‚Ń–Š² +vendored = Š”тŠ¾Ń€Š¾Š½Š½Ń–Š¹ [graphs] contributors.what = Š²Š½ŠµŃŠŗŠø @@ -2798,6 +2902,8 @@ teams.invite_team_member = Š—Š°ŠæрŠ¾ŃŠøтŠø Š“Š¾ %s teams.write_access = Š—Š°ŠæŠøс teams.invite.by = Š’Š°Ń Š·Š°ŠæрŠ¾ŃˆŃƒŃ” %s teams.invite_team_member.list = Š—Š°ŠæрŠ¾ŃˆŠµŠ½Š½Ń Š² Š¾Ń‡Ń–ŠŗуŠ²Š°Š½Š½Ń– +form.name_pattern_not_allowed = Š’ŠøрŠ°Š· Ā«%sĀ» Š½Šµ Š¼Š¾Š¶Šµ Š±ŃƒŃ‚Šø чŠ°ŃŃ‚ŠøŠ½Š¾ŃŽ Š½Š°Š·Š²Šø Š¾Ń€Š³Š°Š½Ń–Š·Š°Ń†Ń–Ń—. +teams.add_nonexistent_repo = Š ŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Š¹, яŠŗŠøŠ¹ Š²Šø Š½Š°Š¼Š°Š³Š°Ń”Ń‚ŠµŃŃ Š“Š¾Š“Š°Ń‚Šø, Š½Šµ ісŠ½ŃƒŃ”. Š”ŠæŠ¾Ń‡Š°Ń‚Šŗу стŠ²Š¾Ń€Ń–Ń‚ŃŒ Š¹Š¾Š³Š¾. [admin] dashboard=ŠŸŠ°Š½ŠµŠ»ŃŒ уŠæрŠ°Š²Š»Ń–Š½Š½Ń @@ -2909,7 +3015,7 @@ users.is_activated=ŠžŠ±Š»Ń–ŠŗŠ¾Š²ŠøŠ¹ Š·Š°ŠæŠøс ŠŗŠ¾Ń€ŠøстуŠ²Š°Ń‡Š° уŠ²Ń–Š¼ users.prohibit_login=Š—Š°Š±Š»Š¾ŠŗŠ¾Š²Š°Š½ŠøŠ¹ Š¾Š±Š»Ń–ŠŗŠ¾Š²ŠøŠ¹ Š·Š°ŠæŠøс users.is_admin=ŠžŠ±Š»Ń–ŠŗŠ¾Š²ŠøŠ¹ Š·Š°ŠæŠøс Š°Š“Š¼Ń–Š½Ń–стрŠ°Ń‚Š¾Ń€Š° users.is_restricted=ŠžŠ±Š¼ŠµŠ¶ŠµŠ½ŠøŠ¹ -users.allow_git_hook=ŠœŠ¾Š¶Šµ стŠ²Š¾Ń€ŃŽŠ²Š°Ń‚Šø Git хуŠŗŠø +users.allow_git_hook=ŠœŠ¾Š¶Šµ стŠ²Š¾Ń€ŃŽŠ²Š°Ń‚Šø Git-хуŠŗŠø users.allow_git_hook_tooltip=Git хуŠŗŠø Š²ŠøŠŗŠ¾Š½ŃƒŃŽŃ‚ŃŒŃŃ Š²Ń–Š“ іŠ¼ŠµŠ½Ń– ŠŗŠ¾Ń€ŠøстуŠ²Š°Ń‡Š° OS сŠµŃ€Š²Ń–ŃŃƒ Forgejo і Š¼Š°ŃŽŃ‚ŃŒ Š¾Š“Š½Š°ŠŗŠ¾Š²ŠøŠ¹ ріŠ²ŠµŠ½ŃŒ Š“Š¾ŃŃ‚ŃƒŠæу Š“Š¾ хŠ¾ŃŃ‚Š°. ŠÆŠŗ рŠµŠ·ŃƒŠ»ŃŒŃ‚Š°Ń‚, ŠŗŠ¾Ń€ŠøстуŠ²Š°Ń‡Ń– Š· Š“Š¾ŃŃ‚ŃƒŠæŠ¾Š¼ Š“Š¾ Git-хуŠŗіŠ² Š¼Š¾Š¶ŃƒŃ‚ŃŒ Š¾Ń‚Ń€ŠøŠ¼Š°Ń‚Šø Š“Š¾ŃŃ‚ŃƒŠæ і Š·Š¼Ń–Š½ŃŽŠ²Š°Ń‚Šø Š²ŃŃ– рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Ń— Forgejo, Š° тŠ°ŠŗŠ¾Š¶ Š±Š°Š·Ńƒ Š“Š°Š½Šøх, щŠ¾ Š²ŠøŠŗŠ¾Ń€ŠøстŠ¾Š²ŃƒŃŽŃ‚ŃŒŃŃ Š² Forgejo. ŠžŃ‚Š¶Šµ, Š²Š¾Š½Šø тŠ°ŠŗŠ¾Š¶ Š·Š“Š°Ń‚Š½Ń– Š¾Ń‚Ń€ŠøŠ¼Š°Ń‚Šø ŠæрŠ°Š²Š° Š°Š“Š¼Ń–Š½Ń–стрŠ°Ń‚Š¾Ń€Š° Forgejo. users.allow_import_local=ŠœŠ¾Š¶Šµ іŠ¼ŠæŠ¾Ń€Ń‚ŃƒŠ²Š°Ń‚Šø Š»Š¾ŠŗŠ°Š»ŃŒŠ½Ń– рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Ń— users.allow_create_organization=ŠœŠ¾Š¶Šµ стŠ²Š¾Ń€ŃŽŠ²Š°Ń‚Šø Š¾Ń€Š³Š°Š½Ń–Š·Š°Ń†Ń–Ń— @@ -3051,7 +3157,7 @@ auths.sspi_default_language_helper=Š¢ŠøŠæŠ¾Š²Š° Š¼Š¾Š²Š° Š“Š»Ń ŠŗŠ¾Ń€ŠøстуŠ² auths.tips=ŠŸŠ¾Ń€Š°Š“Šø auths.tips.oauth2.general=ŠŠ²Ń‚ŠµŠ½Ń‚ŠøфіŠŗŠ°Ń†Ń–я OAuth2 auths.tip.oauth2_provider=ŠŸŠ¾ŃŃ‚Š°Ń‡Š°Š»ŃŒŠ½ŠøŠŗ OAuth2 -auths.tip.bitbucket=Š”тŠ²Š¾Ń€Ń–Ń‚ŃŒ OAuth URI Š½Š° стŠ¾Ń€Ń–Š½Ń†Ń– %s +auths.tip.bitbucket=Š—Š°Ń€ŠµŃ”ŃŃ‚Ń€ŃƒŠ¹Ń‚Šµ Š½Š¾Š²Š¾Š³Š¾ сŠæŠ¾Š¶ŠøŠ²Š°Ń‡Š° OAuth Š½Š° %s і Š“Š¾Š“Š°Š¹Ń‚Šµ Š“Š¾Š·Š²Ń–Š» Ā«ŠžŠ±Š»Ń–ŠŗŠ¾Š²ŠøŠ¹ Š·Š°ŠæŠøсĀ» ā€” Ā«Š§ŠøтŠ°Š½Š½ŃĀ» auths.tip.nextcloud=`Š—Š°Ń€ŠµŃ”ŃŃ‚Ń€ŃƒŠ¹Ń‚Šµ Š½Š¾Š²Š¾Š³Š¾ сŠæŠ¾Š¶ŠøŠ²Š°Ń‡Š° OAuth у Š²Š°ŃˆŠ¾Š¼Ńƒ ŠµŠŗŠ·ŠµŠ¼ŠæŠ»ŃŃ€Ń– Š·Š° Š“Š¾ŠæŠ¾Š¼Š¾Š³Š¾ŃŽ Š½Š°ŃŃ‚ŃƒŠæŠ½Š¾Š³Š¾ Š¼ŠµŠ½ŃŽ "ŠŠ°Š»Š°ŃˆŃ‚ŃƒŠ²Š°Š½Š½Ń -> Š‘ŠµŠ·ŠæŠµŠŗŠ° -> ŠŗŠ»Ń–Ń”Š½Ń‚ OAuth 2.0"` auths.tip.dropbox=Š”тŠ²Š¾Ń€Ń–Ń‚ŃŒ Š½Š¾Š²ŠøŠ¹ Š“Š¾Š“Š°Ń‚Š¾Šŗ Š½Š° %s auths.tip.facebook=Š—Š°Ń€ŠµŃ”ŃŃ‚Ń€ŃƒŠ¹Ń‚Šµ Š½Š¾Š²ŠøŠ¹ Š“Š¾Š“Š°Ń‚Š¾Šŗ Š½Š° %s і Š“Š¾Š“Š°Š¹Ń‚Šµ Š¼Š¾Š“уŠ»ŃŒ Ā«Facebook LoginĀ» @@ -3059,7 +3165,7 @@ auths.tip.github=Š—Š°Ń€ŠµŃ”ŃŃ‚Ń€ŃƒŠ¹Ń‚Šµ Š½Š¾Š²ŠøŠ¹ Š“Š¾Š“Š°Ń‚Š¾Šŗ OAuth Š½Š° % auths.tip.gitlab=Š”Š¾Š“Š°Š¹Ń‚Šµ Š½Š¾Š²ŠøŠ¹ Š“Š¾Š“Š°Ń‚Š¾Šŗ Š½Š° https://gitlab.com/profile/applications auths.tip.google_plus=ŠžŃ‚Ń€ŠøŠ¼Š°Š¹Ń‚Šµ Š¾Š±Š»Ń–ŠŗŠ¾Š²Ń– Š“Š°Š½Ń– ŠŗŠ»Ń–Ń”Š½Ń‚Š° OAuth2 Š² ŠŗŠ¾Š½ŃŠ¾Š»Ń– Google API Š½Š° стŠ¾Ń€Ń–Š½Ń†Ń– %s auths.tip.openid_connect=Š’ŠøŠŗŠ¾Ń€ŠøстŠ¾Š²ŃƒŠ¹Ń‚Šµ OpenID Connect Discovery URL (/.well-known/openid-configuration) Š“Š»Ń Š°Š²Ń‚Š¾Š¼Š°Ń‚ŠøчŠ½Š¾Ń— Š½Š°ŃŃ‚Ń€Š¾Š¹ŠŗŠø Š²Ń…Š¾Š“у OAuth -auths.tip.twitter=ŠŸŠµŃ€ŠµŠ¹Š“іть Š½Š° %s, стŠ²Š¾Ń€Ń–Ń‚ŃŒ ŠæрŠ¾Š³Ń€Š°Š¼Ńƒ і ŠæŠµŃ€ŠµŠŗŠ¾Š½Š°Š¹Ń‚ŠµŃŃ, щŠ¾ Š²ŠŗŠ»ŃŽŃ‡ŠµŠ½Š° Š¾Šæція Ā«Š”Š¾Š·Š²Š¾Š»ŠøтŠø цю ŠæрŠ¾Š³Ń€Š°Š¼Ńƒ Š“Š»Ń Š²Ń…Š¾Š“у Š² сŠøстŠµŠ¼Ńƒ Š·Š° Š“Š¾ŠæŠ¾Š¼Š¾Š³Š¾ŃŽ TwitterĀ» +auths.tip.twitter=ŠŸŠµŃ€ŠµŠ¹Š“іть Š½Š° %s, стŠ²Š¾Ń€Ń–Ń‚ŃŒ ŠæрŠ¾Š³Ń€Š°Š¼Ńƒ і ŠæŠµŃ€ŠµŠŗŠ¾Š½Š°Š¹Ń‚ŠµŃŃ, щŠ¾ Š²Š²Ń–Š¼ŠŗŠ½ŠµŠ½Š¾ Š¾Šæцію Ā«Š”Š¾Š·Š²Š¾Š»ŠøтŠø Š²ŠøŠŗŠ¾Ń€ŠøстŠ°Š½Š½Ń цієї ŠæрŠ¾Š³Ń€Š°Š¼Šø Š“Š»Ń Š²Ń…Š¾Š“у чŠµŃ€ŠµŠ· TwitterĀ» auths.tip.discord=Š—Š°Ń€ŠµŃ”ŃŃ‚Ń€ŃƒŠ¹Ń‚Šµ Š½Š¾Š²ŠøŠ¹ Š“Š¾Š“Š°Ń‚Š¾Šŗ Š½Š° %s auths.tip.yandex=Š”тŠ²Š¾Ń€Ń–Ń‚ŃŒ Š½Š¾Š²ŠøŠ¹ Š“Š¾Š“Š°Ń‚Š¾Šŗ Š½Š° %s. Š£ рŠ¾Š·Š“іŠ»Ń– Ā«Yandex.Passport APIĀ» Š²ŠøŠ±ŠµŃ€Ń–Ń‚ŃŒ тŠ°Šŗі Š“Š¾Š·Š²Š¾Š»Šø: Ā«Š”Š¾ŃŃ‚ŃƒŠæ Š“Š¾ Š°Š“рŠµŃŠø ŠµŠ»ŠµŠŗтрŠ¾Š½Š½Š¾Ń— ŠæŠ¾ŃˆŃ‚ŠøĀ», Ā«Š”Š¾ŃŃ‚ŃƒŠæ Š“Š¾ Š°Š²Š°Ń‚Š°Ń€Š°Ā» і Ā«Š”Š¾ŃŃ‚ŃƒŠæ Š“Š¾ іŠ¼ŠµŠ½Ń– ŠŗŠ¾Ń€ŠøстуŠ²Š°Ń‡Š°, іŠ¼ŠµŠ½Ń– тŠ° ŠæріŠ·Š²ŠøщŠ°, стŠ°Ń‚Ń–Ā» auths.tip.mastodon=Š’Š²ŠµŠ“іть URL сŠæŠµŃ†Ń–Š°Š»ŃŒŠ½Š¾Š³Š¾ ŠµŠŗŠ·ŠµŠ¼ŠæŠ»ŃŃ€Š° Š“Š»Ń ŠµŠŗŠ·ŠµŠ¼ŠæŠ»ŃŃ€Š° mastodon, яŠŗŠøŠ¹ Š²Šø хŠ¾Ń‡ŠµŃ‚Šµ Š°Š²Ń‚ŠµŠ½Ń‚ŠøфіŠŗуŠ²Š°Ń‚Šø Š·Š° Š“Š¾ŠæŠ¾Š¼Š¾Š³Š¾ŃŽ (Š°Š±Š¾ Š²ŠøŠŗŠ¾Ń€ŠøстŠ¾Š²ŃƒŠ²Š°Ń‚Šø Š·Š° Š·Š°Š¼Š¾Š²Ń‡ŃƒŠ²Š°Š½Š½ŃŠ¼) @@ -3193,7 +3299,7 @@ config.git_gc_timeout=Š¢Š°Š¹Š¼-Š°ŃƒŃ‚ Š¾ŠæŠµŃ€Š°Ń†Ń–Ń— Š·Š±ŠøрŠ°Ń‡Š° сŠ¼Ń–Ń‚Ń‚ config.log_config=ŠšŠ¾Š½Ń„Ń–Š³ŃƒŃ€Š°Ń†Ń–я Š¶ŃƒŃ€Š½Š°Š»Ńƒ config.disabled_logger=Š’ŠøŠ¼ŠŗŠ½ŠµŠ½Š¾ -config.access_log_mode=Š ŠµŠ¶ŠøŠ¼ Š“Š¾ŃŃ‚ŃƒŠæу Š“Š¾ Š¶ŃƒŃ€Š½Š°Š»Ńƒ +config.access_log_mode=Š ŠµŠ¶ŠøŠ¼ Š¶ŃƒŃ€Š½Š°Š»ŃŽŠ²Š°Š½Š½Ń Š“Š¾ŃŃ‚ŃƒŠæу config.xorm_log_sql=Š–ŃƒŃ€Š½Š°Š» SQL @@ -3250,13 +3356,13 @@ packages.package_manage_panel = ŠšŠµŃ€ŃƒŠ²Š°Š½Š½Ń ŠæŠ°ŠŗуŠ½ŠŗŠ°Š¼Šø packages.published = ŠžŠæуŠ±Š»Ń–ŠŗŠ¾Š²Š°Š½Š¾ notices.operations = Š”Ń–Ń— packages.cleanup = ŠžŃ‡ŠøстŠøтŠø Š½ŠµŠ“іŠ¹ŃŠ½Ń– Š“Š°Š½Ń– -packages.cleanup.success = Š£ŃŠæішŠ½Š¾ Š¾Ń‡ŠøщŠµŠ½Š¾ Š½ŠµŠ“іŠ¹ŃŠ½Ń– Š“Š°Š½Ń– +packages.cleanup.success = ŠŠµŠ“іŠ¹ŃŠ½Ń– Š“Š°Š½Ń– усŠæішŠ½Š¾ Š¾Ń‡ŠøщŠµŠ½Š¾ users.still_own_packages = Š¦ŠµŠ¹ ŠŗŠ¾Ń€ŠøстуŠ²Š°Ń‡ Š“Š¾ŃŃ– Š²Š¾Š»Š¾Š“іє Š¾Š“Š½ŠøŠ¼ чŠø Š±Ń–Š»ŃŒŃˆŠµ ŠæŠ°ŠŗуŠ½ŠŗŠ°Š¼Šø, сŠæŠ¾Ń‡Š°Ń‚Šŗу Š²ŠøŠ“Š°Š»Ń–Ń‚ŃŒ ці ŠæŠ°ŠŗуŠ½ŠŗŠø. users.purge_help = ŠŸŃ€ŠøŠ¼ŃƒŃŠ¾Š²Š¾ Š²ŠøŠ“Š°Š»ŠøтŠø ŠŗŠ¾Ń€ŠøстуŠ²Š°Ń‡Š° і Š±ŃƒŠ“ь-яŠŗі рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Ń—, Š¾Ń€Š³Š°Š½Ń–Š·Š°Ń†Ń–Ń— тŠ° ŠæŠ°ŠŗуŠ½ŠŗŠø, яŠŗŠøŠ¼Šø Š²Ń–Š½ Š²Š¾Š»Š¾Š“іє. Š’сі ŠŗŠ¾Š¼ŠµŠ½Ń‚Š°Ń€Ń– тŠ° Š·Š°Š“Š°Ń‡Ń–, стŠ²Š¾Ń€ŠµŠ½Ń– цŠøŠ¼ ŠŗŠ¾Ń€ŠøстуŠ²Š°Ń‡ŠµŠ¼, тŠ°ŠŗŠ¾Š¶ Š±ŃƒŠ“уть Š²ŠøŠ“Š°Š»ŠµŠ½Ń–. dashboard.cleanup_packages = ŠžŃ‡ŠøстŠøтŠø Š½ŠµŠæрŠøŠ“Š°Ń‚Š½Ń– ŠæŠ°ŠŗуŠ½ŠŗŠø monitor.last_execution_result = Š ŠµŠ·ŃƒŠ»ŃŒŃ‚Š°Ń‚ repos.lfs_size = Š Š¾Š·Š¼Ń–Ń€ LFS -config.allow_dots_in_usernames = Š”Š¾Š·Š²Š¾Š»ŠøтŠø Š²ŠøŠŗŠ¾Ń€ŠøстŠ°Š½Š½Ń ŠŗрŠ°ŠæŠŗŠø Š² іŠ¼ŠµŠ½Š°Ń… ŠŗŠ¾Ń€ŠøстуŠ²Š°Ń‡Ń–Š². ŠŠµ Š²ŠæŠ»ŠøŠ²Š°Ń” Š½Š° ісŠ½ŃƒŃŽŃ‡Ń– Š¾Š±Š»Ń–ŠŗŠ¾Š²Ń– Š·Š°ŠæŠøсŠø. +config.allow_dots_in_usernames = Š”Š¾Š·Š²Š¾Š»ŠøтŠø Š²ŠøŠŗŠ¾Ń€ŠøстŠ°Š½Š½Ń ŠŗрŠ°ŠæŠŗŠø Š² іŠ¼ŠµŠ½Š°Ń… ŠŗŠ¾Ń€ŠøстуŠ²Š°Ń‡Ń–Š². ŠŠµ Š²ŠæŠ»ŠøŠ²Š°Ń” Š½Š° Š¾Š±Š»Ń–ŠŗŠ¾Š²Ń– Š·Š°ŠæŠøсŠø, щŠ¾ Š²Š¶Šµ ісŠ½ŃƒŃŽŃ‚ŃŒ. config.mailer_enable_helo = Š£Š²Ń–Š¼ŠŗŠ½ŃƒŃ‚Šø HELO users.organization_creation.description = Š”Š¾Š·Š²Š¾Š»ŠøтŠø стŠ²Š¾Ń€ŠµŠ½Š½Ń Š½Š¾Š²Šøх Š¾Ń€Š³Š°Š½Ń–Š·Š°Ń†Ń–Š¹. users.cannot_delete_self = Š’Šø Š½Šµ Š¼Š¾Š¶ŠµŃ‚Šµ Š²ŠøŠ“Š°Š»ŠøтŠø сŠµŠ±Šµ @@ -3306,6 +3412,17 @@ defaulthooks.desc = Š’ŠµŠ±Ń…ŃƒŠŗŠø Š°Š²Ń‚Š¾Š¼Š°Ń‚ŠøчŠ½Š¾ сŠæŠ¾Š²Ń–щŠ°ŃŽŃ‚ŃŒ H assets = Š ŠµŃŃƒŃ€ŃŠø ŠŗŠ¾Š“у auths.invalid_openIdConnectAutoDiscoveryURL = ŠŠµŠæрŠ°Š²ŠøŠ»ŃŒŠ½Š° URL-Š°Š“рŠµŃŠ° Š°Š²Ń‚Š¾Š¼Š°Ń‚ŠøчŠ½Š¾Š³Š¾ Š²ŠøяŠ²Š»ŠµŠ½Š½Ń (ŠæŠ¾Š²ŠøŠ½Š½Š° Š±ŃƒŃ‚Šø Š“іŠ¹ŃŠ½Š° URL-Š°Š“рŠµŃŠ°, щŠ¾ ŠæŠ¾Ń‡ŠøŠ½Š°Ń”Ń‚ŃŒŃŃ Š· http:// Š°Š±Š¾ https://) settings = ŠŠ°Š»Š°ŃˆŃ‚ŃƒŠ²Š°Š½Š½Ń Š°Š“Š¼Ń–Š½Ń–стрŠ°Ń‚Š¾Ń€Š° +dashboard.start_schedule_tasks = Š—Š°ŠæустŠøтŠø Š·Š°ŠæŠ»Š°Š½Š¾Š²Š°Š½Ń– Š·Š°Š²Š“Š°Š½Š½Ń Š“іŠ¹ +config.logger_name_fmt = Š–ŃƒŃ€Š½Š°Š»: %s +config.set_setting_failed = ŠŠµ Š²Š“Š°Š»Š¾ŃŃ Š²ŃŃ‚Š°Š½Š¾Š²ŠøтŠø ŠæŠ°Ń€Š°Š¼ŠµŃ‚Ń€ %s +config.access_log_template = ŠØŠ°Š±Š»Š¾Š½ Š¶ŃƒŃ€Š½Š°Š»Ńƒ Š“Š¾ŃŃ‚ŃƒŠæу +dashboard.cancel_abandoned_jobs = Š”ŠŗŠ°ŃŃƒŠ²Š°Ń‚Šø ŠæŠ¾ŠŗŠøŠ½ŃƒŃ‚Ń– Š·Š°Š²Š“Š°Š½Š½Ń Š“іŠ¹ +monitor.download_diagnosis_report = Š—Š°Š²Š°Š½Ń‚Š°Š¶ŠøтŠø Š“іŠ°Š³Š½Š¾ŃŃ‚ŠøчŠ½ŠøŠ¹ Š·Š²Ń–Ń‚ +auths.oauth2_map_group_to_team_removal = Š’ŠøŠ“Š°Š»ŃŃ‚Šø ŠŗŠ¾Ń€ŠøстуŠ²Š°Ń‡Ń–Š² іŠ· сŠøŠ½Ń…Ń€Š¾Š½Ń–Š·Š¾Š²Š°Š½Šøх ŠŗŠ¾Š¼Š°Š½Š“, яŠŗщŠ¾ ŠŗŠ¾Ń€ŠøстуŠ²Š°Ń‡Ń– Š½Šµ Š½Š°Š»ŠµŠ¶Š°Ń‚ŃŒ Š“Š¾ Š²Ń–Š“ŠæŠ¾Š²Ń–Š“Š½Š¾Ń— Š³Ń€ŃƒŠæŠø. +config.mailer_smtp_addr = ŠŠ“рŠµŃŠ° SMTP +dashboard.update_checker = ŠŸŠµŃ€ŠµŠ²Ń–Ń€ŠŗŠ° Š¾Š½Š¾Š²Š»ŠµŠ½ŃŒ +auths.map_group_to_team_removal = Š’ŠøŠ“Š°Š»ŃŃ‚Šø ŠŗŠ¾Ń€ŠøстуŠ²Š°Ń‡Ń–Š² іŠ· сŠøŠ½Ń…Ń€Š¾Š½Ń–Š·Š¾Š²Š°Š½Šøх ŠŗŠ¾Š¼Š°Š½Š“, яŠŗщŠ¾ ŠŗŠ¾Ń€ŠøстуŠ²Š°Ń‡Ń– Š½Šµ Š½Š°Š»ŠµŠ¶Š°Ń‚ŃŒ Š“Š¾ Š²Ń–Š“ŠæŠ¾Š²Ń–Š“Š½Š¾Ń— Š³Ń€ŃƒŠæŠø LDAP +auths.enable_ldap_groups = Š£Š²Ń–Š¼ŠŗŠ½ŃƒŃ‚Šø Š³Ń€ŃƒŠæŠø LDAP [action] @@ -3324,7 +3441,7 @@ merge_pull_request=`ŠæрŠøŠ¹Š½ŃŠ² Š·Š°ŠæŠøт Š·Š»Šøття %[3]s transfer_repo=ŠæŠµŃ€ŠµŠ½ŠµŃŠµŠ½Š¾ рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Š¹ %s у %s push_tag=Š½Š°Š“сŠøŠ»Š°Ń” тŠµŠ³ %[3]s Š² %[4]s delete_tag=Š²ŠøŠ“Š°Š»ŃŃ” тŠµŠ³ %[2]s іŠ· %[3]s -delete_branch=Š²ŠøŠ“Š°Š»ŠµŠ½Š¾ Š³Ń–Š»Šŗу %[2]s Š· %[3]s +delete_branch=Š²ŠøŠ“Š°Š»ŠµŠ½Š¾ Š³Ń–Š»Šŗу %[2]s Š· %[3]s compare_branch=ŠŸŠ¾Ń€Ń–Š²Š½ŃŃ‚Šø compare_commits=ŠŸŠ¾Ń€Ń–Š²Š½ŃŃ‚Šø %d ŠŗŠ¾Š¼Ń–Ń‚Ń–Š² compare_commits_general=ŠŸŠ¾Ń€Ń–Š²Š½ŃŃ‚Šø ŠŗŠ¾Š¼Ń–Ń‚Šø @@ -3410,7 +3527,7 @@ settings.delete.notice = Š’Šø Š·Š±ŠøрŠ°Ń”Ń‚ŠµŃŃ Š²ŠøŠ“Š°Š»ŠøтŠø %s (%s). Š¦ details.author = ŠŠ²Ń‚Š¾Ń€ title = ŠŸŠ°ŠŗуŠ½ŠŗŠø arch.version.backup = Š ŠµŠ·ŠµŃ€Š²Š½Šµ ŠŗŠ¾ŠæіюŠ²Š°Š½Š½Ń -arch.version.conflicts = Š”уŠæŠµŃ€ŠµŃ‡ŠŗŠø +arch.version.conflicts = ŠšŠ¾Š½Ń„Š»Ń–ŠŗтŠø arch.version.replaces = Š—Š°Š¼Ń–Š½Šø arch.version.provides = ŠŠ°Š“Š°Ń” arch.version.groups = Š“Ń€ŃƒŠæŠ° @@ -3526,6 +3643,14 @@ cran.registry = ŠŠ°Š»Š°ŃˆŃ‚ŃƒŠ¹Ń‚Šµ цŠµŠ¹ рŠµŃ”стр у фŠ°Š¹Š»Ń– Rpr npm.registry = ŠŠ°Š»Š°ŃˆŃ‚ŃƒŠ¹Ń‚Šµ цŠµŠ¹ рŠµŃ”стр у фŠ°Š¹Š»Ń– .npmrc сŠ²Š¾Š³Š¾ ŠæрŠ¾Ń”Šŗту: chef.registry = ŠŠ°Š»Š°ŃˆŃ‚ŃƒŠ¹Ń‚Šµ цŠµŠ¹ рŠµŃ”стр у фŠ°Š¹Š»Ń– ~/.chef/config.rb: owner.settings.chef.keypair.description = Š—Š°ŠæŠøтŠø Š“Š¾ рŠµŃ”ŃŃ‚Ń€Ńƒ Chef ŠæŠ¾Š²ŠøŠ½Š½Ń– Š±ŃƒŃ‚Šø ŠŗрŠøŠæтŠ¾Š³Ń€Š°Ń„ічŠ½Š¾ ŠæіŠ“ŠæŠøсŠ°Š½Ń– яŠŗ Š·Š°ŃŃ–Š± Š°Š²Ń‚ŠµŠ½Ń‚ŠøфіŠŗŠ°Ń†Ń–Ń—. ŠŸŃ€Šø Š³ŠµŠ½ŠµŃ€Š°Ń†Ń–Ń— ŠæŠ°Ń€Šø ŠŗŠ»ŃŽŃ‡Ń–Š² Š½Š° Forgejo Š·Š±ŠµŃ€Ń–Š³Š°Ń”Ń‚ŃŒŃŃ тіŠ»ŃŒŠŗŠø ŠæуŠ±Š»Ń–чŠ½ŠøŠ¹ ŠŗŠ»ŃŽŃ‡. ŠŸŃ€ŠøŠ²Š°Ń‚Š½ŠøŠ¹ ŠŗŠ»ŃŽŃ‡ Š½Š°Š“Š°Ń”Ń‚ŃŒŃŃ Š²Š°Š¼ Š“Š»Ń Š²ŠøŠŗŠ¾Ń€ŠøстŠ°Š½Š½Ń ŠŗŠ¾Š¼Š°Š½Š“ knife. Š“ŠµŠ½ŠµŃ€Š°Ń†Ń–я Š½Š¾Š²Š¾Ń— ŠæŠ°Ń€Šø ŠŗŠ»ŃŽŃ‡Ń–Š² Š·Š°Š¼Ń–Š½Šøть ŠæŠ¾ŠæŠµŃ€ŠµŠ“Š½ŃŽ. +nuget.dependency.framework = Š¦Ń–Š»ŃŒŠ¾Š²ŠøŠ¹ фрŠµŠ¹Š¼Š²Š¾Ń€Šŗ +owner.settings.cleanuprules.preview.overview = Š—Š°ŠæŠ»Š°Š½Š¾Š²Š°Š½Š¾ Š²ŠøŠ“Š°Š»ŠøтŠø %d ŠæŠ°ŠŗуŠ½ŠŗіŠ². +owner.settings.cleanuprules.pattern_full_match = Š—Š°ŃŃ‚Š¾ŃŃƒŠ²Š°Ń‚Šø шŠ°Š±Š»Š¾Š½ Š“Š¾ ŠæŠ¾Š²Š½Š¾Ń— Š½Š°Š·Š²Šø ŠæŠ°ŠŗуŠ½ŠŗŠ° +maven.download = Š©Š¾Š± Š·Š°Š²Š°Š½Ń‚Š°Š¶ŠøтŠø Š·Š°Š»ŠµŠ¶Š½Ń–ŃŃ‚ŃŒ, Š·Š°Šæустіть іŠ· ŠŗŠ¾Š¼Š°Š½Š“Š½Š¾Š³Š¾ ряŠ“ŠŗŠ°: +maven.install2 = Š—Š°ŠæустŠøтŠø Š· ŠŗŠ¾Š¼Š°Š½Š“Š½Š¾Š³Š¾ ряŠ“ŠŗŠ°: +npm.dependencies.bundle = ŠŸŠ°ŠŗŠµŃ‚Š½Ń– Š·Š°Š»ŠµŠ¶Š½Š¾ŃŃ‚Ń– +npm.dependencies.peer = ŠžŠ“Š½Š¾Ń€Š°Š½Š³Š¾Š²Ń– Š·Š°Š»ŠµŠ¶Š½Š¾ŃŃ‚Ń– +arch.pacman.repo.multi = %s Š¼Š°Ń” Š¾Š“Š½Ńƒ Š¹ ту сŠ°Š¼Ńƒ Š²ŠµŃ€ŃŃ–ŃŽ Š² ріŠ·Š½Šøх Š“ŠøстрŠøŠ±ŃƒŃ‚ŠøŠ²Š°Ń…. [secrets] deletion = Š’ŠøŠ“Š°Š»ŠøтŠø сŠµŠŗрŠµŃ‚ @@ -3629,6 +3754,10 @@ runners.update_runner_success = Š Š°Š½ŠµŃ€ Š¾Š½Š¾Š²Š»ŠµŠ½Š¾ runners.delete_runner_header = ŠŸŃ–Š“тŠ²ŠµŃ€Š“іть Š²ŠøŠ“Š°Š»ŠµŠ½Š½Ń рŠ°Š½ŠµŃ€Š° runners.status.offline = ŠŠµŠ°ŠŗтŠøŠ²Š½ŠøŠ¹ runners.status.idle = ŠŸŃ€Š¾ŃŃ‚Š¾ŃŽŃ” +runs.invalid_workflow_helper = ŠŠµŠ“іŠ¹ŃŠ½ŠøŠ¹ фŠ°Š¹Š» ŠŗŠ¾Š½Ń„Ń–Š³ŃƒŃ€Š°Ń†Ń–Ń— рŠ¾Š±Š¾Ń‡Š¾Š³Š¾ ŠæŠ¾Ń‚Š¾Šŗу. Š‘ŃƒŠ“ь Š»Š°ŃŠŗŠ°, ŠæŠµŃ€ŠµŠ²Ń–ртŠµ фŠ°Š¹Š» ŠŗŠ¾Š½Ń„Ń–Š³ŃƒŃ€Š°Ń†Ń–Ń—: %s +runs.no_job = Š Š¾Š±Š¾Ń‡ŠøŠ¹ ŠæŠ¾Ń‚Ń–Šŗ ŠæŠ¾Š²ŠøŠ½ŠµŠ½ Š¼Ń–стŠøтŠø ŠæрŠøŠ½Š°Š¹Š¼Š½Ń– Š¾Š“Š½Šµ Š·Š°Š²Š“Š°Š½Š½Ń +workflow.dispatch.use_from = Š’ŠøŠŗŠ¾Ń€ŠøстŠ°Ń‚Šø рŠ¾Š±Š¾Ń‡ŠøŠ¹ ŠæŠ¾Ń‚Ń–Šŗ іŠ· +runs.no_job_without_needs = Š Š¾Š±Š¾Ń‡ŠøŠ¹ ŠæŠ¾Ń‚Ń–Šŗ ŠæŠ¾Š²ŠøŠ½ŠµŠ½ Š¼Ń–стŠøтŠø ŠæрŠøŠ½Š°Š¹Š¼Š½Ń– Š¾Š“Š½Šµ Š·Š°Š²Š“Š°Š½Š½Ń Š±ŠµŠ· Š·Š°Š»ŠµŠ¶Š½Š¾ŃŃ‚ŠµŠ¹. @@ -3641,7 +3770,7 @@ deleted.display_name = Š’ŠøŠ“Š°Š»ŠµŠ½ŠøŠ¹ ŠæрŠ¾Ń”Šŗт [git.filemode] symbolic_link=Š”ŠøŠ¼Š²Š¾Š»Ń–чŠ½Šµ ŠæŠ¾ŃŠøŠ»Š°Š½Š½Ń -directory = Š¢ŠµŠŗŠ° +directory = ŠšŠ°Ń‚Š°Š»Š¾Š³ submodule = ŠŸŃ–Š“Š¼Š¾Š“уŠ»ŃŒ normal_file = Š—Š²ŠøчŠ°Š¹Š½ŠøŠ¹ фŠ°Š¹Š» executable_file = Š’ŠøŠŗŠ¾Š½ŃƒŠ²Š°Š½ŠøŠ¹ фŠ°Š¹Š» diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index c6c534df9f..59901392c2 100644 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -70,7 +70,7 @@ your_starred=ē‚¹čµž your_settings=č®¾ē½® all=ꉀ꜉ -sources=ę„ęŗ +sources=原创 mirrors=镜像 collaborative=协作 forks=ę“¾ē”Ÿ @@ -171,7 +171,7 @@ copy_path = 复制č·Æ径 [aria] navbar=åƼčˆŖꠏ footer=锵脚 -footer.software=关äŗŽč½Æ件 +footer.software=关äŗŽę­¤č½Æ件 footer.links=é“¾ęŽ„ [heatmap] @@ -1062,7 +1062,7 @@ language.description = ę­¤čÆ­č؀将äæå­˜åˆ°ę‚Øēš„č“¦å·äø­ļ¼Œå¹¶åœØę‚Øē™»å½•åŽ language.localization_project = åø®åŠ©ęˆ‘们将 Forgejo ēæ»čÆ‘ęˆę‚Øēš„čÆ­č؀ļ¼äŗ†č§£ę›“å¤šć€‚ user_block_yourself = ę‚Øäøčƒ½å±č”½č‡Ŗå·±ć€‚ pronouns_custom_label = č‡Ŗ定义代čƍ -change_username_redirect_prompt.with_cooldown.one = ꗧē”Øęˆ·åå°†åœØ %[1]d 天ēš„äæęŠ¤ęœŸåŽåÆ¹ę‰€ęœ‰äŗŗåÆē”Øļ¼Œę‚Ø仍åÆ仄åœØę­¤ęœŸé—“é‡ę–°č®¤é¢†ę—§ē”Øęˆ·åć€‚ +change_username_redirect_prompt.with_cooldown.one = ꗧē”Øęˆ·åå°†åœØ %[1]d 天ēš„äæęŠ¤ęœŸåŽåÆ¹ę‰€ęœ‰äŗŗåÆē”Ø怂ę‚Ø仍åÆ仄åœØę­¤ęœŸé—“é‡ę–°č®¤é¢†ę—§ē”Øęˆ·åć€‚ change_username_redirect_prompt.with_cooldown.few = ꗧē”Øęˆ·åå°†åœØ %[1]d 天ēš„äæęŠ¤ęœŸåŽåÆ¹ę‰€ęœ‰äŗŗåÆē”Øļ¼Œę‚Ø仍åÆ仄åœØę­¤ęœŸé—“é‡ę–°č®¤é¢†ę—§ē”Øęˆ·åć€‚ keep_pronouns_private = ä»…å‘å·²č®¤čƁē”Øęˆ·ę˜¾ē¤ŗ代čƍ keep_pronouns_private.description = čæ™å°†åƹęœŖē™»å½•ēš„č®æé—®č€…éšč—ę‚Øēš„代čÆć€‚ @@ -3636,7 +3636,7 @@ auto_merge_pull_request=`č‡ŖåŠØ合并äŗ†ę‹‰å–čÆ·ę±‚ %[3]s#%[2]s transfer_repo=将仓åŗ“ %s č½¬ē§»č‡³ %s push_tag=ęŽØ送äŗ†ę ‡ē­¾ %[3]s č‡³ä»“åŗ“ %[4]s delete_tag=从%[3]s 删除äŗ†ę ‡ē­¾ %[2]s -delete_branch=从 %[3]s 删除分ę”Æ %[2]s +delete_branch=删除äŗ† %[3]s ēš„ %[2]s 分ę”Æ compare_branch=ęÆ”č¾ƒ compare_commits=ęÆ”č¾ƒ %d ꏐäŗ¤ compare_commits_general=ęÆ”č¾ƒęäŗ¤ diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini index fba51a391e..5f52a02018 100644 --- a/options/locale/locale_zh-TW.ini +++ b/options/locale/locale_zh-TW.ini @@ -1062,7 +1062,7 @@ language.localization_project = å¹«åŠ©ęˆ‘å€‘ēæ»č­Æ Forgejo č‡³ę‚Øēš„čŖžč؀ļ¼å…¬é–‹ę“»å‹•åŖęœ‰ä½ å’Œē«™é»žē®”ē†å“”åÆ見怂 quota.rule.exceeded = å·²č¶…å‡ŗ @@ -3633,7 +3633,7 @@ auto_merge_pull_request=`č‡Ŗ動合併äŗ†åˆä½µč«‹ę±‚ %[3]s#%[2]s transfer_repo=將儲存åŗ« %s č½‰ē§»č‡³ %s push_tag=ęŽØ送äŗ†ęؙē±¤ %[3]s 到 %[4]s delete_tag=åˆŖ除äŗ† %[3]s ēš„ęؙē±¤ %[2]s -delete_branch=åˆŖ除äŗ† %[3]s ēš„ %[2]s 分ę”Æ +delete_branch=åˆŖ除äŗ† %[3]s ēš„ %[2]s 分ę”Æ compare_branch=ęÆ”č¼ƒ compare_commits=ęÆ”č¼ƒ %d å€‹ęäŗ¤ compare_commits_general=ęÆ”č¼ƒęäŗ¤ diff --git a/options/locale_next/locale_ar.json b/options/locale_next/locale_ar.json index 3d87c7ee95..cef0f06e23 100644 --- a/options/locale_next/locale_ar.json +++ b/options/locale_next/locale_ar.json @@ -3,5 +3,7 @@ "home.welcome.no_activity": "Ł„Ų§ ŁŠŁˆŲ¬ŲÆ Ł†Ų“Ų§Ų·", "home.explore_repos": "Ų§ŁƒŲŖŲ“Ł Ų§Ł„Ł…Ų³ŲŖŁˆŲÆŲ¹Ų§ŲŖ", "home.explore_users": "Ų§ŁƒŲŖŲ“Ł Ų§Ł„Ł…Ų³ŲŖŲ®ŲÆŁ…ŁŠŁ†", - "home.explore_orgs": "Ų§ŁƒŲŖŲ“Ł Ų§Ł„Ł…Ł†ŲøŁ…Ų§ŲŖ" + "home.explore_orgs": "Ų§ŁƒŲŖŲ“Ł Ų§Ł„Ł…Ł†ŲøŁ…Ų§ŲŖ", + "moderation.abuse_category.illegal_content": "Ų§Ł„Ł…Ų­ŲŖŁˆŁ‰ ŲŗŁŠŲ± Ų§Ł„Ł…Ų“Ų±ŁˆŲ¹", + "moderation.abuse_category.malware": "ŲØŲ±Ł…Ų¬ŁŠŲ© Ų®ŲØŁŠŲ«Ų©" } diff --git a/options/locale_next/locale_be.json b/options/locale_next/locale_be.json index 0967ef424b..40dfec0b41 100644 --- a/options/locale_next/locale_be.json +++ b/options/locale_next/locale_be.json @@ -1 +1,3 @@ -{} +{ + "moderation.abuse_category.malware": "ŠØŠŗŠ¾Š“Š½Š°Ń ŠæрŠ°Š³Ń€Š°Š¼Š°" +} diff --git a/options/locale_next/locale_bg.json b/options/locale_next/locale_bg.json index 1faf269aba..be8477a98a 100644 --- a/options/locale_next/locale_bg.json +++ b/options/locale_next/locale_bg.json @@ -7,7 +7,6 @@ "one": "ŠøсŠŗŠ° Š“Š° сŠ»ŠµŠµ %[1]d ŠæŠ¾Š“Š°Š²Š°Š½Šµ Š¾Ń‚ %[2]s Š² %[3]s", "other": "ŠøсŠŗŠ° Š“Š° сŠ»ŠµŠµ %[1]d ŠæŠ¾Š“Š°Š²Š°Š½Šøя Š¾Ń‚ %[2]s Š² %[3]s" }, - "mail.actions.run_info_ref": "ŠšŠ»Š¾Š½: %[1]s (%[2]s)", "mail.actions.run_info_trigger": "Š—Š°Š“ŠµŠ¹ŃŃ‚Š²Š°Š½Š¾ ŠæŠ¾Ń€Š°Š“Šø: %[1]s Š¾Ń‚: %[2]s", "meta.last_line": "Š’ Š‘ŃŠŠ»Š³Š°Ń€Šøя рŠ°ŃŃ‚Šµ Š½Š°Š¹-стŠ°Ń€Š¾Ń‚Š¾ Š“ърŠ²Š¾ Š² стрŠ°Š½Š°Ń‚Š°, Š‘Š°Š¹ŠŗушŠµŠ²Š°Ń‚Š° Š¼ŃƒŃ€Š°, Š½Š° Š²ŃŠŠ·Ń€Š°ŃŃ‚ Š½Š°Š“ 1300 Š³Š¾Š“ŠøŠ½Šø.", "relativetime.1day": "Š²Ń‡ŠµŃ€Š°", diff --git a/options/locale_next/locale_bn.json b/options/locale_next/locale_bn.json index 0967ef424b..56a6e6dae4 100644 --- a/options/locale_next/locale_bn.json +++ b/options/locale_next/locale_bn.json @@ -1 +1,3 @@ -{} +{ + "moderation.abuse_category.malware": "ą¦®ą§ą¦Æą¦¾ą¦²ą¦“ą¦Æą¦¼ą§ą¦Æą¦¾ą¦°" +} diff --git a/options/locale_next/locale_ca.json b/options/locale_next/locale_ca.json index 8eefc65a1a..606ab99173 100644 --- a/options/locale_next/locale_ca.json +++ b/options/locale_next/locale_ca.json @@ -1,3 +1,4 @@ { - "search.milestone_kind": "Cerca fites..." + "search.milestone_kind": "Cerca fites...", + "moderation.abuse_category.malware": "Programari maliciĆ³s" } diff --git a/options/locale_next/locale_cs-CZ.json b/options/locale_next/locale_cs-CZ.json index 97a8536d4f..3ce42e6bb0 100644 --- a/options/locale_next/locale_cs-CZ.json +++ b/options/locale_next/locale_cs-CZ.json @@ -28,7 +28,6 @@ "mail.actions.not_successful_run": "Workflow %[1]s selhal v repozitĆ”Å™i %[2]s", "mail.actions.run_info_cur_status": "Stav tohoto procesu: %[1]s (prĆ”vě aktualizovĆ”no z %[2]s)", "mail.actions.run_info_previous_status": "Stav předchozĆ­ho procesu: %[1]s", - "mail.actions.run_info_ref": "Větev: %[1]s (%[2]s)", "mail.actions.run_info_trigger": "SpuÅ”těno z dÅÆvodu: %[1]s od: %[2]s", "mail.actions.successful_run_after_failure_subject": "Workflow %[1]s obnoven v repozitĆ”Å™i %[2]s", "mail.actions.successful_run_after_failure": "Workflow %[1]s obnoven v repozitĆ”Å™i %[2]s", @@ -105,5 +104,12 @@ "settings.visibility.description": "Viditelnost profilu ovlivňuje možnost ostatnĆ­ch přistupovat k vaÅ”im veřejnĆ½m repozitĆ”Å™ÅÆm. Zjistit vĆ­ce", "avatar.constraints_hint": "Velikost vlastnĆ­ho avataru nesmĆ­ překročit %[1]s nebo bĆ½t větÅ”Ć­ než %[2]dx%[3]d pixelÅÆ", "repo.diff.commit.next-short": "DalÅ”Ć­", - "repo.diff.commit.previous-short": "PředchozĆ­" + "repo.diff.commit.previous-short": "PředchozĆ­", + "profile.actions.tooltip": "DalÅ”Ć­ akce", + "keys.gpg.link": "Klƭče GPG", + "profile.edit.link": "Upravit profil", + "feed.atom.link": "Zdroj Atom", + "keys.ssh.link": "Klƭče SSH", + "og.repo.summary_card.alt_description": "Karta se souhrnem repozitĆ”Å™e %[1]s, popsanĆ½m jako: %[2]s", + "mail.actions.run_info_sha": "Revize: %[1]s" } diff --git a/options/locale_next/locale_da.json b/options/locale_next/locale_da.json index 8315e06bcc..2620127b8c 100644 --- a/options/locale_next/locale_da.json +++ b/options/locale_next/locale_da.json @@ -28,7 +28,6 @@ "mail.actions.not_successful_run": "Arbejdsgangen %[1]s mislykkedes i depotet %[2]s", "mail.actions.run_info_cur_status": "Status for denne kĆørsel: %[1]s (lige opdateret fra %[2]s)", "mail.actions.run_info_previous_status": "Status for forrige kĆørsel: %[1]s", - "mail.actions.run_info_ref": "Gren: %[1]s (%[2]s)", "mail.actions.run_info_trigger": "UdlĆøst fordi: %[1]s af: %[2]s", "discussion.locked": "Denne diskussion er blevet lĆ„st. Kommentarer er begrƦnset til bidragydere.", "relativetime.now": "nu", @@ -97,5 +96,10 @@ "settings.visibility.description": "Profilsynlighed pĆ„virker andres adgang til dine ikke-private depoter. LƦs mere", "avatar.constraints_hint": "Brugerdefineret avatar mĆ„ ikke overstige %[1]s i stĆørrelse eller vƦre stĆørre end %[2]dx%[3]d pixels", "repo.diff.commit.next-short": "NƦste", - "repo.diff.commit.previous-short": "Forrige" + "repo.diff.commit.previous-short": "Forrige", + "profile.actions.tooltip": "Flere handlinger", + "profile.edit.link": "Redigere profil", + "feed.atom.link": "Atom feed", + "keys.ssh.link": "SSH NĆøgler", + "keys.gpg.link": "GPG NĆøgler" } diff --git a/options/locale_next/locale_de-DE.json b/options/locale_next/locale_de-DE.json index 3847de2b43..5d670aeedf 100644 --- a/options/locale_next/locale_de-DE.json +++ b/options/locale_next/locale_de-DE.json @@ -27,7 +27,6 @@ "mail.actions.successful_run_after_failure": "Arbeitsablauf %[1]s in Repository %[2]s wiederhergestellt", "mail.actions.not_successful_run": "Arbeitsablauf %[1]s in Repository %[2]s fehlgeschlagen", "mail.actions.run_info_previous_status": "Vorheriger Status des Runs: %[1]s", - "mail.actions.run_info_ref": "Branch: %[1]s (%[2]s)", "mail.actions.run_info_trigger": "Ausgelƶst, weil: %[1]s durch: %[2]s", "mail.actions.run_info_cur_status": "Status dieses Runs: %[1]s (gerade eben von %[2]s aktualisiert)", "discussion.locked": "Diese Diskussion wurde gesperrt. Nur Mitwirkende kƶnnen kommentieren.", @@ -102,5 +101,7 @@ "feed.atom.link": "Atom-Feed", "keys.ssh.link": "SSH-SchlĆ¼ssel", "keys.gpg.link": "GPG-SchlĆ¼ssel", - "profile.actions.tooltip": "Mehr Aktionen" + "profile.actions.tooltip": "Mehr Aktionen", + "og.repo.summary_card.alt_description": "Zusammenfassungskarte des Repositorys %[1]s, beschrieben als %[2]s", + "mail.actions.run_info_sha": "Commit: %[1]s" } diff --git a/options/locale_next/locale_el-GR.json b/options/locale_next/locale_el-GR.json index d3ba25b170..cca89efd0e 100644 --- a/options/locale_next/locale_el-GR.json +++ b/options/locale_next/locale_el-GR.json @@ -12,7 +12,6 @@ "mail.actions.successful_run_after_failure_subject": "Ī— ĻĪæĪ® ĪµĻĪ³Ī±ĻƒĪÆĪ±Ļ‚ %[1]s Ī±Ļ€ĪæĪŗĪ±Ļ„Ī±ĻƒĻ„Ī¬ĪøĪ·ĪŗĪµ ĻƒĻ„Īæ Ī±Ļ€ĪæĪøĪµĻ„Ī®ĻĪ¹Īæ %[2]s", "mail.actions.not_successful_run_subject": "Ī— ĻĪæĪ® ĪµĻĪ³Ī±ĻƒĪÆĪ±Ļ‚ %[1]s Ī±Ļ€Ī­Ļ„Ļ…Ļ‡Īµ ĻƒĻ„Īæ Ī±Ļ€ĪæĪøĪµĻ„Ī®ĻĪ¹Īæ %[2]s", "mail.actions.run_info_trigger": "Ī•Ī½ĪµĻĪ³ĪæĻ€ĪæĪ¹Ī®ĪøĪ·ĪŗĪµ ĪµĻ€ĪµĪ¹Ī“Ī®: %[1]s Ī±Ļ€ĻŒ: %[2]s", - "mail.actions.run_info_ref": "Ī‘Ļ€ĪæĪøĪµĻ„Ī®ĻĪ¹Īæ: %[1]s (%[2]s)", "meta.last_line": "Ī•Ļ…Ļ‡Ī±ĻĪ¹ĻƒĻ„ĪæĻĪ¼Īµ Ļ€ĪæĻ… Ī¼ĪµĻ„Ī±Ļ†ĻĪ¬Ī¶ĪµĻ„Īµ Ļ„Īæ Forgejo! Ī‘Ļ…Ļ„Ī® Ī· Ī³ĻĪ±Ī¼Ī¼Ī® Ī“ĪµĪ½ ĪµĪÆĪ½Ī±Ī¹ ĪæĻĪ±Ļ„Ī® Ī±Ļ€ĻŒ Ļ„ĪæĻ…Ļ‚ Ļ‡ĻĪ®ĻƒĻ„ĪµĻ‚ Ī±Ī»Ī»Ī¬ ĪµĪ¾Ļ…Ļ€Ī·ĻĪµĻ„ĪµĪÆ Ī¬Ī»Ī»ĪæĻ…Ļ‚ ĻƒĪŗĪæĻ€ĪæĻĻ‚ ĻƒĻ„Ī· Ī“Ī¹Ī±Ļ‡ĪµĪÆĻĪ¹ĻƒĪ· Ļ„Ī·Ļ‚ Ī¼ĪµĻ„Ī¬Ļ†ĻĪ±ĻƒĪ·Ļ‚. ĪœĻ€ĪæĻĪµĪÆĻ„Īµ Ī½Ī± Ī³ĻĪ¬ĻˆĪµĻ„Īµ ĪŗĪ¬Ļ€ĪæĪ¹Īæ Ī±ĻƒĻ„ĪµĪÆĪæ Ī±Ī½Ļ„ĪÆ Ī³Ī¹Ī± Ī¼ĪµĻ„Ī¬Ļ†ĻĪ±ĻƒĪ·.", "mail.actions.successful_run_after_failure": "Ī— ĻĪæĪ® ĪµĻĪ³Ī±ĻƒĪÆĪ±Ļ‚ %[1]s Ī±Ļ€ĪæĪŗĪ±Ļ„Ī±ĻƒĻ„Ī¬ĪøĪ·ĪŗĪµ ĻƒĻ„Īæ Ī±Ļ€ĪæĪøĪµĻ„Ī®ĻĪ¹Īæ %[2]s", "discussion.locked": "Ī‘Ļ…Ļ„Ī® Ī· ĻƒĻ…Ī¶Ī®Ļ„Ī·ĻƒĪ· Ī­Ļ‡ĪµĪ¹ ĪŗĪ»ĪµĪ¹Ī“Ļ‰ĪøĪµĪÆ. ĪŸ ĻƒĻ‡ĪæĪ»Ī¹Ī±ĻƒĪ¼ĻŒĻ‚ Ļ€ĪµĻĪ¹ĪæĻĪÆĪ¶ĪµĻ„Ī±Ī¹ ĻƒĻ„ĪæĻ…Ļ‚ ĻƒĻ…Ī½ĪµĪ¹ĻƒĻ†Ī­ĻĪæĪ½Ļ„ĪµĻ‚.", diff --git a/options/locale_next/locale_en-US.json b/options/locale_next/locale_en-US.json index a551db87dc..e08c8b2aee 100644 --- a/options/locale_next/locale_en-US.json +++ b/options/locale_next/locale_en-US.json @@ -92,7 +92,7 @@ "mail.actions.not_successful_run": "Workflow %[1]s failed in repository %[2]s", "mail.actions.run_info_cur_status": "This Run's Status: %[1]s (just updated from %[2]s)", "mail.actions.run_info_previous_status": "Previous Run's Status: %[1]s", - "mail.actions.run_info_ref": "Branch: %[1]s (%[2]s)", + "mail.actions.run_info_sha": "Commit: %[1]s", "mail.actions.run_info_trigger": "Triggered because: %[1]s by: %[2]s", "repo.diff.commit.next-short": "Next", "repo.diff.commit.previous-short": "Prev", diff --git a/options/locale_next/locale_es-ES.json b/options/locale_next/locale_es-ES.json index 37edef9211..82fbcfb4b6 100644 --- a/options/locale_next/locale_es-ES.json +++ b/options/locale_next/locale_es-ES.json @@ -30,5 +30,6 @@ "relativetime.future": "en el futuro", "home.explore_repos": "Explorar repositorios", "home.explore_users": "Explorar usuarios", - "home.explore_orgs": "Explorar organizaciones" + "home.explore_orgs": "Explorar organizaciones", + "moderation.abuse_category.malware": "Malware" } diff --git a/options/locale_next/locale_fi-FI.json b/options/locale_next/locale_fi-FI.json index cb26d76e66..fdc740b978 100644 --- a/options/locale_next/locale_fi-FI.json +++ b/options/locale_next/locale_fi-FI.json @@ -63,6 +63,6 @@ "mail.actions.successful_run_after_failure": "Tyƶnkulku %[1]s palautettu tietovarastoon %[2]s", "mail.actions.run_info_cur_status": "TƤmƤn juoksun tila: %[1]s (juuri pƤivitetty %[2]s:sta)", "mail.actions.run_info_previous_status": "Edellisen ajon tila: %[1]s", - "mail.actions.run_info_ref": "Haara: %[1]s (%[2]s)", - "mail.actions.run_info_trigger": "Laukaistui, koska: %[1]s, tekijƤnƤ: %[2]s" + "mail.actions.run_info_trigger": "Laukaistui, koska: %[1]s, tekijƤnƤ: %[2]s", + "moderation.abuse_category.malware": "Haittaohjelma" } diff --git a/options/locale_next/locale_fil.json b/options/locale_next/locale_fil.json index 884a7b44eb..2c62514648 100644 --- a/options/locale_next/locale_fil.json +++ b/options/locale_next/locale_fil.json @@ -25,7 +25,6 @@ "mail.actions.successful_run_after_failure": "Na-recover ang workflow na %[1]s sa repositoryong %[2]s", "mail.actions.not_successful_run": "Nabigo ang workflow na %[1]s sa repositoryong %[2]s", "mail.actions.run_info_previous_status": "Nakaraang Status ng Run: %[1]s", - "mail.actions.run_info_ref": "Branch: %[1]s (%[2]s)", "mail.actions.run_info_trigger": "Na-trigger dahil: %[1]s ni/ng: %[2]s", "mail.actions.successful_run_after_failure_subject": "Na-recover ang workflow na %[1]s sa repositoryong %[2]s", "mail.actions.not_successful_run_subject": "Nabigo ang workflow na %[1]s sa repositoryong %[2]s", @@ -102,5 +101,6 @@ "feed.atom.link": "Atom feed", "keys.ssh.link": "Mga SSH key", "keys.gpg.link": "Mga GPG key", - "profile.actions.tooltip": "Higit pang mga aksyon" + "profile.actions.tooltip": "Higit pang mga aksyon", + "og.repo.summary_card.alt_description": "Card ng pangkalahatang ideya ng repositoryong %[1]s, inilalarawan bilang: %[2]s" } diff --git a/options/locale_next/locale_fr-FR.json b/options/locale_next/locale_fr-FR.json index da26d56107..438e0433d0 100644 --- a/options/locale_next/locale_fr-FR.json +++ b/options/locale_next/locale_fr-FR.json @@ -10,7 +10,6 @@ "other": "" }, "search.milestone_kind": "Recherche dans les jalonsā€¦", - "mail.actions.run_info_ref": "Branche : %[1]s (%[2]s)", "discussion.locked": "Cette discussion a Ć©tĆ© bloquĆ©. Les commentaires sont limitĆ©s aux contributeurs.", "relativetime.now": "maintenant", "relativetime.future": "dans le future", diff --git a/options/locale_next/locale_hu-HU.json b/options/locale_next/locale_hu-HU.json index 9d52509102..1c02002e6e 100644 --- a/options/locale_next/locale_hu-HU.json +++ b/options/locale_next/locale_hu-HU.json @@ -1,5 +1,6 @@ { "repo.pulls.merged_title_desc": "egyesĆ­tve %[1]d vĆ”ltozĆ”s(ok) a %[2]s-bĆ³l %[3]s-ba %[4]s", "repo.pulls.title_desc": "egyesĆ­teni szeretnĆ© %[1]d vĆ”ltozĆ”s(oka)t a(z) %[2]s-bĆ³l %[3]s-ba", - "search.milestone_kind": "MĆ©rfƶldkƶvek keresĆ©se..." + "search.milestone_kind": "MĆ©rfƶldkƶvek keresĆ©se...", + "moderation.abuse_category.malware": "Malware" } diff --git a/options/locale_next/locale_id-ID.json b/options/locale_next/locale_id-ID.json index f2dac8114f..14bf491789 100644 --- a/options/locale_next/locale_id-ID.json +++ b/options/locale_next/locale_id-ID.json @@ -1,8 +1,5 @@ { - "repo.pulls.merged_title_desc": { - "other": "commit %[1]d telah digabungkan dari %[2]s menjadi %[3]s %[4]s" - }, - "repo.pulls.title_desc": { - "other": "ingin menggabungkan komit %[1]d dari %[2]s menuju %[3]s" - } + "repo.pulls.merged_title_desc": "commit %[1]d telah digabungkan dari %[2]s menjadi %[3]s %[4]s", + "repo.pulls.title_desc": "ingin menggabungkan komit %[1]d dari %[2]s menuju %[3]s", + "moderation.abuse_category.malware": "Perangkat pembahaya" } diff --git a/options/locale_next/locale_it-IT.json b/options/locale_next/locale_it-IT.json index 8464d6244e..f4cc7755f0 100644 --- a/options/locale_next/locale_it-IT.json +++ b/options/locale_next/locale_it-IT.json @@ -82,7 +82,6 @@ "moderation.report_abuse_form.invalid": "Argomenti non validi", "moderation.reporting_failed": "Impossibile inviare segnalazione: %v", "moderation.reported_thank_you": "Grazie per la segnalazione. L'amministratore ĆØ stato avvertito.", - "mail.actions.run_info_ref": "Ramo: %[1]s (%[2]s)", "alert.asset_load_failed": "Impossibile caricare i file di risorsa da {path}. Controlla che i file di risorsa siano accessibili.", "install.invalid_lfs_path": "Non ĆØ possibile creare una root LFS nel percorso specificato: %[1]s", "home.welcome.activity_hint": "Non c'ĆØ nulla nel tuo feed. Le tue azioni e le attivitĆ  dei repositori che segui verranno mostrate qui.", diff --git a/options/locale_next/locale_ja-JP.json b/options/locale_next/locale_ja-JP.json index 40edf8cb90..c4b3a0a2e0 100644 --- a/options/locale_next/locale_ja-JP.json +++ b/options/locale_next/locale_ja-JP.json @@ -1,5 +1,6 @@ { "repo.pulls.merged_title_desc": "恌 %[1]d å€‹ć®ć‚³ćƒŸćƒƒćƒˆć‚’ %[2]s 恋悉 %[3]s ćøćƒžćƒ¼ć‚ø %[4]s", "repo.pulls.title_desc": "恌 %[2]s 恋悉 %[3]s ćø恮 %[1]d ć‚³ćƒŸćƒƒćƒˆć®ćƒžćƒ¼ć‚ø悒åøŒęœ›ć—ć¦ć„ć¾ć™", - "search.milestone_kind": "ćƒžć‚¤ćƒ«ć‚¹ćƒˆćƒ¼ćƒ³ć‚’ę¤œē“¢..." + "search.milestone_kind": "ćƒžć‚¤ćƒ«ć‚¹ćƒˆćƒ¼ćƒ³ć‚’ę¤œē“¢...", + "moderation.abuse_category.malware": "ę‚Ŗę„ć®ć‚³ćƒ¼ćƒ‰" } diff --git a/options/locale_next/locale_ko-KR.json b/options/locale_next/locale_ko-KR.json index 98c949d517..2e51144cb7 100644 --- a/options/locale_next/locale_ko-KR.json +++ b/options/locale_next/locale_ko-KR.json @@ -1,5 +1,6 @@ { "repo.pulls.merged_title_desc": "ė‹˜ģ“ %[2]s ģ—ģ„œ %[3]s ė”œ %[1]d ģ»¤ė°‹ģ„ %[4]s ė³‘ķ•©ķ•Ø", "repo.pulls.title_desc": "%[2]s ģ—ģ„œ %[3]s ė”œ %[1]dź°œģ˜ ģ»¤ė°‹ė“¤ģ„ ė³‘ķ•©ķ•˜ė ¤ķ•Ø", - "home.welcome.no_activity": "ķ™œė™ ģ—†ģŒ" + "home.welcome.no_activity": "ķ™œė™ ģ—†ģŒ", + "moderation.abuse_category.malware": "ģ•…ģ„± ģ†Œķ”„ķŠøģ›Øģ–“" } diff --git a/options/locale_next/locale_lv-LV.json b/options/locale_next/locale_lv-LV.json index f71cfa227d..22b80f2fad 100644 --- a/options/locale_next/locale_lv-LV.json +++ b/options/locale_next/locale_lv-LV.json @@ -30,7 +30,6 @@ "mail.actions.not_successful_run": "DarbplÅ«smas %[1] atteice glabātavā %[2]s", "mail.actions.run_info_cur_status": "Å Ä« izpildÄ«juma stāvoklis: %[1]s (tikko atjaunināts no %[2]s)", "mail.actions.run_info_previous_status": "IepriekŔējā izpildÄ«juma stāvoklis: %[1]s", - "mail.actions.run_info_ref": "Zars: %[1]s (%[2]s)", "mail.actions.run_info_trigger": "IzraisÄ«Å”anas iemesls: %[2]s no: %[2]s", "discussion.locked": "Å Ä« apspriede tika slēgta. Piebilžu pievienoÅ”ana ir ļauta tikai lÄ«dzdalÄ«bniekiem.", "relativetime.future": "nākotnē", @@ -105,5 +104,12 @@ "settings.visibility.description": "Profila redzamÄ«ba ietekmē iespēju citiem piekļūt Tavām glabātavām, kas nav privātas. Uzzināt vairāk", "avatar.constraints_hint": "Pielāgots profila attēls nevar pārsniegt %[1]s vai bÅ«t lielāks par %[2]dx%[3]d pikseļiem", "repo.diff.commit.next-short": "Nāk.", - "repo.diff.commit.previous-short": "Iepr." + "repo.diff.commit.previous-short": "Iepr.", + "profile.actions.tooltip": "Vairāk darbÄ«bu", + "profile.edit.link": "Labot profilu", + "feed.atom.link": "Atom barotne", + "keys.ssh.link": "SSH atslēgas", + "keys.gpg.link": "GPG atslēgas", + "og.repo.summary_card.alt_description": "Glabātavas %[1]s kopsavilkuma kartÄ«te, aprakstÄ«ta kā: %[2]s", + "mail.actions.run_info_sha": "IesÅ«tÄ«jums: %[1]s" } diff --git a/options/locale_next/locale_nb_NO.json b/options/locale_next/locale_nb_NO.json index 0967ef424b..b6b10cebb5 100644 --- a/options/locale_next/locale_nb_NO.json +++ b/options/locale_next/locale_nb_NO.json @@ -1 +1,106 @@ -{} +{ + "relativetime.1day": "i gĆ„r", + "moderation.abuse_category.other_violations": "Andre regel overtredelser", + "moderation.report_remarks": "Kommentar", + "moderation.report_remarks.placeholder": "Skriv noen detaljer rundt missbruket du rapporterer.", + "moderation.submit_report": "Send rapport", + "moderation.reporting_failed": "Missbruk rapporten kunne ikke sendes inn: %v", + "relativetime.hours": { + "one": "%d time siden", + "other": "%d timer siden" + }, + "repo.form.cannot_create": "Det maksimale antallet repositories er nĆ„dd i alle omrĆ„dene du har tilgang til.", + "repo.issue_indexer.title": "Saksindekserer", + "moderation.abuse_category.illegal_content": "Ulovlig innhold", + "error.not_found.title": "Fant ikke siden", + "themes.names.forgejo-light": "Forgejo lyst", + "themes.names.forgejo-dark": "Forgejo mĆørk", + "stars.list.none": "Ingen har gitt stjerner til dette repoet.", + "watch.list.none": "Ingen fĆølger dette repoet.", + "followers.incoming.list.none": "Ingen fĆølger denne brukeren.", + "followers.outgoing.list.self.none": "Du fĆølger ikke noen.", + "followers.outgoing.list.none": "%s fĆølger ikke noen.", + "relativetime.2days": "to dager siden", + "relativetime.1week": "forrige uke", + "relativetime.2weeks": "to uker siden", + "relativetime.1month": "forrige mĆ„ned", + "relativetime.2months": "to mĆ„neder siden", + "relativetime.1year": "i fjor", + "relativetime.2years": "to Ć„r siden", + "alert.asset_load_failed": "Kunne ikke laste inn ressursfiler fra {path}. SĆørg for at ressursfilene er tilgjengelige.", + "search.milestone_kind": "SĆøker i milepƦlerā€¦", + "home.welcome.no_activity": "Ingen aktivitet", + "home.explore_repos": "Utforsk repositorier", + "home.explore_users": "Utforsk brukere", + "home.explore_orgs": "Utforsk organisasjoner", + "relativetime.mins": { + "one": "%d minutt siden", + "other": "%d minutter siden" + }, + "relativetime.months": { + "one": "%d mĆ„ned siden", + "other": "%d mĆ„neder siden" + }, + "relativetime.years": { + "one": "%d Ć„r siden", + "other": "%d Ć„r siden" + }, + "repo.pulls.title_desc": { + "one": "Ćønsker Ć„ slĆ„ sammen %[1]d commit fra %[2]s inn i %[3]s", + "other": "Ćønsker Ć„ slĆ„ sammen %[1]d commits fra %[2]s inn i %[3]s" + }, + "og.repo.summary_card.alt_description": "Sammendrag for repository %[1]s, beskrevet som: %[2]s", + "followers.incoming.list.self.none": "Ingen fĆølger profilen din.", + "install.invalid_lfs_path": "Kan ikke opprette LFS-root pĆ„: %[1]s", + "relativetime.now": "nĆ„", + "relativetime.future": "i fremtiden", + "repo.pulls.merged_title_desc": { + "one": "slo sammen %[1]d commit fra %[2]s inn i %[3]s %[4]s", + "other": "slo sammen %[1]d commits fra %[2]s inn i %[3]s %[4]s" + }, + "editor.textarea.tab_hint": "Linjen er allerede innrykket. Trykk Tab igjen eller trykk Escape for Ć„ gĆ„ ut av editoren.", + "editor.textarea.shift_tab_hint": "Ingen innrykk pĆ„ denne linjen. Trykk Shift + Tab igjen eller Escape for Ć„ gĆ„ ut av editoren.", + "alert.range_error": " mĆ„ vƦre et nummer mellom %[1]s og %[2]s.", + "themes.names.forgejo-auto": "Forgejo (fĆølg systemtema)", + "home.welcome.activity_hint": "Det er forelĆøpig ingenting i feeden din. Aktivitetene dine og handlingene dine fra repositorier du fĆølger, vil vises her etter hvert.", + "incorrect_root_url": "Denne Forgejo instansen er konfigurert til Ć„ bruke \"%s\". Du bruker Forgejo via en annen URL, noe som kan forĆ„rsake at deler av applikasjonen ikke fungerer. Den kanoniske URL-en styres av Forgejo-administratorer via innstillingen ROOT_URL i app.ini-filen.", + "mail.actions.run_info_trigger": "Startet pĆ„ grunn av: %[1]s by: %[2]s", + "admin.dashboard.cleanup_offline_runners": "Rydd opp offline runners", + "settings.visibility.description": "Profilens synlighet pĆ„virker andres mulighet til Ć„ fĆ„ tilgang til dine ikke-private repositorier. Les mer", + "profile.actions.tooltip": "Flere handlinger", + "profile.edit.link": "Rediger profil", + "relativetime.days": { + "one": "%d dag siden", + "other": "%d dager siden" + }, + "relativetime.weeks": { + "one": "%d uke siden", + "other": "%d uker siden" + }, + "feed.atom.link": "Atom feed", + "keys.ssh.link": "SSH nĆøkler", + "keys.gpg.link": "GPG nĆøkler", + "admin.config.moderation_config": "Moderasjonskonfigurasjon", + "moderation.report_abuse": "Rapporter missbruk", + "moderation.report_content": "Rapporter innhold", + "moderation.report_abuse_form.header": "Rapporter missbruk til en administrator", + "moderation.report_abuse_form.details": "Denne formen skal brukes for Ć„ rapporterer brukere som oppretter spam profiler, repositorier, saker, kommentarer eller oppfĆører seg upassende.", + "moderation.report_abuse_form.invalid": "Ugyldige argumenter", + "moderation.report_abuse_form.already_reported": "Du har allerede rapportert dette innholdet", + "moderation.abuse_category": "Kategori", + "moderation.abuse_category.placeholder": "Velg en kategori", + "moderation.abuse_category.spam": "Spam", + "moderation.abuse_category.malware": "Skadelig programvare", + "moderation.reported_thank_you": "Takk for meldingen. Vi har varslet administratorene.", + "mail.actions.successful_run_after_failure_subject": "Arbeidsflyten %[1]s er gjenopprettet i repository %[2]s", + "mail.actions.not_successful_run_subject": "Arbeidsflyten %[1]s feilet i repository %[2]s", + "mail.actions.successful_run_after_failure": "Arbeidsflyten %[1]s er gjenopprettet i repository %[2]s", + "mail.actions.not_successful_run": "Arbeidsflyten %[1]s feilet i repository %[2]s", + "mail.actions.run_info_cur_status": "Status for denne kjĆøringen: %[1]s (oppdatert fra %[2]s)", + "mail.actions.run_info_previous_status": "Status for forrige kjĆøring: %[1]s", + "repo.diff.commit.next-short": "Neste", + "repo.diff.commit.previous-short": "Forrige", + "discussion.locked": "Denne diskusjonen er lĆ„st. Kommentarer kan kun gjĆøres av bidragsytere.", + "avatar.constraints_hint": "Egendefinert avatar kan ikke overstige %[1]s i stĆørrelse eller vƦre stĆørre enn %[2]d Ɨ %[3]d piksler", + "meta.last_line": "Vi gir oss ikke. Kongen har sagt nei!" +} diff --git a/options/locale_next/locale_nds.json b/options/locale_next/locale_nds.json index 24268e2082..20c1208c42 100644 --- a/options/locale_next/locale_nds.json +++ b/options/locale_next/locale_nds.json @@ -28,7 +28,6 @@ "mail.actions.not_successful_run": "Warkwies %[1]s in Repositorium %[2]s is fehlslagen", "mail.actions.run_info_cur_status": "Tostand vun deesem Utfƶhren: %[1]s (jĆ¼Ć¼st vun %[2]s verneeit)", "mail.actions.run_info_previous_status": "Tostand vun de vƶrig Utfƶhren: %[1]s", - "mail.actions.run_info_ref": "Twieg: %[1]s (%[2]s)", "mail.actions.run_info_trigger": "Utlƶƶst um: %[1]s vun: %[2]s", "discussion.locked": "Deeser Snack is tosloten worden. Blots Bidragers kƶnen kommenteren.", "relativetime.future": "in Tokunft", @@ -102,5 +101,7 @@ "keys.ssh.link": "SSH-Slƶtels", "keys.gpg.link": "GPG-Slƶtels", "profile.actions.tooltip": "Mehr Aktioonen", - "profile.edit.link": "Profil bewarken" + "profile.edit.link": "Profil bewarken", + "og.repo.summary_card.alt_description": "Tosamenfatens-Kaart vun de Repositorium %[1]s, beschrieven as: %[2]s", + "mail.actions.run_info_sha": "Kommitteren: %[1]s" } diff --git a/options/locale_next/locale_nl-NL.json b/options/locale_next/locale_nl-NL.json index 4f109825aa..e049db3d41 100644 --- a/options/locale_next/locale_nl-NL.json +++ b/options/locale_next/locale_nl-NL.json @@ -28,7 +28,6 @@ "mail.actions.not_successful_run": "Werkstroom %[1]s mislukt in repositorie %[2]s", "mail.actions.run_info_cur_status": "De status van deze run: %[1]s (zojuist bijgewerkt van %[2]s)", "mail.actions.run_info_previous_status": "Status vorige run: %[1]s", - "mail.actions.run_info_ref": "Branch: %[1]s (%[2]s)", "mail.actions.run_info_trigger": "Getriggerd omdat: %[1]s door: %[2]s", "discussion.locked": "Deze discussie is afgesloten. Commentaar is alleen mogelijk voor bijdragers.", "relativetime.now": "nu", @@ -92,5 +91,17 @@ "watch.list.none": "Niemand houdt deze repo in de gaten.", "followers.incoming.list.self.none": "Niemand volgt uw profiel.", "followers.incoming.list.none": "Deze gebruiker wordt door niemand gevolgd.", - "followers.outgoing.list.self.none": "U volgt niemand." + "followers.outgoing.list.self.none": "U volgt niemand.", + "settings.visibility.description": "Profielzichtbaarheid beĆÆnvloedt de mogelijkheid van anderen om toegang te krijgen tot je niet-privĆ© repositories. Lees meer", + "repo.diff.commit.next-short": "Volgende", + "admin.dashboard.cleanup_offline_runners": "Offline runners opruimen", + "keys.ssh.link": "SSH sleutels", + "keys.gpg.link": "GPG sleutels", + "profile.actions.tooltip": "Meer acties", + "profile.edit.link": "Profiel bewerken", + "feed.atom.link": "Atom-feed", + "repo.diff.commit.previous-short": "Vorige", + "avatar.constraints_hint": "Eigen avatars mogen niet groter zijn dan %[1]s in grootte of groter zijn dan %[2]dx%[3]d pixels", + "og.repo.summary_card.alt_description": "Samenvattingsoverzicht van repositorie %[1]s, omschreven als: %[2]s", + "mail.actions.run_info_sha": "Commit: %[1]s" } diff --git a/options/locale_next/locale_pt-BR.json b/options/locale_next/locale_pt-BR.json index 1a5eca6d34..6ed6c5defd 100644 --- a/options/locale_next/locale_pt-BR.json +++ b/options/locale_next/locale_pt-BR.json @@ -26,7 +26,6 @@ "meta.last_line": "real hot girl shit", "mail.actions.run_info_cur_status": "Status desta execuĆ§Ć£o: %[1]s (atualizado recentemente de %[2]s)", "mail.actions.run_info_previous_status": "Status da execuĆ§Ć£o anterior: %[1]s", - "mail.actions.run_info_ref": "Branch: %[1]s (%[2]s)", "mail.actions.successful_run_after_failure_subject": "Workflow %[1]s recuperado no repositĆ³rio %[2]s", "mail.actions.not_successful_run_subject": "Workflow %[1]s falhou no repositĆ³rio %[2]s", "mail.actions.successful_run_after_failure": "Workflow %[1]s recuperado no repositĆ³rio %[2]s", @@ -83,7 +82,7 @@ "moderation.abuse_category": "Categoria", "moderation.abuse_category.placeholder": "Selecione uma categoria", "moderation.abuse_category.spam": "Spam", - "moderation.abuse_category.malware": "Malware", + "moderation.abuse_category.malware": "Software malicioso", "moderation.abuse_category.illegal_content": "ConteĆŗdo ilegal", "moderation.abuse_category.other_violations": "Outras violaƧƵes de regras da plataforma", "moderation.report_remarks": "ObservaƧƵes", @@ -105,5 +104,12 @@ "avatar.constraints_hint": "Imagem de perfil personalizada nĆ£o pode exceder %[1]s em tamanho ou ser maior que %[2]dx%[3]d pixels", "settings.visibility.description": "A visibilidade do perfil afeta a habilidade de acessarem seus repositĆ³rios nĆ£o-privados. Saiba mais", "repo.diff.commit.next-short": "PrĆ³ximo", - "repo.diff.commit.previous-short": "Anterior" + "repo.diff.commit.previous-short": "Anterior", + "profile.edit.link": "Editar perfil", + "feed.atom.link": "Feed Atom", + "keys.gpg.link": "Chaves GPG", + "og.repo.summary_card.alt_description": "CartĆ£o de resumo do repositĆ³rio %[1]s, descrito como: %[2]s", + "profile.actions.tooltip": "Mais Actions", + "keys.ssh.link": "Chaves SSH", + "mail.actions.run_info_sha": "Commit: %[1]s" } diff --git a/options/locale_next/locale_pt-PT.json b/options/locale_next/locale_pt-PT.json index 78e6dc4493..352e948966 100644 --- a/options/locale_next/locale_pt-PT.json +++ b/options/locale_next/locale_pt-PT.json @@ -27,7 +27,6 @@ "mail.actions.successful_run_after_failure_subject": "SequĆŖncia de trabalho %[1]s foi recuperada no repositĆ³rio %[2]s", "mail.actions.not_successful_run_subject": "SequĆŖncia de trabalho %[1]s falhou no repositĆ³rio %[2]s", "mail.actions.not_successful_run": "SequĆŖncia de trabalho %[1]s falhou no repositĆ³rio %[2]s", - "mail.actions.run_info_ref": "Ramo: %[1]s (%[2]s)", "mail.actions.successful_run_after_failure": "SequĆŖncia de trabalho %[1]s foi recuperada no repositĆ³rio %[2]s", "discussion.locked": "Esta discussĆ£o foi fechada. Apenas contribuidores podem publicar comentĆ”rios.", "mail.actions.run_info_cur_status": "Estado desta execuĆ§Ć£o: %[1]s (atualizado recentemente de %[2]s)", @@ -103,5 +102,12 @@ "stars.list.none": "NinguĆ©m juntou este repositĆ³rio aos favoritos.", "admin.dashboard.cleanup_offline_runners": "Limpeza de executores offline", "settings.visibility.description": "A visibilidade do perfil afecta a capacidade de outros acederem aos seus repositĆ³rios nĆ£o privados. Ler mais", - "avatar.constraints_hint": "O avatar personalizado nĆ£o pode exceder %[1]s de tamanho ou ser maior do que %[2]dx%[3]d pixĆ©is" + "avatar.constraints_hint": "O avatar personalizado nĆ£o pode exceder %[1]s de tamanho ou ser maior do que %[2]dx%[3]d pixĆ©is", + "repo.diff.commit.next-short": "Seg.", + "profile.actions.tooltip": "Mais Actions", + "profile.edit.link": "Editar perfil", + "feed.atom.link": "Feed Atom", + "keys.ssh.link": "Chaves SSH", + "keys.gpg.link": "Chaves GPG", + "repo.diff.commit.previous-short": "Ant." } diff --git a/options/locale_next/locale_ru-RU.json b/options/locale_next/locale_ru-RU.json index 922e2612af..19167d7177 100644 --- a/options/locale_next/locale_ru-RU.json +++ b/options/locale_next/locale_ru-RU.json @@ -26,7 +26,6 @@ "meta.last_line": "Unskip..", "mail.actions.not_successful_run_subject": "ŠŸŃ€Š¾Š²Š°Š» рŠ°Š±. ŠæŠ¾Ń‚Š¾ŠŗŠ° %[1]s Š² рŠµŠæŠ¾Š·ŠøтŠ¾Ń€ŠøŠø %[2]s", "mail.actions.successful_run_after_failure_subject": "Š’Š¾Š·Š¾Š±Š½Š¾Š²Š»ŠµŠ½ŠøŠµ рŠ°Š±. ŠæŠ¾Ń‚Š¾ŠŗŠ° %[1]s Š² рŠµŠæŠ¾Š·ŠøтŠ¾Ń€ŠøŠø %[2]s", - "mail.actions.run_info_ref": "Š’ŠµŃ‚Š²ŃŒ: %[1]s (%[2]s)", "mail.actions.run_info_trigger": "ŠŸŃ€ŠøчŠøŠ½Š° срŠ°Š±Š°Ń‚Ń‹Š²Š°Š½Šøя: %[1]s by: %[2]s", "mail.actions.successful_run_after_failure": "Š Š°Š±Š¾Ń‡ŠøŠ¹ ŠæŠ¾Ń‚Š¾Šŗ %[1]s Š² рŠµŠæŠ¾Š·ŠøтŠ¾Ń€ŠøŠø %[2]s Š±Ń‹Š» Š²Š¾Š·Š¾Š±Š½Š¾Š²Š»Ń‘Š½ ŠæŠ¾ŃŠ»Šµ ŠæрŠ¾Š²Š°Š»Š°", "mail.actions.run_info_cur_status": "Š¢ŠµŠŗущŠµŠµ сŠ¾ŃŃ‚Š¾ŃŠ½ŠøŠµ: %[1]s (Š¾Š±Š½Š¾Š²Š»ŠµŠ½Š¾ ŠæŠ¾ŃŠ»Šµ %[2]s)", @@ -110,5 +109,7 @@ "feed.atom.link": "Atom-Š»ŠµŠ½Ń‚Š°", "keys.ssh.link": "ŠšŠ»ŃŽŃ‡Šø SSH", "keys.gpg.link": "ŠšŠ»ŃŽŃ‡Šø GPG", - "profile.edit.link": "Š˜Š·Š¼ŠµŠ½Šøть ŠæрŠ¾Ń„ŠøŠ»ŃŒ" + "profile.edit.link": "Š˜Š·Š¼ŠµŠ½Šøть ŠæрŠ¾Ń„ŠøŠ»ŃŒ", + "og.repo.summary_card.alt_description": "ŠšŠ°Ń€Ń‚Š¾Ń‡ŠŗŠ° сŠ¾ сŠ²Š¾Š“ŠŗŠ¾Š¹ Š¾ рŠµŠæŠ¾Š·ŠøтŠ¾Ń€ŠøŠø %s. ŠžŠæŠøсŠ°Š½ŠøŠµ: %[2]s", + "mail.actions.run_info_sha": "ŠšŠ¾Š¼Š¼Šøт: %[1]s" } diff --git a/options/locale_next/locale_sr-SP.json b/options/locale_next/locale_sr-SP.json index 0967ef424b..611f997b3e 100644 --- a/options/locale_next/locale_sr-SP.json +++ b/options/locale_next/locale_sr-SP.json @@ -1 +1,3 @@ -{} +{ + "moderation.abuse_category.malware": "ŠœŠ°Š»Š²ŠµŃ€" +} diff --git a/options/locale_next/locale_sv-SE.json b/options/locale_next/locale_sv-SE.json index 9a8762212c..1195647bf5 100644 --- a/options/locale_next/locale_sv-SE.json +++ b/options/locale_next/locale_sv-SE.json @@ -27,7 +27,6 @@ "moderation.reporting_failed": "Det gick inte att skicka in den nya ƶvergreppsrapporten: %v", "mail.actions.run_info_cur_status": "Status fƶr denna kƶrning: %[1]s (just uppdaterad frĆ„n %[2]s)", "mail.actions.run_info_previous_status": "Status fƶr fƶregĆ„ende kƶrning: %[1]s", - "mail.actions.run_info_ref": "Gren: %[1]s (%[2]s)", "mail.actions.run_info_trigger": "Utlƶses pĆ„ grund av: %[1]s av: %[2]s", "alert.asset_load_failed": "Misslyckades med att lƤsa in resursfiler frĆ„n {path}. Kontrollera att resursfilerna Ƥr Ć„tkomliga.", "install.invalid_lfs_path": "Det gick inte att skapa LFS-roten pĆ„ den angivna sƶkvƤgen: %[1]s", @@ -95,5 +94,13 @@ "moderation.abuse_category.spam": "SkrƤppost", "moderation.abuse_category.malware": "Skadlig kod", "settings.visibility.description": "Profilens synlighet pĆ„verkar andras mƶjlighet att komma Ć„t dina icke-privata fƶrrĆ„d. LƤs mer", - "avatar.constraints_hint": "Anpassade avatarer fĆ„r inte vara stƶrre Ƥn %[1] eller %[2]dx%[3] bildpunkter" + "avatar.constraints_hint": "Anpassade avatarer fĆ„r inte vara stƶrre Ƥn %[1] eller %[2]dx%[3] bildpunkter", + "og.repo.summary_card.alt_description": "Sammanfattningskort fƶr arkivet %[1]s, beskrivet som: %[2]s", + "profile.actions.tooltip": "Fler Ć„tgƤrder", + "keys.gpg.link": "GPG-nycklar", + "profile.edit.link": "Redigera profil", + "keys.ssh.link": "SSH-nycklar", + "repo.diff.commit.next-short": "NƤsta", + "repo.diff.commit.previous-short": "Fƶreg", + "feed.atom.link": "Atom-flƶde" } diff --git a/options/locale_next/locale_tr-TR.json b/options/locale_next/locale_tr-TR.json index b0e34e677f..fa71cb8e7d 100644 --- a/options/locale_next/locale_tr-TR.json +++ b/options/locale_next/locale_tr-TR.json @@ -1,5 +1,6 @@ { "repo.pulls.merged_title_desc": "%[4]s %[2]s iƧindeki %[1]d işlemeyi %[3]s ile birleştirdi", "repo.pulls.title_desc": "%[2]s iƧindeki %[1]d işlemeyi %[3]s ile birleştirmek istiyor", - "search.milestone_kind": "Kilometre taşlarını ara..." + "search.milestone_kind": "Kilometre taşlarını ara...", + "moderation.abuse_category.malware": "Malware" } diff --git a/options/locale_next/locale_uk-UA.json b/options/locale_next/locale_uk-UA.json index 33cb5a41a3..8e99505e57 100644 --- a/options/locale_next/locale_uk-UA.json +++ b/options/locale_next/locale_uk-UA.json @@ -25,7 +25,6 @@ "alert.range_error": " Š¼Š°Ń” Š±ŃƒŃ‚Šø чŠøсŠ»Š¾Š¼ Š²Ń–Š“ %[1]s Š“Š¾ %[2]s.", "meta.last_line": "ŠŠµ Š·Š»ŠøŠ²Š°Š¹ Š·Š»ŠøŠ¹ Š·Š°ŠæŠøтŠø Š½Š° Š·Š»Šøття ā€” Š·Ń–Š»Š»Ń”Ń‚ŃŒŃŃ Š·Š»Šµ.", "mail.actions.successful_run_after_failure": "Š Š¾Š±Š¾Ń‡ŠøŠ¹ ŠæŠ¾Ń‚Ń–Šŗ %[1]s Š²Ń–Š“Š½Š¾Š²Š»ŠµŠ½Š¾ Š² рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Ń— %[2]s", - "mail.actions.run_info_ref": "Š“Ń–Š»ŠŗŠ°: %[1]s (%[2]s)", "mail.actions.successful_run_after_failure_subject": "Š Š¾Š±Š¾Ń‡ŠøŠ¹ ŠæŠ¾Ń‚Ń–Šŗ %[1]s Š²Ń–Š“Š½Š¾Š²Š»ŠµŠ½Š¾ Š² рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–Ń— %[2]s", "mail.actions.run_info_previous_status": "Š”тŠ°Š½ ŠæŠ¾ŠæŠµŃ€ŠµŠ“Š½ŃŒŠ¾Š³Š¾ Š·Š°ŠæусŠŗу: %[1]s", "mail.actions.run_info_cur_status": "Š”тŠ°Š½ цьŠ¾Š³Š¾ Š·Š°ŠæусŠŗу: %[1]s (щŠ¾Š¹Š½Š¾ Š¾Š½Š¾Š²Š»ŠµŠ½Š¾ Š· %[2]s)", @@ -110,5 +109,7 @@ "keys.gpg.link": "ŠšŠ»ŃŽŃ‡Ń– GPG", "profile.edit.link": "Š ŠµŠ“Š°Š³ŃƒŠ²Š°Ń‚Šø ŠæрŠ¾Ń„Ń–Š»ŃŒ", "feed.atom.link": "Š”трічŠŗŠ° Atom", - "profile.actions.tooltip": "Š‘Ń–Š»ŃŒŃˆŠµ Š“іŠ¹" + "profile.actions.tooltip": "Š‘Ń–Š»ŃŒŃˆŠµ Š“іŠ¹", + "og.repo.summary_card.alt_description": "ŠŸŃ–Š“суŠ¼ŠŗŠ¾Š²Š° ŠŗŠ°Ń€Ń‚ŠŗŠ° рŠµŠæŠ¾Š·ŠøтŠ¾Ń€Ń–ŃŽ %[1]s Š· Š¾ŠæŠøсŠ¾Š¼: %[2]s", + "mail.actions.run_info_sha": "ŠšŠ¾Š¼Ń–Ń‚: %[1]s" } diff --git a/options/locale_next/locale_vi.json b/options/locale_next/locale_vi.json index 0967ef424b..7ae64113b6 100644 --- a/options/locale_next/locale_vi.json +++ b/options/locale_next/locale_vi.json @@ -1 +1,3 @@ -{} +{ + "moderation.abuse_category.malware": "Phįŗ§n mį»m Ć”c Ć½" +} diff --git a/options/locale_next/locale_zh-CN.json b/options/locale_next/locale_zh-CN.json index 0f408997bf..c235ebd0ad 100644 --- a/options/locale_next/locale_zh-CN.json +++ b/options/locale_next/locale_zh-CN.json @@ -20,7 +20,6 @@ "mail.actions.not_successful_run_subject": "仓åŗ“ %[2]s äø­ēš„å·„ä½œęµ %[1]s å·²å¤±č“„", "mail.actions.successful_run_after_failure": "仓åŗ“ %[2]s äø­ēš„å·„ä½œęµ %[1]s å·²ę¢å¤", "mail.actions.run_info_previous_status": "äøŠę¬”čæč”Œēš„ēŠ¶ę€ļ¼š%[1]s", - "mail.actions.run_info_ref": "分ę”Æļ¼š%[1]sļ¼ˆ%[2]sļ¼‰", "mail.actions.run_info_cur_status": "ꭤꬔčæč”Œēš„ēŠ¶ę€ļ¼š%[1]sļ¼ˆä»Ž %[2]s ꛓꖰļ¼‰", "mail.actions.run_info_trigger": "ē”± %[2]s %[1]s č§¦å‘", "mail.actions.not_successful_run": "仓åŗ“ %[2]s äø­ēš„å·„ä½œęµ %[1]s å·²å¤±č“„", @@ -71,12 +70,13 @@ "editor.textarea.shift_tab_hint": "ę­¤č”Œę— ē¼©čæ›ć€‚å†ę¬”ꌉ Shift + Tab ꈖꌉ Escape 退å‡ŗē¼–č¾‘å™Ø怂", "admin.dashboard.cleanup_offline_runners": "ęø…ē†ē¦»ēŗæčæč”Œå™Ø", "settings.visibility.description": "äøŖäŗŗ资ꖙåÆč§ę€§č®¾ē½®ä¼šå½±å“ä»–äŗŗåƹę‚Øēš„非ē§ęœ‰ä»“åŗ“ēš„č®æ问怂äŗ†č§£ę›“多", - "avatar.constraints_hint": "č‡Ŗ定义夓像大小äøå¾—超čæ‡ %[1]sļ¼Œęˆ–大äŗŽ %[2]dƗ%[3]d 像ē“ ", + "avatar.constraints_hint": "č‡Ŗ定义夓像大小äøå¾—超čæ‡ %[1]sļ¼Œäø”分č¾ØēŽ‡äøå¾—大äŗŽ %[2]dƗ%[3]d 像ē“ ", "keys.ssh.link": "SSH åƆ钄", "keys.gpg.link": "GPG åƆ钄", "profile.actions.tooltip": "ę›“å¤šę“ä½œ", - "repo.diff.commit.next-short": "äø‹äøŖ", - "repo.diff.commit.previous-short": "äøŠäøŖ", + "repo.diff.commit.next-short": "äø‹äø€äøŖ", + "repo.diff.commit.previous-short": "äøŠäø€äøŖ", "feed.atom.link": "Atom č®¢é˜…ęŗ", - "profile.edit.link": "ē¼–č¾‘äøŖäŗŗ资ꖙ" + "profile.edit.link": "ē¼–č¾‘äøŖäŗŗ资ꖙ", + "og.repo.summary_card.alt_description": "仓åŗ“ %[1]s ēš„ę‘˜č¦å”ē‰‡ļ¼Œęčæ°äøŗļ¼š%[2]s" } diff --git a/options/locale_next/locale_zh-HK.json b/options/locale_next/locale_zh-HK.json index 6baf89e022..277385cf5f 100644 --- a/options/locale_next/locale_zh-HK.json +++ b/options/locale_next/locale_zh-HK.json @@ -1,5 +1,4 @@ { - "repo.pulls.merged_title_desc": { - "other": "ę–¼ %[4]s 將 %[1]d ę¬”ä»£ē¢¼ęäŗ¤å¾ž %[2]såˆä½µč‡³ %[3]s" - } + "repo.pulls.merged_title_desc": "ę–¼ %[4]s 將 %[1]d ę¬”ä»£ē¢¼ęäŗ¤å¾ž %[2]såˆä½µč‡³ %[3]s", + "moderation.abuse_category.malware": "ęƒ”ę„ē؋式" } diff --git a/options/locale_next/locale_zh-TW.json b/options/locale_next/locale_zh-TW.json index 3ae0b00d2b..8a5a17a774 100644 --- a/options/locale_next/locale_zh-TW.json +++ b/options/locale_next/locale_zh-TW.json @@ -55,7 +55,6 @@ "mail.actions.not_successful_run": "儲存åŗ« %[2]s äø­ēš„å·„ä½œęµē؋ %[1]s å·²å¤±ę•—", "mail.actions.run_info_cur_status": "ęœ¬ę¬”åŸ·č”Œē‹€ę…‹ļ¼š%[1]sļ¼ˆå‰›å¾ž %[2]s ꛓꖰļ¼‰", "mail.actions.run_info_previous_status": "前äø€ę¬”åŸ·č”Œē‹€ę…‹ļ¼š%[1]s", - "mail.actions.run_info_ref": "分ę”Æļ¼š%[1]s (%[2]s)", "mail.actions.run_info_trigger": "č§øē™¼åŽŸå› ļ¼š%[1]sļ¼Œē”± %[2]s åŸ·č”Œ", "discussion.locked": "ę­¤čØŽč«–å·²č¢«éŽ–å®šć€‚åƒ…é™č²¢ē»č€…ē•™čØ€ć€‚", "alert.asset_load_failed": "ē„”ę³•å¾ž {path} č¼‰å…„č³‡ęŗęŖ”ę”ˆć€‚č«‹ē¢ŗäæé€™äŗ›č³‡ęŗęŖ”ę”ˆåÆä»„č¢«å­˜å–ć€‚", diff --git a/package-lock.json b/package-lock.json index 06a9497efc..edb57b618a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,7 +32,7 @@ "idiomorph": "0.3.0", "jquery": "3.7.1", "katex": "0.16.22", - "mermaid": "11.7.0", + "mermaid": "11.8.1", "mini-css-extract-plugin": "2.9.2", "minimatch": "10.0.3", "monaco-editor": "0.52.2", @@ -56,22 +56,22 @@ "vue-chartjs": "5.3.1", "vue-loader": "17.4.2", "vue3-calendar-heatmap": "2.0.5", - "webpack": "5.99.9", + "webpack": "5.100.0", "webpack-cli": "6.0.1", "wrap-ansi": "9.0.0" }, "devDependencies": { "@axe-core/playwright": "4.10.2", "@eslint-community/eslint-plugin-eslint-comments": "4.5.0", - "@playwright/test": "1.52.0", + "@playwright/test": "1.53.2", "@stoplight/spectral-cli": "6.15.0", - "@stylistic/eslint-plugin": "5.0.0", + "@stylistic/eslint-plugin": "5.1.0", "@stylistic/stylelint-plugin": "3.1.3", "@vitejs/plugin-vue": "6.0.0", - "@vitest/coverage-v8": "3.2.3", - "@vitest/eslint-plugin": "1.2.2", + "@vitest/coverage-v8": "3.2.4", + "@vitest/eslint-plugin": "1.3.4", "@vue/test-utils": "2.4.6", - "eslint": "9.30.0", + "eslint": "9.30.1", "eslint-import-resolver-typescript": "4.4.4", "eslint-plugin-array-func": "5.0.2", "eslint-plugin-import-x": "4.16.1", @@ -83,24 +83,24 @@ "eslint-plugin-toml": "0.12.0", "eslint-plugin-unicorn": "59.0.1", "eslint-plugin-vitest-globals": "1.5.0", - "eslint-plugin-vue": "10.2.0", - "eslint-plugin-vue-scoped-css": "2.10.0", + "eslint-plugin-vue": "10.3.0", + "eslint-plugin-vue-scoped-css": "2.11.0", "eslint-plugin-wc": "3.0.1", - "globals": "16.1.0", + "globals": "16.3.0", "happy-dom": "18.0.1", "license-checker-rseidelsohn": "4.4.2", "markdownlint-cli": "0.45.0", "postcss-html": "1.8.0", - "sharp": "0.34.2", - "stylelint": "16.21.0", + "sharp": "0.34.3", + "stylelint": "16.21.1", "stylelint-declaration-block-no-ignored-properties": "2.8.0", "stylelint-declaration-strict-value": "1.10.11", "stylelint-value-no-unknown-custom-properties": "6.0.1", "svgo": "4.0.0", "typescript": "5.8.3", - "typescript-eslint": "8.35.0", + "typescript-eslint": "8.35.1", "vite-string-plugin": "1.3.4", - "vitest": "3.2.3" + "vitest": "3.2.4" }, "engines": { "node": ">= 20.0.0" @@ -216,12 +216,12 @@ } }, "node_modules/@babel/parser": { - "version": "7.27.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.7.tgz", - "integrity": "sha512-qnzXzDXdr/po3bOTbTIQZ7+TxNKxpkN5IifVLXS+r7qwynkZfPyjZfE7hCXbo7IoO9TNcSyibgONsf2HauUd3Q==", + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.0.tgz", + "integrity": "sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==", "license": "MIT", "dependencies": { - "@babel/types": "^7.27.7" + "@babel/types": "^7.28.0" }, "bin": { "parser": "bin/babel-parser.js" @@ -240,9 +240,9 @@ } }, "node_modules/@babel/types": { - "version": "7.27.7", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.7.tgz", - "integrity": "sha512-8OLQgDScAOHXnAz2cV+RfzzNMipuLVBz2biuAJFMV9bfkNf393je3VM8CLkjQodW5+iWsSJdSgSWT6rsZoXHPw==", + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.0.tgz", + "integrity": "sha512-jYnje+JyZG5YThjHiF28oT4SIZLnYOcSBb6+SDaFIyzDVSkXQmQQYclJ2R+YxcdmK0AX6x1E5OQNtuh3jHDrUg==", "license": "MIT", "dependencies": { "@babel/helper-string-parser": "^7.27.1", @@ -537,9 +537,9 @@ } }, "node_modules/@emnapi/runtime": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.3.tgz", - "integrity": "sha512-pBPWdu6MLKROBX05wSNKcNb++m5Er+KQ9QkB+WVM+pW2Kx9hoSrVTnu3BdkI5eBLZoKu/J6mW/B6i6bJB2ytXQ==", + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.4.tgz", + "integrity": "sha512-hHyapA4A3gPaDCNfiqyZUStTMqIkKRshqPIuDOXv1hcBnD4U3l8cP0T1HMCfGRxQ6V64TGCcoswChANyOAwbQg==", "dev": true, "license": "MIT", "optional": true, @@ -1146,9 +1146,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.30.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.30.0.tgz", - "integrity": "sha512-Wzw3wQwPvc9sHM+NjakWTcPx11mbZyiYHuwWa/QfZ7cIRX7WK54PSk7bdyXDaoaopUcMatv1zaQvOAAO8hCdww==", + "version": "9.30.1", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.30.1.tgz", + "integrity": "sha512-zXhuECFlyep42KZUhWjfvsmXGX39W8K8LFb8AWXM9gSV9dQB+MrJGLKvW6Zw0Ggnbpw0VHTtrhFXYe3Gym18jg==", "dev": true, "license": "MIT", "engines": { @@ -1340,9 +1340,9 @@ } }, "node_modules/@img/sharp-darwin-arm64": { - "version": "0.34.2", - "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.34.2.tgz", - "integrity": "sha512-OfXHZPppddivUJnqyKoi5YVeHRkkNE2zUFT2gbpKxp/JZCFYEYubnMg+gOp6lWfasPrTS+KPosKqdI+ELYVDtg==", + "version": "0.34.3", + "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.34.3.tgz", + "integrity": "sha512-ryFMfvxxpQRsgZJqBd4wsttYQbCxsJksrv9Lw/v798JcQ8+w84mBWuXwl+TT0WJ/WrYOLaYpwQXi3sA9nTIaIg==", "cpu": [ "arm64" ], @@ -1359,13 +1359,13 @@ "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-darwin-arm64": "1.1.0" + "@img/sharp-libvips-darwin-arm64": "1.2.0" } }, "node_modules/@img/sharp-darwin-x64": { - "version": "0.34.2", - "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.34.2.tgz", - "integrity": "sha512-dYvWqmjU9VxqXmjEtjmvHnGqF8GrVjM2Epj9rJ6BUIXvk8slvNDJbhGFvIoXzkDhrJC2jUxNLz/GUjjvSzfw+g==", + "version": "0.34.3", + "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.34.3.tgz", + "integrity": "sha512-yHpJYynROAj12TA6qil58hmPmAwxKKC7reUqtGLzsOHfP7/rniNGTL8tjWX6L3CTV4+5P4ypcS7Pp+7OB+8ihA==", "cpu": [ "x64" ], @@ -1382,13 +1382,13 @@ "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-darwin-x64": "1.1.0" + "@img/sharp-libvips-darwin-x64": "1.2.0" } }, "node_modules/@img/sharp-libvips-darwin-arm64": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.1.0.tgz", - "integrity": "sha512-HZ/JUmPwrJSoM4DIQPv/BfNh9yrOA8tlBbqbLz4JZ5uew2+o22Ik+tHQJcih7QJuSa0zo5coHTfD5J8inqj9DA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.2.0.tgz", + "integrity": "sha512-sBZmpwmxqwlqG9ueWFXtockhsxefaV6O84BMOrhtg/YqbTaRdqDE7hxraVE3y6gVM4eExmfzW4a8el9ArLeEiQ==", "cpu": [ "arm64" ], @@ -1403,9 +1403,9 @@ } }, "node_modules/@img/sharp-libvips-darwin-x64": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.1.0.tgz", - "integrity": "sha512-Xzc2ToEmHN+hfvsl9wja0RlnXEgpKNmftriQp6XzY/RaSfwD9th+MSh0WQKzUreLKKINb3afirxW7A0fz2YWuQ==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.2.0.tgz", + "integrity": "sha512-M64XVuL94OgiNHa5/m2YvEQI5q2cl9d/wk0qFTDVXcYzi43lxuiFTftMR1tOnFQovVXNZJ5TURSDK2pNe9Yzqg==", "cpu": [ "x64" ], @@ -1420,9 +1420,9 @@ } }, "node_modules/@img/sharp-libvips-linux-arm": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.1.0.tgz", - "integrity": "sha512-s8BAd0lwUIvYCJyRdFqvsj+BJIpDBSxs6ivrOPm/R7piTs5UIwY5OjXrP2bqXC9/moGsyRa37eYWYCOGVXxVrA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.2.0.tgz", + "integrity": "sha512-mWd2uWvDtL/nvIzThLq3fr2nnGfyr/XMXlq8ZJ9WMR6PXijHlC3ksp0IpuhK6bougvQrchUAfzRLnbsen0Cqvw==", "cpu": [ "arm" ], @@ -1437,9 +1437,9 @@ } }, "node_modules/@img/sharp-libvips-linux-arm64": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.1.0.tgz", - "integrity": "sha512-IVfGJa7gjChDET1dK9SekxFFdflarnUB8PwW8aGwEoF3oAsSDuNUTYS+SKDOyOJxQyDC1aPFMuRYLoDInyV9Ew==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.2.0.tgz", + "integrity": "sha512-RXwd0CgG+uPRX5YYrkzKyalt2OJYRiJQ8ED/fi1tq9WQW2jsQIn0tqrlR5l5dr/rjqq6AHAxURhj2DVjyQWSOA==", "cpu": [ "arm64" ], @@ -1454,9 +1454,9 @@ } }, "node_modules/@img/sharp-libvips-linux-ppc64": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.1.0.tgz", - "integrity": "sha512-tiXxFZFbhnkWE2LA8oQj7KYR+bWBkiV2nilRldT7bqoEZ4HiDOcePr9wVDAZPi/Id5fT1oY9iGnDq20cwUz8lQ==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.2.0.tgz", + "integrity": "sha512-Xod/7KaDDHkYu2phxxfeEPXfVXFKx70EAFZ0qyUdOjCcxbjqyJOEUpDe6RIyaunGxT34Anf9ue/wuWOqBW2WcQ==", "cpu": [ "ppc64" ], @@ -1471,9 +1471,9 @@ } }, "node_modules/@img/sharp-libvips-linux-s390x": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.1.0.tgz", - "integrity": "sha512-xukSwvhguw7COyzvmjydRb3x/09+21HykyapcZchiCUkTThEQEOMtBj9UhkaBRLuBrgLFzQ2wbxdeCCJW/jgJA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.2.0.tgz", + "integrity": "sha512-eMKfzDxLGT8mnmPJTNMcjfO33fLiTDsrMlUVcp6b96ETbnJmd4uvZxVJSKPQfS+odwfVaGifhsB07J1LynFehw==", "cpu": [ "s390x" ], @@ -1488,9 +1488,9 @@ } }, "node_modules/@img/sharp-libvips-linux-x64": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.1.0.tgz", - "integrity": "sha512-yRj2+reB8iMg9W5sULM3S74jVS7zqSzHG3Ol/twnAAkAhnGQnpjj6e4ayUz7V+FpKypwgs82xbRdYtchTTUB+Q==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.2.0.tgz", + "integrity": "sha512-ZW3FPWIc7K1sH9E3nxIGB3y3dZkpJlMnkk7z5tu1nSkBoCgw2nSRTFHI5pB/3CQaJM0pdzMF3paf9ckKMSE9Tg==", "cpu": [ "x64" ], @@ -1505,9 +1505,9 @@ } }, "node_modules/@img/sharp-libvips-linuxmusl-arm64": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.1.0.tgz", - "integrity": "sha512-jYZdG+whg0MDK+q2COKbYidaqW/WTz0cc1E+tMAusiDygrM4ypmSCjOJPmFTvHHJ8j/6cAGyeDWZOsK06tP33w==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.2.0.tgz", + "integrity": "sha512-UG+LqQJbf5VJ8NWJ5Z3tdIe/HXjuIdo4JeVNADXBFuG7z9zjoegpzzGIyV5zQKi4zaJjnAd2+g2nna8TZvuW9Q==", "cpu": [ "arm64" ], @@ -1522,9 +1522,9 @@ } }, "node_modules/@img/sharp-libvips-linuxmusl-x64": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.1.0.tgz", - "integrity": "sha512-wK7SBdwrAiycjXdkPnGCPLjYb9lD4l6Ze2gSdAGVZrEL05AOUJESWU2lhlC+Ffn5/G+VKuSm6zzbQSzFX/P65A==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.2.0.tgz", + "integrity": "sha512-SRYOLR7CXPgNze8akZwjoGBoN1ThNZoqpOgfnOxmWsklTGVfJiGJoC/Lod7aNMGA1jSsKWM1+HRX43OP6p9+6Q==", "cpu": [ "x64" ], @@ -1539,9 +1539,9 @@ } }, "node_modules/@img/sharp-linux-arm": { - "version": "0.34.2", - "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.34.2.tgz", - "integrity": "sha512-0DZzkvuEOqQUP9mo2kjjKNok5AmnOr1jB2XYjkaoNRwpAYMDzRmAqUIa1nRi58S2WswqSfPOWLNOr0FDT3H5RQ==", + "version": "0.34.3", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.34.3.tgz", + "integrity": "sha512-oBK9l+h6KBN0i3dC8rYntLiVfW8D8wH+NPNT3O/WBHeW0OQWCjfWksLUaPidsrDKpJgXp3G3/hkmhptAW0I3+A==", "cpu": [ "arm" ], @@ -1558,13 +1558,13 @@ "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linux-arm": "1.1.0" + "@img/sharp-libvips-linux-arm": "1.2.0" } }, "node_modules/@img/sharp-linux-arm64": { - "version": "0.34.2", - "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.34.2.tgz", - "integrity": "sha512-D8n8wgWmPDakc83LORcfJepdOSN6MvWNzzz2ux0MnIbOqdieRZwVYY32zxVx+IFUT8er5KPcyU3XXsn+GzG/0Q==", + "version": "0.34.3", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.34.3.tgz", + "integrity": "sha512-QdrKe3EvQrqwkDrtuTIjI0bu6YEJHTgEeqdzI3uWJOH6G1O8Nl1iEeVYRGdj1h5I21CqxSvQp1Yv7xeU3ZewbA==", "cpu": [ "arm64" ], @@ -1581,13 +1581,36 @@ "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linux-arm64": "1.1.0" + "@img/sharp-libvips-linux-arm64": "1.2.0" + } + }, + "node_modules/@img/sharp-linux-ppc64": { + "version": "0.34.3", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-ppc64/-/sharp-linux-ppc64-0.34.3.tgz", + "integrity": "sha512-GLtbLQMCNC5nxuImPR2+RgrviwKwVql28FWZIW1zWruy6zLgA5/x2ZXk3mxj58X/tszVF69KK0Is83V8YgWhLA==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linux-ppc64": "1.2.0" } }, "node_modules/@img/sharp-linux-s390x": { - "version": "0.34.2", - "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.34.2.tgz", - "integrity": "sha512-EGZ1xwhBI7dNISwxjChqBGELCWMGDvmxZXKjQRuqMrakhO8QoMgqCrdjnAqJq/CScxfRn+Bb7suXBElKQpPDiw==", + "version": "0.34.3", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.34.3.tgz", + "integrity": "sha512-3gahT+A6c4cdc2edhsLHmIOXMb17ltffJlxR0aC2VPZfwKoTGZec6u5GrFgdR7ciJSsHT27BD3TIuGcuRT0KmQ==", "cpu": [ "s390x" ], @@ -1604,13 +1627,13 @@ "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linux-s390x": "1.1.0" + "@img/sharp-libvips-linux-s390x": "1.2.0" } }, "node_modules/@img/sharp-linux-x64": { - "version": "0.34.2", - "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.34.2.tgz", - "integrity": "sha512-sD7J+h5nFLMMmOXYH4DD9UtSNBD05tWSSdWAcEyzqW8Cn5UxXvsHAxmxSesYUsTOBmUnjtxghKDl15EvfqLFbQ==", + "version": "0.34.3", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.34.3.tgz", + "integrity": "sha512-8kYso8d806ypnSq3/Ly0QEw90V5ZoHh10yH0HnrzOCr6DKAPI6QVHvwleqMkVQ0m+fc7EH8ah0BB0QPuWY6zJQ==", "cpu": [ "x64" ], @@ -1627,13 +1650,13 @@ "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linux-x64": "1.1.0" + "@img/sharp-libvips-linux-x64": "1.2.0" } }, "node_modules/@img/sharp-linuxmusl-arm64": { - "version": "0.34.2", - "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.34.2.tgz", - "integrity": "sha512-NEE2vQ6wcxYav1/A22OOxoSOGiKnNmDzCYFOZ949xFmrWZOVII1Bp3NqVVpvj+3UeHMFyN5eP/V5hzViQ5CZNA==", + "version": "0.34.3", + "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.34.3.tgz", + "integrity": "sha512-vAjbHDlr4izEiXM1OTggpCcPg9tn4YriK5vAjowJsHwdBIdx0fYRsURkxLG2RLm9gyBq66gwtWI8Gx0/ov+JKQ==", "cpu": [ "arm64" ], @@ -1650,13 +1673,13 @@ "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linuxmusl-arm64": "1.1.0" + "@img/sharp-libvips-linuxmusl-arm64": "1.2.0" } }, "node_modules/@img/sharp-linuxmusl-x64": { - "version": "0.34.2", - "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.34.2.tgz", - "integrity": "sha512-DOYMrDm5E6/8bm/yQLCWyuDJwUnlevR8xtF8bs+gjZ7cyUNYXiSf/E8Kp0Ss5xasIaXSHzb888V1BE4i1hFhAA==", + "version": "0.34.3", + "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.34.3.tgz", + "integrity": "sha512-gCWUn9547K5bwvOn9l5XGAEjVTTRji4aPTqLzGXHvIr6bIDZKNTA34seMPgM0WmSf+RYBH411VavCejp3PkOeQ==", "cpu": [ "x64" ], @@ -1673,13 +1696,13 @@ "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linuxmusl-x64": "1.1.0" + "@img/sharp-libvips-linuxmusl-x64": "1.2.0" } }, "node_modules/@img/sharp-wasm32": { - "version": "0.34.2", - "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.34.2.tgz", - "integrity": "sha512-/VI4mdlJ9zkaq53MbIG6rZY+QRN3MLbR6usYlgITEzi4Rpx5S6LFKsycOQjkOGmqTNmkIdLjEvooFKwww6OpdQ==", + "version": "0.34.3", + "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.34.3.tgz", + "integrity": "sha512-+CyRcpagHMGteySaWos8IbnXcHgfDn7pO2fiC2slJxvNq9gDipYBN42/RagzctVRKgxATmfqOSulgZv5e1RdMg==", "cpu": [ "wasm32" ], @@ -1687,7 +1710,7 @@ "license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT", "optional": true, "dependencies": { - "@emnapi/runtime": "^1.4.3" + "@emnapi/runtime": "^1.4.4" }, "engines": { "node": "^18.17.0 || ^20.3.0 || >=21.0.0" @@ -1697,9 +1720,9 @@ } }, "node_modules/@img/sharp-win32-arm64": { - "version": "0.34.2", - "resolved": "https://registry.npmjs.org/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.34.2.tgz", - "integrity": "sha512-cfP/r9FdS63VA5k0xiqaNaEoGxBg9k7uE+RQGzuK9fHt7jib4zAVVseR9LsE4gJcNWgT6APKMNnCcnyOtmSEUQ==", + "version": "0.34.3", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.34.3.tgz", + "integrity": "sha512-MjnHPnbqMXNC2UgeLJtX4XqoVHHlZNd+nPt1kRPmj63wURegwBhZlApELdtxM2OIZDRv/DFtLcNhVbd1z8GYXQ==", "cpu": [ "arm64" ], @@ -1717,9 +1740,9 @@ } }, "node_modules/@img/sharp-win32-ia32": { - "version": "0.34.2", - "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.34.2.tgz", - "integrity": "sha512-QLjGGvAbj0X/FXl8n1WbtQ6iVBpWU7JO94u/P2M4a8CFYsvQi4GW2mRy/JqkRx0qpBzaOdKJKw8uc930EX2AHw==", + "version": "0.34.3", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.34.3.tgz", + "integrity": "sha512-xuCdhH44WxuXgOM714hn4amodJMZl3OEvf0GVTm0BEyMeA2to+8HEdRPShH0SLYptJY1uBw+SCFP9WVQi1Q/cw==", "cpu": [ "ia32" ], @@ -1737,9 +1760,9 @@ } }, "node_modules/@img/sharp-win32-x64": { - "version": "0.34.2", - "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.34.2.tgz", - "integrity": "sha512-aUdT6zEYtDKCaxkofmmJDJYGCf0+pJg3eU9/oBuqvEeoB9dKI6ZLc/1iLJCTuJQDO4ptntAlkUmHgGjyuobZbw==", + "version": "0.34.3", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.34.3.tgz", + "integrity": "sha512-OWwz05d++TxzLEv4VnsTz5CmZ6mI6S05sfQGEMrNrQcOEERbX46332IvE7pO/EUiw7jUrrS40z/M7kPyjfl04g==", "cpu": [ "x64" ], @@ -1884,9 +1907,9 @@ } }, "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.9", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.9.tgz", - "integrity": "sha512-xpz6C/vXOegF9VEtlMBlkNNIjHrLhKaFBsO4lmQGr00x5BHp7p+oliR6i7LwIcM5cZU2VjLSwm2R+/zj5IjPWg==", + "version": "0.3.12", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz", + "integrity": "sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==", "license": "MIT", "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.0", @@ -1903,9 +1926,9 @@ } }, "node_modules/@jridgewell/source-map": { - "version": "0.3.7", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.7.tgz", - "integrity": "sha512-maArE+jvYbj06DXh2iFlXSSDjTWXODlPTQHdDRQdGoYw7KvT4SfYCnPHfCyww8Z3JqFsW0BBjPLj8A2fwAvv7Q==", + "version": "0.3.10", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.10.tgz", + "integrity": "sha512-0pPkgz9dY+bijgistcTTJ5mR+ocqRXLuhXHYdzoMmmoJ2C9S46RCm2GMUbatPEUK9Yjy26IrAy8D/M00lLkv+Q==", "license": "MIT", "dependencies": { "@jridgewell/gen-mapping": "^0.3.5", @@ -1913,15 +1936,15 @@ } }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.1.tgz", - "integrity": "sha512-mBLKRHc7Ffw/hObYb9+cunuGNjshQk+vZdwZBJoqiysK/mW3Jq0UXosq8aIhMnLevANhR9yoYfdUEOHg6M9y0g==", + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz", + "integrity": "sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==", "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.26", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.26.tgz", - "integrity": "sha512-Z9rjt4BUVEbLFpw0qjCklVxxf421wrmcbP4w+LmBUxYCyJTYYSclgJD0YsCgGqQCtCIPiz7kjbYYJiAKhjJ3kA==", + "version": "0.3.29", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.29.tgz", + "integrity": "sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==", "license": "MIT", "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", @@ -2075,9 +2098,9 @@ } }, "node_modules/@mermaid-js/parser": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/@mermaid-js/parser/-/parser-0.5.0.tgz", - "integrity": "sha512-AiaN7+VjXC+3BYE+GwNezkpjIcCI2qIMB/K4S2/vMWe0q/XJCBbx5+K7iteuz7VyltX9iAK4FmVTvGc9kjOV4w==", + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/@mermaid-js/parser/-/parser-0.6.1.tgz", + "integrity": "sha512-lCQNpV8R4lgsGcjX5667UiuDLk2micCtjtxR1YKbBXvN5w2v+FeLYoHrTSSrjwXdMcDYvE4ZBPvKT31dfeSmmA==", "license": "MIT", "dependencies": { "langium": "3.3.1" @@ -2174,13 +2197,13 @@ } }, "node_modules/@playwright/test": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.52.0.tgz", - "integrity": "sha512-uh6W7sb55hl7D6vsAeA+V2p5JnlAqzhqFyF0VcJkKZXkgnFcVG9PziERRHQfPLfNGx1C292a4JqbWzhR8L4R1g==", + "version": "1.53.2", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.53.2.tgz", + "integrity": "sha512-tEB2U5z74ebBeyfGNZ3Jfg29AnW+5HlWhvHtb/Mqco9pFdZU1ZLNdVb2UtB5CvmiilNr2ZfVH/qMmAROG/XTzw==", "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright": "1.52.0" + "playwright": "1.53.2" }, "bin": { "playwright": "cli.js" @@ -2263,9 +2286,9 @@ "license": "MIT" }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.44.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.44.1.tgz", - "integrity": "sha512-JAcBr1+fgqx20m7Fwe1DxPUl/hPkee6jA6Pl7n1v2EFiktAHenTaXl5aIFjUIEsfn9w3HE4gK1lEgNGMzBDs1w==", + "version": "4.44.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.44.2.tgz", + "integrity": "sha512-g0dF8P1e2QYPOj1gu7s/3LVP6kze9A7m6x0BZ9iTdXK8N5c2V7cpBKHV3/9A4Zd8xxavdhK0t4PnqjkqVmUc9Q==", "cpu": [ "arm" ], @@ -2277,9 +2300,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.44.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.44.1.tgz", - "integrity": "sha512-RurZetXqTu4p+G0ChbnkwBuAtwAbIwJkycw1n6GvlGlBuS4u5qlr5opix8cBAYFJgaY05TWtM+LaoFggUmbZEQ==", + "version": "4.44.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.44.2.tgz", + "integrity": "sha512-Yt5MKrOosSbSaAK5Y4J+vSiID57sOvpBNBR6K7xAaQvk3MkcNVV0f9fE20T+41WYN8hDn6SGFlFrKudtx4EoxA==", "cpu": [ "arm64" ], @@ -2291,9 +2314,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.44.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.44.1.tgz", - "integrity": "sha512-fM/xPesi7g2M7chk37LOnmnSTHLG/v2ggWqKj3CCA1rMA4mm5KVBT1fNoswbo1JhPuNNZrVwpTvlCVggv8A2zg==", + "version": "4.44.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.44.2.tgz", + "integrity": "sha512-EsnFot9ZieM35YNA26nhbLTJBHD0jTwWpPwmRVDzjylQT6gkar+zenfb8mHxWpRrbn+WytRRjE0WKsfaxBkVUA==", "cpu": [ "arm64" ], @@ -2305,9 +2328,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.44.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.44.1.tgz", - "integrity": "sha512-gDnWk57urJrkrHQ2WVx9TSVTH7lSlU7E3AFqiko+bgjlh78aJ88/3nycMax52VIVjIm3ObXnDL2H00e/xzoipw==", + "version": "4.44.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.44.2.tgz", + "integrity": "sha512-dv/t1t1RkCvJdWWxQ2lWOO+b7cMsVw5YFaS04oHpZRWehI1h0fV1gF4wgGCTyQHHjJDfbNpwOi6PXEafRBBezw==", "cpu": [ "x64" ], @@ -2319,9 +2342,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-arm64": { - "version": "4.44.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.44.1.tgz", - "integrity": "sha512-wnFQmJ/zPThM5zEGcnDcCJeYJgtSLjh1d//WuHzhf6zT3Md1BvvhJnWoy+HECKu2bMxaIcfWiu3bJgx6z4g2XA==", + "version": "4.44.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.44.2.tgz", + "integrity": "sha512-W4tt4BLorKND4qeHElxDoim0+BsprFTwb+vriVQnFFtT/P6v/xO5I99xvYnVzKWrK6j7Hb0yp3x7V5LUbaeOMg==", "cpu": [ "arm64" ], @@ -2333,9 +2356,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-x64": { - "version": "4.44.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.44.1.tgz", - "integrity": "sha512-uBmIxoJ4493YATvU2c0upGz87f99e3wop7TJgOA/bXMFd2SvKCI7xkxY/5k50bv7J6dw1SXT4MQBQSLn8Bb/Uw==", + "version": "4.44.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.44.2.tgz", + "integrity": "sha512-tdT1PHopokkuBVyHjvYehnIe20fxibxFCEhQP/96MDSOcyjM/shlTkZZLOufV3qO6/FQOSiJTBebhVc12JyPTA==", "cpu": [ "x64" ], @@ -2347,9 +2370,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.44.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.44.1.tgz", - "integrity": "sha512-n0edDmSHlXFhrlmTK7XBuwKlG5MbS7yleS1cQ9nn4kIeW+dJH+ExqNgQ0RrFRew8Y+0V/x6C5IjsHrJmiHtkxQ==", + "version": "4.44.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.44.2.tgz", + "integrity": "sha512-+xmiDGGaSfIIOXMzkhJ++Oa0Gwvl9oXUeIiwarsdRXSe27HUIvjbSIpPxvnNsRebsNdUo7uAiQVgBD1hVriwSQ==", "cpu": [ "arm" ], @@ -2361,9 +2384,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.44.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.44.1.tgz", - "integrity": "sha512-8WVUPy3FtAsKSpyk21kV52HCxB+me6YkbkFHATzC2Yd3yuqHwy2lbFL4alJOLXKljoRw08Zk8/xEj89cLQ/4Nw==", + "version": "4.44.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.44.2.tgz", + "integrity": "sha512-bDHvhzOfORk3wt8yxIra8N4k/N0MnKInCW5OGZaeDYa/hMrdPaJzo7CSkjKZqX4JFUWjUGm88lI6QJLCM7lDrA==", "cpu": [ "arm" ], @@ -2375,9 +2398,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.44.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.44.1.tgz", - "integrity": "sha512-yuktAOaeOgorWDeFJggjuCkMGeITfqvPgkIXhDqsfKX8J3jGyxdDZgBV/2kj/2DyPaLiX6bPdjJDTu9RB8lUPQ==", + "version": "4.44.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.44.2.tgz", + "integrity": "sha512-NMsDEsDiYghTbeZWEGnNi4F0hSbGnsuOG+VnNvxkKg0IGDvFh7UVpM/14mnMwxRxUf9AdAVJgHPvKXf6FpMB7A==", "cpu": [ "arm64" ], @@ -2389,9 +2412,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.44.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.44.1.tgz", - "integrity": "sha512-W+GBM4ifET1Plw8pdVaecwUgxmiH23CfAUj32u8knq0JPFyK4weRy6H7ooxYFD19YxBulL0Ktsflg5XS7+7u9g==", + "version": "4.44.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.44.2.tgz", + "integrity": "sha512-lb5bxXnxXglVq+7imxykIp5xMq+idehfl+wOgiiix0191av84OqbjUED+PRC5OA8eFJYj5xAGcpAZ0pF2MnW+A==", "cpu": [ "arm64" ], @@ -2403,9 +2426,9 @@ ] }, "node_modules/@rollup/rollup-linux-loongarch64-gnu": { - "version": "4.44.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.44.1.tgz", - "integrity": "sha512-1zqnUEMWp9WrGVuVak6jWTl4fEtrVKfZY7CvcBmUUpxAJ7WcSowPSAWIKa/0o5mBL/Ij50SIf9tuirGx63Ovew==", + "version": "4.44.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.44.2.tgz", + "integrity": "sha512-Yl5Rdpf9pIc4GW1PmkUGHdMtbx0fBLE1//SxDmuf3X0dUC57+zMepow2LK0V21661cjXdTn8hO2tXDdAWAqE5g==", "cpu": [ "loong64" ], @@ -2417,9 +2440,9 @@ ] }, "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { - "version": "4.44.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.44.1.tgz", - "integrity": "sha512-Rl3JKaRu0LHIx7ExBAAnf0JcOQetQffaw34T8vLlg9b1IhzcBgaIdnvEbbsZq9uZp3uAH+JkHd20Nwn0h9zPjA==", + "version": "4.44.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.44.2.tgz", + "integrity": "sha512-03vUDH+w55s680YYryyr78jsO1RWU9ocRMaeV2vMniJJW/6HhoTBwyyiiTPVHNWLnhsnwcQ0oH3S9JSBEKuyqw==", "cpu": [ "ppc64" ], @@ -2431,9 +2454,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.44.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.44.1.tgz", - "integrity": "sha512-j5akelU3snyL6K3N/iX7otLBIl347fGwmd95U5gS/7z6T4ftK288jKq3A5lcFKcx7wwzb5rgNvAg3ZbV4BqUSw==", + "version": "4.44.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.44.2.tgz", + "integrity": "sha512-iYtAqBg5eEMG4dEfVlkqo05xMOk6y/JXIToRca2bAWuqjrJYJlx/I7+Z+4hSrsWU8GdJDFPL4ktV3dy4yBSrzg==", "cpu": [ "riscv64" ], @@ -2445,9 +2468,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-musl": { - "version": "4.44.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.44.1.tgz", - "integrity": "sha512-ppn5llVGgrZw7yxbIm8TTvtj1EoPgYUAbfw0uDjIOzzoqlZlZrLJ/KuiE7uf5EpTpCTrNt1EdtzF0naMm0wGYg==", + "version": "4.44.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.44.2.tgz", + "integrity": "sha512-e6vEbgaaqz2yEHqtkPXa28fFuBGmUJ0N2dOJK8YUfijejInt9gfCSA7YDdJ4nYlv67JfP3+PSWFX4IVw/xRIPg==", "cpu": [ "riscv64" ], @@ -2459,9 +2482,9 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.44.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.44.1.tgz", - "integrity": "sha512-Hu6hEdix0oxtUma99jSP7xbvjkUM/ycke/AQQ4EC5g7jNRLLIwjcNwaUy95ZKBJJwg1ZowsclNnjYqzN4zwkAw==", + "version": "4.44.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.44.2.tgz", + "integrity": "sha512-evFOtkmVdY3udE+0QKrV5wBx7bKI0iHz5yEVx5WqDJkxp9YQefy4Mpx3RajIVcM6o7jxTvVd/qpC1IXUhGc1Mw==", "cpu": [ "s390x" ], @@ -2473,9 +2496,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.44.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.44.1.tgz", - "integrity": "sha512-EtnsrmZGomz9WxK1bR5079zee3+7a+AdFlghyd6VbAjgRJDbTANJ9dcPIPAi76uG05micpEL+gPGmAKYTschQw==", + "version": "4.44.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.44.2.tgz", + "integrity": "sha512-/bXb0bEsWMyEkIsUL2Yt5nFB5naLAwyOWMEviQfQY1x3l5WsLKgvZf66TM7UTfED6erckUVUJQ/jJ1FSpm3pRQ==", "cpu": [ "x64" ], @@ -2487,9 +2510,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.44.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.44.1.tgz", - "integrity": "sha512-iAS4p+J1az6Usn0f8xhgL4PaU878KEtutP4hqw52I4IO6AGoyOkHCxcc4bqufv1tQLdDWFx8lR9YlwxKuv3/3g==", + "version": "4.44.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.44.2.tgz", + "integrity": "sha512-3D3OB1vSSBXmkGEZR27uiMRNiwN08/RVAcBKwhUYPaiZ8bcvdeEwWPvbnXvvXHY+A/7xluzcN+kaiOFNiOZwWg==", "cpu": [ "x64" ], @@ -2501,9 +2524,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.44.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.44.1.tgz", - "integrity": "sha512-NtSJVKcXwcqozOl+FwI41OH3OApDyLk3kqTJgx8+gp6On9ZEt5mYhIsKNPGuaZr3p9T6NWPKGU/03Vw4CNU9qg==", + "version": "4.44.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.44.2.tgz", + "integrity": "sha512-VfU0fsMK+rwdK8mwODqYeM2hDrF2WiHaSmCBrS7gColkQft95/8tphyzv2EupVxn3iE0FI78wzffoULH1G+dkw==", "cpu": [ "arm64" ], @@ -2515,9 +2538,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.44.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.44.1.tgz", - "integrity": "sha512-JYA3qvCOLXSsnTR3oiyGws1Dm0YTuxAAeaYGVlGpUsHqloPcFjPg+X0Fj2qODGLNwQOAcCiQmHub/V007kiH5A==", + "version": "4.44.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.44.2.tgz", + "integrity": "sha512-+qMUrkbUurpE6DVRjiJCNGZBGo9xM4Y0FXU5cjgudWqIBWbcLkjE3XprJUsOFgC6xjBClwVa9k6O3A7K3vxb5Q==", "cpu": [ "ia32" ], @@ -2529,9 +2552,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.44.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.44.1.tgz", - "integrity": "sha512-J8o22LuF0kTe7m+8PvW9wk3/bRq5+mRo5Dqo6+vXb7otCm3TPhYOJqOaQtGU9YMWQSL3krMnoOxMr0+9E6F3Ug==", + "version": "4.44.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.44.2.tgz", + "integrity": "sha512-3+QZROYfJ25PDcxFF66UEk8jGWigHJeecZILvkPkyQN7oc5BvFo4YEXFkOs154j3FTMp9mn9Ky8RCOwastduEA==", "cpu": [ "x64" ], @@ -3050,9 +3073,9 @@ } }, "node_modules/@stylistic/eslint-plugin": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin/-/eslint-plugin-5.0.0.tgz", - "integrity": "sha512-nVV2FSzeTJ3oFKw+3t9gQYQcrgbopgCASSY27QOtkhEGgSfdQQjDmzZd41NeT1myQ8Wc6l+pZllST9qIu4NKzg==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin/-/eslint-plugin-5.1.0.tgz", + "integrity": "sha512-TJRJul4u/lmry5N/kyCU+7RWWOk0wyXN+BncRlDYBqpLFnzXkd7QGVfN7KewarFIXv0IX0jSF/Ksu7aHWEDeuw==", "dev": true, "license": "MIT", "dependencies": { @@ -3494,9 +3517,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "20.19.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.2.tgz", - "integrity": "sha512-9pLGGwdzOUBDYi0GNjM97FIA+f92fqSke6joWeBjWXllfNxZBs7qeMF7tvtOIsbY45xkWkxrdwUfUf3MnQa9gA==", + "version": "20.19.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.4.tgz", + "integrity": "sha512-OP+We5WV8Xnbuvw0zC2m4qfB/BJvjyCwtNjhHdJxV1639SGSKrLmJkc3fMnp2Qy8nJyHp8RO6umxELN/dS1/EA==", "license": "MIT", "dependencies": { "undici-types": "~6.21.0" @@ -3546,17 +3569,17 @@ "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.35.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.35.0.tgz", - "integrity": "sha512-ijItUYaiWuce0N1SoSMrEd0b6b6lYkYt99pqCPfybd+HKVXtEvYhICfLdwp42MhiI5mp0oq7PKEL+g1cNiz/Eg==", + "version": "8.35.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.35.1.tgz", + "integrity": "sha512-9XNTlo7P7RJxbVeICaIIIEipqxLKguyh+3UbXuT2XQuFp6d8VOeDEGuz5IiX0dgZo8CiI6aOFLg4e8cF71SFVg==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.35.0", - "@typescript-eslint/type-utils": "8.35.0", - "@typescript-eslint/utils": "8.35.0", - "@typescript-eslint/visitor-keys": "8.35.0", + "@typescript-eslint/scope-manager": "8.35.1", + "@typescript-eslint/type-utils": "8.35.1", + "@typescript-eslint/utils": "8.35.1", + "@typescript-eslint/visitor-keys": "8.35.1", "graphemer": "^1.4.0", "ignore": "^7.0.0", "natural-compare": "^1.4.0", @@ -3570,7 +3593,7 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^8.35.0", + "@typescript-eslint/parser": "^8.35.1", "eslint": "^8.57.0 || ^9.0.0", "typescript": ">=4.8.4 <5.9.0" } @@ -3586,16 +3609,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.35.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.35.0.tgz", - "integrity": "sha512-6sMvZePQrnZH2/cJkwRpkT7DxoAWh+g6+GFRK6bV3YQo7ogi3SX5rgF6099r5Q53Ma5qeT7LGmOmuIutF4t3lA==", + "version": "8.35.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.35.1.tgz", + "integrity": "sha512-3MyiDfrfLeK06bi/g9DqJxP5pV74LNv4rFTyvGDmT3x2p1yp1lOd+qYZfiRPIOf/oON+WRZR5wxxuF85qOar+w==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.35.0", - "@typescript-eslint/types": "8.35.0", - "@typescript-eslint/typescript-estree": "8.35.0", - "@typescript-eslint/visitor-keys": "8.35.0", + "@typescript-eslint/scope-manager": "8.35.1", + "@typescript-eslint/types": "8.35.1", + "@typescript-eslint/typescript-estree": "8.35.1", + "@typescript-eslint/visitor-keys": "8.35.1", "debug": "^4.3.4" }, "engines": { @@ -3611,14 +3634,14 @@ } }, "node_modules/@typescript-eslint/project-service": { - "version": "8.35.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.0.tgz", - "integrity": "sha512-41xatqRwWZuhUMF/aZm2fcUsOFKNcG28xqRSS6ZVr9BVJtGExosLAm5A1OxTjRMagx8nJqva+P5zNIGt8RIgbQ==", + "version": "8.35.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.1.tgz", + "integrity": "sha512-VYxn/5LOpVxADAuP3NrnxxHYfzVtQzLKeldIhDhzC8UHaiQvYlXvKuVho1qLduFbJjjy5U5bkGwa3rUGUb1Q6Q==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.35.0", - "@typescript-eslint/types": "^8.35.0", + "@typescript-eslint/tsconfig-utils": "^8.35.1", + "@typescript-eslint/types": "^8.35.1", "debug": "^4.3.4" }, "engines": { @@ -3633,14 +3656,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.35.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.0.tgz", - "integrity": "sha512-+AgL5+mcoLxl1vGjwNfiWq5fLDZM1TmTPYs2UkyHfFhgERxBbqHlNjRzhThJqz+ktBqTChRYY6zwbMwy0591AA==", + "version": "8.35.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.1.tgz", + "integrity": "sha512-s/Bpd4i7ht2934nG+UoSPlYXd08KYz3bmjLEb7Ye1UVob0d1ENiT3lY8bsCmik4RqfSbPw9xJJHbugpPpP5JUg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.35.0", - "@typescript-eslint/visitor-keys": "8.35.0" + "@typescript-eslint/types": "8.35.1", + "@typescript-eslint/visitor-keys": "8.35.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3651,9 +3674,9 @@ } }, "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.35.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.0.tgz", - "integrity": "sha512-04k/7247kZzFraweuEirmvUj+W3bJLI9fX6fbo1Qm2YykuBvEhRTPl8tcxlYO8kZZW+HIXfkZNoasVb8EV4jpA==", + "version": "8.35.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.1.tgz", + "integrity": "sha512-K5/U9VmT9dTHoNowWZpz+/TObS3xqC5h0xAIjXPw+MNcKV9qg6eSatEnmeAwkjHijhACH0/N7bkhKvbt1+DXWQ==", "dev": true, "license": "MIT", "engines": { @@ -3668,14 +3691,14 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.35.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.35.0.tgz", - "integrity": "sha512-ceNNttjfmSEoM9PW87bWLDEIaLAyR+E6BoYJQ5PfaDau37UGca9Nyq3lBk8Bw2ad0AKvYabz6wxc7DMTO2jnNA==", + "version": "8.35.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.35.1.tgz", + "integrity": "sha512-HOrUBlfVRz5W2LIKpXzZoy6VTZzMu2n8q9C2V/cFngIC5U1nStJgv0tMV4sZPzdf4wQm9/ToWUFPMN9Vq9VJQQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "8.35.0", - "@typescript-eslint/utils": "8.35.0", + "@typescript-eslint/typescript-estree": "8.35.1", + "@typescript-eslint/utils": "8.35.1", "debug": "^4.3.4", "ts-api-utils": "^2.1.0" }, @@ -3692,9 +3715,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.35.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.0.tgz", - "integrity": "sha512-0mYH3emanku0vHw2aRLNGqe7EXh9WHEhi7kZzscrMDf6IIRUQ5Jk4wp1QrledE/36KtdZrVfKnE32eZCf/vaVQ==", + "version": "8.35.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.1.tgz", + "integrity": "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ==", "dev": true, "license": "MIT", "engines": { @@ -3706,16 +3729,16 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.35.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.0.tgz", - "integrity": "sha512-F+BhnaBemgu1Qf8oHrxyw14wq6vbL8xwWKKMwTMwYIRmFFY/1n/9T/jpbobZL8vp7QyEUcC6xGrnAO4ua8Kp7w==", + "version": "8.35.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.1.tgz", + "integrity": "sha512-Vvpuvj4tBxIka7cPs6Y1uvM7gJgdF5Uu9F+mBJBPY4MhvjrjWGK4H0lVgLJd/8PWZ23FTqsaJaLEkBCFUk8Y9g==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/project-service": "8.35.0", - "@typescript-eslint/tsconfig-utils": "8.35.0", - "@typescript-eslint/types": "8.35.0", - "@typescript-eslint/visitor-keys": "8.35.0", + "@typescript-eslint/project-service": "8.35.1", + "@typescript-eslint/tsconfig-utils": "8.35.1", + "@typescript-eslint/types": "8.35.1", + "@typescript-eslint/visitor-keys": "8.35.1", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", @@ -3768,16 +3791,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.35.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.35.0.tgz", - "integrity": "sha512-nqoMu7WWM7ki5tPgLVsmPM8CkqtoPUG6xXGeefM5t4x3XumOEKMoUZPdi+7F+/EotukN4R9OWdmDxN80fqoZeg==", + "version": "8.35.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.35.1.tgz", + "integrity": "sha512-lhnwatFmOFcazAsUm3ZnZFpXSxiwoa1Lj50HphnDe1Et01NF4+hrdXONSUHIcbVu2eFb1bAf+5yjXkGVkXBKAQ==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.7.0", - "@typescript-eslint/scope-manager": "8.35.0", - "@typescript-eslint/types": "8.35.0", - "@typescript-eslint/typescript-estree": "8.35.0" + "@typescript-eslint/scope-manager": "8.35.1", + "@typescript-eslint/types": "8.35.1", + "@typescript-eslint/typescript-estree": "8.35.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3792,13 +3815,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.35.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.0.tgz", - "integrity": "sha512-zTh2+1Y8ZpmeQaQVIc/ZZxsx8UzgKJyNg1PTvjzC7WMhPSVS8bfDX34k1SrwOf016qd5RU3az2UxUNue3IfQ5g==", + "version": "8.35.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.1.tgz", + "integrity": "sha512-VRwixir4zBWCSTP/ljEo091lbpypz57PoeAQ9imjG+vbeof9LplljsL1mos4ccG6H9IjfrVGM359RozUnuFhpw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.35.0", + "@typescript-eslint/types": "8.35.1", "eslint-visitor-keys": "^4.2.1" }, "engines": { @@ -3810,9 +3833,9 @@ } }, "node_modules/@unrs/resolver-binding-android-arm-eabi": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm-eabi/-/resolver-binding-android-arm-eabi-1.9.2.tgz", - "integrity": "sha512-tS+lqTU3N0kkthU+rYp0spAYq15DU8ld9kXkaKg9sbQqJNF+WPMuNHZQGCgdxrUOEO0j22RKMwRVhF1HTl+X8A==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm-eabi/-/resolver-binding-android-arm-eabi-1.11.0.tgz", + "integrity": "sha512-LRw5BW29sYj9NsQC6QoqeLVQhEa+BwVINYyMlcve+6stwdBsSt5UB7zw4UZB4+4PNqIVilHoMaPWCb/KhABHQw==", "cpu": [ "arm" ], @@ -3824,9 +3847,9 @@ ] }, "node_modules/@unrs/resolver-binding-android-arm64": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm64/-/resolver-binding-android-arm64-1.9.2.tgz", - "integrity": "sha512-MffGiZULa/KmkNjHeuuflLVqfhqLv1vZLm8lWIyeADvlElJ/GLSOkoUX+5jf4/EGtfwrNFcEaB8BRas03KT0/Q==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm64/-/resolver-binding-android-arm64-1.11.0.tgz", + "integrity": "sha512-zYX8D2zcWCAHqghA8tPjbp7LwjVXbIZP++mpU/Mrf5jUVlk3BWIxkeB8yYzZi5GpFSlqMcRZQxQqbMI0c2lASQ==", "cpu": [ "arm64" ], @@ -3838,9 +3861,9 @@ ] }, "node_modules/@unrs/resolver-binding-darwin-arm64": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.9.2.tgz", - "integrity": "sha512-dzJYK5rohS1sYl1DHdJ3mwfwClJj5BClQnQSyAgEfggbUwA9RlROQSSbKBLqrGfsiC/VyrDPtbO8hh56fnkbsQ==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.11.0.tgz", + "integrity": "sha512-YsYOT049hevAY/lTYD77GhRs885EXPeAfExG5KenqMJ417nYLS2N/kpRpYbABhFZBVQn+2uRPasTe4ypmYoo3w==", "cpu": [ "arm64" ], @@ -3852,9 +3875,9 @@ ] }, "node_modules/@unrs/resolver-binding-darwin-x64": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.9.2.tgz", - "integrity": "sha512-gaIMWK+CWtXcg9gUyznkdV54LzQ90S3X3dn8zlh+QR5Xy7Y+Efqw4Rs4im61K1juy4YNb67vmJsCDAGOnIeffQ==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.11.0.tgz", + "integrity": "sha512-PSjvk3OZf1aZImdGY5xj9ClFG3bC4gnSSYWrt+id0UAv+GwwVldhpMFjAga8SpMo2T1GjV9UKwM+QCsQCQmtdA==", "cpu": [ "x64" ], @@ -3866,9 +3889,9 @@ ] }, "node_modules/@unrs/resolver-binding-freebsd-x64": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.9.2.tgz", - "integrity": "sha512-S7QpkMbVoVJb0xwHFwujnwCAEDe/596xqY603rpi/ioTn9VDgBHnCCxh+UFrr5yxuMH+dliHfjwCZJXOPJGPnw==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.11.0.tgz", + "integrity": "sha512-KC/iFaEN/wsTVYnHClyHh5RSYA9PpuGfqkFua45r4sweXpC0KHZ+BYY7ikfcGPt5w1lMpR1gneFzuqWLQxsRKg==", "cpu": [ "x64" ], @@ -3880,9 +3903,9 @@ ] }, "node_modules/@unrs/resolver-binding-linux-arm-gnueabihf": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.9.2.tgz", - "integrity": "sha512-+XPUMCuCCI80I46nCDFbGum0ZODP5NWGiwS3Pj8fOgsG5/ctz+/zzuBlq/WmGa+EjWZdue6CF0aWWNv84sE1uw==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.11.0.tgz", + "integrity": "sha512-CDh/0v8uot43cB4yKtDL9CVY8pbPnMV0dHyQCE4lFz6PW/+9tS0i9eqP5a91PAqEBVMqH1ycu+k8rP6wQU846w==", "cpu": [ "arm" ], @@ -3894,9 +3917,9 @@ ] }, "node_modules/@unrs/resolver-binding-linux-arm-musleabihf": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.9.2.tgz", - "integrity": "sha512-sqvUyAd1JUpwbz33Ce2tuTLJKM+ucSsYpPGl2vuFwZnEIg0CmdxiZ01MHQ3j6ExuRqEDUCy8yvkDKvjYFPb8Zg==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.11.0.tgz", + "integrity": "sha512-+TE7epATDSnvwr3L/hNHX3wQ8KQYB+jSDTdywycg3qDqvavRP8/HX9qdq/rMcnaRDn4EOtallb3vL/5wCWGCkw==", "cpu": [ "arm" ], @@ -3908,9 +3931,9 @@ ] }, "node_modules/@unrs/resolver-binding-linux-arm64-gnu": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.9.2.tgz", - "integrity": "sha512-UYA0MA8ajkEDCFRQdng/FVx3F6szBvk3EPnkTTQuuO9lV1kPGuTB+V9TmbDxy5ikaEgyWKxa4CI3ySjklZ9lFA==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.11.0.tgz", + "integrity": "sha512-VBAYGg3VahofpQ+L4k/ZO8TSICIbUKKTaMYOWHWfuYBFqPbSkArZZLezw3xd27fQkxX4BaLGb/RKnW0dH9Y/UA==", "cpu": [ "arm64" ], @@ -3922,9 +3945,9 @@ ] }, "node_modules/@unrs/resolver-binding-linux-arm64-musl": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.9.2.tgz", - "integrity": "sha512-P/CO3ODU9YJIHFqAkHbquKtFst0COxdphc8TKGL5yCX75GOiVpGqd1d15ahpqu8xXVsqP4MGFP2C3LRZnnL5MA==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.11.0.tgz", + "integrity": "sha512-9IgGFUUb02J1hqdRAHXpZHIeUHRrbnGo6vrRbz0fREH7g+rzQy53/IBSyadZ/LG5iqMxukriNPu4hEMUn+uWEg==", "cpu": [ "arm64" ], @@ -3936,9 +3959,9 @@ ] }, "node_modules/@unrs/resolver-binding-linux-ppc64-gnu": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.9.2.tgz", - "integrity": "sha512-uKStFlOELBxBum2s1hODPtgJhY4NxYJE9pAeyBgNEzHgTqTiVBPjfTlPFJkfxyTjQEuxZbbJlJnMCrRgD7ubzw==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.11.0.tgz", + "integrity": "sha512-LR4iQ/LPjMfivpL2bQ9kmm3UnTas3U+umcCnq/CV7HAkukVdHxrDD1wwx74MIWbbgzQTLPYY7Ur2MnnvkYJCBQ==", "cpu": [ "ppc64" ], @@ -3950,9 +3973,9 @@ ] }, "node_modules/@unrs/resolver-binding-linux-riscv64-gnu": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.9.2.tgz", - "integrity": "sha512-LkbNnZlhINfY9gK30AHs26IIVEZ9PEl9qOScYdmY2o81imJYI4IMnJiW0vJVtXaDHvBvxeAgEy5CflwJFIl3tQ==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.11.0.tgz", + "integrity": "sha512-HCupFQwMrRhrOg7YHrobbB5ADg0Q8RNiuefqMHVsdhEy9lLyXm/CxsCXeLJdrg27NAPsCaMDtdlm8Z2X8x91Tg==", "cpu": [ "riscv64" ], @@ -3964,9 +3987,9 @@ ] }, "node_modules/@unrs/resolver-binding-linux-riscv64-musl": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.9.2.tgz", - "integrity": "sha512-vI+e6FzLyZHSLFNomPi+nT+qUWN4YSj8pFtQZSFTtmgFoxqB6NyjxSjAxEC1m93qn6hUXhIsh8WMp+fGgxCoRg==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.11.0.tgz", + "integrity": "sha512-Ckxy76A5xgjWa4FNrzcKul5qFMWgP5JSQ5YKd0XakmWOddPLSkQT+uAvUpQNnFGNbgKzv90DyQlxPDYPQ4nd6A==", "cpu": [ "riscv64" ], @@ -3978,9 +4001,9 @@ ] }, "node_modules/@unrs/resolver-binding-linux-s390x-gnu": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.9.2.tgz", - "integrity": "sha512-sSO4AlAYhSM2RAzBsRpahcJB1msc6uYLAtP6pesPbZtptF8OU/CbCPhSRW6cnYOGuVmEmWVW5xVboAqCnWTeHQ==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.11.0.tgz", + "integrity": "sha512-HfO0PUCCRte2pMJmVyxPI+eqT7KuV3Fnvn2RPvMe5mOzb2BJKf4/Vth8sSt9cerQboMaTVpbxyYjjLBWIuI5BQ==", "cpu": [ "s390x" ], @@ -3992,9 +4015,9 @@ ] }, "node_modules/@unrs/resolver-binding-linux-x64-gnu": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.9.2.tgz", - "integrity": "sha512-jkSkwch0uPFva20Mdu8orbQjv2A3G88NExTN2oPTI1AJ+7mZfYW3cDCTyoH6OnctBKbBVeJCEqh0U02lTkqD5w==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.11.0.tgz", + "integrity": "sha512-9PZdjP7tLOEjpXHS6+B/RNqtfVUyDEmaViPOuSqcbomLdkJnalt5RKQ1tr2m16+qAufV0aDkfhXtoO7DQos/jg==", "cpu": [ "x64" ], @@ -4006,9 +4029,9 @@ ] }, "node_modules/@unrs/resolver-binding-linux-x64-musl": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.9.2.tgz", - "integrity": "sha512-Uk64NoiTpQbkpl+bXsbeyOPRpUoMdcUqa+hDC1KhMW7aN1lfW8PBlBH4mJ3n3Y47dYE8qi0XTxy1mBACruYBaw==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.11.0.tgz", + "integrity": "sha512-qkE99ieiSKMnFJY/EfyGKVtNra52/k+lVF/PbO4EL5nU6AdvG4XhtJ+WHojAJP7ID9BNIra/yd75EHndewNRfA==", "cpu": [ "x64" ], @@ -4020,9 +4043,9 @@ ] }, "node_modules/@unrs/resolver-binding-wasm32-wasi": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.9.2.tgz", - "integrity": "sha512-EpBGwkcjDicjR/ybC0g8wO5adPNdVuMrNalVgYcWi+gYtC1XYNuxe3rufcO7dA76OHGeVabcO6cSkPJKVcbCXQ==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.11.0.tgz", + "integrity": "sha512-MjXek8UL9tIX34gymvQLecz2hMaQzOlaqYJJBomwm1gsvK2F7hF+YqJJ2tRyBDTv9EZJGMt4KlKkSD/gZWCOiw==", "cpu": [ "wasm32" ], @@ -4037,9 +4060,9 @@ } }, "node_modules/@unrs/resolver-binding-win32-arm64-msvc": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.9.2.tgz", - "integrity": "sha512-EdFbGn7o1SxGmN6aZw9wAkehZJetFPao0VGZ9OMBwKx6TkvDuj6cNeLimF/Psi6ts9lMOe+Dt6z19fZQ9Ye2fw==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.11.0.tgz", + "integrity": "sha512-9LT6zIGO7CHybiQSh7DnQGwFMZvVr0kUjah6qQfkH2ghucxPV6e71sUXJdSM4Ba0MaGE6DC/NwWf7mJmc3DAng==", "cpu": [ "arm64" ], @@ -4051,9 +4074,9 @@ ] }, "node_modules/@unrs/resolver-binding-win32-ia32-msvc": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.9.2.tgz", - "integrity": "sha512-JY9hi1p7AG+5c/dMU8o2kWemM8I6VZxfGwn1GCtf3c5i+IKcMo2NQ8OjZ4Z3/itvY/Si3K10jOBQn7qsD/whUA==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.11.0.tgz", + "integrity": "sha512-HYchBYOZ7WN266VjoGm20xFv5EonG/ODURRgwl9EZT7Bq1nLEs6VKJddzfFdXEAho0wfFlt8L/xIiE29Pmy1RA==", "cpu": [ "ia32" ], @@ -4065,9 +4088,9 @@ ] }, "node_modules/@unrs/resolver-binding-win32-x64-msvc": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.9.2.tgz", - "integrity": "sha512-ryoo+EB19lMxAd80ln9BVf8pdOAxLb97amrQ3SFN9OCRn/5M5wvwDgAe4i8ZjhpbiHoDeP8yavcTEnpKBo7lZg==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.11.0.tgz", + "integrity": "sha512-+oLKLHw3I1UQo4MeHfoLYF+e6YBa8p5vYUw3Rgt7IDzCs+57vIZqQlIo62NDpYM0VG6BjWOwnzBczMvbtH8hag==", "cpu": [ "x64" ], @@ -4096,9 +4119,9 @@ } }, "node_modules/@vitest/coverage-v8": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-3.2.3.tgz", - "integrity": "sha512-D1QKzngg8PcDoCE8FHSZhREDuEy+zcKmMiMafYse41RZpBE5EDJyKOTdqK3RQfsV2S2nyKor5KCs8PyPRFqKPg==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-3.2.4.tgz", + "integrity": "sha512-EyF9SXU6kS5Ku/U82E259WSnvg6c8KTjppUncuNdm5QHpe17mwREHnjDzozC8x9MZ0xfBUFSaLkRv4TMA75ALQ==", "dev": true, "license": "MIT", "dependencies": { @@ -4120,8 +4143,8 @@ "url": "https://opencollective.com/vitest" }, "peerDependencies": { - "@vitest/browser": "3.2.3", - "vitest": "3.2.3" + "@vitest/browser": "3.2.4", + "vitest": "3.2.4" }, "peerDependenciesMeta": { "@vitest/browser": { @@ -4140,13 +4163,13 @@ } }, "node_modules/@vitest/eslint-plugin": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@vitest/eslint-plugin/-/eslint-plugin-1.2.2.tgz", - "integrity": "sha512-R8NwW+VxyKqVGcMfYsUbdThQyMbtNcoeg+jJeTgMHqWdFdcS0nrODAQXhkplvWzgd7jIJ+GQeydGqFLibsxMxg==", + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/@vitest/eslint-plugin/-/eslint-plugin-1.3.4.tgz", + "integrity": "sha512-EOg8d0jn3BAiKnR55WkFxmxfWA3nmzrbIIuOXyTe6A72duryNgyU+bdBEauA97Aab3ho9kLmAwgPX63Ckj4QEg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/utils": "^8.24.0" + "@typescript-eslint/utils": "^8.24.1" }, "peerDependencies": { "eslint": ">= 8.57.0", @@ -4163,15 +4186,15 @@ } }, "node_modules/@vitest/expect": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.2.3.tgz", - "integrity": "sha512-W2RH2TPWVHA1o7UmaFKISPvdicFJH+mjykctJFoAkUw+SPTJTGjUNdKscFBrqM7IPnCVu6zihtKYa7TkZS1dkQ==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.2.4.tgz", + "integrity": "sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==", "dev": true, "license": "MIT", "dependencies": { "@types/chai": "^5.2.2", - "@vitest/spy": "3.2.3", - "@vitest/utils": "3.2.3", + "@vitest/spy": "3.2.4", + "@vitest/utils": "3.2.4", "chai": "^5.2.0", "tinyrainbow": "^2.0.0" }, @@ -4180,13 +4203,13 @@ } }, "node_modules/@vitest/mocker": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.2.3.tgz", - "integrity": "sha512-cP6fIun+Zx8he4rbWvi+Oya6goKQDZK+Yq4hhlggwQBbrlOQ4qtZ+G4nxB6ZnzI9lyIb+JnvyiJnPC2AGbKSPA==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.2.4.tgz", + "integrity": "sha512-46ryTE9RZO/rfDd7pEqFl7etuyzekzEhUbTW3BvmeO/BcCMEgq59BKhek3dXDWgAj4oMK6OZi+vRr1wPW6qjEQ==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/spy": "3.2.3", + "@vitest/spy": "3.2.4", "estree-walker": "^3.0.3", "magic-string": "^0.30.17" }, @@ -4234,9 +4257,9 @@ } }, "node_modules/@vitest/pretty-format": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.2.3.tgz", - "integrity": "sha512-yFglXGkr9hW/yEXngO+IKMhP0jxyFw2/qys/CK4fFUZnSltD+MU7dVYGrH8rvPcK/O6feXQA+EU33gjaBBbAng==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.2.4.tgz", + "integrity": "sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==", "dev": true, "license": "MIT", "dependencies": { @@ -4247,13 +4270,13 @@ } }, "node_modules/@vitest/runner": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.2.3.tgz", - "integrity": "sha512-83HWYisT3IpMaU9LN+VN+/nLHVBCSIUKJzGxC5RWUOsK1h3USg7ojL+UXQR3b4o4UBIWCYdD2fxuzM7PQQ1u8w==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.2.4.tgz", + "integrity": "sha512-oukfKT9Mk41LreEW09vt45f8wx7DordoWUZMYdY/cyAk7w5TWkTRCNZYF7sX7n2wB7jyGAl74OxgwhPgKaqDMQ==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/utils": "3.2.3", + "@vitest/utils": "3.2.4", "pathe": "^2.0.3", "strip-literal": "^3.0.0" }, @@ -4262,13 +4285,13 @@ } }, "node_modules/@vitest/snapshot": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.2.3.tgz", - "integrity": "sha512-9gIVWx2+tysDqUmmM1L0hwadyumqssOL1r8KJipwLx5JVYyxvVRfxvMq7DaWbZZsCqZnu/dZedaZQh4iYTtneA==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.2.4.tgz", + "integrity": "sha512-dEYtS7qQP2CjU27QBC5oUOxLE/v5eLkGqPE0ZKEIDGMs4vKWe7IjgLOeauHsR0D5YuuycGRO5oSRXnwnmA78fQ==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "3.2.3", + "@vitest/pretty-format": "3.2.4", "magic-string": "^0.30.17", "pathe": "^2.0.3" }, @@ -4287,9 +4310,9 @@ } }, "node_modules/@vitest/spy": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.2.3.tgz", - "integrity": "sha512-JHu9Wl+7bf6FEejTCREy+DmgWe+rQKbK+y32C/k5f4TBIAlijhJbRBIRIOCEpVevgRsCQR2iHRUH2/qKVM/plw==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.2.4.tgz", + "integrity": "sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==", "dev": true, "license": "MIT", "dependencies": { @@ -4300,14 +4323,14 @@ } }, "node_modules/@vitest/utils": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.2.3.tgz", - "integrity": "sha512-4zFBCU5Pf+4Z6v+rwnZ1HU1yzOKKvDkMXZrymE2PBlbjKJRlrOxbvpfPSvJTGRIwGoahaOGvp+kbCoxifhzJ1Q==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.2.4.tgz", + "integrity": "sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "3.2.3", - "loupe": "^3.1.3", + "@vitest/pretty-format": "3.2.4", + "loupe": "^3.1.4", "tinyrainbow": "^2.0.0" }, "funding": { @@ -4671,6 +4694,18 @@ "node": ">=0.4.0" } }, + "node_modules/acorn-import-phases": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/acorn-import-phases/-/acorn-import-phases-1.0.3.tgz", + "integrity": "sha512-jtKLnfoOzm28PazuQ4dVBcE9Jeo6ha1GAJvq3N0LlNOszmTfx+wSycBehn+FN0RnyeR77IBxN/qVYMw0Rlj0Xw==", + "license": "MIT", + "engines": { + "node": ">=10.13.0" + }, + "peerDependencies": { + "acorn": "^8.14.0" + } + }, "node_modules/acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", @@ -5245,14 +5280,14 @@ } }, "node_modules/cacheable": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/cacheable/-/cacheable-1.10.0.tgz", - "integrity": "sha512-SSgQTAnhd7WlJXnGlIi4jJJOiHzgnM5wRMEPaXAU4kECTAMpBoYKoZ9i5zHmclIEZbxcu3j7yY/CF8DTmwIsHg==", + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/cacheable/-/cacheable-1.10.1.tgz", + "integrity": "sha512-Fa2BZY0CS9F0PFc/6aVA6tgpOdw+hmv9dkZOlHXII5v5Hw+meJBIWDcPrG9q/dXxGcNbym5t77fzmawrBQfTmQ==", "dev": true, "license": "MIT", "dependencies": { - "hookified": "^1.8.2", - "keyv": "^5.3.3" + "hookified": "^1.10.0", + "keyv": "^5.3.4" } }, "node_modules/cacheable/node_modules/keyv": { @@ -5334,9 +5369,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001726", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001726.tgz", - "integrity": "sha512-VQAUIUzBiZ/UnlM28fSp2CRF3ivUn1BWEvxMcVTNwpw91Py1pGbPIyIKtd+tzct9C3ouceCVdGAXxZOpZAsgdw==", + "version": "1.0.30001727", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001727.tgz", + "integrity": "sha512-pB68nIHmbN6L/4C6MH1DokyR3bYqFwjaSs/sWDHGj4CTcFtQUQMuJftVwWkXq7mNWOybD3KhUv3oWHoGxgP14Q==", "funding": [ { "type": "opencollective", @@ -5539,9 +5574,9 @@ } }, "node_modules/ci-info": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.2.0.tgz", - "integrity": "sha512-cYY9mypksY8NRqgDB1XD1RiJL338v/551niynFTGkZOO2LHuB2OmOYxDIe/ttN9AHwrqdum1360G3ald0W9kCg==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz", + "integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==", "dev": true, "funding": [ { @@ -6904,9 +6939,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.177", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.177.tgz", - "integrity": "sha512-7EH2G59nLsEMj97fpDuvVcYi6lwTcM1xuWw3PssD8xzboAW7zj7iB3COEEEATUfjLHrs5uKBLQT03V/8URx06g==", + "version": "1.5.179", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.179.tgz", + "integrity": "sha512-UWKi/EbBopgfFsc5k61wFpV7WrnnSlSzW/e2XcBmS6qKYTivZlLtoll5/rdqRTxGglGHkmkW0j0pFNJG10EUIQ==", "license": "ISC" }, "node_modules/emoji-regex": { @@ -7250,9 +7285,9 @@ } }, "node_modules/eslint": { - "version": "9.30.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.30.0.tgz", - "integrity": "sha512-iN/SiPxmQu6EVkf+m1qpBxzUhE12YqFLOSySuOyVLJLEF9nzTf+h/1AJYc1JWzCnktggeNrjvQGLngDzXirU6g==", + "version": "9.30.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.30.1.tgz", + "integrity": "sha512-zmxXPNMOXmwm9E0yQLi5uqXHs7uq2UIiqEKo3Gq+3fwo1XrJ+hijAZImyF7hclW3E6oHz43Yk3RP8at6OTKflQ==", "dev": true, "license": "MIT", "dependencies": { @@ -7262,7 +7297,7 @@ "@eslint/config-helpers": "^0.3.0", "@eslint/core": "^0.14.0", "@eslint/eslintrc": "^3.3.1", - "@eslint/js": "9.30.0", + "@eslint/js": "9.30.1", "@eslint/plugin-kit": "^0.3.1", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", @@ -7669,9 +7704,9 @@ "license": "MIT" }, "node_modules/eslint-plugin-vue": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-10.2.0.tgz", - "integrity": "sha512-tl9s+KN3z0hN2b8fV2xSs5ytGl7Esk1oSCxULLwFcdaElhZ8btYYZFrWxvh4En+czrSDtuLCeCOGa8HhEZuBdQ==", + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-10.3.0.tgz", + "integrity": "sha512-A0u9snqjCfYaPnqqOaH6MBLVWDUIN4trXn8J3x67uDcXvR7X6Ut8p16N+nYhMCQ9Y7edg2BIRGzfyZsY0IdqoQ==", "dev": true, "license": "MIT", "dependencies": { @@ -7686,24 +7721,30 @@ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "peerDependencies": { + "@typescript-eslint/parser": "^7.0.0 || ^8.0.0", "eslint": "^8.57.0 || ^9.0.0", "vue-eslint-parser": "^10.0.0" + }, + "peerDependenciesMeta": { + "@typescript-eslint/parser": { + "optional": true + } } }, "node_modules/eslint-plugin-vue-scoped-css": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-vue-scoped-css/-/eslint-plugin-vue-scoped-css-2.10.0.tgz", - "integrity": "sha512-oH2NY7XFHF3EGOotvuPdnhB0x4uOmjoRoWZVfMnJ2PILDKVgZgM8WZ0rhDlh+fsr9jO9P8CAXO5/9s9v/GZNhg==", + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-vue-scoped-css/-/eslint-plugin-vue-scoped-css-2.11.0.tgz", + "integrity": "sha512-rrJgLY8iroTIUMSyxhyhJzFcRxABbk3gFrOLkl41F9G1VBqNNpDShyf6PmDoBEWDk07/bJlnqYlvnQ3giUrRYQ==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "eslint-compat-utils": "^0.6.0", + "eslint-compat-utils": "^0.6.5", "lodash": "^4.17.21", "postcss": "^8.4.31", "postcss-safe-parser": "^6.0.0", "postcss-scss": "^4.0.3", - "postcss-selector-parser": "^6.0.9", + "postcss-selector-parser": "^7.0.0", "postcss-styl": "^0.12.0" }, "engines": { @@ -7717,6 +7758,20 @@ "vue-eslint-parser": ">=7.1.0" } }, + "node_modules/eslint-plugin-vue-scoped-css/node_modules/postcss-selector-parser": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz", + "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==", + "dev": true, + "license": "MIT", + "dependencies": { + "cssesc": "^3.0.0", + "util-deprecate": "^1.0.2" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/eslint-plugin-wc": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/eslint-plugin-wc/-/eslint-plugin-wc-3.0.1.tgz", @@ -7893,9 +7948,9 @@ } }, "node_modules/expect-type": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.2.1.tgz", - "integrity": "sha512-/kP8CAwxzLVEeFrMm4kMmy4CCDlpipyA7MYLVrdJIkV0fYF0UaigQHRsxHiuY/GEea+bh4KSv3TIlgr+2UL6bw==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.2.2.tgz", + "integrity": "sha512-JhFGDVJ7tmDJItKhYgJCGLOWjuK9vPxiXoUFLwLDc99NlmklilbiQJwoctZtt13+xMw91MCk/REan6MWHqDjyA==", "dev": true, "license": "Apache-2.0", "engines": { @@ -8440,9 +8495,9 @@ } }, "node_modules/globals": { - "version": "16.1.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-16.1.0.tgz", - "integrity": "sha512-aibexHNbb/jiUSObBgpHLj+sIuUmJnYcgXBlrfsiDZ9rt4aF2TFRbyLgZ2iFQuVZ1K5Mx3FVkbKRSgKrbK3K2g==", + "version": "16.3.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-16.3.0.tgz", + "integrity": "sha512-bqWEnJ1Nt3neqx2q5SFfGS8r/ahumIakg3HcwtNlrVlwXIeNumWn/c7Pn/wKzGhf6SaW6H6uWXLqC30STCMchQ==", "dev": true, "license": "MIT", "engines": { @@ -10538,14 +10593,14 @@ } }, "node_modules/mermaid": { - "version": "11.7.0", - "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-11.7.0.tgz", - "integrity": "sha512-/1/5R0rt0Z1Ak0CuznAnCF3HtQgayRXUz6SguzOwN4L+DuCobz0UxnQ+ZdTSZ3AugKVVh78tiVmsHpHWV25TCw==", + "version": "11.8.1", + "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-11.8.1.tgz", + "integrity": "sha512-VSXJLqP1Sqw5sGr273mhvpPRhXwE6NlmMSqBZQw+yZJoAJkOIPPn/uT3teeCBx60Fkt5zEI3FrH2eVT0jXRDzw==", "license": "MIT", "dependencies": { "@braintree/sanitize-url": "^7.0.4", "@iconify/utils": "^2.1.33", - "@mermaid-js/parser": "^0.5.0", + "@mermaid-js/parser": "^0.6.1", "@types/d3": "^7.4.3", "cytoscape": "^3.29.3", "cytoscape-cose-bilkent": "^4.1.0", @@ -11320,9 +11375,9 @@ } }, "node_modules/napi-postinstall": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/napi-postinstall/-/napi-postinstall-0.2.5.tgz", - "integrity": "sha512-kmsgUvCRIJohHjbZ3V8avP0I1Pekw329MVAMDzVxsrkjgdnqiwvMX5XwR+hWV66vsAtZ+iM+fVnq8RTQawUmCQ==", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/napi-postinstall/-/napi-postinstall-0.3.0.tgz", + "integrity": "sha512-M7NqKyhODKV1gRLdkwE7pDsZP2/SC2a2vHkOYh9MCpKMbWVfyVfUw5MaH83Fv6XMjxr5jryUp3IDDL9rlxsTeA==", "dev": true, "license": "MIT", "bin": { @@ -11919,9 +11974,9 @@ } }, "node_modules/pkg-types": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.1.1.tgz", - "integrity": "sha512-eY0QFb6eSwc9+0d/5D2lFFUq+A3n3QNGSy/X2Nvp+6MfzGw2u6EbA7S80actgjY1lkvvI0pqB+a4hioMh443Ew==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.2.0.tgz", + "integrity": "sha512-2SM/GZGAEkPp3KWORxQZns4M+WSeXbC2HEvmOIJe3Cmiv6ieAJvdVhDldtHqM5J1Y7MrR1XhkBT/rMlhh9FdqQ==", "license": "MIT", "dependencies": { "confbox": "^0.2.2", @@ -11930,13 +11985,13 @@ } }, "node_modules/playwright": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.52.0.tgz", - "integrity": "sha512-JAwMNMBlxJ2oD1kce4KPtMkDeKGHQstdpFPcPH3maElAXon/QZeTvtsfXmTMRyO9TslfoYOXkSsvao2nE1ilTw==", + "version": "1.53.2", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.53.2.tgz", + "integrity": "sha512-6K/qQxVFuVQhRQhFsVZ9fGeatxirtrpPgxzBYWyZLEXJzqYwuL4fuNmfOfD5et1tJE4GScKyPNeLhZeRwuTU3A==", "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright-core": "1.52.0" + "playwright-core": "1.53.2" }, "bin": { "playwright": "cli.js" @@ -11949,9 +12004,9 @@ } }, "node_modules/playwright-core": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.52.0.tgz", - "integrity": "sha512-l2osTgLXSMeuLZOML9qYODUQoPPnUsKsb5/P6LJ2e6uPKXUdPK5WYhN4z03G+YNbWmGDY4YENauNu4ZKczreHg==", + "version": "1.53.2", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.53.2.tgz", + "integrity": "sha512-ox/OytMy+2w1jcYEYlOo1Hhp8hZkLCximMTUTMBXjGUA1KoFfiSZ+DU+3a739jsPY0yoKH2TFy9S2fsJas8yAw==", "dev": true, "license": "Apache-2.0", "bin": { @@ -13189,9 +13244,9 @@ } }, "node_modules/sharp": { - "version": "0.34.2", - "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.34.2.tgz", - "integrity": "sha512-lszvBmB9QURERtyKT2bNmsgxXK0ShJrL/fvqlonCo7e6xBF8nT8xU6pW+PMIbLsz0RxQk3rgH9kd8UmvOzlMJg==", + "version": "0.34.3", + "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.34.3.tgz", + "integrity": "sha512-eX2IQ6nFohW4DbvHIOLRB3MHFpYqaqvXd3Tp5e/T/dSH83fxaNJQRvDMhASmkNTsNTVF2/OOopzRCt7xokgPfg==", "dev": true, "hasInstallScript": true, "license": "Apache-2.0", @@ -13207,27 +13262,28 @@ "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-darwin-arm64": "0.34.2", - "@img/sharp-darwin-x64": "0.34.2", - "@img/sharp-libvips-darwin-arm64": "1.1.0", - "@img/sharp-libvips-darwin-x64": "1.1.0", - "@img/sharp-libvips-linux-arm": "1.1.0", - "@img/sharp-libvips-linux-arm64": "1.1.0", - "@img/sharp-libvips-linux-ppc64": "1.1.0", - "@img/sharp-libvips-linux-s390x": "1.1.0", - "@img/sharp-libvips-linux-x64": "1.1.0", - "@img/sharp-libvips-linuxmusl-arm64": "1.1.0", - "@img/sharp-libvips-linuxmusl-x64": "1.1.0", - "@img/sharp-linux-arm": "0.34.2", - "@img/sharp-linux-arm64": "0.34.2", - "@img/sharp-linux-s390x": "0.34.2", - "@img/sharp-linux-x64": "0.34.2", - "@img/sharp-linuxmusl-arm64": "0.34.2", - "@img/sharp-linuxmusl-x64": "0.34.2", - "@img/sharp-wasm32": "0.34.2", - "@img/sharp-win32-arm64": "0.34.2", - "@img/sharp-win32-ia32": "0.34.2", - "@img/sharp-win32-x64": "0.34.2" + "@img/sharp-darwin-arm64": "0.34.3", + "@img/sharp-darwin-x64": "0.34.3", + "@img/sharp-libvips-darwin-arm64": "1.2.0", + "@img/sharp-libvips-darwin-x64": "1.2.0", + "@img/sharp-libvips-linux-arm": "1.2.0", + "@img/sharp-libvips-linux-arm64": "1.2.0", + "@img/sharp-libvips-linux-ppc64": "1.2.0", + "@img/sharp-libvips-linux-s390x": "1.2.0", + "@img/sharp-libvips-linux-x64": "1.2.0", + "@img/sharp-libvips-linuxmusl-arm64": "1.2.0", + "@img/sharp-libvips-linuxmusl-x64": "1.2.0", + "@img/sharp-linux-arm": "0.34.3", + "@img/sharp-linux-arm64": "0.34.3", + "@img/sharp-linux-ppc64": "0.34.3", + "@img/sharp-linux-s390x": "0.34.3", + "@img/sharp-linux-x64": "0.34.3", + "@img/sharp-linuxmusl-arm64": "0.34.3", + "@img/sharp-linuxmusl-x64": "0.34.3", + "@img/sharp-wasm32": "0.34.3", + "@img/sharp-win32-arm64": "0.34.3", + "@img/sharp-win32-ia32": "0.34.3", + "@img/sharp-win32-x64": "0.34.3" } }, "node_modules/shebang-command": { @@ -13777,9 +13833,9 @@ "license": "ISC" }, "node_modules/stylelint": { - "version": "16.21.0", - "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.21.0.tgz", - "integrity": "sha512-ki3PpJGG7xhm3WtINoWGnlvqAmbqSexoRMbEMJzlwewSIOqPRKPlq452c22xAdEJISVi80r+I7KL9GPUiwFgbg==", + "version": "16.21.1", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.21.1.tgz", + "integrity": "sha512-WCXdXnYK2tpCbebgMF0Bme3YZH/Rh/UXerj75twYo4uLULlcrLwFVdZTvTEF8idFnAcW21YUDJFyKOfaf6xJRw==", "dev": true, "funding": [ { @@ -13820,7 +13876,7 @@ "micromatch": "^4.0.8", "normalize-path": "^3.0.0", "picocolors": "^1.1.1", - "postcss": "^8.5.5", + "postcss": "^8.5.6", "postcss-resolve-nested-selector": "^0.1.6", "postcss-safe-parser": "^7.0.1", "postcss-selector-parser": "^7.1.0", @@ -13940,15 +13996,15 @@ } }, "node_modules/stylelint/node_modules/flat-cache": { - "version": "6.1.10", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-6.1.10.tgz", - "integrity": "sha512-B6/v1f0NwjxzmeOhzfXPGWpKBVA207LS7lehaVKQnFrVktcFRfkzjZZ2gwj2i1TkEUMQht7ZMJbABUT5N+V1Nw==", + "version": "6.1.11", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-6.1.11.tgz", + "integrity": "sha512-zfOAns94mp7bHG/vCn9Ru2eDCmIxVQ5dELUHKjHfDEOJmHNzE+uGa6208kfkgmtym4a0FFjEuFksCXFacbVhSg==", "dev": true, "license": "MIT", "dependencies": { - "cacheable": "^1.10.0", + "cacheable": "^1.10.1", "flatted": "^3.3.3", - "hookified": "^1.9.1" + "hookified": "^1.10.0" } }, "node_modules/stylelint/node_modules/ignore": { @@ -13961,6 +14017,35 @@ "node": ">= 4" } }, + "node_modules/stylelint/node_modules/postcss": { + "version": "8.5.6", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", + "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "nanoid": "^3.3.11", + "picocolors": "^1.1.1", + "source-map-js": "^1.2.1" + }, + "engines": { + "node": "^10 || ^12 || >=14" + } + }, "node_modules/stylelint/node_modules/postcss-safe-parser": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-7.0.1.tgz", @@ -14834,15 +14919,15 @@ } }, "node_modules/typescript-eslint": { - "version": "8.35.0", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.35.0.tgz", - "integrity": "sha512-uEnz70b7kBz6eg/j0Czy6K5NivaYopgxRjsnAJ2Fx5oTLo3wefTHIbL7AkQr1+7tJCRVpTs/wiM8JR/11Loq9A==", + "version": "8.35.1", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.35.1.tgz", + "integrity": "sha512-xslJjFzhOmHYQzSB/QTeASAHbjmxOGEP6Coh93TXmUBFQoJ1VU35UHIDmG06Jd6taf3wqqC1ntBnCMeymy5Ovw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/eslint-plugin": "8.35.0", - "@typescript-eslint/parser": "8.35.0", - "@typescript-eslint/utils": "8.35.0" + "@typescript-eslint/eslint-plugin": "8.35.1", + "@typescript-eslint/parser": "8.35.1", + "@typescript-eslint/utils": "8.35.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -14917,38 +15002,38 @@ } }, "node_modules/unrs-resolver": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.9.2.tgz", - "integrity": "sha512-VUyWiTNQD7itdiMuJy+EuLEErLj3uwX/EpHQF8EOf33Dq3Ju6VW1GXm+swk6+1h7a49uv9fKZ+dft9jU7esdLA==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.11.0.tgz", + "integrity": "sha512-uw3hCGO/RdAEAb4zgJ3C/v6KIAFFOtBoxR86b2Ejc5TnH7HrhTWJR2o0A9ullC3eWMegKQCw/arQ/JivywQzkg==", "dev": true, "hasInstallScript": true, "license": "MIT", "dependencies": { - "napi-postinstall": "^0.2.4" + "napi-postinstall": "^0.3.0" }, "funding": { "url": "https://opencollective.com/unrs-resolver" }, "optionalDependencies": { - "@unrs/resolver-binding-android-arm-eabi": "1.9.2", - "@unrs/resolver-binding-android-arm64": "1.9.2", - "@unrs/resolver-binding-darwin-arm64": "1.9.2", - "@unrs/resolver-binding-darwin-x64": "1.9.2", - "@unrs/resolver-binding-freebsd-x64": "1.9.2", - "@unrs/resolver-binding-linux-arm-gnueabihf": "1.9.2", - "@unrs/resolver-binding-linux-arm-musleabihf": "1.9.2", - "@unrs/resolver-binding-linux-arm64-gnu": "1.9.2", - "@unrs/resolver-binding-linux-arm64-musl": "1.9.2", - "@unrs/resolver-binding-linux-ppc64-gnu": "1.9.2", - "@unrs/resolver-binding-linux-riscv64-gnu": "1.9.2", - "@unrs/resolver-binding-linux-riscv64-musl": "1.9.2", - "@unrs/resolver-binding-linux-s390x-gnu": "1.9.2", - "@unrs/resolver-binding-linux-x64-gnu": "1.9.2", - "@unrs/resolver-binding-linux-x64-musl": "1.9.2", - "@unrs/resolver-binding-wasm32-wasi": "1.9.2", - "@unrs/resolver-binding-win32-arm64-msvc": "1.9.2", - "@unrs/resolver-binding-win32-ia32-msvc": "1.9.2", - "@unrs/resolver-binding-win32-x64-msvc": "1.9.2" + "@unrs/resolver-binding-android-arm-eabi": "1.11.0", + "@unrs/resolver-binding-android-arm64": "1.11.0", + "@unrs/resolver-binding-darwin-arm64": "1.11.0", + "@unrs/resolver-binding-darwin-x64": "1.11.0", + "@unrs/resolver-binding-freebsd-x64": "1.11.0", + "@unrs/resolver-binding-linux-arm-gnueabihf": "1.11.0", + "@unrs/resolver-binding-linux-arm-musleabihf": "1.11.0", + "@unrs/resolver-binding-linux-arm64-gnu": "1.11.0", + "@unrs/resolver-binding-linux-arm64-musl": "1.11.0", + "@unrs/resolver-binding-linux-ppc64-gnu": "1.11.0", + "@unrs/resolver-binding-linux-riscv64-gnu": "1.11.0", + "@unrs/resolver-binding-linux-riscv64-musl": "1.11.0", + "@unrs/resolver-binding-linux-s390x-gnu": "1.11.0", + "@unrs/resolver-binding-linux-x64-gnu": "1.11.0", + "@unrs/resolver-binding-linux-x64-musl": "1.11.0", + "@unrs/resolver-binding-wasm32-wasi": "1.11.0", + "@unrs/resolver-binding-win32-arm64-msvc": "1.11.0", + "@unrs/resolver-binding-win32-ia32-msvc": "1.11.0", + "@unrs/resolver-binding-win32-x64-msvc": "1.11.0" } }, "node_modules/update-browserslist-db": { @@ -15055,9 +15140,9 @@ "license": "MIT" }, "node_modules/vite": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/vite/-/vite-7.0.0.tgz", - "integrity": "sha512-ixXJB1YRgDIw2OszKQS9WxGHKwLdCsbQNkpJN171udl6szi/rIySHL6/Os3s2+oE4P/FLD4dxg4mD7Wust+u5g==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/vite/-/vite-7.0.2.tgz", + "integrity": "sha512-hxdyZDY1CM6SNpKI4w4lcUc3Mtkd9ej4ECWVHSMrOdSinVc2zYOAppHeGc/hzmRo3pxM5blMzkuWHOJA/3NiFw==", "dev": true, "license": "MIT", "dependencies": { @@ -15130,9 +15215,9 @@ } }, "node_modules/vite-node": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.2.3.tgz", - "integrity": "sha512-gc8aAifGuDIpZHrPjuHyP4dpQmYXqWw7D1GmDnWeNWP654UEXzVfQ5IHPSK5HaHkwB/+p1atpYpSdw/2kOv8iQ==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.2.4.tgz", + "integrity": "sha512-EbKSKh+bh1E1IFxeO0pg1n4dvoOTt0UDiXMd/qn++r98+jPO1xtJilvXldeuQ8giIB5IkpjCgMleHMNEsGH6pg==", "dev": true, "license": "MIT", "dependencies": { @@ -15239,9 +15324,9 @@ } }, "node_modules/vite/node_modules/rollup": { - "version": "4.44.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.44.1.tgz", - "integrity": "sha512-x8H8aPvD+xbl0Do8oez5f5o8eMS3trfCghc4HhLAnCkj7Vl0d1JWGs0UF/D886zLW2rOj2QymV/JcSSsw+XDNg==", + "version": "4.44.2", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.44.2.tgz", + "integrity": "sha512-PVoapzTwSEcelaWGth3uR66u7ZRo6qhPHc0f2uRO9fX6XDVNrIiGYS0Pj9+R8yIIYSD/mCx2b16Ws9itljKSPg==", "dev": true, "license": "MIT", "dependencies": { @@ -15255,44 +15340,44 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.44.1", - "@rollup/rollup-android-arm64": "4.44.1", - "@rollup/rollup-darwin-arm64": "4.44.1", - "@rollup/rollup-darwin-x64": "4.44.1", - "@rollup/rollup-freebsd-arm64": "4.44.1", - "@rollup/rollup-freebsd-x64": "4.44.1", - "@rollup/rollup-linux-arm-gnueabihf": "4.44.1", - "@rollup/rollup-linux-arm-musleabihf": "4.44.1", - "@rollup/rollup-linux-arm64-gnu": "4.44.1", - "@rollup/rollup-linux-arm64-musl": "4.44.1", - "@rollup/rollup-linux-loongarch64-gnu": "4.44.1", - "@rollup/rollup-linux-powerpc64le-gnu": "4.44.1", - "@rollup/rollup-linux-riscv64-gnu": "4.44.1", - "@rollup/rollup-linux-riscv64-musl": "4.44.1", - "@rollup/rollup-linux-s390x-gnu": "4.44.1", - "@rollup/rollup-linux-x64-gnu": "4.44.1", - "@rollup/rollup-linux-x64-musl": "4.44.1", - "@rollup/rollup-win32-arm64-msvc": "4.44.1", - "@rollup/rollup-win32-ia32-msvc": "4.44.1", - "@rollup/rollup-win32-x64-msvc": "4.44.1", + "@rollup/rollup-android-arm-eabi": "4.44.2", + "@rollup/rollup-android-arm64": "4.44.2", + "@rollup/rollup-darwin-arm64": "4.44.2", + "@rollup/rollup-darwin-x64": "4.44.2", + "@rollup/rollup-freebsd-arm64": "4.44.2", + "@rollup/rollup-freebsd-x64": "4.44.2", + "@rollup/rollup-linux-arm-gnueabihf": "4.44.2", + "@rollup/rollup-linux-arm-musleabihf": "4.44.2", + "@rollup/rollup-linux-arm64-gnu": "4.44.2", + "@rollup/rollup-linux-arm64-musl": "4.44.2", + "@rollup/rollup-linux-loongarch64-gnu": "4.44.2", + "@rollup/rollup-linux-powerpc64le-gnu": "4.44.2", + "@rollup/rollup-linux-riscv64-gnu": "4.44.2", + "@rollup/rollup-linux-riscv64-musl": "4.44.2", + "@rollup/rollup-linux-s390x-gnu": "4.44.2", + "@rollup/rollup-linux-x64-gnu": "4.44.2", + "@rollup/rollup-linux-x64-musl": "4.44.2", + "@rollup/rollup-win32-arm64-msvc": "4.44.2", + "@rollup/rollup-win32-ia32-msvc": "4.44.2", + "@rollup/rollup-win32-x64-msvc": "4.44.2", "fsevents": "~2.3.2" } }, "node_modules/vitest": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.2.3.tgz", - "integrity": "sha512-E6U2ZFXe3N/t4f5BwUaVCKRLHqUpk1CBWeMh78UT4VaTPH/2dyvH6ALl29JTovEPu9dVKr/K/J4PkXgrMbw4Ww==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.2.4.tgz", + "integrity": "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==", "dev": true, "license": "MIT", "dependencies": { "@types/chai": "^5.2.2", - "@vitest/expect": "3.2.3", - "@vitest/mocker": "3.2.3", - "@vitest/pretty-format": "^3.2.3", - "@vitest/runner": "3.2.3", - "@vitest/snapshot": "3.2.3", - "@vitest/spy": "3.2.3", - "@vitest/utils": "3.2.3", + "@vitest/expect": "3.2.4", + "@vitest/mocker": "3.2.4", + "@vitest/pretty-format": "^3.2.4", + "@vitest/runner": "3.2.4", + "@vitest/snapshot": "3.2.4", + "@vitest/spy": "3.2.4", + "@vitest/utils": "3.2.4", "chai": "^5.2.0", "debug": "^4.4.1", "expect-type": "^1.2.1", @@ -15303,10 +15388,10 @@ "tinybench": "^2.9.0", "tinyexec": "^0.3.2", "tinyglobby": "^0.2.14", - "tinypool": "^1.1.0", + "tinypool": "^1.1.1", "tinyrainbow": "^2.0.0", "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0", - "vite-node": "3.2.3", + "vite-node": "3.2.4", "why-is-node-running": "^2.3.0" }, "bin": { @@ -15322,8 +15407,8 @@ "@edge-runtime/vm": "*", "@types/debug": "^4.1.12", "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", - "@vitest/browser": "3.2.3", - "@vitest/ui": "3.2.3", + "@vitest/browser": "3.2.4", + "@vitest/ui": "3.2.4", "happy-dom": "*", "jsdom": "*" }, @@ -15462,16 +15547,16 @@ } }, "node_modules/vue-component-type-helpers": { - "version": "2.2.10", - "resolved": "https://registry.npmjs.org/vue-component-type-helpers/-/vue-component-type-helpers-2.2.10.tgz", - "integrity": "sha512-iDUO7uQK+Sab2tYuiP9D1oLujCWlhHELHMgV/cB13cuGbG4qwkLHvtfWb6FzvxrIOPDnU0oHsz2MlQjhYDeaHA==", + "version": "2.2.12", + "resolved": "https://registry.npmjs.org/vue-component-type-helpers/-/vue-component-type-helpers-2.2.12.tgz", + "integrity": "sha512-YbGqHZ5/eW4SnkPNR44mKVc6ZKQoRs/Rux1sxC6rdwXb4qpbOSYfDr9DsTHolOTGmIKgM9j141mZbBeg05R1pw==", "dev": true, "license": "MIT" }, "node_modules/vue-eslint-parser": { - "version": "10.1.4", - "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-10.1.4.tgz", - "integrity": "sha512-EIZvCukIEMHEb3mxOKemtvWR1fcUAdWWAgkfyjmRHzvyhrZvBvH9oz69+thDIWhGiIQjZnPkCn8yHqvjM+a9eg==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-10.2.0.tgz", + "integrity": "sha512-CydUvFOQKD928UzZhTp4pr2vWz1L+H99t7Pkln2QSPdvmURT0MoC4wUccfCnuEaihNsu9aYYyk+bep8rlfkUXw==", "dev": true, "license": "MIT", "peer": true, @@ -15481,7 +15566,6 @@ "eslint-visitor-keys": "^4.2.0", "espree": "^10.3.0", "esquery": "^1.6.0", - "lodash": "^4.17.21", "semver": "^7.6.3" }, "engines": { @@ -15549,21 +15633,22 @@ "license": "BSD-2-Clause" }, "node_modules/webpack": { - "version": "5.99.9", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.99.9.tgz", - "integrity": "sha512-brOPwM3JnmOa+7kd3NsmOUOwbDAj8FT9xDsG3IW0MgbN9yZV7Oi/s/+MNQ/EcSMqw7qfoRyXPoeEWT8zLVdVGg==", + "version": "5.100.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.100.0.tgz", + "integrity": "sha512-H8yBSBTk+BqxrINJnnRzaxU94SVP2bjd7WmA+PfCphoIdDpeQMJ77pq9/4I7xjLq38cB1bNKfzYPZu8pB3zKtg==", "license": "MIT", "dependencies": { "@types/eslint-scope": "^3.7.7", - "@types/estree": "^1.0.6", + "@types/estree": "^1.0.8", "@types/json-schema": "^7.0.15", "@webassemblyjs/ast": "^1.14.1", "@webassemblyjs/wasm-edit": "^1.14.1", "@webassemblyjs/wasm-parser": "^1.14.1", - "acorn": "^8.14.0", + "acorn": "^8.15.0", + "acorn-import-phases": "^1.0.3", "browserslist": "^4.24.0", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.17.1", + "enhanced-resolve": "^5.17.2", "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", @@ -15577,7 +15662,7 @@ "tapable": "^2.1.1", "terser-webpack-plugin": "^5.3.11", "watchpack": "^2.4.1", - "webpack-sources": "^3.2.3" + "webpack-sources": "^3.3.3" }, "bin": { "webpack": "bin/webpack.js" diff --git a/package.json b/package.json index 88f904c44b..c154270c6c 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "idiomorph": "0.3.0", "jquery": "3.7.1", "katex": "0.16.22", - "mermaid": "11.7.0", + "mermaid": "11.8.1", "mini-css-extract-plugin": "2.9.2", "minimatch": "10.0.3", "monaco-editor": "0.52.2", @@ -55,22 +55,22 @@ "vue-chartjs": "5.3.1", "vue-loader": "17.4.2", "vue3-calendar-heatmap": "2.0.5", - "webpack": "5.99.9", + "webpack": "5.100.0", "webpack-cli": "6.0.1", "wrap-ansi": "9.0.0" }, "devDependencies": { "@axe-core/playwright": "4.10.2", "@eslint-community/eslint-plugin-eslint-comments": "4.5.0", - "@playwright/test": "1.52.0", + "@playwright/test": "1.53.2", "@stoplight/spectral-cli": "6.15.0", - "@stylistic/eslint-plugin": "5.0.0", + "@stylistic/eslint-plugin": "5.1.0", "@stylistic/stylelint-plugin": "3.1.3", "@vitejs/plugin-vue": "6.0.0", - "@vitest/coverage-v8": "3.2.3", - "@vitest/eslint-plugin": "1.2.2", + "@vitest/coverage-v8": "3.2.4", + "@vitest/eslint-plugin": "1.3.4", "@vue/test-utils": "2.4.6", - "eslint": "9.30.0", + "eslint": "9.30.1", "eslint-import-resolver-typescript": "4.4.4", "eslint-plugin-array-func": "5.0.2", "eslint-plugin-import-x": "4.16.1", @@ -82,24 +82,24 @@ "eslint-plugin-toml": "0.12.0", "eslint-plugin-unicorn": "59.0.1", "eslint-plugin-vitest-globals": "1.5.0", - "eslint-plugin-vue": "10.2.0", - "eslint-plugin-vue-scoped-css": "2.10.0", + "eslint-plugin-vue": "10.3.0", + "eslint-plugin-vue-scoped-css": "2.11.0", "eslint-plugin-wc": "3.0.1", - "globals": "16.1.0", + "globals": "16.3.0", "happy-dom": "18.0.1", "license-checker-rseidelsohn": "4.4.2", "markdownlint-cli": "0.45.0", "postcss-html": "1.8.0", - "sharp": "0.34.2", - "stylelint": "16.21.0", + "sharp": "0.34.3", + "stylelint": "16.21.1", "stylelint-declaration-block-no-ignored-properties": "2.8.0", "stylelint-declaration-strict-value": "1.10.11", "stylelint-value-no-unknown-custom-properties": "6.0.1", "svgo": "4.0.0", "typescript": "5.8.3", - "typescript-eslint": "8.35.0", + "typescript-eslint": "8.35.1", "vite-string-plugin": "1.3.4", - "vitest": "3.2.3" + "vitest": "3.2.4" }, "browserslist": [ "defaults" diff --git a/release-notes-published/11.0.3.md b/release-notes-published/11.0.3.md new file mode 100644 index 0000000000..ed6f150af9 --- /dev/null +++ b/release-notes-published/11.0.3.md @@ -0,0 +1,34 @@ +## Git update fixing CVE-2025-48385 + +Git vulnerabilities were [disclosed 8 July 2025](https://groups.google.com/g/git-packagers/c/cYJ6peBtyxk/m/xVukiATcBQAJ) and require an update of the Git version used by Forgejo to Git [v2.43.7, v2.44.4, v2.45.4, v2.46.4, v2.47.3, v2.48.2, v2.49.1, or v2.50.1](https://nvd.nist.gov/vuln/detail/CVE-2025-48385). The [containers of this release](https://codeberg.org/forgejo/-/packages/container/forgejo/11.0.3) include a Git binary that is not vulnerable. If Forgejo was installed using a container, it is enough to upgrade the container to get the latest Git binary. + +Security bug fixes are only for Git, there are no security fixes for Forgejo itself in this release. + +## Wiki permissions manual steps + +If collaborators with write access can't edit the wiki, an administrator can now go to the Units settings (`//settings/units#wiki`) and Save the wiki settings (no change is needed) to fix the problem. This is a manual step that will trigger a database update that is currently not possible to automate for Forgejo stable releases. + + + +## Release notes + +- User Interface bug fixes + - [PR](https://codeberg.org/forgejo/forgejo/pulls/8246) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8283)): fix(ui): add missing lazy load attribute to images (#8246) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/8170) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8262)): fix(ui): erroneous list continuation on Cmd+Enter on macOS +- Localization + - [PR](https://codeberg.org/forgejo/forgejo/pulls/8300): i18n: backport of translation updates +- Bug fixes + - [PR](https://codeberg.org/forgejo/forgejo/pulls/8189) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8456)): fix: do not ignore automerge while a PR is checking for conflicts + - [PR](https://codeberg.org/forgejo/forgejo/pulls/8367) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8385)): fix: user activation with uppercase email address + - [PR](https://codeberg.org/forgejo/forgejo/pulls/8234) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8237)): fix: collaborator can edit wiki with write access +- Included for completeness but not worth a release note + - [PR](https://codeberg.org/forgejo/forgejo/pulls/8460) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8465)): chore: disable mismatched root URL e2e test for safari + - [PR](https://codeberg.org/forgejo/forgejo/pulls/8461) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8462)): chore: do not navigate to same URL in E2E test + - [PR](https://codeberg.org/forgejo/forgejo/pulls/8258) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8445)): fix: corrupted wiki unit default permission (#8234 follow-up) (#8258) + - [PR](https://codeberg.org/forgejo/forgejo/pulls/8261) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8412)): fix: skip empty tokens in SearchOptions.Tokens() + - [PR](https://codeberg.org/forgejo/forgejo/pulls/8400) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8401)): chore: improve reliability of webauthn e2e test + - [PR](https://codeberg.org/forgejo/forgejo/pulls/8326) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8333)): fix: make API /repos/{owner}/{repo}/compare/{basehead} work with forks + - [PR](https://codeberg.org/forgejo/forgejo/pulls/8226) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8292)): chore: sort mailer messages in test assertion + - [PR](https://codeberg.org/forgejo/forgejo/pulls/8002) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8289)): fix(ui): release: name is overridden with tag name on edit + - [PR](https://codeberg.org/forgejo/forgejo/pulls/8286) ([backported](https://codeberg.org/forgejo/forgejo/pulls/8287)): Revert "fix(api): document `is_system_webhook` field (#7784)" + diff --git a/release-notes-published/7.0.16.md b/release-notes-published/7.0.16.md new file mode 100644 index 0000000000..5d09ddc245 --- /dev/null +++ b/release-notes-published/7.0.16.md @@ -0,0 +1,11 @@ +## Git update fixing CVE-2025-48385 + +Git vulnerabilities were [disclosed 8 July 2025](https://groups.google.com/g/git-packagers/c/cYJ6peBtyxk/m/xVukiATcBQAJ) and require an update of the Git version used by Forgejo to Git [v2.43.7, v2.44.4, v2.45.4, v2.46.4, v2.47.3, v2.48.2, v2.49.1, or v2.50.1](https://nvd.nist.gov/vuln/detail/CVE-2025-48385). The [containers of this release](https://codeberg.org/forgejo/-/packages/container/forgejo/7.0.16) include a Git binary that is not vulnerable. If Forgejo was installed using a container, it is enough to upgrade the container to get the latest Git binary. + +Security bug fixes are only for Git, there are no security fixes for Forgejo itself in this release. + + + +## Release notes + + diff --git a/routers/api/packages/api.go b/routers/api/packages/api.go index 79e61cf352..c53edfbf96 100644 --- a/routers/api/packages/api.go +++ b/routers/api/packages/api.go @@ -631,7 +631,7 @@ func CommonRoutes() *web.Route { baseURLPattern = regexp.MustCompile(`\A(.*?)\.repo\z`) uploadPattern = regexp.MustCompile(`\A(.*?)/upload\z`) baseRepoPattern = regexp.MustCompile(`(\S+)\.repo/(\S+)\/base/(\S+)`) - rpmsRepoPattern = regexp.MustCompile(`(\S+)\.repo/(\S+)\.(\S+)\/([a-zA-Z0-9_-]+)-([\d.]+-[a-zA-Z0-9_-]+)\.(\S+)\.rpm`) + rpmsRepoPattern = regexp.MustCompile(`(\S+)\.repo/(\S+)\.(\S+)\/([a-zA-Z0-9_-]+)-([\d.]+-[a-zA-Z0-9_.-]+)\.(\S+)\.rpm`) ) r.Methods("HEAD,GET,PUT,DELETE", "*", func(ctx *context.Context) { diff --git a/routers/api/v1/activitypub/actor.go b/routers/api/v1/activitypub/actor.go index e49f277842..0ff822c7f4 100644 --- a/routers/api/v1/activitypub/actor.go +++ b/routers/api/v1/activitypub/actor.go @@ -32,7 +32,7 @@ func Actor(ctx *context.APIContext) { actor := ap.ActorNew(ap.IRI(link), ap.ApplicationType) actor.PreferredUsername = ap.NaturalLanguageValuesNew() - err := actor.PreferredUsername.Set("en", ap.Content(setting.Domain)) + err := actor.PreferredUsername.Set("en", ap.Content("ghost")) if err != nil { ctx.ServerError("PreferredUsername.Set", err) return @@ -41,8 +41,6 @@ func Actor(ctx *context.APIContext) { actor.URL = ap.IRI(setting.AppURL) actor.Inbox = ap.IRI(link + "/inbox") - actor.Outbox = ap.IRI(link + "/outbox") - actor.PublicKey.ID = ap.IRI(link + "#main-key") actor.PublicKey.Owner = ap.IRI(link) diff --git a/routers/api/v1/activitypub/reqsignature.go b/routers/api/v1/activitypub/reqsignature.go index b84fbe05fa..91274249ec 100644 --- a/routers/api/v1/activitypub/reqsignature.go +++ b/routers/api/v1/activitypub/reqsignature.go @@ -4,132 +4,17 @@ package activitypub import ( - "crypto" - "crypto/x509" - "database/sql" - "encoding/pem" - "errors" - "fmt" "net/http" - "net/url" - "forgejo.org/models/db" - "forgejo.org/models/forgefed" - "forgejo.org/models/user" - "forgejo.org/modules/activitypub" - fm "forgejo.org/modules/forgefed" "forgejo.org/modules/log" "forgejo.org/modules/setting" gitea_context "forgejo.org/services/context" "forgejo.org/services/federation" "github.com/42wim/httpsig" - ap "github.com/go-ap/activitypub" ) -func decodePublicKeyPem(pubKeyPem string) ([]byte, error) { - block, _ := pem.Decode([]byte(pubKeyPem)) - if block == nil || block.Type != "PUBLIC KEY" { - return nil, errors.New("could not decode publicKeyPem to PUBLIC KEY pem block type") - } - - return block.Bytes, nil -} - -func getFederatedUser(ctx *gitea_context.APIContext, person *ap.Person, federationHost *forgefed.FederationHost) (*user.FederatedUser, error) { - personID, err := fm.NewPersonID(person.ID.String(), string(federationHost.NodeInfo.SoftwareName)) - if err != nil { - return nil, err - } - _, federatedUser, err := user.FindFederatedUser(ctx, personID.ID, federationHost.ID) - if err != nil { - return nil, err - } - - if federatedUser != nil { - return federatedUser, nil - } - - _, newFederatedUser, err := federation.CreateUserFromAP(ctx, personID, federationHost.ID) - if err != nil { - return nil, err - } - - return newFederatedUser, nil -} - -func storePublicKey(ctx *gitea_context.APIContext, person *ap.Person, pubKeyBytes []byte) error { - federationHost, err := federation.GetFederationHostForURI(ctx, person.ID.String()) - if err != nil { - return err - } - - if person.Type == ap.ActivityVocabularyType("Application") { - federationHost.KeyID = sql.NullString{ - String: person.PublicKey.ID.String(), - Valid: true, - } - - federationHost.PublicKey = sql.Null[sql.RawBytes]{ - V: pubKeyBytes, - Valid: true, - } - - _, err = db.GetEngine(ctx).ID(federationHost.ID).Update(federationHost) - if err != nil { - return err - } - } else if person.Type == ap.ActivityVocabularyType("Person") { - federatedUser, err := getFederatedUser(ctx, person, federationHost) - if err != nil { - return err - } - - federatedUser.KeyID = sql.NullString{ - String: person.PublicKey.ID.String(), - Valid: true, - } - - federatedUser.PublicKey = sql.Null[sql.RawBytes]{ - V: pubKeyBytes, - Valid: true, - } - - _, err = db.GetEngine(ctx).ID(federatedUser.ID).Update(federatedUser) - if err != nil { - return err - } - } - - return nil -} - -func getPublicKeyFromResponse(b []byte, keyID *url.URL) (person *ap.Person, pubKeyBytes []byte, p crypto.PublicKey, err error) { - person = ap.PersonNew(ap.IRI(keyID.String())) - err = person.UnmarshalJSON(b) - if err != nil { - return nil, nil, nil, fmt.Errorf("ActivityStreams type cannot be converted to one known to have publicKey property: %w", err) - } - - pubKey := person.PublicKey - if pubKey.ID.String() != keyID.String() { - return nil, nil, nil, fmt.Errorf("cannot find publicKey with id: %s in %s", keyID, string(b)) - } - - pubKeyBytes, err = decodePublicKeyPem(pubKey.PublicKeyPem) - if err != nil { - return nil, nil, nil, err - } - - p, err = x509.ParsePKIXPublicKey(pubKeyBytes) - if err != nil { - return nil, nil, nil, err - } - - return person, pubKeyBytes, p, err -} - -func verifyHTTPSignatures(ctx *gitea_context.APIContext) (authenticated bool, err error) { +func verifyHTTPUserOrInstanceSignature(ctx *gitea_context.APIContext) (authenticated bool, err error) { if !setting.Federation.SignatureEnforced { return true, nil } @@ -142,84 +27,64 @@ func verifyHTTPSignatures(ctx *gitea_context.APIContext) (authenticated bool, er return false, err } - ID := v.KeyId() - idIRI, err := url.Parse(ID) + signatureAlgorithm := httpsig.Algorithm(setting.Federation.SignatureAlgorithms[0]) + pubKey, err := federation.FindOrCreateFederatedUserKey(ctx.Base, v.KeyId()) + if err != nil || pubKey == nil { + pubKey, err = federation.FindOrCreateFederationHostKey(ctx.Base, v.KeyId()) + if err != nil { + return false, err + } + } + + err = v.Verify(pubKey, signatureAlgorithm) + if err != nil { + return false, err + } + return true, nil +} + +func verifyHTTPUserSignature(ctx *gitea_context.APIContext) (authenticated bool, err error) { + if !setting.Federation.SignatureEnforced { + return true, nil + } + + r := ctx.Req + + // 1. Figure out what key we need to verify + v, err := httpsig.NewVerifier(r) if err != nil { return false, err } signatureAlgorithm := httpsig.Algorithm(setting.Federation.SignatureAlgorithms[0]) - - // 2. Fetch the public key of the other actor - // Try if the signing actor is an already known federated user - _, federationUser, err := user.FindFederatedUserByKeyID(ctx, idIRI.String()) + pubKey, err := federation.FindOrCreateFederatedUserKey(ctx.Base, v.KeyId()) if err != nil { return false, err } - if federationUser != nil && federationUser.PublicKey.Valid { - pubKey, err := x509.ParsePKIXPublicKey(federationUser.PublicKey.V) - if err != nil { - return false, err - } - - authenticated = v.Verify(pubKey, signatureAlgorithm) == nil - return authenticated, err - } - - // Try if the signing actor is an already known federation host - federationHost, err := forgefed.FindFederationHostByKeyID(ctx, idIRI.String()) + err = v.Verify(pubKey, signatureAlgorithm) if err != nil { return false, err } - - if federationHost != nil && federationHost.PublicKey.Valid { - pubKey, err := x509.ParsePKIXPublicKey(federationHost.PublicKey.V) - if err != nil { - return false, err - } - - authenticated = v.Verify(pubKey, signatureAlgorithm) == nil - return authenticated, err - } - - // Fetch missing public key - actionsUser := user.NewAPServerActor() - clientFactory, err := activitypub.GetClientFactory(ctx) - if err != nil { - return false, err - } - - apClient, err := clientFactory.WithKeys(ctx, actionsUser, actionsUser.APActorKeyID()) - if err != nil { - return false, err - } - - b, err := apClient.GetBody(idIRI.String()) - if err != nil { - return false, err - } - - person, pubKeyBytes, pubKey, err := getPublicKeyFromResponse(b, idIRI) - if err != nil { - return false, err - } - - authenticated = v.Verify(pubKey, signatureAlgorithm) == nil - if authenticated { - err = storePublicKey(ctx, person, pubKeyBytes) - if err != nil { - return false, err - } - } - - return authenticated, err + return true, nil } // ReqHTTPSignature function -func ReqHTTPSignature() func(ctx *gitea_context.APIContext) { +func ReqHTTPUserOrInstanceSignature() func(ctx *gitea_context.APIContext) { return func(ctx *gitea_context.APIContext) { - if authenticated, err := verifyHTTPSignatures(ctx); err != nil { + if authenticated, err := verifyHTTPUserOrInstanceSignature(ctx); err != nil { + log.Warn("verifyHttpSignatures failed: %v", err) + ctx.Error(http.StatusBadRequest, "reqSignature", "request signature verification failed") + } else if !authenticated { + ctx.Error(http.StatusForbidden, "reqSignature", "request signature verification failed") + } + } +} + +// ReqHTTPSignature function +func ReqHTTPUserSignature() func(ctx *gitea_context.APIContext) { + return func(ctx *gitea_context.APIContext) { + if authenticated, err := verifyHTTPUserSignature(ctx); err != nil { log.Warn("verifyHttpSignatures failed: %v", err) ctx.Error(http.StatusBadRequest, "reqSignature", "request signature verification failed") } else if !authenticated { diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index bf08bdd249..3b66d02fba 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -92,6 +92,7 @@ import ( _ "forgejo.org/routers/api/v1/swagger" // for swagger generation "code.forgejo.org/go-chi/binding" + ap "github.com/go-ap/activitypub" ) func sudo() func(ctx *context.APIContext) { @@ -826,24 +827,22 @@ func Routes() *web.Route { if setting.Federation.Enabled { m.Get("/nodeinfo", misc.NodeInfo) m.Group("/activitypub", func() { - // deprecated, remove in 1.20, use /user-id/{user-id} instead - m.Group("/user/{username}", func() { - m.Get("", activitypub.ReqHTTPSignature(), activitypub.Person) - m.Post("/inbox", activitypub.ReqHTTPSignature(), activitypub.PersonInbox) - }, context.UserAssignmentAPI(), checkTokenPublicOnly()) m.Group("/user-id/{user-id}", func() { - m.Get("", activitypub.ReqHTTPSignature(), activitypub.Person) - m.Post("/inbox", activitypub.ReqHTTPSignature(), activitypub.PersonInbox) + m.Get("", activitypub.ReqHTTPUserOrInstanceSignature(), activitypub.Person) + m.Post("/inbox", + activitypub.ReqHTTPUserSignature(), + bind(ap.Activity{}), + activitypub.PersonInbox) }, context.UserIDAssignmentAPI(), checkTokenPublicOnly()) m.Group("/actor", func() { m.Get("", activitypub.Actor) - m.Post("/inbox", activitypub.ReqHTTPSignature(), activitypub.ActorInbox) + m.Post("/inbox", activitypub.ReqHTTPUserOrInstanceSignature(), activitypub.ActorInbox) }) m.Group("/repository-id/{repository-id}", func() { - m.Get("", activitypub.ReqHTTPSignature(), activitypub.Repository) + m.Get("", activitypub.ReqHTTPUserSignature(), activitypub.Repository) m.Post("/inbox", bind(forgefed.ForgeLike{}), - activitypub.ReqHTTPSignature(), + activitypub.ReqHTTPUserSignature(), activitypub.RepositoryInbox) }, context.RepositoryIDAssignmentAPI()) }, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryActivityPub)) @@ -1178,7 +1177,7 @@ func Routes() *web.Route { }) m.Group("/workflows", func() { - m.Group("/{workflowname}", func() { + m.Group("/{workflowfilename}", func() { m.Post("/dispatches", reqToken(), reqRepoWriter(unit.TypeActions), mustNotBeArchived, bind(api.DispatchWorkflowOption{}), repo.DispatchWorkflow) }) }) diff --git a/routers/api/v1/repo/action.go b/routers/api/v1/repo/action.go index dbc4933de6..fe29d534ff 100644 --- a/routers/api/v1/repo/action.go +++ b/routers/api/v1/repo/action.go @@ -615,7 +615,7 @@ func ListActionTasks(ctx *context.APIContext) { // DispatchWorkflow dispatches a workflow func DispatchWorkflow(ctx *context.APIContext) { - // swagger:operation POST /repos/{owner}/{repo}/actions/workflows/{workflowname}/dispatches repository DispatchWorkflow + // swagger:operation POST /repos/{owner}/{repo}/actions/workflows/{workflowfilename}/dispatches repository DispatchWorkflow // --- // summary: Dispatches a workflow // consumes: @@ -631,7 +631,7 @@ func DispatchWorkflow(ctx *context.APIContext) { // description: name of the repo // type: string // required: true - // - name: workflowname + // - name: workflowfilename // in: path // description: name of the workflow // type: string @@ -649,13 +649,13 @@ func DispatchWorkflow(ctx *context.APIContext) { // "$ref": "#/responses/notFound" opt := web.GetForm(ctx).(*api.DispatchWorkflowOption) - name := ctx.Params("workflowname") + name := ctx.Params("workflowfilename") if len(opt.Ref) == 0 { ctx.Error(http.StatusBadRequest, "ref", "ref is empty") return } else if len(name) == 0 { - ctx.Error(http.StatusBadRequest, "workflowname", "workflow name is empty") + ctx.Error(http.StatusBadRequest, "workflowfilename", "workflow file name is empty") return } diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go index 7c9593d625..e043448590 100644 --- a/routers/api/v1/repo/branch.go +++ b/routers/api/v1/repo/branch.go @@ -594,7 +594,7 @@ func CreateBranchProtection(ctx *context.APIContext) { isPlainRule := !git_model.IsRuleNameSpecial(ruleName) var isBranchExist bool if isPlainRule { - isBranchExist = git.IsBranchExist(ctx.Req.Context(), ctx.Repo.Repository.RepoPath(), ruleName) + isBranchExist = ctx.Repo.GitRepo.IsBranchExist(ruleName) } protectBranch, err := git_model.GetProtectedBranchRuleByName(ctx, repo.ID, ruleName) @@ -982,7 +982,7 @@ func EditBranchProtection(ctx *context.APIContext) { isPlainRule := !git_model.IsRuleNameSpecial(bpName) var isBranchExist bool if isPlainRule { - isBranchExist = git.IsBranchExist(ctx.Req.Context(), ctx.Repo.Repository.RepoPath(), bpName) + isBranchExist = ctx.Repo.GitRepo.IsBranchExist(bpName) } if isBranchExist { diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go index 3d6a40e9ab..42385d54a6 100644 --- a/routers/api/v1/repo/repo.go +++ b/routers/api/v1/repo/repo.go @@ -861,7 +861,7 @@ func updateRepoUnits(ctx *context.APIContext, owner string, repo *repo_model.Rep if *opts.GloballyEditableWiki { wikiPermissions = repo_model.UnitAccessModeWrite } else { - wikiPermissions = repo_model.UnitAccessModeRead + wikiPermissions = repo_model.UnitAccessModeUnset } } diff --git a/routers/private/manager.go b/routers/private/manager.go index 7ab198f71b..90b48256df 100644 --- a/routers/private/manager.go +++ b/routers/private/manager.go @@ -145,6 +145,7 @@ func AddLogger(ctx *context.PrivateContext) { writerMode.Prefix, _ = opts.Config["prefix"].(string) writerMode.Expression, _ = opts.Config["expression"].(string) + writerMode.Exclusion, _ = opts.Config["exclusion"].(string) switch writerType { case "console": diff --git a/routers/web/auth/oauth.go b/routers/web/auth/oauth.go index e8e5d2c54b..f287e0e900 100644 --- a/routers/web/auth/oauth.go +++ b/routers/web/auth/oauth.go @@ -668,6 +668,11 @@ func GrantApplicationOAuth(ctx *context.Context) { // OIDCWellKnown generates JSON so OIDC clients know Gitea's capabilities func OIDCWellKnown(ctx *context.Context) { + if !setting.OAuth2.Enabled { + ctx.Status(http.StatusNotFound) + return + } + ctx.Data["SigningKey"] = oauth2.DefaultSigningKey ctx.Data["Issuer"] = strings.TrimSuffix(setting.AppURL, "/") ctx.JSONTemplate("user/auth/oidc_wellknown") diff --git a/routers/web/repo/editor.go b/routers/web/repo/editor.go index d40a02ad0e..ccbb3ac2eb 100644 --- a/routers/web/repo/editor.go +++ b/routers/web/repo/editor.go @@ -189,7 +189,7 @@ func editFile(ctx *context.Context, isNewFile bool) { buf = buf[:n] // Only some file types are editable online as text. - if !typesniffer.DetectContentType(buf).IsRepresentableAsText() { + if !typesniffer.DetectContentType(buf, blob.Name()).IsRepresentableAsText() { ctx.NotFound("typesniffer.IsRepresentableAsText", nil) return } diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index a34e3b7c78..a4f6f97a05 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -3593,9 +3593,9 @@ func GetIssueAttachments(ctx *context.Context) { if ctx.Written() { return } - attachments := make([]*api.Attachment, len(issue.Attachments)) + attachments := make([]*api.WebAttachment, len(issue.Attachments)) for i := 0; i < len(issue.Attachments); i++ { - attachments[i] = convert.ToAttachment(ctx.Repo.Repository, issue.Attachments[i]) + attachments[i] = convert.ToWebAttachment(ctx.Repo.Repository, issue.Attachments[i]) } ctx.JSON(http.StatusOK, attachments) } @@ -3628,13 +3628,13 @@ func GetCommentAttachments(ctx *context.Context) { return } - attachments := make([]*api.Attachment, 0) if err := comment.LoadAttachments(ctx); err != nil { ctx.ServerError("LoadAttachments", err) return } + attachments := make([]*api.WebAttachment, len(comment.Attachments)) for i := 0; i < len(comment.Attachments); i++ { - attachments = append(attachments, convert.ToAttachment(ctx.Repo.Repository, comment.Attachments[i])) + attachments[i] = convert.ToWebAttachment(ctx.Repo.Repository, comment.Attachments[i]) } ctx.JSON(http.StatusOK, attachments) } diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go index 4e365f24ea..c9a2bb4e08 100644 --- a/routers/web/repo/pull.go +++ b/routers/web/repo/pull.go @@ -638,7 +638,7 @@ func PrepareViewPullInfo(ctx *context.Context, issue *issues_model.Issue) *git.C if pull.Flow == issues_model.PullRequestFlowGithub { headBranchExist = headGitRepo.IsBranchExist(pull.HeadBranch) } else { - headBranchExist = git.IsReferenceExist(ctx, baseGitRepo.Path, pull.GetGitRefName()) + headBranchExist = baseGitRepo.IsReferenceExist(pull.GetGitRefName()) } if headBranchExist { diff --git a/routers/web/repo/render.go b/routers/web/repo/render.go index b31e2e203a..05eeadc519 100644 --- a/routers/web/repo/render.go +++ b/routers/web/repo/render.go @@ -41,7 +41,7 @@ func RenderFile(ctx *context.Context) { n, _ := util.ReadAtMost(dataRc, buf) buf = buf[:n] - st := typesniffer.DetectContentType(buf) + st := typesniffer.DetectContentType(buf, blob.Name()) isTextFile := st.IsText() rd := charset.ToUTF8WithFallbackReader(io.MultiReader(bytes.NewReader(buf), dataRc), charset.ConvertOpts{}) diff --git a/routers/web/repo/setting/avatar.go b/routers/web/repo/setting/avatar.go index 84d7cccdb8..20e211316d 100644 --- a/routers/web/repo/setting/avatar.go +++ b/routers/web/repo/setting/avatar.go @@ -45,7 +45,7 @@ func UpdateAvatarSetting(ctx *context.Context, form forms.AvatarForm) error { if err != nil { return fmt.Errorf("io.ReadAll: %w", err) } - st := typesniffer.DetectContentType(data) + st := typesniffer.DetectContentType(data, "") if !st.IsImage() || st.IsSvgImage() { return errors.New(ctx.Locale.TrString("settings.uploaded_avatar_not_a_image")) } diff --git a/routers/web/repo/setting/lfs.go b/routers/web/repo/setting/lfs.go index b9cb86bd08..9930d03e8e 100644 --- a/routers/web/repo/setting/lfs.go +++ b/routers/web/repo/setting/lfs.go @@ -291,7 +291,7 @@ func LFSFileGet(ctx *context.Context) { } buf = buf[:n] - st := typesniffer.DetectContentType(buf) + st := typesniffer.DetectContentType(buf, "") ctx.Data["IsTextFile"] = st.IsText() isRepresentableAsText := st.IsRepresentableAsText() diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index bb3e1388a8..d00f85a134 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -228,7 +228,7 @@ func getFileReader(ctx gocontext.Context, repoID int64, blob *git.Blob) ([]byte, n, _ := util.ReadAtMost(dataRc, buf) buf = buf[:n] - st := typesniffer.DetectContentType(buf) + st := typesniffer.DetectContentType(buf, blob.Name()) isTextFile := st.IsText() // FIXME: what happens when README file is an image? @@ -262,7 +262,7 @@ func getFileReader(ctx gocontext.Context, repoID int64, blob *git.Blob) ([]byte, } buf = buf[:n] - st = typesniffer.DetectContentType(buf) + st = typesniffer.DetectContentType(buf, blob.Name()) return buf, dataRc, &fileInfo{st.IsText(), true, meta.Size, &meta.Pointer, st}, nil } diff --git a/routers/web/user/setting/profile.go b/routers/web/user/setting/profile.go index 400ee71f08..e0ce88b582 100644 --- a/routers/web/user/setting/profile.go +++ b/routers/web/user/setting/profile.go @@ -151,7 +151,7 @@ func UpdateAvatarSetting(ctx *context.Context, form *forms.AvatarForm, ctxUser * return fmt.Errorf("io.ReadAll: %w", err) } - st := typesniffer.DetectContentType(data) + st := typesniffer.DetectContentType(data, "") if !st.IsImage() || st.IsSvgImage() { return errors.New(ctx.Locale.TrString("settings.uploaded_avatar_not_a_image")) } diff --git a/routers/web/webfinger.go b/routers/web/webfinger.go index be3c2925fe..372c08f7d8 100644 --- a/routers/web/webfinger.go +++ b/routers/web/webfinger.go @@ -58,7 +58,33 @@ func WebfingerQuery(ctx *context.Context) { return } + // Instance actor + if parts[0] == "ghost" { + aliases := []string{ + appURL.String() + "api/v1/activitypub/actor", + } + + links := []*webfingerLink{ + { + Rel: "self", + Type: "application/activity+json", + Href: appURL.String() + "api/v1/activitypub/actor", + }, + } + + ctx.Resp.Header().Add("Access-Control-Allow-Origin", "*") + ctx.JSON(http.StatusOK, &webfingerJRD{ + Subject: fmt.Sprintf("acct:%s@%s", "ghost", appURL.Host), + Aliases: aliases, + Links: links, + }) + ctx.Resp.Header().Set("Content-Type", "application/jrd+json") + + return + } + u, err = user_model.GetUserByName(ctx, parts[0]) + case "mailto": u, err = user_model.GetUserByEmail(ctx, resource.Opaque) if u != nil && u.KeepEmailPrivate { diff --git a/services/actions/notifier.go b/services/actions/notifier.go index f1e9a6d7e9..a5bac730be 100644 --- a/services/actions/notifier.go +++ b/services/actions/notifier.go @@ -788,7 +788,7 @@ func (n *actionsNotifier) MigrateRepository(ctx context.Context, doer, u *user_m // the ActionRun of the same workflow that finished before priorRun/updatedRun. func sendActionRunNowDoneNotificationIfNeeded(ctx context.Context, priorRun, updatedRun *actions_model.ActionRun) error { if !priorRun.Status.IsDone() && updatedRun.Status.IsDone() { - lastRun, err := actions_model.GetRunBefore(ctx, updatedRun.RepoID, updatedRun.Stopped) + lastRun, err := actions_model.GetRunBefore(ctx, updatedRun) if err != nil && !errors.Is(err, util.ErrNotExist) { return err } diff --git a/services/agit/agit.go b/services/agit/agit.go index 20e87642c3..8ef641629a 100644 --- a/services/agit/agit.go +++ b/services/agit/agit.go @@ -221,7 +221,7 @@ func ProcReceive(ctx context.Context, repo *repo_model.Repository, gitRepo *git. } // Validate pull request. - pull_service.ValidatePullRequest(ctx, pr, oldCommitID, opts.NewCommitIDs[i], pusher) + pull_service.ValidatePullRequest(ctx, pr, opts.NewCommitIDs[i], oldCommitID, pusher) // TODO: call `InvalidateCodeComments` diff --git a/services/auth/oauth2.go b/services/auth/oauth2.go index 093940aa18..4fdd15d7ec 100644 --- a/services/auth/oauth2.go +++ b/services/auth/oauth2.go @@ -17,6 +17,7 @@ import ( "forgejo.org/modules/log" "forgejo.org/modules/setting" "forgejo.org/modules/timeutil" + "forgejo.org/modules/util" "forgejo.org/modules/web/middleware" "forgejo.org/services/actions" "forgejo.org/services/auth/source/oauth2" @@ -125,7 +126,7 @@ func parseToken(req *http.Request) (string, bool) { // check header token if auHead := req.Header.Get("Authorization"); auHead != "" { auths := strings.Fields(auHead) - if len(auths) == 2 && (auths[0] == "token" || strings.ToLower(auths[0]) == "bearer") { + if len(auths) == 2 && (util.ASCIIEqualFold(auths[0], "token") || util.ASCIIEqualFold(auths[0], "bearer")) { return auths[1], true } } diff --git a/services/auth/oauth2_test.go b/services/auth/oauth2_test.go index d6455b33ad..3fce7df50b 100644 --- a/services/auth/oauth2_test.go +++ b/services/auth/oauth2_test.go @@ -4,6 +4,7 @@ package auth import ( + "net/http" "testing" "forgejo.org/models/unittest" @@ -52,3 +53,30 @@ func TestCheckTaskIsRunning(t *testing.T) { }) } } + +func TestParseToken(t *testing.T) { + cases := map[string]struct { + Header string + ExpectedToken string + Expected bool + }{ + "Token Uppercase": {Header: "Token 1234567890123456789012345687901325467890", ExpectedToken: "1234567890123456789012345687901325467890", Expected: true}, + "Token Lowercase": {Header: "token 1234567890123456789012345687901325467890", ExpectedToken: "1234567890123456789012345687901325467890", Expected: true}, + "Token Unicode": {Header: "to\u212Aen 1234567890123456789012345687901325467890", ExpectedToken: "", Expected: false}, + "Bearer Uppercase": {Header: "Bearer 1234567890123456789012345687901325467890", ExpectedToken: "1234567890123456789012345687901325467890", Expected: true}, + "Bearer Lowercase": {Header: "bearer 1234567890123456789012345687901325467890", ExpectedToken: "1234567890123456789012345687901325467890", Expected: true}, + "Missing type": {Header: "1234567890123456789012345687901325467890", ExpectedToken: "", Expected: false}, + "Three Parts": {Header: "abc 1234567890 test", ExpectedToken: "", Expected: false}, + } + + for name := range cases { + c := cases[name] + t.Run(name, func(t *testing.T) { + req, _ := http.NewRequest("GET", "/", nil) + req.Header.Add("Authorization", c.Header) + ActualToken, ActualSuccess := parseToken(req) + assert.Equal(t, c.ExpectedToken, ActualToken) + assert.Equal(t, c.Expected, ActualSuccess) + }) + } +} diff --git a/services/automerge/automerge.go b/services/automerge/automerge.go index cbfe3bd54e..0cdc113379 100644 --- a/services/automerge/automerge.go +++ b/services/automerge/automerge.go @@ -162,7 +162,7 @@ func handlePullRequestAutoMerge(pullID int64, sha string) { return } case issues_model.PullRequestFlowAGit: - headBranchExist := git.IsReferenceExist(ctx, baseGitRepo.Path, pr.GetGitRefName()) + headBranchExist := baseGitRepo.IsReferenceExist(pr.GetGitRefName()) if !headBranchExist { log.Warn("Head branch of auto merge %-v does not exist [HeadRepoID: %d, Branch(Agit): %s]", pr, pr.HeadRepoID, pr.HeadBranch) return diff --git a/services/convert/attachment.go b/services/convert/attachment.go index 6617aac906..74ae7c509c 100644 --- a/services/convert/attachment.go +++ b/services/convert/attachment.go @@ -4,6 +4,9 @@ package convert import ( + "mime" + "path/filepath" + repo_model "forgejo.org/models/repo" api "forgejo.org/modules/structs" ) @@ -20,9 +23,13 @@ func APIAssetDownloadURL(repo *repo_model.Repository, attach *repo_model.Attachm return attach.DownloadURL() } -// ToAttachment converts models.Attachment to api.Attachment for API usage -func ToAttachment(repo *repo_model.Repository, a *repo_model.Attachment) *api.Attachment { - return toAttachment(repo, a, WebAssetDownloadURL) +// ToWebAttachment converts models.Attachment to api.WebAttachment for API usage +func ToWebAttachment(repo *repo_model.Repository, a *repo_model.Attachment) *api.WebAttachment { + attachment := toAttachment(repo, a, WebAssetDownloadURL) + return &api.WebAttachment{ + Attachment: attachment, + MimeType: mime.TypeByExtension(filepath.Ext(attachment.Name)), + } } // ToAPIAttachment converts models.Attachment to api.Attachment for API usage diff --git a/services/convert/attachment_test.go b/services/convert/attachment_test.go new file mode 100644 index 0000000000..d7bf0c1ee7 --- /dev/null +++ b/services/convert/attachment_test.go @@ -0,0 +1,56 @@ +// Copyright 2025 The Forgejo Authors. All rights reserved. +// SPDX-License-Identifier: GPL-3.0-or-later + +package convert + +import ( + "fmt" + "testing" + "time" + + repo_model "forgejo.org/models/repo" + "forgejo.org/models/unittest" + "forgejo.org/modules/setting" + api "forgejo.org/modules/structs" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func TestToWebAttachment(t *testing.T) { + require.NoError(t, unittest.PrepareTestDatabase()) + headRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) + attachment := &repo_model.Attachment{ + ID: 10, + UUID: "uuidxxx", + RepoID: 1, + IssueID: 1, + ReleaseID: 0, + UploaderID: 0, + CommentID: 0, + Name: "test.png", + DownloadCount: 90, + Size: 30, + NoAutoTime: false, + CreatedUnix: 9342, + CustomDownloadURL: "", + ExternalURL: "", + } + + webAttachment := ToWebAttachment(headRepo, attachment) + + assert.NotNil(t, webAttachment) + assert.Equal(t, &api.WebAttachment{ + Attachment: &api.Attachment{ + ID: 10, + Name: "test.png", + Created: time.Unix(9342, 0), + DownloadCount: 90, + Size: 30, + UUID: "uuidxxx", + DownloadURL: fmt.Sprintf("%sattachments/uuidxxx", setting.AppURL), + Type: "attachment", + }, + MimeType: "image/png", + }, webAttachment) +} diff --git a/services/convert/issue_test.go b/services/convert/issue_test.go index 97bacfb229..ea8ad9b7ef 100644 --- a/services/convert/issue_test.go +++ b/services/convert/issue_test.go @@ -24,10 +24,11 @@ func TestLabel_ToLabel(t *testing.T) { label := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 1}) repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: label.RepoID}) assert.Equal(t, &api.Label{ - ID: label.ID, - Name: label.Name, - Color: "abcdef", - URL: fmt.Sprintf("%sapi/v1/repos/user2/repo1/labels/%d", setting.AppURL, label.ID), + ID: label.ID, + Name: label.Name, + Color: "abcdef", + Description: label.Description, + URL: fmt.Sprintf("%sapi/v1/repos/user2/repo1/labels/%d", setting.AppURL, label.ID), }, ToLabel(label, repo, nil)) } diff --git a/services/federation/federation_service.go b/services/federation/federation_service.go index a3b719d1a7..b71d8d2575 100644 --- a/services/federation/federation_service.go +++ b/services/federation/federation_service.go @@ -5,15 +5,12 @@ package federation import ( "context" - "errors" + "database/sql" "fmt" - "net/http" "net/url" "strings" - "time" "forgejo.org/models/forgefed" - "forgejo.org/models/repo" "forgejo.org/models/user" "forgejo.org/modules/activitypub" "forgejo.org/modules/auth/password" @@ -21,91 +18,84 @@ import ( "forgejo.org/modules/log" "forgejo.org/modules/setting" "forgejo.org/modules/validation" + context_service "forgejo.org/services/context" "github.com/google/uuid" ) -// ProcessLikeActivity receives a ForgeLike activity and does the following: -// Validation of the activity -// Creation of a (remote) federationHost if not existing -// Creation of a forgefed Person if not existing -// Validation of incoming RepositoryID against Local RepositoryID -// Star the repo if it wasn't already stared -// Do some mitigation against out of order attacks -func ProcessLikeActivity(ctx context.Context, form any, repositoryID int64) (int, string, error) { - activity := form.(*fm.ForgeLike) - if res, err := validation.IsValid(activity); !res { - return http.StatusNotAcceptable, "Invalid activity", err - } - log.Info("Activity validated:%v", activity) +func Init() error { + return nil +} - // parse actorID (person) - actorURI := activity.Actor.GetID().String() - log.Info("actorURI was: %v", actorURI) - federationHost, err := GetFederationHostForURI(ctx, actorURI) +func FindOrCreateFederationHost(ctx *context_service.Base, actorURI string) (*forgefed.FederationHost, error) { + rawActorID, err := fm.NewActorID(actorURI) if err != nil { - return http.StatusInternalServerError, "Wrong FederationHost", err + return nil, err } - if !activity.IsNewer(federationHost.LatestActivity) { - return http.StatusNotAcceptable, "Activity out of order.", errors.New("Activity already processed") + federationHost, err := forgefed.FindFederationHostByFqdnAndPort(ctx, rawActorID.Host, rawActorID.HostPort) + if err != nil { + return nil, err + } + if federationHost == nil { + result, err := createFederationHostFromAP(ctx, rawActorID) + if err != nil { + return nil, err + } + federationHost = result + } + return federationHost, nil +} + +func FindOrCreateFederatedUser(ctx *context_service.Base, actorURI string) (*user.User, *user.FederatedUser, *forgefed.FederationHost, error) { + user, federatedUser, federationHost, err := findFederatedUser(ctx, actorURI) + if err != nil { + return nil, nil, nil, err + } + personID, err := fm.NewPersonID(actorURI, string(federationHost.NodeInfo.SoftwareName)) + if err != nil { + return nil, nil, nil, err + } + + if user != nil { + log.Trace("Found local federatedUser: %#v", user) + } else { + user, federatedUser, err = createUserFromAP(ctx, personID, federationHost.ID) + if err != nil { + return nil, nil, nil, err + } + log.Trace("Created federatedUser from ap: %#v", user) + } + log.Trace("Got user: %v", user.Name) + + return user, federatedUser, federationHost, nil +} + +func findFederatedUser(ctx *context_service.Base, actorURI string) (*user.User, *user.FederatedUser, *forgefed.FederationHost, error) { + federationHost, err := FindOrCreateFederationHost(ctx, actorURI) + if err != nil { + return nil, nil, nil, err } actorID, err := fm.NewPersonID(actorURI, string(federationHost.NodeInfo.SoftwareName)) if err != nil { - return http.StatusNotAcceptable, "Invalid PersonID", err + return nil, nil, nil, err } - log.Info("Actor accepted:%v", actorID) - // parse objectID (repository) - objectID, err := fm.NewRepositoryID(activity.Object.GetID().String(), string(forgefed.ForgejoSourceType)) + user, federatedUser, err := user.FindFederatedUser(ctx, actorID.ID, federationHost.ID) if err != nil { - return http.StatusNotAcceptable, "Invalid objectId", err - } - if objectID.ID != fmt.Sprint(repositoryID) { - return http.StatusNotAcceptable, "Invalid objectId", err - } - log.Info("Object accepted:%v", objectID) - - // Check if user already exists - user, _, err := user.FindFederatedUser(ctx, actorID.ID, federationHost.ID) - if err != nil { - return http.StatusInternalServerError, "Searching for user failed", err - } - if user != nil { - log.Info("Found local federatedUser: %v", user) - } else { - user, _, err = CreateUserFromAP(ctx, actorID, federationHost.ID) - if err != nil { - return http.StatusInternalServerError, "Error creating federatedUser", err - } - log.Info("Created federatedUser from ap: %v", user) - } - log.Info("Got user:%v", user.Name) - - // execute the activity if the repo was not stared already - alreadyStared := repo.IsStaring(ctx, user.ID, repositoryID) - if !alreadyStared { - err = repo.StarRepo(ctx, user.ID, repositoryID, true) - if err != nil { - return http.StatusNotAcceptable, "Error staring", err - } - } - federationHost.LatestActivity = activity.StartTime - err = forgefed.UpdateFederationHost(ctx, federationHost) - if err != nil { - return http.StatusNotAcceptable, "Error updating federatedHost", err + return nil, nil, nil, err } - return 0, "", nil + return user, federatedUser, federationHost, nil } -func CreateFederationHostFromAP(ctx context.Context, actorID fm.ActorID) (*forgefed.FederationHost, error) { +func createFederationHostFromAP(ctx context.Context, actorID fm.ActorID) (*forgefed.FederationHost, error) { actionsUser := user.NewAPServerActor() clientFactory, err := activitypub.GetClientFactory(ctx) if err != nil { return nil, err } - client, err := clientFactory.WithKeys(ctx, actionsUser, actionsUser.APActorKeyID()) + client, err := clientFactory.WithKeys(ctx, actionsUser, actionsUser.KeyID()) if err != nil { return nil, err } @@ -130,6 +120,7 @@ func CreateFederationHostFromAP(ctx context.Context, actorID fm.ActorID) (*forge return nil, err } + // TODO: we should get key material here also to have it immediately result, err := forgefed.NewFederationHost(actorID.Host, nodeInfo, actorID.HostPort, actorID.HostSchema) if err != nil { return nil, err @@ -143,34 +134,14 @@ func CreateFederationHostFromAP(ctx context.Context, actorID fm.ActorID) (*forge return &result, nil } -func GetFederationHostForURI(ctx context.Context, actorURI string) (*forgefed.FederationHost, error) { - log.Info("Input was: %v", actorURI) - rawActorID, err := fm.NewActorID(actorURI) - if err != nil { - return nil, err - } - federationHost, err := forgefed.FindFederationHostByFqdnAndPort(ctx, rawActorID.Host, rawActorID.HostPort) - if err != nil { - return nil, err - } - if federationHost == nil { - result, err := CreateFederationHostFromAP(ctx, rawActorID) - if err != nil { - return nil, err - } - federationHost = result - } - return federationHost, nil -} - -func CreateUserFromAP(ctx context.Context, personID fm.PersonID, federationHostID int64) (*user.User, *user.FederatedUser, error) { +func fetchUserFromAP(ctx context.Context, personID fm.PersonID, federationHostID int64) (*user.User, *user.FederatedUser, error) { actionsUser := user.NewAPServerActor() clientFactory, err := activitypub.GetClientFactory(ctx) if err != nil { return nil, nil, err } - apClient, err := clientFactory.WithKeys(ctx, actionsUser, actionsUser.APActorKeyID()) + apClient, err := clientFactory.WithKeys(ctx, actionsUser, actionsUser.KeyID()) if err != nil { return nil, nil, err } @@ -216,6 +187,11 @@ func CreateUserFromAP(ctx context.Context, personID fm.PersonID, federationHostI return nil, nil, err } + pubKeyBytes, err := decodePublicKeyPem(person.PublicKey.PublicKeyPem) + if err != nil { + return nil, nil, err + } + newUser := user.User{ LowerName: strings.ToLower(name), Name: name, @@ -234,86 +210,30 @@ func CreateUserFromAP(ctx context.Context, personID fm.PersonID, federationHostI FederationHostID: federationHostID, InboxPath: inbox.Path, NormalizedOriginalURL: personID.AsURI(), + KeyID: sql.NullString{ + String: person.PublicKey.ID.String(), + Valid: true, + }, + PublicKey: sql.Null[sql.RawBytes]{ + V: pubKeyBytes, + Valid: true, + }, } - err = user.CreateFederatedUser(ctx, &newUser, &federatedUser) + log.Info("Fetch federatedUser:%q", federatedUser) + return &newUser, &federatedUser, nil +} + +func createUserFromAP(ctx context.Context, personID fm.PersonID, federationHostID int64) (*user.User, *user.FederatedUser, error) { + newUser, federatedUser, err := fetchUserFromAP(ctx, personID, federationHostID) + if err != nil { + return nil, nil, err + } + err = user.CreateFederatedUser(ctx, newUser, federatedUser) if err != nil { return nil, nil, err } log.Info("Created federatedUser:%q", federatedUser) - return &newUser, &federatedUser, nil -} - -// Create or update a list of FollowingRepo structs -func StoreFollowingRepoList(ctx context.Context, localRepoID int64, followingRepoList []string) (int, string, error) { - followingRepos := make([]*repo.FollowingRepo, 0, len(followingRepoList)) - for _, uri := range followingRepoList { - federationHost, err := GetFederationHostForURI(ctx, uri) - if err != nil { - return http.StatusInternalServerError, "Wrong FederationHost", err - } - followingRepoID, err := fm.NewRepositoryID(uri, string(federationHost.NodeInfo.SoftwareName)) - if err != nil { - return http.StatusNotAcceptable, "Invalid federated repo", err - } - followingRepo, err := repo.NewFollowingRepo(localRepoID, followingRepoID.ID, federationHost.ID, uri) - if err != nil { - return http.StatusNotAcceptable, "Invalid federated repo", err - } - followingRepos = append(followingRepos, &followingRepo) - } - - if err := repo.StoreFollowingRepos(ctx, localRepoID, followingRepos); err != nil { - return 0, "", err - } - - return 0, "", nil -} - -func DeleteFollowingRepos(ctx context.Context, localRepoID int64) error { - return repo.StoreFollowingRepos(ctx, localRepoID, []*repo.FollowingRepo{}) -} - -func SendLikeActivities(ctx context.Context, doer user.User, repoID int64) error { - followingRepos, err := repo.FindFollowingReposByRepoID(ctx, repoID) - log.Info("Federated Repos is: %v", followingRepos) - if err != nil { - return err - } - - likeActivityList := make([]fm.ForgeLike, 0) - for _, followingRepo := range followingRepos { - log.Info("Found following repo: %v", followingRepo) - target := followingRepo.URI - likeActivity, err := fm.NewForgeLike(doer.APActorID(), target, time.Now()) - if err != nil { - return err - } - likeActivityList = append(likeActivityList, likeActivity) - } - - apclientFactory, err := activitypub.GetClientFactory(ctx) - if err != nil { - return err - } - - apclient, err := apclientFactory.WithKeys(ctx, &doer, doer.APActorKeyID()) - if err != nil { - return err - } - for i, activity := range likeActivityList { - activity.StartTime = activity.StartTime.Add(time.Duration(i) * time.Second) - json, err := activity.MarshalJSON() - if err != nil { - return err - } - - _, err = apclient.Post(json, fmt.Sprintf("%s/inbox", activity.Object)) - if err != nil { - log.Error("error %v while sending activity: %q", err, activity) - } - } - - return nil + return newUser, federatedUser, nil } diff --git a/services/federation/repo_like.go b/services/federation/repo_like.go new file mode 100644 index 0000000000..c1e6500c61 --- /dev/null +++ b/services/federation/repo_like.go @@ -0,0 +1,146 @@ +// Copyright 2024 The Forgejo Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package federation + +import ( + "context" + "errors" + "fmt" + "net/http" + "time" + + "forgejo.org/models/forgefed" + "forgejo.org/models/repo" + "forgejo.org/models/user" + "forgejo.org/modules/activitypub" + fm "forgejo.org/modules/forgefed" + "forgejo.org/modules/log" + "forgejo.org/modules/validation" + context_service "forgejo.org/services/context" +) + +// ProcessLikeActivity receives a ForgeLike activity and does the following: +// Validation of the activity +// Creation of a (remote) federationHost if not existing +// Creation of a forgefed Person if not existing +// Validation of incoming RepositoryID against Local RepositoryID +// Star the repo if it wasn't already stared +// Do some mitigation against out of order attacks +func ProcessLikeActivity(ctx *context_service.APIContext, form any, repositoryID int64) (int, string, error) { + activity := form.(*fm.ForgeLike) + if res, err := validation.IsValid(activity); !res { + return http.StatusNotAcceptable, "Invalid activity", err + } + log.Trace("Activity validated: %#v", activity) + + // parse actorID (person) + actorURI := activity.Actor.GetID().String() + user, _, federationHost, err := FindOrCreateFederatedUser(ctx.Base, actorURI) + if err != nil { + ctx.Error(http.StatusNotAcceptable, "Federated user not found", err) + return http.StatusInternalServerError, "FindOrCreateFederatedUser", err + } + + if !activity.IsNewer(federationHost.LatestActivity) { + return http.StatusNotAcceptable, "Activity out of order.", errors.New("Activity already processed") + } + + // parse objectID (repository) + objectID, err := fm.NewRepositoryID(activity.Object.GetID().String(), string(forgefed.ForgejoSourceType)) + if err != nil { + return http.StatusNotAcceptable, "Invalid objectId", err + } + if objectID.ID != fmt.Sprint(repositoryID) { + return http.StatusNotAcceptable, "Invalid objectId", err + } + log.Trace("Object accepted: %#v", objectID) + + // execute the activity if the repo was not stared already + alreadyStared := repo.IsStaring(ctx, user.ID, repositoryID) + if !alreadyStared { + err = repo.StarRepo(ctx, user.ID, repositoryID, true) + if err != nil { + return http.StatusNotAcceptable, "Error staring", err + } + } + federationHost.LatestActivity = activity.StartTime + err = forgefed.UpdateFederationHost(ctx, federationHost) + if err != nil { + return http.StatusNotAcceptable, "Error updating federatedHost", err + } + + return 0, "", nil +} + +// Create or update a list of FollowingRepo structs +func StoreFollowingRepoList(ctx *context_service.Context, localRepoID int64, followingRepoList []string) (int, string, error) { + followingRepos := make([]*repo.FollowingRepo, 0, len(followingRepoList)) + for _, uri := range followingRepoList { + federationHost, err := FindOrCreateFederationHost(ctx.Base, uri) + if err != nil { + return http.StatusInternalServerError, "Wrong FederationHost", err + } + followingRepoID, err := fm.NewRepositoryID(uri, string(federationHost.NodeInfo.SoftwareName)) + if err != nil { + return http.StatusNotAcceptable, "Invalid federated repo", err + } + followingRepo, err := repo.NewFollowingRepo(localRepoID, followingRepoID.ID, federationHost.ID, uri) + if err != nil { + return http.StatusNotAcceptable, "Invalid federated repo", err + } + followingRepos = append(followingRepos, &followingRepo) + } + + if err := repo.StoreFollowingRepos(ctx, localRepoID, followingRepos); err != nil { + return 0, "", err + } + + return 0, "", nil +} + +func DeleteFollowingRepos(ctx context.Context, localRepoID int64) error { + return repo.StoreFollowingRepos(ctx, localRepoID, []*repo.FollowingRepo{}) +} + +func SendLikeActivities(ctx context.Context, doer user.User, repoID int64) error { + followingRepos, err := repo.FindFollowingReposByRepoID(ctx, repoID) + log.Trace("Federated Repos is: %#v", followingRepos) + if err != nil { + return err + } + + likeActivityList := make([]fm.ForgeLike, 0) + for _, followingRepo := range followingRepos { + log.Trace("Found following repo: %#v", followingRepo) + target := followingRepo.URI + likeActivity, err := fm.NewForgeLike(doer.APActorID(), target, time.Now()) + if err != nil { + return err + } + likeActivityList = append(likeActivityList, likeActivity) + } + + apclientFactory, err := activitypub.GetClientFactory(ctx) + if err != nil { + return err + } + apclient, err := apclientFactory.WithKeys(ctx, &doer, doer.APActorID()+"#main-key") + if err != nil { + return err + } + for i, activity := range likeActivityList { + activity.StartTime = activity.StartTime.Add(time.Duration(i) * time.Second) + json, err := activity.MarshalJSON() + if err != nil { + return err + } + + _, err = apclient.Post(json, fmt.Sprintf("%v/inbox", activity.Object)) + if err != nil { + log.Error("error %v while sending activity: %#v", err, activity) + } + } + + return nil +} diff --git a/services/federation/signature_service.go b/services/federation/signature_service.go new file mode 100644 index 0000000000..e5102b89d8 --- /dev/null +++ b/services/federation/signature_service.go @@ -0,0 +1,234 @@ +// Copyright 2024, 2025 The Forgejo Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package federation + +import ( + "crypto/x509" + "database/sql" + "encoding/pem" + "errors" + "fmt" + "net/url" + + "forgejo.org/models/forgefed" + "forgejo.org/models/user" + "forgejo.org/modules/activitypub" + fm "forgejo.org/modules/forgefed" + context_service "forgejo.org/services/context" + + ap "github.com/go-ap/activitypub" +) + +// Factory function for ActorID. Created struct is asserted to be valid +func NewActorIDFromKeyID(ctx *context_service.Base, uri string) (fm.ActorID, error) { + parsedURI, err := url.Parse(uri) + parsedURI.Fragment = "" + if err != nil { + return fm.ActorID{}, err + } + + actionsUser := user.NewAPServerActor() + clientFactory, err := activitypub.GetClientFactory(ctx) + if err != nil { + return fm.ActorID{}, err + } + + apClient, err := clientFactory.WithKeys(ctx, actionsUser, actionsUser.KeyID()) + if err != nil { + return fm.ActorID{}, err + } + + userResponse, err := apClient.GetBody(parsedURI.String()) + if err != nil { + return fm.ActorID{}, err + } + + var actor ap.Actor + err = actor.UnmarshalJSON(userResponse) + if err != nil { + return fm.ActorID{}, err + } + + result, err := fm.NewActorID(actor.PublicKey.Owner.String()) + return result, err +} + +func FindOrCreateFederatedUserKey(ctx *context_service.Base, keyID string) (pubKey any, err error) { + var federatedUser *user.FederatedUser + var keyURL *url.URL + + keyURL, err = url.Parse(keyID) + if err != nil { + return nil, err + } + + // Try if the signing actor is an already known federated user + _, federatedUser, err = user.FindFederatedUserByKeyID(ctx, keyURL.String()) + if err != nil { + return nil, err + } + + if federatedUser == nil { + rawActorID, err := NewActorIDFromKeyID(ctx, keyID) + if err != nil { + return nil, err + } + + _, federatedUser, _, err = FindOrCreateFederatedUser(ctx, rawActorID.AsURI()) + if err != nil { + return nil, err + } + } else { + _, err = forgefed.GetFederationHost(ctx, federatedUser.FederationHostID) + if err != nil { + return nil, err + } + } + + if federatedUser.PublicKey.Valid { + pubKey, err := x509.ParsePKIXPublicKey(federatedUser.PublicKey.V) + if err != nil { + return nil, err + } + return pubKey, nil + } + + // Fetch missing public key + pubKey, pubKeyBytes, apPerson, err := fetchKeyFromAp(ctx, *keyURL) + if err != nil { + return nil, err + } + if apPerson.Type == ap.ActivityVocabularyType("Person") { + // Check federatedUser.id = person.id + if federatedUser.ExternalID != apPerson.ID.String() { + return nil, fmt.Errorf("federated user fetched (%v) does not match the stored one %v", apPerson, federatedUser) + } + // update federated user + federatedUser.KeyID = sql.NullString{ + String: apPerson.PublicKey.ID.String(), + Valid: true, + } + federatedUser.PublicKey = sql.Null[sql.RawBytes]{ + V: pubKeyBytes, + Valid: true, + } + err = user.UpdateFederatedUser(ctx, federatedUser) + if err != nil { + return nil, err + } + return pubKey, nil + } + return nil, nil +} + +func FindOrCreateFederationHostKey(ctx *context_service.Base, keyID string) (pubKey any, err error) { + keyURL, err := url.Parse(keyID) + if err != nil { + return nil, err + } + rawActorID, err := NewActorIDFromKeyID(ctx, keyID) + if err != nil { + return nil, err + } + + // Is there an already known federation host? + federationHost, err := forgefed.FindFederationHostByKeyID(ctx, keyURL.String()) + if err != nil { + return nil, err + } + + if federationHost == nil { + federationHost, err = FindOrCreateFederationHost(ctx, rawActorID.AsURI()) + if err != nil { + return nil, err + } + } + + // Is there an already an key? + if federationHost.PublicKey.Valid { + pubKey, err := x509.ParsePKIXPublicKey(federationHost.PublicKey.V) + if err != nil { + return nil, err + } + return pubKey, nil + } + + // If not, fetch missing public key + pubKey, pubKeyBytes, apPerson, err := fetchKeyFromAp(ctx, *keyURL) + if err != nil { + return nil, err + } + if apPerson.Type == ap.ActivityVocabularyType("Application") { + // Check federationhost.id = person.id + if federationHost.HostPort != rawActorID.HostPort || federationHost.HostFqdn != rawActorID.Host || + federationHost.HostSchema != rawActorID.HostSchema { + return nil, fmt.Errorf("federation host fetched (%v) does not match the stored one %v", apPerson, federationHost) + } + // update federation host + federationHost.KeyID = sql.NullString{ + String: apPerson.PublicKey.ID.String(), + Valid: true, + } + federationHost.PublicKey = sql.Null[sql.RawBytes]{ + V: pubKeyBytes, + Valid: true, + } + err = forgefed.UpdateFederationHost(ctx, federationHost) + if err != nil { + return nil, err + } + return pubKey, nil + } + return nil, nil +} + +func fetchKeyFromAp(ctx *context_service.Base, keyURL url.URL) (pubKey any, pubKeyBytes []byte, apPerson *ap.Person, err error) { + actionsUser := user.NewAPServerActor() + clientFactory, err := activitypub.GetClientFactory(ctx) + if err != nil { + return nil, nil, nil, err + } + + apClient, err := clientFactory.WithKeys(ctx, actionsUser, actionsUser.KeyID()) + if err != nil { + return nil, nil, nil, err + } + + b, err := apClient.GetBody(keyURL.String()) + if err != nil { + return nil, nil, nil, err + } + + person := ap.PersonNew(ap.IRI(keyURL.String())) + err = person.UnmarshalJSON(b) + if err != nil { + return nil, nil, nil, fmt.Errorf("ActivityStreams type cannot be converted to one known to have publicKey property: %w", err) + } + + pubKeyFromAp := person.PublicKey + if pubKeyFromAp.ID.String() != keyURL.String() { + return nil, nil, nil, fmt.Errorf("cannot find publicKey with id: %v in %v", keyURL, string(b)) + } + + pubKeyBytes, err = decodePublicKeyPem(pubKeyFromAp.PublicKeyPem) + if err != nil { + return nil, nil, nil, err + } + + pubKey, err = x509.ParsePKIXPublicKey(pubKeyBytes) + if err != nil { + return nil, nil, nil, err + } + + return pubKey, pubKeyBytes, person, err +} + +func decodePublicKeyPem(pubKeyPem string) ([]byte, error) { + block, _ := pem.Decode([]byte(pubKeyPem)) + if block == nil || block.Type != "PUBLIC KEY" { + return nil, errors.New("could not decode publicKeyPem to PUBLIC KEY pem block type") + } + + return block.Bytes, nil +} diff --git a/services/mailer/mail_actions.go b/services/mailer/mail_actions.go index 09763e164e..a99af823b3 100644 --- a/services/mailer/mail_actions.go +++ b/services/mailer/mail_actions.go @@ -16,8 +16,8 @@ const ( tplActionNowDone base.TplName = "actions/now_done" ) -// requires !run.Status.IsSuccess() or !lastRun.Status.IsSuccess() -func MailActionRun(run *actions_model.ActionRun, priorStatus actions_model.Status, lastRun *actions_model.ActionRun) error { +var MailActionRun = mailActionRun // make it mockable +func mailActionRun(run *actions_model.ActionRun, priorStatus actions_model.Status, lastRun *actions_model.ActionRun) error { if setting.MailService == nil { // No mail service configured return nil @@ -60,7 +60,6 @@ func sendMailActionRun(to *user_model.User, run *actions_model.ActionRun, priorS if len(commitSHA) > 7 { commitSHA = commitSHA[:7] } - branch := run.PrettyRef() data := map[string]any{ "locale": locale, @@ -73,7 +72,6 @@ func sendMailActionRun(to *user_model.User, run *actions_model.ActionRun, priorS "LastRun": lastRun, "PriorStatus": priorStatus, "CommitSHA": commitSHA, - "Branch": branch, "IsSuccess": run.Status.IsSuccess(), } diff --git a/services/mailer/mail_actions_now_done_test.go b/services/mailer/mail_actions_now_done_test.go index 6a01ea7631..e84441f460 100644 --- a/services/mailer/mail_actions_now_done_test.go +++ b/services/mailer/mail_actions_now_done_test.go @@ -54,7 +54,92 @@ func getActionsNowDoneTestOrg(t *testing.T, name, email string, owner *user_mode } func assertTranslatedLocaleMailActionsNowDone(t *testing.T, msgBody string) { - AssertTranslatedLocale(t, msgBody, "mail.actions.successful_run_after_failure", "mail.actions.not_successful_run", "mail.actions.run_info_cur_status", "mail.actions.run_info_ref", "mail.actions.run_info_previous_status", "mail.actions.run_info_trigger", "mail.view_it_on") + AssertTranslatedLocale(t, msgBody, "mail.actions.successful_run_after_failure", "mail.actions.not_successful_run", "mail.actions.run_info_cur_status", "mail.actions.run_info_sha", "mail.actions.run_info_previous_status", "mail.actions.run_info_trigger", "mail.view_it_on") +} + +func TestActionRunNowDoneStatusMatrix(t *testing.T) { + successStatuses := []actions_model.Status{ + actions_model.StatusSuccess, + actions_model.StatusSkipped, + actions_model.StatusCancelled, + } + failureStatuses := []actions_model.Status{ + actions_model.StatusFailure, + } + + for _, testCase := range []struct { + name string + statuses []actions_model.Status + hasLastRun bool + lastStatuses []actions_model.Status + run bool + }{ + { + name: "FailureNoLastRun", + statuses: failureStatuses, + run: true, + }, + { + name: "SuccessNoLastRun", + statuses: successStatuses, + run: false, + }, + { + name: "FailureLastRunSuccess", + statuses: failureStatuses, + hasLastRun: true, + lastStatuses: successStatuses, + run: true, + }, + { + name: "FailureLastRunFailure", + statuses: failureStatuses, + hasLastRun: true, + lastStatuses: failureStatuses, + run: true, + }, + { + name: "SuccessLastRunFailure", + statuses: successStatuses, + hasLastRun: true, + lastStatuses: failureStatuses, + run: true, + }, + { + name: "SuccessLastRunSuccess", + statuses: successStatuses, + hasLastRun: true, + lastStatuses: successStatuses, + run: false, + }, + } { + t.Run(testCase.name, func(t *testing.T) { + var called bool + defer test.MockVariableValue(&MailActionRun, func(run *actions_model.ActionRun, priorStatus actions_model.Status, lastRun *actions_model.ActionRun) error { + called = true + return nil + })() + for _, status := range testCase.statuses { + for _, lastStatus := range testCase.lastStatuses { + called = false + n := NewNotifier() + var lastRun *actions_model.ActionRun + if testCase.hasLastRun { + lastRun = &actions_model.ActionRun{ + Status: lastStatus, + } + } + n.ActionRunNowDone(t.Context(), + &actions_model.ActionRun{ + Status: status, + }, + actions_model.StatusUnknown, + lastRun) + assert.Equal(t, testCase.run, called, "status = %s, lastStatus = %s", status, lastStatus) + } + } + }) + } } func TestActionRunNowDoneNotificationMail(t *testing.T) { diff --git a/services/mailer/notify.go b/services/mailer/notify.go index 7461a67181..640de31fcc 100644 --- a/services/mailer/notify.go +++ b/services/mailer/notify.go @@ -212,7 +212,7 @@ func (m *mailNotifier) NewUserSignUp(ctx context.Context, newUser *user_model.Us func (m *mailNotifier) ActionRunNowDone(ctx context.Context, run *actions_model.ActionRun, priorStatus actions_model.Status, lastRun *actions_model.ActionRun) { // Only send a mail on a successful run when the workflow recovered (i.e., the run before failed). - if run.Status.IsSuccess() && (lastRun == nil || lastRun.Status.IsSuccess()) { + if !run.Status.IsFailure() && (lastRun == nil || !lastRun.Status.IsFailure()) { return } if err := MailActionRun(run, priorStatus, lastRun); err != nil { diff --git a/services/packages/alt/repository.go b/services/packages/alt/repository.go index 317862da9d..9693f4322e 100644 --- a/services/packages/alt/repository.go +++ b/services/packages/alt/repository.go @@ -714,21 +714,23 @@ func buildRelease(ctx context.Context, pv *packages_model.PackageVersion, pfs [] for architecture := range architectures.Seq() { version := time.Now().Unix() label := setting.AppName - data := fmt.Sprintf(`Archive: Alt Linux Team + origin := setting.AppName + archive := setting.AppName + + data := fmt.Sprintf(`Archive: %s Component: classic Version: %d -Origin: Alt Linux Team +Origin: %s Label: %s Architecture: %s NotAutomatic: false `, - version, label, architecture) + archive, version, origin, label, architecture) fileInfo, err := addReleaseAsFileToRepo(ctx, pv, "release.classic", data, group, architecture) if err != nil { return err } - origin := setting.AppName codename := time.Now().Unix() date := time.Now().UTC().Format(time.RFC1123) @@ -744,7 +746,7 @@ NotAutomatic: false data = fmt.Sprintf(`Origin: %s Label: %s -Suite: Sisyphus +Suite: Unknown Codename: %d Date: %s Architectures: %s diff --git a/services/pull/commit_status.go b/services/pull/commit_status.go index 3c864c8ef2..0a95ea1152 100644 --- a/services/pull/commit_status.go +++ b/services/pull/commit_status.go @@ -12,7 +12,6 @@ import ( "forgejo.org/models/db" git_model "forgejo.org/models/git" issues_model "forgejo.org/models/issues" - "forgejo.org/modules/git" "forgejo.org/modules/gitrepo" "forgejo.org/modules/log" "forgejo.org/modules/structs" @@ -105,7 +104,7 @@ func GetPullRequestCommitStatusState(ctx context.Context, pr *issues_model.PullR if pr.Flow == issues_model.PullRequestFlowGithub && !headGitRepo.IsBranchExist(pr.HeadBranch) { return "", errors.New("head branch does not exist, can not merge") } - if pr.Flow == issues_model.PullRequestFlowAGit && !git.IsReferenceExist(ctx, headGitRepo.Path, pr.GetGitRefName()) { + if pr.Flow == issues_model.PullRequestFlowAGit && !headGitRepo.IsReferenceExist(pr.GetGitRefName()) { return "", errors.New("head branch does not exist, can not merge") } diff --git a/services/pull/review.go b/services/pull/review.go index c740328e4c..7d232d6d79 100644 --- a/services/pull/review.go +++ b/services/pull/review.go @@ -9,8 +9,6 @@ import ( "errors" "fmt" "io" - "regexp" - "strings" "forgejo.org/models/db" issues_model "forgejo.org/models/issues" @@ -25,8 +23,6 @@ import ( notify_service "forgejo.org/services/notify" ) -var notEnoughLines = regexp.MustCompile(`fatal: file .* has only \d+ lines?`) - // ErrDismissRequestOnClosedPR represents an error when an user tries to dismiss a review associated to a closed or merged PR. type ErrDismissRequestOnClosedPR struct{} @@ -48,8 +44,8 @@ func (err ErrDismissRequestOnClosedPR) Unwrap() error { // If the line got changed the comment is going to be invalidated. func checkInvalidation(ctx context.Context, c *issues_model.Comment, repo *git.Repository, branch string) error { // FIXME differentiate between previous and proposed line - commit, err := repo.LineBlame(branch, repo.Path, c.TreePath, uint(c.UnsignedLine())) - if err != nil && (strings.Contains(err.Error(), "fatal: no such path") || notEnoughLines.MatchString(err.Error())) { + commit, err := repo.LineBlame(branch, c.TreePath, c.UnsignedLine()) + if err != nil && (errors.Is(err, git.ErrBlameFileDoesNotExist) || errors.Is(err, git.ErrBlameFileNotEnoughLines)) { c.Invalidated = true return issues_model.UpdateCommentInvalidate(ctx, c) } @@ -230,10 +226,10 @@ func CreateCodeCommentKnownReviewID(ctx context.Context, doer *user_model.User, // FIXME validate treePath // Get latest commit referencing the commented line // No need for get commit for base branch changes - commit, err := gitRepo.LineBlame(head, gitRepo.Path, treePath, uint(line)) + commit, err := gitRepo.LineBlame(head, treePath, uint64(line)) if err == nil { commitID = commit.ID.String() - } else if !strings.Contains(err.Error(), "exit status 128 - fatal: no such path") && !notEnoughLines.MatchString(err.Error()) { + } else if !errors.Is(err, git.ErrBlameFileDoesNotExist) && !errors.Is(err, git.ErrBlameFileNotEnoughLines) { return nil, fmt.Errorf("LineBlame[%s, %s, %s, %d]: %w", pr.GetGitRefName(), gitRepo.Path, treePath, line, err) } } diff --git a/templates/mail/actions/now_done.tmpl b/templates/mail/actions/now_done.tmpl index a890411055..adc990c545 100644 --- a/templates/mail/actions/now_done.tmpl +++ b/templates/mail/actions/now_done.tmpl @@ -21,7 +21,7 @@
{{.locale.Tr "mail.actions.run_info_cur_status" .Run.Status .PriorStatus}}
- {{.locale.Tr "mail.actions.run_info_ref" .Branch .CommitSHA}}
+ {{.locale.Tr "mail.actions.run_info_sha" .CommitSHA}}
{{if .LastRun}} {{.locale.Tr "mail.actions.run_info_previous_status" .LastRun.Status}}
{{end}} diff --git a/templates/package/content/alt.tmpl b/templates/package/content/alt.tmpl index 9a5e9c7656..0a5c328e6d 100644 --- a/templates/package/content/alt.tmpl +++ b/templates/package/content/alt.tmpl @@ -24,7 +24,7 @@ apt-get install {{$.PackageDescriptor.Package.Name}}
- +
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 3bc4cd0773..4ab1fa7584 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -221,27 +221,23 @@ {{else if and (eq .Type 9) (gt .AssigneeID 0)}}
{{svg "octicon-person"}} - {{if .RemovedAssignee}} - {{template "shared/user/avatarlink" dict "user" .Assignee}} - - {{template "shared/user/authorlink" .Assignee}} + {{template "shared/user/avatarlink" dict "user" .Assignee}} + + {{template "shared/user/authorlink" .Assignee}} + {{if .RemovedAssignee}} {{if eq .Poster.ID .Assignee.ID}} {{ctx.Locale.Tr "repo.issues.remove_self_assignment" $createdStr}} {{else}} - {{ctx.Locale.Tr "repo.issues.remove_assignee_at" .Poster.GetDisplayName $createdStr}} + {{ctx.Locale.Tr "repo.issues.remove_assignee_at" (RenderUser $.Context .Poster) $createdStr}} {{end}} - - {{else}} - {{template "shared/user/avatarlink" dict "user" .Assignee}} - - {{template "shared/user/authorlink" .Assignee}} + {{else}} {{if eq .Poster.ID .AssigneeID}} {{ctx.Locale.Tr "repo.issues.self_assign_at" $createdStr}} {{else}} - {{ctx.Locale.Tr "repo.issues.add_assignee_at" .Poster.GetDisplayName $createdStr}} + {{ctx.Locale.Tr "repo.issues.add_assignee_at" (RenderUser $.Context .Poster) $createdStr}} {{end}} - - {{end}} + {{end}} +
{{else if eq .Type 10}}
diff --git a/templates/repo/release_tag_header.tmpl b/templates/repo/release_tag_header.tmpl index 63d0689c50..75a115e31e 100644 --- a/templates/repo/release_tag_header.tmpl +++ b/templates/repo/release_tag_header.tmpl @@ -2,24 +2,23 @@ {{$canReadCode := $.Permission.CanRead $.UnitTypeCode}} {{if $canReadReleases}} -
-
-

- {{ctx.Locale.TrN .NumReleases "repo.n_release_one" "repo.n_release_few" (ctx.Locale.PrettyNumber .NumReleases)}} - {{if $canReadCode}} - {{ctx.Locale.TrN .NumTags "repo.n_tag_one" "repo.n_tag_few" (ctx.Locale.PrettyNumber .NumTags)}} - {{end}} -

+
+
+ {{ctx.Locale.TrN .NumReleases "repo.n_release_one" "repo.n_release_few" (ctx.Locale.PrettyNumber .NumReleases)}} + {{if $canReadCode}} + {{ctx.Locale.TrN .NumTags "repo.n_tag_one" "repo.n_tag_few" (ctx.Locale.PrettyNumber .NumTags)}} + {{end}}
{{if .ShowReleaseSearch}} -
+ {{template "shared/search/combo" dict "Value" .Keyword}}
{{end}} -
+
{{if .EnableFeed}} - - {{svg "octicon-rss" 16}} {{ctx.Locale.Tr "rss_feed"}} + + {{svg "octicon-rss" 16}} + {{end}} {{if and (not .PageIsTagList) .CanCreateRelease}} diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl index 0f6cb74d8c..6e9f396e2e 100644 --- a/templates/repo/settings/navbar.tmpl +++ b/templates/repo/settings/navbar.tmpl @@ -7,7 +7,7 @@
{{ctx.Locale.Tr "repo.settings.units.units"}}
- + {{ctx.Locale.Tr "repo.settings.units.overview"}} diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index 2a9d7d02ba..36809b769e 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -59,8 +59,12 @@ {{end}}
- {{svg "octicon-download"}} - {{svg "octicon-copy" 14}} + + {{svg "octicon-download"}} + + + {{svg "octicon-copy" 14}} + {{if .EnableFeed}} {{if .IsViewBranch}} @@ -74,14 +78,22 @@ {{end}} {{if .Repository.CanEnableEditor}} {{if .CanEditFile}} - {{svg "octicon-pencil"}} + + {{svg "octicon-pencil"}} + {{else}} - {{svg "octicon-pencil"}} + + {{svg "octicon-pencil"}} + {{end}} {{if .CanDeleteFile}} - {{svg "octicon-trash"}} + + {{svg "octicon-trash"}} + {{else}} - {{svg "octicon-trash"}} + + {{svg "octicon-trash"}} + {{end}} {{end}} {{else if .EscapeStatus.Escaped}} diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index 0e8382b8ab..ee5e919757 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -5533,7 +5533,7 @@ } } }, - "/repos/{owner}/{repo}/actions/workflows/{workflowname}/dispatches": { + "/repos/{owner}/{repo}/actions/workflows/{workflowfilename}/dispatches": { "post": { "consumes": [ "application/json" @@ -5561,7 +5561,7 @@ { "type": "string", "description": "name of the workflow", - "name": "workflowname", + "name": "workflowfilename", "in": "path", "required": true }, diff --git a/tests/e2e/issue-comment-dropzone.test.e2e.ts b/tests/e2e/issue-comment-dropzone.test.e2e.ts new file mode 100644 index 0000000000..33ea2c9403 --- /dev/null +++ b/tests/e2e/issue-comment-dropzone.test.e2e.ts @@ -0,0 +1,94 @@ +// Copyright 2025 The Forgejo Authors. All rights reserved. +// SPDX-License-Identifier: GPL-3.0-or-later + +// @watch start +// web_src/js/features/common-global.js +// web_src/js/features/comp/Paste.js +// web_src/js/features/repo-issue.js +// web_src/js/features/repo-legacy.js +// @watch end + +import {expect, type Locator, type Page, type TestInfo} from '@playwright/test'; +import {test, save_visual, dynamic_id} from './utils_e2e.ts'; + +test.use({user: 'user2'}); + +async function pasteImage(el: Locator) { + await el.evaluate(async (el) => { + const base64 = `data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAHklEQVQoU2MUk1P7z0AGYBzViDvURgMHT4oaQoEDAFuJEu2fuGfhAAAAAElFTkSuQmCC`; + // eslint-disable-next-line no-restricted-syntax + const response = await fetch(base64); + const blob = await response.blob(); + + el.focus(); + + let pasteEvent = new Event('paste', {bubbles: true, cancelable: true}); + pasteEvent = Object.assign(pasteEvent, { + clipboardData: { + items: [ + { + kind: 'file', + type: 'image/png', + getAsFile() { + return new File([blob], 'foo.png', {type: blob.type}); + }, + }, + ], + }, + }); + + el.dispatchEvent(pasteEvent); + }); +} + +async function assertCopy(page: Page, workerInfo: TestInfo, startWith: string) { + const project = workerInfo.project.name; + if (project === 'webkit' || project === 'Mobile Safari') return; + + const dropzone = page.locator('.dropzone'); + const preview = dropzone.locator('.dz-preview'); + const copyLink = preview.locator('.octicon-copy').locator('..'); + await copyLink.click(); + + const clipboardContent = await page.evaluate(() => navigator.clipboard.readText()); + expect(clipboardContent).toContain(startWith); +} + +test('Paste image in new comment', async ({page}, workerInfo) => { + await page.goto('/user2/repo1/issues/new'); + + await pasteImage(page.locator('.markdown-text-editor')); + + const dropzone = page.locator('.dropzone'); + await expect(dropzone.locator('.files')).toHaveCount(1); + const preview = dropzone.locator('.dz-preview'); + await expect(preview).toHaveCount(1); + await expect(preview.locator('.dz-filename')).toHaveText('foo.png'); + await expect(preview.locator('.octicon-copy')).toBeVisible(); + await assertCopy(page, workerInfo, '![foo]('); + + await save_visual(page); +}); + +test('Re-add images to dropzone on edit', async ({page}, workerInfo) => { + await page.goto('/user2/repo1/issues/new'); + + const issueTitle = dynamic_id(); + await page.locator('#issue_title').fill(issueTitle); + await pasteImage(page.locator('.markdown-text-editor')); + await page.getByRole('button', {name: 'Create issue'}).click(); + + await expect(page).toHaveURL(/\/user2\/repo1\/issues\/\d+$/); + await page.click('.comment-container .context-menu'); + await page.click('.comment-container .menu > .edit-content'); + + const dropzone = page.locator('.dropzone'); + await expect(dropzone.locator('.files').first()).toHaveCount(1); + const preview = dropzone.locator('.dz-preview'); + await expect(preview).toHaveCount(1); + await expect(preview.locator('.dz-filename')).toHaveText('foo.png'); + await expect(preview.locator('.octicon-copy')).toBeVisible(); + await assertCopy(page, workerInfo, '![foo]('); + + await save_visual(page); +}); diff --git a/tests/e2e/issue-sidebar.test.e2e.ts b/tests/e2e/issue-sidebar.test.e2e.ts index 34885d0d5d..9d2975b612 100644 --- a/tests/e2e/issue-sidebar.test.e2e.ts +++ b/tests/e2e/issue-sidebar.test.e2e.ts @@ -50,7 +50,6 @@ test.describe('Pull: Toggle WIP', () => { test('simple toggle', async ({page}, workerInfo) => { test.skip(workerInfo.project.name === 'Mobile Safari', 'Unable to get tests working on Safari Mobile, see https://codeberg.org/forgejo/forgejo/pulls/3445#issuecomment-1789636'); - await page.goto('/user2/repo1/pulls/5'); // toggle to WIP await toggle_wip_to({page}, true); await check_wip({page}, true); diff --git a/tests/e2e/login.test.e2e.ts b/tests/e2e/login.test.e2e.ts index 1ffa0b2e5d..01cf4d7b8d 100644 --- a/tests/e2e/login.test.e2e.ts +++ b/tests/e2e/login.test.e2e.ts @@ -10,7 +10,8 @@ import {expect} from '@playwright/test'; import {test, save_visual, test_context} from './utils_e2e.ts'; -test('Mismatched ROOT_URL', async ({browser}) => { +test('Mismatched ROOT_URL', async ({browser}, workerInfo) => { + test.skip(['Mobile Safari', 'webkit'].includes(workerInfo.project.name), 'init script gets randomly ignored'); const context = await test_context(browser); const page = await context.newPage(); diff --git a/tests/e2e/webauthn.test.e2e.ts b/tests/e2e/webauthn.test.e2e.ts index 0b5a6a6c2b..d4b81621d2 100644 --- a/tests/e2e/webauthn.test.e2e.ts +++ b/tests/e2e/webauthn.test.e2e.ts @@ -42,7 +42,6 @@ test('WebAuthn register & login flow', async ({browser, request}, workerInfo) => await page.locator('div[aria-label="Profile and settingsā€¦"]').click(); await page.getByText('Sign out').click(); }).toPass(); - await page.waitForURL(`${workerInfo.project.use.baseURL}/`); // Login. response = await page.goto('/user/login'); diff --git a/tests/integration/actions_run_now_done_notification_test.go b/tests/integration/actions_run_now_done_notification_test.go index d5142096c5..480d67a73d 100644 --- a/tests/integration/actions_run_now_done_notification_test.go +++ b/tests/integration/actions_run_now_done_notification_test.go @@ -49,41 +49,22 @@ func (m *mockNotifier) ActionRunNowDone(ctx context.Context, run *actions_model. assert.Equal(m.t, m.runID, run.ID) assert.Equal(m.t, actions_model.StatusFailure, run.Status) assert.Equal(m.t, actions_model.StatusRunning, priorStatus) - assert.Equal(m.t, m.lastRunID, lastRun.ID) - assert.Equal(m.t, actions_model.StatusSuccess, lastRun.Status) assert.True(m.t, run.NotifyEmail) case 2: assert.Equal(m.t, m.runID, run.ID) assert.Equal(m.t, actions_model.StatusCancelled, run.Status) assert.Equal(m.t, actions_model.StatusRunning, priorStatus) - assert.Equal(m.t, m.lastRunID, lastRun.ID) - assert.Equal(m.t, actions_model.StatusFailure, lastRun.Status) - assert.True(m.t, run.NotifyEmail) - case 3: - assert.Equal(m.t, m.runID, run.ID) - assert.Equal(m.t, actions_model.StatusSuccess, run.Status) - assert.Equal(m.t, actions_model.StatusRunning, priorStatus) - assert.Equal(m.t, m.lastRunID, lastRun.ID) - assert.Equal(m.t, actions_model.StatusCancelled, lastRun.Status) - assert.True(m.t, run.NotifyEmail) - case 4: - assert.Equal(m.t, m.runID, run.ID) - assert.Equal(m.t, actions_model.StatusSuccess, run.Status) - assert.Equal(m.t, actions_model.StatusRunning, priorStatus) - assert.Equal(m.t, m.lastRunID, lastRun.ID) - assert.Equal(m.t, actions_model.StatusSuccess, lastRun.Status) assert.True(m.t, run.NotifyEmail) default: assert.Fail(m.t, "too many notifications") } - m.lastRunID = m.runID m.runID++ m.testIdx++ } // ensure all tests have been run func (m *mockNotifier) complete() { - assert.Equal(m.t, 5, m.testIdx) + assert.Equal(m.t, 3, m.testIdx) } func TestActionNowDoneNotification(t *testing.T) { @@ -159,24 +140,6 @@ func TestActionNowDoneNotification(t *testing.T) { task = runner.fetchTask(t) require.NoError(t, actions_service.StopTask(db.DefaultContext, task.Id, actions_model.StatusCancelled)) - // we can't differentiate different runs without a delay - time.Sleep(time.Millisecond * 2000) - - // 3: successful run after failure - _, _, err = workflow.Dispatch(db.DefaultContext, inputGetter, repo, user2) - require.NoError(t, err) - task = runner.fetchTask(t) - runner.succeedAtTask(t, task) - - // we can't differentiate different runs without a delay - time.Sleep(time.Millisecond * 2000) - - // 4: successful run after success - _, _, err = workflow.Dispatch(db.DefaultContext, inputGetter, repo, user2) - require.NoError(t, err) - task = runner.fetchTask(t) - runner.succeedAtTask(t, task) - notifier.complete() }) } diff --git a/tests/integration/activitypub_client_test.go b/tests/integration/activitypub_client_test.go index afafca52ae..2adb8304c2 100644 --- a/tests/integration/activitypub_client_test.go +++ b/tests/integration/activitypub_client_test.go @@ -29,7 +29,7 @@ func TestActivityPubClientBodySize(t *testing.T) { clientFactory, err := activitypub.GetClientFactory(db.DefaultContext) require.NoError(t, err) - apClient, err := clientFactory.WithKeys(db.DefaultContext, user1, user1.APActorKeyID()) + apClient, err := clientFactory.WithKeys(db.DefaultContext, user1, user1.KeyID()) require.NoError(t, err) url := u.JoinPath("/api/v1/nodeinfo").String() diff --git a/tests/integration/api_activitypub_actor_test.go b/tests/integration/api_activitypub_actor_test.go deleted file mode 100644 index 778a34d785..0000000000 --- a/tests/integration/api_activitypub_actor_test.go +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright 2024 The Forgejo Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -package integration - -import ( - "net/http" - "testing" - - "forgejo.org/modules/setting" - "forgejo.org/modules/test" - "forgejo.org/routers" - "forgejo.org/tests" - - ap "github.com/go-ap/activitypub" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestActivityPubActor(t *testing.T) { - defer test.MockVariableValue(&setting.Federation.Enabled, true)() - defer test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())() - defer tests.PrepareTestEnv(t)() - - req := NewRequest(t, "GET", "/api/v1/activitypub/actor") - resp := MakeRequest(t, req, http.StatusOK) - assert.Contains(t, resp.Body.String(), "@context") - - var actor ap.Actor - err := actor.UnmarshalJSON(resp.Body.Bytes()) - require.NoError(t, err) - - assert.Equal(t, ap.ApplicationType, actor.Type) - assert.Equal(t, setting.Domain, actor.PreferredUsername.String()) - keyID := actor.GetID().String() - assert.Regexp(t, "activitypub/actor$", keyID) - assert.Regexp(t, "activitypub/actor/outbox$", actor.Outbox.GetID().String()) - assert.Regexp(t, "activitypub/actor/inbox$", actor.Inbox.GetID().String()) - - pubKey := actor.PublicKey - assert.NotNil(t, pubKey) - publicKeyID := keyID + "#main-key" - assert.Equal(t, pubKey.ID.String(), publicKeyID) - - pubKeyPem := pubKey.PublicKeyPem - assert.NotNil(t, pubKeyPem) - assert.Regexp(t, "^-----BEGIN PUBLIC KEY-----", pubKeyPem) -} diff --git a/tests/integration/api_activitypub_person_test.go b/tests/integration/api_activitypub_person_test.go deleted file mode 100644 index c89951ecf1..0000000000 --- a/tests/integration/api_activitypub_person_test.go +++ /dev/null @@ -1,106 +0,0 @@ -// Copyright 2022 The Gitea Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -package integration - -import ( - "fmt" - "net/http" - "net/url" - "testing" - - "forgejo.org/models/db" - "forgejo.org/models/unittest" - user_model "forgejo.org/models/user" - "forgejo.org/modules/activitypub" - "forgejo.org/modules/setting" - "forgejo.org/modules/test" - "forgejo.org/routers" - "forgejo.org/tests" - - ap "github.com/go-ap/activitypub" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestActivityPubPerson(t *testing.T) { - defer test.MockVariableValue(&setting.Federation.Enabled, true)() - defer test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())() - onGiteaRun(t, func(t *testing.T, u *url.URL) { - userID := 2 - username := "user2" - userURL := fmt.Sprintf("%sapi/v1/activitypub/user-id/%d", u, userID) - - user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) - - clientFactory, err := activitypub.GetClientFactory(db.DefaultContext) - require.NoError(t, err) - - apClient, err := clientFactory.WithKeys(db.DefaultContext, user1, user1.APActorKeyID()) - require.NoError(t, err) - - // Unsigned request - t.Run("UnsignedRequest", func(t *testing.T) { - req := NewRequest(t, "GET", userURL) - MakeRequest(t, req, http.StatusBadRequest) - }) - - t.Run("SignedRequestValidation", func(t *testing.T) { - // Signed request - resp, err := apClient.GetBody(userURL) - require.NoError(t, err) - - var person ap.Person - err = person.UnmarshalJSON(resp) - require.NoError(t, err) - - assert.Equal(t, ap.PersonType, person.Type) - assert.Equal(t, username, person.PreferredUsername.String()) - assert.Regexp(t, fmt.Sprintf("activitypub/user-id/%d$", userID), person.GetID()) - assert.Regexp(t, fmt.Sprintf("activitypub/user-id/%d/outbox$", userID), person.Outbox.GetID().String()) - assert.Regexp(t, fmt.Sprintf("activitypub/user-id/%d/inbox$", userID), person.Inbox.GetID().String()) - - assert.NotNil(t, person.PublicKey) - assert.Regexp(t, fmt.Sprintf("activitypub/user-id/%d#main-key$", userID), person.PublicKey.ID) - - assert.NotNil(t, person.PublicKey.PublicKeyPem) - assert.Regexp(t, "^-----BEGIN PUBLIC KEY-----", person.PublicKey.PublicKeyPem) - }) - }) -} - -func TestActivityPubMissingPerson(t *testing.T) { - defer test.MockVariableValue(&setting.Federation.Enabled, true)() - defer test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())() - defer tests.PrepareTestEnv(t)() - - req := NewRequest(t, "GET", "/api/v1/activitypub/user-id/999999999") - resp := MakeRequest(t, req, http.StatusNotFound) - assert.Contains(t, resp.Body.String(), "user does not exist") -} - -func TestActivityPubPersonInbox(t *testing.T) { - defer test.MockVariableValue(&setting.Federation.Enabled, true)() - defer test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())() - - onGiteaRun(t, func(t *testing.T, u *url.URL) { - defer test.MockVariableValue(&setting.AppURL, u.String())() - user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) - - user1url := u.JoinPath("/api/v1/activitypub/user-id/1").String() + "#main-key" - cf, err := activitypub.GetClientFactory(db.DefaultContext) - require.NoError(t, err) - c, err := cf.WithKeys(db.DefaultContext, user1, user1url) - require.NoError(t, err) - user2inboxurl := u.JoinPath("/api/v1/activitypub/user-id/2/inbox").String() - - // Signed request succeeds - resp, err := c.Post([]byte{}, user2inboxurl) - require.NoError(t, err) - assert.Equal(t, http.StatusNoContent, resp.StatusCode) - - // Unsigned request fails - req := NewRequest(t, "POST", user2inboxurl) - MakeRequest(t, req, http.StatusBadRequest) - }) -} diff --git a/tests/integration/api_activitypub_repository_test.go b/tests/integration/api_activitypub_repository_test.go deleted file mode 100644 index fd19b4ce33..0000000000 --- a/tests/integration/api_activitypub_repository_test.go +++ /dev/null @@ -1,169 +0,0 @@ -// Copyright 2024, 2025 The Forgejo Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -package integration - -import ( - "fmt" - "net/http" - "net/url" - "testing" - "time" - - "forgejo.org/models/db" - "forgejo.org/models/forgefed" - "forgejo.org/models/unittest" - "forgejo.org/models/user" - "forgejo.org/modules/activitypub" - forgefed_modules "forgejo.org/modules/forgefed" - "forgejo.org/modules/setting" - "forgejo.org/modules/test" - "forgejo.org/routers" - "forgejo.org/tests" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestActivityPubRepository(t *testing.T) { - defer test.MockVariableValue(&setting.Federation.Enabled, true)() - defer test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())() - - onGiteaRun(t, func(t *testing.T, u *url.URL) { - repositoryID := 2 - - apServerActor := user.NewAPServerActor() - - cf, err := activitypub.GetClientFactory(db.DefaultContext) - require.NoError(t, err) - - c, err := cf.WithKeys(db.DefaultContext, apServerActor, apServerActor.APActorKeyID()) - require.NoError(t, err) - - resp, err := c.GetBody(fmt.Sprintf("%sapi/v1/activitypub/repository-id/%d", u, repositoryID)) - require.NoError(t, err) - assert.Contains(t, string(resp), "@context") - - var repository forgefed_modules.Repository - err = repository.UnmarshalJSON(resp) - require.NoError(t, err) - - assert.Regexp(t, fmt.Sprintf("activitypub/repository-id/%d$", repositoryID), repository.GetID().String()) - }) -} - -func TestActivityPubMissingRepository(t *testing.T) { - defer test.MockVariableValue(&setting.Federation.Enabled, true)() - defer test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())() - defer tests.PrepareTestEnv(t)() - - repositoryID := 9999999 - req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/activitypub/repository-id/%d", repositoryID)) - resp := MakeRequest(t, req, http.StatusNotFound) - assert.Contains(t, resp.Body.String(), "repository does not exist") -} - -func TestActivityPubRepositoryInboxValid(t *testing.T) { - defer test.MockVariableValue(&setting.Federation.Enabled, true)() - defer test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())() - - mock := test.NewFederationServerMock() - federatedSrv := mock.DistantServer(t) - defer federatedSrv.Close() - - onGiteaRun(t, func(t *testing.T, u *url.URL) { - apServerActor := user.NewAPServerActor() - repositoryID := 2 - timeNow := time.Now().UTC() - - cf, err := activitypub.GetClientFactory(db.DefaultContext) - require.NoError(t, err) - - c, err := cf.WithKeys(db.DefaultContext, apServerActor, apServerActor.APActorKeyID()) - require.NoError(t, err) - - repoInboxURL := u.JoinPath(fmt.Sprintf("/api/v1/activitypub/repository-id/%d/inbox", repositoryID)).String() - - activity1 := []byte(fmt.Sprintf( - `{"type":"Like",`+ - `"startTime":"%s",`+ - `"actor":"%s/api/v1/activitypub/user-id/15",`+ - `"object":"%s"}`, - timeNow.Format(time.RFC3339), - federatedSrv.URL, u.JoinPath(fmt.Sprintf("/api/v1/activitypub/repository-id/%d", repositoryID)).String())) - t.Logf("activity: %s", activity1) - resp, err := c.Post(activity1, repoInboxURL) - - require.NoError(t, err) - assert.Equal(t, http.StatusNoContent, resp.StatusCode) - - federationHost := unittest.AssertExistsAndLoadBean(t, &forgefed.FederationHost{HostFqdn: "127.0.0.1"}) - federatedUser := unittest.AssertExistsAndLoadBean(t, &user.FederatedUser{ExternalID: "15", FederationHostID: federationHost.ID}) - unittest.AssertExistsAndLoadBean(t, &user.User{ID: federatedUser.UserID}) - - // A like activity by a different user of the same federated host. - activity2 := []byte(fmt.Sprintf( - `{"type":"Like",`+ - `"startTime":"%s",`+ - `"actor":"%s/api/v1/activitypub/user-id/30",`+ - `"object":"%s"}`, - // Make sure this activity happens later then the one before - timeNow.Add(time.Second).Format(time.RFC3339), - federatedSrv.URL, u.JoinPath(fmt.Sprintf("/api/v1/activitypub/repository-id/%d", repositoryID)).String())) - t.Logf("activity: %s", activity2) - resp, err = c.Post(activity2, repoInboxURL) - - require.NoError(t, err) - assert.Equal(t, http.StatusNoContent, resp.StatusCode) - - federatedUser = unittest.AssertExistsAndLoadBean(t, &user.FederatedUser{ExternalID: "30", FederationHostID: federationHost.ID}) - unittest.AssertExistsAndLoadBean(t, &user.User{ID: federatedUser.UserID}) - - // The same user sends another like activity - otherRepositoryID := 3 - otherRepoInboxURL := u.JoinPath(fmt.Sprintf("/api/v1/activitypub/repository-id/%d/inbox", otherRepositoryID)).String() - activity3 := []byte(fmt.Sprintf( - `{"type":"Like",`+ - `"startTime":"%s",`+ - `"actor":"%s/api/v1/activitypub/user-id/30",`+ - `"object":"%s"}`, - // Make sure this activity happens later then the ones before - timeNow.Add(time.Second*2).Format(time.RFC3339), - federatedSrv.URL, u.JoinPath(fmt.Sprintf("/api/v1/activitypub/repository-id/%d", otherRepositoryID)).String())) - t.Logf("activity: %s", activity3) - resp, err = c.Post(activity3, otherRepoInboxURL) - - require.NoError(t, err) - assert.Equal(t, http.StatusNoContent, resp.StatusCode) - - federatedUser = unittest.AssertExistsAndLoadBean(t, &user.FederatedUser{ExternalID: "30", FederationHostID: federationHost.ID}) - unittest.AssertExistsAndLoadBean(t, &user.User{ID: federatedUser.UserID}) - - // Replay activity2. - resp, err = c.Post(activity2, repoInboxURL) - require.NoError(t, err) - assert.Equal(t, http.StatusNotAcceptable, resp.StatusCode) - }) -} - -func TestActivityPubRepositoryInboxInvalid(t *testing.T) { - defer test.MockVariableValue(&setting.Federation.Enabled, true)() - defer test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())() - - onGiteaRun(t, func(t *testing.T, u *url.URL) { - apServerActor := user.NewAPServerActor() - repositoryID := 2 - - cf, err := activitypub.GetClientFactory(db.DefaultContext) - require.NoError(t, err) - - c, err := cf.WithKeys(db.DefaultContext, apServerActor, apServerActor.APActorKeyID()) - require.NoError(t, err) - - repoInboxURL := u.JoinPath(fmt.Sprintf("/api/v1/activitypub/repository-id/%d/inbox", repositoryID)).String() - activity := []byte(`{"type":"Wrong"}`) - resp, err := c.Post(activity, repoInboxURL) - require.NoError(t, err) - assert.Equal(t, http.StatusNotAcceptable, resp.StatusCode) - }) -} diff --git a/tests/integration/api_federation_httpsig_test.go b/tests/integration/api_federation_httpsig_test.go deleted file mode 100644 index a7a5ae26ed..0000000000 --- a/tests/integration/api_federation_httpsig_test.go +++ /dev/null @@ -1,82 +0,0 @@ -// Copyright 2025 The Forgejo Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -package integration - -import ( - "fmt" - "net/http" - "net/url" - "testing" - - "forgejo.org/models/db" - "forgejo.org/models/forgefed" - "forgejo.org/models/unittest" - "forgejo.org/models/user" - "forgejo.org/modules/activitypub" - "forgejo.org/modules/setting" - "forgejo.org/modules/test" - "forgejo.org/routers" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestFederationHttpSigValidation(t *testing.T) { - defer test.MockVariableValue(&setting.Federation.Enabled, true)() - defer test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())() - - onGiteaRun(t, func(t *testing.T, u *url.URL) { - userID := 2 - userURL := fmt.Sprintf("%sapi/v1/activitypub/user-id/%d", u, userID) - - user1 := unittest.AssertExistsAndLoadBean(t, &user.User{ID: 1}) - - clientFactory, err := activitypub.GetClientFactory(db.DefaultContext) - require.NoError(t, err) - - apClient, err := clientFactory.WithKeys(db.DefaultContext, user1, user1.APActorKeyID()) - require.NoError(t, err) - - // Unsigned request - t.Run("UnsignedRequest", func(t *testing.T) { - req := NewRequest(t, "GET", userURL) - MakeRequest(t, req, http.StatusBadRequest) - }) - - // Signed request - t.Run("SignedRequest", func(t *testing.T) { - resp, err := apClient.Get(userURL) - require.NoError(t, err) - assert.Equal(t, http.StatusOK, resp.StatusCode) - }) - - // HACK HACK HACK: the host part of the URL gets set to which IP forgejo is - // listening on, NOT localhost, which is the Domain given to forgejo which - // is then used for eg. the keyID all requests - applicationKeyID := fmt.Sprintf("%sapi/v1/activitypub/actor#main-key", setting.AppURL) - actorKeyID := fmt.Sprintf("%sapi/v1/activitypub/user-id/1#main-key", setting.AppURL) - - // Check for cached public keys - t.Run("ValidateCaches", func(t *testing.T) { - host, err := forgefed.FindFederationHostByKeyID(db.DefaultContext, applicationKeyID) - require.NoError(t, err) - assert.NotNil(t, host) - assert.True(t, host.PublicKey.Valid) - - _, user, err := user.FindFederatedUserByKeyID(db.DefaultContext, actorKeyID) - require.NoError(t, err) - assert.NotNil(t, user) - assert.True(t, user.PublicKey.Valid) - }) - - // Disable signature validation - defer test.MockVariableValue(&setting.Federation.SignatureEnforced, false)() - - // Unsigned request - t.Run("SignatureValidationDisabled", func(t *testing.T) { - req := NewRequest(t, "GET", userURL) - MakeRequest(t, req, http.StatusOK) - }) - }) -} diff --git a/tests/integration/api_packages_alt_test.go b/tests/integration/api_packages_alt_test.go index c7ee2c49a5..f43759364e 100644 --- a/tests/integration/api_packages_alt_test.go +++ b/tests/integration/api_packages_alt_test.go @@ -214,7 +214,7 @@ enabled=1`, } assert.Equal(t, "classic", result.Component) - assert.Equal(t, "Alt Linux Team", result.Origin) + assert.Equal(t, "Forgejo", result.Origin) assert.Equal(t, "Forgejo", result.Label) assert.Equal(t, "x86_64", result.Architecture) assert.False(t, result.NotAutomatic) @@ -299,17 +299,17 @@ enabled=1`, assert.Equal(t, "Forgejo", result.Origin) assert.Equal(t, "Forgejo", result.Label) - assert.Equal(t, "Sisyphus", result.Suite) + assert.Equal(t, "Unknown", result.Suite) assert.Equal(t, "x86_64", result.Architectures) assert.Len(t, result.MD5Sum, 3) - assert.Equal(t, "bbf7ae6b2f540673ed1cfc0266b5f319", result.MD5Sum[0].Hash) - assert.Equal(t, 1003, result.MD5Sum[0].Size) + assert.Equal(t, "3f25f44163e8e512efb248d3b96949c3", result.MD5Sum[0].Hash) + assert.Equal(t, 1147, result.MD5Sum[0].Size) assert.Equal(t, "base/pkglist.classic", result.MD5Sum[0].File) assert.Len(t, result.BLAKE2B, 3) - assert.Equal(t, "b527bf038895ce29107ec3a6d2eebd7c365e8ce5ab767276eeddd7c549a159025225cb0ecfdbf7b71da13db7e865e77bcb0e2dae4d21335df01a4a17e0056a70", result.BLAKE2B[0].Hash) - assert.Equal(t, 1003, result.BLAKE2B[0].Size) + assert.Equal(t, "21a63e12a41f70e0697d354ae31e22ad6f024ec5ead2ea498b9a1b7db0f98a4e441f46c96d6912fba19148ff013457561fbb9bf3fca2a21d04cf15a325be7de9", result.BLAKE2B[0].Hash) + assert.Equal(t, 1147, result.BLAKE2B[0].Size) assert.Equal(t, "base/pkglist.classic", result.BLAKE2B[0].File) }) @@ -567,9 +567,9 @@ enabled=1`, assert.Equal(t, "https://gitea.io", result.URL) assert.Equal(t, "x86_64", result.Arch) assert.Equal(t, "gitea-test-1.0.2-1.src.rpm", result.SourceRpm) - assert.Equal(t, []string{"", ""}, result.ProvideNames) + assert.Equal(t, []string{"gitea-test(x86-64)", "gitea-test(x86-64)"}, result.ProvideNames) assert.Equal(t, []int{16777226, 16777226, 16777226, 16777226, 16777226, 16777226, 16777226}, result.RequireFlags) - assert.Equal(t, []string{"", "", "", "", "", "", ""}, result.RequireNames) + assert.Equal(t, []string{"rpmlib(PayloadIsXz)", "rpmlib(PayloadIsXz)", "rpmlib(PayloadIsXz)", "rpmlib(PayloadIsXz)", "rpmlib(PayloadIsXz)", "rpmlib(PayloadIsXz)", "rpmlib(PayloadIsXz)"}, result.RequireNames) assert.Equal(t, []string{"5.2-1", "5.2-1", "5.2-1", "5.2-1", "5.2-1", "5.2-1", "5.2-1"}, result.RequireVersions) assert.Equal(t, []int{1678276800}, result.ChangeLogTimes) assert.Equal(t, []string{"KN4CK3R "}, result.ChangeLogNames) diff --git a/tests/integration/issue_comment_test.go b/tests/integration/issue_comment_test.go index 0c53c3028b..6c4a514eba 100644 --- a/tests/integration/issue_comment_test.go +++ b/tests/integration/issue_comment_test.go @@ -223,15 +223,13 @@ func TestIssueCommentChangeAssignee(t *testing.T) { testIssueCommentChangeEvent(t, htmlDoc, "2041", "octicon-person", "User One", "/user1", []string{"user1 was unassigned by user2"}, - []string{"/user1"}) - // []string{"/user1", "/user2"}) + []string{"/user1", "/user2"}) // Add other testIssueCommentChangeEvent(t, htmlDoc, "2042", "octicon-person", "< Ur Tw ><", "/user2", []string{"user2 was assigned by user1"}, - []string{"/user2"}) - // []string{"/user2", "/user1"}) + []string{"/user2", "/user1"}) // Self-remove testIssueCommentChangeEvent(t, htmlDoc, "2043", diff --git a/tests/integration/issue_test.go b/tests/integration/issue_test.go index 34a6e53a37..72fe2a4e49 100644 --- a/tests/integration/issue_test.go +++ b/tests/integration/issue_test.go @@ -629,7 +629,12 @@ func TestIssueCommentAttachment(t *testing.T) { assert.NotEqual(t, 0, id) req = NewRequest(t, "GET", fmt.Sprintf("/%s/%s/comments/%d/attachments", "user2", "repo1", id)) - session.MakeRequest(t, req, http.StatusOK) + resp = session.MakeRequest(t, req, http.StatusOK) + var attachments []*api.WebAttachment + DecodeJSON(t, resp, &attachments) + assert.Len(t, attachments, 1) + assert.Equal(t, attachments[0].UUID, uuid) + assert.Equal(t, "image/png", attachments[0].MimeType) // Using the ID of a comment that does not belong to the repository must fail req = NewRequest(t, "GET", fmt.Sprintf("/%s/%s/comments/%d/attachments", "user5", "repo4", id)) diff --git a/tests/integration/oauth_test.go b/tests/integration/oauth_test.go index 2b44863ec2..188b0426da 100644 --- a/tests/integration/oauth_test.go +++ b/tests/integration/oauth_test.go @@ -632,17 +632,29 @@ func TestSignInOAuthCallbackPKCE(t *testing.T) { }) } -func TestWellKnownDocumentIssuerDoesNotEndWithASlash(t *testing.T) { +func TestWellKnownOpenIDConfiguration(t *testing.T) { defer tests.PrepareTestEnv(t)() - req := NewRequest(t, "GET", "/.well-known/openid-configuration") - resp := MakeRequest(t, req, http.StatusOK) - type response struct { - Issuer string `json:"issuer"` - } - parsed := new(response) - DecodeJSON(t, resp, parsed) - assert.Equal(t, strings.TrimSuffix(setting.AppURL, "/"), parsed.Issuer) + t.Run("Issuer does not end with a slash", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + req := NewRequest(t, "GET", "/.well-known/openid-configuration") + resp := MakeRequest(t, req, http.StatusOK) + type response struct { + Issuer string `json:"issuer"` + } + parsed := new(response) + + DecodeJSON(t, resp, parsed) + assert.Equal(t, strings.TrimSuffix(setting.AppURL, "/"), parsed.Issuer) + }) + + t.Run("Not found if OAuth2 is not enabled", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + defer test.MockVariableValue(&setting.OAuth2.Enabled, false)() + + MakeRequest(t, NewRequest(t, "GET", "/.well-known/openid-configuration"), http.StatusNotFound) + }) } func TestSignInOAuthCallbackRedirectToEscaping(t *testing.T) { diff --git a/tests/integration/pull_commit_test.go b/tests/integration/pull_commit_test.go index f82fc08df4..8a632fa338 100644 --- a/tests/integration/pull_commit_test.go +++ b/tests/integration/pull_commit_test.go @@ -65,7 +65,7 @@ func TestPullCommitLinks(t *testing.T) { func TestPullCommitSignature(t *testing.T) { t.Cleanup(func() { // Cannot use t.Context(), it is in the done state. - require.NoError(t, git.InitFull(context.Background())) //nolint:usetesting + require.NoError(t, git.InitFull(context.Background())) }) defer test.MockVariableValue(&setting.Repository.Signing.SigningName, "UwU")() diff --git a/tests/integration/pull_review_test.go b/tests/integration/pull_review_test.go index 603252f45f..4af0a1100e 100644 --- a/tests/integration/pull_review_test.go +++ b/tests/integration/pull_review_test.go @@ -5,19 +5,23 @@ package integration import ( + "bytes" "fmt" "io" "net/http" "net/http/httptest" "net/url" + "os" "path" "strconv" "strings" "testing" + "time" "forgejo.org/models/db" issues_model "forgejo.org/models/issues" repo_model "forgejo.org/models/repo" + unit_model "forgejo.org/models/unit" "forgejo.org/models/unittest" user_model "forgejo.org/models/user" "forgejo.org/modules/git" @@ -761,3 +765,158 @@ func updateFileInBranch(user *user_model.User, repo *repo_model.Repository, tree _, err = files_service.ChangeRepoFiles(git.DefaultContext, repo, user, opts) return err } + +func TestPullRequestStaleReview(t *testing.T) { + onGiteaRun(t, func(t *testing.T, u *url.URL) { + user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) + session := loginUser(t, user2.Name) + + // Create temporary repository. + repo, _, f := tests.CreateDeclarativeRepo(t, user2, "", + []unit_model.Type{unit_model.TypePullRequests}, nil, + []*files_service.ChangeRepoFile{ + { + Operation: "create", + TreePath: "FUNFACT", + ContentReader: strings.NewReader("Smithy was the runner up to be Forgejo's name"), + }, + }, + ) + defer f() + + // Clone it. + dstPath := t.TempDir() + r := fmt.Sprintf("%suser2/%s.git", u.String(), repo.Name) + cloneURL, _ := url.Parse(r) + cloneURL.User = url.UserPassword("user2", userPassword) + require.NoError(t, git.CloneWithArgs(t.Context(), nil, cloneURL.String(), dstPath, git.CloneRepoOptions{})) + + // Create first commit. + require.NoError(t, os.WriteFile(path.Join(dstPath, "README.md"), []byte("## test content"), 0o600)) + require.NoError(t, git.AddChanges(dstPath, true)) + require.NoError(t, git.CommitChanges(dstPath, git.CommitChangesOptions{ + Committer: &git.Signature{ + Email: "user2@example.com", + Name: "user2", + When: time.Now(), + }, + Author: &git.Signature{ + Email: "user2@example.com", + Name: "user2", + When: time.Now(), + }, + Message: "Add README.", + })) + stdout := &bytes.Buffer{} + require.NoError(t, git.NewCommand(t.Context(), "rev-parse", "HEAD").Run(&git.RunOpts{Dir: dstPath, Stdout: stdout})) + firstCommitID := strings.TrimSpace(stdout.String()) + + // Create agit PR. + require.NoError(t, git.NewCommand(t.Context(), "push", "origin", "HEAD:refs/for/main", "-o", "topic=agit-pr").Run(&git.RunOpts{Dir: dstPath})) + + pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{Index: 1, BaseRepoID: repo.ID}) + + req := NewRequest(t, "GET", "/"+repo.FullName()+"/pulls/1/files/reviews/new_comment") + resp := session.MakeRequest(t, req, http.StatusOK) + doc := NewHTMLParser(t, resp.Body) + + t.Run("Mark review as stale", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + // Create a approved review against against this commit. + req = NewRequestWithValues(t, "POST", "/"+repo.FullName()+"/pulls/1/files/reviews/comments", map[string]string{ + "_csrf": doc.GetCSRF(), + "origin": doc.GetInputValueByName("origin"), + "latest_commit_id": firstCommitID, + "side": "proposed", + "line": "1", + "path": "FUNFACT", + "diff_start_cid": doc.GetInputValueByName("diff_start_cid"), + "diff_end_cid": doc.GetInputValueByName("diff_end_cid"), + "diff_base_cid": doc.GetInputValueByName("diff_base_cid"), + "content": "nitpicking comment", + "pending_review": "", + }) + session.MakeRequest(t, req, http.StatusOK) + + req = NewRequestWithValues(t, "POST", "/"+repo.FullName()+"/pulls/1/files/reviews/submit", map[string]string{ + "_csrf": doc.GetCSRF(), + "commit_id": firstCommitID, + "content": "looks good", + "type": "comment", + }) + session.MakeRequest(t, req, http.StatusOK) + + // Review is not stale. + review := unittest.AssertExistsAndLoadBean(t, &issues_model.Review{IssueID: pr.IssueID}) + assert.False(t, review.Stale) + + // Create second commit + require.NoError(t, os.WriteFile(path.Join(dstPath, "README.md"), []byte("## I prefer this heading"), 0o600)) + require.NoError(t, git.AddChanges(dstPath, true)) + require.NoError(t, git.CommitChanges(dstPath, git.CommitChangesOptions{ + Committer: &git.Signature{ + Email: "user2@example.com", + Name: "user2", + When: time.Now(), + }, + Author: &git.Signature{ + Email: "user2@example.com", + Name: "user2", + When: time.Now(), + }, + Message: "Add README.", + })) + + // Push to agit PR. + require.NoError(t, git.NewCommand(t.Context(), "push", "origin", "HEAD:refs/for/main", "-o", "topic=agit-pr").Run(&git.RunOpts{Dir: dstPath})) + + // Review is stale. + review = unittest.AssertExistsAndLoadBean(t, &issues_model.Review{IssueID: pr.IssueID}) + assert.True(t, review.Stale) + }) + + t.Run("Create stale review", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + // Review based on the first commit, which is a stale review because the + // PR's head is at the seconnd commit. + req := NewRequestWithValues(t, "POST", "/"+repo.FullName()+"/pulls/1/files/reviews/submit", map[string]string{ + "_csrf": doc.GetCSRF(), + "commit_id": firstCommitID, + "content": "looks good", + "type": "approve", + }) + session.MakeRequest(t, req, http.StatusOK) + + // There does not exist a review that is not stale, because all reviews + // are based on the first commit and the PR's head is at the second commit. + unittest.AssertExistsIf(t, false, &issues_model.Review{IssueID: pr.IssueID}, "stale = false") + }) + + t.Run("Mark unstale", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + // Force push the PR to the first commit. + require.NoError(t, git.NewCommand(t.Context(), "reset", "--hard", "HEAD~1").Run(&git.RunOpts{Dir: dstPath})) + require.NoError(t, git.NewCommand(t.Context(), "push", "origin", "HEAD:refs/for/main", "-o", "topic=agit-pr", "-o", "force-push").Run(&git.RunOpts{Dir: dstPath})) + + // There does not exist a review that is stale, because all reviews + // are based on the first commit and thus all reviews are no longer marked + // as stale. + unittest.AssertExistsIf(t, false, &issues_model.Review{IssueID: pr.IssueID}, "stale = true") + }) + + t.Run("Diff did not change", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + // Create a empty commit and push it to the PR. + require.NoError(t, git.NewCommand(t.Context(), "commit", "--allow-empty", "-m", "Empty commit").Run(&git.RunOpts{Dir: dstPath})) + require.NoError(t, git.NewCommand(t.Context(), "push", "origin", "HEAD:refs/for/main", "-o", "topic=agit-pr").Run(&git.RunOpts{Dir: dstPath})) + + // There does not exist a review that is stale, because the diff did not + // change. + unittest.AssertExistsIf(t, false, &issues_model.Review{IssueID: pr.IssueID}, "stale = true") + }) + }) +} diff --git a/tests/integration/release_test.go b/tests/integration/release_test.go index b5cccc65e8..f9ce3c81de 100644 --- a/tests/integration/release_test.go +++ b/tests/integration/release_test.go @@ -70,7 +70,7 @@ func checkLatestReleaseAndCount(t *testing.T, session *TestSession, repoURL, ver // Check release count in the counter on the Release/Tag switch, as well as that the tab is highlighted if count < 10 { // Only check values less than 10, should be enough attempts before this test cracks // 10 is the pagination limit, but the counter can have more than that - releaseTab := htmlDoc.doc.Find(".repository.releases .ui.compact.menu a.active.item[href$='/releases']") + releaseTab := htmlDoc.doc.Find(".repository.releases .switch a.active.item[href$='/releases']") assert.Contains(t, releaseTab.Text(), strconv.Itoa(count)+" release") // Could be "1 release" or "4 releases" } diff --git a/tests/integration/repo_settings_test.go b/tests/integration/repo_settings_test.go index 63cc5332bc..6b467d78b2 100644 --- a/tests/integration/repo_settings_test.go +++ b/tests/integration/repo_settings_test.go @@ -6,21 +6,16 @@ package integration import ( "fmt" "net/http" - "strings" "testing" "forgejo.org/models/db" - "forgejo.org/models/forgefed" git_model "forgejo.org/models/git" repo_model "forgejo.org/models/repo" unit_model "forgejo.org/models/unit" "forgejo.org/models/unittest" user_model "forgejo.org/models/user" - fm "forgejo.org/modules/forgefed" "forgejo.org/modules/optional" "forgejo.org/modules/setting" - "forgejo.org/modules/test" - "forgejo.org/modules/validation" gitea_context "forgejo.org/services/context" repo_service "forgejo.org/services/repository" user_service "forgejo.org/services/user" @@ -311,63 +306,3 @@ func TestProtectedBranch(t *testing.T) { unittest.AssertCount(t, &git_model.ProtectedBranch{RuleName: "master", RepoID: repo.ID}, 1) }) } - -func TestRepoFollowing(t *testing.T) { - defer tests.PrepareTestEnv(t)() - defer test.MockVariableValue(&setting.Federation.Enabled, true)() - - mock := test.NewFederationServerMock() - federatedSrv := mock.DistantServer(t) - defer federatedSrv.Close() - - user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) - repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1, OwnerID: user.ID}) - session := loginUser(t, user.Name) - - t.Run("Add a following repo", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - link := fmt.Sprintf("/%s/settings", repo.FullName()) - - req := NewRequestWithValues(t, "POST", link, map[string]string{ - "_csrf": GetCSRF(t, session, link), - "action": "federation", - "following_repos": fmt.Sprintf("%s/api/v1/activitypub/repository-id/1", federatedSrv.URL), - }) - session.MakeRequest(t, req, http.StatusSeeOther) - - // Verify it was added. - federationHost := unittest.AssertExistsAndLoadBean(t, &forgefed.FederationHost{HostFqdn: "127.0.0.1"}) - unittest.AssertExistsAndLoadBean(t, &repo_model.FollowingRepo{ - ExternalID: "1", - FederationHostID: federationHost.ID, - }) - }) - - t.Run("Star a repo having a following repo", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - repoLink := fmt.Sprintf("/%s", repo.FullName()) - link := fmt.Sprintf("%s/action/star", repoLink) - req := NewRequestWithValues(t, "POST", link, map[string]string{ - "_csrf": GetCSRF(t, session, repoLink), - }) - - session.MakeRequest(t, req, http.StatusOK) - - // Verify distant server received a like activity - like := fm.ForgeLike{} - err := like.UnmarshalJSON([]byte(mock.LastPost)) - if err != nil { - t.Errorf("Error unmarshalling ForgeLike: %q", err) - } - if isValid, err := validation.IsValid(like); !isValid { - t.Errorf("ForgeLike is not valid: %q", err) - } - activityType := like.Type - object := like.Object.GetLink().String() - isLikeType := activityType == "Like" - isCorrectObject := strings.HasSuffix(object, "/api/v1/activitypub/repository-id/1") - if !isLikeType || !isCorrectObject { - t.Error("Activity is not a like for this repo") - } - }) -} diff --git a/tests/integration/repo_tag_test.go b/tests/integration/repo_tag_test.go index 9be33ec8a8..4f72b58d12 100644 --- a/tests/integration/repo_tag_test.go +++ b/tests/integration/repo_tag_test.go @@ -41,11 +41,11 @@ func TestTagViewWithoutRelease(t *testing.T) { // Test that the tags sub-menu is active and has a counter htmlDoc := NewHTMLParser(t, resp.Body) - tagsTab := htmlDoc.Find(".small-menu-items .active.item[href$='/tags']") + tagsTab := htmlDoc.Find(".switch .active.item[href$='/tags']") assert.Contains(t, tagsTab.Text(), "4 tags") // Test that the release sub-menu isn't active - releaseLink := htmlDoc.Find(".small-menu-items .item[href$='/releases']") + releaseLink := htmlDoc.Find(".switch .item[href$='/releases']") assert.False(t, releaseLink.HasClass("active")) // Test that the title is displayed diff --git a/tests/integration/repo_test.go b/tests/integration/repo_test.go index 598a508294..3d5922c0b1 100644 --- a/tests/integration/repo_test.go +++ b/tests/integration/repo_test.go @@ -690,7 +690,7 @@ func TestViewCommit(t *testing.T) { func TestViewCommitSignature(t *testing.T) { t.Cleanup(func() { // Cannot use t.Context(), it is in the done state. - require.NoError(t, git.InitFull(context.Background())) //nolint:usetesting + require.NoError(t, git.InitFull(context.Background())) }) defer test.MockVariableValue(&setting.Repository.Signing.SigningName, "UwU")() diff --git a/tests/integration/signing_git_test.go b/tests/integration/signing_git_test.go index 8b6b30ecab..7018b10376 100644 --- a/tests/integration/signing_git_test.go +++ b/tests/integration/signing_git_test.go @@ -32,7 +32,7 @@ import ( func TestInstanceSigning(t *testing.T) { t.Cleanup(func() { // Cannot use t.Context(), it is in the done state. - require.NoError(t, git.InitFull(context.Background())) //nolint:usetesting + require.NoError(t, git.InitFull(context.Background())) }) onGiteaRun(t, func(t *testing.T, u *url.URL) { diff --git a/tests/integration/webfinger_test.go b/tests/integration/webfinger_test.go index 078be6fa54..9708fc1627 100644 --- a/tests/integration/webfinger_test.go +++ b/tests/integration/webfinger_test.go @@ -52,6 +52,15 @@ func TestWebfinger(t *testing.T) { assert.Equal(t, "acct:user2@"+appURL.Host, jrd.Subject) assert.ElementsMatch(t, []string{user.HTMLURL(), appURL.String() + "api/v1/activitypub/user-id/" + fmt.Sprint(user.ID)}, jrd.Aliases) + instanceReq := NewRequest(t, "GET", fmt.Sprintf("/.well-known/webfinger?resource=acct:ghost@%s", appURL.Host)) + instanceResp := MakeRequest(t, instanceReq, http.StatusOK) + assert.Equal(t, "application/jrd+json", instanceResp.Header().Get("Content-Type")) + + var instanceActor webfingerJRD + DecodeJSON(t, instanceResp, &instanceActor) + assert.Equal(t, "acct:ghost@"+appURL.Host, instanceActor.Subject) + assert.ElementsMatch(t, []string{appURL.String() + "api/v1/activitypub/actor"}, instanceActor.Aliases) + req = NewRequest(t, "GET", fmt.Sprintf("/.well-known/webfinger?resource=acct:%s@%s", user.LowerName, "unknown.host")) MakeRequest(t, req, http.StatusBadRequest) diff --git a/web_src/css/repo/release-tag.css b/web_src/css/repo/release-tag.css index 9860813e98..4a4158f4ba 100644 --- a/web_src/css/repo/release-tag.css +++ b/web_src/css/repo/release-tag.css @@ -110,6 +110,12 @@ .repository.new.release .field button { margin-bottom: 1em; } + .release-list-search { + order: 2 !important; + } + .release-list-buttons { + margin-left: auto; + } } .repository.new.release .field .attachment_edit { diff --git a/web_src/fomantic/package-lock.json b/web_src/fomantic/package-lock.json index d91eb98866..314afd5869 100644 --- a/web_src/fomantic/package-lock.json +++ b/web_src/fomantic/package-lock.json @@ -494,9 +494,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "24.0.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-24.0.7.tgz", - "integrity": "sha512-YIEUUr4yf8q8oQoXPpSlnvKNVKDQlPMWrmOcgzoduo7kvA2UF0/BwJ/eMKFTiTtkNL17I0M6Xe2tvwFU7be6iw==", + "version": "24.0.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.0.10.tgz", + "integrity": "sha512-ENHwaH+JIRTDIEEbDK6QSQntAYGtbvdDXnMXnZaZ6k13Du1dPMmprkEHIL7ok2Wl2aZevetwTAb5S+7yIF+enA==", "license": "MIT", "dependencies": { "undici-types": "~7.8.0" @@ -1249,9 +1249,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001726", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001726.tgz", - "integrity": "sha512-VQAUIUzBiZ/UnlM28fSp2CRF3ivUn1BWEvxMcVTNwpw91Py1pGbPIyIKtd+tzct9C3ouceCVdGAXxZOpZAsgdw==", + "version": "1.0.30001727", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001727.tgz", + "integrity": "sha512-pB68nIHmbN6L/4C6MH1DokyR3bYqFwjaSs/sWDHGj4CTcFtQUQMuJftVwWkXq7mNWOybD3KhUv3oWHoGxgP14Q==", "funding": [ { "type": "opencollective", @@ -2005,9 +2005,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.177", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.177.tgz", - "integrity": "sha512-7EH2G59nLsEMj97fpDuvVcYi6lwTcM1xuWw3PssD8xzboAW7zj7iB3COEEEATUfjLHrs5uKBLQT03V/8URx06g==", + "version": "1.5.179", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.179.tgz", + "integrity": "sha512-UWKi/EbBopgfFsc5k61wFpV7WrnnSlSzW/e2XcBmS6qKYTivZlLtoll5/rdqRTxGglGHkmkW0j0pFNJG10EUIQ==", "license": "ISC" }, "node_modules/emoji-regex": { diff --git a/web_src/js/features/common-global.js b/web_src/js/features/common-global.js index 1aa9edf60f..c6cb4fa47c 100644 --- a/web_src/js/features/common-global.js +++ b/web_src/js/features/common-global.js @@ -208,65 +208,133 @@ export function initGlobalDropzone() { } } -export function initDropzone(el) { - const $dropzone = $(el); - const _promise = createDropzone(el, { - url: $dropzone.data('upload-url'), +export async function initDropzone(dropzoneEl, zone = undefined) { + if (!dropzoneEl) return; + + let disableRemovedfileEvent = false; // when resetting the dropzone (removeAllFiles), disable the "removedfile" event + let fileUuidDict = {}; // to record: if a comment has been saved, then the uploaded files won't be deleted from server when clicking the Remove in the dropzone + + const initFilePreview = (file, data, isReload = false) => { + file.uuid = data.uuid; + fileUuidDict[file.uuid] = {submitted: isReload}; + const input = document.createElement('input'); + input.id = data.uuid; + input.name = 'files'; + input.type = 'hidden'; + input.value = data.uuid; + const inputPath = document.createElement('input'); + inputPath.name = `files_fullpath[${data.uuid}]`; + inputPath.type = 'hidden'; + inputPath.value = htmlEscape(file.fullPath || file.name); + dropzoneEl.querySelector('.files').append(input).append(inputPath); + + // Create a "Copy Link" element, to conveniently copy the image + // or file link as Markdown to the clipboard + const copyLinkElement = document.createElement('div'); + copyLinkElement.className = 'tw-text-center'; + // The a element has a hardcoded cursor: pointer because the default is overridden by .dropzone + copyLinkElement.innerHTML = `${svg('octicon-copy', 14, 'copy link')} Copy link`; + copyLinkElement.addEventListener('click', async (e) => { + e.preventDefault(); + const name = file.name.slice(0, file.name.lastIndexOf('.')); + let fileMarkdown = `[${name}](/attachments/${file.uuid})`; + if (file.type.startsWith('image/')) { + fileMarkdown = `!${fileMarkdown}`; + } else if (file.type.startsWith('video/')) { + fileMarkdown = ``; + } + const success = await clippie(fileMarkdown); + showTemporaryTooltip(e.target, success ? i18n.copy_success : i18n.copy_error); + }); + file.previewTemplate.append(copyLinkElement); + }; + const updateDropzoneState = () => { + if (dropzoneEl.querySelector('.dz-preview')) { + dropzoneEl.classList.add('dz-started'); + } else { + dropzoneEl.classList.remove('dz-started'); + } + }; + + const dz = await createDropzone(dropzoneEl, { + url: dropzoneEl.getAttribute('data-upload-url'), headers: {'X-Csrf-Token': csrfToken}, - maxFiles: $dropzone.data('max-file'), - maxFilesize: $dropzone.data('max-size'), - acceptedFiles: (['*/*', ''].includes($dropzone.data('accepts'))) ? null : $dropzone.data('accepts'), + maxFiles: dropzoneEl.getAttribute('data-max-file'), + maxFilesize: dropzoneEl.getAttribute('data-max-size'), + acceptedFiles: (['*/*', ''].includes(dropzoneEl.getAttribute('data-accepts')) ? null : dropzoneEl.getAttribute('data-accepts')), addRemoveLinks: true, - dictDefaultMessage: $dropzone.data('default-message'), - dictInvalidFileType: $dropzone.data('invalid-input-type'), - dictFileTooBig: $dropzone.data('file-too-big'), - dictRemoveFile: $dropzone.data('remove-file'), + dictDefaultMessage: dropzoneEl.getAttribute('data-default-message'), + dictInvalidFileType: dropzoneEl.getAttribute('data-invalid-input-type'), + dictFileTooBig: dropzoneEl.getAttribute('data-file-too-big'), + dictRemoveFile: dropzoneEl.getAttribute('data-remove-file'), timeout: 0, thumbnailMethod: 'contain', thumbnailWidth: 480, thumbnailHeight: 480, init() { - this.on('success', (file, data) => { - file.uuid = data.uuid; - const $input = $(``).val(data.uuid); - const $inputPath = $(``); - $dropzone.find('.files').append($input).append($inputPath); - // Create a "Copy Link" element, to conveniently copy the image - // or file link as Markdown to the clipboard - const copyLinkElement = document.createElement('div'); - copyLinkElement.className = 'tw-text-center'; - // The a element has a hardcoded cursor: pointer because the default is overridden by .dropzone - copyLinkElement.innerHTML = `${svg('octicon-copy', 14, 'copy link')} Copy link`; - copyLinkElement.addEventListener('click', async (e) => { - e.preventDefault(); - let fileMarkdown = `[${file.name}](/attachments/${file.uuid})`; - if (file.type.startsWith('image/')) { - fileMarkdown = `!${fileMarkdown}`; - } else if (file.type.startsWith('video/')) { - fileMarkdown = ``; + this.on('success', initFilePreview); + this.on('removedfile', async (file) => { + document.getElementById(file.uuid)?.remove(); + document.querySelector(`input[name="files_fullpath[${file.uuid}]"]`)?.remove(); + if (disableRemovedfileEvent) return; + if (dropzoneEl.getAttribute('data-remove-url') && !fileUuidDict[file.uuid].submitted) { + try { + await POST(dropzoneEl.getAttribute('data-remove-url'), {data: new URLSearchParams({file: file.uuid})}); + } catch (error) { + console.error(error); } - const success = await clippie(fileMarkdown); - showTemporaryTooltip(e.target, success ? i18n.copy_success : i18n.copy_error); - }); - file.previewTemplate.append(copyLinkElement); - }); - this.on('removedfile', (file) => { - // Remove the hidden input for the file - $(`#${file.uuid}`).remove(); - - // Remove the hidden input for files_fullpath - $(`input[name="files_fullpath[${file.uuid}]"]`).remove(); - - if ($dropzone.data('remove-url')) { - POST($dropzone.data('remove-url'), { - data: new URLSearchParams({file: file.uuid}), - }); } + updateDropzoneState(); }); this.on('error', function (file, message) { showErrorToast(message); this.removeFile(file); }); + this.on('reload', async () => { + if (!zone || !dz.removeAllFiles) return; + try { + const response = await GET(zone.getAttribute('data-attachment-url')); + const data = await response.json(); + // do not trigger the "removedfile" event, otherwise the attachments would be deleted from server + disableRemovedfileEvent = true; + dz.removeAllFiles(true); + dropzoneEl.querySelector('.files').innerHTML = ''; + for (const element of dropzoneEl.querySelectorAll('.dz-preview')) element.remove(); + fileUuidDict = {}; + disableRemovedfileEvent = false; + + for (const attachment of data) { + attachment.type = attachment.mime_type; + dz.emit('addedfile', attachment); + dz.emit('complete', attachment); + if (attachment.type.startsWith('image/')) { + const imgSrc = `${dropzoneEl.getAttribute('data-link-url')}/${attachment.uuid}`; + dz.emit('thumbnail', attachment, imgSrc); + } + initFilePreview(attachment, {uuid: attachment.uuid}, true); + fileUuidDict[attachment.uuid] = {submitted: true}; + } + } catch (error) { + console.error(error); + } + updateDropzoneState(); + }); + this.on('create-thumbnail', (attachment, file) => { + if (attachment.type && /image.*/.test(attachment.type)) { + // When a new issue is created, a thumbnail cannot be fetch, so we need to create it locally. + // The implementation is took from the dropzone library (`dropzone.js` > `_processThumbnailQueue()`) + dz.createThumbnail( + file, + dz.options.thumbnailWidth, + dz.options.thumbnailHeight, + dz.options.thumbnailMethod, + true, + (dataUrl) => { + dz.emit('thumbnail', attachment, dataUrl); + }, + ); + } + }); }, }); } diff --git a/web_src/js/features/comp/Paste.js b/web_src/js/features/comp/Paste.js index 7e4ecbbeda..0fb6cf4615 100644 --- a/web_src/js/features/comp/Paste.js +++ b/web_src/js/features/comp/Paste.js @@ -82,9 +82,8 @@ class CodeMirrorEditor { async function handleClipboardImages(editor, dropzone, images, e) { const uploadUrl = dropzone.getAttribute('data-upload-url'); - const filesContainer = dropzone.querySelector('.files'); - if (!dropzone || !uploadUrl || !filesContainer || !images.length) return; + if (!dropzone || !uploadUrl || !images.length) return; e.preventDefault(); e.stopPropagation(); @@ -92,7 +91,7 @@ async function handleClipboardImages(editor, dropzone, images, e) { for (const img of images) { const name = img.name.slice(0, img.name.lastIndexOf('.')); - const placeholder = `![${name}](uploading ...)`; + const placeholder = `![${name}](uploading...)`; editor.insertPlaceholder(placeholder); const {uuid} = await uploadFile(img, uploadUrl); @@ -101,12 +100,11 @@ async function handleClipboardImages(editor, dropzone, images, e) { const text = `![${name}](${url})`; editor.replacePlaceholder(placeholder, text); - const input = document.createElement('input'); - input.setAttribute('name', 'files'); - input.setAttribute('type', 'hidden'); - input.setAttribute('id', uuid); - input.value = uuid; - filesContainer.append(input); + const attachment = {uuid, name: img.name, browser_download_url: url, size: img.size, type: img.type}; + dropzone.dropzone.emit('addedfile', attachment); + dropzone.dropzone.emit('create-thumbnail', attachment, img); + dropzone.dropzone.emit('complete', attachment); + dropzone.dropzone.emit('success', attachment, {uuid}); } } diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index bf76453428..d678d9195b 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -445,7 +445,7 @@ export async function handleReply($el) { // When the page is loaded, the dropzone is initialized by initGlobalDropzone, but the editor is not initialized. // When the form is submitted and partially reload, none of them is initialized. const dropzone = $form.find('.dropzone')[0]; - if (!dropzone.dropzone) initDropzone(dropzone); + if (!dropzone.dropzone) await initDropzone(dropzone); editor = await initComboMarkdownEditor($form.find('.combo-markdown-editor')); } editor.focus(); @@ -580,7 +580,7 @@ export function initRepoPullRequestReview() { $td.find("input[name='side']").val(side === 'left' ? 'previous' : 'proposed'); $td.find("input[name='path']").val(path); - initDropzone($td.find('.dropzone')[0]); + await initDropzone($td.find('.dropzone')[0]); const editor = await initComboMarkdownEditor($td.find('.combo-markdown-editor')); editor.focus(); } catch (error) { diff --git a/web_src/js/features/repo-legacy.js b/web_src/js/features/repo-legacy.js index 25ed181616..e6af4cbf04 100644 --- a/web_src/js/features/repo-legacy.js +++ b/web_src/js/features/repo-legacy.js @@ -16,7 +16,6 @@ import { import {initCitationFileCopyContent} from './citation.js'; import {initCompLabelEdit} from './comp/LabelEdit.js'; import {initRepoDiffConversationNav} from './repo-diff.js'; -import {createDropzone} from './dropzone.js'; import {showErrorToast} from '../modules/toast.js'; import {initCommentContent, initMarkupContent} from '../markup/content.js'; import {initCompReactionSelector} from './comp/ReactionSelector.js'; @@ -26,12 +25,10 @@ import {initRepoPullRequestCommitStatus} from './repo-issue-pr-status.js'; import {hideElem, showElem} from '../utils/dom.js'; import {getComboMarkdownEditor, initComboMarkdownEditor} from './comp/ComboMarkdownEditor.js'; import {attachRefIssueContextPopup} from './contextpopup.js'; -import {POST, GET} from '../modules/fetch.js'; +import {POST} from '../modules/fetch.js'; import {MarkdownQuote} from '@github/quote-selection'; import {toAbsoluteUrl} from '../utils.js'; -import {initGlobalShowModal} from './common-global.js'; - -const {csrfToken} = window.config; +import {initDropzone, initGlobalShowModal} from './common-global.js'; export function initRepoCommentForm() { const $commentForm = $('.comment.form'); @@ -312,115 +309,27 @@ async function onEditContent(event) { let comboMarkdownEditor; - /** - * @param {HTMLElement} dropzone - */ - const setupDropzone = async (dropzone) => { - if (!dropzone) return null; - - let disableRemovedfileEvent = false; // when resetting the dropzone (removeAllFiles), disable the "removedfile" event - let fileUuidDict = {}; // to record: if a comment has been saved, then the uploaded files won't be deleted from server when clicking the Remove in the dropzone - const dz = await createDropzone(dropzone, { - url: dropzone.getAttribute('data-upload-url'), - headers: {'X-Csrf-Token': csrfToken}, - maxFiles: dropzone.getAttribute('data-max-file'), - maxFilesize: dropzone.getAttribute('data-max-size'), - acceptedFiles: ['*/*', ''].includes(dropzone.getAttribute('data-accepts')) ? null : dropzone.getAttribute('data-accepts'), - addRemoveLinks: true, - dictDefaultMessage: dropzone.getAttribute('data-default-message'), - dictInvalidFileType: dropzone.getAttribute('data-invalid-input-type'), - dictFileTooBig: dropzone.getAttribute('data-file-too-big'), - dictRemoveFile: dropzone.getAttribute('data-remove-file'), - timeout: 0, - thumbnailMethod: 'contain', - thumbnailWidth: 480, - thumbnailHeight: 480, - init() { - this.on('success', (file, data) => { - file.uuid = data.uuid; - fileUuidDict[file.uuid] = {submitted: false}; - const input = document.createElement('input'); - input.id = data.uuid; - input.name = 'files'; - input.type = 'hidden'; - input.value = data.uuid; - dropzone.querySelector('.files').append(input); - }); - this.on('removedfile', async (file) => { - document.getElementById(file.uuid)?.remove(); - if (disableRemovedfileEvent) return; - if (dropzone.getAttribute('data-remove-url') && !fileUuidDict[file.uuid].submitted) { - try { - await POST(dropzone.getAttribute('data-remove-url'), {data: new URLSearchParams({file: file.uuid})}); - } catch (error) { - console.error(error); - } - } - }); - this.on('submit', () => { - for (const fileUuid of Object.keys(fileUuidDict)) { - fileUuidDict[fileUuid].submitted = true; - } - }); - this.on('reload', async () => { - try { - const response = await GET(editContentZone.getAttribute('data-attachment-url')); - const data = await response.json(); - // do not trigger the "removedfile" event, otherwise the attachments would be deleted from server - disableRemovedfileEvent = true; - dz.removeAllFiles(true); - dropzone.querySelector('.files').innerHTML = ''; - for (const el of dropzone.querySelectorAll('.dz-preview')) el.remove(); - fileUuidDict = {}; - disableRemovedfileEvent = false; - - for (const attachment of data) { - const imgSrc = `${dropzone.getAttribute('data-link-url')}/${attachment.uuid}`; - dz.emit('addedfile', attachment); - dz.emit('thumbnail', attachment, imgSrc); - dz.emit('complete', attachment); - fileUuidDict[attachment.uuid] = {submitted: true}; - dropzone.querySelector(`img[src='${imgSrc}']`).style.maxWidth = '100%'; - const input = document.createElement('input'); - input.id = attachment.uuid; - input.name = 'files'; - input.type = 'hidden'; - input.value = attachment.uuid; - dropzone.querySelector('.files').append(input); - } - if (!dropzone.querySelector('.dz-preview')) { - dropzone.classList.remove('dz-started'); - } - } catch (error) { - console.error(error); - } - }); - }, - }); - dz.emit('reload'); - return dz; - }; - const cancelAndReset = (e) => { e.preventDefault(); showElem(renderContent); hideElem(editContentZone); comboMarkdownEditor.value(rawContent.textContent); - comboMarkdownEditor.attachedDropzoneInst?.emit('reload'); + editContentZone.querySelector('.dropzone')?.dropzone?.emit('reload'); }; const saveAndRefresh = async (e) => { e.preventDefault(); showElem(renderContent); hideElem(editContentZone); - const dropzoneInst = comboMarkdownEditor.attachedDropzoneInst; + const dropzone = editContentZone.querySelector('.dropzone')?.dropzone; + for (const element of dropzone?.element?.querySelectorAll('.dz-preview') ?? []) element.classList.remove('dz-success'); try { const params = new URLSearchParams({ content: comboMarkdownEditor.value(), context: editContentZone.getAttribute('data-context'), content_version: editContentZone.getAttribute('data-content-version'), }); - const files = dropzoneInst?.element?.querySelectorAll('.files [name=files]') ?? []; + const files = dropzone?.element?.querySelectorAll('.files [name=files]') ?? []; for (const fileInput of files) { params.append('files[]', fileInput.value); } @@ -451,8 +360,7 @@ async function onEditContent(event) { } else { content.querySelector('.dropzone-attachments').outerHTML = data.attachments; } - dropzoneInst?.emit('submit'); - dropzoneInst?.emit('reload'); + dropzone?.emit('submit'); initMarkupContent(); initCommentContent(); } catch (error) { @@ -463,8 +371,10 @@ async function onEditContent(event) { comboMarkdownEditor = getComboMarkdownEditor(editContentZone.querySelector('.combo-markdown-editor')); if (!comboMarkdownEditor) { editContentZone.innerHTML = document.getElementById('issue-comment-editor-template').innerHTML; + const dropzone = editContentZone.querySelector('.dropzone'); + if (!dropzone.dropzone) await initDropzone(dropzone, editContentZone); comboMarkdownEditor = await initComboMarkdownEditor(editContentZone.querySelector('.combo-markdown-editor')); - comboMarkdownEditor.attachedDropzoneInst = await setupDropzone(editContentZone.querySelector('.dropzone')); + dropzone.dropzone.emit('reload'); editContentZone.addEventListener('ce-quick-submit', saveAndRefresh); editContentZone.querySelector('button[data-button-name="cancel-edit"]').addEventListener('click', cancelAndReset); editContentZone.querySelector('button[data-button-name="save-edit"]').addEventListener('click', saveAndRefresh);