diff --git a/.deadcode-out b/.deadcode-out index a44599b6f1..f6a194b17f 100644 --- a/.deadcode-out +++ b/.deadcode-out @@ -15,6 +15,7 @@ code.gitea.io/gitea/models ErrUpdateTaskNotExist.Unwrap IsErrSHANotFound IsErrMergeDivergingFastForwardOnly + GetYamlFixturesAccess code.gitea.io/gitea/models/actions ScheduleList.GetUserIDs @@ -136,6 +137,9 @@ code.gitea.io/gitea/modules/git AddChangesWithArgs CommitChanges CommitChangesWithArgs + IsErrExecTimeout + ErrExecTimeout.Error + ErrUnsupportedVersion.Error SetUpdateHook openRepositoryWithDefaultContext IsTagExist @@ -169,9 +173,6 @@ code.gitea.io/gitea/modules/json StdJSON.NewDecoder StdJSON.Indent -code.gitea.io/gitea/modules/log - NewEventWriterBuffer - code.gitea.io/gitea/modules/markup GetRendererByType RenderString @@ -246,13 +247,9 @@ code.gitea.io/gitea/modules/translation MockLocale.TrString MockLocale.Tr MockLocale.TrN - MockLocale.TrPluralString MockLocale.TrSize MockLocale.PrettyNumber -code.gitea.io/gitea/modules/util - OptionalArg - code.gitea.io/gitea/modules/util/filebuffer CreateFromReader @@ -292,6 +289,9 @@ code.gitea.io/gitea/services/pull code.gitea.io/gitea/services/repository IsErrForkAlreadyExist +code.gitea.io/gitea/services/repository/archiver + ArchiveRepository + code.gitea.io/gitea/services/repository/files ContentType.String GetFileResponseFromCommit diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 4549974afd..da649017ae 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -6,7 +6,7 @@ "ghcr.io/devcontainers/features/node:1": { "version": "20" }, - "ghcr.io/devcontainers/features/git-lfs:1.2.3": {}, + "ghcr.io/devcontainers/features/git-lfs:1.2.1": {}, "ghcr.io/devcontainers-contrib/features/poetry:2": {}, "ghcr.io/devcontainers/features/python:1": { "version": "3.12" diff --git a/.dockerignore b/.dockerignore index 5e7a893014..a1611a1ca5 100644 --- a/.dockerignore +++ b/.dockerignore @@ -34,7 +34,6 @@ _testmain.go *coverage.out coverage.all -coverage/ cpu.out /modules/migration/bindata.go diff --git a/.envrc.example b/.envrc similarity index 100% rename from .envrc.example rename to .envrc diff --git a/.eslintrc.yaml b/.eslintrc.yaml new file mode 100644 index 0000000000..db85b143dd --- /dev/null +++ b/.eslintrc.yaml @@ -0,0 +1,803 @@ +root: true +reportUnusedDisableDirectives: true + +ignorePatterns: + - /web_src/js/vendor + - /web_src/fomantic + - /public/assets/js + +parserOptions: + sourceType: module + ecmaVersion: latest + +plugins: + - "@eslint-community/eslint-plugin-eslint-comments" + - "@stylistic/eslint-plugin-js" + - "@vitest" + - eslint-plugin-array-func + - eslint-plugin-github + - eslint-plugin-i + - eslint-plugin-no-jquery + - eslint-plugin-no-use-extend-native + - eslint-plugin-regexp + - eslint-plugin-sonarjs + - eslint-plugin-unicorn + - eslint-plugin-vitest-globals + - eslint-plugin-wc + +env: + es2024: true + node: true + +overrides: + - files: ["web_src/**/*"] + globals: + __webpack_public_path__: true + process: false # https://github.com/webpack/webpack/issues/15833 + - files: ["web_src/**/*", "docs/**/*"] + env: + browser: true + node: false + - files: ["web_src/**/*worker.*"] + env: + worker: true + rules: + no-restricted-globals: [2, addEventListener, blur, close, closed, confirm, defaultStatus, defaultstatus, error, event, external, find, focus, frameElement, frames, history, innerHeight, innerWidth, isFinite, isNaN, length, locationbar, menubar, moveBy, moveTo, name, onblur, onerror, onfocus, onload, onresize, onunload, open, opener, opera, outerHeight, outerWidth, pageXOffset, pageYOffset, parent, print, removeEventListener, resizeBy, resizeTo, screen, screenLeft, screenTop, screenX, screenY, scroll, scrollbars, scrollBy, scrollTo, scrollX, scrollY, status, statusbar, stop, toolbar, top] + - files: ["*.config.*"] + rules: + i/no-unused-modules: [0] + - files: ["**/*.test.*", "web_src/js/test/setup.js"] + env: + vitest-globals/env: true + rules: + "@vitest/consistent-test-filename": [0] + "@vitest/consistent-test-it": [0] + "@vitest/expect-expect": [0] + "@vitest/max-expects": [0] + "@vitest/max-nested-describe": [0] + "@vitest/no-alias-methods": [0] + "@vitest/no-commented-out-tests": [0] + "@vitest/no-conditional-expect": [0] + "@vitest/no-conditional-in-test": [0] + "@vitest/no-conditional-tests": [0] + "@vitest/no-disabled-tests": [0] + "@vitest/no-done-callback": [0] + "@vitest/no-duplicate-hooks": [0] + "@vitest/no-focused-tests": [0] + "@vitest/no-hooks": [0] + "@vitest/no-identical-title": [2] + "@vitest/no-interpolation-in-snapshots": [0] + "@vitest/no-large-snapshots": [0] + "@vitest/no-mocks-import": [0] + "@vitest/no-restricted-matchers": [0] + "@vitest/no-restricted-vi-methods": [0] + "@vitest/no-standalone-expect": [0] + "@vitest/no-test-prefixes": [0] + "@vitest/no-test-return-statement": [0] + "@vitest/prefer-called-with": [0] + "@vitest/prefer-comparison-matcher": [0] + "@vitest/prefer-each": [0] + "@vitest/prefer-equality-matcher": [0] + "@vitest/prefer-expect-resolves": [0] + "@vitest/prefer-hooks-in-order": [0] + "@vitest/prefer-hooks-on-top": [2] + "@vitest/prefer-lowercase-title": [0] + "@vitest/prefer-mock-promise-shorthand": [0] + "@vitest/prefer-snapshot-hint": [0] + "@vitest/prefer-spy-on": [0] + "@vitest/prefer-strict-equal": [0] + "@vitest/prefer-to-be": [0] + "@vitest/prefer-to-be-falsy": [0] + "@vitest/prefer-to-be-object": [0] + "@vitest/prefer-to-be-truthy": [0] + "@vitest/prefer-to-contain": [0] + "@vitest/prefer-to-have-length": [0] + "@vitest/prefer-todo": [0] + "@vitest/require-hook": [0] + "@vitest/require-to-throw-message": [0] + "@vitest/require-top-level-describe": [0] + "@vitest/valid-describe-callback": [2] + "@vitest/valid-expect": [2] + "@vitest/valid-title": [2] + - files: ["web_src/js/modules/fetch.js", "web_src/js/standalone/**/*"] + rules: + no-restricted-syntax: [2, WithStatement, ForInStatement, LabeledStatement, SequenceExpression] + +rules: + "@eslint-community/eslint-comments/disable-enable-pair": [2] + "@eslint-community/eslint-comments/no-aggregating-enable": [2] + "@eslint-community/eslint-comments/no-duplicate-disable": [2] + "@eslint-community/eslint-comments/no-restricted-disable": [0] + "@eslint-community/eslint-comments/no-unlimited-disable": [2] + "@eslint-community/eslint-comments/no-unused-disable": [2] + "@eslint-community/eslint-comments/no-unused-enable": [2] + "@eslint-community/eslint-comments/no-use": [0] + "@eslint-community/eslint-comments/require-description": [0] + "@stylistic/js/array-bracket-newline": [0] + "@stylistic/js/array-bracket-spacing": [2, never] + "@stylistic/js/array-element-newline": [0] + "@stylistic/js/arrow-parens": [2, always] + "@stylistic/js/arrow-spacing": [2, {before: true, after: true}] + "@stylistic/js/block-spacing": [0] + "@stylistic/js/brace-style": [2, 1tbs, {allowSingleLine: true}] + "@stylistic/js/comma-dangle": [2, always-multiline] + "@stylistic/js/comma-spacing": [2, {before: false, after: true}] + "@stylistic/js/comma-style": [2, last] + "@stylistic/js/computed-property-spacing": [2, never] + "@stylistic/js/dot-location": [2, property] + "@stylistic/js/eol-last": [2] + "@stylistic/js/function-call-spacing": [2, never] + "@stylistic/js/function-call-argument-newline": [0] + "@stylistic/js/function-paren-newline": [0] + "@stylistic/js/generator-star-spacing": [0] + "@stylistic/js/implicit-arrow-linebreak": [0] + "@stylistic/js/indent": [2, 2, {ignoreComments: true, SwitchCase: 1}] + "@stylistic/js/key-spacing": [2] + "@stylistic/js/keyword-spacing": [2] + "@stylistic/js/linebreak-style": [2, unix] + "@stylistic/js/lines-around-comment": [0] + "@stylistic/js/lines-between-class-members": [0] + "@stylistic/js/max-len": [0] + "@stylistic/js/max-statements-per-line": [0] + "@stylistic/js/multiline-ternary": [0] + "@stylistic/js/new-parens": [2] + "@stylistic/js/newline-per-chained-call": [0] + "@stylistic/js/no-confusing-arrow": [0] + "@stylistic/js/no-extra-parens": [0] + "@stylistic/js/no-extra-semi": [2] + "@stylistic/js/no-floating-decimal": [0] + "@stylistic/js/no-mixed-operators": [0] + "@stylistic/js/no-mixed-spaces-and-tabs": [2] + "@stylistic/js/no-multi-spaces": [2, {ignoreEOLComments: true, exceptions: {Property: true}}] + "@stylistic/js/no-multiple-empty-lines": [2, {max: 1, maxEOF: 0, maxBOF: 0}] + "@stylistic/js/no-tabs": [2] + "@stylistic/js/no-trailing-spaces": [2] + "@stylistic/js/no-whitespace-before-property": [2] + "@stylistic/js/nonblock-statement-body-position": [2] + "@stylistic/js/object-curly-newline": [0] + "@stylistic/js/object-curly-spacing": [2, never] + "@stylistic/js/object-property-newline": [0] + "@stylistic/js/one-var-declaration-per-line": [0] + "@stylistic/js/operator-linebreak": [2, after] + "@stylistic/js/padded-blocks": [2, never] + "@stylistic/js/padding-line-between-statements": [0] + "@stylistic/js/quote-props": [0] + "@stylistic/js/quotes": [2, single, {avoidEscape: true, allowTemplateLiterals: true}] + "@stylistic/js/rest-spread-spacing": [2, never] + "@stylistic/js/semi": [2, always, {omitLastInOneLineBlock: true}] + "@stylistic/js/semi-spacing": [2, {before: false, after: true}] + "@stylistic/js/semi-style": [2, last] + "@stylistic/js/space-before-blocks": [2, always] + "@stylistic/js/space-before-function-paren": [2, {anonymous: ignore, named: never, asyncArrow: always}] + "@stylistic/js/space-in-parens": [2, never] + "@stylistic/js/space-infix-ops": [2] + "@stylistic/js/space-unary-ops": [2] + "@stylistic/js/spaced-comment": [2, always] + "@stylistic/js/switch-colon-spacing": [2] + "@stylistic/js/template-curly-spacing": [2, never] + "@stylistic/js/template-tag-spacing": [2, never] + "@stylistic/js/wrap-iife": [2, inside] + "@stylistic/js/wrap-regex": [0] + "@stylistic/js/yield-star-spacing": [2, after] + accessor-pairs: [2] + array-callback-return: [2, {checkForEach: true}] + array-func/avoid-reverse: [2] + array-func/from-map: [2] + array-func/no-unnecessary-this-arg: [2] + array-func/prefer-array-from: [2] + array-func/prefer-flat-map: [0] # handled by unicorn/prefer-array-flat-map + array-func/prefer-flat: [0] # handled by unicorn/prefer-array-flat + arrow-body-style: [0] + block-scoped-var: [2] + camelcase: [0] + capitalized-comments: [0] + class-methods-use-this: [0] + complexity: [0] + consistent-return: [0] + consistent-this: [0] + constructor-super: [2] + curly: [0] + default-case-last: [2] + default-case: [0] + default-param-last: [0] + dot-notation: [0] + eqeqeq: [2] + for-direction: [2] + func-name-matching: [2] + func-names: [0] + func-style: [0] + getter-return: [2] + github/a11y-aria-label-is-well-formatted: [0] + github/a11y-no-title-attribute: [0] + github/a11y-no-visually-hidden-interactive-element: [0] + github/a11y-role-supports-aria-props: [0] + github/a11y-svg-has-accessible-name: [0] + github/array-foreach: [0] + github/async-currenttarget: [2] + github/async-preventdefault: [2] + github/authenticity-token: [0] + github/get-attribute: [0] + github/js-class-name: [0] + github/no-blur: [0] + github/no-d-none: [0] + github/no-dataset: [2] + github/no-dynamic-script-tag: [2] + github/no-implicit-buggy-globals: [2] + github/no-inner-html: [0] + github/no-innerText: [2] + github/no-then: [2] + github/no-useless-passive: [2] + github/prefer-observers: [2] + github/require-passive-events: [2] + github/unescaped-html-literal: [0] + grouped-accessor-pairs: [2] + guard-for-in: [0] + id-blacklist: [0] + id-length: [0] + id-match: [0] + i/consistent-type-specifier-style: [0] + i/default: [0] + i/dynamic-import-chunkname: [0] + i/export: [2] + i/exports-last: [0] + i/extensions: [2, always, {ignorePackages: true}] + i/first: [2] + i/group-exports: [0] + i/max-dependencies: [0] + i/named: [2] + i/namespace: [0] + i/newline-after-import: [0] + i/no-absolute-path: [0] + i/no-amd: [2] + i/no-anonymous-default-export: [0] + i/no-commonjs: [2] + i/no-cycle: [2, {ignoreExternal: true, maxDepth: 1}] + i/no-default-export: [0] + i/no-deprecated: [0] + i/no-dynamic-require: [0] + i/no-empty-named-blocks: [2] + i/no-extraneous-dependencies: [2] + i/no-import-module-exports: [0] + i/no-internal-modules: [0] + i/no-mutable-exports: [0] + i/no-named-as-default-member: [0] + i/no-named-as-default: [2] + i/no-named-default: [0] + i/no-named-export: [0] + i/no-namespace: [0] + i/no-nodejs-modules: [0] + i/no-relative-packages: [0] + i/no-relative-parent-imports: [0] + i/no-restricted-paths: [0] + i/no-self-import: [2] + i/no-unassigned-import: [0] + i/no-unresolved: [2, {commonjs: true, ignore: ["\\?.+$", ^vitest/]}] + i/no-unused-modules: [2, {unusedExports: true}] + i/no-useless-path-segments: [2, {commonjs: true}] + i/no-webpack-loader-syntax: [2] + i/order: [0] + i/prefer-default-export: [0] + i/unambiguous: [0] + init-declarations: [0] + line-comment-position: [0] + logical-assignment-operators: [0] + max-classes-per-file: [0] + max-depth: [0] + max-lines-per-function: [0] + max-lines: [0] + max-nested-callbacks: [0] + max-params: [0] + max-statements: [0] + multiline-comment-style: [2, separate-lines] + new-cap: [0] + no-alert: [0] + no-array-constructor: [2] + no-async-promise-executor: [0] + no-await-in-loop: [0] + no-bitwise: [0] + no-buffer-constructor: [0] + no-caller: [2] + no-case-declarations: [2] + no-class-assign: [2] + no-compare-neg-zero: [2] + no-cond-assign: [2, except-parens] + no-console: [1, {allow: [debug, info, warn, error]}] + no-const-assign: [2] + no-constant-binary-expression: [2] + no-constant-condition: [0] + no-constructor-return: [2] + no-continue: [0] + no-control-regex: [0] + no-debugger: [1] + no-delete-var: [2] + no-div-regex: [0] + no-dupe-args: [2] + no-dupe-class-members: [2] + no-dupe-else-if: [2] + no-dupe-keys: [2] + no-duplicate-case: [2] + no-duplicate-imports: [2] + no-else-return: [2] + no-empty-character-class: [2] + no-empty-function: [0] + no-empty-pattern: [2] + no-empty-static-block: [2] + no-empty: [2, {allowEmptyCatch: true}] + no-eq-null: [2] + no-eval: [2] + no-ex-assign: [2] + no-extend-native: [2] + no-extra-bind: [2] + no-extra-boolean-cast: [2] + no-extra-label: [0] + no-fallthrough: [2] + no-func-assign: [2] + no-global-assign: [2] + no-implicit-coercion: [2] + no-implicit-globals: [0] + no-implied-eval: [2] + no-import-assign: [2] + no-inline-comments: [0] + no-inner-declarations: [2] + no-invalid-regexp: [2] + no-invalid-this: [0] + no-irregular-whitespace: [2] + no-iterator: [2] + no-jquery/no-ajax-events: [2] + no-jquery/no-ajax: [2] + no-jquery/no-and-self: [2] + no-jquery/no-animate-toggle: [2] + no-jquery/no-animate: [2] + no-jquery/no-append-html: [2] + no-jquery/no-attr: [2] + no-jquery/no-bind: [2] + no-jquery/no-box-model: [2] + no-jquery/no-browser: [2] + no-jquery/no-camel-case: [2] + no-jquery/no-class-state: [2] + no-jquery/no-class: [0] + no-jquery/no-clone: [2] + no-jquery/no-closest: [0] + no-jquery/no-constructor-attributes: [2] + no-jquery/no-contains: [2] + no-jquery/no-context-prop: [2] + no-jquery/no-css: [2] + no-jquery/no-data: [0] + no-jquery/no-deferred: [2] + no-jquery/no-delegate: [2] + no-jquery/no-each-collection: [0] + no-jquery/no-each-util: [0] + no-jquery/no-each: [0] + no-jquery/no-error-shorthand: [2] + no-jquery/no-error: [2] + no-jquery/no-escape-selector: [2] + no-jquery/no-event-shorthand: [2] + no-jquery/no-extend: [2] + no-jquery/no-fade: [2] + no-jquery/no-filter: [0] + no-jquery/no-find-collection: [0] + no-jquery/no-find-util: [2] + no-jquery/no-find: [0] + no-jquery/no-fx-interval: [2] + no-jquery/no-global-eval: [2] + no-jquery/no-global-selector: [0] + no-jquery/no-grep: [2] + no-jquery/no-has: [2] + no-jquery/no-hold-ready: [2] + no-jquery/no-html: [0] + no-jquery/no-in-array: [2] + no-jquery/no-is-array: [2] + no-jquery/no-is-empty-object: [2] + no-jquery/no-is-function: [2] + no-jquery/no-is-numeric: [2] + no-jquery/no-is-plain-object: [2] + no-jquery/no-is-window: [2] + no-jquery/no-is: [2] + no-jquery/no-jquery-constructor: [0] + no-jquery/no-live: [2] + no-jquery/no-load-shorthand: [2] + no-jquery/no-load: [2] + no-jquery/no-map-collection: [0] + no-jquery/no-map-util: [2] + no-jquery/no-map: [2] + no-jquery/no-merge: [2] + no-jquery/no-node-name: [2] + no-jquery/no-noop: [2] + no-jquery/no-now: [2] + no-jquery/no-on-ready: [2] + no-jquery/no-other-methods: [0] + no-jquery/no-other-utils: [2] + no-jquery/no-param: [2] + no-jquery/no-parent: [0] + no-jquery/no-parents: [2] + no-jquery/no-parse-html-literal: [2] + no-jquery/no-parse-html: [2] + no-jquery/no-parse-json: [2] + no-jquery/no-parse-xml: [2] + no-jquery/no-prop: [2] + no-jquery/no-proxy: [2] + no-jquery/no-ready-shorthand: [2] + no-jquery/no-ready: [2] + no-jquery/no-selector-prop: [2] + no-jquery/no-serialize: [2] + no-jquery/no-size: [2] + no-jquery/no-sizzle: [0] + no-jquery/no-slide: [2] + no-jquery/no-sub: [2] + no-jquery/no-support: [2] + no-jquery/no-text: [0] + no-jquery/no-trigger: [0] + no-jquery/no-trim: [2] + no-jquery/no-type: [2] + no-jquery/no-unique: [2] + no-jquery/no-unload-shorthand: [2] + no-jquery/no-val: [0] + no-jquery/no-visibility: [2] + no-jquery/no-when: [2] + no-jquery/no-wrap: [2] + no-jquery/variable-pattern: [2] + no-label-var: [2] + no-labels: [0] # handled by no-restricted-syntax + no-lone-blocks: [2] + no-lonely-if: [0] + no-loop-func: [0] + no-loss-of-precision: [2] + no-magic-numbers: [0] + no-misleading-character-class: [2] + no-multi-assign: [0] + no-multi-str: [2] + no-negated-condition: [0] + no-nested-ternary: [0] + no-new-func: [2] + no-new-native-nonconstructor: [2] + no-new-object: [2] + no-new-symbol: [2] + no-new-wrappers: [2] + no-new: [0] + no-nonoctal-decimal-escape: [2] + no-obj-calls: [2] + no-octal-escape: [2] + no-octal: [2] + no-param-reassign: [0] + no-plusplus: [0] + no-promise-executor-return: [0] + no-proto: [2] + no-prototype-builtins: [2] + no-redeclare: [2] + no-regex-spaces: [2] + no-restricted-exports: [0] + no-restricted-globals: [2, addEventListener, blur, close, closed, confirm, defaultStatus, defaultstatus, error, event, external, find, focus, frameElement, frames, history, innerHeight, innerWidth, isFinite, isNaN, length, location, locationbar, menubar, moveBy, moveTo, name, onblur, onerror, onfocus, onload, onresize, onunload, open, opener, opera, outerHeight, outerWidth, pageXOffset, pageYOffset, parent, print, removeEventListener, resizeBy, resizeTo, screen, screenLeft, screenTop, screenX, screenY, scroll, scrollbars, scrollBy, scrollTo, scrollX, scrollY, self, status, statusbar, stop, toolbar, top, __dirname, __filename] + no-restricted-imports: [0] + no-restricted-syntax: [2, WithStatement, ForInStatement, LabeledStatement, SequenceExpression, {selector: "CallExpression[callee.name='fetch']", message: "use modules/fetch.js instead"}] + no-return-assign: [0] + no-script-url: [2] + no-self-assign: [2, {props: true}] + no-self-compare: [2] + no-sequences: [2] + no-setter-return: [2] + no-shadow-restricted-names: [2] + no-shadow: [0] + no-sparse-arrays: [2] + no-template-curly-in-string: [2] + no-ternary: [0] + no-this-before-super: [2] + no-throw-literal: [2] + no-undef-init: [2] + no-undef: [2, {typeof: true}] + no-undefined: [0] + no-underscore-dangle: [0] + no-unexpected-multiline: [2] + no-unmodified-loop-condition: [2] + no-unneeded-ternary: [2] + no-unreachable-loop: [2] + no-unreachable: [2] + no-unsafe-finally: [2] + no-unsafe-negation: [2] + no-unused-expressions: [2] + no-unused-labels: [2] + no-unused-private-class-members: [2] + no-unused-vars: [2, {args: all, argsIgnorePattern: ^_, varsIgnorePattern: ^_, caughtErrorsIgnorePattern: ^_, destructuredArrayIgnorePattern: ^_, ignoreRestSiblings: false}] + no-use-before-define: [2, {functions: false, classes: true, variables: true, allowNamedExports: true}] + no-use-extend-native/no-use-extend-native: [2] + no-useless-backreference: [2] + no-useless-call: [2] + no-useless-catch: [2] + no-useless-computed-key: [2] + no-useless-concat: [2] + no-useless-constructor: [2] + no-useless-escape: [2] + no-useless-rename: [2] + no-useless-return: [2] + no-var: [2] + no-void: [2] + no-warning-comments: [0] + no-with: [0] # handled by no-restricted-syntax + object-shorthand: [2, always] + one-var-declaration-per-line: [0] + one-var: [0] + operator-assignment: [2, always] + operator-linebreak: [2, after] + prefer-arrow-callback: [2, {allowNamedFunctions: true, allowUnboundThis: true}] + prefer-const: [2, {destructuring: all, ignoreReadBeforeAssign: true}] + prefer-destructuring: [0] + prefer-exponentiation-operator: [2] + prefer-named-capture-group: [0] + prefer-numeric-literals: [2] + prefer-object-has-own: [2] + prefer-object-spread: [2] + prefer-promise-reject-errors: [2, {allowEmptyReject: false}] + prefer-regex-literals: [2] + prefer-rest-params: [2] + prefer-spread: [2] + prefer-template: [2] + radix: [2, as-needed] + regexp/confusing-quantifier: [2] + regexp/control-character-escape: [2] + regexp/hexadecimal-escape: [0] + regexp/letter-case: [0] + regexp/match-any: [2] + regexp/negation: [2] + regexp/no-contradiction-with-assertion: [0] + regexp/no-control-character: [0] + regexp/no-dupe-characters-character-class: [2] + regexp/no-dupe-disjunctions: [2] + regexp/no-empty-alternative: [2] + regexp/no-empty-capturing-group: [2] + regexp/no-empty-character-class: [0] + regexp/no-empty-group: [2] + regexp/no-empty-lookarounds-assertion: [2] + regexp/no-empty-string-literal: [2] + regexp/no-escape-backspace: [2] + regexp/no-extra-lookaround-assertions: [0] + regexp/no-invalid-regexp: [2] + regexp/no-invisible-character: [2] + regexp/no-lazy-ends: [2] + regexp/no-legacy-features: [2] + regexp/no-misleading-capturing-group: [0] + regexp/no-misleading-unicode-character: [0] + regexp/no-missing-g-flag: [2] + regexp/no-non-standard-flag: [2] + regexp/no-obscure-range: [2] + regexp/no-octal: [2] + regexp/no-optional-assertion: [2] + regexp/no-potentially-useless-backreference: [2] + regexp/no-standalone-backslash: [2] + regexp/no-super-linear-backtracking: [0] + regexp/no-super-linear-move: [0] + regexp/no-trivially-nested-assertion: [2] + regexp/no-trivially-nested-quantifier: [2] + regexp/no-unused-capturing-group: [0] + regexp/no-useless-assertions: [2] + regexp/no-useless-backreference: [2] + regexp/no-useless-character-class: [2] + regexp/no-useless-dollar-replacements: [2] + regexp/no-useless-escape: [2] + regexp/no-useless-flag: [2] + regexp/no-useless-lazy: [2] + regexp/no-useless-non-capturing-group: [2] + regexp/no-useless-quantifier: [2] + regexp/no-useless-range: [2] + regexp/no-useless-set-operand: [2] + regexp/no-useless-string-literal: [2] + regexp/no-useless-two-nums-quantifier: [2] + regexp/no-zero-quantifier: [2] + regexp/optimal-lookaround-quantifier: [2] + regexp/optimal-quantifier-concatenation: [0] + regexp/prefer-character-class: [0] + regexp/prefer-d: [0] + regexp/prefer-escape-replacement-dollar-char: [0] + regexp/prefer-lookaround: [0] + regexp/prefer-named-backreference: [0] + regexp/prefer-named-capture-group: [0] + regexp/prefer-named-replacement: [0] + regexp/prefer-plus-quantifier: [2] + regexp/prefer-predefined-assertion: [2] + regexp/prefer-quantifier: [0] + regexp/prefer-question-quantifier: [2] + regexp/prefer-range: [2] + regexp/prefer-regexp-exec: [2] + regexp/prefer-regexp-test: [2] + regexp/prefer-result-array-groups: [0] + regexp/prefer-set-operation: [2] + regexp/prefer-star-quantifier: [2] + regexp/prefer-unicode-codepoint-escapes: [2] + regexp/prefer-w: [0] + regexp/require-unicode-regexp: [0] + regexp/simplify-set-operations: [2] + regexp/sort-alternatives: [0] + regexp/sort-character-class-elements: [0] + regexp/sort-flags: [0] + regexp/strict: [2] + regexp/unicode-escape: [0] + regexp/use-ignore-case: [0] + require-atomic-updates: [0] + require-await: [0] + require-unicode-regexp: [0] + require-yield: [2] + sonarjs/cognitive-complexity: [0] + sonarjs/elseif-without-else: [0] + sonarjs/max-switch-cases: [0] + sonarjs/no-all-duplicated-branches: [2] + sonarjs/no-collapsible-if: [0] + sonarjs/no-collection-size-mischeck: [2] + sonarjs/no-duplicate-string: [0] + sonarjs/no-duplicated-branches: [0] + sonarjs/no-element-overwrite: [2] + sonarjs/no-empty-collection: [2] + sonarjs/no-extra-arguments: [2] + sonarjs/no-gratuitous-expressions: [2] + sonarjs/no-identical-conditions: [2] + sonarjs/no-identical-expressions: [2] + sonarjs/no-identical-functions: [2, 5] + sonarjs/no-ignored-return: [2] + sonarjs/no-inverted-boolean-check: [2] + sonarjs/no-nested-switch: [0] + sonarjs/no-nested-template-literals: [0] + sonarjs/no-one-iteration-loop: [2] + sonarjs/no-redundant-boolean: [2] + sonarjs/no-redundant-jump: [2] + sonarjs/no-same-line-conditional: [2] + sonarjs/no-small-switch: [0] + sonarjs/no-unused-collection: [2] + sonarjs/no-use-of-empty-return-value: [2] + sonarjs/no-useless-catch: [2] + sonarjs/non-existent-operator: [2] + sonarjs/prefer-immediate-return: [0] + sonarjs/prefer-object-literal: [0] + sonarjs/prefer-single-boolean-return: [0] + sonarjs/prefer-while: [2] + sort-imports: [0] + sort-keys: [0] + sort-vars: [0] + strict: [0] + symbol-description: [2] + unicode-bom: [2, never] + unicorn/better-regex: [0] + unicorn/catch-error-name: [0] + unicorn/consistent-destructuring: [2] + unicorn/consistent-empty-array-spread: [2] + unicorn/consistent-function-scoping: [2] + unicorn/custom-error-definition: [0] + unicorn/empty-brace-spaces: [2] + unicorn/error-message: [0] + unicorn/escape-case: [0] + unicorn/expiring-todo-comments: [0] + unicorn/explicit-length-check: [0] + unicorn/filename-case: [0] + unicorn/import-index: [0] + unicorn/import-style: [0] + unicorn/new-for-builtins: [2] + unicorn/no-abusive-eslint-disable: [0] + unicorn/no-anonymous-default-export: [0] + unicorn/no-array-callback-reference: [0] + unicorn/no-array-for-each: [2] + unicorn/no-array-method-this-argument: [2] + unicorn/no-array-push-push: [2] + unicorn/no-array-reduce: [2] + unicorn/no-await-expression-member: [0] + unicorn/no-await-in-promise-methods: [2] + unicorn/no-console-spaces: [0] + unicorn/no-document-cookie: [2] + unicorn/no-empty-file: [2] + unicorn/no-for-loop: [0] + unicorn/no-hex-escape: [0] + unicorn/no-instanceof-array: [0] + unicorn/no-invalid-fetch-options: [2] + unicorn/no-invalid-remove-event-listener: [2] + unicorn/no-keyword-prefix: [0] + unicorn/no-length-as-slice-end: [2] + unicorn/no-lonely-if: [2] + unicorn/no-magic-array-flat-depth: [0] + unicorn/no-negated-condition: [0] + unicorn/no-negation-in-equality-check: [2] + unicorn/no-nested-ternary: [0] + unicorn/no-new-array: [0] + unicorn/no-new-buffer: [0] + unicorn/no-null: [0] + unicorn/no-object-as-default-parameter: [0] + unicorn/no-process-exit: [0] + unicorn/no-single-promise-in-promise-methods: [2] + unicorn/no-static-only-class: [2] + unicorn/no-thenable: [2] + unicorn/no-this-assignment: [2] + unicorn/no-typeof-undefined: [2] + unicorn/no-unnecessary-await: [2] + unicorn/no-unnecessary-polyfills: [2] + unicorn/no-unreadable-array-destructuring: [0] + unicorn/no-unreadable-iife: [2] + unicorn/no-unused-properties: [2] + unicorn/no-useless-fallback-in-spread: [2] + unicorn/no-useless-length-check: [2] + unicorn/no-useless-promise-resolve-reject: [2] + unicorn/no-useless-spread: [2] + unicorn/no-useless-switch-case: [2] + unicorn/no-useless-undefined: [0] + unicorn/no-zero-fractions: [2] + unicorn/number-literal-case: [0] + unicorn/numeric-separators-style: [0] + unicorn/prefer-add-event-listener: [2] + unicorn/prefer-array-find: [2] + unicorn/prefer-array-flat-map: [2] + unicorn/prefer-array-flat: [2] + unicorn/prefer-array-index-of: [2] + unicorn/prefer-array-some: [2] + unicorn/prefer-at: [0] + unicorn/prefer-blob-reading-methods: [2] + unicorn/prefer-code-point: [0] + unicorn/prefer-date-now: [2] + unicorn/prefer-default-parameters: [0] + unicorn/prefer-dom-node-append: [2] + unicorn/prefer-dom-node-dataset: [0] + unicorn/prefer-dom-node-remove: [2] + unicorn/prefer-dom-node-text-content: [2] + unicorn/prefer-event-target: [2] + unicorn/prefer-export-from: [0] + unicorn/prefer-includes: [2] + unicorn/prefer-json-parse-buffer: [0] + unicorn/prefer-keyboard-event-key: [2] + unicorn/prefer-logical-operator-over-ternary: [2] + unicorn/prefer-math-trunc: [2] + unicorn/prefer-modern-dom-apis: [0] + unicorn/prefer-modern-math-apis: [2] + unicorn/prefer-module: [2] + unicorn/prefer-native-coercion-functions: [2] + unicorn/prefer-negative-index: [2] + unicorn/prefer-node-protocol: [2] + unicorn/prefer-number-properties: [0] + unicorn/prefer-object-from-entries: [2] + unicorn/prefer-object-has-own: [0] + unicorn/prefer-optional-catch-binding: [2] + unicorn/prefer-prototype-methods: [0] + unicorn/prefer-query-selector: [0] + unicorn/prefer-reflect-apply: [0] + unicorn/prefer-regexp-test: [2] + unicorn/prefer-set-has: [0] + unicorn/prefer-set-size: [2] + unicorn/prefer-spread: [0] + unicorn/prefer-string-raw: [0] + unicorn/prefer-string-replace-all: [0] + unicorn/prefer-string-slice: [0] + unicorn/prefer-string-starts-ends-with: [2] + unicorn/prefer-string-trim-start-end: [2] + unicorn/prefer-structured-clone: [2] + unicorn/prefer-switch: [0] + unicorn/prefer-ternary: [0] + unicorn/prefer-text-content: [2] + unicorn/prefer-top-level-await: [0] + unicorn/prefer-type-error: [0] + unicorn/prevent-abbreviations: [0] + unicorn/relative-url-style: [2] + unicorn/require-array-join-separator: [2] + unicorn/require-number-to-fixed-digits-argument: [2] + unicorn/require-post-message-target-origin: [0] + unicorn/string-content: [0] + unicorn/switch-case-braces: [0] + unicorn/template-indent: [2] + unicorn/text-encoding-identifier-case: [0] + unicorn/throw-new-error: [2] + use-isnan: [2] + valid-typeof: [2, {requireStringLiterals: true}] + vars-on-top: [0] + wc/attach-shadow-constructor: [2] + wc/define-tag-after-class-definition: [0] + wc/expose-class-on-global: [0] + wc/file-name-matches-element: [2] + wc/guard-define-call: [0] + wc/guard-super-call: [2] + wc/max-elements-per-file: [0] + wc/no-child-traversal-in-attributechangedcallback: [2] + wc/no-child-traversal-in-connectedcallback: [2] + wc/no-closed-shadow-root: [2] + wc/no-constructor-attributes: [2] + wc/no-constructor-params: [2] + wc/no-constructor: [2] + wc/no-customized-built-in-elements: [2] + wc/no-exports-with-element: [0] + wc/no-invalid-element-name: [2] + wc/no-invalid-extends: [2] + wc/no-method-prefixed-with-on: [2] + wc/no-self-class: [2] + wc/no-typos: [2] + wc/require-listener-teardown: [2] + wc/tag-name-matches-class: [2] + yoda: [2, never] diff --git a/.forgejo/issue_template/config.yml b/.forgejo/issue_template/config.yml index f2ea8d945a..0e3caf9280 100644 --- a/.forgejo/issue_template/config.yml +++ b/.forgejo/issue_template/config.yml @@ -1,7 +1,7 @@ contact_links: - name: 🔓 Security Reports url: mailto:security@forgejo.org - about: "Please email (See https://forgejo.org/.well-known/security.txt)." + about: "Please email (GPG: `A4676E79`) instead of opening a public issue." - name: 💬 Matrix Chat Room url: https://matrix.to/#/#forgejo-chat:matrix.org about: Please ask questions and discuss configuration or deployment problems here. diff --git a/.forgejo/testdata/build-release/Dockerfile b/.forgejo/testdata/build-release/Dockerfile index d10564359e..9c44dedddd 100644 --- a/.forgejo/testdata/build-release/Dockerfile +++ b/.forgejo/testdata/build-release/Dockerfile @@ -1,6 +1,6 @@ -FROM data.forgejo.org/oci/alpine:3.21 +FROM code.forgejo.org/oci/alpine:3.20 ARG RELEASE_VERSION=unkown LABEL maintainer="contact@forgejo.org" \ org.opencontainers.image.version="${RELEASE_VERSION}" RUN mkdir -p /app/gitea -RUN ( echo '#!/bin/sh' ; echo "echo forgejo v$RELEASE_VERSION" ) > /app/gitea/gitea ; chmod +x /app/gitea/gitea +RUN ( echo '#!/bin/sh' ; echo "echo forgejo v$RELEASE_VERSION" ) > /app/gitea/forgejo-cli ; chmod +x /app/gitea/forgejo-cli diff --git a/.forgejo/testdata/build-release/go.mod b/.forgejo/testdata/build-release/go.mod index 729cb6f831..697bc87b98 100644 --- a/.forgejo/testdata/build-release/go.mod +++ b/.forgejo/testdata/build-release/go.mod @@ -1,3 +1,3 @@ module code.gitea.io/gitea -go 1.23.3 +go 1.23.1 diff --git a/.forgejo/workflows-composite/apt-install-from/action.yaml b/.forgejo/workflows-composite/apt-install-from/action.yaml deleted file mode 100644 index 615e7cb184..0000000000 --- a/.forgejo/workflows-composite/apt-install-from/action.yaml +++ /dev/null @@ -1,29 +0,0 @@ -inputs: - packages: - description: 'Packages to install' - required: true - release: - description: 'Release to install from' - default: testing - -runs: - using: "composite" - steps: - - name: setup apt package source - run: | - export DEBIAN_FRONTEND=noninteractive - echo "deb http://deb.debian.org/debian/ ${RELEASE} main" > "/etc/apt/sources.list.d/${RELEASE}.list" - env: - RELEASE: ${{inputs.release}} - - name: install packages - run: | - apt-get update -qq - apt-get -q install -qq -y ${PACKAGES} - env: - PACKAGES: ${{inputs.packages}} - - name: remove temporary package list to prevent using it in other steps - run: | - rm "/etc/apt/sources.list.d/${RELEASE}.list" - apt-get update -qq - env: - RELEASE: ${{inputs.release}} diff --git a/.forgejo/workflows-composite/build-backend/action.yaml b/.forgejo/workflows-composite/build-backend/action.yaml deleted file mode 100644 index ada372b834..0000000000 --- a/.forgejo/workflows-composite/build-backend/action.yaml +++ /dev/null @@ -1,15 +0,0 @@ -runs: - using: "composite" - steps: - - run: | - su forgejo -c 'make deps-backend' - - uses: actions/cache@v4 - id: cache-backend - with: - path: ${{github.workspace}}/gitea - key: backend-build-${{ github.sha }} - - if: steps.cache-backend.outputs.cache-hit != 'true' - run: | - su forgejo -c 'make backend' - env: - TAGS: bindata diff --git a/.forgejo/workflows-composite/setup-cache-go/action.yaml b/.forgejo/workflows-composite/setup-cache-go/action.yaml deleted file mode 100644 index 1b1d37bb6b..0000000000 --- a/.forgejo/workflows-composite/setup-cache-go/action.yaml +++ /dev/null @@ -1,60 +0,0 @@ -# SPDX-License-Identifier: MIT -name: 'Forgejo Actions to setup Go and cache dependencies' -author: 'Forgejo authors' -description: | - Wrap the setup-go with improved dependency caching. -inputs: - username: - description: 'User for which to manage the dependency cache' - default: root - -runs: - using: "composite" - steps: - - name: "Install zstd for faster caching" - run: | - apt-get update -qq - apt-get -q install -qq -y zstd - - - name: "Set up Go using setup-go" - uses: https://data.forgejo.org/actions/setup-go@v5 - id: go-version - with: - go-version-file: "go.mod" - # do not cache dependencies, we do this manually - cache: false - - - name: "Get go environment information" - id: go-environment - run: | - export GOROOT="$(go env GOROOT)" - echo "modcache=$(su ${RUN_AS_USER} -c '${GOROOT}/bin/go env GOMODCACHE')" >> "$GITHUB_OUTPUT" - echo "cache=$(su ${RUN_AS_USER} -c '${GOROOT}/bin/go env GOCACHE')" >> "$GITHUB_OUTPUT" - env: - RUN_AS_USER: ${{ inputs.username }} - GO_VERSION: ${{ steps.go-version.outputs.go-version }} - - - name: "Create cache folders with correct permissions (for non-root users)" - if: inputs.username != 'root' - # when the cache is restored, only the permissions of the last part are restored - # so assuming that /home/user exists and we are restoring /home/user/go/pkg/mod, - # both folders will have the correct permissions, but - # /home/user/go and /home/user/go/pkg might be owned by root - run: | - su ${RUN_AS_USER} -c 'mkdir -p "${MODCACHE_DIR}" "${CACHE_DIR}"' - env: - RUN_AS_USER: ${{ inputs.username }} - MODCACHE_DIR: ${{ steps.go-environment.outputs.modcache }} - CACHE_DIR: ${{ steps.go-environment.outputs.cache }} - - - name: "Restore Go dependencies from cache or mark for later caching" - id: cache-deps - uses: actions/cache@v4 - with: - key: setup-cache-go-deps-${{ runner.os }}-${{ inputs.username }}-${{ steps.go-version.outputs.go_version }}-${{ hashFiles('go.sum', 'go.mod') }} - restore-keys: | - setup-cache-go-deps-${{ runner.os }}-${{ inputs.username }}-${{ steps.go-version.outputs.go_version }}- - setup-cache-go-deps-${{ runner.os }}-${{ inputs.username }}- - path: | - ${{ steps.go-environment.outputs.modcache }} - ${{ steps.go-environment.outputs.cache }} diff --git a/.forgejo/workflows-composite/setup-env/action.yaml b/.forgejo/workflows-composite/setup-env/action.yaml deleted file mode 100644 index f19569a137..0000000000 --- a/.forgejo/workflows-composite/setup-env/action.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# TODO: -# - [ ] prepare a forgejo ci image with the necessary tools and forgejo user -runs: - using: "composite" - steps: - - name: setup user and permissions - run: | - git config --add safe.directory '*' - # ignore if the user already exists (like with the playwright image) - adduser --quiet --comment forgejo --disabled-password forgejo || true - chown -R forgejo:forgejo . - - - uses: ./.forgejo/workflows-composite/setup-cache-go - with: - username: forgejo - - - name: validate go version - run: | - set -ex - toolchain=$(grep -oP '(?<=toolchain ).+' go.mod) - version=$(go version | cut -d' ' -f3) - if dpkg --compare-versions ${version#go} lt ${toolchain#go}; then - echo "go version too low: $toolchain >= $version" - exit 1 - fi diff --git a/.forgejo/workflows/backport.yml b/.forgejo/workflows/backport.yml index 795557dfac..32a93edbc0 100644 --- a/.forgejo/workflows/backport.yml +++ b/.forgejo/workflows/backport.yml @@ -22,8 +22,6 @@ # `backport/v1.21` label on a merged pull request that can be backported # without conflict. # -name: issue-labels - on: pull_request_target: types: @@ -33,21 +31,21 @@ on: jobs: backporting: if: > - ( vars.ROLE == 'forgejo-coding' ) && ( + !startsWith(vars.ROLE, 'forgejo-') && ( github.event.pull_request.merged && contains(toJSON(github.event.pull_request.labels), 'backport/v') ) runs-on: docker container: - image: 'data.forgejo.org/oci/node:20-bookworm' + image: 'code.forgejo.org/oci/node:20-bookworm' steps: - name: event info run: | cat <<'EOF' ${{ toJSON(github) }} EOF - - uses: https://data.forgejo.org/actions/git-backporting@v4.8.4 + - uses: https://code.forgejo.org/actions/git-backporting@v4.8.0 with: target-branch-pattern: "^backport/(?(v.*))$" strategy: ort diff --git a/.forgejo/workflows/build-release-integration.yml b/.forgejo/workflows/build-release-integration.yml index 6410915644..610b8f0520 100644 --- a/.forgejo/workflows/build-release-integration.yml +++ b/.forgejo/workflows/build-release-integration.yml @@ -22,13 +22,13 @@ on: jobs: release-simulation: - if: vars.ROLE == 'forgejo-coding' - runs-on: lxc-bookworm + if: ${{ !startsWith(vars.ROLE, 'forgejo-') }} + runs-on: self-hosted steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - id: forgejo - uses: https://data.forgejo.org/actions/setup-forgejo@v2.0.4 + uses: https://code.forgejo.org/actions/setup-forgejo@v1 with: user: root password: admin1234 diff --git a/.forgejo/workflows/build-release.yml b/.forgejo/workflows/build-release.yml index 9d88cb43dd..ce05f6d8ff 100644 --- a/.forgejo/workflows/build-release.yml +++ b/.forgejo/workflows/build-release.yml @@ -14,12 +14,6 @@ # secrets.CASCADE_DESTINATION_TOKEN: scope read:user, write:repository, write:issue # vars.CASCADE_DESTINATION_DOER: forgejo-ci # -# vars.SKIP_END_TO_END: `true` or `false` -# It must be `false` (or absent) so https://code.forgejo.org/forgejo/end-to-end is run -# with the newly built release. -# It must be set to `true` when a release is missing, for instance because it was -# removed and failed to upload. -# on: push: tags: 'v[0-9]+.[0-9]+.*' @@ -29,11 +23,11 @@ on: jobs: release: - runs-on: lxc-bookworm + runs-on: self-hosted # root is used for testing, allow it if: vars.ROLE == 'forgejo-integration' || github.repository_owner == 'root' steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -43,11 +37,11 @@ jobs: repository="${{ github.repository }}" echo "value=${repository##*/}" >> "$GITHUB_OUTPUT" - - uses: https://data.forgejo.org/actions/setup-node@v4 + - uses: https://code.forgejo.org/actions/setup-node@v3 with: node-version: 20 - - uses: https://data.forgejo.org/actions/setup-go@v5 + - uses: https://code.forgejo.org/actions/setup-go@v4 with: go-version-file: "go.mod" @@ -93,7 +87,7 @@ jobs: - name: cache node_modules id: node - uses: https://data.forgejo.org/actions/cache@v4 + uses: https://code.forgejo.org/actions/cache@v3 with: path: | node_modules @@ -164,7 +158,7 @@ jobs: - name: build container & release if: ${{ secrets.TOKEN != '' }} - uses: https://data.forgejo.org/forgejo/forgejo-build-publish/build@v5.3.1 + uses: https://code.forgejo.org/forgejo/forgejo-build-publish/build@v5.1.1 with: forgejo: "${{ env.GITHUB_SERVER_URL }}" owner: "${{ env.GITHUB_REPOSITORY_OWNER }}" @@ -176,14 +170,14 @@ jobs: platforms: linux/amd64,linux/arm64,linux/arm/v6 release-notes: "${{ steps.release-notes.outputs.value }}" binary-name: forgejo - binary-path: /app/gitea/gitea + binary-path: /app/gitea/forgejo-cli override: "${{ steps.release-info.outputs.override }}" verify-labels: "maintainer=contact@forgejo.org,org.opencontainers.image.version=${{ steps.release-info.outputs.version }}" verbose: ${{ vars.VERBOSE || secrets.VERBOSE || 'false' }} - name: build rootless container if: ${{ secrets.TOKEN != '' }} - uses: https://data.forgejo.org/forgejo/forgejo-build-publish/build@v5.3.1 + uses: https://code.forgejo.org/forgejo/forgejo-build-publish/build@v5.1.1 with: forgejo: "${{ env.GITHUB_SERVER_URL }}" owner: "${{ env.GITHUB_REPOSITORY_OWNER }}" @@ -200,8 +194,8 @@ jobs: verbose: ${{ vars.VERBOSE || secrets.VERBOSE || 'false' }} - name: end-to-end tests - if: ${{ secrets.TOKEN != '' && vars.ROLE == 'forgejo-integration' && vars.SKIP_END_TO_END != 'true' }} - uses: https://data.forgejo.org/actions/cascading-pr@v2.2.0 + if: ${{ secrets.TOKEN != '' && vars.ROLE == 'forgejo-integration' }} + uses: https://code.forgejo.org/actions/cascading-pr@v2 with: origin-url: ${{ env.GITHUB_SERVER_URL }} origin-repo: ${{ github.repository }} diff --git a/.forgejo/workflows/cascade-setup-end-to-end.yml b/.forgejo/workflows/cascade-setup-end-to-end.yml index 710cd27ba4..404bbe8fa6 100644 --- a/.forgejo/workflows/cascade-setup-end-to-end.yml +++ b/.forgejo/workflows/cascade-setup-end-to-end.yml @@ -12,10 +12,8 @@ # whatever is in the default branch instead # # - after it is merged, double check it works by setting the -# run-end-to-end-test on a pull request (any pull request will do) +# run-end-to-end-test on a pull request (any pull request will doe # -name: issue-labels - on: push: branches: @@ -25,23 +23,42 @@ on: - labeled jobs: + info: + if: ${{ !startsWith(vars.ROLE, 'forgejo-') }} + runs-on: docker + container: + image: code.forgejo.org/oci/node:20-bookworm + steps: + - name: event + run: | + echo github.event.pull_request.head.repo.fork = ${{ github.event.pull_request.head.repo.fork }} + echo github.event.action = ${{ github.event.action }} + echo github.event.pull_request.merged = ${{ github.event.pull_request.merged }} + echo github.event.pull_request.labels.*.name + cat <<'EOF' + ${{ toJSON(github.event.pull_request.labels.*.name) }} + EOF + cat <<'EOF' + ${{ toJSON(github.event) }} + EOF + cascade: if: > - vars.ROLE == 'forgejo-coding' && ( + !startsWith(vars.ROLE, 'forgejo-') && ( github.event_name == 'push' || ( - github.event.action == 'label_updated' && github.event.label.name == 'run-end-to-end-tests' + github.event.action == 'label_updated' && contains(github.event.pull_request.labels.*.name, 'run-end-to-end-tests') ) ) runs-on: docker container: - image: data.forgejo.org/oci/node:20-bookworm + image: code.forgejo.org/oci/node:20-bookworm steps: - uses: actions/checkout@v4 with: fetch-depth: '0' show-progress: 'false' - - uses: https://code.forgejo.org/actions/cascading-pr@v2.2.0 + - uses: actions/cascading-pr@v2 with: origin-url: ${{ env.GITHUB_SERVER_URL }} origin-repo: ${{ github.repository }} diff --git a/.forgejo/workflows/e2e.yml b/.forgejo/workflows/e2e.yml new file mode 100644 index 0000000000..9f2fbb0fa2 --- /dev/null +++ b/.forgejo/workflows/e2e.yml @@ -0,0 +1,37 @@ +name: e2e + +on: + pull_request: + paths: + - Makefile + - playwright.config.js + - .forgejo/workflows/e2e.yml + - tests/e2e/** + - web_src/js/** + - web_src/css/form.css + - templates/webhook/shared-settings.tmpl + - templates/org/team/new.tmpl + +jobs: + test-e2e: + if: ${{ !startsWith(vars.ROLE, 'forgejo-') }} + runs-on: docker + container: + image: 'code.forgejo.org/oci/playwright:latest' + steps: + - uses: https://code.forgejo.org/actions/checkout@v4 + - uses: https://code.forgejo.org/actions/setup-go@v4 + with: + go-version-file: "go.mod" + - run: | + git config --add safe.directory '*' + chown -R forgejo:forgejo . + - run: | + su forgejo -c 'make deps-frontend frontend deps-backend' + - run: | + su forgejo -c 'make backend' + - run: | + su forgejo -c 'make generate test-e2e-sqlite' + timeout-minutes: 40 + env: + USE_REPO_TEST_DIR: 1 diff --git a/.forgejo/workflows/forgejo-integration-cleanup.yml b/.forgejo/workflows/forgejo-integration-cleanup.yml index 9cef5fac68..049679a1eb 100644 --- a/.forgejo/workflows/forgejo-integration-cleanup.yml +++ b/.forgejo/workflows/forgejo-integration-cleanup.yml @@ -9,7 +9,7 @@ jobs: if: vars.ROLE == 'forgejo-integration' runs-on: docker container: - image: 'data.forgejo.org/oci/node:20-bookworm' + image: 'code.forgejo.org/oci/node:20-bookworm' steps: - name: apt install curl jq diff --git a/.forgejo/workflows/merge-requirements.yml b/.forgejo/workflows/merge-requirements.yml deleted file mode 100644 index d5270321ad..0000000000 --- a/.forgejo/workflows/merge-requirements.yml +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 2024 The Forgejo Authors -# SPDX-License-Identifier: MIT - -name: requirements - -on: - pull_request: - types: - - labeled - - edited - - opened - - synchronize - -jobs: - merge-conditions: - if: vars.ROLE == 'forgejo-coding' - runs-on: docker - container: - image: 'data.forgejo.org/oci/node:20-bookworm' - steps: - - name: Debug output - run: | - cat <<'EOF' - ${{ toJSON(github) }} - EOF - - name: Missing test label - if: > - !( - contains(toJSON(github.event.pull_request.labels), 'test/present') - || contains(toJSON(github.event.pull_request.labels), 'test/not-needed') - || contains(toJSON(github.event.pull_request.labels), 'test/manual') - ) - run: | - echo "Test label must be set to either 'present', 'not-needed' or 'manual'." - exit 1 - - name: Missing manual test instructions - if: > - ( - contains(toJSON(github.event.pull_request.labels), 'test/manual') - && !contains(toJSON(github.event.pull_request.body), '# Test') - ) - run: | - echo "Manual test label is set. The PR description needs to contain test steps introduced by a heading like:" - echo "# Testing" - exit 1 diff --git a/.forgejo/workflows/milestone.yml b/.forgejo/workflows/milestone.yml deleted file mode 100644 index 9a51c515d0..0000000000 --- a/.forgejo/workflows/milestone.yml +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2024 The Forgejo Authors -# SPDX-License-Identifier: MIT -# -name: milestone - -on: - pull_request_target: - types: - - closed - -jobs: - set: - if: vars.ROLE == 'forgejo-coding' && github.event.pull_request.merged - runs-on: docker - container: - image: 'data.forgejo.org/oci/ci:1' - steps: - - uses: https://data.forgejo.org/forgejo/set-milestone@v1.0.0 - with: - forgejo: https://codeberg.org - repository: forgejo/forgejo - token: ${{ secrets.SET_MILESTONE_TOKEN }} - pr-number: ${{ github.event.pull_request.number }} - verbose: ${{ vars.SET_MILESTONE_VERBOSE }} diff --git a/.forgejo/workflows/mirror.yml b/.forgejo/workflows/mirror.yml index 888f7ec07d..fd222115ac 100644 --- a/.forgejo/workflows/mirror.yml +++ b/.forgejo/workflows/mirror.yml @@ -11,7 +11,7 @@ jobs: if: ${{ secrets.MIRROR_TOKEN != '' }} runs-on: docker container: - image: 'data.forgejo.org/oci/node:20-bookworm' + image: 'code.forgejo.org/oci/node:20-bookworm' steps: - name: git push {v*/,}forgejo run: | diff --git a/.forgejo/workflows/publish-release.yml b/.forgejo/workflows/publish-release.yml index 0e75912a3a..41c884c2d1 100644 --- a/.forgejo/workflows/publish-release.yml +++ b/.forgejo/workflows/publish-release.yml @@ -36,20 +36,20 @@ on: jobs: publish: - runs-on: lxc-bookworm + runs-on: self-hosted if: vars.DOER != '' && vars.FORGEJO != '' && vars.TO_OWNER != '' && vars.FROM_OWNER != '' && secrets.TOKEN != '' steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - name: copy & sign - uses: https://data.forgejo.org/forgejo/forgejo-build-publish/publish@v5.3.1 + uses: https://code.forgejo.org/forgejo/forgejo-build-publish/publish@v5 with: from-forgejo: ${{ vars.FORGEJO }} to-forgejo: ${{ vars.FORGEJO }} from-owner: ${{ vars.FROM_OWNER }} to-owner: ${{ vars.TO_OWNER }} repo: ${{ vars.REPO }} - release-notes: "See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/{VERSION}.md" + release-notes: "See https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#{ANCHOR}" ref-name: ${{ github.ref_name }} sha: ${{ github.sha }} from-token: ${{ secrets.TOKEN }} @@ -59,28 +59,30 @@ jobs: gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }} verbose: ${{ vars.VERBOSE }} - - name: get trigger mirror issue - id: mirror - uses: https://data.forgejo.org/infrastructure/issue-action/get@v1.3.0 - with: - forgejo: https://code.forgejo.org - repository: forgejo/forgejo - labels: mirror-trigger - - - name: trigger the mirror - uses: https://data.forgejo.org/infrastructure/issue-action/set@v1.3.0 - with: - forgejo: https://code.forgejo.org - repository: forgejo/forgejo - token: ${{ secrets.LABEL_ISSUE_FORGEJO_MIRROR_TOKEN }} - numbers: ${{ steps.mirror.outputs.numbers }} - label-wait-if-exists: 3600 - label: trigger - - name: upgrade v*.next.forgejo.org - uses: https://data.forgejo.org/infrastructure/next-digest@v1.1.0 + run: | + export DEBIAN_FRONTEND=noninteractive + apt-get update -qq + apt-get -q install -y -qq curl + version="${{ github.ref_name }}" + version=${version##*v} + major=$(echo $version | sed -E -e 's/^([0-9]+).*/\1/') + # https://forgejo.org/docs/next/developer/infrastructure + curl -o /dev/null -sS https://v$major.next.forgejo.org/.well-known/wakeup-on-logs/forgejo-v$major + + - name: set up go for the DNS update below + if: vars.ROLE == 'forgejo-experimental' && secrets.OVH_APP_KEY != '' + uses: https://code.forgejo.org/actions/setup-go@v4 with: - url: https://placeholder:${{ secrets.TOKEN_NEXT_DIGEST }}@code.forgejo.org/infrastructure/next-digest - ref_name: '${{ github.ref_name }}' - image: 'codeberg.org/forgejo-experimental/forgejo' - tag_suffix: '-rootless' + go-version-file: "go.mod" + - name: update the _release.experimental DNS record + if: vars.ROLE == 'forgejo-experimental' && secrets.OVH_APP_KEY != '' + uses: https://code.forgejo.org/actions/ovh-dns-update@v1 + with: + subdomain: _release.experimental + domain: forgejo.com # there is a CNAME from .org to .com (for security reasons) + record-id: 5283602601 + value: v=${{ github.ref_name }} + ovh-app-key: ${{ secrets.OVH_APP_KEY }} + ovh-app-secret: ${{ secrets.OVH_APP_SECRET }} + ovh-consumer-key: ${{ secrets.OVH_CON_KEY }} diff --git a/.forgejo/workflows/release-notes-assistant-milestones.yml b/.forgejo/workflows/release-notes-assistant-milestones.yml index 50b267ec14..fb7bba1d52 100644 --- a/.forgejo/workflows/release-notes-assistant-milestones.yml +++ b/.forgejo/workflows/release-notes-assistant-milestones.yml @@ -6,14 +6,14 @@ on: jobs: release-notes: - if: vars.ROLE == 'forgejo-coding' + if: ${{ !startsWith(vars.ROLE, 'forgejo-') runs-on: docker container: - image: 'data.forgejo.org/oci/node:20-bookworm' + image: 'code.forgejo.org/oci/node:20-bookworm' steps: - - uses: https://data.forgejo.org/actions/checkout@v4 + - uses: https://code.forgejo.org/actions/checkout@v3 - - uses: https://data.forgejo.org/actions/setup-go@v5 + - uses: https://code.forgejo.org/actions/setup-go@v4 with: go-version-file: "go.mod" cache: false diff --git a/.forgejo/workflows/release-notes-assistant.yml b/.forgejo/workflows/release-notes-assistant.yml index 7217bf4d2b..dd67b4e203 100644 --- a/.forgejo/workflows/release-notes-assistant.yml +++ b/.forgejo/workflows/release-notes-assistant.yml @@ -1,5 +1,3 @@ -name: issue-labels - on: pull_request_target: types: @@ -9,12 +7,12 @@ on: jobs: release-notes: - if: ( vars.ROLE == 'forgejo-coding' ) && contains(github.event.pull_request.labels.*.name, 'worth a release-note') + if: ${{ !startsWith(vars.ROLE, 'forgejo-') && contains(github.event.pull_request.labels.*.name, 'worth a release-note') }} runs-on: docker container: - image: 'data.forgejo.org/oci/node:20-bookworm' + image: 'code.forgejo.org/oci/node:20-bookworm' steps: - - uses: https://data.forgejo.org/actions/checkout@v4 + - uses: https://code.forgejo.org/actions/checkout@v3 - name: event run: | @@ -25,7 +23,7 @@ jobs: ${{ toJSON(github.event) }} EOF - - uses: https://data.forgejo.org/actions/setup-go@v5 + - uses: https://code.forgejo.org/actions/setup-go@v4 with: go-version-file: "go.mod" cache: false diff --git a/.forgejo/workflows/renovate.yml b/.forgejo/workflows/renovate.yml index 632fb82c19..400cd453b3 100644 --- a/.forgejo/workflows/renovate.yml +++ b/.forgejo/workflows/renovate.yml @@ -8,9 +8,7 @@ name: renovate on: push: branches: - - renovate/** # self-test updates - paths: - - .forgejo/workflows/renovate.yml + - 'renovate/**' # self-test updates schedule: - cron: '0 0/2 * * *' workflow_dispatch: @@ -21,15 +19,15 @@ env: jobs: renovate: - if: vars.ROLE == 'forgejo-coding' && secrets.RENOVATE_TOKEN != '' + if: ${{ secrets.RENOVATE_TOKEN != '' }} runs-on: docker container: - image: data.forgejo.org/renovate/renovate:39.106.0 + image: code.forgejo.org/forgejo-contrib/renovate:38.93.2 steps: - name: Load renovate repo cache - uses: https://data.forgejo.org/actions/cache/restore@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1 + uses: https://code.forgejo.org/actions/cache/restore@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 with: path: | .tmp/cache/renovate/repository @@ -62,7 +60,7 @@ jobs: - name: Save renovate repo cache if: always() && env.RENOVATE_DRY_RUN != 'full' - uses: https://data.forgejo.org/actions/cache/save@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1 + uses: https://code.forgejo.org/actions/cache/save@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 with: path: | .tmp/cache/renovate/repository diff --git a/.forgejo/workflows/testing.yml b/.forgejo/workflows/testing.yml index eb3163d3ae..725cd242ee 100644 --- a/.forgejo/workflows/testing.yml +++ b/.forgejo/workflows/testing.yml @@ -6,270 +6,319 @@ on: branches: - 'forgejo*' - 'v*/forgejo*' - workflow_dispatch: jobs: backend-checks: - if: vars.ROLE == 'forgejo-coding' || vars.ROLE == 'forgejo-testing' + if: ${{ !startsWith(vars.ROLE, 'forgejo-') }} runs-on: docker container: - image: 'data.forgejo.org/oci/node:20-bookworm' - options: --tmpfs /tmp:exec,noatime + image: 'code.forgejo.org/oci/node:20-bookworm' steps: - name: event info run: | cat <<'EOF' ${{ toJSON(github) }} EOF - - uses: https://data.forgejo.org/actions/checkout@v4 - - uses: ./.forgejo/workflows-composite/setup-env - - run: su forgejo -c 'make deps-backend deps-tools' - - run: su forgejo -c 'make --always-make -j$(nproc) lint-backend tidy-check swagger-check fmt-check swagger-validate' # ensure the "go-licenses" make target runs - - uses: ./.forgejo/workflows-composite/build-backend + - uses: https://code.forgejo.org/actions/checkout@v3 + - uses: https://code.forgejo.org/actions/setup-go@v4 + with: + go-version-file: "go.mod" + - run: make deps-backend deps-tools + - run: make --always-make -j$(nproc) lint-backend tidy-check swagger-check fmt-check swagger-validate # ensure the "go-licenses" make target runs + - run: | + make backend + env: + TAGS: bindata + - uses: actions/cache@v4 + with: + path: '/workspace/forgejo/forgejo/gitea' + key: backend-build-${{ github.sha }} frontend-checks: - if: vars.ROLE == 'forgejo-coding' || vars.ROLE == 'forgejo-testing' + if: ${{ !startsWith(vars.ROLE, 'forgejo-') }} runs-on: docker container: - image: 'data.forgejo.org/oci/node:20-bookworm' - options: --tmpfs /tmp:exec,noatime + image: 'code.forgejo.org/oci/node:20-bookworm' steps: - - uses: https://data.forgejo.org/actions/checkout@v4 + - uses: https://code.forgejo.org/actions/checkout@v3 - run: make deps-frontend - run: make lint-frontend - run: make checks-frontend - run: make test-frontend-coverage - run: make frontend - - name: Install zstd for cache saving - # works around https://github.com/actions/cache/issues/1169, because the - # consuming job has zstd and doesn't restore the cache otherwise - run: | - apt-get update -qq - apt-get -q install -qq -y zstd - - name: "Cache frontend build for playwright testing" - uses: actions/cache/save@v4 - with: - path: ${{github.workspace}}/public/assets - key: frontend-build-${{ github.sha }} test-unit: - if: vars.ROLE == 'forgejo-coding' || vars.ROLE == 'forgejo-testing' + if: ${{ !startsWith(vars.ROLE, 'forgejo-') }} runs-on: docker needs: [backend-checks, frontend-checks] container: - image: 'data.forgejo.org/oci/node:20-bookworm' - options: --tmpfs /tmp:exec,noatime + image: 'code.forgejo.org/oci/node:20-bookworm' services: elasticsearch: - image: data.forgejo.org/oci/bitnami/elasticsearch:7 - options: --tmpfs /bitnami/elasticsearch/data + image: docker.io/bitnami/elasticsearch:7 env: discovery.type: single-node ES_JAVA_OPTS: "-Xms512m -Xmx512m" minio: - image: data.forgejo.org/oci/bitnami/minio:2024.8.17 + image: docker.io/bitnami/minio:2024.8.17 options: >- - --hostname gitea.minio --tmpfs /bitnami/minio/data:noatime + --hostname gitea.minio env: MINIO_DOMAIN: minio MINIO_ROOT_USER: 123456 MINIO_ROOT_PASSWORD: 12345678 steps: - - uses: https://data.forgejo.org/actions/checkout@v4 - - uses: ./.forgejo/workflows-composite/setup-env - - name: install git >= 2.42 - uses: ./.forgejo/workflows-composite/apt-install-from + - uses: https://code.forgejo.org/actions/checkout@v3 + - uses: https://code.forgejo.org/actions/setup-go@v4 with: - packages: git + go-version-file: "go.mod" + - run: | + git config --add safe.directory '*' + adduser --quiet --comment forgejo --disabled-password forgejo + chown -R forgejo:forgejo . + - name: install git >= 2.42 + run: | + export DEBIAN_FRONTEND=noninteractive + echo deb http://deb.debian.org/debian/ testing main > /etc/apt/sources.list.d/testing.list + apt-get update -qq + apt-get -q install -qq -y git + rm /etc/apt/sources.list.d/testing.list + apt-get update -qq - name: test release-notes-assistant.sh run: | apt-get -q install -qq -y jq ./release-notes-assistant.sh test_main - - uses: ./.forgejo/workflows-composite/build-backend + - run: | + su forgejo -c 'make deps-backend' + - uses: actions/cache/restore@v4 + id: cache-backend + with: + path: '/workspace/forgejo/forgejo/gitea' + key: backend-build-${{ github.sha }} + - if: steps.cache-backend.outputs.cache-hit != 'true' + run: | + su forgejo -c 'make backend' + env: + TAGS: bindata - run: | su forgejo -c 'make test-backend test-check' - timeout-minutes: 120 + timeout-minutes: 50 env: RACE_ENABLED: 'true' TAGS: bindata TEST_ELASTICSEARCH_URL: http://elasticsearch:9200 - test-e2e: - if: vars.ROLE == 'forgejo-coding' || vars.ROLE == 'forgejo-testing' + test-remote-cacher: + if: ${{ !startsWith(vars.ROLE, 'forgejo-') }} runs-on: docker needs: [backend-checks, frontend-checks] container: - image: 'data.forgejo.org/oci/playwright:latest' - options: --tmpfs /tmp:exec,noatime - steps: - - uses: https://data.forgejo.org/actions/checkout@v4 - with: - fetch-depth: 20 - - uses: ./.forgejo/workflows-composite/setup-env - - name: "Restore frontend build" - uses: actions/cache/restore@v4 - id: cache-frontend - with: - path: ${{github.workspace}}/public/assets - key: frontend-build-${{ github.sha }} - - name: "Build frontend (if not cached)" - if: steps.cache-frontend.outputs.cache-hit != 'true' - run: | - su forgejo -c 'make deps-frontend frontend' - - uses: ./.forgejo/workflows-composite/build-backend - - name: Get changed files - id: changed-files - uses: https://data.forgejo.org/tj-actions/changed-files@v45 - with: - separator: '\n' - - run: | - su forgejo -c 'make generate test-e2e-sqlite' - timeout-minutes: 120 - env: - USE_REPO_TEST_DIR: 1 - PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 - CHANGED_FILES: ${{steps.changed-files.outputs.all_changed_files}} - - name: Upload test artifacts on failure - if: failure() - uses: https://data.forgejo.org/forgejo/upload-artifact@v4 - with: - name: test-artifacts.zip - path: tests/e2e/test-artifacts/ - retention-days: 3 - test-remote-cacher: - if: vars.ROLE == 'forgejo-coding' || vars.ROLE == 'forgejo-testing' - runs-on: docker - needs: [backend-checks, frontend-checks, test-unit] - container: - image: 'data.forgejo.org/oci/node:20-bookworm' - options: --tmpfs /tmp:exec,noatime - name: ${{ format('test-remote-cacher ({0})', matrix.cacher.name) }} + image: 'code.forgejo.org/oci/node:20-bookworm' strategy: matrix: cacher: - - name: redis - image: data.forgejo.org/oci/bitnami/redis:7.2 - options: --tmpfs /bitnami/redis/data:noatime - - name: redict - image: registry.redict.io/redict:7.3.0-scratch - options: --tmpfs /data:noatime - - name: valkey - image: data.forgejo.org/oci/bitnami/valkey:7.2 - options: --tmpfs /bitnami/redis/data:noatime - - name: garnet - image: ghcr.io/microsoft/garnet-alpine:1.0.14 - options: --tmpfs /data:noatime + # redis + - image: docker.io/bitnami/redis:7.2 + port: 6379 + # redict + - image: registry.redict.io/redict:7.3.0-scratch + port: 6379 + # valkey + - image: docker.io/bitnami/valkey:7.2 + port: 6379 + # garnet + - image: ghcr.io/microsoft/garnet-alpine:1.0.14 + port: 6379 services: cacher: image: ${{ matrix.cacher.image }} options: ${{ matrix.cacher.options }} steps: - - uses: https://data.forgejo.org/actions/checkout@v4 - - uses: ./.forgejo/workflows-composite/setup-env - - name: install git >= 2.42 - uses: ./.forgejo/workflows-composite/apt-install-from + - uses: https://code.forgejo.org/actions/checkout@v3 + - uses: https://code.forgejo.org/actions/setup-go@v4 with: - packages: git - - uses: ./.forgejo/workflows-composite/build-backend + go-version-file: "go.mod" + - run: | + git config --add safe.directory '*' + adduser --quiet --comment forgejo --disabled-password forgejo + chown -R forgejo:forgejo . + - name: install git >= 2.42 + run: | + export DEBIAN_FRONTEND=noninteractive + echo deb http://deb.debian.org/debian/ testing main > /etc/apt/sources.list.d/testing.list + apt-get update -qq + apt-get -q install -qq -y git + rm /etc/apt/sources.list.d/testing.list + apt-get update -qq + - run: | + su forgejo -c 'make deps-backend' + - uses: actions/cache/restore@v4 + id: cache-backend + with: + path: '/workspace/forgejo/forgejo/gitea' + key: backend-build-${{ github.sha }} + - if: steps.cache-backend.outputs.cache-hit != 'true' + run: | + su forgejo -c 'make backend' + env: + TAGS: bindata - run: | su forgejo -c 'make test-remote-cacher test-check' - timeout-minutes: 120 + timeout-minutes: 50 env: RACE_ENABLED: 'true' TAGS: bindata TEST_REDIS_SERVER: cacher:${{ matrix.cacher.port }} test-mysql: - if: vars.ROLE == 'forgejo-coding' || vars.ROLE == 'forgejo-testing' + if: ${{ !startsWith(vars.ROLE, 'forgejo-') }} runs-on: docker needs: [backend-checks, frontend-checks] container: - image: 'data.forgejo.org/oci/node:20-bookworm' - options: --tmpfs /tmp:exec,noatime + image: 'code.forgejo.org/oci/node:20-bookworm' services: mysql: - image: 'data.forgejo.org/oci/bitnami/mysql:8.4' + image: 'docker.io/bitnami/mysql:8.4' env: ALLOW_EMPTY_PASSWORD: yes MYSQL_DATABASE: testgitea # # See also https://codeberg.org/forgejo/forgejo/issues/976 # - MYSQL_EXTRA_FLAGS: --innodb-adaptive-flushing=OFF --innodb-buffer-pool-size=4G --innodb-log-buffer-size=128M --innodb-flush-log-at-trx-commit=0 --innodb-flush-log-at-timeout=30 --innodb-flush-method=nosync --innodb-fsync-threshold=1000000000 --disable-log-bin - options: --tmpfs /bitnami/mysql/data:noatime + MYSQL_EXTRA_FLAGS: --innodb-adaptive-flushing=OFF --innodb-buffer-pool-size=4G --innodb-log-buffer-size=128M --innodb-flush-log-at-trx-commit=0 --innodb-flush-log-at-timeout=30 --innodb-flush-method=nosync --innodb-fsync-threshold=1000000000 steps: - - uses: https://data.forgejo.org/actions/checkout@v4 - - uses: ./.forgejo/workflows-composite/setup-env - - name: install dependencies & git >= 2.42 - uses: ./.forgejo/workflows-composite/apt-install-from + - uses: https://code.forgejo.org/actions/checkout@v3 + - uses: https://code.forgejo.org/actions/setup-go@v4 with: - packages: git git-lfs - - uses: ./.forgejo/workflows-composite/build-backend + go-version-file: "go.mod" + - name: install dependencies & git >= 2.42 + run: | + export DEBIAN_FRONTEND=noninteractive + echo deb http://deb.debian.org/debian/ testing main > /etc/apt/sources.list.d/testing.list + apt-get update -qq + apt-get install --no-install-recommends -qq -y git git-lfs + rm /etc/apt/sources.list.d/testing.list + apt-get update -qq + - name: setup user and permissions + run: | + git config --add safe.directory '*' + adduser --quiet --comment forgejo --disabled-password forgejo + chown -R forgejo:forgejo . + - run: | + su forgejo -c 'make deps-backend' + - uses: actions/cache/restore@v4 + id: cache-backend + with: + path: '/workspace/forgejo/forgejo/gitea' + key: backend-build-${{ github.sha }} + - if: steps.cache-backend.outputs.cache-hit != 'true' + run: | + su forgejo -c 'make backend' + env: + TAGS: bindata - run: | su forgejo -c 'make test-mysql-migration test-mysql' - timeout-minutes: 120 + timeout-minutes: 50 env: USE_REPO_TEST_DIR: 1 test-pgsql: - if: vars.ROLE == 'forgejo-coding' || vars.ROLE == 'forgejo-testing' + if: ${{ !startsWith(vars.ROLE, 'forgejo-') }} runs-on: docker needs: [backend-checks, frontend-checks] container: - image: 'data.forgejo.org/oci/node:20-bookworm' - options: --tmpfs /tmp:exec,noatime + image: 'code.forgejo.org/oci/node:20-bookworm' services: minio: - image: data.forgejo.org/oci/bitnami/minio:2024.8.17 + image: docker.io/bitnami/minio:2024.8.17 env: MINIO_ROOT_USER: 123456 MINIO_ROOT_PASSWORD: 12345678 - options: --tmpfs /bitnami/minio/data ldap: - image: data.forgejo.org/oci/test-openldap:latest + image: docker.io/gitea/test-openldap:latest pgsql: - image: data.forgejo.org/oci/bitnami/postgresql:15 + image: 'code.forgejo.org/oci/postgres:15' env: - POSTGRESQL_DATABASE: test - POSTGRESQL_PASSWORD: postgres - POSTGRESQL_FSYNC: off - POSTGRESQL_EXTRA_FLAGS: -c full_page_writes=off - options: --tmpfs /bitnami/postgresql + POSTGRES_DB: test + POSTGRES_PASSWORD: postgres steps: - - uses: https://data.forgejo.org/actions/checkout@v4 - - uses: ./.forgejo/workflows-composite/setup-env - - name: install dependencies & git >= 2.42 - uses: ./.forgejo/workflows-composite/apt-install-from + - uses: https://code.forgejo.org/actions/checkout@v3 + - uses: https://code.forgejo.org/actions/setup-go@v4 with: - packages: git git-lfs - - uses: ./.forgejo/workflows-composite/build-backend + go-version-file: "go.mod" + - name: install dependencies & git >= 2.42 + run: | + export DEBIAN_FRONTEND=noninteractive + echo deb http://deb.debian.org/debian/ testing main > /etc/apt/sources.list.d/testing.list + apt-get update -qq + apt-get install --no-install-recommends -qq -y git git-lfs + rm /etc/apt/sources.list.d/testing.list + apt-get update -qq + - name: setup user and permissions + run: | + git config --add safe.directory '*' + adduser --quiet --comment forgejo --disabled-password forgejo + chown -R forgejo:forgejo . + - run: | + su forgejo -c 'make deps-backend' + - uses: actions/cache/restore@v4 + id: cache-backend + with: + path: '/workspace/forgejo/forgejo/gitea' + key: backend-build-${{ github.sha }} + - if: steps.cache-backend.outputs.cache-hit != 'true' + run: | + su forgejo -c 'make backend' + env: + TAGS: bindata - run: | su forgejo -c 'make test-pgsql-migration test-pgsql' - timeout-minutes: 120 + timeout-minutes: 50 env: RACE_ENABLED: true USE_REPO_TEST_DIR: 1 TEST_LDAP: 1 test-sqlite: - if: vars.ROLE == 'forgejo-coding' || vars.ROLE == 'forgejo-testing' + if: ${{ !startsWith(vars.ROLE, 'forgejo-') }} runs-on: docker needs: [backend-checks, frontend-checks] container: - image: 'data.forgejo.org/oci/node:20-bookworm' - options: --tmpfs /tmp:exec,noatime + image: 'code.forgejo.org/oci/node:20-bookworm' steps: - - uses: https://data.forgejo.org/actions/checkout@v4 - - uses: ./.forgejo/workflows-composite/setup-env - - name: install dependencies & git >= 2.42 - uses: ./.forgejo/workflows-composite/apt-install-from + - uses: https://code.forgejo.org/actions/checkout@v3 + - uses: https://code.forgejo.org/actions/setup-go@v4 with: - packages: git git-lfs - - uses: ./.forgejo/workflows-composite/build-backend + go-version-file: "go.mod" + - name: install dependencies & git >= 2.42 + run: | + export DEBIAN_FRONTEND=noninteractive + echo deb http://deb.debian.org/debian/ testing main > /etc/apt/sources.list.d/testing.list + apt-get update -qq + apt-get install --no-install-recommends -qq -y git git-lfs + rm /etc/apt/sources.list.d/testing.list + apt-get update -qq + - name: setup user and permissions + run: | + git config --add safe.directory '*' + adduser --quiet --comment forgejo --disabled-password forgejo + chown -R forgejo:forgejo . + - run: | + su forgejo -c 'make deps-backend' + - uses: actions/cache/restore@v4 + id: cache-backend + with: + path: '/workspace/forgejo/forgejo/gitea' + key: backend-build-${{ github.sha }} + - if: steps.cache-backend.outputs.cache-hit != 'true' + run: | + su forgejo -c 'make backend' + env: + TAGS: bindata sqlite sqlite_unlock_notify - run: | su forgejo -c 'make test-sqlite-migration test-sqlite' - timeout-minutes: 120 + timeout-minutes: 50 env: TAGS: sqlite sqlite_unlock_notify RACE_ENABLED: true TEST_TAGS: sqlite sqlite_unlock_notify USE_REPO_TEST_DIR: 1 security-check: - if: vars.ROLE == 'forgejo-coding' || vars.ROLE == 'forgejo-testing' + if: ${{ !startsWith(vars.ROLE, 'forgejo-') }} runs-on: docker needs: - test-sqlite @@ -278,10 +327,11 @@ jobs: - test-remote-cacher - test-unit container: - image: 'data.forgejo.org/oci/node:20-bookworm' - options: --tmpfs /tmp:exec,noatime + image: 'code.forgejo.org/oci/node:20-bookworm' steps: - - uses: https://data.forgejo.org/actions/checkout@v4 - - uses: ./.forgejo/workflows-composite/setup-env - - run: su forgejo -c 'make deps-backend deps-tools' - - run: su forgejo -c 'make security-check' + - uses: https://code.forgejo.org/actions/checkout@v3 + - uses: https://code.forgejo.org/actions/setup-go@v4 + with: + go-version-file: "go.mod" + - run: make deps-backend deps-tools + - run: make security-check diff --git a/.gitignore b/.gitignore index 79a4108dab..7f40d0ba55 100644 --- a/.gitignore +++ b/.gitignore @@ -37,7 +37,6 @@ _testmain.go *coverage.out coverage.all -coverage/ cpu.out /modules/migration/bindata.go @@ -73,7 +72,6 @@ cpu.out /tests/e2e/reports /tests/e2e/test-artifacts /tests/e2e/test-snapshots -/tests/e2e/.auth /tests/*.ini /tests/**/*.git/**/*.sample /node_modules @@ -117,9 +115,6 @@ prime/ *_source.tar.bz2 .DS_Store -# Direnv configuration -/.envrc - # nix-direnv generated files .direnv/ diff --git a/.golangci.yml b/.golangci.yml index 0678b90bfc..4a20269b0e 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -77,8 +77,6 @@ linters-settings: - name: unreachable-code - name: var-declaration - name: var-naming - - name: redefines-builtin-id - disabled: true gofumpt: extra-rules: true depguard: diff --git a/.release-notes-assistant.yaml b/.release-notes-assistant.yaml index b3e5a8e665..15c73f9b39 100644 --- a/.release-notes-assistant.yaml +++ b/.release-notes-assistant.yaml @@ -10,7 +10,7 @@ branch-known: cleanup-line: 'sed -Ee "s/^(feat|fix):\s*//g" -e "s/^\[WIP\] //" -e "s/^WIP: //" -e "s;\[(UI|BUG|FEAT|v.*?/forgejo)\]\s*;;g"' render-header: | - ## Release notes + ## Draft release notes comment: |
Where does that come from? diff --git a/CODEOWNERS b/CODEOWNERS index 6ca34a69df..d46efc052b 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -16,9 +16,6 @@ templates/.* @caesar @crystal @gusted ## the issue sidebar was touched by fnetx templates/repo/issue/view_content/sidebar.* @fnetx -# Playwright tests -tests/e2e/.* @fnetx - # Files related to Go development. # The modules usually don't require much knowledge about Forgejo and could diff --git a/Dockerfile b/Dockerfile index 3f7f3e7d1f..01ab36b711 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM --platform=$BUILDPLATFORM code.forgejo.org/oci/xx AS xx +FROM --platform=$BUILDPLATFORM docker.io/tonistiigi/xx AS xx -FROM --platform=$BUILDPLATFORM code.forgejo.org/oci/golang:1.23-alpine3.21 as build-env +FROM --platform=$BUILDPLATFORM code.forgejo.org/oci/golang:1.23-alpine3.20 as build-env ARG GOPROXY ENV GOPROXY=${GOPROXY:-direct} @@ -51,7 +51,7 @@ RUN chmod 755 /tmp/local/usr/bin/entrypoint \ /go/src/code.gitea.io/gitea/environment-to-ini RUN chmod 644 /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete -FROM code.forgejo.org/oci/alpine:3.21 +FROM code.forgejo.org/oci/golang:1.23-alpine3.20 ARG RELEASE_VERSION LABEL maintainer="contact@forgejo.org" \ org.opencontainers.image.authors="Forgejo" \ @@ -98,11 +98,11 @@ ENV GITEA_CUSTOM=/data/gitea VOLUME ["/data"] ENTRYPOINT ["/usr/bin/entrypoint"] -CMD ["/usr/bin/s6-svscan", "/etc/s6"] +CMD ["/bin/s6-svscan", "/etc/s6"] COPY --from=build-env /tmp/local / RUN cd /usr/local/bin ; ln -s gitea forgejo COPY --from=build-env /go/src/code.gitea.io/gitea/gitea /app/gitea/gitea -RUN ln -s /app/gitea/gitea /app/gitea/forgejo-cli +RUN ln /app/gitea/gitea /app/gitea/forgejo-cli COPY --from=build-env /go/src/code.gitea.io/gitea/environment-to-ini /usr/local/bin/environment-to-ini COPY --from=build-env /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete /etc/profile.d/gitea_bash_autocomplete.sh diff --git a/Dockerfile.rootless b/Dockerfile.rootless index 129bd6f1ba..d2f5f71524 100644 --- a/Dockerfile.rootless +++ b/Dockerfile.rootless @@ -1,6 +1,6 @@ -FROM --platform=$BUILDPLATFORM code.forgejo.org/oci/xx AS xx +FROM --platform=$BUILDPLATFORM docker.io/tonistiigi/xx AS xx -FROM --platform=$BUILDPLATFORM code.forgejo.org/oci/golang:1.23-alpine3.21 as build-env +FROM --platform=$BUILDPLATFORM code.forgejo.org/oci/golang:1.23-alpine3.20 as build-env ARG GOPROXY ENV GOPROXY=${GOPROXY:-direct} @@ -49,7 +49,7 @@ RUN chmod 755 /tmp/local/usr/local/bin/docker-entrypoint.sh \ /go/src/code.gitea.io/gitea/environment-to-ini RUN chmod 644 /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete -FROM code.forgejo.org/oci/alpine:3.21 +FROM code.forgejo.org/oci/golang:1.23-alpine3.20 LABEL maintainer="contact@forgejo.org" \ org.opencontainers.image.authors="Forgejo" \ org.opencontainers.image.url="https://forgejo.org" \ @@ -90,7 +90,7 @@ RUN chown git:git /var/lib/gitea /etc/gitea COPY --from=build-env /tmp/local / RUN cd /usr/local/bin ; ln -s gitea forgejo COPY --from=build-env --chown=root:root /go/src/code.gitea.io/gitea/gitea /app/gitea/gitea -RUN ln -s /app/gitea/gitea /app/gitea/forgejo-cli +RUN ln /app/gitea/gitea /app/gitea/forgejo-cli COPY --from=build-env --chown=root:root /go/src/code.gitea.io/gitea/environment-to-ini /usr/local/bin/environment-to-ini COPY --from=build-env /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete /etc/profile.d/gitea_bash_autocomplete.sh diff --git a/Makefile b/Makefile index 5865262d1a..a2bfbdc95c 100644 --- a/Makefile +++ b/Makefile @@ -18,41 +18,28 @@ DIST := dist DIST_DIRS := $(DIST)/binaries $(DIST)/release IMPORT := code.gitea.io/gitea -GO ?= $(shell go env GOROOT)/bin/go +GO ?= go SHASUM ?= shasum -a 256 HAS_GO := $(shell hash $(GO) > /dev/null 2>&1 && echo yes) COMMA := , DIFF ?= diff --unified -ifeq ($(USE_GOTESTSUM), yes) - GOTEST ?= gotestsum -- - GOTESTCOMPILEDRUNPREFIX ?= gotestsum --raw-command -- go tool test2json -t - GOTESTCOMPILEDRUNSUFFIX ?= -test.v=test2json -else - GOTEST ?= $(GO) test - GOTESTCOMPILEDRUNPREFIX ?= - GOTESTCOMPILEDRUNSUFFIX ?= -endif - 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.1.1 # renovate: datasource=go +EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/v3/cmd/editorconfig-checker@v3.0.3 # renovate: datasource=go GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.7.0 # renovate: datasource=go -GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.62.2 # renovate: datasource=go +GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.61.0 # renovate: datasource=go GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/gxz@v0.5.11 # renovate: datasource=go MISSPELL_PACKAGE ?= github.com/golangci/misspell/cmd/misspell@v0.6.0 # 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 GO_LICENSES_PACKAGE ?= github.com/google/go-licenses@v1.6.0 # renovate: datasource=go GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@v1 # renovate: datasource=go -DEADCODE_PACKAGE ?= golang.org/x/tools/cmd/deadcode@v0.29.0 # renovate: datasource=go +DEADCODE_PACKAGE ?= golang.org/x/tools/cmd/deadcode@v0.25.0 # renovate: datasource=go GOMOCK_PACKAGE ?= go.uber.org/mock/mockgen@v0.4.0 # renovate: datasource=go -GOPLS_PACKAGE ?= golang.org/x/tools/gopls@v0.17.1 # renovate: datasource=go -RENOVATE_NPM_PACKAGE ?= renovate@39.115.4 # 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: ... +GOPLS_PACKAGE ?= golang.org/x/tools/gopls@v0.16.2 # renovate: datasource=go +RENOVATE_NPM_PACKAGE ?= renovate@38.93.2 # renovate: datasource=docker packageName=code.forgejo.org/forgejo-contrib/renovate ifeq ($(HAS_GO), yes) CGO_EXTRA_CFLAGS := -DSQLITE_MAX_VARIABLE_NUMBER=32766 @@ -167,8 +154,9 @@ TAR_EXCLUDES := .git data indexers queues log node_modules $(EXECUTABLE) $(FOMAN GO_DIRS := build cmd models modules routers services tests WEB_DIRS := web_src/js web_src/css +ESLINT_FILES := web_src/js tools *.js tests/e2e/*.js tests/e2e/shared/*.js STYLELINT_FILES := web_src/css web_src/js/components/*.vue -SPELLCHECK_FILES := $(GO_DIRS) $(WEB_DIRS) docs/content templates options/locale/locale_en-US.ini .github $(wildcard *.go *.js *.ts *.vue *.md *.yml *.yaml *.toml) +SPELLCHECK_FILES := $(GO_DIRS) $(WEB_DIRS) docs/content templates options/locale/locale_en-US.ini .github $(wildcard *.go *.js *.md *.yml *.yaml *.toml) GO_SOURCES := $(wildcard *.go) GO_SOURCES += $(shell find $(GO_DIRS) -type f -name "*.go" ! -path modules/options/bindata.go ! -path modules/public/bindata.go ! -path modules/templates/bindata.go) @@ -420,10 +408,10 @@ lint-frontend: lint-js lint-css lint-frontend-fix: lint-js-fix lint-css-fix .PHONY: lint-backend -lint-backend: lint-go lint-go-vet lint-editorconfig lint-renovate lint-locale lint-disposable-emails +lint-backend: lint-go lint-go-vet lint-editorconfig lint-renovate .PHONY: lint-backend-fix -lint-backend-fix: lint-go-fix lint-go-vet lint-editorconfig lint-disposable-emails-fix +lint-backend-fix: lint-go-fix lint-go-vet lint-editorconfig .PHONY: lint-codespell lint-codespell: @@ -439,11 +427,11 @@ lint-codespell-fix-i: .PHONY: lint-js lint-js: node_modules - npx eslint --color --max-warnings=0 + npx eslint --color --max-warnings=0 --ext js,vue $(ESLINT_FILES) .PHONY: lint-js-fix lint-js-fix: node_modules - npx eslint --color --max-warnings=0 --fix + npx eslint --color --max-warnings=0 --ext js,vue $(ESLINT_FILES) --fix .PHONY: lint-css lint-css: node_modules @@ -463,10 +451,6 @@ lint-renovate: node_modules @if grep --quiet --extended-regexp -e '^( WARN:|ERROR:)' .lint-renovate ; then cat .lint-renovate ; rm .lint-renovate ; exit 1 ; fi @rm .lint-renovate -.PHONY: lint-locale -lint-locale: - $(GO) run build/lint-locale.go - .PHONY: lint-md lint-md: node_modules npx markdownlint docs *.md @@ -514,14 +498,6 @@ lint-go-gopls: lint-editorconfig: $(GO) run $(EDITORCONFIG_CHECKER_PACKAGE) templates .forgejo/workflows -.PHONY: lint-disposable-emails -lint-disposable-emails: - $(GO) run build/generate-disposable-email.go -check -r $(DISPOSABLE_EMAILS_SHA) - -.PHONY: lint-disposable-emails-fix -lint-disposable-emails-fix: - $(GO) run build/generate-disposable-email.go -r $(DISPOSABLE_EMAILS_SHA) - .PHONY: lint-templates lint-templates: .venv node_modules @node tools/lint-templates-svg.js @@ -558,12 +534,12 @@ test: test-frontend test-backend .PHONY: test-backend test-backend: @echo "Running go test with $(GOTESTFLAGS) -tags '$(TEST_TAGS)'..." - @$(GOTEST) $(GOTESTFLAGS) -tags='$(TEST_TAGS)' $(GO_TEST_PACKAGES) + @$(GO) test $(GOTESTFLAGS) -tags='$(TEST_TAGS)' $(GO_TEST_PACKAGES) .PHONY: test-remote-cacher test-remote-cacher: @echo "Running go test with $(GOTESTFLAGS) -tags '$(TEST_TAGS)'..." - @$(GOTEST) $(GOTESTFLAGS) -tags='$(TEST_TAGS)' $(GO_TEST_REMOTE_CACHER_PACKAGES) + @$(GO) test $(GOTESTFLAGS) -tags='$(TEST_TAGS)' $(GO_TEST_REMOTE_CACHER_PACKAGES) .PHONY: test-frontend test-frontend: node_modules @@ -588,7 +564,7 @@ test-check: .PHONY: test\#% test\#%: @echo "Running go test with -tags '$(TEST_TAGS)'..." - @$(GOTEST) $(GOTESTFLAGS) -tags='$(TEST_TAGS)' -run $(subst .,/,$*) $(GO_TEST_PACKAGES) + @$(GO) test $(GOTESTFLAGS) -tags='$(TEST_TAGS)' -run $(subst .,/,$*) $(GO_TEST_PACKAGES) .PHONY: coverage coverage: @@ -599,7 +575,7 @@ coverage: .PHONY: unit-test-coverage unit-test-coverage: @echo "Running unit-test-coverage $(GOTESTFLAGS) -tags '$(TEST_TAGS)'..." - @$(GOTEST) $(GOTESTFLAGS) -timeout=20m -tags='$(TEST_TAGS)' -cover -coverprofile coverage.out $(GO_TEST_PACKAGES) && echo "\n==>\033[32m Ok\033[m\n" || exit 1 + @$(GO) test $(GOTESTFLAGS) -timeout=20m -tags='$(TEST_TAGS)' -cover -coverprofile coverage.out $(GO_TEST_PACKAGES) && echo "\n==>\033[32m Ok\033[m\n" || exit 1 .PHONY: tidy tidy: @@ -620,7 +596,7 @@ tidy-check: tidy go-licenses: $(GO_LICENSE_FILE) $(GO_LICENSE_FILE): go.mod go.sum - -$(GO) run $(GO_LICENSES_PACKAGE) save . --force --ignore code.gitea.io/gitea --save_path=$(GO_LICENSE_TMP_DIR) 2>/dev/null + -$(shell $(GO) env GOROOT)/bin/go run $(GO_LICENSES_PACKAGE) save . --force --ignore code.gitea.io/gitea --save_path=$(GO_LICENSE_TMP_DIR) 2>/dev/null $(GO) run build/generate-go-licenses.go $(GO_LICENSE_TMP_DIR) $(GO_LICENSE_FILE) @rm -rf $(GO_LICENSE_TMP_DIR) @@ -632,11 +608,11 @@ generate-ini-sqlite: .PHONY: test-sqlite test-sqlite: integrations.sqlite.test generate-ini-sqlite - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GOTESTCOMPILEDRUNPREFIX) ./integrations.sqlite.test $(GOTESTCOMPILEDRUNSUFFIX) + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini ./integrations.sqlite.test .PHONY: test-sqlite\#% test-sqlite\#%: integrations.sqlite.test generate-ini-sqlite - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GOTESTCOMPILEDRUNPREFIX) ./integrations.sqlite.test $(GOTESTCOMPILEDRUNSUFFIX) -test.run $(subst .,/,$*) + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini ./integrations.sqlite.test -test.run $(subst .,/,$*) .PHONY: test-sqlite-migration test-sqlite-migration: migrations.sqlite.test migrations.individual.sqlite.test @@ -653,11 +629,11 @@ generate-ini-mysql: .PHONY: test-mysql test-mysql: integrations.mysql.test generate-ini-mysql - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini $(GOTESTCOMPILEDRUNPREFIX) ./integrations.mysql.test $(GOTESTCOMPILEDRUNSUFFIX) + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini ./integrations.mysql.test .PHONY: test-mysql\#% test-mysql\#%: integrations.mysql.test generate-ini-mysql - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini $(GOTESTCOMPILEDRUNPREFIX) ./integrations.mysql.test $(GOTESTCOMPILEDRUNSUFFIX) -test.run $(subst .,/,$*) + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini ./integrations.mysql.test -test.run $(subst .,/,$*) .PHONY: test-mysql-migration test-mysql-migration: migrations.mysql.test migrations.individual.mysql.test @@ -671,16 +647,15 @@ generate-ini-pgsql: -e 's|{{REPO_TEST_DIR}}|${REPO_TEST_DIR}|g' \ -e 's|{{TEST_LOGGER}}|$(or $(TEST_LOGGER),test$(COMMA)file)|g' \ -e 's|{{TEST_TYPE}}|$(or $(TEST_TYPE),integration)|g' \ - -e 's|{{TEST_STORAGE_TYPE}}|$(or $(TEST_STORAGE_TYPE),minio)|g' \ tests/pgsql.ini.tmpl > tests/pgsql.ini .PHONY: test-pgsql test-pgsql: integrations.pgsql.test generate-ini-pgsql - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GOTESTCOMPILEDRUNPREFIX) ./integrations.pgsql.test $(GOTESTCOMPILEDRUNSUFFIX) + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini ./integrations.pgsql.test .PHONY: test-pgsql\#% test-pgsql\#%: integrations.pgsql.test generate-ini-pgsql - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GOTESTCOMPILEDRUNPREFIX) ./integrations.pgsql.test $(GOTESTCOMPILEDRUNSUFFIX) -test.run $(subst .,/,$*) + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini ./integrations.pgsql.test -test.run $(subst .,/,$*) .PHONY: test-pgsql-migration test-pgsql-migration: migrations.pgsql.test migrations.individual.pgsql.test @@ -699,34 +674,35 @@ test-e2e: test-e2e-sqlite .PHONY: test-e2e-sqlite test-e2e-sqlite: playwright e2e.sqlite.test generate-ini-sqlite - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GOTESTCOMPILEDRUNPREFIX) ./e2e.sqlite.test $(GOTESTCOMPILEDRUNSUFFIX) -test.run TestE2e + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini ./e2e.sqlite.test -test.run TestE2e .PHONY: test-e2e-sqlite\#% test-e2e-sqlite\#%: playwright e2e.sqlite.test generate-ini-sqlite - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GOTESTCOMPILEDRUNPREFIX) ./e2e.sqlite.test $(GOTESTCOMPILEDRUNSUFFIX) -test.run TestE2e/$* + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini ./e2e.sqlite.test -test.run TestE2e/$* .PHONY: test-e2e-sqlite-firefox\#% test-e2e-sqlite-firefox\#%: playwright e2e.sqlite.test generate-ini-sqlite - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini PLAYWRIGHT_PROJECT=firefox $(GOTESTCOMPILEDRUNPREFIX) ./e2e.sqlite.test $(GOTESTCOMPILEDRUNSUFFIX) -test.run TestE2e/$* + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini PLAYWRIGHT_PROJECT=firefox ./e2e.sqlite.test -test.run TestE2e/$* .PHONY: test-e2e-mysql test-e2e-mysql: playwright e2e.mysql.test generate-ini-mysql - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini $(GOTESTCOMPILEDRUNPREFIX) ./e2e.mysql.test $(GOTESTCOMPILEDRUNSUFFIX) -test.run TestE2e + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini ./e2e.mysql.test -test.run TestE2e .PHONY: test-e2e-mysql\#% test-e2e-mysql\#%: playwright e2e.mysql.test generate-ini-mysql - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini $(GOTESTCOMPILEDRUNPREFIX) ./e2e.mysql.test $(GOTESTCOMPILEDRUNSUFFIX) -test.run TestE2e/$* + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini ./e2e.mysql.test -test.run TestE2e/$* .PHONY: test-e2e-pgsql test-e2e-pgsql: playwright e2e.pgsql.test generate-ini-pgsql - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GOTESTCOMPILEDRUNPREFIX) ./e2e.pgsql.test $(GOTESTCOMPILEDRUNSUFFIX) -test.run TestE2e + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini ./e2e.pgsql.test -test.run TestE2e .PHONY: test-e2e-pgsql\#% test-e2e-pgsql\#%: playwright e2e.pgsql.test generate-ini-pgsql - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GOTESTCOMPILEDRUNPREFIX) ./e2e.pgsql.test $(GOTESTCOMPILEDRUNSUFFIX) -test.run TestE2e/$* + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini ./e2e.pgsql.test -test.run TestE2e/$* .PHONY: test-e2e-debugserver test-e2e-debugserver: e2e.sqlite.test generate-ini-sqlite + sed -i s/3003/3000/g tests/sqlite.ini GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini ./e2e.sqlite.test -test.run TestDebugserver -test.timeout 24h .PHONY: bench-sqlite @@ -750,73 +726,73 @@ integration-test-coverage-sqlite: integrations.cover.sqlite.test generate-ini-sq GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini ./integrations.cover.sqlite.test -test.coverprofile=integration.coverage.out integrations.mysql.test: git-check $(GO_SOURCES) - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -o integrations.mysql.test + $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -o integrations.mysql.test integrations.pgsql.test: git-check $(GO_SOURCES) - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -o integrations.pgsql.test + $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -o integrations.pgsql.test integrations.sqlite.test: git-check $(GO_SOURCES) - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -o integrations.sqlite.test -tags '$(TEST_TAGS)' + $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -o integrations.sqlite.test -tags '$(TEST_TAGS)' integrations.cover.test: git-check $(GO_SOURCES) - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -coverpkg $(shell echo $(GO_TEST_PACKAGES) | tr ' ' ',') -o integrations.cover.test + $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -coverpkg $(shell echo $(GO_TEST_PACKAGES) | tr ' ' ',') -o integrations.cover.test integrations.cover.sqlite.test: git-check $(GO_SOURCES) - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -coverpkg $(shell echo $(GO_TEST_PACKAGES) | tr ' ' ',') -o integrations.cover.sqlite.test -tags '$(TEST_TAGS)' + $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration -coverpkg $(shell echo $(GO_TEST_PACKAGES) | tr ' ' ',') -o integrations.cover.sqlite.test -tags '$(TEST_TAGS)' .PHONY: migrations.mysql.test migrations.mysql.test: $(GO_SOURCES) generate-ini-mysql - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration/migration-test -o migrations.mysql.test - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini $(GOTESTCOMPILEDRUNPREFIX) ./migrations.mysql.test $(GOTESTCOMPILEDRUNSUFFIX) + $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration/migration-test -o migrations.mysql.test + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini ./migrations.mysql.test .PHONY: migrations.pgsql.test migrations.pgsql.test: $(GO_SOURCES) generate-ini-pgsql - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration/migration-test -o migrations.pgsql.test - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GOTESTCOMPILEDRUNPREFIX) ./migrations.pgsql.test $(GOTESTCOMPILEDRUNSUFFIX) + $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration/migration-test -o migrations.pgsql.test + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini ./migrations.pgsql.test .PHONY: migrations.sqlite.test migrations.sqlite.test: $(GO_SOURCES) generate-ini-sqlite - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration/migration-test -o migrations.sqlite.test -tags '$(TEST_TAGS)' - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GOTESTCOMPILEDRUNPREFIX) ./migrations.sqlite.test $(GOTESTCOMPILEDRUNSUFFIX) + $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/integration/migration-test -o migrations.sqlite.test -tags '$(TEST_TAGS)' + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini ./migrations.sqlite.test .PHONY: migrations.individual.mysql.test migrations.individual.mysql.test: $(GO_SOURCES) for pkg in $(MIGRATION_PACKAGES); do \ - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini $(GOTEST) $(GOTESTFLAGS) -tags '$(TEST_TAGS)' $$pkg || exit 1; \ + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/mysql.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' $$pkg || exit 1; \ done .PHONY: migrations.individual.sqlite.test\#% migrations.individual.sqlite.test\#%: $(GO_SOURCES) generate-ini-sqlite - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GOTEST) $(GOTESTFLAGS) -tags '$(TEST_TAGS)' code.gitea.io/gitea/models/migrations/$* + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' code.gitea.io/gitea/models/migrations/$* .PHONY: migrations.individual.pgsql.test migrations.individual.pgsql.test: $(GO_SOURCES) for pkg in $(MIGRATION_PACKAGES); do \ - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GOTEST) $(GOTESTFLAGS) -tags '$(TEST_TAGS)' $$pkg || exit 1;\ + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' $$pkg || exit 1;\ done .PHONY: migrations.individual.pgsql.test\#% migrations.individual.pgsql.test\#%: $(GO_SOURCES) generate-ini-pgsql - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GOTEST) $(GOTESTFLAGS) -tags '$(TEST_TAGS)' code.gitea.io/gitea/models/migrations/$* + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/pgsql.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' code.gitea.io/gitea/models/migrations/$* .PHONY: migrations.individual.sqlite.test migrations.individual.sqlite.test: $(GO_SOURCES) generate-ini-sqlite for pkg in $(MIGRATION_PACKAGES); do \ - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GOTEST) $(GOTESTFLAGS) -tags '$(TEST_TAGS)' $$pkg || exit 1; \ + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' $$pkg || exit 1; \ done .PHONY: migrations.individual.sqlite.test\#% migrations.individual.sqlite.test\#%: $(GO_SOURCES) generate-ini-sqlite - GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GOTEST) $(GOTESTFLAGS) -tags '$(TEST_TAGS)' code.gitea.io/gitea/models/migrations/$* + GITEA_ROOT="$(CURDIR)" GITEA_CONF=tests/sqlite.ini $(GO) test $(GOTESTFLAGS) -tags '$(TEST_TAGS)' code.gitea.io/gitea/models/migrations/$* e2e.mysql.test: $(GO_SOURCES) - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/e2e -o e2e.mysql.test + $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/e2e -o e2e.mysql.test e2e.pgsql.test: $(GO_SOURCES) - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/e2e -o e2e.pgsql.test + $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/e2e -o e2e.pgsql.test e2e.sqlite.test: $(GO_SOURCES) - $(GOTEST) $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/e2e -o e2e.sqlite.test -tags '$(TEST_TAGS)' + $(GO) test $(GOTESTFLAGS) -c code.gitea.io/gitea/tests/e2e -o e2e.sqlite.test -tags '$(TEST_TAGS)' .PHONY: check check: test @@ -920,7 +896,7 @@ release-docs: | $(DIST_DIRS) docs .PHONY: reproduce-build reproduce-build: # Start building the Dockerfile with the RELEASE_VERSION tag set. GOPROXY is set -# for convenience, because the default of the Dockerfile is `direct` which can be +# for convience, because the default of the Dockerfile is `direct` which can be # quite slow. @docker build --build-arg="RELEASE_VERSION=$(RELEASE_VERSION)" --build-arg="GOPROXY=$(shell $(GO) env GOPROXY)" --tag "forgejo-reproducibility" . @id=$$(docker create forgejo-reproducibility); \ diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 32f7b8c264..f86e10c21a 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -4,31 +4,19 @@ A minor or major Forgejo release is published every [three months](https://forge A [patch or minor release](https://semver.org/spec/v2.0.0.html) (e.g. upgrading from v7.0.0 to v7.0.1 or v7.1.0) does not require manual intervention. But [major releases](https://semver.org/spec/v2.0.0.html#spec-item-8) where the first version number changes (e.g. upgrading from v1.21 to v7.0) contain breaking changes and the release notes explain how to deal with them. -The release notes of each release [are available in the release-notes-published directory of this repository](release-notes-published), starting with [Forgejo 7.0.7](release-notes-published/7.0.7.md) and [Forgejo 8.0.1](release-notes-published/8.0.1.md). - -## 9.0.2 - -See the [Forgejo 9.0.2 release notes](release-notes-published/9.0.2.md). - -## 9.0.1 - -See the [Forgejo 9.0.1 release notes](release-notes-published/9.0.1.md). - -## 9.0.0 - -See the [Forgejo 9.0.0 release notes](release-notes-published/9.0.0.md). +The release notes of each release [are available in the corresponding milestone](https://codeberg.org/forgejo/forgejo/milestones), starting with [Forgejo 7.0.7](https://codeberg.org/forgejo/forgejo/milestone/7683) and [Forgejo 8.0.1](https://codeberg.org/forgejo/forgejo/milestone/7682). ## 8.0.3 -See the [Forgejo 8.0.3 release notes](release-notes-published/8.0.3.md). +The Forgejo v8.0.3 release notes are [available in the v8.0.3 milestone](https://codeberg.org/forgejo/forgejo/milestone/8231). ## 8.0.2 -See the [Forgejo 8.0.2 release notes](release-notes-published/8.0.2.md). +The Forgejo v8.0.2 release notes are [available in the v8.0.2 milestone](https://codeberg.org/forgejo/forgejo/milestone/7728). ## 8.0.1 -See the [Forgejo 8.0.1 release notes](release-notes-published/8.0.1.md). +The Forgejo v8.0.1 release notes are [available in the v8.0.1 milestone](https://codeberg.org/forgejo/forgejo/milestone/7682). ## 8.0.0 @@ -167,25 +155,17 @@ A [companion blog post](https://forgejo.org/2024-07-release-v8-0/) provides addi - [PR](https://codeberg.org/forgejo/forgejo/pulls/2937): 31 March updates -## 7.0.11 - -See the [Forgejo 7.0.11 release notes](release-notes-published/7.0.11.md). - -## 7.0.10 - -See the [Forgejo 7.0.10 release notes](release-notes-published/7.0.10.md). - ## 7.0.9 -See the [Forgejo 7.0.9 release notes](release-notes-published/7.0.9.md). +The Forgejo v7.0.9 release notes are [available in the v7.0.9 milestone](https://codeberg.org/forgejo/forgejo/milestone/8232). ## 7.0.8 -See the [Forgejo 7.0.8 release notes](release-notes-published/7.0.8.md). +The Forgejo v7.0.8 release notes are [available in the v7.0.8 milestone](https://codeberg.org/forgejo/forgejo/milestone/7729). ## 7.0.7 -See the [Forgejo 7.0.7 release notes](release-notes-published/7.0.7.md). +The Forgejo v7.0.7 release notes are [available in the v7.0.7 milestone](https://codeberg.org/forgejo/forgejo/milestone/7683). ## 7.0.6 @@ -1590,7 +1570,7 @@ this situation, [follow the instructions in the companion blog post](https://for The most prominent ones are described here, others can be found in the list of commits included in the release as described above. - * [Fix links to pull request reviews sent via mail](https://codeberg.org/forgejo/forgejo/commit/88e179d5ef8ee41f71d068195685ff098b38ca31). The pull request link was correct but it did not go the review and stayed at the beginning of the page + * [Fix links to pull request reviews sent via mail](https://codeberg.org/forgejo/forgejo/commit/88e179d5ef8ee41f71d068195685ff098b38ca31). The pull request link was correct but it did not go the the review and stayed at the beginning of the page * [Recognize OGG as an audio format](https://codeberg.org/forgejo/forgejo/commit/622ec5c79f299c32ac2667a1aa7b4bf5d7c2d6cf) * [Consistently show the last time a cron job was run in the admin panel](https://codeberg.org/forgejo/forgejo/commit/5f769ef20) * [Fix NuGet registry v2 & v3 API search endpoints](https://codeberg.org/forgejo/forgejo/commit/471138829b0c24fe8c621dbb866ae8bb45ebc674) @@ -1609,7 +1589,7 @@ this situation, [follow the instructions in the companion blog post](https://for * [Fix pull request check list when there are more than 30](https://codeberg.org/forgejo/forgejo/commit/e226b9646) * [Fix attachment clipboard copy on insecure origin](https://codeberg.org/forgejo/forgejo/commit/12ac84c26) * [Fix the profile README rendering](https://codeberg.org/forgejo/forgejo/commit/84c3b60a4) that [was inconsistent with other markdown files renderings](https://codeberg.org/forgejo/forgejo/issues/833) - * [Fix API leaking the user email when the caller is not authenticated](https://codeberg.org/forgejo/forgejo/commit/d89003cc1) + * [Fix API leaking the user email when the caller is not authentified](https://codeberg.org/forgejo/forgejo/commit/d89003cc1) ## 1.20.2-0 @@ -1667,7 +1647,7 @@ $ git -C forgejo log --oneline --no-merges origin/v1.19/forgejo..origin/v1.20/fo The semantic version was updated to `5.0.0+0-gitea-1.20.1` because it contains breaking changes. - **Breaking:** - [Scoped access tokens](https://codeberg.org/forgejo/forgejo/commit/18de83b2a3fc120922096b7348d6375094ae1532) or (Personal Access Tokens), were refactored and although existing tokens are still valid, they may have a different scope than before. To ensure that no tokens have a larger scope than expected they must be removed and recreated. - - If your `app.ini` has one of the following `[indexer].ISSUE_INDEXER_QUEUE_TYPE`, `[indexer].ISSUE_INDEXER_QUEUE_BATCH_NUMBER`, `[indexer].`, `[indexer].ISSUE_INDEXER_QUEUE_DIR`, `[indexer].ISSUE_INDEXER_QUEUE_CONN_STR`, `[indexer].UPDATE_BUFFER_LEN`, `[mailer].SEND_BUFFER_LEN`, `[repository].PULL_REQUEST_QUEUE_LENGTH` or `[repository].MIRROR_QUEUE_LENGTH`, Forgejo will abort immediately. Unless you know exactly what you're doing, you must comment them out so the default values are used. + - If your `app.ini` has one of the the following `[indexer].ISSUE_INDEXER_QUEUE_TYPE`, `[indexer].ISSUE_INDEXER_QUEUE_BATCH_NUMBER`, `[indexer].`, `[indexer].ISSUE_INDEXER_QUEUE_DIR`, `[indexer].ISSUE_INDEXER_QUEUE_CONN_STR`, `[indexer].UPDATE_BUFFER_LEN`, `[mailer].SEND_BUFFER_LEN`, `[repository].PULL_REQUEST_QUEUE_LENGTH` or `[repository].MIRROR_QUEUE_LENGTH`, Forgejo will abort immediately. Unless you know exactly what you're doing, you must comment them out so the default values are used. - The `-p` option of `environment-to-ini` is [no longer supported](https://codeberg.org/forgejo/forgejo/commit/fa0b5b14c2faa6a5f76bb2e7bc9241a5e4354189) - The ".png" suffix for [user and organizations is now reserved](https://codeberg.org/forgejo/forgejo/commit/2b91841cd3e1213ff3e4ed4209d6a4be89c2fa79) - The section `[git.reflog]` is [now obsolete and its keys have been moved](https://codeberg.org/forgejo/forgejo/commit/2f149c5c9db97f20fbbc65e32d1f3133048b11a2) to the following replacements: @@ -1761,7 +1741,7 @@ $ git -C forgejo log --oneline --no-merges origin/v1.19/forgejo..origin/v1.20/fo - [The repository migration can be canceled](https://codeberg.org/forgejo/forgejo/commit/f6e029e6c7849d4361abf7f1d749b5d528364ac4) - [Add button on the diff header to copy the file name](https://codeberg.org/forgejo/forgejo/commit/c5ede35124c8d5280219c24049bb0ad7da9f02ed) - [Add --quiet option to the dump CLI](https://codeberg.org/forgejo/forgejo/commit/cb1536471bcef4d78a3fe5cbd738b9f60fabbcc2) - - [Support searching for an issue with its number in the list of issues](https://codeberg.org/forgejo/forgejo/commit/1144b1d129de530b2c07dfdfaf55de383cd82212) + - [Support searching for an issue with its number in the the list of issues](https://codeberg.org/forgejo/forgejo/commit/1144b1d129de530b2c07dfdfaf55de383cd82212) - [Improve the list of notifications](https://codeberg.org/forgejo/forgejo/commit/f7ede92f82f7f3ec7bb31a1249f9524e5b728f34) - [When editing a file in the web UI, allow for a preview whenever possible](https://codeberg.org/forgejo/forgejo/commit/ac64c8297444ade63a2a364c4afb7e6c1de5a75f) - [Make release download URLs human readable](https://codeberg.org/forgejo/forgejo/commit/42919ccb7cd32ab67d0878baf2bac6cd007899a8) @@ -1798,7 +1778,7 @@ $ git -C forgejo log --oneline --no-merges origin/v1.19/forgejo..origin/v1.20/fo - [Add API for gitignore templates](https://codeberg.org/forgejo/forgejo/commit/36a5d4c2f3b5670e5e921034cd5d25817534a6d4) - [Add API to upuload a file to an empty repository](https://codeberg.org/forgejo/forgejo/commit/cf465b472166ccf6d3e001e3043e4bf43e16e6b3) - [Allow for --not when listing the commits of a repo](https://codeberg.org/forgejo/forgejo/commit/f766b002938b5c81e343c81fda3c0669fa09809f) - - [Add `files` and `verification` parameters to improve performances when listing the commits of a repo](https://codeberg.org/forgejo/forgejo/commit/1dd83dbb917d55bd253001646d6743f247a4d98b) + - [Add `files` and `verification` parameters to improve performances when listing the commits of a a repo](https://codeberg.org/forgejo/forgejo/commit/1dd83dbb917d55bd253001646d6743f247a4d98b) - [Allow for listing a single commit in a repository](https://codeberg.org/forgejo/forgejo/commit/5930ab5fdf7a970fcca3cd50b44cf1cacb615a54) - [Create a branch directly from commit on the create branch API](https://codeberg.org/forgejo/forgejo/commit/cd9a13ebb47d32f46b38439a524e3b2e0c619490) - [Add API for Label templates](https://codeberg.org/forgejo/forgejo/commit/25dc1556cd70b567a4920beb002a0addfbfd6ef2) diff --git a/assets/go-licenses.json b/assets/go-licenses.json index 2c6bf78ec7..89fa08074c 100644 --- a/assets/go-licenses.json +++ b/assets/go-licenses.json @@ -24,11 +24,6 @@ "path": "code.forgejo.org/forgejo/reply/LICENSE", "licenseText": "MIT License\n\nCopyright (c) The Forgejo Authors\nCopyright (c) Discourse\nCopyright (c) Claudemiro\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n" }, - { - "name": "code.forgejo.org/go-chi/binding", - "path": "code.forgejo.org/go-chi/binding/LICENSE", - "licenseText": "Apache License\nVersion 2.0, January 2004\nhttp://www.apache.org/licenses/\n\nTERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n1. Definitions.\n\n\"License\" shall mean the terms and conditions for use, reproduction, and\ndistribution as defined by Sections 1 through 9 of this document.\n\n\"Licensor\" shall mean the copyright owner or entity authorized by the copyright\nowner that is granting the License.\n\n\"Legal Entity\" shall mean the union of the acting entity and all other entities\nthat control, are controlled by, or are under common control with that entity.\nFor the purposes of this definition, \"control\" means (i) the power, direct or\nindirect, to cause the direction or management of such entity, whether by\ncontract or otherwise, or (ii) ownership of fifty percent (50%) or more of the\noutstanding shares, or (iii) beneficial ownership of such entity.\n\n\"You\" (or \"Your\") shall mean an individual or Legal Entity exercising\npermissions granted by this License.\n\n\"Source\" form shall mean the preferred form for making modifications, including\nbut not limited to software source code, documentation source, and configuration\nfiles.\n\n\"Object\" form shall mean any form resulting from mechanical transformation or\ntranslation of a Source form, including but not limited to compiled object code,\ngenerated documentation, and conversions to other media types.\n\n\"Work\" shall mean the work of authorship, whether in Source or Object form, made\navailable under the License, as indicated by a copyright notice that is included\nin or attached to the work (an example is provided in the Appendix below).\n\n\"Derivative Works\" shall mean any work, whether in Source or Object form, that\nis based on (or derived from) the Work and for which the editorial revisions,\nannotations, elaborations, or other modifications represent, as a whole, an\noriginal work of authorship. For the purposes of this License, Derivative Works\nshall not include works that remain separable from, or merely link (or bind by\nname) to the interfaces of, the Work and Derivative Works thereof.\n\n\"Contribution\" shall mean any work of authorship, including the original version\nof the Work and any modifications or additions to that Work or Derivative Works\nthereof, that is intentionally submitted to Licensor for inclusion in the Work\nby the copyright owner or by an individual or Legal Entity authorized to submit\non behalf of the copyright owner. For the purposes of this definition,\n\"submitted\" means any form of electronic, verbal, or written communication sent\nto the Licensor or its representatives, including but not limited to\ncommunication on electronic mailing lists, source code control systems, and\nissue tracking systems that are managed by, or on behalf of, the Licensor for\nthe purpose of discussing and improving the Work, but excluding communication\nthat is conspicuously marked or otherwise designated in writing by the copyright\nowner as \"Not a Contribution.\"\n\n\"Contributor\" shall mean Licensor and any individual or Legal Entity on behalf\nof whom a Contribution has been received by Licensor and subsequently\nincorporated within the Work.\n\n2. Grant of Copyright License.\n\nSubject to the terms and conditions of this License, each Contributor hereby\ngrants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,\nirrevocable copyright license to reproduce, prepare Derivative Works of,\npublicly display, publicly perform, sublicense, and distribute the Work and such\nDerivative Works in Source or Object form.\n\n3. Grant of Patent License.\n\nSubject to the terms and conditions of this License, each Contributor hereby\ngrants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,\nirrevocable (except as stated in this section) patent license to make, have\nmade, use, offer to sell, sell, import, and otherwise transfer the Work, where\nsuch license applies only to those patent claims licensable by such Contributor\nthat are necessarily infringed by their Contribution(s) alone or by combination\nof their Contribution(s) with the Work to which such Contribution(s) was\nsubmitted. If You institute patent litigation against any entity (including a\ncross-claim or counterclaim in a lawsuit) alleging that the Work or a\nContribution incorporated within the Work constitutes direct or contributory\npatent infringement, then any patent licenses granted to You under this License\nfor that Work shall terminate as of the date such litigation is filed.\n\n4. Redistribution.\n\nYou may reproduce and distribute copies of the Work or Derivative Works thereof\nin any medium, with or without modifications, and in Source or Object form,\nprovided that You meet the following conditions:\n\nYou must give any other recipients of the Work or Derivative Works a copy of\nthis License; and\nYou must cause any modified files to carry prominent notices stating that You\nchanged the files; and\nYou must retain, in the Source form of any Derivative Works that You distribute,\nall copyright, patent, trademark, and attribution notices from the Source form\nof the Work, excluding those notices that do not pertain to any part of the\nDerivative Works; and\nIf the Work includes a \"NOTICE\" text file as part of its distribution, then any\nDerivative Works that You distribute must include a readable copy of the\nattribution notices contained within such NOTICE file, excluding those notices\nthat do not pertain to any part of the Derivative Works, in at least one of the\nfollowing places: within a NOTICE text file distributed as part of the\nDerivative Works; within the Source form or documentation, if provided along\nwith the Derivative Works; or, within a display generated by the Derivative\nWorks, if and wherever such third-party notices normally appear. The contents of\nthe NOTICE file are for informational purposes only and do not modify the\nLicense. You may add Your own attribution notices within Derivative Works that\nYou distribute, alongside or as an addendum to the NOTICE text from the Work,\nprovided that such additional attribution notices cannot be construed as\nmodifying the License.\nYou may add Your own copyright statement to Your modifications and may provide\nadditional or different license terms and conditions for use, reproduction, or\ndistribution of Your modifications, or for any such Derivative Works as a whole,\nprovided Your use, reproduction, and distribution of the Work otherwise complies\nwith the conditions stated in this License.\n\n5. Submission of Contributions.\n\nUnless You explicitly state otherwise, any Contribution intentionally submitted\nfor inclusion in the Work by You to the Licensor shall be under the terms and\nconditions of this License, without any additional terms or conditions.\nNotwithstanding the above, nothing herein shall supersede or modify the terms of\nany separate license agreement you may have executed with Licensor regarding\nsuch Contributions.\n\n6. Trademarks.\n\nThis License does not grant permission to use the trade names, trademarks,\nservice marks, or product names of the Licensor, except as required for\nreasonable and customary use in describing the origin of the Work and\nreproducing the content of the NOTICE file.\n\n7. Disclaimer of Warranty.\n\nUnless required by applicable law or agreed to in writing, Licensor provides the\nWork (and each Contributor provides its Contributions) on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,\nincluding, without limitation, any warranties or conditions of TITLE,\nNON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are\nsolely responsible for determining the appropriateness of using or\nredistributing the Work and assume any risks associated with Your exercise of\npermissions under this License.\n\n8. Limitation of Liability.\n\nIn no event and under no legal theory, whether in tort (including negligence),\ncontract, or otherwise, unless required by applicable law (such as deliberate\nand grossly negligent acts) or agreed to in writing, shall any Contributor be\nliable to You for damages, including any direct, indirect, special, incidental,\nor consequential damages of any character arising as a result of this License or\nout of the use or inability to use the Work (including but not limited to\ndamages for loss of goodwill, work stoppage, computer failure or malfunction, or\nany and all other commercial damages or losses), even if such Contributor has\nbeen advised of the possibility of such damages.\n\n9. Accepting Warranty or Additional Liability.\n\nWhile redistributing the Work or Derivative Works thereof, You may choose to\noffer, and charge a fee for, acceptance of support, warranty, indemnity, or\nother liability obligations and/or rights consistent with this License. However,\nin accepting such obligations, You may act only on Your own behalf and on Your\nsole responsibility, not on behalf of any other Contributor, and only if You\nagree to indemnify, defend, and hold each Contributor harmless for any liability\nincurred by, or claims asserted against, such Contributor by reason of your\naccepting any such warranty or additional liability.\n\nEND OF TERMS AND CONDITIONS\n\nAPPENDIX: How to apply the Apache License to your work\n\nTo apply the Apache License to your work, attach the following boilerplate\nnotice, with the fields enclosed by brackets \"[]\" replaced with your own\nidentifying information. (Don't include the brackets!) The text should be\nenclosed in the appropriate comment syntax for the file format. We also\nrecommend that a file or class name and description of purpose be included on\nthe same \"printed page\" as the copyright notice for easier identification within\nthird-party archives.\n\n Copyright [yyyy] [name of copyright owner]\n\n Licensed under the Apache License, Version 2.0 (the \"License\");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License." - }, { "name": "code.forgejo.org/go-chi/cache", "path": "code.forgejo.org/go-chi/cache/LICENSE", @@ -79,16 +74,16 @@ "path": "git.sr.ht/~mariusor/go-xsd-duration/LICENSE", "licenseText": "MIT License\n\nCopyright (c) 2019 Go xsd:duration\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n" }, + { + "name": "gitea.com/go-chi/binding", + "path": "gitea.com/go-chi/binding/LICENSE", + "licenseText": "Apache License\nVersion 2.0, January 2004\nhttp://www.apache.org/licenses/\n\nTERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n1. Definitions.\n\n\"License\" shall mean the terms and conditions for use, reproduction, and\ndistribution as defined by Sections 1 through 9 of this document.\n\n\"Licensor\" shall mean the copyright owner or entity authorized by the copyright\nowner that is granting the License.\n\n\"Legal Entity\" shall mean the union of the acting entity and all other entities\nthat control, are controlled by, or are under common control with that entity.\nFor the purposes of this definition, \"control\" means (i) the power, direct or\nindirect, to cause the direction or management of such entity, whether by\ncontract or otherwise, or (ii) ownership of fifty percent (50%) or more of the\noutstanding shares, or (iii) beneficial ownership of such entity.\n\n\"You\" (or \"Your\") shall mean an individual or Legal Entity exercising\npermissions granted by this License.\n\n\"Source\" form shall mean the preferred form for making modifications, including\nbut not limited to software source code, documentation source, and configuration\nfiles.\n\n\"Object\" form shall mean any form resulting from mechanical transformation or\ntranslation of a Source form, including but not limited to compiled object code,\ngenerated documentation, and conversions to other media types.\n\n\"Work\" shall mean the work of authorship, whether in Source or Object form, made\navailable under the License, as indicated by a copyright notice that is included\nin or attached to the work (an example is provided in the Appendix below).\n\n\"Derivative Works\" shall mean any work, whether in Source or Object form, that\nis based on (or derived from) the Work and for which the editorial revisions,\nannotations, elaborations, or other modifications represent, as a whole, an\noriginal work of authorship. For the purposes of this License, Derivative Works\nshall not include works that remain separable from, or merely link (or bind by\nname) to the interfaces of, the Work and Derivative Works thereof.\n\n\"Contribution\" shall mean any work of authorship, including the original version\nof the Work and any modifications or additions to that Work or Derivative Works\nthereof, that is intentionally submitted to Licensor for inclusion in the Work\nby the copyright owner or by an individual or Legal Entity authorized to submit\non behalf of the copyright owner. For the purposes of this definition,\n\"submitted\" means any form of electronic, verbal, or written communication sent\nto the Licensor or its representatives, including but not limited to\ncommunication on electronic mailing lists, source code control systems, and\nissue tracking systems that are managed by, or on behalf of, the Licensor for\nthe purpose of discussing and improving the Work, but excluding communication\nthat is conspicuously marked or otherwise designated in writing by the copyright\nowner as \"Not a Contribution.\"\n\n\"Contributor\" shall mean Licensor and any individual or Legal Entity on behalf\nof whom a Contribution has been received by Licensor and subsequently\nincorporated within the Work.\n\n2. Grant of Copyright License.\n\nSubject to the terms and conditions of this License, each Contributor hereby\ngrants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,\nirrevocable copyright license to reproduce, prepare Derivative Works of,\npublicly display, publicly perform, sublicense, and distribute the Work and such\nDerivative Works in Source or Object form.\n\n3. Grant of Patent License.\n\nSubject to the terms and conditions of this License, each Contributor hereby\ngrants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,\nirrevocable (except as stated in this section) patent license to make, have\nmade, use, offer to sell, sell, import, and otherwise transfer the Work, where\nsuch license applies only to those patent claims licensable by such Contributor\nthat are necessarily infringed by their Contribution(s) alone or by combination\nof their Contribution(s) with the Work to which such Contribution(s) was\nsubmitted. If You institute patent litigation against any entity (including a\ncross-claim or counterclaim in a lawsuit) alleging that the Work or a\nContribution incorporated within the Work constitutes direct or contributory\npatent infringement, then any patent licenses granted to You under this License\nfor that Work shall terminate as of the date such litigation is filed.\n\n4. Redistribution.\n\nYou may reproduce and distribute copies of the Work or Derivative Works thereof\nin any medium, with or without modifications, and in Source or Object form,\nprovided that You meet the following conditions:\n\nYou must give any other recipients of the Work or Derivative Works a copy of\nthis License; and\nYou must cause any modified files to carry prominent notices stating that You\nchanged the files; and\nYou must retain, in the Source form of any Derivative Works that You distribute,\nall copyright, patent, trademark, and attribution notices from the Source form\nof the Work, excluding those notices that do not pertain to any part of the\nDerivative Works; and\nIf the Work includes a \"NOTICE\" text file as part of its distribution, then any\nDerivative Works that You distribute must include a readable copy of the\nattribution notices contained within such NOTICE file, excluding those notices\nthat do not pertain to any part of the Derivative Works, in at least one of the\nfollowing places: within a NOTICE text file distributed as part of the\nDerivative Works; within the Source form or documentation, if provided along\nwith the Derivative Works; or, within a display generated by the Derivative\nWorks, if and wherever such third-party notices normally appear. The contents of\nthe NOTICE file are for informational purposes only and do not modify the\nLicense. You may add Your own attribution notices within Derivative Works that\nYou distribute, alongside or as an addendum to the NOTICE text from the Work,\nprovided that such additional attribution notices cannot be construed as\nmodifying the License.\nYou may add Your own copyright statement to Your modifications and may provide\nadditional or different license terms and conditions for use, reproduction, or\ndistribution of Your modifications, or for any such Derivative Works as a whole,\nprovided Your use, reproduction, and distribution of the Work otherwise complies\nwith the conditions stated in this License.\n\n5. Submission of Contributions.\n\nUnless You explicitly state otherwise, any Contribution intentionally submitted\nfor inclusion in the Work by You to the Licensor shall be under the terms and\nconditions of this License, without any additional terms or conditions.\nNotwithstanding the above, nothing herein shall supersede or modify the terms of\nany separate license agreement you may have executed with Licensor regarding\nsuch Contributions.\n\n6. Trademarks.\n\nThis License does not grant permission to use the trade names, trademarks,\nservice marks, or product names of the Licensor, except as required for\nreasonable and customary use in describing the origin of the Work and\nreproducing the content of the NOTICE file.\n\n7. Disclaimer of Warranty.\n\nUnless required by applicable law or agreed to in writing, Licensor provides the\nWork (and each Contributor provides its Contributions) on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,\nincluding, without limitation, any warranties or conditions of TITLE,\nNON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are\nsolely responsible for determining the appropriateness of using or\nredistributing the Work and assume any risks associated with Your exercise of\npermissions under this License.\n\n8. Limitation of Liability.\n\nIn no event and under no legal theory, whether in tort (including negligence),\ncontract, or otherwise, unless required by applicable law (such as deliberate\nand grossly negligent acts) or agreed to in writing, shall any Contributor be\nliable to You for damages, including any direct, indirect, special, incidental,\nor consequential damages of any character arising as a result of this License or\nout of the use or inability to use the Work (including but not limited to\ndamages for loss of goodwill, work stoppage, computer failure or malfunction, or\nany and all other commercial damages or losses), even if such Contributor has\nbeen advised of the possibility of such damages.\n\n9. Accepting Warranty or Additional Liability.\n\nWhile redistributing the Work or Derivative Works thereof, You may choose to\noffer, and charge a fee for, acceptance of support, warranty, indemnity, or\nother liability obligations and/or rights consistent with this License. However,\nin accepting such obligations, You may act only on Your own behalf and on Your\nsole responsibility, not on behalf of any other Contributor, and only if You\nagree to indemnify, defend, and hold each Contributor harmless for any liability\nincurred by, or claims asserted against, such Contributor by reason of your\naccepting any such warranty or additional liability.\n\nEND OF TERMS AND CONDITIONS\n\nAPPENDIX: How to apply the Apache License to your work\n\nTo apply the Apache License to your work, attach the following boilerplate\nnotice, with the fields enclosed by brackets \"[]\" replaced with your own\nidentifying information. (Don't include the brackets!) The text should be\nenclosed in the appropriate comment syntax for the file format. We also\nrecommend that a file or class name and description of purpose be included on\nthe same \"printed page\" as the copyright notice for easier identification within\nthird-party archives.\n\n Copyright [yyyy] [name of copyright owner]\n\n Licensed under the Apache License, Version 2.0 (the \"License\");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License." + }, { "name": "gitea.com/lunny/levelqueue", "path": "gitea.com/lunny/levelqueue/LICENSE", "licenseText": "Copyright (c) 2019 Lunny Xiao\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.\n" }, - { - "name": "github.com/42wim/httpsig", - "path": "github.com/42wim/httpsig/LICENSE", - "licenseText": "BSD 3-Clause License\n\nCopyright (c) 2018, go-fed\nAll rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are met:\n\n* Redistributions of source code must retain the above copyright notice, this\n list of conditions and the following disclaimer.\n\n* Redistributions in binary form must reproduce the above copyright notice,\n this list of conditions and the following disclaimer in the documentation\n and/or other materials provided with the distribution.\n\n* Neither the name of the copyright holder nor the names of its\n contributors may be used to endorse or promote products derived from\n this software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\nAND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\nIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\nDISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE\nFOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL\nDAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR\nSERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER\nCAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,\nOR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" - }, { "name": "github.com/42wim/sshsig", "path": "github.com/42wim/sshsig/LICENSE", @@ -297,7 +292,7 @@ { "name": "github.com/cyphar/filepath-securejoin", "path": "github.com/cyphar/filepath-securejoin/LICENSE", - "licenseText": "Copyright (C) 2014-2015 Docker Inc \u0026 Go Authors. All rights reserved.\nCopyright (C) 2017-2024 SUSE LLC. All rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" + "licenseText": "Copyright (C) 2014-2015 Docker Inc \u0026 Go Authors. All rights reserved.\nCopyright (C) 2017 SUSE LLC. All rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" }, { "name": "github.com/davecgh/go-spew/spew", @@ -572,7 +567,7 @@ { "name": "github.com/gorilla/sessions", "path": "github.com/gorilla/sessions/LICENSE", - "licenseText": "Copyright (c) 2024 The Gorilla Authors. All rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n\t * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n\t * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n\t * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" + "licenseText": "Copyright (c) 2023 The Gorilla Authors. All rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n\t * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n\t * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n\t * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" }, { "name": "github.com/hashicorp/go-cleanhttp", @@ -615,8 +610,8 @@ "licenseText": "The MIT License (MIT)\n\nCopyright (c) 2014 Juan Batiz-Benet\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.\n" }, { - "name": "github.com/jhillyerd/enmime/v2", - "path": "github.com/jhillyerd/enmime/v2/LICENSE", + "name": "github.com/jhillyerd/enmime", + "path": "github.com/jhillyerd/enmime/LICENSE", "licenseText": "The MIT License (MIT)\n\nCopyright (c) 2012-2016 James Hillyerd, All Rights Reserved\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of\nthis software and associated documentation files (the \"Software\"), to deal in\nthe Software without restriction, including without limitation the rights to\nuse, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of\nthe Software, and to permit persons to whom the Software is furnished to do so,\nsubject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS\nFOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR\nCOPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER\nIN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\nCONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n" }, { @@ -720,8 +715,8 @@ "licenseText": "MIT License\n\nCopyright (c) 2020-2024 Meili SAS\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n" }, { - "name": "github.com/mholt/acmez/v3", - "path": "github.com/mholt/acmez/v3/LICENSE", + "name": "github.com/mholt/acmez/v2", + "path": "github.com/mholt/acmez/v2/LICENSE", "licenseText": " Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n 1. Definitions.\n\n \"License\" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n \"Licensor\" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n \"Legal Entity\" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n \"control\" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n \"Source\" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n \"Object\" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n \"Work\" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n \"Derivative Works\" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n \"Contribution\" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, \"submitted\"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as \"Not a Contribution.\"\n\n \"Contributor\" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n 2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n 3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n 4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a \"NOTICE\" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n 5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n 6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n 7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n 8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n 9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\n END OF TERMS AND CONDITIONS\n\n APPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets \"[]\"\n replaced with your own identifying information. (Don't include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same \"printed page\" as the copyright notice for easier\n identification within third-party archives.\n\n Copyright [yyyy] [name of copyright owner]\n\n Licensed under the Apache License, Version 2.0 (the \"License\");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n" }, { @@ -764,11 +759,6 @@ "path": "github.com/modern-go/reflect2/LICENSE", "licenseText": " Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n 1. Definitions.\n\n \"License\" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n \"Licensor\" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n \"Legal Entity\" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n \"control\" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n \"Source\" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n \"Object\" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n \"Work\" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n \"Derivative Works\" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n \"Contribution\" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, \"submitted\"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as \"Not a Contribution.\"\n\n \"Contributor\" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n 2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n 3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n 4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a \"NOTICE\" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n 5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n 6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n 7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n 8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n 9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\n END OF TERMS AND CONDITIONS\n\n APPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets \"[]\"\n replaced with your own identifying information. (Don't include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same \"printed page\" as the copyright notice for easier\n identification within third-party archives.\n\n Copyright [yyyy] [name of copyright owner]\n\n Licensed under the Apache License, Version 2.0 (the \"License\");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n" }, - { - "name": "github.com/munnerz/goautoneg", - "path": "github.com/munnerz/goautoneg/LICENSE", - "licenseText": "Copyright (c) 2011, Open Knowledge Foundation Ltd.\nAll rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n Redistributions of source code must retain the above copyright\n notice, this list of conditions and the following disclaimer.\n\n Redistributions in binary form must reproduce the above copyright\n notice, this list of conditions and the following disclaimer in\n the documentation and/or other materials provided with the\n distribution.\n\n Neither the name of the Open Knowledge Foundation Ltd. nor the\n names of its contributors may be used to endorse or promote\n products derived from this software without specific prior written\n permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nHOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" - }, { "name": "github.com/nektos/act/pkg", "path": "github.com/nektos/act/pkg/LICENSE", @@ -817,7 +807,7 @@ { "name": "github.com/pjbgf/sha1cd", "path": "github.com/pjbgf/sha1cd/LICENSE", - "licenseText": " Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n 1. Definitions.\n\n \"License\" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n \"Licensor\" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n \"Legal Entity\" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n \"control\" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n \"Source\" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n \"Object\" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n \"Work\" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n \"Derivative Works\" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n \"Contribution\" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, \"submitted\"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as \"Not a Contribution.\"\n\n \"Contributor\" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n 2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n 3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n 4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a \"NOTICE\" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n 5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n 6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n 7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n 8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n 9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\n END OF TERMS AND CONDITIONS\n\n APPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets \"[]\"\n replaced with your own identifying information. (Don't include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same \"printed page\" as the copyright notice for easier\n identification within third-party archives.\n\n Copyright 2023 pjbgf\n\n Licensed under the Apache License, Version 2.0 (the \"License\");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n" + "licenseText": " Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n 1. Definitions.\n\n \"License\" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n \"Licensor\" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n \"Legal Entity\" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n \"control\" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n \"Source\" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n \"Object\" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n \"Work\" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n \"Derivative Works\" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n \"Contribution\" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, \"submitted\"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as \"Not a Contribution.\"\n\n \"Contributor\" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n 2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n 3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n 4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a \"NOTICE\" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n 5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n 6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n 7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n 8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n 9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\n END OF TERMS AND CONDITIONS\n\n APPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets \"[]\"\n replaced with your own identifying information. (Don't include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same \"printed page\" as the copyright notice for easier\n identification within third-party archives.\n\n Copyright [yyyy] [name of copyright owner]\n\n Licensed under the Apache License, Version 2.0 (the \"License\");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n" }, { "name": "github.com/pkg/errors", @@ -834,11 +824,6 @@ "path": "github.com/pquerna/otp/LICENSE", "licenseText": "\n Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n 1. Definitions.\n\n \"License\" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n \"Licensor\" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n \"Legal Entity\" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n \"control\" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n \"Source\" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n \"Object\" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n \"Work\" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n \"Derivative Works\" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n \"Contribution\" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, \"submitted\"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as \"Not a Contribution.\"\n\n \"Contributor\" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n 2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n 3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n 4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a \"NOTICE\" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n 5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n 6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n 7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n 8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n 9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\n END OF TERMS AND CONDITIONS\n\n APPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets \"[]\"\n replaced with your own identifying information. (Don't include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same \"printed page\" as the copyright notice for easier\n identification within third-party archives.\n\n Copyright [yyyy] [name of copyright owner]\n\n Licensed under the Apache License, Version 2.0 (the \"License\");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n" }, - { - "name": "github.com/prometheus/client_golang/internal/github.com/golang/gddo/httputil", - "path": "github.com/prometheus/client_golang/internal/github.com/golang/gddo/httputil/LICENSE", - "licenseText": "Copyright (c) 2013 The Go Authors. All rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" - }, { "name": "github.com/prometheus/client_golang/prometheus", "path": "github.com/prometheus/client_golang/prometheus/LICENSE", @@ -949,6 +934,11 @@ "path": "github.com/x448/float16/LICENSE", "licenseText": "MIT License\n\nCopyright (c) 2019 Montgomery Edwardsâ´â´â¸ and Faye Amacker\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n\n" }, + { + "name": "github.com/xanzy/go-gitlab", + "path": "github.com/xanzy/go-gitlab/LICENSE", + "licenseText": " Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n 1. Definitions.\n\n \"License\" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n \"Licensor\" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n \"Legal Entity\" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n \"control\" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n \"Source\" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n \"Object\" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n \"Work\" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n \"Derivative Works\" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n \"Contribution\" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, \"submitted\"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as \"Not a Contribution.\"\n\n \"Contributor\" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n 2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n 3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n 4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a \"NOTICE\" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n 5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n 6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n 7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n 8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n 9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\n END OF TERMS AND CONDITIONS\n\n APPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets \"{}\"\n replaced with your own identifying information. (Don't include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same \"printed page\" as the copyright notice for easier\n identification within third-party archives.\n\n Copyright {yyyy} {name of copyright owner}\n\n Licensed under the Apache License, Version 2.0 (the \"License\");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n" + }, { "name": "github.com/xanzy/ssh-agent", "path": "github.com/xanzy/ssh-agent/LICENSE", @@ -979,11 +969,6 @@ "path": "github.com/zeebo/blake3/LICENSE", "licenseText": "This work is released into the public domain with CC0 1.0.\n\n-------------------------------------------------------------------------------\n\nCreative Commons Legal Code\n\nCC0 1.0 Universal\n\n CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE\n LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN\n ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS\n INFORMATION ON AN \"AS-IS\" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES\n REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS\n PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM\n THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED\n HEREUNDER.\n\nStatement of Purpose\n\nThe laws of most jurisdictions throughout the world automatically confer\nexclusive Copyright and Related Rights (defined below) upon the creator\nand subsequent owner(s) (each and all, an \"owner\") of an original work of\nauthorship and/or a database (each, a \"Work\").\n\nCertain owners wish to permanently relinquish those rights to a Work for\nthe purpose of contributing to a commons of creative, cultural and\nscientific works (\"Commons\") that the public can reliably and without fear\nof later claims of infringement build upon, modify, incorporate in other\nworks, reuse and redistribute as freely as possible in any form whatsoever\nand for any purposes, including without limitation commercial purposes.\nThese owners may contribute to the Commons to promote the ideal of a free\nculture and the further production of creative, cultural and scientific\nworks, or to gain reputation or greater distribution for their Work in\npart through the use and efforts of others.\n\nFor these and/or other purposes and motivations, and without any\nexpectation of additional consideration or compensation, the person\nassociating CC0 with a Work (the \"Affirmer\"), to the extent that he or she\nis an owner of Copyright and Related Rights in the Work, voluntarily\nelects to apply CC0 to the Work and publicly distribute the Work under its\nterms, with knowledge of his or her Copyright and Related Rights in the\nWork and the meaning and intended legal effect of CC0 on those rights.\n\n1. Copyright and Related Rights. A Work made available under CC0 may be\nprotected by copyright and related or neighboring rights (\"Copyright and\nRelated Rights\"). Copyright and Related Rights include, but are not\nlimited to, the following:\n\n i. the right to reproduce, adapt, distribute, perform, display,\n communicate, and translate a Work;\n ii. moral rights retained by the original author(s) and/or performer(s);\niii. publicity and privacy rights pertaining to a person's image or\n likeness depicted in a Work;\n iv. rights protecting against unfair competition in regards to a Work,\n subject to the limitations in paragraph 4(a), below;\n v. rights protecting the extraction, dissemination, use and reuse of data\n in a Work;\n vi. database rights (such as those arising under Directive 96/9/EC of the\n European Parliament and of the Council of 11 March 1996 on the legal\n protection of databases, and under any national implementation\n thereof, including any amended or successor version of such\n directive); and\nvii. other similar, equivalent or corresponding rights throughout the\n world based on applicable law or treaty, and any national\n implementations thereof.\n\n2. Waiver. To the greatest extent permitted by, but not in contravention\nof, applicable law, Affirmer hereby overtly, fully, permanently,\nirrevocably and unconditionally waives, abandons, and surrenders all of\nAffirmer's Copyright and Related Rights and associated claims and causes\nof action, whether now known or unknown (including existing as well as\nfuture claims and causes of action), in the Work (i) in all territories\nworldwide, (ii) for the maximum duration provided by applicable law or\ntreaty (including future time extensions), (iii) in any current or future\nmedium and for any number of copies, and (iv) for any purpose whatsoever,\nincluding without limitation commercial, advertising or promotional\npurposes (the \"Waiver\"). Affirmer makes the Waiver for the benefit of each\nmember of the public at large and to the detriment of Affirmer's heirs and\nsuccessors, fully intending that such Waiver shall not be subject to\nrevocation, rescission, cancellation, termination, or any other legal or\nequitable action to disrupt the quiet enjoyment of the Work by the public\nas contemplated by Affirmer's express Statement of Purpose.\n\n3. Public License Fallback. Should any part of the Waiver for any reason\nbe judged legally invalid or ineffective under applicable law, then the\nWaiver shall be preserved to the maximum extent permitted taking into\naccount Affirmer's express Statement of Purpose. In addition, to the\nextent the Waiver is so judged Affirmer hereby grants to each affected\nperson a royalty-free, non transferable, non sublicensable, non exclusive,\nirrevocable and unconditional license to exercise Affirmer's Copyright and\nRelated Rights in the Work (i) in all territories worldwide, (ii) for the\nmaximum duration provided by applicable law or treaty (including future\ntime extensions), (iii) in any current or future medium and for any number\nof copies, and (iv) for any purpose whatsoever, including without\nlimitation commercial, advertising or promotional purposes (the\n\"License\"). The License shall be deemed effective as of the date CC0 was\napplied by Affirmer to the Work. Should any part of the License for any\nreason be judged legally invalid or ineffective under applicable law, such\npartial invalidity or ineffectiveness shall not invalidate the remainder\nof the License, and in such case Affirmer hereby affirms that he or she\nwill not (i) exercise any of his or her remaining Copyright and Related\nRights in the Work or (ii) assert any associated claims and causes of\naction with respect to the Work, in either case contrary to Affirmer's\nexpress Statement of Purpose.\n\n4. Limitations and Disclaimers.\n\n a. No trademark or patent rights held by Affirmer are waived, abandoned,\n surrendered, licensed or otherwise affected by this document.\n b. Affirmer offers the Work as-is and makes no representations or\n warranties of any kind concerning the Work, express, implied,\n statutory or otherwise, including without limitation warranties of\n title, merchantability, fitness for a particular purpose, non\n infringement, or the absence of latent or other defects, accuracy, or\n the present or absence of errors, whether or not discoverable, all to\n the greatest extent permissible under applicable law.\n c. Affirmer disclaims responsibility for clearing rights of other persons\n that may apply to the Work or any use thereof, including without\n limitation any person's Copyright and Related Rights in the Work.\n Further, Affirmer disclaims responsibility for obtaining any necessary\n consents, permissions or other rights required for any use of the\n Work.\n d. Affirmer understands and acknowledges that Creative Commons is not a\n party to this document and has no duty or obligation with respect to\n this CC0 or use of the Work.\n" }, - { - "name": "gitlab.com/gitlab-org/api/client-go", - "path": "gitlab.com/gitlab-org/api/client-go/LICENSE", - "licenseText": " Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n 1. Definitions.\n\n \"License\" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n \"Licensor\" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n \"Legal Entity\" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n \"control\" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n \"Source\" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n \"Object\" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n \"Work\" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n \"Derivative Works\" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n \"Contribution\" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, \"submitted\"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as \"Not a Contribution.\"\n\n \"Contributor\" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n 2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n 3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n 4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a \"NOTICE\" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n 5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n 6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n 7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n 8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n 9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\n END OF TERMS AND CONDITIONS\n\n APPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets \"{}\"\n replaced with your own identifying information. (Don't include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same \"printed page\" as the copyright notice for easier\n identification within third-party archives.\n\n Copyright {yyyy} {name of copyright owner}\n\n Licensed under the Apache License, Version 2.0 (the \"License\");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n" - }, { "name": "go.etcd.io/bbolt", "path": "go.etcd.io/bbolt/LICENSE", @@ -1004,11 +989,6 @@ "path": "go.uber.org/zap/LICENSE", "licenseText": "Copyright (c) 2016-2017 Uber Technologies, Inc.\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.\n" }, - { - "name": "go.uber.org/zap/exp/zapslog", - "path": "go.uber.org/zap/exp/zapslog/LICENSE", - "licenseText": "Copyright (c) 2016-2024 Uber Technologies, Inc.\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.\n" - }, { "name": "golang.org/x/crypto", "path": "golang.org/x/crypto/LICENSE", @@ -1052,7 +1032,7 @@ { "name": "golang.org/x/time/rate", "path": "golang.org/x/time/rate/LICENSE", - "licenseText": "Copyright 2009 The Go Authors.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n * Neither the name of Google LLC nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" + "licenseText": "Copyright (c) 2009 The Go Authors. All rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are\nmet:\n\n * Redistributions of source code must retain the above copyright\nnotice, this list of conditions and the following disclaimer.\n * Redistributions in binary form must reproduce the above\ncopyright notice, this list of conditions and the following disclaimer\nin the documentation and/or other materials provided with the\ndistribution.\n * Neither the name of Google Inc. nor the names of its\ncontributors may be used to endorse or promote products derived from\nthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\nLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\nA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\nOWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\nSPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\nLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\nDATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\nTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\nOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" }, { "name": "google.golang.org/genproto/googleapis/rpc/status", diff --git a/build.go b/build.go index d410e171c7..234579b514 100644 --- a/build.go +++ b/build.go @@ -11,4 +11,13 @@ package main import ( // for embed _ "github.com/shurcooL/vfsgen" + + // for cover merge + _ "golang.org/x/tools/cover" + + // for vet + _ "code.gitea.io/gitea-vet" + + // for swagger + _ "github.com/go-swagger/go-swagger/cmd/swagger" ) diff --git a/build/generate-disposable-email.go b/build/generate-disposable-email.go deleted file mode 100644 index f87df088c5..0000000000 --- a/build/generate-disposable-email.go +++ /dev/null @@ -1,203 +0,0 @@ -// Copyright 2024 James Hatfield -// SPDX-License-Identifier: MIT - -//go:build ignore - -package main - -import ( - "bufio" - "bytes" - "crypto" - "flag" - "fmt" - "go/format" - "io" - "log" - "net/http" - "os" - "regexp" - "strings" -) - -const disposableEmailListURL string = "https://raw.githubusercontent.com/disposable-email-domains/disposable-email-domains/%s/disposable_email_blocklist.conf" - -var ( - gitRef *string = flag.String("r", "master", "Git reference of the domain list version") - outPat *string = flag.String("o", "modules/setting/disposable_email_domain_data.go", "Output path") - check *bool = flag.Bool("check", false, "Check if the current output file matches the current upstream list") -) - -func main() { - flag.Parse() - - if *check { - // read in the local copy of the domain list - local, err := get_local_file() - if err != nil { - log.Fatalf("File Read Error: %v", err) - } - - // generate the remote copy of the domain list - remote, err := generate() - if err != nil { - log.Fatalf("Generation Error: %v", err) - } - - // strip the comments from both (so we dont fail simply due to git ref difference) - local = strip_comments(local) - remote = strip_comments(remote) - - // generate the hash of the local copy - local_sha, err := hash(local) - if err != nil { - log.Fatalf("Local Hash Generation Error: %v", err) - } - - // generate the hash of the remote copy - remote_sha, err := hash(remote) - if err != nil { - log.Fatalf("Remote Hash Generation Error: %v", err) - } - - // if the hashes dont match then the local copy needs to be updated - if local_sha != remote_sha { - log.Fatalf("Disposable email domain list needs to be updated!! \"make lint-disposable-emails-fix\"") - } - } else { - // generate the source code (array of domains) - res, err := generate() - if err != nil { - log.Fatalf("Generation Error: %v", err) - } - - // write result to a file - err = os.WriteFile(*outPat, res, 0o644) - if err != nil { - log.Fatalf("File Write Error: %v", err) - } - } -} - -func strip_comments(data []byte) []byte { - result := make([]byte, 0, len(data)) - - re := regexp.MustCompile(`^\W*//.*$`) - - for _, line := range bytes.Split(data, []byte("\n")) { - if !re.Match(line) { - result = append(result, line...) - } - } - - return result -} - -func hash(data []byte) (string, error) { - var err error - - hash := crypto.SHA3_256.New() - - _, err = hash.Write(data) - if err != nil { - return "", err - } - - return fmt.Sprintf("%x", hash.Sum(nil)), err -} - -func get_local_file() ([]byte, error) { - var err error - - f, err := os.Open(*outPat) - if err != nil { - return nil, err - } - defer f.Close() - - data, err := io.ReadAll(f) - if err != nil { - return nil, err - } - - return data, err -} - -func get_remote() ([]string, error) { - var err error - var url string = fmt.Sprintf(disposableEmailListURL, *gitRef) - - // download the domain list - res, err := http.Get(url) - if err != nil { - return nil, err - } - defer res.Body.Close() - - body, err := io.ReadAll(res.Body) - if err != nil { - return nil, err - } - - // go through all entries (1 domain per line) - scanner := bufio.NewScanner(bytes.NewReader(body)) - - var arrDomains []string - for scanner.Scan() { - line := scanner.Text() - arrDomains = append(arrDomains, line) - } - - return arrDomains, err -} - -func generate() ([]byte, error) { - var err error - var url string = fmt.Sprintf(disposableEmailListURL, *gitRef) - - // download the domains list - arrDomains, err := get_remote() - if err != nil { - return nil, err - } - - // build the string in a readable way - var sb strings.Builder - - _, err = sb.WriteString("[]string{\n") - if err != nil { - return nil, err - } - - for _, item := range arrDomains { - _, err = sb.WriteString(fmt.Sprintf("\t%q,\n", item)) - if err != nil { - return nil, err - } - } - - _, err = sb.WriteString("}") - if err != nil { - return nil, err - } - - // insert the values into file - final := fmt.Sprintf(hdr, url, sb.String()) - - return format.Source([]byte(final)) -} - -const hdr = ` -// Copyright 2024 James Hatfield -// SPDX-License-Identifier: MIT -// -// Code generated by build/generate-disposable-email.go. DO NOT EDIT -// Sourced from %s -package setting - -import "sync" - -var DisposableEmailDomains = sync.OnceValue(func() []string { - return %s -}) -` diff --git a/build/generate-emoji.go b/build/generate-emoji.go index 98c2f15d75..5a88e456ee 100644 --- a/build/generate-emoji.go +++ b/build/generate-emoji.go @@ -53,6 +53,8 @@ func (e Emoji) MarshalJSON() ([]byte, error) { } func main() { + var err error + flag.Parse() // generate data @@ -81,6 +83,8 @@ var replacer = strings.NewReplacer( var emojiRE = regexp.MustCompile(`\{Emoji:"([^"]*)"`) func generate() ([]byte, error) { + var err error + // load gemoji data res, err := http.Get(gemojiURL) if err != nil { diff --git a/build/gocovmerge.go b/build/gocovmerge.go new file mode 100644 index 0000000000..c6f74ed85c --- /dev/null +++ b/build/gocovmerge.go @@ -0,0 +1,118 @@ +// Copyright 2020 The Gitea Authors. All rights reserved. +// Copyright (c) 2015, Wade Simmons +// SPDX-License-Identifier: MIT + +// gocovmerge takes the results from multiple `go test -coverprofile` runs and +// merges them into one profile + +//go:build ignore + +package main + +import ( + "flag" + "fmt" + "io" + "log" + "os" + "sort" + + "golang.org/x/tools/cover" +) + +func mergeProfiles(p, merge *cover.Profile) { + if p.Mode != merge.Mode { + log.Fatalf("cannot merge profiles with different modes") + } + // Since the blocks are sorted, we can keep track of where the last block + // was inserted and only look at the blocks after that as targets for merge + startIndex := 0 + for _, b := range merge.Blocks { + startIndex = mergeProfileBlock(p, b, startIndex) + } +} + +func mergeProfileBlock(p *cover.Profile, pb cover.ProfileBlock, startIndex int) int { + sortFunc := func(i int) bool { + pi := p.Blocks[i+startIndex] + return pi.StartLine >= pb.StartLine && (pi.StartLine != pb.StartLine || pi.StartCol >= pb.StartCol) + } + + i := 0 + if sortFunc(i) != true { + i = sort.Search(len(p.Blocks)-startIndex, sortFunc) + } + i += startIndex + if i < len(p.Blocks) && p.Blocks[i].StartLine == pb.StartLine && p.Blocks[i].StartCol == pb.StartCol { + if p.Blocks[i].EndLine != pb.EndLine || p.Blocks[i].EndCol != pb.EndCol { + log.Fatalf("OVERLAP MERGE: %v %v %v", p.FileName, p.Blocks[i], pb) + } + switch p.Mode { + case "set": + p.Blocks[i].Count |= pb.Count + case "count", "atomic": + p.Blocks[i].Count += pb.Count + default: + log.Fatalf("unsupported covermode: '%s'", p.Mode) + } + } else { + if i > 0 { + pa := p.Blocks[i-1] + if pa.EndLine >= pb.EndLine && (pa.EndLine != pb.EndLine || pa.EndCol > pb.EndCol) { + log.Fatalf("OVERLAP BEFORE: %v %v %v", p.FileName, pa, pb) + } + } + if i < len(p.Blocks)-1 { + pa := p.Blocks[i+1] + if pa.StartLine <= pb.StartLine && (pa.StartLine != pb.StartLine || pa.StartCol < pb.StartCol) { + log.Fatalf("OVERLAP AFTER: %v %v %v", p.FileName, pa, pb) + } + } + p.Blocks = append(p.Blocks, cover.ProfileBlock{}) + copy(p.Blocks[i+1:], p.Blocks[i:]) + p.Blocks[i] = pb + } + return i + 1 +} + +func addProfile(profiles []*cover.Profile, p *cover.Profile) []*cover.Profile { + i := sort.Search(len(profiles), func(i int) bool { return profiles[i].FileName >= p.FileName }) + if i < len(profiles) && profiles[i].FileName == p.FileName { + mergeProfiles(profiles[i], p) + } else { + profiles = append(profiles, nil) + copy(profiles[i+1:], profiles[i:]) + profiles[i] = p + } + return profiles +} + +func dumpProfiles(profiles []*cover.Profile, out io.Writer) { + if len(profiles) == 0 { + return + } + fmt.Fprintf(out, "mode: %s\n", profiles[0].Mode) + for _, p := range profiles { + for _, b := range p.Blocks { + fmt.Fprintf(out, "%s:%d.%d,%d.%d %d %d\n", p.FileName, b.StartLine, b.StartCol, b.EndLine, b.EndCol, b.NumStmt, b.Count) + } + } +} + +func main() { + flag.Parse() + + var merged []*cover.Profile + + for _, file := range flag.Args() { + profiles, err := cover.ParseProfiles(file) + if err != nil { + log.Fatalf("failed to parse profile '%s': %v", file, err) + } + for _, p := range profiles { + merged = addProfile(merged, p) + } + } + + dumpProfiles(merged, os.Stdout) +} diff --git a/build/lint-locale.go b/build/lint-locale.go deleted file mode 100644 index 44d320994c..0000000000 --- a/build/lint-locale.go +++ /dev/null @@ -1,155 +0,0 @@ -// Copyright 2024 The Forgejo Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -//nolint:forbidigo -package main - -import ( - "fmt" - "html" - "io/fs" - "os" - "path/filepath" - "regexp" - "slices" - "strings" - - "github.com/microcosm-cc/bluemonday" - "github.com/sergi/go-diff/diffmatchpatch" - "gopkg.in/ini.v1" //nolint:depguard -) - -var ( - policy *bluemonday.Policy - tagRemover *strings.Replacer - safeURL = "https://TO-BE-REPLACED.COM" - - // Matches href="", href="#", href="%s", href="#%s", href="%[1]s" and href="#%[1]s". - placeHolderRegex = regexp.MustCompile(`href="#?(%s|%\[\d\]s)?"`) -) - -func initBlueMondayPolicy() { - policy = bluemonday.NewPolicy() - - policy.RequireParseableURLs(true) - policy.AllowURLSchemes("https") - - // Only allow safe URL on href. - // Only allow target="_blank". - // Only allow rel="nopener noreferrer", rel="noopener" and rel="noreferrer". - // Only allow placeholder on id and class. - policy.AllowAttrs("href").Matching(regexp.MustCompile("^" + regexp.QuoteMeta(safeURL) + "$")).OnElements("a") - policy.AllowAttrs("target").Matching(regexp.MustCompile("^_blank$")).OnElements("a") - policy.AllowAttrs("rel").Matching(regexp.MustCompile("^(noopener|noreferrer|noopener noreferrer)$")).OnElements("a") - policy.AllowAttrs("id", "class").Matching(regexp.MustCompile(`^%s|%\[\d\]s$`)).OnElements("a") - - // Only allow positional placeholder as class. - positionalPlaceholderRe := regexp.MustCompile(`^%\[\d\]s$`) - policy.AllowAttrs("class").Matching(positionalPlaceholderRe).OnElements("strong") - policy.AllowAttrs("id").Matching(positionalPlaceholderRe).OnElements("code") - - // Allowed elements with no attributes. Must be a recognized tagname. - policy.AllowElements("strong", "br", "b", "strike", "code", "i") - - // TODO: Remove in `actions.workflow.dispatch.trigger_found`. - policy.AllowNoAttrs().OnElements("c") -} - -func initRemoveTags() { - oldnew := []string{} - for _, el := range []string{ - "email@example.com", "correu@example.com", "epasts@domens.lv", "email@exemplo.com", "eposta@ornek.com", "email@példa.hu", "email@esempio.it", - "user", "utente", "lietotÄjs", "gebruiker", "usuário", "Benutzer", "Bruker", "bruger", - "server", "servidor", "kiszolgáló", "serveris", - "label", "etichetta", "etiÄ·ete", "rótulo", "Label", "utilizador", "etiket", "iezÄ«me", - } { - oldnew = append(oldnew, "<"+el+">", "REPLACED-TAG") - } - - tagRemover = strings.NewReplacer(oldnew...) -} - -func preprocessTranslationValue(value string) string { - // href should be a parsable URL, replace placeholder strings with a safe url. - value = placeHolderRegex.ReplaceAllString(value, `href="`+safeURL+`"`) - - // Remove tags that aren't tags but will be parsed as tags. We already know they are safe and sound. - value = tagRemover.Replace(value) - - return value -} - -func checkLocaleContent(localeContent []byte) []string { - // Same configuration as Forgejo uses. - cfg := ini.Empty(ini.LoadOptions{ - IgnoreContinuation: true, - }) - cfg.NameMapper = ini.SnackCase - - if err := cfg.Append(localeContent); err != nil { - panic(err) - } - - dmp := diffmatchpatch.New() - errors := []string{} - - for _, section := range cfg.Sections() { - for _, key := range section.Keys() { - var trKey string - if section.Name() == "" || section.Name() == "DEFAULT" || section.Name() == "common" { - trKey = key.Name() - } else { - trKey = section.Name() + "." + key.Name() - } - - keyValue := preprocessTranslationValue(key.Value()) - - if html.UnescapeString(policy.Sanitize(keyValue)) != keyValue { - // Create a nice diff of the difference. - diffs := dmp.DiffMain(keyValue, html.UnescapeString(policy.Sanitize(keyValue)), false) - diffs = dmp.DiffCleanupSemantic(diffs) - diffs = dmp.DiffCleanupEfficiency(diffs) - - errors = append(errors, trKey+": "+dmp.DiffPrettyText(diffs)) - } - } - } - return errors -} - -func main() { - initBlueMondayPolicy() - initRemoveTags() - - localeDir := filepath.Join("options", "locale") - localeFiles, err := os.ReadDir(localeDir) - if err != nil { - panic(err) - } - - if !slices.ContainsFunc(localeFiles, func(e fs.DirEntry) bool { return strings.HasSuffix(e.Name(), ".ini") }) { - fmt.Println("No locale files found") - os.Exit(1) - } - - exitCode := 0 - for _, localeFile := range localeFiles { - if !strings.HasSuffix(localeFile.Name(), ".ini") { - continue - } - - localeContent, err := os.ReadFile(filepath.Join(localeDir, localeFile.Name())) - if err != nil { - panic(err) - } - - if err := checkLocaleContent(localeContent); len(err) > 0 { - fmt.Println(localeFile.Name()) - fmt.Println(strings.Join(err, "\n")) - fmt.Println() - exitCode = 1 - } - } - - os.Exit(exitCode) -} diff --git a/build/lint-locale_test.go b/build/lint-locale_test.go deleted file mode 100644 index b33dc9af2b..0000000000 --- a/build/lint-locale_test.go +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright 2024 The Forgejo Authors. All rights reserved. -// SPDX-License-Identifier: MIT -package main - -import ( - "testing" - - "github.com/stretchr/testify/assert" -) - -func TestLocalizationPolicy(t *testing.T) { - initBlueMondayPolicy() - initRemoveTags() - - t.Run("Remove tags", func(t *testing.T) { - assert.Empty(t, checkLocaleContent([]byte(`hidden_comment_types_description = Comment types checked here will not be shown inside issue pages. Checking "Label" for example removes all " added/removed
+ + + + + milestones.filter_sort.most_issues=മികàµà´• ഇഷàµà´¯àµ‚à´•à´³àµà´‚ milestones.filter_sort.least_issues=à´•àµà´±à´žàµà´ž ഇഷàµà´¯àµ‚കളെങàµà´•à´¿à´²àµà´‚ @@ -747,7 +753,18 @@ settings.event_issues=ഇഷàµà´¯àµ‚à´•à´³àµâ€ [org] + + + + + + [admin] + + + + + repos.issues=ഇഷàµà´¯àµ‚à´•à´³àµâ€ @@ -785,3 +802,4 @@ repos.issues=ഇഷàµà´¯àµ‚à´•à´³àµâ€ [units] [packages] + diff --git a/options/locale/locale_nb_NO.ini b/options/locale/locale_nb_NO.ini index 18c9835df0..aae4ae788f 100644 --- a/options/locale/locale_nb_NO.ini +++ b/options/locale/locale_nb_NO.ini @@ -1,3 +1,6 @@ + + + [common] enable_javascript = Denne nettsiden behøver JavaScript. toc = Innholdsfortegnelse @@ -20,129 +23,4 @@ language = SprÃ¥k notifications = Varslinger create_new = Opprett… user_profile_and_more = Profil og innstillinger… -signed_in_as = Logget inn som -confirm_delete_selected = Bekreft sletting av alle valgte elementer? -dashboard = Dashbord -download_logs = Last ned logger -copy_hash = Kopier hash -more_items = Flere elementer -passcode = Adgangskode -webauthn_insert_key = Skriv inn din sikkerhetsnøkkel -webauthn_use_twofa = Bruk tofaktorkode fra din mobil -organization = Organisasjon -mirror = Speil -new_mirror = Ny speiling -repository = Repositorium -new_project = Nytt prosjekt -new_project_column = Ny kolonne -webauthn_error = Klarte ikke lese sikkerhetsnøkkelen. -webauthn_unsupported_browser = Nettleseren din støtter ikke WebAuthn. -webauthn_error_unknown = En ukjent feil oppstod. Vennligst prøv igjen. -webauthn_error_insecure = WebAuhn støtter kun sikre forbindelser. For testing over HTTP kan du bruke verten "localhost" eller "127.0.0.1" -admin_panel = Nettsideadministrasjon -settings = Innstillinger -your_profile = Profil -your_starred = Stjernemerket -your_settings = Innstillinger -new_repo.title = Nytt repositorium -new_migrate.title = Ny migrasjon -new_org.title = Ny organisasjon -new_repo.link = Nytt repositorium -new_migrate.link = Ny migrasjon -new_org.link = Ny organisasjon -all = Alle -sources = Kilder -mirrors = Speilinger -activities = Aktiviteter -rss_feed = RSS feed -retry = Prøv igjen -rerun = Kjør pÃ¥ nytt -rerun_all = Kjør alle jobber pÃ¥ nytt -save = Lagre -cancel = Avbryt -forks = Forks -milestones = Milepæler -ok = OK -test = Test -loading = Laster inn… -error = Feil -go_back = GÃ¥ tilbake -never = Aldri -invalid_data = Ugyldig data: %v -unknown = Ukjent -pin = Pin -artifacts = Artefakter -archived = Arkivert -concept_system_global = Global -add = Legg til -add_all = Legg til alle -remove = Fjern -remove_all = Fjern alle -remove_label_str = Fjern element "%s" -edit = Rediger -view = Vis -enabled = Aktivert -disabled = Deaktivert -locked = LÃ¥st -copy = Kopier -copy_generic = Kopier til utklippstavlen -copy_url = Kopier URL -copy_content = Kopier innhold -copy_success = Kopiert! -copy_error = Kopiering mislyktes -copy_type_unsupported = Denne filtypen kan ikke kopieres -write = Skriv -preview = ForhÃ¥ndsvis -concept_user_individual = Individuell -concept_code_repository = Repositorium -concept_user_organization = Organisasjon -show_timestamps = Vis tidsstempler -show_log_seconds = Vis sekunder -show_full_screen = Vis fullskjerm -name = Navn -value = Verdi -filter = Filter -filter.clear = Tøm filtre -filter.is_archived = Arkivert -filter.not_archived = Ikke arkivert -filter.is_mirror = Speilinger -filter.not_mirror = Ikke speilinger -filter.is_template = Maler -filter.not_template = Ikke maler -filter.public = Offentlig -filter.private = Privat -explore = Utforsk -active_stopwatch = Aktiv tidsregistrering -home = Hjem -help = Hjelp -logo = Logo -sign_in = Logg inn -sign_in_with_provider = Logg inn med %s -sign_in_or = eller -sign_out = Logg ut -sign_up = Opprett konto -confirm_delete_artifact = Er du sikker pÃ¥ at du vil slette artefakten "%s" ? -webauthn_sign_in = Trykk pÃ¥ knappen pÃ¥ sikkerhetsnøkkelen din. Dersom nøkkelen din ikke har en knapp, sett den inn pÃ¥ nytt. -copy_path = Kopier sti -webauthn_error_unable_to_process = Tjeneren kunne ikke behandle forespørselen din. -webauthn_error_empty = Du mÃ¥ gi nøkkelen et navn. - -[search] -search = Søk... -type_tooltip = Søketype -fuzzy = Fuzzy -union = Union -regexp = RegExp -exact = Nøyaktig - -[auth] -verify = Bekreft -sign_up_button = Opprett konto nÃ¥. -change_unconfirmed_email_error = Kan ikke endre e-postadresse: %v -login_userpass = Logg inn -oauth_signup_tab = Registrer ny konto -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 +signed_in_as = Logget inn som \ No newline at end of file diff --git a/options/locale/locale_nds.ini b/options/locale/locale_nds.ini deleted file mode 100644 index 7e80d116c2..0000000000 --- a/options/locale/locale_nds.ini +++ /dev/null @@ -1,3756 +0,0 @@ -[common] -home = Heimaad -explore = Utförsken -help = Hülp -sign_in = Anmellen -sign_in_with_provider = Mit %s anmellen -sign_in_or = of -sign_out = Ofmellen -sign_up = Registreren -link_account = Konto verbinnen -version = Versioon -powered_by = Dreven mit %s -page = Sied -template = Vörlaag -language = Spraak -notifications = Narichtens -tracked_time_summary = Tosamenfaten vun erfaat Tied na de Filters in de Gefall-List -create_new = Neei … -user_profile_and_more = Profil un Instellens … -signed_in_as = Anmellt as -enable_javascript = Deese Internett-Sied bruukt JavaScript. -toc = Inhollsverteeknis -return_to_forgejo = Torügg to Forgejo -toggle_menu = Menü umschalten -more_items = Mehr Dingen -username = Brukernaam -access_token = Togang-Teken -captcha = CAPTCHA -twofa = Twee-Faktooren-Anmellen -twofa_scratch = Twee-Faktooren-Eenmaalpasswoord -webauthn_insert_key = Steek dienen Sekerheids-Slötel in -webauthn_press_button = Bidde drück de Knoop up dienem Sekerheids-Slötel … -webauthn_use_twofa = Bruuk eene Twee-Faktooren-Tahl vun dienem Telefoon -webauthn_error = Kunn dienen Sekerheids-Slötel nich lesen. -webauthn_unsupported_browser = Dien Browser unnerstütt stedenwies WebAuthn nich. -webauthn_error_unknown = Een unbekannter Fehler is uptreden. Bidde versöök dat noch eenmaal. -passcode = Pass-Tahl -webauthn_error_empty = Du muttst de Slötel eenen Naam geven. -repository = Repositorium -organization = Vereenigung -new_fork = Neje Repositoriums-Gabel -dashboard = Kontor -logo = Logo -active_stopwatch = Aktive Tied-Erfatens -password = Passwoord -register = Registreren -licenses = Lizenzen -email = E-Mail-Adress -re_type = Passwoord utwiesen -webauthn_error_unable_to_process = De Server kunn diene Anfraag nich verarbeiden. -new_mirror = Nejer Spegel -webauthn_sign_in = Drück de Knoop up dienem Sekerheids-Slötel. Wenn dien Slötel keenen Knoop hett, steek ’t ut un weer in. -webauthn_error_insecure = WebAuthn unnerstütt blots seker Verbinnens. Wenn du över HTTP testen willst, kannst du de Quell »localhost« of »127.0.0.1« bruken -webauthn_error_duplicated = De Sekerheids-Slötel is för deese Anfraag nich verlöövt. Bidde wees wiss, dat de Slötel nich al vermarkt is. -webauthn_error_timeout = Tied överweggahn ehr dien Slötel lesen worden kunn. Bidde laad deese Sied neei un versöök dat noch eenmaal. -mirror = Spegel -new_project = Nejes Projekt -new_project_column = Neje Rieg -admin_panel = Sied-Administreren -settings = Instellens -your_profile = Profil -your_starred = Steern sett -your_settings = Instellens -new_repo.title = Nejes Repositorium -new_org.title = Neje Vereenigung -new_repo.link = Nejes Repositorium -all = All -mirrors = Spegels -forks = Gabels -activities = Doon -pull_requests = Haalvörslagen -issues = Gefallens -milestones = Markstenen -ok = Jau -cancel = Ofbreken -rerun = Weer lopen laten -rerun_all = All Upgavens weer lopen laten -save = Sekern -add_all = All hentofögen -remove = Wegdoon -remove_all = All wegdoon -remove_label_str = Ding »%s« wegdoon -edit = Bewarken -view = Wiesen -test = Testen -enabled = Anknipst -disabled = Utknipst -locked = Tosloten -copy = Koperen -copy_generic = To Tüskenavlaag koperen -copy_url = URL koperen -copy_hash = Prüfsumm koperen -copy_content = Inholl koperen -copy_branch = Twiegnaam koperen -copy_success = Kopeert! -copy_error = Koperen fehlslagen -write = Schrieven -preview = Utkiek -loading = Lädt … -error = Fehler -error404 = De Sied, wat du söchst, gifft dat of nich of du hest nich de Rechten, se antokieken. -error413 = Du hest diene Quote överweggahn. -go_back = Torügg gahn -invalid_data = Ungültiger Weert: %v -never = Nie -unknown = Unbekannt -rss_feed = RSS-Schuuv -pin = Faststeken -unpin = Lösssteken -artifacts = Objekten -confirm_delete_artifact = Willst du dat Objekt »%s« würrelk lösken? -archived = Archiveert -concept_user_individual = Enkelt -concept_code_repository = Repositorium -show_log_seconds = Sekünnen wiesen -show_full_screen = Hele Billschirm wiesen -download_logs = Utgaav runnerladen -name = Naam -value = Weert -filter = Filter -filter.is_archived = Archiveert -filter.not_archived = Nich archiveert -filter.is_fork = Gabels -filter.not_fork = Nich Gabels -filter.not_mirror = Nich Spegels -filter.is_template = Vörlagen -filter.not_template = Nich Vörlagen -filter.public = Publik -filter.private = Privaat -new_migrate.link = Nejer Umtreck -concept_system_global = Överall -new_migrate.title = Nejer Umtreck -retry = Weer versöken -sources = Quellen -show_timestamps = Tiedstempels wiesen -confirm_delete_selected = Willst du all de utköört Dingen lösken? -collaborative = Mitnanner arbeiden -add = Hentofögen -copy_type_unsupported = Deese Aard vun Datei kann nich kopeert worden -new_org.link = Neje Vereenigung -concept_user_organization = Vereenigung -filter.clear = Filters leegmaken -filter.is_mirror = Spegels -copy_path = Padd koperen - -[search] -search = Söken … -type_tooltip = Söök-Aard -fuzzy = um de Slag -fuzzy_tooltip = Ok Resultaten wiesen, wat dicht to de Söökwoorden passen -union = Passt -union_tooltip = Resultaten wiesen, wat to eets of anner vun de mit Leegtekens trennt Söökwoorden passen -exact = akkeraat -exact_tooltip = Blots Resultaten wiesen, wat akkeraat to de Söökwoord passen -regexp = RegEx -regexp_tooltip = De Söökwoord as Regel-Utdruck behanneln -repo_kind = In Repos söken … -user_kind = In Brukers söken … -org_kind = In Vereenigungen söken … -team_kind = In Klottjen söken … -project_kind = In Projekten söken … -commit_kind = In Kommitterens söken … -runner_kind = In Lopers söken … -no_results = Nix funnen, wat passt. -milestone_kind = In Markstenen söken … -pull_kind = In Haalvörslagens söken … -code_search_unavailable = Quelltext-Söök is stedenwies nich verföögbaar. Bidde kuntakteer de Sied-Chef. -branch_kind = In Twiegen söken … -code_kind = In Quelltext söken … -package_kind = In Paketen söken … -issue_kind = In Gefallens söken … -keyword_search_unavailable = Woorden-Söök is stedenwies nich verföögbaar. Bidde kuntakteer de Sied-Chef. -code_search_by_git_grep = Stedenwies Quelltext-Söök-Resultaten worden vun »git grep« paraatstellt. Wenn de Sied-Chef de Quelltext-Indizerer anknipst, kann dat betere Resultaten geven. - -[aria] -navbar = Navigerens-Balken -footer = Footbalken -footer.software = Över deeses Programm -footer.links = Verwiesens - -[heatmap] -number_of_contributions_in_the_last_12_months = %s Bidragens in de lesten 12 Maanten -contributions_zero = Keene Bidragens -contributions_format = {contributions} am {day}. {month} {year} -contributions_one = Bidrag -less = Minner -more = Mehr -contributions_few = Bidragens - -[editor] -buttons.bold.tooltip = Fetten Text hentofögen -buttons.italic.tooltip = Schüünen Text hentofögen -buttons.quote.tooltip = Text ziteren -buttons.code.tooltip = Quelltext hentofögen -buttons.link.tooltip = Verwies hentofögen -buttons.list.unordered.tooltip = Punkierte List hentofögen -buttons.list.task.tooltip = List vun Upgavens hentofögen -buttons.mention.tooltip = Eenen Bruker of eene Klottje nömen -buttons.ref.tooltip = Een Gefall of Haalvörslag nömen -buttons.switch_to_legacy.tooltip = In Stee daarvun de olle Bewarker bruken -buttons.disable_monospace_font = Fastbreden-Schrift utknipsen -buttons.indent.tooltip = Dingen um een Stand inschuven -buttons.unindent.tooltip = Dingen um een Stand utschuven -buttons.heading.tooltip = Överschrift hentofögen -buttons.list.ordered.tooltip = Nummereerte List hentofögen -buttons.enable_monospace_font = Fastbreden-Schrift anknipsen -buttons.new_table.tooltip = Tabell hentofögen -table_modal.header = Tabell hentofögen -table_modal.placeholder.header = Kopprieg -table_modal.placeholder.content = Inholl -table_modal.label.rows = Riegen -table_modal.label.columns = Striepen - -[filter] -string.desc = Z – A -string.asc = A – Z - -[error] -not_found = Dat Enn kunn nich funnen worden. -network_error = Nettwark-Fehler -server_internal = Binnerer Server-Fehler -occurred = Een Fehler is uptreden -report_message = Wenn du glöövst, dat dat een Fehler mit Forgejo is, dann söök bidde up Codeberg na Gefallens of maak falls nödig een nejes Gefall op. - -[startpage] -app_desc = Een sülvst-hostet Git-Deenst sünner Pien -install = Licht to installeren -lightweight = Lichtgewichtig -lightweight_desc = Forgejo hett minne Minnstanförderns un kann sülvst up eenem billigen Raspberry Pi lopen. Spaar diener Maschien Stroom! -platform_desc = Forgejo löppt nawieselk up frejen Bedrievssysteemen as Linux un FreeBSD, un ok up verschedenen CPU-Architekturen. Köör ut, welke du am leevsten hest! -license = Quellopen -platform = Över all Plattformen -license_desc = Gah un haal di Forgejo! Maak bi uns mit, um dat Projekt noch beter to maken. Wees nich schüchtern, een Bidrager to wesen! -install_desc = Du kannst dat Programm eenfach up diener Plattfoorm utföhren, dat mit Docker verdeel, of dat as Paket halen. - -[home] -uname_holder = Brukernaam of E-Mail-Adress -switch_dashboard_context = Kontor-Umgeven wesseln -my_repos = Repositoriums -my_orgs = Vereenigungen -view_home = %s wiesen -filter_by_team_repositories = Na Klottjen-Repositoriums filtern -feed_of = Schuuv vun »%s« -show_archived = Archiveert -show_only_unarchived = Wiest blots nich archiveert -show_private = Privaat -show_only_private = Wiest blots privaat -show_only_public = Wiest blots publik -show_only_archived = Wiest blots archiveert -issues.in_your_repos = In dienen Repositoriums -filter = Anner Filters -show_both_archived_unarchived = Wiest archiveert un nicht archiveert -show_both_private_public = Wiest publik un privaat - -[explore] -repos = Repositoriums -users = Brukers -stars_one = %d Steern -stars_few = %d Steerns -forks_one = %d Gabel -forks_few = %d Gabels -go_to = Gah to -code = Quelltext -code_last_indexed_at = Tolest indizeert %s -relevant_repositories_tooltip = Repositoriums, wat Gabels sünd of wat keene Themen, keen Bill un keen Beschrieven hebben, sünd versteekt. -relevant_repositories = Blots Repositoriums vun Belang worden wiest; wies Resultaten sünner Filter. -organizations = Vereenigungen - -[auth] -create_new_account = Konto vermarken -disable_register_prompt = Registreren is utknipst. Bidde kuntakteer de Sied-Chef. -disable_register_mail = E-Mail-Utwiesen för ’t Registreren is utknipst. -manual_activation_only = Kuntakteer de Sied-Chef, um dat Aktiveren oftosluten. -remember_me = Deeses Gereed marken -forgot_password = Passwoord vergeten? -hint_register = Bruukst du een Konto? Registreer di nu. -sign_up_button = Registreer di nu. -sign_up_successful = Dien Konto is anleggt worden. Willkomen! -must_change_password = Verneei dien Passwoord -active_your_account = Aktiveer dien Konto -account_activated = Konto is aktiveert worden -prohibit_login = Konto is sperrt -resent_limit_prompt = Du hest körtens eerst eene Aktiverens-E-Mail anfordert. Bidde wacht 3 Menüten un versöök dat dann weer. -change_unconfirmed_email_summary = Änner de E-Mail-Adress, waar de Aktiverens-E-Mail hen schickt wordt. -send_reset_mail = Torügghalens-E-Mail schicken -reset_password = Konto torügghalen -invalid_code = Diene Utwies-Tahl is ungültig of avlopen. -invalid_password = Dien Passwoord passt nich to de Passwoord, wat bruukt worden is, um dat Konto intorichten. -reset_password_helper = Konto torügghalen -reset_password_wrong_user = Du büst as %s anmellt, aver de Konto-Torügghalens-Verwies is för %s dacht -allow_password_change = Verlangen, dat de Bruker sien Passwoord ännert (anraadt) -change_unconfirmed_email = Wenn du bi’m Registreren de falske E-Mail-Adress angeven hest, kannst du se ünnern ännern, un de Utwies-Naricht word in Stee daarvun to de neje Adress schickt. -forgot_password_title = Passwoord vergeten -hint_login = Hest du al een Konto? Nu anmellen! -change_unconfirmed_email_error = Kann de E-Mail-Adress nich ännern: %v -prohibit_login_desc = Dien Konto is daartegen sperrt worden, mit de Instanz to warken. Kuntakteer de Instanz-Chef, um weer Togang to kriegen. -resend_mail = Klick hier, um de Aktiverens-E-Mail neei to schicken -invalid_code_forgot_password = Diene Utwies-Tahl is ungültig of avlopen. Klick hier, um eene neje Sitzung to begünnen. -verify = Utwiesen -scratch_code = Eenmaalpasswoord -use_scratch_code = Een Eenmaalpasswoord bruken -login_userpass = Anmellen -oauth_signup_submit = Konto ofsluten -oauth_signin_tab = Mit eenem bestahn Konto verbinnen -oauth_signin_submit = Konto verbinnen -openid_connect_submit = Verbinnen -authorize_application = Programm verlöven -authorize_application_created_by = Deeses Programm is vun %s maakt worden. -authorize_title = »%s« verlöven, up dien Konto totogriepen? -authorization_failed = Verlööv fehlslagen -back_to_sign_in = Torügg tum Anmellen -openid_register_title = Nejes Konto maken -password_pwned_err = Kunn Anfraag to HaveIBeenPwned nich ofsluten -password_too_short = Passwoord kann nich körter as %d Bookstavens wesen. -email_domain_blacklisted = Du kannst di nich mit deener E-Mail-Adress registreren. -authorize_redirect_notice = Du worst na %s umleit, wenn du deeses Programm verlöövst. -oauth.signin.error.access_denied = De Anmell-Anfraag is oflehnt worden. -last_admin = Du kannst de leste Chef nich wegdoon. Dat mutt tominnst eenen Chef geven. -unauthorized_credentials = Anmell-Informatioon is falsk of avlopen. Bidde versöök de Örder noch eenmaal of kiek för mehr Informatioonen %s an -twofa_scratch_token_incorrect = Dien Eenmaalpasswoord is falsk. -sign_in_openid = Mit OpenID wiedermaken -oauth_signup_tab = Nejes Konto vermarken -oauth_signup_title = Nejes Konto ofsluten -oauth_signin_title = Mell di an, um dat Konto-Verbinnen to verlöven -openid_connect_title = Mit eenem bestahn Konto verbinnen -confirmation_mail_sent_prompt = Eene neje Utwiesens-E-Mail is an %s schickt worden. Um dat Registreren oftosluten, kiek bidde in dienen E-Mail-Ingang un folg de Verwies daarin in de anner %s. Wenn de E-Mail falsk is, kannst du di anmellen un eene neje Utwiesens-E-Mail an eene anner E-Mail-Adress verlangen. -reset_password_mail_sent_prompt = Eene neje Utwiesens-E-Mail is an %s schickt worden. Um dat Konto-Torügghalen oftosluten, kiek bidde in dienen E-Mail-Ingang un folg de Verwies daarin in de anner %s. -has_unconfirmed_mail = Moin %s, du hest eene nich utwiesen E-Mail-Adress (%s). Wenn du keene Utwiesens-E-Mail kregen hest of eene neje bruukst, klick bidde up de Knoop unnern. -non_local_account = Frömde Brukers könen hör Passwoord nich dör de Forgejo-Internett-Brukerschnittstee vernejen. -openid_register_desc = De utköört OpenID-URI is unbekannt. Verbinn dat hier mit eenem nejen Konto. -disable_forgot_password_mail = Konto-Torügghalen is utknipst, denn keene E-Mail is inricht. Bidde kuntakteer dienen Sied-Chef. -authorize_application_description = Wenn du de Togang verlöövst, kann dat all diene Konto-Informatioon lesen un schrieven, ok privaate Repos un Vereenigungen. -authorization_failed_desc = Dat Anmellen is fehlslagen, denn wi hebben eene ungültig Anfraag funnen. Bidde kuntakteer de Chef vun de Programm, wat du anmellen willst. -twofa_scratch_used = Du hest dien Eenmaalpasswoord bruukt. Du büst to de Twee-Faktooren-Instellens-Sied umleit worden, waar du 2FA utknipsen of een nejes Eenmaalpasswoord maken kannst. -oauth.signin.error.temporarily_unavailable = Anmellen fehlslagen, denn de Anmell-Server is jüüst nich verföögbaar. Bidde versöök dat naher noch eenmaal. -twofa_passcode_incorrect = Diene Pass-Tahl is falsk. Wenn du diene Gereedskupp nich finnen kannst, bruuk tum Anmellen dien Eenmaalpasswoord. -disable_forgot_password_mail_admin = Konto-Torügghalen is blots verföögbaar, wenn E-Mail inricht is. Bidde richt E-Mail in, um Konto-Torügghalen antoknipsen. -oauth.signin.error = Bi’m Verarbeiden vun de Anmellens-Anfraag is een Fehler uptreden. Wenn de Fehler wieder uptreddt, kuntakteer bidde de Sied-Chef. -openid_connect_desc = De utköört OpenID-URI is unbekannt. Verbinn dat hier mit eenem nejen Konto. -openid_signin_desc = Giff diene OpenID-URI in. To’n Bispööl: alice.openid.example.org of https://openid.example.org/alice. -password_pwned = Dat Passwoord, wat du utköört hest, is up eener List vun klaut Passwoorden, wat tovör in publiken Datenbröken blootmaakt worden is. Bidde versöök dat noch eenmaal mit eenem anner Passwoord, un överlegg di, of du deeses Passwoord ok annerwaar ännern willst. -use_onetime_code = Een Eenmaal-Bruuk-Passwoord bruken - -[mail] -view_it_on = Up %s wiesen -activate_account = Bidde aktiveer dien Konto -register_notify.text_1 = dat is diene Registrerens-Utwiesen-E-Mail för %s! -register_notify.text_3 = Wenn well anners deeses Konto för di maakt hett, muttst du toeerst dien Passwoord setten. -reset_password = Haal dien Konto torügg -password_change.text_1 = Dat Passwoord för dien Konto is jüüst ännert worden. -totp_disabled.subject = TOTP is utknipst -totp_disabled.text_1 = Tied-baseert Eenmaalpasswoord (TOTP) för dien Konto is jüüst utknipst worden. -totp_disabled.no_2fa = Keene anner 2FA-Aarden sünd mehr inricht, sodat dat nu nich mehr nödig is, dat du di mit 2FA to dien Konto anmellst. -removed_security_key.subject = Een Sekerheids-Slötel is wegdaan worden -removed_security_key.text_1 = Sekerheids-Slötel »%[1]s« is jüüst ut dienem Konto wegdaan worden. -account_security_caution.text_1 = Wenn du dat weerst, kannst du deese E-Mail seker minnachten. -account_security_caution.text_2 = Wenn du dat nich weerst, hett well in dien Konto inbroken. Bidde kuntakteer de Sied-Chefs. -register_success = Registreren kumpleet -issue_assigned.pull = @%[1]s hett di to Haalvörslag %[2]s in Repositorium %[3]s towiesen. -issue.action.reopen = @%[1]s hett #%[2]s weer opmaakt. -issue.action.merge = @%[1]s hett #%[2]s in %[3]s tosamenföhrt. -issue.action.reject = @%[1]s hett um Änners för deesen Haalvörslag beden. -issue.action.ready_for_review = @%[1]s hett deesen Haalvörslag as klaar tum Nakieken markeert. -issue.action.new = @%[1]s hett #%[2]d opmaakt. -release.new.subject = %s in %s publik maakt -release.note = Notiz: -release.downloads = Runnerladen: -repo.transfer.subject_to = %s will Repositorium »%s« to %s överdragen -repo.transfer.to_you = du -link_not_working_do_paste = Gaht de Verwies nich? Versöök, dat to koperen un in de URL-Rieg vun dienem Browser intofögen. -hi_user_x = Moin %s, -activate_account.text_2 = Bidde klick up deesen Verwies, um dien Konto binnen %s to aktiveren: -admin.new_user.user_info = Bruker-Informatioon -activate_email.text = Bidde klick up deesen Verwies, um diene E-Mail-Adress binnen %s uttowiesen: -reset_password.text = Wenn du dat weerst, klick bidde up deesen Verwies, um dien Konto binnen %s torüggtohalen: -password_change.subject = Dien Passwoord is ännert worden -issue_assigned.issue = @%[1]s hett di to Gefall %[2]s in Repositorium %[3]s towiesen. -issue.action.push_1 = @%[1]s hett %[3]Kommitteren to %[2]s schuven -issue.action.push_n = @%[1]s hett %[3]Kommitterens to %[2]s schuven -activate_account.text_1 = Moin %[1]s, wees bedankt, dat du di up %[2]s registreert hest! -issue.action.review_dismissed = @%[1]s hett dat leste Nakieken vun %[2]s för deesen Haalvörslag ofseggt. -issue.in_tree_path = In %s: -reply = of anter deeser E-Mail stracks -activate_email = Wies diene E-Mail-Adress ut -admin.new_user.subject = Nejer Bruker %s jüüst registreert -register_notify = Willkomen up %s -register_notify.text_2 = Du kannst di to dien Konto mit dienem Brukernaam anmellen: %s -primary_mail_change.text_1 = De Höövd-E-Mail-Adress vun dienem Konto is jüüst to %[1]s ännert worden. Dat heet, dat deese E-Mail-Adress keene E-Mail-Narichtens för dien Konto mehr kriegen word. -release.title = Titel: %s -repo.collaborator.added.subject = %s hett di to %s as Mitarbeider hentoföögt -team_invite.text_2 = Bidde klick up deesen Verwies, um de Klottje bitotreden: -issue.action.force_push = %[1]s hett de %[2]s vun %[3]s to %[4]s dwangsschuven. -issue.action.review = @%[1]s hett över deesen Haalvörslag kommenteert. -primary_mail_change.subject = Diene Höövd-E-Mail-Adress is ännert worden -release.new.text = @%[1]s hett %[2]s in %[3]s publik maakt -release.download.targz = Quelltext (TAR.GZ) -repo.collaborator.added.text = Du büst as Mitarbeider to deesem Repositorium hentoföögt worden: -team_invite.text_1 = %[1]s hett di inladen, in de Klottje %[2]s in de Vereenigung %[3]s intotreden. -removed_security_key.no_2fa = Keene anner 2FA-Aarden sünd mehr inricht, sodat dat nu nich mehr nödig is, dat du di mit 2FA to dien Konto anmellst. -totp_enrolled.subject = Du hest TOTP as 2FA-Aard anknipst -totp_enrolled.text_1.no_webauthn = Du hest jüüst TOTP för dien Konto anknipst. Dat heet, dat du bi all tokünftig Anmellens TOTP as 2FA-Aard bruken muttst. -totp_enrolled.text_1.has_webauthn = Du hest jüüst TOTP för dien Konto anknipst. Dat heet, dat du bi all tokünftig Anmellens TOTP as 2FA-Aard of eets vun dien Sekerheids-Slötels bruken kannst. -issue.x_mentioned_you = @%s hett di nöömt: -issue.action.approve = @%[1]s hett deesem Haalvörslag tostimmt. -repo.transfer.subject_to_you = %s will Repositorium »%s« to di överdragen -team_invite.text_3 = Wahrschau: Deese Inladen weer för %[1]s dacht. Wenn du deese Inladen nich verwacht hest, kannst du deese E-Mail minnachten. -issue.action.close = @%[1]s hett #%[2]s dichtmaakt. -repo.transfer.body = Um dat antonehmen of oftolehnen, besöök %s, of ignoreer dat eenfach. -release.download.zip = Quelltext (ZIP) -team_invite.subject = %[1]s hett di inladen, in de Vereenigung %[2]s intotreden -admin.new_user.text = Bidde klick hier, um deesen Bruker vun de Chef-Paneel to verwalten. - -[modal] -no = Nee -confirm = Utwiesen -cancel = Ofbreken -yes = Jau -modify = Vernejen - -[form] -UserName = Brukernaam -FullName = Kumpleter Naam -Pronouns = Pronomens -Biography = Levensloop -Website = Internett-Sied -Location = Stee -RepoName = Repositoriums-Naam -TeamName = Klottjen-Naam -AuthName = Verlööv-Naam -AdminEmail = Chef-E-Mail -AccessToken = Togang-Teken -CommitMessage = Kommitteren-Naricht -TreeName = Dateipadd -SSPISeparatorReplacement = Trenner -SSPIDefaultLanguage = Normaalspraak -email_error = ` is keene gültige E-Mail-Adress.` -captcha_incorrect = De CAPTCHA-Tahl is falsk. -username_been_taken = Deeser Brukernaam word al bruukt. -To = Twieg-Naam -CommitChoice = Kommitteren-Utköör -git_ref_name_error = ` mutt een gültig Git-Beteekner-Naam wesen.` -include_error = ` mutt de Text »%s« enthollen.` -password_not_match = De Passwoorden passen nich. -Password = Passwoord -Content = Inholl -require_error = ` kann nich leeg wesen.` -alpha_dash_error = ` sall nix as alphanumerisk Bookstavens un Binnestrekens (»-«) un Unnerstrekens (»_«) enthollen.` -size_error = ` mutt de Grött %s hebben.` -glob_pattern_error = ` Glob-Muster is ungültig: %s.` -Email = E-Mail-Adress -Retype = Passwoord utwiesen -CommitSummary = Kommitteren-Tosamenfaten -Description = Beschrieven -NewBranchName = Nejer Twieg-Naam -min_size_error = ` mutt tominnst %s Bookstavens enthollen.` -regex_pattern_error = ` Regex-Muster is ungültig: %s.` -username_error_no_dots = ` kann nix as alphanumerisk Bookstavens (»0-9«, »a-z«, »A-Z«) un Binnestrekens (»-«) un Unnerstrekens (»_«) enthollen. ’t kann nich mit nich-alphanumerisk Bookstavens begünnen of ennen, un ’t düür nich twee nich-alphanumerisk Bookstavens stracks achternanner geven.` -lang_select_error = Köör eene Spraak ut de List ut. -alpha_dash_dot_error = ` sall nix as alphanumerisk Bookstavens un Binnestrekens (»-«), Unnerstrekens (»_«) un Punkten (».«) enthollen.` -max_size_error = ` düür nich mehr as %s Bookstavens enthollen.` -url_error = `»%s« is keene gültige URL.` -username_error = ` kann nix as alphanumerisk Bookstavens (»0-9«, »a-z«, »A-Z«) un Binnestrekens (»-«), Unnerstrekens (»_«) un Punkten (».«) enthollen. ’t kann nich mit nich-alphanumerisk Bookstavens begünnen of ennen, un ’t düür nich twee nich-alphanumerisk Bookstavens stracks achternanner geven.` -invalid_group_team_map_error = ` Towiesen is ungültig: %s` -unknown_error = Unbekannter Fehler: -repo_name_been_taken = De Repositoriums-Naam word al bruukt. -username_change_not_local_user = Frömde Brukers düren hör Brukernaam nich ännern. -repository_files_already_exist.adopt = Dateien för deeses Repositorium gifft ’t al un kann blots övernohmen worden. -repository_files_already_exist.delete = Dateien för deeses Repositorium gifft ’t al. Du muttst se lösken. -password_uppercase_one = Tominnst een Grootbookstaav -password_digit_one = Tominnst eene Tahl -enterred_invalid_repo_name = De Repositoriums-Naam, wat du ingeven hest, is falsk. -enterred_invalid_org_name = De Vereenigungs-Naam, wat du ingeven hest, is falsk. -enterred_invalid_owner_name = De neje Eegner-Naam is nich gültig. -user_not_exist = De Bruuker gifft ’t nich. -team_not_exist = De Klottje gifft ’t nich. -unset_password = De Anmell-Bruker hett dat Passwoord nich sett. -last_org_owner = Du kannst nich de leste Bruker ut de »Eegners«-Klottje wegdoon. Eene Vereenigung mutt alltieden tominnst eenen Eegner hebben. -cannot_add_org_to_team = Eene Vereenigung kann nich as Liddmaat hentoföögt worden. -organization_leave_success = Du hest de Vereenigung %s verlaten. -invalid_ssh_key = Kann dienen SSH-Slötel nich utwiesen: %s -repository_force_private = Dwang-Privaat is anknipst: Privaate Repositoriums könen nich publik maakt worden. -repository_files_already_exist.adopt_or_delete = Dateien för deeses Repositorium gifft ’t al. Nehm se an of löske se. -username_password_incorrect = Brukernaam of Passwoord is falsk. -repository_files_already_exist = Dateien för deeses Repositorium gifft ’t al. Kuntakteer de Systeemchef. -email_invalid = De E-Mail-Adress is ungültig. -password_special_one = Tominnst een Sünnerbookstaav (Punkte, Klammern, Anföhrens-Tekens of so wat) -org_name_been_taken = De Vereenigungs-Naam word al bruukt. -team_name_been_taken = De Klottjen-Naam word al bruukt. -team_no_units_error = Verlööv Togang to tominnst eenem Repositoriums-Deel. -email_been_used = De E-Mail-Adress word al bruukt. -enterred_invalid_password = Dat Passwoord, wat du ingeven hest, is falsk. -password_complexity = Passwoord is nich kumplizeert genoog: -invalid_gpg_key = Kann dienen GPG-Slötel nich utwiesen: %s -openid_been_used = De OpenID-Adress »%s« word al bruukt. -password_lowercase_one = Tominnst een Kleenbookstaav -duplicate_invite_to_team = De Bruker is al as Liddmaat inladen. -unsupported_login_type = De Anmell-Aard unnerstütt dat Konto-Lösken nich. -invalid_ssh_principal = Ungültiger Höövdmann: %s -unable_verify_ssh_key = Kann de SSH-Slötel nich utwiesen, bidde kiek noch eenmaal, dat daar keen Fehler drin is. -auth_failed = Verlöven fehlslagen: %v -still_own_repo = Dien Konto is een Eegner vun een of mehr Repositoriums, löske of överdraag se eerst. -still_own_packages = Dien Konto is een Eegner vun een of mehr Paketen, löske se eerst. -org_still_own_repo = Deese Vereenigung is een Eegner vun een of mehr Repositoriums, löske of överdraag se eerst. -target_branch_not_exist = Enn-Twieg gifft ’t nich. -admin_cannot_delete_self = Du kannst di nich sülvst lösken, wenn du een Chef büst. Löske eerst diene Chef-Rechten. -required_prefix = Ingaav mutt mit »%s« begünnen -must_use_public_key = Du hest eenen privaaten Slötel ingeven. Bidde laad dienen privaaten Slötel nienich elkeenwaar up. Bruuk in Stee daarvun dienen publiken Slötel. -still_has_org = Dien Konto is een Liddmaat in een of mehr Vereenigungen, verlaat se eerst. -org_still_own_packages = Deese Vereenigung is een Eegner vun een of mehr Paketen, löske se eerst. -PayloadUrl = Ladung-URL -visit_rate_limit = Frömd-Togriep hett Togrieps-Begrenz troffen. -2fa_auth_required = Frömd-Togriep bruukt Twee-Faktooren-Anmellen. - -[user] -change_avatar = Änner dien Kontobill … -joined_on = Am %s bitreden -repositories = Repositoriums -activity = Publikes Doon -followers.title.one = Nagaher -followers.title.few = Nagahers -following.title.one = Gaht na -followers_one = %d Nagaher -followers_few = %d Nagahers -following_one = gaht %d na -following_few = gaht %d na -follow = Nagahn -unfollow = Nich mehr nagahn -block_user = Bruker blockeren -starred = Repositoriums mit Steernen -watched = Beluurt Repositoriums -code = Quelltext -projects = Projekten -following.title.few = Gaht na -overview = Översicht -block = Blockeren -unblock = Nich mehr blockeren -user_bio = Levensloop -email_visibility.limited = All anmellt Brukers könen diene E-Mail-Adress sehn -show_on_map = Deese Stee up eener Kaart wiesen -settings = Bruker-Instellens -disabled_public_activity = Deeser Bruker hett dat publike Ankieken vun de Doon utknipst. -form.name_chars_not_allowed = Brukernaam »%s« enhollt ungültig Bookstavens. -form.name_pattern_not_allowed = Dat Muster »%s« is in eenem Brukernaam nich verlöövt. -form.name_reserved = De Brukernaam »%s« is vörbehollen. -block_user.detail = Bidde wees wiss, dat dat Blockeren vun eenem Bruker anner Resultaten hett, nämlich: -block_user.detail_1 = Jo wordt elkeen anner nich mehr nagahn un eenanner ok nich mehr nagahn könen. -block_user.detail_2 = Deeser Bruker kann nich mit dienen Repositoriums warken, un ok nich mit Gefallens un Kommentaren, wat to maakt hest. -block_user.detail_3 = Jo köönt eenanner nich as Repositoriums-Mitarbeiders hentofögen. -follow_blocked_user = Du kannst deesem Bruker nich nagahn, denn du hest deesen Bruker blockeert of deeser Bruker hett di blockeert. -public_activity.visibility_hint.self_public = Dien Doon is för elkeen sichtbaar, blots nich dat Warken in privaaten Steden. Inrichten. -public_activity.visibility_hint.admin_public = Dien Doon is för elkeen sichtbaar, aver as Chef kannst du ok dat Warken in privaaten Steden sehn. -public_activity.visibility_hint.self_private = Blots du un de Instanz-Chefs könen dien Doon sehn. Inrichten. -public_activity.visibility_hint.admin_private = Du kannst deeses Doon sehn, um dat, dat du een Chef büst, aver de Bruker will, dat dat privaat blievt. -public_activity.visibility_hint.self_private_profile = Blots du un de Instanz-Chefs könen dien Doon sehn, denn dien Profil is privaat. Inrichten. - -[settings] -profile = Profil -security = Sekerheid -repos = Repositoriums -delete = Konto lösken -organization = Vereenigungen -uid = UID -webauthn = Twee-Faktooren-Anmellen (Sekerheids-Slötels) -blocked_users = Blockeert Brukers -public_profile = Publikes Profil -location_placeholder = Deel waar du umslags büst mit Annerns -pronouns = Pronomens -pronouns_custom = Eegene -update_theme = Thema ännern -update_profile = Profil vernejen -update_language_success = Spraak is verneeit worden. -update_profile_success = Dien Profil is verneeit worden. -change_username_prompt = Wahrschau: Wenn du dienen Brukernaam ännerst, ännert sik ok diene Konto-URL. -change_username_redirect_prompt = De olle Brukernaam leit daarhen um, bit well anners hüm nimmt. -continue = Wiedermaken -cancel = Ofbreken -language = Spraak -language.title = Normaalspraak -language.localization_project = Hülp uns, Forgejo in diene Spraak to översetten! Mehr unnerhören. -hints = Wenken -update_hints = Wenken vernejen -update_hints_success = Wenken sünd verneeit worden. -hidden_comment_types = Verburgen Kommentaar-Aarden -hidden_comment_types.issue_ref_tooltip = Kommentaren, waar de Bruker de Twieg/Mark, wat mit deesem Gefall verbunnen is, ännert hett -comment_type_group_branch = Twieg -comment_type_group_time_tracking = Tied-Erfaten -comment_type_group_pull_request_push = Kommitterens hentoföögt -comment_type_group_project = Projekt -comment_type_group_issue_ref = Gefall-Nömen -saved_successfully = Diene Instellens sünd sekert worden. -privacy = Privaatheid -lookup_avatar_by_mail = Kontobill vun E-Mail-Adress söken -enable_custom_avatar = Eegen Kontobill bruken -choose_new_avatar = Nejes Kontobill utkören -update_avatar = Kontobill vernejen -delete_current_avatar = Stedenwies Kontobill lösken -uploaded_avatar_is_too_big = De upladen Dateigrött ((%d KiB) is mehr as verlöövt (%d KiB). -update_avatar_success = Dien Kontobill is verneeit worden. -change_password = Passwoord ännern -update_password = Passwoord vernejen -old_password = Stedenwies Passwoord -new_password = Nejes Passwoord -theme_desc = Deeses Thema word in de Brukerschnittstee bruukt, wenn du anmellt büst. -primary = Höövd -activated = Aktiveert -requires_activation = Mutt aktiveert worden -primary_email = As Höövd setten -activations_pending = Aktiveren staht ut -delete_email = Wegdoon -email_deletion = E-Mail-Adress wegdoon -add_new_openid = Neje OpenID-URI hentofögen -add_email = E-Mail-Adress hentofögen -add_openid = OpenID-URI hentofögen -keep_email_private = E-Mail-Adress verbargen -manage_gpg_keys = GPG-Slötels verwalten -ssh_principal_been_used = Deeser Höövdmann is al to de Server hentoföögt worden. -gpg_key_id_used = Eenen publiken GPG-Slötel mit de sülve ID gifft ’t al. -gpg_token_signature = Beschütt GPG-Unnerschrift -key_signature_gpg_placeholder = Begünnt mit »-----BEGIN PGP SIGNATURE-----« -ssh_key_verified = Utwiest Slötel -ssh_key_verify = Utwiesen -ssh_token = Teken -ssh_token_help = So kannst du de Unnerschrift maken: -ssh_token_signature = Beschütt SSH-Unnerschrift -key_signature_ssh_placeholder = Begünnt mit »-----BEGIN SSH SIGNATURE-----« -verify_ssh_key_success = SSH-Slötel »%s« is utwiest worden. -key_id = Slötel-ID -principal_content = Inholl -add_gpg_key_success = De GPG-Slötel »%s« is hentoföögt worden. -delete_key = Wegdoon -ssh_key_deletion = SSH-Slötel wegdoon -ssh_principal_deletion_success = De Höövdmann is wegdaan worden. -orgs = Vereenigungen -biography_placeholder = Vertell annern een bietje wat över di! (Markdown word unnerstütt) -change_username = Dien Brukernaam is ännert worden. -ui = Thema -additional_repo_units_hint_description = Wiest eenen Wenk »Mehr anknipsen« för Repositoriums, in wat nich all verföögbaar Delen anknipst sünd. -comment_type_group_label = Vermark -comment_type_group_title = Titel -keep_activity_private = Doon vun de Profil-Sied verbargen -appearance = Utsehn -twofa = Twee-Faktooren-Anmellen (TOTP) -update_language_not_found = Spraak »%s« is nich verföögbaar. -hidden_comment_types.ref_tooltip = Kommentaren, waar deeses Gefall vun eenem anner Gefall/Kommitteren/… nöömt worden is -comment_type_group_assignee = Towiesen -comment_type_group_deadline = Anstahn -password_change_disabled = Frömde Brukers könen hör Passwoord nich dör de Forgejo-Internett-Brukerschnittstee vernejen. -manage_openid = OpenID-Adressen -openid_deletion_desc = Wenn du deese OpenID-Adress ut dienem Konto wegdoost, kannst du di nich mehr daarmit anmellen. Wiedermaken? -add_new_email = E-Mail-Adress hentofögen -applications = Programmen -full_name = Kumpleter Naam -update_language = Spraak ännern -update_user_avatar_success = Dat Kontobill vum Bruker is verneeit worden. -ssh_gpg_keys = SSH- un GPG-Slötels -password_incorrect = De stedenwies Passwoord is falsk. -manage_emails = E-Mail-Adressen verwalten -activate_email = Aktiveren schicken -email_deletion_success = De E-Mail-Adress is wegdaan worden. -uploaded_avatar_not_a_image = De upladen Datei is keen Bill. -openid_deletion_success = De OpenID-Adress is wegdaan worden. -openid_desc = OpenID lett di dat Anmellen to eenem frömden Anbeder utlagern. -account = Konto -password = Passwoord -avatar = Kontobill -website = Internett-Sied -pronouns_unspecified = Nich angeven -additional_repo_units_hint = Vörslagen, mehr Repositorium-Delen antoknipsen -comment_type_group_reference = Nömen -comment_type_group_milestone = Marksteen -comment_type_group_lock = Slutens-Tostand -comment_type_group_review_request = Nakiekens-Anfraag -keep_activity_private.description = Dien publikes Doon kann blots vun di un de Instanz-Chefs sehn worden. -ssh_key_deletion_success = De SSH-Slötel is wegdaan worden. -location = Stee -language.description = Deese Spraak word in deenem Konto sekert un na de Anmellen toeerst bruukt. -comment_type_group_dependency = Ofhangen -retype_new_password = Nejes Passwoord utwiesen -change_password_success = Dien Passwoord is verneeit worden. Bruuk vun nu an tum Anmellen dat neje Passwoord. -manage_themes = Normaalthema -theme_update_success = Dien Thema is verneeit worden. -theme_update_error = Dat utköört Thema gifft ’t nich. -add_new_principal = Höövdmann hentofögen -ssh_key_name_used = Dien Konto hett al eenen SSH-Slötel mit de sülven Naam. -gpg_key_verified = Utwiest Slötel -subkeys = Unnerslötels -key_content = Inholl -add_key_success = De SSH-Slötel »%s« is hentoföögt worden. -gpg_key_deletion = GPG-Slötel wegdoon -manage_ssh_principals = SSH-Zertifikaat-Höövdmannen verwalten -openid_deletion = OpenID-Adress wegdoon -add_email_success = De neje E-Mail-Adress is hentoföögt worden. -email_preference_set_success = E-Mail-Instellen is sett worden. -add_openid_success = De neje OpenID-Adress is hentoföögt worden. -ssh_key_been_used = Deeser SSH-Slötel is al to de Server hentoföögt worden. -verify_gpg_key_success = GPG-Slötel »%s« is utwiest worden. -manage_ssh_keys = SSH-Slötels verwalten -add_key = Slötel hentofögen -gpg_key_verify = Utwiesen -gpg_token = Teken -gpg_token_help = So kannst du de Unnerschrift maken: -key_name = Slötel-Naam -gpg_key_deletion_success = De GPG-Slötel is wegdaan worden. -key_content_gpg_placeholder = Begünnt mit »-----BEGIN PGP PUBLIC KEY BLOCK-----« -key_content_ssh_placeholder = Begünnt mit »ssh-ed25519«, »ssh-rsa«, »ecdsa-sha2-nistp256«, »ecdsa-sha2-nistp384«, »ecdsa-sha2-nistp521«, »sk-ecdsa-sha2-nistp256@openssh.com« of »sk-ssh-ed25519@openssh.com« -gpg_key_matched_identities = Passt up Identitäten: -gpg_token_required = Du muttst eene Unnerschrifft för dat Teken unnern angeven -gpg_invalid_token_signature = De angeven GPG-Slötel, Unnerschrift un Teken passen nich tonanner of dat Teken is verollt. -ssh_invalid_token_signature = De angeven SSH-Slötel, Unnerschrift of Teken passen nich tonanner of dat Teken is verollt. -add_principal_success = De SSH-Zertifikaat-Höövdmann »%s« is hentoföögt worden. -gpg_key_deletion_desc = Wenn du eenen GPG-Slötel wegdoost, sünd Kommitterens, wat daarmit unnerschreven sünd, nich mehr utwiest. Wiedermaken? -added_on = Am %s hentoföögt -valid_until_date = Gültig bit %s -no_activity = In de lesten Tied nich bruukt -can_read_info = Lesen -key_state_desc = Deeser Slötel is in de lesten 7 Dagen bruukt worden -show_openid = Im Profil wiesen -hide_openid = Im Profil verbargen -ssh_externally_managed = Deeser SSH-Slötel word för deesen Bruker frömd verwalt -manage_access_token = Togang-Tekens -generate_new_token = Nejes Teken maken -token_name = Teken-Naam -access_token_deletion = Togang-Teken lösken -delete_token_success = Dat Teken is lösket worden. Programmen, wat dat bruken, könen nich mehr up dien Konto togriepen. -repo_and_org_access = Togang to Repositoriums un Vereenigungen -permissions_public_only = Blots publik -permissions_access_all = All (publik, privaat un begrenzt) -select_permissions = Verlöövnissen utkören -permission_no_access = Keen Togang -permission_read = Lesen -permission_write = Lesen un Schrieven -permissions_list = Verlöövnissen: -at_least_one_permission = Du muttst tominnst eene Verlöövnis utkören, um een Teken to maken -manage_oauth2_applications = OAuth2-Programmen verwalten -edit_oauth2_application = OAuth2-Programm bewarken -remove_oauth2_application = OAuth2-Programm wegdoon -gpg_key_verified_long = Slötel is mit eenem Teken utwiest worden un kann bruukt worden, um Kommitterens uttowiesen, wat up elkeen aktiveert E-Mail-Adress för deesen Bruker passen, un daarto ok för de Identitäten, up wat deeser Slötel passt. -valid_forever = Ewig gültig -principal_state_desc = Deeser SSH-Zertifikaat-Höövdmann is in de lesten 7 Dagen bruukt worden -token_state_desc = Deeses Teken is in de lesten 7 Dagen bruukt worden -ssh_disabled = SSH is utknipst -ssh_key_verified_long = Slötel is mit eenem Teken utwiest worden un kann bruukt worden, um Kommitterens uttowiesen, wat up elkeen aktiveert E-Mail-Adress för deesen Bruker passen. -tokens_desc = Deese Tekens geven över de Forgejo-API Togang to dienem Konto. -ssh_token_required = Du muttst eene Unnerschrifft för dat Teken unnern angeven -ssh_key_deletion_desc = Wenn du eenen SSH-Slötel wegdoost, kann he nich mehr up dien Konto togriepen. Wiedermaken? -gpg_no_key_email_found = Deeser GPG-Slötel passt up keene aktiveert E-Mail-Adress, wat mit dien Konto verbunnen is. He kann doch hentoföögt worden, wenn du dat angeven Teken unnerschriffst. -gpg_key_matched_identities_long = De Identitäten, wat in deesem Slötel binnen liggen, passen up deese aktiveert E-Mail-Adressen för deesen Bruker. Kommitterens, wat up deese E-Mail-Adressens passen, könen mit deesem Slötel utwiest worden. -ssh_principal_deletion = SSH-Zertifikaat-Höövdmann wegdoon -can_write_info = Schrieven -generate_token = Teken maken -generate_token_name_duplicate = %s word al as Programm-Naam bruukt. Bidde bruuk eenen nejen. -ssh_principal_deletion_desc = Wenn du eenen SSH-Zertifikaat-Höövdmann wegdoost, kann he nich mehr up dien Konto togriepen. Wiedermaken? -last_used = Tolest bruukt am -ssh_signonly = SSH is stedenwies utknipst, sodat deese Slötels blots tum Utwiesen vun de Kommitterens-Unnerschrift bruukt worden. -generate_token_success = Dien nejes Teken is maakt worden. Kopeer dat nu, denn dat word nich noch eenmaal wiest. -delete_token = Lösken -access_token_deletion_desc = Wenn du een Teken löskest, könen Programmen, wat dat bruken, nich mehr up dien Konto togriepen. Dat kann man nich torüggnehmen. Wiedermaken? -oauth2_applications_desc = OAuth2-Programmen verlöövt dienen Frömdprogrammen, Brukers in deeser Forgejo-Instanz seker antomellen. -remove_oauth2_application_desc = Wenn du een OAuth2-Programm wegdoost, word sien Togriep to all unnerschreven Togang-Tekens torüggnohmen. Wiedermaken? -create_oauth2_application_success = Du hest een nejes OAuth2-Programm hentoföögt. -oauth2_application_name = Programm-Naam -save_application = Sekern -oauth2_client_id = Klient-ID -oauth2_client_secret = Klient-Geheemst -oauth2_regenerate_secret = Geheemst neei maken -oauth2_application_remove_description = Wenn du een OAuth2-Programm wegdoost, kann ’t nich mehr up anmellt Brukerkonten in deeser Instanz togriepen. Wiedermaken? -authorized_oauth2_applications = Anmellt OAuth2-Programmen -revoke_key = Torüggnehmen -revoke_oauth2_grant = Togriep torüggnehmen -revoke_oauth2_grant_description = Wenn du Togriep för deeses Frömdprogramm torügggnimmst, kann deeses Programm nich mehr up diene Daten togriepen. Willst du dat würrelk? -revoke_oauth2_grant_success = Togriep torüggnohmen. -twofa_disable = Twee-Faktooren-Anmellen utknipsen -twofa_scratch_token_regenerate = Eenmaal-Bruuk-Torügghalens-Slötel neei maken -twofa_disable_note = Du kannst dat Twee-Faktooren-Anmellen wenn nödig utknipsen. -twofa_disabled = Twee-Faktooren-Anmellen is utknipst worden. -scan_this_image = Bekiek deeses Bill mit dienem Anmellens-Programm: -remove_oauth2_application_success = Dat Programm is wegdaan worden. -create_oauth2_application = Een nejes OAuth2-Programm hentofögen -update_oauth2_application_success = Du hest dat OAuth2-Programm verneeit. -create_oauth2_application_button = Nejes Programm -oauth2_redirect_uris = Umleit-URIs. Bidde schriev elkeen URI up eene neje Rieg. -twofa_disable_desc = Wenn du Twee-Faktooren-Anmellen utknipst, is dien Konto minner seker. Wiedermaken? -oauth2_regenerate_secret_hint = Geheemst verloren? -oauth2_client_secret_hint = Dat Geheemst word nich weer wiest, nadeem du deese Sied verlettst of neei laadst. Bidde wees wiss, dat du ’t sekert hest. -oauth2_application_edit = Bewarken -twofa_is_enrolled = Dien Konto hett stedenwies Twee-Faktooren-Anmellen anknipst. -twofa_enroll = Twee-Faktooren-Anmellen anknipsen -twofa_not_enrolled = Dien Konto hett stedenwies keen Twee-Faktooren-Anmellen anknipst. -oauth2_application_create_description = OAuth2-Programmen gifft dienen Frömdprogrammen Togriep up Brukers in deeser Instanz. -authorized_oauth2_applications_description = Du hest in deenem eegenen Forgejo-Konto deesen Frömdprogrammen Togriep geven. Bidde nimm Togriep för Programmen, wat nich mehr bruukt worden, torügg. -twofa_scratch_token_regenerated = Dien Eenmaal-Bruuk-Torügghalens-Slötel is nu %s. Bewahr dat an eener sekeren Stee up, denn dat word nich noch eenmaal wiest. -regenerate_scratch_token_desc = Wenn du dienen Torügghalens-Slötel verloren of al tum Anmellen bruukt hest, kannst du ’t hier torüggsetten. -twofa_failed_get_secret = Kunn dat Geheemst nich halen. -webauthn_register_key = Sekerheids-Slötel hentofögen -webauthn_nickname = Spitznaam -webauthn_delete_key_desc = Wenn du eenen Sekerheids-Slötel wegdoost, kannst du di nich mehr daarmit anmellen. Wiedermaken? -link_account = Konto verbinnen -remove_account_link_success = Dat verbunnt Konto is wegdaan worden. -repos_none = Du büst keen Eegner vun elkeen Repositoriums. -orgs_none = Du büst keen Liddmaat in elkeen Vereenigungen. -blocked_users_none = ’t gifft keene blockeerten Brukers. -delete_account = Dien Konto lösken -delete_account_title = Brukerkonto lösken -delete_account_desc = Willst du würrelk deeses Brukerkonto för all Tieden lösken? -email_notifications.enable = E-Mail-Narichtens anknipsen -email_notifications.onmention = Blots bi’m Nömen benarichtigen -email_notifications.submit = E-Mail-Instellen setten -visibility.limited = Begrenzt -blocked_since = Blockeert siet %s -user_block_success = De Bruker is nu blockeert. -webauthn_alternative_tip = Du willst villicht noch eene anner Twedes-Anmellen-Aard inrichten. -manage_account_links_desc = Deese frömden Konten sünd mit dienem Forgejo-Konto verbunnen. -remove_account_link = Verbunnen Konto wegdoon -remove_account_link_desc = Wenn du een verbunnen Konto wegdoost, hett ’t keenen Togriep mehr to dienem Forgejo-Konto. Wiedermaken? -then_enter_passcode = Un giff de Pass-Tahl in, wat dat Programm wiest: -webauthn_delete_key = Sekerheids-Slötel wegdoon -webauthn_key_loss_warning = Wenn du diene Sekerheids-Slötels verlüst, verlüst du ok Togriep to dien Konto. -manage_account_links = Verbunnt Konten -hooks.desc = Föög Internett-Hakens hento, wat för all Repositoriums, vun wat du een Eegner büst, utlööst worden. -email_notifications.andyourown = Un ok för diene eegenen Narichtens -visibility = Bruker-Sichtbaarkeid -visibility.limited_tooltip = Blots anmellt Brukers könen ’t sehn -visibility.private = Privaat -user_unblock_success = De Bruker is nu nich mehr blockeert. -or_enter_secret = Of giff dat Geheemst in: %s -passcode_invalid = De Pass-Tahl is falsk. Versöök dat bidde noch eenmaal. -twofa_enrolled = Twee-Faktooren-Anmellen is för dien Konto nu inricht. Bewahr dienen Eenmaal-Bruuk-Toorügghalens-Slötel (%s) an eener sekeren Stee up, denn dat word nich noch eenmaal wiest. -delete_prompt = Dat lösket dien Brukerkonto för all Tieden. Dat KANN NICH torüggnohmen worden. -visibility.private_tooltip = Blots de Liddmaten vun Vereenigungen, waar du Liddmaat büst, könen ’t sehn -visibility.public = Publik -delete_with_all_comments = Dien Konto is junger as %s. Um Spöök-Kommentaren to vermieden, worden all Kommentaren up Gefallens un HVs daar ok mit lösket. -confirm_delete_account = Lösken utwiesen -email_notifications.disable = Nich över E-Mail benarichtigen -visibility.public_tooltip = Elkeen kann ’t sehen -password_username_disabled = Frömde Brukers könen hör Brukernaam nich ännern. Bidde kuntakteer dienen Sied-Chef för mehr Informatioonen. -profile_desc = Över di -hidden_comment_types_description = Kommentaar-Arden, wat hier utköört sünd, worden in Gefall-Sieden nich wiest. Wenn du to’n Bispööl »Vermark« utköörst, worden all de »›Bruker‹ hett ›Vermark‹ hentoföögt/wegdaan«-Kommentaren wegdaan. -email_desc = Diene Höövd-E-Mail-Adress word för Narichtens, Passwoord-Torügghalen un, wenn se nich verburgen is, Git-Aktioonen över ’t Internett bruukt. -can_not_add_email_activations_pending = Een Aktiveren staht noch ut. Wenn du eene neje E-Mail-Adress hentofögen willst, versöök dat in een paar Menüten noch eenmaal. -email_deletion_desc = De E-Mail-Adress un daarmit verbunnen Informatioon word ut dienem Konto wegdaan. Git-Kommitterens vun deeser E-Mail-Adress worden nich ännert. Wiedermaken? -principal_desc = Deese SSH-Zertifikaat-Höövdmannen sünd mit dienem Konto verbunnen un geven kumpleten Togriep up diene Repositoriums. -add_email_confirmation_sent = Eene Utwiesens-E-Mail is an »%s« schickt worden. Um diene E-Mail-Adress uttowiesen, kiek bidde in dienen E-Mail-Ingang un folg de Verwies daarin in de anner %s. -ssh_desc = Deese publiken SSH-Slötels sünd mit dienem Konto verbunnen. De tohörig privaate Slötel gifft kumpleten Togriep up diene Repositoriums. SSH-Slötels, wat utwiest worden sünd, könen bruukt worden, um SSH-unnerschreven Git-Kommitterens uttowiesen. -keep_email_private_popup = Diene E-Mail-Adress word vun dienem Profil verbargen un is nich de Normaalweert för Kommitterens, wat du över de Internett-Schnittstee maakst, so as Datei-Upladens, Bewarkens un Tosamenföhrens-Kommitterens. In Stee daarvun kann eene besünnere Adress %s bruukt worden, um Kommitterens mit dienem Konto to verbinnen. Deese Instellen ännert keene bestahn Kommitterens. -ssh_helper = Bruukst du Hülp? Kiek de Inföhren an, wo du diene eegenen SSH-Slötels maakst of hülp gewohnten Probleemen of, över wat man mit SSH mennigmaal strukelt. -access_token_desc = Utköört Teken-Verlöövnissen begrenzen dat Anmellen blots up de tohörig API-Padden. Lees de Dokumenteren för mehr Informatioonen. -oauth2_confidential_client = Diskreeter Klient. Köör dat för Programmen ut, wat dat Geheemst diskreet behanneln, as Internett-Sieden. Köör dat nich för stedenwies Programmen ut, as Schrievdisk- un Telefoon-Programmens. -gpg_helper = Bruukst du Hülp? Kiek de Inföhren över GPG an. -gpg_desc = Deese publiken GPG-Slötels sünd mit dienem Konto verbunnen un worden bruukt, um diene Kommitterens uttowiesen. Holl de tohörig privaaten Slötels seker, denn daarmit kann man Kommitterens mit diener Unnerschrift unnerschrieven. -oauth2_application_locked = Forgejo vermarkt vörweg eenige OAuth2-Programmen bi’m Starten, wenn dat in de Instellens anknipst is. Um unverwachts Verhollen to verhinnern, könen se nich bewarkt of wegdaan worden. Bidde kiek för mehr Informatioonen de OAuth2-Dokumenteren an. -twofa_desc = Um dien Konto tegen Passwoordklau to schütten, kannst du een Smart-Telefoon of anner Geraadskupp bruken, um tied-baseerte Eenmaalpasswoorden (»TOTP«) to kriegen. -twofa_recovery_tip = Wenn du dien Geraadskupp verlüst, kannst du eenen Eenmaal-Bruuk-Torügghalens-Slötel bruken, um weer in dien Konto to komen. -webauthn_desc = Sekerheids-Slötels sünd Geraadskuppen, wat kryptographisk Slötels enthollen. Se könen för dat Anmellen mit Twee Faktooren bruukt worden. Sekerheids-Slötels mutten de »WebAuthn Authenticator«-Standard unnerstütten. -user_block_yourself = Du kannst di nich sülvst blockeren. -pronouns_custom_label = Eegene Pronomens - -[repo] -rss.must_be_on_branch = Du muttst up eenem Twieg wesen, um eenen RSS-Schuuv to hebben. -admin.manage_flags = Flaggen verwalten -admin.flags_replaced = Repositoriums-Flaggen utwesselt -owner = Eegner -repo_name = Repositoriums-Naam -repo_size = Repositoriums-Grött -size_format = %[1]s: %[2]s; %[3]s: %[4]s -template = Vörlaag -template_select = Köör eene Vörlaag ut -template_helper = Dat Repositorium as Vörlaag bruken -visibility = Sichtbaarkeid -visibility_helper = Repositorium privaat maken -visibility_fork_helper = (Wenn du dat ännerst, ännert dat ok de Sichtbaarkeid vun all Gabels.) -fork_repo = Repositorium gabeln -fork_from = Gabeln vun -already_forked = Du hest %s al gabelt -fork_branch = Twieg, wat to de Gabel, kloont worden sall -open_with_editor = Mit %s opmaken -download_tar = TAR.GZ runnerladen -generate_repo = Repositorium maken -generate_from = Maken ut -repo_desc = Beschrieven -admin.update_flags = Flaggen vernejen -new_repo_helper = In eenem Repositorium sünd all Dateien vun eenem Projekt, ok hör Versioons-Histoorje. Hest du al annerwaar eens? Treck een Repositorium um. -owner_helper = Eenige Vereenigungen worden in de List villicht nich wiest, denn ’t gifft eene Grenz, wo völe Repositoriums man hebben kann. -admin.enabled_flags = Flaggen, wat för deeses Repositorium anknipst sünd: -admin.failed_to_replace_flags = Kunn Repositoriums-Flaggen nich utwesseln -fork_no_valid_owners = Deeses Repositorium kann nich gabelt worden, denn ’t gifft keene gültigen Eegners. -repo_name_helper = Gode Repositoriums-Namen sünd kört, licht to marken un eenmaalige Slötelwoorden. -visibility_helper_forced = Dien Sied-Chef dwingt, dat neje Repositoriums privaat ween mutten. -template_description = Vörlaag-Repositoriums verlöven Brukers, neje Repositoriums mit de sülve Verteeknisstruktur, Dateien un Instellens to maken. -clone_helper = Bruukst du Hülp bi’m Klonen? Besöök Hülp. -repo_lang = Spraak -repo_gitignore_helper = Vörlaag för .gitignore utkören -visibility_description = Blots de Eegner vun de Vereenigung, of de Liddmaten vun de Vereenigung, wenn se deeses Recht hebben, worden dat sehn könen. -fork_to_different_account = To een anner Konto gabeln -fork_visibility_helper = De Sichtbaarkeid vun eenem gabelt Repositorium kann nich ännert worden. -all_branches = All Twiegen -use_template = Deese Vörlaag bruken -repo_desc_helper = Giff een körte Beschrieven in (wenn du willst) -download_zip = ZIP runnerladen -download_bundle = BUNDLE runnerladen -license_helper = Köör eene Lizenz-Datei ut -object_format = Objekt-Formaat -object_format_helper = Objekt-Formaat in deesem Repositorium. Kann naher nich mehr ännert worden. SHA1 is dat, wat am wiedesten unnerstütt word. -readme = LEESMI -readme_helper = Köör eene Vörlaag för de LEESMI-Datei ut -readme_helper_desc = Dat is de Stee, waar du eene kumplete Beschrieven för dien Projekt schrieven kannst. -create_repo = Repositorium maken -default_branch_label = Höövd -default_branch_helper = De Höövd-Twieg is de Grund-Twieg för Haalvörslagens un Quelltext-Kommitterens. -mirror_prune = Schörtjen -mirror_interval_invalid = De Spegel-Tiedofstand is ungültig. -mirror_public_key = Publiker SSH-Slötel -mirror_use_ssh.not_available = SSH is nich tum Anmellen verföögbaar. -mirror_sync = spegelt -mirror_address = Vun URL klonen -mirror_interval = Tiedofstand för ’t Spegeln (gültige Tied-Eenheiden sünd »h«, »m« un »s«). 0 um dat automatisk Spegeln uttoknipsen. (Minnster Ofstand: %s) -issue_labels = Vermarkens -issue_labels_helper = Köör eene Vermarkens-Sammlung ut -license = Lizenz -auto_init = Repositorium inrichten -mirror_sync_on_commit = Spegeln, wenn Kommitterens schuuvt worden -repo_gitignore_helper_desc = Köör ut eener List vun Vörlagen för bekannte Spraken ut, welke Dateien nich verfolgt worden. Normaale Objekten, wat vun de Bauwarktüüg vun elkeen Spraak utgeven worden, sünd in deeser .gitignore dann al enthollen. -default_branch = Höövd-Twieg -mirror_prune_desc = Feern-Verfolgens-Nömens, wat nich mehr bruukt worden, wegdoon -mirror_use_ssh.text = SSH tum Anmellen bruken -license_helper_desc = Eene Lizenz regelt, wat anners mit dienem Quelltext doon un nich doon düren. Nich wiss, welke för dien Projekt passt? Kiek Köör eene Lizenz an. -mirror_denied_combination = Kann nich publiken Slötel un Passwoord tum Anmellen beide tosammen bruken. -mirror_address_desc = Giff de nödigen Anmell-Informatioonen unner »Anmellen« in. -mirror_lfs_endpoint = LFS-Ennpunkt -mirror_last_synced = Tolest spegelt -mirror_password_placeholder = (Nich ännert) -mirror_password_blank_placeholder = (Nich sett) -watchers = Belurers -stargazers = Steernenkiekers -stars_remove_warning = Dat lösket all Steernen vun deesem Repositorium. -forks = Gabels -stars = Steernen -reactions_more = un noch %d daarto -language_other = Anner -adopt_preexisting_label = Dateien övernehmen -delete_preexisting_label = Lösken -delete_preexisting_content = Dateien in %s lösken -delete_preexisting_success = Dateien sünner Eegner in %s lösken -tree_path_not_found_branch = Padd %[1]s gifft ’t nich in Twieg %[2]s -transfer.accept = Överdragen annehmen -transfer.accept_desc = To »%s« överdragen -transfer.reject = Överdragen oflehnen -transfer.no_permission_to_reject = Du hest nich dat Recht, deeses Överdragen oftolehnen. -desc.private = Privaat -desc.public = Publik -desc.template = Vörlaag -desc.archived = Archiveert -template.topics = Themen -template.avatar = Kontobill -template.one_item = Tominnst een Vörlaag-Ding mutt utköört worden -template.invalid = Een Vörlaag-Repositorium mutt utköört worden -migrate_options_lfs_endpoint.label = LFS-Ennpunkt -migrate_options_lfs_endpoint.placeholder = Wenn leeg laten, word de Ennpunkt vun de Kloon-URL avleit -migrate_items = Umtreck-Dingen -migrate_items_wiki = Wiki -migrate_items_milestones = Markstenen -migrate_items_pullrequests = Haalvörslagen -migrate_items_releases = Publizerens -migrate_repo = Repositorium umtrecken -migrate.clone_address = Umtrecken / Klonen vun URL -migrate.failed = Umtreck fehlslagen: %v -migrate.migrate_items_options = Togang-Teken is nödig, um mehr Dingen umtotrecken -migrated_from = Vun %[2]s umtrucken -migrate.migrate = Vun %s umtrecken -migrate.migrating = Treckt vun %s um … -migrate.github.description = Daten vun github.com of eenem GitHub-Enterprise-Server umtrecken. -migrate.gitlab.description = Daten vun gitlab.com of anner GitLab-Instanzen umtrecken. -migrate.codebase.description = Daten vun codebasehq.com umtrecken. -migrate.migrating_git = Git-Daten worden umtrucken -migrate.migrating_topics = Themen worden umtrucken -migrate.migrating_labels = Vermarkens worden umtrucken -migrate.migrating_releases = Publizerens worden umtrucken -migrate.migrating_issues = Gefallens worden umtrucken -migrate.cancel_migrating_title = Umtreck ofbreken -mirror_from = Spegel vun -forked_from = gabelt vun -fork_from_self = Du kannst dien eegen Repositorium nich gabeln. -watch_guest_user = Mell di an, um deeses Repositorium to beluren. -star_guest_user = Mell di an, um eenen Steern up deeses Repositorium to setten. -subscribe.issue.guest.tooltip = Mell di an, um deeses Gefall to abonneren. -watch = Beluren -unwatch = Nich mehr beluren -star = Steern setten -unstar = Steern wegnehmen -download_archive = Repositorium runnerladen -no_desc = Nich beschrieven -quick_guide = Fixanwies -clone_this_repo = Deeses Repositorium klonen -cite_this_repo = Deeses Repositorium ziteren -push_exist_repo = Een bestahn Repositorium vun de Oorderreeg schuven -code = Quelltext -code.desc = Wies Quelltext, Dateien, Kommitterens un Twiegen. -branch = Twieg -tree = Boom -unit_disabled = De Sied-Chef hett deesen Repositoriums-Deel utknipst. -delete_preexisting = Vörbestahn Dateien lösken -desc.internal = Binnern -template.git_content = Git-Inholl (Höövd-Twieg) -template.webhooks = Internett-Hakens -mirror_password_help = Änner de Brukernaam, um een sekert Passwoord to lösken. -author_search_tooltip = Wiest bit to 30 Brukers -transfer.reject_desc = Överdragen to »%s« ofbreken -migrate_options_lfs = LFS-Dateien umtrecken -migrate_items_labels = Vermarkens -migrate.clone_address_desc = De HTTP(S) of Git »clone« URL vun eenem bestahn Repositorium -migrate.invalid_local_path = De stedenwies Padd is ungültig. ’t gifft dat nich of dat is keen Verteeknis. -migrate.gitea.description = Daten vun gitea.com of anner Gitea-Instanzen umtrecken. -fork_guest_user = Mell di an, um deeses Repositorium to gabeln. -fork = Gabeln -adopt_preexisting = Vörbestahn Dateien övernehmen -blame_prior = Schüld vör deeser Ännern wiesen -adopt_search = Giff Brukernaam in, um na Repositoriums sünner Eegner to söken … (leeg laten, um se all to finnen) -adopt_preexisting_success = Vun %s Dateien övernohmen un Repositorium maakt -tree_path_not_found_commit = Padd %[1]s gifft ’t nich in Kommitteren %[2]s -tree_path_not_found_tag = Padd %[1]s gifft ’t nich in Mark %[2]s -desc.sha256 = SHA256 -template.issue_labels = Gefall-Vermarkens -form.name_pattern_not_allowed = Dat Muster »%s« is in eenem Repositoriums-Naam nich verlöövt. -mirror_lfs = Spieker för grote Dateien (LFS) -mirror_lfs_desc = Spegeln vun LFS-Daten anknipsen. -adopt_preexisting_content = Repositorium vun %s maken -transfer.no_permission_to_accept = Du hest nich dat Recht, deeses Överdragen antonehmen. -template.git_hooks = Git-Hakens -archive.title_date = Deeses Repositorium is up %s archiveert worden. Du kannst de Dateien ankieken un ’t klonen, aver nich schuven un keene Gefallens un Haalvörslagen opmaken. -form.reach_limit_of_creation_1 = De Eegner is al bi de Grenz vun %d Repositorium. -form.name_reserved = De Repositoriums-Naam »%s« is vörbehollen. -form.string_too_long = De angeven Text is langer as %d Bookstavens. -migrate_items_issues = Gefallens -template.items = Vörlaag-Dingen -template.git_hooks_tooltip = Du kannst jüüst keene Git-Hakens bewarken of lösken, nadeem se hentoföögt sünd. Köör dat blots ut, wenn du de Vörlaag-Repositorium vertraust. -archive.issue.nocomment = Deeses Repositorium is archiveert. Du kannst nich up Gefallens kommenteren. -archive.pull.nocomment = Deeses Repositorium is archiveert. Du kannst nich up Haalvörslagens kommenteren. -form.reach_limit_of_creation_n = De Eegner is al bi de Grenz vun %d Repositoriums. -migrate_options_mirror_helper = Deeses Repositorium word een Spegel wesen -migrate_options_lfs_endpoint.description.local = Een stedenwies Server-Padd word ok unnerstütt. -migrate_items_merge_requests = Tosamenföhren-Vörslagen -migrate.permission_denied = Du düürst keene stedenwies Repositoriums importeren. -archive.title = Deeses Repositorium is archiveert. Du kannst de Dateien ankieken un ’t klonen, aver nich schuven un keene Gefallens un Haalvörslagen opmaken. -need_auth = Anmellen -migrate_options = Umtreck-Instellens -migrate.clone_local_path = of een stedenwies Server-Padd -migrate.migrating_failed.error = Umtrecken fehlslagen: %s -migrate.migrating_failed_no_addr = Umtreck fehlslagen. -migrate.migrating_pulls = Haalvörslagen worden umtrucken -empty_message = Deeses Repositorium hett noch keenen Inholl. -migrate.invalid_lfs_endpoint = De LFS-Ennpunkt is nich gültig. -migrated_from_fake = Vun %[1]s umtrucken -migrate.git.description = Een Repositorium blots vun elkeen Git-Deenst umtrecken. -migrate.onedev.description = Daten vun code.onedev.io of anner OneDev-Instanzen umtrecken. -generated_from = maakt vun -migrate.migrating_failed = Umtrecken un %s fehlslagen. -migrate.forgejo.description = Daten vun codeberg.org of anner Forgejo-Instanzen umtrecken. -migrate.gogs.description = Daten vun notabug.org of anner Gogs-Instanzen umtrecken. -migrate.migrating_milestones = Markstenen worden umtrucken -create_new_repo_command = Een nejes Repositorium in de Oorderreeg maken -migrate.cancel_migrating_confirm = Willst du deesen Umtreck ofbreken? -subscribe.pull.guest.tooltip = Mell di an, um deesen Haalvörslag to abonneren. -more_operations = Mehr doon -migrate.gitbucket.description = Daten vun GitBucket-Instanzen umtrecken. -find_tag = Mark finnen -branches = Twiegen -tag = Mark -tags = Markens -issues = Gefallens -pulls = Haalvörslagen -packages = Paketen -actions = Aktioonen -releases = Publizerens -milestones = Markstenen -org_labels_desc_manage = Verwalten -commits = Kommitterens -commit = Kommitteren -n_commit_one = %s Kommitteren -n_commit_few = %s Kommitterens -n_branch_one = %s Twieg -n_tag_one = %s Mark -n_tag_few = %s Markens -n_release_one = %s Publizeren -n_release_few = %s Publizerens -file.title = %s am %s -file_history = Histoorje -file_view_source = Quelltext wiesen -file_view_rendered = Tekent wiesen -file_view_raw = Ruug wiesen -file_permalink = Ewig Verwies -file_too_large = De Datei is to grot tum Wiesen. -file_copy_permalink = Ewig Verwies koperen -view_git_blame = Git-Schüld wiesen -video_not_supported_in_browser = Dien Browser unnerstütt de HTML5-»video«-Mark nich. -audio_not_supported_in_browser = Dien Browser unnerstütt de HTML5-»audio«-Mark nich. -stored_lfs = Mit Git LFS sekert -unescape_control_characters = Inkielen -executable_file = Utföhrbaar Datei -vendored = Verkoperig -generated = Maakt -commit_graph = Kommitterens-Boom -commit_graph.select = Twiegen utkören -commit_graph.monochrome = Eenfarvig -commit_graph.color = Klöör -commit.contained_in = Deeses Kommitteren is enthollen in: -commit.contained_in_default_branch = Deeses Kommitteren is Deel vun de Höövd-Twieg -commit.load_referencing_branches_and_tags = Twiegen un Markens laden, wat deeses Kommitteren nömen -blame = Schüld -download_file = Datei runnerladen -normal_view = Normaale Sicht -line = Rieg -lines = Riegen -from_comment = (Kommentaar) -no_eol.text = Keen Riegenenn -no_eol.tooltip = Deese Datei ennt nich mit eenem Riegenenn-Bookstaven. -editor.add_file = Datei hentofögen -editor.new_file = Neje Datei -editor.edit_file = Datei bewarken -editor.cannot_edit_lfs_files = LFS-Dateien könen nich in de Internett-Schnittstee bewarkt worden. -editor.delete_this_file = Datei lösken -editor.file_delete_success = Datei »%s« is lösket worden. -editor.name_your_file = Benööm diene Datei … -editor.or = of -editor.cancel_lower = Ofbreken -editor.commit_signed_changes = Unnerschrieven Ännerns kommitteren -editor.commit_changes = Ännerns kommitteren -editor.add_tmpl = »<%s>« hentofögen -editor.add_tmpl.filename = Dateinaam -editor.add = %s hentofögen -editor.update = %s vernejen -editor.delete = %s lösken -editor.patch = Plack anwennen -editor.patching = Plackt: -editor.fail_to_apply_patch = Kann Plack »%s« nich anwennen -editor.new_patch = Nejer Plack -editor.commit_message_desc = Wenn du willst, föög een wiederes Beschrieven hento … -editor.commit_directly_to_this_branch = Kommitteer stracks up de %[1]s-Twieg. -editor.propose_file_change = Datei-Ännern vörslagen -editor.new_branch_name = Benööm de Twieg för deeses Kommitteren -editor.new_branch_name_desc = Nejer Twig-Naam … -editor.cancel = Ofbreken -editor.filename_is_invalid = De Dateinaam is ungültig: »%s«. -editor.invalid_commit_mail = Ungültige E-Mail för dat Kommitteren. -editor.branch_does_not_exist = Twieg »%s« gifft dat in deesem Repositorium nich. -editor.branch_already_exists = Twieg »%s« gifft dat in deesem Repositorium al. -editor.filename_is_a_directory = Dateinaam »%s« word in deesem Repositorium al as Verteeknisnaam bruukt. -editor.file_deleting_no_longer_exists = De Datei, wat lösket word, »%s«, gifft dat in deesem Repositorium nich mehr. -editor.file_already_exists = Eene Datei mit de Naam »%s« gifft dat in deesem Repositorium al. -editor.commit_id_not_matching = De Datei is ännert worden, as du se bewarkt hest. Kommitteer up eenen nejen Twieg un föhr dann tosamen. -editor.push_out_of_date = De Schuuv schient verollt to wesen. -editor.commit_empty_file_header = Eene lege Datei kommitteren -editor.no_changes_to_show = ’t gifft keene Ännerns to wiesen. -editor.fail_to_update_file_summary = Fehler-Naricht: -editor.push_rejected_summary = Kumpleete Oflehnens-Naricht: -editor.add_subdir = Verteeknis hentofögen … -editor.upload_file_is_locked = Datei »%s« is vun %s tosluten. -editor.upload_files_to_dir = Dateien to »%s« upladen -editor.cannot_commit_to_protected_branch = Kann nich up schütt Twieg »%s« kommitteren. -editor.no_commit_to_branch = Kann nich stracks to de Twieg kommitteren, denn: -editor.require_signed_commit = Twieg bruuk een unnerschreven Kommitteren -editor.cherry_pick = Rosienenbick %s up: -editor.revert = Nehm %s torügg up: -commits.desc = Stöver dör de Quelltext-Ännerns-Histoorje. -commits.commits = Kommitterens -commits.no_commits = Keene gemeensaamen Kommitterens. »%s« un »%s« hebben kumpleet verscheden Histoorjes. -commits.nothing_to_compare = Deese Twiegen sünd gliek. -commits.search_branch = Deeser Twieg -commits.search_all = All Twiegen -commits.author = Autor -commits.message = Naricht -commits.date = Datum -commits.older = Oller -commits.newer = Nejer -commits.signed_by_untrusted_user_unmatched = Unnerschrieven vun eenem unvertraut Bruker, well nich de Kommitterer is -commits.gpg_key_id = GPG-Slötel-ID -commits.ssh_key_fingerprint = SSH-Slötel-Fingerspoor -commit.operations = Doon -commit.revert = Torüggnehmen -commit.revert-header = Torüggnehmen: %s -commit.cherry-pick = Rosienenbicken -commit.cherry-pick-header = Rosienenbicken: %s -commit.cherry-pick-content = Twieg utkören, up wat du Rosienenbicken willst: -commitstatus.error = Fehler -commitstatus.failure = Fehlslagen -commitstatus.pending = Staht ut -commitstatus.success = Daankregen -projects = Projekten -projects.description_placeholder = Beschrieven -projects.create = Projekt maken -projects.title = Titel -projects.create_success = Dat Projekt »%s« is maakt worden. -projects.deletion = Projekt lösken -projects.deletion_success = Dat Projekt is lösket worden. -projects.edit = Projekt bewarken -projects.edit_subheader = Projekten organiseren Gefallens un verfolgen dat Wiederkomen. -projects.modify = Projekt bewarken -projects.edit_success = Projekt »%s« is verneeit worden. -projects.type.none = Nix -projects.type.basic_kanban = Slichtes Kanban -projects.type.bug_triage = Fehlers verwalten -projects.template.desc = Vörlaag -projects.column.edit = Striep bewarken -projects.column.edit_title = Naam -projects.column.new_title = Naam -projects.column.new_submit = Striep maken -projects.column.set_default = Höövd setten -projects.column.delete = Striep lösken -projects.column.color = Klöör -projects.open = Opmaken -projects.close = Dichtmaken -projects.column.assigned_to = Towiesen an -projects.card_type.images_and_text = Billers un Text -projects.card_type.text_only = Blots Text -issues.filter_assignees = Towiesen filtern -issues.filter_milestones = Marksteen filtern -issues.filter_projects = Projekt filtern -issues.filter_labels = Vermark filtern -issues.new = Nejes Gefall -issues.new.title_empty = Titel kann nich leeg wesen -issues.new.labels = Vermarkens -issues.new.clear_labels = Vermarkens leegmaken -issues.new.projects = Projekten -issues.new.no_projects = Keen Projekt -issues.new.closed_projects = Dichtmaakt Projekten -issues.new.no_items = Keene Dingen -issues.new.milestone = Marksteen -issues.new.no_milestone = Keen Marksteen -issues.new.open_milestone = Open Markstenen -issues.new.closed_milestone = Dichtmaakt Markstenen -issues.new.assignees = Towiesen -issues.new.no_assignees = Keene Towiesens -issues.new.assign_to_me = An mi towiesen -project = Projekten -release = Publizeren -file_follow = Symbolisk Verwies nagahn -editor.signoff_desc = Föög am Enn vun de Kommitterens-Naricht eenen »Signed-off-by«-Nadrag för de Kommitterer hento. -editor.create_new_branch_np = Maak eenen nejen Twieg för deeses Kommitteren. -editor.filename_cannot_be_empty = De Dateinaam kann nich leeg wesen. -labels = Vermarkens -file_raw = Ruug -commit_graph.hide_pr_refs = Haalvörslagen verbargen -editor.upload_file = Datei upladen -editor.preview_changes = Ännerns vörwiesen -filter_branch_and_tag = Twieg of Mark filtern -symbolic_link = Symbolisk Verwies -editor.cannot_edit_non_text_files = Binäärdateien könen nich in de Internett-Schnittstee bewarkt worden. -editor.must_be_on_a_branch = Du muttst up eenem Twieg wesen, um Ännerns an deeser Datei to maken of vörtoslagen. -editor.fork_before_edit = Du muttst deeses Repositorium gabeln, um Ännerns an deeser Datei to maken of vörtoslagen. -n_branch_few = %s Twiegen -released_this = hett dat publizeert -escape_control_characters = Utkielen -editor.edit_this_file = Datei bewarken -editor.this_file_locked = Datei is tosluten -editor.filename_help = Föög een Verteeknis hento, indeem du sienen Naam mit eenem Schüünstreek (»/«) daarna ingiffst. Löske een Verteeknis, indeem du am Begünn vun de Ingaavfeld de Rücktast drückst. -editor.unable_to_upload_files = Kunn de Dateien to »%s« nich upladen mit Fehler: %v -commits.signed_by_untrusted_user = Unnerschrieven vun eenem unvertraut Bruker -projects.deletion_desc = Wenn du een Projekt löskest, word ’t vun all verwandt Gefallens wegnohmen. Wiedermaken? -projects.column.set_default_desc = Deese Striep as de Höövd-Striep för unverwalt Gefallens un Haalvörslagens setten -issues.desc = Fehlermellens, Upgavens un Markstenen organiseren. -issues.new.open_projects = Open Projekten -editor.create_new_branch = Maak eenen nejen Twieg för deeses Kommitteren un maak daarmit eenen Haalvörslag op. -editor.must_have_write_access = Du muttst Schriev-Togriep hebben, um Ännerns an deeser Datei to maken of vörtoslagen. -editor.file_is_a_symlink = `»%s« is een symbolisk Verwies. Symbolisk Verwiesen könen in de Internett-Bewarker nich bewarkt worden` -editor.commit_empty_file_text = De Datei, wat du kommitteren willst, is leeg. Wiedermaken? -editor.push_rejected = De Ännern is vun de Server oflehnt worden. Bidde överprüüf de Git-Hakens. -commits.browse_further = Wiederstövern -projects.description = Beschrieven (wenn du willst) -projects.card_type.desc = Kaart-Vörwiesens -issues.new.no_label = Keene Vermarkens -issues.new.clear_projects = Projekten leegmaken -issues.new.clear_assignees = Towiesens leegmaken -editor.file_editing_no_longer_exists = De Datei, wat bewarkt word, »%s«, gifft dat in deesem Repositorium nich mehr. -editor.user_no_push_to_branch = Bruker kann nich to Twieg schuven -editor.directory_is_a_file = Verteeknisnaam »%s« word in deesem Repositorium al as Dateinaam bruukt. -editor.file_changed_while_editing = De Datei-Inhollens hebben sik ännert, siet du mit de Bewarken begunnen hest. Klick hier, um se to sehn, of kommitteer de Änners weer, um se to överschrieven. -editor.push_rejected_no_message = De Ännern is vun de Server sünner Naricht oflehnt worden. Bidde överprüüf de Git-Hakens. -commits.signed_by = Unnerschrieven vun -commit.revert-content = Twieg utkören, up wat du dat torüggnehmen willst: -projects.desc = Gefallens un Haalvörslagens in Projekt-Bredden verwalten. -projects.new = Nejes Projekt -projects.template.desc_helper = Köör tum Begünnen eene Projekt-Vörlaag ut -editor.fail_to_update_file = Kunn de Datei »%s« nich vernejen/hentofögen. -ext_issues = Frömde Gefallens -projects.column.new = Neje Striep -projects.column.deletion_desc = Wenn du eene Projekt-Striep löskest, worden all Gefallens daarin in de Höövd-Striep verschuven. Wiedermaken? -issues.new.clear_milestone = Marksteen leegmaken -commits.renamed_from = Umbenöömt vun %s -commits.view_path = To deeser Tied in de Histoorje wiesen -issues.filter_reviewers = Nakieker filtern -issues.new.no_reviewers = Keene Nakiekers -issues.choose.open_external_link = Opmaken -issues.choose.blank = Normaal -issues.choose.invalid_templates = %v ungültig Vörlagen(s) funnen -issues.choose.invalid_config = De Gefall-Instellens enthollen Fehlers: -issues.no_ref = Keen Twieg/Mark angeven -issues.new_label = Nejer Vermark -issues.new_label_placeholder = Vermark-Naam -issues.new_label_desc_placeholder = Beschrieven -issues.create_label = Vermark maken -issues.label_templates.helper = Köör eene Vermarkens-Sammlung ut -issues.label_templates.use = Vermarkens-Sammlung bruken -issues.add_labels = hett %[2]s de Vermarkens %[1]s hentoföögt -issues.remove_label = hett %[2]s de Vermark %[1]s wegdaan -issues.add_milestone_at = `hett dat %[2]s to de Marksteen %[1]s hentoföögt` -issues.add_project_at = `hett dat %[2]s to de Projekt %[1]s hentoföögt` -issues.change_milestone_at = `hett %[3]s de Marksteen vun %[1]s to %[2]s ännert` -issues.remove_milestone_at = `hett dat %[2]s vun de Marksteen %[1]s wegdaan` -issues.remove_project_at = `hett dat %[2]s vun de Projekt %[1]s wegdaan` -issues.deleted_milestone = `(lösket)` -issues.deleted_project = `(lösket)` -issues.self_assign_at = `hett dat %s sik sülven towiesen` -issues.remove_self_assignment = `hett sien Towiesen %s wegnohmen` -issues.change_title_at = `hett %[3]s de Titel vun %[1]s to %[2]s ännert` -issues.change_ref_at = `hett %[3]s de Nömen vun %[1]s to %[2]s ännert` -issues.delete_branch_at = `hett %[2]s de Twieg %[1]s lösket` -issues.filter_label = Vermark -issues.filter_label_exclude = `Bruuk Alt+Klick/Enter, um Vermarkens uttosluten` -issues.filter_label_no_select = All Vermarkens -issues.filter_label_select_no_label = Keen Vermark -issues.filter_milestone = Marksteen -issues.filter_milestone_none = Keene Markstenen -issues.filter_milestone_open = Open Markstenen -issues.filter_project = Projekt -issues.filter_project_all = All Projekten -issues.filter_project_none = Keen Projekt -issues.filter_assignee = Towiesen -issues.filter_assginee_no_select = All Towiesens -issues.filter_assginee_no_assignee = Nüms towiesen -issues.filter_poster = Autor -issues.filter_poster_no_select = All Autoren -issues.filter_type.assigned_to_you = Di towiesen -issues.filter_type.mentioning_you = Nöömt di -issues.filter_type.review_requested = Nakieken anfraggt -issues.filter_sort = Sorteren -issues.filter_sort.latest = Neeist -issues.filter_sort.oldest = Ollst -issues.filter_sort.recentupdate = Körtens ännert -issues.filter_sort.leastupdate = Lang nich ännert -issues.filter_sort.mostcomment = Meest kommenteert -issues.filter_sort.leastcomment = Minnst kommenteert -issues.filter_sort.nearduedate = Nahst Anstahns-Datum -issues.filter_sort.farduedate = Feernst Anstahns-Datum -issues.filter_sort.moststars = Meeste Steernen -issues.filter_sort.feweststars = Minnste Steernen -issues.filter_sort.mostforks = Meeste Gabels -issues.action_open = Opmaken -issues.action_close = Dichtmaken -issues.action_label = Vermark -issues.action_milestone = Marksteen -issues.action_assignee = Towiesen -issues.action_check = Utkören/Ofkören -issues.action_check_all = All Dingen Utkören/Ofkören -issues.opened_by = %[1]s vun %[3]s opmaakt -pulls.merged_by_fake = vun %[2]s is %[1]s tosamenföhrt worden -issues.closed_by = vun %[3]s is %[1]s dichtmaakt worden -issues.closed_by_fake = vun %[2]s is %[1]s dichtmaakt worden -issues.opened_by_fake = vun %[2]s is %[1]s opmaakt worden -issues.previous = Vörig -issues.all_title = All -issues.draft_title = Sketts -issues.num_comments_1 = %d Kommentaar -issues.delete_comment_confirm = Willst du deesen Kommentaar würrelk lösken? -issues.context.copy_link = Verwies koperen -issues.context.reference_issue = In nejem Gefall benömen -issues.context.edit = Bewarken -issues.context.delete = Lösken -issues.no_content = Keen Beschrieven angeven. -issues.choose.get_started = Lössleggen -issues.label_templates.fail_to_load_file = Kunn de Vermark-Vörlaag-Datei »%s« nich laden: %v -issues.add_label = hett %[2]s de Vermark %[1]s hentoföögt -issues.add_assignee_at = `is vun %s %s towiesen worden` -issues.action_milestone_no_select = Keen Marksteen -issues.choose.blank_about = Een nejes Gefall vun de Normaal-Vörlaag maken. -issues.create = Gefall maken -issues.label_templates.title = Eene Vermark-Sammlung laden -issues.label_templates.info = Dat gifft noch keene Vermarkens. Maak eenen Vermark mit »Nejer Vermark« of bruuk eene Vermarkens-Sammlung: -issues.change_project_at = `hett %[3]s dat Projekt vun %[1]s to %[2]s ännert` -issues.remove_assignee_at = `is sien Towiesen vun %s %s wegnohmen worden` -issues.open_title = Open -issues.close = Gefall dichtmaken -issues.choose.ignore_invalid_templates = Ungültig Vörlagens sünd ignoreert worden -issues.add_ref_at = `hett %[2]s de Nömen %[1]s hentoföögt` -issues.filter_type.all_issues = All Gefallens -issues.filter_type.created_by_you = Vun di maakt -issues.filter_milestone_closed = Dichtmaakt Markstenen -issues.commented_at = `hett %s kommenteert` -issues.remove_labels = hett %[2]s de Vermarkens %[1]s wegdaan -issues.filter_type = Aard -pulls.merged_by = vun %[3]s is %[1]s tosamenföhrt worden -issues.next = Anner -issues.add_remove_labels = hett %[3]s de Vermarkens %[1]s hentoföögt un %[2]s wegdaan -issues.remove_ref_at = `hett %[2]s de Nömen %[1]s wegdaan` -issues.filter_milestone_all = All Markstenen -issues.filter_type.reviewed_by_you = Vun di nakiekt -issues.filter_sort.fewestforks = Minnste Gabels -issues.action_assignee_no_select = Nich towiesen -issues.closed_title = Dicht -issues.num_comments = %d Kommentaren -issues.context.quote_reply = Antwoord ziteren -issues.comment_pull_merged_at = hett Kommitteren %[1]s in %[2]s %[3]s tosamenföhrt -issues.close_comment_issue = Mit Kommentaar dichtmaken -issues.reopen_comment_issue = Mit Kommentaar weer opmaken -issues.create_comment = Kommenteren -issues.reopened_at = `hett deeses Gefall %[2]s weer opmaakt` -issues.comment_manually_pull_merged_at = hett Kommitteren %[1]s in %[2]s %[3]s vun Hand tosamenföhrt -issues.reopen_issue = Weer opmaken -issues.closed_at = `hett deeses Gefall %[2]s dichtmaakt` -issues.commit_ref_at = `hett deeses Gefall %[2]s vun eenem Kommitteren benöömt` -issues.ref_closing_from = `hett deeses Gefall vun eenem Haalvörslag %[4]s, wat ’t dichtmaken word, %[2]s benöömt` -issues.ref_closed_from = `hett deeses Gefall %[4]s %[2]s dichtmaakt` -issues.ref_reopened_from = `hett deeses Gefall %[4]s %[2]s weer opmaakt` -issues.ref_from = `vun %[1]s` -issues.author = Autor -issues.author.tooltip.pr = Deeser Bruker is de Autor vun deesem Haalvörslag. -issues.role.owner = Eegner -issues.role.owner_helper = Deeser Bruker is de Eegner vun deesem Repositorium. -issues.role.member = Liddmaat -issues.role.collaborator = Mitarbeider -issues.role.first_time_contributor = Nejer Bidrager -issues.role.first_time_contributor_helper = Dat is de eerste Bidrag vun deesem Bruker to deesem Repositorium. -issues.role.contributor = Bidrager -issues.role.contributor_helper = Deeser Bruker hett al wat in deesem Repositorium kommitteert. -issues.remove_request_review = Nakieken-Anfragg wegdoon -issues.remove_request_review_block = Kann Nakiekens-Anfragg nich wegdoon -issues.dismiss_review = Nakieken ofseggen -issues.dismiss_review_warning = Willst du deeses Nakieken würrelk ofseggen? -issues.sign_in_require_desc = Mell di an um mittosnacken. -issues.edit = Bewarken -issues.cancel = Ofbreken -issues.save = Sekern -issues.label_description = Beschrieven -issues.label_color = Klöör -issues.label_exclusive = Sünner annere -issues.label_archive = Vermark archiveren -issues.label_count = %d Vermarkens -issues.label_open_issues = %d open Gefallens/Haalvörslagens -issues.label_edit = Bewarken -issues.label_delete = Lösken -issues.label_modify = Vermark bewarken -issues.label_deletion = Vermark lösken -issues.label_deletion_success = De Vermark is lösket worden. -issues.label.filter_sort.alphabetically = Na de Alphabeet -issues.label.filter_sort.reverse_alphabetically = Umdreiht na de Alphabeet -issues.label.filter_sort.by_size = Lüttste Grött -issues.num_participants_one = %d Mitmaker -issues.num_participants_few = %d Mitmakers -issues.ref_pull_from = `hett deeses Haalvörslag %[4]s %[2]s benöömt` -issues.label_title = Naam -issues.label_archived_filter = Archiveert Vermarkens wiesen -issues.archived_label_description = (Archiveert) %s -issues.ref_issue_from = `hett deeses Gefall %[4]s %[2]s benöömt` -issues.ref_reopening_from = `hett deeses Gefall vun eenem Haalvörslag %[4]s, wat ’t weer opmaken word, %[2]s benöömt` -issues.author.tooltip.issue = Deeser Bruker is de Autor vun deesem Gefall. -issues.role.member_helper = Deeser Bruker is een Liddmaat vun de Vereenigung, wat de Eegner vun deesem Repositorium is. -issues.role.collaborator_helper = Deeser Bruuker is inladen worden, in deesem Repositorium mittoarbeiden. -issues.re_request_review = Nakieken neei anfragen -issues.is_stale = ’t hett siet de Nakieken Ännerns in deesem HV geven -issues.label_deletion_desc = Wenn du een Vermark löskest, word dat vun all Gefallens wegnohmen. Wiedermaken? -issues.label.filter_sort.reverse_by_size = Gröttste Grött -issues.review.review = Nakieken -issues.review.reviewers = Nakiekers -issues.review.show_resolved = Wies lööst -issues.review.hide_resolved = Verbarg lööst -issues.review.resolve_conversation = Snack lösen -issues.attachment.open_tab = `Klick, um »%s« in eener nejen Karteikaart antokieken` -issues.attachment.download = `Klick, um »%s« runnertoladen` -issues.unsubscribe = Ofbestellen -issues.unpin_issue = Gefall lösssteken -issues.lock = Snack tosluten -issues.unlock = Snack upsluten -issues.lock_duplicate = Een Gefall kann nich dübbelt tosluten worden. -issues.unlock_comment = hett deesen Snack %s upsluten -issues.unlock_confirm = Upsluten -issues.lock_confirm = Tosluten -issues.lock.notice_3 = - Du kannst deeses Gefall to elkeen Tied weer upsluten. -issues.unlock.notice_1 = - Elkeenwell kann weer up deesem Gefall kommenteren. -issues.unlock.notice_2 = - Du kannst deeses Gefall to elkeen Tied weer tosluten. -issues.lock.reason = Grund för ’t Tosluten -issues.comment_on_locked = Du kannst nich up een tosloten Gefall kommenteren. -issues.delete = Lösken -issues.delete.title = Deeses Gefall lösken? -issues.tracker = Tied-Erfater -issues.start_tracking_short = Tiednehmer starten -issues.start_tracking = Tied-Erfaten begünnen -issues.stop_tracking_history = `hett %s to warken uphöört` -issues.cancel_tracking = Wegdoon -issues.cancel_tracking_history = `hett %s dat Tied-Erfaten wegdaan` -issues.add_time = Tied vun Hand indragen -issues.del_time = Deese Tied-Upschrift lösken -issues.add_time_short = Tied hentofögen -issues.add_time_cancel = Ofbreken -issues.add_time_history = `hett %s bruukt Tied hentoföögt` -issues.del_time_history = `hett %s bruukt Tied wegdaan` -issues.add_time_hours = Stünnen -issues.add_time_minutes = Menüten -issues.add_time_sum_to_small = Keene Tied is indragen worden. -issues.time_spent_total = Tied bruukt all tosamen -issues.time_spent_from_all_authors = `Tied bruukt all tosamen: %s` -issues.due_date = Anstahns-Datum -issues.push_commit_1 = hett %[2]s %[1]d Kommitteren hentoföögt -issues.push_commits_n = hett %[2]s %[1]d Kommitterens hentoföögt -issues.force_push_compare = Verglieken -issues.due_date_form_edit = Bewarken -issues.due_date_form_remove = Wegdoon -issues.due_date_not_set = Keen Anstahns-Datum sett. -issues.due_date_added = hett %[2]s dat Anstahns-Datum %[1]s hentoföögt -issues.due_date_remove = hett %[2]s dat Anstahns-Datum %[1]s wegdaan -issues.due_date_overdue = Staht al lang an -issues.dependency.title = Ofhangens -issues.dependency.issue_no_dependencies = Keene Ofhangens sett. -issues.dependency.pr_no_dependencies = Keene Ofhangens sett. -issues.dependency.no_permission_1 = Du hest nich de Rechten, um %d Ofhangen to lesen -issues.dependency.no_permission_n = Du hest nich de Rechten, um %d Ofhangens to lesen -issues.dependency.add = Ofhangen hentofögen … -issues.dependency.cancel = Ofbreken -issues.dependency.issue_closing_blockedby = Dat Dichtmaken vun deesem Gefall word vun deesen Gefallens blockeert -issues.dependency.pr_closing_blockedby = Dat Dichtmaken vun deesem Haalvörslag word vun deesen Gefallens blockeert -issues.dependency.pr_close_blocks = Deeser Haalvörslag blockeert dat Dichtmaken vun deesen Gefallens -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.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. -issues.dependency.add_error_dep_issue_not_exist = Ofhangig Gefall gifft dat nich. -issues.dependency.add_error_dep_not_exist = Ofhangen gifft dat nich. -issues.dependency.add_error_dep_exists = Ofhangen gifft dat al. -issues.dependency.add_error_cannot_create_circular = Du kannst keen Ofhangen maken, waar sik twee Gefallens tegensiedig blockeren. -issues.dependency.add_error_dep_not_same_repo = Beide Gefallens mutten in de sülve Repositorium wesen. -issues.review.self.approval = Du kannst nich dien eegen Haalvörslag tostimmen. -issues.review.self.rejection = Du kannst nich up dien eegen Haalvörslag um Ännerns beden. -issues.review.comment = hett %s nakiekt -issues.review.dismissed_label = Ofseggt -issues.review.left_comment = hett kommenteert -issues.review.content.empty = Du muttst eenen Kommentaar geven, wat för Ännerns du hebben willst. -issues.review.reject = hett %s um Ännerns beden -issues.review.remove_review_request = hett %[2]s de Nakieken-Anfraag för %[1]s wegdaan -issues.review.remove_review_request_self = hett %s dat Nakieken verweigert -issues.unlock_error = Kann een Gefall nich upsluten, wenn ’t nich tosloten is. -issues.lock_with_reason = hett dat %[2]s um %[1]s tosluten un Snack up Mitarbeiders begrenzt -issues.unpin_comment = hett dat %s lössstoken -issues.lock.notice_1 = - Anner Brukers könen keene nejen Kommentaren to deesem Gefall hentofögen. -issues.stop_tracking = Tiednehmer anhollen -issues.lock.unknown_reason = Kann een Gefall nich sünner Grund tosluten. -issues.subscribe = Abonneren -issues.max_pinned = Du kannst nich mehr Gefallens faststeken -issues.pin_comment = hett dat %s faststoken -issues.lock_no_reason = hett dat %s tosluten un Snack up Mitarbeiders begrenzt -issues.delete.text = Willst du deeses Gefall würrelk lösken? (Dat lösket för all Tieden all Inhollen. Wenn du ’t blots archiveren willst, maakt ’t lever blots dicht) -issues.start_tracking_history = `hett %s to warken begunnen` -issues.lock.notice_2 = - Du un anner Mitarbeiders mit Togriep to deesem Repositorium köönt wiederhen Kommentaren schrieven, wat elkeenwell sücht. -issues.due_date_modified = hett dat Anstahns-Datum vun %[2]s to %[1]s %[3]s ännert -issues.dependency.issue_remove_text = Dat word de Ofhangen vun deesem Gefall wegdoon. Wiedermaken? -issues.review.approve = hett deese Ännerns %s tostimmt -issues.review.dismissed = hett %[2]s dat Nakieken vun %[1]s ofseggt -issues.lock.title = Snack up deesem Gefall tosluten. -issues.unlock.title = Snack up deesem Gefall upsluten. -issues.tracker_auto_close = Tiednehmer word automatisk anhollt, wenn dat Gefall dichtmaakt word -issues.dependency.no_permission.can_remove = Du hest nich de Rechten, um deese Ofhangen to lesen, aver du kannst deese Ofhangen wegdoon -issues.dependency.remove_info = Deese Ofhangen wegdoon -issues.dependency.removed_dependency = `hett %s eene Ofhangen wegdaan` -issues.dependency.issue_close_blocked = Du muttst all Gefallens, wat deeses Gefall blockeren, dichtmaken, ehr du dat hier dichtmaken kannst. -issues.review.outdated = Verollt -issues.review.option.show_outdated_comments = Verollte Kommentarens wiesen -issues.review.un_resolve_conversation = Snack weer opmaken -issues.tracking_already_started = `Du hest dat Tied-Erfaten al in eenem anner Gefall begunnen!` -issues.due_date_invalid = Dat Anstahns-Datum is ungültig of buten de Rieg. Bidde bruuk dat Formaat »JJJJ-MM-DD«. -issues.dependency.remove = Wegdoon -issues.dependency.issue_close_blocks = Deeses Gefall blockeert dat Dichtmaken vun deesen Gefallens -issues.review.outdated_description = Inholl hett sik ännert, siet deeser Kommentaar schreven worden is -issues.force_push_codes = `hett %[1]s vun %[2]s to %[4]s %[6]s dwangsschuven` -issues.dependency.pr_remove_text = Dat word de Ofhangen vun deesem Haalvörslag wegdoon. Wiedermaken? -issues.review.pending = Staht ut -issues.review.option.hide_outdated_comments = Verollte Kommentarens verbargen -issues.due_date_form = JJJJ-MM-DD -issues.dependency.added_dependency = `hett %s eene neje Ofhangen hentoföögt` -issues.review.wait = is %s um een Nakieken anfraggt worden -issues.review.add_review_request = hett %[2]s um een Nakieken vun %[1]s anfraggt -issues.review.show_outdated = Wies verollt -issues.review.hide_outdated = Verbarg verollt -issues.content_history.options = Instellens -issues.reference_link = Nömen: %s -compare.compare_base = Grund -compare.compare_head = Verglieken -pulls.desc = Haalvörslagen un Quelltext-Nakiekens anknipsen. -pulls.new = Nejer Haalvörslag -pulls.view = Haalvörslag wiesen -pulls.allow_edits_from_maintainers = Bewarkens vun Liddmaten verlöven -pulls.allow_edits_from_maintainers_err = Vernejen fehlslagen -pulls.compare_changes_desc = Köör de Twieg ut, waarhen tosamenföhrt worden sall, un vun welkem Twieg haalt worden sall. -pulls.has_viewed_file = Ankiekt -pulls.has_changed_since_last_review = Siet lestem Nakieken ännert -pulls.viewed_files_label = %[1]d vun %[2]d Dateien ankiekt -pulls.expand_files = All Dateien verwiedern -pulls.collapse_files = All Dateien tosamenfolden -pulls.compare_base = tosamenföhren na -pulls.compare_compare = halen vun -pulls.switch_head_and_base = Kopp un Grund tuusken -pulls.filter_branch = Twieg filtern -pulls.no_results = Keene Resultaten funnen. -pulls.show_all_commits = All Kommitterens wiesen -pulls.show_changes_since_your_last_review = Ännerns siet dienem lesten Nakieken wiesen -pulls.showing_specified_commit_range = Blots Ännerns vun Kommitterens %[1]s bit %[2]s wiesen -pulls.review_only_possible_for_full_diff = Nakieken gaht blots, wenn de hele Unnerscheed wiest word -pulls.filter_changes_by_commit = Na Kommitteren filtern -pulls.nothing_to_compare = Deese Twiegen sünd gliek. ’t is nich nödig, eenen Haalvörslag to maken. -pulls.nothing_to_compare_have_tag = De utköört Twieg/Mark sünd gliek. -pulls.create = Haalvörslag maken -pulls.title_desc_one = will %[1]d Kommitteren vun %[2]s na %[3]s tosamenföhren -pulls.merged_title_desc_one = hett %[1]d Kommitteren vun %[2]s na %[3]s %[4]s tosamenföhrt -pulls.change_target_branch_at = `hett %[3]s de Enn-Twieg vun %[1]s to %[2]s ännert` -pulls.tab_conversation = Snack -pulls.tab_commits = Kommitterens -pulls.tab_files = Ännert Dateien -pulls.reopen_to_merge = Bidde maak deesen Haalvörslag weer op, um dat Tosamenföhren dörtoföhren. -pulls.cant_reopen_deleted_branch = Deeser Haalvörslag kann nich weer opmaakt worden, denn de Twieg is lösket worden. -pulls.merged = Tosamenföhrt -pulls.merged_success = Haalvörslag tosamenföhrt un dichtmaakt -pulls.closed = Haalvörslag dichtmaakt -pulls.manually_merged = Vun Hand tosamenföhrt -pulls.merged_info_text = De Twieg %s kann nu lösket worden. -pulls.is_closed = De Haalvörslag is dichtmaakt worden. -pulls.title_wip_desc = `Begünn de Titel mit %s, daarmit de Haalvörslag nich ut Versehn tosamenföhrt word.` -pulls.still_in_progress = Noch in de Maak? -pulls.cannot_merge_work_in_progress = Deeser Haalvörslag is as noch in de Maak markeert. -pulls.ready_for_review = Klaar tum Nakieken? -pulls.add_prefix = Dat Präfix %s hentofögen -pulls.remove_prefix = Dat Präfix %s wegdoon -pulls.files_conflicted = Deeser Haalvörslag hett Ännerns, wat mit de Enn-Twieg unverdragelk sünd. -pulls.is_ancestor = Deeser Twieg is al in de Enn-Twieg enthollen. Dat gifft nix tum tosamenföhren. -pulls.is_empty = De Ännerns in deesem Twieg sünd al in de Enn-Twieg. Dat word een leger Kommitteren. -pulls.required_status_check_failed = Eenige nödig Överprüfens sünd fehlslagen. -pulls.required_status_check_missing = Eenige nödig Överprüfens sünd nich daar. -pulls.required_status_check_administrator = As een Chef düürst du deesen Haalvörslag doch tosamenföhren. -pulls.blocked_by_approvals = Deeser Haalvörslag hett noch nich genoog Tostimmens. %d vun %d Tostimmens geven. -pulls.blocked_by_rejection = Een offizieller Nakieker hett um Ännerns an deesem Haalvörslag beden. -pulls.blocked_by_outdated_branch = Deeser Haalvörslag is blockeert, denn he is verollt. -pulls.cannot_auto_merge_desc = Deeser Haalvörslag kann nich automatisk tosamenföhrt worden, denn dat gifft Unverdragelkheidens. -pulls.cannot_auto_merge_helper = Föhr dat vun Hand tosamen, um de Unverdragelkheidens oftohelpen. -pulls.num_conflicting_files_1 = %d unverdragelk Datei -pulls.approve_count_1 = %d Tostimmen -pulls.reject_count_n = %d Bidden um Ännerns -pulls.waiting_count_n = %d Nakiekens stahn ut -pulls.wrong_commit_id = Kommitteren-ID mutt eene Kommitteren-ID up de Enn-Twieg wesen -pulls.no_merge_helper = Knips Tosamenföhrens-Instellens in de Repositoriums-Instellens an of föhr de Tosamenföhren vun Hand tosamen. -pulls.no_merge_wip = De Haalvörslag kann nich tosamenföhrt worden, denn dat is as noch in de Maak markeert. -pulls.no_merge_not_ready = De Haalvörslag is nich klaar tum Tosamenföhren, bekiek de Nakiekens-Tostand un de Överprüfens. -pulls.merge_pull_request = Tosamenföhrens-Kommitteren maken -pulls.has_pull_request = `Eenen Haalvörslag tüsken deesen Twiegen gifft dat al: %[2]s#%[3]d` -pulls.blocked_by_official_review_requests = Deeser Haalvörslag is blockeert, denn een of mehr offiziell Nakiekers hebben noch nich tostimmt. -pulls.blocked_by_changed_protected_files_1 = Deeser Haalvörslag is blockeert, denn dat ännert eene beschütt Datei: -pulls.no_merge_desc = De Haalvörslag kann nich tosamenföhrt worden, denn all Tosamenföhrens-Instellens sünd in deesem Repositorium utknipst. -issues.review.resolved_by = hett deesen Snack as lööst markeert -issues.reference_issue.body = Text -issues.content_history.delete_from_history = Ut Histoorje lösken -pulls.compare_changes = Nejer Haalvörslag -pulls.allow_edits_from_maintainers_desc = Brukers, well dat Recht hebben, to de Grund-Twieg to schrieven, düren ok up deesen Twieg schuuven -pulls.nothing_to_compare_and_allow_empty_pr = Deese Twiegen sünd gliek. De HV word leeg wesen. -pulls.title_desc_few = will %[1]d Kommitterens vun %[2]s na %[3]s tosamenföhren -pulls.data_broken = Deeser Haalvörslag is kaputt, denn de Gabel-Informatioon fehlt. -pulls.waiting_count_1 = %d Nakieken staht ut -issues.content_history.deleted = lösket -issues.content_history.created = maakt -issues.content_history.delete_from_history_confirm = Ut Histoorje lösken? -issues.blocked_by_user = Du kannst up deesem Repositorium keenen Gefall opmaken, denn de Repositoriums-Eegner hett di blockeert. -pulls.merged_title_desc_few = hett %[1]d Kommitterens vun %[2]s na %[3]s %[4]s tosamenföhrt -pulls.reject_count_1 = %d Bidde um Ännerns -pulls.blocked_by_user = Du kannst in deesem Repositorium keenen Haalvörslag opmaken, denn de Repositoriums-Eegner hett di blockeert. -pulls.no_merge_access = Du hest nich dat Recht, deesen Haalvörslag tosamentoföhren. -issues.comment.blocked_by_user = Du kannst up deesem Gefall keenen Kommentaar schrieven, denn de Repositoriums-Eegner of de Autor vun de Gefall hett di blockeert. -pulls.switch_comparison_type = Verglieks-Aard ännern -pulls.showing_only_single_commit = Blots Ännerns vun Kommitteren %[1]s wiesen -pulls.blocked_by_changed_protected_files_n = Deeser Haalvörslag is blockeert, denn dat ännert beschütt Dateien: -pulls.num_conflicting_files_n = %d unverdragelk Dateien -issues.content_history.edited = bewarkt -pulls.select_commit_hold_shift_for_range = Kommitteren utkören. Holl Umschalt un Klick, um eene Rieg uttokören -pulls.is_checking = Överprüfen vun Tosamenföhrens-Unverdragelkheidens löppt. Bidde versöök dat in körter Tied noch eenmaal. -pulls.can_auto_merge_desc = Deeser Haalvörslag kann automatisk tosamenföhrt worden. -pulls.approve_count_n = %d Tostimmens -pulls.rebase_merge_pull_request = Umbaseren dann fix na vörn -pulls.rebase_merge_commit_pull_request = Umbaseren dann Tosamenföhrens-Kommitteren maken -pulls.squash_merge_pull_request = Plattdrück-Kommitteren maken -pulls.fast_forward_only_merge_pull_request = Blots fix na vörn -pulls.merge_manually = Vun Hand tosamenföhrt -pulls.merge_commit_id = De Tosamenföhrens-Kommitteren-ID -pulls.require_signed_wont_sign = De Twieg bruukt unnerschrieven Kommitterens, aver deeses Tosamenföhren word nich unnerschrieven wesen -pulls.invalid_merge_option = Du kannst deese Tosamenföhrens-Instellen för deesen Haalvörslag nich bruken. -pulls.merge_conflict = Tosamenföhren fehlslagen: Dat hett bi’m Tosamenföhren eene Unverdragelkheid geven. Wenk: Versöök eene anner Tosamenföhrens-Aard -pulls.merge_conflict_summary = Fehler-Naricht -pulls.rebase_conflict = Tosamenföhren fehlslagen: Dat hett bi’m Umbaseren vun Kommitteren %[1]s eene Unverdragelkheid geven. Wenk: Versöök eene anner Tosamenföhrens-Aard -pulls.rebase_conflict_summary = Fehler-Naricht -pulls.merge_out_of_date = Tosamenföhren fehlslagen: Bi’m Tosamenföhren is de Grund verneeit worden. Wenk: Versöök dat noch eenmaal. -pulls.head_out_of_date = Tosamenföhren fehlslagen: Bi’m Tosamenföhren is de Kopp verneeit worden. Wenk: Versöök dat noch eenmaal. -pulls.push_rejected_summary = Kumpleete Oflehnens-Naricht -pulls.push_rejected = Schuven fehlslagen: Dat Schuven is oflehnt worden. Bidde överprüüf de Git-Hakens för deeses Repositorium. -pulls.open_unmerged_pull_exists = `Du kannst dat nich weer opmaken, denn dat gifft een anner open Haalvörslag (#%d) mit akkeraat de sülven Eegenskuppen.` -pulls.status_checking = Eenige Överprüfens stahn ut -pulls.status_checks_success = All Överprüfens sünd klaar -pulls.status_checks_warning = Eenige Överprüfens hebben Wahrschauens mellt -pulls.status_checks_error = Eenige Överprüfens hebben Fehlers mellt -pulls.status_checks_failure = Eenige Överprüfens sünd fehlslagen -pulls.status_checks_requested = Nödig -pulls.status_checks_hide_all = All Överprüfens verbargen -pulls.status_checks_details = Mehr Informatioonen -pulls.status_checks_show_all = All Överprüfens wiesen -pulls.update_branch_rebase = Twieg mit Umbaseren vernejen -pulls.outdated_with_base_branch = De Twieg is tegen de Grund-Twieg verollt -pulls.close = Haalvörslag dichtmaken -pulls.closed_at = `hett deesen Haalvörslag %[2]s dichtmaakt` -pulls.reopened_at = `hett deesen Haalvörslag %[2]s weer opmaakt` -pulls.cmd_instruction_hint = Wies Oorderreeg-Instruksjes -pulls.cmd_instruction_checkout_title = Utchecken -pulls.cmd_instruction_merge_title = Tosamenföhren -pulls.clear_merge_message = Tosamenföhrens-Naricht leegmaken -pulls.reopen_failed.head_branch = De Haalvörslag kann nich weer opmaakt worden, denn de Kopp-Twieg gifft dat nich mehr. -pulls.reopen_failed.base_branch = De Haalvörslag kann nich weer opmaakt worden, denn de Grund-Twieg gifft dat nich mehr. -pulls.made_using_agit = AGit -pulls.auto_merge_when_succeed = Automatisk Tosamenföhren, wenn all Överprüfens kumpleet sünd -pulls.auto_merge_newly_scheduled_comment = ` hett de Haalvörslag %[1]s sett, sik tosamentoföhren, wenn all Överprüfens kumpleet sünd` -pulls.delete.title = Deesen Haalvörslag lösken? -pulls.recently_pushed_new_branches = Du hest to de Twieg %[1]s %[2]s schuven -milestones.new = Nejer Marksteen -milestones.closed = %s dichtmaakt -milestones.open = Opmaken -milestones.close = Dichtmaken -milestones.completeness = %d%% Kumpleet -milestones.create = Marksteen maken -milestones.desc = Beschrieven -milestones.due_date = Anstahns-Datum (kann leeg wesen) -milestones.create_success = De Marksteen »%s« is maakt worden. -milestones.edit = Marksteen bewarken -milestones.edit_subheader = Markstenen organiseren Gefallens un verfolgen Wiederkomen. -milestones.cancel = Ofbreken -milestones.modify = Marksteen vernejen -milestones.edit_success = Marksteen »%s« is verneeit worden. -milestones.deletion = Marksteen lösken -pulls.has_merged = Fehlslagen: De Haalvörslag is tosamenföhrt worden, du kannst nich noch eenmaal tosamenföhren of de Enn-Twieg ännern. -pulls.unrelated_histories = Tosamenföhren fehlslagen: De Tosamenföhrens-Kopp un -Grund hebben keene gemeensame Histoorje. Wenk: Versöök eene anner Tosamenföhrens-Aard -pulls.update_not_allowed = Du düürst deesen Twieg nich vernejen -pulls.commit_ref_at = `hett deesen Haalvörslag %[2]s vun eenem Kommitteren benöömt` -pulls.auto_merge_newly_scheduled = De Haalvörslag weer sett, sik tosamentoföhren, wenn all Överprüfens kumpleet sünd. -milestones.clear = Leeg maken -pulls.push_rejected_no_message = Schuven fehlslagen: Dat Schuven is sünner feerne Naricht oflehnt worden. Bidde överprüüf de Git-Hakens för deeses Repositorium -pulls.update_branch = Twieg mit Tosamenföhren vernejen -pulls.update_branch_success = Twieg is verneeit worden -pulls.cmd_instruction_checkout_desc = Check in dienem Projekt-Repositorium eenen nejen Twieg ut un probeer de Ännerns ut. -pulls.cmd_instruction_merge_desc = Föhr de Ännerns tosamen un veneei up Forgejo. -pulls.cmd_instruction_merge_warning = Wahrschau: De Instellens »Tosamenföhren vun Hand automatisk erkennen« is för deeses Repositorium utknipst, du muttst deesen Haalvörslag daarna noch as vun Hand tosamenföhrt markeren. -pulls.auto_merge_button_when_succeed = (Wenn Överprüfens kumpleet sünd) -pulls.auto_merge_cancel_schedule = Automatisk Tosamenföhren ofbreken -pulls.auto_merge_canceled_schedule = Dat automatisk Tosamenföhren is för deesen Haalvörslag ofbroken worden. -pulls.agit_explanation = Mit de AGit-Warkwies maakt. AGit lett Bidragers Ännerns mit »git push« vörslagen, sünner eene Gabel of eenen nejen Twieg to maken. -pulls.auto_merge_has_pending_schedule = %[1]s hett de Haalvörslag %[2]s sett, sik tosamentoföhren, wenn all Överprüfens kumpleet sünd. -pulls.auto_merge_not_scheduled = Deeser Haalvörslag is nich för dat automatisk Tosamenföhren sett. -pull.deleted_branch = (lösket):%s -pulls.auto_merge_canceled_schedule_comment = ` hett dat automatisk Tosamenföhren vun deesem Haalvörslag, wenn all Överprüfens kumpleet sünd, %[1]s ofbroken` -pulls.delete.text = Willst du deesen Haalvörslag würrelk lösken? (Dat lösket för all Tieden all Inhollen. Wenn du ’t blots archiveren willst, maakt ’t lever blots dicht) -milestones.update_ago = %s verneeit -milestones.no_due_date = Keen Anstahns-Datum -milestones.new_subheader = Markstenen könen di hülpen, Gefallens to organiseren un hör Wiederkomen to verfolgen. -milestones.title = Titel -milestones.invalid_due_date_format = Anstahns-Datums-Formaat mutt »JJJJ-MM-DD« wesen. -milestones.deletion_desc = Wenn een Marksteen lösket word, word dat vun all benöömt Gefallens wegdaan. Wiedermaken? -milestones.deletion_success = De Marksteen is lösket worden. -milestones.filter_sort.name = Naam -milestones.filter_sort.latest_due_date = Feernst Anstahns-Datum -milestones.filter_sort.least_complete = Minnst kumpleet -milestones.filter_sort.most_complete = Meest kumpleet -milestones.filter_sort.most_issues = Meest Gefallens -signing.will_sign = Deeses Kommitteren word mit de Slötel »%s« unnerschreven. -signing.wont_sign.nokey = Deese Instanz hett keenen Slötel, um deeses Kommitteren to unnerschrieven. -signing.wont_sign.never = Kommitterens worden nie unnerschrieven. -signing.wont_sign.always = Kommitterens worden alltieden unnerschrieven. -signing.wont_sign.twofa = Du muttst Twee-Faktooren-Anmellen anknipsen, um Kommitterens to unnerschrieven. -signing.wont_sign.headsigned = Deeses Kommitteren word nich unnerschrieven, denn dat Kopp-Kommitteren is nich unnerschreven. -signing.wont_sign.basesigned = Deeses Kommitteren word nich unnerschrieven, denn dat Grund-Kommitteren is nich unnerschreven. -signing.wont_sign.commitssigned = Dat Tosamenföhren word nich unnerschrieven, denn de Kommitterens vun Belang sünd nich all unnerschreven. -signing.wont_sign.approved = Dat Tosamenföhren word nich unnerschrieven, denn de HV is nich tostimmt. -signing.wont_sign.not_signed_in = Du büst nich anmellt. -ext_wiki = Frömdes Wiki -wiki = Wiki -wiki.welcome = Willkomen im Wiki. -wiki.desc = Schriev un deel Dokumenterens mit Mitarbeiders. -wiki.create_first_page = Maak de eerste Sied -wiki.page = Sied -wiki.filter_page = Sied filtern -wiki.new_page = Sied -wiki.page_title = Sied-Titel -wiki.page_content = Sied-Text -wiki.default_commit_message = Schriev eene Notiz över deeses Sieden-Vernejen (wenn du willst). -wiki.save_page = Sied sekern -wiki.cancel = Ofbreken -wiki.last_commit_info = %s hett diese Sied %s bewarkt -wiki.edit_page_button = Bewarken -wiki.new_page_button = Neje Sied -wiki.file_revision = Sied-Versioon -wiki.back_to_wiki = Torügg tur Wiki-Sied -wiki.delete_page_button = Sied lösken -wiki.delete_page_notice_1 = Wenn du de Wiki-Sied »%s« löskest, kann se nich mehr torügghaalt worden. Wiedermaken? -wiki.reserved_page = De Wiki-Sied-Naam »%s« is vörbehollen. -wiki.pages = Sieden -wiki.last_updated = Tolest %s verneeit -wiki.original_git_entry_tooltip = Wies de echte Git-Datei un bruuk nich de fründelk Verwies. -wiki.search = Im Wiki söken -wiki.no_search_results = Keene Resultaten -activity = Doon -activity.navbar.pulse = Puls -activity.navbar.code_frequency = Quelltext-Frequenz -activity.navbar.contributors = Bidragers -activity.navbar.recent_commits = Leste Kommitterens -activity.period.filter_label = Tied: -activity.period.daily = 1 Dag -activity.period.halfweekly = 3 Dagen -activity.overview = Översicht -activity.active_prs_count_1 = %d aktiiv Haalvörslag -activity.merged_prs_count_1 = Tosamenföhrt Haalvörslag -activity.opened_prs_count_1 = Nejer Haalvörslag -activity.title.user_n = %d Brukers -activity.title.prs_n = %d Haalvörslagen -activity.title.prs_merged_by = %s vun %s tosamenföhrt -activity.title.prs_opened_by = %s vun %s opmaakt -activity.merged_prs_label = Tosamenföhrt -activity.opened_prs_label = Neei vörslagen -activity.active_issues_count_1 = %d aktiiv Gefall -activity.closed_issues_count_1 = Dichtmaakt Gefall -activity.title.issues_closed_from = %s vun %s dichtmaakt -activity.title.issues_created_by = %s vun %s opmaakt -activity.new_issues_count_1 = Nejes Gefall -activity.new_issues_count_n = Neje Gefallens -activity.new_issue_label = Opmaakt -activity.closed_issue_label = Dichtmaakt -activity.title.unresolved_conv_1 = %d nich lööst Snack -activity.unresolved_conv_desc = Deese körtens ännert Gefallens un Haalvörslagen sünd noch nich lööst worden. -activity.unresolved_conv_label = Open -activity.published_release_label = Publizeren -activity.published_tag_label = Mark -activity.no_git_activity = In deeser Tied hett dat keen Kommitterens-Doon geven. -activity.git_stats_exclude_merges = Sünner Tosamenföhrens -activity.git_stats_author_1 = %d Autor -activity.git_stats_author_n = %d Autoren -activity.git_stats_pushed_1 = hett -activity.git_stats_pushed_n = hebben -activity.git_stats_commit_1 = %d Kommittteren -activity.git_stats_commit_n = %d Kommittterens -activity.git_stats_push_to_branch = to %s un -activity.git_stats_push_to_all_branches = to all Twiegen schuven. -activity.git_stats_on_default_branch = Up %s -activity.git_stats_files_changed_n = ännert worden -activity.git_stats_addition_n = %d neje Riegen -activity.git_stats_addition_1 = %d neje Rieg -activity.git_stats_and_deletions = un -activity.git_stats_deletion_1 = %d lösket Rieg geven -activity.commit = Kommitterens-Doon -contributors.contribution_type.filter_label = Bidrag-Aard: -contributors.contribution_type.additions = Neje Riegen -settings = Instellens -settings.options = Repositorium -settings.collaboration = Mitarbeiders -settings.collaboration.admin = Chef -settings.collaboration.write = Schrieven -settings.collaboration.read = Lesen -settings.collaboration.owner = Eegner -settings.hooks = Internett-Hakens -settings.collaboration.undefined = Nich sett -settings.githooks = Git-Hakens -settings.basic_settings = Grund-Instellens -settings.federation_not_enabled = Verdeeltheid is in diener Instanz utknipst. -settings.mirror_settings.docs.disabled_push_mirror.instructions = Sett dien Repositorium, dat Kommitterens, Markens un Twiegen automatisk vun eenem anner Repositorium haalt worden. -settings.mirror_settings.docs.disabled_push_mirror.pull_mirror_warning = Jüüst nu kann dat blots in de Menü »Nejer Umtreck« maakt worden. För mehr Informatioonen, bekiek bidde: -settings.mirror_settings.docs.disabled_push_mirror.info = Schuuv-Spegels sünd vun dienem Sied-Chef utknipst worden. -settings.mirror_settings.docs.no_new_mirrors = Dien Repositorium spegelt Ännerns to of vun eenem anner Repositorium. Bidde wees wiss, dat du jüüst nu keene nejen Spegels maken kannst. -settings.mirror_settings.docs.can_still_use = Ok wenn du keene Spegels bewarken of neje maken kannst, düürst du diene bestahn Spegels wiederhen bruken. -settings.mirror_settings.docs.pull_mirror_instructions = Um eenen Haal-Spegel intorichten, bekiek bidde: -settings.mirror_settings.docs.more_information_if_disabled = Hier lehrst du mehr över Schuuv- un Haal-Spegels: -settings.mirror_settings.docs.doc_link_title = Wo spegel ick Repositoriums? -settings.mirror_settings.mirrored_repository = Spegelt Repositorium -settings.mirror_settings.direction = Richtung -settings.mirror_settings.direction.pull = Halen -settings.mirror_settings.direction.push = Schuven -settings.mirror_settings.last_update = Tolest verneeit -settings.mirror_settings.push_mirror.edit_sync_time = Spegelns-Tiedofstand bewarken -settings.mirror_settings.push_mirror.none_ssh = Nix -settings.units.overview = Översicht -settings.mirror_settings.push_mirror.copy_public_key = Publiken Slötel koperen -settings.pull_mirror_sync_in_progress = Haalt jüüst Ännerns vun de feernen Stee %s. -settings.pull_mirror_sync_quota_exceeded = Quote överweggahn, haalt keene Ännerns. -settings.site = Internett-Sied -settings.update_settings = Instellens sekern -settings.branches.update_default_branch = Höövd-Twieg vernejen -settings.branches.add_new_rule = Neje Örder hentofögen -settings.advanced_settings = Mehr Instellens -settings.use_internal_wiki = Inbaut Wiki bruken -settings.external_wiki_url = URL vum frömden Wiki -settings.use_internal_issue_tracker = Inbaut Gefall-Verfolger bruken -settings.external_tracker_url = URL vum frömden Gefall-Verfolger -settings.tracker_url_format = URL-Formaat vum frömden Gefall-Verfolger -settings.tracker_url_format_error = Dat URL-Formaat vum frömden Gefall-Verfolger is keene gültige URL. -settings.tracker_issue_style.numeric = Numerisk -settings.tracker_issue_style.regexp = Regel-Utdruck -settings.tracker_issue_style.regexp_pattern = Regel-Utdruck-Muster -settings.enable_timetracker = Tied-Erfaten anknipsen -settings.allow_only_contributors_to_track_time = Blots Bidragers Tied erfaten laten -settings.pulls_desc = Haalvörslagen im Repositorium anknipsen -settings.pulls.ignore_whitespace = Leegtekens för Unverdragelkheidens minnachten -settings.pulls.allow_rebase_update = Verlöven, Haalvörslag-Twieg dör Umbaseren to vernejen -settings.pulls.default_delete_branch_after_merge = Haalvörslag-Twieg na de Tosamenföhren automatisk lösken -settings.pulls.default_allow_edits_from_maintainers = Bewarkens vun Liddmaten normaal verlöven -settings.releases_desc = Repositorium-Publizerens anknipsen -settings.packages_desc = Repositorium-Paketlist anknipsen -settings.projects_desc = Repositorium-Projekten anknipsen -settings.admin_settings = Chef-Instellens -settings.admin_code_indexer = Quelltext-Indizerer -settings.admin_stats_indexer = Quelltext-Statistiken-Indizerer -settings.admin_indexer_commit_sha = Tolest indizeert Kommitteren -settings.admin_indexer_unindexed = Nich indizeert -settings.reindex_requested = Nejes Indizeren vörmarkt -settings.reindex_button = Tum Neeiindizeren vörmarken -settings.danger_zone = Gefahren-Zoon -settings.convert_succeed = De Spegel is in een normaales Repositorium umwannelt worden. -settings.convert_fork = To normaalem Repositorium umwanneln -settings.convert_fork_desc = Du kannst deese Gabel in een normaales Repositorium umwanneln. Dat kann nich torüggnohmen worden. -settings.convert_fork_confirm = Repositorium umwanneln -settings.convert_fork_succeed = De Gabel is in een normaales Repositorium umwannelt worden. -settings.transfer.title = Eegnerskupp överdragen -settings.transfer.button = Eegnerskupp överdragen -settings.transfer.modal.title = Eegnerskupp överdragen -settings.transfer.rejected = Repositoriums-Överdragen is oflehnt worden. -settings.transfer.success = Repositoriums-Överdragen is ofsluten. -settings.transfer_abort = Överdragen ofbreken -settings.transfer_abort_invalid = Du kannst een Repositoriums-Överdragen, wat dat nich gifft, nich ofbreken. -settings.confirmation_string = Utwiesens-Text -settings.transfer_in_progress = Een Överdraag löppt al. Bidde breck dat eerst of, wenn du deeses Repositorium to een anner Bruker överdragen willst. -settings.transfer_perform = Överdragen dörföhren -settings.transfer_succeed = Dat Repositorium is överdragen worden. -settings.transfer_quota_exceeded = De neje Eegner (%s) is över de Quote. Dat Repositorium is nich överdragen worden. -milestones.filter_sort.earliest_due_data = Nahst Anstahns-Datum -milestones.filter_sort.least_issues = Minnst Gefallens -wiki.wiki_page_revisions = Sied-Versioonen -activity.period.yearly = 1 Jahr -activity.title.issues_1 = %s Gefall -activity.git_stats_files_changed_1 = ännert worden -activity.git_stats_deletion_n = %d lösket Riegen geven -contributors.contribution_type.deletions = Lösket Riegen -settings.federation_following_repos = URLs vun Nagahns-Repositoriums. Trennt mit »;«, keene Leegtekens. -settings.mirror_settings.docs = Sett dien Repositorium, dat Kommitterens, Markens un Twiegen automatisk mit eenem anner Repositorium spegelt worden. -settings.mirror_settings.push_mirror.add = Schuuv-Spegel hentofögen -settings.units.add_more = Mehr anknipsen -settings.branches.switch_default_branch = Höövd-Twieg ännern -settings.use_external_wiki = Frömdes Wiki bruken -settings.external_tracker_url_error = De URL vum frömden Gefall-Verfolger is keene gültige URL. -settings.actions_desc = Integreerte CI-/CD-Affolgens mit Forgejo-Aktioonen anknipsen -settings.convert_notices_1 = Dat wannelt deesen Spegel in een normaales Repositorium um un kann nich torüggnohmen worden. -settings.convert_confirm = Repositorium umwanneln -signing.wont_sign.parentsigned = Deeses Kommitteren word nich unnerschrieven, denn dat Ollern-Kommitteren is nich unnerschreven. -wiki.page_already_exists = Eene Wiki-Sied mit de sülven Naam gifft dat al. -activity.period.weekly = 1 Week -activity.period.monthly = 1 Maant -activity.closed_issues_count_n = Dichtmaakt Gefallens -settings.desc = Unner »Instellens« kannst du de Instellens för dat Repositorium verwalten -settings.federation_apapiurl = Verdeeltheids-URL vun deesem Repositorium. Kopeer un föög dat in de Verdeeltheids-Instellens vun eenem anner Repositorium as eene URL vun eenem Nagahns-Repositorium in. -settings.mirror_settings.docs.doc_link_pull_section = de Deel »Vun eenem feernen Repositorium halen« in de Dokumenteren. -settings.mirror_settings.pushed_repository = Schuuvt Repositorium -settings.units.units = Eenheiden -settings.wiki_globally_editable = Elkeenwell verlöven, dat Wiki to bewarken -settings.tracker_issue_style.regexp_pattern_desc = De eerste Fangens-Grupp word in Stee vun {index} bruukt. -settings.convert = To normaalem Repositorium umwanneln -settings.convert_desc = Du kannst deesen Spegel in een normaales Repositorium umwanneln. Dat kann nich torüggnohmen worden. -settings.transfer_abort_success = Dat Repositoriums-Överdragen na %s is ofbroken worden. -signing.wont_sign.error = Bi’m Nakieken, of dat Kommitteren unnerschrieven worden kann, hett dat eenen Fehler geven. -signing.wont_sign.pubkey = Deeses Kommitteren word nich unnerschrieven, denn du hest in dienem Konto keenen publiken Slötel angeven. -activity.active_prs_count_n = %d aktiiv Haalvörslagen -activity.merged_prs_count_n = Tosamenföhrt Haalvörslagen -activity.title.user_1 = %d Bruker -activity.title.prs_1 = %d Haalvörslag -activity.active_issues_count_n = %d aktiiv Gefallens -activity.title.issues_n = %s Gefallens -activity.title.unresolved_conv_n = %d nich lööst Snacks -activity.title.releases_1 = %d Publizeren -activity.git_stats_file_1 = is %d Datei -contributors.contribution_type.commits = Kommitterens -settings.mirror_settings = Spegel-Instellens -settings.federation_settings = Verdeeltheid-Instellens -settings.mirror_settings.docs.disabled_pull_mirror.instructions = Sett dien Repositorium, dat Kommitterens, Markens un Twiegen automatisk to eenem anner Repositorium schuuvt worden. Haal-Spegels sünd vun dienem Sied-Chef utknipst worden. -settings.mirror_settings.docs.pulling_remote_title = Vun eenem feernen Repositorium halen -settings.sync_mirror = Nu spegeln -settings.update_mirror_settings = Spegel-Instellens vernejen -activity.git_stats_additions = un dat hett -settings.mirror_settings.push_mirror.none = Keene Schuuv-Spegels inricht -settings.mirror_settings.push_mirror.remote_url = Feerne Git-Repositoriums-URL -settings.wiki_desc = Repositoriums-Wiki anknipsen -settings.external_wiki_url_error = De URL vum frömden Wiki is keene gültige URL. -settings.use_external_issue_tracker = Frömden Gefall-Verfolger bruken -wiki.welcome_desc = Dat Wiki lett di Dokumenterens mit Mitarbeiders schrieven un delen. -wiki.page_name_desc = Giff eenen Naam för deese Wiki-Sied in. Eenige besünnere Namens sünd: »Home«, »_Sidebar« un »_Footer«. -activity.period.quarterly = 3 Maanten -activity.period.semiyearly = 6 Maanten -activity.opened_prs_count_n = Neje Haalvörslagen -settings.tracker_issue_style.alphanumeric = Alphanumerisk -settings.transfer_owner = Nejer Eegner -activity.title.releases_n = %d Publizerens -activity.title.releases_published_by = %s vun %s publizeert -activity.published_prerelease_label = Vör-Publizeren -activity.git_stats_file_n = sünd %d Dateien -settings.push_mirror_sync_in_progress = Schuuvt jüüst Ännerns to de feernen Stee %s. -settings.pulls.enable_autodetect_manual_merge = Tosamenföhren vun Hand automatisk erkennen (Wahrschau: In eenigen besünneren Fallen kann dat falsk oordelen) -settings.convert_fork_notices_1 = Dat wannelt deese Gabel in een normaales Repositorium um un kann nich torüggnohmen worden. -settings.enter_repo_name = Giff de Eegner un Repositoriums-Naam jüüst so in, as se wiesen worden: -settings.transfer_notices_2 = - Du hest wiederhen Togriep up dat Repositorium, wenn du dat to eener Vereenigung överdraggst, waar du een Eegner büst. -settings.transfer_started = Deeses Repositorium is tum Överdragen vörmarkt worden un wacht up Verlööv vun »%s« -settings.external_wiki_url_desc = Besökers worden to de URL vum frömden Wiki umleit, wenn se up de Wiki-Karteikaart klicken. -settings.issues_desc = Repositoriums-Gefall-Verfolger anknipsen -settings.external_tracker_url_desc = Besökers worden to de URL vum frömden Gefall-Verfolger umleit, wenn se up de Gefallens-Karteikaart klicken. -settings.tracker_issue_style = Tahlen-Formaat vum frömden Gefall-Verfolger -settings.tracker_url_format_desc = Bruuk de Utdruckens {user}, {repo} un {index} för de Brukernaam, Repositoriums-Naam un Gefall-Tahl. -settings.admin_enable_health_check = Repositorium-Gesundheids-Överprüfens anknipsen (git fsck) -settings.admin_enable_close_issues_via_commit_in_any_branch = Een Gefall över een Kommitteren sluten, wat in eenem nich-Höövd-Twieg maakt worden is -settings.new_owner_has_same_repo = De neje Eegner hett al een Repositorium mit de sülven Naam. Bidde köör een anner Naam ut. -settings.new_owner_blocked_doer = De neje Eegner hett di blockeert. -settings.transfer_desc = Överdraag deeses Repositorium to eenem Bruker of eener Vereenigung, waar du Chef-Rechtens hest. -settings.transfer_notices_1 = - Du hest keen Togriep mehr up dat Repositorium, wenn du dat to eenem enkelt Bruker överdraggst. -settings.transfer_notices_3 = - Wenn dat Repositorium privaat is un to eenem enkelt Bruker överdragen word, passt deese Aktioon up, dat de Bruker tominnst Lesen-Togriep hett (un ännert de Rechtens as nödig). -settings.signing_settings = Unnerschrift-Utwiesens-Instellens -settings.trust_model.collaborator = Mitarbeider -settings.trust_model.collaborator.long = Mitarbeider: Unnerschriftens vun Mitarbeiders vertrauen -settings.trust_model.committer = Kommitterer -settings.trust_model.committer.long = Kommitterer: Vertrau Unnerschriften, wat to de Kommitterer passen (Dat is jüüst as up GitHub un dwingt, dat Kommitterens, wat vun Forgejo unnerschrieven worden, Forgejo as Kommitterer hebben) -settings.trust_model.committer.desc = Gültige Unnerschriften worden blots dann as »vertraut« markeert, wenn se to de Kommitterer passen, un sünst as »unvertraut«. Dat dwingt Forgejo, de Kommitterer up unnerschrieven Kommitterens to wesen, un de eegentlik Kommitterer word mit Nadragen »Co-authored-by:« un »Co-committed-by:« im Kommitteren vermarkt. De normaale Slötel för Forgejo mutt to eenem Bruker in de Datenbank passen. -settings.trust_model.collaboratorcommitter = Mitarbeider+Kommitterer -settings.trust_model.collaboratorcommitter.long = Mitarbeider+Kommitterer: Vertrau Unnerschriften vun Mitarbeiders, wat to de Kommitterer passen -settings.wiki_rename_branch_main_notices_1 = Dat KANN NICH torüggnohmen worden. -settings.wiki_rename_branch_main_notices_2 = Dat benöömt för all Tieden de binnern Twieg vun de Repositoriums-Wiki vun %s um. Bestahn Utcheckens mutten dann verneeit worden. -settings.wiki_branch_rename_failure = Kunn de Twieg-Naam vun de Wiki vun de Repositorium nich normaliseren. -settings.confirm_wiki_branch_rename = De Wiki-Twieg umbenöömen -settings.wiki_delete = Wiki-Daten lösken -settings.wiki_delete_desc = De Repositoriums-Wiki-Daten to lösken is för all Tieden un kann nich torüggnohmen worden. -settings.wiki_delete_notices_1 = - Dat word dat Repositoriums-Wiki för %s för all Tieden lösken un utknipsen. -settings.confirm_wiki_delete = Wiki-Daten lösken -settings.delete = Deeses Repositorium lösken -settings.delete_desc = Een Repositorium to lösken is för all Tieden un kann nich torüggnohmen worden. -settings.delete_notices_1 = - Dat KANN NICH torüggnohmen worden. -settings.trust_model.default = Normaales Vertroens-Modell -settings.wiki_deletion_success = De Repositoriums-Wiki-Daten sünd lösket worden. -settings.trust_model = Unnerschrift-Vertroens-Modell -settings.trust_model.collaborator.desc = Gültige Unnerschriften vun Mitarbeiders in deesem Repositorium worden as »vertraut« markeert (of se to de Kommitterer passen of nich). Annerns worden gültige Unnerschriften as »unvertraut« markeert, wenn de Unnerschrift tum Kommitterer passt, un as »passt nich«, wenn nich. -settings.trust_model.collaboratorcommitter.desc = Gültige Unnerschriften vun Mitarbeiders in deesem Repositorium worden as »vertraut« markeert, wenn se to de Kommitterer passen. Annerns worden gültige Unnerschriften as »unvertraut« markeert, wenn de Unnerschrift tum Kommitterer passt, un as »passt nich«, wenn nich. Dat dwingt Forgejo, de Kommitterer up unnerschrieven Kommitterens to wesen, un de eegentlik Kommitterer word mit Nadragen »Co-authored-by:« un »Co-committed-by:« im Kommitteren vermarkt. De normaale Slötel för Forgejo mutt to eenem Bruker in de Datenbank passen. -settings.trust_model.default.desc = Dat normaale Repositoriums-Vertroens-Modell för deese Instanz bruken. -settings.wiki_rename_branch_main_desc = De Twieg, wat binnern vun de Wiki bruukt word, to »%s« umbenöömen. Deeses Ännern is för all Tieden un kann nich torüggnohmen worden. -settings.wiki_rename_branch_main = De Wiki-Twieg-Naam normaliseren -settings.wiki_branch_rename_success = De Twieg-Naam vun de Wiki vun de Repositorium is normaliseert worden. -settings.delete_notices_2 = - Dat lösket för all Tieden dat Repositorium %s mit all Quelltexten, Gefallens, Kommentaren, Wiki-Daten un Mitarbeider-Instellens. -settings.deletion_success = Dat Repositorium is lösket worden. -settings.update_settings_success = De Repositoriums-Instellens sünd verneeit worden. -settings.add_collaborator_success = De Mitarbeider is hentoföögt worden. -settings.add_collaborator_owner = Kann eenen Eegner nich as Mitarbeider hentofögen. -settings.add_collaborator_duplicate = Deeser Mitarbeider is al to de Repositorium hentoföögt worden. -settings.add_collaborator_blocked_our = Kann de Mitarbeider nich hentofögen, denn de Repositoriums-Eegner hett hüm blockeert. -settings.add_collaborator_blocked_them = Kann de Mitarbeider nich hentofögen, denn he hett de Repositoriums-Eegner blockeert. -settings.delete_collaborator = Wegdoon -settings.collaborator_deletion = Mitarbeider wegdoon -settings.collaborator_deletion_desc = Wenn du eenen Mitarbeider wegdoost, hett he keenen Togriep mehr up deeses Repositorium. Wiedermaken? -settings.remove_collaborator_success = De Mitarbeider is wegdaan worden. -settings.org_not_allowed_to_be_collaborator = Vereenigungen könen nich as Mitarbeider hentoföögt worden. -settings.change_team_access_not_allowed = Blots de Vereenigungs-Eegner kann de Klottjen-Togriep to de Repositorium ännern -settings.team_not_in_organization = De Klottje is nich in de sülve Vereenigung as dat Repositorium -settings.teams = Klottjen -settings.add_team = Klottje hentofögen -settings.add_team_duplicate = Klottje hett dat Repositorium al -settings.add_team_success = De Klottje hett nu Togriep to de Repositorium. -settings.change_team_permission_tip = De Klottjen-Rechte sünd up de Klottjen-Instellens-Sied sett un könen nich pro Repositorium ännert worden -settings.delete_team_tip = Deese Klottje hett Togriep to all Repositoriums un kann nich lösket worden -settings.remove_team_success = De Togriep vun de Klottje to de Repositorium is wegdaan worden. -settings.add_webhook = Internett-Haak hentofögen -settings.add_webhook.invalid_channel_name = Internett-Haak-Kanaal-Naam düür nich leeg wesen un mutt mehr as blot de #-Bookstaav enthollen. -settings.webhook_deletion = Internett-Haak wegdoon -settings.webhook_deletion_success = De Internett-Haak is wegdaan worden. -settings.webhook.test_delivery = Levern testen -settings.webhook.test_delivery_desc = Deesen Internett-Haak mit eenem falsken Vörfall testen. -settings.webhook.test_delivery_desc_disabled = Aktiveer deesen Internett-Haak, um hüm mit eenem falsken Vörfall to testen. -settings.webhook.request = Anfraag -settings.webhook.response = Antwoord -settings.webhook.payload = Inholl -settings.webhook.body = Text -settings.webhook.replay.description_disabled = Aktiveer deesen Internett-Haak, um hüm weer uttoföhren. -settings.githook_edit_desc = Wenn de Haak nich aktiiv is, word Bispööl-Inholl wiest. Wenn du de Inholl leeg lettst, word deeser Haak utknipst. -settings.githook_name = Haak-Naam -settings.githook_content = Haak-Inholl -settings.update_githook = Haak vernejen -settings.payload_url = Enn-URL -settings.http_method = HTTP-Aard -settings.content_type = Aard vum POST-Inholl -settings.secret = Geheemst -settings.slack_username = Brukernaam -settings.slack_color = Klöör -settings.discord_username = Brukernaam -settings.discord_icon_url = Bill-URL -settings.event_desc = Utlösen för: -settings.event_push_only = Schuuv-Vörfall -settings.event_send_everything = All Vörfallen -settings.event_choose = Eegene Vörfallen … -settings.event_header_repository = Repositoriums-Vörfallen -settings.event_create = Maken -settings.event_create_desc = Twieg of Mark maakt. -settings.event_delete = Lösken -settings.event_delete_desc = Twieg of Mark lösket. -settings.event_fork_desc = Repositorium gabelt. -settings.event_wiki = Wiki -settings.event_release = Publizeren -settings.event_release_desc = Publizeren in eenem Repositorium maakt, verneeit of lösket. -settings.event_push = Schuuv -settings.event_push_desc = Git-Schuuv to eenem Repositorium. -settings.event_repository = Repositorium -settings.event_repository_desc = Repositorium maakt of lösket. -settings.event_header_issue = Gefall-Vörfallen -settings.event_issues_desc = Gefall opmaakt, dichtmaakt, weer opmaakt of bewarkt. -settings.event_issue_assign = Towiesen -settings.event_issue_label = Vermarkens -settings.event_issue_milestone = Markstenen -settings.event_issue_milestone_desc = Marksteen hentoföögt, wegdaan of ännert. -settings.event_issue_comment = Kommentaren -settings.event_issue_comment_desc = Gefall-Kommentaar maakt, bewarkt of lösket. -settings.event_header_pull_request = Haalvörslag-Vörfallens -settings.event_pull_request = Ännern -settings.event_pull_request_desc = Haalvörslag opmaakt, dichtmaakt, weer opmaakt of bewarkt. -settings.event_pull_request_assign = Towiesen -settings.event_pull_request_assign_desc = Haalvörslag towiesen of Towiesen wegdaan. -settings.event_pull_request_label = Vermarkens -settings.event_pull_request_label_desc = Haalvörslag-Vermarkens hentoföögt of wegdaan. -settings.event_pull_request_milestone = Markstenen -settings.event_pull_request_milestone_desc = Marksteen hentoföögt, wegdaan of ännert. -settings.event_pull_request_comment = Kommentaren -settings.event_pull_request_comment_desc = Haalvörslag-Kommentaar maakt, bewarkt of lösket. -settings.event_pull_request_review = Nakiekens -settings.event_pull_request_review_desc = Haalvörslag tostimmt of torüggwiest of Nakiekens-Kommentaren hentoföögt. -settings.event_pull_request_sync = Verneeit -settings.event_pull_request_sync_desc = Twieg automatisk mit de Enn-Twieg verneeit. -settings.event_pull_request_review_request = Nakiekens-Anfragen -settings.event_pull_request_review_request_desc = Haalvörslag-Nakieken anfraggt of Nakiekens-Anfraag wegdaan. -settings.event_pull_request_approvals = Haalvörslag-Tostimmens -settings.event_pull_request_merge = Haalvörslag-Tosamenföhren -settings.event_pull_request_enforcement = Dwingen -settings.event_package = Paket -settings.event_package_desc = Paket in eenem Repositorium maakt of lösket. -settings.branch_filter = Twieg-Filter -settings.add_hook_success = De Internett-Haak is hentoföögt worden. -settings.update_webhook = Internett-Haak vernejen -settings.update_hook_success = De Internett-Haak is verneeit worden. -settings.delete_webhook = Internett-Haak wegdoon -settings.recent_deliveries = Leste Leverns -settings.hook_type = Haak-Aard -settings.slack_token = Teken -settings.graphql_url = GraphQL-URL -settings.web_hook_name_gitea = Gitea -settings.web_hook_name_discord = Discord -settings.web_hook_name_telegram = Telegram -settings.web_hook_name_matrix = Matrix -settings.web_hook_name_msteams = Microsoft Teams -settings.web_hook_name_feishu = Feishu / Lark Suite -settings.web_hook_name_feishu_only = Feishu -settings.web_hook_name_larksuite_only = Lark Suite -settings.web_hook_name_wechatwork = WeCom (WeChat Work) -settings.web_hook_name_packagist = Packagist -settings.packagist_username = Packagist-Brukernaam -settings.packagist_api_token = API-Teken -settings.packagist_package_url = Packagist-Paket-URL -settings.web_hook_name_sourcehut_builds = Up SourceHut bauen -settings.sourcehut_builds.manifest_path = Padd tum Bau-Manifest -settings.sourcehut_builds.visibility = Upgaav-Sichtbaarkeid -settings.add_deploy_key = Utbrengens-Slötel hentofögen -settings.is_writable = Schriev-Togriep anknipsen -settings.is_writable_info = Deesem Utbrengens-Slötel verlöven, tum Repositorium to schuven. -settings.no_deploy_keys = Dat gifft noch keene Utbrengens-Slötels. -settings.title = Titel -settings.key_name_used = Dat gifft al eenen Utbrengens-Slötel mit de sülve Naam. -settings.add_key_success = De Utbrengens-Slötel »%s« is hentoföögt worden. -settings.deploy_key_deletion = Utbrengens-Slötel wegdoon -settings.deploy_key_deletion_success = De Utbrengens-Slötel is wegdaan worden. -settings.branches = Twiegen -settings.protected_branch = Twieg Schütten -settings.protected_branch.save_rule = Örder sekern -settings.protected_branch.delete_rule = Örder wegdoon -settings.branch_protection = Schüttens-Örders för Twieg »%s« -settings.protect_new_rule = Eene neje Twieg-Schüttens-Örder hentofögen -settings.protect_disable_push = Schuven utknipsen -settings.protect_enable_push = Schuven anknipsen -settings.protect_whitelist_committers = Verlöövt Schuvers utkören -settings.protect_whitelist_committers_desc = Blots verlöövt Brukers of Klottjen düren to deesem Twieg schuven (aver nich dwangsschuven). -settings.protect_whitelist_deploy_keys = Verlöövt Utbrengens-Slötels mit Schriev-Togriep as Schuvers. -settings.protect_whitelist_users = Verlöövt Brukers as Schuvers -settings.protect_merge_whitelist_teams = Verlöövt Klottjen as Tosamenföhrers -settings.protect_check_status_contexts = Tostands-Överprüfens anknipsen -settings.protect_check_status_contexts_list = Tostands-Överprüfens, wat in deesem Repositorium in de leste Week funnen worden sünd -settings.protect_invalid_status_check_pattern = Ungültiges Tostands-Överprüfens-Muster: »%s«. -settings.protect_required_approvals = Nödige Tostimmens -settings.protect_approvals_whitelist_enabled = Blots verlöövt Brukers of Klottjen düren tostimmen -settings.protect_approvals_whitelist_teams = Verlöövt Klottjen tum Nakieken -settings.dismiss_stale_approvals = Verslaan Tostimmens ofseggen -settings.dismiss_stale_approvals_desc = Wenn neje Kommitterens up de Twieg schuven worden, wat de Inholl vum Haalvörslag ännern, worden olle Tostimmens ofseggt. -settings.ignore_stale_approvals = Verslaan Tostimmens minnachten -settings.ignore_stale_approvals_desc = Tostimmens, wat up oller Kommitterens maakt worden sünd (verslaan Nakiekens), nich daarto tellen, wo völe Tostimmens de HV hett. Is egaal wenn verslaan Nakiekens eh ofseggt worden. -settings.require_signed_commits = Kommitterens mutten unnerschrieven wesen -settings.require_signed_commits_desc = Schuvens to deesem Twieg verseggen, wat nich unnerschrieven sünd of nich utwiest worden könen. -settings.protect_branch_name_pattern = Naam-Muster för schütt Twiegen -settings.protect_patterns = Musters -settings.protect_protected_file_patterns = Schütt Dateinaam-Musters (trennt mit Semikolons »;«) -settings.update_protect_branch_success = Twieg-Schütten för Örder »%s« is verneeit worden. -settings.remove_protected_branch_failed = Twieg-Schüttens-Örder »%s« kunn nich wegdaan worden. -settings.block_rejected_reviews = Tosamenföhren bi Nakiekens mit erbeden Ännerns blockeren -settings.block_rejected_reviews_desc = Dat Tosamenföhren is nich verlöövt, wenn offizielle Nakiekers um Ännerns beden hebben, ok wenn dat genoog Tostimmens gifft. -settings.block_on_official_review_requests = Tosamenföhren bi offiziellen Nakiekens-Anfragen blockeren -settings.block_on_official_review_requests_desc = Dat Tosamenföhren is nich verlöövt, wenn eene offizielle Nakieker-Anfraag utstaht, ok wenn dat genoog Tostimmens gifft. -settings.block_outdated_branch = Tosamenföhren för verollte Haalvörslagen blockeren -settings.enforce_on_admins_desc = Repositoriums-Chefs düren deese Örder nich minnachten. -settings.merge_style_desc = Tosamenföhrens-Aarden -settings.default_merge_style_desc = Normaale Tosamenföhrens-Aard -settings.edit_protected_branch = Bewarken -settings.add_collaborator = Mitarbeider hentofögen -settings.webhook.replay.description = Deesen Internett-Haak weer utföhren. -settings.event_issues = Ännern -settings.webhook.delivery.success = Een Vörfall is to de Leverslang hentoföögt worden. Dat kann een paar Sekünnen düren, ehr dat in de Lever-Histoorje vörkummt. -settings.discord_icon_url.exceeds_max_length = Bill-URL düür nich langer as 2048 Bookstavens wesen -settings.update_settings_no_unit = Dat Repositorium sall tominnst elk of anner Aard vun Gebruuk verlöven. -settings.delete_notices_fork_1 = - Gabels vun deesem Repositorium worden nach de Lösken to normaalen Repositoriums. -settings.confirm_delete = Repositorium lösken -settings.add_collaborator_inactive_user = Kann eenen inaktiiv Bruker nich as Mitarbeider hentofögen. -settings.add_webhook.invalid_path = Padd düür keen Deel enthollen, wat ».« of »..« of leeg is, un kann nich mit eenem Schüünstreek begünnen of ennen. -settings.hooks_desc = Internett-Hakens schicken automatisk HTTP-POST-Anfragen to eenem Server, wenn wisse Forgejo-Vörfallen passeren. Lees mehr in de Internett-Hakens-Dokumenteren. -settings.webhook_deletion_desc = Wenn du eenen Internett-Haak wegdoost, worden siene Instellens un Lever-Histoorje lösket. Wiedermaken? -settings.githooks_desc = Git-Hakens worden vun Git sülvst utföhrt. Du kannst Haken-Dateien unnern bewarken, um eegene Aktioonen intorichten. -settings.webhook.headers = Koppriegen -settings.event_fork = Gabel -settings.event_wiki_desc = Wiki-Sied maakt, umbenöömt, bewarkt of lösket. -settings.slack_icon_url = Bill-URL -settings.slack_channel = Kanaal -settings.web_hook_name_forgejo = Forgejo -settings.sourcehut_builds.secrets = Geheemsten -settings.sourcehut_builds.secrets_helper = Giff de Upgaav Togang to de Bau-Geheemsten (bruukt de Verlöövnis SECRETS:RO) -settings.deploy_keys = Utbrengens-Slötels -settings.protect_enable_merge = Tosamenföhren anknipsen -settings.protect_no_valid_status_check_patterns = Keene gültigen Tostands-Överprüfens-Musters. -settings.protect_approvals_whitelist_users = Verlöövt Nakiekers -settings.protect_unprotected_file_patterns = Nich schütt Dateinaam-Musters (trennt mit Semikolons »;«) -settings.remove_protected_branch_success = Twieg-Schütten för Örder »%s« is wegdaan worden. -settings.default_branch_desc = Köör eenen Höövd-Repositoriums-Twieg för Haalvörslagen un Quelltext-Kommitterens ut: -settings.choose_branch = Köör eenen Twieg ut … -settings.event_issue_assign_desc = Gefall towiesen of Towiesen wegdaan. -settings.add_web_hook_desc = %s in dien Repositorium inbinnen. -settings.web_hook_name_gogs = Gogs -settings.key_been_used = Een Utbrengens-Slötel mit de sülve Inholl word al bruukt. -settings.protect_merge_whitelist_committers = Tosamenföhrens-Verlööv-List anknipsen -settings.protect_merge_whitelist_users = Verlöövt Brukers as Tosamenföhrers -settings.event_issue_label_desc = Gefall-Vermarkens hentoföögt of wegdaan. -settings.active_helper = Informatioonen över utlööst Vörfallen worden to deeser Internett-Haak-URL schickt. -settings.web_hook_name_slack = Slack -settings.protect_enable_push_desc = Elkeen, well Schriev-Togriep hett, düür to deesem Twieg schuven (aver nich dwangsschuven). -settings.protect_status_check_patterns = Tostands-Överprüfens-Musters -settings.protect_status_check_patterns_desc = Giff Musters in, wat angeven, welke Tostands-Överprüfens klaar wesen mutten, ehr Twiegen in eenen Twieg, wat up deese Örder passt, tosamenföhrt worden könen. Elkeen Rieg sett een Muster. Musters düren nich leeg wesen. -settings.protect_status_check_matched = Passt -settings.protect_approvals_whitelist_enabled_desc = Blots Nakiekens vun verlöövt Brukers of Klottjen tellen to de nödige Tahl vun Tostimmens. Sünner eene sülke List tellen Nakiekens vun elkeen, well Schriev-Togriep hett, to de nödige Tahl vun Tostimmens. -settings.protect_branch_name_pattern_desc = Naam-Musters för schütt Twiegen. Kiek in de Dokumenteren för de Muster-Syntax. Bispölen: main, release/** -settings.protected_branch_deletion = Twieg-Schütten wegdoon -settings.protected_branch_deletion_desc = Wenn du de Twieg-Schütten utknipst, düren all Brukers mit Schriev-Rechten to the Twieg schuven. Wiedermaken? -settings.active = Aktiiv -settings.deploy_key_desc = Utbrengens-Slötels hebben Blots-Lesen-Togriep up dat Repositorium. -settings.deploy_key_deletion_desc = Wenn du eenen Utbrengens-Slötel wegdoost, hett he keenen Togriep mehr up deeses Repositorium. Wiedermaken? -settings.protect_disable_push_desc = Man düür nich to deesem Twieg schuven. -settings.protect_enable_merge_desc = Elkeen, well Schriev-Togriep hett, düür Haalvörslagens in deesen Twieg tosamenföhren. -settings.protect_whitelist_teams = Verlöövt Klottjen as Schuvers -settings.protect_merge_whitelist_committers_desc = Blots verlöövt Brukers of Klottjen düren Haalvörslagen in deesen Twieg tosamenföhren. -settings.protect_check_status_contexts_desc = Verlang, dat vör de Tosamenföhren Tostands-Överprüfens klaar wesen mutten. Wenn dat anknipst is, mutten Kommitterens eerst to een anner Twieg schuven worden, un könen eerst dann tosamenföhrt of strack to eenem Twieg schuuvt worden, wat up deese Örder passt, nadeem de Tostands-Överprüfens klaar worden sünd. Wenn keen Umgeven passt, mutt de leste Kommitteren klaar wesen, wat ok immer de Umgeven is. -settings.protect_required_approvals_desc = Verlööv Haalvörslagen blots dann tosamentoföhren, wenn genoog Nakiekers tostimmt hebben. -settings.block_outdated_branch_desc = Dat Tosamenföhren is nich verlöövt, wenn de Kopp-Twieg achter de Grund-Twieg torügg is. -settings.authorization_header = Anmellens-Kopprieg -settings.authorization_header_desc = Wenn sett, word dat as Anmellens-Kopprieg för Anfragen anföögt. Bispölen: %s. -settings.slack_domain = Domään -settings.web_hook_name_dingtalk = DingTalk -settings.deploy_key_content = Inholl -settings.no_protected_branch = Dat gifft keene schütt Twiegen. -settings.enforce_on_admins = Deese Örder för Repositoriums-Chefs dwingen -settings.protected_branch_duplicate_rule_name = För deese Sammlung vun Twiegen gifft dat all een Örder -settings.tags = Markens -settings.tags.protection = Mark-Schütten -settings.tags.protection.allowed = Verlöövt -settings.tags.protection.allowed.teams = Verlöövt Klottjen -settings.tags.protection.allowed.noone = Nüms -settings.tags.protection.none = Dat gifft keene schütt Markens. -settings.thread_id = Thema-ID -settings.matrix.homeserver_url = Heimaadserver-URL -settings.matrix.room_id = Ruum-ID -settings.archive.header = Deeses Repo archiveren -settings.archive.error_ismirror = Du kannst een spegelt Repo nich archiveren. -settings.archive.tagsettings_unavailable = Mark-Instellens sünd in archiveert Repos nich verföögbaar. -settings.unarchive.button = Repo ut Archiv torügghalen -settings.unarchive.success = Dat Repo is nu nich mehr archiveert. -settings.unarchive.error = Een Fehler is bi’m Torügghalen vum Repo ut de Archiv uptreden. Kiek in de Utgaav för mehr Informatioonen. -settings.lfs = LFS -settings.lfs_filelist = LFS-Dateien, wat in deesem Repositorium verwahrt sünd -settings.lfs_lfs_file_no_commits = Keene Kommitterens för deese LFS-Datei funnen -settings.tags.protection.pattern = Mark-Muster -settings.tags.protection.allowed.users = Verlöövt Brukers -settings.chat_id = Snack-ID -settings.archive.button = Repo archiveren -settings.unarchive.header = Deeses Repo as nich mehr archiveert setten -settings.update_avatar_success = Dat Repositoriums-Kontobill is verneeit worden. -settings.lfs_findcommits = Kommitterens finnen -settings.protected_branch_required_approvals_min = Nödige Tostimmens könen nich negativ wesen. -settings.archive.mirrors_unavailable = Spegels sünd in archiveert Repos nich verföögbaar. -settings.tags.protection.create = Örder hentofögen -settings.bot_token = Bot-Teken -settings.matrix.message_type = Narichten-Aard -settings.archive.text = Wenn dat Repo archiveert word, kann man daar blots noch lesen. Dat word vum Kontor verburgen. Nüms (ok nich du sülvst!) kann noch neje Kommitterens maken of Gefallens of Haalvörslagen opmaken. -settings.archive.success = Dat Repo is archiveert worden. -settings.archive.error = Een Fehler is bi’m Archiveren vum Repo uptreden. Kiek in de Utgaav för mehr Informatioonen. -settings.archive.branchsettings_unavailable = Twieg-Instellens sünd in archiveert Repos nich verföögbaar. -settings.unarchive.text = Wenn dat Repo nich mehr archiveert is, kann dat weer Kommitterens un Schuvens kriegen un ok neje Gefallens un Haalvörslagens. -settings.lfs_no_lfs_files = In deesem Repositorium sünd keene LFS-Dateien verwahrt -settings.lfs_noattribute = Deeser Padd is im Höövd-Twieg nich as toslutbaar markeert -settings.lfs_findpointerfiles = Wieser-Dateien finnen -settings.lfs_invalid_locking_path = Ungültiger Padd: %s -settings.lfs_lock = Slött -settings.lfs_lock_path = Dateipadd tum tosluten … -settings.lfs_locks_no_locks = Keene Slötten -settings.lfs_force_unlock = Upsluten dwingen -settings.lfs_pointers.sha = Blob-Prüfsumm -settings.lfs_pointers.oid = OID -settings.lfs_pointers.inRepo = Im Repo -settings.lfs_pointers.accessible = Bruker kann togriepen -settings.lfs_pointers.associateAccessible = %d togangelk OIDs benöömen -settings.rename_branch_failed_exist = Kann Twieg nich umbenöömen, denn de Enn-Twieg %s gifft dat al. -settings.rename_branch_success = Twieg %s is in %s umbenöömt worden. -settings.rename_branch = Twieg umbenöömen -diff.browse_source = In Quell stövern -diff.parent = Ollern -diff.commit = Kommitteren -diff.git-notes = Anmarkens -diff.data_not_available = Unnerscheed-Inholl is nich verföögbaar -diff.options_button = Unnerscheed-Instellens -diff.show_diff_stats = Statistiken wiesen -diff.download_patch = Plack-Datei runnerladen -diff.show_split_view = Deelte Sicht -diff.show_unified_view = Vereenigte Sicht -diff.whitespace_button = Leegtekens -diff.whitespace_ignore_all_whitespace = Leegtekens bi’m Verglieken vun Riegen minnachten -diff.whitespace_ignore_amount_changes = Ännerns in de Meng an Leegtekens minnachten -diff.whitespace_ignore_at_eol = Ännerns in de Leegtekens am Datei-Enn minnachten -diff.stats_desc_file = %d Ännerns: %d neje Riegen un %d lösket Riegen -diff.bin = BIN -diff.bin_not_shown = Binäärdatei word nich wiesen. -diff.view_file = Datei wiesen -diff.file_before = Vörher -diff.file_after = Daarna -diff.file_byte_size = Grött -diff.file_suppressed = Datei-Unnerscheed unnerdrückt, denn dat is to grot -diff.too_many_files = Eenige Dateien worden nich wiesen, denn in deesem Unnerscheed sünd to völe Dateien ännert worden -diff.show_more = Mehr wiesen -diff.load = Unnerscheed laden -diff.generated = maakt -diff.vendored = verkoperig -diff.comment.placeholder = Eenen Kommentaar schrieven -diff.comment.start_review = Nakieken begünnen -diff.review = Nakieken klaarmaken -diff.review.header = Nakieken avgeven -diff.review.approve = Tostimmen -diff.committed_by = kommitteert vun -diff.protected = Schütt -diff.image.side_by_side = Tegenanner -diff.image.swipe = Wisken -diff.show_file_tree = Dateiboom wiesen -diff.hide_file_tree = Dateiboom verbargen -release.releases = Publizerens -release.detail = Över de Publizeren -release.tags = Markens -release.new_release = Nejes Publizeren -release.draft = Sketts -release.prerelease = Vör-Publizeren -release.stable = Stevig -release.edit = Bewarken -release.ahead.commits = %d Kommitterens -release.ahead.target = to %s siet deesem Publizeren -tag.ahead.target = to %s siet deeser Mark -release.source_code = Quelltext -release.edit_subheader = Publizerens organiseren Projekt-Versioonen. -release.tag_name = Mark-Naam -release.target = Enn -release.tag_helper_existing = Bestahn Mark. -release.title_empty = Titel kann nich leeg wesen. -release.message = Beschriev deeses Publizeren -release.prerelease_desc = As Vör-Publizeren markeren -release.prerelease_helper = Markeer, dat deeses Publizeren nich för stevig Gebruuk dacht is. -release.cancel = Ofbreken -release.publish = Publizeren publik maken -release.save_draft = Sketts sekern -release.deletion_success = Dat Publizeren is lösket worden. -release.tag_name_already_exist = Een Publizeren mit deesem Mark-Naam gifft dat al. -release.tag_name_invalid = De Mark-Naam is nich gültig. -release.tag_name_protected = De Mark-Naam is schütt. -release.downloads = Runnerladens -release.download_count_one = %s maal runnerladen -release.download_count_few = %s maal runnerladen -release.hide_archive_links = Automatisk maakt Archiven verbargen -release.releases_for = Publizerens för %s -release.tags_for = Markens för %s -release.system_generated = Deeser Anhang is automatisk maakt worden. -release.type_attachment = Anhang -release.type_external_asset = Frömdes Objekt -release.asset_external_url = Frömde URL -release.add_external_asset = Frömdes Objekt hentofögen -branch.name = Twieg-Naam -branch.already_exists = Een Twieg mit de Naam »%s« gifft dat al. -branch.delete_head = Lösken -branch.delete = Twieg »%s« lösken -branch.delete_html = Twieg lösken -branch.create_branch = Maak Twieg %s -branch.create_from = vun »%s« -branch.create_success = Twieg »%s« is maakt worden. -branch.branch_already_exists = Twieg »%s« gifft dat in deesem Repositorium al. -branch.deleted_by = Vun %s lösket -branch.restore_failed = Kunn Twieg »%s« nich torügghalen. -branch.protected_deletion_failed = Twieg »%s« is schütt un kann nich lösket worden. -branch.restore = Twieg »%s« torügghalen -branch.download = Twieg »%s« runnerladen -branch.rename = Twieg »%s« umbenöömen -branch.included = Enthollen -branch.create_new_branch = Twieg vum Twieg maken: -branch.rename_branch_to = »%s« umbenöömen to: -branch.create_branch_operation = Twieg maken -branch.new_branch = Nejen Twieg maken -topic.manage_topics = Themen verwalten -topic.done = Daan -topic.count_prompt = Du kannst nich mehr as 25 Themen utkören -settings.lfs_lock_already_exists = Slött gifft dat al: %s -diff.whitespace_show_everything = All Ännerns wiesen -diff.review.placeholder = Nakiekens-Kommentaar -settings.lfs_delete = LFS-Datei mit OID %s lösken -settings.lfs_delete_warning = Wenn eene LFS-Datei lösket word, kann bi’m Utchecken de Fehler »Objekt gifft dat nich« uptreden. Willst du dat würrelk? -settings.lfs_locks = Slötten -diff.comment.markdown_info = Markdown kann bruukt worden, um dat Textformaat antopassen. -settings.lfs_invalid_lock_directory = Kann Verteeknis nich tosluten: %s -settings.lfs_pointers.exists = Bestaht im Lager -settings.rename_branch_failed_not_exist = Kann Twieg %s nich umbenöömen, denn de Twieg gifft dat nich. -diff.comment.reply = Antern -diff.image.overlay = Överleggen -settings.lfs_lock_file_no_exist = Tosluten Datei gifft dat im Höövd-Twieg nich -diff.file_suppressed_line_too_long = Datei-Unnerscheed unnerdrückt, denn een of mehr Riegen sünd to lang -settings.lfs_pointers.found = Hett %d Blob-Wieser(s) funnen – %d benöömt, %d unbenöömt (im Lager fehlen %d) -settings.rename_branch_failed_protected = Kann Twieg %s nich umbenöömen, denn dat is een schütt Twieg. -diff.download_diff = Unnerscheed-Datei runnerladen -diff.stats_desc = %d ännert Dateien mit %d nejen Riegen un %d lösket Riegen -diff.file_image_height = Höcht -tag.create_tag_from = Neje Mark vun »%s« maken -tag.create_success = Mark »%s« is maakt worden. -error.csv.too_large = Kann deese Datei nich teken, denn se is to grot. -diff.file_image_width = Breddt -diff.comment.add_line_comment = Riegen-Kommentaar hentofögen -diff.comment.add_review_comment = Kommentaar hentofögen -release.tag_helper_new = Neje Mark. Deese Mark word vun de Enn maakt. -release.edit_release = Publizeren vernejen -release.deletion_desc = Wenn du een Publizeren löskest, word dat blots vun Forgejo wegdaan. Dat ännert nix an de Git-Mark, de Inholl vun dienem Repositorium of siener Histoorje. Wiedermaken? -release.add_tag = Mark maken -release.asset_name = Objekt-Naam -branch.delete_branch_has_new_commits = Twieg »%s« kann nich lösket worden, denn na de Tosamenföhren sünd neje Kommitterens hentoföögt worden. -branch.restore_success = Twieg »%s« is torügghaalt worden. -tag.create_tag = Mark %s maken -diff.comment.add_single_comment = Enkelt Kommentaar hentofögen -diff.review.comment = Kommentaar -diff.review.reject = Um Ännerns bidden -diff.has_escaped = Deese Rieg hett verburgen Unicode-Bookstavens -releases.desc = Verfolg Projekt-Versioonen un Runnerladens. -diff.review.self_reject = Haalvörslag-Autoren könen nich up hör eegen Haalvörslag um Ännerns beden -diff.review.self_approve = Haalvörslag-Autoren könen nich hör eegen Haalvörslag tostimmen -release.deletion_tag_desc = Lösket deese Mark ut de Repositorium. Dat ännert nix an de Inholl vun de Repositorium of siener Histoorje. Wiedermaken? -release.invalid_external_url = Ungültige frömde URL: »%s« -tag.confirm_create_tag = Mark maken -release.compare = Verglieken -branch.delete_desc = Eenen Twieg to lösken is för all Tieden. Ok wenn de lösket Twieg villicht noch körte Tied rumliggt, ehr he würrelk wegdaan word, KANN DAT MEESTTIEDENS NICH torüggnohmen worden. Wiedermaken? -branch.deletion_success = Twieg »%s« is lösket worden. -branch.included_desc = Deeser Twieg is Deel vum Höövd-Twieg -release.new_subheader = Publizerens organiseren Projekt-Versioonen. -release.tag_helper = Köör eene bestahn Mark ut of maak eene neje Mark. -release.deletion_tag_success = De Mark is lösket worden. -release.tag_already_exist = De Mark-Naam gifft dat al. -branch.warning_rename_default_branch = Du benöömst de Höövd-Twieg um. -branch.renamed = Twieg %s is in %s umbenöömt worden. -topic.format_prompt = Themen mutten mit eenem Bookstaav of Tahl begünnen, düren Binnestrekens (»-«) un Punkten (».«) enthollen un könen bit to 35 Bookstavens lang wesen. All Bookstavens mutten Kleenbookstavens wesen. -error.csv.invalid_field_count = Kann deese Datei nich teken, denn se hett de falske Tahl vun Felden in Rieg %d. -release.title = Publizerens-Titel -release.delete_release = Publizeren lösken -release.delete_tag = Mark lösken -release.deletion = Publizeren lösken -release.hide_archive_links_helper = Verbargt automatisk maakt Quelltext-Archiven för deeses Publizeren. To’n Bispööl wenn du diene eegenen uplaadst. -branch.deletion_failed = Kunn Twieg »%s« nich lösken. -branch.branch_name_conflict = Twieg-Naam »%s« is unverdragelk mit de al bestahn Twieg »%s«. -branch.new_branch_from = Nejen Twieg vun »%s« maken -tag.create_tag_operation = Mark maken -release.add_tag_msg = Bruuk de Titel un Inholl vun de Publizeren as Mark-Naricht. -find_file.go_to_file = Datei finnen -find_file.no_matching = Keene passend Datei funnen -branch.tag_collision = Twieg »%s« kann nich maakt worden, denn in de Repositorium gifft dat al eene Mark mit de sülve Naam. -branch.default_deletion_failed = Twieg »%s« is de Höövd-Twieg un kann nich lösket worden. -branch.confirm_create_branch = Twieg maken -error.csv.unexpected = Kann deese Datei nich teken, denn se enthollt eenen unverwachten Bookstaav in Rieg %d un Striep %d. -pulls.edit.already_changed = Kann Ännerns an de Haalvörslag nich sekern. Dat schient, dat de Inholl al vun een anner Bruker ännert worden is. Bidde laad de Sied neei un versöök, dat dann noch eenmaal to bewarken, daarmit du hör Ännerns nich överschriffst -mirror_lfs_endpoint_desc = Spegel word versöken, de Klonen-URL to bruken, um de LFS-Server uttofinnen. Du kannst ok eenen eegenen Ennpunkt angeven, wenn de Repositoriums-LFS-Dateien annerwaar lagert worden. -migrate_options_lfs_endpoint.description = Umtreck word versöken, de frömde Git-Tegenstee to bruken, um de LFS-Server uttofinnen. Du kannst ok eenen eegenen Ennpunkt angeven, wenn de Repositoriums-LFS-Dateien annerwaar lagert worden. -clear_ref = `Stedenwies Beteekner leegmaken` -org_labels_desc = Vereenigungs-Vermarkens, wat mit all Repositoriums unner deeser Vereenigung bruukt worden könen -invisible_runes_header = `Deese Datei enthollt unsichtbaare Unicode-Bookstavens` -ambiguous_runes_line = `Deese Rieg hett verwesselbaare Unicode-Bookstavens` -ambiguous_character = `%[1]c [U+%04[1]X] kann mit %[2]c [U+%04[2]X] verwesselt worden` -commits.search.tooltip = Du kannst Slötelwoorden mit »author:«, »committer:«, »after:« of »before:« begünnen, to’n Bispööl »revert author:Alice before:2019-01-13«. -projects.new_subheader = Verwalt, verfolg un verneei diene Arbeid an eener Stee, daarmit Projekten dörsichtig un up Tied blieven. -issues.label_archive_tooltip = Archiveert Vermarkens worden in de Vörslagens, wenn du na Vermarkens söchst, normaal nich wiest. -issues.label_exclusive_desc = Benööm de Vermark Rebeet/Ding, daarmit dat nich mit anner Vermarkens ut de sülven Rebeet/ tosamen bruukt worden kann. -issues.label_exclusive_warning = Elkeen anner Vermark in de sülve Rebeet word wegdaan, wenn de Vermarkens vun eenem Gefall of Haalvörslag bewarkt worden. -blame.ignore_revs.failed = Kunn de Versioonen in de .git-blame-ignore-revs nich minnachten. -invisible_runes_line = `Deese Rieg hett verburgen Unicode-Bookstavens` -mirror_address_url_invalid = De angeven URL is ungültig. Du muttst all Delen vun de URL recht utkielen. -mirror_address_protocol_invalid = De angeven URL is ungültig. Blots Steden vun de Aarden »http(s)://« of »git://« könen tum Spegeln bruukt worden. -mirror_use_ssh.helper = Forgejo spegelt dat Repositorium mit Git över SSH un maakt för di een Slötelpaar, wenn du deese Instellen utköörst. Du muttst wiss maken, dat de maakt publike Slötel dat Recht kriggt, to de Enn-Repositorium to schuven. Wenn du dat utköörst, kannst du keen Anmellen mit Passwoord bruken. -migrate.permission_denied_blocked = Du kannst nich vun verboden Servers importeren; bidde fraag de Chef, of he de Instellens ALLOWED_DOMAINS/ALLOW_LOCALNETWORKS/BLOCKED_DOMAINS överprüfen maag. -blame.ignore_revs = Minnacht Versioonen in .git-blame-ignore-revs. Klick hier, um daar överwegtogahn un de normaale Schüld-Ansicht to wiesen. -migrate.github_token_desc = Du kannst hier een of mehr Tekens angeven, wat mit Kommas trennt sünd, um dat Umtrecken fixer to maken, um de GitHub-API-Togrieps-Begrenz. WAHRSCHAU: Wenn du dat missbruukst, kannst du de Richtlienjen vun de Deenstbedriev verletzen un dien Konto kann sperrt worden. -issues.edit.already_changed = Kann Ännerns an de Gefall nich sekern. Dat schient, dat de Inholl al vun een anner Bruker ännert worden is. Bidde laad de Sied neei un versöök, dat dann noch eenmaal to bewarken, daarmit du hör Ännerns nich överschriffst -broken_message = De Git-Daten unner deesem Repositorium könen nich lesen worden. Kuntakteer de Chef vun deeser Instanz of löske dat Repositorium. -ambiguous_runes_header = `Deese Datei enthollt verwesselbaare Unicode-Bookstavens` -ambiguous_runes_description = `Deese Datei enthollt Unicode-Bookstavens, wat man licht mit anner Bookstavens verwesseln kann. Wenn du glöövst, dat dat so wesen sall, kannst du deese Wahrschau seker minnachten. Bruuk de Utkielen-Knoop, um se to wiesen.` -invisible_runes_description = `Deese Datei enthollt unsichtbaare Unicode-Bookstavens, wat Minsken nich sehn könen, aver vun eenem Reekner anners verarbeidt worden könen. Wenn du glöövst, dat dat so wesen sall, kannst du deese Wahrschau seker minnachten. Bruuk de Utkielen-Knoop, um se to wiesen.` -comments.edit.already_changed = Kann Ännerns an de Kommentaar nich sekern. Dat schient, dat de Inholl al vun een anner Bruker ännert worden is. Bidde laad de Sied neei un versöök, dat dann noch eenmaal to bewarken, daarmit du hör Ännerns nich överschriffst -pulls.clear_merge_message_hint = Wenn du de Tosamenföhrens-Naricht leeg maakst, lösket dat blots de Naricht-Inholl un behollt sülk automatisk maakte Git-Nadragens as »Co-Autored-By …«. -settings.add_webhook_desc = Forgejo schickt POST-Anfragen mit eener angeven Inholls-Aard to de Enn-URL. Lees mehr in de Internett-Hakens-Inföhren. -issues.review.pending.tooltip = Deeser Kommentaar is jüüst för anner Brukers nich sichtbaar. Um diene utstahn Kommentaren avtogeven, köör boven in de Sied »%s« → »%s/%s/%s« ut. -settings.sourcehut_builds.access_token_helper = Togang-Teken, wat de Verlöövnis JOBS:RW hett. Maak een builds.sr.ht-Teken of een builds.sr.ht-Teken mit Togriep to Geheemsten up meta.sr.ht. -settings.protect_unprotected_file_patterns_desc = Nich schütt Dateien, wat stracks ännert worden düren, wenn de Bruker Schriev-Togriep hett, an de Schuuv-Schüttens-Örders vörbi. Mennig Musters könen mit Semikolon (»;«) trennt worden. Kiek de Dokumenteren för ">%[2]s för de Syntax an. Bispölen: .drone.yml, /docs/**/*.txt. -settings.protected_branch_required_rule_name = Ördernaam is nödig -settings.protect_protected_file_patterns_desc = Schütt Dateien, wat nich stracks ännert worden düren, sülvst wenn de Bruker dat Recht hett, Dateien in deesem Twieg hentotofögen, to bewarken of to lösken. Mennig Musters könen mit Semikolon (»;«) trennt worden. Kiek de Dokumenteren för ">%[2]s för de Syntax an. Bispölen: .drone.yml, /docs/**/*.txt. -settings.branch_filter_desc = Twieg-Verlöövnis-List för Vörfallen över dat Schuven un dat Maken un Lösken vun Twiegen, angeven as een Glob-Muster. Wenn leeg of * worden Vörfallen för all Twiegen mellt. Kiek de Dokumenteren för %[2]s för de Syntax an. Bispölen: master, {master,release*}. -settings.matrix.room_id_helper = De Ruum-ID kann vun de Element-Internett-Sied unner Ruum-Instellens → Verwiedert → Binnere Ruum-ID haalt worden. Bispööl: %s. -settings.tags.protection.pattern.description = Du kannst eenen enkelt Naam bruken of een Glob-Muster of Regel-Utdruck, um up mennig Markens to passen. Lees mehr in de Inföhren över schütt Markens. -error.broken_git_hook = Git-Hakens in deesem Repositorium schienen kaputt to wesen. Bidde folg de Dokumenteren, um se to repareren, dann schuuv een paar Kommitterens, um de Tostand to vernejen. -settings.matrix.access_token_helper = Dat word anraden, daarföör eegens een Matrix-Konto intorichten. Dat Togangs-Teken kann in de Element-Internett-Sied (in eener privaaten/anonymen Karteikaart) unner Brukermenü (boven links) → All Instellens → Hülp & Över → Togangs-Teken (stracks unner de Heimaadserver-URL) haalt worden. Maak de privaate/anonyme Karteikaart dicht (wenn du di avmellst, word dat Teken ungültig). -issues.review.add_remove_review_requests = hett %[3]s um Nakiekens vun %[1]s anfraggt un de Nakiekens-Anfragen för %[2]s wegdaan -issues.review.add_review_requests = hett %[2]s um Nakiekens vun %[1]s anfraggt -issues.review.remove_review_requests = hett %[2]s de Nakieken-Anfragen för %[1]s wegdaan -pulls.delete_after_merge.head_branch.is_protected = De Kopp-Twieg, wat du lösken willst, is een schütt Twieg un kann nich lösket worden. -pulls.delete_after_merge.head_branch.insufficient_branch = Du hest nich dat Recht, de Kopp-Twieg to lösken. -pulls.delete_after_merge.head_branch.is_default = De Kopp-Twieg, wat du lösken willst, is de Höövd-Twieg un kann nich lösket worden. -issues.filter_sort.relevance = Belang -diff.git-notes.add = Anmarken hentofögen -diff.git-notes.remove-header = Anmarken wegdoon -diff.git-notes.remove-body = Deeses Anmarken word wegdaan. -issues.num_reviews_one = %d Nakieken -issues.summary_card_alt = Tosamenfatens-Kaart vun eenem Gefall mit de Naam »%s« im Repositorium %s -issues.num_reviews_few = %d Nakiekens -settings.default_update_style_desc = Normaale Vernejens-Aard, wat bruukt word, um Haalvörslagens to vernejen, wat achter de Grund-Twieg torügg sünd. -pulls.sign_in_require = Mell di an, um eenen nejen Haalvörslag to maken. -new_from_template = Bruuk eene Vörlaag -new_advanced = Mehr Instellens -new_advanced_expand = Klick, um mehr to wiesen -auto_init_description = Begünn de Git-Histoorje mit eenem LEESMI un föög, wenn du willst, Lizenz- un .gitignore-Dateien hento. -new_from_template_description = Du kannst eene bestahn Repositoriums-Vörlaag up deeser Instanz utkören un hör Instellens anwennen. -summary_card_alt = Tosamenfatens-Kaart vun de Repositorium %s -issues.reaction.alt_add = De %[1]s-Reageren to de Kommentaar hentofögen. -issues.reaction.add = Reageren hentofögen -issues.reaction.alt_few = %[1]s hett mit %[2]s reageert. -issues.reaction.alt_many = %[1]s un %[2]d anner hebben mit %[3]s reageert. -issues.reaction.alt_remove = De %[1]s-Reageren vun de Kommentaar wegdoon. -issues.context.menu = Kommentaar-Menü -release.summary_card_alt = Tosamenfatens-Kaart vun eenem Publizeren mit de Naam »%s« im Repositorium %s - -[repo.permissions] -code.read = Lesen: De Quelltext vun deesem Repositorium ankieken un klonen. -code.write = Schrieven: Schuuv to de Repositorium un maak Twiegen un Markens. -issues.read = Lesen: Gefallens un Kommentaren lesen un maken. -issues.write = Schrieven: Gefallens dichtmaken un wiedere Informatioonen so as Vermarkens, Markstenen, Towiesens, Anstahns-Daten un Ofhangens bewarken. -releases.write = Schrieven: Publizerens un hör Objekten publik maken, bewarken un lösken. -releases.read = Lesen: Publizerens ankieken un runnerladen. -wiki.write = Schrieven: Sieden in de inbaut Wiki maken, vernejen un lösken. -wiki.read = Lesen: Dat inbaut Wiki un siene Histoorje lesen. -pulls.write = Schrieven: Haalvörslagen dichtmaken un wiedere Informatioonen so as Vermarkens, Markstenen, Towiesens, Anstahns-Daten un Ofhangens bewarken. -pulls.read = Lesen: Haalvörslagen lesen un maken. -projects.read = Lesen: Repositoriums-Projekt-Bredden wiesen. -projects.write = Schrieven: Projekten un Striepen maken un bewarken. -packages.read = Lesen: Paketen in de Repositorium ankieken un runnerladen. -actions.write = Schrieven: CI-/CD-Affolgens vun Hand utlösen, neei starten, ofbreken of tostimmen. -actions.read = Lesen: CI-/CD-Affolgens un hör Utgaav ankieken. -ext_issues = Togriep to de Verwies to eenem frömden Gefall-Verfolger. De Rechten worden frömd verwalt. -ext_wiki = Togriep to de Verwies to eenem frömden Wiki. De Rechten worden frömd verwalt. -packages.write = Schrieven: Paketen in de Repositorium publik maken un lösken. - -[graphs] -component_loading = Lade %s … -component_loading_failed = Kunn %s nich laden -component_loading_info = Dat kann een bietje düren … -component_failed_to_load = Een unverwacht Fehler is uptreden. -code_frequency.what = Quelltext-Frequenz -contributors.what = Bidragens -recent_commits.what = Leste Kommitterens - -[org] -org_name_holder = Vereenigungs-Naam -org_full_name_holder = Kumpleter Naam vun de Vereenigung -org_name_helper = Vereenigungs-Namen sallen kört un lich to marken wesen. -create_org = Vereenigung maken -open_dashboard = Kontor opmaken -repo_updated = %s verneeit -members = Liddmaten -teams = Klottjen -code = Quelltext -lower_members = Liddmaten -lower_repositories = Repositoriums -create_new_team = Neje Klottje -team_name = Klottjen-Naam -team_desc = Beschrieven -team_desc_helper = Beschriev de Zweck of Rull vun de Klottje. -team_access_desc = Repositoriums-Togriep -team_permission_desc = Rechten -team_unit_desc = Togriep to Repositoriums-Delen verlöven -team_unit_disabled = (Utknipst) -form.create_org_not_allowed = Du hest nich dat Recht, eene Vereenigung to maken. -settings = Instellens -settings.options = Vereenigung -settings.full_name = Kumpleter Naam -settings.website = Internett-Sied -settings.visibility.limited = Begrenzt (blots anmellt Brukers könen ’t sehn) -settings.visibility.limited_shortname = Begrenzt -settings.visibility.private_shortname = Privaat -settings.update_settings = Instellens vernejen -settings.update_setting_success = Vereenigungs-Instellens sünd verneeit worden. -settings.change_orgname_redirect_prompt = De olle Naam leit daarhen um, bit well anners hüm nimmt. -settings.update_avatar_success = Dat Vereenigungs-Kontobill is verneeit worden. -settings.delete = Vereenigung lösken -settings.delete_account = Deese Vereenigung lösken -settings.delete_prompt = Dat lösket de Vereenigung för all Tieden. Dat KANN NICH torüggnohmen worden! -settings.confirm_delete_account = Lösken utwiesen -settings.delete_org_title = Vereenigung lösken -settings.delete_org_desc = De Vereenigung word för all Tieden lösket. Wiedermaken? -settings.labels_desc = Föög Vermarkens hento, wat för Gefallens in all Repositoriums unner deeser Vereenigung bruukt worden könen. -create_team = Klottje maken -form.name_pattern_not_allowed = Dat Muster »%s« is in eenem Vereenigungs-Naam nich verlöövt. -follow_blocked_user = Du kannst deeser Vereenigung nich nagahn, denn de Vereenigung hett du blockeert. -form.name_reserved = De Vereenigungs-Naam »%s« is vörbehollen. -settings.repoadminchangeteam = Repositoriums-Chef kann Togriep för Klottjen hentofögen un wegdoon -settings.email = Kuntakt-E-Mail -settings.permission = Verlöövnissen -settings.visibility.private = Privaat (blots Vereenigungs-Liddmaten könen ’t sehn) -team_name_helper = Klottjen-Namen sallen kört un licht to marken wesen. -settings.location = Stee -settings.change_orgname_prompt = Wahrschau: Wenn du de Vereenigungs-Naam ännerst, ännert sik ok de Vereenigungs-URL un de olle Naam word freeigeven. -org_desc = Beschrieven -settings.visibility = Sichtbaarkeid -settings.visibility.public = Publik -settings.hooks_desc = Föög Internett-Hakens hento, wat för all Repositoriums unner deeser Vereenigung utlööst worden. -members.membership_visibility = Liddmaat-Sichtbaarkeid: -members.public = Sichtbaar -members.public_helper = Verbargen -members.private = Nich sichtbaar -members.private_helper = Sichtbaar maken -members.member_role = Liddmaat-Rull: -members.owner = Eegner -members.member = Liddmaat -members.remove = Wegdoon -members.remove.detail = %[1]s ut %[2]s wegdoon? -members.leave = Verlaten -members.leave.detail = Willst du de Vereenigung »%s« würrelk verlaten? -members.invite_desc = Föög eenen nejen Liddmaat to %s hento: -members.invite_now = Nu inladen -teams.join = Bitreden -teams.leave = Verlaten -teams.leave.detail = Willst du de Klottje »%s« würrelk verlaten? -teams.can_create_org_repo = Repositoriums maken -teams.can_create_org_repo_helper = Liddmaten könen neje Repositoriums in de Vereenigung maken. De Maker kriggt Chef-Rechten in de neje Repositorium. -teams.none_access = Keen Togang -teams.none_access_helper = De Instellen »Keen Togang« is blots för privaate Repositoriums vun Belang. -teams.general_access = Eegener Togang -teams.general_access_helper = Liddmaten-Rechten worden vun de Rechten-Tabell unnern fastleggt. -teams.read_access = Lesen -teams.write_access = Schrieven -teams.admin_access = Chef-Togang -teams.no_desc = Deese Klottje is nich beschrieven -teams.settings = Instellens -teams.owners_permission_desc = Eegners hebben kumpleten Togang to all Repositoriums un hebben Chef-Togang to de Vereenigung. -teams.update_settings = Instellens vernejen -teams.delete_team = Klottje wegdoon -teams.add_team_member = Klottjen-Liddmaat hentofögen -teams.delete_team_success = De Klottje is wegdaan worden. -teams.write_permission_desc = Deese Klottje gifft Schrievens-Togriep: Liddmaten könen Klottjen-Repositoriums ankieken un daarhen schuven. -teams.remove_all_repos_title = All Klottjen-Repositoriums wegdoon -teams.add_all_repos_title = All Repositoriums hentofögen -teams.add_nonexistent_repo = Dat Repositorium, wat du hentofögen willst, gifft dat nich; bidde maak ’t eerst. -teams.add_duplicate_users = Bruker is al een Klottjen-Liddmaat. -teams.members.none = Deese Klottje hett keene Liddmaten. -teams.specific_repositories = Wisse Repositoriums -teams.all_repositories_helper = Klottje het Togang to all Repositoriums. Wenn du dat utköörst, worden all bestahn Repositoriums to de Klottje hentoföögt. -teams.invite.title = Du büst inladen worden, to de Klottje %s in de Vereenigung %s bitotreden. -teams.invite.by = Vun %s inladen -teams.invite.description = Bidde klick up de Knoop unnern, um to de Klottje bitotreden. -teams.invite_team_member = To %s inladen -teams.delete_team_desc = Wenn du eene Klottje wegdoost, hebben hör Liddmaten keen Togriep mehr up de Repositoriums. Wiedermaken? -teams.admin_permission_desc = Deese Klottje gifft Chef-Togriep: Liddmaten könen Klottjen-Repositoriums ankieken, daarhen schuven un Mitarbeiders hentofögen. -teams.create_repo_permission_desc = Daarto gifft deese Klottje dat Recht, Repositoriums to maken: Liddmaten könen neje Repositoriums in de Vereenigung maken. -teams.repositories = Klottjen-Repositoriums -teams.members = Klottjen-Liddmaten -teams.add_all_repos_desc = Dat föögt all de Repositoriums in de Vereenigung to de Klottje hento. -teams.admin_access_helper = Liddmaten könen to Klottjen-Repositoriums schuven un halen un daar Mitarbeiders hentofögen. -teams.delete_team_title = Klottje wegdoon -teams.invite_team_member.list = Utstahn Inladens -teams.remove_all_repos_desc = Dat doot all Repositoriums vun de Klottje weg. -teams.read_permission_desc = Deese Klottje gifft Lesens-Togriep: Liddmaten könen Klottjen-Repositoriums ankieken un klonen. -teams.repos.none = Deese Klottje kann up keene Repositoriums togriepen. -teams.specific_repositories_helper = Liddmaten hebben blots Togriep up Repositoriums, wat besünners to de Klottje hentoföögt worden sünd. Wenn du dat utköörst, worden Repositoriums, wat du al mit All Repositoriums hentoföögt hest, nich automatisk wegdaan. -teams.all_repositories = All Repositoriums - -[admin] -dashboard = Kontor -self_check = Sülvst-Överprüfen -identity_access = Sülvst & Togang -users = Brukerkonten -organizations = Vereenigungen -assets = Quelltext-Objekten -repositories = Repositoriums -hooks = Internett-Hakens -integrations = Inbinnens -authentication = Anmellens-Quellen -emails = Bruker-E-Mails -config = Inrichten -notices = Systeem-Narichtens -config_summary = Tosamenfaten -monitor = Överwachen -first_page = Eerste -last_page = Leste -config_settings = Instellens -total = All tosamen: %d -settings = Chef-Instellens -dashboard.statistic = Tosamenfaten -dashboard.operations = Plegens-Aktioonen -dashboard.new_version_hint = Forgejo %s is nu verföögbaar, du hest %s. Kiek de Blog för mehr Informatioonen an. -dashboard.delete_generated_repository_avatars = Maakte Repositoriums-Kontobillers lösken -dashboard.sync_repo_tags = Markens vun Git-Daten to de Datenbank spegeln -dashboard.update_mirrors = Spegels vernejen -dashboard.repo_health_check = Gesundheids-Överprüfen för all Repositoriums -dashboard.check_repo_stats = De Statistiken vun all Repositoriums överprüfen -dashboard.deleted_branches_cleanup = Lösket Twiegen uprümen -dashboard.git_gc_repos = Up all Repositoriums de Müll avhalen -dashboard.resync_all_sshprincipals = De ».ssh/authorized_principals«-Datei mit de SSH-Höövdmannen vun Forgejo vernejen. -dashboard.reinit_missing_repos = All fehlend Git-Repositoriums neei inrichten, för wat dat Uptekens gifft -dashboard.cleanup_packages = Avlopen Paketen uprümen -dashboard.cleanup_actions = Avlopen Utgaven un Objekten vun Aktioonen uprümen -dashboard.current_goroutine = Stedenwies Go-Routinen -dashboard.total_memory_allocated = Spieker towiesen all tosamen -dashboard.memory_allocate_times = Spieker-Towiesens -dashboard.system_status = Systeem-Tostand -dashboard.operation_switch = Wesseln -dashboard.operation_run = Utföhren -dashboard.clean_unbind_oauth_success = All unverbunnen OAuth-Verbinnens sünd wegdaan worden. -dashboard.task.process = Upgaav: %[1]s -dashboard.task.cancelled = Upgaav: %[1]s ofbroken: %[3]s -dashboard.task.error = Fehler in Upgaav: %[1]s: %[3]s -dashboard.task.unknown = Unbekannte Upgaav: %[1]s -dashboard.cron.started = Hett Tiedplaan begunnen: %[1]s -dashboard.cron.error = Fehler im Tiedplaan: %s: %[3]s -dashboard.delete_inactive_accounts.started = Upgaav, um all nich aktiveerten Konten to lösken, begunnen. -dashboard.delete_repo_archives = All Repositoriums-Archiven (ZIP, TAR.GZ, usw. …) lösken -dashboard.delete_missing_repos.started = Upgaav, um all Repositoriums sünner Git-Dateien to lösken, begunnen. -dashboard.delete_missing_repos = All Repositoriums sünner Git-Dateien lösken -dashboard.task.finished = Upgaav: %[1]s vun %[2]s begunnen is daan worden -dashboard.cron.finished = Tiedplaan: %[1]s is daan worden -dashboard.operation_name = Aktioons-Naam -dashboard.cron.process = Tiedplaan: %[1]s -dashboard.cron.cancelled = Tiedplaan: %[1]s ofbroken: %[3]s -dashboard.resync_all_sshkeys = De ».ssh/authorized_keys«-Datei mit de SSH-Slötels vun Forgejo vernejen. -dashboard.memory_obtained = Spieker erhollen -dashboard.pointer_lookup_times = Wieser-Nakiek-Tieden -dashboard.task.started = Hett Upgaav begunnen: %[1]s -dashboard.delete_inactive_accounts = All nich aktiveerten Konten lösken -dashboard.delete_repo_archives.started = Upgaav, um all Repositoriums-Archiven to lösken, begunnen. -dashboard.archive_cleanup = Olle Repositoriums-Archiven lösken -dashboard.resync_all_hooks = De Hakens »pre-receive«, »update« un »post-receive« in all Repositoriums vernejen -dashboard.clean_unbind_oauth = Unverbunnen OAuth-Verbinnens uprümen -dashboard.sync_repo_branches = Fehlend Twiegen vun Git-Daten to de Datenbank spegeln -dashboard.update_migration_poster_id = Umtreck-Autor-IDs vernejen -dashboard.cleanup_hook_task_table = hook_task-Tabell uprümen -dashboard.sync_external_users = Frömde Brukerdaten vernejen -dashboard.server_uptime = Server-Bedrievstied -dashboard.current_memory_usage = Stedenwies Spiekerbruuk -dashboard.heap_memory_obtained = Hoopspieker erhollen -dashboard.current_heap_usage = Stedenwies Hoopbruuk -dashboard.heap_memory_idle = Hoopspieker mit nix to doon -dashboard.heap_memory_released = Hoopspieker freeigeven -dashboard.heap_objects = Hoopobjekten -dashboard.bootstrap_stack_usage = Bootstrap-Stapelbruuk -dashboard.stack_memory_obtained = Stapelspieker erhollen -dashboard.mspan_structures_usage = MSpan-Struktuuren-Bruuk -dashboard.mspan_structures_obtained = MSpan-Struktuuren erhollen -dashboard.mcache_structures_usage = MCache-Struktuuren-Bruuk -dashboard.gc_metadata_obtained = Wiedere Informatioonen för GC erhollen -dashboard.other_system_allocation_obtained = Anner Systeemtowiesens erhollen -dashboard.next_gc_recycle = Anner GC-Müllavhalen -dashboard.last_gc_time = Tied siet lestem GC -dashboard.total_gc_pause = GC-Paus all tosamen -dashboard.last_gc_pause = Leste GC-Paus -dashboard.gc_times = GC-Tieden -dashboard.delete_old_actions = All olles Doon ut de Datenbank lösken -dashboard.update_checker = Vernejens-Sööker -dashboard.delete_old_system_notices = All ollen Systeemnarichten ut de Datenbank lösken -dashboard.gc_lfs = In LFS-Meta-Objekten de Müll avhalen -dashboard.stop_zombie_tasks = Spöök-Aktioonen-Upgaven anhollen -dashboard.stop_endless_tasks = Aktioonen-Upgaven sünner Enn anhollen -dashboard.cancel_abandoned_jobs = Verlaten Aktioonen-Upgaven ofbreken -dashboard.sync_branch.started = Twieg-Vernejen begunnen -users.user_manage_panel = Brukerkonten verwalten -users.new_account = Brukerkonto maken -users.name = Brukernaam -users.full_name = Kumpleter Naam -users.activated = Aktiveert -users.admin = Chef -users.restricted = Begrenzt -users.reserved = Vörbehollen -users.created = Maakt -users.last_login = Tolest anmellt -users.never_login = Nie anmellt -users.send_register_notify = E-Mail-Naricht över dat Registreren schicken -users.new_success = Dat Brukerkonto »%s« is maakt worden. -users.edit = Bewarken -users.auth_source = Anmellens-Quell -users.local = Stedenwies -users.auth_login_name = Anmell-Naam -users.password_helper = Laat dat Passwoord leeg, um dat nich to ännern. -users.update_profile_success = Dat Brukerkonto is verneeit worden. -users.edit_account = Brukerkonto bewarken -users.is_activated = Konto aktiveert -users.prohibit_login = Konto sperrt -users.block.description = Deesem Bruker verseggen, mit deesem Deenst dör deeses Konto to warken, un dat Anmellen verseggen. -users.is_admin = Chefkonto -users.admin.description = Deesem Bruker kumpleten Togriep to all Chef-Aktioonen geven, wat mit de Internett-Schnittstee un de API gahn. -users.is_restricted = Begrenztes Konto -users.allow_git_hook = Kann Git-Hakens maken -dashboard.memory_free_times = Spieker-Freeigevens -users.bot = Bot -users.2fa = 2FA -dashboard.profiling_bucket_hash_table_obtained = Profileren-Emmer-Prüfsummtabell erhollen -dashboard.sync_tag.started = Mark-Vernejen begunnen -dashboard.rebuild_issue_indexer = Gefall-Indizerer neei bauen -users.activated.description = Of dat E-Mail-Utwiesen ofsluten is. De Eegner vun eenem nich aktiveerten Konto kann sik nich anmellen, bit dat E-Mail-Utwiesen ofsluten is. -dashboard.heap_memory_in_use = Hoopspieker bruukt -users.max_repo_creation_desc = (Giff -1 in, um de Normaalweert vun de Instanz to bruken.) -dashboard.mcache_structures_obtained = MCache-Struktuuren erhollen -dashboard.start_schedule_tasks = Aktioonen-Upgaven mit Tiedplaan begünnen -users.remote = Frömd -users.max_repo_creation = Hoogste Tahl vun Repositoriums -dashboard.delete_old_actions.started = Hett begunnen, all olles Doon ut de Datenbank to lösken. -users.repos = Repos -users.restricted.description = Verlööv blots, mit de Repositoriums un Vereenigungen to warken, waar deeser Bruker as Mitarbeider hentoföögt is. Dat verhinnert Togriep to publiken Repositoriums in deeser Instanz. -users.allow_git_hook_tooltip = Git-Hakens worden as de BS-Bruker utföhrt, unner well Forgejo löppt, un hebben dat sülve Maat an Host-Togriep. Also könen Brukers mit de Git-Haak-Recht all Forgejo-Repositoriums ankieken un bewarken un ok de Datenbank, wat Forgejo bruukt. Also könen se ok Chef-Rechten för Forgejo kriegen. -users.allow_import_local = Kann stedenwies Repositoriums importeren -users.local_import.description = Verlööv, Repositoriums vun de stedenwies Dateisysteem vum Server to importeren. Dat kann een Sekerheidsprobleem wesen. -users.allow_create_organization = Kann Vereenigungen maken -users.organization_creation.description = Verlööv, neje Vereenigungen to maken. -users.update_profile = Brukerkonto vernejen -users.delete_account = Brukerkonto lösken -users.cannot_delete_self = Du kannst nich di sülven lösken -users.still_own_repo = De Bruker is noch een Eegner vun een of mehr Repositoriums. Löske of överdraag deese Repositoriums eerst. -users.still_has_org = De Bruker is noch een Liddmaat vun eener Vereenigung. Doo de Bruker eerst ut all Vereenigungen weg. -users.purge = Bruker wegschüren -users.purge_help = Mit Dwang de Bruker un all siene Repositoriums, Vereenigungen un Paketen lösken. All Kommentaren un Gefallens, wat deeser Bruker maakt hett, worden ok lösket. -users.still_own_packages = Deeser Bruker is noch Eegner vun een of mehr Paketen, löske eerst deese Paketen. -users.list_status_filter.menu_text = Filter -users.list_status_filter.not_active = Nich aktiiv -users.list_status_filter.is_restricted = Begrenzt -users.list_status_filter.not_restricted = Unbegrenzt -users.list_status_filter.is_2fa_enabled = 2FA anknipst -users.list_status_filter.not_2fa_enabled = 2FA utknipst -users.details = Bruker-Informatioonen -emails.email_manage_panel = Bruker-E-Mails verwalten -emails.primary = Höövd -emails.activated = Aktiveert -emails.filter_sort.email = E-Mail -emails.filter_sort.email_reverse = E-Mail (umdreiht) -emails.filter_sort.name = Brukernaam -emails.filter_sort.name_reverse = Brukernaam (umdreiht) -emails.updated = E-Mail verneeit -emails.not_updated = Kunn de erbeden E-Mail-Adress nich vernejen: %v -emails.duplicate_active = Deese E-Mail-Adress is al för eenen anner Bruker aktiiv. -emails.change_email_header = E-Mail-Eegenskuppen vernejen -emails.change_email_text = Willst du deese E-Mail-Adress würrelk vernejen? -emails.delete = E-Mail wegdoon -emails.delete_desc = Willst du deese E-Mail-Adress würrelk wegdoon? -emails.deletion_success = De E-Mail-Adress is wegdaan worden. -emails.delete_primary_email_error = Du kannst de Höövd-E-Mail nich wegdoon. -orgs.org_manage_panel = Vereenigungen verwalten -orgs.name = Naam -orgs.teams = Klottjen -orgs.members = Liddmaten -orgs.new_orga = Neje Vereenigung -repos.repo_manage_panel = Repositoriums verwalten -repos.unadopted = Repositoriums sünner Eegner -repos.unadopted.no_more = Keene Repositoriums sünner Eegner funnen. -repos.owner = Eegner -repos.name = Naam -repos.private = Privaat -repos.issues = Gefallens -repos.size = Grött -repos.lfs_size = LFS-Grött -packages.package_manage_panel = Paketen verwalten -packages.total_size = Grött all tosamen: %s -packages.unreferenced_size = Unbenöömt Grött: %s -packages.cleanup = Avlopen Daten uprümen -packages.cleanup.success = Avlopen Daten uprüümt -packages.owner = Eegner -packages.creator = Maker -packages.name = Naam -packages.version = Versioon -packages.type = Aard -packages.repository = Repositorium -packages.size = Grött -packages.published = Publizeert -defaulthooks = Normaale Internett-Hakens -defaulthooks.add_webhook = Normaalen Internett-Haak hentofögen -defaulthooks.update_webhook = Normaalen Internett-Haak vernejen -systemhooks = Systeem-Internett-Hakens -systemhooks.add_webhook = Systeem-Internett-Haak hentofögen -systemhooks.update_webhook = Systeem-Internett-Haak vernejen -auths.auth_manage_panel = Anmellens-Quellen verwalten -auths.new = Anmellens-Quell hentofögen -auths.name = Naam -auths.type = Aard -systemhooks.desc = Internett-Hakens schicken automatisk HTTP-POST-Anfragen to eenem Server, wenn wisse Forgejo-Vörfallen passeren. Internett-Hakens, wat hier inricht worden, hanneln för all Repositoriums in de Systeem, also bedenk bidde, wat dat för de Systeemlast heten word. Lees mehr in de Internett-Hakens-Dokumenteren. -auths.enabled = Anknipst -auths.updated = Verneeit -auths.security_protocol = Sekerheids-Protokoll -auths.domain = Domään -auths.host = Host -auths.port = Poort -auths.bind_dn = Binne-DN -auths.bind_password = Binne-Passwoord -auths.user_base = Bruker-Söök-Grundlaag -auths.user_dn = Bruker-DN -auths.attribute_username = Brukernaam-Eegenskupp -auths.attribute_username_placeholder = Laat dat leeg, um de Brukernaam to bruken, wat in Forgejo ingeven worden is. -auths.attribute_name = Vörnaam-Eegenskupp -auths.attribute_surname = Achternaam-Eegenskupp -auths.attribute_mail = E-Mail-Eegenskupp -auths.attribute_ssh_public_key = Eegenskupp för publiken SSH-Slötel -auths.attribute_avatar = Kontobill-Eegenskupp -auths.attributes_in_bind = Eegenskuppen in Binne-DN-Umgeven halen -auths.default_domain_name = Normaaler Domään-Naam för de E-Mail-Adress -auths.allow_deactivate_all = Verlööv, dat een leges Söökresultaat all Brukers as nich aktiiv sett -auths.use_paged_search = Söök mit Siedens bruken -auths.search_page_size = Siedengrött -auths.filter = Bruker-Filter -auths.admin_filter = Chef-Filter -auths.restricted_filter = Begrenzt-Filter -auths.verify_group_membership = Gruppen-Liddmatenskupp in LDAP utwiesen (laat de Filter leeg, um dat to överspringen) -auths.group_search_base = Gruppensöök-Grundlaag-DN -auths.group_attribute_list_users = Gruppen-Eegenskupp, wat de Brukerlist enthollt -auths.user_attribute_in_group = Bruker-Eegenskupp in Grupp list -auths.map_group_to_team_removal = Brukers ut spegelt Klottjen wegdoon, wenn de Bruker nich in de tohörig LDAP-Grupp is -auths.enable_ldap_groups = LDAP-Gruppen anknipsen -auths.ms_ad_sa = MS-AD-Söök-Eegenskuppen -auths.smtp_auth = SMTP-Anmellens-Aard -auths.smtphost = SMTP-Host -auths.smtpport = SMTP-Poort -auths.allowed_domains = Verlöövte Domänen -auths.skip_tls_verify = TLS-Utwiesen överspringen -auths.force_smtps = SMTPS dwingen -auths.helo_hostname = HELO-Hostnaam -auths.helo_hostname_helper = Hostnaam, wat mit HELO schickt word. Laat dat leeg, um de stedenwies Hostnaam to schicken. -auths.disable_helo = HELO utknipsen -auths.pam_service_name = PAM-Deenst-Naam -auths.pam_email_domain = PAM-E-Mail-Domään (nich nödig) -auths.oauth2_provider = OAuth2-Anbeder -auths.oauth2_icon_url = Bill-URL -auths.oauth2_clientID = Klient-ID (Slötel) -auths.oauth2_clientSecret = Klient-Geheemst -auths.oauth2_use_custom_url = Eegene URLs in Stee vun de normaalen URLs bruken -auths.oauth2_tokenURL = Teken-URL -auths.oauth2_authURL = Anmellen-URL -auths.oauth2_profileURL = Profil-URL -auths.oauth2_emailURL = E-Mail-URL -auths.skip_local_two_fa = Stedenwies 2FA överspringen -auths.oauth2_tenant = Inwohner -auths.oauth2_scopes = Wiedere Rebeeten -users.deletion_success = Dat Brukerkonto is lösket worden. -users.list_status_filter.is_admin = Chef -auths.syncenabled = Bruker-Vernejen anknipsen -users.reset_2fa = 2FA torüggsetten -users.list_status_filter.is_prohibit_login = Anmellen verseggen -users.list_status_filter.not_admin = Keen Chef -auths.auth_type = Anmellens-Aard -auths.restricted_filter_helper = Laat dat leeg, wenn keene Brukers begrenzt wesen sallen. Bruuk eenen Steern (»*«), um all Brukers, wat nich up de Chef-Filter passen, as begrenzt to setten. -auths.force_smtps_helper = SMTPS word alltieden up Poort 465 bruukt. Sett dat, um SMTPS up anner Poorten to dwingen. (Anners word up anner Poorten STARTTLS bruukt, wenn de Host dat unnerstütt.) -users.list_status_filter.reset = Torüggsetten -users.list_status_filter.is_active = Aktiiv -users.list_status_filter.not_prohibit_login = Anmellen verlöven -auths.auth_name = Anmellens-Naam -auths.map_group_to_team = LDAP-Gruppens up Vereenigungs-Klottjen avbillen (laat dat Feld leeg, um dat to överspringen) -auths.allowed_domains_helper = Laat dat leeg, um all Domänens to verlöven. Trenn mennig Domänen mit eenem Komma (»,«). -defaulthooks.desc = Internett-Hakens schicken automatisk HTTP-POST-Anfragen to eenem Server, wenn wisse Forgejo-Vörfallen passeren. Internett-Hakens, wat hier inricht worden, sünd Normaalweertens un worden in all neje Repositoriums kopeert. Lees mehr in de Internett-Hakens-Dokumenteren. -auths.openIdConnectAutoDiscoveryURL = URL för Automatisk Utförsken mit OpenID-Verbinnen -auths.skip_local_two_fa_helper = Wenn dat nich sett is, heet dat, dat stedenwies Brukers mit 2FA doch tum Anmellen dör 2FA gahn mutten -auths.oauth2_required_claim_name = Nödig Anrecht-Naam -auths.oauth2_required_claim_value = Nödig Anrecht-Weert -auths.oauth2_required_claim_value_helper = Sett deesen Weert, um dat Anmellen vun deesem Quell blots to Brukers to verlöven, well een Anrecht up deesen Naam un Weert hebben -auths.oauth2_required_claim_name_helper = Sett deesen Naam, um dat Anmellen vun deesem Quell blots to Brukers to verlöven, well een Anrecht up deesen Naam hebben -auths.oauth2_group_claim_name = Anrecht-Naam, wat Gruppnamen för deesen Quell gifft. (Nich nödig) -auths.oauth2_admin_group = Gruppen-Anrecht-Weert för Chef-Brukers. (Nich nödig – bruukt boven de Anrecht-Naam) -auths.oauth2_restricted_group = Gruppen-Anrecht-Weert för begrenzte Brukers. (Nich nödig – bruukt boven de Anrecht-Naam) -auths.oauth2_map_group_to_team = Billt Anrechts-Gruppen up Vereenigungs-Klottjen av. (Nich nödig – bruukt boven de Anrecht-Naam) -auths.oauth2_map_group_to_team_removal = Brukers vun spegelt Klottjen wegdoon, wenn de Bruker nich to de tohörig Grupp daartohöört. -auths.sspi_auto_create_users = Brukers automatisk maken -auths.sspi_auto_activate_users = Brukers automatisk aktiveren -auths.sspi_auto_activate_users_helper = Verlöövt de SSPI-Anmellens-Aard, neje Brukers automatisk to aktiveren -auths.sspi_separator_replacement = Trennteken, wat in Stee vun \, / un @ bruukt word -auths.sspi_separator_replacement_helper = De Bookstaav, wat bruukt word, um de Trenntekens vun unnerörnt Anmell-Namen uttowesseln (to’n Bispööl dat \ in »DOMAIN\bruker«) un Bruker-Höövdmann-Namen (to’n Bispööl dat @ in »bruker@example.org«). -auths.sspi_default_language = Bruker-Normaal-Spraak -auths.tips = Tipps -auths.tips.gmail_settings = Gmail-Instellens: -auths.tips.oauth2.general = Anmellen mit OAuth2 -auths.tips.oauth2.general.tip = Wenn du een nejes OAuth2-Programm vermarkst, sall de Rückroop-/Umleit-URL wesen: -auths.tip.oauth2_provider = OAuth2-Anbeder -auths.tip.bitbucket = Vermark eenen nejen OAuth-Bruker up %s un föög de Verlööv »Konto« → »Lesen« hento -auths.tip.nextcloud = Vermark eenen nejen OAuth-Bruker up diener Instanz, indeem du dat Menü »Instellens« → »Sekerheid« → »OAuth-2.0-Klient« bruukst -auths.tip.dropbox = Maak een nejes Programm up %s -auths.tip.github = Vermark een nejes OAuth-Programm up %s -auths.tip.gitlab_new = Vermark een nejes Programm up %s -auths.tip.google_plus = Haal OAuth2-Klient-Anmelldaten vun de Google-API-Konsool up %s -auths.tip.discord = Vermark een nejes Programm up %s -auths.tip.gitea = Vermark een nejes OAuth2-Programm. Anleden kann up %s funnen worden -auths.tip.twitter = Gah to %s, maak een Programm un wees wiss, dat de Instellen »Verlööv deesem Programm, tum Anmellen mit Twitter bruukt to worden« anknipst is -auths.edit = Anmellens-Quell bewarken -auths.activated = Deeser Anmellens-Quell is aktiveert -auths.new_success = De Anmellens-Aard »%s« is hentoföögt worden. -auths.update_success = De Anmellens-Quell is verneeit worden. -auths.update = Anmellens-Quell vernejen -auths.delete = Anmellens-Quell wegdoon -auths.delete_auth_title = Anmellens-Quell wegdoon -auths.delete_auth_desc = Wenn du eenen Anmellens-Quell wegdoost, könen Brukers dat nich mehr bruken, um sik antomellen. Wiedermaken? -auths.still_in_used = De Anmellens-Quell word noch bruukt. Du muttst Brukers, wat deesen Anmellens-Quell bruken, eerst ännern of lösken. -auths.deletion_success = De Anmellens-Quell is wegdaan worden. -auths.login_source_exist = De Anmellens-Quell »%s« gifft dat al. -auths.unable_to_initialize_openid = Kann de OpenID-Verbinnens-Anbeder nich inrichten: %s -auths.invalid_openIdConnectAutoDiscoveryURL = Ungültige URL för Automatisk Utförsken (dat mutt eene gültige URL wesen, wat mit http:// of https:// begünnt) -config.server_config = Server-Inrichten -config.app_name = Instanz-Titel -config.app_slogan = Instanz-Motto -config.app_ver = Forgejo-Versioon -config.app_url = Grund-URL -config.custom_file_root_path = Eegener Datei-Ruut-Padd -config.domain = Server-Domään -config.offline_mode = Stedenwies-Modus -config.disable_router_log = Router-Utgaav utknipsen -config.run_user = Bruker för ’t Utföhren -config.run_mode = Utföhrens-Aard -config.git_version = Git-Versioon -config.lfs_root_path = LFS-Ruut-Padd -config.script_type = Schrievens-Aard -config.ssh_config = SSH-Inrichten -config.ssh_enabled = Anknipst -config.ssh_start_builtin_server = Inbaut Server bruken -config.ssh_domain = SSH-Server-Domään -config.ssh_port = Poort -config.ssh_listen_port = Tohören-Poort -config.ssh_root_path = Ruutpadd -config.ssh_key_test_path = Slöteltestpadd -config.ssh_minimum_key_size_check = Minnste Slötelgrött prüfen -config.ssh_minimum_key_sizes = Minnste Slötelgröten -config.lfs_config = LFS-Inrichten -config.lfs_enabled = Anknipst -config.lfs_content_path = LFS-Inholls-Padd -config.db_config = Datenbank-Inrichten -config.db_type = Aard -config.db_host = Host -config.db_name = Naam -config.db_user = Brukernaam -config.db_schema = Schema -config.db_ssl_mode = SSL -config.db_path = Padd -config.register_email_confirm = E-Mail-Utwiesen bi’m Registreren verlangen -config.disable_register = Sülvst-Registreren utknipsen -config.reverse_auth_user = Umdreiht-Proxy-Anmell-Bruker -config.lfs_http_auth_expiry = LFS-HTTP-Anmellens-Avlooptied -config.enable_openid_signin = OpenID-Anmellen anknipsen -config.show_registration_button = Registreren-Knoop wiesen -config.require_sign_in_view = Anmellen verlangen, um Inholl to wiesen -config.mail_notify = E-Mail-Narichtens anknipsen -config.enable_captcha = CAPTCHA anknipsen -config.active_code_lives = Ofloops-Düür vun de Aktiverens-Teken -config.default_keep_email_private = E-Mail-Adressen normaal verbargen -config.default_allow_create_organization = Normaal verlöven, Vereenigungen to maken -config.enable_timetracking = Tied-Erfaten anknipsen -config.default_enable_timetracking = Tied-Erfaten normaal anknipsen -config.default_allow_only_contributors_to_track_time = Blots Bidragers Tied erfaten laten -config.no_reply_address = Verburgen E-Mail-Domään -config.default_visibility_organization = Normaal-Sichtbaarkeid vun nejen Vereenigungen -config.default_enable_dependencies = Gefall-Ofhangens normaal anknipsen -config.webhook_config = Internett-Haak-Inrichten -config.queue_length = Slang-Längde -config.deliver_timeout = Lever-Tied-Överweggahn -config.skip_tls_verify = TLS-Utwiesen överspringen -config.mailer_config = E-Mailer-Inrichten -config.mailer_enabled = Anknipst -config.mailer_enable_helo = HELO anknipsen -config.mailer_name = Naam -config.mailer_smtp_addr = SMTP-Host -config.mailer_smtp_port = SMTP-Poort -config.mailer_user = Bruker -config.mailer_use_sendmail = Sendmail bruken -config.mailer_sendmail_path = Sendmail-Padd -config.mailer_sendmail_args = Wiedere Argumenten för Sendmail -config.mailer_sendmail_timeout = Sendmail-Tied-Överweggahn -config.test_email_placeholder = E-Mail (to’n Bispööl test@example.com) -config.send_test_mail = Test-E-Mail schicken -config.send_test_mail_submit = Schicken -config.test_mail_failed = Kunn keene Test-E-Mail an »%s« schicken: %v -config.test_mail_sent = Eene Test-E-Mail is an »%s« schickt worden. -config.oauth_config = OAuth-Inrichten -config.oauth_enabled = Anknipst -config.cache_config = Tüskenspieker-Inrichten -config.cache_adapter = Tüskenspieker-Anpasser -config.cache_interval = Tüskenspieker-Tiedofstand -config.cache_conn = Tüskenspieker-Verbinnen -config.cache_test = Tüskenspieker testen -config.cache_test_failed = Kunn de Tüskenspieker nich nakieken: %v. -config.cache_test_succeeded = Tüskenspieker-Test daankregen, hett eene Antwoord in %s kregen. -config.session_config = Sitzungs-Inrichten -config.mailer_use_dummy = Muster -config.cache_item_ttl = Tüskenspieker-Ding-TTL -config.session_provider = Sitzungs-Anbeder -config.provider_config = Anbeder-Inrichten -config.cookie_name = Kookje-Naam -config.gc_interval_time = GC-Tiedofstand -config.session_life_time = Sitzungs-Levenstied -config.https_only = Blots HTTPS -config.cookie_life_time = Kookje-Levenstied -config.picture_config = Bill- und Kontobill-Inrichten -config.picture_service = Billdeenst -config.disable_gravatar = Gravatar utknipsen -config.enable_federated_avatar = Verdeelte Kontobillers anknipsen -config.git_config = Git-Inrichten -config.git_disable_diff_highlight = Syntax-Vörheven im Unnerscheed utknipsen -config.git_max_diff_lines = Hoogste Unnerscheeds-Riegen pro Datei -config.git_max_diff_line_characters = Hoogste Unnerscheeds-Bookstavens pro Rieg -config.git_max_diff_files = Hoogste Tahl vun Unnerscheeds-Dateien wiest -config.git_gc_args = GC-Argumenten -config.git_migrate_timeout = Umtreck-Tied-Överweggahn -config.git_mirror_timeout = Spegel-Vernejens-Tied-Överweggahn -config.git_clone_timeout = Klonen-Tied-Överweggahn -config.git_pull_timeout = Haal-Tied-Överweggahn -config.git_gc_timeout = GC-Tied-Överweggahn -config.log_config = Utgaav-Inrichten -config.logger_name_fmt = Utgever: %s -config.disabled_logger = Utknipst -config.access_log_mode = Utgaav-Togrieps-Aard -config.access_log_template = Utgaav-Togrieps-Vörlaag -config.xorm_log_sql = SQL utgeven -monitor.stats = Statistiken -monitor.cron = Tiedplaan-Upgaven -monitor.name = Naam -monitor.schedule = Tiedplaan -monitor.next = Anner Maal -monitor.previous = Lestes Maal -monitor.process = Lopend Prozessen -monitor.stacktrace = Stapelspoor -monitor.processes_count = %d Prozessen -monitor.download_diagnosis_report = Faststellens-Bericht runnerladen -monitor.desc = Beschrieven -monitor.start = Begünn-Tied -monitor.execute_time = Looptied -monitor.last_execution_result = Resultaat -monitor.process.cancel = Prozess ofbreken -monitor.process.cancel_desc = Wenn een Prozess ofbroken word, könen Daten verloren gahn -monitor.process.cancel_notices = Ofbreken: %s? -monitor.process.children = Kinners -monitor.queues = Slangen -monitor.queue = Slang: %s -monitor.queue.name = Naam -monitor.queue.activeworkers = Aktiiv Rieters -monitor.queue.maxnumberworkers = Hoogste Tahl vun Rieters -monitor.queue.numberinqueue = Tahl in de Slang -monitor.queue.review_add = Rieters nakieken / hentofögen -monitor.queue.settings.title = Vörraad-Instellens -monitor.queue.settings.maxnumberworkers = Hoogste Tahl vun Rieters -monitor.queue.settings.maxnumberworkers.placeholder = Stedenwies %[1]d -monitor.queue.settings.maxnumberworkers.error = Hoogste Tahl vun Rieters mutt eene Tahl wesen -monitor.queue.settings.submit = Instellens vernejen -monitor.queue.settings.changed = Instellens verneeit -monitor.queue.settings.remove_all_items = All wegdoon -notices.system_notice_list = Systeem-Narichtens -notices.operations = Doon -notices.select_all = All utkören -notices.deselect_all = All nich utkören -notices.inverse_selection = Utkören umdreihen -notices.delete_selected = Utköört wegdoon -notices.delete_all = All Narichtens wegdoon -notices.type = Aard -notices.type_1 = Repositorium -notices.type_2 = Upgaav -notices.desc = Beschrieven -notices.op = Up. -monitor.queue.exemplar = Musteraard -notices.view_detail_header = Naricht-Informatioonen -self_check.no_problem_found = Noch keen Probleem funnen. -self_check.database_collation_mismatch = Verwacht, dat de Datenbank deese Kollatioon bruukt: %s -self_check.database_collation_case_insensitive = Datenbank bruukt eene Kollatioon %s, wat eene unklünige Kollatioon is. Forgejo kann twaar daarmit warken, aver dat kann rare Fallen geven, waar dat nich so warkt as verwacht. -self_check.database_fix_mysql = Brukers vun MySQL of MariaDB könen de Oorder »forgejo doctor convert« bruken, um de Kollatioons-Problemen oftohelpen, of du kannst dat Probleem ofhelpen, indeem du vun Hand de SQL-Oorders »ALTER … COLLATE …« bruukst. -self_check.database_inconsistent_collation_columns = Datenbank bruukt Kollatioon %s, aver deese Striepen bruken unpassend Kollatioonen. Dat kann unverwachte Problemen maken. -auths.sspi_auto_create_users_helper = Verlöövt de SSPI-Anmellens-Aard, automatisk een Konto för Brukers to maken, well sik tum eersten Maal anmellen -config.log_file_root_path = Utgaav-Padd -config.reset_password_code_lives = Ofloops-Düür vun de Torügghalens-Teken -config.allow_dots_in_usernames = Brukers verlöven, Punkten in hör Brukernamen to bruken. Ännert nix an bestahn Konten. -monitor.queue.numberworkers = Tahl vun Rieters -config.set_setting_failed = Instellen %s to setten fehlslagen -monitor.execute_times = Utföhrens -monitor.queue.settings.desc = Vörraden wassen as nödig, wenn hör Rieters-Slang blockeert. -auths.tip.openid_connect = Bruuk de Utförsken-URL för OpenID-Verbinnen (/.well-known/openid-configuration), um de Ennpunkten antogeven -auths.login_source_of_type_exist = Eenen Anmellens-Quell vun deeser Aard gifft dat al. -config.mailer_protocol = Protokoll -auths.tip.facebook = Vermark een nejes Programm up %s un föög dat Produkt »Facebook-Anmellen« hento -config.custom_conf = Inricht-Dateipadd -config.app_data_path = Programmdatenpadd -config.service_config = Deenst-Inrichten -config.enable_openid_signup = OpenID-Sülvst-Registreren anknipsen -config.cache_test_slow = Tüskenspieker-Test daankregen, aver de Antwoord is langsaam: %s. -monitor.queue.type = Aard -monitor.queue.settings.remove_all_items_done = All Dingen in de Slang sünd wegdaan worden. -auths.tip.mastodon = Giff eene eegene Instanz-URL för de Mastodon-Instanz, mit wat du anmellen willst, in (of bruuk de Normaalweert) -notices.delete_success = De Systeem-Narichtens sünd wegdaan worden. -auths.sspi_strip_domain_names = Domään-Namen vun Brukernamen lösken -auths.sspi_strip_domain_names_helper = Wenn dat anknipst is, worden Domään-Namen automatisk vun Anmell-Namen lösket (to’n Bispööl worden »DOMAIN\bruker« un »bruker@example.org« beide blots »bruker«). -auths.sspi_default_language_helper = Normaal-Spraak för Brukers, wat vun de SSPI-Anmellens-Aard automatisk maakt worden. Laat dat leeg, wenn du willst, dat de Spraak automatisk utköört word. -config.repo_root_path = Repositoriums-Ruut-Padd -config.allow_only_internal_registration = Registreren blots dör Forgejo sülvst verlöven -config.allow_only_external_registration = Registreren blots dör frömde Deensten verlöven -config.ssh_keygen_path = Slötelmakens-Padd (»ssh-keygen«) -config.open_with_editor_app_help = De »Mit … opmaken«-Bewarkers im Kloon-Menü. Wenn du dat leeg lettst, word de Normaalweert bruukt. Verwieder, um de Normaalweert antokieken. -auths.tip.yandex = Maak een nejes Programm up %s. Köör deese Verlöövnissen ut de Deel »Yandex.Passport API« ut: »Togriep up E-Mail-Adress«, »Togriep up Bruker-Kontobill« un »Togriep up Brukernaam, Vörnaam un Achternaam, Geschlecht« -monitor.duration = Düür (s) - -[action] -rename_repo = hett een Repositorium vun %[1]s na %[3]s umbenöömt -create_issue = `hett Gefall %[3]s #%[2]s opmaakt` -close_issue = `hett Gefall %[3]s #%[2]s dichtmaakt` -reopen_issue = `hett Gefall %[3]s #%[2]s weer opmaakt` -create_pull_request = `hett Haalvörslag %[3]s #%[2]s opmaakt` -reopen_pull_request = `hett Haalvörslag %[3]s #%[2]s weer opmaakt` -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 -compare_branch = Verglieken -compare_commits = %d Kommitterens verglieken -compare_commits_general = Kommitterens verglieken -mirror_sync_create = hett nejen Beteekner %[3]s na %[4]s spegelt -approve_pull_request = `hett %[3]s#%[2]s tostimmt` -reject_pull_request = `hett um Ännerns in %[3]s#%[2]s beden` -review_dismissed = `hett dat Nakieken vun %[4]s för %[3]s#%[2]s ofseggt` -review_dismissed_reason = Grund: -starred_repo = hett up %[2]s eenen Steern sett -merge_pull_request = `hett Haalvörslag %[3]s #%[2]s tosamenföhrt` -create_branch = hett Twieg %[3]s in %[4]s maakt -delete_tag = hett Mark %[2]s vun %[3]s lösket -push_tag = hett Mark %[3]s na %[4]s schuven -publish_release = `hett %[4]s in %[3]s publik maakt` -commit_repo = hett to %[3]s in %[4]s schuven -close_pull_request = `hett Haalvörslag %[3]s #%[2]s dichtmaakt` -create_repo = hett dat Repositorium %s maakt -mirror_sync_push = hett Kommitterens na %[3]s in %[4]s spegelt -mirror_sync_delete = hett Beteekner %[2]s in %[3]s spegelt un lösket -watched_repo = hett begunnen, %[2]s to beluren - -[tool] -future = in Tokunft -1s = 1 Sekünn -1m = 1 Menüüt -1d = 1 Dag -1w = 1 Week -1mon = 1 Maant -1y = 1 Jahr -seconds = %d Sekünnen -hours = %d Stünnen -days = %d Dagen -weeks = %d Weken -months = %d Maanten -years = %d Jahren -raw_seconds = Sekünnen -raw_minutes = Menüten -minutes = %d Menüten -now = nu -1h = 1 Stünn - -[munits.data] -b = B -kib = KiB -mib = MiB -gib = GiB -tib = TiB -pib = PiB -eib = EiB - -[dropzone] -default_message = Laat Dateien hier fallen of klick hier tum Upladen. -invalid_input_type = Du kannst deese Aard vun Dateien nich upladen. -file_too_big = Dateigrött ({{filesize}} MB) is boven de hoogste Dateigrött vun {{maxFilesize}} MB. -remove_file = Datei wegdoon - -[notification] -notifications = Narichtens -unread = Nich lesen -read = Lesen -no_unread = Keene nejen Narichtens. -no_read = Keene lesen Narichtens. -pin = Naricht faststeken -mark_as_read = As lesen markeren -mark_as_unread = As nich lesen markeren -mark_all_as_read = All as lesen markeren -subscriptions = Abonneerens -watching = Beluren -no_subscriptions = Nix abonneert - -[gpg] -default_key = Mit normaalem Slötel unnerschrieven -error.extract_sign = Kunn Unnerschrift nich uttrecken -error.generate_hash = Kunn Prüfsumm vum Kommitteren nich bereken -error.no_committer_account = Keen Konto mit de Kommitterer-E-Mail-Adress verbunnen -error.no_gpg_keys_found = Keen bekannter Slötel för deese Unnerschrift in de Datenbank funnen -error.not_signed_commit = Kommitteren is nich unnerschrieven -error.failed_retrieval_gpg_keys = Kunn keenen Slötel halen, wat mit de Konto vum Kommitterer verbunnen is -error.probable_bad_signature = WAHRSCHAU! Ofschoonst een Slötel mit deeser ID in de Datenbank is, wiest dat deeses Kommitteren nich ut! Deeses Kommitteren is VERDÄCHTIG. -error.probable_bad_default_signature = WAHRSCHAU! Ofschoonst de normaal-Slötel deese ID hett, wiest dat deeses Kommitteren nich ut! Deeses Kommitteren is VERDÄCHTIG. - -[install] -install = Installeren -title = Eerstinrichten -docker_helper = Wenn du Forgejo in Docker utföhrst, lees bidde de Dokumenteren, ehr du eets Instellens ännerst. -require_db_desc = Forgejo bruukt MySQL, PostgreSQL, SQLite3 of TiDB (MySQL-Protokoll). -db_title = Datenbank-Instellens -db_type = Datenbank-Aard -host = Host -user = Brukernaam -password = Passwoord -db_name = Datenbank-Naam -db_schema = Schema -db_schema_helper = Leeg laten, um de Normaalweert för de Datenbank to bruken (»public«). -path = Padd -reinstall_error = Du versöchst, in eene bestahn Forgejo-Datenbank to installeren -reinstall_confirm_check_2 = De Repositoriums un Instellens mutten villicht verneeit worden. Indeem du deese Kist utköörst, stimmst du to, dat du de Hakens för de Repositoriums un de authorized_keys-Datei vun Hand vernejen worst. Du wiest ut, dat du wiss maken worst, dat de Repositoriums- un Spegel-Instellens all recht sünd. -err_empty_db_path = De SQLite3-Datenbank-Padd kann nich leeg wesen. -no_admin_and_disable_registration = Du kannst Bruker-Sülvst-Registreren nich utknipsen, sünner eerst een Chef-Konto to maken. -err_empty_admin_password = Dat Chef-Passwoord kann nich leeg wesen. -err_empty_admin_email = De Chef-E-Mail-Adress kann nich leeg wesen. -err_admin_name_is_reserved = Chef-Brukernaam is ungültig, Brukernaam is vörbehollen -general_title = Allgemeene Instellens -app_name = Instanz-Titel -app_slogan = Instanz-Motto -repo_path = Repositoriums-Ruut-Padd -lfs_path = Git-LFS-Ruut-Padd -lfs_path_helper = Dateien, wat vun Git LFS verfolgt worden, worden in deesem Verteeknis sekert. Leeg laten, um dat uttoknipsen. -run_user = Bruker för ’t Utföhren -domain = Server-Domään -domain_helper = Domään of Hostadress för de Server. -ssh_port = SSH-Server-Poort -http_port = HTTP-Tohören-Poort -http_port_helper = Poort-Tahl, wat de Forgejo-Internett-Server bruken word. -ssh_port_helper = Poort-Tahl, wat de SSH-Server bruken word. Leeg laten, um de SSH-Server uttoknipsen. -log_root_path = Utgaav-Padd -log_root_path_helper = Utgaav-Dateien worden in deeses Verteeknis schreven. -email_title = E-Mail-Instellens -smtp_addr = SMTP-Host -smtp_port = SMTP-Poort -smtp_from = E-Mail schicken as -smtp_from_invalid = De »E-Mail schicken as«-Adress is ungültig -smtp_from_helper = E-Mail-Adress, wat Forgejo bruken word. Giff eene slichte E-Mail-Adress in of bruuk dat Formaat »"Naam" «. -mailer_user = SMTP-Brukernaam -mailer_password = SMTP-Passwoord -register_confirm = E-Mail-Utwiesen bi’m Registreren verlangen -mail_notify = E-Mail-Narichtens anknipsen -server_service_title = Instellens för de Server un Frömdanbeder-Deensten -offline_mode = Stedenwies-Modus anknipsen -disable_gravatar = Gravatar utknipsen -federated_avatar_lookup = Verdeelte Kontobillers anknipsen -federated_avatar_lookup.description = Kontobillers över Libravatar söken. -disable_registration = Sülvst-Registreren utknipsen -disable_registration.description = Blots Instanz-Chefs könen neje Brukerkonten maken. Dat word nödig anraden, dat Registreren uttoknipsen, wenn du nich vörhest, eene publike Instanz för alle Lüü to hosten un paraat büst, mit mennig Oolkert-Konten klaartoworden. -allow_only_external_registration = Registreren blots över frömde Deenste verlöven -allow_only_external_registration.description = Brukers könen neje Konten blots över inricht frömde Deensten maken. -openid_signin.description = Brukers verlöven, sik över OpenID antomellen. -openid_signup.description = Brukers verlöven, Konten över OpenID to maken, wenn Sülvst-Registreren anknipst is. -enable_captcha = CAPTCHA bi’m Registreren anknipsen -require_sign_in_view = Anmellen verlangen, um Instanz-Inholl to wiesen -default_keep_email_private = E-Mail-Adressen normaal verbargen -default_keep_email_private.description = Dat Verbargen vun de E-Mail-Adress för neje Brukers anknipsen, sodat deese Informatioon na de Registreren nich stracks dörsickert. -default_enable_timetracking = Tied-Erfaten normaal anknipsen -default_enable_timetracking.description = Nejen Repositoriums stracks verlöven, Tied-Erfatens to bruken. -admin_title = Chefkonto-Instellens -admin_setting.description = Du mutts nich vun Nood een Chefkonto inrichten. De eerste registreert Bruker word automatisk een Chef. -admin_name = Chef-Brukernaam -admin_password = Passwoord -confirm_password = Passwoord utwiesen -install_btn_confirm = Forgejo installeren -invalid_db_setting = De Datenbank-Instellens sünd ungültig: %v -invalid_db_table = De Datenbank-Tabell »%s« is ungültig: %v -invalid_repo_path = De Repositoriums-Ruut-Padd is ungültig: %v -invalid_app_data_path = De Programm-Daten-Padd is ungültig: %v -run_user_not_match = De »Bruker för ’t Utföhren«-Brukernaam is nich de stedenwies Brukernaam: %s → %s -internal_token_failed = Kunn binneres Teken nich maken: %v -secret_key_failed = Kunn geheemen Slötel nich maken: %v -err_admin_name_pattern_not_allowed = Chef-Brukernaam is ungültig, de Brukernaam passt up een vörbehollen Muster -run_user_helper = De Bedrievssysteem-Brukernaam, as wat Forgejo löppt. Wees wiss, dat deeser Bruker Togriep to de Repositoriums-Ruut-Padd hebben mutt. -optional_title = Nich nödige Instellens -openid_signin = OpenID-Anmellen anknipsen -openid_signup = OpenID-Sülvst-Registreren anknipsen -save_config_failed = Kunn Inrichten nich sekern: %v -enable_update_checker_helper_forgejo = Dat söcht alltied weer na nejen Forgejo-Versioonen, indeem een TXT-DNS-Upteken unner release.forgejo.org ankiekt word. -app_slogan_helper = Giff hier dat Motto för diene Instanz in. Leeg laten, um dat uttoknipsen. -ssl_mode = SSL -reinstall_confirm_message = Neei-installeren mit eener bestahn Forgejo-Datenbank kann mennig Problemen geven. Meesttiedens is dat beter, du bruukst diene bestahn »app.ini«, um Forgejo uttoföhren. Wenn du weetst, wat do doost, wies dat hier ut: -sqlite_helper = Dateipadd för de SQLite3-Datenbank.
Giff eenen absoluuten Padd in, wenn du Forgejo as Deenst utföhrst. -reinstall_confirm_check_1 = De Daten, wat vun de SECRET_KEY in app.ini verslötelt sünd, könen verloren gahn: Brukes könen sik villicht nich mehr mit 2FA/OTP anmellen un Spegels sün villicht kaputt. Wenn du deese Kist utköörst, stimmst du to, dat de stedenwies app.ini de rechten SECRET_KEY enthollt. -repo_path_helper = Frömde Git-Repositoriums worden in deesem Verteeknis sekert. -offline_mode.description = Frömdanbeder-Inholls-Levern-Nettwarken utknipsen un all Objekten stedenwies levern. -require_sign_in_view.description = Blots anmellt Brukers verlöven Togriep to eets Inhollen verlöven. Gasten könen nix as de Anmell-Sieden sehn. -default_allow_create_organization = Normaal verlöven, Vereenigungen to maken -default_allow_create_organization.description = Nejen Brukers stracks verlöven, Vereenigungen to maken. Wenn deese Instellen utknipst is, mutt een Chef nejen Brukers eerst dat Recht geven, Vereenigungen to maken. -config_location_hint = Deese Inricht-Instellens worden sekert in: -reinstall_confirm_check_3 = Du wiest ut, dat du heel un dall wiss büst, dat Forgejo mit de rechten app.ini-Stee löppt un dat du wiss büst, dat du würrelk neei installeren muttst. Du wiest ut, dat du de Gefahren boven annimmst. -err_admin_name_is_invalid = Chef-Brukernaam is ungültig -app_name_helper = Giff hier dienen Instanz-Naam in. Dat word up elkeen Sied wiest. -disable_gravatar.description = Gravatar un anner Frömdanbeder-Kontobill-Quellen utknipsen. Dat Normaalbill word för Bruker-Kontobillers bruukt, wenn se nich hör eegen Kontobill to de Instanz upladen. -test_git_failed = Kunn »git«-Oorder nich testen: %v -sqlite3_not_available = Deese Forgejo-Versioon unnerstütt SQLite3 nich. Bidde laad de offizielle Binäärversioon vun %s runner (nich de »gobuild«-Versioon). -app_url = Grund-URL -app_url_helper = Grund-Adress för HTTP(S)-Kloon-URLs un E-Mail-Narichtens. -enable_captcha.description = Verlangen, dat Brukers een CAPTCHA ofsluten, um Konten to maken. -admin_email = E-Mail-Adress -allow_dots_in_usernames = Brukers verlöven, Punkten in hör Brukernamen to bruken. Ännert nix an bestahn Konten. -no_reply_address = Verburgen E-Mail-Domään -no_reply_address_helper = Domään-Naam för Brukers mit eener verburgen E-Mail-Adrees. To’n Bispööl word de Brukernaam »fiete« in Git as »fiete@noreply.example.org« vermarkt, wenn de verbargen E-Mail-Domään as »noreply.example.org« sett is. -invalid_admin_setting = Chefkonto-Instellen is ungültig: %v -invalid_log_root_path = De Utgaav-Padd is ungültig: %v -password_algorithm = Passwoord-Prüfsumm-Funktioon -enable_update_checker = Vernejens-Nakieker anknipsen -env_config_keys = Umgevens-Inrichten -env_config_keys_prompt = Deese Umgevens-Variaabeln worden ok up diene Instellens-Datei anwennt: -password_algorithm_helper = Sett de Passwoord-Prüfsumm-Funktioon. Funktioonen hebben verscheden Vörutsettens un Starkden. De argon2-Funktioon is bannig seker, aver se bruukt mennig Spieker un is för lütte Systeemen villicht nich gadelk. -invalid_password_algorithm = Ungültige Passwoord-Prüfsumm-Funktioon - -[units] -unit = Eenheid -error.no_unit_allowed_repo = Du hest nich dat Recht, to elkeen Deel vun deesem Repositorium totogriepen. -error.unit_not_allowed = Du hest nich dat Recht, up deese Deel vum Repositorium totogriepen. - -[packages] -title = Paketen -desc = Repositorium-Paketen verwalten. -empty = Dat gifft noch keene Paketen. -filter.type = Aard -filter.type.all = All -filter.container.tagged = Markt -filter.container.untagged = Nich markt -published_by = %[1]s vun %[3]s publizeert -installation = Installeren -about = Över deeses Paket -requirements = Bruukt -dependencies = Ofhangens -keywords = Slötelwoorden -details = Mehr Informatioonen -details.author = Autor -details.project_site = Projekt-Internett-Sied -details.repository_site = Repositoriums-Internett-Sied -details.documentation_site = Dokumenterens-Internett-Sied -details.license = Lizenz -assets = Objekten -versions = Versioonen -versions.view_all = All wiesen -dependency.id = ID -dependency.version = Versioon -alpine.registry.info = Köör $branch un $repository ut de List unnern ut. -alpine.repository = Repositoriums-Informatioon -alpine.repository.branches = Twiegen -alpine.repository.repositories = Repositoriums -arch.version.properties = Versioon-Eegenskuppen -arch.version.provides = Stellt paraat -arch.version.groups = Grupp -arch.version.depends = Hangt of vun -arch.version.optdepends = Hangt nich nödig of vun -arch.version.makedepends = Bau-Ofhangens -arch.version.checkdepends = Överprüfens-Ofhangens -arch.version.conflicts = Unverdragelkheiden -arch.version.replaces = Staht liek för -composer.dependencies = Ofhangens -composer.dependencies.development = Entwicklens-Ofhangens -conan.details.repository = Repositorium -container.labels = Vermarkens -container.labels.key = Slötel -container.labels.value = Weert -cran.install = Um dat Paket to installeren, föhr deese Oorder ut: -debian.install = Um dat Paket to installeren, föhr deese Oorder ut: -debian.repository = Repositoriums-Informatioon -debian.repository.distributions = Verdeelens -debian.repository.components = Delen -debian.repository.architectures = Architekturen -helm.install = Um dat Paket to installeren, föhr deese Oorder ut: -npm.dependencies.development = Entwicklens-Ofhangens -npm.dependencies.bundle = Mitbrocht Ofhangens -npm.dependencies.peer = Maten-Ofhangens -npm.dependencies.optional = Nich nödige Ofhangens -npm.details.tag = Mark -pypi.requires = Bruukt Python -rpm.repository = Repositoriums-Informatioon -rpm.repository.architectures = Architekturen -rubygems.dependencies.runtime = Looptied-Ofhangens -rubygems.dependencies.development = Entwicklens-Ofhangens -rubygems.required.ruby = Bruukt Ruby-Versioon -rubygems.required.rubygems = Bruukt RubyGem-Versioon -swift.install2 = un föhr deese Oorder ut: -settings.link.description = Wenn du een Paket mit eenem Repositorium verbinnst, word dat Paket in de Paketlist vum Repositorium wiest. -settings.link.select = Repositorium utkören -settings.link.error = Kunn de Repositoriums-Verwies nich vernejen. -settings.delete = Paket lösken -settings.delete.description = Een Paket to lösken is för all Tieden un kann nich torüggnohmen worden. -settings.delete.success = Dat Paket is lösket worden. -settings.delete.error = Kunn dat Paket nich lösken. -owner.settings.cargo.initialize = Index inrichten -owner.settings.cargo.initialize.error = Kunn Cargo-Index nich inrichten: %v -owner.settings.cargo.initialize.success = De Cargo-Index is inricht worden. -owner.settings.cargo.rebuild = Index neei bauen -owner.settings.cargo.rebuild.error = Kunn Cargo-Index nich neei bauen: %v -owner.settings.cargo.rebuild.success = De Cargo-Index is neei baut worden. -owner.settings.cleanuprules.title = Schoonmakens-Örders -owner.settings.cleanuprules.add = Schoonmakens-Örder hentofögen -owner.settings.cleanuprules.edit = Schoonmakens-Örder bewarken -owner.settings.cleanuprules.none = Dat gifft noch keene Schoonmakens-Örders. -owner.settings.cleanuprules.preview = Schoonmakens-Örder-Utkiek -owner.settings.cleanuprules.preview.none = Schoonmakens-Örder passt up keene Paketen. -owner.settings.cleanuprules.enabled = Anknipst -owner.settings.cleanuprules.pattern_full_match = Muster up de kumplete Paketnaam anwennen -owner.settings.cleanuprules.keep.count = De neeiste behollen -owner.settings.cleanuprules.keep.count.1 = 1 Versioon pro Paket -owner.settings.cleanuprules.keep.count.n = %d Versioonen pro Paket -owner.settings.cleanuprules.keep.pattern = Versioonen behollen, wat passen -owner.settings.cleanuprules.remove.title = Versioonen, wat up deese Örders passen, worden lösket, wenn dat keene Örder boven gifft, wat seggt, dat se behollt worden mutten. -owner.settings.cleanuprules.remove.days = Versioonen oller as dat lösken -owner.settings.cleanuprules.remove.pattern = Versioonen lösken, wat passen -owner.settings.cleanuprules.success.update = Schoonmakens-Örder is verneeit worden. -filter.no_result = Dien Filter gifft keene Resultaten. -alpine.repository.architectures = Architekturen -settings.link.button = Repositoriums-Verwies vernejen -alpine.install = Um dat Paket to installeren, föhr deese Oorder ut: -arch.version.description = Beschrieven -published_by_in = %[1]s vun %[3]s in %[5]s publizeert -settings.link.success = Repositoriums-Verwies is verneeit worden. -settings.delete.notice = Du willst %s (%s) lösken. Dat kann nich torüggnohmen worden, willst du dat würrelk? -owner.settings.cleanuprules.preview.overview = %d Paketen sünd tum Lösken vörmarkt. -owner.settings.cleanuprules.success.delete = Schoonmakens-Örder is wegdaan worden. -owner.settings.cargo.rebuild.no_index = Kann nich neei bauen, keen Index is inricht. -npm.dependencies = Ofhangens -rpm.install = Um dat Paket to installeren, föhr deese Oorder ut: -settings.link = Verbinn deeses Paket mit eenem Repositorium -owner.settings.cleanuprules.keep.title = Versioonen, wat up deese Örders passen, worden behollt, ok wenn se up eene Löskens-Örder unnern passen. -empty.documentation = För mehr Informatioonen över de Paketlist, kiek de Dokumenteren an. -empty.repo = Hest du een Paket upladen, aver dat word hier nich wiest? Gah to de Paket-Instellens un verbinn dat mit deesem Repo. -registry.documentation = För mehr Informatioonen över de %s-Paketlist, kiek de Dokumenteren an. -alpine.registry = Richt deese Paketlist in, indeem du de URL in diene /etc/apk/repositories-Datei inföögst: -alpine.registry.key = Laad de publiken RSA-Slötel vun de Paketlist in dat Verteeknis /etc/apk/keys/ runner, um de Index-Unnerschrift uttowiesen: -arch.pacman.helper.gpg = Föög dat Vertroens-Zertifikaat för Pacman hento: -arch.pacman.repo.multi = %s hett in mennig Verdeelens de sülve Versioon. -arch.pacman.repo.multi.item = Inrichten för %s -arch.pacman.conf = Föög de Server mit de verwandt Verdeelen un Architektuur to de /etc/pacman.conf hento: -arch.pacman.sync = Verneei dat Paket mit Pacman: -arch.version.backup = Sekerheids-Kopie -cargo.registry = Richt deese Paketlist in de Cargo-Instellens-Datei in (to’n Bispööl ~/.cargo/config.toml): -cargo.install = Um dat Paket mit Cargo to installeren, föhr deese Oorder ut: -chef.install = Um dat Paket to installeren, föhr deese Oorder ut: -chef.registry = Richt deese Paketlist in diener ~/.chef/config.rb-Datei in: -composer.registry = Richt deese Paketlist in diener ~/.composer/config.json-Datei in: -conan.registry = Richt deese Paketlist vun de Oorderreeg in: -conda.registry = Richt deese Paketlist as een Conda-Repositorium in diener ~/.condarc-Datei in: -composer.install = Um dat Paket mit Composer to installeren, föhr deese Oorder ut: -conda.install = Um dat Paket mit Conda to installeren, föhr deese Oorder ut: -container.details.type = Avbill-Aard -container.details.platform = Plattfoorm -container.pull = Haal deeses Avbill vun de Oorderreeg: -container.digest = Prüüfsumm -container.multi_arch = BS / Arch -container.layers = Avbill-Schichten -cran.registry = Richt deese Paketlist in diener Rprofile.site-Datei in: -debian.registry = Richt deese Paketlist vun de Oorderreeg in: -debian.registry.info = Köör $distribution un $component ut de unnern List ut. -generic.download = Laad deeses Paket vun de Oorderreeg runner: -go.install = Installeer dat Paket vun de Oorderreeg: -helm.registry = Richt deese Paketlist vun de Oorderreeg in: -maven.registry = Richt deese Paketlist in diener pom.xml-Datei in: -maven.install2 = Vun de Oorderreeg utföhren: -maven.download = Um de Ofhangen runnertoladen, föhr in de Oorderreeg ut: -nuget.registry = Richt deese Paketlist vun de Oorderreeg in: -nuget.install = Um dat Paket mit NuGet to installeren, föhr deese Oorder ut: -nuget.dependency.framework = Enn-Rahmwark -npm.registry = Richt deese Paketlist in de .npmrc-Datei vun dienem Projekt in: -maven.install = Um dat Paket to bruken, giff in de dependencies-Deel vun de pom.xml-Datei dat an: -npm.install = Um dat Paket mit npm to installeren, föhr deese Oorder ut: -npm.install2 = of föög dat to de »package.json«-Datei hento: -pub.install = Um dat Paket mit Dart to installeren, föhr deese Oorder ut: -pypi.install = Um dat Paket mit pip to installeren, föhr deese Oorder ut: -rpm.registry = Richt deese Paketlist vun de Oorderreeg in: -rpm.distros.redhat = Up Verdeelens mit RedHat as Grundlaag -rpm.distros.suse = Up Verdeelens mit SUSE as Grundlaag -rpm.repository.multiple_groups = Deeses Paket is in mennig Gruppen verföögbaar. -rubygems.install = Um dat Paket mit gem to installeren, föhr deese Oorder ut: -rubygems.install2 = of föög dat to de »Gemfile«-Datei hento: -swift.registry = Richt deese Paketlist vun de Oorderreeg in: -swift.install = Föög dat Paket in diener Package.swift-Datei hento: -vagrant.install = Um eene Vagrant-Kist hentotofögen, föhr deese Oorder ut: -owner.settings.cargo.title = Cargo-Paketlist-Index -owner.settings.cargo.initialize.description = Een besünners Index-Git-Repositorium is nödig, um de Cargo-Paketlist to bruken. Deese Instellen word dat Repositorium (neei) maken un automatisk inrichten. -owner.settings.cargo.rebuild.description = Neeibauen kann nüttelk wesen, wenn de Index nich to de lagert Cargo-Paketen passt. -owner.settings.cleanuprules.keep.pattern.container = De latest-Versioon word för Behälter-Paketen alltieden behollen. -owner.settings.chef.title = Chef-Paketlist -owner.settings.chef.keypair = Slötelpaar maken -owner.settings.chef.keypair.description = Een Slötelpaar is nödig, um sik bi de Chef-Paketlist antomellen. Wenn du al een Slötelpaar maakt hest, word dat olle Slötelpaar wegdaan, wenn du een nejes Slötelpaar maakst. -conan.install = Um dat Paket mit Conan to installeren, föhr deese Oorder ut: -container.images.title = Avbillers -search_in_external_registry = In %s söken - -[secrets] -secrets = Geheemsten -description = Geheemsten worden an wisse Aktioonen övergeven un könen anners nich lesen worden. -none = Dat gifft noch keene Geheemsten. -creation = Geheemst hentofögen -creation.success = Dat Geheemst »%s« is hentoföögt worden. -creation.failed = Kunn Geheemst nich hentofögen. -deletion = Geheemst wegdoon -deletion.success = Dat Geheemst is wegdaan worden. -deletion.failed = Kunn Geheemst nich wegdoon. -management = Geheemsten verwalten -creation.value_placeholder = Giff elkeen Inholl in. Leegtekens am Begünn un Enn worden ofsneden. -deletion.description = Een Geheemst wegtodoon is för all Tieden un kann nich torüggnohmen worden. Wiedermaken? -creation.name_placeholder = Blots alphanumerisk Bookstavens (’t word nich tüsken Groot- un Kleenbookstavens unnerscheden) un Unnerstrekens; kann nich mit GITEA_ of GITHUB_ begünnen - -[actions] -actions = Aktioonen -status.unknown = Unbekannt -status.waiting = Wacht -status.running = Löppt -status.success = Daankregen -status.failure = Fehlslagen -status.cancelled = Ofbroken -status.skipped = Översprungen -runners = Lopers -runners.runner_manage_panel = Lopers verwalten -runners.new = Nejen Loper maken -runners.new_notice = Wo man eenen Loper start -runners.status = Tostand -runners.id = ID -runners.name = Naam -runners.owner_type = Aard -runners.description = Beschrieven -runners.labels = Vermarkens -runners.runner_title = Loper -runners.task_list = Leste Upgaven up deesem Loper -runners.task_list.no_tasks = Dat gifft noch keene Upgaav. -runners.task_list.run = Utföhren -runners.task_list.status = Tostand -runners.task_list.repository = Repositorium -runners.task_list.commit = Kommitteren -runners.task_list.done_at = Daan um -runners.edit_runner = Loper bewarken -runners.update_runner_success = Loper verneeit -runners.update_runner_failed = Kunn Loper nich vernejen -runners.delete_runner = Deesen Loper wegdoon -runners.delete_runner_success = Loper wegdaan -runners.delete_runner_failed = Kunn Loper nich wegdoon -runners.delete_runner_header = Wies ut, dat du deesen Loper wegdoon willst -runners.none = Keene Lopers verföögbaar -runners.status.unspecified = Unbekannt -runners.status.idle = Nix to doon -runners.status.active = Aktiiv -runners.status.offline = Nich verbunnen -runners.version = Versioon -runners.reset_registration_token = Registrerens-Teken torüggsetten -runners.reset_registration_token_success = Loper-Registrerens-Teken torüggsett -runs.all_workflows = All Warkwiesen -runs.commit = Kommitteren -runs.scheduled = Na Tiedplaan -runs.pushed_by = schuven vun -runs.workflow = Warkwies -runs.invalid_workflow_helper = Warkwies-Instellens-Datei is ungültig. Bidde kiek diene Instellens-Datei na: %s -runs.no_matching_online_runner_helper = Keen verbunnen Loper, wat passt, mit de Vermark funnen: %s -runs.no_job = De Warkwies mutt tominnst eene Upgaav enthollen -runs.actor = Aktöör -runs.status = Tostand -runs.actors_no_select = All Aktören -runs.status_no_select = All Tostanden -runs.no_results = Keene Resultaten passen. -runs.no_workflows = Dat gifft noch keene Warkwiesens. -runs.no_runs = Deese Warkwies is noch nich utföhrt worden. -runs.empty_commit_message = (lege Kommitterens-Naricht) -runs.expire_log_message = Utgaav is wegdaan worden, denn se weer to oll. -workflow.enable = Warkwies anknipsen -workflow.enable_success = Warkwies »%s« is anknipst worden. -workflow.disabled = Warkwies is utknipst. -workflow.dispatch.trigger_found = Deese Warkwies hett eenen workflow_dispatch-Vörfall-Utlööser. -workflow.dispatch.use_from = Warkwies bruken vun -workflow.dispatch.run = Warkwies utföhren -workflow.dispatch.input_required = Weert för Ingaav »%s« nödig. -workflow.dispatch.invalid_input_type = Ungültige Ingaav-Aard »%s«. -workflow.dispatch.warn_input_limit = Blots de eersten %d Ingaven worden wiesen. -need_approval_desc = Warkwiesen vun eenem Haalvörslag ut eener Gabel mutten eerst tostimmt worden. -variables = Variaabeln -variables.management = Variaabeln verwalten -variables.none = Dat gifft noch keene Variaabeln. -variables.deletion = Variaabel wegdoon -variables.description = Variaabeln worden an wisse Aktioonen övergeven un könen anners nich lesen worden. -variables.id_not_exist = Variaabel mit ID %d gifft dat nich. -variables.edit = Variaabel bewarken -variables.deletion.failed = Kunn Variaabel nich wegdoon. -variables.deletion.success = De Variaabel is wegdaan worden. -variables.creation.failed = Kunn Variaabel nich hentofögen. -variables.creation.success = De Variaabel »%s« is hentoföögt worden. -variables.update.success = De Variaabel is bewarkt worden. -workflow.disable = Warkwies utknipsen -variables.creation = Variaabel hentofögen -variables.update.failed = Kunn Variaabel nich bewarken. -status.blocked = Blockeert -runners.delete_runner_notice = Wenn eene Upgaav up deesem Loper löppt, word se ofbroken un as fehlslagen markeert. Dat kann Bau-Warkwiesen stören. -runners.last_online = Tolest verbunnen -runners.update_runner = Ännerns vernejen -workflow.disable_success = Warkwies »%s« is utknipst worden. -runs.no_job_without_needs = De Warkwies mutt tominnst eene Upgaav sünner Ofhangen enthollen. -workflow.dispatch.success = Warkwies-Utföhren is vörmarkt worden. -variables.deletion.description = Eene Variaabel wegtodoon is för all Tieden un kann nich torüggnohmen worden. Wiedermaken? -unit.desc = Verwalt integreerte CI-/CD-Affolgens mit Forgejo-Aktioonen. -runs.no_workflows.quick_start = Weetst du nich, wo man mit Forgejo-Aktioonen begünnt? Kiek de fixe Inföhren an. -runs.no_workflows.documentation = För mehr Informatioonen över Forgejo-Aktioonen, kiek de Dokumenteren an. -runs.no_workflows.help_write_access = Weetst du nich, wo man mit Forgejo-Aktioonen begünnen sall? Kiek de Fixanwies in de Bruker-Dokumenteren an, um diene eerste Warkwies to schrieven, un richt dann dienen eersten Forgejo-Loper in, um diene Upgavens uttoföhren. -runs.no_workflows.help_no_write_access = Um mehr över Forgejo-Aktioonen to lehren, kiek de Dokumenteren an. - -[projects] -deleted.display_name = Lösket Projekt -type-1.display_name = Enkelt Projekt -type-2.display_name = Repositoriums-Projekt -type-3.display_name = Vereenigungs-Projekt - -[git.filemode] -changed_filemode = %[1]s → %[2]s -directory = Verteeknis -normal_file = Normaale Datei -executable_file = Utföhrbaare Datei -symbolic_link = Symbolisk Verwies -submodule = Unnermoduul - -[markup] -filepreview.lines = Riegen %[1]d bit %[2]d in %[3]s -filepreview.truncated = Utkiek is ofsneden worden -filepreview.line = Rieg %[1]d in %[2]s - -[translation_meta] -test = Moin! diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini index 30d2c0ebdf..baec116282 100644 --- a/options/locale/locale_nl-NL.ini +++ b/options/locale/locale_nl-NL.ini @@ -166,7 +166,6 @@ new_repo.link = Nieuwe repository new_repo.title = Nieuwe repository new_migrate.link = Nieuwe migratie new_org.link = Nieuwe organisatie -copy_path = Kopieer bestandspad [aria] navbar = Navigatiebalk @@ -200,12 +199,6 @@ buttons.list.task.tooltip = Een lijst met taken toevoegen buttons.disable_monospace_font = Lettertype monospace uitschakelen buttons.indent.tooltip = Items één niveau lager plaatsen buttons.unindent.tooltip = Items één niveau hoger plaatsen -buttons.new_table.tooltip = Tabel toevoegen -table_modal.header = Tabel toevoegen -table_modal.placeholder.header = Kop -table_modal.placeholder.content = Inhoud -table_modal.label.rows = Rijen -table_modal.label.columns = Kolommen [filter] string.asc = A - Z @@ -257,7 +250,7 @@ no_admin_and_disable_registration=U kunt zelf-registratie van de gebruiker niet err_empty_admin_password=Het administrator-wachtwoord mag niet leeg zijn. err_empty_admin_email=Het e-mailadres van Het beheerder mag niet leeg zijn. err_admin_name_is_reserved=Gebruikersnaam van beheerder is ongeldig, gebruikersnaam is gereserveerd -err_admin_name_pattern_not_allowed=Gebruikersnaam van beheerder is ongeldig, de gebruikersnaam komt overeen met een gereserveerd patroon +err_admin_name_pattern_not_allowed=Gebruikersnaam van beheerder is ongeldig, de gebruikersnaam is gereserveerd err_admin_name_is_invalid=Gebruikersnaam van beheerder is ongeldig general_title=Algemene instellingen @@ -276,7 +269,7 @@ http_port=HTTP luisterpoort http_port_helper=Poortnummer dat zal worden gebruikt door de Forgejo webserver. app_url=Basis URL app_url_helper=Basisadres voor HTTP(S) kloon URL's en e-mailmeldingen. -log_root_path=Logboek-pad +log_root_path=Log-pad log_root_path_helper=Logboekbestanden worden geschreven naar deze map. optional_title=Optionele instellingen @@ -483,8 +476,6 @@ hint_register = Heb je een account nodig? Registreer nu. sign_up_button = Registreer nu. back_to_sign_in = Terug naar aanmelden sign_in_openid = Ga verder met OpenID -unauthorized_credentials = Je inloggegevens zijn foutief of vervallen. Probeer opnieuw of zie %s voor meer informatie -use_onetime_code = Gebruik een eenmalige code [mail] view_it_on=Bekijk het op %s @@ -667,7 +658,7 @@ unable_verify_ssh_key = Kan de SSH-sleutel niet verifiëren, controleer deze voo still_own_repo = Uw account is eigenaar van één of meer repositories, verwijder of draag deze eerst over. admin_cannot_delete_self = U kan uzelf niet verwijderen als u een beheerder bent. Verwijder eerst uw beheerdersrechten. username_error_no_dots = ` kan alleen alfanumerieke karakters ("0-9","a-z","A-Z"), streepje ("-") en liggend streepje ("_") bevatten. Niet-alfanumerieke karakters aan het begin of eind zijn verboden en aaneenvolgende niet alfanumerieke karakters zijn ook verboden.` -invalid_group_team_map_error = ` mapping is ongeldig: %s` +invalid_group_team_map_error = ` mapping is ongeldig: %s" org_still_own_repo = Deze organisatie is eigenaar van één of meer repositories, verwijder of draag deze eerst over. org_still_own_packages = Deze organisatie is eigenaar van één of meer pakketten, verwijder deze eerst. unset_password = De inloggebruiker heeft het wachtwoord niet ingesteld. @@ -724,7 +715,6 @@ public_activity.visibility_hint.self_public = Uw activiteiten zijn zichtbaar voo public_activity.visibility_hint.admin_public = Deze activiteit is zichtbaar voor iedereen, maar als beheerder kun je ook interacties in privéruimtes zien. public_activity.visibility_hint.self_private = Uw activiteiten zijn alleen zichtbaar voor jou en de beheerders van de instantie. Configureer. public_activity.visibility_hint.admin_private = Deze activiteit is zichtbaar voor u omdat u een beheerder bent, maar de gebruiker wil dat het privé blijft. -public_activity.visibility_hint.self_private_profile = Uw activiteit is alleen zichtbaar voor u en de beheerders van de instantie omdat uw profiel privé is. Aanpassen. [settings] @@ -800,7 +790,7 @@ emails=E-mailadressen manage_emails=E-mailadressen beheren manage_themes=Standaardthema manage_openid=OpenID-adressen -theme_desc=Dit thema wordt gebruikt voor de webinterface wanneer je bent aangemeld. +theme_desc=Dit zal het standaardthema worden op de gehele site. primary=Primair activated=Geactiveerd requires_activation=Vereist activering @@ -986,8 +976,8 @@ visibility.limited=Beperkt visibility.private=Privé blocked_users = Geblokkeerde gebruikers uid = UID -biography_placeholder = Vertel anderen een beetje over uzelf! (Markdown is ondersteund) -profile_desc = Over u +biography_placeholder = Vertel ons iets over uzelf! (U kunt van Markdown gebruik maken) +profile_desc = Controleer hoe uw profiel aan andere gebruikers wordt getoond. Uw primaire e-mailadres zal worden gebruikt voor notificaties, wachtwoord herstel en web-gebaseerde Git-operaties. update_language_not_found = Taal "%s" is niet beschikbaar. change_username_prompt = Opmerking: Het veranderen van uw gebruikersnaam zal ook de URL van uw account veranderen. change_username_redirect_prompt = De oude gebruikersnaam zal worden doorverwezen totdat iemand deze opeist. @@ -1020,7 +1010,7 @@ at_least_one_permission = Je moet minstens één machtiging kiezen om een token permission_write = Lees en schrijf oauth2_client_secret_hint = Dit geheim zal niet meer worden getoond nadat u deze pagina heeft verlaten of vernieuwd. Zorg ervoor dat u het heeft opgeslagen. revoke_oauth2_grant_success = Toegang succesvol ingetrokken. -keep_email_private_popup = Uw e-mailadres zal niet getoond worden op uw profiel en zal niet de standaard zijn voor commits die via de webinterface gemaakt worden, zoals bestandsuploads, bewerkingen en samenvoeg commits. In plaats daarvan kan een speciaal adres %s gebruikt worden om commits aan uw account te koppelen. Deze optie zal bestaande commits niet beïnvloeden. +keep_email_private_popup = Dit zal je e-mailadres verbergen van uw profielpagina. Het zal niet langer de standaard zijn voor commits die via de webinterface gemaakt worden, zoals bestandsuploads en bewerkingen, en het zal niet gebruikt worden voor samenvoeg commits. In plaats daarvan kan een speciaal adres %s gebruikt worden om commits met je account te associëren. Merk op dat het veranderen van deze optie geen effect heeft op bestaande commits. create_oauth2_application_success = U heeft met succes een OAuth2 applicatie gecreëerd. permissions_access_all = Alle (publiek, privé en gelimiteerd) oauth2_application_remove_description = Door een OAuth2-applicatie te verwijderen, krijgt deze geen toegang meer tot geautoriseerde gebruikersaccounts op deze instantie. Doorgaan? @@ -1031,12 +1021,12 @@ webauthn_key_loss_warning = Als u uw beveiligingssleutels verliest, zal u toegan repos_none = U bezit geen repositories. hooks.desc = Voeg webhooks toe die door alle repositories waarvan u eigenaar bent aangeroept kunnen worden. visibility.public_tooltip = Zichtbaar voor iedereen -visibility.limited_tooltip = Alleen zichtbaar voor ingelogde gebruikers +visibility.limited_tooltip = Alleen zichtbaar voor geauthenticeerde gebruikers visibility.private_tooltip = Alleen zichtbaar voor leden van organisaties waarbij u bent aangesloten user_unblock_success = De gebruiker is succesvol gedeblokkeerd. user_block_success = De gebruiker is succesvol geblokkeerd. blocked_since = Geblokkeerd sinds %s -access_token_desc = Geselecteerde token machtigingen beperken autorisatie alleen tot de bijbehorende API routes. Lees de documentatie voor meer informatie. +access_token_desc = Geselecteerde token machtigingen beperken autorisatie alleen tot de bijbehorende API routes. Lees de documentatie voor meer informatie. oauth2_confidential_client = Vertrouwelijke client. Selecteer deze optie voor apps die het geheim bewaren, zoals webapps. Niet selecteren voor native apps, waaronder desktop- en mobiele apps. authorized_oauth2_applications_description = Je hebt deze applicaties van derden toegang verleend tot je persoonlijke Forgejo-account. Trek de toegang in voor applicaties die niet langer in gebruik zijn. hidden_comment_types.ref_tooltip = Reacties waarbij naar deze issue werd verwezen vanuit een ander issue/commit/… @@ -1048,7 +1038,7 @@ additional_repo_units_hint = Stel voor om extra repositorie units in te schakele update_hints = Tips bijwerken update_hints_success = Tips zijn bijgewerkt. hints = Tips -additional_repo_units_hint_description = Toon een “Meer activeren†hint voor repositories die niet alle beschikbare eenheden hebben ingeschakeld. +additional_repo_units_hint_description = Toon een "Voeg meer eenheden toe..." knop voor repositories die niet alle beschikbare eenheden hebben ingeschakeld. pronouns = Persoonlijke voornaamwoord pronouns_custom = Aangepast pronouns_unspecified = Ongedefinieerd @@ -1056,8 +1046,6 @@ language.title = Standaard taal keep_activity_private.description = Uw publieke activiteit zal alleen zichtbaar zijn voor u en de beheerders van de instantie. language.description = Deze taal wordt opgeslagen in uw account en wordt als standaardtaal gebruikt nadat u zich heeft aangemeld. language.localization_project = Help ons Forgejo in uw taal te vertalen! Leer meer. -user_block_yourself = U kunt niet zichzelf blokkeren. -pronouns_custom_label = Aangepaste voornaamwoorden [repo] owner=Eigenaar @@ -1095,11 +1083,11 @@ issue_labels=Labels issue_labels_helper=Selecteer een labelset license=Licentie license_helper=Selecteer een licentie bestand -license_helper_desc=Een licentie bepaalt wat anderen wel en niet met je code kunnen doen. Niet zeker welke juist is voor jouw project? Zie Kies een licentie. +license_helper_desc=Een licentie bepaalt wat anderen wel en niet met je code kunnen doen. Niet zeker welke juist is voor jouw project? Zie Kies een licentie. readme=README readme_helper=Selecteer een README-bestandssjabloon readme_helper_desc=Dit is de plek waar je een volledige beschrijving van je project kunt schrijven. -auto_init=Initialiseer repository +auto_init=Initialiseer repository (voegt .gitignore, License en README toe) trust_model_helper=Selecteer het vertrouwensmodel voor handtekeningverificatie. Mogelijke opties zijn: trust_model_helper_collaborator=Samenwerker: Vertrouw handtekeningen door samenwerker trust_model_helper_committer=Committer: Vertrouw handtekeningen die overeenkomen met de committers @@ -1163,8 +1151,8 @@ template.issue_labels=Issue labels template.one_item=Moet ten minste één sjabloon selecteren template.invalid=Moet een sjabloon repository selecteren -archive.issue.nocomment=Deze repository is gearchiveerd. U kunt niet reageren op problemen. -archive.pull.nocomment=Deze repository is gearchiveerd. U kunt niet reageren op pull requests. +archive.issue.nocomment=Deze repo is gearchiveerd. U kunt niet reageren op problemen. +archive.pull.nocomment=Deze repo is gearchiveerd. U kunt niet reageren op pull requests. form.reach_limit_of_creation_1=U heeft al uw limiet van %d repository bereikt. form.reach_limit_of_creation_n=U heeft al uw limiet van %d repositories bereikt. @@ -1313,14 +1301,13 @@ editor.or=of editor.cancel_lower=Annuleer editor.commit_signed_changes=Commit ondertekende wijzigingen editor.commit_changes=Wijzigingen doorvoeren -editor.add_tmpl="<%s>" toevoegen -editor.add_tmpl.filename = bestandsnaam +editor.add_tmpl="" toevoegen editor.patch=Patch toepassen editor.patching=Patchen: editor.new_patch=Nieuwe patch editor.commit_message_desc=Voeg een optionele uitgebreide omschrijving toe… editor.signoff_desc=Voeg een Signed-off-by toe aan het einde van het commit logbericht. -editor.commit_directly_to_this_branch=Commit direct naar de branch %[1]s. +editor.commit_directly_to_this_branch=Commit direct naar de branch '%s'. editor.create_new_branch=Maak een nieuwe branch voor deze commit en start van een pull request. editor.create_new_branch_np=Maak een nieuwe branch voor deze commit. editor.propose_file_change=Stel bestandswijziging voor @@ -1369,7 +1356,7 @@ commit.cherry-pick-content=Selecteer een branch om te cherry-pick op: commitstatus.error=Fout commitstatus.pending=In behandeling -ext_issues=Externe issues +ext_issues=Toegang tot externe issues ext_issues.desc=Koppelen aan een externe kwestie-tracker. projects=Projecten @@ -1516,9 +1503,9 @@ issues.context.quote_reply=Citeer antwoord issues.context.reference_issue=Verwijs in een nieuwe issue issues.context.edit=Bewerken issues.context.delete=Verwijder -issues.close_comment_issue=Sluit met commentaar +issues.close_comment_issue=Reageer en sluit issues.reopen_issue=Heropen -issues.reopen_comment_issue=Heropen met commentaar +issues.reopen_comment_issue=Reageer en heropen issues.create_comment=Reageer issues.closed_at=`heeft dit probleem gesloten %[2]s` issues.reopened_at=`heropende dit probleem %[2]s` @@ -1610,7 +1597,7 @@ issues.error_modifying_due_date=Deadline aanpassen mislukt. issues.error_removing_due_date=Deadline verwijderen mislukt. issues.push_commit_1=toegevoegd %d commit %s issues.push_commits_n=toegevoegd %d commits %s -issues.force_push_codes=`force-push %[1]s van %[2]s naar %[4]s %[6]s` +issues.force_push_codes=`force-push %[1]s van %[2]s naar %[4]s %[6]s` issues.force_push_compare=Vergelijk issues.due_date_form=jjjj-mm-dd issues.due_date_form_add=Vervaldatum toevoegen @@ -1659,9 +1646,9 @@ issues.review.left_comment=heeft een reactie achtergelaten issues.review.content.empty=Je moet een reactie achterlaten die de gewenste verandering(en) beschrijft. issues.review.reject=aangevraagde wijzigingen %s issues.review.wait=is gevraagd voor review %s -issues.review.add_review_request=beoordeling gevraagd van %[1]s %[2]s -issues.review.remove_review_request=beoordelingsaanvraag voor %[1]s %[2]s verwijderd -issues.review.remove_review_request_self=weigerde te beoordelen %s +issues.review.add_review_request=heeft een review aangevraagd van %s %s +issues.review.remove_review_request=beoordelingsaanvraag voor %s %s verwijderd +issues.review.remove_review_request_self=beoordeling geweigerd %s issues.review.pending=In behandeling issues.review.review=Review issues.review.reviewers=Beoordelaars @@ -1707,7 +1694,7 @@ pulls.nothing_to_compare=Deze branches zijn gelijk. Er is geen pull request nodi pulls.nothing_to_compare_and_allow_empty_pr=Deze branches zijn gelijk. Deze pull verzoek zal leeg zijn. pulls.has_pull_request=`Een pull-verzoek tussen deze branches bestaat al: %[2]s#%[3]d` pulls.create=Pull request aanmaken -pulls.title_desc_few=wilt %[1]d commits van %[2]s samenvoegen met %[3]s +pulls.title_desc_few=wilt %[1]d commits van %[2]s samenvoegen met %[3]s pulls.merged_title_desc_few=heeft %[1]d commits samengevoegd van %[2]s naar %[3]s %[4]s pulls.change_target_branch_at='doelbranch aangepast van %s naar %s %s' pulls.tab_conversation=Discussie @@ -1824,7 +1811,7 @@ milestones.filter_sort.most_issues=Meeste problemen milestones.filter_sort.least_issues=Minste problemen -ext_wiki=Externe wiki +ext_wiki=Toegang tot externe wiki ext_wiki.desc=Koppelen aan een externe wiki. wiki=Wiki @@ -1915,7 +1902,8 @@ activity.git_stats_and_deletions=en activity.git_stats_deletion_1=%d verwijdering activity.git_stats_deletion_n=%d verwijderingen -contributors.contribution_type.commits = Commits +contributors.contribution_type.commits=Commits + search=Zoek search.search_repo=Zoek repository search.fuzzy=Vergelijkbaar @@ -2060,29 +2048,29 @@ settings.event_repository_desc=Repository gemaakt of verwijderd. settings.event_header_issue=Issue gebeurtenissen settings.event_issues=Issues settings.event_issues_desc=Issue geopend, gesloten, heropend of bewerkt. -settings.event_issue_assign=Toewijzing +settings.event_issue_assign=issue toegekend settings.event_issue_assign_desc=Issue toegewezen of niet-toegewezen. -settings.event_issue_label=Labels -settings.event_issue_label_desc=Issue labels toegevoegd of verwijderd. -settings.event_issue_milestone=Mijlpalen -settings.event_issue_milestone_desc=Mijlpaal toegevoegd, verwijderd of gewijzigd. -settings.event_issue_comment=Opmerkingen +settings.event_issue_label=Issue gelabeld +settings.event_issue_label_desc=Issue-labels bijgewerkt of verwijderd. +settings.event_issue_milestone=Issue gemilestoned +settings.event_issue_milestone_desc=Issue gemilestoned of gedemilestoned. +settings.event_issue_comment=Issue reactie settings.event_issue_comment_desc=Issue reactie aangemaakt, bewerkt of verwijderd. settings.event_header_pull_request=Pull request gebeurtenissen -settings.event_pull_request=Wijziging +settings.event_pull_request=Pull request settings.event_pull_request_desc=Pull request geopend, gesloten, heropend of bewerkt. -settings.event_pull_request_assign=Toewijzing +settings.event_pull_request_assign=Pull request toegewezen settings.event_pull_request_assign_desc=Pull request toegewezen of niet-toegewezen. -settings.event_pull_request_label=Labels -settings.event_pull_request_label_desc=Pull request labels toegevoegd of verwijderd. -settings.event_pull_request_milestone=Mijlpalen -settings.event_pull_request_milestone_desc=Mijlpaal toegevoegd, verwijderd of gewijzigd. -settings.event_pull_request_comment=Opmerkingen +settings.event_pull_request_label=Pull request gelabeld +settings.event_pull_request_label_desc=Pull request labels bijgewerkt of gewist. +settings.event_pull_request_milestone=Pull Request gemilestoned +settings.event_pull_request_milestone_desc=Pull Reguest gemilestoned of gedemilestoned. +settings.event_pull_request_comment=Pull request reactie settings.event_pull_request_comment_desc=Pull request commentaar gemaakt, bewerkt of verwijderd. -settings.event_pull_request_review=Beoordelingen -settings.event_pull_request_review_desc=Pull request goedgekeurd, afgewezen of opmerkingen over beoordeling toegevoegd. -settings.event_pull_request_sync=Gesynchroniseerd -settings.event_pull_request_sync_desc=Branch automatisch bijgewerkt met doel branch. +settings.event_pull_request_review=Pull request gereviewed +settings.event_pull_request_review_desc=Pull request goedgekeurd, afgewezen of review commentaar. +settings.event_pull_request_sync=Pull request gesynchroniseerd +settings.event_pull_request_sync_desc=Pull request gesynchroniseerd. settings.branch_filter=Branch filter settings.active=Actief settings.active_helper=Informatie over geactiveerde gebeurtenissen wordt naar deze webhook URL gestuurd. @@ -2196,8 +2184,8 @@ settings.archive.header=Archiveer deze repo settings.archive.success=De repo is succesvol gearchiveerd. settings.archive.error=Er is een fout opgetreden tijdens het archiveren van de repo. Zie het logboek voor meer informatie. settings.archive.error_ismirror=U kunt geen gespiegelde repository archiveren. -settings.archive.branchsettings_unavailable=Branchinstellingen zijn niet beschikbaar in gearchiveerde repo's. -settings.archive.tagsettings_unavailable=Tag-instellingen zijn niet beschikbaar in gearchiveerde repo's. +settings.archive.branchsettings_unavailable=Branch instellingen zijn niet beschikbaar als de repo is gearchiveerd. +settings.archive.tagsettings_unavailable=Labelinstellingen zijn niet beschikbaar als de repo is gearchiveerd. settings.update_avatar_success=De repository avatar is bijgewerkt. settings.lfs=LFS settings.lfs_filelist=LFS bestanden opgeslagen in deze repository @@ -2292,7 +2280,7 @@ release.draft=Concept release.prerelease=Voorlopige release release.stable=Stabiel release.compare=Vergelijk -release.edit=Bewerken +release.edit=bewerken release.ahead.commits=%d commits release.ahead.target=aan %s sinds deze release release.source_code=Broncode @@ -2410,7 +2398,7 @@ issues.review.option.hide_outdated_comments = Verouderde reacties verbergen pulls.expand_files = Alle bestanden uitklappen pulls.collapse_files = Alle bestanden inklappen pulls.show_all_commits = Alle commits weergeven -new_repo_helper = Een repository bevat alle projectbestanden, inclusief revisiegeschiedenis. Host je er al ergens anders een? Repository migreren. +new_repo_helper = Een repository bevat alle projectbestanden, inclusief revisiegeschiedenis. Host je er al ergens anders een? Repository migreren. editor.fail_to_update_file = Mislukt bij het bijwerken/creëren van bestand "%s". editor.file_is_a_symlink = `"%s" is een symbolische link. Symbolische links kunnen niet worden bewerkt in de webeditor` editor.filename_is_a_directory = Bestandsnaam "%s" wordt al gebruikt als naam van een map in deze repository. @@ -2480,7 +2468,7 @@ tree_path_not_found_tag = Pad %[1]s bestaat niet in tag %[2]s transfer.no_permission_to_reject = Je hebt geen rechten om deze overdracht af te wijzen. settings.transfer_owner = Nieuwe eigenaar mirror_address_protocol_invalid = De opgegeven URL is ongeldig. Alleen http(s):// of git:// locaties kunnen gebruikt worden voor spiegelen. -archive.title = Deze repository is gearchiveerd. Je kunt bestanden bekijken en klonen, maar geen issues of pull requests pushen of openen. +archive.title = Deze repo is gearchiveerd. Je kunt bestanden bekijken en klonen, maar geen issues of pull requests pushen of openen. archive.title_date = Deze repository is gearchiveerd op %s. Je kunt bestanden bekijken en klonen, maar je kunt niet pushen of issues of pull requests openen. migrate_options_lfs_endpoint.placeholder = Als dit leeg gelaten wordt, zal het eindpunt afgeleid worden van de kloon URL invisible_runes_description = `Dit bestand bevat onzichtbare Unicode-tekens die voor mensen niet te onderscheiden zijn, maar door een computer anders verwerkt kunnen worden. Als je denkt dat dit opzettelijk is, kun je deze waarschuwing gerust negeren. Gebruik de Escape knop om ze te onthullen.` @@ -2612,7 +2600,7 @@ settings.remove_protected_branch_success = Branchbescherming voor regel "%s" is settings.remove_protected_branch_failed = Verwijderen van branchbeschermings regel "%s" is mislukt. settings.merge_style_desc = Samenvoegstijl settings.thread_id = Thread ID -settings.archive.mirrors_unavailable = Mirrors zijn niet beschikbaar in gearchiveerde repo's. +settings.archive.mirrors_unavailable = Mirrors zijn niet beschikbaar als de repo is gearchiveerd. settings.unarchive.header = Deze repo uit het archief halen settings.unarchive.text = Het uit het archief halen van de repo zal het vermogen herstellen om commits en pushes te ontvangen, evenals nieuwe issues en pull requests. settings.unarchive.error = Er is een fout opgetreden bij het uit het archief halen van de repo. Bekijk de logs voor meer details. @@ -2691,7 +2679,7 @@ settings.pulls.default_allow_edits_from_maintainers = Standaard bewerkingen van settings.trust_model.collaboratorcommitter.desc = Geldige handtekeningen van samenwerkers van dit archief zullen "vertrouwd" gemarkeerd worden als ze overeenkomen met de committer. Anders zullen geldige handtekeningen gemarkeerd worden als "niet vertrouwd" als de handtekening overeenkomt met de committer en "niet gematcht" anders. Dit zal Forgejo dwingen om gemarkeerd te worden als de committer op ondertekende commits met de werkelijke committer gemarkeerd als Co-Authored-By: en Co-Committed-By: aanhanger in de commit. De standaard Forgejo sleutel moet overeenkomen met een gebruiker in de database. settings.branch_filter_desc = Branch whitelist for push, branch creation and branch deletion events, specified as glob pattern. Indien leeg of *, worden gebeurtenissen voor alle takken gerapporteerd. Zie %[2]s documentatie voor syntax. Voorbeelden: master, {master,release*}. contributors.contribution_type.filter_label = Soort bijdrage: -settings.event_pull_request_review_request = Beoordelingsverzoeken +settings.event_pull_request_review_request = Pull request beoordeling aangevraagd pulls.recently_pushed_new_branches = Je hebt op branch gepusht %[1]s %[2]s settings.protect_enable_merge_desc = Iedereen met schrijftoegang mogen pull requests samenvoegen in deze branch. settings.add_web_hook_desc = Integreer %s in uw repository. @@ -2704,13 +2692,14 @@ settings.wiki_rename_branch_main_notices_2 = Dit zal de interne branch van %s's settings.trust_model.collaborator.desc = Geldige handtekeningen van samenwerkers van deze repository worden als "vertrouwd" gemarkeerd - (of ze nu overeenkomen met de committer of niet). Anders worden geldige handtekeningen gemarkeerd als "niet-vertrouwd" als de handtekening overeenkomt met de committer en "niet-gematcht" als dat niet het geval is. settings.trust_model.committer.desc = Geldige handtekeningen zullen alleen "vertrouwd" gemarkeerd worden als ze overeenkomen met de committer, anders zullen ze gemarkeerd worden als "ongeëvenaard". Dit dwingt Forgejo om de committer te zijn op ondertekende commits met de werkelijke committer gemarkeerd als Co-authored-by: en Co-committed-by: aanhanger in de commit. De standaard Forgejo sleutel moet overeenkomen met een gebruiker in de database. settings.pulls.enable_autodetect_manual_merge = Handmatig samenvoegen met autodetectie inschakelen (Opmerking: In sommige speciale gevallen kunnen hierdoor verkeerde beoordelingen optreden) -settings.protect_protected_file_patterns_desc = Beschermde bestanden mogen niet direct gewijzigd worden, zelfs als de gebruiker rechten heeft om bestanden in deze branch toe te voegen, te bewerken of te verwijderen. Meerdere patronen kunnen gescheiden worden met een puntkomma (";"). Zie %s documentatie voor patroon syntax. Voorbeelden: .drone.yml, /docs/**/*.txt. +settings.protect_protected_file_patterns_desc = Beschermde bestanden mogen niet direct gewijzigd worden, zelfs als de gebruiker rechten heeft om bestanden in deze branch toe te voegen, te bewerken of te verwijderen. Meerdere patronen kunnen gescheiden worden met een puntkomma (";"). Zie github.com/gobwas/glob documentatie voor patroon syntax. Voorbeelden: .drone.yml, /docs/**/*.txt. wiki.delete_page_notice_1 = Het verwijderen van de wikipagina "%s" kan niet ongedaan worden gemaakt. Doorgaan? wiki.reserved_page = De wikipaginanaam "%s" is gereserveerd. activity.navbar.pulse = Puls wiki.original_git_entry_tooltip = Bekijk het originele Git bestand in plaats van een vriendelijke link te gebruiken. activity.navbar.contributors = Samenwerkers contributors.contribution_type.additions = Toevoegingen +contributors.contribution_type.commits = Commits contributors.contribution_type.deletions = Verwijderingen settings.mirror_settings.docs.doc_link_pull_section = het gedeelte "Pullen uit een externe repository" in de documentatie. settings.mirror_settings.docs.doc_link_title = Hoe kan ik repositories spiegelen? @@ -2718,13 +2707,13 @@ settings.mirror_settings.docs.pull_mirror_instructions = Raadpleeg voor het inst settings.mirror_settings.docs.more_information_if_disabled = Hier vindt u meer informatie over duw- en pull mirrors: settings.mirror_settings.docs.pulling_remote_title = Pullen uit een externe repository settings.mirror_settings.pushed_repository = Gepusht repository -settings.units.units = Eenheden +settings.units.units = Repository-eenheden settings.mirror_settings.push_mirror.remote_url = Git externe repository URL settings.units.overview = Overzicht settings.mirror_settings.push_mirror.edit_sync_time = Synchronisatie-interval van mirror bewerken settings.push_mirror_sync_in_progress = Wijzigingen worden momenteel naar de externe %s gepusht. settings.pull_mirror_sync_in_progress = Haalt momenteel wijzigingen op van de externe %s. -settings.units.add_more = Meer activeren +settings.units.add_more = Meer toevoegen... settings.update_mirror_settings = Mirrorinstellingen bijwerken settings.branches.switch_default_branch = Wissel standaard branch settings.branches.add_new_rule = Voeg nieuwe regel toe @@ -2754,7 +2743,7 @@ activity.navbar.code_frequency = Code frequentie activity.navbar.recent_commits = Recente commits file_follow = Volg symlink error.broken_git_hook = it hooks van deze repository lijken kapot te zijn. Volg alsjeblieft de documentatie om ze te repareren, push daarna wat commits om de status te vernieuwen. -pulls.title_desc_one = wilt %[1]d commit van %[2]s samenvoegen in %[3]s +pulls.title_desc_one = wilt %[1]d commit van %[2]s samenvoegen in %[3]s open_with_editor = Open met %s commits.search_branch = Deze branch pulls.merged_title_desc_one = heeft %[1]d commit van %[2]s samengevoegd in %[3]s %[4]s @@ -2832,49 +2821,10 @@ mirror_public_key = Publieke SSH-sleutel mirror_use_ssh.helper = Forgejo zal deze repository mirroren via Git over SSH en een sleutelpaar voor je aanmaken als je deze optie selecteert. Je moet ervoor zorgen dat de gegenereerde publieke sleutel geautoriseerd is om naar het doel-repository te pushen. Je kunt geen wachtwoord-gebaseerde autorisatie gebruiken als je dit selecteert. settings.mirror_settings.push_mirror.none_ssh = Geen mirror_use_ssh.not_available = SSH-authenticatie is niet beschikbaar. -issues.new.assign_to_me = Aan mij toewijzen -issues.all_title = Alles -settings.discord_icon_url.exceeds_max_length = Icoon-URL moet 2048 tekens of minder zijn -issues.review.add_review_requests = beoordelingen gevraagd van %[1]s %[2]s -issues.review.remove_review_requests = verwijderde beoordelingsverzoeken voor %[1]s %[2]s -issues.review.add_remove_review_requests = vraagde beoordelingen van %[1]s en verwijderde beoordelingsverzoeken voor %[2]s %[3]s -pulls.delete_after_merge.head_branch.is_default = De hoofdbranch die u wilt verwijderen is de standaard branch en kan niet verwijderd worden. -pulls.delete_after_merge.head_branch.is_protected = De hoofdbranch die u wilt verwijderen is een beschermde branch en kan niet verwijderd worden. -pulls.delete_after_merge.head_branch.insufficient_branch = Je hebt geen toestemming om de hoofdbranch te verwijderen. -issues.filter_sort.relevance = Relevantie -diff.git-notes.add = Notitie toevoegen -diff.git-notes.remove-header = Notitie verwijderen -diff.git-notes.remove-body = Deze notitie zal worden verwijderd. -issues.summary_card_alt = Overzichtskaart van een issue met de titel "%s" in repository %s -issues.num_reviews_one = %d beoordeling -issues.num_reviews_few = %d beoordelingen -settings.default_update_style_desc = Standaard update stijl gebruikt voor het updaten van pull requests die achter de basis branch liggen. -pulls.sign_in_require = Aanmelden om een nieuwe pull request aan te maken. -new_advanced = Geavanceerde instellingen -new_advanced_expand = Klik om uit te breiden -new_from_template_description = Je kunt een bestaand repositorysjabloon op deze instantie selecteren en de instellingen toepassen. -new_from_template = Een sjabloon gebruiken -auto_init_description = De Git geschiedenis starten met een README en optioneel License en .gitignore bestanden toevoegen. -issues.reaction.add = Reactie toevoegen -issues.reaction.alt_few = %[1]s reageerde %[2]s. -issues.reaction.alt_add = Voeg %[1]s reactie toe aan commentaar. -issues.context.menu = Commentaar menu -summary_card_alt = Overzichtskaart van repository %s -release.summary_card_alt = Samenvattende kaart van een release met de titel "%s" in repository %s -issues.reaction.alt_remove = Verwijder %[1]s reactie van bericht. -issues.reaction.alt_many = %[1]s en %[2]d meer gereageerd %[3]s. [graphs] -component_loading_info = Dit kan even duren… -component_failed_to_load = Er is een onverwachte fout opgetreden. -contributors.what = bijdragen -component_loading_failed = %s kon niet worden geladen -component_loading = Bezig met laden van %s... -code_frequency.what = code frequentie -recent_commits.what = recente commits - [org] org_name_holder=Organisatienaam @@ -2997,7 +2947,7 @@ teams.invite.description = Klik op onderstaande knop om u bij het team aan te sl teams.invite.by = Uitgenodigd door %s teams.all_repositories_admin_permission_desc = Dit team verleent Administrator permissies tot alle repositories: leden kunnen lezen, pushen naar en samenwerkers toevoegen aan repositories. settings.change_orgname_prompt = Merk op: Het wijzigen van de organisatienaam zal ook de URL van uw organisatie veranderen en de oude naam vrijgeven. -settings.visibility.limited = Beperkt (alleen zichtbaar voor ingelogde gebruikers) +settings.visibility.limited = Beperkt (alleen zichtbaar voor geauthenticeerde gebruikers) teams.add_nonexistent_repo = De repository die u probeert toe te voegen bestaat niet, maak deze eerst aan alstublieft. teams.all_repositories_write_permission_desc = Dit team verleent Schrijf permissies tot alle repositories: leden kunnen lezen en pushen naar repositories. open_dashboard = Open dashboard @@ -3233,7 +3183,7 @@ auths.tip.github=Registreer een nieuwe OAuth toepassing op %s auths.tip.gitlab=Registreer een nieuwe applicatie op https://gitlab.com/profile/applicaties auths.tip.google_plus=Verkrijg OAuth2 client referenties van de Google API console op %s auths.tip.openid_connect=Gebruik de OpenID Connect Discovery URL (/.well-known/openid-configuration) om de eindpunten op te geven -auths.tip.yandex=Maak een nieuwe toepassing op %s. Selecteer de volgende rechten in het gedeelte “Yandex.Passport APIâ€: “Toegang tot e-mailadresâ€, ‘Toegang tot gebruikersavatar’ en ‘Toegang tot gebruikersnaam, voor- en achternaam, geslacht’ +auths.tip.yandex=`Maak een nieuwe applicatie aan op %s. Selecteer de volgende machtigingen van de "Yandex". assport API sectie: "Toegang tot e-mailadres", "Toegang tot avatar" en "Toegang tot gebruikersnaam, voornaam en achternaam, geslacht"` auths.edit=Authenticatiebron bewerken auths.activated=Deze authenticatiebron is geactiveerd auths.update_success=De authenticatie-bron is bijgewerkt. @@ -3454,10 +3404,10 @@ auths.oauth2_required_claim_value_helper = Stel deze waarde in om het aanmelden users.remote = Externe users.list_status_filter.not_2fa_enabled = 2FA uitgeschakeld users.reserved = Gereserveerd -defaulthooks.desc = Webhooks doen automatisch HTTP POST verzoeken naar een server wanneer bepaalde Forgejo gebeurtenissen zich voordoen. Webhooks defined here are defaults and will be copied into all new repositories. Read more in the webhooks guide. +defaulthooks.desc = Webhooks doen automatisch HTTP POST verzoeken naar een server wanneer bepaalde Forgejo gebeurtenissen zich voordoen. Webhooks die hier gedefinieerd zijn, zijn standaard en worden gekopieerd naar alle nieuwe repositories.. Lees meer in de webhooks gids. auths.verify_group_membership = Controleer het groepslidmaatschap in LDAP (laat het filter leeg om over te slaan) dashboard.rebuild_issue_indexer = Herbouw issue indexer -systemhooks.desc = Webhooks doen automatisch HTTP POST verzoeken naar een server wanneer bepaalde Forgejo gebeurtenissen zich voordoen. Webhooks die hier gedefinieerd zijn, werken op alle repositories op het systeem, dus houd rekening met mogelijke gevolgen voor de prestaties. Lees meer in de webhooks guide. +systemhooks.desc = Webhooks doen automatisch HTTP POST verzoeken naar een server wanneer bepaalde Forgejo gebeurtenissen zich voordoen. Webhooks die hier gedefinieerd zijn, werken op alle repositories op het systeem, dus houd rekening met mogelijke gevolgen voor de prestaties. Lees meer in de webhooks gids. hooks = Webhooks integrations = Integraties dashboard.new_version_hint = Forgejo %s is nu beschikbaar, u gebruikt versie %s. Zie de blog voor meer details. @@ -3494,7 +3444,7 @@ self_check.database_inconsistent_collation_columns = Database gebruikt collatie monitor.stacktrace = Stacktrace monitor.download_diagnosis_report = Diagnoserapport downloaden self_check.database_collation_case_insensitive = Database gebruikt collatie %s, wat een ongevoelige collatie is. Hoewel Forgejo ermee kan werken, kunnen er enkele zeldzame gevallen zijn die niet werken zoals verwacht. -self_check.database_fix_mysql = Voor MySQL/MariaDB gebruikers zou je het "forgejo doctor convert" commando kunnen gebruiken om de collatieproblemen op te lossen, of je zou het probleem ook kunnen oplossen door "ALTER ... COLLATE ..." SQL's handmatig op te lossen. +self_check.database_fix_mysql = Voor MySQL/MariaDB gebruikers zou je het "gitea doctor convert" commando kunnen gebruiken om de collatieproblemen op te lossen, of je zou het probleem ook kunnen oplossen door "ALTER ... COLLATE ..." SQL's handmatig op te lossen. dashboard.gc_lfs = LFS meta-objecten afval opruimen auths.map_group_to_team = Breng LDAP-groepen in kaart voor organisatieteams (laat het veld leeg om over te slaan) auths.oauth2_required_claim_name = Verplichte claimnaam @@ -3505,7 +3455,7 @@ auths.oauth2_icon_url = Pictogram URL auths.pam_email_domain = PAM e-maildomein (optioneel) auths.tip.gitea = Registreer een nieuwe OAuth2-toepassing. De handleiding is te vinden op %s auths.tip.discord = Registreer een nieuwe toepassing op %s -auths.tip.bitbucket = Registreer een nieuwe OAuth consumer op %s en voeg de rechten “Account†- “Read†toe +auths.tip.bitbucket = Registreer een nieuwe OAuth consumer op %s auths.tips.oauth2.general.tip = Bij het registreren van een nieuwe OAuth2-authenticatie moet de callback/redirect URL zijn: config.ssh_domain = SSH-server domein auths.login_source_of_type_exist = Er bestaat al een authenticatiebron van dit type. @@ -3558,7 +3508,6 @@ emails.delete_desc = Weet u zeker dat u deze e-mailadres wilt verwijderen? emails.delete_primary_email_error = U kunt de primaire e-mail niet verwijderen. emails.delete = E-mail verwijderen emails.deletion_success = Het e-mailadres is verwijderd. -monitor.duration = Duur (s) [action] @@ -3684,16 +3633,16 @@ cargo.install = Voer de volgende opdracht uit om het pakket met Cargo te install chef.install = Voer het volgende commando uit om het pakket te installeren: composer.registry = Stel dit register in je ~/.composer/config.json bestand: composer.dependencies = Afhankelijkheden -composer.dependencies.development = Ontwikkelings afhankelijkheden +composer.dependencies.development = Ontwikkelings Afhankelijkheden conan.registry = Stel dit register in vanaf de terminal: conan.install = Voer het volgende commando uit om het pakket met Conan te installeren: conda.registry = Stel dit register in als een Conda repository in je .condarc bestand: -container.details.type = Afbeelding type +container.details.type = Afbeelding Type container.details.platform = Platform container.pull = Haal de afbeelding op vanaf de terminal: -container.digest = Digest +container.digest = Digest: container.multi_arch = Besturingssysteem / Arch -container.layers = Afbeelding lagen +container.layers = Afbeelding Lagen container.labels = Labels container.labels.key = Sleutel debian.repository = Repository informatie @@ -3715,7 +3664,7 @@ rpm.repository.architectures = Architecturen rpm.repository.multiple_groups = Dit pakket is beschikbaar in meerdere groepen. rubygems.install = Voer het volgende commando uit om het pakket met gem te installeren: rubygems.install2 = of voeg het toe aan het Gemfile: -rubygems.dependencies.development = Ontwikkelings dependencies +rubygems.dependencies.development = Ontwikkelings Dependencies swift.registry = Stel dit register in vanaf de terminal: swift.install = Voeg het pakket toe in je Package.swift bestand: swift.install2 = en voer het volgende commando uit: @@ -3733,7 +3682,7 @@ nuget.install = Voer het volgende commando uit om het pakket met NuGet te instal npm.install = Voer het volgende commando uit om het pakket met npm te installeren: npm.install2 = of voeg het toe aan het package.json bestand: npm.dependencies = Afhankelijkheden -npm.dependencies.development = Ontwikkelings afhankelijkheden +npm.dependencies.development = Ontwikkelings Afhankelijkheden npm.dependencies.peer = Peer afhankelijkheden npm.dependencies.optional = Optionele afhankelijkheden owner.settings.cargo.title = Cargo register index @@ -3755,7 +3704,7 @@ owner.settings.cleanuprules.keep.count = Bewaar de meest recente owner.settings.cleanuprules.keep.count.1 = 1 versie per pakket owner.settings.cleanuprules.keep.count.n = %d versies per pakket pub.install = Voer het volgende commando uit om het pakket met Dart te installeren: -rubygems.dependencies.runtime = Runtime dependencies +rubygems.dependencies.runtime = Runtime Dependencies settings.delete.error = Het verwijderen van het pakket is mislukt. alpine.registry = Stel dit register in door de url toe te voegen aan je /etc/apk/repositories bestand: maven.registry = Stel dit register in het pom.xml bestand van je project: @@ -3819,15 +3768,6 @@ arch.version.conflicts = Conflicten arch.version.replaces = Vervangt arch.version.backup = Back-up arch.version.makedepends = Maken is afhankelijk van -container.images.title = Afbeeldingen -search_in_external_registry = Zoeken in %s -alt.registry.install = Voer het volgende commando uit om het pakket te installeren: -alt.repository = Repository info -alt.repository.architectures = Architecturen -alt.repository.multiple_groups = Dit pakket is beschikbaar in meerdere groepen. -alt.registry = Stel dit register in vanaf de opdrachtregel: -alt.install = Pakket installeren -alt.setup = Voeg een repository toe aan de lijst met gekoppelde repositories (kies de benodigde architectuur in plaats van '_arch_'): [secrets] secrets = Geheimen @@ -3845,6 +3785,9 @@ creation.name_placeholder = hoofdlettergevoelig, alleen alfanumerieke tekens of deletion.failed = Mislukt om geheim te verwijderen. [actions] + + + runners.name=Naam runners.owner_type=Type runners.description=Omschrijving @@ -3919,7 +3862,7 @@ runs.actors_no_select = Alle acteurs runs.status_no_select = Alle statussen runs.no_results = Geen resultaten gevonden. runs.no_workflows = Er zijn nog geen workflows. -unit.desc = Beheer geïntegreerde CI/CD-pijplijnen met Forgejo Actions. +unit.desc = Beheer geïntegreerde CI/CD-pijplijnen met Forgejo Actions runs.no_workflows.documentation = Voor meer informatie over Forgejo acties, zie de documentatie. workflow.disable_success = Workflow "%s" is succesvol uitgeschakeld. variables.none = Er zijn nog geen variabelen. @@ -3940,8 +3883,6 @@ workflow.dispatch.warn_input_limit = Alleen de eerste %d invoeren worden weergeg workflow.dispatch.invalid_input_type = Ongeldig invoertype “%sâ€. workflow.dispatch.input_required = Waarde vereist voor invoer “%sâ€. runs.expire_log_message = Logs zijn verwijderd omdat ze te oud waren. -runs.no_workflows.help_no_write_access = Om meer te weten te komen over Forgejo Acties, zie de documentatie. -runs.no_workflows.help_write_access = Weet je niet hoe je moet beginnen met Forgejo Actions? Bekijk de snelstart in de gebruikersdocumentatie om je eerste workflow te schrijven en stel vervolgens een Forgejo runner in om je jobs uit te voeren. @@ -3953,6 +3894,7 @@ type-3.display_name = Organisatie project deleted.display_name = Verwijderd project [git.filemode] +; Ordered by git filemode value, ascending. E.g. directory has "040000", normal file has "100644", … symbolic_link=Symbolische link submodule = Submodule changed_filemode = %[1]s → %[2]s @@ -3962,6 +3904,16 @@ executable_file = Uitvoerbaar bestand +[graphs] +component_loading_info = Dit kan even duren… +component_failed_to_load = Er is een onverwachte fout opgetreden. +contributors.what = bijdragen +component_loading_failed = %s kon niet worden geladen +component_loading = Bezig met laden van %s... +code_frequency.what = code frequentie +recent_commits.what = recente commits + + [search] search = Zoek... fuzzy = Fuzzy @@ -3990,8 +3942,6 @@ pull_kind = Zoek pulls... union = Trefwoorden union_tooltip = Neem resultaten op die overeenkomen met een van de trefwoorden gescheiden door spaties milestone_kind = Zoek mijlpalen... -regexp_tooltip = Interpreteer de zoekterm als een reguliere expressie -regexp = RegExp [munits.data] b = B @@ -4009,24 +3959,4 @@ filepreview.truncated = Voorbeeld is ingekort [translation_meta] -test = Oké - -[repo.permissions] -code.write = Schrijven: Push naar de repositorie, maak branches en tags. -code.read = Lezen: Toegang en clone de code van de repository. -issues.read = Lezen: Lees en maak issues en commentaren. -pulls.read = Lezen: Lezen en pull requests maken. -releases.read = Lezen: Bekijk en download releases. -ext_issues = Toegang tot de link naar een externe issue tracker. De rechten worden extern beheerd. -ext_wiki = Toegang tot de link naar een externe wiki. De rechten worden extern beheerd. -actions.write = Write: Handmatig starten, herstarten, annuleren of goedkeuren van hangende CI/CD-pijplijnen. -pulls.write = Schrijven: Sluit pull requests af en beheer metadata zoals labels, mijlpalen, verantwoordelijken, vervaldatums en afhankelijkheden. -releases.write = Schrijven: Publiceren, bewerken en verwijderen van releases en hun assets. -wiki.read = Lezen: Lees de geïntegreerde wiki en zijn geschiedenis. -wiki.write = Schrijven: Pagina's maken, bijwerken en verwijderen in de geïntegreerde wiki. -projects.read = Lezen: Toegang tot projectboards van repository's. -projects.write = Schrijven: Projecten en kolommen maken en bewerken. -packages.read = Lezen: Bekijk en download pakketten die aan de repository is toegewezen. -packages.write = Schrijven: Publiceer en verwijder pakketten die aan de repository is toegewezen. -actions.read = Lezen: Bekijk geïntegreerde CI/CD-pijplijnen en hun logboeken. -issues.write = Schrijven: Sluit issues af en beheer metadata zoals labels, mijlpalen, verantwoordelijken, vervaldatums en afhankelijkheden. +test = Oké \ No newline at end of file diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini index 7192f6a366..e9e3b62254 100644 --- a/options/locale/locale_pl-PL.ini +++ b/options/locale/locale_pl-PL.ini @@ -166,7 +166,6 @@ new_repo.link = Nowe repozytorium new_migrate.link = Nowa migracja new_org.link = Nowa organizacja filter.not_fork = Nie forki -copy_path = Skopiuj Å›cieżkÄ™ [aria] navbar = Pasek nawigacji @@ -199,12 +198,6 @@ buttons.switch_to_legacy.tooltip = Zamiast tego użyj starego edytora buttons.disable_monospace_font = WyÅ‚Ä…cz czcionkÄ™ monospace buttons.enable_monospace_font = WÅ‚Ä…cz czcionkÄ™ monospace buttons.indent.tooltip = Zagnieżdż elementy o jeden poziom -buttons.new_table.tooltip = Dodaj tabelÄ™ -table_modal.header = Dodaj tabelÄ™ -table_modal.placeholder.header = Nagłówek -table_modal.placeholder.content = Zawartość -table_modal.label.rows = Wiersze -table_modal.label.columns = Kolumny [filter] string.asc = A - Z @@ -255,7 +248,7 @@ err_empty_db_path=Åšcieżka do bazy danych SQLite3 nie może być pusta. no_admin_and_disable_registration=Nie możesz wyÅ‚Ä…czyć możliwoÅ›ci samodzielnej rejestracji kont użytkowników bez stworzenia konta administratora. err_empty_admin_password=HasÅ‚o administratora nie może być puste. err_empty_admin_email=Pole adresu e-mail administratora nie może być puste. -err_admin_name_is_reserved=Nazwa użytkownika administratora jest nieprawidÅ‚owa, pseudonim jest zarezerwowany +err_admin_name_is_reserved=Nazwa użytkownika administratora jest nieprawidÅ‚owa, pseudonim jest zastrzeżony err_admin_name_pattern_not_allowed=Nazwa użytkownika administratora jest nieprawidÅ‚owa, pseudonim zawiera zastrzeżone znaki err_admin_name_is_invalid=Nazwa użytkownika administratora jest nieprawidÅ‚owa @@ -477,8 +470,6 @@ back_to_sign_in = Wróć do logowania sign_in_openid = Kontynuuj z OpenID hint_login = Masz już konto? Zaloguj siÄ™ teraz! sign_up_button = Zarejestruj siÄ™. -use_onetime_code = Użyj kodu jednorazowego -unauthorized_credentials = Dane uwierzytelniajÄ…ce sÄ… nieprawidÅ‚owe lub wygasÅ‚y. Spróbuj ponownie wykonać polecenie lub zobacz %s, aby uzyskać wiÄ™cej informacji [mail] view_it_on=Zobacz na %s @@ -561,7 +552,6 @@ removed_security_key.subject = Klucz bezpieczeÅ„stwa zostaÅ‚ usuniÄ™ty removed_security_key.text_1 = Klucz bezpieczeÅ„stwa "%[1]s" zostaÅ‚ wÅ‚aÅ›nie usuniÄ™ty z twojego konta. totp_enrolled.text_1.has_webauthn = WÅ‚aÅ›nie wÅ‚Ä…czyÅ‚eÅ› TOTP dla swojego konta. Oznacza to, że dla wszystkich przyszÅ‚ych logowaÅ„ do konta możesz użyć TOTP jako metody 2FA lub użyć dowolnego klucza bezpieczeÅ„stwa. team_invite.text_2 = Kliknij poniższy link, aby doÅ‚Ä…czyć do zespoÅ‚u: -issue.action.merge = poÅ‚Ä…czone [modal] @@ -664,9 +654,6 @@ must_use_public_key = Podany klucz jest kluczem prywatnym. Nie przesyÅ‚aj nigdzi Location = Lokalizacja username_error_no_dots = ` może zawierać tylko znaki alfanumeryczne ("0-9", "a-z", "A-Z"), myÅ›lnik ("-") oraz podkreÅ›lenie ("_"). Nie może zaczynać siÄ™ ani koÅ„czyć znakami niealfanumerycznymi, a znaki niealfanumeryczne wystÄ™pujÄ…ce po sobie sÄ… również zabronione.` username_error = ` może zawierać tylko znaki alfanumeryczne ("0-9", "a-z", "A-Z"), myÅ›lnik ("-") oraz podkreÅ›lenie ("_"). Nie może zaczynać siÄ™ ani koÅ„czyć znakami niealfanumerycznymi, a znaki niealfanumeryczne wystÄ™pujÄ…ce po sobie sÄ… również zabronione.` -still_has_org = Twoje konto jest czÅ‚onkiem jednej bÄ…dź wielu organizacji, musisz je najpierw opuÅ›cić. -org_still_own_repo = Ta organizacja nadal jest wÅ‚aÅ›cicielem jednego lub wielu repozytoriów. Najpierw je usuÅ„ lub przenieÅ›. -admin_cannot_delete_self = Nie możesz usunąć siebie, gdy jesteÅ› administratorem. ProszÄ™ najpierw usunąć swoje uprawnienia administratora. [user] @@ -686,20 +673,6 @@ disabled_public_activity=Ten użytkownik wyÅ‚Ä…czyÅ‚ publiczne wyÅ›wietlanie jeg code = Kod block = Zablokuj unblock = Odblokuj -block_user.detail = PamiÄ™taj, że zablokowanie użytkownika powoduje inne skutki, takie jak: -block_user.detail_2 = Ten użytkownik nie bÄ™dzie mógÅ‚ wchodzić w interakcjÄ™ z repozytoriami, których jesteÅ› wÅ‚aÅ›cicielem, ani z problemami i komentarzami, które utworzyÅ‚eÅ›. -settings = Ustawienia użytkownika -followers_one = %d obserwujÄ…cych -following_one = %d obserwowanych -followers.title.one = ObserwujÄ…cy -followers.title.few = ObserwujÄ…cy -following.title.one = Obserwowani -following.title.few = Obserwowani -email_visibility.limited = Twój adres e-mail jest widoczny dla wszystkich uwierzytelnionych użytkowników -block_user = Zablokuj użytkownika -block_user.detail_1 = Przestaniecie siÄ™ wzajemnie obserwować i nie bÄ™dziecie mogli siÄ™ wzajemnie obserwować. -follow_blocked_user = Nie możesz obserwować tego użytkownika, ponieważ go zablokowaÅ‚eÅ› lub ten użytkownik zablokowaÅ‚ Ciebie. -show_on_map = Pokaż to mejsce na mapie [settings] @@ -712,7 +685,7 @@ avatar=Awatar ssh_gpg_keys=Klucze SSH / GPG social=Konta spoÅ‚ecznoÅ›ciowe applications=Aplikacje -orgs=Organizacje +orgs=ZarzÄ…dzaj organizacjami repos=Repozytoria delete=UsuÅ„ konto twofa=Autoryzacja dwuetapowa @@ -725,7 +698,7 @@ password_username_disabled=Użytkownicy nielokalni nie mogÄ… zmieniać swoich na full_name=ImiÄ™ i nazwisko website=Strona location=Lokalizacja -update_theme=ZmieÅ„ motyw +update_theme=Zaktualizuj motyw update_profile=Zaktualizuj profil update_language_success=JÄ™zyk zostaÅ‚ zaktualizowany. update_profile_success=Twój profil zostaÅ‚ zaktualizowany. @@ -756,15 +729,15 @@ password_change_disabled=Konta niebÄ™dÄ…ce lokalnymi nie mogÄ… zmienić swojego emails=Adresy e-mail manage_emails=ZarzÄ…dzaj adresami e-mail -manage_themes=DomyÅ›lny motyw -manage_openid=Adresy OpenID +manage_themes=Wybierz motyw domyÅ›lny +manage_openid=ZarzÄ…dzanie adresami OpenID theme_desc=BÄ™dzie to domyÅ›lny motyw na caÅ‚ej stronie. primary=Podstawowy activated=Aktywowany requires_activation=Wymaga aktywacji primary_email=Ustaw jako podstawowy -activate_email=WyÅ›lij email aktywacyjny -activations_pending=OczekujÄ…ce aktywacje +activate_email=WyÅ›lij aktywacjÄ™ +activations_pending=Aktywacje oczekujÄ…ce delete_email=UsuÅ„ email_deletion=UsuÅ„ adres email email_deletion_desc=Adres e-mail i powiÄ…zane informacje zostanÄ… usuniÄ™te z Twojego konta. Commity za pomocÄ… tego adresu e-mail pozostanÄ… niezmienione. Kontynuować? @@ -774,7 +747,7 @@ theme_update_error=Wybrany motyw nie istnieje. openid_deletion=UsuÅ„ adres OpenID openid_deletion_desc=UsuniÄ™cie tego adresu OpenID z Twojego konta uniemożliwi Ci logowanie siÄ™ za jego pomocÄ…. Kontynuować? openid_deletion_success=Adres OpenID zostaÅ‚ usuniÄ™ty. -add_new_email=Dodaj e-mail +add_new_email=Dodaj nowy e-mail add_new_openid=Dodaj nowy URI OpenID add_email=Dodaj adres e-mail add_openid=Dodaj OpenID URI @@ -787,13 +760,13 @@ openid_desc=OpenID pozwala na delegowanie uwierzytelniania do zewnÄ™trznego oper manage_ssh_keys=ZarzÄ…dzaj kluczami SSH manage_gpg_keys=ZarzÄ…dzaj kluczami GPG add_key=Dodaj klucz -ssh_desc=Te publiczne klucze SSH sÄ… powiÄ…zane z Twoim kontem. OdpowiadajÄ…ce im klucze prywatne umożliwiajÄ… peÅ‚ny dostÄ™p do Twoich repozytoriów. Klucze SSH, które zostaÅ‚y zweryfikowane mogÄ… zostać użyte do weryfikacji commitów podpisanych kluczem SSH. -gpg_desc=Te publiczne klucze GPG sÄ… powiÄ…zane z Twoim kontem i bÄ™dÄ… używane do weryfikacji twoich commitów. Dbaj o bezpieczeÅ„stwo kluczy prywatnych, gdyż pozwalajÄ… one na podpisywanie commitów. +ssh_desc=Te publiczne klucze SSH sÄ… powiÄ…zane z Twoim kontem. OdpowiadajÄ…ce im klucze prywatne umożliwiajÄ… peÅ‚ny dostÄ™p do Twoich repozytoriów. +gpg_desc=Te publiczne klucze GPG sÄ… powiÄ…zane z Twoim kontem. Dbaj o bezpieczeÅ„stwo kluczy prywatnych, gdyż pozwalajÄ… one na weryfikacjÄ™ commitów. ssh_helper=Potrzebujesz pomocy? Sprawdź na GitHubie przewodnik generowania kluczy SSH lub rozwiÄ…zywanie typowych problemów z SSH. gpg_helper=Potrzebujesz pomocy? Przeczytaj na GitHubie poradnik na temat GPG. add_new_key=Dodaj klucz SSH add_new_gpg_key=Dodaj klucz GPG -key_content_gpg_placeholder=Zaczyna siÄ™ od "-----BEGIN PGP PUBLIC KEY BLOCK-----" +key_content_gpg_placeholder=Zaczyna siÄ™ od '-----BEGIN PGP PUBLICZNEJ BLOKI KLUCZOWEJ PGP---' ssh_key_been_used=Ten klucz SSH zostaÅ‚ już dodany do tego serwera. ssh_key_name_used=Klucz SSH z tÄ… nazwÄ… zostaÅ‚ już dodany do Twojego konta. ssh_principal_been_used=Ten klucz SSH zostaÅ‚ już dodany do tego serwera. @@ -810,7 +783,7 @@ gpg_token=Token gpg_token_help=Możesz wygenerować podpis za pomocÄ…: gpg_token_code=echo "%s" | gpg -a --default-key %s --detach-sig gpg_token_signature=Wzmocniony podpis GPG -key_signature_gpg_placeholder=Zaczyna siÄ™ od "-----BEGIN PGP SIGNATURE-----" +key_signature_gpg_placeholder=Zaczyna siÄ™ od '-----BEGIN PGP SIGNATURE-----' ssh_key_verified=Zweryfikowany klucz ssh_key_verified_long=Klucz zostaÅ‚ zweryfikowany tokenem i może być użyty do weryfikacji zmian pasujÄ…cych do wszystkich aktywowanych adresów e-mail tego użytkownika. ssh_key_verify=Weryfikuj @@ -818,7 +791,7 @@ ssh_token_required=Musisz podać podpis poniższego tokenu ssh_token=Token ssh_token_help=Możesz wygenerować podpis używajÄ…c: ssh_token_signature=Wzmocniony podpis SSH -key_signature_ssh_placeholder=Zaczyna siÄ™ od "-----BEGIN SSH SIGNATURE-----" +key_signature_ssh_placeholder=Zaczyna siÄ™ od '-----BEGIN SSH SIGNATURE-----' subkeys=Podklucze key_id=ID klucza key_name=Nazwa klucza @@ -848,10 +821,10 @@ ssh_externally_managed=Ten klucz SSH jest zarzÄ…dzany zewnÄ™trznie dla tego uży manage_social=ZarzÄ…dzaj powiÄ…zanymi kontami spoÅ‚ecznoÅ›ciowymi unbind=RozÅ‚Ä…cz -manage_access_token=Tokeny dostÄ™pu +manage_access_token=ZarzÄ…dzaj tokenami dostÄ™pu generate_new_token=Wygeneruj nowy token tokens_desc=Te tokeny dostÄ™pu udzielajÄ… dostÄ™pu do Twojego konta za pomocÄ… API Forgejo. -token_name=Nazwa tokenu +token_name=Nazwa tokena generate_token=Wygeneruj token generate_token_success=Twój nowy token zostaÅ‚ wygenerowany. Skopiuj go teraz, gdyż nie zostanie ujawniony ponownie. generate_token_name_duplicate=%s istnieje już jako nazwa aplikacji. Użyj nowej. @@ -881,15 +854,15 @@ oauth2_application_create_description=Aplikacje OAuth2 umożliwiajÄ… Twojej apli authorized_oauth2_applications=Autoryzowane aplikacje OAuth2 revoke_key=OdwoÅ‚aj -revoke_oauth2_grant=Zabierz dostÄ™p +revoke_oauth2_grant=OdwoÅ‚aj dostÄ™p revoke_oauth2_grant_description=OdwoÅ‚anie dostÄ™pu dla tej aplikacji uniemożliwi jej korzystanie z Twoich danych. Czy jesteÅ› pewny(-a)? twofa_desc=Weryfikacja dwuskÅ‚adnikowa zwiÄ™ksza bezpieczeÅ„stwo Twojego konta. twofa_is_enrolled=Twoje konto ma obecnie wÅ‚Ä…czoną autoryzacjÄ™ dwuetapowÄ…. twofa_not_enrolled=Twoje konto obecnie nie ma wÅ‚Ä…czonej autoryzacji dwuetapowej. twofa_disable=WyÅ‚Ä…cz weryfikacjÄ™ dwuetapowÄ… -twofa_scratch_token_regenerate=Ponownie wygeneruj jednorazowy kod odzyskiwania -twofa_enroll=WÅ‚Ä…cz weryfikacjÄ™ dwuetapowÄ… +twofa_scratch_token_regenerate=Wygeneruj ponownie kod jednorazowy +twofa_enroll=WÅ‚Ä…cz weryfikacjÄ™ dwuskÅ‚adnikowÄ… twofa_disable_note=W każdej chwili możesz wyÅ‚Ä…czyć weryfikacjÄ™ dwuskÅ‚adnikowÄ…. twofa_disable_desc=WyÅ‚Ä…czenie weryfikacji dwuetapowej sprawi, że Twoje konto bÄ™dzie mniej bezpieczne. Kontynuować? regenerate_scratch_token_desc=JeÅ›li zgubiÅ‚eÅ›(-aÅ›) lub zużyÅ‚eÅ›(-aÅ›) swój kod jednorazowy, możesz go wygenerować ponownie tutaj. @@ -905,7 +878,7 @@ webauthn_register_key=Dodaj klucz bezpieczeÅ„stwa webauthn_delete_key=UsuÅ„ klucz bezpieczeÅ„stwa webauthn_delete_key_desc=Jeżeli usuniesz klucz bezpieczeÅ„stwa, utracisz możliwość zalogowania się z jego użyciem. Kontynuować? -manage_account_links=PowiÄ…zane konta +manage_account_links=ZarzÄ…dzaj powiÄ…zanymi kontami manage_account_links_desc=Te konta zewnÄ™trzne sÄ… powiÄ…zane z Twoim kontem Forgejo. account_links_not_available=Obecnie nie ma żadnych zewnÄ™trznych kont powiÄ…zanych z tym kontem Forgejo. link_account=Powiąż konto @@ -920,7 +893,7 @@ delete_account=UsuÅ„ swoje konto delete_prompt=Ta operacja permanentnie usunie Twoje konto użytkownika i jest NIEODWRACALNA. delete_with_all_comments=Twoje konto jest mÅ‚odsze niż %s. Aby uniknąć faÅ‚szywych komentarzy, wszystkie komentarze zgÅ‚oszenia/PR zostanÄ… z nim usuniÄ™te. confirm_delete_account=Potwierdź usuniÄ™cie -delete_account_title=UsuÅ„ konto użytkownika +delete_account_title=UsuÅ„ swoje konto delete_account_desc=Czy na pewno chcesz permanentnie usunąć to konto użytkownika? email_notifications.enable=WÅ‚Ä…cz powiadomienia e-mail @@ -959,7 +932,7 @@ template_description=Szablony repozytoriów pozwalajÄ… użytkownikom generować visibility=Widoczność visibility_description=Tylko wÅ‚aÅ›ciciel lub czÅ‚onkowie organizacji, jeÅ›li majÄ… odpowiednie uprawnienia, bÄ™dÄ… mogli to zobaczyć. visibility_helper_forced=Administrator strony wymaga, aby nowe repozytoria byÅ‚y prywatne. -visibility_fork_helper=(Zmiana tej wartoÅ›ci wpÅ‚ynie na widoczność wszystkich forków.) +visibility_fork_helper=(Zmiana tej wartoÅ›ci wpÅ‚ynie na wszystkie forki.) clone_helper=Potrzebujesz pomocy z klonowaniem? Odwiedź pomoc. fork_repo=Forkuj repozytorium fork_from=Forkuj z @@ -969,13 +942,13 @@ clone_in_vsc=Klonuj w VS Code download_zip=Pobierz ZIP download_tar=Pobierz TAR.GZ download_bundle=Pobierz BUNDLE -generate_repo=Wygeneruj repozytorium -generate_from=Wygeneruj z +generate_repo=Generuj repozytorium +generate_from=Generuj z repo_desc=Opis repo_desc_helper=Wprowadź krótki opis (opcjonalnie) repo_lang=JÄ™zyk repo_gitignore_helper=Wybierz szablony pliku .gitignore. -issue_labels=Etykiety +issue_labels=Etykiety zgÅ‚oszenia issue_labels_helper=Wybierz zestaw etykiet zgÅ‚oszeÅ„ license=Licencja license_helper=Wybierz plik licencji @@ -986,14 +959,14 @@ readme_helper_desc=To jest miejsce, w którym możesz napisać peÅ‚ny opis swoje auto_init=Inicjalizuj repozytorium (dodaje .gitignore, licencjÄ™ i README) trust_model_helper_default=DomyÅ›lnie: Użyj domyÅ›lnego modelu zaufania dla tej instalacji create_repo=Utwórz repozytorium -default_branch=DomyÅ›lny branch +default_branch=DomyÅ›lna gałąź default_branch_helper=DomyÅ›lny branch jest podstawowym branch'em dla pull requestów i commit'ów kodu. mirror_prune=Wyczyść mirror_prune_desc=UsuÅ„ przestarzaÅ‚e odwoÅ‚ania do zdalnych Å›ledzeÅ„ mirror_interval_invalid=InterwaÅ‚ lustrzanej kopii jest niepoprawny. mirror_address=Sklonuj z adresu URL mirror_lfs=Duże przechowywanie plików (LFS) -mirror_lfs_endpoint=Endpoint LFS +mirror_lfs_endpoint=Punkt koÅ„cowy LFS mirror_lfs_endpoint_desc=Synchronizacja spróbuje użyć adresu URL klonowania, aby okreÅ›lić serwer LFS. Możesz również okreÅ›lić niestandardowy punkt koÅ„cowy, jeÅ›li dane repozytorium LFS sÄ… przechowywane gdzieÅ› indziej. mirror_last_synced=Ostatnio zsynchronizowano mirror_password_placeholder=(Nie zmieniono) @@ -1176,9 +1149,9 @@ editor.or=lub editor.cancel_lower=Anuluj editor.commit_signed_changes=Zatwierdź podpisane zmiany editor.commit_changes=Zatwierdź zmiany -editor.add_tmpl=Dodanie '<%s>' +editor.add_tmpl=Dodanie '' editor.commit_message_desc=Dodaj dodatkowy rozszerzony opis… -editor.commit_directly_to_this_branch=Zmieniaj bezpoÅ›rednio gałąź %[1]s. +editor.commit_directly_to_this_branch=Zmieniaj bezpoÅ›rednio gałąź %s. editor.create_new_branch=Stwórz nowÄ… gałąź dla tego commita i rozpocznij Pull Request. editor.create_new_branch_np=Stwórz nowÄ… gałąź dla tego commita. editor.propose_file_change=Zaproponuj zmiany w pliku @@ -1508,7 +1481,7 @@ pulls.no_results=Nie znaleziono wyników. pulls.nothing_to_compare=Te gaÅ‚Ä™zie sÄ… sobie równe. Nie ma potrzeby tworzyć Pull Requesta. pulls.nothing_to_compare_and_allow_empty_pr=Te gaÅ‚Ä™zie sÄ… równe. Ten PR bÄ™dzie pusty. pulls.create=Utwórz Pull Request -pulls.title_desc_few=chce scalić %[1]d commity/ów z %[2]s do %[3]s +pulls.title_desc_few=chce scalić %[1]d commity/ów z %[2]s do %[3]s pulls.merged_title_desc_few=scala %[1]d commity/ów z %[2]s do %[3]s %[4]s pulls.change_target_branch_at=`zmienia gałąź docelowÄ… z %s na %s %s` pulls.tab_conversation=Dyskusja @@ -1939,8 +1912,8 @@ settings.protect_whitelist_teams=ZespoÅ‚y dopuszczone do pushowania settings.protect_whitelist_search_teams=Szukaj zespołów… settings.protect_merge_whitelist_committers=WÅ‚Ä…cz dopuszczenie scalania settings.protect_merge_whitelist_committers_desc=Zezwól jedynie dopuszczonym użytkownikom lub zespoÅ‚om na scalanie Pull Requestów w tej gaÅ‚Ä™zi. -settings.protect_merge_whitelist_users=Użytkownicy dopuszczeni do scalania -settings.protect_merge_whitelist_teams=ZespoÅ‚y dopuszczone do scalania +settings.protect_merge_whitelist_users=Użytkownicy dopuszczeni do scalania: +settings.protect_merge_whitelist_teams=ZespoÅ‚y dopuszczone do scalania: settings.protect_check_status_contexts=WÅ‚Ä…cz kontrolÄ™ stanu settings.protect_check_status_contexts_desc=Wymagaj powodzenia kontroli stanów przed scalaniem. Wybierz które kontrole stanów muszÄ… zostać ukoÅ„czone pomyÅ›lnie, zanim gaÅ‚Ä™zie bÄ™dÄ… mogÅ‚y zostać scalone z gaÅ‚Ä™ziÄ…, która pokrywa siÄ™ z tÄ… zasadÄ…. Kiedy wÅ‚Ä…czone, commity muszÄ… być najpierw wypchniÄ™te do innej gaÅ‚Ä™zi, a nastÄ™pnie scalone lub wypchniÄ™te bezpoÅ›rednio do gaÅ‚Ä™zi, która pokrywa siÄ™ z tÄ… zasadÄ… po pomyÅ›lnej kontroli stanów. Jeżeli nie zostanÄ… wybrane konteksty, ostatni commit musi zakoÅ„czyć siÄ™ powodzeniem niezależnie od kontekstu. settings.protect_check_status_contexts_list=Kontrole stanów w poprzednim tygodniu dla tego repozytorium @@ -2820,6 +2793,9 @@ rpm.repository.architectures = Architektury secrets = Sekrety [actions] + + + runners.name=Nazwa runners.owner_type=Typ runners.description=Opis @@ -2855,6 +2831,7 @@ status.blocked = Zablokowano [projects] [git.filemode] +; Ordered by git filemode value, ascending. E.g. directory has "040000", normal file has "100644", … symbolic_link=DowiÄ…zanie symboliczne executable_file = Plik wykonywalny submodule = PodmoduÅ‚ @@ -2889,6 +2866,4 @@ exact = DokÅ‚adnie exact_tooltip = UwzglÄ™dniaj tylko wyniki pasujÄ…ce do wyszukiwanego hasÅ‚a issue_kind = Wyszukaj problemy... pull_kind = Wyszukaj pull requesty... -union = Unia -regexp = RegExp -regexp_tooltip = Interpretuj wyszukiwane hasÅ‚o jako wyrażenie regularne +union = Unia \ No newline at end of file diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini index f6cf73620c..a0e5acc060 100644 --- a/options/locale/locale_pt-BR.ini +++ b/options/locale/locale_pt-BR.ini @@ -4,7 +4,7 @@ dashboard=Painel explore=Explorar help=Ajuda logo=Logotipo -sign_in=Iniciar sessão +sign_in=Acessar sign_in_with_provider=Entrar com %s sign_in_or=ou sign_out=Sair @@ -12,7 +12,7 @@ sign_up=Cadastrar link_account=Vincular conta register=Cadastrar version=Versão -powered_by=Oferecido por %s +powered_by=Desenvolvido por %s page=Página template=Template language=Idioma @@ -33,7 +33,7 @@ access_token=Token de acesso re_type=Confirmar senha captcha=CAPTCHA twofa=Autenticação de dois fatores -twofa_scratch=Código de uso único da autenticação de dois fatores +twofa_scratch=Código de backup da autenticação de dois fatores passcode=Senha webauthn_insert_key=Insira sua chave de segurança @@ -61,7 +61,7 @@ new_org=Nova organização new_project=Novo projeto new_project_column=Nova coluna manage_org=Gerenciar organizações -admin_panel=Administração do site +admin_panel=Administração geral account_settings=Configurações da conta settings=Configurações your_profile=Perfil @@ -76,7 +76,7 @@ forks=Forks activities=Atividades pull_requests=Pull requests -issues=Problemas +issues=Issues milestones=Marcos ok=OK @@ -164,9 +164,6 @@ new_org.title = Nova organização new_repo.link = Novo repositório new_migrate.link = Nova migração new_org.link = Nova organização -test = Teste -error413 = Você esgotou sua cota. -copy_path = Copiar caminho [aria] navbar=Barra de navegação @@ -198,14 +195,6 @@ buttons.ref.tooltip=Referenciar um issue ou um pull request buttons.switch_to_legacy.tooltip=Em vez disso, usar o editor legado buttons.enable_monospace_font=Habilitar fonte mono espaçada buttons.disable_monospace_font=Desabilitar fonte mono espaçada -buttons.indent.tooltip = Aninhar items em um nível -buttons.unindent.tooltip = Desaninhar items em um nível -buttons.new_table.tooltip = Adicionar tabela -table_modal.header = Adicionar tabela -table_modal.placeholder.header = Cabeçalho -table_modal.placeholder.content = Conteúdo -table_modal.label.rows = Linhas -table_modal.label.columns = Colunas [filter] string.asc=A - Z @@ -224,12 +213,12 @@ server_internal = Erro interno do servidor app_desc=Um serviço de hospedagem Git amigável install=Fácil de instalar platform=Multi-plataforma +platform_desc=Forgejo roda em qualquer sistema em que Go consegue compilar: Windows, macOS, Linux, ARM, etc. Escolha qual você gosta mais! lightweight=Leve e rápido lightweight_desc=Forgejo utiliza poucos recursos e consegue mesmo rodar no barato Raspberry Pi. Economize energia elétrica da sua máquina! license=Código aberto license_desc=Está tudo no Forgejo! Contribua e torne este projeto ainda melhor. Não tenha vergonha de contribuir! install_desc = Apenas rode o binário para a sua plataforma, execute-o com Docker, ou obtenha-o empacotado. -platform_desc = Foi confirmado que o Forgejo roda em sistemas operacionais livres, como Linux e FreeBSD, assim como em diferentes arquiteturas de CPU. Escolha sua preferida! [install] install=Instalação @@ -262,7 +251,7 @@ err_admin_name_is_invalid=Nome de usuário do administrador inválido general_title=Configurações gerais app_name=Título do servidor -app_name_helper=Insira o nome da sua instância aqui. Ele será mostrado em todas as páginas. +app_name_helper=Você pode inserir o nome da empresa aqui. repo_path=Caminho raiz do repositório repo_path_helper=Todos os repositórios remotos do Git serão salvos neste diretório. lfs_path=Caminho raiz do Git LFS @@ -292,22 +281,22 @@ register_confirm=Exigir confirmação de e-mail para cadastros mail_notify=Habilitar notificações por e-mail server_service_title=Configurações do servidor e serviços de terceiros offline_mode=Habilitar modo local -offline_mode.description=Desabilitar redes de entrega de conteúdo (CDNs) de terceiros e fornecer todos os recursos localmente. +offline_mode.description=Desabilitar redes de entrega de conteúdo de terceiros e entregar todos os recursos localmente. disable_gravatar=Desabilitar o gravatar -disable_gravatar.description=Desabilitar o uso do Gravatar e avatar de fontes de terceiros. Um avatar padrão será usado a menos que um usuário localmente carrega um avatar. +disable_gravatar.description=Desabilitar o gravatar e avatar de fontes de terceiros. Um avatar padrão será usado a menos que um usuário localmente carrega um avatar. federated_avatar_lookup=Habilitar avatares federados -federated_avatar_lookup.description=Buscar avatares usando Libravatar. +federated_avatar_lookup.description=Habilitar a busca federativa de avatares a usar o serviço federativo de código aberto baseado no libravatar. disable_registration=Somente administradores podem criar novas contas -disable_registration.description=Apenas administradores do servidor poderão criar novas contas. É altamente recomendado manter o cadastro desativado a não ser que deseje hospedar uma instância pública para qualquer pessoa e puder lidar com uma grande quantidade de contas de spam. -allow_only_external_registration.description=Usuários apenas poderão criar novas contas usando serviços externos que tenham sido configurados. +disable_registration.description=Desabilitar auto-cadastro de usuário. Somente os administradores serão capazes de criar novas contas de usuário. +allow_only_external_registration.description=Permitir cadastro somente por meio de serviços externos openid_signin=Habilitar acesso via OpenID openid_signin.description=Habilitar o acesso de usuários via OpenID. openid_signup=Habilitar cadastros via OpenID -openid_signup.description=Permitir que os usuários criem contas com OpenID se o autorregistro estiver habilitado. +openid_signup.description=Habilitar o auto-cadastro com base no OpenID. enable_captcha=Habilitar CAPTCHA ao registrar enable_captcha.description=Impor validação por CAPTCHA para cadastro de usuários. require_sign_in_view=Apenas usuários logados podem visualizar páginas -require_sign_in_view.description=Limitar acesso ao conteúdo apenas aos usuários autenticados. Visitantes só poderão acessar as páginas de autenticação. +require_sign_in_view.description=Limitar o acesso de página aos usuários autenticados. Os visitantes só verão as páginas de autenticação e cadastro. admin_setting.description=Criar uma conta de administrador é opcional. O primeiro usuário cadastrado automaticamente se tornará um administrador. admin_title=Configurações da conta de administrador admin_name=Usuário @@ -328,11 +317,11 @@ save_config_failed=Falha ao salvar a configuração: %v invalid_admin_setting=Configuração da conta de administrador está inválida: %v invalid_log_root_path=Pasta raíz do log está inválida: %v default_keep_email_private=Ocultar endereços de e-mail por padrão -default_keep_email_private.description=Ocultar endereços de e-mail de novas contas de usuário por padrão para que esta informação não seja vazada imediatamente após o cadastro. +default_keep_email_private.description=Ocultar endereços de e-mail de novas contas de usuário por padrão. default_allow_create_organization=Permitir a criação de organizações -default_allow_create_organization.description=Permitir que novas contas de usuário criem organizações por padrão. Quando esta opção está desabilitada, um administrador precisa dar permissão para a criação de organizações por novos usuários. +default_allow_create_organization.description=Permitir que novas contas de usuários criem organizações por padrão. default_enable_timetracking=Habilitar o cronômetro por padrão -default_enable_timetracking.description=Habilitar o uso da funcionalidade de contagem de tempo para novos repositórios por padrão. +default_enable_timetracking.description=Habilitar o cronômetro para novos repositórios por padrão. no_reply_address=Domínio de e-mail oculto no_reply_address_helper=Nome de domínio para usuários com endereço de e-mail oculto. Por exemplo, o nome de usuário "joe" será registrado no Git como "joe@noreply.example.org" se o domínio de e-mail oculto estiver definido como "noreply.example.org". password_algorithm=Algoritmo de hash de senhas @@ -352,7 +341,7 @@ app_slogan_helper = Insira o slogan de seu servidor aqui. Deixe em branco para d [home] uname_holder=Usuário ou e-mail password_holder=Senha -switch_dashboard_context=Trocar contexto do painel +switch_dashboard_context=Trocar contexto do painel de controle my_repos=Repositórios show_more_repos=Mostrar mais repositórios… collaborative_repos=Repositórios colaborativos @@ -414,14 +403,14 @@ forgot_password_title=Esqueci minha senha forgot_password=Esqueceu sua senha? sign_up_now=Precisa de uma conta? Cadastre-se agora. sign_up_successful=A conta foi criada com sucesso. Bem-vindo! -confirmation_mail_sent_prompt=Um novo email de confirmação foi enviado para %s. Para completar o processo de cadastro, por favor verifique sua caixa de entrada e acesse o link fornecido dentro de %s. Se o e-mail estiver incorreto, você pode entrar na conta e solicitar outro e-mail de confirmação para um endereço diferente. +confirmation_mail_sent_prompt=Um novo e-mail de confirmação foi enviado para %s. Por favor, verifique sua caixa de e-mail nas próximas %s horas para finalizar o processo de cadastro. must_change_password=Redefina sua senha allow_password_change=Exigir que o usuário redefina a senha (recomendado) -reset_password_mail_sent_prompt=Um e-mail de confirmação foi enviado para %s. Para concluir o processo de recuperação de conta, por favor verifique sua caixa de entrada e siga o link dentro do(s) próximo(s) %s. -active_your_account=Ative sua conta +reset_password_mail_sent_prompt=Um e-mail de confirmação foi enviado para %s. Por favor, verifique sua caixa de entrada dentro do(s) próximo(s) %s para concluir o processo de recuperação de conta. +active_your_account=Ativar sua conta account_activated=Conta foi ativada -prohibit_login=Conta está suspensa -prohibit_login_desc=Sua conta foi suspensa de interagir com o servidor. Entre em contato com a administração do servidor para recuperar o acesso. +prohibit_login=É proibido fazer login +prohibit_login_desc=Sua conta está proibida de fazer login, entre em contato com o administrador do site. resent_limit_prompt=Você já solicitou recentemente um e-mail de ativação. Por favor, aguarde 3 minutos e tente novamente. has_unconfirmed_mail=Oi %s, você possui um endereço de e-mail não confirmado (%s). Se você não recebeu um e-mail de confirmação ou precisa reenviar um novo, clique no botão abaixo. resend_mail=Clique aqui para reenviar seu e-mail de ativação @@ -444,7 +433,7 @@ twofa_scratch_token_incorrect=Seu código de backup está incorreto. login_userpass=Acessar tab_openid=OpenID oauth_signup_tab=Cadastrar nova conta -oauth_signup_title=Completar nova conta +oauth_signup_title=Completar Nova Conta oauth_signup_submit=Completar conta oauth_signin_tab=Vincular a uma conta existente oauth_signin_title=Faça login para autorizar a conta vinculada @@ -464,7 +453,7 @@ email_domain_blacklisted=Você não pode se cadastrar com seu endereço de e-mai authorize_application=Autorizar aplicativo authorize_redirect_notice=Você será redirecionado para %s se você autorizar este aplicativo. authorize_application_created_by=Este aplicativo foi criado por %s. -authorize_application_description=Se você conceder o acesso, isso permitirá acessar e alterar todas as informações da sua conta, incluindo repositórios privados e organizações. +authorize_application_description=Se você conceder o acesso, ele será capaz de acessar e escrever em todas as informações da sua conta, incluindo repositórios privados e organizações. authorize_title=Autorizar "%s" para acessar sua conta? authorization_failed=Autorização falhou authorization_failed_desc=A autorização falhou porque detectamos uma solicitação inválida. Entre em contato com o responsável do aplicativo que você tentou autorizar. @@ -482,9 +471,6 @@ hint_register = Precisa de uma conta? Registre-se agora. sign_up_button = Registre-se agora. hint_login = Já possui uma conta? Faça login agora! sign_in_openid = Continuar com OpenID -back_to_sign_in = Voltar a Iniciar Sessão -unauthorized_credentials = As credenciais estão incorretas ou expiraram. Tente novamente o comando ou consulte %s para obter mais informações -use_onetime_code = Usar um código de uso único [mail] view_it_on=Veja em %s @@ -501,10 +487,10 @@ activate_email=Verifique seu endereço de e-mail activate_email.title=%s, por favor verifique o seu endereço de e-mail activate_email.text=Por favor clique no link a seguir para verificar o seu endereço de e-mail em %s: -register_notify=Boas vindas a %s +register_notify=Bem-vindo ao %s register_notify.title=%[1]s, bem-vindo(a) a %[2]s register_notify.text_1=este é o seu e-mail de confirmação de registro para %s! -register_notify.text_2=Você pode iniciar a sessão com o usuário: %s +register_notify.text_2=Você pode fazer login em sua conta utilizando o usuário: %s register_notify.text_3=Se outra pessoa criou esta conta para você, é preciso definir a sua senha primeiro. reset_password=Recuperar sua conta @@ -563,12 +549,6 @@ totp_disabled.subject = A autenticação em dois fatores foi desabilitada removed_security_key.subject = Uma chave de segurança foi removida removed_security_key.text_1 = A chave de segurança "%[1]s" foi removida de sua conta. account_security_caution.text_1 = Caso tenha sido você, este e-mail pode ser ignorado. -totp_enrolled.subject = Você ativou TOTP como método 2FA -totp_disabled.text_1 = A senha de uso único baseada em tempo (TOTP) na sua conta foi desativada. -totp_disabled.no_2fa = Já não existem mais outros métodos de autenticação em dois fatores (2FA) configurados, ou seja, não é mais necessário acessar sua conta com 2FA. -removed_security_key.no_2fa = Já não existem mais outros métodos de autenticação em dois fatores (2FA) configurados, ou seja, não é mais necessário acessar sua conta com 2FA. -totp_enrolled.text_1.no_webauthn = Você acabou de habilitar a TOTP para sua conta. Isso significa que para todos os acessos futuros à sua conta você deverá usar a TOTP como método de 2FA. -totp_enrolled.text_1.has_webauthn = Você acabou de habilitar a TOTP para sua conta. Isso significa que para todos os futuros acessos à sua conta você pode usar a TOTP como método de 2FA ou usar qualquer uma de suas chaves de segurança. [modal] yes=Sim @@ -709,22 +689,17 @@ form.name_chars_not_allowed=O usuário "%s" contém caracteres inválidos. block_user = Bloquear usuário unblock = Desbloquear block = Bloquear -block_user.detail_2 = Este usuário não poderá interagir com repositórios, issues ou comentários criados por você. +block_user.detail_2 = Este usuário não poderá interagir com seus repositórios, questões criadas e comentários. follow_blocked_user = Você não pode seguir este usuário porque você o bloqueou ou foi bloqueado por ele. -block_user.detail_3 = Vocês não poderão adicionar um ao outro como colaboradores de um repositório. -block_user.detail = Note que bloquear um usuário tem outros efeitos, tais como: +block_user.detail_3 = Este(a) usuário(a) não poderá adicioná-lo(a) como colaborador(a), nem você poderá adicioná-lo(a) como colaborador(a). +block_user.detail = Por favor, entenda que se você bloquear este usuário, outras ações serão tomadas. Tais como: followers_one = %d seguidor -following_one = seguindo %d -block_user.detail_1 = Vocês deixarão de seguir um ao outro e não poderão mais seguir um ao outro. +following_one = %d seguindo +block_user.detail_1 = Você deixará de seguir este usuário. following.title.few = seguindo following.title.one = seguindo followers.title.one = seguidor followers.title.few = seguidores -public_activity.visibility_hint.self_private = Sua atividade está visível apenas para você e para os administradores da instância. Configurar. -public_activity.visibility_hint.self_public = Sua atividade está visível para todos, exceto o engajamento em espaços privados. Configurar. -public_activity.visibility_hint.admin_public = Sua atividade está visível para todos, mas como um administrador você também pode ver o engajamento em espaços privados. -public_activity.visibility_hint.admin_private = Essa atividade está visível para você porque você é um administrador, mas o usuário dejesa que ela seja mantida em privado. -public_activity.visibility_hint.self_private_profile = Sua atividade só é visível para você e para os administradores do servidor porque seu perfil é privado. Configurar. [settings] profile=Perfil @@ -746,9 +721,9 @@ uid=UID webauthn=Chaves de segurança public_profile=Perfil público -biography_placeholder=Conte um pouco sobre você! (Markdown é suportado) +biography_placeholder=Conte-nos um pouco sobre você! (Você pode usar Markdown) location_placeholder=Compartilhe sua localização aproximada com outras pessoas -profile_desc=Sobre você +profile_desc=Controle como o seu perfil é exibido para outros usuários. Seu endereço de e-mail principal será usado para notificações, recuperação de senha e operações do Git baseadas na Web. password_username_disabled=Usuários não-locais não podem alterar seus nomes de usuário. Por favor contate o administrador do site para mais informações. full_name=Nome completo website=Site @@ -813,7 +788,7 @@ manage_emails=Gerenciar endereços de e-mail manage_themes=Tema padrão manage_openid=Endereços OpenID email_desc=Seu endereço de e-mail principal será usado para notificações, recuperação de senha e, desde que não esteja oculto, para operações do Git baseadas na Web. -theme_desc=Este tema será usado para a interface web quando você fizer login. +theme_desc=Este será o seu tema padrão em todo o site. primary=Principal activated=Ativado requires_activation=Requer ativação @@ -834,12 +809,12 @@ add_new_email=Adicionar novo endereço de e-mail add_new_openid=Adicionar novo URI OpenID add_email=Adicionar novo endereço de e-mail add_openid=Adicionar URI OpenID -add_email_confirmation_sent=Um e-mail de confirmação foi enviado para "%s". Para confirmar seu endereço de e-mail, verifique sua caixa de entrada e acesse o link fornecido nela em até %s. +add_email_confirmation_sent=Um e-mail de confirmação foi enviado para "%s". Verifique sua caixa de entrada nos próximos %s para confirmar seu endereço de e-mail. add_email_success=O novo endereço de e-mail foi adicionado. email_preference_set_success=Preferência de e-mail definida com sucesso. add_openid_success=O novo endereço de OpenID foi adicionado. keep_email_private=Ocultar endereço de e-mail -keep_email_private_popup=Seu endereço de email não será exibido no seu perfil e não será o padrão para commits feitos pela interface web, como envios de arquivos, modificações e commits de merge. Em vez disso, um endereço especial %s pode ser usado para associar commits com a sua conta. Esta opção não irá afetar commits já existentes. +keep_email_private_popup=Isso ocultará seu endereço de e-mail do seu perfil, bem como quando você fizer um pull request ou editar um arquivo usando a interface Web. Os commits enviados não serão modificados. openid_desc=OpenID permite delegar autenticação para um provedor externo. manage_ssh_keys=Gerenciar chaves SSH @@ -980,9 +955,9 @@ twofa_desc=Autenticação de dois fatores melhora a segurança de sua conta. twofa_is_enrolled=Sua conta está atualmente habilitada com autenticação de dois fatores. twofa_not_enrolled=Sua conta não está atualmente inscrita para a autenticação em duas etapas. twofa_disable=Desabilitar autenticação de dois fatores -twofa_scratch_token_regenerate=Gerar novamente o token de recuperação de uso único +twofa_scratch_token_regenerate=Gerar novamente o token de backup twofa_scratch_token_regenerated=Seu token agora é %s. Guarde-a em um local seguro, pois ela nunca mais será exibido. -twofa_enroll=Habilitar a autenticação de dois fatores +twofa_enroll=Inscrever para a autenticação de dois fatores twofa_disable_note=Você pode desabilitar a autenticação de dois fatores se necessário. twofa_disable_desc=Desabilitar a autenticação de dois fatores tornará sua conta menos segura. Tem certeza que deseja continuar? regenerate_scratch_token_desc=Se você perdeu o seu token de backup, ou teve que usá-lo para realizar um acesso, você pode redefini-lo. @@ -1023,7 +998,7 @@ delete_account_desc=Tem certeza que deseja apagar sua conta de usuário permanen email_notifications.enable=Habilitar notificações por e-mail email_notifications.onmention=Somente quando for mencionado(a) email_notifications.disable=Desabilitar notificações por e-mail -email_notifications.submit=Definir preferência de email +email_notifications.submit=Atualizar preferências de e-mail email_notifications.andyourown=e suas próprias notificações visibility=Visibilidade do usuário @@ -1040,7 +1015,7 @@ user_block_success = O usuário foi bloqueado. twofa_recovery_tip = Caso perca o seu dispositivo, você poderá usar uma chave de uso único para recuperar o acesso à sua conta. webauthn_key_loss_warning = Caso perca as suas chaves de segurança, você perderá o acesso à sua conta. blocked_users_none = Nenhum usuário bloqueado. -access_token_desc = As permissões selecionadas para o token limitam o acesso apenas às rotas da API correspondentes. Veja a documentação para mais informações. +access_token_desc = As permissões selecionadas para o token limitam o acesso apenas às rotas da API correspondentes. Veja a documentação para mais informações. webauthn_alternative_tip = Você talvez queira configurar um método adicional de autenticação. change_password = Alterar senha hints = Dicas @@ -1049,14 +1024,11 @@ pronouns_custom = Personalizado pronouns_unspecified = Não especificado language.title = Idioma padrão additional_repo_units_hint = Sugira habilitar unidades de repositório adicionais -additional_repo_units_hint_description = Exibir uma sugestão para "Habilitar mais" em repositórios que não possuem todas as unidades disponíveis habilitadas. +additional_repo_units_hint_description = Exiba um botão "Adicionar mais unidades..." para repositórios que não possuem todas as unidades disponíveis habilitadas. update_hints = Dicas de atualização update_hints_success = As dicas foram atualizadas. keep_activity_private.description = A sua atividade pública estará visível apenas para si e para os administradores do servidor. language.localization_project = Ajude-nos a traduzir Forgejo para o seu idioma! Mais informações. -language.description = Essa língua será salva em sua conta e será usada como padrão após você iniciar a sessão. -user_block_yourself = Você não pode se bloquear. -pronouns_custom_label = Pronomes personalizados [repo] owner=Proprietário @@ -1065,16 +1037,16 @@ repo_name=Nome do repositório repo_name_helper=Um bom nome de repositório é composto por palavras curtas, memorizáveis e únicas. repo_size=Tamanho do repositório template=Modelo -template_select=Selecione um modelo +template_select=Selecione um modelo. template_helper=Tornar repositório um modelo template_description=Os repositórios de modelo permitem que os usuários gerem novos repositórios com a mesma estrutura de diretório, arquivos e configurações opcionais. visibility=Visibilidade visibility_description=Somente o proprietário ou os membros da organização, se tiverem direitos, poderão vê-lo. visibility_helper=Tornar o repositório privado visibility_helper_forced=O administrador do site força novos repositórios a serem privados. -visibility_fork_helper=(Esta alteração irá afetar a visibilidade de todos os forks.) +visibility_fork_helper=(Esta alteração irá afetar todos os forks.) clone_helper=Precisa de ajuda com o clone? Visite a Ajuda. -fork_repo=Fazer fork do repositório +fork_repo=Fork do repositório fork_from=Fork de already_forked=Você já fez o fork de %s fork_to_different_account=Faça um fork para uma conta diferente @@ -1090,17 +1062,17 @@ generate_from=Gerar a partir de repo_desc=Descrição repo_desc_helper=Digite uma breve descrição (opcional) repo_lang=Linguagem -repo_gitignore_helper=Selecionar modelos de .gitignore +repo_gitignore_helper=Selecione modelos do .gitignore. repo_gitignore_helper_desc=Escolha os arquivos que não serão rastreados da lista de modelos para linguagens comuns. Artefatos típicos gerados pelos compiladores de cada linguagem estão incluídos no .gitignore por padrão. -issue_labels=Etiquetas -issue_labels_helper=Selecione um conjunto de etiquetas +issue_labels=Etiquetas de issue +issue_labels_helper=Selecione um conjunto de etiquetas de issue. license=Licença -license_helper=Selecione um arquivo de licença -license_helper_desc=Uma licença define o que os outros podem e não podem fazer com o seu código. Não tem certeza qual é a mais adequada para o seu projeto? Veja Escolher uma licença. +license_helper=Selecione um arquivo de licença. +license_helper_desc=Uma licença define o que os outros podem e não podem fazer com o seu código. Não tem certeza qual é a mais adequada para o seu projeto? Veja Escolher uma licença. readme=LEIA-ME -readme_helper=Selecione um modelo de arquivo README +readme_helper=Selecione um modelo de arquivo LEIA-ME. readme_helper_desc=Aqui você pode escrever uma descrição completa para o seu projeto. -auto_init=Inicializar repositório +auto_init=Inicializar o repositório (adicionando .gitignore, licença e LEIA-ME) trust_model_helper=Selecione o modelo de confiança para verificação de assinatura. As opções possíveis são: trust_model_helper_collaborator=Colaborador: Confiar em assinaturas de colaboradores trust_model_helper_committer=Committer: Confiar em assinaturas que correspondem aos committers @@ -1112,12 +1084,12 @@ default_branch_label=padrão default_branch_helper=O branch padrão é o branch base para pull requests e commits de código. mirror_prune=Varrer mirror_prune_desc=Remover referências obsoletas de controle remoto -mirror_interval=Intervalo de espelhamento (unidades válidas de tempo são "h", "m", "s"). O valor 0 desabilita a sincronização periódica. (Intervalo mínimo: %s) +mirror_interval=Intervalo de espelhamento (unidades válidas são 'h', 'm', ou 's'). O desabilita a sincronização automática. (Intervalo mínimo: %s) mirror_interval_invalid=O intervalo do espelhamento não é válido. mirror_sync_on_commit=Sincronizar quando commits forem enviados mirror_address=Clonar a partir de URL mirror_address_desc=Coloque todas as credenciais necessárias na seção de autorização. -mirror_address_url_invalid=A URL fornecida é inválida. Você deve escapar todos os componentes da URL corretamente. +mirror_address_url_invalid=O URL fornecido é inválido. Você deve escapar todos os componentes do URL corretamente. mirror_address_protocol_invalid=O URL fornecido é inválido. Somente locais http(s):// ou git:// podem ser usados para espelhamento. mirror_lfs=Armazenamento de Arquivo Grande (LFS) mirror_lfs_desc=Ativar espelhamento de dados LFS. @@ -1173,8 +1145,8 @@ template.invalid=Deve-se selecionar um repositório de modelo archive.title=Este repositório está arquivado. Você pode visualizar arquivos e cloná-lo, mas não pode fazer push, abrir issues ou pull requests. archive.title_date=Este repositório foi arquivado em %s. Você pode visualizar arquivos e cloná-lo, mas não pode fazer push, abrir issues ou pull requests. -archive.issue.nocomment=Este repositório está arquivado. Você não pode comentar em issues. -archive.pull.nocomment=Este repositório está arquivado. Você não pode comentar em pull requests. +archive.issue.nocomment=Este repositório está arquivado. Você não pode comentar nas issues. +archive.pull.nocomment=Este repositório está arquivado. Você não pode comentar nos pull requests. form.reach_limit_of_creation_1=Você já atingiu o seu limite de %d repositório. form.reach_limit_of_creation_n=Você já atingiu o limite de %d repositórios. @@ -1196,7 +1168,7 @@ migrate_items_milestones=Marcos migrate_items_labels=Etiquetas migrate_items_issues=Issues migrate_items_pullrequests=Pull requests -migrate_items_merge_requests=Pedidos de merge +migrate_items_merge_requests=Requisições de merge migrate_items_releases=Versões migrate_repo=Migrar repositório migrate.clone_address=Migrar / Clonar de URL @@ -1228,9 +1200,9 @@ migrate.migrating_git=Migrando dados Git migrate.migrating_topics=Migrando tópicos migrate.migrating_milestones=Migrando marcos migrate.migrating_labels=Migrando rótulos -migrate.migrating_releases=Migrando releases -migrate.migrating_issues=Migrando issues -migrate.migrating_pulls=Migrando pull requests +migrate.migrating_releases=Migrando Versões +migrate.migrating_issues=Migrando Issues +migrate.migrating_pulls=Migrando Pull Requests migrate.cancel_migrating_title=Cancelar migração migrate.cancel_migrating_confirm=Você quer cancelar essa migração? @@ -1303,15 +1275,15 @@ ambiguous_character=`%[1]c [U+%04[1]X] é confundível com o %[2]c [U+%04[2]X]` escape_control_characters=Escapar unescape_control_characters=Desescapar file_copy_permalink=Copiar link permanente -view_git_blame=Ver git blame -video_not_supported_in_browser=Seu navegador não tem suporte para a tag "video" do HTML5. -audio_not_supported_in_browser=Seu navegador não tem suporte para a tag "audio" do HTML5. +view_git_blame=Ver Git Blame +video_not_supported_in_browser=Seu navegador não suporta a tag 'video' do HTML5. +audio_not_supported_in_browser=Seu navegador não suporta a tag 'audio' do HTML5. stored_lfs=Armazenado com Git LFS symbolic_link=Link simbólico executable_file=Arquivo executável commit_graph=Gráfico de commits commit_graph.select=Selecionar branches -commit_graph.hide_pr_refs=Esconder pull requests +commit_graph.hide_pr_refs=Esconder Pull Requests commit_graph.monochrome=Monocromático commit_graph.color=Colorido commit.contained_in=Esse commit está contido em: @@ -1339,23 +1311,22 @@ editor.delete_this_file=Excluir arquivo editor.must_have_write_access=Você deve ter permissão de escrita para fazer ou propor alterações neste arquivo. editor.file_delete_success=O arquivo "%s" foi excluído. editor.name_your_file=Nomeie o seu arquivo… -editor.filename_help=Adicione um diretório digitando o nome seguido por uma barra ("/"). Remova um diretório pressionando apagar no início do campo de entrada. +editor.filename_help=Adicione um diretório digitando seu nome seguido por uma barra ('/'). Remova um diretório digitando o backspace no início do campo de entrada. editor.or=ou editor.cancel_lower=Cancelar -editor.commit_signed_changes=Criar commit das modificações assinadas -editor.commit_changes=Criar commit das modificações -editor.add_tmpl=Adicionar "<%s>" -editor.add_tmpl.filename = nome do arquivo +editor.commit_signed_changes=Commit de alteradores assinadas +editor.commit_changes=Aplicar commit das alterações +editor.add_tmpl=Adicionar "" editor.add=Adicionar %s editor.update=Atualizar %s editor.delete=Excluir %s editor.patch=Aplicar correção editor.patching=Corrigindo: editor.fail_to_apply_patch=`Não foi possível aplicar a correção "%s"` -editor.new_patch=Novo patch +editor.new_patch=Nova correção editor.commit_message_desc=Adicione uma descrição detalhada (opcional)... editor.signoff_desc=Adicione um assinado-por-committer no final do log do commit. -editor.commit_directly_to_this_branch=Commit diretamente no branch %[1]s. +editor.commit_directly_to_this_branch=Commit diretamente no branch %s. editor.create_new_branch=Crie um novo branch para este commit e crie um pull request. editor.create_new_branch_np=Crie um novo branch para este commit. editor.propose_file_change=Propor alteração de arquivo @@ -1371,15 +1342,15 @@ editor.file_is_a_symlink=`"%s" é um link simbólico. Links simbólicos não pod editor.filename_is_a_directory=O nome do arquivo "%s" já é usado como um nome de diretório neste repositório. editor.file_editing_no_longer_exists=O arquivo que está sendo editado, "%s", não existe mais neste repositório. editor.file_deleting_no_longer_exists=O arquivo a ser excluído, "%s", não existe mais neste repositório. -editor.file_changed_while_editing=O conteúdo do arquivo mudou desde que você começou a editar. Clique aqui para ver as diferenças ou clique em Aplicar commit das alterações novamente para sobrescrever as alterações com sua versão atual. +editor.file_changed_while_editing=O conteúdo do arquivo mudou desde que você começou a editar. Clique aqui para ver o que foi editado ou clique em Aplicar commit das alterações novamemente para sobreescrever estas alterações. editor.file_already_exists=Um arquivo com nome "%s" já existe neste repositório. editor.commit_empty_file_header=Fazer commit de um arquivo vazio editor.commit_empty_file_text=O arquivo que você está prestes fazer commit está vazio. Continuar? editor.no_changes_to_show=Nenhuma alteração a mostrar. editor.fail_to_update_file=Falha ao atualizar/criar arquivo "%s". editor.fail_to_update_file_summary=Mensagem de erro: -editor.push_rejected_no_message=A alteração foi rejeitada pelo servidor sem uma mensagem. Por favor, verifique os Git hooks . -editor.push_rejected=A alteração foi rejeitada pelo servidor. Por favor, verifique os Git hooks . +editor.push_rejected_no_message=A alteração foi rejeitada pelo servidor sem uma mensagem. Por favor, verifique os Hooks Git. +editor.push_rejected=A alteração foi rejeitada pelo servidor. Por favor, verifique os Hooks Git. editor.push_rejected_summary=Mensagem completa de rejeição: editor.add_subdir=Adicionar um subdiretório... editor.unable_to_upload_files=Ocorreu um erro ao enviar arquivos para "%s": %v @@ -1424,7 +1395,7 @@ commitstatus.failure=Falha commitstatus.pending=Pendente commitstatus.success=Sucesso -ext_issues=Issues externos +ext_issues=Acesso a Issues Externos ext_issues.desc=Link para o issue tracker externo. projects=Projetos @@ -1445,7 +1416,7 @@ projects.modify=Editar projeto projects.edit_success=Projeto "%s" atualizado. projects.type.none=Nenhum projects.type.basic_kanban=Kanban básico -projects.type.bug_triage=Triagem de bugs +projects.type.bug_triage=Triagem de Bugs projects.template.desc=Modelo de projeto projects.template.desc_helper=Selecione um modelo de projeto para começar projects.type.uncategorized=Sem categoria @@ -1459,7 +1430,7 @@ projects.column.set_default_desc=Definir esta coluna como padrão para pull e is projects.column.unset_default=Desatribuir padrão projects.column.unset_default_desc=Desatribuir esta coluna como padrão projects.column.delete=Excluir coluna -projects.column.deletion_desc=Excluir uma coluna do projeto move todos os issues relacionados para a coluna padrão. Continuar? +projects.column.deletion_desc=Excluir uma coluna do projeto move todas as issues relacionadas para 'Sem categoria'. Continuar? projects.column.color=Cor projects.open=Abrir projects.close=Fechar @@ -1474,7 +1445,7 @@ issues.filter_milestones=Filtrar Marco issues.filter_projects=Filtrar Projeto issues.filter_labels=Filtrar Rótulo issues.filter_reviewers=Filtrar Revisor -issues.new=Novo issue +issues.new=Nova issue issues.new.title_empty=Título não pode ser em branco issues.new.labels=Etiquetas issues.new.no_label=Nenhum rótulo @@ -1492,7 +1463,7 @@ issues.new.open_milestone=Marcos abertos issues.new.closed_milestone=Marcos fechados issues.new.assignees=Responsáveis issues.new.clear_assignees=Limpar responsáveis -issues.new.no_assignees=Sem responsáveis +issues.new.no_assignees=Sem responsável issues.new.no_reviewers=Sem revisor issues.choose.get_started=Primeiros passos issues.choose.open_external_link=Abrir @@ -1506,10 +1477,10 @@ issues.new_label=Novo rótulo issues.new_label_placeholder=Nome da etiqueta issues.new_label_desc_placeholder=Descrição issues.create_label=Criar rótulo -issues.label_templates.title=Carregue um modelo de etiquetas -issues.label_templates.info=Ainda não existem etiquetas. Crie uma etiqueta em "Nova etiqueta" ou use um modelo etiquetas: -issues.label_templates.helper=Selecione uma predefinição de etiqueta -issues.label_templates.use=Use predefinição de etiqueta +issues.label_templates.title=Carregue um conjunto de etiquetas pré-definidas +issues.label_templates.info=Ainda não existem etiquetas. Crie uma etiqueta em 'Nova etiqueta' ou use um conjunto de etiquetas predefinida: +issues.label_templates.helper=Selecione um conjunto de etiquetas +issues.label_templates.use=Use o conjunto de etiquetas issues.label_templates.fail_to_load_file=Falha ao carregar o modelo de etiquetas "%s": %v issues.add_label=adicionou o rótulo %s %s issues.add_labels=adicionou os rótulos %s %s @@ -1613,8 +1584,8 @@ issues.reopened_at=`reabriu esta issue %[2]s` issues.commit_ref_at=`citou esta issue em um commit %[2]s` issues.ref_issue_from=`referenciado esta issue %[4]s %[2]s` issues.ref_pull_from=`referenciado este pull request %[4]s %[2]s` -issues.ref_closing_from=`referenciado esta issue de um pull request %[4]s que a fechará %[2]s` -issues.ref_reopening_from=`referenciado esta issue de um pull request %[4]s que a reabrirá %[2]s` +issues.ref_closing_from=`referenciado um pull request %[4]s que fechará esta issue %[2]s` +issues.ref_reopening_from=`referenciado um pull request %[4]s que reabrirá esta issue %[2]s` issues.ref_closed_from=`fechou esta issue %[4]s %[2]s` issues.ref_reopened_from=`reabriu esta issue %[4]s %[2]s` issues.ref_from=`de %[1]s` @@ -1710,7 +1681,7 @@ issues.error_modifying_due_date=Falha ao modificar a data limite. issues.error_removing_due_date=Falha ao remover a data limite. issues.push_commit_1=adicionou %d commit %s issues.push_commits_n=adicionou %d commits %s -issues.force_push_codes=`forçou o push %[1]s de %[2]s para %[4]s %[6]s` +issues.force_push_codes=`forçou o push %[1]s de %[2]s para %[4]s %[6]s` issues.force_push_compare=Comparar issues.due_date_form=dd/mm/aaaa issues.due_date_form_add=Adicionar data limite @@ -1721,13 +1692,13 @@ issues.due_date_added=adicionou a data limite %s %s issues.due_date_modified=modificou a data limite de %[2]s para %[1]s %[3]s issues.due_date_remove=removeu a data limite %s %s issues.due_date_overdue=Em atraso -issues.due_date_invalid=A data limite é inválida ou está fora do intervalo permitido. Por favor, use o formato "yyyy-mm-dd". +issues.due_date_invalid=A data limite é inválida ou está fora do intervalo. Por favor, use o formato 'dd/mm/aaaa'. issues.dependency.title=Dependências issues.dependency.issue_no_dependencies=Não há dependências definidas. issues.dependency.pr_no_dependencies=Não há dependências definidas. -issues.dependency.no_permission_1=Você não tem permissão para ler a dependência %d -issues.dependency.no_permission_n=Você não tem permissão para ler as dependências %d -issues.dependency.no_permission.can_remove=Você não tem permissão para ler esta dependência, mas pode removê-la +issues.dependency.no_permission_1=Você não tem permissão para ler %d dependência +issues.dependency.no_permission_n=Você não tem permissão para ler %d dependências +issues.dependency.no_permission.can_remove=Você não tem permissão para ler esta dependência, mas pode remover esta dependência issues.dependency.add=Adicionar dependência… issues.dependency.cancel=Cancelar issues.dependency.remove=Remover @@ -1739,7 +1710,7 @@ issues.dependency.issue_closing_blockedby=Fechamento desta issue está bloqueado issues.dependency.issue_close_blocks=Esta issue bloqueia o fechamento das seguintes issues issues.dependency.pr_close_blocks=Este pull request bloqueia o fechamento das seguintes issues issues.dependency.issue_close_blocked=Você precisa fechar todas as issues que bloqueiam esta issue antes de poder fechá-la. -issues.dependency.issue_batch_close_blocked=Não é possível fechar as issues que você escolheu porque a issue #%d ainda tem dependências abertas +issues.dependency.issue_batch_close_blocked=Não é possível fechar as issues que você escolheu, porque a issue #%d ainda tem dependências abertas issues.dependency.pr_close_blocked=Você precisa fechar todas issues que bloqueiam este pull request antes de poder fazer o merge. issues.dependency.blocks_short=Bloqueia issues.dependency.blocked_by_short=Depende de @@ -1763,8 +1734,8 @@ issues.review.left_comment=deixou um comentário issues.review.content.empty=Você precisa deixar um comentário indicando as alterações solicitadas. issues.review.reject=solicitou alterações %s issues.review.wait=foi solicitado(a) para revisar %s -issues.review.add_review_request=solicitou revisão de %[1]s %[2]s -issues.review.remove_review_request=removeu a solicitação de revisão para %[1]s %[2]s +issues.review.add_review_request=solicitou uma revisão de %s %s +issues.review.remove_review_request=removeu a solicitação de revisão para %s %s issues.review.remove_review_request_self=recusou-se a revisar %s issues.review.pending=Pendente issues.review.pending.tooltip=Este comentário não está atualmente visível para outros usuários. Para enviar seus comentários pendentes, selecione "%s" -> "%s/%s/%s" no topo da página. @@ -1796,7 +1767,7 @@ compare.compare_head=comparar pulls.desc=Habilitar pull requests e revisões de código. pulls.new=Novo pull request -pulls.view=Ver pull request +pulls.view=Ver Pull Request pulls.compare_changes=Novo pull request pulls.allow_edits_from_maintainers=Permitir edições de mantenedores pulls.allow_edits_from_maintainers_desc=Usuários com acesso de gravação para o branch base também podem fazer push para este branch @@ -1824,7 +1795,7 @@ pulls.nothing_to_compare=Estes branches são iguais. Não há nenhuma necessidad pulls.nothing_to_compare_and_allow_empty_pr=Estes branches são iguais. Este PR ficará vazio. pulls.has_pull_request=`Um pull request entre esses branches já existe: %[2]s#%[3]d` pulls.create=Criar pull request -pulls.title_desc_few=quer mesclar %[1]d commits de %[2]s em %[3]s +pulls.title_desc_few=quer mesclar %[1]d commits de %[2]s em %[3]s pulls.merged_title_desc_few=mesclou %[1]d commits de %[2]s em %[3]s %[4]s pulls.change_target_branch_at=`mudou o branch de destino de %s para %s %s` pulls.tab_conversation=Conversação @@ -1845,15 +1816,15 @@ pulls.add_prefix=Adicione o prefixo %s pulls.remove_prefix=Remover o prefixo %s pulls.data_broken=Este pull request está quebrado devido a falta de informação do fork. pulls.files_conflicted=Este pull request tem alterações conflitantes com o branch de destino. -pulls.is_checking=Verificação de conflitos de merge está em andamento. Tente novamente em alguns momentos. +pulls.is_checking=Verificação de conflitos do merge está em andamento. Tente novamente em alguns momentos. pulls.is_ancestor=Este branch já está incluído no branch de destino. Não há nada para mesclar. -pulls.is_empty=As alterações neste branch já estão no branch de destino. Este será um commit vazio. +pulls.is_empty=As alterações neste branch já estão na branch de destino. Este será um commit vazio. pulls.required_status_check_failed=Algumas verificações necessárias não foram bem sucedidas. pulls.required_status_check_missing=Estão faltando algumas verificações necessárias. pulls.required_status_check_administrator=Como administrador, você ainda pode aplicar o merge deste pull request. pulls.blocked_by_approvals=Este pull request ainda não tem aprovações suficientes. %d de %d aprovações concedidas. pulls.blocked_by_rejection=Este pull request tem alterações solicitadas por um revisor oficial. -pulls.blocked_by_official_review_requests=Este pull request está bloqueado porque falta aprovação de um ou mais revisores oficiais. +pulls.blocked_by_official_review_requests=Este pull request tem solicitações de revisão oficiais. pulls.blocked_by_outdated_branch=Este pull request está bloqueado porque está desatualizado. pulls.blocked_by_changed_protected_files_1=Este pull request está bloqueado porque altera um arquivo protegido: pulls.blocked_by_changed_protected_files_n=Este pull request está bloqueado porque altera arquivos protegidos: @@ -1887,13 +1858,13 @@ pulls.invalid_merge_option=Você não pode usar esta opção de merge neste pull pulls.merge_conflict=O merge falhou: Houve um conflito ao fazer merge. Dica: Tente uma estratégia diferente pulls.merge_conflict_summary=Mensagem de erro pulls.rebase_conflict=O merge falhou: Houve um conflito durante o rebase do commit %[1]s. Dica: Tente uma estratégia diferente -pulls.rebase_conflict_summary=Mensagem de erro -pulls.unrelated_histories=Merge falhou: A head do merge e da base não compartilham um histórico comum. Dica: Tente uma estratégia diferente -pulls.merge_out_of_date=Merge falhou: Durante a geração do merge, a base foi atualizada. Dica: Tente novamente. +pulls.rebase_conflict_summary=Mensagem de Erro +pulls.unrelated_histories=Merge falhou: O merge do principal e da base não compartilham uma história comum. Dica: Tente uma estratégia diferente +pulls.merge_out_of_date=Merge falhou: durante a geração do merge, a base não foi atualizada. Dica: Tente novamente. pulls.head_out_of_date=O merge falhou: Enquanto gerava o merge, a head foi atualizada. Dica: Tente novamente. -pulls.push_rejected=O merge falhou: O push foi rejeitado. Revise os hooks do Git para este repositório. +pulls.push_rejected=O merge falhou: O push foi rejeitado. Revise os Git Hooks para este repositório. pulls.push_rejected_summary=Mensagem completa da rejeição -pulls.push_rejected_no_message=O push falhou: O push foi rejeitado mas não houve mensagem remota. Revise os hooks do Git para este repositório +pulls.push_rejected_no_message=O merge falhou: O push foi rejeitado mas não houve mensagem remota.
Revise os Git Hooks para este repositório pulls.open_unmerged_pull_exists=`Não é possível executar uma operação de reabertura pois há um pull request pendente (#%d) com propriedades idênticas.` pulls.status_checking=Algumas verificações estão pendentes pulls.status_checks_success=Todas as verificações foram bem sucedidas @@ -1945,7 +1916,7 @@ milestones.title=Título milestones.desc=Descrição milestones.due_date=Data limite (opcional) milestones.clear=Limpar -milestones.invalid_due_date_format=Formato da data limite deve ser "aaaa-mm-dd". +milestones.invalid_due_date_format=Formato da data limite deve ser 'dd/mm/aaaa'. milestones.create_success=O marco "%s" foi criado. milestones.edit=Editar marco milestones.edit_subheader=Marcos organizam as issues e acompanham o progresso. @@ -1964,7 +1935,7 @@ milestones.filter_sort.least_issues=Com menos issues signing.will_sign=Esse commit será assinado com a chave "%s". signing.wont_sign.error=Ocorreu um erro ao verificar se o commit poderia ser assinado. -signing.wont_sign.nokey=Esta instância não tem uma chave para assinar esse commit. +signing.wont_sign.nokey=Não há nenhuma chave disponível para assinar esse commit. signing.wont_sign.never=Commits nunca são assinados. signing.wont_sign.always=Commits são sempre assinados. signing.wont_sign.pubkey=O commit não será assinado porque você não tem uma chave pública associada à sua conta. @@ -1975,7 +1946,7 @@ signing.wont_sign.commitssigned=O merge não será assinado, pois todos os commi signing.wont_sign.approved=O merge não será assinado porque o PR não foi aprovado. signing.wont_sign.not_signed_in=Você não está conectado. -ext_wiki=Wiki Externa +ext_wiki=Acesso a Wiki Externo ext_wiki.desc=Link para uma wiki externa. wiki=Wiki @@ -1994,7 +1965,7 @@ wiki.last_commit_info=%s editou esta página %s wiki.edit_page_button=Editar wiki.new_page_button=Nova página wiki.file_revision=Revisão de página -wiki.wiki_page_revisions=Revisões da página +wiki.wiki_page_revisions=Revisões de página Wiki wiki.back_to_wiki=Voltar para página Wiki wiki.delete_page_button=Excluir página wiki.delete_page_notice_1=A exclusão da página de wiki "%s" não pode ser desfeita. Continuar? @@ -2002,7 +1973,7 @@ wiki.page_already_exists=Uma página de wiki com o mesmo nome já existe. wiki.reserved_page=O nome da página da wiki "%s" está reservado. wiki.pages=Páginas wiki.last_updated=Última atualização %s -wiki.page_name_desc=Digite um nome para esta página Wiki. Alguns nomes especiais são: "Home", "_Sidebar" e "_Footer". +wiki.page_name_desc=Digite um nome para esta página Wiki. Alguns nomes especiais são: 'Home', '_Sidebar' e '_Footer'. wiki.original_git_entry_tooltip=Ver o arquivo Git original em vez de usar o link amigável. activity=Atividade @@ -2015,26 +1986,26 @@ activity.period.quarterly=3 meses activity.period.semiyearly=6 meses activity.period.yearly=1 ano activity.overview=Visão geral -activity.active_prs_count_1=%d pull request ativo -activity.active_prs_count_n=%d pull requests ativos -activity.merged_prs_count_1=Pull request com merge concluído -activity.merged_prs_count_n=Pull requests com merge concluído +activity.active_prs_count_1=%d Pull request ativo +activity.active_prs_count_n=%d Pull requests ativos +activity.merged_prs_count_1=Pull request com merge aplicado +activity.merged_prs_count_n=Pull requests com merge aplicado activity.opened_prs_count_1=Pull request proposto activity.opened_prs_count_n=Pull requests propostos activity.title.user_1=%d usuário activity.title.user_n=%d usuários -activity.title.prs_1=%d pull request -activity.title.prs_n=%d pull requests +activity.title.prs_1=%d Pull request +activity.title.prs_n=%d Pull requests activity.title.prs_merged_by=%s com merge aplicado por %s activity.title.prs_opened_by=%s proposto(s) por %s activity.merged_prs_label=Merge aplicado activity.opened_prs_label=Proposto -activity.active_issues_count_1=%d issue ativa -activity.active_issues_count_n=%d issues ativas +activity.active_issues_count_1=%d Issue ativa +activity.active_issues_count_n=%d Issues ativas activity.closed_issues_count_1=Issue fechada activity.closed_issues_count_n=Issues fechadas -activity.title.issues_1=%d issue -activity.title.issues_n=%d issues +activity.title.issues_1=+%d Issue +activity.title.issues_n=+%d Issues activity.title.issues_closed_from=%s fechada por %s activity.title.issues_created_by=%s criada por %s activity.closed_issue_label=Fechado @@ -2045,10 +2016,10 @@ activity.title.unresolved_conv_1=%d conversa não resolvida activity.title.unresolved_conv_n=%d conversas não resolvidas activity.unresolved_conv_desc=Estas issues foram recentemente alteradas e pull requests ainda não foram resolvidos. activity.unresolved_conv_label=Aberta -activity.title.releases_1=%d release -activity.title.releases_n=%d releases +activity.title.releases_1=%d Versão +activity.title.releases_n=%d Versões activity.title.releases_published_by=%s publicada(s) por %s -activity.published_release_label=Release +activity.published_release_label=Publicado activity.no_git_activity=Não houve nenhuma atividade de commit neste período. activity.git_stats_exclude_merges=Excluindo merges, activity.git_stats_author_1=%d autor @@ -2071,7 +2042,8 @@ activity.git_stats_and_deletions=e activity.git_stats_deletion_1=%d exclusão activity.git_stats_deletion_n=%d exclusões -contributors.contribution_type.commits = Commits +contributors.contribution_type.commits=Commits + search=Pesquisar search.search_repo=Pesquisar no repositório... search.type.tooltip=Tipo de pesquisa @@ -2106,22 +2078,22 @@ settings.mirror_settings.direction.pull=Pull settings.mirror_settings.direction.push=Push settings.mirror_settings.last_update=Última atualização settings.mirror_settings.push_mirror.none=Nenhum espelhamento de push configurado -settings.mirror_settings.push_mirror.remote_url=URL do repositório Git remoto -settings.mirror_settings.push_mirror.add=Adicionar espelho de push +settings.mirror_settings.push_mirror.remote_url=URL do repositório do Git remoto +settings.mirror_settings.push_mirror.add=Adicionar Espelho de Push settings.mirror_settings.push_mirror.edit_sync_time=Editar intervalo de sincronização de espelhos settings.sync_mirror=Sincronizar agora settings.site=Site -settings.update_settings=Salvar configurações -settings.update_mirror_settings=Atualizar configurações do espelho -settings.branches.switch_default_branch=Alterar branch padrão -settings.branches.update_default_branch=Atualizar branch padrão -settings.branches.add_new_rule=Adicionar nova regra +settings.update_settings=Atualizar configurações +settings.update_mirror_settings=Atualizar espelho +settings.branches.switch_default_branch=Alterar +settings.branches.update_default_branch=Atualizar Branch Padrão +settings.branches.add_new_rule=Adicionar Nova Regra settings.advanced_settings=Configurações avançadas settings.wiki_desc=Habilitar a wiki do repositório settings.use_internal_wiki=Usar a wiki nativa settings.use_external_wiki=Usar wiki externa -settings.external_wiki_url=URL da wiki externa +settings.external_wiki_url=URL externa da wiki settings.external_wiki_url_error=A URL da wiki externa não é válida. settings.external_wiki_url_desc=Visitantes são redirecionados para a URL da wiki externa ao clicar na aba da wiki. settings.issues_desc=Habilitar issue tracker para o repositório @@ -2139,35 +2111,35 @@ settings.tracker_issue_style.regexp=Expressão Regular settings.tracker_issue_style.regexp_pattern=Padrão de expressão regular settings.tracker_issue_style.regexp_pattern_desc=O primeiro grupo capturado será usado no lugar de {index}. settings.tracker_url_format_desc=Use os espaços reservados {user}, {repo} e {index} para o nome de usuário, nome do repositório e o índice de problemas. -settings.enable_timetracker=Habilitar estatísticas de tempo -settings.allow_only_contributors_to_track_time=Permitir que apenas os colaboradores usem estatísticas de tempo +settings.enable_timetracker=Habilitar Cronômetro +settings.allow_only_contributors_to_track_time=Permitir que apenas os colaboradores acompanhem o contador de tempo settings.pulls_desc=Habilitar pull requests no repositório settings.pulls.ignore_whitespace=Ignorar espaço em branco em conflitos settings.pulls.enable_autodetect_manual_merge=Habilitar a detecção automática de merge manual (Nota: Em alguns casos especiais, podem ocorrer julgamentos errados) settings.pulls.allow_rebase_update=Ativar atualização do branch do pull request por rebase settings.pulls.default_delete_branch_after_merge=Excluir o branch de pull request após o merge por padrão settings.pulls.default_allow_edits_from_maintainers=Permitir edições de mantenedores por padrão -settings.releases_desc=Habilitar releases no repositório -settings.packages_desc=Habilitar registro de pacotes do repositório -settings.projects_desc=Habilitar projetos do repositório -settings.actions_desc=Habilitar pipelines integradas de CI/CD com Forgejo Actions -settings.admin_settings=Configurações de administrador +settings.releases_desc=Habilitar versões do Repositório +settings.packages_desc=Habilitar Registro de Pacotes de Repositório +settings.projects_desc=Habilitar Projetos do Repositório +settings.actions_desc=Habilitar ações do repositório +settings.admin_settings=Configurações do administrador settings.admin_enable_health_check=Habilitar verificações de integridade (git fsck) no repositório settings.admin_code_indexer=Indexador de código -settings.admin_stats_indexer=Indexador de estatísticas de código -settings.admin_indexer_commit_sha=Último commit indexado +settings.admin_stats_indexer=Indexador de Estatísticas do Código +settings.admin_indexer_commit_sha=Último SHA indexado settings.admin_indexer_unindexed=Não indexado settings.reindex_button=Adicionar à fila de reindexação -settings.reindex_requested=Reindexação solicitada +settings.reindex_requested=Reindexação requisitada settings.admin_enable_close_issues_via_commit_in_any_branch=Fechar issue via commit em um branch não padrão settings.danger_zone=Zona de perigo settings.new_owner_has_same_repo=O novo proprietário já tem um repositório com o mesmo nome. Por favor, escolha outro nome. -settings.convert=Converter para repositório comum +settings.convert=Converter para repositório tradicional settings.convert_desc=Você pode converter este espelhamento em um repositório tradicional. Esta ação não pode ser revertida. settings.convert_notices_1=Esta operação vai converter este espelhamento em um repositório tradicional. Esta ação não pode ser desfeita. -settings.convert_confirm=Converter repositório +settings.convert_confirm=Converter o repositório settings.convert_succeed=O espelhamento foi convertido em um repositório tradicional. -settings.convert_fork=Converter para um repositório comum +settings.convert_fork=Converter Para Um Repositório Normal settings.convert_fork_desc=Você pode converter este fork em um repositório normal. Esta ação não pode ser desfeita. settings.convert_fork_notices_1=Esta operação irá converter o fork em um repositório normal e não pode ser desfeita. settings.convert_fork_confirm=Converter repositório @@ -2184,12 +2156,12 @@ settings.transfer_notices_1=- Você perderá o acesso ao repositório se transfe settings.transfer_notices_2=- Você manterá acesso ao repositório se transferi-lo para uma organização que você também é proprietário. settings.transfer_notices_3=- Se o repositório for privado e for transferido para um usuário individual, esta ação certifica que o usuário tem pelo menos permissão de leitura (e altera as permissões se necessário). settings.transfer_owner=Novo proprietário -settings.transfer_perform=Executar transferência +settings.transfer_perform=Executar Transferência settings.transfer_started=`Este repositório foi marcado para transferência e aguarda a confirmação de "%s"` settings.transfer_succeed=O repositório foi transferido. -settings.signing_settings=Configurações de verificação de assinatura -settings.trust_model=Modelo de confiança para assinaturas -settings.trust_model.default=Modelo padrão de confiança +settings.signing_settings=Configurações de Verificação de Assinatura +settings.trust_model=Modelo de Confiança na Assinatura +settings.trust_model.default=Modelo Padrão de Confiança settings.trust_model.default.desc=Use o modelo de confiança de repositório padrão para esta instalação. settings.trust_model.collaborator=Colaborador settings.trust_model.collaborator.long=Colaborador: Confiar em assinaturas feitas por colaboradores @@ -2226,7 +2198,7 @@ settings.org_not_allowed_to_be_collaborator=Organizações não podem ser adicio settings.change_team_access_not_allowed=Alteração do acesso da equipe para o repositório está restrito ao proprietário da organização settings.team_not_in_organization=A equipe não está na mesma organização que o repositório settings.teams=Equipes -settings.add_team=Adicionar equipe +settings.add_team=Adicionar Equipe settings.add_team_duplicate=A equipe já tem o repositório settings.add_team_success=A equipe agora tem acesso ao repositório. settings.search_team=Pesquisar Equipe… @@ -2250,10 +2222,10 @@ settings.webhook.replay.description=Executar novamente esse webhook. settings.webhook.delivery.success=Um evento foi adicionado à fila de envio. Pode levar alguns segundos até que ele apareça no histórico de envio. settings.githooks_desc=Hooks do Git são executados pelo próprio Git. Você pode editar arquivos de hook abaixo para configurar operações personalizadas. settings.githook_edit_desc=Se o hook não estiver ativo, o conteúdo de exemplo será apresentado. Deixar o conteúdo em branco irá desabilitar esse hook. -settings.githook_name=Nome do hook -settings.githook_content=Conteúdo do hook -settings.update_githook=Atualizar hook -settings.add_webhook_desc=Forgejo enviará requisições POST com um Content-Type especificado para a URL de destino. Leia mais no guia de webhooks. +settings.githook_name=Nome do Hook +settings.githook_content=Conteúdo do Hook +settings.update_githook=Atualizar Hook +settings.add_webhook_desc=Forgejo enviará requisições POST com um tipo de conteúdo especificado para a URL de destino. Leia mais no guia de webhooks. settings.payload_url=URL de destino settings.http_method=Método HTTP settings.content_type=Tipo de conteúdo POST @@ -2263,11 +2235,11 @@ settings.slack_icon_url=URL do ícone settings.slack_color=Cor settings.discord_username=Nome de usuário settings.discord_icon_url=URL do ícone -settings.event_desc=Acionar em: +settings.event_desc=Acionado em: settings.event_push_only=Eventos de push settings.event_send_everything=Todos os eventos -settings.event_choose=Eventos personalizados… -settings.event_header_repository=Eventos do repositório +settings.event_choose=Eventos personalizados... +settings.event_header_repository=Eventos do Repositório settings.event_create=Criar settings.event_create_desc=Branch ou tag criado. settings.event_delete=Excluir @@ -2282,37 +2254,37 @@ settings.event_push=Push settings.event_push_desc=Git push para o repositório. settings.event_repository=Repositório settings.event_repository_desc=Repositório criado ou excluído. -settings.event_header_issue=Eventos de issues -settings.event_issues=Modificação +settings.event_header_issue=Eventos da Issue +settings.event_issues=Issues settings.event_issues_desc=Issue aberta, fechada, reaberta ou editada. -settings.event_issue_assign=Atribuição +settings.event_issue_assign=Issue Atribuída settings.event_issue_assign_desc=Issue atribuída ou não atribuída. -settings.event_issue_label=Rótulos -settings.event_issue_label_desc=Rótulos da issue adicionados ou removidos. -settings.event_issue_milestone=Marcos -settings.event_issue_milestone_desc=Marco adicionado, removido ou modificado. -settings.event_issue_comment=Comentários +settings.event_issue_label=Issue Rotulada +settings.event_issue_label_desc=Rótulos da issue atualizados ou removidos. +settings.event_issue_milestone=Marco Atribuído à Issue +settings.event_issue_milestone_desc=Marco atribuído ou desatribuído à Issue. +settings.event_issue_comment=Comentário da issue settings.event_issue_comment_desc=Comentário da issue criado, editado ou excluído. -settings.event_header_pull_request=Eventos de pull request -settings.event_pull_request=Modificação +settings.event_header_pull_request=Eventos de Pull Request +settings.event_pull_request=Pull request settings.event_pull_request_desc=Pull request aberto, fechado, reaberto ou editado. -settings.event_pull_request_assign=Atribuição +settings.event_pull_request_assign=Pull Request Atribuído settings.event_pull_request_assign_desc=Pull request atribuído ou desatribuído. -settings.event_pull_request_label=Rótulos -settings.event_pull_request_label_desc=Rótulos do pull request adicionados ou removidos. -settings.event_pull_request_milestone=Marcos -settings.event_pull_request_milestone_desc=Marco adicionado, removido ou modificado. -settings.event_pull_request_comment=Comentários +settings.event_pull_request_label=Pull Request Rotulado +settings.event_pull_request_label_desc=Rótulos do pull request atualizados ou limpos. +settings.event_pull_request_milestone=Marco Atribuído ao Pull Request +settings.event_pull_request_milestone_desc=Marco atribuído ou desatribuído ao pull request. +settings.event_pull_request_comment=Comentário no Pull Request settings.event_pull_request_comment_desc=Comentário criado, editado ou excluído no pull request. -settings.event_pull_request_review=Revisões -settings.event_pull_request_review_desc=Pull request aprovado, rejeitado ou comentários de revisão adicionados. -settings.event_pull_request_sync=Sincronizado -settings.event_pull_request_sync_desc=Branch atualizado automaticamente com o branch alvo. +settings.event_pull_request_review=Pull Request Revisado +settings.event_pull_request_review_desc=Pull request aprovado, rejeitado ou revisão comentada. +settings.event_pull_request_sync=Pull Request Sincronizado +settings.event_pull_request_sync_desc=Pull request sincronizado. settings.event_package=Pacote settings.event_package_desc=Pacote criado ou excluído em um repositório. settings.branch_filter=Filtro de branch settings.branch_filter_desc=Lista dos branches a serem considerados nos eventos push, criação de branch e exclusão de branch, especificados como padrão glob. Se estiver vazio ou for *, eventos para todos os branches serão relatados. Veja %[2]s documentação da sintaxe. Exemplos: master, {master,release*}. -settings.authorization_header=Cabeçalho de autorização +settings.authorization_header=Header de Autorização settings.authorization_header_desc=Será incluído como header de autorização para solicitações quando estiver presente. Exemplos: %s. settings.active=Ativo settings.active_helper=Informações sobre eventos disparados serão enviadas para esta URL do webhook. @@ -2320,8 +2292,8 @@ settings.add_hook_success=O webhook foi adicionado. settings.update_webhook=Atualizar webhook settings.update_hook_success=O webhook foi atualizado. settings.delete_webhook=Remover webhook -settings.recent_deliveries=Entregas recentes -settings.hook_type=Tipo de hook +settings.recent_deliveries=Entregas Recentes +settings.hook_type=Tipo de Hook settings.slack_token=Token settings.slack_domain=Domínio settings.slack_channel=Canal @@ -2343,8 +2315,8 @@ settings.web_hook_name_packagist=Packagist settings.packagist_username=Nome de usuário no Packagist settings.packagist_api_token=Token de API settings.packagist_package_url=URL do pacote do Packagist -settings.deploy_keys=Chaves de deploy -settings.add_deploy_key=Adicionar chave de deploy +settings.deploy_keys=Chaves de Deploy +settings.add_deploy_key=Nova chave settings.deploy_key_desc=As chaves de deploy possuem somente acesso de leitura (pull) ao repositório. settings.is_writable=Habilitar acesso de escrita settings.is_writable_info=Permitir que esta chave de deploy faça push para o repositório. @@ -2357,13 +2329,13 @@ settings.deploy_key_deletion=Remover chave de deploy settings.deploy_key_deletion_desc=A exclusão de uma chave de deploy irá revogar o seu acesso a este repositório. Continuar? settings.deploy_key_deletion_success=A chave de deploy foi removida. settings.branches=Branches -settings.protected_branch=Proteção de branch -settings.protected_branch.save_rule=Salvar regra -settings.protected_branch.delete_rule=Excluir regra +settings.protected_branch=Proteção de Branch +settings.protected_branch.save_rule=Salvar Regra +settings.protected_branch.delete_rule=Excluir Regra settings.protected_branch_can_push=Permitir push? settings.protected_branch_can_push_yes=Você pode fazer push settings.protected_branch_can_push_no=Você não pode fazer push -settings.branch_protection=Regras de proteção do branch "%s" +settings.branch_protection=Proteção de Branch para '%s' settings.protect_this_branch=Habilitar Proteção de Branch settings.protect_this_branch_desc=Previne a exclusão e restringe o merge e push para o branch. settings.protect_disable_push=Desabilitar push @@ -2371,42 +2343,42 @@ settings.protect_disable_push_desc=Nenhum push será permitido neste branch. settings.protect_enable_push=Habilitar push settings.protect_enable_push_desc=Qualquer pessoa com acesso de escrita terá permissão para realizar push neste branch (mas não forçar o push). settings.protect_enable_merge=Permitir merge -settings.protect_whitelist_committers=Push restrito à lista de permissão +settings.protect_whitelist_committers=Lista permitida para push settings.protect_whitelist_committers_desc=Somente usuários ou equipes da lista permitida serão autorizados realizar push neste branch (mas não forçar o push). settings.protect_whitelist_deploy_keys=Dar permissão às chaves de deploy com acesso de gravação para push. -settings.protect_whitelist_users=Usuários com permissão para realizar push +settings.protect_whitelist_users=Usuários com permissão para realizar push: settings.protect_whitelist_search_users=Pesquisar usuários... -settings.protect_whitelist_teams=Equipes com permissão para realizar push +settings.protect_whitelist_teams=Equipes com permissão para realizar push: settings.protect_whitelist_search_teams=Pesquisar equipes... -settings.protect_merge_whitelist_committers=Habilitar lista de permissão de merge +settings.protect_merge_whitelist_committers=Habilitar controle de permissão de merge settings.protect_merge_whitelist_committers_desc=Permitir que determinados usuários ou equipes possam aplicar merge de pull requests neste branch. -settings.protect_merge_whitelist_users=Usuários com permissão para fazer merge -settings.protect_merge_whitelist_teams=Equipes com permissão para fazer merge +settings.protect_merge_whitelist_users=Usuários com permissão para aplicar merge: +settings.protect_merge_whitelist_teams=Equipes com permissão para aplicar merge: settings.protect_check_status_contexts=Habilitar verificação de status settings.protect_check_status_contexts_desc=Exigir que as verificações de status passem antes de fazer merge. Escolha quais verificações de status devem passar antes que os branches possam ter o merge aplicado em um branch que corresponda a esta regra. Quando habilitado, os commits devem primeiro ser enviados para outro branch, então faça merge ou push diretamente para um branch que corresponde a esta regra após a verificação de status ter passado. Se nenhum contexto for selecionado, o último commit deve ser bem sucedido, independentemente do contexto. settings.protect_check_status_contexts_list=Verificações de status encontradas na última semana para este repositório -settings.protect_required_approvals=Aprovações necessárias +settings.protect_required_approvals=Aprovações necessárias: settings.protect_required_approvals_desc=Permite apenas realizar merge do pull request com avaliações positivas suficientes. settings.protect_approvals_whitelist_enabled=Restringir aprovações a usuários ou equipes da lista permitida settings.protect_approvals_whitelist_enabled_desc=Somente as avaliações de usuários ou equipes da lista permitida serão contadas com as aprovações necessárias. Sem aprovação da lista permitida, as revisões de qualquer pessoa com acesso de escrita contam para as aprovações necessárias. -settings.protect_approvals_whitelist_users=Usuários com permissão de fazer revisões -settings.protect_approvals_whitelist_teams=Equipes com permissão de fazer revisões +settings.protect_approvals_whitelist_users=Usuários com permissão de revisão: +settings.protect_approvals_whitelist_teams=Equipes com permissão de revisão: settings.dismiss_stale_approvals=Descartar aprovações obsoletas settings.dismiss_stale_approvals_desc=Quando novos commits que mudam o conteúdo do pull request são enviados para o branch, as antigas aprovações serão descartadas. -settings.require_signed_commits=Exigir commits assinados +settings.require_signed_commits=Exibir commits assinados settings.require_signed_commits_desc=Rejeitar pushes para este branch se não estiverem assinados ou não forem validáveis. -settings.protect_branch_name_pattern=Padrão de nome de branch protegido +settings.protect_branch_name_pattern=Padrão de Nome de Branch Protegida settings.protect_patterns=Padrões -settings.protect_protected_file_patterns=Padrões de arquivo protegidos (separados usando ponto e vírgula ";") -settings.protect_protected_file_patterns_desc=Arquivos protegidos não podem ser alterados diretamente, mesmo que o usuário tenha direitos para adicionar, editar ou excluir arquivos neste branch. Vários padrões podem ser separados usando ponto e vírgula (';'). Consulte a documentação %s para a sintaxe padrão. Exemplos: .drone.yml, /docs/**/*.txt. -settings.protect_unprotected_file_patterns=Padrões de arquivo desprotegidos (separados usando ponto e vírgula ";") +settings.protect_protected_file_patterns=Padrões de arquivos protegidos (separados usando ponto e vírgula ';'): +settings.protect_protected_file_patterns_desc=Arquivos protegidos não podem ser alterados diretamente, mesmo que o usuário tenha direitos para adicionar, editar ou excluir arquivos neste branch. Vários padrões podem ser separados usando ponto e vírgula (';'). Consulte a documentação github.com/gobwas/glob para a sintaxe padrão. Exemplos: .drone.yml, /docs/**/*.txt. +settings.protect_unprotected_file_patterns=Padrões de arquivos desprotegidos (separados usando ponto e vírgula ';'): settings.protect_unprotected_file_patterns_desc=Arquivos não protegidos que podem ser alterados diretamente se o usuário tiver acesso de gravação, ignorando as restrições de push. Vários padrões podem ser separados usando ponto e vírgula (\;'). Veja %[2]s documentação para sintaxe de padrões. Exemplos: .drone.yml, /docs/**/*.txt. settings.add_protected_branch=Habilitar proteção settings.delete_protected_branch=Desabilitar proteção settings.update_protect_branch_success=Proteção do branch "%s" foi atualizada. settings.remove_protected_branch_success=Proteção do branch "%s" foi desabilitada. settings.remove_protected_branch_failed=Removendo regra de proteção de branch "%s" falhou. -settings.protected_branch_deletion=Remover proteção de branch +settings.protected_branch_deletion=Desabilitar proteção de branch settings.protected_branch_deletion_desc=Desabilitar a proteção de branch permite que os usuários com permissão de escrita realizem push. Continuar? settings.block_rejected_reviews=Bloquear merge em revisões rejeitadas settings.block_rejected_reviews_desc=O merge não será possível quando são solicitadas alterações pelos revisores oficiais, mesmo que haja aprovação suficiente. @@ -2415,35 +2387,35 @@ settings.block_on_official_review_requests_desc=O merge não será possível qua settings.block_outdated_branch=Bloquear o merge se o pull request estiver desatualizado settings.block_outdated_branch_desc=O merge não será possível quando o branch de topo estiver atrás do branch base. settings.default_branch_desc=Selecione um branch padrão para pull requests e commits de código: -settings.merge_style_desc=Estilos de merge -settings.default_merge_style_desc=Estilo de merge padrão +settings.merge_style_desc=Estilos de Merge +settings.default_merge_style_desc=Estilo de merge padrão para pull requests: settings.choose_branch=Escolha um branch... settings.no_protected_branch=Não há branches protegidos. settings.edit_protected_branch=Editar settings.protected_branch_required_rule_name=Nome da regra é obrigatório -settings.protected_branch_duplicate_rule_name=Já existe uma regra para este conjunto de branches +settings.protected_branch_duplicate_rule_name=Regra com nome duplicado settings.protected_branch_required_approvals_min=Aprovações necessárias não podem ser negativas. settings.tags=Tags -settings.tags.protection=Proteção de tags -settings.tags.protection.pattern=Padrão de tag +settings.tags.protection=Proteção das Tags +settings.tags.protection.pattern=Padrão de Tag settings.tags.protection.allowed=Permitido settings.tags.protection.allowed.users=Usuários permitidos settings.tags.protection.allowed.teams=Equipes permitidas settings.tags.protection.allowed.noone=Ninguém -settings.tags.protection.create=Adicionar regra +settings.tags.protection.create=Proteger tag settings.tags.protection.none=Não há tags protegidas. -settings.bot_token=Token do bot +settings.bot_token=Token do Bot settings.chat_id=ID do Chat settings.matrix.homeserver_url=URL do Homeserver settings.matrix.room_id=ID da Sala -settings.matrix.message_type=Tipo de mensagem +settings.matrix.message_type=Tipo de Mensagem settings.archive.button=Arquivar repositório settings.archive.header=Arquivar este repositório settings.archive.success=O repositório foi arquivado com sucesso. settings.archive.error=Um erro ocorreu enquanto estava sendo arquivado o repositório. Veja o log para mais detalhes. settings.archive.error_ismirror=Você não pode arquivar um repositório espelhado. -settings.archive.branchsettings_unavailable=Configurações de branch não estão disponíveis em repositórios arquivados. -settings.archive.tagsettings_unavailable=Configurações de tag não estão disponíveis em repositórios arquivados. +settings.archive.branchsettings_unavailable=Configurações do branch não estão disponíveis quando o repositório está arquivado. +settings.archive.tagsettings_unavailable=As configurações de tag não estão disponíveis se o repositório estiver arquivado. settings.update_avatar_success=O avatar do repositório foi atualizado. settings.lfs=LFS settings.lfs_filelist=Arquivos LFS armazenados neste repositório @@ -2452,7 +2424,7 @@ settings.lfs_findcommits=Encontrar commits settings.lfs_lfs_file_no_commits=Nenhum commit encontrado para este arquivo LFS settings.lfs_noattribute=Este caminho não possui atributo bloqueável no branch padrão settings.lfs_delete=Excluir arquivo LFS com OID %s -settings.lfs_delete_warning=A exclusão de um arquivo LFS pode causar erros do tipo "o objeto não existe" ao fazer checkout. Você tem certeza? +settings.lfs_delete_warning=A exclusão de um arquivo LFS pode causar erros do tipo 'o objeto não existe' no checkout. Você tem certeza? settings.lfs_findpointerfiles=Encontre arquivos de ponteiro settings.lfs_locks=Bloqueios settings.lfs_invalid_locking_path=Caminho inválido: %s @@ -2464,11 +2436,11 @@ settings.lfs_locks_no_locks=Sem bloqueios settings.lfs_lock_file_no_exist=Arquivo bloqueado não existe no branch padrão settings.lfs_force_unlock=Forçar desbloqueio settings.lfs_pointers.found=Encontrado %d ponteiro(s) de blob - %d associado, %d não associado (%d ausente na loja) -settings.lfs_pointers.sha=Hash do blob +settings.lfs_pointers.sha=SHA Blob settings.lfs_pointers.oid=OID settings.lfs_pointers.inRepo=No repositório settings.lfs_pointers.exists=Existe na loja -settings.lfs_pointers.accessible=Acessível ao usuário +settings.lfs_pointers.accessible=Acessível ao Usuário settings.lfs_pointers.associateAccessible=Associar %d OIDs acessíveis settings.rename_branch_failed_exist=Não é possível renomear o branch porque existe o branch %s. settings.rename_branch_failed_not_exist=Não é possível renomear o branch %s porque ele não existe. @@ -2481,11 +2453,11 @@ diff.browse_source=Ver código fonte diff.parent=pai diff.commit=commit diff.git-notes=Notas -diff.data_not_available=O conteúdo do diff não está disponível -diff.options_button=Opções de visualização de diferenças +diff.data_not_available=Conteúdo de diff não disponível +diff.options_button=Opções de diferenças diff.show_diff_stats=Mostrar estatísticas -diff.download_patch=Baixar arquivo patch -diff.download_diff=Baixar arquivo diff +diff.download_patch=Baixar arquivo de patch +diff.download_diff=Baixar arquivo de diferenças diff.show_split_view=Visão dividida diff.show_unified_view=Visão unificada diff.whitespace_button=Espaço em branco @@ -2511,12 +2483,12 @@ diff.load=Carregar Diff diff.generated=gerado diff.vendored=externo diff.comment.placeholder=Deixe um comentário -diff.comment.markdown_info=Estilo com Markdown é suportado. +diff.comment.markdown_info=Estilo com markdown é suportado. diff.comment.add_single_comment=Adicionar um único comentário diff.comment.add_review_comment=Adicionar comentário diff.comment.start_review=Iniciar revisão diff.comment.reply=Responder -diff.review=Finalizar revisão +diff.review=Revisão diff.review.header=Enviar revisão diff.review.placeholder=Comentário da revisão diff.review.comment=Comentar @@ -2537,12 +2509,12 @@ releases.desc=Acompanhe as versões e downloads do projeto. release.releases=Versões release.detail=Detalhes da versão release.tags=Tags -release.new_release=Nova release +release.new_release=Nova versão release.draft=Rascunho -release.prerelease=Pré-release +release.prerelease=Versão prévia release.stable=Estável release.compare=Comparar -release.edit=Editar +release.edit=editar release.ahead.commits=%d commits release.ahead.target=para %s desde esta versão tag.ahead.target=para %s desde esta tag @@ -2557,15 +2529,15 @@ release.tag_helper_existing=Tag existente. release.title=Título da versão release.title_empty=O título não pode estar em branco. release.message=Descreva esta versão -release.prerelease_desc=Marcar como pré-release +release.prerelease_desc=Marcar como pré-lançamento release.prerelease_helper=Marcar esta versão como inadequada para uso em produção. release.cancel=Cancelar -release.publish=Publicar release +release.publish=Publicar versão release.save_draft=Salvar rascunho -release.edit_release=Atualizar release -release.delete_release=Excluir release -release.delete_tag=Excluir tag -release.deletion=Excluir release +release.edit_release=Atualizar versão +release.delete_release=Excluir versão +release.delete_tag=Apagar Tag +release.deletion=Excluir versão release.deletion_success=A versão foi excluída. release.deletion_tag_desc=A tag será excluída do repositório. Conteúdo do repositório e histórico permanecerão inalterados. Continuar? release.deletion_tag_success=A tag foi excluída. @@ -2576,15 +2548,15 @@ release.tag_already_exist=Este nome de tag já existe. release.downloads=Downloads release.download_count=Downloads: %s release.add_tag_msg=Use o título e o conteúdo do lançamento como mensagem da tag. -release.add_tag=Criar tag +release.add_tag=Criar apenas a tag release.releases_for=Versões para %s release.tags_for=Tags para %s -branch.name=Nome do branch +branch.name=Nome do Branch branch.already_exists=Um branch com o nome "%s" já existe. branch.delete_head=Excluir -branch.delete=Excluir branch "%s" -branch.delete_html=Excluir branch +branch.delete=`Excluir branch "%s"` +branch.delete_html=Excluir Branch branch.deletion_success=Branch "%s" excluído. branch.deletion_failed=Falha ao excluir o branch "%s". branch.delete_branch_has_new_commits=O branch "%s" não pode ser excluído porque novos commits foram feitos após o merge. @@ -2597,9 +2569,9 @@ branch.restore_success=Branch "%s" restaurado. branch.restore_failed=Ocorreu um erro ao restaurar o branch "%s". branch.protected_deletion_failed=Branch "%s" é protegido. Ele não pode ser excluído. branch.default_deletion_failed=Branch "%s" é o branch padrão. Ele não pode ser excluído. -branch.restore=Restaurar branch "%s" -branch.download=Baixar branch "%s" -branch.rename=Renomear branch "%s" +branch.restore=`Restaurar branch "%s"` +branch.download=`Baixar branch "%s"` +branch.rename=`Renomear branch "%s"` branch.included_desc=Este branch faz parte do branch padrão branch.included=Incluído branch.create_new_branch=Criar branch a partir do branch: @@ -2623,7 +2595,7 @@ topic.manage_topics=Gerenciar Tópicos topic.done=Feito topic.count_prompt=Você não pode selecionar mais de 25 tópicos -find_file.go_to_file=Encontrar um arquivo +find_file.go_to_file=Ir para arquivo find_file.no_matching=Nenhum arquivo correspondente encontrado error.csv.too_large=Não é possível renderizar este arquivo porque ele é muito grande. @@ -2637,13 +2609,13 @@ issues.role.collaborator = Colaborador(a) issues.label_archived_filter = Mostrar etiquetas arquivadas pulls.status_checks_hide_all = Esconder todas as verificações pulls.status_checks_show_all = Mostrar todas as verificações -pulls.cmd_instruction_hint = Ver instruções de linha de comando +pulls.cmd_instruction_hint = `Ver as instruções da linha de comando.` wiki.cancel = Cancelar settings.unarchive.success = O repositório foi desarquivado. settings.unarchive.button = Desarquivar repositório settings.unarchive.header = Desarquivar este repositório diff.comment.add_line_comment = Adicionar comentário na linha -new_repo_helper = Um repositório contém todos os arquivos de projeto, incluindo o histórico de revisões. Já hospeda um repositório em outra plataforma? Migrar repositório. +new_repo_helper = Um repositório contém todos os arquivos de projeto, incluindo o histórico de revisões. Já hospeda um repositório em outra plataforma? Migrar repositório blame.ignore_revs.failed = Falha ao ignorar as revisões em .git-blame-ignore-revs. migrate.forgejo.description = Migrar dados do codeberg.org ou outras servidores Forgejo. commits.browse_further = Ver mais @@ -2653,7 +2625,7 @@ issues.role.contributor = Contribuidor(a) issues.role.member_helper = Este usuário é membro da organização proprietária deste repositório. issues.role.collaborator_helper = Este(a) usuário(a) foi convidado(a) para colaborar neste repositório. pulls.cmd_instruction_checkout_title = Checkout -settings.wiki_globally_editable = Permitir que qualquer pessoa edite a wiki +settings.wiki_globally_editable = Permitir que qualquer pessoa possa editar a wiki settings.transfer_abort_success = A transferência de repositório para %s foi cancelada. settings.enter_repo_name = Digite os nomes do dono e do repositório exatamente neste formato: issues.blocked_by_user = Você não pode criar uma questão neste repositório porque você foi bloqueado pelo dono do repositório. @@ -2667,7 +2639,7 @@ admin.update_flags = Atualizar sinalizadores admin.flags_replaced = Os sinalizadores do repositório foram substituídos all_branches = Todos os ramos fork_branch = Branch a ser clonada para o fork -object_format_helper = O formato utilizado para armazenar os objetos do repositório. Não pode ser alterado depois. SHA1 é o mais compatível. +object_format_helper = O formato utilizado para armazenar os objetos do repositório, sendo SHA1 o mais compatível. Esta ação é IRREVERSÃVEL. object_format = Formato dos objetos tree_path_not_found_branch = O caminho %[1]s não existe no ramo %[2]s tree_path_not_found_tag = O caminho %[1]s não existe na etiqueta %[2]s @@ -2679,15 +2651,16 @@ issues.role.contributor_helper = Este usuário fez commits para o repositório a issues.choose.invalid_config = A configuração de issue contém erros: pulls.made_using_agit = AGit contributors.contribution_type.filter_label = Tipo de contribuição: +contributors.contribution_type.commits = Commits settings.webhook.test_delivery_desc_disabled = Ative este webhook para testá-lo com um evento simulado. activity.navbar.contributors = Contribuidores issues.label_archive_tooltip = Etiquetas arquivadas não serão exibidas nas sugestões de pesquisa de etiquetas. activity.navbar.pulse = Recente settings.units.overview = Geral -settings.units.add_more = Habilitar mais +settings.units.add_more = Adicionar mais... pulls.commit_ref_at = `referenciou este pedido de mesclagem no commit %[2]s` pulls.cmd_instruction_merge_title = Mesclar -settings.units.units = Unidades +settings.units.units = Funcionalidades vendored = Externo issues.num_participants_one = %d participante issues.archived_label_description = (arquivada) %s @@ -2700,7 +2673,7 @@ settings.confirm_wiki_branch_rename = Renomar o ramo da wiki pulls.merged_title_desc_one = mesclou %[1]d commit de %[2]s em %[3]s %[4]s activity.navbar.recent_commits = Commits recentes size_format = %[1]s: %[2]s; %[3]s: %[4]s -pulls.title_desc_one = quer mesclar %[1]d commit de %[2]s em %[3]s +pulls.title_desc_one = quer mesclar %[1]d commit de %[2]s em %[3]s pulls.cmd_instruction_merge_desc = Mescle as alterações e enviar para o Forgejo. pulls.ready_for_review = Pronto para revisão? commits.search_branch = Este ramo @@ -2728,11 +2701,11 @@ comments.edit.already_changed = Falha ao salvar as alterações ao comentário. activity.navbar.code_frequency = Frequência de código settings.protect_status_check_matched = Correspondente branch.tag_collision = O ramo "%s" não pode ser criado porque já existe uma etiqueta com o mesmo nome no repositório. -settings.archive.mirrors_unavailable = Réplicas não estão disponíveis em repositórios arquivados. +settings.archive.mirrors_unavailable = As réplicas ficarão indisponíveis se o repositório estiver arquivado. release.download_count_one = %s download settings.mirror_settings.docs.no_new_mirrors = O seu repositório está replicando alterações de ou para outro repositório. Observe que não é possível criar novas réplicas no momento. settings.mirror_settings.docs.pull_mirror_instructions = Para configurar uma réplica de outro repositório, consulte: -settings.wiki_rename_branch_main_desc = Renomear o branch usado internamente pela Wiki para "%s". Esta ação é permanente e não pode ser desfeita. +settings.wiki_rename_branch_main_desc = Renomear o ramo usado internamente pela wiki para "%s". Esta ação é IRREVERSÃVEL. settings.enforce_on_admins = Impor esta regra aos administradores de repositórios settings.enforce_on_admins_desc = Administradores de repositório não podem burlar esta regra. subscribe.issue.guest.tooltip = Faça login para receber notificações desta questão @@ -2759,121 +2732,8 @@ activity.published_tag_label = Etiqueta issues.author.tooltip.issue = Este(a) usuário(a) é o(a) autor(a) desta questão. no_eol.text = Sem EOL no_eol.tooltip = Não há um caractere de fim de linha no final do arquivo. -pulls.fast_forward_only_merge_pull_request = Apenas fast-forward -pulls.has_merged = Falha: O pull request foi merged, você não pode merge novamente ou mudar o branch destino. -issues.author.tooltip.pr = Esse usuário é o autor dessa solicitação de pull. -editor.push_out_of_date = O push parece estar desatualizado. -issues.comment.blocked_by_user = Você não pode criar um comentário nesse problema porque você está bloqueado pelo dono do repositório ou pelo autor do problema. -pulls.blocked_by_user = Você não pode criar uma solicitação de pull nesse repositório porque você está bloqueado pelo dono do repositório. -mirror_use_ssh.helper = Forgejo irá espelhar o repositório via Git através de SSH e criar um par de chaves para você ao escolher essa opção. Você deverá garantir que a chave pública gerada está autorizada a fazer push para o repositório de destino. Você não pode usar autorização baseada em senha ao escolher essa opção. -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. -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. -signing.wont_sign.headsigned = O merge não será assinado pois o commit head não está assinado. -settings.mirror_settings.push_mirror.copy_public_key = Copiar chave pública -settings.pull_mirror_sync_in_progress = Fazendo pull das mudanças do remoto %s nesse momento. -pulls.reopen_failed.head_branch = O pull request não pode ser reaberto porque o branch head não existe mais. -pulls.cmd_instruction_checkout_desc = Do repositório do seu projeto, faça checkout de um novo branch e teste as alterações. -settings.mirror_settings.docs.pulling_remote_title = Fazendo pull de um repositório remoto -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. -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. -pulls.reopen_failed.base_branch = O pull request não pode ser reaberto porque o branch base não existe mais. -activity.commit = Atividade de commits -pulls.cmd_instruction_merge_warning = Atenção: A opção "Autodetectar merge manual" não está habilitada para este repositório, você terá que marcar este pull request como um merge manual depois. -settings.federation_following_repos = URLs de Repositórios Seguidores. Separado por ";", sem espaços. -settings.mirror_settings.docs.disabled_push_mirror.info = Espelhos de pull foram desativados pelo administrador do seu site. -settings.mirror_settings.push_mirror.none_ssh = Nenhum -settings.protect_status_check_patterns_desc = Insira padrões para especificar quais verificações de status devem passar com sucesso antes que merges possam ser feitos em branches aos quais esta regra se aplica. Cada linha especifica um padrão. Padrões não podem estar vazios. -settings.archive.text = Arquivar o repositório irá torná-lo totalmente "somente leitura". Ele ficará oculto do painel. Ninguém (nem mesmo você!) poderá fazer novos commits, ou abrir quaisquer issues ou pull requests. -settings.add_key_success = A chave de deploy "%s" foi adicionada. -settings.protect_invalid_status_check_pattern = Padrão de verificação de status inválido: "%s". -settings.web_hook_name_sourcehut_builds = Builds do SourceHut -settings.protect_new_rule = Criar uma nova regra de proteção de branch -settings.wiki_rename_branch_main_notices_2 = Isso irá renomear permanentemente o branch interno da wiki do repositório %s. Checkouts existentes precisarão ser atualizados. -settings.protect_enable_merge_desc = Qualquer pessoa com permissão de escrita terá autorização para fazer merge dos pull requests neste ramo. -settings.protect_no_valid_status_check_patterns = Não há padrões de verificação de status válidos. -settings.event_pull_request_approvals = Aprovações de pull request -settings.event_pull_request_enforcement = Aplicação -settings.ignore_stale_approvals = Ignorar aprovações inativas -settings.update_settings_no_unit = O repositório deve permitir pelo menos algum tipo de interação. -settings.protect_branch_name_pattern_desc = Padrões de nome de branch protegidos. Ver sintaxe de padrões na documentação. Exemplos: main, release/** -settings.webhook.replay.description_disabled = Para executar novamente este webhook, ative-o. -settings.sourcehut_builds.manifest_path = Caminho do manifest de build -settings.sourcehut_builds.secrets_helper = Dar a este job acesso aos segredos de build (requer a permissão SECRETS:RO) -settings.sourcehut_builds.access_token_helper = Token de acesso tem a permissão JOBS:RW. Gere um token builds.sr.ht ou um token builds.sr.ht com acesso a segredos em meta.sr.ht. -settings.matrix.room_id_helper = O ID da sala pode ser obtido do cliente web Element > Configurações da Sala > Avançado > ID interno da sala. Exemplo: %s. -settings.unarchive.error = Ocorreu um erro ao tentar desarquivar o repositório. Veja o log para mais detalhes. -settings.event_pull_request_review_request = Pedidos de revisão -settings.event_pull_request_review_request_desc = Revisão de pull request solicitada ou pedido de revisão removido. -settings.event_pull_request_merge = Merge de pull request -settings.matrix.access_token_helper = É recomendado configurar uma conta Matrix dedicada para isso. O token de acesso pode ser obtido do cliente web Element (em uma aba privada/anônima) > Menu do usuário (acima à esquerda) > Todas as configurações > Ajuda & Sobre > Avançado > Token de acesso (logo abaixo da URL do servidor). Feche a aba privada/anônima (sair da conta irá invalidar o token). -settings.tags.protection.pattern.description = Você pode usar um único nome, um padrão glob ou uma expressão regular para corresponder a várias tags. Saiba mais no guia de tags protegidas. -settings.add_webhook.invalid_path = O caminho não deve conter partes que sejam "." ou ".." ou uma string vazia. Ele não pode começar ou terminar com uma barra. -settings.sourcehut_builds.visibility = Visibilidade do job -settings.unarchive.text = Desarquivar o repositório irá restaurar a possibilidade de receber commits e push, bem como novos issues e pull requests. -settings.ignore_stale_approvals_desc = Não contar aprovações feitas em commits mais antigos (revisões inativas) no número de aprovações de pedidos de merge. Não tem efeito se as revisões inativas já são desconsideradas. -settings.protect_status_check_patterns = Padrões de verificação de status -error.broken_git_hook = Os hooks Git desse repositório parecem estar quebrados. Por favor, siga a documentação para corrigi-los e então faça push de alguns commits para atualizar o status. -release.type_attachment = Anexo -release.type_external_asset = Recurso externo -release.asset_name = Nome do recurso -release.asset_external_url = URL Externa -release.hide_archive_links_helper = Esconder automaticamente arquivos de código fonte gerados para esse release. Por exemplo, se você estiver enviando os seus manualmente. -branch.delete_desc = Apagar um branch é permanente. Ainda que o branch apagado possa continuar a existir por um breve período antes de ser realmente apagado, isso NÃO PODE ser desfeito na maioria dos casos. Continuar? -release.add_external_asset = Adicionar componente externo -release.invalid_external_url = URL externo inválido: "%s" -release.deletion_desc = Eliminar um release apenas o remove do Forgejo. Isso não irá afetar a tag no Git, o conteúdo do seu repositório ou o histórico. Continuar? -issues.all_title = Tudo -issues.new.assign_to_me = Designar a mim -settings.discord_icon_url.exceeds_max_length = A URL do ícone precisa ter 2048 caracteres ou menos -issues.review.add_review_requests = solicitou revisões de %[1]s %[2]s -issues.review.remove_review_requests = removeu pedidos de revisão para %[1]s %[2]s -issues.review.add_remove_review_requests = solicitou revisões de %[1]s e removeu pedidos de revisão para %[2]s %[3]s -pulls.delete_after_merge.head_branch.is_default = O branch head que você quer excluir é o branch padrão e não pode ser excluído. -pulls.delete_after_merge.head_branch.is_protected = O branch head que você quer excluir é um branch protegido e não pode ser excluído. -pulls.delete_after_merge.head_branch.insufficient_branch = Você não tem permissão para excluir o branch head. -issues.filter_sort.relevance = Relevância -diff.git-notes.add = Adicionar anotação -diff.git-notes.remove-header = Remover anotação -diff.git-notes.remove-body = Esta anotação será removida. -issues.num_reviews_one = %d revisão -issues.summary_card_alt = Cartão de resumo de um issue com o título "%s" no repositório %s -issues.num_reviews_few = %d revisões -settings.default_update_style_desc = Estilo padrão de atualização usado para atualizar pull requests que estão atrasados em relação ao branch base. -pulls.sign_in_require = Entre para criar um novo pull request. -new_from_template = Use um modelo -new_from_template_description = Você pode selecionar um modelo de repositório nesta instância e aplicar suas configurações. -new_advanced = Configurações avançadas -new_advanced_expand = Clique para expandir -auto_init_description = Inicializar o histórico do Git com um README e opcionalmente adicionar arquivos License e .gitignore. -issues.reaction.alt_remove = Remover reação %[1]s deste comentário. -issues.reaction.alt_add = Adicionar reação %[1]s ao comentário. -issues.context.menu = Menu de comentário -issues.reaction.add = Adicionar reação -issues.reaction.alt_few = %[1]s reagiu com %[2]s. -issues.reaction.alt_many = %[1]s e mais %[2]d reagiram com %[3]s. -summary_card_alt = Cartão de resumo do repositório %s -release.summary_card_alt = Cartão de resumo de um release intitulado "%s" no repositório %s [graphs] -component_loading = Carregando %s... -component_loading_failed = Não foi possível carregar o(a) %s -component_loading_info = Pode demorar um pouco… -contributors.what = contribuições -code_frequency.what = frequência de código -recent_commits.what = commits recentes -component_failed_to_load = Ocorreu um erro inesperado. - [org] org_name_holder=Nome da organização @@ -2895,7 +2755,7 @@ team_name_helper=Nomes de equipe devem ser curtos e memoráveis. team_desc_helper=Descreva a finalidade ou o papel da equipe. team_access_desc=Acesso ao repositório team_permission_desc=Permissão -team_unit_desc=Permitir acesso a seções do repositório +team_unit_desc=Permitir o acesso a seções de repositório team_unit_disabled=(Desabilitado) form.name_reserved=O nome de organização "%s" está reservado. @@ -2910,12 +2770,12 @@ settings.permission=Permissões settings.repoadminchangeteam=O administrador do repositório pode adicionar e remover o acesso para equipes settings.visibility=Visibilidade settings.visibility.public=Pública -settings.visibility.limited=Limitado (visível apenas para usuários autenticados) +settings.visibility.limited=Limitado (Visível apenas para usuários autenticados) settings.visibility.limited_shortname=Limitado -settings.visibility.private=Privada (visível apenas para membros da organização) +settings.visibility.private=Privada (Visível apenas para membros da organização) settings.visibility.private_shortname=Privado -settings.update_settings=Atualizar configurações +settings.update_settings=Atualizar Configurações settings.update_setting_success=Configurações da organização foram atualizadas. settings.change_orgname_redirect_prompt=O nome antigo irá redirecionar até que seja reivindicado. settings.update_avatar_success=O avatar da organização foi atualizado. @@ -2929,29 +2789,29 @@ settings.hooks_desc=Adicionar Webhooks que serão acionados para todos o settings.labels_desc=Adicionar rótulos que possam ser usadas em issues para todos os repositórios desta organização. -members.membership_visibility=Visibilidade de membros: +members.membership_visibility=Visibilidade da associação: members.public=Público -members.public_helper=Tornar privado +members.public_helper=tornar privado members.private=Privado -members.private_helper=Tornar público -members.member_role=Papel do membro: +members.private_helper=tornar público +members.member_role=Categoria de membro: members.owner=Proprietário members.member=Membro members.remove=Remover members.remove.detail=Remover %[1]s de %[2]s? members.leave=Sair -members.leave.detail=Você tem certeza que quer sair da organização "%s"? +members.leave.detail=Sair de %s? members.invite_desc=Adicionar novo membro em %s: members.invite_now=Convidar agora teams.join=Juntar-se teams.leave=Deixar -teams.leave.detail=Você tem certeza que quer sair da equipe "%s"? +teams.leave.detail=Sair de %s? teams.can_create_org_repo=Criar repositórios teams.can_create_org_repo_helper=Membros podem criar novos repositórios na organização. O criador terá acesso administrativo ao novo repositório. -teams.none_access=Sem acesso -teams.none_access_helper=A opção "sem acesso" só tem efeito em repositórios privados. -teams.general_access=Acesso personalizado +teams.none_access=Sem Acesso +teams.none_access_helper=Os membros não podem ver ou fazer qualquer outra ação nesta unidade. +teams.general_access=Acesso Geral teams.general_access_helper=As permissões dos membros serão decididas pela tabela de permissões abaixo. teams.read_access=Leitura teams.read_access_helper=Os membros podem ver e clonar os repositórios da equipe. @@ -2973,7 +2833,7 @@ teams.delete_team_desc=A exclusão de uma equipe revoga o acesso ao repositório teams.delete_team_success=A equipe foi excluída. teams.read_permission_desc=Essa equipe concede acesso para Leitura: membros podem ver e clonar os repositórios da equipe. teams.write_permission_desc=Esta equipe concede acesso para escrita: Membros podem ler e fazer push para os repositórios da equipe. -teams.admin_permission_desc=Esta equipe concede acesso de Administrador: membros podem ler, fazer push e adicionar outros colaboradores em repositórios da equipe. +teams.admin_permission_desc=Esta equipe concede acesso de Administrador: Membros podem ler, fazer push e adicionar outros colaboradores para os repositórios da equipe. teams.create_repo_permission_desc=Além disso, esta equipe concede permissão de Criar repositório: membros podem criar novos repositórios na organização. teams.repositories=Repositórios da equipe teams.search_repo_placeholder=Pesquisar repositório... @@ -2981,7 +2841,7 @@ teams.remove_all_repos_title=Remover todos os repositórios da equipe teams.remove_all_repos_desc=Isto irá remover todos os repositórios da equipe. teams.add_all_repos_title=Adicionar todos os repositórios teams.add_all_repos_desc=Isto irá adicionar todos os repositórios da organização à equipe. -teams.add_nonexistent_repo=O repositório que você está tentando adicionar não existe, por favor crie-o primeiro. +teams.add_nonexistent_repo=O repositório que você está tentando adicionar não existe. Crie-o antes de adicioná-lo. teams.add_duplicate_users=Usuário já é um membro da equipe. teams.repos.none=Nenhum repositório pode ser acessado por essa equipe. teams.members.none=Nenhum membro nesta equipe. @@ -3009,7 +2869,7 @@ repositories=Repositórios hooks=Webhooks integrations=Integrações authentication=Fontes de autenticação -emails=E-mails do usuário +emails=E-mails do Usuário config=Configuração notices=Avisos do sistema monitor=Monitoramento @@ -3042,62 +2902,62 @@ dashboard.delete_repo_archives.started=A tarefa de remover todos os arquivos foi dashboard.delete_missing_repos=Excluir todos os repositórios que não possuem seus arquivos Git dashboard.delete_missing_repos.started=Foi iniciada a tarefa de excluir todos os repositórios que não têm arquivos Git. dashboard.delete_generated_repository_avatars=Excluir avatares gerados do repositório -dashboard.update_mirrors=Atualizar espelhos +dashboard.update_mirrors=Atualizar espelhamentos dashboard.repo_health_check=Verificar estado de saúde de todos os repositórios dashboard.check_repo_stats=Verificar estatísticas de todos os repositórios dashboard.archive_cleanup=Apagar arquivos antigos de repositório dashboard.deleted_branches_cleanup=Realizar limpeza de branches apagados dashboard.update_migration_poster_id=Sincronizar os IDs do remetente da migração dashboard.git_gc_repos=Coleta de lixo em todos os repositórios -dashboard.resync_all_sshkeys=Atualizar o arquivo ".ssh/authorized_keys" com as chaves SSH do Forgejo. -dashboard.resync_all_sshprincipals=Atualizar o arquivo ".ssh/authorized_principals" com os principals SSH do Forgejo. -dashboard.resync_all_hooks=Ressincronizar hooks pre-receive, update e post-receive de todos os repositórios +dashboard.resync_all_sshkeys=Atualizar o arquivo '.ssh/authorized_keys' com as chaves SSH do Forgejo. +dashboard.resync_all_sshprincipals=Atualizar o arquivo '.ssh/authorized_principals' com os diretores do Forgejo SSH. +dashboard.resync_all_hooks=Ressincronizar hooks pre-receive, update e post-receive de todos os repositórios. dashboard.reinit_missing_repos=Reinicializar todos os repositórios Git perdidos cujos registros existem dashboard.sync_external_users=Sincronizar dados de usuário externo dashboard.cleanup_hook_task_table=Limpar tabela hook_task dashboard.cleanup_packages=Limpar pacotes expirados -dashboard.server_uptime=Tempo de atividade do servidor -dashboard.current_goroutine=Goroutines atuais +dashboard.server_uptime=Tempo de atividade do Servidor +dashboard.current_goroutine=Goroutines Atuais dashboard.current_memory_usage=Uso de memória atual dashboard.total_memory_allocated=Total de memória alocada dashboard.memory_obtained=Memória obtida -dashboard.pointer_lookup_times=Número de consultas a ponteiros +dashboard.pointer_lookup_times=Nº de consultas a ponteiros dashboard.memory_allocate_times=Alocações de memória dashboard.memory_free_times=Liberações de memória dashboard.current_heap_usage=Uso atual da heap dashboard.heap_memory_obtained=Memória de heap obtida -dashboard.heap_memory_idle=Memória de heap ociosa -dashboard.heap_memory_in_use=Memória de heap em uso -dashboard.heap_memory_released=Memória de heap liberada +dashboard.heap_memory_idle=Memória da heap ociosa +dashboard.heap_memory_in_use=Memória da heap em uso +dashboard.heap_memory_released=Memória da heap liberada dashboard.heap_objects=Objetos na heap dashboard.bootstrap_stack_usage=Uso de pilha bootstrap dashboard.stack_memory_obtained=Memória de pilha obtida -dashboard.mspan_structures_usage=Uso de estruturas MSpan -dashboard.mspan_structures_obtained=Estruturas MSpan obtidas -dashboard.mcache_structures_usage=Uso de estruturas MCache -dashboard.mcache_structures_obtained=Estruturas MCache obtidas -dashboard.profiling_bucket_hash_table_obtained=Hash table de profiling bucket obtida +dashboard.mspan_structures_usage=Uso de estruturas de MSpan +dashboard.mspan_structures_obtained=Estruturas de MSpan obtidas +dashboard.mcache_structures_usage=Uso de estruturas de MCache +dashboard.mcache_structures_obtained=Estruturas de MCache obtidas +dashboard.profiling_bucket_hash_table_obtained=Perfil obtido da Bucket Hash Table dashboard.gc_metadata_obtained=Metadados do GC obtidos dashboard.other_system_allocation_obtained=Outra alocação de sistema obtida dashboard.next_gc_recycle=Próxima reciclagem do GC -dashboard.last_gc_time=Tempo desde última GC +dashboard.last_gc_time=Desde da ultima vez do GC dashboard.total_gc_time=Pausa total do GC -dashboard.total_gc_pause=Pausa total de GC -dashboard.last_gc_pause=Última pausa de GC -dashboard.gc_times=Número de execuções do GC -dashboard.delete_old_actions=Excluir todas as atividades antigas do banco de dados -dashboard.delete_old_actions.started=A exclusão de todas as atividades antigas do banco de dados foi iniciada. +dashboard.total_gc_pause=Pausa total do GC +dashboard.last_gc_pause=Última pausa do GC +dashboard.gc_times=Nº de execuções do GC +dashboard.delete_old_actions=Excluir todas as ações antigas do banco de dados +dashboard.delete_old_actions.started=A exclusão de todas as ações antigas do banco de dados foi iniciada. dashboard.update_checker=Verificador de atualização dashboard.delete_old_system_notices=Excluir todos os avisos de sistema antigos do banco de dados dashboard.gc_lfs=Coletar lixos dos meta-objetos LFS -dashboard.stop_zombie_tasks=Parar tarefas de actions zumbi -dashboard.stop_endless_tasks=Parar tarefas infinitas de actions -dashboard.cancel_abandoned_jobs=Cancelar trabalhos abandonados de actions +dashboard.stop_zombie_tasks=Parar tarefas zumbi +dashboard.stop_endless_tasks=Parar tarefas infinitas +dashboard.cancel_abandoned_jobs=Cancelar trabalhos abandonados -users.user_manage_panel=Gerenciar contas de usuário +users.user_manage_panel=Gerenciamento de conta de usuário users.new_account=Criar conta de usuário users.name=Nome de usuário -users.full_name=Nome completo +users.full_name=Nome Completo users.activated=Ativado users.admin=Administrador users.restricted=Restrito @@ -3106,11 +2966,11 @@ users.2fa=2FA users.repos=Repositórios users.created=Criado users.last_login=Último acesso -users.never_login=Nunca entrou -users.send_register_notify=Notificar sobre cadastros via e-mail +users.never_login=Nunca acessado +users.send_register_notify=Enviar notificação de cadastro de usuário users.new_success=Usuário "%s" criado. users.edit=Editar -users.auth_source=Fonte de autenticação +users.auth_source=Fonte da autenticação users.local=Local users.auth_login_name=Nome de acesso da autenticação users.password_helper=Deixe a senha em branco para mantê-la inalterada. @@ -3118,21 +2978,21 @@ users.update_profile_success=A conta de usuário foi atualizada. users.edit_account=Editar a conta de usuário users.max_repo_creation=Número máximo de repositórios users.max_repo_creation_desc=(Use -1 para usar o limite padrão global.) -users.is_activated=Conta ativada -users.prohibit_login=Conta suspensa -users.is_admin=Conta de administrador -users.is_restricted=Conta restrita -users.allow_git_hook=Pode criar hooks do Git -users.allow_git_hook_tooltip=Hooks do Git são executados como o usuário do SO que executa Forgejo e terão o mesmo nível de acesso ao servidor. Como resultado, usuários com esse privilégio especial de hooks do Git podem acessar e modificar todos os repositórios do Forgejo, bem como o banco de dados usado pelo Forgejo. Por isso, eles também podem obter privilégios de administrador do Forgejo. +users.is_activated=Conta de usuário está ativada +users.prohibit_login=Desabilitar acesso +users.is_admin=É administrador +users.is_restricted=Está restrito +users.allow_git_hook=Pode criar hooks Git +users.allow_git_hook_tooltip=Hooks Git são executados como o usuário do SO que executa Forgejo e terá o mesmo nível de acesso ao servidor. Como resultado, os usuários com esse privilégio especial de Hook do Git podem acessar e modificar todos os repositórios do Forgejo, bem como o banco de dados usado pelo Forgejo. Por conseguinte, podem também obter privilégios de administrador do Forgejo. users.allow_import_local=Pode importar repositórios locais users.allow_create_organization=Pode criar organizações users.update_profile=Atualizar conta de usuário users.delete_account=Excluir conta de usuário -users.cannot_delete_self=Você não pode excluir a si mesmo +users.cannot_delete_self=Você não pode excluir você mesmo users.still_own_repo=Este usuário ainda possui um ou mais repositórios. Exclua ou transfira esses repositórios primeiro. users.still_has_org=Este usuário é membro de uma organização. Remova o usuário de qualquer organização primeiro. users.purge=Eliminar usuário -users.purge_help=Exclua forçosamente o usuário e quaisquer repositórios, organizações e pacotes pertencentes ao usuário. Todos os comentários e issues criados por esse usuário também serão excluídos. +users.purge_help=Exclua forçosamente o usuário e quaisquer repositórios, organizações e pacotes pertencentes ao usuário. Todos os comentários também serão excluídos. users.still_own_packages=Este usuário é dono de um ou mais pacotes. Exclua estes pacotes antes de continuar. users.deletion_success=A conta de usuário foi excluída. users.reset_2fa=Reinicializar 2FA @@ -3141,12 +3001,12 @@ users.list_status_filter.reset=Reset users.list_status_filter.is_active=Ativo users.list_status_filter.not_active=Inativo users.list_status_filter.is_admin=Administrador -users.list_status_filter.not_admin=Não administrador +users.list_status_filter.not_admin=Não Administrador users.list_status_filter.is_restricted=Restrito users.list_status_filter.not_restricted=Não restrito users.list_status_filter.is_prohibit_login=Proibir login users.list_status_filter.not_prohibit_login=Permitir login -users.list_status_filter.is_2fa_enabled=Autenticação de dois fatores ativada +users.list_status_filter.is_2fa_enabled=2FA Ativado users.list_status_filter.not_2fa_enabled=Autenticação em duas etapas desativada users.details=Detalhes do usuário @@ -3169,8 +3029,8 @@ orgs.members=Membros orgs.new_orga=Nova organização repos.repo_manage_panel=Gerenciar repositórios -repos.unadopted=Repositórios não adotados -repos.unadopted.no_more=Não foram encontrados repositórios não adotados +repos.unadopted=Repositórios Não Adotados +repos.unadopted.no_more=Não foram encontrados mais repositórios não adotados repos.owner=Proprietário(a) repos.name=Nome repos.private=Privado @@ -3194,11 +3054,11 @@ packages.repository=Repositório packages.size=Tamanho packages.published=Publicado -defaulthooks=Webhooks padrão +defaulthooks=Webhooks Padrões defaulthooks.add_webhook=Adicionar Webhook Padrão defaulthooks.update_webhook=Atualizar Webhook Padrão -systemhooks=Webhooks do sistema +systemhooks=Webhooks do Sistema systemhooks.add_webhook=Adicionar Webhook do Sistema systemhooks.update_webhook=Atualizar Webhook do Sistema @@ -3224,20 +3084,20 @@ auths.attribute_username_placeholder=Deixe em branco para usar o nome de usuári auths.attribute_name=Atributo primeiro nome auths.attribute_surname=Atributo sobrenome auths.attribute_mail=Atributo e-mail -auths.attribute_ssh_public_key=Atributo chave SSH pública -auths.attribute_avatar=Atributo avatar -auths.attributes_in_bind=Obter os atributos no contexto de bind DN +auths.attribute_ssh_public_key=Atributo de chave SSH pública +auths.attribute_avatar=Atributo do avatar +auths.attributes_in_bind=Buscar os atributos no contexto de Bind DN auths.allow_deactivate_all=Permitir que um resultado de pesquisa vazio para desativar todos os usuários auths.use_paged_search=Usar pesquisa paginada auths.search_page_size=Tamanho da página auths.filter=Filtro de usuário auths.admin_filter=Filtro de administrador auths.restricted_filter=Filtro restrito -auths.restricted_filter_helper=Deixe em branco para não definir nenhum usuário como restrito. Use um asterisco ("*") para definir todos os usuários que não correspondem ao filtro Administrador como restritos. +auths.restricted_filter_helper=Deixe em branco para não definir nenhum usuário como restrito. Use um asterisco ('*') para definir todos os usuários que não correspondem ao Filtro de administrador como restritos. auths.verify_group_membership=Verificar associação ao grupo no LDAP (deixe o filtro vazio para ignorar) -auths.group_search_base=DN Base para pesquisa de grupos -auths.group_attribute_list_users=Atributo do grupo que contém a lista de usuário -auths.user_attribute_in_group=Atributo de usuário listado no grupo +auths.group_search_base=Grupo de Pesquisa DN Base +auths.group_attribute_list_users=Atributo do Grupo que Contém a Lista de Usuários +auths.user_attribute_in_group=Atributo do Usuário Listado em Grupo auths.map_group_to_team=Mapear grupos LDAP para Organizações (deixe o campo vazio para pular) auths.map_group_to_team_removal=Remover usuários de equipes sincronizadas se o usuário não pertence ao grupo LDAP correspondente auths.enable_ldap_groups=Habilitar grupos LDAP @@ -3268,15 +3128,15 @@ auths.oauth2_emailURL=URL do e-mail auths.skip_local_two_fa=Ignorar autenticação em duas etapas local auths.skip_local_two_fa_helper=Deixar desligado significa que os usuários locais com 2FA ligada ainda terão que fazer login com 2FA auths.oauth2_tenant=Locatário -auths.oauth2_scopes=Escopos adicionais -auths.oauth2_required_claim_name=Nome obrigatório do claim +auths.oauth2_scopes=Escopos Adicionais +auths.oauth2_required_claim_name=Nome do Claim Obrigatorio auths.oauth2_required_claim_name_helper=Defina este nome para permitir o login desta fonte apenas para usuários que tenham um claim com este nome -auths.oauth2_required_claim_value=Valor obrigatório do claim +auths.oauth2_required_claim_value=Valor do Claim Obrigatorio auths.oauth2_required_claim_value_helper=Defina este valor para permitir o login desta fonte apenas para usuários que tenham um claim com este nome e valor auths.oauth2_group_claim_name=Nome do claim que fornece os nomes dos grupos para esta fonte. (Opcional) -auths.oauth2_admin_group=Valor do claim de grupo para os usuários administradores. (Opcional - requer nome do claim acima) -auths.oauth2_restricted_group=Valor do claim de grupo para os usuários restritos. (Opcional - requer nome do claim acima) -auths.oauth2_map_group_to_team=Mapear grupos do claim a equipes da organização. (Opcional - requer nome do claim acima) +auths.oauth2_admin_group=Valor do Claim de Grupo para os usuários administradores. (Opcional - requer nome do claim acima) +auths.oauth2_restricted_group=Valor do Claim de Grupo para os usuários restritos. (Opcional - requer nome do claim acima) +auths.oauth2_map_group_to_team=Mapear grupos para Organizações. (Opcional - requer nome do claim acima) auths.oauth2_map_group_to_team_removal=Remover usuários de equipes sincronizadas se o usuário não pertence ao grupo correspondente. auths.enable_auto_register=Habilitar cadastro automático auths.sspi_auto_create_users=Criar usuários automaticamente @@ -3311,7 +3171,7 @@ auths.new_success=A fonte de autenticação "%s" foi adicionada. auths.update_success=A fonte de autenticação foi atualizada. auths.update=Atualizar fonte de autenticação auths.delete=Excluir fonte de autenticação -auths.delete_auth_title=Excluir fonte de autenticação +auths.delete_auth_title=Excluir a Fonte de Autenticação auths.delete_auth_desc=A exclusão de uma fonte de autenticação impede que os usuários a usem para acessar. Continuar? auths.still_in_used=A fonte de autenticação ainda está em uso. Converta ou exclua todos os usuários que usam essa fonte de autenticação primeiro. auths.deletion_success=A fonte de autenticação foi excluída. @@ -3323,20 +3183,20 @@ auths.invalid_openIdConnectAutoDiscoveryURL=URL do Auto Discovery inválida (dev config.server_config=Configuração do servidor config.app_name=Nome do servidor config.app_ver=Versão do Forgejo -config.app_url=URL base -config.custom_conf=Localização do arquivo de configuração -config.custom_file_root_path=Localização raiz dos arquivos personalizados +config.app_url=URL base do Forgejo +config.custom_conf=Caminho do Arquivo de Configuração +config.custom_file_root_path=Caminho raiz para arquivo personalizado config.domain=Domínio do servidor config.offline_mode=Modo local -config.disable_router_log=Desabilitar log do roteador -config.run_user=Executar como este usuário +config.disable_router_log=Desabilitar o Log do roteador +config.run_user=Executar como nome de usuário config.run_mode=Modo de execução config.git_version=Versão do Git -config.repo_root_path=Localização raiz do repositório -config.lfs_root_path=Localização raiz de LFS -config.log_file_root_path=Localização do log +config.repo_root_path=Caminho raiz do repositório +config.lfs_root_path=Caminho raiz do LFS +config.log_file_root_path=Caminho do log config.script_type=Tipo de script -config.reverse_auth_user=Usuário de autenticação do proxy reverso +config.reverse_auth_user=Usuário de autenticação reversa config.ssh_config=Configuração de SSH config.ssh_enabled=Habilitado @@ -3344,16 +3204,16 @@ config.ssh_start_builtin_server=Usar o servidor embutido config.ssh_domain=Domínio do servidor SSH config.ssh_port=Porta config.ssh_listen_port=Porta de escuta -config.ssh_root_path=Caminho raiz -config.ssh_key_test_path=Localização de teste para chave -config.ssh_keygen_path=Localização do gerador de chaves ("ssh-keygen") +config.ssh_root_path=Caminho da raiz +config.ssh_key_test_path=Caminho da chave de teste +config.ssh_keygen_path=Caminho do keygen ('ssh-keygen') config.ssh_minimum_key_size_check=Verificar tamanho mínimo da chave config.ssh_minimum_key_sizes=Tamanhos mínimos da chave config.lfs_config=Configuração de LFS config.lfs_enabled=Habilitado -config.lfs_content_path=Localização do conteúdo LFS -config.lfs_http_auth_expiry=Tempo de expiração da autenticação HTTP de LFS +config.lfs_content_path=Caminho do conteúdo LFS +config.lfs_http_auth_expiry=Expiração da autenticação HTTP LFS config.db_config=Configuração do banco de dados config.db_type=Tipo @@ -3366,42 +3226,42 @@ config.db_path=Caminho config.service_config=Configuração do serviço config.register_email_confirm=Exigir confirmação de e-mail para se cadastrar -config.disable_register=Desabilitar autocadastro -config.allow_only_internal_registration=Permitir cadastro somente através do próprio Forgejo -config.allow_only_external_registration=Permitir cadastro somente através de serviços externos -config.enable_openid_signup=Habilitar autocadastro via OpenID +config.disable_register=Desabilitar auto-cadastro +config.allow_only_internal_registration=Permitir Registro Somente Através do Próprio Forgejo +config.allow_only_external_registration=Permitir cadastro somente por meio de serviços externos +config.enable_openid_signup=Habilitar o auto-cadastro via OpenID config.enable_openid_signin=Habilitar acesso via OpenID config.show_registration_button=Mostrar botão de cadastro -config.require_sign_in_view=Exigir cadastro para visualização de páginas -config.mail_notify=Habilitar notificações via e-mail +config.require_sign_in_view=Exigir acesso do usuário para a visualização de páginas +config.mail_notify=Habilitar notificações de e-mail config.enable_captcha=Habilitar o CAPTCHA -config.active_code_lives=Tempo de expiração do código de ativação -config.reset_password_code_lives=Tempo de expiração do código de recuperação +config.active_code_lives=Ativar Code Lives +config.reset_password_code_lives=Tempo de expiração do código de recuperação de conta config.default_keep_email_private=Ocultar endereços de e-mail por padrão config.default_allow_create_organization=Permitir a criação de organizações por padrão -config.enable_timetracking=Habilitar estatísticas de tempo -config.default_enable_timetracking=Habilitar estatísticas de tempo por padrão +config.enable_timetracking=Habilitar Cronômetro +config.default_enable_timetracking=Habilitar o Cronômetro por Padrão config.allow_dots_in_usernames = Permitir pontos em nomes de usuário. Esta opção não afeta contas já existentes. -config.default_allow_only_contributors_to_track_time=Permitir que apenas os colaboradores usem as estatísticas de tempo -config.no_reply_address=Domínio do email oculto +config.default_allow_only_contributors_to_track_time=Permitir que apenas os colaboradores acompanhem o contador de tempo +config.no_reply_address=Ocultar domínio de e-mail config.default_visibility_organization=Visibilidade padrão para novas organizações config.default_enable_dependencies=Habilitar dependências de issue por padrão -config.webhook_config=Configuração de webhook +config.webhook_config=Configuração de Hook da Web config.queue_length=Tamanho da fila -config.deliver_timeout=Tempo limite de entrega +config.deliver_timeout=Intervalo de entrega config.skip_tls_verify=Ignorar verificação de TLS -config.mailer_config=Configuração de envio de e-mails +config.mailer_config=Configuração de Envio de E-mail config.mailer_enabled=Habilitado config.mailer_enable_helo=Ativar HELO config.mailer_name=Nome config.mailer_protocol=Protocolo -config.mailer_smtp_addr=Host SMTP +config.mailer_smtp_addr=Addr SMTP config.mailer_smtp_port=Porta SMTP config.mailer_user=Usuário config.mailer_use_sendmail=Usar o Sendmail -config.mailer_sendmail_path=Localização do Sendmail +config.mailer_sendmail_path=Caminho do Sendmail config.mailer_sendmail_args=Argumentos extras para o Sendmail config.mailer_sendmail_timeout=Tempo limite do Sendmail config.mailer_use_dummy=Dummy @@ -3411,20 +3271,20 @@ config.send_test_mail_submit=Enviar config.test_mail_failed=Ocorreu um erro ao enviar um e-mail de teste para "%s": %v config.test_mail_sent=Um e-mail de teste foi enviado para "%s". -config.oauth_config=Configuração de OAuth +config.oauth_config=Configuração do OAuth config.oauth_enabled=Habilitado config.cache_config=Configuração de cache config.cache_adapter=Adaptador de cache config.cache_interval=Intervalo de cache config.cache_conn=Conexão de cache -config.cache_item_ttl=TTL do item de cache +config.cache_item_ttl=Item de cache TTL -config.session_config=Configuração de sessão -config.session_provider=Provedor de sessão +config.session_config=Configuração da sessão +config.session_provider=Provedor da sessão config.provider_config=Configuração do provedor config.cookie_name=Nome do cookie -config.gc_interval_time=Tempo de intervalo do GC +config.gc_interval_time=Tempo de Intervalo do GC config.session_life_time=Tempo de vida da sessão config.https_only=Apenas HTTPS config.cookie_life_time=Tempo de vida do cookie @@ -3432,25 +3292,25 @@ config.cookie_life_time=Tempo de vida do cookie config.picture_config=Configuração de imagem e avatar config.picture_service=Serviço de imagens config.disable_gravatar=Desabilitar o gravatar -config.enable_federated_avatar=Habilitar avatares federados +config.enable_federated_avatar=Habilitar avatares federativos config.git_config=Configuração do Git -config.git_disable_diff_highlight=Desabilitar realce de sintaxe em diffs -config.git_max_diff_lines=Máximo de linhas por arquivo em diffs -config.git_max_diff_line_characters=Máximo de caracteres por linha em diffs -config.git_max_diff_files=Máximo de arquivos de diff exibidos +config.git_disable_diff_highlight=Desabilitar realce de mudanças no diff +config.git_max_diff_lines=Máximo de linhas mostradas no diff (para um único arquivo) +config.git_max_diff_line_characters=Máximo de caracteres mostrados no diff (para uma única linha) +config.git_max_diff_files=Máximo de arquivos a serem mostrados no diff config.git_gc_args=Argumentos do GC config.git_migrate_timeout=Tempo limite de migração -config.git_mirror_timeout=Tempo limite para atualização de espelhos -config.git_clone_timeout=Tempo limite para operações de clonagem -config.git_pull_timeout=Tempo limite para operações de pull -config.git_gc_timeout=Tempo limite para operação de GC +config.git_mirror_timeout=Tempo limite de atualização de espelhamento +config.git_clone_timeout=Tempo limite para operação de clone +config.git_pull_timeout=Tempo limite para operação de pull +config.git_gc_timeout=Tempo limite para execução do GC config.log_config=Configuração de log config.logger_name_fmt=Logger: %s config.disabled_logger=Desabilitado -config.access_log_mode=Modo do log de acesso -config.access_log_template=Modelo do log de acesso +config.access_log_mode=Modo log Access +config.access_log_template=Modelo do registro de acesso config.xorm_log_sql=Log SQL config.set_setting_failed=Falha ao definir configuração %s @@ -3481,10 +3341,10 @@ monitor.queue=Fila: %s monitor.queue.name=Nome monitor.queue.type=Tipo monitor.queue.exemplar=Tipo de modelo -monitor.queue.numberworkers=Número de workers -monitor.queue.maxnumberworkers=Número máximo de workers -monitor.queue.numberinqueue=Número na fila -monitor.queue.settings.title=Configurações do pool +monitor.queue.numberworkers=Número de executores +monitor.queue.maxnumberworkers=Número máximo de executores +monitor.queue.numberinqueue=Número na Fila +monitor.queue.settings.title=Configurações do conjunto monitor.queue.settings.maxnumberworkers=Número máximo de executores monitor.queue.settings.maxnumberworkers.placeholder=Atualmente %[1]d monitor.queue.settings.maxnumberworkers.error=Número máximo de executores deve ser um número @@ -3494,10 +3354,10 @@ monitor.queue.settings.remove_all_items=Remover tudo monitor.queue.settings.remove_all_items_done=Todos os itens da fila foram removidos. notices.system_notice_list=Avisos do sistema -notices.view_detail_header=Detalhes do aviso +notices.view_detail_header=Ver detalhes do aviso notices.operations=Operações -notices.select_all=Selecionar tudo -notices.deselect_all=Desselecionar tudo +notices.select_all=Marcar todos +notices.deselect_all=Desmarcar todos notices.inverse_selection=Inverter seleção notices.delete_selected=Excluir seleção notices.delete_all=Excluir todos os avisos @@ -3510,12 +3370,12 @@ notices.delete_success=Os avisos do sistema foram excluídos. identity_access = Identidade e acesso settings = Configurações de administrador users.bot = Robô -dashboard.start_schedule_tasks = Iniciar tarefas de actions programadas +dashboard.start_schedule_tasks = Iniciar tarefas programadas users.reserved = Reservado emails.change_email_text = Tem certeza de que deseja atualizar este endereço de e-mail? -self_check = Autoverificação +self_check = Autodiagnóstico auths.tip.gitea = Registre um novo aplicativo OAuth2. A documentação pode ser encontrada em %s/ -dashboard.sync_tag.started = Sincronização de tags iniciada +dashboard.sync_tag.started = Sincronização de etiquetas iniciada self_check.no_problem_found = Por enquanto não há algum problema. config_settings = Configurações config_summary = Resumo @@ -3530,34 +3390,6 @@ dashboard.sync_branch.started = Sincronização de ramos iniciada dashboard.sync_repo_branches = Sincronizar ramos perdidos do Git para o banco de dados packages.cleanup.success = Os dados expirados foram limpos com sucesso monitor.queue.activeworkers = Processos ativos -systemhooks.desc = Os webhooks fazem automaticamente solicitações HTTP POST para um servidor quando certos eventos Forgejo são acionados. Os webhooks definidos aqui atuarão em todos os repositórios do sistema, então, considere quaisquer implicações de desempenho que isso possa ter. Leia mais no guia de webhooks. -defaulthooks.desc = Os webhooks fazem automaticamente solicitações HTTP POST para um servidor quando certos eventos Forgejo são acionados. Os webhooks definidos aqui são padrões e serão copiados para todos os novos repositórios. Leia mais no guia de webhooks. -self_check.database_fix_mysql = Para usuários do MySQL/MariaDB, você pode usar o comando "forgejo doctor convert" para corrigir os problemas de ordenamento, ou também pode corrigir o problema usando "ALTER ... COLLATE ..." SQLs manualmente. -monitor.queue.settings.desc = Os pools crescem dinamicamente quando as filas de seus workers ficam bloqueadas. -config.cache_test_succeeded = Teste de cache bem-sucedido, obteve uma resposta em %s. -self_check.database_inconsistent_collation_columns = O banco de dados está usando o ordenamento %s, mas essas colunas estão usando ordenamentos incompatíveis. Isso pode causar alguns problemas inesperados. -dashboard.rebuild_issue_indexer = Reconstruir indexador de problemas -monitor.queue.review_add = Revisar / adicionar workers -assets = Ativos de código -config.open_with_editor_app_help = Os editores "Abrir com" para o menu clone. Se deixado em branco, o padrão será usado. Expanda para ver o padrão. -config.cache_test_slow = Teste de cache bem-sucedido, mas a resposta é lenta: %s. -config.cache_test = Cache de Teste -config.cache_test_failed = Falha ao sondar o cache: %v. -self_check.database_collation_mismatch = Esperar que o banco de dados use o ordenamento: %s -dashboard.cleanup_actions = Limpar logs expirados e artefatos de ações -emails.delete = Deletar email -emails.delete_primary_email_error = Você não pode excluir o email principal. -emails.deletion_success = O endereço de email foi excluído. -emails.delete_desc = Tem certeza de que deseja excluir este endereço de e-mail? -dashboard.cron.cancelled = Cron: %[1]s cancelado: %[3]s -users.activated.description = Conclusão da verificação de e-mail. O proprietário de uma conta não ativada não poderá efetuar login até que a verificação de e-mail seja concluída. -users.block.description = Bloquear este usuário de interagir com este serviço através de sua conta e proibir o login. -users.admin.description = Conceda a este usuário acesso total a todos os recursos administrativos disponíveis por meio da interface do usuário da Web e da API. -users.restricted.description = Permitir interação somente com os repositórios e organizações onde este usuário é adicionado como colaborador. Isso impede o acesso a repositórios públicos nesta instância. -users.organization_creation.description = Permitir a criação de novas organizações. -users.local_import.description = Permitir importar repositórios do sistema de arquivos local do servidor. Isso pode ser um problema de segurança. -self_check.database_collation_case_insensitive = O banco de dados está usando um ordenamento %s, que é um ordenamento insensível. Embora o Forgejo possa funcionar com ele, pode haver alguns casos raros que não funcionam como esperado. -monitor.duration = Duração (s) [action] @@ -3586,7 +3418,7 @@ mirror_sync_create=sincronizou a nova referência %[3]s para mirror_sync_delete=referência excluída e sincronizada %[2]s em %[3]s do espelhamento approve_pull_request=`aprovou %[3]s#%[2]s` reject_pull_request=`sugeriu modificações para %[3]s#%[2]s` -publish_release=`lançou o release "%[4]s" em %[3]s` +publish_release=`lançou a versão "%[4]s" em %[3]s` review_dismissed=`descartou a revisão de %[4]s para %[3]s#%[2]s` review_dismissed_reason=Motivo: create_branch=criou o branch %[3]s em %[4]s @@ -3640,9 +3472,9 @@ error.generate_hash=Falha ao gerar hash de commit error.no_committer_account=Nenhuma conta vinculada ao e-mail do autor do commit error.no_gpg_keys_found=Nenhuma chave conhecida encontrada para esta assinatura no banco de dados error.not_signed_commit=Não é um commit assinado -error.failed_retrieval_gpg_keys=Falha ao obter qualquer chave anexada à conta do autor do commit -error.probable_bad_signature=ATENÇÃO! Embora exista uma chave com este ID no banco de dados, ela não verifica este commit! Este commit é SUSPEITO. -error.probable_bad_default_signature=ATENÇÃO! Embora a chave padrão tenha este ID, ela não verifica este commit! Este commit é SUSPEITO. +error.failed_retrieval_gpg_keys=Falha em obter qualquer chave anexada à conta do autor do commit +error.probable_bad_signature=AVISO! Embora exista uma chave com este ID no banco de dados, ela não verifica este commit! Este commit é SUSPEITO. +error.probable_bad_default_signature=AVISO! Embora a chave padrão tenha este ID, ela não verifica este commit! Este commit é SUSPEITO. [units] unit=Unidade @@ -3669,9 +3501,9 @@ dependencies=Dependências keywords=Palavras-chave details=Detalhes details.author=Autor -details.project_site=Site do projeto -details.repository_site=Site do repositório -details.documentation_site=Site da documentação +details.project_site=Site do Projeto +details.repository_site=Site do Repositório +details.documentation_site=Site da Documentação details.license=Licença assets=Recursos versions=Versões @@ -3693,18 +3525,18 @@ chef.install=Para instalar o pacote, execute o seguinte comando: composer.registry=Configure este registro em seu arquivo ~/.composer/config.json: composer.install=Para instalar o pacote usando o Composer, execute o seguinte comando: composer.dependencies=Dependências -composer.dependencies.development=Dependências de desenvolvimento +composer.dependencies.development=Dependências de Desenvolvimento conan.details.repository=Repositório conan.registry=Configure este registro pela linha de comando: conan.install=Para instalar o pacote usando o Conan, execute o seguinte comando: conda.registry=Configure este registro como um repositório Conda no arquivo .condarc: conda.install=Para instalar o pacote usando o Conda, execute o seguinte comando: -container.details.type=Tipo de imagem +container.details.type=Tipo de Imagem container.details.platform=Plataforma container.pull=Puxe a imagem pela linha de comando: -container.digest=Digest +container.digest=Digest: container.multi_arch=S.O. / Arquitetura -container.layers=Camadas da imagem +container.layers=Camadas da Imagem container.labels=Rótulos container.labels.key=Chave container.labels.value=Valor @@ -3732,9 +3564,9 @@ npm.registry=Configure este registro no arquivo .npmrc do seu proje npm.install=Para instalar o pacote usando o npm, execute o seguinte comando: npm.install2=ou adicione-o ao arquivo package.json: npm.dependencies=Dependências -npm.dependencies.development=Dependências de desenvolvimento -npm.dependencies.peer=Dependências peer -npm.dependencies.optional=Dependências opcionais +npm.dependencies.development=Dependências de Desenvolvimento +npm.dependencies.peer=Dependências Peer +npm.dependencies.optional=Dependências Opcionais npm.details.tag=Tag pub.install=Para instalar o pacote usando Dart, execute o seguinte comando: pypi.requires=Requer Python @@ -3743,12 +3575,12 @@ rpm.registry=Configure este registro pela linha de comando: rpm.distros.redhat=em distribuições baseadas no RedHat rpm.distros.suse=em distribuições baseadas no SUSE rpm.install=Para instalar o pacote, execute o seguinte comando: -rpm.repository = Informações do repositório -rpm.repository.architectures = Arquiteturas +rpm.repository=Informações do repositório +rpm.repository.architectures=Arquiteturas rubygems.install=Para instalar o pacote usando gem, execute o seguinte comando: rubygems.install2=ou adicione-o ao Gemfile: -rubygems.dependencies.runtime=Dependências de tempo de execução -rubygems.dependencies.development=Dependências de desenvolvimento +rubygems.dependencies.runtime=Dependências de Execução +rubygems.dependencies.development=Dependências de Desenvolvimento rubygems.required.ruby=Requer o Ruby versão rubygems.required.rubygems=Requer o RubyGem versão swift.registry=Configure este registro pela linha de comando: @@ -3766,17 +3598,17 @@ settings.delete.description=A exclusão de um pacote é permanente e não pode s settings.delete.notice=Você está prestes a excluir %s (%s). Esta operação é irreversível, tem certeza? settings.delete.success=O pacote foi excluído. settings.delete.error=Falha ao excluir o pacote. -owner.settings.cargo.title=Ãndice do registro Cargo +owner.settings.cargo.title=Ãndice do Registro Cargo owner.settings.cargo.initialize=Inicializar índice owner.settings.cargo.initialize.error=Falha ao inicializar índice Cargo: %v owner.settings.cargo.initialize.success=O índice Cargo foi criado com sucesso. owner.settings.cargo.rebuild=Reconstruir índice owner.settings.cargo.rebuild.error=Falha ao reconstruir índice Cargo: %v owner.settings.cargo.rebuild.success=O índice Cargo foi reconstruído com sucesso. -owner.settings.cleanuprules.title=Regras de limpeza -owner.settings.cleanuprules.add=Adicionar regra de limpeza -owner.settings.cleanuprules.edit=Editar regra de limpeza -owner.settings.cleanuprules.preview=Pré-visualizar regra de limpeza +owner.settings.cleanuprules.title=Gerenciar Regras de Limpeza +owner.settings.cleanuprules.add=Adicionar Regra de Limpeza +owner.settings.cleanuprules.edit=Editar Regra de Limpeza +owner.settings.cleanuprules.preview=Pré-visualizar Regra de Limpeza owner.settings.cleanuprules.preview.overview=%d pacotes agendados para serem removidos. owner.settings.cleanuprules.preview.none=A regra de limpeza não corresponde a nenhum pacote. owner.settings.cleanuprules.enabled=Habilitado @@ -3794,32 +3626,11 @@ owner.settings.cleanuprules.success.update=Regra de limpeza foi atualizada. owner.settings.cleanuprules.success.delete=Regra de limpeza foi excluída. owner.settings.chef.title=Registro Chef owner.settings.chef.keypair=Gerar par de chaves +rpm.repository.architectures = Arquiteturas +rpm.repository = Informações do repositório rpm.repository.multiple_groups = Este pacote está disponível em vários grupos. -npm.dependencies.bundle = Dependências em bundle +npm.dependencies.bundle = Dependências empacotadas registry.documentation = Para mais informações sobre o registro %s, veja a documentação. -arch.version.replaces = Substitui -arch.version.conflicts = Conflitos -arch.version.properties = Propriedades da versão -arch.version.description = Descrição -arch.version.groups = Grupo -arch.version.provides = Fornece -arch.version.depends = Depende -arch.version.optdepends = Depende opcionalmente -arch.pacman.repo.multi.item = Configuração para %s -arch.pacman.sync = Sincronizar pacote com o pacman: -arch.pacman.repo.multi = %s possui a mesma versão em distribuições diferentes. -arch.pacman.helper.gpg = Adicionar certificado de confiança para o pacman: -arch.version.backup = Cópia de Segurança -owner.settings.cleanuprules.none = Não há regras de limpeza ainda. -owner.settings.cargo.rebuild.description = Reconstruir pode ser útil se o índice não estiver sincronizado com os pacotes do Cargo armazenados. -owner.settings.cargo.rebuild.no_index = Não foi possível reconstruir, não há um índice inicializado. -arch.pacman.conf = Adicione o servidor com a distribuição e arquitetura no arquivo /etc/pacman.conf : -arch.version.makedepends = Dependências do make -arch.version.checkdepends = Verificar dependências -owner.settings.cargo.initialize.description = É necessário um repositório Git especial de índice para usar o registro Cargo. Usar esta opção irá (re-)criar o repositório e configurá-lo automaticamente. -owner.settings.chef.keypair.description = É necessário um par de chaves para autenticar no registro Chef. Se você já gerou um par de chaves, gere um novo par e descarte o antigo. -container.images.title = Imagens -search_in_external_registry = Buscar em %s [secrets] secrets=Segredos @@ -3839,10 +3650,10 @@ management=Gerenciar segredos [actions] actions=Ações -unit.desc=Gerenciar pipelines integradas de CI/CD com Forgejo Actions. +unit.desc=Gerenciar ações status.unknown=Desconhecido -status.waiting=Aguardando +status.waiting=Em espera status.running=Rodando status.success=Sucesso status.failure=Falha @@ -3851,8 +3662,8 @@ status.skipped=Ignorado status.blocked=Bloqueado runners=Runners -runners.runner_manage_panel=Gerenciar runners -runners.new=Criar novo runner +runners.runner_manage_panel=Gerenciamento de Runners +runners.new=Criar novo Runner runners.new_notice=Como iniciar um runner runners.status=Estado runners.id=ID @@ -3886,7 +3697,7 @@ runners.status.offline=Offline runners.version=Versão runners.reset_registration_token_success=Token de registro de runner redefinido com sucesso -runs.all_workflows=Todos os workflows +runs.all_workflows=Todos os Workflows runs.commit=Commit runs.pushed_by=push feito por runs.invalid_workflow_helper=O arquivo de configuração do workflow é inválido. Por favor, verifique seu arquivo de configuração: %s @@ -3902,7 +3713,7 @@ runners.reset_registration_token = Resetar token de registro runs.scheduled = Programadas variables.creation = Adicionar variável variables.deletion = Remover variável -variables.management = Gerenciar variáveis +variables.management = Gerenciamento de variáveis runs.actors_no_select = Todos os atores variables.none = Ainda não há variáveis. variables.update.failed = Falha ao editar a variável. @@ -3917,37 +3728,15 @@ runs.no_workflows.documentation = Para mais informações sobre Forgejo Actions, runs.no_workflows.quick_start = Forgejo Actions é uma novidade para você? Veja o guia rápido. runs.no_results = Nenhum resultado. variables.description = As variáveis serão passadas para certas ações e não poderão ser lidas de outra forma. -workflow.dispatch.trigger_found = Este workflow tem um disparador de evento workflow_dispatch. -workflow.dispatch.run = Executar workflow -runs.no_runs = O workflow ainda não foi executado. -workflow.dispatch.warn_input_limit = Exibindo apenas as %d primeiras entradas. -runs.no_matching_online_runner_helper = Nenhum runner online encontrado com o rótulo: %s -workflow.disabled = Workflow está desativado. -workflow.dispatch.use_from = Usar workflow de -runs.no_job = O workflow precisa conter pelo menos um trabalho -workflow.disable_success = Workflow "%s" desativado com sucesso. -workflow.enable = Ativar workflow -workflow.disable = Desabilitar workflow -runs.no_workflows = Não há workflows ainda. -runs.no_job_without_needs = O workflow deve conter pelo menos um trabalho sem dependências. -runs.workflow = Workflow -workflow.enable_success = Workflow "%s" ativado com sucesso. -workflow.dispatch.success = Execução do workflow solicitada com sucesso. -workflow.dispatch.input_required = Exigir um valor para a entrada "%s". -workflow.dispatch.invalid_input_type = Tipo de entrada "%s" inválido. -variables.deletion.description = Apagar uma variável é permanente e não pode ser desfeito. Continuar? -runs.expire_log_message = Os logs foram apagados pois eram antigos demais. -runs.no_workflows.help_no_write_access = Para aprender sobre as Actions do Forgejo, veja a documentação. -runs.no_workflows.help_write_access = Não sabe como começar a usar as Actions do Forgejo? Veja o guia de como começar na documentação do usuário para escrever seu primeiro workflow, depois configure um runner do Forgejo para executar trabalhos. [projects] type-1.display_name=Projeto individual type-2.display_name=Projeto do repositório type-3.display_name=Projeto da organização -deleted.display_name = Projeto Apagado [git.filemode] +; Ordered by git filemode value, ascending. E.g. directory has "040000", normal file has "100644", … symbolic_link=Ligação simbólica changed_filemode = %[1]s → %[2]s directory = Diretório @@ -3957,6 +3746,16 @@ executable_file = Arquivo executável +[graphs] +component_loading = Carregando %s... +component_loading_failed = Não foi possível carregar o(a) %s +component_loading_info = Pode demorar um pouco… +contributors.what = contribuições +code_frequency.what = frequência de código +recent_commits.what = commits recentes +component_failed_to_load = Ocorreu um erro inesperado. + + [search] org_kind = Buscar organizações... team_kind = Buscar equipes... @@ -3979,14 +3778,6 @@ commit_kind = Buscar commits… runner_kind = Pesquisar runners... code_search_unavailable = A pesquisa de código não está disponível no momento. Entre em contato com o administrador do site. milestone_kind = Pesquisar marcos... -union_tooltip = Incluir resultados que coincidam com quaisquer palavras-chave separadas por espaços em branco -union = União -exact = Exato -exact_tooltip = Incluir apenas resultados que correspondam exatamente ao termo de pesquisa -issue_kind = Pesquisar problemas... -pull_kind = Pesquisar pulls... -regexp_tooltip = Interpretar o termo de busca como uma expressão regular -regexp = RegExp [munits.data] b = B @@ -4000,27 +3791,4 @@ eib = EiB [markup] filepreview.line = Linha %[1]d em %[2]s filepreview.lines = Linhas %[1]d a %[2]d em %[3]s -filepreview.truncated = Pré-visualização truncada - -[repo.permissions] -pulls.write = Escrita: Encerrar pull requests e gerir metadados como rótulos, marcos, responsáveis, prazos e dependências. -code.read = Leitura: Acessar e clonar o código do repositório. -issues.read = Leitura: Visualizar e criar issues e comentários. -code.write = Escrita: Fazer push para o repositório, criar branches e tags. -issues.write = Escrita: Encerrar issues e gerir metadados como rótulos, marcos, responsáveis, prazos e dependências. -pulls.read = Leitura: Visualizar e criar pull requests. -releases.read = Leitura: Visualizar e baixar releases. -releases.write = Escrita: Publicar editar e apagar releases e seus recursos. -wiki.read = Leitura: Ler a wiki integrada e o histórico dela. -wiki.write = Escrita: Criar, alterar e apagar páginas na wiki integrada. -projects.read = Ler: Acesse os painéis de projetos do repositório. -ext_wiki = Acesse o link para um wiki externo. As permissões são gerenciadas externamente. -actions.write = Escrever: Acione, reinicie, cancele ou aprove manualmente pipelines de CI/CD pendentes. -projects.write = Escrever: Crie projetos e colunas e edite-os. -actions.read = Ler: Visualize pipelines de CI/CD integrados e seus logs. -packages.read = Ler: Visualize e baixe pacotes atribuídos ao repositório. -packages.write = Escrever: Publique e delete pacotes atribuídos ao repositório. -ext_issues = Acesse o link para um issue tracker externo. As permissões são gerenciadas externamente. - -[translation_meta] -test = To preserve its claws, the giant anteater walks on its front knuckles, like gorillas +filepreview.truncated = Pré-visualização truncada \ No newline at end of file diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini index ca1199dd54..7f2bb86b79 100644 --- a/options/locale/locale_pt-PT.ini +++ b/options/locale/locale_pt-PT.ini @@ -142,7 +142,7 @@ confirm_delete_selected=Confirma a exclusão de todos os itens marcados? name=Nome value=Valor -filter.is_fork = Derivado +filter.is_fork = Derivações filter.is_mirror = Réplicas filter.is_template = Modelos filter.public = Público @@ -156,7 +156,7 @@ filter.clear = Retirar filtros filter.is_archived = Arquivado filter.not_template = Não modelos toggle_menu = Comutar menu -filter = Filtrar +filter = Filtro copy_generic = Copiar para a área de transferência test = Teste error413 = Você esgotou a sua quota. @@ -166,7 +166,6 @@ new_org.title = Nova organização new_repo.link = Novo repositório new_migrate.link = Nova migração new_org.link = Nova organização -copy_path = Copiar caminho [aria] navbar=Barra de navegação @@ -200,12 +199,6 @@ buttons.enable_monospace_font=Habilitar tipo de letra mono-espaçado buttons.disable_monospace_font=Desabilitar tipo de letra mono-espaçado buttons.indent.tooltip = Aninhar itens num nível buttons.unindent.tooltip = Desaninhar itens por um nível -buttons.new_table.tooltip = Adicionar tabela -table_modal.header = Adicionar tabela -table_modal.placeholder.header = Cabeçalho -table_modal.placeholder.content = Conteúdo -table_modal.label.rows = Linhas -table_modal.label.columns = Colunas [filter] string.asc=A - Z @@ -213,7 +206,7 @@ string.desc=Z - A [error] occurred=Ocorreu um erro -report_message=Se acredita de que se trata de um erro do Forgejo, procure, por favor, questões relacionadas no Codeberg ou abra uma nova questão, se necessário. +report_message=Se acredita de que se trata de um erro do Forgejo, procure, por favor, questões relacionadas no GitHub ou abra uma nova questão, se necessário. missing_csrf=Pedido inválido: não há código CSRF invalid_csrf=Pedido inválido: código CSRF inválido not_found=Não foi possível encontrar o destino. @@ -483,8 +476,6 @@ hint_register = Precisa de uma conta? Faça uma inscrição agora.< sign_up_button = Faça uma inscrição agora. back_to_sign_in = Voltar ao iniciar a sessão sign_in_openid = Prosseguir com OpenID -unauthorized_credentials = As credenciais estão erradas ou expiraram. Tente o comando de novo ou veja %s para mais informação -use_onetime_code = Usar código de utilização única [mail] view_it_on=Ver em %s @@ -724,7 +715,6 @@ public_activity.visibility_hint.self_public = O seu trabalho está visível para public_activity.visibility_hint.admin_public = Este trabalho está visível para todos, mas como administrador/a pode também ver o que consta em espaços privados. public_activity.visibility_hint.self_private = O seu trabalho apenas está visível para si e para os administradores da instância. Configurar. public_activity.visibility_hint.admin_private = Este trabalho está visível para si porque é um/a administrador/a, mas o/a utilizador/a quer permanecer privado/a. -public_activity.visibility_hint.self_private_profile = O seu trabalho está visível somente para si e para os administradores da instância porque o seu perfil é privado. Configure. [settings] profile=Perfil @@ -746,9 +736,9 @@ uid=UID webauthn=Autenticação em dois passos (chaves de segurança) public_profile=Perfil público -biography_placeholder=Diga aos outros um pouco sobre si! (Markdown é suportado) +biography_placeholder=Conte-nos um pouco sobre si! (Pode usar Markdown) location_placeholder=Partilhe a sua localização aproximada com outros -profile_desc=Sobre si +profile_desc=Controle como o seu perfil é apresentado aos outros utilizadores. O seu endereço de email principal será usado para notificações, recuperação de senha e operações Git baseadas na web. password_username_disabled=Utilizadores não-locais não podem mudar os seus nomes de utilizador. Entre em contacto com o administrador do sítio saber para mais detalhes. full_name=Nome completo website=Sítio web @@ -813,7 +803,7 @@ manage_emails=Gerir endereços de email manage_themes=Tema padrão manage_openid=Endereços OpenID email_desc=O seu endereço de email principal irá ser usado para notificações, recuperação de senha e, desde que não esteja oculto, operações Git baseados na web. -theme_desc=Este tema será usado para a interface web quando tiver sessão iniciada. +theme_desc=Este será o seu tema padrão em todo o sítio. primary=Principal activated=Em uso requires_activation=Tem que ser habilitado @@ -839,7 +829,7 @@ add_email_success=O novo endereço de email foi adicionado. email_preference_set_success=As preferências relativas ao email foram definidas com sucesso. add_openid_success=O novo endereço OpenID foi adicionado. keep_email_private=Ocultar endereço de email -keep_email_private_popup=O seu endereço de e-mail não será mostrado no seu perfil e não será o predefinido para cometimentos feitos através da interface web, tais como upload de arquivos, edições e cometimentos de integração. Ao invés disso, um endereço especial %s poderá ser usado para vincular cometimentos à sua conta. Esta opção não irá alterar os cometimentos existentes. +keep_email_private_popup=Isto irá ocultar o seu endereço de email no seu perfil. Não será mais o predefinido nos cometimentos feitos através da interface web, tais como carregamentos de ficheiros e edições, e não será usado para cometimentos de integração. Ao invés disso, um endereço especial %s poderá ser usado para associar cometimentos à sua conta. Note que mudar esta opção não irá alterar os cometimentos existentes. openid_desc=O OpenID permite delegar a autenticação num fornecedor externo. manage_ssh_keys=Gerir chaves SSH @@ -942,7 +932,7 @@ select_permissions=Escolher permissões permission_no_access=Sem acesso permission_read=Lidas permission_write=Leitura e escrita -access_token_desc=As permissões dos códigos escolhidos limitam a autorização apenas às rotas da API correspondentes. Leia a documentação para obter mais informação. +access_token_desc=As permissões dos códigos escolhidos limitam a autorização apenas às rotas da API correspondentes. Leia a documentação para obter mais informação. at_least_one_permission=Tem que escolher pelo menos uma permissão para criar um código permissions_list=Permissões: @@ -1034,7 +1024,7 @@ visibility=Visibilidade do utilizador visibility.public=Pública visibility.public_tooltip=Visível para todos visibility.limited=Limitada -visibility.limited_tooltip=Visível apenas para utilizadores registados +visibility.limited_tooltip=Visível apenas para utilizadores autenticados visibility.private=Privada visibility.private_tooltip=Visível apenas para membros das organizações a que se associou additional_repo_units_hint = Sugere a habilitação de unidades do repositório adicionais @@ -1047,7 +1037,7 @@ hints = Sugestões blocked_users = Utilizadores bloqueados blocked_since = Bloqueado desde %s user_block_success = O utilizador foi bloqueado com sucesso. -additional_repo_units_hint_description = Mostrar uma sugestão "Habilitar mais" para repositórios que não têm todas as unidades disponíveis habilitadas. +additional_repo_units_hint_description = Mostrar um botão "Adicionar mais unidades..." para repositórios que não têm todas as unidades disponíveis habilitadas. update_hints_success = As sugestões foram modificadas. blocked_users_none = Não há utilizadores bloqueados. user_unblock_success = O utilizador foi desbloqueado com sucesso. @@ -1055,8 +1045,6 @@ language.title = Idioma predefinido keep_activity_private.description = O seu trabalho público apenas estará visível para si e para os administradores da instância. language.description = Este idioma vai ser guardado na sua conta e ser usado como o predefinido depois de iniciar sessão. language.localization_project = Ajude-nos a traduzir o Forgejo para o seu idioma! Saiba mais. -pronouns_custom_label = Pronomes personalizados -user_block_yourself = Não se pode bloquear a si próprio. [repo] new_repo_helper=Um repositório contém todos os ficheiros do trabalho, incluindo o histórico das revisões. Já tem um hospedado noutro sítio? Migre o repositório. @@ -1099,13 +1087,13 @@ issue_labels=Rótulos issue_labels_helper=Escolha um conjunto de rótulos license=Licença license_helper=Escolha um ficheiro de licença -license_helper_desc=Uma licença rege o que os outros podem, ou não, fazer com o seu código fonte. Não tem a certeza sobre qual a mais indicada para o seu trabalho? Veja: Escolher uma licença. +license_helper_desc=Uma licença rege o que os outros podem, ou não, fazer com o seu código fonte. Não tem a certeza sobre qual a mais indicada para o seu trabalho? Veja: Escolher uma licença. object_format=Formato dos elementos object_format_helper=Formato dos elementos do repositório. Não poderá ser alterado mais tarde. SHA1 é o mais compatível. readme=README readme_helper=Escolha um modelo de ficheiro README readme_helper_desc=Este é o sítio onde pode escrever uma descrição completa do seu trabalho. -auto_init=Inicializar repositório +auto_init=Inicializar repositório (adiciona `.gitignore`, `LICENSE` e `README.md`) trust_model_helper=Escolha o modelo de confiança para a validação das assinaturas. As opções são: trust_model_helper_collaborator=Colaborador: Confiar nas assinaturas dos colaboradores trust_model_helper_committer=Autor do cometimento: Confiar nas assinaturas que correspondem a autores de cometimentos @@ -1183,7 +1171,7 @@ template.issue_labels=Rótulos das questões template.one_item=Tem que escolher pelo menos um item do modelo template.invalid=Tem que escolher um repositório modelo -archive.title=Este repositório está arquivado. Pode ver os ficheiros e cloná-lo, mas não pode fazer envios ou abrir questões ou pedidos de integração. +archive.title=Este repositório está arquivado. Pode ver os seus ficheiros e cloná-lo, mas não pode fazer envios para o repositório nem lançar questões ou fazer pedidos de integração. archive.title_date=Este repositório foi arquivado em %s. Pode ver os ficheiros e cloná-lo, mas não pode fazer envios ou abrir questões/pedidos de integração. archive.issue.nocomment=Este repositório está arquivado. Não pode comentar nas questões. archive.pull.nocomment=Este repositório está arquivado. Não pode comentar nos pedidos de integração. @@ -1358,7 +1346,7 @@ editor.or=ou editor.cancel_lower=Cancelar editor.commit_signed_changes=Cometer modificações assinadas editor.commit_changes=Cometer modificações -editor.add_tmpl=Adicionar "<%s>" +editor.add_tmpl=Adicionar "" editor.add=Adicionar %s editor.update=Modificar %s editor.delete=Eliminar %s @@ -1368,7 +1356,7 @@ editor.fail_to_apply_patch=`Não foi possível aplicar o remendo (patch) "%s"` editor.new_patch=Novo remendo (patch) editor.commit_message_desc=Adicionar uma descrição alargada opcional… editor.signoff_desc=Adicionar "Assinado-por" seguido do autor do cometimento no fim da mensagem do registo de cometimentos. -editor.commit_directly_to_this_branch=Cometer imediatamente no ramo %[1]s. +editor.commit_directly_to_this_branch=Cometer imediatamente no ramo %s. editor.create_new_branch=Crie um novo ramo para este cometimento e inicie um pedido de integração. editor.create_new_branch_np=Criar um novo ramo para este cometimento. editor.propose_file_change=Propor modificação do ficheiro @@ -1438,7 +1426,7 @@ commitstatus.failure=Falha commitstatus.pending=Pendente commitstatus.success=Sucesso -ext_issues=Questões externas +ext_issues=Acesso a questões externas ext_issues.desc=Ligação para um rastreador de questões externo. projects=Planeamentos @@ -1619,9 +1607,9 @@ issues.no_content=Nenhuma descrição fornecida. issues.close=Encerrar questão issues.comment_pull_merged_at=cometimento %[1]s integrado em %[2]s %[3]s issues.comment_manually_pull_merged_at=cometimento %[1]s integrado manualmente em %[2]s %[3]s -issues.close_comment_issue=Fechar com comentário +issues.close_comment_issue=Comentar e fechar issues.reopen_issue=Reabrir -issues.reopen_comment_issue=Reabrir com comentário +issues.reopen_comment_issue=Comentar e reabrir issues.create_comment=Comentar issues.closed_at=`encerrou esta questão %[2]s` issues.reopened_at=`reabriu esta questão %[2]s` @@ -1734,7 +1722,7 @@ issues.error_modifying_due_date=Falhou a modificação da data de vencimento. issues.error_removing_due_date=Falhou a remoção da data de vencimento. issues.push_commit_1=adicionou %d cometimento %s issues.push_commits_n=adicionou %d cometimentos %s -issues.force_push_codes=`forçou o envio %[1]s de %[2]s para %[4]s %[6]s` +issues.force_push_codes=`forçou o envio %[1]s de %[2]s para %[4]s %[6]s` issues.force_push_compare=Comparar issues.due_date_form=aaaa-mm-dd issues.due_date_form_add=Adicionar data de vencimento @@ -1788,8 +1776,8 @@ issues.review.left_comment=deixou um comentário issues.review.content.empty=Tem que deixar um comentário indicando a(s) modificação(ões) solicitada(s). issues.review.reject=modificações solicitadas %s issues.review.wait=foi solicitada para revisão %s -issues.review.add_review_request=solicitou revisão de %[1]s %[2]s -issues.review.remove_review_request=removeu a solicitação de revisão para %[1]s %[2]s +issues.review.add_review_request=solicitou revisão de %s %s +issues.review.remove_review_request=removeu a solicitação de revisão para %s %s issues.review.remove_review_request_self=recusou-se a rever %s issues.review.pending=Pendente issues.review.pending.tooltip=Este comentário não está visível para os outros utilizadores, neste momento. Para submeter os seus comentários pendentes, escolha "%s" → "%s/%s/%s" no topo da página. @@ -1850,7 +1838,7 @@ pulls.nothing_to_compare_have_tag=O ramo/etiqueta escolhidos são iguais. pulls.nothing_to_compare_and_allow_empty_pr=Estes ramos são iguais. Este pedido de integração ficará vazio. pulls.has_pull_request=`Já existe um pedido de integração entre estes ramos: %[2]s#%[3]d` pulls.create=Criar um pedido de integração -pulls.title_desc_few=quer integrar %[1]d cometimento(s) do ramo %[2]s no ramo %[3]s +pulls.title_desc_few=quer integrar %[1]d cometimento(s) do ramo %[2]s no ramo %[3]s pulls.merged_title_desc_few=integrou %[1]d cometimento(s) do ramo %[2]s no ramo %[3]s %[4]s pulls.change_target_branch_at=`mudou o ramo de destino de %s para %s %s` pulls.tab_conversation=Diálogo @@ -2011,7 +1999,7 @@ signing.wont_sign.commitssigned=A integração não irá ser assinada, uma vez q signing.wont_sign.approved=A integração não irá ser assinada, uma vez que o pedido de integração não foi assinado. signing.wont_sign.not_signed_in=Não tem a sessão iniciada. -ext_wiki=Wiki externo +ext_wiki=Acesso a wiki externo ext_wiki.desc=Ligação para um wiki externo. wiki=Wiki @@ -2341,32 +2329,32 @@ settings.event_push_desc=Envio do Git para um repositório. settings.event_repository=Repositório settings.event_repository_desc=Repositório criado ou eliminado. settings.event_header_issue=Eventos da questão -settings.event_issues=Modificação +settings.event_issues=Questões settings.event_issues_desc=Questão aberta, fechada, reaberta ou editada. -settings.event_issue_assign=Atribuição +settings.event_issue_assign=Questão atribuída settings.event_issue_assign_desc=Encarregado atribuído ou retirado à questão. -settings.event_issue_label=Rótulos -settings.event_issue_label_desc=Rótulos adicionados ou retirados às questões. -settings.event_issue_milestone=Etapas -settings.event_issue_milestone_desc=Etapa atribuída, removida ou modificada. -settings.event_issue_comment=Comentários +settings.event_issue_label=Questão com rótulo +settings.event_issue_label_desc=Rótulos modificados ou retirados às questões. +settings.event_issue_milestone=Questão com etapa atribuída +settings.event_issue_milestone_desc=Etapa atribuída ou retirada à questão. +settings.event_issue_comment=Comentário da questão settings.event_issue_comment_desc=Comentário da questão criado, editado ou eliminado. settings.event_header_pull_request=Eventos de pedidos de integração -settings.event_pull_request=Modificação +settings.event_pull_request=Pedido de integração settings.event_pull_request_desc=Pedido de integração aberto, fechado, reaberto ou editado. -settings.event_pull_request_assign=Atribuição +settings.event_pull_request_assign=Encarregado atribuído ao pedido de integração settings.event_pull_request_assign_desc=Encarregado atribuído ou retirado ao pedido de integração. -settings.event_pull_request_label=Rótulos -settings.event_pull_request_label_desc=Rótulos adicionados ou retirados aos pedidos de integração. -settings.event_pull_request_milestone=Etapas -settings.event_pull_request_milestone_desc=Etapas adicionadas, removidas ou modificadas. -settings.event_pull_request_comment=Comentários +settings.event_pull_request_label=Rótulo atribuído ao pedido de integração +settings.event_pull_request_label_desc=Rótulos modificados ou retirados aos pedidos de integração. +settings.event_pull_request_milestone=Etapa atribuída ao pedido de integração +settings.event_pull_request_milestone_desc=Etapa atribuída ou retirada ao pedido de integração. +settings.event_pull_request_comment=Comentário do pedido de integração settings.event_pull_request_comment_desc=Comentário do pedido de integração criado, editado ou eliminado. -settings.event_pull_request_review=Revisões +settings.event_pull_request_review=Pedido de integração revisto settings.event_pull_request_review_desc=Pedido de integração aprovado, rejeitado ou comentado na revisão. -settings.event_pull_request_sync=Sincronizado -settings.event_pull_request_sync_desc=Ramo sincronizado automaticamente com o ramo de destino. -settings.event_pull_request_review_request=Pedidos de revisão +settings.event_pull_request_sync=Pedido de integração sincronizado +settings.event_pull_request_sync_desc=Pedido de integração sincronizado. +settings.event_pull_request_review_request=Solicitada a revisão do pedido de integração settings.event_pull_request_review_request_desc=A revisão do pedido de integração foi solicitada ou a solicitação de revisão foi removida. settings.event_pull_request_approvals=Aprovações do pedido de integração settings.event_pull_request_merge=Integração constante no pedido @@ -2470,7 +2458,7 @@ settings.protect_branch_name_pattern=Padrão do nome do ramo protegido settings.protect_branch_name_pattern_desc=Padrões de nomes de ramos protegidos. Consulte a documentação para ver a sintaxe dos padrões. Exemplos: main, release/** settings.protect_patterns=Padrões settings.protect_protected_file_patterns=Padrões de ficheiros protegidos (separados com ponto e vírgula ";") -settings.protect_protected_file_patterns_desc=Ficheiros protegidos não podem ser modificados imediatamente, mesmo que o utilizador tenha direitos para adicionar, editar ou eliminar ficheiros neste ramo. Múltiplos padrões podem ser separados com ponto e vírgula (";"). Veja a documentação em %s para ver a sintaxe. Exemplos: .drone.yml, /docs/**/*.txt. +settings.protect_protected_file_patterns_desc=Ficheiros protegidos não podem ser modificados imediatamente, mesmo que o utilizador tenha direitos para adicionar, editar ou eliminar ficheiros neste ramo. Múltiplos padrões podem ser separados com ponto e vírgula (";"). Veja a documentação em github.com/gobwas/glob para ver a sintaxe. Exemplos: .drone.yml, /docs/**/*.txt. settings.protect_unprotected_file_patterns=Padrões de ficheiros desprotegidos (separados com ponto e vírgula ";") settings.protect_unprotected_file_patterns_desc=Ficheiros desprotegidos que podem ser modificados imediatamente se o utilizador tiver direitos de escrita, contornando a restrição no envio. Padrões múltiplos podem ser separados com ponto e vírgula (";"). Veja a documentação em %[2]s para ver a sintaxe. Exemplos: .drone.yml, /docs/**/*.txt. settings.add_protected_branch=Habilitar salvaguarda @@ -2517,9 +2505,9 @@ settings.archive.text=Arquivar o repositório irá torná-lo apenas de leitura. settings.archive.success=O repositório foi arquivado com sucesso. settings.archive.error=Ocorreu um erro enquanto decorria o processo de arquivo do repositório. Veja os registo para obter mais detalhes. settings.archive.error_ismirror=Não pode arquivar um repositório que tenha sido replicado. -settings.archive.branchsettings_unavailable=As configurações dos ramos não estão disponíveis em repositórios arquivados. -settings.archive.tagsettings_unavailable=As configurações sobre etiquetas não estão disponíveis em repositórios arquivados. -settings.archive.mirrors_unavailable=As réplicas não estão disponíveis em repositórios arquivados. +settings.archive.branchsettings_unavailable=As configurações dos ramos não estão disponíveis quando o repositório está arquivado. +settings.archive.tagsettings_unavailable=As configurações sobre etiquetas não estão disponíveis quando o repositório está arquivado. +settings.archive.mirrors_unavailable=As réplicas não estão disponíveis se o repositório estiver arquivado. settings.unarchive.button=Desarquivar repositório settings.unarchive.header=Desarquivar este repositório settings.unarchive.text=Desarquivar o repositório irá restaurar a capacidade de receber cometimentos e envios, assim como novas questões e pedidos de integração. @@ -2593,7 +2581,7 @@ diff.generated=gerado diff.vendored=externo diff.comment.add_line_comment=Adicionar comentário de linha diff.comment.placeholder=Deixar um comentário -diff.comment.markdown_info=A formatação com Markdown é suportada. +diff.comment.markdown_info=A formatação com markdown é suportada. diff.comment.add_single_comment=Adicionar um único comentário diff.comment.add_review_comment=Adicionar comentário diff.comment.start_review=Iniciar revisão @@ -2624,7 +2612,7 @@ release.draft=Rascunho release.prerelease=Pré-lançamento release.stable=Estável release.compare=Comparar -release.edit=Editar +release.edit=editar release.ahead.commits=%d cometimentos release.ahead.target=para %s desde este lançamento tag.ahead.target=para o ramo %s desde esta etiqueta @@ -2743,10 +2731,10 @@ migrate.forgejo.description = Migrar dados de codeberg.org ou de outras instânc n_commit_one = %s cometimento editor.commit_id_not_matching = O ficheiro foi modificado enquanto o estava a editar. Cometa para um ramo novo e depois integre. commits.search_branch = Este ramo -pulls.title_desc_one = quer integrar %[1]d cometimento do ramo %[2]s no ramo %[3]s +pulls.title_desc_one = quer integrar %[1]d cometimento do ramo %[2]s no ramo %[3]s pulls.reopen_failed.base_branch = O pedido de integração não pode ser reaberto porque o ramo base já não existe. activity.navbar.code_frequency = Frequência de programação -settings.units.add_more = Habilitar mais +settings.units.add_more = Adicionar mais... settings.wiki_rename_branch_main_desc = Renomear o ramo usado internamente pelo Wiki para "%s". Esta operação é permanente e não poderá ser revertida. settings.add_collaborator_blocked_our = Não foi possível adicionar o/a colaborador/a porque o/a proprietário/a do repositório bloqueou-os. settings.add_webhook.invalid_path = A localização não pode conter "." ou ".." ou ficar em branco. Não pode começar ou terminar com uma barra. @@ -2769,7 +2757,7 @@ release.download_count_one = %s descarga release.download_count_few = %s descargas release.system_generated = Este anexo é gerado automaticamente. pulls.ready_for_review = Pronto/a para rever? -settings.units.units = Unidades +settings.units.units = Unidades do repositório error.broken_git_hook = Os automatismos git deste repositório parecem estar danificados. Consulte a documentação sobre como os consertar e depois envie alguns cometimentos para refrescar o estado. settings.rename_branch_failed_protected = Não é possível renomear o ramo %s porque é um ramo protegido. settings.units.overview = Visão geral @@ -2831,41 +2819,9 @@ mirror_use_ssh.text = Utilizar a autenticação SSH mirror_denied_combination = Não é possível usar a autenticação baseada em chave pública e senha em combinação. settings.mirror_settings.push_mirror.copy_public_key = Copiar chave pública settings.mirror_settings.push_mirror.none_ssh = Nenhuma -settings.protect_new_rule = Criar uma nova regra de proteção de ramo +settings.protect_new_rule = Criar uma nova regra de salvaguarda do ramo mirror_use_ssh.helper = O Forgejo irá replicar o repositório via Git sobre SSH e criar um par de chaves para si quando escolher esta opção. Tem que se certificar que a chave pública gerada está autorizada a enviar para o repositório de destino. Não pode usar a autorização baseada numa senha quando escolher isto. mirror_use_ssh.not_available = A autenticação por SSH não está disponível. -issues.new.assign_to_me = Atribuir a mim -issues.all_title = Todas -settings.discord_icon_url.exceeds_max_length = O URL do ícone tem que ter 2048 caracteres ou menos -issues.filter_sort.relevance = Relevância -diff.git-notes.add = Adicionar nota -diff.git-notes.remove-header = Remover nota -diff.git-notes.remove-body = Esta nota irá ser removida. -issues.review.add_review_requests = revisões solicitadas de %[1]s %[2]s -issues.review.remove_review_requests = pedidos de revisão removidos para %[1]s %[2]s -issues.review.add_remove_review_requests = pedidos de revisão de %[1]s e pedidos de revisão removidos para %[2]s %[3]s -pulls.delete_after_merge.head_branch.is_default = O ramo de topo que pretende eliminar é o ramo predefinido e não pode ser eliminado. -pulls.delete_after_merge.head_branch.is_protected = O ramo de topo que pretende eliminar é um ramo protegido e não pode ser eliminado. -pulls.delete_after_merge.head_branch.insufficient_branch = Não tem permissão para eliminar o ramo de topo. -issues.summary_card_alt = Cartão de resumo de uma questão com o título "%s" no repositório %s -issues.num_reviews_one = %d revisão -issues.num_reviews_few = %d revisões -editor.add_tmpl.filename = nome do ficheiro -new_from_template = Utilize um template -settings.default_update_style_desc = Estilo de atualização predefinido utilizado para atualizar pedidos de integração que estão atrasados em relação ao ramo base. -pulls.sign_in_require = Inicie sessão para criar um novo pedido de integração. -new_advanced = Configurações avançadas -new_advanced_expand = Clique para expandir -new_from_template_description = Pode selecionar um modelo de repositório existente nesta instância e aplicar as suas definições. -auto_init_description = Iniciar o histórico do Git com um README e, opcionalmente, adicione os ficheiros License e .gitignore. -issues.reaction.add = Adicionar reação -issues.reaction.alt_few = %[1]s reagiu com %[2]s. -issues.reaction.alt_many = %[1]s e mais %[2]d reagiram com %[3]s. -issues.reaction.alt_remove = Remover reação %[1]s deste comentário. -issues.reaction.alt_add = Adicionar reação %[1]s ao comentário. -issues.context.menu = Menu de comentário -summary_card_alt = Cartão de resumo do repositório %s -release.summary_card_alt = Cartão de resumo de um lançamento com o título "%s" no repositório %s [graphs] component_loading=A carregar %s... @@ -2913,7 +2869,7 @@ settings.permission=Permissões settings.repoadminchangeteam=O administrador do repositório pode adicionar e remover o acesso às equipas settings.visibility=Visibilidade settings.visibility.public=Público -settings.visibility.limited=Limitada (visível apenas para utilizadores regitados) +settings.visibility.limited=Limitada (visível apenas para utilizadores autenticados) settings.visibility.limited_shortname=Limitada settings.visibility.private=Privada (visível apenas para membros da organização) settings.visibility.private_shortname=Privado @@ -3186,8 +3142,8 @@ orgs.members=Membros orgs.new_orga=Nova organização repos.repo_manage_panel=Gerir repositórios -repos.unadopted=Repositórios não adotados -repos.unadopted.no_more=Não foram encontrados repositórios não adotados. +repos.unadopted=Repositórios não adoptados +repos.unadopted.no_more=Não foram encontrados mais repositórios não adoptados repos.owner=Proprietário(a) repos.name=Nome repos.private=Privado @@ -3294,9 +3250,9 @@ auths.oauth2_required_claim_name_helper=Defina este nome para restringir o iníc auths.oauth2_required_claim_value=Valor de reivindicação obrigatório auths.oauth2_required_claim_value_helper=Defina este valor para restringir o início de sessão desta fonte a utilizadores que tenham uma reivindicação com este nome e este valor auths.oauth2_group_claim_name=Reivindicar nome que fornece nomes de grupo para esta fonte. (Opcional) -auths.oauth2_admin_group=Valor da reivindicação de grupo para utilizadores administradores. (Opcional — exige a reivindicação de nome acima) -auths.oauth2_restricted_group=Valor da reivindicação de grupo para utilizadores restritos. (Opcional — exige a reivindicação de nome acima) -auths.oauth2_map_group_to_team=Mapear grupos reclamados em equipas da organização. (Opcional — requer nome de reclamação acima) +auths.oauth2_admin_group=Valor da reivindicação de grupo para utilizadores administradores (opcional — exige a reivindicação de nome acima). +auths.oauth2_restricted_group=Valor da reivindicação de grupo para utilizadores restritos (opcional — exige a reivindicação de nome acima). +auths.oauth2_map_group_to_team=Mapear grupos reclamados em equipas da organização (opcional — requer nome de reclamação acima). auths.oauth2_map_group_to_team_removal=Remover utilizadores das equipas sincronizadas se esses utilizadores não pertencerem ao grupo correspondente. auths.enable_auto_register=Habilitar o registo automático auths.sspi_auto_create_users=Criar utilizadores automaticamente @@ -3536,7 +3492,7 @@ self_check.no_problem_found=Nenhum problema encontrado até agora. self_check.database_collation_mismatch=Supor que a base de dados usa a colação: %s self_check.database_collation_case_insensitive=A base de dados está a usar a colação %s, que é insensível à diferença entre maiúsculas e minúsculas. Embora o Gitea possa trabalhar com ela, pode haver alguns casos raros que não funcionem como esperado. self_check.database_inconsistent_collation_columns=A base de dados está a usar a colação %s, mas estas colunas estão a usar colações diferentes. Isso poderá causar alguns problemas inesperados. -self_check.database_fix_mysql=Para utilizadores do MySQL/MariaDB, pode usar o comando "forgejo doctor convert" para resolver os problemas de colação. Também pode resolver o problema com comandos SQL "ALTER ... COLLATE ..." aplicados manualmente. +self_check.database_fix_mysql=Para utilizadores do MySQL/MariaDB, pode usar o comando "gitea doctor convert" para resolver os problemas de colação. Também pode resolver o problema com comandos SQL "ALTER ... COLLATE ..." aplicados manualmente. config_summary = Resumo auths.tips.gmail_settings = Configurações do Gmail: config_settings = Configurações @@ -3559,7 +3515,6 @@ emails.delete = Eliminar email emails.deletion_success = O endereço de email foi eliminado. emails.delete_primary_email_error = Não pode eliminar o endereço de email principal. emails.delete_desc = Tem a certeza que quer eliminar este endereço de email? -monitor.duration = Duração (s) [action] create_repo=criou o repositório %s @@ -3684,7 +3639,7 @@ alpine.registry=Configure este registo adicionando o URL no seu ficheiro / alpine.registry.key=Descarregue a chave RSA pública do registo para dentro da pasta /etc/apk/keys/ para verificar a assinatura do índice: alpine.registry.info=Escolha $branch e $repository da lista abaixo. alpine.install=Para instalar o pacote, execute o seguinte comando: -alpine.repository=Informações do repositório +alpine.repository=Informação do repositório alpine.repository.branches=Ramos alpine.repository.repositories=Repositórios alpine.repository.architectures=Arquitecturas @@ -3704,9 +3659,9 @@ conda.install=Para instalar o pacote usando o Conda, execute o seguinte comando: container.details.type=Tipo de imagem container.details.platform=Plataforma container.pull=Puxar a imagem usando a linha de comandos: -container.digest=Resumo +container.digest=Resumo: container.multi_arch=S.O. / Arquit. -container.layers=Camadas da imagem +container.layers=Camadas de imagem container.labels=Rótulos container.labels.key=Chave container.labels.value=Valor @@ -3715,7 +3670,7 @@ cran.install=Para instalar o pacote, execute o seguinte comando: debian.registry=Configurar este registo usando a linha de comandos: debian.registry.info=Escolha $distribution e $component da lista abaixo. debian.install=Para instalar o pacote, execute o seguinte comando: -debian.repository=Informações do repositório +debian.repository=Informação do repositório debian.repository.distributions=Distribuições debian.repository.components=Componentes debian.repository.architectures=Arquitecturas @@ -3745,12 +3700,12 @@ rpm.registry=Configurar este registo usando a linha de comandos: rpm.distros.redhat=em distribuições baseadas no RedHat rpm.distros.suse=em distribuições baseadas no SUSE rpm.install=Para instalar o pacote, execute o seguinte comando: -rpm.repository=Informações do repositório +rpm.repository=Informação do repositório rpm.repository.architectures=Arquitecturas rpm.repository.multiple_groups=Este pacote está disponível em vários grupos. rubygems.install=Para instalar o pacote usando o gem, execute o seguinte comando: rubygems.install2=ou adicione-o ao ficheiro Gemfile: -rubygems.dependencies.runtime=Dependências em tempo de execução +rubygems.dependencies.runtime=Dependências do tempo de execução (runtime) rubygems.dependencies.development=Dependências de desenvolvimento rubygems.required.ruby=Requer a versão do Ruby rubygems.required.rubygems=Requer a versão do RubyGem @@ -3811,7 +3766,7 @@ arch.version.provides = Fornece arch.pacman.helper.gpg = Adicionar certificado de confiança para o pacman: arch.pacman.conf = Adicionar servidor com distribuição e arquitectura relacionadas a /etc/pacman.conf : arch.pacman.repo.multi = %s tem a mesma versão em distribuições diferentes. -arch.version.optdepends = Depende opcionalmente +arch.version.optdepends = Dependências opcionais arch.version.depends = Depende de arch.version.makedepends = Dependências do make arch.version.groups = Grupo @@ -3819,8 +3774,6 @@ arch.version.checkdepends = Verificar dependências arch.version.conflicts = Conflitos arch.version.backup = Cópia de segurança arch.version.replaces = Substitui -container.images.title = Imagens -search_in_external_registry = Procurar em %s [secrets] secrets=Segredos @@ -3840,7 +3793,7 @@ management=Gerir segredos [actions] actions=Operações -unit.desc=Gerir sequências CI/CD integradas com Forgejo Actions. +unit.desc=Gerir sequências CI/CD integradas com Forgejo Actions status.unknown=Desconhecido status.waiting=Aguardando @@ -3939,8 +3892,6 @@ workflow.dispatch.trigger_found = Esta sequência de trabalho é despoletada pel workflow.dispatch.success = A execução da sequência de trabalho foi pedida com sucesso. workflow.dispatch.invalid_input_type = Tipo de entrada "%s" inválido. runs.expire_log_message = Os registos foram purgados por serem demasiado antigos. -runs.no_workflows.help_no_write_access = Para aprender sobre Forgejo Actions, vejaa documentação. -runs.no_workflows.help_write_access = Não sabe como começar com o Forgejo Actions? Consulte o início rápido na documentação do utilizador para escrever a sua primeira sequência de trabalho, depois prepare um executor Forgejo para executar os seus trabalhos. [projects] type-1.display_name=Planeamento individual @@ -3950,6 +3901,7 @@ deleted.display_name = Planeamento eliminado [git.filemode] changed_filemode=%[1]s → %[2]s +; Ordered by git filemode value, ascending. E.g. directory has "040000", normal file has "100644", … directory=Pasta normal_file=Ficheiro normal executable_file=Ficheiro executável @@ -3986,8 +3938,6 @@ pull_kind = Procurar pedidos de integração... union = Palavras-chave union_tooltip = Incluir resultados correspondentes a qualquer das palavras-chave separadas por espaços em branco milestone_kind = Procurar etapas... -regexp_tooltip = Interpreta o termo de pesquisa como uma expressão regular -regexp = ExpReg [munits.data] kib = KiB @@ -4004,24 +3954,4 @@ filepreview.line = Linha %[1]d em %[2]s filepreview.truncated = A previsão foi truncada [translation_meta] -test = ok - -[repo.permissions] -code.read = Ler: Aceder e clonar o código-fonte do repositório. -releases.read = Ler: Ver e descarregar lançamentos. -projects.read = Ler: Aceder aos quadros de planeamento do repositório. -projects.write = Escrever: Criar planeamentos e colunas e editá-las. -packages.read = Ler: Ver e descarregar pacotes atribuídos ao repositório. -packages.write = Escrever: Publicar e eliminar pacotes atribuídos ao repositório. -actions.read = Ler: Ver sequências CI/CD integrados e os seus registos. -actions.write = Escrever: Despoletar, reiniciar, cancelar ou aprovar manualmente sequências CI/CD pendentes. -ext_issues = Aceder à ligação para um rastreador de questões externo. As permissões são geridas externamente. -ext_wiki = Aceder à ligação para um wiki externo. As permissões são geridas externamente. -issues.write = Escrever: Fechar questões e gerir metadados, tais como rótulos, etapas, encarregados, datas de vencimento e dependências. -pulls.read = Ler: Ler e criar pedidos de integração. -releases.write = Escrever: Publicar, editar e eliminar lançamentos e seus recursos. -wiki.read = Ler: Ler o wiki integrado e o seu histórico. -wiki.write = Escrever: Criar, modificar e eliminar páginas no wiki integrado. -code.write = Escrever: Enviar para o repositório, criar ramos e etiquetas. -issues.read = Ler: Ler e criar questões e comentários. -pulls.write = Escrever: Fechar pedidos de integração e gerir metadados, tais como rótulos, etapas, encarregados, datas de vencimento e dependências. +test = ok \ No newline at end of file diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini index 5ed8dae67b..0938d4099c 100644 --- a/options/locale/locale_ru-RU.ini +++ b/options/locale/locale_ru-RU.ini @@ -160,13 +160,12 @@ invalid_data = Ðеверные данные: %v copy_generic = Копировать в буфер обмена test = Проверить error413 = Ваша квота иÑчерпана. -new_migrate.link = Выполнить Ð¿ÐµÑ€ÐµÐ½Ð¾Ñ +new_migrate.link = Выполнить миграцию new_org.link = Создать организацию new_repo.title = Ðовый репозиторий -new_migrate.title = Ðовый Ð¿ÐµÑ€ÐµÐ½Ð¾Ñ +new_migrate.title = ÐÐ¾Ð²Ð°Ñ Ð¼Ð¸Ð³Ñ€Ð°Ñ†Ð¸Ñ new_org.title = ÐÐ¾Ð²Ð°Ñ Ð¾Ñ€Ð³Ð°Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ new_repo.link = Создать репозиторий -copy_path = Копировать путь [aria] navbar=Панель навигации @@ -200,12 +199,6 @@ buttons.enable_monospace_font=Включить моноширинный шриф buttons.disable_monospace_font=Выключить моноширинный шрифт buttons.unindent.tooltip = Уменьшить вложенноÑÑ‚ÑŒ на 1 buttons.indent.tooltip = Увеличить вложенноÑÑ‚ÑŒ на 1 -buttons.new_table.tooltip = Создать таблицу -table_modal.label.columns = Кол-во Ñтолбцов -table_modal.header = Создание таблицы -table_modal.placeholder.header = Заголовок -table_modal.placeholder.content = Содержимое -table_modal.label.rows = Кол-во Ñтрок [filter] string.asc=A - Я @@ -234,7 +227,7 @@ license_desc=Ð’ÑÑ‘ Ñто на документацией. +docker_helper=ЕÑли вы запуÑкаете Forgejo под Docker, пожалуйÑта, ознакомьтеÑÑŒ Ñ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ð¸ÐµÐ¹, прежде чем изменÑÑ‚ÑŒ любые наÑтройки. require_db_desc=Forgejo требуетÑÑ MySQL, PostgreSQL, SQLite3 или TiDB (по протоколу MySQL). db_title=ÐаÑтройки базы данных db_type=Тип базы данных @@ -256,9 +249,9 @@ 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_pattern_not_allowed=ÐеподходÑщее Ð¸Ð¼Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратора, оно попадает под шаблон зарезервированных -err_admin_name_is_invalid=ÐеподходÑщее Ð¸Ð¼Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратора +err_admin_name_is_reserved=Ðеверное Ð¸Ð¼Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратора, Ñто Ð¸Ð¼Ñ Ð·Ð°Ñ€ÐµÐ·ÐµÑ€Ð²Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¾ +err_admin_name_pattern_not_allowed=Ðеверное Ð¸Ð¼Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратора, Ð¸Ð¼Ñ Ð¿Ð¾Ð¿Ð°Ð´Ð°ÐµÑ‚ под зарезервированный шаблон +err_admin_name_is_invalid=Ðеверное Ð¸Ð¼Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратора general_title=ОÑновные наÑтройки app_name=Ðазвание Ñервера @@ -267,16 +260,16 @@ repo_path=Путь до каталога репозиториев repo_path_helper=Ð’Ñе удалённые Git репозитории будут Ñохранены в Ñтом каталоге. lfs_path=Путь до корневого каталога Git LFS lfs_path_helper=Ð’ Ñтом каталоге будут хранитьÑÑ Ñ„Ð°Ð¹Ð»Ñ‹ Git LFS. ОÑтавьте пуÑтым, чтобы отключить LFS. -run_user=Работа под пользователем +run_user=Выполнение под пользователем run_user_helper=Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð¾Ð¹ ÑиÑтемы, под которым работает Forgejo. Обратите внимание, что Ñтот пользователь должен иметь доÑтуп к корневому пути репозиториев. domain=Домен Ñервера domain_helper=Домен или Ð°Ð´Ñ€ÐµÑ Ñ…Ð¾Ñта Ð´Ð»Ñ Ñервера. ssh_port=Порт SSH-Ñервера -ssh_port_helper=Ðомер порта, иÑпользуемый Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ñщих подключений по SSH. ОÑтавьте пуÑтым Ð´Ð»Ñ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð´Ð¾Ñтупа по SSH. +ssh_port_helper=Ðомер порта, иÑпользуемый SSH-Ñервером. ОÑтавьте пуÑтым Ð´Ð»Ñ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð´Ð¾Ñтупа по SSH. http_port=Порт HTTP-Ñервера http_port_helper=Ðомер порта, иÑпользуемый веб-Ñервером Forgejo. -app_url=Базовый URL -app_url_helper=Этот параметр влиÑет на URL ÐºÐ»Ð¾Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ð¾ HTTP/HTTPS и на ÑÑылки в уведомлениÑÑ… по Ñл. почте. +app_url=Базовый URL Forgejo +app_url_helper=Этот параметр влиÑет на URL Ð´Ð»Ñ ÐºÐ»Ð¾Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ð¾ HTTP/HTTPS и на некоторые ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾ Ñл. почте. log_root_path=Путь журналов log_root_path_helper=Файлы журнала будут запиÑыватьÑÑ Ð² Ñтот каталог. @@ -284,9 +277,9 @@ optional_title=Дополнительные наÑтройки email_title=ÐаÑтройки Ñл. почты smtp_addr=ÐÐ´Ñ€ÐµÑ SMTP smtp_port=Порт SMTP -smtp_from=Отправитель +smtp_from=ОтправлÑÑ‚ÑŒ пиÑьма от smtp_from_helper=ÐÐ´Ñ€ÐµÑ Ñл. почты, который будет иÑпользоватьÑÑ Forgejo. Введите обычный Ð°Ð´Ñ€ÐµÑ Ñл. почты или иÑпользуйте формат "ИмÑ" . -mailer_user=Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ SMTP +mailer_user=Логин SMTP mailer_password=Пароль SMTP register_confirm=Требовать подтверждение по Ñл. почте Ð´Ð»Ñ Ñ€ÐµÐ³Ð¸Ñтрации mail_notify=Ð£Ð²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾ Ñл. почте @@ -316,11 +309,11 @@ confirm_password=Подтверждение Ð¿Ð°Ñ€Ð¾Ð»Ñ admin_email=ÐÐ´Ñ€ÐµÑ Ñл. почты install_btn_confirm=УÑтановить Forgejo test_git_failed=Ðе удалоÑÑŒ проверить команду «git»: %v -sqlite3_not_available=Эта верÑÐ¸Ñ Forgejo не поддерживает SQLite3. ПожалуйÑта, Ñкачайте официальную Ñборку из %s (не верÑию «gobuild»). +sqlite3_not_available=Эта верÑÐ¸Ñ Forgejo не поддерживает SQLite3. ПожалуйÑта, загрузите официальную бинарную Ñборку из %s (не Ñборку «gobuild»). invalid_db_setting=Ðекорректные наÑтройки базы данных: %v invalid_db_table=Таблица «%s» базы данных некорректна: %v -invalid_repo_path=Ðеверный путь к корню репозиториев: %v -invalid_app_data_path=Ðеверный путь к данным приложениÑ: %v +invalid_repo_path=ÐедопуÑтимый путь к корню репозиториÑ: %v +invalid_app_data_path=Ðеверный путь к приложению: %v run_user_not_match=Текущий пользователь не ÑвлÑетÑÑ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¼ Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка: %s -> %s internal_token_failed=Ðе удалоÑÑŒ Ñоздать внутренний токен: %v secret_key_failed=Ðе удалоÑÑŒ Ñоздать Ñекретный ключ: %v @@ -341,7 +334,7 @@ password_algorithm_helper=Задайте алгоритм Ñ…ÐµÑˆÐ¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ enable_update_checker=Проверка обновлений env_config_keys=ÐаÑтройка Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ env_config_keys_prompt=Следующие переменные Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ Ñ‚Ð°ÐºÐ¶Ðµ будут применены к вашему конфигурационному файлу: -enable_update_checker_helper_forgejo = ПериодичеÑки проверÑÑ‚ÑŒ наличие новых верÑий Forgejo через «TXT» DNS-запиÑÑŒ домена release.forgejo.org. +enable_update_checker_helper_forgejo = ПериодичеÑки проверÑÑ‚ÑŒ наличие новых верÑий Forgejo через DNS-запиÑÑŒ TXT на release.forgejo.org. allow_dots_in_usernames = Разрешить точки в именах пользователей. Это не повлиÑет на уже Ñозданные учётные запиÑи. smtp_from_invalid = ÐÐ´Ñ€ÐµÑ Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ пиÑем некорректен config_location_hint = Эти наÑтройки конфигурации будут Ñохранены в: @@ -360,7 +353,7 @@ my_orgs=Организации my_mirrors=Мои зеркала view_home=Показать %s search_repos=ПоиÑк репозиториÑ… -filter=Прочие фильтры +filter=Другие фильтры filter_by_team_repositories=Фильтровать по репозиториÑм команды feed_of=Лента «%s» @@ -394,8 +387,8 @@ user_no_results=ПодходÑщие пользователи не найден org_no_results=ПодходÑщие организации не найдены. code_no_results=СоответÑтвующий поиÑковому запроÑу иÑходный код не найден. code_search_results=Результаты поиÑка «%s» -code_last_indexed_at=ПоÑледнÑÑ Ð¸Ð½Ð´ÐµÐºÑÐ°Ñ†Ð¸Ñ %s -relevant_repositories_tooltip=Скрыты Ð¾Ñ‚Ð²ÐµÑ‚Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸ репозитории, не имеющие ни темы, ни значка, ни опиÑаниÑ. +code_last_indexed_at=ПоÑледний проиндекÑированный %s +relevant_repositories_tooltip=Репозитории, ÑвлÑющиеÑÑ Ð¾Ñ‚Ð²ÐµÑ‚Ð²Ð»ÐµÐ½Ð¸Ñми или не имеющие ни темы, ни значка, ни опиÑаниÑ, Ñкрыты. relevant_repositories=Показаны только релевантные репозитории, показать результаты без фильтрации. forks_one = %d ответвление forks_few = %d ответвлений @@ -418,7 +411,7 @@ sign_up_successful=Ð£Ñ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ уÑпешно Ñоздана. Д confirmation_mail_sent_prompt=Ðовое пиÑьмо Ð´Ð»Ñ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð±Ñ‹Ð»Ð¾ отправлено на %s. Ð”Ð»Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ Ñ€ÐµÐ³Ð¸Ñтрации, пожалуйÑта, перейдите по ÑÑылке внутри в течение %s. ЕÑли был введён неправильный адреÑ, вы можете войти и изменить его. must_change_password=Обновите пароль allow_password_change=Требовать Ñмену Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¼ (рекомендуетÑÑ) -reset_password_mail_sent_prompt=ПиÑьмо Ð´Ð»Ñ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð±Ñ‹Ð»Ð¾ отправлено на %s. Чтобы завершить процеÑÑ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ запиÑи, перейдите по указанной в нём ÑÑылке в течение %s. +reset_password_mail_sent_prompt=ПиÑьмо Ð´Ð»Ñ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð±Ñ‹Ð»Ð¾ отправлено на %s. Чтобы выполнить воÑÑтановление учётной запиÑи, перейдите по ÑÑылке внутри в течение %s. active_your_account=ÐÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ запиÑи account_activated=Ð£Ñ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ активирована prohibit_login=Ð£Ñ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ приоÑтановлена @@ -483,8 +476,6 @@ sign_up_button = ЗарегиÑтрироватьÑÑ. back_to_sign_in = Ðазад ко входу sign_in_openid = Продолжить Ñ OpenID hint_login = Уже еÑÑ‚ÑŒ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ? Войдите! -unauthorized_credentials = Учётные данные неверны или иÑтекли. Попробуйте повторить команду или ознакомьтеÑÑŒ Ñ Ð¿Ð¾Ð´Ñ€Ð¾Ð±Ð½Ð¾ÑÑ‚Ñми по ÑÑылке: %s -use_onetime_code = ИÑпользовать одноразовый код [mail] view_it_on=ПоÑмотреть на %s @@ -523,10 +514,10 @@ issue.action.push_n=@%[1]s отправил(а) %[3]d изменений issue.action.close=@%[1]s закрыл(а) #%[2]d. issue.action.reopen=@%[1]s переоткрыл(а) #%[2]d. issue.action.merge=@%[1]s Ñлил(а) #%[2]d в %[3]s. -issue.action.approve=@%[1]s ÑлиÑние одобрено. +issue.action.approve=@%[1]s одобрил(а) Ñтот Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° ÑлиÑние. issue.action.reject=@%[1]s запроÑил(а) Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² Ñтом запроÑе на ÑлиÑние. issue.action.review=@%[1]s прокомментировал(а) Ñтот Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° ÑлиÑние. -issue.action.review_dismissed=@%[1]s отклонена поÑледнÑÑ Ñ€ÐµÑ†ÐµÐ½Ð·Ð¸Ñ Ñ %[2]s Ð´Ð»Ñ Ñтого запроÑа на ÑлиÑние. +issue.action.review_dismissed=@%[1]s отклонил(а) поÑледний отзыв Ñ %[2]s Ð´Ð»Ñ Ñтого запроÑа на ÑлиÑние. issue.action.ready_for_review=@%[1]s отметил(а) Ñтот Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° ÑлиÑние как готовый к раÑÑмотрению. issue.action.new=@%[1]s Ñоздал(а) #%[2]d. issue.in_tree_path=Ð’ %s: @@ -687,13 +678,13 @@ change_avatar=Изменить изображение профилÑ… joined_on=РегиÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ %s repositories=Репозитории activity=ÐŸÑƒÐ±Ð»Ð¸Ñ‡Ð½Ð°Ñ Ð°ÐºÑ‚Ð¸Ð²Ð½Ð¾ÑÑ‚ÑŒ -followers_few=%d подпиÑчиков +followers_few=%d подпиÑчики starred=Избранные репозитории watched=ОтÑлеживаемые репозитории code=Код projects=Проекты overview=Обзор -following_few=%d подпиÑок +following_few=%d подпиÑки follow=ПодпиÑатьÑÑ unfollow=ОтпиÑатьÑÑ user_bio=О Ñебе @@ -724,7 +715,6 @@ public_activity.visibility_hint.self_public = Ваша активноÑÑ‚ÑŒ ви public_activity.visibility_hint.self_private = Ваша активноÑÑ‚ÑŒ видна только вам и админиÑтраторам Ñервера. Изменить. public_activity.visibility_hint.admin_private = Эта активноÑÑ‚ÑŒ доÑтупна вам, потому что вы админиÑтратор. Этот пользователь желает, чтобы она оÑталаÑÑŒ чаÑтной. public_activity.visibility_hint.admin_public = Эта активноÑÑ‚ÑŒ доÑтупна вÑем, но вы, как админиÑтратор, также видите дейÑÑ‚Ð²Ð¸Ñ Ð² приватных меÑтах. -public_activity.visibility_hint.self_private_profile = Ваша активноÑÑ‚ÑŒ видна только вам и админиÑтраторам Ñервера, потому что ваш профиль Ñкрыт. Изменить. [settings] profile=Профиль @@ -746,9 +736,9 @@ uid=UID webauthn=Ð”Ð²ÑƒÑ…Ñ„Ð°ÐºÑ‚Ð¾Ñ€Ð½Ð°Ñ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ñ (ключами безопаÑноÑти) public_profile=Публичный профиль -biography_placeholder=Кратко раÑÑкажите о Ñебе другим! (Можно иÑпользовать Markdown) +biography_placeholder=РаÑÑкажите немного о Ñебе! (Можно иÑпользовать Markdown) location_placeholder=ПуÑÑ‚ÑŒ вÑе знают, откуда вы -profile_desc=Ваш профиль +profile_desc=Как ваш профиль будет отображатьÑÑ Ð´Ð»Ñ Ð´Ñ€ÑƒÐ³Ð¸Ñ… пользователей. Ваш оÑновной Ð°Ð´Ñ€ÐµÑ Ñл. почты будет иÑпользоватьÑÑ Ð´Ð»Ñ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ð¹, воÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð¸ веб-операций Ñ Git. password_username_disabled=Ðелокальным пользователÑм запрещено изменение их имени пользователÑ. Ð”Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð±Ð¾Ð»ÐµÐµ подробной информации обратитеÑÑŒ к админиÑтратору Ñайта. full_name=Полное Ð¸Ð¼Ñ website=Веб-Ñайт @@ -810,10 +800,10 @@ password_change_disabled=Ðелокальные учётные запиÑи не emails=ÐдреÑа Ñл. почты manage_emails=Управление адреÑами Ñл. почты -manage_themes=Тема интерфейÑа +manage_themes=Тема по умолчанию manage_openid=ÐдреÑа OpenID email_desc=Ваш оÑновной Ð°Ð´Ñ€ÐµÑ Ñл. почты будет иÑпользоватьÑÑ Ð´Ð»Ñ ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ð¹, воÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð¸, еÑли он не Ñкрыт, Ð´Ð»Ñ Ð´ÐµÐ¹Ñтвий Ñ Git в веб-интерфейÑе. -theme_desc=Эта тема Ð¾Ñ„Ð¾Ñ€Ð¼Ð»ÐµÐ½Ð¸Ñ Ð±ÑƒÐ´ÐµÑ‚ иÑпользоватьÑÑ Ð¿Ñ€Ð¸ входе на Ñайт под Ñтой учётной запиÑью. +theme_desc=Это будет темой по умолчанию Ð´Ð»Ñ Ð²Ñего Ñайта. primary=ОÑновной activated=Ðктивирован requires_activation=ТребуетÑÑ Ð°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ð¸Ñ @@ -941,7 +931,7 @@ select_permissions=Выбрать Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ permission_no_access=Ðет доÑтупа permission_read=Чтение permission_write=Чтение и запиÑÑŒ -access_token_desc=Выбранные облаÑти дейÑÑ‚Ð²Ð¸Ñ Ñ‚Ð¾ÐºÐµÐ½Ð° ограничивают его иÑпользование до ÑоответÑтвующих маршрутов API. Ð”Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð´Ñ€Ð¾Ð±Ð½Ð¾Ñтей ознакомьтеÑÑŒ Ñ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ð¸ÐµÐ¹ . +access_token_desc=Выбранные облаÑти дейÑÑ‚Ð²Ð¸Ñ Ñ‚Ð¾ÐºÐµÐ½Ð° ограничивают авторизацию только ÑоответÑтвующими маршрутами API. Читайте документацию Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ информации. at_least_one_permission=Ðеобходимо выбрать Ñ…Ð¾Ñ‚Ñ Ð±Ñ‹ одно разрешение Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ñ‚Ð¾ÐºÐµÐ½Ð° permissions_list=РазрешениÑ: @@ -949,7 +939,7 @@ manage_oauth2_applications=Управление приложениÑми OAuth2 edit_oauth2_application=Изменить приложение OAuth2 oauth2_applications_desc=ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ OAuth2 позволÑет Ñтороннему приложению к безопаÑно аутентифицировать пользователей данной уÑтановки Forgejo. remove_oauth2_application=Удаление Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ OAuth2 -remove_oauth2_application_desc=Удаление Ñтого Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¾Ñ‚Ð¼ÐµÐ½Ð¸Ñ‚ доÑтуп ко вÑем подпиÑанным токенам доÑтупа. Продолжить? +remove_oauth2_application_desc=Удаление Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ OAuth2 отменит доÑтуп ко вÑем подпиÑанным токенам доÑтупа. Продолжить? remove_oauth2_application_success=Приложение было уÑпешно удалено. create_oauth2_application=Создать новое приложение OAuth2 create_oauth2_application_button=Создать приложение @@ -1028,8 +1018,8 @@ visibility=ВидимоÑÑ‚ÑŒ Ð¿Ñ€Ð¾Ñ„Ð¸Ð»Ñ visibility.public=Публичный visibility.public_tooltip=Виден вÑем, кто может открыть Ñтот Ñайт visibility.limited=Ограниченный -visibility.limited_tooltip=Виден только зарегиÑтрированным пользователÑм -visibility.private=Скрытый +visibility.limited_tooltip=Виден только зарегиÑтрированным пользователÑм Ñайта +visibility.private=ЧаÑтный visibility.private_tooltip=Виден только учаÑтникам организаций, в которых вы ÑоÑтоите blocked_users_none = Заблокированных пользователей нет. user_block_success = Пользователь заблокирован. @@ -1040,23 +1030,21 @@ blocked_since = Заблокирован Ñ %s user_unblock_success = Пользователь разблокирован. twofa_scratch_token_regenerated = Ваш одноразовый ключ воÑÑтановлениÑ: %s. Сохраните его в надёжном меÑте. Больше он показан не будет. blocked_users = Заблокированные пользователи -keep_email_private_popup = Ваш Ð°Ð´Ñ€ÐµÑ Ñл. почты не будет видим в профиле и не будет иÑпользован по умолчанию Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð¾Ð² из веб-интерфейÑа, таких как загрузка и редактирование файлов, а также Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð¾Ð² ÑлиÑний. ВмеÑто него Ð´Ð»Ñ ÑвÑзи коммитов Ñ ÑƒÑ‡. запиÑью можно иÑпользовать Ñпециальный Ð°Ð´Ñ€ÐµÑ %s. Изменение данной наÑтройки не изменит Ð°Ð´Ñ€ÐµÑ Ð² ÑущеÑтвующих коммитах. +keep_email_private_popup = Ваш Ð°Ð´Ñ€ÐµÑ Ñл. почты будет Ñкрыт из профилÑ. Он больше не будет иÑпользоватьÑÑ Ð¿Ð¾ умолчанию Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð¾Ð², Ñделанных из веб-интерфейÑа, таких как загрузки и Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð² и не будет иÑпользоватьÑÑ Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð¾Ð² запроÑов на ÑлиÑние. ВмеÑто него можно будет иÑпользовать Ñпециальный Ð°Ð´Ñ€ÐµÑ %s, чтобы приÑваивать коммиты Ñ Ð²Ð°ÑˆÐ¸Ð¼ аккаунтом. Обратите внимание на то, что изменение данной наÑтройки не повлиÑет на ÑущеÑтвующие коммиты. oauth2_confidential_client = Конфиденциальный клиент. Выберите Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹, хранÑщих Ñекрет в тайне, например, Ð´Ð»Ñ Ð²ÐµÐ±-приложений. Ðе выбирайте Ð´Ð»Ñ Ð½Ð°Ñ‚Ð¸Ð²Ð½Ñ‹Ñ… приложений, Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð´Ð»Ñ ÐŸÐš или Ñмартфонов. change_password = Изменение Ð¿Ð°Ñ€Ð¾Ð»Ñ hints = ПодÑказки additional_repo_units_hint = Предлагать включить больше разделов в репозиториÑÑ… update_hints = Обновить подÑказки update_hints_success = ПодÑказки обновлены. -additional_repo_units_hint_description = Показывать подÑказку "Включить больше разделов" в репозиториÑÑ…, в которых включены не вÑе разделы. +additional_repo_units_hint_description = Показывать кнопку "Добавить больше разделов" в репозиториÑÑ…, в которых включены не вÑе разделы. pronouns_custom = Другие pronouns = МеÑÑ‚Ð¾Ð¸Ð¼ÐµÐ½Ð¸Ñ pronouns_unspecified = Ðе указаны -language.title = Язык интерфейÑа +language.title = Язык по умолчанию keep_activity_private.description = Ваша Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ð°Ñ Ð°ÐºÑ‚Ð¸Ð²Ð½Ð¾ÑÑ‚ÑŒ будет видна только вам и админиÑтраторам Ñервера. language.description = Выбранный Ñзык будет Ñохранён в вашей уч. запиÑи и будет иÑпользован по умолчанию поÑле входа. language.localization_project = Помогите Ñ Ð¿ÐµÑ€ÐµÐ²Ð¾Ð´Ð¾Ð¼ Forgejo на Ñвой Ñзык! Подробнее. -user_block_yourself = ÐÐµÐ»ÑŒÐ·Ñ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ ÑебÑ. -pronouns_custom_label = Другие меÑÑ‚Ð¾Ð¸Ð¼ÐµÐ½Ð¸Ñ [repo] owner=Владелец @@ -1067,11 +1055,11 @@ repo_size=Размер Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ size_format = `%[1]s: %[2]s; %[3]s: %[4]s` template=Шаблон template_select=Выберите шаблон -template_helper=Пометить репозиторий как шаблон +template_helper=Сделать репозиторий шаблоном template_description=Шаблонные репозитории дают возможноÑÑ‚ÑŒ пользователÑм Ñоздавать новые репозитории Ñ Ñ‚Ð¾Ð¹ же Ñтруктурой каталогов, файлами и дополнительными наÑтройками. visibility=ВидимоÑÑ‚ÑŒ -visibility_description=Он будет видим только владельцу организации и её учаÑтникам при наличии прав. -visibility_helper=ЧаÑтный репозиторий +visibility_description=Это увидÑÑ‚ только владелец организации или учаÑтники при наличии прав. +visibility_helper=Сделать репозиторий приватным visibility_helper_forced=ÐдминиÑтратор Ñайта наÑтроил параметр видимоÑти новых репозиториев. Репозиторий приватный по умолчанию. visibility_fork_helper=(Это изменит видимоÑÑ‚ÑŒ вÑех ответвлений.) clone_helper=Ðужна помощь в клонировании? ПоÑетите Ñтраницу помощи. @@ -1093,16 +1081,16 @@ repo_desc=ОпиÑание repo_desc_helper=Добавьте краткое опиÑание (необÑзательно) repo_lang=Язык repo_gitignore_helper=Выберите шаблоны .gitignore -repo_gitignore_helper_desc=Выберите шаблоны из ÑпиÑка Ð´Ð»Ñ Ð¿Ð¾Ð¿ÑƒÐ»Ñрных Ñзыков. .gitignore определÑет, какие файлы не надо отÑлеживать в проекте. По умолчанию в него включены типичные артефакты, Ñоздаваемые инÑтрументами Ñборки каждого Ñзыка. +repo_gitignore_helper_desc=Выберите из ÑпиÑка шаблонов Ð´Ð»Ñ Ð¿Ð¾Ð¿ÑƒÐ»Ñрных Ñзыков , какие файлы не надо отÑлеживать. По умолчанию в .gitignore включены типичные артефакты, Ñоздаваемые инÑтрументами Ñборки каждого Ñзыка. issue_labels=Метки issue_labels_helper=Выберите набор меток license=Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ license_helper=Выберите лицензию -license_helper_desc=Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ñет, что другие могут и не могут делать Ñ Ð²Ð°ÑˆÐ¸Ð¼ кодом. Ðе знаете, ÐºÐ°ÐºÐ°Ñ Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ Ð¿Ð¾Ð´Ð¾Ð¹Ð´Ñ‘Ñ‚ Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ проекта? ОзнакомьтеÑÑŒ Ñ Ð’Ñ‹Ð±Ð¾Ñ€Ð¾Ð¼ лицензии. +license_helper_desc=Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ñет, что другие люди могут, а что не могут делать Ñ Ð²Ð°ÑˆÐ¸Ð¼ кодом. Ðе уверены, ÐºÐ°ÐºÐ°Ñ Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ Ð¿Ð¾Ð´Ñ…Ð¾Ð´Ð¸Ñ‚ Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ проекта? Смотрите Выберите лицензию. readme=README readme_helper=Выберите шаблон README readme_helper_desc=Это меÑто, где вы можете напиÑать подробное опиÑание вашего проекта. -auto_init=Инициализировать репозиторий +auto_init=Инициализировать репозиторий (ДобавлÑет .gitignore, LICENSE and README) trust_model_helper=Выберите модель Ð´Ð¾Ð²ÐµÑ€Ð¸Ñ Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ подпиÑи. Возможные варианты: trust_model_helper_collaborator=СоучаÑтник: доверÑÑ‚ÑŒ подпиÑÑм ÑоучаÑтников trust_model_helper_committer=Ðвтор коммита: доверÑÑ‚ÑŒ подпиÑÑм, ÑоответÑтвующим авторам коммитов @@ -1171,8 +1159,8 @@ template.issue_labels=Метки задач template.one_item=Ðеобходимо выбрать Ñ…Ð¾Ñ‚Ñ Ð±Ñ‹ один Ñлемент шаблона template.invalid=Ðеобходимо выбрать шаблон Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ -archive.issue.nocomment=Этот репозиторий архивирован. Комментирование в задачах невозможно. -archive.pull.nocomment=Этот репозиторий архивирован. Комментирование в запроÑах ÑлиÑний невозможно. +archive.issue.nocomment=Этот репозиторий в архиве. Ð’Ñ‹ не можете комментировать задачи. +archive.pull.nocomment=Это репозиторий в архиве. Ð’Ñ‹ не можете комментировать запроÑÑ‹ на ÑлиÑние. form.reach_limit_of_creation_1=ДоÑтигнуто ограничение на количеÑтво репозиториев: %d. form.reach_limit_of_creation_n=ДоÑтигнуто ограничение на количеÑтво репозиториев: %d. @@ -1198,7 +1186,7 @@ migrate_items_releases=ВыпуÑки migrate_repo=ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ migrate.clone_address=ÐŸÐµÑ€ÐµÐ½Ð¾Ñ / Клонирование по URL migrate.clone_address_desc=HTTP/HTTPS или Git Ð°Ð´Ñ€ÐµÑ ÑущеÑтвующего Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ -migrate.github_token_desc=Ð’Ñ‹ можете указать один или неÑколько разделенных запÑтыми токенов, чтобы уÑкорить Ð¿ÐµÑ€ÐµÐ½Ð¾Ñ Ð·Ð° Ñчёт обхода ограничений чаÑтоты обращений к API GitHub. ПРЕДУПРЕЖДЕÐИЕ: злоупотребление Ñтой функцией может нарушить уÑÐ»Ð¾Ð²Ð¸Ñ Ð¿Ñ€ÐµÐ´Ð¾ÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð¸Ñ ÑƒÑлуг и привеÑти к блокировке учётной запиÑи. +migrate.github_token_desc=Ð’Ñ‹ можете помеÑтить один или неÑколько токенов, разделенных запÑтыми, чтобы уÑкорить миграцию, обходом ограничений ÑкороÑти API GitHub. ПРЕДУПРЕЖДЕÐИЕ: злоупотребление Ñтой функцией может нарушить политику поÑтавщика уÑлуг и привеÑти к блокировке учётной запиÑи. migrate.clone_local_path=или локальный путь на Ñервере migrate.permission_denied=У Ð²Ð°Ñ Ð½ÐµÑ‚ прав на импорт локальных репозиториев. migrate.permission_denied_blocked=Ð’Ñ‹ не можете импортировать Ñ Ð·Ð°Ð¿Ñ€ÐµÑ‰Ñ‘Ð½Ð½Ñ‹Ñ… хоÑтов, пожалуйÑта, попроÑите админиÑтратора проверить наÑтройки ALLOWED_DOMAINS/ALLOW_LOCALNETWORKS/BLOCKED_DOMAINS. @@ -1211,7 +1199,7 @@ migrated_from_fake=ПеренеÑено из %[1]s migrate.migrate=ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ð¸Ð· %s migrate.migrating=ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ð¸Ð· %s... migrate.migrating_failed=ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ð¸Ð· %s не удалÑÑ. -migrate.migrating_failed.error=Ðе удалоÑÑŒ перенеÑти: %s +migrate.migrating_failed.error=Ðе удалоÑÑŒ мигрировать: %s migrate.migrating_failed_no_addr=ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ð½Ðµ удалÑÑ. migrate.github.description=ПеренеÑите данные Ñ github.com или Ñервера GitHub Enterprise. migrate.git.description=ПеренеÑти только репозиторий из любого Git ÑервиÑа. @@ -1229,7 +1217,7 @@ migrate.migrating_releases=ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ð²Ñ‹Ð¿ÑƒÑков migrate.migrating_issues=ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ð·Ð°Ð´Ð°Ñ‡ migrate.migrating_pulls=ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñов на ÑлиÑние migrate.cancel_migrating_title=Отменить Ð¿ÐµÑ€ÐµÐ½Ð¾Ñ -migrate.cancel_migrating_confirm=Ð’Ñ‹ хотите отменить переноÑ? +migrate.cancel_migrating_confirm=Ð’Ñ‹ хотите отменить Ñту миграцию? mirror_from=зеркало из forked_from=ответвлён от @@ -1339,7 +1327,7 @@ editor.or=или editor.cancel_lower=Отменить editor.commit_signed_changes=ЗафикÑировать подпиÑанные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ editor.commit_changes=Сохранить правки -editor.add_tmpl=Добавить «<%s>» +editor.add_tmpl=Добавить «» editor.add=Добавить %s editor.update=Обновить %s editor.delete=Удалить %s @@ -1349,8 +1337,8 @@ editor.fail_to_apply_patch=Ðевозможно применить патч «%s editor.new_patch=ÐÐ¾Ð²Ð°Ñ Ð¿Ñ€Ð°Ð²ÐºÐ° editor.commit_message_desc=Добавьте необÑзательное раÑширенное опиÑание… editor.signoff_desc=Добавить трейлер Signed-off-by Ñ Ð°Ð²Ñ‚Ð¾Ñ€Ð¾Ð¼ коммита в конце ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð¼Ð¸Ñ‚Ð°. -editor.commit_directly_to_this_branch=Сохранить коммит напрÑмую в ветвь %[1]s. -editor.create_new_branch=Сохранить коммит в новую ветвь и начать Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° ÑлиÑние. +editor.commit_directly_to_this_branch=Сделайте коммит напрÑмую в ветвь %s. +editor.create_new_branch=Создайте новую ветвь Ð´Ð»Ñ Ñтого коммита, и Ñделайте Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° ÑлиÑние. editor.create_new_branch_np=Создать новую ветвь Ð´Ð»Ñ Ñтого коммита. editor.propose_file_change=Предложить изменение файла editor.new_branch_name=Укажите название новой ветви Ð´Ð»Ñ Ñтого коммита @@ -1418,7 +1406,7 @@ commitstatus.failure=Ðеудача commitstatus.pending=Ожидание commitstatus.success=УÑпешно -ext_issues=Внешние задачи +ext_issues=ДоÑтуп ко внешним задачам ext_issues.desc=СÑылка на внешнюю ÑиÑтему отÑÐ»ÐµÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ Ð·Ð°Ð´Ð°Ñ‡. projects=Проекты @@ -1599,9 +1587,9 @@ issues.no_content=ОпиÑание отÑутÑтвует. issues.close=Закрыть задачу issues.comment_pull_merged_at=коммит %[1]s был добавлен в %[2]s %[3]s issues.comment_manually_pull_merged_at=коммит %[1]s был вручную добавлен в %[2]s %[3]s -issues.close_comment_issue=Закрыть комментарием +issues.close_comment_issue=Прокомментировать и закрыть issues.reopen_issue=Открыть Ñнова -issues.reopen_comment_issue=Открыть Ñнова комментарием +issues.reopen_comment_issue=Прокомментировать и открыть Ñнова issues.create_comment=Комментировать issues.closed_at=`задача была закрыта %[2]s` issues.reopened_at=`задача была открыта Ñнова %[2]s` @@ -1626,9 +1614,9 @@ issues.role.first_time_contributor_helper=Это первое учаÑтие п issues.role.contributor=Соавтор issues.re_request_review=Повторить Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° отзыв issues.is_stale=Со времени Ñтого обзора в Ñтот PR были внеÑены некоторые Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ -issues.remove_request_review=Отменить Ð·Ð°Ð¿Ñ€Ð¾Ñ Ñ€ÐµÑ†ÐµÐ½Ð·Ð¸Ð¸ -issues.remove_request_review_block=Ðе удалоÑÑŒ отменить Ð·Ð°Ð¿Ñ€Ð¾Ñ Ñ€ÐµÑ†ÐµÐ½Ð·Ð¸Ð¸ -issues.dismiss_review=Отклонить рецензию +issues.remove_request_review=Удалить Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° отзыв +issues.remove_request_review_block=Ðевозможно удалить Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° отзыв +issues.dismiss_review=Отклонить отзыв issues.dismiss_review_warning=Ð’Ñ‹ уверены, что хотите отклонить Ñту рецензию? issues.sign_in_require_desc=Войдите, чтобы приÑоединитьÑÑ Ðº обÑуждению. issues.edit=Изменить @@ -1714,15 +1702,15 @@ issues.error_modifying_due_date=Ðе удалоÑÑŒ изменить Ñрок в issues.error_removing_due_date=Ðе удалоÑÑŒ убрать Ñрок выполнениÑ. issues.push_commit_1=добавлен %d коммит %s issues.push_commits_n=добавлены %d коммита(ов) %s -issues.force_push_codes=`форÑированное обновление изменений %[1]s %[4]s вмеÑто %[2]s %[6]s` +issues.force_push_codes=`форÑированное обновление изменений %[1]s %[4]s вмеÑто %[2]s %[6]s` issues.force_push_compare=Сравнить issues.due_date_form=гггг-мм-дд issues.due_date_form_add=Добавить Ñрок Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ issues.due_date_form_edit=Изменить issues.due_date_form_remove=Удалить issues.due_date_not_set=Срок Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð½Ðµ уÑтановлен. -issues.due_date_added=добавлен Ñрок Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ â€“ %s, %s -issues.due_date_modified=Ñрок Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½Ñ‘Ð½ Ñ %[2]s на %[1]s %[3]s +issues.due_date_added=добавлен Ñрок Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ %s %s +issues.due_date_modified=Ñрок Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€ÐµÐ´Ð²Ð¸Ð½ÑƒÑ‚ Ñ %[2]s на %[1]s %[3]s issues.due_date_remove=убран Ñрок Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ %s %s issues.due_date_overdue=ПроÑроченные issues.due_date_invalid=Срок Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð½ÐµÐ´ÐµÐ¹Ñтвителен или находитÑÑ Ð·Ð° пределами допуÑтимого диапазона. ПожалуйÑта, иÑпользуйте формат «гггг-мм-дд». @@ -1759,17 +1747,17 @@ issues.dependency.add_error_cannot_create_circular=Ð’Ñ‹ не можете Ñоз issues.dependency.add_error_dep_not_same_repo=Обе задачи должны находитьÑÑ Ð² одном репозитории. issues.review.self.approval=Ð’Ñ‹ не можете одобрить ÑобÑтвенный Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° ÑлиÑние. issues.review.self.rejection=Ðевозможно запрашивать Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñвоего запроÑа на ÑлиÑние. -issues.review.approve=Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¾Ð´Ð¾Ð±Ñ€ÐµÐ½Ñ‹ %s -issues.review.comment=оÑтавлена Ñ€ÐµÑ†ÐµÐ½Ð·Ð¸Ñ %s -issues.review.dismissed=отклонена Ñ€ÐµÑ†ÐµÐ½Ð·Ð¸Ñ %s %s +issues.review.approve=одобрил(а) Ñти Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ %s +issues.review.comment=раÑÑмотрел(а) Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ %s +issues.review.dismissed=отклонил(а) отзыв %s %s issues.review.dismissed_label=Отклонено issues.review.left_comment=оÑтавил комментарий issues.review.content.empty=Ð—Ð°Ð¿Ñ€Ð°ÑˆÐ¸Ð²Ð°Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ, вы обÑзаны оÑтавить комментарий Ñ Ð¿Ð¾ÑÑнением Ñвоих пожеланий отноÑительно запроÑа на ÑлиÑние. -issues.review.reject=запрошены Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ %s +issues.review.reject=запроÑил(а) Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ %s issues.review.wait=был запрошен Ð´Ð»Ñ Ð¾Ñ‚Ð·Ñ‹Ð²Ð° %s -issues.review.add_review_request=запрошена Ñ€ÐµÑ†ÐµÐ½Ð·Ð¸Ñ Ð¾Ñ‚ %[1]s %[2]s -issues.review.remove_review_request=отменён Ð·Ð°Ð¿Ñ€Ð¾Ñ Ñ€ÐµÑ†ÐµÐ½Ð·Ð¸Ð¸ от %[1]s %[2]s -issues.review.remove_review_request_self=отказ от Ñ€ÐµÑ†ÐµÐ½Ð·Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ %s +issues.review.add_review_request=запроÑил(а) отзыв от %s %s +issues.review.remove_review_request=удалил(а )заÑвку на отзыв Ð´Ð»Ñ %s %s +issues.review.remove_review_request_self=отказалÑÑ Ð´Ð¾Ð±Ð°Ð²Ð»ÑÑ‚ÑŒ отзыв %s issues.review.pending=Ожидание issues.review.pending.tooltip=Этот комментарий в наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ð½Ðµ виден другим пользователÑм. Чтобы отправить отложенные комментарии, выберите «%s» → «%s/%s/%s» в верхней чаÑти Ñтраницы. issues.review.review=Ð ÐµÑ†ÐµÐ½Ð·Ð¸Ñ @@ -1825,8 +1813,8 @@ pulls.nothing_to_compare=Ðечего Ñравнивать, родительÑк pulls.nothing_to_compare_and_allow_empty_pr=Ветви идентичны. Этот PR будет пуÑтым. pulls.has_pull_request=`Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° ÑлиÑние Ñтих ветвей уже ÑущеÑтвует: %[2]s#%[3]d` pulls.create=Создать Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° ÑлиÑние -pulls.title_desc_one=хочет влить %[1]d коммит из %[2]s в %[3]s -pulls.title_desc_few=хочет влить %[1]d коммит(ов) из %[2]s в %[3]s +pulls.title_desc_one=хочет влить %[1]d коммит из %[2]s в %[3]s +pulls.title_desc_few=хочет влить %[1]d коммит(ов) из %[2]s в %[3]s pulls.merged_title_desc_one=Ñлит %[1]d коммит из %[2]s в %[3]s %[4]s pulls.merged_title_desc_few=Ñлито %[1]d коммит(ов) из %[2]s в %[3]s %[4]s pulls.change_target_branch_at=`изменил(а) целевую ветвь Ñ %s на %s %s` @@ -1834,7 +1822,7 @@ pulls.tab_conversation=ОбÑуждение pulls.tab_commits=Коммиты pulls.tab_files=Изменённые файлы pulls.reopen_to_merge=ПожалуйÑта, переоткройте Ñтот Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° ÑлиÑние Ð´Ð»Ñ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÑлиÑниÑ. -pulls.cant_reopen_deleted_branch=Этот Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° ÑлиÑние не может быть открыт повторно, потому что ветвь была удалена. +pulls.cant_reopen_deleted_branch=Этот Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° ÑлиÑние не может быть открыт заново, потому что ветвь была удалена. pulls.merged=Слито pulls.merged_success=Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° ÑлиÑние удовлетворён и закрыт pulls.closed=Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° ÑлиÑние закрыт @@ -1908,7 +1896,7 @@ pulls.update_branch_rebase=Обновить ветвь перебазирова pulls.update_branch_success=Ветвь уÑпешно обновлена pulls.update_not_allowed=ÐедоÑтаточно прав Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð²ÐµÑ‚Ð²Ð¸ pulls.outdated_with_base_branch=Эта ветвь отÑтает от базовой ветви -pulls.close=Закрыть Ð·Ð°Ð¿Ñ€Ð¾Ñ ÑлиÑÐ½Ð¸Ñ +pulls.close=Закрыть Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° ÑлиÑние pulls.closed_at=`закрыл Ñтот Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° ÑлиÑние %[2]s` pulls.reopened_at=`переоткрыл Ñтот Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° ÑлиÑние %[2]s` pulls.cmd_instruction_hint=Показать инÑтрукции Ð´Ð»Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹ Ñтроки @@ -1930,7 +1918,7 @@ pulls.auto_merge_newly_scheduled_comment=`запланировал Ñтот за pulls.auto_merge_canceled_schedule_comment=`отменил автоматичеÑкое ÑлиÑние Ñтого запроÑа поÑле Ð¿Ñ€Ð¾Ñ…Ð¾Ð¶Ð´ÐµÐ½Ð¸Ñ Ð²Ñех проверок %[1]s` pulls.delete.title=Удалить Ñтот Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° ÑлиÑние? -pulls.delete.text=Ð’Ñ‹ точно хотите удалить Ñтот Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° ÑлиÑние? (Это навÑегда удалит вÑÑ‘ его Ñодержимое. Возможно, будет лучше закрыть его в архивных целÑÑ…) +pulls.delete.text=Ð’Ñ‹ точно хотите удалить Ñтот Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° ÑлиÑние? (Это навÑегда удалит вÑÑ‘ его Ñодержимое. Возможно, лучше закрыть его в архивных целÑÑ…) pull.deleted_branch=(удалена):%s @@ -1976,7 +1964,7 @@ signing.wont_sign.commitssigned=СлиÑние не будет подпиÑан signing.wont_sign.approved=СлиÑние не будет подпиÑано, так как Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° ÑлиÑние не одобрен. signing.wont_sign.not_signed_in=Ð’Ñ‹ не вошли в ÑиÑтему. -ext_wiki=ВнешнÑÑ Ð²Ð¸ÐºÐ¸ +ext_wiki=ДоÑтуп ко внешней вики ext_wiki.desc=СÑылка на внешнюю вики. wiki=Вики @@ -2071,7 +2059,8 @@ activity.git_stats_and_deletions=и activity.git_stats_deletion_1=%d удаление activity.git_stats_deletion_n=%d удалений -contributors.contribution_type.commits = Коммиты +contributors.contribution_type.commits=коммитов + search=ПоиÑк search.search_repo=ПоиÑк по репозиторию search.type.tooltip=Тип поиÑка @@ -2099,7 +2088,7 @@ settings.mirror_settings=Зеркалирование settings.mirror_settings.docs=ÐаÑтройте Ñвой репозиторий Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑкой Ñинхронизации коммитов, тегов и ветвей Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼ репозиторием. settings.mirror_settings.docs.disabled_pull_mirror.instructions=ÐаÑтройте Ñвой проект Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑкой отправки коммитов, тегов и ветвей в другой репозиторий. Pull-зеркала были отключены админиÑтратором Ñайта. settings.mirror_settings.docs.disabled_push_mirror.instructions=ÐаÑтройте Ñвой проект, чтобы автоматичеÑки получать коммиты, теги и ветви из другого репозиториÑ. -settings.mirror_settings.docs.disabled_push_mirror.pull_mirror_warning=Ð’ наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ñто можно Ñделать только через меню «Выполнить переноÑ». Ð”Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ информации, пожалуйÑта, ознакомьтеÑÑŒ: +settings.mirror_settings.docs.disabled_push_mirror.pull_mirror_warning=Ð’ наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ñто можно Ñделать только в меню «ÐÐ¾Ð²Ð°Ñ Ð¼Ð¸Ð³Ñ€Ð°Ñ†Ð¸Ñ». Ð”Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ информации, пожалуйÑта, ознакомьтеÑÑŒ: settings.mirror_settings.docs.disabled_push_mirror.info=Push-зеркала отключены админиÑтратором Ñайта. settings.mirror_settings.docs.no_new_mirrors=Ваш репозиторий зеркалирует Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² другой репозиторий или из него. ПожалуйÑта, имейте в виду, что в данный момент невозможно Ñоздавать новые зеркала. settings.mirror_settings.docs.can_still_use=Ð¥Ð¾Ñ‚Ñ Ð²Ñ‹ не можете изменÑÑ‚ÑŒ ÑущеÑтвующие зеркала или Ñоздавать новые, вы можете по-прежнему иÑпользовать ÑущеÑтвующее зеркало. @@ -2138,7 +2127,7 @@ settings.use_external_issue_tracker=ИÑпользовать внешнюю Ñи settings.external_tracker_url=СÑылка на внешнюю ÑиÑтему задач settings.external_tracker_url_error=URL внешнего баг-трекера не ÑвлÑетÑÑ ÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ñ‹Ð¼ URL. settings.external_tracker_url_desc=ПоÑетители будут перенаправлены по указанному адреÑу трекера задач при открытии вкладки. -settings.tracker_url_format=Формат ÑÑылок внешней ÑиÑтемы задач +settings.tracker_url_format=Формат ÑÑылки внешней ÑиÑтемы задач settings.tracker_url_format_error=Формат URL внешнего баг-трекера некорректен. settings.tracker_issue_style=Формат нумерации во внешней ÑиÑтеме задач settings.tracker_issue_style.numeric=Цифровой @@ -2160,7 +2149,7 @@ settings.packages_desc=Включить рееÑÑ‚Ñ€ пакетов settings.projects_desc=Включить проекты settings.actions_desc=Включить интеграцию конвейеров CI/CD Ñ Forgejo Actions settings.admin_settings=ÐаÑтройки админиÑтратора -settings.admin_enable_health_check=ВыполнÑÑ‚ÑŒ проверки целоÑтноÑти данных (git fsck) +settings.admin_enable_health_check=ПроверÑÑ‚ÑŒ целоÑтноÑÑ‚ÑŒ данных в Ñтом репозитории (git fsck) settings.admin_code_indexer=ИндекÑатор кода settings.admin_stats_indexer=ИндекÑатор ÑтатиÑтики кода settings.admin_indexer_commit_sha=ПоÑледний индекÑированный коммит @@ -2197,9 +2186,9 @@ settings.transfer_perform=Выполнить передачу settings.transfer_started=Репозиторий ожидает Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€ÐµÐ´Ð°Ñ‡Ð¸ от «%s» settings.transfer_succeed=Репозиторий перенеÑён. settings.signing_settings=ÐаÑтройки проверки подпиÑей -settings.trust_model=Факторы Ð´Ð¾Ð²ÐµÑ€Ð¸Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑм -settings.trust_model.default=Фактор Ð´Ð¾Ð²ÐµÑ€Ð¸Ñ Ð¿Ð¾ умолчанию -settings.trust_model.default.desc=ИÑпользовать фактор Ð´Ð¾Ð²ÐµÑ€Ð¸Ñ Ð¿Ð¾ умолчанию, иÑпользуемый на Ñтом Ñервере. +settings.trust_model=Модель Ð´Ð¾Ð²ÐµÑ€Ð¸Ñ Ð¿Ð¾Ð´Ð¿Ð¸Ñи +settings.trust_model.default=Модель Ð´Ð¾Ð²ÐµÑ€Ð¸Ñ Ð¿Ð¾ умолчанию +settings.trust_model.default.desc=ИÑпользовать Ñтандартную модель Ð´Ð¾Ð²ÐµÑ€Ð¸Ñ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Ð´Ð»Ñ Ñтой уÑтановки. settings.trust_model.collaborator=СоучаÑтник settings.trust_model.collaborator.long=СоучаÑтник: доверÑÑ‚ÑŒ подпиÑÑм ÑоучаÑтников settings.trust_model.collaborator.desc=ДейÑтвительные подпиÑи ÑоучаÑтников Ñтого Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Ð±ÑƒÐ´ÑƒÑ‚ помечены как «доверенные» (незавиÑимо от того, ÑоответÑтвуют ли они автору коммита). Ð’ оÑтальных ÑлучаÑÑ… дейÑтвительные подпиÑи будут помечены как «недоверенные», еÑли подпиÑÑŒ ÑоответÑтвует автору коммита, и «не Ñовпадающие», еÑли нет. @@ -2250,7 +2239,7 @@ settings.hooks_desc=Веб-хуки позволÑÑŽÑ‚ внешним Ñлужб settings.webhook_deletion=Удаление веб-хука settings.webhook_deletion_desc=Удаление Ñтого веб-хука приведет к удалению вÑей ÑвÑзанной Ñ Ð½Ð¸Ð¼ информации, Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ Ð¸Ñторию. Хотите продолжить? settings.webhook_deletion_success=Веб-хук был удалён. -settings.webhook.test_delivery=Проверить отправку +settings.webhook.test_delivery=Проверить доÑтавку settings.webhook.test_delivery_desc=Отправить теÑтовое Ñобытие Ð´Ð»Ñ Ñ‚ÐµÑÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð½Ð°Ñтройки веб-хука. settings.webhook.request=Ð—Ð°Ð¿Ñ€Ð¾Ñ settings.webhook.response=Ответ @@ -2264,7 +2253,7 @@ settings.githook_edit_desc=ЕÑли хук не активен, будет по settings.githook_name=Ðазвание хукa settings.githook_content=Содержимое хука settings.update_githook=Обновить хук -settings.add_webhook_desc=Forgejo будет оправлÑÑ‚ÑŒ POST-запроÑÑ‹ на указанный URL обработчика Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ð¼ заголовком «Content-Type». ПодробноÑти доÑтупны в инÑтрукции по иÑпользованию веб-хуков. +settings.add_webhook_desc=Forgejo будет оправлÑÑ‚ÑŒ POST-запроÑÑ‹ на указанный URL Ð°Ð´Ñ€ÐµÑ Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ð¼ заголовком «Content-Type». ПодробноÑти в инÑтрукции по иÑпользованию веб-хуков. settings.payload_url=URL обработчика settings.http_method=HTTP-метод settings.content_type=Тип Ñодержимого POST @@ -2275,10 +2264,10 @@ settings.slack_color=Цвет settings.discord_username=Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ settings.discord_icon_url=URL иконки settings.event_desc=Срабатывать на: -settings.event_push_only=Ð¡Ð¾Ð±Ñ‹Ñ‚Ð¸Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ (push) +settings.event_push_only=Ð¡Ð¾Ð±Ñ‹Ñ‚Ð¸Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ settings.event_send_everything=Ð’Ñе ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ -settings.event_choose=Выбранные ÑобытиÑ… -settings.event_header_repository=Ð¡Ð¾Ð±Ñ‹Ñ‚Ð¸Ñ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸ÐµÐ² +settings.event_choose=Другие ÑобытиÑ… +settings.event_header_repository=Ð¡Ð¾Ð±Ñ‹Ñ‚Ð¸Ñ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ settings.event_create=Создание settings.event_create_desc=Создание ветвей и тегов. settings.event_delete=Удаление @@ -2294,33 +2283,33 @@ settings.event_push_desc=Отправка изменений в репозито settings.event_repository=Репозиторий settings.event_repository_desc=Создание и удаление репозиториев. settings.event_header_issue=Ð¡Ð¾Ð±Ñ‹Ñ‚Ð¸Ñ Ð·Ð°Ð´Ð°Ñ‡ -settings.event_issues=Изменение +settings.event_issues=Задачи settings.event_issues_desc=Создание, закрытие, переоткрытие и изменение задач. -settings.event_issue_assign=Ðазначение +settings.event_issue_assign=Ðазначение задач settings.event_issue_assign_desc=Выдача и ÑнÑтие Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð·Ð°Ð´Ð°Ñ‡Ð¸. -settings.event_issue_label=Метки -settings.event_issue_label_desc=Добавление и удаление меток задач. -settings.event_issue_milestone=Этапы -settings.event_issue_milestone_desc=Добавление задач в Ñтапы, удаление и изменение. -settings.event_issue_comment=Комментарии +settings.event_issue_label=Метки задач +settings.event_issue_label_desc=Изменение и очиÑтка меток задач. +settings.event_issue_milestone=Этапы задач +settings.event_issue_milestone_desc=Добавление задач в Ñтапы и удаление. +settings.event_issue_comment=Комментарии задач settings.event_issue_comment_desc=Добавление, изменение и удаление комментариев в задачах. settings.event_header_pull_request=Ð¡Ð¾Ð±Ñ‹Ñ‚Ð¸Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñов ÑлиÑний -settings.event_pull_request=Изменение +settings.event_pull_request=ЗапроÑÑ‹ ÑлиÑÐ½Ð¸Ñ settings.event_pull_request_desc=Создание, закрытие, переоткрытие и изменение запроÑов ÑлиÑниÑ. -settings.event_pull_request_assign=Ðазначение +settings.event_pull_request_assign=Ðазначение запроÑов settings.event_pull_request_assign_desc=Выдача и ÑнÑтие Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñа на ÑлиÑние. -settings.event_pull_request_label=Метки -settings.event_pull_request_label_desc=Добавление и удаление меток запроÑа ÑлиÑниÑ. -settings.event_pull_request_milestone=Этапы -settings.event_pull_request_milestone_desc=Добавление запроÑов ÑлиÑÐ½Ð¸Ñ Ð² Ñтапы, удаление и изменение. -settings.event_pull_request_comment=Комментарии +settings.event_pull_request_label=Метки запроÑов ÑлиÑÐ½Ð¸Ñ +settings.event_pull_request_label_desc=Изменение и очиÑтка меток запроÑа ÑлиÑниÑ. +settings.event_pull_request_milestone=Этапы запроÑов ÑлиÑÐ½Ð¸Ñ +settings.event_pull_request_milestone_desc=Добавление запроÑа ÑлиÑÐ½Ð¸Ñ Ð² Ñтап и удаление. +settings.event_pull_request_comment=Комментарии запроÑов на ÑлиÑние settings.event_pull_request_comment_desc=Добавление, изменение и удаление комментариев в запроÑах на ÑлиÑние. -settings.event_pull_request_review=Рецензии -settings.event_pull_request_review_desc=Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² запроÑе ÑлиÑÐ½Ð¸Ñ Ð¾Ð´Ð¾Ð±Ñ€ÐµÐ½Ñ‹, отклонены прокомментированы. -settings.event_pull_request_sync=Ð¡Ð¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ -settings.event_pull_request_sync_desc=Ветвь Ñинхронизирована Ñ Ñ†ÐµÐ»ÐµÐ²Ð¾Ð¹ ветвью автоматичеÑки. -settings.event_pull_request_review_request=ЗапроÑÑ‹ рецензий -settings.event_pull_request_review_request_desc=Создание и отмена запроÑов рецензий в запроÑах ÑлиÑний. +settings.event_pull_request_review=Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° ÑлиÑние раÑÑмотрен +settings.event_pull_request_review_desc=Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° ÑлиÑние утвержден, отклонён или оÑтавлен комментарий. +settings.event_pull_request_sync=Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° ÑлиÑние Ñинхронизирован +settings.event_pull_request_sync_desc=Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° ÑлиÑние Ñинхронизирован. +settings.event_pull_request_review_request=Запрошена Ñ€ÐµÑ†ÐµÐ½Ð·Ð¸Ñ Ð´Ð»Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñа на ÑлиÑние +settings.event_pull_request_review_request_desc=Создан или удалён Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° рецензию Ð´Ð»Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñа на ÑлиÑние. settings.event_pull_request_approvals=ÐžÐ´Ð¾Ð±Ñ€ÐµÐ½Ð¸Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñов ÑлиÑний settings.event_pull_request_merge=СлиÑние запроÑа на ÑлиÑние settings.event_package=Пакеты @@ -2329,15 +2318,15 @@ settings.branch_filter=Фильтр ветвей settings.branch_filter_desc=Белый ÑпиÑок ветвей Ð´Ð»Ñ Ñобытий Push, ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð²ÐµÑ‚Ð²ÐµÐ¹ и ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð²ÐµÑ‚Ð²ÐµÐ¹, указанных в виде глоб-шаблона. ЕÑли пуÑтой или *, то вÑе Ñобытий Ð´Ð»Ñ Ð²Ñех ветвей будут зарегиÑтрированы. Перейдите по ÑÑылке %[2]s на документацию по ÑинтакÑиÑу. Примеры: master, {master,release*}. settings.authorization_header=Заголовок авторизации settings.authorization_header_desc=Будет включён в качеÑтве заголовка авторизации Ð´Ð»Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñов. Примеры: %s. -settings.active=Ðктивен +settings.active=Ðктивный settings.active_helper=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ проиÑходÑщих ÑобытиÑÑ… будет отправлÑÑ‚ÑŒÑÑ Ð½Ð° URL Ñтого веб-хука. settings.add_hook_success=Веб-хук добавлен. settings.update_webhook=Обновить веб-хук settings.update_hook_success=Веб-хук обновлён. settings.delete_webhook=Удалить веб-хук -settings.recent_deliveries=Ðедавние отправки -settings.hook_type=Тип веб-хука -settings.slack_token=Токен +settings.recent_deliveries=Ðедавние раÑÑылки +settings.hook_type=Тип хука +settings.slack_token=Slack токен settings.slack_domain=Домен settings.slack_channel=Канал settings.add_web_hook_desc=Интегрируйте %s Ñ Ñтим репозиторием . @@ -2421,7 +2410,7 @@ settings.protect_branch_name_pattern=Шаблон названий защищё settings.protect_branch_name_pattern_desc=Шаблоны названий защищённых ветвей. О ÑинтакÑиÑе шаблонов читайте в документации. Примеры: main, release/** settings.protect_patterns=Шаблоны settings.protect_protected_file_patterns=Шаблоны защищённых файлов, разделённые точкой Ñ Ð·Ð°Ð¿Ñтой «;» -settings.protect_protected_file_patterns_desc=Защищенные файлы Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ напрÑмую, даже еÑли пользователь имеет право добавлÑÑ‚ÑŒ, редактировать или удалÑÑ‚ÑŒ файлы в Ñтой ветви. Можно указать неÑколько шаблонов, разделÑÑ Ð¸Ñ… точкой Ñ Ð·Ð°Ð¿Ñтой («;»). О ÑинтакÑиÑе шаблонов читайте в документации %s . Примеры: .drone.yml, /docs/**/*.txt. +settings.protect_protected_file_patterns_desc=Защищенные файлы Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ напрÑмую, даже еÑли пользователь имеет право добавлÑÑ‚ÑŒ, редактировать или удалÑÑ‚ÑŒ файлы в Ñтой ветви. Можно указать неÑколько шаблонов, разделÑÑ Ð¸Ñ… точкой Ñ Ð·Ð°Ð¿Ñтой («;»). О ÑинтакÑиÑе шаблонов читайте в документации github.com/gobwas/glob . Примеры: .drone.yml, /docs/**/*.txt. settings.protect_unprotected_file_patterns=Шаблоны незащищённых файлов, разделённые точкой Ñ Ð·Ð°Ð¿Ñтой «;» settings.protect_unprotected_file_patterns_desc=Ðезащищенные файлы, которые допуÑкаетÑÑ Ð¸Ð·Ð¼ÐµÐ½ÑÑ‚ÑŒ напрÑмую, еÑли пользователь имеет право на запиÑÑŒ, неÑÐ¼Ð¾Ñ‚Ñ€Ñ Ð½Ð° ограничение отправки изменений. Можно указать неÑколько шаблонов, разделÑÑ Ð¸Ñ… точкой Ñ Ð·Ð°Ð¿Ñтой («;»). О ÑинтакÑиÑе шаблонов читайте в документации %[2]s . Примеры: .drone.yml, /docs/**/*.txt. settings.add_protected_branch=Включить защиту @@ -2465,11 +2454,11 @@ settings.archive.header=ÐÑ€Ñ…Ð¸Ð²Ð°Ñ†Ð¸Ñ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ settings.archive.success=Репозиторий был уÑпешно архивирован. settings.archive.error=Ошибка при попытке архивировать репозиторий. Смотрите логи Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð´Ñ€Ð¾Ð±Ð½Ð¾Ñтей. settings.archive.error_ismirror=Ð’Ñ‹ не можете помеÑтить зеркалируемый репозиторий в архив. -settings.archive.branchsettings_unavailable=ÐаÑтройки ветвей недоÑтупны в архивированных репозиториÑÑ…. -settings.archive.tagsettings_unavailable=ÐаÑтройки тегов недоÑтупны в архивированных репозиториÑÑ…. +settings.archive.branchsettings_unavailable=ÐаÑтройки ветви недоÑтупны, еÑли репозиторий архивирован. +settings.archive.tagsettings_unavailable=ÐаÑтройки тегов недоÑтупны, еÑли репозиторий архивирован. settings.unarchive.button=Разархивировать settings.unarchive.header=Вернуть Ñтот репозиторий из архива -settings.unarchive.text=Ð Ð°Ð·Ð°Ñ€Ñ…Ð¸Ð²Ð°Ñ†Ð¸Ñ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Ð²Ð¾ÑÑтановит возможноÑÑ‚ÑŒ отправлÑÑ‚ÑŒ в него изменениÑ, а также Ñоздавать новые задачи и запроÑÑ‹ на ÑлиÑние. +settings.unarchive.text=Разархивирование Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Ð²Ð¾ÑÑтановит его ÑпоÑобноÑÑ‚ÑŒ принимать изменениÑ, а также новые задачи и запроÑÑ‹ на ÑлиÑние. settings.unarchive.success=Репозиторий был уÑпешно разархивирован. settings.update_avatar_success=Картинка Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð°. settings.lfs=LFS @@ -2538,7 +2527,7 @@ diff.load=Показать Ñ€Ð°Ð·Ð»Ð¸Ñ‡Ð¸Ñ diff.generated=Ñгенерированный diff.vendored=предоÑтавленный diff.comment.placeholder=ОÑтавить комментарий -diff.comment.markdown_info=ПоддерживаетÑÑ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ Ñ Markdown. +diff.comment.markdown_info=ПоддерживаетÑÑ ÑинтакÑÐ¸Ñ Markdown. diff.comment.add_single_comment=Добавить проÑтой комментарий diff.comment.add_review_comment=Добавить комментарий diff.comment.start_review=Ðачать рецензию @@ -2569,7 +2558,7 @@ release.draft=Черновик release.prerelease=Предварительный выпуÑк release.stable=Стабильный release.compare=Сравнить -release.edit=Редактировать +release.edit=редактировать release.ahead.commits=%d коммиты release.ahead.target=%s Ñ Ñтого выпуÑка tag.ahead.target=в %s поÑле Ñтого тега @@ -2663,7 +2652,7 @@ error.csv.unexpected=Ðе удаетÑÑ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð·Ð¸Ñ‚ÑŒ Ñтот файл, error.csv.invalid_field_count=Ðе удаетÑÑ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð·Ð¸Ñ‚ÑŒ Ñтот файл, потому что он имеет неправильное количеÑтво полей в Ñтроке %d. mirror_address_protocol_invalid = Эта ÑÑылка недейÑтвительна. Ð”Ð»Ñ Ð·ÐµÑ€ÐºÐ°Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¼Ð¾Ð¶Ð½Ð¾ иÑпользовать только раÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ http(s):// и git:// . fork_no_valid_owners = Ðевозможно Ñоздать ответвление Ñтого репозиториÑ, Ñ‚.к. здеÑÑŒ нет дейÑтвующих владельцев. -new_repo_helper = Репозиторий Ñодержит вÑе файлы проекта и иÑторию изменений. Уже где-то еÑÑ‚ÑŒ репозиторий? Выполните переноÑ. +new_repo_helper = Репозиторий Ñодержит вÑе файлы проекта и иÑторию изменений. Уже где-то еÑÑ‚ÑŒ репозиторий? Выполните миграцию. mirror_address_url_invalid = Эта ÑÑылка недейÑтвительна. Ðеобходимо правильно указать вÑе чаÑти адреÑа. issues.comment.blocked_by_user = Ð’Ñ‹ не можете комментировать под Ñтой задачей, Ñ‚.к. вы заблокированы владельцем Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Ð¸Ð»Ð¸ автором задачи. pulls.blocked_by_user = Ðевозможно Ñоздать Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° ÑлиÑние в Ñтом репозитории, Ñ‚.к. вы заблокированы его владельцем. @@ -2709,7 +2698,7 @@ pulls.recently_pushed_new_branches = Ð’Ñ‹ отправили коммиты в milestones.new_subheader = Этапы полезны Ð´Ð»Ñ ÑиÑтематизации задач и отÑÐ»ÐµÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ Ð¸Ñ… выполнениÑ. wiki.cancel = Отмена settings.unarchive.error = При раÑпаковке Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Ð¿Ñ€Ð¾Ð¸Ð·Ð¾ÑˆÐ»Ð° ошибка. ПодробноÑти доÑтупны в логе. -settings.archive.mirrors_unavailable = ÐаÑтройки Ð·ÐµÑ€ÐºÐ°Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð½ÐµÐ´Ð¾Ñтупны в архивированных репозиториÑÑ…. +settings.archive.mirrors_unavailable = Зеркалирование недоÑтупно Ð´Ð»Ñ Ð°Ñ€Ñ…Ð¸Ð²Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ñ… репозиториев. issues.role.contributor_helper = Ð’ репозитории приÑутÑтвуют коммиты за авторÑтвом Ñтого пользователÑ. settings.wiki_rename_branch_main = Ðормализовать название ветви вики settings.wiki_rename_branch_main_notices_2 = ВнутреннÑÑ Ð²ÐµÑ‚Ð²ÑŒ вики Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ %s будет переименована. ÐеÑохранённые Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð¾Ñ‚Ñ€ÐµÐ±ÑƒÑŽÑ‚ обновлениÑ. @@ -2728,13 +2717,14 @@ settings.wiki_globally_editable = Разрешить редактировани settings.webhook.test_delivery_desc_disabled = Ðктивируйте Ñтот веб-хук Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ теÑтовым Ñобытием. commits.browse_further = Смотреть далее vendored = Сторонний -settings.units.add_more = Вкл. больше +settings.units.add_more = Доб. больше... pulls.fast_forward_only_merge_pull_request = Только fast-forward settings.units.overview = Обзор -settings.units.units = Разделы -pulls.reopen_failed.head_branch = Этот Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° ÑлиÑние не может быть открыт повторно, так как иÑÑ…Ð¾Ð´Ð½Ð°Ñ Ð²ÐµÑ‚Ð²ÑŒ больше не ÑущеÑтвует. +settings.units.units = Разделы Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ +pulls.reopen_failed.head_branch = Этот Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° ÑлиÑние не может быть открыт заново, потому что Ð³Ð¾Ð»Ð¾Ð²Ð½Ð°Ñ Ð²ÐµÑ‚Ð²ÑŒ больше не ÑущеÑтвует. pulls.reopen_failed.base_branch = Этот Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° ÑлиÑние не может быть открыт заново, потому что Ð±Ð°Ð·Ð¾Ð²Ð°Ñ Ð²ÐµÑ‚Ð²ÑŒ больше не ÑущеÑтвует. settings.ignore_stale_approvals = Игнорировать уÑтаревшие Ð¾Ð´Ð¾Ð±Ñ€ÐµÐ½Ð¸Ñ +contributors.contribution_type.commits = Коммиты contributors.contribution_type.additions = Ð”Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ contributors.contribution_type.deletions = Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ñ contributors.contribution_type.filter_label = Вид деÑтельноÑти: @@ -2744,7 +2734,7 @@ pulls.made_using_agit = AGit activity.navbar.contributors = Соавторы activity.navbar.code_frequency = ЧаÑтота изменений activity.navbar.recent_commits = Ðедавние коммиты -settings.confirmation_string = Строка Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ +settings.confirmation_string = Подтверждение settings.archive.text = ÐÑ€Ñ…Ð¸Ð²Ð°Ñ†Ð¸Ñ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Ñделает вÑÑ‘ его Ñодержимое доÑтупным только Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ. Он будет Ñкрыт Ñ Ð´Ð¾Ð¼Ð°ÑˆÐ½ÐµÐ³Ð¾ Ñкрана. Ðикто (Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ Ð²Ð°Ñ!) не Ñможет добавлÑÑ‚ÑŒ коммиты, открывать задачи и запроÑÑ‹ ÑлиÑний. release.deletion_desc = Удаление выпуÑка удалÑет его только в Forgejo. Это дейÑтвие не затронет тег в git, Ñодержимое Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Ð¸ его иÑторию. Продолжить? pulls.agit_explanation = Создано через рабочий поток AGit. С ним можно предлагать изменениÑ, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñƒ «git push», без необходимоÑти в Ñоздании Ð¾Ñ‚Ð²ÐµÑ‚Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ новой ветви. @@ -2835,48 +2825,8 @@ mirror_use_ssh.helper = Forgejo будет Ñинхронизировать из mirror_denied_combination = Ðевозможно одновременно иÑпользовать аутентификацию по SSH и по паролю. settings.mirror_settings.push_mirror.none_ssh = Ðет settings.mirror_settings.push_mirror.copy_public_key = Копировать публичный ключ -issues.new.assign_to_me = Ðазначить Ñебе -issues.all_title = Ð’Ñе -settings.discord_icon_url.exceeds_max_length = URL иконки не может быть длиннее 2048 Ñимволов -issues.review.add_review_requests = запрошены рецензии от %[1]s %[2]s -issues.review.remove_review_requests = отменены запроÑÑ‹ рецензий от %[1]s %[2]s -issues.review.add_remove_review_requests = запрошены рецензии от %[1]s и отменены запроÑÑ‹ рецензий от %[2]s %[3]s -pulls.delete_after_merge.head_branch.is_default = Ð“Ð¾Ð»Ð¾Ð²Ð½Ð°Ñ Ð²ÐµÑ‚Ð²ÑŒ, которую вы попыталиÑÑŒ удалить, ÑвлÑетÑÑ Ð²ÐµÑ‚Ð²ÑŒÑŽ по умолчанию и не может быть удалена. -pulls.delete_after_merge.head_branch.is_protected = Ð“Ð¾Ð»Ð¾Ð²Ð½Ð°Ñ Ð²ÐµÑ‚Ð²ÑŒ, которую вы попыталиÑÑŒ удалить, защищена от Ñтого и не может быть удалена. -pulls.delete_after_merge.head_branch.insufficient_branch = ОтÑутÑтвует разрешение Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð³Ð¾Ð»Ð¾Ð²Ð½Ð¾Ð¹ ветви. -issues.filter_sort.relevance = По ÑоответÑтвию -diff.git-notes.remove-header = Удаление заметки -diff.git-notes.remove-body = Заметка будет удалена. -diff.git-notes.add = Добавить заметку -issues.num_reviews_few = %d рецензий -issues.num_reviews_one = %d Ñ€ÐµÑ†ÐµÐ½Ð·Ð¸Ñ -issues.summary_card_alt = Карточка Ñо Ñводкой задачи "%s" в репозитории %s -editor.add_tmpl.filename = Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° -settings.default_update_style_desc = Стиль Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¾Ñ‚Ñтающих ветвей запроÑов на ÑлиÑние по умолчанию. -pulls.sign_in_require = Войдите, чтобы Ñоздать Ð·Ð°Ð¿Ñ€Ð¾Ñ ÑлиÑниÑ. -new_from_template = Применить шаблон -new_from_template_description = Ð’Ñ‹ можете выбрать любой шаблон Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Ð½Ð° Ñтом Ñервере и применить его наÑтройки на Ñтом репозитории. -new_advanced = РаÑширенные наÑтройки -new_advanced_expand = Ðажмите, чтобы раÑкрыть -auto_init_description = Ðачать иÑторию коммитов Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ README и, еÑли надо, лицензии и .gitignore. -summary_card_alt = Карточка Ñо Ñводкой о репозитории %s -issues.reaction.add = Добавить реакцию -issues.reaction.alt_few = Ð ÐµÐ°ÐºÑ†Ð¸Ñ %[2]s от %[1]s. -issues.reaction.alt_many = Ð ÐµÐ°ÐºÑ†Ð¸Ñ %[3]s от %[1]s и %[2]d других. -issues.reaction.alt_remove = Убрать реакцию %[1]s Ñ Ñтого комментариÑ. -issues.reaction.alt_add = Добавить реакцию %[1]s к Ñтому комментарию. -issues.context.menu = Меню ÐºÐ¾Ð¼Ð¼ÐµÐ½Ñ‚Ð°Ñ€Ð¸Ñ -release.summary_card_alt = Карточка Ñо Ñводкой о выпуÑке «%s» в репозитории %s [graphs] -component_loading_failed = Ðе удалоÑÑŒ загрузить %s -component_failed_to_load = СлучилаÑÑŒ Ð½ÐµÐ¿Ñ€ÐµÐ´Ð²Ð¸Ð´ÐµÐ½Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°. -contributors.what = ÑоучаÑтие -component_loading = Загрузка %s... -component_loading_info = Это займёт некоторое времÑ… -code_frequency.what = чаÑтота изменений -recent_commits.what = недавние коммиты - [org] org_name_holder=Ðазвание организации @@ -2895,9 +2845,9 @@ org_desc=ОпиÑание team_name=Ðазвание команды team_desc=ОпиÑание team_name_helper=ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´ должны быть короткими и запоминающимиÑÑ. -team_desc_helper=Ðазначение или роль Ñтой команды. -team_access_desc=ДоÑтуп к репозиториÑм -team_permission_desc=Ð Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ +team_desc_helper=Опишите назначение или роль команды. +team_access_desc=ДоÑтуп к репозиторию +team_permission_desc=Разрешение team_unit_desc=Разрешить доÑтуп к разделам Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ team_unit_disabled=(Отключено) @@ -2915,7 +2865,7 @@ settings.permission=Ð Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ñ settings.repoadminchangeteam=ÐдминиÑтратор Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ Ð¼Ð¾Ð¶ÐµÑ‚ добавлÑÑ‚ÑŒ и удалÑÑ‚ÑŒ права доÑтупа Ð´Ð»Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´ settings.visibility=ВидимоÑÑ‚ÑŒ settings.visibility.public=Публичный -settings.visibility.limited=ÐžÐ³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð½Ð°Ñ (видна только зарегиÑтрированным пользователÑм) +settings.visibility.limited=ÐžÐ³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð½Ð°Ñ (видна только авторизованным пользователÑм) settings.visibility.limited_shortname=Ограниченный settings.visibility.private=ЧаÑÑ‚Ð½Ð°Ñ (видна только учаÑтникам организации) settings.visibility.private_shortname=ЧаÑÑ‚Ð½Ð°Ñ @@ -3192,7 +3142,7 @@ repos.lfs_size=Размер LFS packages.package_manage_panel=Управление пакетами packages.total_size=Общий размер: %s -packages.unreferenced_size=Ðеуказанный размер: %s +packages.unreferenced_size=Размер по ÑÑылке: %s packages.cleanup=ОчиÑтить уÑтаревшие данные packages.cleanup.success=ОчиÑтка уÑтаревших данных уÑпешно завершена packages.owner=Владелец @@ -3332,13 +3282,13 @@ auths.invalid_openIdConnectAutoDiscoveryURL=Ðеверный URL Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾ config.server_config=ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ñервера config.app_name=Ðазвание Ñервера config.app_ver=ВерÑÐ¸Ñ Forgejo -config.app_url=Базовый URL +config.app_url=Базовый URL Forgejo config.custom_conf=Путь к файлу конфигурации config.custom_file_root_path=Путь до каталога Ñ Ñ„Ð°Ð¹Ð»Ð°Ð¼Ð¸ Ð´Ð»Ñ Ð¿ÐµÑ€Ñонализации config.domain=Домен Ñервера config.offline_mode=Локальный режим config.disable_router_log=Отключение журнала маршрутизатора -config.run_user=Работа под пользователем +config.run_user=Выполнение под пользователем config.run_mode=Режим работы config.git_version=ВерÑÐ¸Ñ git config.app_data_path=Путь к данным Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ @@ -3382,7 +3332,7 @@ config.allow_only_external_registration=РегиÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ че config.enable_openid_signup=СаморегиÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ñ‡ÐµÑ€ÐµÐ· OpenID config.enable_openid_signin=Вход через OpenID config.show_registration_button=Кнопка региÑтрации -config.require_sign_in_view=Требовать авторизацию Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñмотра Ñодержимого +config.require_sign_in_view=Ð”Ð»Ñ Ð¿Ñ€Ð¾Ñмотра Ñодержимого необходима Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ð¸Ñ config.mail_notify=Ð£Ð²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾ Ñл. почте config.enable_captcha=CAPTCHA config.active_code_lives=Срок дейÑÑ‚Ð²Ð¸Ñ ÐºÐ¾Ð´Ð° активации учётной запиÑи @@ -3450,7 +3400,7 @@ config.git_max_diff_lines=МакÑ. количеÑтво Ñтрок в файл config.git_max_diff_line_characters=МакÑ. количеÑтво Ñимволов в Ñтроке при Ñравнении config.git_max_diff_files=МакÑ. отображаемое количеÑтво файлов при Ñравнении config.git_gc_args=Ðргументы Ñборщика муÑора -config.git_migrate_timeout=Ограничение времени переноÑов +config.git_migrate_timeout=Ограничение времени миграций config.git_mirror_timeout=Ограничение времени на Ñинхронизацию зеркала config.git_clone_timeout=Ограничение времени операций ÐºÐ»Ð¾Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ config.git_pull_timeout=Ограничение времени на получение изменений @@ -3496,7 +3446,7 @@ monitor.queue.activeworkers=Ðктивные обработчики monitor.queue.maxnumberworkers=МакÑ. количеÑтво обработчиков monitor.queue.numberinqueue=ÐŸÐ¾Ð·Ð¸Ñ†Ð¸Ñ Ð² очереди monitor.queue.settings.title=ÐаÑтройки пула -monitor.queue.settings.desc=Пулы динамичеÑки раÑтут в завиÑимоÑти от блокировки очередей их рабочих. +monitor.queue.settings.desc=Пулы увеличиваютÑÑ Ð´Ð¸Ð½Ð°Ð¼Ð¸Ñ‡ÐµÑки в ответ на блокировку очередей Ñвоих обработчиков. monitor.queue.settings.maxnumberworkers=МакÑ. количеÑтво обработчиков monitor.queue.settings.maxnumberworkers.placeholder=Ð’ наÑтоÑщий момент %[1]d monitor.queue.settings.maxnumberworkers.error=МакÑимальное количеÑтво обработчиков должно быть чиÑлом @@ -3522,7 +3472,7 @@ notices.delete_success=Ð£Ð²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ ÑиÑтемы были удале self_check.no_problem_found = Пока проблем не обнаружено. auths.tip.gitea = ЗарегиÑтрируйте новое приложение OAuth2. ДоÑтупна инÑтрукциÑ: %s auths.tips.oauth2.general.tip = При региÑтрации нового Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ OAuth2 ÑÑылка обратного Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð¾Ð»Ð¶Ð½Ð° быть: -self_check.database_fix_mysql = Пользователи MySQL и MariaDB могут иÑправить проблемы Ñ ÑопоÑтавлением командой "forgejo doctor convert". Также можно вручную впиÑать "ALTER ... COLLATE ..." в SQL. +self_check.database_fix_mysql = Пользователи MySQL и MariaDB могут иÑправить проблемы Ñ ÑопоÑтавлением командой "gitea doctor convert". Также можно вручную впиÑать "ALTER ... COLLATE ..." в SQL. dashboard.cleanup_actions = ОчиÑтить уÑтаревшие журналы и артефакты ДейÑтвий dashboard.sync_repo_branches = Синхронизировать ветви из Git в базу данных assets = Кодовые объекты @@ -3560,7 +3510,6 @@ emails.delete = Удалить Ð°Ð´Ñ€ÐµÑ emails.deletion_success = ÐÐ´Ñ€ÐµÑ Ñл. поÑÑ‚Ñ‹ удалён из учётной запиÑи. emails.delete_primary_email_error = Ðевозможно удалить оÑновной адреÑ. emails.delete_desc = Ð’Ñ‹ точно хотите удалить Ñтот Ð°Ð´Ñ€ÐµÑ Ñл. почты? -monitor.duration = ДлительноÑÑ‚ÑŒ (Ñ) [action] @@ -3577,17 +3526,17 @@ comment_issue=`оÑтавлен комментарий под задачей %[3]s#%[2]s` merge_pull_request=`принÑÑ‚ Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° ÑлиÑние %[3]s#%[2]s` auto_merge_pull_request=`автоматичеÑки принÑÑ‚ Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð½Ð° ÑлиÑние %[3]s#%[2]s` -transfer_repo=репозиторий %s был передан: %s -push_tag=отправлен тег %[3]s в %[4]s -delete_tag=удалён тег %[2]s в %[3]s -delete_branch=удалена ветвь %[2]s в %[3]s +transfer_repo=передан репозиторий %s %s +push_tag=Ñоздан тег %[3]s в %[4]s +delete_tag=удалён Ñ‚Ñг %[2]s из %[3]s +delete_branch=удалена ветвь %[2]s из %[3]s compare_branch=Сравнить compare_commits=Сравнить %d коммитов compare_commits_general=Сравнить коммиты mirror_sync_push=Ñинхронизировал(а) коммиты %[3]s в %[4]s из зеркала mirror_sync_create=Ñинхронизировал(а) новую ÑÑылку %[3]s в %[4]s из зеркала mirror_sync_delete=Ñинхронизированные и удалённые ÑÑылки %[2]s на %[3]s из зеркала -approve_pull_request=`одобрен Ð·Ð°Ð¿Ñ€Ð¾Ñ ÑлиÑÐ½Ð¸Ñ %[3]s#%[2]s` +approve_pull_request=`одобрен %[3]s#%[2]s` reject_pull_request=`предложил(а) Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ %[3]s#%[2]s` publish_release=`выпуÑк %[4]s опубликован в %[3]s` review_dismissed=`отклонён отзыв от %[4]s Ð´Ð»Ñ %[3]s#%[2]s` @@ -3715,7 +3664,7 @@ conda.install=Чтобы уÑтановить пакет Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Conda container.details.type=Тип образа container.details.platform=Платформа container.pull=Загрузите образ из командной Ñтроки: -container.digest=Отпечаток +container.digest=Отпечаток: container.multi_arch=ОС / архитектура container.layers=Слои образа container.labels=Метки @@ -3756,8 +3705,8 @@ rpm.registry=ÐаÑтроить рееÑÑ‚Ñ€ из командной Ñтрок rpm.distros.redhat=на диÑтрибутивах ÑемейÑтва RedHat rpm.distros.suse=на диÑтрибутивах ÑемейÑтва SUSE rpm.install=Чтобы уÑтановить пакет, выполните Ñледующую команду: -rpm.repository = О репозитории -rpm.repository.architectures = Ðрхитектуры +rpm.repository=О репозитории +rpm.repository.architectures=Ðрхитектуры rubygems.install=Чтобы уÑтановить пакет Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ gem, выполните Ñледующую команду: rubygems.install2=или добавьте его в Gemfile: rubygems.dependencies.runtime=ЗавиÑимоÑти времени Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ @@ -3809,7 +3758,9 @@ owner.settings.cleanuprules.success.delete=Правило очиÑтки уда owner.settings.chef.title=РееÑÑ‚Ñ€ Chef owner.settings.chef.keypair=Создать пару ключей owner.settings.cleanuprules.none = Правил очиÑтки пока нет. -owner.settings.cargo.rebuild.description = ПереÑборка может быть полезна в Ñлучае, еÑли Ð¸Ð½Ð´ÐµÐºÑ Ð½Ðµ Ñинхронизирован Ñ Ñ…Ñ€Ð°Ð½ÑщимиÑÑ Ð¿Ð°ÐºÐµÑ‚Ð°Ð¼Ð¸ Cargo. +owner.settings.cargo.rebuild.description = ПереÑборка может быть полезной в Ñлучае, еÑли Ð¸Ð½Ð´ÐµÐºÑ Ð½Ðµ Ñинхронизирован Ñ Ñохранёнными пакетами Cargo. +rpm.repository = О репозитории +rpm.repository.architectures = Ðрхитектуры rpm.repository.multiple_groups = Этот пакет доÑтупен в неÑкольких группах. owner.settings.chef.keypair.description = Ð”Ð»Ñ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸ рееÑтра Chef необходима пара ключей. ЕÑли до Ñтого вы уже Ñгенерировали пару ключей, Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð¹ приведёт к прекращению дейÑÑ‚Ð²Ð¸Ñ Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰ÐµÐ¹. owner.settings.cargo.rebuild.no_index = Ðевозможно выполнить переÑборку. Ðет инициализированного индекÑа. @@ -3830,10 +3781,6 @@ arch.version.replaces = ЗаменÑет arch.version.backup = Рез. ÐºÐ¾Ð¿Ð¸Ñ arch.version.conflicts = Конфликтует Ñ arch.version.checkdepends = Проверочные завиÑимоÑти -container.images.title = Образы -search_in_external_registry = Ðайти в %s -alt.repository = О репозитории -alt.repository.architectures = Ðрхитектуры [secrets] secrets=Секреты @@ -3853,7 +3800,7 @@ management=Управление Ñекретами [actions] actions=ДейÑÑ‚Ð²Ð¸Ñ -unit.desc=Управление вÑтроенными конвейерами CI/CD Ñ Ð”ÐµÐ¹ÑтвиÑми Forgejo. +unit.desc=Управление вÑтроенными конвейерами CI/CD Ñ Ð”ÐµÐ¹ÑтвиÑми Forgejo status.unknown=ÐеизвеÑтно status.waiting=Ожидает @@ -3952,8 +3899,6 @@ workflow.dispatch.input_required = Требовать значение Ð´Ð»Ñ Ð¿ workflow.dispatch.invalid_input_type = ÐеизвеÑтный тип Ð¿Ð¾Ð»Ñ Â«%s». workflow.dispatch.warn_input_limit = ОтображаютÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ первые %d полей. runs.expire_log_message = Журнал был удалён из-за ÑтароÑти. -runs.no_workflows.help_write_access = Ðе знаете, как начать иÑпользовать ДейÑÑ‚Ð²Ð¸Ñ Forgejo? ОзнакомьтеÑÑŒ Ñ Ñ€ÑƒÐºÐ¾Ð²Ð¾Ð´Ñтвом по быÑтрому Ñтарту в документации и Ñоздайте первый рабочий поток, затем наÑтройте иÑполнитель Forgejo, который будет выполнÑÑ‚ÑŒ задачи. -runs.no_workflows.help_no_write_access = ОзнакомьтеÑÑŒ Ñ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ð°Ñ†Ð¸ÐµÐ¹, чтобы узнать про ДейÑÑ‚Ð²Ð¸Ñ Forgejo. [projects] type-1.display_name=Индивидуальный проект @@ -3963,6 +3908,7 @@ deleted.display_name = Удалённый проект [git.filemode] changed_filemode=%[1]s → %[2]s +; Ordered by git filemode value, ascending. E.g. directory has "040000", normal file has "100644", … directory=Каталог normal_file=Обычный файл executable_file=ИÑполнÑемый файл @@ -3971,36 +3917,44 @@ submodule=Подмодуль +[graphs] +component_loading_failed = Ðе удалоÑÑŒ загрузить %s +component_failed_to_load = СлучилаÑÑŒ Ð½ÐµÐ¿Ñ€ÐµÐ´Ð²Ð¸Ð´ÐµÐ½Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°. +contributors.what = ÑоучаÑтие +component_loading = Загрузка %s... +component_loading_info = Это займёт некоторое времÑ… +code_frequency.what = чаÑтота изменений +recent_commits.what = недавние коммиты + + [search] search = ПоиÑк... fuzzy_tooltip = Включает результаты, доÑтаточно похожие на запроÑ, даже при наличии неточноÑтей type_tooltip = Тип поиÑка fuzzy = Приблизительный match = Точный -repo_kind = Ðайти репозитории... -user_kind = Ðайти пользователей... -org_kind = Ðайти организации... -team_kind = Ðайти команды... -code_kind = Ðайти в коде... -package_kind = Ðайти пакеты... -project_kind = Ðайти проекты... -branch_kind = Ðайти ветви... -commit_kind = Ðайти коммиты... +repo_kind = ПоиÑк репозиториев... +user_kind = ПоиÑк пользователей... +org_kind = ПоиÑк организаций... +team_kind = ПоиÑк команд... +code_kind = ПоиÑк по коду... +package_kind = ПоиÑк пакетов... +project_kind = ПоиÑк проектов... +branch_kind = ПоиÑк ветвей... +commit_kind = ПоиÑк коммитов... no_results = По запроÑу ничего не найдено. -keyword_search_unavailable = ПоиÑк по ключевым Ñловам недоÑтупен. Уточните подробноÑти у админиÑтратора Ñервера. +keyword_search_unavailable = ПоиÑк по ключевым Ñловам недоÑтупен. Уточните подробноÑти у админиÑтратора. match_tooltip = Включать только результаты, точно ÑоответÑтвующие запроÑу -code_search_unavailable = ПоиÑк в коде недоÑтупен. Уточните подробноÑти у админиÑтратора Ñервера. -runner_kind = Ðайти иÑполнителей... -code_search_by_git_grep = Эти результаты получены через «git grep». Результатов может быть больше, еÑли на Ñервере будет включен индекÑатор кода. +code_search_unavailable = ПоиÑк по коду ÑÐµÐ¹Ñ‡Ð°Ñ Ð½ÐµÐ´Ð¾Ñтупен. Уточните подробноÑти у админиÑтратора. +runner_kind = ПоиÑк иÑполнителей... +code_search_by_git_grep = Эти результаты получены через «git grep». Результатов может быть больше, еÑли админиÑтратор Ñервера включит индекÑатор кода. exact = Точный exact_tooltip = Включает только результаты, в точноÑти ÑоответÑтвующие запроÑу -issue_kind = Ðайти задачи... -pull_kind = Ðайти ÑлиÑниÑ... +issue_kind = ПоиÑк задач... +pull_kind = ПоиÑк ÑлиÑний... union_tooltip = Включает результаты Ñ Ñовпавшими ключевыми Ñловами, разделёнными пробелами union = Обычный -milestone_kind = Ðайти Ñтапы... -regexp = РегулÑрное выражение -regexp_tooltip = Интерпретировать поиÑковый Ð·Ð°Ð¿Ñ€Ð¾Ñ ÐºÐ°Ðº регулÑрное выражение +milestone_kind = ПоиÑк Ñтапов... [markup] @@ -4009,24 +3963,4 @@ filepreview.lines = Строки Ñ %[1]d по %[2]d в %[3]s filepreview.truncated = ПредпроÑмотр был обрезан [translation_meta] -test = forgejo :) - -[repo.permissions] -code.write = ЗапиÑÑŒ: отправка изменений в репозиторий, Ñоздание веток и тегов. -code.read = Чтение: проÑмотр и клонирование иÑходного кода репозиториÑ. -issues.read = Чтение: проÑмотр и Ñоздание задач и комментариев. -pulls.read = Чтение: проÑмотр и открытие запроÑов ÑлиÑний. -releases.read = Чтение: проÑмотр выпуÑков и Ñкачивание файлов. -releases.write = ЗапиÑÑŒ: публикациÑ, изменение и удаление выпуÑков и их файлов. -wiki.read = Чтение: проÑмотр Ñтраниц и иÑтории Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð²Ñтроенной вики. -projects.write = ЗапиÑÑŒ: Ñоздание и изменение проектов и колонок. -packages.write = ЗапиÑÑŒ: Ð¿ÑƒÐ±Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ Ð¸ удаление пакетов в репозитории. -projects.read = Чтение: проÑмотр проектов в репозитории. -ext_wiki = ДоÑтуп ко ÑÑылке на внешнюю вики. ÐаÑтройка разрешений выполнÑетÑÑ Ð²Ð½Ðµ Ñайта. -actions.read = Чтение: проÑмотр интегрированных конвейеров CI/CD и их логов. -pulls.write = ЗапиÑÑŒ: закрытие запроÑов ÑлиÑний и изменение их метаданных: меток, Ñтапа, назначений, Ñрока Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¸ завиÑимоÑтей и пр. -issues.write = ЗапиÑÑŒ: закрытие задач и изменение их метаданных: меток, Ñтапа, назначений, Ñрока Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¸ завиÑимоÑтей и пр. -actions.write = ЗапиÑÑŒ: ручной запуÑк, перезапуÑк, отмена и одобрение работы конвейеров CI/CD. -wiki.write = ЗапиÑÑŒ: Ñоздание, изменение и удаление Ñтраниц во вÑтроенной вики. -packages.read = Чтение: проÑмотр и Ñкачивание пакетов в репозитории. -ext_issues = ДоÑтуп к ÑÑылке на внешний трекер задач. ÐаÑтройка разрешений выполнÑетÑÑ Ð²Ð½Ðµ Ñайта. +test = хи-хи! \ No newline at end of file diff --git a/options/locale/locale_si-LK.ini b/options/locale/locale_si-LK.ini index ac7627ca80..bfb22176e8 100644 --- a/options/locale/locale_si-LK.ini +++ b/options/locale/locale_si-LK.ini @@ -116,6 +116,7 @@ missing_csrf=නරක ඉල්ලීම: CSRF ටà·à¶šà¶±à·Š නොමà·à¶­ app_desc=වේදනà·à¶šà·à¶»à·“, ස්වයං-සත්කà·à¶»à¶š Git සේවà·à·€à¶šà·Š install=ස්ථà·à¶´à¶±à¶ºà¶§ පහසුය platform=හරස් වේදිකà·à·€ +platform_desc=Forgejo ඕනෑම තà·à¶±à¶š ධà·à·€à¶±à¶º Go සඳහ෠සම්පà·à¶¯à¶±à¶º කළ à·„à·à¶šà·’ය: වින්ඩà·à·ƒà·Š, මà·à¶šà·à·ƒà·Š, ලිනක්ස්, ARM, ආදිය ඔබ ආදරය කරන එකක් තà·à¶»à¶±à·Šà¶±! lightweight=à·ƒà·à·„à·à¶½à·Šà¶½à·” lightweight_desc=Forgejo අඩු අවම අවà·à·Šà¶ºà¶­à· ඇති අතර මිල අඩු Raspberry Pi මත ධà·à·€à¶±à¶º කළ à·„à·à¶šà·’ය. ඔබේ යන්ත්ර à·à¶šà·Šà¶­à·’ය සුරකින්න! license=විවෘත මූලà·à·à·Šâ€à¶» @@ -919,10 +920,10 @@ editor.or=à·„à· editor.cancel_lower=අවලංගු කරන්න editor.commit_signed_changes=අත්සන් කළ වෙනස්කම් සිදු කරන්න editor.commit_changes=වෙනස්කම් සිදු කරන්න -editor.add_tmpl='<%s>' එකතු කරන්න +editor.add_tmpl='' එකතු කරන්න editor.commit_message_desc=විකල්ප දීර්චවිස්තරයක් එක් කරන්න… editor.signoff_desc=කà·à¶´à·€à·– ලොග් පණිවිඩය අවසà·à¶±à¶ºà·š දී කà·à¶´à¶šà¶»à·” විසින් සිග්නෙඩ්-ඕෆ්-විසින් ට්රේලරයක් එක් කරන්න. -editor.commit_directly_to_this_branch=%[1]s à·à·à¶›à·à·€à¶§ කෙලින්ම කà·à¶´ කරන්න. +editor.commit_directly_to_this_branch=%s à·à·à¶›à·à·€à¶§ කෙලින්ම කà·à¶´ කරන්න. editor.create_new_branch=මෙම කà·à¶´ කිරීම සඳහ෠නව à·à·à¶›à·à·€à¶šà·Š à·ƒà·à¶¯à· අදින්න ඉල්ලීමක් ආරම්භ කරන්න. editor.create_new_branch_np=මෙම කà·à¶´ කිරීම සඳහ෠නව à·à·à¶›à·à·€à¶šà·Š à·ƒà·à¶¯à¶±à·Šà¶±. editor.propose_file_change=ගොනු වෙනස් කිරීම යà·à¶¢à¶±à· කරන්න @@ -1097,12 +1098,12 @@ issues.reopen_comment_issue=අදහස් දක්ව෠විවෘත ක issues.create_comment=අදහස issues.closed_at=`මෙම ගà·à¶§à·…ුව වස෠%[2]s` issues.reopened_at=`මෙම ගà·à¶§à·…ුව නà·à·€à¶­ විවෘත කරන ලදි %[2]s` -issues.ref_issue_from=`මෙම නිකුතුව %[4]s à·„à·’ %[2]s` -issues.ref_pull_from=`මෙම අදින්න ඉල්ලීම%[4]s %[2]s` -issues.ref_closing_from=`මෙම ගà·à¶§à·…ුව වස෠දමනු ඇත%[4]s මෙම ගà·à¶§à·…ුව %[2]s` -issues.ref_reopening_from=`මෙම ගà·à¶§à·…ුව නà·à·€à¶­ විවෘත කරනු ඇත%[4]s මෙම ගà·à¶§à·…ුව %[2]s` -issues.ref_closed_from=`මෙම නිකුතුව%[4]s %[2]s` -issues.ref_reopened_from=`මෙම නිකුතුව%[4]s %[2]sනà·à·€à¶­ විවෘත කරන ලදි` +issues.ref_issue_from=මෙම නිකුතුව %[4]s à·„à·’ %[2]s +issues.ref_pull_from=මෙම අදින්න ඉල්ලීම%[4]s %[2]s +issues.ref_closing_from=මෙම ගà·à¶§à·…ුව වස෠දමනු ඇත%[4]s මෙම ගà·à¶§à·…ුව %[2]s +issues.ref_reopening_from=මෙම ගà·à¶§à·…ුව නà·à·€à¶­ විවෘත කරනු ඇත%[4]s මෙම ගà·à¶§à·…ුව %[2]s +issues.ref_closed_from=මෙම නිකුතුව%[4]s %[2]s +issues.ref_reopened_from=මෙම නිකුතුව%[4]s %[2]sනà·à·€à¶­ විවෘත කරන ලදි issues.ref_from=`හිම%[1]s` issues.role.owner=හිමිකරු issues.role.member=à·ƒà·à¶¸à·à¶¢à·’ක @@ -1182,7 +1183,7 @@ issues.error_modifying_due_date=නියමිත දිනය වෙනස් issues.error_removing_due_date=නියමිත දිනය ඉවත් කිරීමට අපොහොසත් විය. issues.push_commit_1=එකතු %d කà·à¶´ %s issues.push_commits_n=එකතු %d විවරයන් %s -issues.force_push_codes=`බලය-pushed%[1]s සිට %[2]s %[4]s ගේ %[6]s` +issues.force_push_codes=`බලය-pushed%[1]s සිට %[2]s %[4]s ගේ %[6]s` issues.force_push_compare=සසඳන්න issues.due_date_form=Yyy-mm-dd issues.due_date_form_add=නියමිත දිනය එකතු කරන්න @@ -1268,7 +1269,7 @@ pulls.nothing_to_compare=මෙම à·à·à¶›à· සමà·à¶± වේ. අදි pulls.nothing_to_compare_and_allow_empty_pr=මෙම à·à·à¶›à· සමà·à¶± වේ. මෙම මහජන සම්බන්ධත෠හිස් වනු ඇත. pulls.has_pull_request=`මෙම à·à·à¶›à· අතර අදින්න ඉල්ලීම දà·à¶±à¶§à¶¸à¶­à·Š පවතී: %[2]s #%[3]d` pulls.create=අදින්න ඉල්ලීම නිර්මà·à¶«à¶º -pulls.title_desc_few=%[1]d සිට %[2]s දක්ව෠%[3]s +pulls.title_desc_few=%[1]d සිට %[2]s දක්ව෠%[3]s pulls.merged_title_desc_few=මර්ජ්%[1]d සිට %[2]s දක්ව෠%[3]s %[4]s pulls.change_target_branch_at=`ඉලක්කගත à·à·à¶›à·à·€ %s සිට %s %sදක්ව෠වෙනස් කර ඇත` pulls.tab_conversation=සංවà·à¶¯à¶º @@ -1279,7 +1280,7 @@ pulls.cant_reopen_deleted_branch=à·à·à¶›à·à·€ මක෠දà·à¶¸à·– නි pulls.merged=සංයුක්ත කෙරිණි pulls.manually_merged=අතින් සංයුක්ත කර ඇත pulls.is_closed=අදින්න ඉල්ලීම වස෠දම෠ඇත. -pulls.title_wip_desc=`අහම්බෙන් ඒකà·à¶¶à¶¯à·Šà¶° කිරීමෙන් අදින්න ඉල්ලීම à·€à·à·…à·à¶šà·Šà·€à·“ම සඳහ෠%s සමඟ මà·à¶­à·˜à¶šà·à·€ ආරම්භ කරන්න.` +pulls.title_wip_desc=අහම්බෙන් ඒකà·à¶¶à¶¯à·Šà¶° කිරීමෙන් අදින්න ඉල්ලීම à·€à·à·…à·à¶šà·Šà·€à·“ම සඳහ෠%s සමඟ මà·à¶­à·˜à¶šà·à·€ ආරම්භ කරන්න. pulls.cannot_merge_work_in_progress=මෙම අදින්න ඉල්ලීම ක්රියà·à¶­à·Šà¶¸à¶š වන කà·à¶»à·Šà¶ºà¶ºà¶šà·Š ලෙස සලකුණු කර ඇත. pulls.still_in_progress=තවමත් ක්රියà·à¶­à·Šà¶¸à¶š වෙමින් තිබේද? pulls.add_prefix=%s උපසර්ගය එකතු කරන්න @@ -2537,6 +2538,9 @@ owner.settings.cleanuprules.enabled=සබල කර ඇත [secrets] [actions] + + + runners.name=නම runners.owner_type=වර්ගය runners.description=සවිස්තරය @@ -2553,4 +2557,6 @@ runs.commit=කà·à¶´ [projects] [git.filemode] +; Ordered by git filemode value, ascending. E.g. directory has "040000", normal file has "100644", … symbolic_link=සංකේතà·à¶­à·Šà¶¸à¶š සබà·à¶³à·’ය + diff --git a/options/locale/locale_sk-SK.ini b/options/locale/locale_sk-SK.ini index bd2ce203dd..29824c5b4d 100644 --- a/options/locale/locale_sk-SK.ini +++ b/options/locale/locale_sk-SK.ini @@ -187,6 +187,7 @@ app_desc=Jednoducho prístupný vlastný Git install=Jednoduchá inÅ¡talácia install_desc=Jednoducho spustite binárku pre vaÅ¡u platformu, poÅ¡lite ju ako Docker, alebo ju získajte ako balíÄek. platform=Multiplatformový +platform_desc=Forgejo beží vÅ¡ade kde je možné preložiÅ¥ Go: Windows, macOS, Linux, ARM, a podobne. Vyberte si! lightweight=Ľahká lightweight_desc=Forgejo má minimálne požiadavky a môže bežaÅ¥ na Raspberry Pi. Å etrite energiou vášho stroja! license=Otvorený zdrojový kód @@ -1029,7 +1030,7 @@ editor.cancel_lower=ZruÅ¡iÅ¥ editor.commit_signed_changes=OdoslaÅ¥ podpísané zmeny editor.commit_changes=OdoslaÅ¥ zmeny editor.patch=PoužiÅ¥ patch -editor.commit_directly_to_this_branch=OdoslaÅ¥ zmeny revízie priamo do vetvy %[1]s. +editor.commit_directly_to_this_branch=OdoslaÅ¥ zmeny revízie priamo do vetvy %s. editor.cancel=ZruÅ¡iÅ¥ editor.commit_empty_file_header=OdoslaÅ¥ prázdny súbor editor.commit_empty_file_text=Súbor, ktorý sa chystáte odoslaÅ¥, je prázdny. PokraÄovaÅ¥? @@ -1361,6 +1362,9 @@ owner.settings.cleanuprules.enabled=Povolené [secrets] [actions] + + + runners.labels=Å títky @@ -1370,4 +1374,6 @@ runners.labels=Å títky [projects] [git.filemode] -symbolic_link=Symbolický odkaz \ No newline at end of file +; Ordered by git filemode value, ascending. E.g. directory has "040000", normal file has "100644", … +symbolic_link=Symbolický odkaz + diff --git a/options/locale/locale_sl.ini b/options/locale/locale_sl.ini index 0a948f0ec9..ffa1e38af6 100644 --- a/options/locale/locale_sl.ini +++ b/options/locale/locale_sl.ini @@ -1,3 +1,6 @@ + + + [common] language = Jezik passcode = Pristopna koda @@ -240,7 +243,7 @@ smtp_from_helper = e-poÅ¡tni naslov, ki ga bo uporabljal Forgejo. Vnesite navade [admin] users.allow_git_hook_tooltip = Kljuke Git se izvajajo kot uporabnik operacijskega sistema, v katerem je nameÅ¡Äen program Forgejo, in imajo enako raven dostopa do gostitelja. Uporabniki s tem posebnim privilegijem Git Hook lahko dostopajo do vseh skladiÅ¡Ä Forgejo in spreminjajo vse zbirke Forgejo ter podatkovno bazo, ki jo uporablja Forgejo. PoslediÄno lahko pridobijo tudi skrbniÅ¡ke privilegije Forgejo. auths.force_smtps_helper = SMTPS se vedno uporablja na vratih 465. ÄŒe želite, da se SMTPS uporablja tudi na drugih vratih, to nastavite. (V nasprotnem primeru se bo STARTTLS uporabljal na drugih vratih, Äe ga gostitelj podpira.) -self_check.database_fix_mysql = Uporabniki MySQL/MariaDB lahko za odpravo težav s kollacijo uporabite ukaz "forgejo doctor convert", lahko pa težavo odpravite tudi z ukazom "ALTER ... COLLATE ..." SQL roÄno. +self_check.database_fix_mysql = Uporabniki MySQL/MariaDB lahko za odpravo težav s kollacijo uporabite ukaz "gitea doctor convert", lahko pa težavo odpravite tudi z ukazom "ALTER ... COLLATE ..." SQL roÄno. users.purge_help = Prisilno izbriÅ¡ite uporabnika in vsa skladiÅ¡Äa, organizacije in pakete, ki so v njegovi lasti. Izbrisani bodo tudi vsi komentarji in vpraÅ¡anja, ki jih je objavil ta uporabnik. auths.sspi_default_language_helper = Privzet jezik za uporabnike, samodejno ustvarjene z metodo avtentikacije SSPI. Pustite prazno, Äe želite, da se jezik zazna samodejno. auths.restricted_filter_helper = Pustite prazno, Äe ne želite nastaviti nobenega uporabnika kot omejenega. Uporabite zvezdico ("*"), Äe želite vse uporabnike, ki se ne ujemajo z administratorskim filtrom, nastaviti kot omejene. @@ -309,7 +312,7 @@ appearance = Videz password = Geslo authorized_oauth2_applications_description = Tem aplikacijam tretjih oseb ste odobrili dostop do svojega osebnega raÄuna Forgejo. Prosimo, da prekliÄete dostop do aplikacij, ki jih ne uporabljate veÄ. social_desc = S temi družabnimi raÄuni se lahko prijavite v svoj raÄun. PrepriÄajte se, da jih vse prepoznate. -access_token_desc = Izbrana dovoljenja žetona omejujejo avtorizacijo samo na ustrezne poti API. Za veÄ informacij preberite dokumentacijo. +access_token_desc = Izbrana dovoljenja žetona omejujejo avtorizacijo samo na ustrezne poti API. Za veÄ informacij preberite dokumentacijo. oauth2_client_secret_hint = Skrivnost se ne bo veÄ prikazala, ko zapustite ali osvežite to stran. PrepriÄajte se, da ste jo shranili. twofa_desc = Za zaÅ¡Äito raÄuna pred krajo gesla lahko uporabite pametni telefon ali drugo napravo za prejemanje Äasovno omejenih enkratnih gesel ("TOTP"). twofa_recovery_tip = ÄŒe napravo izgubite, boste lahko z obnovitvenim kljuÄem za enkratno uporabo ponovno pridobili dostop do raÄuna. @@ -552,7 +555,7 @@ repo.collaborator.added.subject = %s vas je dodal v %s team_invite.subject = %[1]s vas je povabil, da se pridružite organizaciji %[2]s issue.action.new = @%[1]s ustvaril #%[2]d. team_invite.text_1 = %[1]s vas je povabil, da se pridružite ekipi %[2]s v organizaciji %[3]s. -team_invite.text_3 = Opomba: To vabilo je bilo namenjeno %[1]s. ÄŒe tega vabila niste priÄakovali, ga lahko ignorirate. +team_invite.text_3 = Opomba: To vabilo je bilo namenjeno %[1]. ÄŒe tega vabila niste priÄakovali, ga lahko ignorirate. reply = ali neposredno odgovorite na to e-poÅ¡tno sporoÄilo activate_email = Preverite svoj e-poÅ¡tni naslov activate_email.title = %s, preverite svoj e-poÅ¡tni naslov @@ -688,4 +691,4 @@ code = Koda owner.settings.chef.keypair.description = Za preverjanje pristnosti v registru Chef je potreben par kljuÄev. ÄŒe ste par kljuÄev ustvarili že prej, se pri ustvarjanju novega para kljuÄev stari par kljuÄev zavrže. [actions] -runners.runner_manage_panel = Upravljanje tekaÄev \ No newline at end of file +runners.runner_manage_panel = Upravljanje tekaÄev diff --git a/options/locale/locale_sr-SP.ini b/options/locale/locale_sr-SP.ini index 3021b48781..e091f91a68 100644 --- a/options/locale/locale_sr-SP.ini +++ b/options/locale/locale_sr-SP.ini @@ -89,6 +89,7 @@ has_unconfirmed_mail=Здраво, %s! Имате непотврђену адр resend_mail=Кликните овде да поново пошаљете пиÑмо [mail] + activate_account=Молимо Ð²Ð°Ñ Ð°ÐºÑ‚Ð¸Ð²Ð¸Ñ€Ð°Ñ˜Ñ‚Ðµ ваш налог activate_email=Потврдите вашу адреÑу е-поште @@ -265,7 +266,7 @@ editor.commit_changes=Изврши комит промена editor.add=Додај '%s' editor.update=Ðжурирај '%s' editor.delete=Уклони '%s' -editor.commit_directly_to_this_branch=Изврши комит директно на %[1]s грану. +editor.commit_directly_to_this_branch=Изврши комит директно на %s грану. editor.create_new_branch=Креирај нову грану за овај комит и поднеÑи захтев за Ñпајање. editor.cancel=Откажи editor.branch_already_exists=Грана '%s' већ поÑтоји за ово Ñпремиште. @@ -355,6 +356,9 @@ pulls.tab_commits=Комити pulls.merged=Спојено pulls.can_auto_merge_desc=Овај захтев за Ñпајање може бити обављен аутоматÑки. +; %[2]s
%[3]s + + milestones.new=Ðова фаза milestones.open_tab=%d отворено milestones.close_tab=%d затворено @@ -724,4 +728,5 @@ remove_file=Уклони датотеку [gpg] -[units] \ No newline at end of file +[units] + diff --git a/options/locale/locale_sv-SE.ini b/options/locale/locale_sv-SE.ini index abdb012120..71eddbd550 100644 --- a/options/locale/locale_sv-SE.ini +++ b/options/locale/locale_sv-SE.ini @@ -16,7 +16,7 @@ template=Mall language=SprÃ¥k notifications=Notiser create_new=Skapa… -user_profile_and_more=Profil och inställningar… +user_profile_and_more=Profil och Inställningar… signed_in_as=Inloggad som toc=InnehÃ¥llsförteckning licenses=Licenser @@ -38,7 +38,7 @@ organization=Organisation mirror=Spegel new_repo=Ny utvecklingskatalog new_migrate=Ny migrering -new_mirror=Ny spegling +new_mirror=Ny Spegling new_fork=Ny förgrening av utvecklingskatalog new_org=Ny organisation new_project=Nytt projekt @@ -57,7 +57,7 @@ collaborative=Kollaborativa forks=Forks activities=Aktiviteter -pull_requests=Pull-förfrÃ¥gningar +pull_requests=Pull förfrÃ¥gningar issues=Ärenden milestones=Milstolpar @@ -94,127 +94,22 @@ name=Namn logo = Logotyp sign_in_with_provider = Logga in med %s enable_javascript = Denna webbplats kräver JavaScript. -ok = OK -more_items = Fler saker -webauthn_sign_in = Tryck pÃ¥ knappen pÃ¥ din säkerhetsnyckel. Om din säkerhetsnyckel inte har en knapp, dra ut den och sätt in den igen. -new_project_column = Ny kolumn -copy_type_unsupported = Den här filtypen kan inte kopieras -error = Fel -retry = Försök igen -rerun_all = Kör om alla jobb -copy_success = Kopierad! -locked = LÃ¥st -copy = Kopiera -copy_url = Kopiera URL -copy_error = Kopiering misslyckades -copy_content = Kopiera innehÃ¥ll -webauthn_insert_key = Skriv in din säkerhetsnyckel -webauthn_press_button = Var god tryck pÃ¥ knappen pÃ¥ din säkerhetsnyckel… -webauthn_error = Kunde inte läsa din säkerhetsnyckel. -webauthn_unsupported_browser = Din webbläsare har inte ännu stöd för WebAuthn. -webauthn_error_unknown = Ett okänt fel har inträffat. Var god försök igen. -webauthn_error_empty = Du mÃ¥ste ange ett namn för den här nyckeln. -new_org.title = Ny organisation -new_org.link = Ny organisation -test = Test -concept_system_global = Global -concept_user_individual = Individuell -rss_feed = RSS-flöde -never = Aldrig -unknown = Okänd -confirm_delete_artifact = Är du säker pÃ¥ att du vill ta bort artefakten "%s"? -artifacts = Artefakter -show_timestamps = Visa tidsstämpel -show_full_screen = Visa i fullskärm -download_logs = Ladda ner loggar -go_back = GÃ¥ tillbaka -show_log_seconds = Visa sekunder -rerun = Kör om -filter = Filter -filter.is_archived = Arkiverade -filter.clear = Rensa filter -filter.is_mirror = Speglar -copy_path = Kopiera sökväg -unpin = Lossa -value = Värde -filter.not_archived = Inte arkiverade -error413 = Du har använt upp din kvot. -invalid_data = Ogiltig data: %v -filter.not_template = Inte mallar -copy_hash = Kopiera hash -view = Se -copy_branch = Kopiera grennamn -pin = Fäst -filter.public = Publika -new_repo.title = Ny utvecklingskatalog -new_migrate.title = Ny migrering -new_repo.link = Ny utvecklingskatalog -new_migrate.link = Ny migrering -filter.not_mirror = Inte speglar -filter.is_template = Mallar -filter.private = Privata -active_stopwatch = SpÃ¥rning av aktiv tid -tracked_time_summary = Sammanfattning av spÃ¥rad tid baserat pÃ¥ filter av ärendelistan -toggle_menu = Visningsmeny -confirm_delete_selected = Bekräfta för att ta bort alla valda objekt? -webauthn_error_timeout = Timeout uppnÃ¥ddes innan din nyckel kan läsas. Vänligen ladda om denna sida och försök igen. -filter.is_fork = Förgreningar -webauthn_error_duplicated = Säkerhetsnyckeln är inte tillÃ¥ten för denna begäran. Se till att nyckeln inte redan är registrerad. -filter.not_fork = Inte gafflar -remove_label_str = Ta bort objektet "%" -webauthn_use_twofa = Använd en tvÃ¥faktorskod frÃ¥n din telefon -webauthn_error_insecure = WebAuthn stöder endast säkra anslutningar. För testning över HTTP kan du använda "localhost" eller "127.0.0.1" -webauthn_error_unable_to_process = Servern kunde inte hantera din begäran. -copy_generic = Kopiera till urklipp [aria] -footer.software = Om den här mjukvaran -footer.links = Länkar -footer = Sidfot -navbar = Navigeringsfält [heatmap] -contributions_one = bidrag -contributions_zero = Inga bidrag -contributions_format = {contributions} pÃ¥ {day} {month}, {year} -contributions_few = bidrag -less = Mindre -more = Mer -number_of_contributions_in_the_last_12_months = %s bidrag under de senaste 12 mÃ¥naderna [editor] -buttons.quote.tooltip = Citera text -buttons.code.tooltip = Lägg till kod -buttons.link.tooltip = Lägg till en länk -buttons.heading.tooltip = Lägg till rubrik -buttons.bold.tooltip = Lägg till fetstilt text -buttons.italic.tooltip = Lägg till kursiv text -buttons.list.unordered.tooltip = Lägg till en punktlista -buttons.list.ordered.tooltip = Lägg till en numrerad lista -buttons.list.task.tooltip = Lägg till en lista med sysslor -buttons.mention.tooltip = Nämn en användare eller ett team -buttons.ref.tooltip = Hänvisa till ett ärende eller en pull request -buttons.new_table.tooltip = Lägg till tabell -table_modal.header = Lägg till tabell -table_modal.placeholder.header = Sidhuvud -table_modal.placeholder.content = InnehÃ¥ll -table_modal.label.rows = Rader -table_modal.label.columns = Kolumner [filter] -string.asc = A - Ö [error] -occurred = Ett fel har inträffat -server_internal = Internt serverfel -network_error = Nätverksfel -report_message = Om du tror att detta är en Forgejo-bugg, sök efter ärenden pÃ¥ Codeberg eller öppna ett nytt ärende om det behövs. [startpage] app_desc=En smidig, självhostad Git-tjänst install=Lätt att installera platform=Plattformsoberoende -platform_desc=Forgejo har bekräftats körbart pÃ¥ libre-operativsystem sÃ¥ som Linux och FreeBSD, samt pÃ¥ olika CPU-arkitekturer. Välj den du älskar! +platform_desc=Forgejo kan köra överallt där Go kan kompileras: Windows, macOS, Linux, ARM, etc. Välj den du gillar! lightweight=Lättviktig lightweight_desc=Forgejo har lÃ¥ga minimum-krav och kan köras pÃ¥ en billig Rasperry Pi. Spara pÃ¥ din maskins kraft! license=Öppen källkod @@ -244,103 +139,85 @@ err_admin_name_pattern_not_allowed=Administratörens användarnamn är ogiltigt, err_admin_name_is_invalid=Administratörsanvändarnamnet är ogiltigt general_title=Allmänna inställningar -app_name=Instansens titel -app_name_helper=Skriv in din instans namn här. Det kommer att visas pÃ¥ varje sida. +app_name=Sajtens namn +app_name_helper=Du kan ange ditt företagsnamn här. repo_path=Rotsökväg för utvecklingskatalog repo_path_helper=Fjärrutvecklingskataloger kommer att sparas i denna katalog. -lfs_path=LFS rotsökväg +lfs_path=LFS Rotsökväg lfs_path_helper=Filer hanterade av Git LFS kommer att sparas i denna mapp. Lämna tom för att avaktivera. -run_user=Användare att köra som +run_user=Kör som användarnamn ssh_port=SSH-serverport -ssh_port_helper=Portnumret som din SSH-server använder. Lämna tom för att inaktivera SSH-server. -http_port=HTTP-lyssningsport -http_port_helper=Portnumret som kommer att användas av Forgejos webbserver. -app_url=Bas-URL +ssh_port_helper=Portnumret som din SSH-server lyssnar pÃ¥. Lämna tom för att inaktivera. +http_port=Forgejo HTTP-lyssningsport +http_port_helper=Portnumret som Forgejos webbserver kommer lyssna pÃ¥. +app_url=Forgejo URL app_url_helper=Basadressen för HTTP(S)-kloningslänkar och mejlnotifikationer. log_root_path=Loggsökväg log_root_path_helper=Loggfiler kommer skrivas till denna katalog. optional_title=Övriga inställningar -email_title=E-postinställningar +email_title=Mejlinställningar smtp_addr=SMTP-server smtp_port=SMTP-port -smtp_from=Skicka E-post som +smtp_from=Skicka Mejl Som smtp_from_helper=Mejladress som Forgejo kommer att använda. Anges i simpelt ('email@example.com') eller fullständigt ('Name ') format. -mailer_user=SMTP-användarnamn -mailer_password=SMTP-lösenord -register_confirm=Kräv bekräftelse via E-post för att registrera -mail_notify=Aktivera E-postnotifikationer -server_service_title=Inställningar för server- och tredjepartstjänster -offline_mode=Aktivera lokalt läge +mailer_user=SMTP-Användarnamn +mailer_password=SMTP-Lösenord +register_confirm=Kräv Bekräftelse Via Mejl För Att Registrera +mail_notify=Aktivera Mejlnotifikationer +server_service_title=Inställningar för Server- och Tredjepartstjänster +offline_mode=Aktivera Lokalt Läge offline_mode.description=Inaktivera CDN frÃ¥n tredjepart och distribuera samtliga resurser lokalt istället. disable_gravatar=Inaktivera Gravatar -disable_gravatar.description=Inaktivera Gravatar- och avatarskällor frÃ¥n tredjepart. Standardbilder kommer att användas för användaravatarer om dom inte laddar upp en egen avatar till instansen. -federated_avatar_lookup=Aktivera federerade avatarer -federated_avatar_lookup.description=Använd Libavatar för uppslagning av avatarer. -disable_registration=Inaktivera självregistrering -disable_registration.description=Endast instansens administratörer kommer kunna skapa nya konton. Det rekommenderas starkt att inaktivera självregistrering av användare om du inte tänker driva en publik instans för alla och är redo att hantera en stor mängd spam-konton. -allow_only_external_registration.description=Användare kommer endast kunna skapa nya konton genom att använda konfigurerade externa tjänster. +disable_gravatar.description=Inaktivera Gravatar- och avatarskällor frÃ¥n tredjepart. Om användaren inte laddar upp en avatar sÃ¥ kommer en standardavatar att användas. +federated_avatar_lookup=Aktivera Federerade Avatarer +federated_avatar_lookup.description=Använd libravatar vid förenad uppslagning av avatarer. +disable_registration=Inaktivera Självregistrering +disable_registration.description=Inaktivera självregistrering av användare. Endast administratörer kommer kunna skapa nya konton. +allow_only_external_registration.description=TillÃ¥t registrering endast via externa tjänster openid_signin=Aktivera OpenID-inloggning -openid_signin.description=TillÃ¥t användare att logga in via OpenID. +openid_signin.description=Aktivera användarinloggning via OpenID. openid_signup=Aktivera självregistrering genom OpenID -openid_signup.description=TillÃ¥t användare att skapa konton via OpenID om självregistrering är aktiverad. +openid_signup.description=Aktivera OpenID-baserad självregistrering av användare. enable_captcha=Aktivera CAPTCHA registrering -enable_captcha.description=Kräv att användare klarar CAPTCHA för att registrera konton. -require_sign_in_view=Kräv inloggning för att visa instansens innehÃ¥ll -admin_setting.description=Skapandet av ett administratörskonto är frivilligt. Den första användaren som registreras blir automatiskt administratör. -admin_title=Inställningar för administratörskonto -admin_name=Användarnamn för administratör +enable_captcha.description=Kräv captcha för användarregistrering. +require_sign_in_view=Kräv Inloggning För Att Visa Sidor +admin_setting.description=Skapandet av administratörskonto är frivilligt. Den första användaren som registreras blir automatiskt administratör. +admin_title=Inställningar för Administratörskonto +admin_name=Användarnamn för Administratör admin_password=Lösenord confirm_password=Bekräfta lösenord -admin_email=E-postadress +admin_email=Mejladress install_btn_confirm=Installera Forgejo -test_git_failed=Misslyckades att testa "git" kommando: %v -sqlite3_not_available=Denna version av Forgejo stödjer inte SQLite3. Ladda ner den officiella binären frÃ¥n %s (inte "gobuild" versionen). +test_git_failed=Misslyckades att testa 'git' kommando: %v +sqlite3_not_available=Denna version av Forgejo stödjer ej SQLite3. Ladda ner den officiella binären frÃ¥n %s (inte 'gobuild' versionen). invalid_db_setting=Databasinställningarna är ogiltiga: %v invalid_repo_path=Utvecklingskatalogens rotsökväg är ogiltig: %v run_user_not_match=Systemtjänstanvändaren är inte den nuvarande användaren: %s -> %s save_config_failed=Misslyckades att spara konfigurationen: %v invalid_admin_setting=Inställning för administartörskontot är ogiltig: %v invalid_log_root_path=Sökvägen för loggar är ogiltig: %v -default_keep_email_private=Dölj e-postadresser som standard -default_keep_email_private.description=Dölj e-postadress för nya användarkonton som standard sÃ¥ att den informationen inte omedelbart läcker efter registrering. +default_keep_email_private=Dölj mailadresser som standard +default_keep_email_private.description=Dölj mailadresser för nya användarkonton som standard. default_allow_create_organization=TillÃ¥t skapandet utav organisationer som standard -default_allow_create_organization.description=TillÃ¥t nya användarkonton att skapa organisationer som standard. När detta alternativt ej är aktivt sÃ¥ behöver en administratör tilldela rättigheter att skapa organisationer till nya användare. -default_enable_timetracking=Aktivera tidredovisning som standard +default_allow_create_organization.description=TillÃ¥t nya användarkonton att skapa organisationer som standard. +default_enable_timetracking=Aktivera tidredovisning som Standard default_enable_timetracking.description=Aktivera tidsredovisning för nya utvecklingskataloger som standard. -no_reply_address=Dold e-postdomän -no_reply_address_helper=Domännamn för användare med en dold e-postadress. Exempelvis kommer användarnamnet "joe" att loggas i Git som "joe@noreply.example.org" om den dolda e-postdomänen är satt till "noreply.example.org". -require_db_desc = Forgejo kräver MySQL, PostgreSQL, SQLite3 eller TiDB (MySQL-protokoll). -allow_only_external_registration = TillÃ¥t registrering endast via externa tjänster -app_slogan = Instansslogan -app_slogan_helper = Skriv in din slogan här. Lämna tom för att stänga av. -domain = Serverdomän -domain_helper = Domän eller värdadress för servern. -reinstall_error = Du försöker att installera i en existerande Forgejo-databas -password_algorithm_helper = Ställ in hashalgoritmen för lösenord. Algoritmer har olika krav och styrka. Argon2-algoritmen är ganska säker men använder mycket minne och kan vara olämplig för smÃ¥ system. -config_location_hint = Dessa konfigurationsinställningar kommer att sparas i: -invalid_db_table = Databastabellen "%s" är ogiltig: %v -secret_key_failed = Misslyckades att generera hemlig nyckel: %v -allow_dots_in_usernames = TillÃ¥t användare att använda punkter i sina användarnamn. PÃ¥verkar inte befintliga användare. -reinstall_confirm_message = Ominstallation med en befintlig Forgejo-databas kan orsaka flera problem. I de flesta fall bör du använda din befintliga "app.ini" för att köra Forgejo. Om du vet vad du hÃ¥ller pÃ¥ med, bekräfta följande: -require_sign_in_view.description = Begränsa Ã¥tkomst till innehÃ¥ll till inloggade användare. Gäster kommer endast att kunna besöka autentiseringssidorna. -invalid_app_data_path = Sökvägen för appdata är ogiltig: %v -internal_token_failed = Misslyckades att generera intern token: %v -password_algorithm = Hashalgoritm för lösenord -invalid_password_algorithm = Ogiltig hashalgoritm för lösenord +no_reply_address=Dold mejldomän +no_reply_address_helper=Domännamn för användare med en dold mailadress. Exempelvis kommer användarnamnet 'joe' att loggas i Git som 'joe@noreply.example.org' om dold maildomän är satt till 'noreply.example.org'. [home] -uname_holder=Användarnamn eller e-postadress +uname_holder=Användarnamn eller Mejladress password_holder=Lösenord -switch_dashboard_context=Växla visad instrumentpanel +switch_dashboard_context=Växla Visad Instrumentpanel my_repos=Utvecklingskataloger show_more_repos=Visa flera utvecklingskataloger… collaborative_repos=Kollaborativa Utvecklingskataloger -my_orgs=Organisationer +my_orgs=Mina organisationer my_mirrors=Mina speglar view_home=Visa %s search_repos=Hitta en utvecklingskatalog… -filter=Övriga filter +filter=Övriga Filter show_archived=Arkiverade show_both_archived_unarchived=Visar bÃ¥de arkiverade och icke arkiverade @@ -353,7 +230,6 @@ show_only_private=Visar endast privata show_only_public=Visar endast publika issues.in_your_repos=I dina utvecklingskataloger -filter_by_team_repositories = Filtrera efter lagutvecklingskataloger [explore] repos=Utvecklingskataloger @@ -366,13 +242,9 @@ user_no_results=Inga matchande användare hittades. org_no_results=Inga matchande organisationer hittades. code_no_results=Ingen källkod hittades som matchar din sökterm. code_last_indexed_at=Indexerades senast %s -stars_one = %d stjärna -go_to = GÃ¥ till -relevant_repositories = Endast relevanta utvecklingskataloger visas, visa ofiltrerade resultat. -stars_few = %d stjärnor [auth] -create_new_account=Registrera konto +create_new_account=Registrera Konto register_helper_msg=Har du redan ett konto? Logga in nu! social_register_helper_msg=Har du redan ett konto? Länka det nu! disable_register_prompt=Registrering inaktiverad. Vänligen kontakta din sidadministratör. @@ -381,18 +253,18 @@ remember_me=Kom ihÃ¥g denna enhet forgot_password_title=Glömt lösenord forgot_password=Glömt lösenord? sign_up_now=Behöver du ett konto? Registrera nu. -confirmation_mail_sent_prompt=Ett nytt bekräftelsemejl has skickats till %s. För att slutföra registreringsprocessen, vänligen kolla din inkorg inom dom kommande %s. Om e-postadressen är felaktig sÃ¥ kan du logga in och begära att fÃ¥ ett nytt bekräftelsemejlet skickat till en annan e-postadressen. +confirmation_mail_sent_prompt=Ett nytt bekräftelsemail has skickats till %s. Vänligen kolla din inkorg inom dom kommande %s för att slutföra registreringsprocessen. must_change_password=Ändra ditt lösenord allow_password_change=Kräv att användaren byter lösenord (rekommenderas) -reset_password_mail_sent_prompt=Ett nytt bekräftelsemail has skickats till %s. För att slutföra Ã¥terställning av ditt konto, kontrollera din inkorg och gÃ¥ till den bifogade länken inom de kommande %s. +reset_password_mail_sent_prompt=Ett nytt bekräftelsemail has skickats till %s. Vänligen kontrollera din inkorg inom de kommande %s för att slutföra Ã¥terställning av ditt konto. active_your_account=Aktivera ditt konto account_activated=Kontot har aktiverats -prohibit_login=Kontot är avstängd +prohibit_login=Inloggning otillÃ¥ten resent_limit_prompt=Du har redan begärt ett aktiveringsmejl nyligen. Vänligen vänta 3 minuter och försök igen. has_unconfirmed_mail=Hej %s, du har en obekräftad epostaddress (%s). Om du inte har fÃ¥tt ett bekräftelsemail eller behöver ett nytt, klicka pÃ¥ knappen nedan. resend_mail=Klicka här för att skicka ditt aktiveringsmejl igen email_not_associate=Denna e-postadress är inte knutet till nÃ¥got konto. -send_reset_mail=Skicka mejl för kontoÃ¥terställning +send_reset_mail=Skicka mail för kontoÃ¥terställning reset_password=KontoÃ¥terställning invalid_code=Din bekräftelsekod är ogiltig eller har löpt ut. reset_password_helper=Ã…terställ konto @@ -426,24 +298,9 @@ authorize_title=Ge "%s" tillgÃ¥ng till ditt konto? authorization_failed=Auktorisering misslyckades sspi_auth_failed=SSPI-autentisering misslyckades password_pwned_err=Kunde inte slutföra begäran till HaveIBeenPwned -reset_password_wrong_user = Du är inloggad som %s, men kontoÃ¥terställningslänken är avsedd för %s -invalid_code_forgot_password = Din bekräftelsekod är ogiltig eller har gÃ¥tt ut. Klicka pÃ¥ här för att pÃ¥börja en ny session. -invalid_password = Ditt lösenord matchar inte lösenordet som användes för att skapa kontot. -openid_signin_desc = Ange din OpenID URI. Till exempel: alice.openid.example.org eller https://openid.example.org/alice. -sign_in_openid = Fortsätt med OpenID -hint_login = Har du redan ett konto? Logga in nu! -change_unconfirmed_email_summary = Ändra e-postadressen som aktiveringsmejl skickas till. -change_unconfirmed_email_error = Det gÃ¥r inte att ändra e-postadressen: %v -use_onetime_code = Använde en engÃ¥ngskod -last_admin = Du kan inte ta bort den sista administratören. Det mÃ¥ste finnas minst en administratör. -back_to_sign_in = Tillbaka till Logga in -hint_register = Behöver du ett konto? Registrera ett nu. -prohibit_login_desc = Ditt konto har blivit avstängt frÃ¥n att interagera med instansen. Kontakta instansadministratören för att Ã¥terfÃ¥ tillgÃ¥ng. -password_pwned = Lösenordet du valde finns pÃ¥ en lista över stulna lösenord som tidigare exponerats i offentliga dataintrÃ¥ng. Försök igen med ett annat lösenord och överväg att ändra detta lösenord pÃ¥ annat hÃ¥ll ocksÃ¥. -sign_up_button = Registrera dig. -sign_up_successful = Kontot skapades. Välkommen! [mail] + activate_account=Vänligen aktivera ditt konto activate_email=Verifiera din epostaddress @@ -453,14 +310,6 @@ register_notify=Välkommen till %s reset_password=Ã…terställ ditt konto register_success=Registreringen lyckades -password_change.subject = Ditt lösenord har uppdaterats -password_change.text_1 = Lösenordet för ditt konto ändrades just. -primary_mail_change.subject = Din primära e-postadress har ändrats -activate_account.text_1 = Hej %[1]s, tack för att du registrerat dig hos %[2]s! -reply = eller svara pÃ¥ detta e-postmeddelande direkt -hi_user_x = Hej %s, -admin.new_user.user_info = Användarinformation -admin.new_user.text = Vänligen klicka här för att hantera denna användare frÃ¥n administratörspanelen. @@ -498,8 +347,8 @@ SSPISeparatorReplacement=Avgränsare SSPIDefaultLanguage=StandardsprÃ¥k require_error=fÃ¥r inte vara tomt -alpha_dash_error=` bör endast innehÃ¥lla alfanumeriska tecken, bindestreck ("-") och understreck ("_").` -alpha_dash_dot_error=` bör endast innehÃ¥lla alfanumeriska tecken, bindestreck ("-"), understreck ("_") och punkter (".").` +alpha_dash_error=` bör endast innehÃ¥lla alfanumeriska tecken, bindestreck ('-') och understreck ('_').` +alpha_dash_dot_error=` bör endast innehÃ¥lla alfanumeriska tecken, bindestreck ('-'), understreck ('_') och punkter ('.').` git_ref_name_error=mÃ¥ste vara ett för Git välformaterat referensnamn. size_error=` mÃ¥ste vara av storleken %s` min_size_error=` mÃ¥ste innehÃ¥lla minst %s tecken.` @@ -535,7 +384,7 @@ enterred_invalid_owner_name=Det nya namnet pÃ¥ ägaren är ogiltligt. enterred_invalid_password=Det angivna lösenordet är felaktigt. user_not_exist=Användaren finns inte. team_not_exist=Teamet finns inte. -last_org_owner=Du kan inte ta bort den sista användaren frÃ¥n "owners" teamet. Det mÃ¥ste finnas minst en ägare för en organisation. +last_org_owner=Du kan inte ta bort den sista användaren frÃ¥n 'owners' teamet. Det mÃ¥ste finnas minst en ägare för en organisation. cannot_add_org_to_team=En organisation kan inte läggas till som teammedlem. invalid_ssh_key=Kunde inte verifiera din SSH-nyckel: %s @@ -549,9 +398,9 @@ target_branch_not_exist=MÃ¥lgrenen finns inte. [user] change_avatar=Byt din avatar… repositories=Utvecklingskataloger -activity=Offentlig aktivitet +activity=Offentlig Aktivitet followers_few=%d följare -starred=Stjärnmärkta utvecklingskataloger +starred=Stjärnmärkta Utvecklingskataloger projects=Projekt overview=Översikt following_few=%d följer @@ -567,13 +416,13 @@ account=Konto password=Lösenord security=Säkerhet avatar=Visningsbild -ssh_gpg_keys=SSH/GPG-nycklar +ssh_gpg_keys=SSH / GPG-nycklar social=Sociala konton applications=Applikationer -orgs=Organisationer +orgs=Hantera Organisationer repos=Utvecklingskataloger delete=Radera konto -twofa=TvÃ¥faktorsautentisering (TOTP) +twofa=TvÃ¥faktorsautentisering account_link=Länkade Konton organization=Organisationer @@ -594,16 +443,16 @@ comment_type_group_title=Titel privacy=Sekretess keep_activity_private_popup=Gör aktiviteten endast synlig för dig och administratörerna -lookup_avatar_by_mail=SlÃ¥ upp avatar efter e-postadress +lookup_avatar_by_mail=SlÃ¥ upp avatarer med hjälp utav mejladress federated_avatar_lookup=Förenad uppslagning av avatar -enable_custom_avatar=Använd anpassad avatar +enable_custom_avatar=Aktivera Egen Avatar choose_new_avatar=Välj ny avatar -update_avatar=Uppdatera avatar -delete_current_avatar=Ta bort aktuell avatar +update_avatar=Uppdatera Avatar +delete_current_avatar=Tag bort aktuell avatar uploaded_avatar_not_a_image=Den uppladdade filen är inte en bild. update_avatar_success=Din avatar har blivit uppdaterad. -update_password=Ändra lösenord +update_password=Ändra Lösenordet old_password=Nuvarande lösenord new_password=Nytt lösenord password_incorrect=Det nuvarande lösenordet är felaktigt. @@ -611,18 +460,18 @@ change_password_success=Ditt lösenord har uppdaterats. Logga in med ditt nya l password_change_disabled=Externa användare kan inte ändra sitt lösenord genom Forgejos webbgränssnitt. emails=E-postadresser -manage_emails=Hantera e-postadresser -manage_themes=Standardtema -manage_openid=OpenID-adresser -theme_desc=Detta tema kommer att användas för webbgränssnittet när du är inloggad. +manage_emails=Hantera mejladresser +manage_themes=Välj standardtema +manage_openid=Hantera OpenID-adresser +theme_desc=Detta kommer att vara ditt standardtema pÃ¥ webbplatsen. primary=Primär activated=Aktiverad requires_activation=Aktivering krävs -primary_email=Gör primär +primary_email=Sätt Som Primär activate_email=Skicka aktivering activations_pending=Väntar pÃ¥ aktivering delete_email=Ta Bort -email_deletion=Ta bort e-postadress +email_deletion=Ta Bort mejladress email_deletion_desc=Mejladressen och relaterad information kommer tas bort frÃ¥n ditt konto. Git-commits med denna mejladress förblir oförändrade. Vill du fortsätta? email_deletion_success=Mejladressen har tagits bort. theme_update_success=Ditt tema ändrades. @@ -630,26 +479,26 @@ theme_update_error=Det valda temat finns inte. openid_deletion=Ta bort OpenID-adress openid_deletion_desc=Borttagning av denna OpenID-adress frÃ¥n ditt konto kommer förhindra framtida inloggningar med den. Vill du fortsätta? openid_deletion_success=OpenID-adressen har tagits bort. -add_new_email=Lägg till ny e-postadress -add_new_openid=Lägg till ny OpenID-URI -add_email=Lägg till e-postadress +add_new_email=Lägg till ny mejladress +add_new_openid=Lägg till ny OpenID URI +add_email=Lägg till mejladress add_openid=Lägg till OpenID URI add_email_success=Den nya mejladressen har lagts till. email_preference_set_success=E-postinställningen har uppdaterats. add_openid_success=Den nya OpenID-adressen har lagts till. -keep_email_private=Göm e-postadress +keep_email_private=Göm mejladress openid_desc=OpenID lÃ¥ter dig delegera autentiseringen till en extern leverantör. manage_ssh_keys=Hantera SSH-nycklar manage_gpg_keys=Hantera GPG-nycklar add_key=Lägg till nyckel -ssh_desc=Dessa publika SSH nycklar är associerade med ditt konto. De motsvarande privata nycklarna tillÃ¥ter full Ã¥tkomst till dina utvecklingskataloger. SSH-nycklar som har blivit verifierade kan användas för att verifiera SSH-signerade Git-commiter. +ssh_desc=Dessa publika SSH nycklar är associerade med ditt konto. De motsvarande privata nycklarna tillÃ¥ter full Ã¥tkomst till dina utvecklingskataloger. gpg_desc=Dessa publika GPG nycklar är associerade med ditt konto. HÃ¥ll dina privata nycklar säkra dÃ¥ de tillÃ¥ter att commits kan verifieras. ssh_helper=Behöver du hjälp? Kolla in Github's guide för att skapa din egen SSH-nycklar eller lösa vanliga problem som kan uppstÃ¥ med SSH. gpg_helper=Behöver du hjälp? Ta en titt pÃ¥ Github's guide om GPG. add_new_key=Lägg till SSH-nyckel add_new_gpg_key=Lägg till GPG-nyckel -key_content_gpg_placeholder=Börjar med "-----BEGIN PGP PUBLIC KEY BLOCK-----" +key_content_gpg_placeholder=Börjar med '-----BEGIN PGP PUBLIC KEY BLOCK-----' ssh_key_been_used=Denna SSH-nyckel har redan lagts till pÃ¥ servern. gpg_key_id_used=En publik GPG-nyckel med samma ID existerar redan. gpg_key_verify=Verifiera @@ -681,15 +530,15 @@ ssh_disabled=SSH är inaktiverat manage_social=Hantera länkade sociala konton unbind=Koppla frÃ¥n -manage_access_token=Ã…tkomsttokens -generate_new_token=Generera ny token +manage_access_token=Hantera Ã¥tkomst-tokens +generate_new_token=Generera Nya Tokens tokens_desc=Dessa tokens tillÃ¥ter Ã¥tkomst till ditt konto via Forgejo API. token_name=Tokennamn -generate_token=Generera token +generate_token=Generera Token generate_token_success=Din nya token har genererats. Kopiera nu dÃ¥ den inte kommer visas igen. generate_token_name_duplicate=%s finns redan som programnamn. Välj ett annat. delete_token=Radera -access_token_deletion=Ta bort Ã¥tkomsttoken +access_token_deletion=Ta bort Ã¥tkomst token access_token_deletion_cancel_action=Avbryt access_token_deletion_confirm_action=Radera delete_token_success=Token har tagits bort. Applikationer som använder den kommer inte längre ha Ã¥tkomst till ditt konto. @@ -714,7 +563,7 @@ oauth2_application_create_description=OAuth2-applikationer ger tredjepartsapplik authorized_oauth2_applications=Auktoriserade OAuth2-appar revoke_key=Upphäv -revoke_oauth2_grant=Dra in Ã¥tkomst +revoke_oauth2_grant=Upphäv Ã¥tkomst revoke_oauth2_grant_description=Ã…terkallning av Ã¥tkomst för detta tredjepartsprogram kommer att hindra programmet frÃ¥n att komma Ã¥t dina data. Är du säker? twofa_desc=TvÃ¥faktorsautentisering förbättrar säkerheten pÃ¥ ditt konto. @@ -734,31 +583,30 @@ passcode_invalid=Koden är ogiltig. Försök igen. twofa_enrolled=TvÃ¥faktorsautentisering har aktiverats för ditt konto. Förvara din skrapkod (%s) pÃ¥ en säker plats eftersom den bara visas en gÃ¥ng! -manage_account_links=Länkade konton +manage_account_links=Hantera Länkade Konton manage_account_links_desc=Dessa externa konton är länkade till ditt Forgejo-konto. account_links_not_available=Det finns för närvarande inga externa konton länkade till ditt Forgejo-konto. link_account=Länka konto -remove_account_link=Ta bort länkat konto +remove_account_link=Ta Bort Länkat Konto remove_account_link_desc=Borttagning av länkade konton kommer häva dess Ã¥tkomst till ditt Forgejo-konto. Vill du fortsätta? remove_account_link_success=Det länkade konton har tagits bort. orgs_none=Du är inte en medlem i nÃ¥gon organisation. -delete_account=Ta bort ditt konto +delete_account=Radera ditt konto delete_prompt=Denna Ã¥tgärd kommer ta bort ditt konto permanent. Det KAN INTE Ã¥ngras. -confirm_delete_account=Bekräfta borttagelse -delete_account_title=Ta bort användarkonto +confirm_delete_account=Bekräfta Borttagelsen +delete_account_title=Ta Bort Användarkonto delete_account_desc=Är du säker pÃ¥ att du vill ta bort ditt konto permanent? -email_notifications.enable=Aktivera notiser via e-post +email_notifications.enable=Aktivera notiser via mejl email_notifications.onmention=Endast e-post vid omnämnanden -email_notifications.disable=Inaktivera notiser via e-post -email_notifications.submit=Ställ in e-postpreferenser +email_notifications.disable=Inaktivera notiser via mejl +email_notifications.submit=Ställ in e-post inställningar visibility.public=Offentlig visibility.private=Privat -change_password = Byt lösenord [repo] owner=Ägare @@ -766,31 +614,31 @@ repo_name=Utvecklingskatalogens namn repo_name_helper=Bra namn pÃ¥ utvecklingskataloger bestÃ¥r utav korta, unika nyckelord som är enkla att komma ihÃ¥g. repo_size=Utvecklingskatalogens storlek template=Mall -template_select=Välj en mall +template_select=Välj mall. template_helper=Gör utvecklingskatalog till mall template_description=Utvecklingskatalogmallar lÃ¥ter användare skapa nya utvecklingskataloger med samma filstruktur, filer, och valda inställningar. visibility=Synligt för visibility_description=Bara ägaren eller medlemmar i organisationen med rätt rättigheter kommer kunna se det. visibility_helper_forced=Din tjänstadministratör pÃ¥tvingar privata utvecklingskataloger. -visibility_fork_helper=(Att ändra detta kommer att pÃ¥verka alla forkar.) +visibility_fork_helper=(Ändring av detta kommer pÃ¥verka alla forkar.) clone_helper=Hjälp med kloning? Se hjälp. -fork_repo=Forka utveckligskatalog -fork_from=Forka frÃ¥n +fork_repo=Forka Repo +fork_from=Forka FrÃ¥n fork_visibility_helper=Synligheten av en forkad utvecklingskatalog kan inte ändras. use_template=Välj den här mallen -generate_repo=Generera utvecklingskatalog +generate_repo=Skapa utvecklingskatalog generate_from=Generera frÃ¥n repo_desc=Beskrivning repo_lang=SprÃ¥k -repo_gitignore_helper=Välj .gitignore-mallar +repo_gitignore_helper=Välj .gitignore-mallar. repo_gitignore_helper_desc=Välj vilka filer som inte ska spÃ¥ras frÃ¥n en lista med mallar för vanliga sprÃ¥k. Typiska artefakter som genereras av varje sprÃ¥k byggverktyg ingÃ¥r i .gitignore som standard. -issue_labels=Etiketter -issue_labels_helper=Välj en uppsättning av etiketter +issue_labels=Ärendeetiketter +issue_labels_helper=Välj en grupp av ärendeetiketter. license=Licens -license_helper=Välj en licensfil -license_helper_desc=En licens styr vad andra kan och inte kan göra med din kod. Inte säker pÃ¥ vilken som är rätt för ditt projekt? Se Välj en licens. +license_helper=Välj licensfil. +license_helper_desc=En licens styr vad andra kan och inte kan göra med din kod. Inte säker pÃ¥ vilken som är rätt för ditt projekt? Se Välj en licens. readme=README -readme_helper=Välj en mall för README-filen +readme_helper=Välj en mall för README-filen. readme_helper_desc=Här kan du skriva en fullständig beskrivning för ditt projekt. auto_init=Initiera utvecklingskatalog (Lägger till .gitignore, License and README) create_repo=Skapa utvecklingskatalog @@ -799,8 +647,8 @@ default_branch_helper=Den förvalda grenen är bas-gren för pull requests och k mirror_prune=Rensa mirror_prune_desc=Ta bort förlegade fjärrföljande referenser mirror_interval_invalid=Speglingsintervallen är inte giltig. -mirror_address=Klona frÃ¥n URL -mirror_last_synced=Synkroniserad senast +mirror_address=Klona FrÃ¥n URL +mirror_last_synced=Senaste Synkronisering watchers=Observerare stargazers=Stjärnmärkare forks=Förgreningar @@ -821,7 +669,7 @@ desc.internal=Intern desc.archived=Arkiverade template.items=Mallobjekt -template.git_content=Git-innehÃ¥ll (standardgren) +template.git_content=Git innehÃ¥ll (Default branch) template.git_hooks=Githookar template.webhooks=Webbhookar template.topics=Ämnen @@ -834,7 +682,7 @@ archive.issue.nocomment=Den här utvecklingskatalogen är arkiverad. Du kan inte archive.pull.nocomment=Den här utvecklingskatalogen är arkiverad. Du kan inte kommentera pÃ¥ pull-förfrÃ¥gningar. -migrate_options=Migreringsalternativ +migrate_options=Migrationsalternativ migrate_service=Migreringstjänst migrate_items=Migrationsobjekt migrate_items_wiki=Wiki @@ -844,9 +692,9 @@ migrate_items_issues=Ärenden migrate_items_pullrequests=Pull Requester migrate_items_merge_requests=Begäran om sammanslagning migrate_items_releases=Releaser -migrate_repo=Migrera utvecklingskatalog -migrate.clone_address=Migrera eller klona frÃ¥n URL -migrate.clone_address_desc=HTTP(S)- eller Git "clone" länk för en existerande utvecklingskatalog +migrate_repo=Migrera Repot +migrate.clone_address=Migrera Eller Klona FrÃ¥n URL +migrate.clone_address_desc=HTTP(S)- eller Git 'clone' länken för en existerande utvecklingskatalog migrate.clone_local_path=eller en lokal serversökväg migrate.permission_denied=Du fÃ¥r inte importera lokala repon. migrate.failed=Migrering misslyckades: %v @@ -856,7 +704,7 @@ migrated_from_fake=Migrerad frÃ¥n %[1]s migrate.migrate=Migrera frÃ¥n %s migrate.migrating=Migrerar frÃ¥n %s ... migrate.migrating_failed=Migrering frÃ¥n %s misslyckades. -migrate.migrating_issues=Migrerar ärenden +migrate.migrating_issues=Migrerar Ärenden mirror_from=spegling av forked_from=forkad frÃ¥n @@ -870,7 +718,7 @@ watch=Bevaka unstar=Ta bort stjärnmärkning star=Stjärnmärk fork=Förgrening -download_archive=Ladda ner utvecklingskatalogen +download_archive=Ladda Ned Utvecklingskatalogen no_desc=Ingen beskrivning quick_guide=Snabbguide @@ -904,38 +752,38 @@ file_view_raw=Visa i rÃ¥format file_permalink=Permalänk file_too_large=Filen är för stor för att visas. -video_not_supported_in_browser=Din webbläsare stödjer ej HTML5-taggen "video". -audio_not_supported_in_browser=Din webbläsare stödjer ej HTML5-taggen "audio". +video_not_supported_in_browser=Din webbläsare stödjer ej HTML5-taggen 'video'. +audio_not_supported_in_browser=Din webbläsare stöder inte taggen 'audio' i HTML5. stored_lfs=Sparad med Git LFS symbolic_link=Symbolisk länk -commit_graph=Commitgraf +commit_graph=Commit-Graf commit_graph.monochrome=Mono blame=Blame normal_view=Normal vy line=rad lines=rader -editor.new_file=Ny fil -editor.upload_file=Ladda upp fil -editor.edit_file=Redigera fil +editor.new_file=Ny Fil +editor.upload_file=Ladda Upp Fil +editor.edit_file=Redigera Fil editor.preview_changes=Förhandsgranska ändringar editor.cannot_edit_lfs_files=LFS-filer kan inte redigeras i webbgränssnittet. editor.cannot_edit_non_text_files=Binära filer kan inte redigeras genom webbgränssnittet. -editor.edit_this_file=Redigera fil +editor.edit_this_file=Redigera Fil editor.this_file_locked=Filen är lÃ¥st editor.must_be_on_a_branch=Du mÃ¥ste vara pÃ¥ en branch för att göra eller föreslÃ¥ ändringar i denna fil. editor.fork_before_edit=Du mÃ¥ste forka denna utvecklingskatalog för att göra eller föreslÃ¥ förändringar pÃ¥ denna fil. editor.delete_this_file=Ta bort fil editor.must_have_write_access=Du mÃ¥ste ha skrivÃ¥tkomst för att göra eller föreslÃ¥ ändringar av denna fil. editor.name_your_file=Namnge din fil… -editor.filename_help=Lägg till en katalog genom att skriva dess namn följt utav ett snedstreck ("/"). Ta bort katalog genom att sudda i början utav fältet. +editor.filename_help=Lägg till en katalog genom att skriva dess namn följt utav en slash ('/'). Ta bort katalog genom att sudda i början utav fältet. editor.or=eller editor.cancel_lower=Avbryt editor.commit_signed_changes=Committa signerade ändringar editor.commit_changes=Checka in ändringar -editor.add_tmpl=Lägg till '<%s>' +editor.add_tmpl=Lägg till '' editor.commit_message_desc=Lägg till en valfri utökad beskrivning… -editor.commit_directly_to_this_branch=Checka in direkt till grenen %[1]s. +editor.commit_directly_to_this_branch=Checka in direkt till grenen %s. editor.create_new_branch=Skapa en ny gren för denna incheckning och pÃ¥börja en hämtningsbegäran. editor.create_new_branch_np=Skapa en ny branch för den här committen. editor.propose_file_change=FöreslÃ¥ filändring @@ -956,7 +804,7 @@ commits.desc=Bläddra i källkodens förändringshistorik. commits.commits=Incheckningar commits.search=Sök commits… commits.find=Sök -commits.search_all=Alla grenar +commits.search_all=Alla brancher commits.author=Upphovsman commits.message=Meddelande commits.date=Datum @@ -965,7 +813,7 @@ commits.newer=Nyare commits.signed_by=Signerad av commits.signed_by_untrusted_user=Signerad av opÃ¥litlig användare commits.signed_by_untrusted_user_unmatched=Signerad av opÃ¥litlig användare som inte matchar den som committat -commits.gpg_key_id=GPG-nyckel-ID +commits.gpg_key_id=GPG-nyckel ID commitstatus.pending=Väntande @@ -980,7 +828,7 @@ projects.new=Nytt projekt projects.deletion=Ta bort projekt projects.deletion_success=Projektet har tagits bort. projects.edit=Redigera projekt -projects.modify=Redigera projekt +projects.modify=Uppdatera projekt projects.type.none=Ingen projects.template.desc=Projektmall projects.type.uncategorized=Okatergoriserad @@ -995,10 +843,10 @@ issues.filter_milestones=Filtrera milstolpe issues.filter_projects=Filtrera projekt issues.filter_labels=Filtrera etikett issues.filter_reviewers=Filtrera granskare -issues.new=Nytt ärende +issues.new=Nytt Ärende issues.new.title_empty=Titeln kan inte vara tom issues.new.labels=Etiketter -issues.new.no_label=Inga etiketter +issues.new.no_label=Ingen Etikett issues.new.clear_labels=Rensa etiketter issues.new.projects=Projekt issues.new.clear_projects=Rensa projekt @@ -1007,26 +855,26 @@ issues.new.open_projects=Öppna projekt issues.new.closed_projects=Stängda projekt issues.new.no_items=Inga objekt issues.new.milestone=Milsten -issues.new.no_milestone=Ingen milstolpe +issues.new.no_milestone=Ingen Milsten issues.new.clear_milestone=Rensa milstenar -issues.new.open_milestone=Öppna milstolpar -issues.new.closed_milestone=Stängda milstolpar +issues.new.open_milestone=Öppna Milstenar +issues.new.closed_milestone=Stängda Milstenar issues.new.assignees=Tilldelade issues.new.clear_assignees=Rensa tilldelade -issues.new.no_assignees=Inga tilldelade +issues.new.no_assignees=Ingen tilldelad issues.new.no_reviewers=Inga granskare issues.choose.get_started=Kom igÃ¥ng issues.choose.open_external_link=Öppna issues.choose.blank=Standard issues.choose.blank_about=Skapa ett ärende frÃ¥n standardmall. -issues.no_ref=Ingen gren/etikett specificerad -issues.create=Skapa ärende +issues.no_ref=Ingen Branch/Tag specificerad +issues.create=Skapa Ärende issues.new_label=Ny etikett issues.new_label_placeholder=Etikettsnamn issues.new_label_desc_placeholder=Beskrivning -issues.create_label=Skapa etikett +issues.create_label=Skapa Etikett issues.label_templates.title=Ladda en fördefinierad uppsättning etiketter -issues.label_templates.info=Inga etiketter finns ännu. Skapa en etikett med "Ny etikett" eller använd fördefinierade etiketter: +issues.label_templates.info=Inga etiketter finns ännu. Skapa en etikett med 'Ny etikett' eller använd fördefinierade etiketter: issues.label_templates.helper=Markera en uppsättning etiketter issues.label_templates.use=Använd etikettsamling issues.add_milestone_at=`lade till denna till milstolpe %s %s` @@ -1086,20 +934,20 @@ issues.commented_at=`kommenterad %s` issues.delete_comment_confirm=Är du säker pÃ¥ att du vill ta bort den här kommentaren? issues.context.copy_link=Kopiera länk issues.context.quote_reply=Citerat svar -issues.context.reference_issue=Hänvisa till i nytt ärende +issues.context.reference_issue=Referens i nytt ärende issues.context.edit=Redigera issues.context.delete=Ta bort -issues.close_comment_issue=Stäng med kommentar +issues.close_comment_issue=Kommentera och stäng issues.reopen_issue=Ã…teröppna -issues.reopen_comment_issue=Öppna igen med kommentar +issues.reopen_comment_issue=Kommentera och Ã¥teröppna issues.create_comment=Kommentera issues.closed_at=`stängde ärendet %[2]s` issues.reopened_at=`Ã¥teröppnade detta ärende %[2]s` issues.commit_ref_at=`refererade till detta ärende frÃ¥n en incheckning %[2]s` issues.ref_issue_from=`refererade till detta ärende %[4]s %[2]s` issues.ref_pull_from=`refererade till denna pull-förfrÃ¥gan %[4]s %[2]s` -issues.ref_closing_from=`hänvisade till detta ärende frÃ¥n en pull-förfrÃ¥gan %[4]s som kommer att stänga det %[2]s` -issues.ref_reopening_from=`hänvisade till detta ärende frÃ¥n en pull-förfrÃ¥gan %[4]s som kommer att öppna ärendet pÃ¥ nytt %[2]s` +issues.ref_closing_from=`refererade till en pull-förfrÃ¥gan %[4]s som kommer att stänga detta ärende %[2]s` +issues.ref_reopening_from=`refererade till en pull-förfrÃ¥gan %[4]s som kommer att öppna ärendet pÃ¥ nytt %[2]s` issues.ref_closed_from=`stängde detta ärende %[4]s %[2]s` issues.ref_reopened_from=`öpnnade detta ärende igen %[4]s %[2]s` issues.ref_from=`frÃ¥n %[1]s` @@ -1138,11 +986,11 @@ issues.lock.unknown_reason=Kan inte lÃ¥sa ärende utan angiven anledning. issues.lock_duplicate=Ett ärende kan inte lÃ¥sas tvÃ¥ gÃ¥nger. issues.unlock_error=Kan inte lÃ¥sa upp ett olÃ¥st ärende. issues.lock_with_reason=lÃ¥st som %s och begränsad konversation till medarbetare %s -issues.lock_no_reason=lÃ¥st och begränsat konversation till medarbetare %s +issues.lock_no_reason=lÃ¥st och begränsat konversation till kollaboratörer %s issues.unlock_comment=lÃ¥s upp denna konversation %s issues.lock_confirm=LÃ¥s issues.unlock_confirm=LÃ¥s upp -issues.lock.notice_1=- Andra användare kan inte kommentera pÃ¥ detta ärende. +issues.lock.notice_1=- Andra användare kan inte kommentera detta ärende. issues.lock.notice_2=- Du och andra kollaboratörer med tillgÃ¥ng till denna utvecklingskatalog kan fortfarande skriva kommentarer som andra kan se. issues.lock.notice_3=- Du kan alltid lÃ¥sa upp detta ärende senare. issues.unlock.notice_1=- Alla kommer kunna kommentera detta ärende en gÃ¥ng till. @@ -1168,7 +1016,7 @@ issues.del_time_history=`raderade tillbringad tid %s` issues.add_time_hours=Timmar issues.add_time_minutes=Minuter issues.add_time_sum_to_small=Inge tid har angivits. -issues.time_spent_total=Total tid spenderad +issues.time_spent_total=Total Tid Spenderad issues.time_spent_from_all_authors=`Total Tid Spenderad: %s` issues.due_date=Förfallodatum issues.invalid_due_date_format=Datumsformatet för förfallodatum mÃ¥ste följa 'yyyy-MM-dd'. @@ -1185,7 +1033,7 @@ issues.due_date_not_set=Inget förfallodatum satt. issues.due_date_added=lade till förfallodatumet %s %s issues.due_date_remove=tog bort förfallodatumet %s %s issues.due_date_overdue=Försenad -issues.due_date_invalid=Förfallodatumet är ogiltigt eller utanför gränserna. Använd formatet "åååå-mm-dd". +issues.due_date_invalid=Förfallodatumet är ogiltigt eller utanför gränserna. Använd formatet 'åååå-mm-dd'. issues.dependency.title=Beroenden issues.dependency.add=Lägg till beroende… issues.dependency.cancel=Avbryt @@ -1215,10 +1063,10 @@ issues.review.approve=godkände dessa ändringar %s issues.review.comment=granskad av %s issues.review.left_comment=lämnade en kommentar issues.review.content.empty=Du mÃ¥ste skriva en kommentar som anger de önskade ändringarna. -issues.review.reject=efterfrÃ¥gade ändringar %s -issues.review.wait=efterfrÃ¥gades för granskning %s -issues.review.add_review_request=efterfrÃ¥gade granskning frÃ¥n %[1]s %[2]s -issues.review.remove_review_request=tog bort granskningsförfrÃ¥gan för %[1]s %[2]s +issues.review.reject=begärda ändringar %s +issues.review.wait=begärdes för granskning %s +issues.review.add_review_request=begärde granskning frÃ¥n %s %s +issues.review.remove_review_request=tog bort granskningsbegäran för %s %s issues.review.remove_review_request_self=vägrade att granska %s issues.review.pending=Väntande issues.review.review=Granska @@ -1234,21 +1082,21 @@ issues.content_history.options=Alternativ pulls.desc=Aktivera pull-förfrÃ¥gningar och kodgranskning. -pulls.new=Ny pull-förfrÃ¥gan -pulls.compare_changes=Ny pull-förfrÃ¥gan +pulls.new=Ny Pull-FörfrÃ¥gan +pulls.compare_changes=Ny Pull-Request pulls.compare_changes_desc=Välj branchen att merga in i, och ifrÃ¥n. pulls.compare_base=merga in i pulls.compare_compare=pulla frÃ¥n pulls.filter_branch=Filtrera gren pulls.no_results=Inga resultat hittades. pulls.nothing_to_compare=Dessa brancher är ekvivalenta. Det finns ingen anledning att skapa en pull-request. -pulls.create=Skapa pull-förfrÃ¥gan -pulls.title_desc_few=vill sammanfoga %[1]d incheckningar frÃ¥n s[2]s in i %[3]s +pulls.create=Skapa PullförfrÃ¥gan +pulls.title_desc_few=vill sammanfoga %[1]d incheckningar frÃ¥n s[2]s in i %[3]s pulls.merged_title_desc_few=sammanfogade %[1]d incheckningar frÃ¥n %[2]s in i %[3]s %[4]s pulls.change_target_branch_at=`ändrade mÃ¥l-branch frÃ¥n %s till %s%s` pulls.tab_conversation=Konversation pulls.tab_commits=Incheckningar -pulls.tab_files=Ändrade filer +pulls.tab_files=Ändrade Filer pulls.reopen_to_merge=Vänligen Ã¥teröppna denna Pull-förfrÃ¥gan igen för att utföra sammanfogningen. pulls.cant_reopen_deleted_branch=Denna pull-förfrÃ¥gan kan inte öppnas igen eftersom branchen tagits bort. pulls.merged=Sammanfogat @@ -1285,12 +1133,12 @@ milestones.no_due_date=Inget förfallodatum milestones.open=Öppna milestones.close=Stäng milestones.completeness=%d%% Slutförd -milestones.create=Skapa milstolpe +milestones.create=Skapa Milstolpe milestones.title=Titel milestones.desc=Beskrivning milestones.due_date=Förfallodatum (valfritt) milestones.clear=Rensa -milestones.invalid_due_date_format=Förfallodatumsformatet mÃ¥ste vara "åååå-mm-dd". +milestones.invalid_due_date_format=Förfallodatumsformatet mÃ¥ste vara 'yyyy-MM-dd'. milestones.edit=Redigera milstolpe milestones.edit_subheader=Milstolpar organiserar ärenden och följer utvecklingens fortskridande. milestones.cancel=Avbryt @@ -1318,7 +1166,7 @@ wiki.default_commit_message=Skriv en anteckning om den här uppdateringen (valfr wiki.save_page=Spara sidan wiki.last_commit_info=%s redigerade denna sida %s wiki.edit_page_button=Redigera -wiki.new_page_button=Ny sida +wiki.new_page_button=Ny Sida wiki.back_to_wiki=Tillbaka till wikisidan wiki.delete_page_button=Tag bort sida wiki.page_already_exists=Wiki-sida med samma namn finns redan. @@ -1335,39 +1183,39 @@ activity.period.quarterly=3 mÃ¥nader activity.period.semiyearly=6 mÃ¥nader activity.period.yearly=1 Ã¥r activity.overview=Översikt -activity.active_prs_count_1=%d aktiv pull-förfrÃ¥gan -activity.active_prs_count_n=%d aktiva pull-förfrÃ¥gningar +activity.active_prs_count_1=%d Aktiv Pull begäran +activity.active_prs_count_n=%d Aktiva Pull begärelser activity.merged_prs_count_1=Sammanfogad Pull-förfrÃ¥gan activity.merged_prs_count_n=Sammanfogade Pull-förfrÃ¥gningar -activity.opened_prs_count_1=Föreslagen pull-förfrÃ¥gan -activity.opened_prs_count_n=Föreslagna pull-förfrÃ¥gningar +activity.opened_prs_count_1=Föreslagen Pull begäran +activity.opened_prs_count_n=Föreslagna Pull-förfrÃ¥gningar activity.title.user_1=%d användare activity.title.user_n=%d användare -activity.title.prs_1=%d pull-förfrÃ¥gningar -activity.title.prs_n=%d pull-förfrÃ¥gningar +activity.title.prs_1=%d Pull-begäran +activity.title.prs_n=%d Pull begärelser activity.title.prs_merged_by=%s sammanfogad av %s activity.title.prs_opened_by=%s föreslÃ¥s av %s activity.merged_prs_label=Sammanfogad activity.opened_prs_label=Föreslagen -activity.active_issues_count_1=%d aktivt ärende -activity.active_issues_count_n=%d aktiva ärenden +activity.active_issues_count_1=%d Aktivt ärende +activity.active_issues_count_n=%d Aktiva ärenden activity.closed_issues_count_1=Stängt ärende activity.closed_issues_count_n=Stängda ärenden activity.title.issues_1=%d ärende -activity.title.issues_n=%d ärenden +activity.title.issues_n=%d Ärenden activity.title.issues_created_by=%s skapad av %s activity.closed_issue_label=Stängd activity.new_issues_count_1=Nytt ärende activity.new_issues_count_n=Nya ärenden activity.new_issue_label=Öppnad -activity.title.unresolved_conv_1=%d olöst konversation -activity.title.unresolved_conv_n=%d olösta konversationer +activity.title.unresolved_conv_1=%d Olöst konversation +activity.title.unresolved_conv_n=%d Olösta konversationer activity.unresolved_conv_desc=De nyligen förändrade ärendena och pull-requesterna har inte blivit lösta ännu. activity.unresolved_conv_label=Öppna -activity.title.releases_1=%d utgÃ¥va -activity.title.releases_n=%d utgÃ¥vor +activity.title.releases_1=%d release +activity.title.releases_n=%d releaser activity.title.releases_published_by=%s publicerad av %s -activity.published_release_label=UtgÃ¥va +activity.published_release_label=Publicerad activity.no_git_activity=Det har inte gjorts nÃ¥gra commit under den här perioden. activity.git_stats_exclude_merges=Exkludera merger, activity.git_stats_author_1=%d författare @@ -1407,34 +1255,34 @@ settings.mirror_settings=Inställningar för spegling settings.sync_mirror=Synkronisera nu settings.site=Webbplats -settings.update_settings=Spara inställningar -settings.advanced_settings=Avancerade Inställningar +settings.update_settings=Uppdatera inställningar +settings.advanced_settings=Advancerade Inställningar settings.wiki_desc=Aktivera wiki för utvecklingskatalog -settings.use_internal_wiki=Använd inbyggd wiki -settings.use_external_wiki=Använd extern wiki -settings.external_wiki_url=URL till extern wiki +settings.use_internal_wiki=Använd inbyggd Wiki +settings.use_external_wiki=Använd extern Wiki +settings.external_wiki_url=Extern Wiki-URL settings.external_wiki_url_error=Den externa wiki-länken är inte giltig. settings.external_wiki_url_desc=Besökare omdirigeras till den externa wiki-länken när de trycker pÃ¥ wiki-tabben. settings.issues_desc=Aktivera ärendehantering för utvecklingskatalogen settings.use_internal_issue_tracker=Använd inbyggt ärendehanteringssystem settings.use_external_issue_tracker=Använd externt ärendehanteringssystem -settings.external_tracker_url=URL för externt ärendehanteringssystem +settings.external_tracker_url=URL För Extern Ärendehanterare settings.external_tracker_url_error=Länken för ärendehanteringsystemet är inte en giltig länk. settings.external_tracker_url_desc=Besökare dirigeras om till länken för det externa ärendehanteringssystemet när de trycker pÃ¥ ärende-tabben. -settings.tracker_url_format=URL-format för externt ärendehanteringssystem +settings.tracker_url_format=URL-Format För Extern Ärendehanterare settings.tracker_url_format_error=URL-formatet för den extern ärendehanterare är inte en giltig URL. -settings.tracker_issue_style=Externt ärendenummerformat +settings.tracker_issue_style=Externt ärendenummersformat settings.tracker_issue_style.numeric=Numerisk settings.tracker_issue_style.alphanumeric=Alfanumerisk settings.tracker_url_format_desc=Använd variablerna {user}, {repo} och {index} för användarnamn, utvecklingskatalogsnamn och ärenderegister. settings.enable_timetracker=Aktivera tidsredovisning -settings.allow_only_contributors_to_track_time=LÃ¥t endast medarbetare spÃ¥ra tid -settings.pulls_desc=Aktivera pull-förfrÃ¥gningar för utvecklingskatalog +settings.allow_only_contributors_to_track_time=LÃ¥t endast medarbetare spÃ¥ra tidsredovisning +settings.pulls_desc=Aktivera Pull Requests för utvecklingskatalog settings.pulls.ignore_whitespace=Ignorera blanksteg vid konflikter settings.admin_settings=Administratörsinställningar settings.admin_enable_health_check=Aktivera hälsokontroll för utvecklingskataloger (git fsck) settings.admin_enable_close_issues_via_commit_in_any_branch=Stäng ett ärende via en commit gjord i en icke standard-gren -settings.danger_zone=Farozon +settings.danger_zone=HögrisksomrÃ¥de settings.new_owner_has_same_repo=Den nya ägaren har redan ett repo med det namnet. Vänligen välj ett annat namn. settings.convert=Konvertera till vanlig utvecklingskatalog settings.convert_desc=Du kan konvertera denna spegling till en vanlig utvecklingskatalog. Detta kan ej Ã¥ngras. @@ -1448,15 +1296,15 @@ settings.transfer_desc=Överför denna utvecklingskatalog till en användare ell settings.transfer_form_title=Ange utvecklingskatalogens namn för att bekräfta: settings.transfer_notices_1=- Du kommer förlora Ã¥tkomst till denna utvecklingskatalog om du för över den till en individuell användare. settings.transfer_notices_2=- Du kommer behÃ¥lla Ã¥tkomst till utvecklingskatalogen om du för över den till en organisation som du antingen äger eller är delägare i. -settings.transfer_owner=Ny ägare +settings.transfer_owner=Ny Ägare settings.transfer_succeed=Utvecklingskatalogen har flyttats över. settings.trust_model.collaborator=Medarbetare -settings.wiki_delete=Ta bort wikidata +settings.wiki_delete=Ta bort wiki-data settings.wiki_delete_desc=Borttagning av utvecklingskatalogens wiki-data är permanent och kan ej Ã¥ngras. settings.wiki_delete_notices_1=- Detta kommer permanent ta bort och inaktivera utvecklingskatalogens wiki för %s. -settings.confirm_wiki_delete=Ta bort wikidata +settings.confirm_wiki_delete=Ta bort wiki-data settings.wiki_deletion_success=Utvecklingskatalogens wiki-data har blivit borttaget. -settings.delete=Ta bort denna utvecklingskatalog +settings.delete=Ta Bort Detta Repo settings.delete_desc=Borttagning av en utvecklingskatalog är permanent och kan ej Ã¥ngras. settings.delete_notices_1=- Denna Ã¥tgärd kan INTE Ã¥ngras. settings.delete_notices_2=- Denna Ã¥tgärd kommer permanent ta bort utvecklingskatalogen %s inklusive kod, ärenden, kommentarer, wiki-data samt medarbetarinställningar. @@ -1479,12 +1327,12 @@ settings.teams=Grupper settings.add_team_duplicate=Teamet har redan utvecklingskatalogen settings.add_team_success=Teamet har nu tillgÃ¥ng till utvecklingskatalogen. settings.remove_team_success=Teamets Ã¥tkomst till utvecklingskatalogen har tagits bort. -settings.add_webhook=Lägg till webbhook +settings.add_webhook=Lägg Till Webbhook settings.hooks_desc=Webhooks gör automatiskt ett HTTP POST anrop mot en server när vissa Forgejo events triggas. Läs mer om detta i webhooks guiden. -settings.webhook_deletion=Ta bort webbhook +settings.webhook_deletion=Ta bort Webhook settings.webhook_deletion_desc=Borttagning utav en webhook tar även bort dess inställningar och leveranshistorik. Vill du fortsätta? settings.webhook_deletion_success=Webhooken har blivit borttagen. -settings.webhook.test_delivery=Testa leverans +settings.webhook.test_delivery=Testa Leverans settings.webhook.test_delivery_desc=Testa webhooken genom ett testevent. settings.webhook.request=Begäran settings.webhook.response=Svar @@ -1495,19 +1343,19 @@ settings.githook_edit_desc=Om kroken är inaktiv visas exempelinnehÃ¥ll. Inaktiv settings.githook_name=Kroknamn settings.githook_content=KrokinnehÃ¥ll settings.update_githook=Uppdatera krok -settings.add_webhook_desc=Forgejo kommer skicka ett POST anrop med en specificerad Content-Type till mÃ¥ladressen. Läs mer om detta i webhook-guiden. +settings.add_webhook_desc=Forgejo kommer skicka ett POST anrop med en specificerad Content-Type till mÃ¥ladressen. Läs mer om detta i webhook guiden. settings.payload_url=MÃ¥l-URL settings.http_method=HTTP-metod -settings.content_type=POST content type +settings.content_type=POST Content Type settings.secret=Hemlighet settings.slack_username=Användarnamn settings.slack_icon_url=URL för ikon settings.discord_username=Användarnamn settings.discord_icon_url=URL för ikon settings.event_desc=Trigga vid: -settings.event_push_only=Push-händelser -settings.event_send_everything=Alla händelser -settings.event_choose=Anpassade händelser… +settings.event_push_only=Push Events +settings.event_send_everything=Alla events +settings.event_choose=Anpassade events… settings.event_header_repository=Händelser i utvecklingskatalogen settings.event_create=Skapa settings.event_create_desc=Branch eller tagg skapad. @@ -1547,62 +1395,62 @@ settings.title=Titel settings.deploy_key_content=InnehÃ¥ll settings.key_been_used=En distributionsnyckel med identiskt innehÃ¥ller används redan. settings.key_name_used=En distributionsnyckel med samma namn finns redan. -settings.deploy_key_deletion=Ta bort driftsättningsnyckel +settings.deploy_key_deletion=Ta bort distributionsnyckel settings.deploy_key_deletion_desc=Borttagning utav en distributionsnyckel kommer att Ã¥terkalla dess Ã¥tkomst till utvecklingskatalogen. Vill du fortsätta? settings.deploy_key_deletion_success=Distributionsnyckeln har blivit borttagen. settings.branches=Brancher -settings.protected_branch=Grenskydd +settings.protected_branch=Branchskydd settings.protected_branch_can_push=TillÃ¥t push? settings.protected_branch_can_push_yes=Du kan pusha settings.protected_branch_can_push_no=Du kan inte pusha -settings.branch_protection=Skyddsregler för gren "%s" +settings.branch_protection=Branchskydd för '%s' settings.protect_this_branch=Aktivera branchskydd -settings.protect_disable_push=Inaktivera push +settings.protect_disable_push=Inaktivera Push settings.protect_disable_push_desc=Inga push-förfrÃ¥gningar kommer att tillÃ¥tas till denna branch. -settings.protect_enable_push=Aktivera push +settings.protect_enable_push=Aktivera Push settings.protect_enable_push_desc=Alla med skrivrättigheter kommer att kunna pusha till denna branch (men inte force-pusha). settings.protect_whitelist_deploy_keys=Vitlista deploy-nyckar med skrivÃ¥tkomst till push. -settings.protect_whitelist_users=Vitlistade användare för pushning +settings.protect_whitelist_users=Vitlistade användare för pushning: settings.protect_whitelist_search_users=Sök användare… -settings.protect_whitelist_teams=Vitlistade team för pushning +settings.protect_whitelist_teams=Vitlistade team för pushning: settings.protect_whitelist_search_teams=Sök team… settings.protect_merge_whitelist_committers=Aktivera vitlista för sammanfogning settings.protect_merge_whitelist_committers_desc=TillÃ¥t endast vitlistade användare eller team att sammanfoga pull requests i denna branch. -settings.protect_merge_whitelist_users=Vitlistade användare för sammanfogning -settings.protect_merge_whitelist_teams=Vitlistade teams för sammanfogning +settings.protect_merge_whitelist_users=Vitlistade användare för sammanfogning: +settings.protect_merge_whitelist_teams=Vitlistade teams för sammanfogning: settings.protect_check_status_contexts=Aktivera statuskontroller settings.protect_check_status_contexts_desc=Kräv godkända statuskontroller innan merge. Välj vilka statuskontroller som godkännas innan grenar kan slÃ¥s samman till en gren som matchar denna regel. När aktiverad, mÃ¥ste committer först pushas till en annan gren, sedan mergas eller pushas direkt till en gren som matchar denna regel efter statuskontroll har har godkännts. Om inga context väljs mÃ¥ste den sista committen vara framgÃ¥ngsrik oavsett context. settings.protect_check_status_contexts_list=Statuskontroller funna under senaste veckan för denna utvecklingskatalog -settings.protect_required_approvals=Godkännanden som krävs -settings.protect_approvals_whitelist_users=Vitlistade granskare -settings.protect_approvals_whitelist_teams=Vitlistade team för granskning -settings.require_signed_commits=Kräv signerade commiter +settings.protect_required_approvals=Godkännanden som krävs: +settings.protect_approvals_whitelist_users=Vitlistade granskare: +settings.protect_approvals_whitelist_teams=Vitlistade team för granskning: +settings.require_signed_commits=Kräv signerade commits settings.require_signed_commits_desc=Avvisa pushar till den här grenen om dom är osignerade eller inte verifierbara. settings.add_protected_branch=Aktivera skydd settings.delete_protected_branch=Inaktivera skydd -settings.protected_branch_deletion=Inaktivera grenskydd +settings.protected_branch_deletion=Inaktivera skydd för branch settings.protected_branch_deletion_desc=Genom att inaktivera branchskyddet tillÃ¥ts användare med skrivrättigheter att pusha till branchen. Vill du fortsätta? settings.default_branch_desc=Välj en standard branch för Pull Requests och Code Commits: settings.choose_branch=Välj en branch… settings.no_protected_branch=Det finns inga skyddade brancher. settings.edit_protected_branch=Ändra settings.protected_branch_required_approvals_min=Antal erforderliga godkännanden kan inte vara negativa. -settings.bot_token=Bottoken +settings.bot_token=Bot Token settings.chat_id=Chatt-ID settings.matrix.room_id=Rum-ID settings.matrix.message_type=Typ av meddelande -settings.archive.button=Arkivera utvecklingskatalog -settings.archive.header=Arkivera denna utvecklingskatalog +settings.archive.button=Arkivera förrÃ¥d +settings.archive.header=Arkivera detta förrÃ¥d settings.archive.success=FörrÃ¥det arkiverades. settings.archive.error=Ett fel uppstod när utvecklingskatalogen arkiverades. Se loggen för fler detaljer. settings.archive.error_ismirror=Du kan inte arkivera ett speglat förrÃ¥d. -settings.archive.branchsettings_unavailable=Inställningar för grenar är inte tillgängliga för arkiverade utvecklingskataloger. +settings.archive.branchsettings_unavailable=Inställningar för grenar är inte tillgängliga om förrÃ¥det arkiverats. settings.update_avatar_success=Utvecklingskatalogens avatar har uppdaterats. settings.lfs=LFS settings.lfs_filelist=LFS filer lagrade i denna utvecklingskatalog settings.lfs_no_lfs_files=Inga LFS filer är lagrade i denna utvecklingskatalog settings.lfs_findcommits=Hitta commits -settings.lfs_lfs_file_no_commits=Ingen commit hittad för denna LFS-fil +settings.lfs_lfs_file_no_commits=Ingen commit hittad för denna LFS fil settings.lfs_locks=LÃ¥s settings.lfs_invalid_locking_path=Ogiltig sökväg: %s settings.lfs_invalid_lock_directory=Kan inte lÃ¥sa katalog: %s @@ -1611,18 +1459,18 @@ settings.lfs_lock=LÃ¥s settings.lfs_lock_path=Filväg att lÃ¥sa... settings.lfs_locks_no_locks=Inga lÃ¥s settings.lfs_force_unlock=Tvinga upplÃ¥sning -settings.lfs_pointers.sha=Blobhash +settings.lfs_pointers.sha=Blob SHA settings.lfs_pointers.oid=OID settings.lfs_pointers.inRepo=I utvecklingskatalogen settings.rename_branch_failed_not_exist=Kan inte byta namn pÃ¥ branchen %s eftersom den inte finns. -diff.browse_source=Bläddra källkod +diff.browse_source=Bläddra i källkod diff.parent=förälder diff.commit=incheckning diff.git-notes=Anteckningar -diff.data_not_available=Diff-innehÃ¥ll ej tillgänglig -diff.show_split_view=Delad vy -diff.show_unified_view=Unifierad vy +diff.data_not_available=Diff Content ej tillgänglig +diff.show_split_view=Delad Vy +diff.show_unified_view=Unifierad Vy diff.whitespace_button=Blanksteg diff.whitespace_show_everything=Visa alla ändringar diff.whitespace_ignore_all_whitespace=Ignorera blanksteg när rader jämförs @@ -1638,12 +1486,12 @@ diff.file_image_height=Höjd diff.file_byte_size=Storlek diff.file_suppressed=Filskillnaden har hÃ¥llits tillbaka eftersom den är för stor diff.comment.placeholder=Lämna en kommentar -diff.comment.markdown_info=Stilisering med Markdown stöds. +diff.comment.markdown_info=Styling med markdown stöds. diff.comment.add_single_comment=Lägg till en kommentar diff.comment.add_review_comment=Lägg till kommentar diff.comment.start_review=Starta granskning diff.comment.reply=Svara -diff.review=Slutför granskning +diff.review=Granska diff.review.placeholder=Granskningskommentar diff.review.comment=Kommentar diff.review.approve=Godkänn @@ -1652,12 +1500,12 @@ diff.committed_by=committad av releases.desc=Följ projektversioner och nerladdningar. release.releases=Släpp -release.new_release=Ny utgÃ¥va +release.new_release=Nytt Släpp release.draft=Utkast -release.prerelease=FörutgÃ¥va +release.prerelease=Försläpp release.stable=Stabil release.compare=Jämför -release.edit=Redigera +release.edit=redigera release.ahead.commits=%d committer release.ahead.target=till %s sedan denna utgÃ¥va release.source_code=Källkod @@ -1666,23 +1514,23 @@ release.edit_subheader=Releaser organiserar projektversioner. release.tag_name=Taggnamn release.target=MÃ¥l release.tag_helper=Välj en existerande tagg eller skapa en ny tagg. -release.prerelease_desc=Markera som en förutgÃ¥va +release.prerelease_desc=Markera som en Pre-Release release.prerelease_helper=Markera denna Release olämpliga för användning i produktion. release.cancel=Avbryt -release.publish=Publicera utgÃ¥va -release.save_draft=Spara utkast -release.edit_release=Uppdatera utgÃ¥va -release.delete_release=Ta bort utgÃ¥va -release.deletion=Ta bort utgÃ¥va +release.publish=Publicera Släpp +release.save_draft=Spara Utkast +release.edit_release=Uppdatera Release +release.delete_release=Ta bort Release +release.deletion=Ta bort Release release.deletion_success=Releasen har blivit raderad. release.tag_name_already_exist=En release med denna tagg existerar redan. release.tag_name_invalid=Taggnamnet är inte giltigt. release.downloads=Nedladdningar release.download_count=Nedladdningar: %s -branch.name=Grennamn +branch.name=Branch namn branch.delete_head=Radera -branch.delete_html=Ta borg gren +branch.delete_html=Radera branch branch.create_branch=Skapa branchen %s branch.deleted_by=Raderad av %s @@ -1691,7 +1539,6 @@ branch.deleted_by=Raderad av %s topic.manage_topics=Hantera ämnen topic.done=Klar topic.count_prompt=Du kan inte välja fler än 25 ämnen -settings.enter_repo_name = Ange ägar- och utvecklingskatalog-namnet exakt som det visas: @@ -1699,7 +1546,7 @@ settings.enter_repo_name = Ange ägar- och utvecklingskatalog-namnet exakt som d [org] org_name_holder=Organisationsnamn -org_full_name_holder=Fullständigt organisationsnamn +org_full_name_holder=Organisationens Fullständiga Namn org_name_helper=Organisationsnamn bör vara korta och enkla att komma ihÃ¥g. create_org=Skapa organisation repo_updated=Uppdaterad %s @@ -1707,10 +1554,10 @@ members=Medlemmar teams=Grupper lower_members=medlemmar lower_repositories=utvecklingskataloger -create_new_team=Nytt lag -create_team=Skapa lag +create_new_team=Nytt Team +create_team=Skapa Team org_desc=Beskrivning -team_name=Lagnamn +team_name=Gruppnamn team_desc=Beskrivning team_name_helper=Teamnamn bör vara korta och lätta att komma ihÃ¥g. team_desc_helper=Beskriv syftet eller rollen för teamet. @@ -1737,7 +1584,7 @@ settings.update_settings=Uppdatera inställningar settings.update_setting_success=Organisationsinställningarna har uppdaterats. settings.update_avatar_success=Organisationens avatar har uppdateras. settings.delete=Tag bort organisation -settings.delete_account=Ta bort denna organisationen +settings.delete_account=Tag bort denna organisation settings.delete_prompt=Organisationen kommer tas bort permanent, och det gÃ¥r INTE att Ã¥ngra detta! settings.confirm_delete_account=Bekräfta borttagning settings.delete_org_title=Ta bort organisation @@ -1748,9 +1595,9 @@ settings.labels_desc=Lägg till etiketter som kan användas till ärenden för < members.membership_visibility=Synlighet för medlemskap: members.public=Synlig -members.public_helper=Gör dold +members.public_helper=gör dold members.private=Dold -members.private_helper=Gör synlig +members.private_helper=gör synlig members.member_role=Medlemsroll: members.owner=Ägare members.member=Medlem @@ -1771,18 +1618,18 @@ teams.admin_access_helper=Medlemmar kan pulla och pusha till teamets utvecklings teams.no_desc=Detta team har ingen beskrivning teams.settings=Inställningar teams.owners_permission_desc=Ägare har full Ã¥tkomst till alla utvecklingskataloger och har administratörsÃ¥tkomst till organisationen. -teams.members=Lagmedlemmar +teams.members=Teammedlemmar teams.update_settings=Uppdatera inställningar -teams.delete_team=Ta bort lag -teams.add_team_member=Lägg till lagmedlem -teams.delete_team_title=Ta bort lag +teams.delete_team=Ta bort team +teams.add_team_member=Lägg till teammedlem +teams.delete_team_title=Ta bort team teams.delete_team_desc=Borttagning av ett team Ã¥terkallar Ã¥tkomsten till utvecklingskatalogen för dess medlemmar. Vill du fortsätta? teams.delete_team_success=Teamet har blivit borttaget. teams.read_permission_desc=Medlemskap i detta team ger läsrättigheter: medlemmar kan se och klona teamets utvecklingskataloger. teams.write_permission_desc=Medlemskap i detta team ger skrivrättigheter: medlemmar kan läsa och pusha till teamets utvecklingskataloger. -teams.admin_permission_desc=Medlemskap i detta lag ger administratörsrättigheter: medlemmar kan läsa frÃ¥n, pusha till och lägga till medarbetare till lagets utvecklingskataloger. +teams.admin_permission_desc=Medlemskap i detta team ger administratörsrättigheter: medlemmar kan läsa, pusha och lägga till medarbetare till teamets utvecklingskataloger. teams.create_repo_permission_desc=Vidare sÃ¥ ger detta team Skapa utvecklingskatalog rättigheten: medlemmar can skapa nya utvecklingskataloger i organisationen. -teams.repositories=Lagets utvecklingskataloger +teams.repositories=TeamförrÃ¥d teams.search_repo_placeholder=Sök utvecklingskatalog… teams.remove_all_repos_title=Ta bort alla utvecklingskataloger för teamet teams.remove_all_repos_desc=Detta kommer att ta bort alla utvecklingskataloger frÃ¥n teamet. @@ -1801,10 +1648,10 @@ teams.all_repositories_admin_permission_desc=Detta team beviljar Admin/.well-known/openid-configuration) för att ange slutpunkterna auths.tip.twitter=GÃ¥ till %s, skapa en applikation och försäkra att alternativet "Allow this application to be used to Sign in with Twitter" är aktiverat auths.tip.discord=Registrera en ny applikation pÃ¥ %s -auths.edit=Redigera autentiseringskälla +auths.edit=Redigera autensieringskälla auths.activated=Denna autentiseringskälla är aktiverad auths.update_success=Autentiseringskällan har uppdaterats. -auths.update=Uppdatera autentiseringskälla +auths.update=Uppdatera autensieringskälla auths.delete=Ta bort autentiseringskälla -auths.delete_auth_title=Tag bort autentiseringskälla +auths.delete_auth_title=Tag bort denna autentisering auths.delete_auth_desc=Borttagning av en autensieringskälla förhindrar användare frÃ¥n att använda den för inloggning. Vill du fortsätta? auths.still_in_used=Autentiseringskällan är fortfarande i bruk. Konvertera eller ta bort alla användare som använder denna autentiseringskälla först. auths.deletion_success=Autentiseringskällan har tagits bort. -config.server_config=Serverkonfiguration -config.app_name=Instansnamn -config.app_ver=Forgejo-version -config.app_url=Bas-URL för Forgejo -config.custom_conf=Sökväg för konfigurationsfil -config.offline_mode=Lokalt läge -config.disable_router_log=Inaktivera routerloggning -config.run_user=Användare att köra som +config.server_config=Server-konfiguration +config.app_name=Sajtens namn +config.app_ver=Forgejo Version +config.app_url=Forgejo Bas-URL +config.custom_conf=Konfigurationsfil +config.offline_mode=Offlineläge +config.disable_router_log=Avaktivera Router Loggning +config.run_user=Kör som användarnamn config.run_mode=Exekveringsläge -config.git_version=Git-version +config.git_version=Git version config.repo_root_path=Rotsökväg för utvecklingskatalog -config.lfs_root_path=LFS rotsökväg +config.lfs_root_path=LFS Rotsökväg config.log_file_root_path=Sökväg för loggar -config.script_type=Skripttyp -config.reverse_auth_user=Autentiseringsanvändare för omvänd proxy +config.script_type=Script-typ +config.reverse_auth_user=Motsatt autentiserings användare config.ssh_config=SSH-konfiguration config.ssh_enabled=Aktiverad -config.ssh_start_builtin_server=Använd inbyggd server +config.ssh_start_builtin_server=Använd inbyggd Server config.ssh_port=Port config.ssh_listen_port=Lyssningsport config.ssh_root_path=Rotsökväg config.ssh_key_test_path=Testsökväg för nyckel -config.ssh_keygen_path=Sökväg för nyckelgenerator ("ssh-keygen") +config.ssh_keygen_path=Sökväg för nyckelgenerator ('ssh-keygen') config.ssh_minimum_key_size_check=Kontroll av minsta tillÃ¥tna nyckelstorlek config.ssh_minimum_key_sizes=Minsta tillÃ¥tna nyckelstorlek @@ -2029,48 +1876,48 @@ config.db_ssl_mode=SSL config.db_path=Sökväg config.service_config=Tjänstkonfiguration -config.register_email_confirm=Kräv e-postbekräftelse för att registrera +config.register_email_confirm=Kräv mejlbekräftelse för att registrera config.disable_register=Inaktivera självregistrering config.enable_openid_signup=Aktivera självregistrering genom OpenID config.enable_openid_signin=Aktivera OpenID-inloggning config.show_registration_button=Visa registreringsknapp -config.require_sign_in_view=Kräv inloggning för att visa innehÃ¥ll -config.mail_notify=Aktivera e-postnotiser +config.require_sign_in_view=Kräv inloggning för att visa sidor +config.mail_notify=Aktivera Mejlnotifikationer config.enable_captcha=Aktivera CAPTCHA -config.active_code_lives=Livstid för aktiveringskoder -config.default_keep_email_private=Dölj e-postadresser som standard +config.active_code_lives=Aktivera livstid för koder +config.default_keep_email_private=Dölj mejladresser som standard config.default_allow_create_organization=TillÃ¥t skapandet utav organisationer som standard config.enable_timetracking=Aktivera tidsredovisning -config.default_enable_timetracking=Aktivera tidredovisning som standard -config.default_allow_only_contributors_to_track_time=LÃ¥t endast bidragsgivare spÃ¥ra tid -config.no_reply_address=Dold e-postdomän +config.default_enable_timetracking=Aktivera tidredovisning som Standard +config.default_allow_only_contributors_to_track_time=LÃ¥t endast medarbetare spÃ¥ra tidsredovisning +config.no_reply_address=Dold mejldomän config.webhook_config=Webbkrokskonfiguration config.queue_length=Kölängd config.deliver_timeout=Tidsfrist för leverans -config.skip_tls_verify=Skippa TLS-verifiering +config.skip_tls_verify=Skippa TLS verifiering config.mailer_enabled=Aktiverad config.mailer_name=Namn config.mailer_smtp_port=SMTP-port config.mailer_user=Användare config.mailer_use_sendmail=Använd Sendmail -config.mailer_sendmail_path=Sökväg för sendmail +config.mailer_sendmail_path=Sendmail sökväg config.mailer_sendmail_args=Extra argument till sendmail -config.send_test_mail=Skicka testmejl +config.send_test_mail=Skicka testmeddelande config.oauth_config=OAuth-konfiguration config.oauth_enabled=Aktiverad -config.cache_config=Cachekonfiguration -config.cache_adapter=Cacheadapter -config.cache_interval=Cacheintervall -config.cache_conn=Cacheanslutning +config.cache_config=Mellanlagringskonfiguration +config.cache_adapter=Mellanlagringsadapter +config.cache_interval=Mellanlagringsintervall +config.cache_conn=Mellanlagringsanslutning config.session_config=Sessionskonfiguration config.session_provider=Sessionsleverantör config.provider_config=Leverantörskonfiguration -config.cookie_name=Cookienamn +config.cookie_name=Cookie-namn config.gc_interval_time=Tidsintervall för skräpsamling config.session_life_time=Livstid för session config.https_only=Endast HTTPS @@ -2079,21 +1926,21 @@ config.cookie_life_time=Livstid för kaka config.picture_config=Konfiguration för bild och avatar config.picture_service=Bildtjänst config.disable_gravatar=Inaktivera Gravatar -config.enable_federated_avatar=Aktivera federerade avatarer +config.enable_federated_avatar=Aktivera Förenad Uppslaging av Profilbilder config.git_config=Git-konfiguration -config.git_disable_diff_highlight=Inaktivera syntaxmarkering i diffar -config.git_max_diff_lines=Maximalt antal diff-rader per fil -config.git_max_diff_line_characters=Maximalt antal diff-karaktärer per rad -config.git_max_diff_files=Maximalt antal diff-filer att visa +config.git_disable_diff_highlight=Inaktivera Diff Syntax Highlight +config.git_max_diff_lines=Max Diff-rader (per fil) +config.git_max_diff_line_characters=Max Diff-tecken (per rad) +config.git_max_diff_files=Max Diff-filer (att visa) config.git_gc_args=Skräpsamlarargument config.git_migrate_timeout=Migreringstimeout -config.git_mirror_timeout=Tidsfrist för spegeluppdatering -config.git_clone_timeout=Tidsfrist för kloning -config.git_pull_timeout=Tidsfrist för pull -config.git_gc_timeout=Tidsfrist för skräpsamling +config.git_mirror_timeout=Spelgingsuppdateringstimeout +config.git_clone_timeout=Klonoperationstimeout +config.git_pull_timeout=Klonoperationstimeout +config.git_gc_timeout=GC-operationstimeout -config.log_config=Loggkonfiguration +config.log_config=Logg-konfiguration config.disabled_logger=Inaktiverad config.xorm_log_sql=Logga SQL @@ -2120,26 +1967,18 @@ monitor.queue.settings.submit=Uppdatera inställningar monitor.queue.settings.changed=Inställningar uppdaterade notices.system_notice_list=Systemnotiser -notices.view_detail_header=Notisdetaljer -notices.select_all=Markera alla +notices.view_detail_header=Visa notisdetaljer +notices.select_all=Markera Alla notices.deselect_all=Avmarkera alla -notices.inverse_selection=Invertera markeringar -notices.delete_selected=Ta bort markerade -notices.delete_all=Ta bort alla notiser +notices.inverse_selection=Invertera Markeringar +notices.delete_selected=Ta Bort Markerade +notices.delete_all=Ta Bort Alla Notiser notices.type=Typ notices.type_1=Utvecklingskatalog notices.type_2=Uppgift notices.desc=Beskrivning notices.op=Op. notices.delete_success=Systemnotifikationer har blivit raderade. -users.2fa = 2FA -users.reserved = Reserverad -self_check.database_fix_mysql = För MySQL/MariaDB-användare sÃ¥ kan du använda kommandot â€forgejo doctor convert†för att Ã¥tgärda problemet med kollateringen, eller sÃ¥ du Ã¥tgärda det genom att manuellt använda SQL "ALTER ... COLLATE ...". -users.bot = Bott -users.remote = FjärrÃ¥tkomst -users.restricted.description = TillÃ¥t endast interaktion med utvecklingskataloger och organisationer där den här användaren finns tillagd som medarbetare. Det förhindrar tillgÃ¥ng till allmänna utvecklingskataloger i den här instansen. -users.is_restricted = Begränsat konto -self_check.database_inconsistent_collation_columns = Databasen använder kollateringen %s, men dessa kolumner använder felanpassade kollateringar. Det kan komma att orsaka oväntade problem. [action] @@ -2152,10 +1991,6 @@ compare_branch=Jämför compare_commits=Jämför %d commits compare_commits_general=Jämför commits mirror_sync_delete=synkade och raderade referens %[2]s pÃ¥ %[3]s frÃ¥n spegel -approve_pull_request = `godkände %[3]s#%[2]s` -create_branch = skapade grenen %[3]s i %[4]s -starred_repo = stjärnmärkte %[2]s -watched_repo = började följa %[2]s [tool] now=nu @@ -2219,6 +2054,9 @@ owner.settings.cleanuprules.enabled=Aktiv [secrets] [actions] + + + runners.name=Namn runners.owner_type=Typ runners.description=Beskrivning @@ -2235,39 +2073,6 @@ runs.commit=Commit [projects] [git.filemode] +; Ordered by git filemode value, ascending. E.g. directory has "040000", normal file has "100644", … symbolic_link=Symbolisk länk - - -[search] -milestone_kind = Sök milstolpar... -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... -search = Sök... -type_tooltip = Söktyp -team_kind = Sök lag... -org_kind = Sök organisationer... -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 -no_results = Inga matchande resultat hittades. -code_search_by_git_grep = Nuvarande kodsökningsresultat gjordes med "git grep". Det kan finnas bättre resultat om webbplatsadministratören möjliggör indexering av kod. -fuzzy = Ungefärlig -union = Nyckelord -union_tooltip = Inkludera resultat som matchar nÃ¥got av de med mellanslag sepererade sökorden -pull_kind = Sök ändringsförslag… -regexp = RegExp -keyword_search_unavailable = Sökning pÃ¥ nyckelord är för närvarande inte tillgängligt. Vänligen kontakta webbplatsadministratören. - - -[translation_meta] -test = Det här är en teststräng. Den visas inte i Forgejo UI men används vid testtillfälle. Vänligen skriv in "ok" för att spara tid (eller en intressant fakta du själv väljer) för att nÃ¥ upp till 100% komplett :) \ No newline at end of file diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini index 9a8d716083..9aa99729d6 100644 --- a/options/locale/locale_tr-TR.ini +++ b/options/locale/locale_tr-TR.ini @@ -17,10 +17,10 @@ page=Sayfa template=Åžablon language=Dil notifications=Bildirimler -active_stopwatch=Etkin Zaman Takipçisi +active_stopwatch=Etkin Zaman Takibi tracked_time_summary=Konu listesi süzgeçlerine dayanan takip edilen zamanın özeti create_new=OluÅŸtur… -user_profile_and_more=Profil ve ayarlar… +user_profile_and_more=Profil ve Ayarlar… signed_in_as=GiriÅŸ yapan: enable_javascript=Bu web sitesinin çalışması için JavaScript gereklidir. toc=İçindekiler Tablosu @@ -28,12 +28,12 @@ licenses=Lisanslar return_to_forgejo=Forgejo'ya Dön username=Kullanıcı Adı -email=E-posta adresi +email=E-posta Adresi password=Parola access_token=EriÅŸim Kodu -re_type=Parolayı doÄŸrula +re_type=Parolayı DoÄŸrula captcha=CAPTCHA -twofa=Ä°ki aÅŸamalı doÄŸrulama +twofa=Ä°ki AÅŸamalı DoÄŸrulama twofa_scratch=Ä°ki aÅŸamalı kazınmış kod passcode=Åžifre @@ -59,10 +59,10 @@ new_migrate=Yeni Göç new_mirror=Yeni Yansı new_fork=Yeni Depo Çatalı new_org=Yeni Organizasyon -new_project=Yeni proje -new_project_column=Yeni sütun +new_project=Yeni Proje +new_project_column=Yeni Sütun manage_org=Organizasyonları Yönet -admin_panel=Site yönetimi +admin_panel=Site Yönetimi account_settings=Hesap Ayarları settings=Ayarlar your_profile=Profil @@ -87,9 +87,9 @@ rerun=Yeniden çalıştır rerun_all=Tüm görevleri yeniden çalıştır save=Kaydet add=Ekle -add_all=Tümünü ekle +add_all=Tümünü Ekle remove=Kaldır -remove_all=Tümünü kaldır +remove_all=Tümünü Kaldır remove_label_str=`"%s" öğesini kaldır` edit=Düzenle view=Görüntüle @@ -118,7 +118,7 @@ go_back=Geri Git never=Asla unknown=Bilinmiyor -rss_feed=RSS yayını +rss_feed=RSS Beslemesi pin=Sabitle unpin=Sabitlemeyi kaldır @@ -141,17 +141,17 @@ confirm_delete_selected=Tüm seçili öğeleri gerçekten silmek istiyor musunuz name=Ä°sim value=DeÄŸer -copy_generic = Panoya kopyala +copy_generic = Kopyala filter = Filtrele filter.not_archived = ArÅŸivlenmemiÅŸ filter.clear = Filtreleri Temizle filter.is_archived = ArÅŸivlenmiÅŸ filter.is_mirror = YansılaÅŸtırılmış -filter.is_fork = Çatallar -filter.not_fork = Çatallanmayanlar +filter.is_fork = Çatallanmış +filter.not_fork = Çatallanmamış filter.not_mirror = Yansılanmamış filter.is_template = Åžablon -filter.not_template = Åžablon olmayan +filter.not_template = Åžablon deÄŸil filter.public = Herkese açık filter.private = Gizli more_items = Daha fazla öğe @@ -163,14 +163,11 @@ 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ÅŸ -copy_path = Dizini kopyala [aria] -navbar=Gezinti çubuÄŸu +navbar=Gezinti ÇubuÄŸu footer=Alt Bilgi -footer.software=Bu yazılım hakkında +footer.software=Yazılım Hakkında footer.links=BaÄŸlantılar [heatmap] @@ -178,8 +175,6 @@ 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 [editor] buttons.heading.tooltip=BaÅŸlık ekle @@ -196,12 +191,6 @@ buttons.ref.tooltip=Bir konuya veya deÄŸiÅŸiklik isteÄŸine deÄŸin buttons.switch_to_legacy.tooltip=Eski düzenleyiciyi kullan buttons.enable_monospace_font=EÅŸaralıklı yazıtipini etkinleÅŸtir buttons.disable_monospace_font=EÅŸaralıklı yazıtipini devre dışı bırak -buttons.new_table.tooltip = Tablo ekle -table_modal.header = Tablo ekle -table_modal.placeholder.header = BaÅŸlık -table_modal.placeholder.content = İçerik -table_modal.label.rows = Satırlar -table_modal.label.columns = Sütunlar [filter] string.asc=A - Z @@ -209,18 +198,18 @@ string.desc=Z - A [error] occurred=Bir hata oluÅŸtu -report_message=Bunun bir Forgejo hatası olduÄŸunu düşünüyorsanız, lütfen Codeberg sayfasında sorunu arayın veya gerekiyorsa yeni bir sorun oluÅŸturun. +report_message=Bunun bir Forgejo hatası olduÄŸunu düşünüyorsanız, lütfen GitHub sayfasında sorunu arayın veya gerekiyorsa yeni bir sorun oluÅŸturun. missing_csrf=Hatalı Ä°stek: CSRF anahtarı yok invalid_csrf=Hatalı Ä°stek: geçersiz CSRF eriÅŸim anahtarı not_found=Hedef bulunamadı. network_error=AÄŸ hatası -server_internal = İç sunucu hatası [startpage] app_desc=Zahmetsiz, kendi sunucunuzda barındırabileceÄŸiniz Git servisi install=Kurulumu kolay install_desc=Platformunuz için ikili dosyayı çalıştırın, Docker ile yükleyin veya paket olarak edinin. platform=Farklı platformlarda çalışablir +platform_desc=Forgejo Go ile derleme yapılabilecek her yerde çalışmaktadır: Windows, macOS, Linux, ARM, vb. Hangisini seviyorsanız onu seçin! 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 @@ -231,12 +220,12 @@ install=Kurulum title=BaÅŸlangıç Yapılandırması docker_helper=EÄŸer Forgejo'yı Docker içerisinde çalıştırıyorsanız, lütfen herhangi bir deÄŸiÅŸiklik yapmadan önce belgeleri okuyun. require_db_desc=Forgejo MySQL, PostgreSQL, SQLite3 veya TiDB (MySQL protokolü) gerektirir. -db_title=Veritabanı ayarları -db_type=Veritabanı tipi +db_title=Veritabanı Ayarları +db_type=Veritabanı Türü host=Sunucu user=Kullanıcı adı password=Parola -db_name=Veritabanı adı +db_name=Veritabanı Adı db_schema=Åžema db_schema_helper=Veritabanı varsayılanı için boÅŸ bırakın ("genel"). ssl_mode=SSL @@ -255,16 +244,16 @@ err_admin_name_is_reserved=Yönetici Kullanıcı Adı geçersiz, bu kullanıcı 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 -general_title=Genel ayarlar +general_title=Genel Ayarlar app_name=Site BaÅŸlığı app_name_helper=Åžirket adınızı buraya girebilirsiniz. -repo_path=Depo kök dizini +repo_path=Depo Kök Yolu repo_path_helper=Tüm uzak Git depoları bu dizine kaydedilecektir. -lfs_path=Git LFS kök dizini +lfs_path=Git LFS Kök Yolu lfs_path_helper=Git LFS tarafından izlenen dosyalar bu dizinde saklanacaktır. LFS'yi devre dışı bırakmak için boÅŸ bırakın. run_user=Åžu Kullanıcı Olarak Çalıştır run_user_helper=Forgejo'nin çalışacağı iÅŸletim sistemi kullanıcı adı. Bu kullanıcının depo kök yoluna eriÅŸiminin olması gerektiÄŸini unutmayın. -domain=Sunucu alan adı +domain=Sunucu Alan Adı domain_helper=Sunucu için alan adı veya ana bilgisayar adresi. ssh_port=SSH Sunucu Portu ssh_port_helper=SSH sunucusunun dinleyeceÄŸi port numarası. EtkisizleÅŸtimek için boÅŸ bırakın. @@ -276,25 +265,25 @@ log_root_path=Günlük Dosyaları Yolu log_root_path_helper=Günlük dosyaları bu dizine kaydedilecektir. optional_title=Ä°steÄŸe BaÄŸlı Ayarlar -email_title=E-posta ayarları -smtp_addr=SMTP sunucusu -smtp_port=SMTP portu +email_title=E-posta Ayarları +smtp_addr=SMTP Sunucusu +smtp_port=SMTP Portu smtp_from=E-posta Gönderen smtp_from_helper=Forgejo'nın kullanacağı e-posta adresi. Yalın bir e-posta adresi girin veya "Ä°sim" biçimini kullanın. -mailer_user=SMTP kullanıcı adı -mailer_password=SMTP parolası +mailer_user=SMTP Kullanıcı Adı +mailer_password=SMTP Parolası register_confirm=Kayıt için E-posta DoÄŸrulaması Gereksin -mail_notify=E-Posta bildirimlerini etkinleÅŸtir +mail_notify=E-Posta Bildirimlerini EtkinleÅŸtir server_service_title=Sunucu ve DiÄŸer Servis Ayarları offline_mode=Yerel Kipi EtkinleÅŸtir offline_mode.description=Üçüncü parti içerik teslim aÄŸlarını etkisizleÅŸtirin ve bütün kaynakları yerelden sunun. disable_gravatar=Gravatar'ı Devre Dışı Bırak -disable_gravatar.description=Gravatar ve diÄŸer üçüncü parti profil resmi kaynaklarını kullanma. Kullanıcı bir profil resmi yüklemediÄŸi zaman varsayılan bir resim kullanılacaktır. +disable_gravatar.description=Gravatar ve üçüncü parti avatar kaynaklarını iptal edin. Kullanıcı bir avatar yüklemediÄŸi zaman varsayılan bir avatar kullanılacaktır. federated_avatar_lookup=BirleÅŸtirilmiÅŸ Avatarları EtkinleÅŸtir -federated_avatar_lookup.description=Libravatar kullanarak federe profil resmi aramasını etkinleÅŸtirin. +federated_avatar_lookup.description=Libravatar kullanarak federe avatar aramasını etkinleÅŸtirin. disable_registration=Kendi Kendine Kaydolmayı Devre Dışı Bırak disable_registration.description=Kullanıcının kendi kendine kaydolmasını devre dışı bırak. Yalnızca yöneticiler yeni hesaplar oluÅŸturabilecek. -allow_only_external_registration.description=Sadece belirlenen dış hizmetler aracılığıyla kullanıcı kaydına izin ver. +allow_only_external_registration.description=Sadece dış hizmetler aracılığıyla kullanıcı kaydına izin ver openid_signin=OpenID Oturum Açmayı EtkinleÅŸtiriniz openid_signin.description=OpenID ile kullanıcı giriÅŸini etkinleÅŸtir. openid_signup=OpenID ile Kendi Kendine Kaydı EtkinleÅŸtir @@ -303,12 +292,12 @@ enable_captcha=CAPTCHA kaydını etkinleÅŸtir enable_captcha.description=Kullanıcının kendi kendine kaydolması için captcha doÄŸrulaması gereksin. require_sign_in_view=Sayfaları Görüntülemek için GiriÅŸ Yapmak Gereksin require_sign_in_view.description=Sayfa eriÅŸimini giriÅŸ yapmış kullanıcılarla sınırlandır. Ziyaretçiler sadece oturum açma ve kayıt sayfalarını görecektir. -admin_setting.description=Bir yönetici hesabı açmak isteÄŸe baÄŸlıdır. Ä°lk kayıt olan kullanıcı kendiliÄŸinden yönetici olacaktır. -admin_title=Yönetici hesabı ayarları -admin_name=Yönetici kullanıcı adı +admin_setting.description=Bir yönetici hesabı açmak isteÄŸe baÄŸlıdır. Ä°lk kayıtlı kullanıcı kendiliÄŸinden yönetici olmaktadır. +admin_title=Yönetici Hesabı Ayarları +admin_name=Yönetici Kullanıcı Adı admin_password=Parola -confirm_password=Parolayı doÄŸrula -admin_email=E-posta adresi +confirm_password=Parolayı DoÄŸrula +admin_email=E-posta Adresi install_btn_confirm=Forgejo'u Kur test_git_failed='git' komut testi baÅŸarısız: %v sqlite3_not_available=Bu Gieta sürümü SQLite3 desteklemiyor. Lütfen %s adresinden resmi çalışır sürümü ('gobuild' sürümünü deÄŸil) indirin. @@ -323,7 +312,7 @@ save_config_failed=%v Yapılandırması kaydedilirken hata oluÅŸtu invalid_admin_setting=Yönetici hesap ayarları geçersiz: %v invalid_log_root_path=Log dosya yolu geçersiz: %v default_keep_email_private=E-posta adreslerini varsayılan olarak gizle -default_keep_email_private.description=Kayıt olunduktan hemen sonra bilgi sızıntısı olmaması için yeni kullanıcı hesaplarının e-posta adreslerini varsayılan olarak gizle. +default_keep_email_private.description=Yeni kullanıcı hesaplarının e-posta adreslerini varsayılan olarak gizle. default_allow_create_organization=Varsayılan Olarak Organizasyon OluÅŸturmaya Ä°zin Ver default_allow_create_organization.description=Varsayılan olarak yeni kullanıcı hesaplarının organizasyon oluÅŸturmasına izin ver. default_enable_timetracking=Varsayılan Olarak Zaman Takibini EtkinleÅŸtir @@ -333,17 +322,12 @@ no_reply_address_helper=GizlenmiÅŸ e-posta adresine sahip kullanıcılar için a password_algorithm=Parola Hash Algoritması invalid_password_algorithm=Hatalı parola hash algoritması password_algorithm_helper=Parola hash algoritmasını ayarlayın. Algoritmalar deÄŸiÅŸen gereksinimlere ve güce sahiptirler. argon2 algoritması iyi özelliklere sahip olmasına raÄŸmen fazla miktarda bellek kullanır ve küçük sistemler için uygun olmayabilir. -enable_update_checker=Güncelleme denetleyicisini etkinleÅŸtir +enable_update_checker=Güncelleme Denetleyicisini EtkinleÅŸtir env_config_keys=Ortam Yapılandırma env_config_keys_prompt=AÅŸağıdaki ortam deÄŸiÅŸkenleri de yapılandırma dosyanıza eklenecektir: -allow_only_external_registration = Sadece dış hizmetler aracılığıyla kullanıcı kaydına izin ver -app_slogan = OluÅŸum sloganı -app_slogan_helper = OluÅŸum sloganınızı giriniz. Devre dışı bırakmak için boÅŸ bırakınız. -enable_update_checker_helper_forgejo = release.forgejo.org adresindeki TXT DNS kayıdı kullanılarak yeni Forgejo sürümleri düzenli olarak kontrol edilecektir. -allow_dots_in_usernames = Kullanıcı isimlerinde noktaya izin ver. Var olan kullanıcıları etkilemez. [home] -uname_holder=Kullanıcı adı veya e-posta adresi +uname_holder=Kullanıcı Adı veya E-Posta Adresi password_holder=Parola switch_dashboard_context=Panoya GeçiÅŸ Yap my_repos=Depolar @@ -390,19 +374,15 @@ code_search_results=`"%s" için sonuçları ara` code_last_indexed_at=Son dizinlenen %s relevant_repositories_tooltip=Çatal olan veya konusu, simgesi veya açıklaması olmayan depolar gizlenmiÅŸtir. relevant_repositories=Sadece iliÅŸkili depolar gösteriliyor, süzülmemiÅŸ sonuçları göster. -stars_one = %d yıldız -stars_few = %d yıldız -forks_one = %d çatal -forks_few = %d çatal [auth] -create_new_account=Hesap oluÅŸtur +create_new_account=Hesap OluÅŸtur register_helper_msg=Bir hesabınız var mı? Åžimdi giriÅŸ yapın! social_register_helper_msg=Hesabınız var mı? Hemen baÄŸlayın! disable_register_prompt=Kayıt iÅŸlemi devre dışıdır. Lütfen site yöneticinizle iletiÅŸim kurun. disable_register_mail=Kayıt için e-posta doÄŸrulama devre dışıdır. manual_activation_only=EtkinleÅŸtirmeyi tamamlamak için site yöneticinizle baÄŸlantıya geçin. -remember_me=Bu cihazı hatırla +remember_me=Bu Aygıtı hatırla remember_me.compromised=Oturum açma tokeni artık geçerli deÄŸil, bu ele geçirilmiÅŸ bir hesaba iÅŸaret ediyor olabilir. Lütfen hesabınızda olaÄŸandışı faaliyet olup olmadığını denetleyin. forgot_password_title=Åžifremi unuttum forgot_password=Åžifrenizi mi unuttunuz? @@ -421,7 +401,7 @@ has_unconfirmed_mail=Merhaba %s, doÄŸrulanmamış bir e-posta adresin var (%s resend_mail=EtkinleÅŸtirme e-postasını tekrar almak için buraya tıklayın email_not_associate=Bu e-posta adresi hiçbir hesap ile iliÅŸkilendirilmemiÅŸtir. send_reset_mail=Hesap Kurtarma E-postası Gönder -reset_password=Hesap kurtarma +reset_password=Hesap Kurtarma invalid_code=DoÄŸrulama kodunuz geçersiz veya süresi dolmuÅŸ. invalid_code_forgot_password=Onay kodunuz hatalı veya süresi geçmiÅŸ. Yeni bir oturum baÅŸlatmak için buraya tıklayın. invalid_password=Parolanız hesap oluÅŸturulurken kullanılan parolayla eÅŸleÅŸmiyor. @@ -435,9 +415,9 @@ use_scratch_code=Bir çizgi kodu kullanınız twofa_scratch_used=Geçici kodunuzu kullandınız. Ä°ki aÅŸamalı ayarlar sayfasına yönlendirildiniz, burada aygıt kaydınızı kaldırabilir veya yeni bir geçici kod oluÅŸturabilirsiniz. twofa_passcode_incorrect=Åžifreniz yanlış. Aygıtınızı yanlış yerleÅŸtirdiyseniz, oturum açmak için çizgi kodunuzu kullanın. twofa_scratch_token_incorrect=Çizgi kodunuz doÄŸru deÄŸildir. -login_userpass=Oturum aç +login_userpass=Oturum Aç tab_openid=Açık Kimlik -oauth_signup_tab=Yeni hesap oluÅŸtur +oauth_signup_tab=Yeni Hesap OluÅŸtur oauth_signup_title=Yeni Hesabı Tamamla oauth_signup_submit=Hesabı Tamamla oauth_signin_tab=Mevcut Hesaba BaÄŸla @@ -465,15 +445,6 @@ authorization_failed_desc=Geçersiz bir istek tespit ettiÄŸimiz için yetkilendi sspi_auth_failed=SSPI kimlik doÄŸrulaması baÅŸarısız oldu password_pwned=SeçtiÄŸiniz parola, daha önce herkese açık veri ihlallerinde açığa çıkan bir çalınan parola listesindedir. Lütfen farklı bir parola ile tekrar deneyin ve baÅŸka yerlerde de bu parolayı deÄŸiÅŸtirmeyi düşünün. password_pwned_err=HaveIBeenPwned'e yapılan istek tamamlanamadı -change_unconfirmed_email_summary = Aktivasyon e-postasının geldiÄŸi adresi deÄŸiÅŸtir. -change_unconfirmed_email_error = E-posta adresi deÄŸiÅŸtirilemedi: %v -last_admin = Son yöneticiyi kaldırmazsınız. En az bir yönetici olmalıdır. -back_to_sign_in = GiriÅŸ yapa dön -sign_up_button = Hemen kaydol. -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 [mail] view_it_on=%s üzerinde görüntüle @@ -540,18 +511,6 @@ team_invite.subject=%[1]s sizi %[2]s organizasyonuna katılmaya davet etti team_invite.text_1=%[1]s sizi %[3]s organizasyonundaki %[2]s takımına katılmaya davet etti. team_invite.text_2=Takıma katılmak lütfen aÅŸağıdaki baÄŸlantıya tıklayın: team_invite.text_3=Not: Bu davet %[1]s içindi. Bu daveti beklemiyorsanız, e-postayı yok sayabilirsiniz. -totp_disabled.text_1 = Hesabınızdaki zaman-tabanlı tek kullanımlık ÅŸifre/iki faktörlü doÄŸrulama (TOTP) devre dışı bırakıldı. -removed_security_key.subject = Bir güvenlik anahtarı kaldırıldı -primary_mail_change.subject = Ana e-posta adresiniz deÄŸiÅŸti -totp_disabled.subject = TOTP devre dışı bırakıldı -removed_security_key.text_1 = Güvenlik anahtarı "%[1]s" hesabınızdan kaldırıldı. -account_security_caution.text_2 = EÄŸer bu siz deÄŸilseniz hesabınız ele geçirilmiÅŸ demektir. Lütfen site yöneticileri ile iletiÅŸime geçiniz. -admin.new_user.subject = Yeni kullanıcı %s kayıt oldu -account_security_caution.text_1 = EÄŸer bu sizseniz bu e-postayı görmezden gelebilirsiniz. -password_change.subject = Parolanız deÄŸiÅŸti -admin.new_user.user_info = Kullanıcı bilgisi -admin.new_user.text = Lütfen bu kullanıcıyı admin panelinden yönetmek için buraya tıklayın. -password_change.text_1 = Hesabınızın parolası deÄŸiÅŸti. [modal] yes=Evet @@ -650,17 +609,6 @@ org_still_own_repo=Bu organizasyon hala bir veya daha fazla depoya sahip, önce org_still_own_packages=Bu organizasyon hala bir veya daha fazla pakete sahip, önce onları silin. target_branch_not_exist=Hedef dal mevcut deÄŸil. -To = Dal adı -Description = Açıklama -Pronouns = Adıllar -FullName = Tam isim -required_prefix = Girdi "%s" ile baÅŸlamalıdır -Biography = Biyografi -AccessToken = EriÅŸim jetonu -Location = Konum -Website = Websitesi -admin_cannot_delete_self = Yöneticiyken kullanıcınızı silemezsiniz. Lütfen önce yönetici yetkilerinizi kaldırın. -username_error_no_dots = ` sadece alfanumerik karakterler ("0-9","a-z","A-Z"), tire ("-") ve alt tire ("-") içerebilir. Alfanumerik olmayan karakterlerle baÅŸlayamaz ve bitemez, ayrıca ardışık alfanumerik olmayan karakterler de kullanılamaz.` [user] @@ -687,23 +635,6 @@ settings=Kullanıcı Ayarları form.name_reserved=`"%s" kullanıcı adı rezerve edilmiÅŸ.` form.name_pattern_not_allowed=Kullanıcı adında "%s" deseni kullanılamaz. form.name_chars_not_allowed=`"%s" kullanıcı adı geçersiz karakterler içeriyor.` -following.title.few = Takip edilenler -public_activity.visibility_hint.admin_private = Bu aktivite yönetici olduÄŸunuz için açıktır ama kullanıcı gizli kalmasını tercih etmiÅŸtir. -block_user = Kullanıcıyı engelle -public_activity.visibility_hint.self_public = Gizli alanlar haricindeki aktiviteleriniz herkese açıktır. DeÄŸiÅŸtir. -public_activity.visibility_hint.admin_public = Bu aktivite herkese açıktır ama bir yönetici olarak gizli alanlardaki etkileÅŸimleri de görebilirsiniz. -unblock = Engeli kaldır -following_one = %d takipçi -follow_blocked_user = Bu kullanıcıyı takip edemezsiniz çünkü bu kullanıcıyı engellediniz veya bu kullanıcı tarafından engellendiniz. -followers.title.few = Takipçiler -following.title.one = Takip edilenler -followers.title.one = Takipçi -block = Engelle -public_activity.visibility_hint.self_private = Aktiviteniz sadece size ve oluÅŸum yöneticilerine açıktır. DeÄŸiÅŸtir. -followers_one = %d takipçi -block_user.detail_2 = Bu kullanıcı sahip olduÄŸunuz depolar, açtığınız sorunlar ve yaptığınız yorumlar ile etkileÅŸime geçemeyecek. -block_user.detail_1 = Birbirinizden takipten çıkacak ve birbirinizi takip edemeyeceksiniz. -block_user.detail = Bu kullanıcıyı engellediÄŸinizde: [settings] profile=Profil @@ -921,7 +852,7 @@ select_permissions=Ä°zinleri seçin permission_no_access=EriÅŸim Yok permission_read=OkunmuÅŸ permission_write=Okuma ve Yazma -access_token_desc=Seçili token izinleri, yetkilendirmeyi ilgili API yollarıyla sınırlandıracaktır. Daha fazla bilgi için belgeleri okuyun. +access_token_desc=Seçili token izinleri, yetkilendirmeyi ilgili API yollarıyla sınırlandıracaktır. Daha fazla bilgi için belgeleri okuyun. at_least_one_permission=Bir token oluÅŸturmak için en azından bir izin seçmelisiniz permissions_list=Ä°zinler: @@ -1016,16 +947,6 @@ visibility.limited=Sınırlı visibility.limited_tooltip=Sadece oturum açmış kullanıcılar tarafından görünür visibility.private=Özel visibility.private_tooltip=Sadece katıldığınız organizasyonların üyeleri tarafından görünür -user_unblock_success = Kullanıcının engeli baÅŸarılı bir ÅŸekilde kaldırıldı. -user_block_success = Kullanıcı baÅŸarılı bir ÅŸekilde engellendi. -language.title = Varsayılan dil -change_password = Parolayı güncelle -pronouns = Adıllar -blocked_users = Engelli kullanıcılar -pronouns_unspecified = BelirtilmemiÅŸ -hints = Ä°puçları -language.description = Bu dil giriÅŸ yaptığınızda varsayılan dil olarak kullanılmak üzere hesabınıza kaydedilecektir. -keep_activity_private.description = Åžu anki halka açık aktiviteniz sadece size ve oluÅŸum yöneticilerine açık olacaktır. [repo] new_repo_helper=Bir depo, sürüm geçmiÅŸi dahil tüm proje dosyalarını içerir. Zaten baÅŸka bir yerde mi barındırıyorsunuz? Depoyu taşıyın. @@ -1120,9 +1041,9 @@ blame.ignore_revs=.git-blame-ignore-revs dosyasındaki sürüml blame.ignore_revs.failed=.git-blame-ignore-revs dosyasındaki sürümler yok sayılamadı. author_search_tooltip=En fazla 30 kullanıcı görüntüler -tree_path_not_found_commit=%[1]s yolu, %[2]s iÅŸlemesinde mevcut deÄŸil -tree_path_not_found_branch=%[1]s yolu, %[2]s dalında mevcut deÄŸil -tree_path_not_found_tag=%[1]s yolu, %[2]s etiketinde mevcut deÄŸil +tree_path_not_found_commit=%[1] yolu, %[2]s iÅŸlemesinde mevcut deÄŸil +tree_path_not_found_branch=%[1] yolu, %[2]s dalında mevcut deÄŸil +tree_path_not_found_tag=%[1] yolu, %[2]s etiketinde mevcut deÄŸil transfer.accept=Aktarımı Kabul Et transfer.accept_desc=`"%s" tarafına aktar` @@ -1321,8 +1242,7 @@ editor.or=veya editor.cancel_lower=Ä°ptal editor.commit_signed_changes=Ä°mzalı DeÄŸiÅŸiklikleri Ä°ÅŸle editor.commit_changes=DeÄŸiÅŸiklikleri Uygula -editor.add_tmpl='<%s>' eklendi -editor.add_tmpl.filename = dosyaadi +editor.add_tmpl='' eklendi editor.add=%s Ekle editor.update=%s Güncelle editor.delete=%s Sil @@ -1332,7 +1252,7 @@ editor.fail_to_apply_patch=`"%s" yaması uygulanamıyor` editor.new_patch=Yeni Yama editor.commit_message_desc=Ä°steÄŸe baÄŸlı uzun bir açıklama ekleyin… editor.signoff_desc=Ä°ÅŸleme günlüğü mesajının sonuna iÅŸleyen tarafından imzalanan bir fragman ekleyin. -editor.commit_directly_to_this_branch=DoÄŸrudan %[1]s bölümüne uygula. +editor.commit_directly_to_this_branch=DoÄŸrudan %s bölümüne uygula. editor.create_new_branch=Bu iÅŸleme için yeni bir dal oluÅŸturun ve bir deÄŸiÅŸiklik isteÄŸi baÅŸlatın. editor.create_new_branch_np=Bu iÅŸleme için yeni bir dal oluÅŸtur. editor.propose_file_change=Dosya deÄŸiÅŸikliÄŸi öner @@ -1698,7 +1618,7 @@ issues.error_modifying_due_date=BitiÅŸ tarihi deÄŸiÅŸtirilemedi. issues.error_removing_due_date=BitiÅŸ tarihi silinemedi. issues.push_commit_1=%d iÅŸlemeyi %s ekledi issues.push_commits_n=%d iÅŸlemeyi %s ekledi -issues.force_push_codes=`%[1]s %[2]s hedefinden %[4]s hedefine zorla gönderildi %[6]s` +issues.force_push_codes=`%[1]s %[2]s hedefinden %[4]s hedefine zorla gönderildi %[6]s` issues.force_push_compare=KarşılaÅŸtır issues.due_date_form=yyyy-aa-gg issues.due_date_form_add=BitiÅŸ tarihi ekle @@ -1813,7 +1733,7 @@ pulls.nothing_to_compare=Bu dallar eÅŸit. DeÄŸiÅŸiklik isteÄŸi oluÅŸturmaya gere pulls.nothing_to_compare_and_allow_empty_pr=Bu dallar eÅŸittir. Bu DÄ° boÅŸ olacak. pulls.has_pull_request=`Bu dallar arasında zaten bir deÄŸiÅŸiklik isteÄŸi var: %[2]s#%[3]d` pulls.create=DeÄŸiÅŸiklik Ä°steÄŸi OluÅŸtur -pulls.title_desc_few=%[2]s içindeki %[1]d iÅŸlemeyi %[3]s ile birleÅŸtirmek istiyor +pulls.title_desc_few=%[2]s içindeki %[1]d iÅŸlemeyi %[3]s ile birleÅŸtirmek istiyor pulls.merged_title_desc_few=%[4]s %[2]s içindeki %[1]d iÅŸlemeyi %[3]s ile birleÅŸtirdi pulls.change_target_branch_at='hedef dal %s adresinden %s%s adresine deÄŸiÅŸtirildi' pulls.tab_conversation=Sohbet @@ -2424,7 +2344,7 @@ settings.protect_branch_name_pattern=KorunmuÅŸ Dal Adı Deseni settings.protect_branch_name_pattern_desc=KorunmuÅŸ dal isim desenleri. Desen sözdizimi için belgelere bakabilirsiniz. Örnekler: main, release/** settings.protect_patterns=Desenler settings.protect_protected_file_patterns=Korumalı dosya kalıpları (noktalı virgülle ayrılmış ';'): -settings.protect_protected_file_patterns_desc=Kullanıcının bu dalda dosya ekleme, düzenleme veya silme hakları olsa bile doÄŸrudan deÄŸiÅŸtirilmesine izin verilmeyen korumalı dosyalar. Birden çok desen noktalı virgül (';') kullanılarak ayrılabilir. Desen sözdizimi için %s belgelerine bakın. Örnekler: .drone.yml, /docs/**/*.txt. +settings.protect_protected_file_patterns_desc=Kullanıcının bu dalda dosya ekleme, düzenleme veya silme hakları olsa bile doÄŸrudan deÄŸiÅŸtirilmesine izin verilmeyen korumalı dosyalar. Birden çok desen noktalı virgül (';') kullanılarak ayrılabilir. Desen sözdizimi için github.com/gobwas/glob belgelerine bakın. Örnekler: .drone.yml, /docs/**/*.txt. settings.protect_unprotected_file_patterns=Korunmasız dosya desenleri (noktalı virgülle ayrılmış ';'): settings.protect_unprotected_file_patterns_desc=Kullanıcının yazma eriÅŸimi, itme kısıtlamasını atlama hakkı olduÄŸunda doÄŸrudan deÄŸiÅŸtirmesine izin verilen korunmasız dosyalar. Birden çok desen noktalı virgül (';') kullanılarak ayrılabilir. Desen söz dizimi için %[2]s belgelerine bakın. Örnekler: .drone.yml, /docs/**/*.txt. settings.add_protected_branch=Korumayı etkinleÅŸtir @@ -2670,27 +2590,6 @@ find_file.no_matching=EÅŸleÅŸen dosya bulunamadı error.csv.too_large=Bu dosya çok büyük olduÄŸu için iÅŸlenemiyor. error.csv.unexpected=%d satırı ve %d sütununda beklenmeyen bir karakter içerdiÄŸinden bu dosya iÅŸlenemiyor. error.csv.invalid_field_count=%d satırında yanlış sayıda alan olduÄŸundan bu dosya iÅŸlenemiyor. -admin.enabled_flags = Etiketler ÅŸu depo için etkinleÅŸti: -admin.update_flags = Etiketleri güncelle -admin.failed_to_replace_flags = Depo etiketleri deÄŸiÅŸtirilemedi -admin.manage_flags = Etiketleri yönet -admin.flags_replaced = Depo etiketleri deÄŸiÅŸtirildi -rss.must_be_on_branch = RSS akışı için bir dalda olmalısınız. -settings.transfer_quota_exceeded = Yeni sahip (%s) kotayı aÅŸmış. Depo aktarılamadı. -contributors.contribution_type.filter_label = Katılım tipi: -settings.enter_repo_name = Sahibi ve depo adını tam olarak ÅŸu ÅŸekilde girin: -contributors.contribution_type.additions = Eklemeler -settings.units.overview = Genel Bakış -settings.federation_settings = Federasyon Ayarları -wiki.cancel = Ä°ptal -settings.transfer.button = SahipliÄŸi aktar -settings.transfer.modal.title = SahipliÄŸi aktar -wiki.no_search_results = Sonuç yok -settings.federation_not_enabled = OluÅŸumunuz federasyona açık deÄŸildir. -settings.pull_mirror_sync_quota_exceeded = Kota aşıldı, deÄŸiÅŸiklikler çekilmeyecek. -activity.navbar.contributors = Katılımcılar -contributors.contribution_type.deletions = Çıkarmalar -settings.new_owner_blocked_doer = Yeni sahip sizi engelledi. [graphs] @@ -3677,7 +3576,7 @@ need_approval_desc=DeÄŸiÅŸiklik isteÄŸi çatalında iÅŸ akışı çalıştırmak variables=DeÄŸiÅŸkenler variables.management=DeÄŸiÅŸken Yönetimi -variables.creation=DeÄŸiÅŸken ekle +variables.creation=DeÄŸiÅŸken Ekle variables.none=Henüz hiçbir deÄŸiÅŸken yok. variables.deletion=DeÄŸiÅŸkeni kaldır variables.deletion.description=Bir deÄŸiÅŸkeni kaldırma kalıcıdır ve geri alınamaz. Devam edilsin mi? @@ -3697,10 +3596,10 @@ runs.no_workflows.quick_start = Gitea Ä°ÅŸlem'i nasıl baÅŸlatacağınızı bilm type-1.display_name=KiÅŸisel Proje type-2.display_name=Depo Projesi type-3.display_name=Organizasyon Projesi -deleted.display_name = SilinmiÅŸ proje [git.filemode] changed_filemode=%[1]s → %[2]s +; Ordered by git filemode value, ascending. E.g. directory has "040000", normal file has "100644", … directory=Dizin normal_file=Normal dosya executable_file=Çalıştırılabilir dosya @@ -3717,18 +3616,4 @@ search = Ara... code_kind = Kodları ara... type_tooltip = Arama türü 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... -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... -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 -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. +user_kind = Kullanıcıları ara... \ No newline at end of file diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini index 472ce499f1..70ac146062 100644 --- a/options/locale/locale_uk-UA.ini +++ b/options/locale/locale_uk-UA.ini @@ -26,7 +26,7 @@ return_to_forgejo=ПовернутиÑÑ Ð´Ð¾ Forgejo username=Ім'Ñ ÐºÑ€Ð¸Ñтувача email=ÐдреÑа електронної пошти password=Пароль -access_token=Токен доÑтупу +access_token=Токен ДоÑтупу re_type=ÐŸÑ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ captcha=CAPTCHA twofa=Двофакторна Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ñ–Ñ @@ -41,11 +41,11 @@ mirror=Дзеркало new_repo=Ðовий репозиторій new_migrate=Ðова Ð¼Ñ–Ð³Ñ€Ð°Ñ†Ñ–Ñ new_mirror=Ðове дзеркало -new_fork=Ðовий форк репозиторію +new_fork=Ðовий репозиторій - ÐºÐ¾Ð¿Ñ–Ñ new_org=Ðова Ð¾Ñ€Ð³Ð°Ð½Ñ–Ð·Ð°Ñ†Ñ–Ñ new_project=Ðовий проєкт manage_org=ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¾Ñ€Ð³Ð°Ð½Ñ–Ð·Ð°Ñ†Ñ–Ñми -admin_panel=Панель адмініÑтрації +admin_panel=Панель ÐдмініÑтратора account_settings=ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ запиÑу settings=ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ your_profile=Профіль @@ -104,11 +104,11 @@ name=Ðазва logo = Логотип sign_in_with_provider = Увійти через %s tracked_time_summary = ПідÑумок відÑтеженого чаÑу з урахуваннÑм фільтрів ÑпиÑку задач -enable_javascript = Цей вебÑайт потребує JavaScript. +enable_javascript = Сайту треба JavaScript. webauthn_press_button = ÐатиÑніть кнопку на ключі безпеки… webauthn_use_twofa = Введіть код Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð· телефону webauthn_error = Ðе вдалоÑÑ Ñ€Ð¾Ð·Ð¿Ñ–Ð·Ð½Ð°Ñ‚Ð¸ ключ безпеки. -webauthn_error_unknown = СталаÑÑ Ð½ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð° помилка. Будь лаÑка, повторіть Ñпробу. +webauthn_error_unknown = ТрапилаÑÑŒ невідома помилка. Будь лаÑка, повторіть Ñпробу. webauthn_error_unable_to_process = Сервер не зміг обробити запит. webauthn_error_duplicated = Запит із наданим ключем безпеки відхилено. ВпевнітьÑÑ, що цього ключа ще не зареєÑтровано. webauthn_error_empty = Ключ Ñлід ÑкоÑÑŒ назвати. @@ -132,56 +132,18 @@ value = Ð—Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ webauthn_insert_key = Під'єднайте ключ безпеки download_logs = Завантажити журнали webauthn_sign_in = ÐатиÑніть кнопку на ключі безпеки. Якщо ключ безпеки не має кнопки, від'єднайте його й під'єднайте ще раз. -webauthn_unsupported_browser = Ваш браузер наразі не підтримує WebAuthn. +webauthn_unsupported_browser = Ваш оглÑдач наразі не підтримує WebAuthn. webauthn_error_insecure = WebAuthn підтримує лише захищені з'єднаннÑ. Ð”Ð»Ñ Ñ‚ÐµÑÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñ‡ÐµÑ€ÐµÐ· HTTP можете викориÑтати origin-Ñ€Ñдок «localhost» чи «127.0.0.1» webauthn_error_timeout = Ключ не вÑтиг зчитатиÑÑŒ протÑгом відведеного терміну. Будь лаÑка, перезавантажте Ñторінку й повторіть Ñпробу. locked = Заблоковано -filter.is_template = Шаблони -test = ТеÑÑ‚ -show_timestamps = Показувати відмітки чаÑу -filter.clear = ОчиÑтити фільтри -filter.is_archived = Ðрхівовано -filter = Фільтри -toggle_menu = Перемкнути видиміÑÑ‚ÑŒ меню -confirm_delete_artifact = Ви впевнені, що хочете видалити артефакт «%s»? -artifacts = Ðртефакти -filter.not_archived = Ðе архівовано -filter.public = ЗагальнодоÑтупні -filter.private = Приватні -more_items = Більше пунктів -remove_label_str = Видалити об'єкт «%s» -new_repo.title = Ðовий репозиторій -new_migrate.title = Ðова Ð¼Ñ–Ð³Ñ€Ð°Ñ†Ñ–Ñ -new_org.title = Ðова Ð¾Ñ€Ð³Ð°Ð½Ñ–Ð·Ð°Ñ†Ñ–Ñ -new_repo.link = Ðовий репозиторій -new_migrate.link = Ðова Ð¼Ñ–Ð³Ñ€Ð°Ñ†Ñ–Ñ -new_org.link = Ðова Ð¾Ñ€Ð³Ð°Ð½Ñ–Ð·Ð°Ñ†Ñ–Ñ -copy_generic = Скопіювати до буфера обміну -show_log_seconds = Показувати Ñекунди -show_full_screen = Показувати у повноекранному режимі -filter.is_fork = Форки -filter.not_fork = Ðе форки -filter.is_mirror = Дзеркала -filter.not_mirror = Ðе дзеркала -filter.not_template = Ðе шаблони -error413 = Ви вичерпали Ñвою чаÑтку. -invalid_data = ÐедійÑні дані: %v -copy_path = Копіювати шлÑÑ… [aria] -footer.software = Про заÑтоÑунок +footer.software = Про програму footer.links = ПоÑÐ¸Ð»Ð°Ð½Ð½Ñ -footer = Ðижній колонтитул -navbar = Панель навігації [heatmap] less = Менше more = Більше -contributions_one = внеÑок -number_of_contributions_in_the_last_12_months = %s внеÑків за оÑтанні 12 міÑÑців -contributions_zero = Ðема внеÑків -contributions_format = {contributions} за {month} {day}, {year} -contributions_few = внеÑки [editor] buttons.bold.tooltip = Додати грубий шрифт @@ -193,37 +155,19 @@ buttons.list.unordered.tooltip = Додати маркований ÑпиÑок buttons.list.ordered.tooltip = Додати нумерований ÑпиÑок buttons.list.task.tooltip = Додати ÑпиÑок завдань buttons.heading.tooltip = Додати заголовок -buttons.switch_to_legacy.tooltip = ВикориÑтовувати заÑтарілий редактор заміÑÑ‚ÑŒ поточного -buttons.disable_monospace_font = Вимкнути моноширинний шрифт -buttons.indent.tooltip = ВклаÑти предмет на один рівень -buttons.unindent.tooltip = ВиклаÑти об'єкт на один рівень -buttons.mention.tooltip = Згадати кориÑтувача чи команду -buttons.ref.tooltip = ПоÑлатиÑÑŒ на задачу чи на запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ -buttons.enable_monospace_font = Увімкнути моноширинний шрифт -buttons.new_table.tooltip = Додати таблицю -table_modal.label.columns = Стовпці -table_modal.header = Додати таблицю -table_modal.placeholder.header = Заголовок -table_modal.placeholder.content = ВміÑÑ‚ -table_modal.label.rows = РÑдки [filter] -string.asc = Ð - Я -string.desc = Я - Ð [error] occurred=СталаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° missing_csrf=Ðекоректний запит: токен CSRF не задано network_error=Помилка мережі -server_internal = Ð’Ð½ÑƒÑ‚Ñ€Ñ–ÑˆÐ½Ñ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ñервера -report_message = Якщо ви думаєте, що це вада Forgejo, будь лаÑка, пошукайте Ñ—Ñ— у ÑпиÑку задач на Codeberg чи Ñтворіть нову задачу, Ñкщо необхідно. -not_found = Ціль не була знайдена. [startpage] app_desc=Зручний влаÑний ÑÐµÑ€Ð²Ñ–Ñ Ñ…Ð¾Ñтингу репозиторіїв Git install=Легко вÑтановити platform=ПлатформонезалежніÑÑ‚ÑŒ -platform_desc=Forgejo підтверджено працює на вільних операційних ÑиÑтемах, Ñк-от Linux Ñ– FreeBSD, так Ñамо й на різних архітектурах ЦП. Оберіть, Ñка вам до вподоби! +platform_desc=Forgejo виконуєтьÑÑ Ð½Ð° платформі, Ð´Ð»Ñ Ñкої можливо Ñкомпілювати Go: Windows, macOS, Linux, ARM, та інших. Оберіть ту, Ñка вам до вподоби! lightweight=ÐевибагливіÑÑ‚ÑŒ lightweight_desc=Forgejo має низькі вимоги до реÑурÑів та може працювати на недорогому Raspberry Pi. Заощадьте енергію Ñвого комп'ютера! license=Відкритий вихідний код @@ -239,7 +183,7 @@ db_type=Тип бази даних host=ХоÑÑ‚ user=Ім'Ñ ÐºÑ€Ð¸Ñтувача password=Пароль -db_name=Ðазва бази даних +db_name=Ім'Ñ Ð±Ð°Ð·Ð¸ даних db_schema=Схема db_schema_helper=Залиште пуÑтим Ð´Ð»Ñ Ð±Ð°Ð·Ð¸ даних за замовчуваннÑм ("публічна"). ssl_mode=SSL @@ -254,108 +198,92 @@ 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=Ðеправильне ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача-адмініÑтратора general_title=Загальні Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ -app_name=Ðазва екземплÑра -app_name_helper=Уведіть тут назву Ñвого екземплÑра. Вона відображатиметьÑÑ Ð½Ð° кожній Ñторінці. -repo_path=Коренева тека репозиторію +app_name=Ðазва Ñайту +app_name_helper=Тут ви можете ввеÑти назву Ñвоєї компанії. +repo_path=Кореневий шлÑÑ… Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ñ–Ñ repo_path_helper=Ð’ÑÑ– вилучені Git репозиторії будуть збережені в цей каталог. -lfs_path=Кореневий шлÑÑ… Git LFS +lfs_path=Кореневої шлÑÑ… Git LFS lfs_path_helper=У цій папці будуть зберігатиÑÑ Ñ„Ð°Ð¹Ð»Ð¸ Git LFS. Залиште порожнім, щоб вимкнути LFS. -run_user=КориÑтувач, від Ñкого запуÑтити +run_user=ЗапуÑк від імені КориÑтувача domain=Домен Ñервера domain_helper=Домен або адреÑа хоÑта Ñервера. -ssh_port=Порт SSH-Ñервера -ssh_port_helper=Ðомер порту, що викориÑтовує SSH Ñервер. Залиште порожнім, аби вимкнути SSH. -http_port=HTTP-порт Ð´Ð»Ñ Ð¿Ñ€Ð¾ÑÐ»ÑƒÑ…Ð¾Ð²ÑƒÐ²Ð°Ð½Ð½Ñ -http_port_helper=Ðомер порту, що буде проÑлуховуватиÑÑ Ð²ÐµÐ±Ñервером Forgejo. -app_url=Базова URL-адреÑа +ssh_port=Порт SSH Ñервера +ssh_port_helper=Ðомер порту, Ñкий викориÑтовує SSH Ñервер. Залиште порожнім, щоб вимкнути SSH. +http_port=Forgejo HTTP порт +http_port_helper=Ðомер порту, Ñкий буде проÑлуховуватиÑÑ Forgejos веб-Ñервером. +app_url=Базова URL-адреÑа Forgejo app_url_helper=Базова адреÑа Ð´Ð»Ñ HTTP(S) ÐºÐ»Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ñ‡ÐµÑ€ÐµÐ· URL та повідомлень електронної пошти. -log_root_path=ШлÑÑ… до файлу журналу +log_root_path=ШлÑÑ… до лог файлу log_root_path_helper=Файли журналу будуть запиÑані в цей каталог. optional_title=Додаткові Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ -email_title=ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ email -smtp_addr=ÐдреÑа SMTP -smtp_port=Порт SMTP -smtp_from=ВідправлÑти email від імені +email_title=ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Email +smtp_addr=SMTP хоÑÑ‚ +smtp_port=SMTP порт +smtp_from=ВідправлÑти Email від імені smtp_from_helper=Електронна пошта Ð´Ð»Ñ Ð²Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð°Ð½Ð½Ñ Ð² GÑ–tea. Введіть звичайну електронну адреÑу або викориÑтовуйте формат: "Ім'Ñ" . -mailer_user=SMTP Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача -mailer_password=SMTP пароль +mailer_user=SMTP Ім'Ñ ÐºÑ€Ð¸Ñтувача +mailer_password=SMTP Пароль register_confirm=Потрібно підтвердити електронну пошту Ð´Ð»Ñ Ñ€ÐµÑ”Ñтрації mail_notify=Увімкнути ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ ÐµÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾ÑŽ поштою server_service_title=Сервер Ñ– Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð¾Ð²Ð½Ñ–ÑˆÐ½Ñ–Ñ… Ñлужб offline_mode=Увімкнути локальний режим -offline_mode.description=Відключити поÑÑ‚Ð°Ñ‡Ð°Ð½Ð½Ñ ÐºÐ¾Ð½Ñ‚ÐµÐ½Ñ‚Ñƒ зі Ñторонніх мереж й обÑлуговувати вÑÑ– реÑурÑи локально. +offline_mode.description=Відключити Ñторонні мережі доÑтавки контенту Ñ– обÑлуговувати вÑÑ– реÑурÑи локально. disable_gravatar=Вимкнути Gravatar -disable_gravatar.description=Вимкнути Gravatar або інші Ñторонні джерела аватарів. Якщо кориÑтувач не завантажить влаÑний аватар локально, то буде викориÑтовуватиÑÑ Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð·Ð° замовчуваннÑм. -federated_avatar_lookup=Увімкнути федеровані аватари -federated_avatar_lookup.description=Увімкнути зовнішні аватари за допомогою Libravatar. +disable_gravatar.description=Відключити Gravatar Ñ– Ñторонні джерела аватарів. Якщо кориÑтувач не завантажить аватар локально то за замовчуваннÑм буде викориÑтовуватиÑÑ Ñтандартний аватар. +federated_avatar_lookup=Увімкнути федеративні аватари +federated_avatar_lookup.description=Увімкнути зовнішний Ðватар за допомогою Libravatar. disable_registration=Вимкнути ÑамоÑтійну реєÑтрацію -disable_registration.description=Тільки адмініÑтратор може Ñтворювати нові облікові запиÑи. Ðаполегливо рекомендуємо залишити реєÑтрацію вимкненою, Ñкщо ви не збираєтеÑÑ Ñ€Ð¾Ð·Ð¼Ñ–Ñ‰ÑƒÐ²Ð°Ñ‚Ð¸ загальнодоÑтупний екземплÑÑ€ та ÑприÑти поÑві величезної кількоÑÑ‚Ñ– Ñпам-акаунтів. -allow_only_external_registration.description=КориÑтувачам буде дозволено реєÑтруватиÑÑŒ лише через налаштовані Ñторонні ÑервіÑи. +disable_registration.description=Вимкнути ÑамоÑтійну реєÑтрацію кориÑтувачів, тільки адмініÑтратор може Ñтворювати нові облікові запиÑи. +allow_only_external_registration.description=Дозволити реєÑтрацію тільки через Ñторонні ÑервіÑи openid_signin=Увімкнути реєÑтрацію за допомогою OpenID openid_signin.description=Увімкнути вхід за допомогою OpenID. openid_signup=Увімкнути ÑамоÑтійну реєÑтрацію за допомогою OpenID -openid_signup.description=Увімкнути ÑамореєÑтрацію кориÑтувачів тільки через OpenID. +openid_signup.description=Увімкнути ÑамореєÑтрацію кориÑтувачів на оÑнові OpenID. enable_captcha=Увімкнути CAPTCHA при реєÑтрації -enable_captcha.description=Вимагати перевірку CAPTCHA Ð´Ð»Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¸Ñ… запиÑів. -require_sign_in_view=Вимагати авторизації Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ³Ð»Ñду вміÑту екземплÑра -admin_setting.description=Створювати обліковий Ð·Ð°Ð¿Ð¸Ñ Ð°Ð´Ð¼Ñ–Ð½Ñ–Ñтратора необов'Ñзково. Перший зареєÑтрований кориÑтувач автоматично Ñтає адмініÑтратором. +enable_captcha.description=Вимагати перевірку CAPTCHA при ÑамоÑтійній реєÑтрації кориÑтувача. +require_sign_in_view=Вимагати авторизації Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ³Ð»Ñду Ñторінок +admin_setting.description=Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ запиÑу адмініÑтратора необов'Ñзково. Перший зареєÑтрований кориÑтувач автоматично Ñтає адмініÑтратором. admin_title=ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ запиÑу адмініÑтратора -admin_name=Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача-адмініÑтратора +admin_name=Ім'Ñ ÐºÑ€Ð¸Ñтувача ÐдмініÑтратора admin_password=Пароль confirm_password=ÐŸÑ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ admin_email=ÐдреÑа електронної пошти install_btn_confirm=Ð’ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Forgejo -test_git_failed=Ðе вдалоÑÑ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€Ð¸Ñ‚Ð¸ команду «git»: %v -sqlite3_not_available=Ð¦Ñ Ð²ÐµÑ€ÑÑ–Ñ Forgejo не підтримує SQLite3. Будь лаÑка, завантажте офіційну бінарну верÑÑ–ÑŽ з %s (не верÑÑ–ÑŽ «gobuild»). +test_git_failed=Ðе в змозі перевірити 'git' команду: %v +sqlite3_not_available=Ð¦Ñ Ð²ÐµÑ€ÑÑ–Ñ Forgejo не підтримує SQLite3. Будь лаÑка, завантажте офіційну бінарну верÑÑ–ÑŽ з %s (не верÑÑ–ÑŽ gobuild). invalid_db_setting=ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð±Ð°Ð·Ð¸ даних Ñ” некоректними: %v invalid_repo_path=Помилковий шлÑÑ… до ÐºÐ¾Ñ€ÐµÐ½Ñ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ñ–ÑŽ: %v invalid_app_data_path=Ðекоректний шлÑÑ… до даних програми: %v -run_user_not_match=Ім'Ñ Ð² «КориÑтувач, від Ñкого запуÑтити» не Ñ” ім'Ñм поточного кориÑтувача: %s -> %s +run_user_not_match=Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача 'run as' не Ñ” поточним ім'Ñм кориÑтувача: %s -> %s internal_token_failed=Ðе вдалоÑÑ Ð·Ð³ÐµÐ½ÐµÑ€ÑƒÐ²Ð°Ñ‚Ð¸ внутрішній токен: %v secret_key_failed=Ðе вдалоÑÑ Ð·Ð³ÐµÐ½ÐµÑ€ÑƒÐ²Ð°Ñ‚Ð¸ Ñекретний ключ: %v save_config_failed=Ðе в змозі зберегти конфігурацію: %v invalid_admin_setting=ÐеприпуÑтимі Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ запиÑу адмініÑтратора: %v invalid_log_root_path=ÐеприпуÑтимий шлÑÑ… Ð´Ð»Ñ Ð»Ð¾Ð³Ñ–Ð²: %v -default_keep_email_private=Приховати адреÑи електронної пошти за замовчуваннÑм -default_keep_email_private.description=За замовчуваннÑм приховати адреÑи електронної пошти нових облікових запиÑів, щоб Ñ†Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð½Ðµ «витікала» одразу піÑÐ»Ñ Ñ€ÐµÑ”Ñтрації. +default_keep_email_private=Приховати адреÑу електронної пошти за замовчуваннÑм +default_keep_email_private.description=Приховати адреÑу електронної пошти нових облікових запиÑів за замовчуваннÑм. default_allow_create_organization=Дозволити ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¾Ñ€Ð³Ð°Ð½Ñ–Ð·Ð°Ñ†Ñ–Ð¹ за замовчуваннÑм -default_allow_create_organization.description=Дозволити новим кориÑтувачам Ñтворювати організації за замовчуваннÑм. Якщо цю опцію вимкнено, дозвіл на ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¾Ñ€Ð³Ð°Ð½Ñ–Ð·Ð°Ñ†Ñ–Ð¹ новим кориÑтувачам надає адмініÑтратор. +default_allow_create_organization.description=Дозволити новим обліковим запиÑам кориÑтувачів Ñтворювати організації за замовчуваннÑм. default_enable_timetracking=Увімкнути відÑÑ‚ÐµÐ¶ÐµÐ½Ð½Ñ Ñ‡Ð°Ñу за замовчуваннÑм -default_enable_timetracking.description=Дозволити викориÑÑ‚Ð°Ð½Ð½Ñ Ñ„ÑƒÐ½ÐºÑ†Ñ–Ñ— відÑÑ‚ÐµÐ¶ÐµÐ½Ð½Ñ Ñ‡Ð°Ñу Ð´Ð»Ñ Ð½Ð¾Ð²Ð¸Ñ… репозиторіїв за замовчуваннÑм. +default_enable_timetracking.description=Включити відÑÑ‚ÐµÐ¶ÐµÐ½Ð½Ñ Ñ‡Ð°Ñу Ð´Ð»Ñ Ð½Ð¾Ð²Ð¸Ñ… репозиторіїв за замовчуваннÑм. no_reply_address=Прихований поштовий домен -no_reply_address_helper=Доменне ім'Ñ Ð´Ð»Ñ ÐºÐ¾Ñ€Ð¸Ñтувачів із прихованою електронною адреÑою. Ðаприклад, кориÑтувач «joe» буде входити в Git Ñк «joe@noreply.example.org», Ñкщо Ð´Ð»Ñ Ð¿Ñ€Ð¸Ñ…Ð¾Ð²Ð°Ð½Ð¾Ð³Ð¾ домену електронної пошти вÑтановлено «noreply.example.org». +no_reply_address_helper=Доменне ім'Ñ Ð´Ð»Ñ ÐºÐ¾Ñ€Ð¸Ñтувачів із прихованою електронною адреÑою. Ðаприклад, ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача 'joe' буде входити в Git Ñк 'joe@noreply.example.org', Ñкщо Ð´Ð»Ñ Ð¿Ñ€Ð¸Ñ…Ð¾Ð²Ð°Ð½Ð¾Ð³Ð¾ домену електронної пошти вÑтановлено 'noreply.example.org'. password_algorithm=Ðлгоритм Ñ…ÐµÑˆÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ -config_location_hint = Ці опції налаштувань будуть збережені в: -env_config_keys = ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ñередовища -env_config_keys_prompt = Ці змінні Ñередовища будуть також заÑтоÑовані до вашого файлу конфігурації: -invalid_db_table = База даних «%s» недійÑна: %v -enable_update_checker = Увімкнути перевірку оновлень -require_db_desc = Forgejo вимагає MySQL, PostgreSQL, SQLite3 чи TiDB (протокол MySQL). -allow_only_external_registration = Дозволити реєÑтрацію тільки через зовнішні ÑервіÑи -require_sign_in_view.description = Обмежити доÑтуп до контенту лише кориÑтувачам, що увійшли. ГоÑÑ‚Ñ– зможуть лише відвідувати Ñторінки автентифікації. -password_algorithm_helper = Ð’Ñтановити алгоритм Ñ…ÐµÑˆÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ–Ð². Ðлгоритми мають різні вимоги та Ñилу. Ðлгоритм argon2 Ñ” доÑить безпечним, проте Ñпоживає багато памʼÑÑ‚Ñ– та Ñ” недоречним Ð´Ð»Ñ Ð¼Ð°Ð»Ð¸Ñ… ÑиÑтем. -app_slogan = ГаÑло екземплÑра -app_slogan_helper = Уведіть гаÑло вашого екземплÑра тут. Залиште порожнім, аби вимкнути. -run_user_helper = Ð†Ð¼Ê¼Ñ ÐºÐ¾Ñ€Ð¸Ñтувача операційної ÑиÑтеми, від Ñкого запущено Forgejo. Зауважте, що цей кориÑтувач повинен мати доÑтуп до кореневої теки репозиторію. -smtp_from_invalid = ÐдреÑа з «ВідправлÑти email від імені» недійÑна -allow_dots_in_usernames = Дозволити кориÑтувачам викориÑтовувати крапки у Ñвоїх іменах. Ðе впливає на облікові запиÑи, що вже Ñ–Ñнують. -invalid_password_algorithm = ÐедійÑний варіант алгоритму Ñ…ÐµÑˆÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ–Ð² -enable_update_checker_helper_forgejo = ÐаÑвніÑÑ‚ÑŒ нових верÑій Forgejo періодично перевірÑтиметьÑÑ Ñ‡ÐµÑ€ÐµÐ· перевірку запиÑу TXT DNS на release.forgejo.org. [home] -uname_holder=Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача або ел. пошта +uname_holder=Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача або Ел. пошта password_holder=Пароль switch_dashboard_context=Переключити контекÑÑ‚ панелі ÑƒÐ¿Ñ€Ð°Ð²Ð»Ñ–Ð½Ð½Ñ my_repos=Репозиторії show_more_repos=Показати більше репозиторіїв… collaborative_repos=Спільні репозиторії -my_orgs=Організації +my_orgs=Мої організації my_mirrors=Мої дзеркала view_home=ПереглÑнути %s search_repos=Шукати репозиторій… @@ -389,12 +317,7 @@ org_no_results=Відповідних організацій не знайден code_no_results=Відповідний пошуковому запитанню код не знайдено. code_last_indexed_at=ОÑтанні індекÑовані %s relevant_repositories = ВідображаютьÑÑ Ð»Ð¸ÑˆÐµ релевантні репозиторії, переглÑнути результати без фільтру. -relevant_repositories_tooltip = Приховано форки, а також репозиторії без теми, значка й опиÑу. -go_to = Перейти до -stars_one = %d зірка -stars_few = %d зірок -forks_one = %d форк -forks_few = %d форків +relevant_repositories_tooltip = Приховано форки, а також Ñховища без теми, значка й опиÑу. [auth] create_new_account=РеєÑÑ‚Ñ€Ð°Ñ†Ñ–Ñ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ запиÑу @@ -402,8 +325,8 @@ register_helper_msg=Вже зареєÑтровані? Увійдіть зара social_register_helper_msg=Вже Ñ” аккаунт? Зв'Ñжіть його зараз! disable_register_prompt=Вибачте, можливіÑÑ‚ÑŒ реєÑтрації відключена. Будь лаÑка, зв'ÑжітьÑÑ Ð· адмініÑтратором Ñайту. disable_register_mail=ÐŸÑ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ñ€ÐµÑ”Ñтрації електронною поштою вимкнено. -remember_me=Запам'Ñтати цей приÑтрій -forgot_password_title=Забули пароль +remember_me=Запам’Ñтати цей приÑтрій +forgot_password_title=Забув пароль forgot_password=Забули пароль? sign_up_now=Потрібен обліковий запиÑ? ЗареєÑтруйтеÑÑ Ð·Ð°Ñ€Ð°Ð·. confirmation_mail_sent_prompt=Ðовий лиÑÑ‚ Ð´Ð»Ñ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð±ÑƒÐ»Ð¾ відправлено на %s, будь лаÑка, перевірте вашу поштову Ñкриньку протÑгом %s Ð´Ð»Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ñ€ÐµÑ”Ñтрації. @@ -412,12 +335,12 @@ allow_password_change=Вимагати в кориÑтувача змінити reset_password_mail_sent_prompt=Електронний лиÑÑ‚ із підтвердженнÑм надіÑлано %s. Перевірте папку 'Вхідні' в межах наÑтупних %s, щоб завершити Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ запиÑу. active_your_account=Ðктивувати обліковий Ð·Ð°Ð¿Ð¸Ñ account_activated=Обліковий Ð·Ð°Ð¿Ð¸Ñ Ð°ÐºÑ‚Ð¸Ð²Ð¾Ð²Ð°Ð½Ð¾ -prohibit_login=Обліковий Ð·Ð°Ð¿Ð¸Ñ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¾Ð²Ð°Ð½Ð¾ +prohibit_login=Вхід заборонений resent_limit_prompt=Вибачте, ви вже запроÑили активацію по електронній пошті нещодавно. Будь лаÑка, зачекайте 3 хвилини, а потім Ñпробуйте ще раз. has_unconfirmed_mail=Привіт %s, у Ð²Ð°Ñ Ñ” непідтверджена електронна адреÑа (%s ). Якщо ви не отримали електронний лиÑÑ‚ із підтвердженнÑм або вам потрібно надіÑлати новий, натиÑніть на кнопку нижче. resend_mail=ÐатиÑніть тут, щоб виÑлати лиÑÑ‚ активації знову email_not_associate=Ð¦Ñ ÐµÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð° пошта не пов'Ñзана ні з одним обліковим запиÑом. -send_reset_mail=ÐадіÑлати лиÑта Ð´Ð»Ñ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ +send_reset_mail=ÐадіÑлати електронний лиÑÑ‚ Ð´Ð»Ñ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ запиÑу reset_password=Ð’Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ запиÑу invalid_code=Цей код Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð½ÐµÐ´Ñ–Ð¹Ñний або закінчивÑÑ. reset_password_helper=Відновити обліковий Ð·Ð°Ð¿Ð¸Ñ @@ -432,10 +355,10 @@ twofa_scratch_token_incorrect=Ðевірний одноразовий парол login_userpass=Увійти tab_openid=OpenID oauth_signup_tab=ЗареєÑтрувати обліковий Ð·Ð°Ð¿Ð¸Ñ -oauth_signup_title=Завершити реєÑтрацію -oauth_signup_submit=Завершити +oauth_signup_title=Повний новий обліковий Ð·Ð°Ð¿Ð¸Ñ +oauth_signup_submit=Повний обліковий Ð·Ð°Ð¿Ð¸Ñ oauth_signin_tab=ПоÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° Ñ–Ñнуючий обліковий Ð·Ð°Ð¿Ð¸Ñ -oauth_signin_title=Увійдіть, щоб авторизувати пов'Ñзаний обліковий Ð·Ð°Ð¿Ð¸Ñ +oauth_signin_title=Увійдіть щоб авторизувати пов'Ñзаний обліковий Ð·Ð°Ð¿Ð¸Ñ oauth_signin_submit=Прив'Ñзати обліковий Ð·Ð°Ð¿Ð¸Ñ openid_connect_submit=Під’єднатиÑÑ openid_connect_title=ПідключитиÑÑ Ð´Ð¾ Ñ–Ñнуючого облікового запиÑу @@ -453,33 +376,10 @@ authorize_title=Ðвторизуйвати "%s" Ð´Ð»Ñ Ð´Ð¾Ñтупу до ва authorization_failed=Помилка авторизації sspi_auth_failed=Помилка SSPI-автентифікації password_pwned_err=Ðе вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ запит до HaveIBeenPwed -change_unconfirmed_email_summary = Змінити адреÑу електронної пошти, на Ñку надходÑÑ‚ÑŒ активаційні лиÑти. -oauth.signin.error.temporarily_unavailable = ÐÐ²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ñ–Ñ Ð½Ðµ вдалаÑÑ, оÑкільки Ñервер автентифікації тимчаÑово недоÑтупний. Будь лаÑка, Ñпробуйте пізніше. -change_unconfirmed_email = Якщо ви вказали неправильну електронну адреÑу впродовж реєÑтрації, ви можете змінити Ñ—Ñ— нижче. ÐŸÑ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð±ÑƒÐ´Ðµ надіÑлано на нову адреÑу. -last_admin = Ви не можете видалити оÑтаннього адмініÑтратора. Має бути хоча б один адмініÑтратор. -oauth.signin.error.access_denied = Запит на авторизацію було відхилено. -change_unconfirmed_email_error = Ðе вдалоÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ електронну адреÑу: %v -manual_activation_only = Зв'ÑжітьÑÑ Ð· адмініÑтратором Ñайту, аби завершити активацію. -prohibit_login_desc = Ваш обліковий Ð·Ð°Ð¿Ð¸Ñ Ð±ÑƒÐ»Ð¾ відізвано від взаємодії з екземплÑром. ЗвʼÑжітьÑÑ Ð· адмініÑтратором екземплÑру, щоб отримати доÑтуп знову. -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. -invalid_password = Ваш пароль не відповідає тому, що був заданий при Ñтворенні облікового запиÑу. -hint_login = Вже маєте обліковий запиÑ? Увійдіть зараз! -hint_register = Потрібен обліковий запиÑ? ЗареєÑтруйтеÑÑ Ð·Ð°Ñ€Ð°Ð·. -sign_up_button = ЗареєÑтруватиÑÑ. -sign_up_successful = Обліковий Ð·Ð°Ð¿Ð¸Ñ ÑƒÑпішно Ñтворений. Вітаємо! -unauthorized_credentials = Хибні або проÑтрочені дані Ð´Ð»Ñ Ð²Ñ…Ð¾Ð´Ñƒ. Спробуйте ще раз або перейдіть до %s по докладнішу інформацію -use_onetime_code = КориÑтати одноразовий код -oauth.signin.error = Виникла помилка при обробці запиту на авторизацію. Якщо Ñ†Ñ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° буде повторюватиÑÑŒ, звернітьÑÑ Ð´Ð¾ адмініÑтратора Ñайту. -authorization_failed_desc = ÐÐ²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ñ–Ñ Ð½Ðµ відбулаÑÑ: виÑвлено недійÑний запит. Будь лаÑка, звернітьÑÑ Ð´Ð¾ розробника програми, Ñку ви намагалиÑÑ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·ÑƒÐ²Ð°Ñ‚Ð¸. -password_pwned = Вибраний вами пароль Ñ” у ÑпиÑку викрадених паролів, виÑвлених під Ñ‡Ð°Ñ Ð²Ð¸Ñ‚Ð¾ÐºÑ–Ð² даних. Будь лаÑка, Ñпробуйте ще раз з іншим паролем. Варто також змінити цей пароль в інших міÑцÑÑ…. [mail] view_it_on=ПереглÑнути на %s -link_not_working_do_paste=ПоÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ðµ працює? Спробуйте його Ñкопіювати та вÑтавити у Ñвій браузер. +link_not_working_do_paste=Ðе працює? Спробуйте Ñкопіювати та вÑтавити його в Ñвій браузер. hi_user_x=Привіт %s, activate_account=Будь лаÑка, активуйте ваш обліковий Ð·Ð°Ð¿Ð¸Ñ @@ -490,15 +390,15 @@ activate_account.text_2=Перейдіть за цим поÑиланнÑм, щ activate_email=Підтвердить вашу адреÑу електронної пошти activate_email.text=Перейдіть за цим поÑиланнÑм, щоб підтвердити вашу електронну адреÑу в %s: -register_notify=Вітаємо у %s +register_notify=ЛаÑкаво проÑимо у %s register_notify.title=%[1]s, лаÑкаво проÑимо до %[2]s register_notify.text_1=це ваша е-пошта Ð´Ð»Ñ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ñ€ÐµÑ”Ñтрації Ð´Ð»Ñ %s! -register_notify.text_2=Ви можете ввійти до Ñвого облікового запиÑу, викориÑтовуючи ім'Ñ: %s -register_notify.text_3=Якщо цей обліковий Ð·Ð°Ð¿Ð¸Ñ Ð±ÑƒÐ»Ð¾ Ñтворено не вами, будь лаÑка, Ñпочатку вÑтановіть Ñвій пароль. +register_notify.text_2=Тепер ви можете увійти Ñк: %s. +register_notify.text_3=Якщо цей обліковий Ð·Ð°Ð¿Ð¸Ñ Ð±ÑƒÐ»Ð¾ Ñтворено Ð´Ð»Ñ Ð²Ð°Ñ, будь лаÑка, Ñпочатку вÑтановіть Ñвій пароль. reset_password=Ð’Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ð°ÑˆÐ¾Ð³Ð¾ облікового запиÑу reset_password.title=%s, ви відправили запит на Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ запиÑу -reset_password.text=Перейдіть за цим поÑиланнÑм, щоб відновити Ñвій обліковий Ð·Ð°Ð¿Ð¸Ñ Ð² %s: +reset_password.text=Перейдіть за цим поÑиланнÑм, щоб відновити ваш обліковий Ð·Ð°Ð¿Ð¸Ñ Ð² %s: register_success=РеєÑÑ‚Ñ€Ð°Ñ†Ñ–Ñ ÑƒÑпішна @@ -528,36 +428,13 @@ release.downloads=ЗвантаженнÑ: release.download.zip=Вихідний код (ZIP) release.download.targz=Вихідний код (TAR.GZ) -repo.transfer.subject_to=%s бажає передати репозиторій «%s» в %s -repo.transfer.subject_to_you=%s бажає передати вам репозиторій «%s» +repo.transfer.subject_to=%s бажає передати"%s" в %s +repo.transfer.subject_to_you=%s бажає передати"%s" вам repo.transfer.to_you=вам repo.transfer.body=Щоб прийнÑти або відхилити перейдіть до %s або проÑто ігноруйте. -repo.collaborator.added.subject=%s додав Ð²Ð°Ñ Ð´Ð¾ %s в ÑкоÑÑ‚Ñ– Ñпівавтора -repo.collaborator.added.text=Ð’Ð°Ñ Ð´Ð¾Ð´Ð°Ð½Ð¾ в ÑкоÑÑ‚Ñ– Ñпівавтора репозиторію: -primary_mail_change.subject = Ваша оÑновна пошта була змінена -totp_disabled.subject = TOTP було вимкнено -totp_disabled.text_1 = ТимчаÑовий одноразовий пароль (TOTP) на вашому обліковому запиÑÑ– було вимкнено. -password_change.subject = Ваш пароль уÑпішно змінено -password_change.text_1 = Пароль до вашого облікового запиÑу було щойно змінено. -reply = чи відповіÑти напрÑму з електронної адреÑи -admin.new_user.user_info = Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ ÐºÐ¾Ñ€Ð¸Ñтувача -admin.new_user.text = Будь лаÑка, натиÑніть тут, щоб керувати цим кориÑтувачем із панелі адмініÑтрації. -admin.new_user.subject = Ðовий кориÑтувач %s щойно ввійшов -removed_security_key.text_1 = Ключ безпеки «%[1]s» було щойно видалено з вашого облікового запиÑу. -removed_security_key.subject = Ключ безпеки видалено -team_invite.text_2 = Щоб приєднатиÑÑ Ð´Ð¾ команди, будь лаÑка, перейдіть за поÑиланнÑм: -team_invite.subject = %[1]s запрошує Ð’Ð°Ñ Ð¿Ñ€Ð¸Ñ”Ð´Ð½Ð°Ñ‚Ð¸ÑÑ Ð´Ð¾ організації %[2]s -team_invite.text_3 = Примітка: Це Ð·Ð°Ð¿Ñ€Ð¾ÑˆÐµÐ½Ð½Ñ Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ðµ Ð´Ð»Ñ %[1]s. Якщо Ви не очікували цього запрошеннÑ, можете проігнорувати цей лиÑÑ‚. -team_invite.text_1 = %[1]s запрошує Ð’Ð°Ñ Ð¿Ñ€Ð¸Ñ”Ð´Ð½Ð°Ñ‚Ð¸ÑÑ Ð´Ð¾ команди %[2]s в організації %[3]s. -primary_mail_change.text_1 = ОÑновну адреÑу електронної пошти вашого облікового запиÑу було змінено на %[1]s. Це означає, що Ñ†Ñ Ð°Ð´Ñ€ÐµÑа більше не отримуватиме ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð²Ð°ÑˆÐ¾Ð³Ð¾ облікового запиÑу. -account_security_caution.text_1 = Якщо це були ви, можете Ñміливо знехтувати цим лиÑтом. -account_security_caution.text_2 = Якщо це були не ви, ваш обліковий Ð·Ð°Ð¿Ð¸Ñ Ð·Ð½Ð°Ñ…Ð¾Ð´Ð¸Ñ‚ÑŒÑÑ Ð¿Ñ–Ð´ загрозою. Будь лаÑка, звʼÑжітьÑÑ Ð· адмініÑтраторами цього Ñайту. -totp_enrolled.subject = Ви задіÑли TOTP Ñк заÑіб двофакторної автентифікації -totp_enrolled.text_1.has_webauthn = Ви щойно задіÑли TOTP Ð´Ð»Ñ Ñвого облікового запиÑу. Ð’ÑÑ– наÑтупні Ñпроби входу вимагатимуть викориÑÑ‚Ð°Ð½Ð½Ñ TOTP Ñк заÑобу двофакторної автентифікації або будь-Ñкого з ваших ключів безпеки. -totp_enrolled.text_1.no_webauthn = Ви щойно задіÑли TOTP Ð´Ð»Ñ Ñвого облікового запиÑу. Ð’ÑÑ– наÑтупні Ñпроби входу вимагатимуть викориÑÑ‚Ð°Ð½Ð½Ñ TOTP Ñк заÑобу двофакторної автентифікації. -totp_disabled.no_2fa = Ðе налаштовано жодного заÑобу двофакторної автентифікації. Це означає, що ви можете входити у Ñвій обліковий Ð·Ð°Ð¿Ð¸Ñ Ð±ÐµÐ· необхідноÑÑ‚Ñ– викориÑтовувати двофакторну автентифікацію. -removed_security_key.no_2fa = Ðе налаштовано жодного заÑобу двофакторної автентифікації. Це означає, що ви можете входити у Ñвій обліковий Ð·Ð°Ð¿Ð¸Ñ Ð±ÐµÐ· необхідноÑÑ‚Ñ– викориÑтовувати двофакторну автентифікацію. +repo.collaborator.added.subject=%s додав Ð²Ð°Ñ Ð´Ð¾ %s +repo.collaborator.added.text=Ви були додані в ÑкоÑÑ‚Ñ– Ñпівавтора репозиторію: [modal] @@ -565,7 +442,6 @@ yes=Так no=ÐÑ– cancel=Відмінити modify=ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ -confirm = Підтвердити [form] UserName=Ð†Ð¼â€™Ñ ÐºÐ¾Ñ€Ð¸Ñтувача @@ -591,8 +467,8 @@ SSPISeparatorReplacement=Розділювач SSPIDefaultLanguage=Типова мова require_error=` не може бути пуÑтим.` -alpha_dash_error=` повинен міÑтити тільки літерно-цифрові Ñимволи, Ð´ÐµÑ„Ñ–Ñ («-») та підкреÑÐ»ÐµÐ½Ð½Ñ («_»).` -alpha_dash_dot_error=` повинен міÑтити тільки літерно-цифрові Ñимволи, Ð´ÐµÑ„Ñ–Ñ («-») , підкреÑÐ»ÐµÐ½Ð½Ñ («_») та крапки («.»).` +alpha_dash_error=` повинен міÑтити тільки літерно-цифрові Ñимволи, Ð´ÐµÑ„Ñ–Ñ ('-') та підкреÑÐ»ÐµÐ½Ð½Ñ ('_'). ` +alpha_dash_dot_error=` повинен міÑтити тільки літерно-цифрові Ñимволи, Ð´ÐµÑ„Ñ–Ñ ('-') , підкреÑÐ»ÐµÐ½Ð½Ñ ('_') та точки ('.'). ` git_ref_name_error=` повинен бути правильним поÑилальним ім'Ñм Git.` size_error=` повинен бути розмір %s.` min_size_error=` повинен бути принаймні %s Ñимволів.` @@ -631,7 +507,7 @@ enterred_invalid_owner_name=Ім'Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ влаÑника не Ñ” дій enterred_invalid_password=Введений вами пароль некоректний. user_not_exist=Даний кориÑтувач не Ñ–Ñнує. team_not_exist=Команда не Ñ–Ñнує. -last_org_owner=Ви не можете видалити оÑтаннього кориÑтувача з команди «ВлаÑники». Ð’ організації має бути принаймні один влаÑник. +last_org_owner=Ви не можете видалити оÑтаннього кориÑтувача з команди 'влаÑники'. У кожній команді має бути принаймні один влаÑник. cannot_add_org_to_team=Організацію неможливо додати Ñк учаÑника команди. invalid_ssh_key=Ðеможливо перевірити ваш SSH ключ: %s @@ -641,43 +517,18 @@ auth_failed=Помилка автентифікації: %v target_branch_not_exist=Цільової гілки не Ñ–Ñнує. -still_own_packages = Ваш обліковий Ð·Ð°Ð¿Ð¸Ñ Ð²Ð¾Ð»Ð¾Ð´Ñ–Ñ” одним чи більше пакунками, Ñпочатку видаліть Ñ—Ñ…. -org_still_own_packages = ÐžÑ€Ð³Ð°Ð½Ñ–Ð·Ð°Ñ†Ñ–Ñ Ð²Ñе ще володіє одним чи більше пакунками, Ñпочатку видаліть Ñ—Ñ…. -username_error_no_dots = ` може міÑтити тільки літерно-цифрові Ñимволи («0-9», «a-z», «A-Z»), Ð´ÐµÑ„Ñ–Ñ («-») та підкреÑÐ»ÐµÐ½Ð½Ñ («_»). Ðе може починатиÑÑ Ð°Ð±Ð¾ закінчуватиÑÑ Ð½ÐµÐ»Ñ–Ñ‚ÐµÑ€Ð½Ð¸Ð¼Ð¸ Ñимволами; нелітерні Ñимволи підрÑд також заборонені.` -username_error = ` може міÑтити тільки літерно-цифрові Ñимволи («0-9», «a-z», «A-Z»), Ð´ÐµÑ„Ñ–Ñ («-»), підкреÑÐ»ÐµÐ½Ð½Ñ («_») та крапки («.»). Ðе може починатиÑÑ Ð°Ð±Ð¾ закінчуватиÑÑ Ð½ÐµÐ»Ñ–Ñ‚ÐµÑ€Ð½Ð¸Ð¼Ð¸ Ñимволами; нелітерні Ñимволи підрÑд також заборонені.` -Description = ÐžÐ¿Ð¸Ñ -Pronouns = Займенники -Biography = Про Ñебе -FullName = Повне ім'Ñ -Website = ВебÑайт -url_error = `«%s» Ñ” недійÑним поÑиланнÑм.` -To = Ðазва гілки -Location = Ð Ð¾Ð·Ñ‚Ð°ÑˆÑƒÐ²Ð°Ð½Ð½Ñ -AccessToken = Токен доÑтупу -unable_verify_ssh_key = Ðе вдалоÑÑ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€Ð¸Ñ‚Ð¸ ключ SSH, перевірте його на наÑвніÑÑ‚ÑŒ помилок. -repository_force_private = Увімкнено примуÑову приватніÑÑ‚ÑŒ: приватні репозиторії не можна зробити публічними. -must_use_public_key = Ключ, Ñкий ви надали, Ñ” приватним. Будь лаÑка, нікуди не завантажуйте Ñвій приватний ключ. ВикориÑтовуйте заміÑÑ‚ÑŒ нього публічний ключ. -openid_been_used = ÐдреÑа OpenID «%s» вже викориÑтовуєтьÑÑ. -still_has_org = Ваш обліковий Ð·Ð°Ð¿Ð¸Ñ Ñ” учаÑником однієї або декількох організацій, Ñпочатку покиньте Ñ—Ñ…. -duplicate_invite_to_team = Цього кориÑтувача вже запрошено Ñк учаÑника команди. -organization_leave_success = Ви уÑпішно покинули організацію %s. -include_error = ` має міÑтити підрÑдок «%s».` -invalid_group_team_map_error = ` Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð½ÐµÐ´Ñ–Ð¹Ñне: %s` -unsupported_login_type = Цей тип входу не підтримує Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ запиÑу. -admin_cannot_delete_self = Ви не можете видалити Ñебе, Ñкщо ви Ñ” адмініÑтратором. Спочатку зніміть із Ñебе права адмініÑтратора. -unset_password = Ð”Ð»Ñ ÐºÐ¾Ñ€Ð¸Ñтувача не вÑтановлено пароль. [user] change_avatar=Змінити Ñвій аватар… repositories=Репозиторії activity=Публічна активніÑÑ‚ÑŒ -followers_few=%d cтежать -starred=Обрані репозиторії +followers_few=%d читачі +starred=Обрані Репозиторії watched=ВідÑтежувані репозиторії projects=Проєкт overview=ОглÑд -following_few=%d відÑтежуваних +following_few=%d читає follow=ПідпиÑатиÑÑ unfollow=ВідпиÑатиÑÑ user_bio=Ð‘Ñ–Ð¾Ð³Ñ€Ð°Ñ„Ñ–Ñ @@ -686,24 +537,6 @@ joined_on = РеєÑÑ‚Ñ€Ð°Ñ†Ñ–Ñ %s email_visibility.private = Ваш email видно лише вам Ñ– адмініÑтраторам email_visibility.limited = Вашу е-пошту видно вÑім авторизованим settings = КориÑтувацькі параметри -block_user.detail_3 = Ви не зможете додати один одного в ÑкоÑÑ‚Ñ– Ñпівавтора репозиторію. -show_on_map = Показати це міÑце на мапі -block_user.detail_2 = Цей кориÑтувач не зможе взаємодіÑти з репозиторіÑми, влаÑником Ñких Ñ” ви, а також із задачами та коментарÑми, Ñкі ви Ñтворили. -block_user.detail_1 = Ви припините Ñтежити один за одним Ñ– не зможете підпиÑатиÑÑ Ð¾Ð´Ð¸Ð½ на одного. -block = Заблокувати -unblock = Розблокувати -code = Код -block_user = Заблокувати кориÑтувача -block_user.detail = Зверніть увагу, що Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ñ€Ð¸Ñтувача має такі наÑлідки: -follow_blocked_user = Ви не можете Ñтежити за цим кориÑтувачем, тому що ви його заблокували або він заблокував ваÑ. -following_one = %d відÑтежуваний -followers_one = %d cтежить -followers.title.one = Cтежить -followers.title.few = Cтежать -following.title.one = ВідÑтежуваний -following.title.few = ВідÑтежувані -form.name_reserved = Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача «%s» зарезервовано. -form.name_chars_not_allowed = Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача «%s» міÑтить неприпуÑтимі Ñимволи. [settings] @@ -713,13 +546,13 @@ appearance=Зовнішній виглÑд password=Пароль security=Безпека avatar=Ðватар -ssh_gpg_keys=Ключі SSH / GPG +ssh_gpg_keys=SSH / GPG ключі social=Соціальні облікові запиÑи applications=Додатки -orgs=Організації +orgs=ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¾Ñ€Ð³Ð°Ð½Ñ–Ð·Ð°Ñ†Ñ–Ñми repos=Репозиторії delete=Видалити обліковий Ð·Ð°Ð¿Ð¸Ñ -twofa=Двофакторна Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ñ–Ñ (TOTP) +twofa=Двофакторна Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ñ–Ñ account_link=Прив'Ñзані облікові запиÑи organization=Організації @@ -728,9 +561,9 @@ password_username_disabled=Ðелокальним кориÑтувачам за full_name=Повне ім'Ñ website=Веб-Ñайт location=МіÑÑ†ÐµÐ·Ð½Ð°Ñ…Ð¾Ð´Ð¶ÐµÐ½Ð½Ñ -update_theme=Змінити тему +update_theme=Оновити тему update_profile=Оновити профіль -update_language=Змінити мову +update_language=Оновити мову update_language_success=Мову оновлено. update_profile_success=Профіль уÑпішно оновлено. change_username=Ваше Ім'Ñ ÐºÑ€Ð¸Ñтувача було змінено. @@ -747,7 +580,7 @@ comment_type_group_project=Проєкт privacy=ПриватніÑÑ‚ÑŒ keep_activity_private_popup=Показувати вашу активніÑÑ‚ÑŒ лише Вам та адмініÑтраторам -lookup_avatar_by_mail=Знайти аватар за адреÑою електронної пошти +lookup_avatar_by_mail=Знайти Ðватар за адреÑою електронної пошти federated_avatar_lookup=Знайти зовнішній аватар enable_custom_avatar=Увімкнути кориÑтувацькі аватари choose_new_avatar=Оберіть новий аватар @@ -766,9 +599,9 @@ password_change_disabled=Ðелокальні акаунти не можуть emails=ÐдреÑа електронної пошти manage_emails=ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð°Ð´Ñ€ÐµÑами ел. пошти -manage_themes=Тема за замовчуваннÑм -manage_openid=ÐдреÑи OpenID -theme_desc=Ð¦Ñ Ñ‚ÐµÐ¼Ð° буде типовою Ð´Ð»Ñ Ð²ÐµÐ±-інтерфейÑу, коли ви ввійдете в ÑиÑтему. +manage_themes=Виберіть тему за замовчуваннÑм +manage_openid=ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ OpenID +theme_desc=Ð¦Ñ Ñ‚ÐµÐ¼Ð° буде типовою Ð´Ð»Ñ Ð²Ñього Ñайту. primary=ОÑновний activated=Ðктивовано requires_activation=Потрібна Ð°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ñ–Ñ @@ -784,8 +617,8 @@ theme_update_error=Вибрана тема не Ñ–Ñнує. openid_deletion=Видалити адреÑу OpenID openid_deletion_desc=Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ñ†Ñ–Ñ”Ñ— OpenID-адреÑи з вашого облікового запиÑу заборонÑÑ” вам входити з ним. Продовжити? openid_deletion_success=ÐдреÑа OpenID була видалена. -add_new_email=Додати адреÑу електронної пошти -add_new_openid=Додати новий URI OpenID +add_new_email=Додати нову адреÑу електронної пошти +add_new_openid=Додати новий OpenID URI add_email=Додати адреÑу електронної пошти add_openid=Додати OpenID URI add_email_success=Додано нову адреÑу електронної пошти. @@ -794,19 +627,19 @@ add_openid_success=Ðова адреÑа OpenID була додана. keep_email_private=Приховати адреÑу електронної пошти openid_desc=OpenID дозволÑÑ” делегувати аутентифікацію зовнішньому поÑтачальнику поÑлуг. -manage_ssh_keys=Керувати ключами SSH +manage_ssh_keys=Керувати SSH ключами manage_ssh_principals=Ð£Ð¿Ñ€Ð°Ð²Ð»Ñ–Ð½Ð½Ñ SSH Ñертифікатами кориÑтувачів -manage_gpg_keys=Керувати ключами GPG +manage_gpg_keys=Керувати GPG ключами add_key=Додати ключ -ssh_desc=Ці відкриті ключі SSH повʼÑзані з вашим обліковим запиÑом. Відповідні приватні ключі дозволÑÑŽÑ‚ÑŒ отримати повний доÑтуп до ваших репозиторіїв. Підтверджені ключі можна викориÑтати Ð´Ð»Ñ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ñ–Ð² Git, підпиÑані з SSH. +ssh_desc=Ці відкриті SSH-ключі пов'Ñзані з вашим обліковим запиÑом. Відповідні приватні ключі дозволÑÑŽÑ‚ÑŒ отримати повний доÑтуп до ваших репозиторіїв. principal_desc=Ці наÑтройки SSH Ñертифікатів вказані у вашому обліковому запиÑÑ– та надають повний доÑтуп до ваших репозиторіїв. gpg_desc=Ці публічні ключі GPG пов'Ñзані з вашим обліковим запиÑом. Тримайте Ñвої приватні ключі в безпеці, оÑкільки вони дозволÑÑŽÑ‚ÑŒ здійÑнювати перевірку комітів. ssh_helper=Потрібна допомога? ДивітьÑÑ Ð³Ñ–Ð´ на GitHub з генерації ключів SSH або Ð²Ð¸Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð½Ñ Ñ‚Ð¸Ð¿Ð¾Ð²Ð¸Ñ… неполадок SSH. gpg_helper= Потрібна допомога? ПереглÑньте поÑібник GitHub про GPG . add_new_key=Додати SSH ключ add_new_gpg_key=Додати GPG ключ -key_content_ssh_placeholder=ПочинаєтьÑÑ Ð· «ssh-ed25519», «ssh-rsa», «ecdsa-sha2-nistp256», «ecdsa-sha2-nistp384», «ecdsa-sha2-nistp521», «sk-ecdsa-sha2-nistp256@openssh.com» або «sk-ssh-ed25519@openssh.com» -key_content_gpg_placeholder=ПочинаєтьÑÑ Ð· «-----BEGIN PGP PUBLIC KEY BLOCK-----» +key_content_ssh_placeholder=ПочинаєтьÑÑ Ð· 'ssh-ed25519', 'ssh-rsa', 'ecdsa-sha2-nistp256', 'ecdsa-sha2-nistp384', 'ecdsa-sha2-nistp521', 'sk-ecdsa-sha2-nistp256@openssh.com', або 'sk-ssh-ed25519@openssh.com' +key_content_gpg_placeholder=ПочинаєтьÑÑ Ð· '-----BEGIN PGP PUBLIC KEY BLOCK-----' add_new_principal=Додати кориÑтувача ssh_key_been_used=Цей SSH ключ вже був додано до Ñервера. ssh_key_name_used=Ключ SSH з таким ім'Ñм вже Ñ–Ñнує у вашому обліковому запиÑÑ–. @@ -824,7 +657,7 @@ gpg_token=Токен gpg_token_help=Ви можете Ñтворити Ð¿Ñ–Ð´Ð¿Ð¸Ñ Ð·Ð° допомогою: gpg_token_code=echo "%s" | gpg -a --default-key %s --detach-sig gpg_token_signature=ТекÑтовий (armored) Ð¿Ñ–Ð´Ð¿Ð¸Ñ GPG -key_signature_gpg_placeholder=ПочинаєтьÑÑ Ð· «-----BEGIN PGP SIGNATURE-----» +key_signature_gpg_placeholder=`ПочинаєтьÑÑ Ð· "-----BEGIN PGP SIGNATURE-----"` ssh_key_verified=Перевірений ключ ssh_key_verify=Підтвердити ssh_token_required=Вам потрібно надати Ð¿Ñ–Ð´Ð¿Ð¸Ñ Ð´Ð»Ñ Ð½Ð¸Ð¶Ñ‡ÐµÐ²ÐºÐ°Ð·Ð°Ð½Ð¾Ð³Ð¾ токена @@ -836,8 +669,8 @@ key_name=Ім'Ñ ÐºÐ»ÑŽÑ‡Ð° key_content=ЗміÑÑ‚ principal_content=ЗміÑÑ‚ delete_key=Видалити -ssh_key_deletion=Видалити ключ SSH -gpg_key_deletion=Видалити ключ GPG +ssh_key_deletion=Видалити SSH ключ +gpg_key_deletion=Видалити GPG ключ ssh_principal_deletion=Видалити SSH Ñертифікат кориÑтувача ssh_key_deletion_desc=Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ ÐºÐ»ÑŽÑ‡Ð° SSH ÑкаÑовує доÑтуп до вашого облікового запиÑу. Продовжити? gpg_key_deletion_desc=Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ GPG ключа ÑкаÑовує перевірку підпиÑаних ним комітів. Продовжити? @@ -860,10 +693,10 @@ ssh_externally_managed=Цей ключ SSH має зовнішнє управл manage_social=Керувати зв'Ñзаними обліковими запиÑами Ñоціальних мереж unbind=Від'єднати -manage_access_token=Токени доÑтупу +manage_access_token=ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ñ‚Ð¾ÐºÐµÐ½Ð°Ð¼Ð¸ доÑтупу generate_new_token=Згенерувати новий токен tokens_desc=Ці токени надають доÑтуп до вашого облікового запиÑу за допомогою Forgejo API. -token_name=Ім'Ñ Ñ‚Ð¾ÐºÐµÐ½Ð° +token_name=Ім'Ñ Ñ‚Ð¾ÐºÐµÐ½Ñƒ generate_token=Згенерувати токен generate_token_success=Ваш новий токен був Ñтворений. Скопіюйте його зараз, оÑкільки він не буде показаний знову. generate_token_name_duplicate=Ðазва програми %s вже викориÑтовуєтьÑÑ. Будь лаÑка, викориÑтайте нову. @@ -880,13 +713,13 @@ oauth2_applications_desc=Програми OAuth2 дають можливіÑÑ‚ÑŒ remove_oauth2_application=Видалити програму OAuth2 remove_oauth2_application_desc=Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸ OAuth2 ÑкаÑовує доÑтуп до вÑÑ–Ñ… підпиÑаних маркерів доÑтупу. Продовжити? remove_oauth2_application_success=Програму видалено. -create_oauth2_application=Створити новий додаток OAuth2 +create_oauth2_application=Створити нову програму OAuth2 create_oauth2_application_button=Створити програму oauth2_application_name=Ðазва програми save_application=Зберегти oauth2_client_id=ID Клієнта oauth2_client_secret=Ключ клієнта -oauth2_regenerate_secret=Згенерувати новий ключ +oauth2_regenerate_secret=Відновити ключ oauth2_regenerate_secret_hint=Ви втратили Ñвій ключ? oauth2_application_edit=Редагувати oauth2_application_create_description=Програми OAuth2 надають вашим Ñтороннім програмам доÑтуп до облікових запиÑів кориÑтувачів у цьому екземплÑрі. @@ -914,28 +747,28 @@ twofa_enrolled=Ð”Ð»Ñ Ð²Ð°ÑˆÐ¾Ð³Ð¾ облікового запиÑу було в twofa_failed_get_secret=Ðе вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ Ñекрет. -manage_account_links=Пов'Ñзані облікові запиÑи +manage_account_links=ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¸Ð¼Ð¸ запиÑами manage_account_links_desc=Ці зовнішні акаунти прив'Ñзані до вашого аккаунту Forgejo. account_links_not_available=Ðаразі немає зовнішніх облікових запиÑів, пов'Ñзаних із вашим обліковим запиÑом Forgejo. link_account=Прив'Ñзати обліковий Ð·Ð°Ð¿Ð¸Ñ -remove_account_link=Видалити пов'Ñзаний обліковий Ð·Ð°Ð¿Ð¸Ñ +remove_account_link=Видалити облікові запиÑи remove_account_link_desc=Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð¿Ð¾Ð²'Ñзаного облікового запиÑу відкликає його доÑтуп до вашого облікового запиÑу Forgejo. Продовжити? remove_account_link_success=Зв'Ñзаний обліковий Ð·Ð°Ð¿Ð¸Ñ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð¾. orgs_none=Ви не Ñ” учаÑником будь-Ñкої організації. -delete_account=Видалити Ñвій обліковий Ð·Ð°Ð¿Ð¸Ñ +delete_account=Видалити ваш обліковий Ð·Ð°Ð¿Ð¸Ñ delete_prompt=Ð¦Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ñ–Ñ Ð¾Ñтаточно видалить обліковий Ð·Ð°Ð¿Ð¸Ñ ÐºÐ¾Ñ€Ð¸Ñтувача. Це ÐЕ МОЖЛИВО відмінити. delete_with_all_comments=Ваш обліковий Ð·Ð°Ð¿Ð¸Ñ Ð¼Ð¾Ð»Ð¾Ð´ÑˆÐ¸Ð¹ за %s днів. Щоб уникнути коментарів-привидів, вÑÑ– запити/PR коментрарі будуть видалені з ним. -confirm_delete_account=Підтвердити Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ -delete_account_title=Видалити обліковий Ð·Ð°Ð¿Ð¸Ñ +confirm_delete_account=ÐŸÑ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ +delete_account_title=Видалити цей обліковий Ð·Ð°Ð¿Ð¸Ñ delete_account_desc=Ви впевнені, що хочете оÑтаточно видалити цей обліковий запиÑ? -email_notifications.enable=Увімкнути email-ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ -email_notifications.onmention=Email тільки коли згадують -email_notifications.disable=Вимкнути email-ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ -email_notifications.submit=Зберегти параметри email +email_notifications.enable=Увімкнути ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ email +email_notifications.onmention=ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ email тільки коли згадують +email_notifications.disable=Вимкнути email ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ +email_notifications.submit=Ðалаштувати параметри email visibility=ВидиміÑÑ‚ÑŒ кориÑтувача visibility.public=Публічний @@ -944,68 +777,16 @@ visibility.private=Приватний saved_successfully = ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ÑƒÑпішно збережено. comment_type_group_time_tracking = Облік чаÑу location_placeholder = ПоділітьÑÑ Ð· іншими, де приблизно ви знаходитеÑÑŒ -biography_placeholder = Розкажіть трохи про Ñебе! (ПідтримуєтьÑÑ Markdown) +biography_placeholder = Розкажіть трохи про Ñебе! (Можете викориÑтати Markdown) hidden_comment_types = Приховані типи коментарів -keep_activity_private = Приховати активніÑÑ‚ÑŒ зі Ñторінки профілю +keep_activity_private = Приховати ÐктивніÑÑ‚ÑŒ зі Ñторінки профілю blocked_users = Заблоковані кориÑтувачі -blocked_users_none = Ðемає заблокованих кориÑтувачів. -profile_desc = Про Ñебе +blocked_users_none = Ви не заблокували жодного кориÑтувача. +profile_desc = Керуйте тим, Ñк ваш профіль відображаєтьÑÑ Ñ–Ð½ÑˆÐ¸Ð¼ кориÑтувачам. Ваша оÑновна адреÑа електронної пошти буде викориÑтовуватиÑÑ Ð´Ð»Ñ Ñповіщень, Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ Ñ‚Ð° операцій з Git через веб-інтерфейÑ. retype_new_password = Підтвердіть новий пароль email_desc = Ваша оÑновна адреÑа електронної пошти буде викориÑтовуватиÑÑ Ð´Ð»Ñ Ñповіщень, Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ Ñ–, за умови, що вона не прихована, Ð´Ð»Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ñ–Ð¹ з Git через веб-інтерфейÑ. visibility.limited_tooltip = Видимий(а) тільки Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ… кориÑтувачів visibility.private_tooltip = Видимий(а) тільки Ð´Ð»Ñ ÑƒÑ‡Ð°Ñників організацій, до Ñких ви приєдналиÑÑ -twofa_scratch_token_regenerated = Ваш одноразовий код Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½Ð°Ñ€Ð°Ð·Ñ– %s. Збережіть його у безпечному міÑці, бо він не буде показаний знову. -authorized_oauth2_applications_description = Ви надали цим Ñтороннім заÑтоÑункам доÑтуп до вашого облікового запиÑу Forgejo. Будь лаÑка, відкличте доÑтуп із заÑтоÑунків, що більше не викориÑтовуютьÑÑ. -webauthn_delete_key = Видалити ключ безпеки -webauthn_key_loss_warning = Якщо ви втратите ключ безпеки, то втратите доÑтуп до вашого облікового запиÑу. -webauthn_register_key = Додати ключ безпеки -webauthn_nickname = ПÑевдонім -webauthn_desc = Ключі безпеки це апаратні приÑтрої, що міÑÑ‚ÑÑ‚ÑŒ криптографічні ключі. Вони можуть викориÑтовуватиÑÑŒ Ð´Ð»Ñ Ð´Ð²Ð¾ÐºÑ€Ð°Ñ‚Ð½Ð¾Ñ— автентифікації. Ключі безпеки мають підтримувати Ñтандарт WebAuthn Authenticator. -revoke_oauth2_grant_success = ДоÑтуп відкликано уÑпішно. -twofa_recovery_tip = Якщо ви втратите ваш приÑтрій, ви зможете викориÑтати одноразовий код відновленнÑ, щоб знову отримати доÑтуп до Ñвого облікового запиÑу. -webauthn_delete_key_desc = Якщо ви видалите ключ безпеки, ви більше не зможете з ним зайти. Продовжити? -change_password = Зміна Ð¿Ð°Ñ€Ð¾Ð»Ñ -email_notifications.andyourown = І ваші влаÑні ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ -visibility.public_tooltip = Видимий(а) Ð´Ð»Ñ Ð²ÑÑ–Ñ… -update_language_not_found = Мова «%s» недоÑтупна. -pronouns = Займенники -pronouns_unspecified = Ðе вказані -hints = Підказки -language.title = Мова за замовчуваннÑм -update_hints = Оновити підказки -update_hints_success = Підказки оновлено. -additional_repo_units_hint = Пропонувати увімкнути додаткові розділи репозиторію -additional_repo_units_hint_description = Показувати підказку «Увімкнути ще» Ð´Ð»Ñ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ñ–Ñ—Ð², у Ñких увімкнено не вÑÑ– доÑтупні розділи. -language.description = Цю мову буде збережено у вашому обліковому запиÑÑ–, вона викориÑтовуватиметьÑÑ Ð¿Ñ–ÑÐ»Ñ Ñ‚Ð¾Ð³Ð¾, Ñк ви ввійдете в ÑиÑтему. -language.localization_project = Допоможіть нам переклаÑти Forgejo вашою мовою! ДізнатиÑÑ Ð±Ñ–Ð»ÑŒÑˆÐµ. -permissions_list = Дозволи: -comment_type_group_dependency = ЗалежніÑÑ‚ÑŒ -comment_type_group_pull_request_push = Додані коміти -permissions_public_only = Тільки публічні -select_permissions = Виберіть дозволи -permissions_access_all = УÑÑ– (публічні, приватні й обмежені) -create_oauth2_application_success = Ви уÑпішно Ñтворили новий додаток OAuth2. -keep_email_private_popup = Ваша адреÑа електронної пошти не буде відображатиÑÑ Ñƒ вашому профілі Ñ– не буде викориÑтовуватиÑÑ Ð·Ð° замовчуваннÑм Ð´Ð»Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ñ–Ð², зроблених через веб-інтерфейÑ, таких Ñк Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð², Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ Ñ– об'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ñ–Ð². ÐатоміÑÑ‚ÑŒ ви можете викориÑтовувати Ñпеціальну адреÑу %s Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð²'Ñзки комітів до Ñвого облікового запиÑу. Ð¦Ñ Ð¾Ð¿Ñ†Ñ–Ñ Ð½Ðµ вплине на Ñ–Ñнуючі коміти. -blocked_since = Заблокований з %s -can_not_add_email_activations_pending = ОчікуєтьÑÑ Ð°ÐºÑ‚Ð¸Ð²Ð°Ñ†Ñ–Ñ, Ñпробуйте ще раз за кілька хвилин, Ñкщо хочете додати нову адреÑу електронної пошти. -ssh_signonly = SSH наразі вимкнено, тому ці ключі викориÑтовуютьÑÑ Ð»Ð¸ÑˆÐµ Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€ÐºÐ¸ підпиÑу комітів. -uid = UID -at_least_one_permission = Ð”Ð»Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ‚Ð¾ÐºÐµÐ½Ð° необхідно вибрати хоча б один дозвіл -verify_gpg_key_success = Ключ GPG «%s» перевірено. -repos_none = Ви не Ñ” влаÑником жодного репозиторію. -add_gpg_key_success = Ключ GPG «%s» додано. -add_key_success = Ключ SSH «%s» додано. -permission_no_access = Ðемає доÑтупу -permission_write = Ð§Ð¸Ñ‚Ð°Ð½Ð½Ñ Ñ– Ð·Ð°Ð¿Ð¸Ñ -uploaded_avatar_is_too_big = Розмір завантаженого файлу (%d КіБ) перевищує макÑимальний розмір (%d КіБ). -verify_ssh_key_success = Ключ SSH «%s» перевірено. -ssh_invalid_token_signature = Ðаданий SSH-ключ, Ð¿Ñ–Ð´Ð¿Ð¸Ñ Ð°Ð±Ð¾ токен не збігаютьÑÑ Ð°Ð±Ð¾ токен заÑтарів. -valid_until_date = ДійÑний до %s -added_on = Додано %s -key_signature_ssh_placeholder = ПочинаєтьÑÑ Ð· «-----BEGIN SSH SIGNATURE-----» -user_block_yourself = Ви не можете заблокувати Ñебе. -pronouns_custom_label = Інші займенники -repo_and_org_access = ДоÑтуп до репозиторію та організації [repo] owner=ВлаÑник @@ -1014,7 +795,7 @@ repo_name=Ðазва репозиторію repo_name_helper=Хороші назви репозиторіїв викориÑтовують короткі, унікальні ключові Ñлова що легко запам'Ñтати. repo_size=Розмір репозиторію template=Шаблон -template_select=Виберіть шаблон +template_select=Оберіть шаблон. template_helper=Зробити репозиторій шаблоном template_description=Шаблонні репозиторії дозволÑÑŽÑ‚ÑŒ кориÑтувачам генерувати нові репозиторії із такою ж Ñтруктурою директорій, файлами та додатковими налаштуваннÑми. visibility=ВидиміÑÑ‚ÑŒ @@ -1022,7 +803,7 @@ visibility_description=Тільки влаÑник або члени орган visibility_helper_forced=ÐдмініÑтратор вашого Ñайту налаштував параметри: вÑÑ– нові репозиторії будуть приватними. visibility_fork_helper=(Ці зміни вплинуть на вÑÑ– форки.) clone_helper=Потрібна допомога у клонуванні? Відвідайте Ñторінку Допомога. -fork_repo=Створити форк репозиторію +fork_repo=Форкнути репозиторій fork_from=Форк з fork_visibility_helper=Ðеможливо змінити видиміÑÑ‚ÑŒ форкнутого репозиторію. use_template=ЗаÑтоÑувати цей шаблон @@ -1035,17 +816,17 @@ generate_from=Генерувати з repo_desc=ÐžÐ¿Ð¸Ñ repo_desc_helper=Введіть короткий Ð¾Ð¿Ð¸Ñ (опціонально) repo_lang=Мова -repo_gitignore_helper=Виберіть шаблони .gitignore +repo_gitignore_helper=Виберіть шаблон .gitignore. repo_gitignore_helper_desc=Оберіть з ÑпиÑку мовних шаблонів файли, Ñкі не будуть відÑтежуватиÑÑŒ. Типові артефакти, Ñкі генеруютьÑÑ Ð·Ð° допомогою інÑтрументів побудови кожної мови, за замовчуваннÑм включені до .gitignor. -issue_labels=Мітки -issue_labels_helper=Виберіть набір міток +issue_labels=Мітки задачі +issue_labels_helper=Вибрати мітку Ð´Ð»Ñ Ð·Ð°Ð´Ð°Ñ‡Ñ–. license=Ð›Ñ–Ñ†ÐµÐ½Ð·Ñ–Ñ -license_helper=Виберіть файл ліцензії -license_helper_desc=Ð›Ñ–Ñ†ÐµÐ½Ð·Ñ–Ñ Ñ€ÐµÐ³ÑƒÐ»ÑŽÑ” те, що інші можуть Ñ– не можуть робити з вашим кодом. Ðе впевнені, що Ñаме підходить Ð´Ð»Ñ Ð²Ð°ÑˆÐ¾Ð³Ð¾ проєкту? ДивітьÑÑ Ð’Ð¸Ð±ÐµÑ€Ñ–Ñ‚ÑŒ ліцензію. +license_helper=Виберіть ліцензійний файл. +license_helper_desc=Ð›Ñ–Ñ†ÐµÐ½Ð·Ñ–Ñ Ñ€ÐµÐ³ÑƒÐ»ÑŽÑ” те, що інші можуть Ñ– не можуть робити з вашим кодом. Ðе впевнені, що Ñаме підходить Ð´Ð»Ñ Ð²Ð°ÑˆÐ¾Ð³Ð¾ проєкту? ДивітьÑÑ Ð’Ð¸Ð±ÐµÑ€Ñ–Ñ‚ÑŒ ліцензію. readme=README -readme_helper=Виберіть шаблон README +readme_helper=Виберіть шаблон README. readme_helper_desc=Це міÑце, де ви можете напиÑати повний Ð¾Ð¿Ð¸Ñ Ð²Ð°ÑˆÐ¾Ð³Ð¾ проєкту. -auto_init=Ініціалізувати репозиторій +auto_init=Ініціалізувати репозиторій (Додає .gitignore, LICENSE та README) trust_model_helper=Виберіть модель довіри Ð´Ð»Ñ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð¿Ñ–Ð´Ð¿Ð¸Ñу. Можливі варіанти: trust_model_helper_collaborator=Співавтор: підпиÑи довіри від Ñпівавторів trust_model_helper_committer=УчаÑник: довірені підпиÑи учаÑтників @@ -1102,12 +883,12 @@ template.git_hooks=Перехоплювачі Git template.webhooks=Webhook'и template.topics=Теми template.avatar=Ðватар -template.issue_labels=Мітки задач +template.issue_labels=Мітки задачі template.one_item=Слід обрати хоча б один елемент шаблону template.invalid=Слід обрати шаблонний репозиторій archive.issue.nocomment=Цей репозиторій архівовано. Ви не можете коментувати задачі. -archive.pull.nocomment=Цей репозиторій архівовано. Ви не можете коментувати запити на злиттÑ. +archive.pull.nocomment=Це архівний репозитарій. Ви не можете коментувати пулл-реквеÑти. form.reach_limit_of_creation_1=Ви вже доÑÑгли ліміту в %d репозиторіїв. form.reach_limit_of_creation_n=Ви доÑÑгли макÑимальної кількоÑÑ‚Ñ– %d Ñтворених репозиторіїв. @@ -1125,11 +906,11 @@ migrate_items_milestones=Етапи migrate_items_labels=Мітки migrate_items_issues=Задачі migrate_items_pullrequests=Запити на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ -migrate_items_merge_requests=Запити на об'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ +migrate_items_merge_requests=Запити на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ migrate_items_releases=Релізи migrate_repo=ПеренеÑти репозиторій migrate.clone_address=ÐœÑ–Ð³Ñ€Ð°Ñ†Ñ–Ñ / клонувати з URL-адреÑи -migrate.clone_address_desc=URL-адреÑа HTTP(S) або Git «clone» Ñ–Ñнуючого репозиторію +migrate.clone_address_desc=URL-адреÑа HTTP(S) або Git "clone" Ñ–Ñнуючого Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ñ–Ñ migrate.clone_local_path=або шлÑÑ… до локального Ñерверу migrate.permission_denied=Вам не дозволено імпортувати локальні репозиторії. migrate.permission_denied_blocked=Ви не можете імпортувати з заборонених вузлів, будь лаÑка, попроÑÑ–Ñ‚ÑŒ адмініÑтратора перевірити Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ALLOWED_DOMAINS/ALLOW_LOCALNETWORKS/BLOCKED_DOMAINS. @@ -1211,8 +992,8 @@ file_permalink=ПоÑтійне поÑÐ¸Ð»Ð°Ð½Ð½Ñ file_too_large=Цей файл завеликий щоб бути показаним. file_copy_permalink=Копіювати поÑтійне поÑÐ¸Ð»Ð°Ð½Ð½Ñ -video_not_supported_in_browser=Ваш браузер не підтримує тег HTML5 «video». -audio_not_supported_in_browser=Ваш браузер не підтримує тег HTML5 «audio». +video_not_supported_in_browser=Ваш браузер не підтримує тег 'video' HTML5. +audio_not_supported_in_browser=Ваш браузер не підтримує тег HTML5 'audio'. stored_lfs=Збережено з Git LFS symbolic_link=Символічне поÑÐ¸Ð»Ð°Ð½Ð½Ñ commit_graph=Графік комітів @@ -1228,7 +1009,7 @@ lines=Ñ€Ñдки editor.new_file=Ðовий файл editor.upload_file=Завантажити файл -editor.edit_file=Редагувати файл +editor.edit_file=Ð ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ editor.preview_changes=Попередній переглÑд змін editor.cannot_edit_lfs_files=Файли LFS не можна редагувати в веб-інтерфейÑÑ–. editor.cannot_edit_non_text_files=Бінарні файли не можливо редагувати у веб-інтерфейÑÑ–. @@ -1239,15 +1020,15 @@ editor.fork_before_edit=Ðеобхідно зробити форк цього Ñ€ editor.delete_this_file=Видалити файл editor.must_have_write_access=Ви повинні мати доÑтуп на Ð·Ð°Ð¿Ð¸Ñ Ñ‰Ð¾Ð± запропонувати зміни до цього файлу. editor.name_your_file=Дайте назву файлу… -editor.filename_help=Щоб додати каталог, наберіть його назву, а потім — коÑу риÑку «/». Щоб видалити каталог, перейдіть до початку Ð¿Ð¾Ð»Ñ Ñ– натиÑніть Backspace. +editor.filename_help=Щоб додати каталог, наберіть його назву, а потім - коÑу риÑку ('/'). Щоб видалити каталог, перейдіть до початку Ð¿Ð¾Ð»Ñ Ñ– натиÑніть backspace. editor.or=або editor.cancel_lower=СкаÑувати editor.commit_signed_changes=ВнеÑти підпиÑані зміни editor.commit_changes=Закомітити зміни -editor.add_tmpl=Додати «<%s>» +editor.add_tmpl=Додати '' editor.commit_message_desc=Додати необов'Ñзковий розширений опиÑ… editor.signoff_desc=Додати повідомленню в журналі комітів Ñ€Ñдок Signed-off-by від Ñвого імені. -editor.commit_directly_to_this_branch=Зробіть коміт прÑмо в гілку %[1]s. +editor.commit_directly_to_this_branch=Зробіть коміт прÑмо в гілку %s. editor.create_new_branch=Створити нову гілку Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ коміту та відкрити запит на злиттÑ. editor.create_new_branch_np=Створити нову гілку Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ коміту. editor.propose_file_change=Запропонувати зміну файлу @@ -1259,7 +1040,7 @@ editor.commit_empty_file_header=Закомітити порожній файл editor.commit_empty_file_text=Файл, в комміті порожній. Продовжити? editor.no_changes_to_show=Ðема змін Ð´Ð»Ñ Ð¿Ð¾ÐºÐ°Ð·Ñƒ. editor.fail_to_update_file_summary=Помилка: -editor.push_rejected_summary=Повне Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ відхиленнÑ: +editor.push_rejected_summary=Повне Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ відмову: editor.add_subdir=Додати каталог… editor.no_commit_to_branch=Ðе вдалоÑÑ Ð²Ð½ÐµÑти коміт безпоÑередньо до гілки, тому що: editor.user_no_push_to_branch=КориÑтувач не може здійÑнити пуш до гілки @@ -1270,7 +1051,7 @@ commits.commits=Коміти commits.nothing_to_compare=Ці гілки однакові. commits.search=Знайти коміт… commits.find=Пошук -commits.search_all=У вÑÑ–Ñ… гілках +commits.search_all=УÑÑ– гілки commits.author=Ðвтор commits.message=ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ commits.date=Дата @@ -1279,13 +1060,13 @@ commits.newer=Ðовіше commits.signed_by=ПідпиÑано commits.signed_by_untrusted_user=ПідпиÑаний недовіреним кориÑтувачем commits.signed_by_untrusted_user_unmatched=ПідпиÑаний недовіреним кориÑтувачем, Ñкий не відповідає комітеру -commits.gpg_key_id=Ідентифікатор ключа GPG +commits.gpg_key_id=Ідентифікатор GPG ключа commitstatus.error=Помилка commitstatus.pending=ÐžÑ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð½Ñ -ext_issues=Зовнішні задачі +ext_issues=ДоÑтуп до зовнішніх задач ext_issues.desc=ПоÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° зовнішню ÑиÑтему відÑÑ‚ÐµÐ¶ÐµÐ½Ð½Ñ Ð·Ð°Ð´Ð°Ñ‡. projects=Проєкти @@ -1299,14 +1080,14 @@ projects.new_subheader=Координуйте, відÑтежуйте та он projects.deletion=Видалити проєкт projects.deletion_desc=Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾Ñ”ÐºÑ‚Ñƒ видалÑÑ” його з уÑÑ–Ñ… пов'Ñзаних задач. Продовжити? projects.deletion_success=Проєкт видалено. -projects.edit=Редагувати проєкт +projects.edit=Редагувати проєкти projects.edit_subheader=Проєкти організовують задачі та відÑтежують прогреÑ. projects.modify=Оновити проєкт -projects.type.none=Ðемає +projects.type.none=ВідÑутній projects.type.basic_kanban=Спрощений канбан projects.type.bug_triage=Ð¡Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ð¼Ð¸Ð»Ð¾Ðº -projects.template.desc=Шаблон -projects.template.desc_helper=Виберіть шаблон проєкту, аби почати +projects.template.desc=Шаблон проєкту +projects.template.desc_helper=Оберіть шаблон проєкту, аби почати projects.type.uncategorized=Без категорії projects.column.edit_title=Ðазва projects.column.new_title=Ðазва @@ -1323,7 +1104,7 @@ issues.filter_reviewers=Фільтр рецензентів issues.new=Ðова задача issues.new.title_empty=Заголовок не може бути пуÑтим issues.new.labels=Мітки -issues.new.no_label=Без міток +issues.new.no_label=Без мітки issues.new.clear_labels=ОчиÑтити мітки issues.new.projects=Проєкти issues.new.clear_projects=Скинути проєкти @@ -1338,7 +1119,7 @@ issues.new.open_milestone=Ðктивні етапи issues.new.closed_milestone=Закриті етапи issues.new.assignees=Виконавці issues.new.clear_assignees=Прибрати виконавців -issues.new.no_assignees=Ðемає виконавців +issues.new.no_assignees=Ðемає Ð²Ð¸ÐºÐ¾Ð½Ð°Ð²Ñ†Ñ issues.new.no_reviewers=Ðемає рецензентів issues.choose.get_started=Початок роботи issues.choose.open_external_link=Відкрити @@ -1351,7 +1132,7 @@ issues.new_label_placeholder=Ðазва мітки issues.new_label_desc_placeholder=ÐžÐ¿Ð¸Ñ issues.create_label=Створити мітку issues.label_templates.title=Завантажити визначений набір міток -issues.label_templates.info=Ще немає міток. ÐатиÑніть «Ðова мітка» або викориÑтовуйте попередньо визначений набір міток: +issues.label_templates.info=Ще немає міток. ÐатиÑніть 'Ðова мітка' або викориÑтовуйте попередньо визначений набір міток: issues.label_templates.helper=Оберіть набір міток issues.label_templates.use=ВикориÑтовувати набір міток issues.add_label=додано %s з міткою %s @@ -1518,17 +1299,17 @@ issues.error_modifying_due_date=Ðе вдалоÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ дату за issues.error_removing_due_date=Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ дату завершеннÑ. issues.push_commit_1=додав %d коміт %s issues.push_commits_n=додав %d коміти(-ів) %s -issues.force_push_codes=`примуÑово залито %[1]s з %[2]s до %[4]s %[6]s` +issues.force_push_codes=`примуÑово залито %[1]s з %[2]s до %[4]s %[6]s` issues.force_push_compare=ПорівнÑти issues.due_date_form=рррр-мм-дд issues.due_date_form_add=Додати дату Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ issues.due_date_form_edit=Редагувати issues.due_date_form_remove=Видалити -issues.due_date_not_set=Термін Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ Ð½Ðµ вÑтановлено. +issues.due_date_not_set=Термін Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ Ð½Ðµ вÑтановлений. issues.due_date_added=додав(ла) дату Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ %s %s issues.due_date_remove=видалив(ла) дату Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ %s %s issues.due_date_overdue=ПроÑтрочено -issues.due_date_invalid=Термін дії недійÑний або знаходитьÑÑ Ð·Ð° межами допуÑтимого діапазону. Будь лаÑка, викориÑтовуйте формат «рррр-мм-дд». +issues.due_date_invalid=Термін дії не дійÑний або знаходитьÑÑ Ð·Ð° межами допуÑтимого діапазону. Будь лаÑка викориÑтовуйте формат 'yyyy-mm-dd'. issues.dependency.title=ЗалежноÑÑ‚Ñ– issues.dependency.add=Додати залежніÑть… issues.dependency.cancel=Відмінити @@ -1604,8 +1385,8 @@ pulls.nothing_to_compare=Ці гілки однакові. Ðемає необх pulls.nothing_to_compare_and_allow_empty_pr=Одинакові гілки. Цей PR буде порожнім. pulls.has_pull_request=`Запит Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð´Ð»Ñ Ñ†Ð¸Ñ… гілок вже Ñ–Ñнує: %[2]s#%[3]d` pulls.create=Створити запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ -pulls.title_desc_few=хоче об'єднати %[1]d комітів з %[2]s в %[3]s -pulls.merged_title_desc_few=об'єднав %[1]d комітів з %[2]s в %[3]s %[4]s +pulls.title_desc_few=хоче злити %[1]d комітів з %[2]s в %[3]s +pulls.merged_title_desc_few=злито %[1]d комітів з %[2]s до %[3]s %[4]s pulls.change_target_branch_at=`змінена цільова гілка з %s на %s %s` pulls.tab_conversation=ÐžÐ±Ð³Ð¾Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ pulls.tab_commits=Коміти @@ -1622,7 +1403,7 @@ pulls.add_prefix=Додати Ð¿Ñ€ÐµÑ„Ñ–ÐºÑ %s pulls.remove_prefix=Видалити Ð¿Ñ€ÐµÑ„Ñ–ÐºÑ %s pulls.data_broken=ЗміÑÑ‚ цього запиту було порушено внаÑлідок Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ— Форком. Цей запит Ñ‚ÑгнетьÑÑ Ñ‡ÐµÑ€ÐµÐ· відÑутніÑÑ‚ÑŒ інформації про вилученнÑ. pulls.files_conflicted=Цей запит має зміни, що конфліктують з цільовою гілкою. -pulls.is_checking=Триває перевірка конфліктів. Оновіть Ñторінку дещо пізніше. +pulls.is_checking=Триває перевірка конфліктів, будь лаÑка обновіть Ñторінку дещо пізніше. pulls.required_status_check_failed=ДеÑкі необхідні перевірки виконані з помилками. pulls.required_status_check_missing=Декілька з необхідних перевірок відÑутні. pulls.required_status_check_administrator=Як адмініÑтратор ви вÑе одно можете об'єднати цей запит на злиттÑ. @@ -1637,7 +1418,7 @@ pulls.reject_count_1=%d запит на зміну pulls.reject_count_n=%d запити на зміну pulls.waiting_count_1=очікуєтьÑÑ %d Ñ€ÐµÑ†ÐµÐ½Ð·Ñ–Ñ pulls.waiting_count_n=очікуєтьÑÑ %d рецензії(й) -pulls.wrong_commit_id=ID коміта повинен бути ID коміта в цільовій гілці +pulls.wrong_commit_id=id коміту повинен бути id коміту в цільовій гілці pulls.no_merge_desc=Цей запити на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ злити, оÑкільки вÑÑ– параметри об'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ñ–Ñ Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð¾. pulls.no_merge_helper=Увімкніть параметри Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð² налаштуваннÑÑ… Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ñ–Ñ Ð°Ð±Ð¾ злийте запити на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð²Ñ€ÑƒÑ‡Ð½Ñƒ. @@ -1653,13 +1434,13 @@ pulls.merge_commit_id=ID коміту Ð·Ð»Ð¸Ñ‚Ñ‚Ñ pulls.require_signed_wont_sign=Гілка вимагає підпиÑаних комітів, але це Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð½Ðµ буде підпиÑано pulls.invalid_merge_option=Цей параметр Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð½Ðµ можна викориÑтовувати Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ Pull Request'а. -pulls.merge_conflict=Ðе вдалоÑÑ Ð¾Ð±'єднати: при об'єднанні виник конфлікт. Підказка: Ñпробуйте іншу Ñтратегію -pulls.merge_conflict_summary=ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ помилку -pulls.rebase_conflict=Ðе вдалоÑÑ Ð¾Ð±'єднати: виник конфлікт під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÐ±Ð°Ð·ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ð°: %[1]s. Підказка: Ñпробуйте іншу Ñтратегію -pulls.rebase_conflict_summary=ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ помилку -pulls.unrelated_histories=Ðе вдалоÑÑ Ð¾Ð±'єднати: head та base Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð½Ðµ мають Ñпільної Ñ–Ñторії. Підказка: Ñпробуйте іншу Ñтратегію -pulls.merge_out_of_date=Ðе вдалоÑÑ Ð¾Ð±'єднати: base було оновлено, поки відбувалоÑÑ Ð¾Ð±'єднаннÑ. Підказка: Ñпробуйте знову. -pulls.push_rejected_summary=Повне Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ð²Ñ–Ð´Ñ…Ð¸Ð»ÐµÐ½Ð½Ñ +pulls.merge_conflict=Ð—Ð»Ð¸Ñ‚Ñ‚Ñ Ð½Ðµ вдалоÑÑ: Був конфлікт при злиттÑ. Підказка: Ñпробуйте іншу Ñтратегію +pulls.merge_conflict_summary=Помилка +pulls.rebase_conflict=Ð—Ð»Ð¸Ñ‚Ñ‚Ñ Ð½Ðµ вдалоÑÑ: відбувÑÑ ÐºÐ¾Ð½Ñ„Ð»Ñ–ÐºÑ‚ під Ñ‡Ð°Ñ Ð·Ð»Ð¸Ñ‚Ñ‚Ñ: %[1]s. Підказка: Ñпробуйте іншу Ñтратегію +pulls.rebase_conflict_summary=Помилка +pulls.unrelated_histories=Помилка злиттÑ: head та base Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð½Ðµ мають Ñпільної Ñ–Ñторії. Підказка: Ñпробуйте іншу Ñтратегію +pulls.merge_out_of_date=Помилка злиттÑ: base було оновлено, поки відбувалоÑÑ Ð·Ð»Ð¸Ñ‚Ñ‚Ñ. Підказка: Ñпробуйте знову. +pulls.push_rejected_summary=Повне Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ відмову pulls.open_unmerged_pull_exists=`Ви не можете знову відкрити, оÑкільки вже Ñ–Ñнує запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ (%d) з того ж Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ñ–Ñ Ð· тією ж інформацією про Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ñ– в очікуванні.` pulls.status_checking=ДеÑкі перевірки знаходÑÑ‚ÑŒÑÑ Ð½Ð° розглÑді pulls.status_checks_success=Ð’ÑÑ– перевірки були уÑпішними @@ -1693,7 +1474,7 @@ milestones.title=Заголовок milestones.desc=ÐžÐ¿Ð¸Ñ milestones.due_date=Дата Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ (опціонально) milestones.clear=ОчиÑтити -milestones.invalid_due_date_format=Термін Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ Ð¼Ð°Ñ” бути у форматі «рррр-мм-дд». +milestones.invalid_due_date_format=Дата Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ð¼Ð°Ñ” бути в форматі 'рррр-мм-дд'. milestones.edit=Редагувати етап milestones.edit_subheader=Створюйте етапи Ð´Ð»Ñ Ð¾Ñ€Ð³Ð°Ð½Ñ–Ð·Ð°Ñ†Ñ–Ñ— ваших задач. milestones.cancel=Відмінити @@ -1729,7 +1510,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=Період: @@ -1741,31 +1522,31 @@ activity.period.quarterly=3 міÑÑці activity.period.semiyearly=6 міÑÑців activity.period.yearly=1 рік activity.overview=ОглÑд -activity.active_prs_count_1=%d активний запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ -activity.active_prs_count_n=%d активних запитів на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ -activity.merged_prs_count_1=Об'єднаний запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ -activity.merged_prs_count_n=Об'єднані запити на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ +activity.active_prs_count_1=%d Ðктивний запити на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ +activity.active_prs_count_n=%d Ðктивні запити на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ +activity.merged_prs_count_1=Злитий запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ +activity.merged_prs_count_n=Злиті запити на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ activity.opened_prs_count_1=Запропонований запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ activity.opened_prs_count_n=Запропонованих запитів на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ activity.title.user_1=%d кориÑтувачем activity.title.user_n=%d кориÑтувачами -activity.title.prs_1=%d запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ -activity.title.prs_n=%d запитів на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ +activity.title.prs_1=%d Запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ +activity.title.prs_n=%d Запитів на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ activity.title.prs_merged_by=%s злито %s activity.title.prs_opened_by=%s запропоновано %s activity.merged_prs_label=Злито activity.opened_prs_label=Запропоновано -activity.active_issues_count_1=%d активна задача -activity.active_issues_count_n=%d активних задач +activity.active_issues_count_1=%d Ðктивна задача +activity.active_issues_count_n=%d Ðктивні задачі activity.closed_issues_count_1=Закрита задача activity.closed_issues_count_n=Закриті задачі -activity.title.issues_1=%d задача -activity.title.issues_n=%d задач +activity.title.issues_1=%d Задач +activity.title.issues_n=%d Задач activity.title.issues_closed_from=%s закрито %s activity.title.issues_created_by=%s Ñтворена(Ñ–) %s activity.closed_issue_label=Закрито activity.new_issues_count_1=Ðова задача -activity.new_issues_count_n=Ðові задачі +activity.new_issues_count_n=Ðові Задачі activity.new_issue_label=Відкриті activity.title.unresolved_conv_1=%d Ðезавершене Ð¾Ð±Ð³Ð¾Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ activity.title.unresolved_conv_n=%d Ðезавершених обговорень @@ -1825,17 +1606,17 @@ settings.mirror_settings.direction.pull=Pull 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.remote_url=URL віддаленого Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð°Ñ€Ñ–Ñ git settings.mirror_settings.push_mirror.add=Додати Push дзеркало settings.sync_mirror=Синхронізувати зараз settings.site=Веб-Ñайт -settings.update_settings=Зберегти Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ +settings.update_settings=Оновити Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ settings.branches.update_default_branch=Оновити гілку за замовчуваннÑм settings.advanced_settings=Додаткові Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ -settings.wiki_desc=Увімкнути вікі репозиторію -settings.use_internal_wiki=ВикориÑтовувати вбудовану вікі -settings.use_external_wiki=ВикориÑтовувати зовнішню вікі +settings.wiki_desc=Увімкнути репозиторії Вікі +settings.use_internal_wiki=ВикориÑтовувати вбудовані Вікі +settings.use_external_wiki=ВикориÑтовувати зовнішні Вікі settings.external_wiki_url=URL зовнішньої вікі settings.external_wiki_url_error=Ð—Ð¾Ð²Ð½Ñ–ÑˆÐ½Ñ URL-адреÑа wiki не Ñ” допуÑтимою URL-адреÑою. settings.external_wiki_url_desc=Відвідувачі будуть перенаправлені на URL-адреÑу, коли вони клацають по вкладці. @@ -1847,7 +1628,7 @@ settings.external_tracker_url_error=URL зовнішнього баг-треке settings.external_tracker_url_desc=Відвідувачі перенаправлÑÑŽÑ‚ÑŒÑÑ Ð½Ð° зовнішню URL-адреÑу, коли натиÑкають вкладку 'Задачі'. settings.tracker_url_format=Формат URL зовнішнього трекера задач settings.tracker_url_format_error=Ðеправильний формат URL-адреÑи зовнішнього баг-трекера. -settings.tracker_issue_style=Формат номера Ð´Ð»Ñ Ð·Ð¾Ð²Ð½Ñ–ÑˆÐ½ÑŒÐ¾Ñ— ÑиÑтеми обліку задач +settings.tracker_issue_style=Формат номеру Ð´Ð»Ñ Ð·Ð¾Ð²Ð½Ñ–ÑˆÐ½ÑŒÐ¾Ñ— ÑиÑтеми обліку задач settings.tracker_issue_style.numeric=Цифровий settings.tracker_issue_style.alphanumeric=Буквено-цифровий settings.tracker_url_format_desc=ВикориÑтовуйте шаблони {user}, {repo} та {index} Ð´Ð»Ñ Ñ–Ð¼ÐµÐ½Ñ– кориÑтувача, репозиторію та номеру задічі. @@ -1885,7 +1666,7 @@ settings.transfer_notices_1=- Ви втратите доÑтуп до репоз settings.transfer_notices_2=- Ви збережете доÑтуп, Ñкщо новим влаÑником Ñтане організаціÑ, влаÑником Ñкої ви Ñ”. settings.transfer_notices_3=- Якщо репозиторій Ñ” приватним Ñ– передаєтьÑÑ Ð¾ÐºÑ€ÐµÐ¼Ð¾Ð¼Ñƒ кориÑтувачеві, Ñ†Ñ Ð´Ñ–Ñ Ð³Ð°Ñ€Ð°Ð½Ñ‚ÑƒÑ”, що кориÑтувач має хоча б дозвіл на Ñ‡Ð¸Ñ‚Ð°Ð½Ñ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð°Ñ€Ñ–ÑŽ (Ñ– при необхідноÑÑ‚Ñ– змінює права дозволів). settings.transfer_owner=Ðовий влаÑник -settings.transfer_perform=ЗдійÑнити перенеÑÐµÐ½Ð½Ñ +settings.transfer_perform=ЗдіÑнити перенеÑÐµÐ½Ð½Ñ settings.transfer_started=`Цей репозиторій чекає Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð¿ÐµÑ€ÐµÐ½ÐµÑÐµÐ½Ð½Ñ Ð²Ñ–Ð´ "%s"` settings.transfer_succeed=Репозиторій був перенеÑений. settings.signing_settings=Параметри перевірки підпиÑу @@ -1903,7 +1684,7 @@ settings.trust_model.collaboratorcommitter.desc=ДопуÑтимі Ð¿Ñ–Ð´Ð¿Ð¸Ñ settings.wiki_delete=Видалити вікі-дані settings.wiki_delete_desc=Будьте уважні! Як тільки ви видалите Вікі - шлÑху назад не буде. settings.wiki_delete_notices_1=- Це назавжди знищить Ñ– відключить wiki Ð´Ð»Ñ %s. -settings.confirm_wiki_delete=Видалити вікі-дані +settings.confirm_wiki_delete=Видалити Вікі-дані settings.wiki_deletion_success=Дані wiki були видалені. settings.delete=Видалити цей репозиторій settings.delete_desc=Будьте уважні! Як тільки ви видалите репозиторій - шлÑху назад не буде. @@ -1926,7 +1707,7 @@ settings.org_not_allowed_to_be_collaborator=Організації не можу settings.change_team_access_not_allowed=Зміна доÑтупу команди до репозитарію обмежена влаÑником організації settings.team_not_in_organization=Команда та репозитарій мають привÑзки до різних організацій settings.teams=Команди -settings.add_team=Додати команду +settings.add_team=Додати Команду settings.add_team_duplicate=Команда вже має привÑзку до репозитарію settings.add_team_success=Команда отримала доÑтуп до репозиторію. settings.search_team=Знайти команду… @@ -1953,7 +1734,7 @@ settings.update_githook=Оновити хук settings.add_webhook_desc=Forgejo буде відправлÑти POST запити на вказану URL адреÑу, з інформацією про події, що відбуваютьÑÑ. Подробиці на Ñторінці інÑтрукції по викориÑтанню web-хуків . settings.payload_url=Цільова URL-адреÑа settings.http_method=Метод HTTP -settings.content_type=Тип вміÑту POST +settings.content_type=Тип зміÑту settings.secret=Секрет settings.slack_username=Ім'Ñ ÐºÑ€Ð¸Ñтувача settings.slack_icon_url=URL іконки @@ -1962,7 +1743,7 @@ settings.discord_username=Ім'Ñ ÐºÑ€Ð¸Ñтувача settings.discord_icon_url=URL іконки settings.event_desc=Тригер: settings.event_push_only=Push події -settings.event_send_everything=УÑÑ– події +settings.event_send_everything=Ð’ÑÑ– події settings.event_choose=ВлаÑні події… settings.event_header_repository=Події репозиторію settings.event_create=Створити @@ -1979,33 +1760,33 @@ settings.event_push_desc=Git push до репозиторію. settings.event_repository=Репозиторій settings.event_repository_desc=Репозиторій Ñтворений або видалено. settings.event_header_issue=Події задачі -settings.event_issues=Зміна +settings.event_issues=Задачі settings.event_issues_desc=Задача відкрита, закрита, повторно відкрита або відредагована. -settings.event_issue_assign=ÐŸÑ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ +settings.event_issue_assign=Задача прив'Ñзана settings.event_issue_assign_desc=Задачу призначено або ÑкаÑовано. -settings.event_issue_label=Мітки -settings.event_issue_label_desc=Ð”Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð°Ð±Ð¾ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð¼Ñ–Ñ‚Ð¾Ðº задач. +settings.event_issue_label=Задача з міткою +settings.event_issue_label_desc=Мітки задачі оновлено або видалено. settings.event_issue_milestone=Задача з етапом settings.event_issue_milestone_desc=Задача призначена на етап або видалена з етапу. -settings.event_issue_comment=Коментарі +settings.event_issue_comment=Коментар задачі settings.event_issue_comment_desc=Коментар задачі Ñтворено, видалено чи відредаговано. -settings.event_header_pull_request=Події запиту на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ +settings.event_header_pull_request=Події запиту Ð·Ð»Ð¸Ñ‚Ñ‚Ñ settings.event_pull_request=Запити до Ð·Ð»Ð¸Ñ‚Ñ‚Ñ settings.event_pull_request_desc=Запит до Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¾, закрито, перевідкрито або відредаговано. -settings.event_pull_request_assign=ÐŸÑ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ +settings.event_pull_request_assign=Запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¾ settings.event_pull_request_assign_desc=Запит про Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¾ або ÑкаÑовано. -settings.event_pull_request_label=Мітки -settings.event_pull_request_label_desc=Мітки запиту на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾ або очищено. +settings.event_pull_request_label=Запиту на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð° мітка +settings.event_pull_request_label_desc=Мітка запиту на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð° або очищена. settings.event_pull_request_milestone=Запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ð¹ на етап settings.event_pull_request_milestone_desc=Запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ð¹ на етап або видалений з етапу. -settings.event_pull_request_comment=Коментарі +settings.event_pull_request_comment=Запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¾ÐºÐ¾Ð¼ÐµÐ½Ñ‚Ð¾Ð²Ð°Ð½Ð¸Ð¹ settings.event_pull_request_comment_desc=Коментар запиту на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ñтворено, відредаговано чи видалено. settings.event_pull_request_review=Запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ñ€ÐµÑ†ÐµÐ½Ð·Ð¾Ð²Ð°Ð½Ð¾ settings.event_pull_request_review_desc=Коментар запиту до Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð¸Ð¹, відхилений або рецензований. -settings.event_pull_request_sync=Синхронізовано +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=Веб-хук було додано. @@ -2017,8 +1798,8 @@ settings.hook_type=Тип хука settings.slack_token=Токен settings.slack_domain=Домен settings.slack_channel=Канал -settings.deploy_keys=Ключі Ð´Ð»Ñ Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ -settings.add_deploy_key=Додати ключ Ð´Ð»Ñ Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ +settings.deploy_keys=Ключі Ð´Ð»Ñ Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ +settings.add_deploy_key=Додати ключ Ð´Ð»Ñ Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ settings.deploy_key_desc=Ключі Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ Ð´Ð¾Ñтупні тільки Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ. Це не те ж Ñаме що Ñ– SSH-ключі аккаунта. settings.is_writable=Увімкнути доÑтуп Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñу settings.is_writable_info=Чи може цей ключ бути викориÑтаний Ð´Ð»Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ push в репозиторій? Ключі Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ Ð·Ð°Ð²Ð¶Ð´Ð¸ мають доÑтуп на pull. @@ -2027,7 +1808,7 @@ settings.title=Заголовок settings.deploy_key_content=ЗміÑÑ‚ settings.key_been_used=ЗміÑÑ‚ ключа Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ Ð²Ð¶Ðµ викориÑтовуєтьÑÑ. settings.key_name_used=Ключ Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ Ð· таким заголовком вже Ñ–Ñнує. -settings.deploy_key_deletion=Видалити ключ Ð´Ð»Ñ Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ +settings.deploy_key_deletion=Видалити ключ Ð´Ð»Ñ Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ settings.deploy_key_deletion_desc=Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ ÐºÐ»ÑŽÑ‡Ð° розгортки унеможливить доÑтуп до Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ñ–Ñ Ð· його допомогою. Ви впевнені? settings.deploy_key_deletion_success=Ключі Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ Ð±ÑƒÐ»Ð¾ видалено. settings.branches=Гілки @@ -2035,40 +1816,40 @@ settings.protected_branch=ЗахиÑÑ‚ гілки settings.protected_branch_can_push=Дозволити push? settings.protected_branch_can_push_yes=Ви можете виконувати push settings.protected_branch_can_push_no=Ви не можете виконувати push -settings.branch_protection=Правила захиÑту Ð´Ð»Ñ Ð³Ñ–Ð»ÐºÐ¸ «%s» +settings.branch_protection=ЗахиÑÑ‚ гілки %s settings.protect_this_branch=ЗахиÑтити цю гілку settings.protect_this_branch_desc=Запобігає видаленню гілки та обмежує Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ Ð² ній push та злиттÑ. -settings.protect_disable_push=Заборонити push +settings.protect_disable_push=Заборонити Push settings.protect_disable_push_desc=Ð”Ð»Ñ Ñ†Ñ–Ñ”Ñ— гілки буде заборонено Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ push. -settings.protect_enable_push=Дозволити push +settings.protect_enable_push=Дозволити Push settings.protect_enable_push_desc=Будь-хто із правом запиÑу зможе виконувати push Ð´Ð»Ñ Ñ†Ñ–Ñ”Ñ— гілки (за виключеннÑм force push). settings.protect_whitelist_committers=Білий ÑпиÑок Ð¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ Push settings.protect_whitelist_committers_desc=Лише кориÑтувачі та команди з білого ÑпиÑку зможуть виконувати push в цій гілці (за виключенÑм force push). settings.protect_whitelist_deploy_keys=Білий ÑпиÑок ключів Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ Ð· правом на запиÑ. -settings.protect_whitelist_users=КориÑтувачі, Ñкі можуть робити push в цю гілку +settings.protect_whitelist_users=КориÑтувачі, Ñкі можуть робити push в цю гілку: settings.protect_whitelist_search_users=Пошук кориÑтувачів… -settings.protect_whitelist_teams=Команди, учаÑники Ñких можуть робити push в цю гілку +settings.protect_whitelist_teams=Команди, учаÑники Ñких можуть робити push в цю гілку: settings.protect_whitelist_search_teams=Пошук команд… -settings.protect_merge_whitelist_committers=Обмежити право на об'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ ÑпиÑком +settings.protect_merge_whitelist_committers=Обмежити право на прийнÑÑ‚Ñ‚Ñ Pull Request'ів в цю гілку ÑпиÑком settings.protect_merge_whitelist_committers_desc=Ви можете додавати кориÑтувачів або цілі команди в 'білий' ÑпиÑок цієї гілки. Тільки приÑутні в ÑпиÑку зможуть приймати запити на злиттÑ. Ð’ іншому випадку будь-хто з правами запиÑу до головного репозиторію буде володіти такою можливіÑÑ‚ÑŽ. -settings.protect_merge_whitelist_users=КориÑтувачі з правом на об'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ -settings.protect_merge_whitelist_teams=Команди, Ñким дозволено об'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ +settings.protect_merge_whitelist_users=КориÑтувачі з правом на прийнÑÑ‚Ñ‚Ñ Pull Request'ів в цю гілку: +settings.protect_merge_whitelist_teams=Команди, Ñким дозволено злиттÑ: settings.protect_check_status_contexts=Увімкнути перевірку Ñтану settings.protect_check_status_contexts_desc=Вимагати уÑпішного Ð¿Ñ€Ð¾Ñ…Ð¾Ð´Ð¶ÐµÐ½Ð½Ñ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€Ð¾Ðº Ñтану перед злиттÑм. Оберіть перевірки Ñтану, Ñкі Ñлід провеÑти Ð´Ð»Ñ Ð³Ñ–Ð»Ð¾Ðº, перед Ñ—Ñ… об'єднаннÑм з гілкою, що відповідає цьому правилу. Коли цей пункт увімкнено, коміти Ñпершу надÑилаютьÑÑ Ð´Ð¾ іншої гілки, а потім зливаютьÑÑ Ð°Ð±Ð¾ надÑилаютьÑÑ Ð±ÐµÐ·Ð¿Ð¾Ñередньо до гілки, Ñка відповідає цьому правилу піÑÐ»Ñ ÑƒÑпішного Ð¿Ñ€Ð¾Ñ…Ð¾Ð´Ð¶ÐµÐ½Ð½Ñ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€Ð¾Ðº Ñтану. Якщо не вибрано контекÑÑ‚, оÑтанній коміт має уÑпішно проходити перевірки, незалежно від контекÑту. settings.protect_check_status_contexts_list=Перевірки ÑтатуÑу знайдено Ð´Ð»Ñ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð°Ñ€Ñ–ÑŽ за минулий тиждень -settings.protect_required_approvals=Ðеобхідно ÑÑ…Ð²Ð°Ð»ÐµÐ½Ð½Ñ +settings.protect_required_approvals=Ðеобхідно ÑхваленнÑ: settings.protect_required_approvals_desc=Дозволити об'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð·Ð°Ð¿Ð¸Ñ‚Ñ–Ð² на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð»Ð¸ÑˆÐµ із доÑтатньою кількіÑÑ‚ÑŽ позитивних рецензій. settings.protect_approvals_whitelist_enabled=Обмежити ÑÑ…Ð²Ð°Ð»ÐµÐ½Ð½Ñ ÐºÐ¾Ñ€Ð¸Ñтувачами та командами з білого ÑпиÑку settings.protect_approvals_whitelist_enabled_desc=Лише рецензії кориÑтувачів та команд в білому ÑпиÑку впливають на чиÑло отриманих затверджень. Без білого ÑпиÑку будуть враховані рецензії будь-кого із доÑтупом на запиÑ. -settings.protect_approvals_whitelist_users=Білий ÑпиÑок рецензентів -settings.protect_approvals_whitelist_teams=Білий ÑпиÑок команд рецензентів +settings.protect_approvals_whitelist_users=Білий ÑпиÑок рецензентів: +settings.protect_approvals_whitelist_teams=Білий ÑпиÑок команд рецензентів: settings.dismiss_stale_approvals=Відхилити заÑтарілі Ð¿Ð¾Ð³Ð¾Ð´Ð¶ÐµÐ½Ð½Ñ settings.dismiss_stale_approvals_desc=Коли нові коміти що змінюють вміÑÑ‚ пулл-запиту відправлÑÑŽÑ‚ÑŒÑÑ Ð² гілку, Ñтарі Ð¿Ð¾Ð³Ð¾Ð´Ð¶ÐµÐ½Ð½Ñ Ð±ÑƒÐ´ÑƒÑ‚ÑŒ відхилені. -settings.require_signed_commits=Вимагати Ð¿Ñ–Ð´Ð¿Ð¸Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ñ–Ð² +settings.require_signed_commits=Потрібно підпиÑані коміти settings.require_signed_commits_desc=ВідхилÑти push до цієї гілки, Ñкщо вони не підпиÑані або Ð¿Ñ–Ð´Ð¿Ð¸Ñ Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ перевірити. settings.add_protected_branch=Увімкнути захиÑÑ‚ settings.delete_protected_branch=Вимкнути захиÑÑ‚ -settings.protected_branch_deletion=Вимкнути захиÑÑ‚ гілки +settings.protected_branch_deletion=Відключити захиÑÑ‚ гілки settings.protected_branch_deletion_desc=Будь-Ñкий кориÑтувач з дозволами на Ð·Ð°Ð¿Ð¸Ñ Ð·Ð¼Ð¾Ð¶Ðµ виконувати push в цю гілку. Ви впевнені? settings.block_rejected_reviews=Блокувати Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð¿Ñ€Ð¸ відкидаючих рецензіÑÑ… settings.block_rejected_reviews_desc=Ð—Ð»Ð¸Ñ‚Ñ‚Ñ Ð±ÑƒÐ´Ðµ недоÑтупним, Ñкщо Ñ” запит змін від офіційних рецензентів, навіть за наÑвноÑÑ‚Ñ– доÑтатньої кількоÑÑ‚Ñ– Ñхвалень. @@ -2077,7 +1858,7 @@ settings.block_on_official_review_requests_desc=ÐžÐ±â€™Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð½ÐµÐ¼Ð¾Ð¶ settings.block_outdated_branch=Блокувати злиттÑ, Ñкщо запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð·Ð°Ñтарів settings.block_outdated_branch_desc=Ð—Ð»Ð¸Ñ‚Ñ‚Ñ Ð±ÑƒÐ´Ðµ неможливим, коли головна гілка позаду оÑновної. settings.default_branch_desc=Головна гілка Ñ” 'базовою' Ð´Ð»Ñ Ð²Ð°ÑˆÐ¾Ð³Ð¾ репозиторіÑ, на Ñку за замовчуваннÑм ÑпрÑмовані вÑÑ– запити на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ñ– Ñка Ñ” обличчÑм вашого репозиторіÑ. Перше, що побачить відвідувач - це зміÑÑ‚ головної гілки. Виберіть Ñ—Ñ— з уже Ñ–Ñнуючих: -settings.default_merge_style_desc=Стиль об'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð·Ð° замовчуваннÑм +settings.default_merge_style_desc=Стиль Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð·Ð° замовчуваннÑм: settings.choose_branch=Оберіть гілку… settings.no_protected_branch=Ðемає захищених гілок. settings.edit_protected_branch=Редагувати @@ -2089,20 +1870,20 @@ settings.tags.protection.allowed=Дозволено settings.tags.protection.allowed.users=Дозволені кориÑтувачі settings.tags.protection.allowed.teams=Дозволені команди settings.tags.protection.allowed.noone=Ðіхто -settings.tags.protection.create=Додати правило +settings.tags.protection.create=ЗахиÑтна мітка settings.tags.protection.none=Там не немає захищених міток. settings.bot_token=Токен Ð´Ð»Ñ Ð±Ð¾Ñ‚Ð° settings.chat_id=Чат ID settings.matrix.homeserver_url=URL домашньої Ñторінки settings.matrix.room_id=Ðомер кімнати settings.matrix.message_type=Тип Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ -settings.archive.button=Ðрхівувати репозиторій -settings.archive.header=Ðрхівувати цей репозиторій +settings.archive.button=Ðрхівний репозиторій +settings.archive.header=Відправити репозиторій в архів settings.archive.success=Репозиторію уÑпішно приÑвоєно ÑÑ‚Ð°Ñ‚ÑƒÑ Ð°Ñ€Ñ…Ñ–Ð²Ð½Ð¾Ð³Ð¾. settings.archive.error=СталаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° при Ñпробі архівувати репозиторій. Докладнішу інформацію див. у журналі. settings.archive.error_ismirror=Ðеможливо архівувати дзеркальний репозиротрій. -settings.archive.branchsettings_unavailable=Параметри гілки недоÑтупні в архівованих репозиторіÑÑ…. -settings.archive.tagsettings_unavailable=Параметри міток недоÑтупні в архівованих репозиторіÑÑ…. +settings.archive.branchsettings_unavailable=Параметри гілки не доÑтупні, Ñкщо репозиторій архівний. +settings.archive.tagsettings_unavailable=Параметри міток недоÑтупні, Ñкщо репозиторій архівний. settings.update_avatar_success=Ðватар репозиторію оновлений. settings.lfs=LFS settings.lfs_filelist=Файли LFS, Ñкі зберігаютьÑÑ Ð² цьому репозиторії @@ -2111,7 +1892,7 @@ settings.lfs_findcommits=Знайти коміти settings.lfs_lfs_file_no_commits=Ðе знайдено комітів Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ файлу LFS settings.lfs_noattribute=Цей шлÑÑ… не має атрибуту Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð² гілці за замовчуваннÑм settings.lfs_delete=Видалити файл LFS з OID %s -settings.lfs_delete_warning=Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ LFS може Ñпричинити помилки «Об'єкт не Ñ–Ñнує» під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€ÐºÐ¸. Ви впевнені? +settings.lfs_delete_warning=Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ LFS може Ñпричинити помилки "Об'єкт не Ñ–Ñнує" під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€ÐºÐ¸. Ви впевнені? settings.lfs_findpointerfiles=Знайти файли-поÑÐ¸Ð»Ð°Ð½Ð½Ñ settings.lfs_locks=Ð‘Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ settings.lfs_invalid_locking_path=ÐеприпуÑтимий шлÑÑ…: %s @@ -2119,13 +1900,13 @@ settings.lfs_invalid_lock_directory=Ðе можливо заблокувати settings.lfs_lock_already_exists=Ð‘Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ð¶Ðµ викориÑтовуєтьÑÑ: %s settings.lfs_lock=Блокувати settings.lfs_lock_path=ШлÑÑ… до файлу Ð´Ð»Ñ Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ... -settings.lfs_locks_no_locks=Ðемає блокувань +settings.lfs_locks_no_locks=ВідÑутнє Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ settings.lfs_lock_file_no_exist=Заблокований файл не Ñ–Ñнує у гілці за замовчуваннÑм settings.lfs_force_unlock=ПримуÑове Ñ€Ð¾Ð·Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ settings.lfs_pointers.found=Знайдено %d поÑилань на blob - %d пов'Ñзаних, %d непов'Ñзаних (%d відÑутні у Ñховищі) settings.lfs_pointers.sha=Blob SHA settings.lfs_pointers.oid=OID -settings.lfs_pointers.inRepo=У репозиторії +settings.lfs_pointers.inRepo=Ð’ репозиторії settings.lfs_pointers.exists=ÐаÑвний у Ñховищі settings.lfs_pointers.accessible=ДоÑтупний Ð´Ð»Ñ ÐºÐ¾Ñ€Ð¸Ñтувача settings.lfs_pointers.associateAccessible=Пов'Ñзати доÑтупні %d OID @@ -2170,7 +1951,7 @@ diff.load=Завантажити різницю diff.generated=згенерований diff.vendored=Ñторонній diff.comment.placeholder=Залишити коментар -diff.comment.markdown_info=ПідтримуєтьÑÑ Ñ€Ð¾Ð·Ð¼Ñ–Ñ‚ÐºÐ° Markdown. +diff.comment.markdown_info=Ð¡Ñ‚Ð¸Ð»Ñ–Ð·Ð°Ñ†Ñ–Ñ Ð· markdown підтримуєтьÑÑ. diff.comment.add_single_comment=Додати проÑтий коментар diff.comment.add_review_comment=Додати коментар diff.comment.start_review=Розпочати рецензію @@ -2196,10 +1977,10 @@ release.draft=Чернетка release.prerelease=Пре-реліз release.stable=Стабільний release.compare=ПорівнÑти -release.edit=Редагувати +release.edit=редагувати release.ahead.commits=%d коміт(ів) release.ahead.target=до %s з моменту цього випуÑку -release.source_code=Вихідний код +release.source_code=Код release.new_subheader=ÐŸÑƒÐ±Ð»Ñ–ÐºÐ°Ñ†Ñ–Ñ Ñ€ÐµÐ»Ñ–Ð·Ñ–Ð² допоможе вам організувати верÑÑ–ÑŽ проєкту. release.edit_subheader=ÐŸÑƒÐ±Ð»Ñ–ÐºÐ°Ñ†Ñ–Ñ Ñ€ÐµÐ»Ñ–Ð·Ñ–Ð² допоможе вам організувати верÑÑ–ÑŽ проєкту. release.tag_name=Ðазва тегу @@ -2226,7 +2007,7 @@ release.download_count=ЗавантаженнÑ: %s release.add_tag_msg=ВикориÑтовуйте заголовок Ñ– зміÑÑ‚ релізу Ñк Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ñк тег повідомленнÑ. release.add_tag=Створити тільки мітку -branch.name=Ðазва гілки +branch.name=Ім'Ñ Ð³Ñ–Ð»ÐºÐ¸ branch.delete_head=Видалити branch.delete_html=Видалити гілку branch.create_branch=Створити гілку %s @@ -2259,9 +2040,9 @@ issues.filter_milestone_open = Відкриті етапи issues.filter_milestone_closed = Закриті етапи issues.filter_milestone_all = УÑÑ– етапи issues.filter_milestone_none = Без етапу -issues.filter_poster_no_select = УÑÑ– автори +issues.filter_poster_no_select = Ð’ÑÑ– автори pulls.merged_info_text = Гілку %s тепер можна видалити. -find_file.go_to_file = Знайти файл +find_file.go_to_file = Перейти до файлу visibility_helper = Зробити репозиторій приватним projects.card_type.desc = Попередній виглÑд карток projects.card_type.text_only = Лише текÑÑ‚ @@ -2289,199 +2070,8 @@ commit.cherry-pick-header = ВиÑмикнути: %s commit.cherry-pick-content = Оберіть гілку, на Ñку виÑмикнути: pulls.expand_files = Розгорнути вÑÑ– файли pulls.collapse_files = Згорнути вÑÑ– файли -settings.packages_desc = Увімкнути реєÑÑ‚Ñ€ пакунків репозиторію -issues.role.contributor_helper = У цьому репозиторії Ñ” коміти цього кориÑтувача. -contributors.contribution_type.deletions = Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ -contributors.contribution_type.filter_label = Вид внеÑку: -issues.role.contributor = ДопиÑувач -activity.navbar.contributors = ДопиÑувачі -settings.protected_branch.save_rule = Зберегти правило -release.tags_for = Теги %s -editor.file_is_a_symlink = `«%s» — Ñимвольне поÑиланнÑ. Символьні поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ðµ можна редагувати у вебредакторі` -settings.sourcehut_builds.secrets = Секрети -settings.web_hook_name_feishu_only = Feishu -settings.web_hook_name_gogs = Gogs -settings.web_hook_name_dingtalk = DingTalk -settings.web_hook_name_feishu = Feishu / Lark Suite -settings.web_hook_name_gitea = Gitea -issues.dependency.no_permission.can_remove = У Ð²Ð°Ñ Ð½ÐµÐ¼Ð°Ñ” дозволу читати цю залежніÑÑ‚ÑŒ, але ви можете Ñ—Ñ— видалити -issues.filter_label_select_no_label = Без мітки -settings.web_hook_name_msteams = Microsoft Teams -issues.all_title = УÑÑ– -settings.web_hook_name_packagist = Packagist -settings.packagist_username = Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача Packagist -settings.web_hook_name_matrix = Matrix -issues.dependency.issue_no_dependencies = ЗалежноÑтей не вÑтановлено. -issues.dependency.pr_no_dependencies = ЗалежноÑтей не вÑтановлено. -issues.dependency.no_permission_1 = У Ð²Ð°Ñ Ð½ÐµÐ¼Ð°Ñ” дозволу читати залежніÑÑ‚ÑŒ %d -issues.dependency.no_permission_n = У Ð²Ð°Ñ Ð½ÐµÐ¼Ð°Ñ” дозволу читати залежноÑÑ‚Ñ– %d -settings.web_hook_name_larksuite_only = Lark Suite -issues.filter_project_all = УÑÑ– проєкти -issues.num_comments_1 = %d коментар -settings.web_hook_name_sourcehut_builds = Збірки SourceHut -settings.web_hook_name_slack = Slack -settings.web_hook_name_discord = ДиÑкорд -settings.web_hook_name_forgejo = Forgejo -settings.web_hook_name_wechatwork = WeCom (Wechat Work) -migrate.migrating_failed.error = ÐœÑ–Ð³Ñ€Ð°Ñ†Ñ–Ñ Ð½Ðµ вдалаÑÑ: %s -all_branches = УÑÑ– гілки -migrate.forgejo.description = ПеренеÑти дані з codeberg.org або інших екземплÑрів Forgejo. -settings.tracker_issue_style.regexp_pattern = Шаблон регулÑрного виразу -settings.tracker_issue_style.regexp = РегулÑрний вираз -release.download_count_one = %s Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ -release.download_count_few = %s завантажень -release.invalid_external_url = Ðеправильна Ð·Ð¾Ð²Ð½Ñ–ÑˆÐ½Ñ URL-адреÑа: «%s» -issues.role.collaborator_helper = Цього кориÑтувача запрошено до Ñпівпраці над репозиторієм. -settings.add_collaborator_owner = Ðеможливо додати влаÑника в ÑкоÑÑ‚Ñ– Ñпівавтора. -settings.protect_status_check_patterns = Шаблони перевірки Ñтану -issues.role.collaborator = Співавтор -pulls.auto_merge_cancel_schedule = СкаÑувати автоматичне об'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ -issues.comment_pull_merged_at = об'єднав коміт %[1]s в %[2]s %[3]s -pulls.title_desc_one = хоче об'єднати %[1]d коміт з %[2]s в %[3]s -settings.merge_style_desc = Стилі об'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ -pulls.auto_merge_when_succeed = Об'єднувати автоматично, Ñкщо вÑÑ– перевірки проходÑÑ‚ÑŒ уÑпішно -pulls.cmd_instruction_merge_title = Об'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ -settings.protect_enable_merge = Увімкнути об'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ -pulls.merged_success = Запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ ÑƒÑпішно об'єднано Ñ– закрито -pulls.auto_merge_button_when_succeed = (Якщо перевірки проходÑÑ‚ÑŒ уÑпішно) -editor.commit_id_not_matching = Файл було змінено, поки ви його редагували. Зробіть коміт у нову гілку, а потім об'єднайте. -settings.event_pull_request_merge = Об'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð·Ð°Ð¿Ð¸Ñ‚Ñƒ на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ -pulls.auto_merge_canceled_schedule = Ðвтоматичне об'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ ÑкаÑовано Ð´Ð»Ñ Ñ†ÑŒÐ¾Ð³Ð¾ запиту на злиттÑ. -pulls.auto_merge_not_scheduled = Цей запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð½Ðµ заплановано Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ð¾Ð³Ð¾ об'єднаннÑ. -pulls.merged_title_desc_one = об'єднав %[1]d коміт з %[2]s в %[3]s %[4]s -pulls.fast_forward_only_merge_pull_request = Тільки fast-forward -pulls.merged_by = від %[3]s об'єднано %[1]s -issues.comment_manually_pull_merged_at = вручну об'єднав коміт %[1]s в %[2]s %[3]s -pulls.merged_by_fake = від %[2]s об'єднано %[1]s -pulls.clear_merge_message = ОчиÑтити Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ об'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ -pulls.cmd_instruction_merge_desc = Об'єднайте зміни й оновіть Ñ—Ñ… на Forgejo. -pulls.is_ancestor = Цю гілку вже включено в цільову гілку. Ðічого об'єднувати. -pulls.has_merged = Помилка: запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð²Ð¶Ðµ об'єднано, неможливо об'єднати знову чи змінити цільову гілку. -pulls.head_out_of_date = Ðе вдалоÑÑ Ð¾Ð±'єднати: head було оновлено, поки відбувалоÑÑ Ð¾Ð±'єднаннÑ. Підказка: Ñпробуйте знову. -no_eol.tooltip = У цьому файлі відÑутній Ñимвол Ð·Ð°ÐºÑ–Ð½Ñ‡ÐµÐ½Ð½Ñ Ñ€Ñдка (EOL) у кінці. -settings.trust_model.committer.desc = ДопуÑтимі підпиÑи будуть позначатиÑÑ Ñк «довірені», тільки Ñкщо вони відповідають автору коміта, в іншому випадку вони позначатимутьÑÑ Ñк «невідповідні». Це змуÑить Forgejo бути автором підпиÑаних комітів, а фактичного автора зазначати в трейлерах «Co-authored-by» Ñ– «Co-committed-by» в опиÑÑ– коміта. Типовий ключ Forgejo повинен відповідати кориÑтувачу в базі даних. -pulls.clear_merge_message_hint = ÐžÑ‡Ð¸Ñ‰ÐµÐ½Ð½Ñ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ об'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚ÑŒ лише вміÑÑ‚ Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ñƒ Ñ– збереже згенеровані git-трейлери, такі Ñк «Co-Authored-By…». -branch.delete_branch_has_new_commits = Гілку «%s» не можна видалити, оÑкільки піÑÐ»Ñ Ð¾Ð±'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð±ÑƒÐ»Ð¾ додано нові коміти. -settings.graphql_url = ПоÑÐ¸Ð»Ð°Ð½Ð½Ñ GraphQL -settings.packagist_api_token = Токен API -settings.archive.text = ÐÑ€Ñ…Ñ–Ð²ÑƒÐ²Ð°Ð½Ð½Ñ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ñ–ÑŽ зробить його доÑтупним тільки Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ. Він буде прихований з панелі управліннÑ. Ðіхто (навіть ви!) не зможе робити нові коміти, Ñтворювати задачі чи запити на злиттÑ. -settings.protected_branch.delete_rule = Видалити правило -settings.branches.add_new_rule = Додати нове правило -settings.add_key_success = Ключ Ð´Ð»Ñ Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ Â«%s» уÑпішно додано. -settings.update_settings_no_unit = Репозиторій повинен дозволÑти хоча б ÑкуÑÑŒ взаємодію. -settings.packagist_package_url = ПоÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° пакунок Packagist -settings.transfer.modal.title = Передати новому влаÑнику -settings.transfer.button = Передати новому влаÑнику -settings.event_package = Пакунок -settings.event_package_desc = Пакунок у репозиторії Ñтворено або видалено. -settings.new_owner_blocked_doer = Ðовий влаÑник заблокував ваÑ. -settings.transfer_quota_exceeded = Ðовий влаÑник (%s) перевищив квоту. Репозиторій не передано. -release.title_empty = Заголовок не може бути порожнім. -issues.role.member_helper = Цей кориÑтувач Ñ” членом організації, що володіє цим репозиторієм. -wiki.page_content = ВміÑÑ‚ Ñторінки -wiki.page_title = Заголовок Ñторінки -pulls.close = Закрити запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ -branch.delete = Видалити гілку «%s» -diff.comment.add_line_comment = Додати коментар до Ñ€Ñдка -issues.review.option.hide_outdated_comments = Приховати заÑтарілі коментарі -issues.num_participants_one = %d учаÑник -issues.review.option.show_outdated_comments = Показати заÑтарілі коментарі -pulls.delete.title = Видалити цей запит на злиттÑ? -issues.author.tooltip.pr = Ðвтор цього запиту на злиттÑ. -branch.deletion_failed = Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ гілку «%s». -pulls.status_checks_show_all = Показати вÑÑ– перевірки -wiki.cancel = СкаÑувати -issues.role.first_time_contributor_helper = Це перший внеÑок цього кориÑтувача до репозиторію. -pulls.filter_changes_by_commit = Фільтрувати за комітом -pulls.is_empty = Зміни з цієї гілки вже Ñ” в цільовій гілці. Коміт буде порожній. -issues.author.tooltip.issue = Ðвтор цієї задачі. -pulls.made_using_agit = AGit -activity.navbar.recent_commits = Ðещодавні коміти -branch.deletion_success = Гілку «%s» видалено. -pulls.show_all_commits = Показати вÑÑ– коміти -pull.deleted_branch = (видалено): %s -milestones.update_ago = Оновлено %s -size_format = %[1]s: %[2]s; %[3]s: %[4]s -settings.units.add_more = Увімкнути ще -migrate.cancel_migrating_title = СкаÑувати перенеÑÐµÐ½Ð½Ñ -settings.units.units = Розділи -settings.units.overview = ОглÑд -projects.create_success = Проєкт «%s» Ñтворено. -issues.no_content = Ðемає опиÑу. -settings.mirror_settings.docs.doc_link_title = Як дзеркалювати репозиторії? -n_commit_one = %s коміт -n_commit_few = %s комітів -signing.will_sign = Коміт буде підпиÑано ключем «%s». -signing.wont_sign.error = Під Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€ÐºÐ¸ можливоÑÑ‚Ñ– підпиÑати коміт ÑталаÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°. -commits.search_branch = У цій гілці -ext_wiki = Ð—Ð¾Ð²Ð½Ñ–ÑˆÐ½Ñ Ð²Ñ–ÐºÑ– -pulls.commit_ref_at = `поÑлавÑÑ Ð½Ð° цей запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð² коміті %[2]s` -pulls.cmd_instruction_hint = ПереглÑнути інÑтрукції Ð´Ð»Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð³Ð¾ Ñ€Ñдка -issues.max_pinned = Ðеможливо закріпити більше задач -issues.unpin_comment = відкріпив %s -issues.pin_comment = закріпив %s -project = Проєкти -issues.review.outdated_description = ВміÑÑ‚ змінивÑÑ Ð· моменту напиÑÐ°Ð½Ð½Ñ Ñ†ÑŒÐ¾Ð³Ð¾ ÐºÐ¾Ð¼ÐµÐ½Ñ‚Ð°Ñ€Ñ -commits.browse_further = ДивитиÑÑ Ð´Ð°Ð»Ñ– -issues.unpin_issue = Відкріпити задачу -n_branch_one = %s гілка -n_branch_few = %s гілок -executable_file = Виконуваний файл -migrate_options_mirror_helper = Цей репозиторій буде дзеркалом -projects.edit_success = Проєкт «%s» оновлено. -wiki.search = Пошук по вікі -wiki.no_search_results = Ðічого не знайдено -pulls.closed = Запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð·Ð°ÐºÑ€Ð¸Ñ‚Ð¾ -signing.wont_sign.not_signed_in = Ви не ввійшли в ÑиÑтему. -settings.wiki_globally_editable = Дозволити вÑім кориÑтувачам редагувати вікі -settings.reindex_button = Додати в чергу на переіндекÑацію -settings.reindex_requested = Потрібна переіндекÑÐ°Ñ†Ñ–Ñ -editor.file_delete_success = Файл «%s» видалено. -file_follow = Слідувати за Ñимвольним поÑиланнÑм -projects.column.set_default = УÑтановити за замовчуваннÑм -settings.federation_following_repos = URL-адреÑи відÑтежуваних репозиторіїв. Через «;», без пробілів. -settings.federation_not_enabled = Федерацію вимкнено у вашому екземплÑрі. -settings.federation_settings = ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñ„ÐµÐ´ÐµÑ€Ð°Ñ†Ñ–Ñ— -signing.wont_sign.nokey = Цей екземплÑÑ€ не має ключа Ð´Ð»Ñ Ð¿Ñ–Ð´Ð¿Ð¸ÑÐ°Ð½Ð½Ñ Ñ†ÑŒÐ¾Ð³Ð¾ коміта. -settings.federation_apapiurl = URL федерації цього репозиторію. Скопіюйте Ñ—Ñ— та вÑтавте в Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñ„ÐµÐ´ÐµÑ€Ð°Ñ†Ñ–Ñ— іншого репозиторію Ñк URL-адреÑу відÑтежуваного репозиторію. -fork_branch = Гілка, Ñку буде клоновано у форк -already_forked = Ви вже Ñтворили форк %s -fork_to_different_account = Створити форк до іншого облікового запиÑу -fork_no_valid_owners = Ðеможливо Ñтворити форк цього репозиторію, оÑкільки тут немає дійÑних влаÑників. -pulls.agit_explanation = Створено через робочий потік AGit. AGit дозволÑÑ” допиÑувачам пропонувати зміни за допомогою «git push» без ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ„Ð¾Ñ€ÐºÑƒ або нової гілки. -diff.review.self_approve = Ðвтори запитів на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð½Ðµ можуть Ñхвалювати влаÑні запити на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ -settings.event_pull_request_approvals = Ð¡Ñ…Ð²Ð°Ð»ÐµÐ½Ð½Ñ Ð·Ð°Ð¿Ð¸Ñ‚Ñ–Ð² на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ -diff.git-notes.add = Додати примітку -diff.git-notes.remove-header = Видалити примітку -projects.column.assigned_to = Призначено на -issues.new.assign_to_me = Призначити Ñобі -contributors.contribution_type.additions = Ð”Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ -settings.add_web_hook_desc = Інтегрувати %s у цей репозиторій. -settings.event_wiki_desc = Вікі-Ñторінку Ñтворено, перейменовано, відредаговано або видалено. -settings.mirror_settings.push_mirror.copy_public_key = Копіювати публічний ключ -editor.add_tmpl.filename = назва файлу -settings.unarchive.button = Розархівувати репозиторій -object_format = Формат об'єкта -settings.archive.mirrors_unavailable = Дзеркала недоÑтупні в архівованих репозиторіÑÑ…. -pulls.sign_in_require = Увійдіть, щоб Ñтворити новий запит на злиттÑ. -new_advanced_expand = ÐатиÑніть, щоб розгорнути -new_from_template = ВикориÑтати шаблон -new_advanced = Додаткові Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ -auto_init_description = Почніть Ñ–Ñторію Git з README Ñ– за бажаннÑм додайте файли License та .gitignore. -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». Ð¦Ñ Ð·Ð¼Ñ–Ð½Ð° Ñ” оÑтаточною Ñ– Ñ—Ñ— неможливо ÑкаÑувати. -wiki.reserved_page = Ðазву вікі-Ñторінки «%s» зарезервовано. [graphs] -contributors.what = внеÑки -component_loading_info = Це може зайнÑти деÑкий чаÑ… -component_loading = Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ %s... -component_loading_failed = Ðе вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ %s -recent_commits.what = нещодавні коміти -component_failed_to_load = СталаÑÑ Ð½ÐµÑподівана помилка. [org] org_name_holder=Ðазва організації @@ -2536,9 +2126,9 @@ settings.labels_desc=Додати мітки, Ñкі можуть бути ви members.membership_visibility=ВидиміÑÑ‚ÑŒ учаÑника: members.public=Показувати -members.public_helper=Зробити прихованим +members.public_helper=зробити прихованим members.private=Прихований -members.private_helper=Зробити видимим +members.private_helper=зробити видимим members.member_role=Роль учаÑника: members.owner=ВлаÑник members.member=УчаÑник @@ -2571,7 +2161,7 @@ teams.delete_team_desc=Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ ÑкаÑовує Ð´Ð¾Ñ teams.delete_team_success=Команду було видалено. teams.read_permission_desc=Ð¦Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° має доÑтуп Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ: учаÑники можуть переглÑдати та клонувати репозиторії. teams.write_permission_desc=Ð¦Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° надає доÑтуп на запиÑ: учаÑники можуть отримувати й виконувати push команди до репозитрію. -teams.admin_permission_desc=Ð¦Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° надає адмініÑтраторÑький доÑтуп: учаÑники можуть читати, виконувати push та додавати Ñпівавторів до Ñ—Ñ— репозиторіїв. +teams.admin_permission_desc=Ð¦Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° надає адмініÑтраторÑький доÑтуп: учаÑники можуть читати, виконувати push команди та додавати Ñпівробітників до репозиторію. teams.create_repo_permission_desc=Крім того, Ñ†Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° надає дозвіл Створити репозиторій: учаÑники можуть Ñтворювати нові репозиторії в організації. teams.repositories=Репозиторії команди teams.search_repo_placeholder=Пошук репозиторію… @@ -2589,12 +2179,6 @@ teams.all_repositories_helper=Команда має доÑтуп до вÑÑ–Ñ… teams.all_repositories_read_permission_desc=Ð¦Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° надає дозвіл ПереглÑд Ð´Ð»Ñ Ð²ÑÑ–Ñ… репозиторіїв: учаÑники можуть переглÑдати та клонувати Ñ—Ñ…. teams.all_repositories_write_permission_desc=Ð¦Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° надає дозвіл Ð—Ð°Ð¿Ð¸Ñ Ð´Ð»Ñ Ð²ÑÑ–Ñ… репозиторіїв: учаÑники можуть переглÑдати та виконувати push в репозиторіÑÑ…. teams.all_repositories_admin_permission_desc=Ð¦Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° надає дозвіл ÐдмініÑÑ‚Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð²ÑÑ–Ñ… репозиторіїв: учаÑники можуть переглÑдати, виконувати push та додавати Ñпівробітників. -code = Код -open_dashboard = Відкрити панель ÑƒÐ¿Ñ€Ð°Ð²Ð»Ñ–Ð½Ð½Ñ -follow_blocked_user = Ви не можете Ñтежити за цією організацією, тому що Ð²Ð°Ñ Ñƒ ній заблокували. -teams.invite.description = Щоб приєднатиÑÑ Ð´Ð¾ команди, натиÑніть кнопку нижче. -teams.invite.title = Ð’Ð°Ñ Ð·Ð°Ð¿Ñ€Ð¾ÑˆÐµÐ½Ð¾ приєднатиÑÑ Ð´Ð¾ команди %s в організації %s. -form.name_reserved = Ðазву організації «%s» зарезервовано. [admin] dashboard=Панель ÑƒÐ¿Ñ€Ð°Ð²Ð»Ñ–Ð½Ð½Ñ @@ -2603,7 +2187,7 @@ organizations=Організації repositories=Репозиторії hooks=Веб-хуки authentication=Джерела автентифікації -emails=Електронні адреÑи +emails=Електронні адреÑи КориÑтувача config=ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ notices=Ð¡Ð¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ ÑиÑтеми monitor=Моніторинг @@ -2613,7 +2197,7 @@ total=Разом: %d dashboard.statistic=ПідÑумок dashboard.operations=Технічне обÑÐ»ÑƒÐ³Ð¾Ð²ÑƒÐ²Ð°Ð½Ð½Ñ -dashboard.system_status=Стан ÑиÑтеми +dashboard.system_status=Ð¡Ñ‚Ð°Ñ‚ÑƒÑ ÑиÑтеми dashboard.operation_name=Ðазва операції dashboard.operation_switch=Перемкнути dashboard.operation_run=ЗапуÑтити @@ -2630,7 +2214,7 @@ dashboard.cron.error=Помилка в Cron: %s: %[3]s dashboard.cron.finished=Cron: %[1]s завершено dashboard.delete_inactive_accounts=Видалити вÑÑ– неактивовані облікові запиÑи dashboard.delete_inactive_accounts.started=Запущено Ð·Ð°Ð²Ð´Ð°Ð½Ð½Ñ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð²ÑÑ– неактивованих облікових запиÑів. -dashboard.delete_repo_archives=Видалити вÑÑ– архіви репозиторіїв (ZIP, TAR.GZ тощо) +dashboard.delete_repo_archives=Видалити вÑÑ– архіви репозиторіїв (ZIP, TAR.GZ, Ñ– Ñ‚. д..) dashboard.delete_repo_archives.started=Запущено Ð·Ð°Ð²Ð´Ð°Ð½Ð½Ñ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð²ÑÑ–Ñ… архівів репозиторіїв. dashboard.delete_missing_repos=Видалити вÑÑ– запиÑи про репозиторії з відÑутніми файлами Git dashboard.delete_missing_repos.started=Запущено Ð·Ð°Ð²Ð´Ð°Ð½Ð½Ñ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð²ÑÑ–Ñ… репозиторіїв, в Ñких відÑутні файли Git. @@ -2642,13 +2226,13 @@ dashboard.archive_cleanup=Видалити Ñтарі архіви репози dashboard.deleted_branches_cleanup=Прибрати видалені гілки dashboard.update_migration_poster_id=Оновити мігровані ID авторів dashboard.git_gc_repos=Виконати очиÑтку ÑÐ¼Ñ–Ñ‚Ñ‚Ñ Ð´Ð»Ñ Ð²ÑÑ–Ñ… репозиторіїв -dashboard.resync_all_sshkeys=Оновити файл «.ssh/authorized_keys» з SSH-ключами Forgejo. -dashboard.resync_all_sshprincipals=Оновити файл «.ssh/authorized_principals» з SSH даними кориÑтувача Forgejo. -dashboard.resync_all_hooks=ПереÑинхронізувати перед-прийнÑтні, оновлюючі та поÑÑ‚-прийнÑтні хуки в уÑÑ–Ñ… репозиторіÑÑ… +dashboard.resync_all_sshkeys=Оновити файл '.ssh/authorized_keys' з SSH ключами Forgejo. +dashboard.resync_all_sshprincipals=Оновіть файл '.ssh/authorized_princÑ‚ipals' з SSH даними кориÑтувача Forgejo. +dashboard.resync_all_hooks=ПереÑинхронізувати перед-прийнÑтні, оновлюючі та поÑÑ‚-прийнÑтні хуки в уÑÑ–Ñ… репозиторіÑÑ…. dashboard.reinit_missing_repos=Переініціалізувати уÑÑ– репозитрії git-файли Ñких втрачено dashboard.sync_external_users=Синхронізувати дані зовнішніх кориÑтувачів dashboard.cleanup_hook_task_table=ОчиÑтити hook_task таблицю -dashboard.server_uptime=Ð§Ð°Ñ Ñ€Ð¾Ð±Ð¾Ñ‚Ð¸ Ñервера +dashboard.server_uptime=Uptime Ñерверу dashboard.current_goroutine=Поточна кількіÑÑ‚ÑŒ Goroutines dashboard.current_memory_usage=Поточне викориÑÑ‚Ð°Ð½Ð½Ñ Ð¿Ð°Ð¼'ÑÑ‚Ñ– dashboard.total_memory_allocated=Виділено пам'ÑÑ‚Ñ– загалом @@ -2680,7 +2264,7 @@ dashboard.gc_times=КількіÑÑ‚ÑŒ запуÑків збирача Ñмітт dashboard.delete_old_actions=Видалити вÑÑ– Ñтарі дії з бази даних dashboard.delete_old_actions.started=Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð²ÑÑ–Ñ… Ñтарі дії з бази даних розпочато. -users.user_manage_panel=ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¸Ð¼Ð¸ запиÑами +users.user_manage_panel=ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¸Ð¼Ð¸ запиÑами кориÑтувачів users.new_account=Створити обліковий Ð·Ð°Ð¿Ð¸Ñ users.name=Ім'Ñ ÐºÑ€Ð¸Ñтувача users.full_name=Повне ім'Ñ @@ -2700,18 +2284,18 @@ users.auth_login_name=Логін Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ñ–Ñ— users.password_helper=Залиште пароль порожнім, щоб не змінювати його. users.update_profile_success=Обліковий Ð·Ð°Ð¿Ð¸Ñ ÐºÐ¾Ñ€Ð¸Ñтувача було оновлено. users.edit_account=Редагувати обліковий Ð·Ð°Ð¿Ð¸Ñ -users.max_repo_creation=МакÑимальна кількіÑÑ‚ÑŒ репозиторіїв +users.max_repo_creation=МакÑимальне чиÑло репозиторіїв users.max_repo_creation_desc=(Введіть -1, щоб викориÑтовувати глобальний ліміт за замовчуваннÑм.) users.is_activated=Обліковий Ð·Ð°Ð¿Ð¸Ñ ÐºÐ¾Ñ€Ð¸Ñтувача увімкнено users.prohibit_login=Вимкнути вхід -users.is_admin=Обліковий Ð·Ð°Ð¿Ð¸Ñ Ð°Ð´Ð¼Ñ–Ð½Ñ–Ñтратора +users.is_admin=ÐдмініÑтратор users.is_restricted=Обмежений 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=Може Ñтворювати організації +users.allow_create_organization=Може Ñтворювати організацій users.update_profile=Оновити обліковий Ð·Ð°Ð¿Ð¸Ñ -users.delete_account=Видалити обліковий Ð·Ð°Ð¿Ð¸Ñ +users.delete_account=Видалити цей обліковий Ð·Ð°Ð¿Ð¸Ñ users.still_own_repo=Ваш обліковий Ð·Ð°Ð¿Ð¸Ñ Ð²Ñе ще володіє одним або кількома репозиторіÑми, Ñпочатку вам потрібно видалити або передати Ñ—Ñ…. users.still_has_org=Цей обліковий Ð·Ð°Ð¿Ð¸Ñ Ð²Ñе ще Ñ” учаÑником однієї або декількох організацій. Ð”Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð²Ð¶ÐµÐ½Ð½Ñ, покиньте або видаліть організації. users.deletion_success=Обліковий Ð·Ð°Ð¿Ð¸Ñ ÐºÐ¾Ñ€Ð¸Ñтувача було видалено. @@ -2726,8 +2310,8 @@ users.list_status_filter.is_restricted=З обмеженнÑми users.list_status_filter.not_restricted=Без обмежень users.list_status_filter.is_prohibit_login=Вхід заборонено users.list_status_filter.not_prohibit_login=Вхід дозволено -users.list_status_filter.is_2fa_enabled=2FA увімкнено -users.list_status_filter.not_2fa_enabled=2FA вимкнено +users.list_status_filter.is_2fa_enabled=2FA увімкнена +users.list_status_filter.not_2fa_enabled=2FA вимкнена emails.email_manage_panel=Ð£Ð¿Ñ€Ð°Ð²Ð»Ñ–Ð½Ð½Ñ Ð¿Ð¾ÑˆÑ‚Ð¾ÑŽ кориÑтувача emails.primary=Головний @@ -2749,7 +2333,7 @@ orgs.new_orga=Ðова Ð¾Ñ€Ð³Ð°Ð½Ñ–Ð·Ð°Ñ†Ñ–Ñ repos.repo_manage_panel=ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ñ–Ñми repos.unadopted=ÐеприйнÑÑ‚Ñ– репозиторії -repos.unadopted.no_more=Ðе знайдено неприйнÑтих репозиторіїв. +repos.unadopted.no_more=Ðе знайдено більше неприйнÑтих репозиторіїв repos.owner=ВлаÑник repos.name=Ðазва repos.private=Приватний @@ -2773,12 +2357,12 @@ systemhooks=СиÑтемні вебхуки systemhooks.add_webhook=Додати ÑиÑтемний вебхук systemhooks.update_webhook=Оновити ÑиÑтемний вебхук -auths.auth_manage_panel=ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð¶ÐµÑ€ÐµÐ»Ð°Ð¼Ð¸ автентифікації +auths.auth_manage_panel=ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð¶ÐµÑ€ÐµÐ»Ð¾Ð¼ автентифікації auths.new=Додати джерело автентифікації auths.name=Ім'Ñ auths.type=Тип auths.enabled=Увімкнено -auths.syncenabled=Увімкнути Ñинхронізацію кориÑтувачів +auths.syncenabled=Увімкнути Ñинхронізацію кориÑтувача auths.updated=Оновлено auths.auth_type=Тип автентифікації auths.auth_name=Ðазва автентифікації @@ -2800,23 +2384,23 @@ auths.attributes_in_bind=ВитÑгувати атрибути в ÐºÐ¾Ð½Ñ‚ÐµÐºÑ auths.allow_deactivate_all=Дозволити порожньому результату пошуку відключити вÑÑ–Ñ… кориÑтувачів auths.use_paged_search=ВикориÑтовувати поÑторінковий пошук auths.search_page_size=Розмір Ñторінки -auths.filter=Фільтр кориÑтувачів +auths.filter=КориÑтувацький фільтр auths.admin_filter=Фільтр адмініÑтратора -auths.restricted_filter=Фільтр обмежених -auths.restricted_filter_helper=Залиште порожнім, щоб не вÑтановлювати Ð¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ Ð½Ð° жодного з кориÑтувачів. ВикориÑтовуйте зірочку («*»), щоб уÑтановити Ð¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ Ð½Ð° вÑÑ–Ñ… кориÑтувачів, Ñкі не відповідають Фільтру адмініÑтратора. +auths.restricted_filter=Обмежуючий фільтр +auths.restricted_filter_helper=Залиште пуÑтим, щоб не вÑтановлювати Ð¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ Ð½Ð° жодного з кориÑтувачів. ВикориÑтовуйте зірочку ('*') щоб вÑтановити Ð¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ Ð½Ð° вÑÑ–Ñ… кориÑтувачів, Ñкі не відповідають фільтру ÐдмініÑтратора. auths.group_search_base=Пошукова база груп DN auths.group_attribute_list_users=Ðтрибут групи зі ÑпиÑком кориÑтувачів -auths.user_attribute_in_group=Ðтрибут кориÑтувача в групі +auths.user_attribute_in_group=Ðтрибути кориÑтувача в групі auths.ms_ad_sa=Ðтрибути пошуку MS AD auths.smtp_auth=Тип автентифікації SMTP -auths.smtphost=ÐдреÑа SMTP -auths.smtpport=Порт SMTP +auths.smtphost=SMTP хоÑÑ‚ +auths.smtpport=SMTP порт auths.allowed_domains=Дозволені домени -auths.allowed_domains_helper=Залиште порожнім, щоб дозволити вÑÑ– домени. РозділÑйте кілька доменів за допомогою коми («,»). +auths.allowed_domains_helper=Залиште порожнім, щоб дозволити вÑÑ– домени. Розділіть кілька доменів за допомогою коми (','). auths.skip_tls_verify=ПропуÑтити перевірку TLS auths.force_smtps=ПримуÑово викориÑтовувати SMTPS auths.force_smtps_helper=SMTPS завжди викориÑтовуєтьÑÑ Ð½Ð° порту 465. Ð’Ñтановіть цей прапорець Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð¼ÑƒÑового викориÑÑ‚Ð°Ð½Ð½Ñ SMTPS на інших портах. (Ð’ іншому випадку STARTTLS буде викориÑтовуватиÑÑ Ð´Ð»Ñ Ñ–Ð½ÑˆÐ¸Ñ… портів, Ñкщо хоÑÑ‚ його підтримує.) -auths.helo_hostname=Ім'Ñ Ñ…Ð¾Ñту HELO +auths.helo_hostname=HELO Hostname auths.helo_hostname_helper=Ім'Ñ Ñ…Ð¾Ñта, Ñке буде надіÑлано з HELO. Залиште порожнім, аби надÑилати поточне ім'Ñ Ñ…Ð¾Ñта. auths.disable_helo=Вимкнути HELO auths.pam_service_name=Ім'Ñ Ñлужби PAM @@ -2846,22 +2430,22 @@ auths.sspi_separator_replacement_helper=Символ, Ñкий замінює Ñ€ auths.sspi_default_language=Типова мова кориÑтувача auths.sspi_default_language_helper=Типова мова Ð´Ð»Ñ ÐºÐ¾Ñ€Ð¸Ñтувачів, Ñкі ÑтворюютьÑÑ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ð¾ при SSPI-автентифікації. Залиште не вказаним, Ñкщо надаєте перевагу автоматичному визначенню мови. auths.tips=Поради -auths.tips.oauth2.general=ÐÐ²Ñ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ OAuth2 +auths.tips.oauth2.general=OAuth2 Ð°Ð²Ñ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ auths.tip.oauth2_provider=ПоÑтачальник OAuth2 auths.tip.bitbucket=Створіть OAuth URI на Ñторінці %s auths.tip.nextcloud=`ЗареєÑтруйте нового Ñпоживача OAuth у вашому екземплÑрі за допомогою наÑтупного меню "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ -> Безпека -> клієнт OAuth 2.0"` -auths.tip.dropbox=Створіть новий додаток на %s -auths.tip.facebook=ЗареєÑтруйте новий додаток на %s Ñ– додайте модуль «Facebook Login» -auths.tip.github=ЗареєÑтруйте новий додаток OAuth на %s +auths.tip.dropbox=Додайте новий додаток на %s +auths.tip.facebook=`Створіть новий додаток на %s Ñ– додайте модуль "Facebook Login"` +auths.tip.github=Додайте OAuth додаток на %s 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.discord=ЗареєÑтруйте новий додаток на %s -auths.tip.yandex=Створіть новий додаток на %s. Виберіть наÑтупні дозволи з «Yandex.Passport API»: «ДоÑтуп до адреÑи електронної пошти», «ДоÑтуп до аватара» Ñ– «ДоÑтуп до імені кориÑтувача, імені та прізвища, Ñтаті» +auths.tip.yandex=`Створіть нову програму в %s. Виберіть наÑтупні дозволи з "Yandex. assport API": "ДоÑтуп до адреÑи електронної пошти", "ДоÑтуп до аватара" Ñ– "ДоÑтуп до імені кориÑтувача, імені та прізвища, Ñтаті"` auths.tip.mastodon=Введіть URL Ñпеціального екземплÑра Ð´Ð»Ñ ÐµÐºÐ·ÐµÐ¼Ð¿Ð»Ñра mastodon, Ñкий ви хочете автентифікувати за допомогою (або викориÑтовувати за замовчуваннÑм) auths.edit=Редагувати джерело автентифікації -auths.activated=Це джерело авторизації активоване +auths.activated=Ð¦Ñ Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ Ð°ÐºÑ‚Ð¸Ð²Ð¾Ð²Ð°Ð½Ð° auths.update_success=Параметри аутентифікації оновлені. auths.update=Оновити джерело автентифікації auths.delete=Видалити джерело автентифікації @@ -2872,19 +2456,19 @@ auths.deletion_success=Канал аутентифікації уÑпішно з auths.login_source_of_type_exist=Джерело автентифікації такого типу вже наÑвне. config.server_config=ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ñервера -config.app_name=Ðазва екземплÑра +config.app_name=Ðазва Ñайту config.app_ver=ВерÑÑ–Ñ Forgejo -config.app_url=Базова URL-адреÑа +config.app_url=Базова URL-адреÑа Forgejo config.custom_conf=ШлÑÑ… до файлу конфігурації config.custom_file_root_path=ШлÑÑ… до файлу кориÑтувача config.domain=Домен Ñервера config.offline_mode=Локальний режим config.disable_router_log=Вимкнути Ð»Ð¾Ð³ÑƒÐ²Ð°Ð½Ð½Ñ Ñ€Ð¾ÑƒÑ‚ÐµÑ€Ñƒ -config.run_user=КориÑтувач, від Ñкого запуÑтити +config.run_user=ЗапуÑк від імені КориÑтувача config.run_mode=Режим Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ config.git_version=ВерÑÑ–Ñ Git -config.repo_root_path=ШлÑÑ… до ÐºÐ¾Ñ€ÐµÐ½Ñ Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ñ–ÑŽ -config.lfs_root_path=Кореневий шлÑÑ… LFS +config.repo_root_path=Кореневий шлÑÑ… Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ñ–Ñ +config.lfs_root_path=Кореневої шлÑÑ… LFS config.log_file_root_path=ШлÑÑ… до лог файлу config.script_type=Тип Ñкрипта config.reverse_auth_user=Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ñ–Ñ— на reverse proxy @@ -2892,19 +2476,19 @@ config.reverse_auth_user=Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача Ð´Ð»Ñ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð° config.ssh_config=ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ SSH config.ssh_enabled=Увімкнено config.ssh_start_builtin_server=ВикориÑтовувати вбудований Ñервер -config.ssh_domain=Домен Ñервера SSH +config.ssh_domain=Домен SSH Ñервера config.ssh_port=Порт -config.ssh_listen_port=Порт, що проÑлуховуєтьÑÑ -config.ssh_root_path=ШлÑÑ… до ÐºÐ¾Ñ€ÐµÐ½Ñ +config.ssh_listen_port=Порт що проÑлуховуєтьÑÑ +config.ssh_root_path=ШлÑÑ… до кореню config.ssh_key_test_path=ШлÑÑ… до теÑтового ключа -config.ssh_keygen_path=ШлÑÑ… до генератора ключів («ssh-keygen») -config.ssh_minimum_key_size_check=Перевірка мінімального розміру ключа +config.ssh_keygen_path=ШлÑÑ… до генератора ключів ('ssh-keygen') +config.ssh_minimum_key_size_check=Мінімальний розмір ключа перевірки config.ssh_minimum_key_sizes=Мінімальні розміри ключів config.lfs_config=ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ LFS config.lfs_enabled=Увімкнено -config.lfs_content_path=ШлÑÑ… до вміÑту LFS -config.lfs_http_auth_expiry=Термін дії LFS HTTP-автентифікації +config.lfs_content_path=ШлÑÑ… до контенту LFS +config.lfs_http_auth_expiry=ЗаÑтаріла LFS HTTP Ð°ÑƒÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ config.db_config=ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ð±Ð°Ð·Ð¸ даних config.db_type=Тип @@ -2916,19 +2500,19 @@ config.db_ssl_mode=SSL config.db_path=ШлÑÑ… config.service_config=ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ ÑервіÑу -config.register_email_confirm=Вимагати підтвердити електронну пошту Ð´Ð»Ñ Ñ€ÐµÑ”Ñтрації +config.register_email_confirm=Потрібно підтвердити електронну пошту Ð´Ð»Ñ Ñ€ÐµÑ”Ñтрації config.disable_register=Вимкнути ÑамоÑтійну реєÑтрацію config.allow_only_internal_registration=Дозволити реєÑтрацію тільки через Forgejo config.allow_only_external_registration=Дозволити реєÑтрацію тільки через Ñторонні ÑервіÑи config.enable_openid_signup=Увімкнути ÑамоÑтійну реєÑтрацію за допомогою OpenID config.enable_openid_signin=Увімкнути реєÑтрацію за допомогою OpenID -config.show_registration_button=Показувати кнопку «РеєÑтраціÑ» -config.require_sign_in_view=Вимагати авторизації Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ³Ð»Ñду вміÑту +config.show_registration_button=`Показувати кнопку "РеєÑтраціÑ"` +config.require_sign_in_view=Вимагати авторизації Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ³Ð»Ñду Ñторінок config.mail_notify=Увімкнути ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ ÐµÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾ÑŽ поштою config.enable_captcha=Увімкнути CAPTCHA -config.active_code_lives=Термін дії коду активації -config.reset_password_code_lives=Термін дії коду Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ запиÑу -config.default_keep_email_private=Приховувати адреÑи електронної пошти за замовчуваннÑм +config.active_code_lives=Ð§Ð°Ñ Ð°ÐºÑ‚ÑƒÐ°Ð»ÑŒÐ½Ð¾ÑÑ‚Ñ– кода Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ +config.reset_password_code_lives=Ð’Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñ‡Ð°Ñу Ð·Ð°ÐºÑ–Ð½Ñ‡ÐµÐ½Ð½Ñ Ñ‚ÐµÑ€Ð¼Ñ–Ð½Ñƒ дії коду облікового запиÑу +config.default_keep_email_private=Приховати адреÑу електронної пошти за замовчуваннÑм config.default_allow_create_organization=Дозволити ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð¾Ñ€Ð³Ð°Ð½Ñ–Ð·Ð°Ñ†Ñ–Ð¹ за замовчуваннÑм config.enable_timetracking=Увімкнути відÑÑ‚ÐµÐ¶ÐµÐ½Ð½Ñ Ñ‡Ð°Ñу config.default_enable_timetracking=Увімкнути відÑÑ‚ÐµÐ¶ÐµÐ½Ð½Ñ Ñ‡Ð°Ñу за замовчуваннÑм @@ -2944,14 +2528,14 @@ config.skip_tls_verify=ПропуÑтити перевірку TLS config.mailer_enabled=Увімкнено config.mailer_name=Ім'Ñ -config.mailer_smtp_port=Порт SMTP +config.mailer_smtp_port=SMTP порт config.mailer_user=КориÑтувач config.mailer_use_sendmail=ВикориÑтовувати Sendmail config.mailer_sendmail_path=ШлÑÑ… до Sendmail config.mailer_sendmail_args=Додаткові аргументи до Sendmail config.mailer_sendmail_timeout=Тайм-аут Sendmail config.test_email_placeholder=ÐдреÑа електронної пошти (наприклад, test@example.com) -config.send_test_mail=ÐадіÑлати теÑтового лиÑта +config.send_test_mail=Відправити теÑтового лиÑта config.oauth_config=ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ OAuth config.oauth_enabled=Увімкнено @@ -2965,18 +2549,18 @@ config.cache_item_ttl=Ð§Ð°Ñ Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ð½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ… кешу config.session_config=ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ ÑеÑÑ–Ñ— config.session_provider=Провайдер ÑеÑÑ–Ñ— config.provider_config=ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ð¿Ð¾Ñтачальника -config.cookie_name=Ðазва файлу cookie +config.cookie_name=Ім'Ñ Ñ„Ð°Ð¹Ð»Ñƒ cookie config.gc_interval_time=Інтервал запуÑку збирача ÑÐ¼Ñ–Ñ‚Ñ‚Ñ (GC) config.session_life_time=Ð§Ð°Ñ Ð¶Ð¸Ñ‚Ñ‚Ñ ÑеÑÑ–Ñ— config.https_only=Тільки HTTPS -config.cookie_life_time=Ð§Ð°Ñ Ð¶Ð¸Ñ‚Ñ‚Ñ Ñ„Ð°Ð¹Ð»Ñƒ cookie +config.cookie_life_time=Ð§Ð°Ñ Ð¶Ð¸Ñ‚Ñ‚Ñ cookie-файлу -config.picture_config=ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñ„Ð¾Ñ‚Ð¾Ð³Ñ€Ð°Ñ„Ñ–Ñ— або аватара +config.picture_config=ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñ„Ð¾Ñ‚Ð¾Ð³Ñ€Ð°Ñ„Ñ–Ñ— або аватари config.picture_service=Ð¡ÐµÑ€Ð²Ñ–Ñ Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½ÑŒ config.disable_gravatar=Вимкнути Gravatar -config.enable_federated_avatar=Увімкнути федеровані аватари +config.enable_federated_avatar=Увімкнути зовнішні аватари -config.git_config=ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Git +config.git_config=ÐšÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ git config.git_disable_diff_highlight=Вимкнути підÑвітку ÑинтакÑиÑу diff config.git_max_diff_lines=МакÑимум Ñ€Ñдків на diff (на один файл) config.git_max_diff_line_characters=МакÑимум Ñимволів на diff (на одну Ñтроку) @@ -3006,7 +2590,7 @@ monitor.desc=ÐžÐ¿Ð¸Ñ monitor.start=Ð§Ð°Ñ Ð¿Ð¾Ñ‡Ð°Ñ‚ÐºÑƒ monitor.execute_time=Ð§Ð°Ñ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ monitor.process.cancel=Зупинити Ð¿Ñ€Ð¾Ñ†ÐµÑ -monitor.process.cancel_desc=СкаÑÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¾Ñ†ÐµÑу може призвеÑти до втрати даних +monitor.process.cancel_desc=Зупинка процеÑу може призвеÑти до втрати даних monitor.process.cancel_notices=Зупинити: %s? monitor.process.children=Дочірні процеÑи @@ -3015,8 +2599,8 @@ monitor.queue=Черга: %s monitor.queue.name=Ðазва monitor.queue.type=Тип monitor.queue.exemplar=Приклад типу -monitor.queue.numberworkers=КількіÑÑ‚ÑŒ обробників -monitor.queue.maxnumberworkers=МакÑимальна кількіÑÑ‚ÑŒ обробників +monitor.queue.numberworkers=КількіÑÑ‚ÑŒ робочих потоків +monitor.queue.maxnumberworkers=МакÑимальна кількіÑÑ‚ÑŒ робочих потоків monitor.queue.settings.title=ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿ÑƒÐ»Ñƒ monitor.queue.settings.maxnumberworkers=МакÑимальна кількіÑÑ‚ÑŒ робочих потоків monitor.queue.settings.maxnumberworkers.placeholder=Поточний %[1]d @@ -3030,7 +2614,7 @@ notices.select_all=Вибрати вÑе notices.deselect_all=СкаÑувати Ð²Ð¸Ð´Ñ–Ð»ÐµÐ½Ð½Ñ notices.inverse_selection=Інвертувати виділене notices.delete_selected=Видалити обране -notices.delete_all=Видалити вÑÑ– cÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ +notices.delete_all=Видалити уÑÑ– cÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ notices.type=Тип notices.type_1=Репозиторій notices.type_2=Ð—Ð°Ð²Ð´Ð°Ð½Ð½Ñ @@ -3043,40 +2627,9 @@ packages.total_size = Загальний розмір: %s packages.unreferenced_size = Розмір без поÑилань: %s packages.creator = Творець packages.version = ВерÑÑ–Ñ -packages.package_manage_panel = Керувати пакунками +packages.package_manage_panel = Менеджмент Пакунків packages.published = Опубліковано notices.operations = Дії -packages.cleanup = ОчиÑтити недійÑні дані -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.mailer_enable_helo = Увімкнути HELO -users.organization_creation.description = Дозволити ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð½Ð¾Ð²Ð¸Ñ… організацій. -users.cannot_delete_self = Ви не можете видалити Ñебе -monitor.processes_count = %d процеÑів -monitor.stacktrace = ТраÑа Ñтека -config.send_test_mail_submit = ÐадіÑлати -users.bot = Бот -monitor.stats = СтатиÑтика -users.new_success = Обліковий Ð·Ð°Ð¿Ð¸Ñ Â«%s» Ñтворено. -config_settings = ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ -self_check.no_problem_found = Проблем поки що не виÑвлено. -config_summary = ПідÑумок -monitor.queue.review_add = ПереглÑнути / додати обробники -monitor.queue.activeworkers = Ðктивні обробники -monitor.queue.numberinqueue = Ðомер у черзі -monitor.queue.settings.desc = Пули динамічно зроÑтають у відповідь на Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ñ—Ñ…Ð½Ñ–Ñ… черг обробників. -monitor.queue.settings.remove_all_items_done = УÑÑ– елементи в черзі видалено. -monitor.queue.settings.remove_all_items = Видалити вÑÑ– -config.app_slogan = ГаÑло екземплÑра -auths.tip.gitea = ЗареєÑтруйте новий додаток OAuth. ІнÑтрукцію можна знайти на %s -auths.tip.gitlab_new = ЗареєÑтруйте новий додаток на %s -monitor.duration = ТриваліÑÑ‚ÑŒ (Ñ) -users.reserved = Зарезервовано [action] @@ -3110,7 +2663,6 @@ review_dismissed_reason=Причина: create_branch=Ñтворив гілку %[3]s в %[4]s starred_repo=додав %[2]s у обране watched_repo=почав Ñлідкувати за %[2]s -auto_merge_pull_request = `автоматично об'єднав запит на Ð·Ð»Ð¸Ñ‚Ñ‚Ñ %[3]s#%[2]s` [tool] now=зараз @@ -3157,11 +2709,11 @@ default_key=ПідпиÑано типовим ключем error.extract_sign=Ðе вдалоÑÑ Ð²Ð¸Ñ‚Ñгти Ð¿Ñ–Ð´Ð¿Ð¸Ñ error.generate_hash=Ðе вдалоÑÑ Ð·Ð³ÐµÐ½ÐµÑ€ÑƒÐ²Ð°Ñ‚Ð¸ хеш коміту error.no_committer_account=Ðккаунт кориÑтувача з таким Email не знайдено -error.no_gpg_keys_found=Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ GPG-ключ, що відповідає даному підпиÑу +error.no_gpg_keys_found=Ðе вдалоÑÑ Ð·Ð½Ð°Ð¹Ñ‚Ð¸ GPG ключ що відповідає даному підпиÑу error.not_signed_commit=ÐепідпиÑаний коміт -error.failed_retrieval_gpg_keys=Ðе вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ відповідний GPG-ключ кориÑтувача -error.probable_bad_signature=УВÐГÐ! Хоча ключ із таким ID Ñ– Ñ” в базі, коміт неможливо ним перевірити! Цей коміт ПІДОЗРІЛИЙ. -error.probable_bad_default_signature=УВÐГÐ! Хоча типовий ключ має цей ID, коміт неможливо ним перевірити! Цей коміт ПІДОЗРІЛИЙ. +error.failed_retrieval_gpg_keys=Ðе вдалоÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ відповідний GPG ключ кориÑтувача +error.probable_bad_signature=УВÐГÐ! Хоча ключ з таким ID Ñ– Ñ” в базі, коміт не може бути ним перевірено! Цей коміт ПІДОЗРІЛИЙ. +error.probable_bad_default_signature=УВÐГÐ! Хоча типовий ключ має цей ID, коміт не може бути ним перевірено! Цей коміт ПІДОЗРІЛИЙ. [units] error.no_unit_allowed_repo=У Ð²Ð°Ñ Ð½ÐµÐ¼Ð°Ñ” доÑтупу до жодного розділу цього репозиториÑ. @@ -3173,115 +2725,19 @@ alpine.repository.branches=Гілки alpine.repository.repositories=Репозиторії conan.details.repository=Репозиторій owner.settings.cleanuprules.enabled=Увімкнено -about = Про цей пакунок +about = Про цей пакет empty = Поки що тут немає пакунків. -empty.documentation = Докладніше про реєÑÑ‚Ñ€ пакунків читайте в документації. -registry.documentation = Докладніше про реєÑÑ‚Ñ€ %s читайте в документації. -settings.delete.notice = Ви збираєтеÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ %s (%s). Цю операцію не можна ÑкаÑувати, ви впевнені? +empty.documentation = Ð”Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¾Ñ— інформації щодо реєÑтру пакунків, переглÑньте документацію. +registry.documentation = Ð”Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¾Ñ— інформації щодо реєÑтру %s, переглÑньте документацію. +settings.delete.notice = Ви збираєтеÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ %s (%s). Цю операцію не можна відмінити, ви впевнені? details.author = Ðвтор -title = Пакунки -arch.version.backup = Резервне ÐºÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ð½Ð½Ñ -arch.version.conflicts = Суперечки -arch.version.replaces = Заміни -arch.version.provides = Ðадає -arch.version.groups = Група -conda.install = Ðби вÑтановити пакунок, викориÑтовуючи Conda, запуÑÑ‚Ñ–Ñ‚ÑŒ команду: -cargo.install = Ðби вÑтановити пакунок, викориÑтовуючи Cargo, запуÑÑ‚Ñ–Ñ‚ÑŒ команду: -versions.view_all = ПереглÑнути вÑÑ– -generic.download = Завантажте пакунок із командного Ñ€Ñдка: -details = Подробиці -arch.version.optdepends = ÐеобовʼÑзково залежить -installation = УÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ -details.license = Ð›Ñ–Ñ†ÐµÐ½Ð·Ñ–Ñ -filter.type.all = УÑÑ– -conan.install = Ðби вÑтановити пакунок, викориÑтовуючи Conan, запуÑÑ‚Ñ–Ñ‚ÑŒ команду: -container.layers = Шари образу -details.project_site = ВебÑторінка проєкту -details.documentation_site = ВебÑторінка документації -desc = Керувати пакунками репозиторію. -requirements = Вимоги -dependencies = ЗалежноÑÑ‚Ñ– -empty.repo = Ви опублікували пакунок, але він не показаний тут? Перейдіть до налаштувань пакунків та привʼÑжіть його до цього репозиторію. -alpine.repository = Про репозиторій -alpine.install = Ðби вÑтановити цей пакунок, запуÑÑ‚Ñ–Ñ‚ÑŒ команду: -cran.install = Ðби вÑтановити пакунок, запуÑÑ‚Ñ–Ñ‚ÑŒ команду: -composer.dependencies.development = ЗалежноÑÑ‚Ñ– розробки -container.labels.key = Ключ -container.labels.value = Ð—Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ -composer.install = Ðби вÑтановити пакунок, викориÑтовуючи Composer, запуÑÑ‚Ñ–Ñ‚ÑŒ команду: -debian.repository.components = Складові -filter.container.tagged = Відмічений -filter.container.untagged = Ðевідмічений -container.multi_arch = ОС / Ðрхітектура -arch.pacman.helper.gpg = Додайте Ñертифікат довіреноÑÑ‚Ñ– до pacman: -arch.pacman.sync = Синхронізуйте пакунок з pacman: -arch.pacman.conf = Додайте Ñервер з повʼÑзаним доÑтрибутивом та архітектурою до /etc/pacman.conf : -arch.version.properties = ВлаÑтивоÑÑ‚Ñ– верÑÑ–Ñ— -arch.version.description = ÐžÐ¿Ð¸Ñ -chef.install = Ðби вÑтановити пакунок, запуÑÑ‚Ñ–Ñ‚ÑŒ команду: -container.details.platform = Платформа -container.details.type = Тип образу -container.pull = Завантажити образ із командного Ñ€Ñдка: -details.repository_site = ВебÑторінка репозиторію -composer.dependencies = ЗалежноÑÑ‚Ñ– -debian.install = Ðби вÑтановити пакунок, запуÑÑ‚Ñ–Ñ‚ÑŒ команду: -debian.repository = Про репозиторій -debian.repository.distributions = ДиÑтрибутиви -alpine.repository.architectures = Ðрхітектури -arch.version.depends = Залежить -go.install = Ð’Ñтановити пакунок із командного Ñ€Ñдка: -debian.repository.architectures = Ðрхітектури -helm.install = Ðби вÑтановити пакунок, запуÑÑ‚Ñ–Ñ‚ÑŒ команду: -keywords = Ключові Ñлова -assets = РеÑурÑи -versions = ВерÑÑ–Ñ— -dependency.version = ВерÑÑ–Ñ -container.labels = Мітки -filter.no_result = Ваш фільтр не видав жодних результатів. -dependency.id = ID -rpm.repository = Про репозиторій -rpm.repository.architectures = Ðрхітектури -settings.delete.error = Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ пакунок. -settings.delete.success = Пакунок видалено. -npm.dependencies = ЗалежноÑÑ‚Ñ– -settings.delete = Видалити пакунок -npm.dependencies.development = ЗалежноÑÑ‚Ñ– розробки -rubygems.dependencies.development = ЗалежноÑÑ‚Ñ– розробки -npm.dependencies.optional = Ðеобов'Ñзкові залежноÑÑ‚Ñ– -container.images.title = Образи -search_in_external_registry = Шукати в %s -owner.settings.cleanuprules.keep.count.n = %d верÑій на пакунок -settings.delete.description = Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð¿Ð°ÐºÑƒÐ½ÐºÐ° Ñ” оÑтаточним Ñ– його неможливо ÑкаÑувати. -owner.settings.cleanuprules.keep.count.1 = 1 верÑÑ–ÑŽ на пакунок -rpm.repository.multiple_groups = Цей пакунок доÑтупний у кількох групах. -helm.registry = Ðалаштуйте цей реєÑÑ‚Ñ€ із командного Ñ€Ñдка: -rpm.registry = Ðалаштуйте цей реєÑÑ‚Ñ€ із командного Ñ€Ñдка: -conan.registry = Ðалаштуйте цей реєÑÑ‚Ñ€ із командного Ñ€Ñдка: -nuget.registry = Ðалаштуйте цей реєÑÑ‚Ñ€ із командного Ñ€Ñдка: -swift.registry = Ðалаштуйте цей реєÑÑ‚Ñ€ із командного Ñ€Ñдка: -alt.repository.architectures = Ðрхітектури -alt.repository = Про репозиторій -alt.repository.multiple_groups = Цей пакунок доÑтупний у кількох групах. -alt.install = Ð’Ñтановити пакунок -alt.registry = Ðалаштуйте цей реєÑÑ‚Ñ€ із командного Ñ€Ñдка: -debian.registry = Ðалаштуйте цей реєÑÑ‚Ñ€ із командного Ñ€Ñдка: -debian.registry.info = Виберіть $distribution Ñ– $component зі ÑпиÑку нижче. [secrets] -deletion = Видалити Ñекрет -creation.success = Секрет «%s» додано. -creation.failed = Ðе вдалоÑÑ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ Ñекрет. -management = ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ñекретами -deletion.success = Секрет видалено. -deletion.failed = Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ñекрет. -deletion.description = Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ñекрету Ñ” оÑтаточним Ñ– його неможливо ÑкаÑувати. Продовжити? -creation = Додати Ñекрет -none = Секретів ще немає. -creation.name_placeholder = без ÑƒÑ€Ð°Ñ…ÑƒÐ²Ð°Ð½Ð½Ñ Ñ€ÐµÐ³Ñ–Ñтру, тільки літерно-цифрові Ñимволи або підкреÑленнÑ, не може починатиÑÑ Ð· GITEA_ або GITHUB_ -secrets = Секрети -creation.value_placeholder = Уведіть довільний вміÑÑ‚. Пробіли на початку та в кінці будуть пропущені. [actions] + + + runners.name=Ðазва runners.owner_type=Тип runners.description=ÐžÐ¿Ð¸Ñ @@ -3291,121 +2747,13 @@ runners.task_list.commit=Коміт runners.status.active=Ðктивний runs.commit=Коміт -variables.update.failed = Ðе вдалоÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ змінну. -variables.update.success = Змінну змінено. -variables.creation = Додати змінну -variables.none = Змінних ще немає. -variables.deletion = Видалити змінну -variables = Змінні -runs.scheduled = Заплановано -actions = Дії -variables.deletion.success = Змінну видалено. -runners.id = ID -runners.update_runner = Оновити зміни -variables.creation.failed = Ðе вдалоÑÑ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ змінну. -variables.deletion.failed = Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ змінну. -status.waiting = Очікує -variables.creation.success = Змінну «%s» додано. -runners.labels = Мітки -status.unknown = Ðевідомо -runners.task_list.no_tasks = Завдань поки що немає. -runners.version = ВерÑÑ–Ñ -status.blocked = Заблоковано -status.cancelled = СкаÑовано -variables.description = Змінні передаютьÑÑ Ð¿ÐµÐ²Ð½Ð¸Ð¼ діÑм Ñ– не можуть бути прочитані інакше. -variables.deletion.description = Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð·Ð¼Ñ–Ð½Ð½Ð¾Ñ— Ñ” оÑтаточним Ñ– його неможливо ÑкаÑувати. Продовжити? -variables.management = ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð·Ð¼Ñ–Ð½Ð½Ð¸Ð¼Ð¸ -variables.id_not_exist = Змінної з ідентифікатором %d не Ñ–Ñнує. -variables.edit = Редагувати змінну -runs.expire_log_message = Журнали очищено, тому що вони були занадто Ñтарі. -runs.empty_commit_message = (порожнє Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ ÐºÐ¾Ð¼Ñ–Ñ‚Ð°) -runners.status.unspecified = Ðевідомо -runs.status_no_select = УÑÑ– Ñтани -runs.status = Стан -runners.task_list.status = Стан -runners.status = Стан -runs.no_workflows.documentation = Докладніше про Дії Forgejo читайте в документації. -runners.reset_registration_token = Скинути токен реєÑтрації -workflow.enable_success = Робочий потік «%s» уÑпішно ввімкнено. -runs.workflow = Робочий потік -workflow.disable = Вимкнути робочий потік -workflow.disable_success = Робочий потік «%s» уÑпішно вимкнено. -workflow.disabled = Робочий потік вимкнено. -workflow.enable = Увімкнути робочий потік -runs.no_workflows = Робочих потоків ще немає. -runs.all_workflows = УÑÑ– робочі потоки -runs.no_results = Ðе знайдено відповідних результатів. -status.failure = Помилка -status.running = Працює -status.success = УÑпіх -status.skipped = Пропущено -need_approval_desc = Потрібне ÑÑ…Ð²Ð°Ð»ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑку робочих потоків Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñ‚Ñƒ на злиттÑ. [projects] -type-3.display_name = Проєкт організації -type-2.display_name = Проєкт репозиторію -type-1.display_name = ОÑобиÑтий проєкт -deleted.display_name = Видалений проєкт [git.filemode] +; Ordered by git filemode value, ascending. E.g. directory has "040000", normal file has "100644", … symbolic_link=Символічне поÑÐ¸Ð»Ð°Ð½Ð½Ñ -directory = Тека -submodule = Підмодуль -normal_file = Звичайний файл -executable_file = Виконуваний файл -changed_filemode = %[1]s → %[2]s - - -[search] -code_kind = Шукати код... -code_search_unavailable = Пошук коду наразі недоÑтупний. Будь лаÑка, звʼÑжітьÑÑ Ð· адмініÑтратором Ñайту. -user_kind = Шукати кориÑтувачів... -repo_kind = Шукати репозиторії... -search = Пошук... -type_tooltip = Вид пошуку -fuzzy = Ðечіткий -fuzzy_tooltip = Включати результати, що подібні пошуковому запиту -union_tooltip = Включати результати, що відповідають будь-Ñкому з ключових Ñлів, розділених пробілами -union = Ключові Ñлова -exact = Точний -exact_tooltip = Включати лише результати, що чітко відповідають запиту -regexp = РегулÑрні вирази -regexp_tooltip = Опрацьовувати пошуковий запит Ñк регулÑрний вираз -org_kind = Шукати організації... -team_kind = Шукати команди... -milestone_kind = Шукати віхи... -commit_kind = Шукати коментарі... -no_results = Ðе знайдено відповідних результатів. -keyword_search_unavailable = Пошук за ключовими Ñловами наразі недоÑтупний. Будь лаÑка, зв'ÑжітьÑÑ Ð· адмініÑтратором Ñайту. -code_search_by_git_grep = Поточні результати пошуку коду надаютьÑÑ Ð· «git grep». Тут можуть бути кращі результати, Ñкщо адмініÑтратор Ñайту ввімкнув індекÑацію коду. -package_kind = Шукати пакунки... -project_kind = Шукати проєкти... -branch_kind = Шукати гілки... -issue_kind = Шукати задачі... -pull_kind = Шукати запити на злиттÑ... -runner_kind = Пошук раннерів... - -[markup] -filepreview.truncated = ПереглÑд було урізано -filepreview.line = РÑдок %[1]d в %[2]s -filepreview.lines = РÑдки з %[1]d по %[2]d в %[3]s - -[translation_meta] -test = Це теÑтовий текÑÑ‚. Він не відображаєтьÑÑ Ð² інтерфейÑÑ– кориÑтувача Forgejo, а викориÑтовуєтьÑÑ Ð· метою теÑÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ - -[repo.permissions] -packages.read = Читати: ДивитиÑÑŒ та завантажити пакунки призначені до репозиторію. -packages.write = ПиÑати: Публікувати та видалÑти пакунки призначені до репозиторію. - -[munits.data] -pib = ПіБ -eib = ЕіБ -kib = КіБ -mib = МіБ -gib = ГіБ -tib = ТіБ -b = Б diff --git a/options/locale/locale_vi.ini b/options/locale/locale_vi.ini index b12bac0c89..98d5506d83 100644 --- a/options/locale/locale_vi.ini +++ b/options/locale/locale_vi.ini @@ -1,3 +1,6 @@ + + + [common] home = Trang chủ explore = Khám phá @@ -81,6 +84,4 @@ signed_in_as = Äăng nhập bằng re_type = Xác nhận mật khẩu webauthn_sign_in = Nhấn nút trên khóa bảo mật, nếu không có nút thì bạn hãy rút ra rồi cắm lại. new_org.link = Tạo tổ chức -error404 = Trang bạn Ä‘ang tìm không tồn tại hoặc bạn không có quyá»n xem. -edit = Chỉnh sá»­a -filter = Lá»c \ No newline at end of file +error404 = Trang bạn Ä‘ang tìm không tồn tại hoặc bạn không có quyá»n xem. \ No newline at end of file diff --git a/options/locale/locale_yi.ini b/options/locale/locale_yi.ini index 9340e3ef0a..8b13789179 100644 --- a/options/locale/locale_yi.ini +++ b/options/locale/locale_yi.ini @@ -1 +1 @@ -[common] \ No newline at end of file + diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index b17d85cffa..1873b11478 100644 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -1,6 +1,6 @@ [common] home=首页 -dashboard=控制é¢æ¿ +dashboard=首页 explore=探索 help=帮助 logo=徽标 @@ -12,15 +12,15 @@ sign_up=注册 link_account=链接账户 register=注册 version=当å‰ç‰ˆæœ¬ -powered_by=ç”± %s æä¾›æ”¯æŒ +powered_by=Powered by %s page=é¡µé¢ template=æ¨¡æ¿ language=语言选项 notifications=通知 -active_stopwatch=活跃时间跟踪器 -tracked_time_summary=基于工å•åˆ—è¡¨è¿‡æ»¤å™¨çš„è·Ÿè¸ªæ—¶é—´æ¦‚è¦ +active_stopwatch=活动时间跟踪器 +tracked_time_summary=åŸºäºŽé—®é¢˜åˆ—è¡¨è¿‡æ»¤å™¨çš„è·Ÿè¸ªæ—¶é—´æ¦‚è¦ create_new=创建… -user_profile_and_more=个人信æ¯ä¸Žè®¾ç½®â€¦ +user_profile_and_more=个人信æ¯å’Œè®¾ç½®â€¦ signed_in_as=已登录用户 enable_javascript=æ­¤ç½‘ç«™éœ€è¦ JavaScript。 toc=目录 @@ -30,11 +30,11 @@ return_to_forgejo=返回 Forgejo username=用户å email=电å­é‚®ä»¶åœ°å€ password=å¯†ç  -access_token=访问令牌 +access_token=访问令牌（Access Token） re_type=ç¡®è®¤å¯†ç  captcha=验è¯ç  twofa=ä¸¤æ­¥éªŒè¯ -twofa_scratch=两步验è¯å¤‡ç”¨éªŒè¯ç  +twofa_scratch=两步验è¯å£ä»¤ passcode=验è¯ç  webauthn_insert_key=æ’入安全密钥 @@ -56,28 +56,28 @@ organization=组织 mirror=é•œåƒ new_repo=创建仓库 new_migrate=è¿ç§»å¤–部仓库 -new_mirror=åˆ›å»ºé•œåƒ -new_fork=创建派生仓库 +new_mirror=åˆ›å»ºæ–°çš„é•œåƒ +new_fork=新的派生仓库 new_org=创建组织 new_project=创建项目 new_project_column=创建列 manage_org=管ç†æˆ‘的组织 -admin_panel=ç½‘ç«™ç®¡ç† +admin_panel=管ç†åŽå° account_settings=å¸æˆ·è®¾ç½® settings=设置 your_profile=ä¸ªäººä¿¡æ¯ -your_starred=点赞 +your_starred=已点赞 your_settings=设置 all=所有 -sources=æ¥æº +sources=自建 mirrors=é•œåƒ collaborative=å作 forks=派生 activities=最近活动 pull_requests=åˆå¹¶è¯·æ±‚ -issues=å·¥å• +issues=å·¥å•ç®¡ç† milestones=里程碑 ok=确定 @@ -109,24 +109,24 @@ copy_type_unsupported=无法å¤åˆ¶æ­¤ç±»åž‹çš„文件内容 write=撰写 preview=预览 -loading=正在加载… +loading=正在加载... error=错误 error404=您正å°è¯•è®¿é—®çš„é¡µé¢ ä¸å­˜åœ¨ 或 æ‚¨å°šæœªè¢«æŽˆæƒ æŸ¥çœ‹è¯¥é¡µé¢ã€‚ go_back=返回 -never=从未 +never=ä»Žä¸ unknown=未知 rss_feed=RSS è®¢é˜…æº -pin=置顶 +pin=固定 unpin=å–消置顶 artifacts=åˆ¶å“ confirm_delete_artifact=您确定è¦åˆ é™¤åˆ¶å““%sâ€å—？ -archived=已存档 +archived=已归档 concept_system_global=全局 concept_user_individual=个人 @@ -144,14 +144,14 @@ name=å称 value=值 filter = 筛选 filter.clear = 清除筛选æ¡ä»¶ -filter.is_archived = 已存档 -filter.not_archived = 未存档 -filter.is_fork = 是派生 -filter.not_fork = ä¸æ˜¯æ´¾ç”Ÿ -filter.is_mirror = æ˜¯é•œåƒ -filter.not_mirror = ä¸æ˜¯é•œåƒ -filter.is_template = æ˜¯æ¨¡æ¿ -filter.not_template = ä¸æ˜¯æ¨¡æ¿ +filter.is_archived = 已归档 +filter.not_archived = 未归档 +filter.is_fork = 已派生 +filter.not_fork = 未派生 +filter.is_mirror = å·²é•œåƒ +filter.not_mirror = æœªé•œåƒ +filter.is_template = æ¨¡æ¿ +filter.not_template = éžæ¨¡æ¿ filter.public = 公开 filter.private = ç§æœ‰ toggle_menu = 切æ¢èœå• @@ -160,13 +160,12 @@ more_items = 显示更多 copy_generic = å¤åˆ¶åˆ°å‰ªè´´æ¿ test = 测试 error413 = 您已用尽您的é…é¢ã€‚ -new_repo.title = 创建仓库 -new_migrate.title = 开始è¿ç§» -new_org.title = 创建组织 -new_repo.link = 创建仓库 -new_migrate.link = 开始è¿ç§» -new_org.link = 创建组织 -copy_path = å¤åˆ¶è·¯å¾„ +new_repo.title = 新仓库 +new_migrate.title = æ–°è¿ç§» +new_org.title = 新组织 +new_repo.link = 新仓库 +new_migrate.link = æ–°è¿ç§» +new_org.link = 新组织 [aria] navbar=å¯¼èˆªæ  @@ -175,12 +174,12 @@ footer.software=关于软件 footer.links=链接 [heatmap] -number_of_contributions_in_the_last_12_months=过去的一年内有 %s 次贡献 -contributions_zero=没有贡献 -less=较少 -more=较多 -contributions_format = {year}å¹´{month}{day}日有{contributions} -contributions_few = 贡献 +number_of_contributions_in_the_last_12_months=一年内 %s 次贡献 +contributions_zero=ç›®å‰è¿˜æ²¡æœ‰è´¡çŒ® +less=æ›´å°‘çš„ +more=更多的 +contributions_format = {year}{month}{day} 当日有 {contributions} +contributions_few = 项贡献 contributions_one = 贡献 [editor] @@ -199,13 +198,7 @@ buttons.switch_to_legacy.tooltip=使用旧版编辑器 buttons.enable_monospace_font=å¯ç”¨ç­‰å®½å­—体 buttons.disable_monospace_font=ç¦ç”¨ç­‰å®½å­—体 buttons.unindent.tooltip = 解除一级嵌套æ¡ç›® -buttons.indent.tooltip = 嵌套一级æ¡ç›® -table_modal.header = 添加表格 -table_modal.placeholder.header = 标题 -table_modal.label.columns = 列数 -table_modal.label.rows = 行数 -buttons.new_table.tooltip = 添加表格 -table_modal.placeholder.content = 内容 +buttons.indent.tooltip = 解除一级嵌套æ¡ç›® [filter] string.asc=A - Z @@ -213,7 +206,7 @@ string.desc=Z - A [error] occurred=å‘生了一个错误 -report_message=如果您确定这是一个 Forgejo çš„ bug，请在 Codeberg 上æœç´¢ç›¸å…³é—®é¢˜æˆ–在必è¦æ—¶åˆ›å»ºä¸€ä¸ªæ–°å·¥å•ã€‚ +report_message=如果您确定这是一个 Forgejo bug，请在 Codeberg 上æœç´¢é—®é¢˜ï¼Œæˆ–在必è¦æ—¶åˆ›å»ºä¸€ä¸ªæ–°å·¥å•ã€‚ missing_csrf=错误的请求：没有 CSRF 令牌 invalid_csrf=错误的请求：无效的 CSRF 令牌 not_found=找ä¸åˆ°ç›®æ ‡ã€‚ @@ -223,13 +216,13 @@ server_internal = æœåŠ¡å™¨å†…部错误 [startpage] app_desc=一款æžæ˜“æ­å»ºçš„自助 Git æœåŠ¡ install=易安装 -install_desc=通过二进制æ¥è¿è¡Œï¼›æˆ–者通过Docker æ¥è¿è¡Œï¼›æˆ–者通过安装包 æ¥è¿è¡Œã€‚ +install_desc=通过 二进制 æ¥è¿è¡Œï¼›æˆ–者通过 docker æ¥è¿è¡Œï¼›æˆ–者通过 安装包 æ¥è¿è¡Œ platform=è·¨å¹³å° platform_desc=å·²è¯å®žå¯ä»¥åœ¨ Linux å’Œ FreeBSD 等自由æ“作系统以åŠä¸åŒçš„ CPU 架构上è¿è¡Œ Forgejoã€‚æŒ‘ä¸€ä¸ªæ‚¨å–œæ¬¢çš„å°±è¡Œï¼ lightweight=è½»é‡çº§ lightweight_desc=一个廉价的树莓派的é…置足以满足 Forgejo 的最低系统硬件è¦æ±‚。最大程度上节çœæ‚¨çš„æœåŠ¡å™¨èµ„æºï¼ license=å¼€æºåŒ– -license_desc=å–å¾— Forgejoï¼èµ¶å¿«åŠ å…¥æˆ‘们æ¥å…±åŒå‘展这个伟大的项目ï¼è¿˜ç­‰ä»€ä¹ˆï¼Ÿæˆä¸ºè´¡çŒ®è€…å§ï¼ +license_desc=所有的代ç éƒ½å¼€æºåœ¨ Forgejo 上，赶快加入我们æ¥å…±åŒå‘展这个伟大的项目ï¼è¿˜ç­‰ä»€ä¹ˆï¼Ÿæˆä¸ºè´¡çŒ®è€…å§ï¼ [install] install=å®‰è£…é¡µé¢ @@ -242,7 +235,7 @@ host=æ•°æ®åº“主机 user=用户å password=æ•°æ®åº“ç”¨æˆ·å¯†ç  db_name=æ•°æ®åº“å称 -db_schema=æž¶æž„æ¨¡å¼ +db_schema=Schema db_schema_helper=留空则数æ®åº“中默认值为("public")。 ssl_mode=SSL path=æ•°æ®åº“文件路径 @@ -253,7 +246,7 @@ reinstall_confirm_check_1=使用 app.ini 中 SECRET KEY 加密的数æ®å¯èƒ½ä¼š reinstall_confirm_check_2=代ç ä»“库和设置å¯èƒ½éœ€è¦é‡æ–°åŒæ­¥ã€‚勾选此框，表示您确认将手动é‡æ–°åŒæ­¥ä»“库和 SSH authorized_keys çš„é’©å­ã€‚您确认您将确ä¿ä»£ç ä»“库和镜åƒè®¾ç½®æ˜¯æ­£ç¡®çš„。 reinstall_confirm_check_3=你确认你ç»å¯¹è‚¯å®šè¿™ä¸ª Forgejo 在正确的 app.ini ä½ç½®ä¸Šè¿è¡Œï¼Œè€Œä¸”你确定你必须é‡æ–°å®‰è£…。你确认你知晓上述风险。 err_empty_db_path=SQLite æ•°æ®åº“文件路径ä¸èƒ½ä¸ºç©ºã€‚ -no_admin_and_disable_registration=您ä¸èƒ½å¤Ÿåœ¨æœªåˆ›å»ºç®¡ç†å‘˜è´¦å·çš„情况下ç¦æ­¢æ³¨å†Œã€‚ +no_admin_and_disable_registration=您ä¸èƒ½å¤Ÿåœ¨æœªåˆ›å»ºç®¡ç†å‘˜ç”¨æˆ·çš„情况下ç¦æ­¢æ³¨å†Œã€‚ err_empty_admin_password=管ç†å‘˜å¯†ç ä¸èƒ½ä¸ºç©ºã€‚ err_empty_admin_email=管ç†å‘˜ç”µå­é‚®ä»¶ä¸èƒ½ä¸ºç©ºã€‚ err_admin_name_is_reserved=管ç†å‘˜ç”¨æˆ·å无效，用户å是ä¿ç•™çš„ @@ -266,8 +259,8 @@ app_name_helper=在此处输入您的实例åç§°ã€‚å®ƒå°†æ˜¾ç¤ºåœ¨æ‰€æœ‰é¡µé¢ repo_path=仓库根目录 repo_path_helper=所有远程 Git 仓库将ä¿å­˜åˆ°æ­¤ç›®å½•ã€‚ lfs_path=LFS 根目录 -lfs_path_helper=存储为Git LFS的文件将被存储在此目录。留空以ç¦ç”¨LFS。 -run_user=è¦ä½¿ç”¨çš„用户身份 +lfs_path_helper=存储为Git LFS的文件将被存储在此目录。留空ç¦ç”¨LFS +run_user=以用户è¿è¡Œ run_user_helper=输入 Forgejo è¿è¡Œçš„æ“作系统用户å。请注æ„，此用户必须具有对仓库根路径的访问æƒé™ã€‚ domain=æœåŠ¡å™¨åŸŸå domain_helper=æœåŠ¡å™¨çš„域å或主机地å€ã€‚ @@ -285,7 +278,7 @@ email_title=电å­é‚®ç®±è®¾ç½® smtp_addr=SMTP ä¸»æœºåœ°å€ smtp_port=SMTP ç«¯å£ smtp_from=电å­é‚®ä»¶å‘件人 -smtp_from_helper=Forgejo 使用的电å­é‚®ä»¶åœ°å€ã€‚直接输入邮件地å€æˆ–使用完整格å¼ï¼š"å称" 。 +smtp_from_helper=请输入一个用于 Forgejo 的电å­é‚®ä»¶åœ°å€ï¼Œæˆ–者使用完整格å¼ï¼š"å称" mailer_user=SMTP 用户å mailer_password=SMTP å¯†ç  register_confirm=需è¦å‘电å­é‚®ä»¶ç¡®è®¤æ³¨å†Œ @@ -298,14 +291,14 @@ disable_gravatar.description=ç¦ç”¨ Gravatar 和第三方头åƒæºã€‚除éžç”¨ federated_avatar_lookup=å¯ç”¨è”é‚¦å¤´åƒ federated_avatar_lookup.description=使用 Libravatar 查找头åƒã€‚ disable_registration=ç¦æ­¢ç”¨æˆ·è‡ªåŠ©æ³¨å†Œ -disable_registration.description=åªæœ‰å®žä¾‹ç®¡ç†å‘˜æ‰èƒ½åˆ›å»ºæ–°çš„å¸æˆ·ã€‚强烈建议ä¿æŒæ³¨å†Œç¦ç”¨ï¼Œé™¤éžæ‚¨æ‰“算为所有人托管一个公共实例并准备好处ç†å¤§é‡åžƒåœ¾å¸æˆ·ã€‚ +disable_registration.description=åªæœ‰å®žä¾‹ç®¡ç†å‘˜æ‰èƒ½åˆ›å»ºæ–°çš„用户å¸æˆ·ã€‚强烈建议ä¿æŒæ³¨å†Œç¦ç”¨ï¼Œé™¤éžæ‚¨æ‰“算为所有人托管一个公共实例并准备好处ç†å¤§é‡åžƒåœ¾å¸æˆ·ã€‚ allow_only_external_registration.description=ä»…å…许使用已é…置的外部æœåŠ¡æ¥åˆ›å»ºæ–°å¸æˆ·ã€‚ openid_signin=å¯ç”¨ OpenID 登录 openid_signin.description=å…许用户通过 OpenID 登录。 openid_signup=å¯ç”¨ OpenID 自助注册 openid_signup.description=如果å¯ç”¨äº†è‡ªåŠ©æ³¨å†Œï¼Œåˆ™å…许用户通过 OpenID 创建å¸æˆ·ã€‚ enable_captcha=å¯ç”¨æ³¨å†ŒéªŒè¯ç  -enable_captcha.description=è¦æ±‚用户通过验è¯ç æ‰èƒ½åˆ›å»ºå¸æˆ·ã€‚ +enable_captcha.description=è¦æ±‚用户通过 CAPTCHA 验è¯æ‰èƒ½åˆ›å»ºå¸æˆ·ã€‚ require_sign_in_view=å¯ç”¨é¡µé¢è®¿é—®é™åˆ¶ require_sign_in_view.description=ä»…å…许已登录用户访问页é¢ã€‚访客åªèƒ½çœ‹åˆ°æ³¨å†Œå’Œç™»å½•é¡µã€‚ admin_setting.description=创建管ç†å‘˜å¸æˆ·æ˜¯å¯é€‰çš„。第一个注册用户将自动æˆä¸ºç®¡ç†å‘˜ã€‚ @@ -332,7 +325,7 @@ default_keep_email_private.description=默认为新用户å¯ç”¨ç”µå­é‚®ä»¶åœ° default_allow_create_organization=默认情况下å…许创建组织 default_allow_create_organization.description=默认å…许新用户创建组织。ç¦ç”¨æ­¤é€‰é¡¹æ—¶ï¼Œç®¡ç†å‘˜å¿…é¡»å‘新用户授予创建组织的æƒé™ã€‚ default_enable_timetracking=默认情况下å¯ç”¨æ—¶é—´è·Ÿè¸ª -default_enable_timetracking.description=默认å…许新仓库使用时间跟踪功能。 +default_enable_timetracking.description=默认å…许新存储库使用时间跟踪功能。 no_reply_address=éšè—电å­é‚®ä»¶ no_reply_address_helper=用于设置éšè—电å­é‚®ä»¶åœ°å€çš„用户使用的电å­é‚®ä»¶åŸŸå。例如，如果用于éšè—电å­é‚®ä»¶åœ°å€çš„域å设为“noreply.example.orgâ€ï¼Œåˆ™ç”¨æˆ·å “joe†在 Git 中将以 “joe@noreply.example.org†表示。 password_algorithm=密ç å“ˆå¸Œç®—法 @@ -364,10 +357,10 @@ filter=其他过滤器 filter_by_team_repositories=按团队仓库筛选 feed_of=`"%s"çš„æº` -show_archived=已存档 -show_both_archived_unarchived=显示已存档和未存档的 -show_only_archived=åªæ˜¾ç¤ºå·²å­˜æ¡£çš„ -show_only_unarchived=åªæ˜¾ç¤ºæœªå­˜æ¡£çš„ +show_archived=已归档 +show_both_archived_unarchived=显示已归档和未归档的 +show_only_archived=åªæ˜¾ç¤ºå·²å½’档的 +show_only_unarchived=åªæ˜¾ç¤ºæœªå½’档的 show_private=ç§æœ‰åº“ show_both_private_public=åŒæ—¶æ˜¾ç¤ºå…¬å¼€çš„å’Œç§æœ‰çš„ @@ -395,7 +388,7 @@ org_no_results=未找到匹é…的组织。 code_no_results=未找到与æœç´¢å­—è¯åŒ¹é…çš„æºä»£ç ã€‚ code_search_results=“%s†的æœç´¢ç»“果是 code_last_indexed_at=最åŽç´¢å¼•äºŽ %s -relevant_repositories_tooltip=派生的ã€ç¼ºå°‘主题ã€å›¾æ ‡å’Œæ述的仓库已被éšè—。 +relevant_repositories_tooltip=派生的仓库，以åŠç¼ºå°‘主题ã€å›¾æ ‡å’Œæ述的仓库将被éšè—。 relevant_repositories=åªæ˜¾ç¤ºç›¸å…³çš„仓库， 显示未过滤结果。 stars_one = %d 点赞 stars_few = %d 点赞 @@ -423,7 +416,7 @@ active_your_account=激活您的å¸æˆ· account_activated=å¸æˆ·å·²æ¿€æ´» prohibit_login=è´¦å·å·²æš‚åœ prohibit_login_desc=您的账å·å·²æš‚åœä¸Žå®žä¾‹äº¤äº’。请与实例管ç†å‘˜è”系以é‡æ–°èŽ·å¾—访问æƒé™ã€‚ -resent_limit_prompt=您请求å‘é€æ¿€æ´»é‚®ä»¶è¿‡äºŽé¢‘ç¹ï¼Œè¯·ç­‰å¾… 3 分钟åŽå†è¯•ã€‚ +resent_limit_prompt=您请求å‘é€æ¿€æ´»é‚®ä»¶è¿‡äºŽé¢‘ç¹ï¼Œè¯·ç­‰å¾… 3 分钟åŽå†è¯•ï¼ has_unconfirmed_mail=%s 您好，系统检测到您有一å°å‘é€è‡³ %s 但未被确认的邮件。如果您未收到激活邮件，或需è¦é‡æ–°å‘é€ï¼Œè¯·å•å‡»ä¸‹æ–¹çš„按钮。 resend_mail=å•å‡»æ­¤å¤„é‡æ–°å‘é€ç¡®è®¤é‚®ä»¶ email_not_associate=您输入的邮箱地å€æœªè¢«å…³è”到任何å¸å·ï¼ @@ -433,7 +426,7 @@ invalid_code=此确认密钥无效或已过期。 invalid_code_forgot_password=你的确认ç æ— æ•ˆæˆ–者已过期，点击 这里 开始新的会è¯ã€‚ invalid_password=您的密ç ä¸Žç”¨äºŽåˆ›å»ºè´¦æˆ·çš„密ç ä¸åŒ¹é…。 reset_password_helper=æ¢å¤è´¦æˆ· -reset_password_wrong_user=您以 %s 登录，但æ¢å¤è´¦å·é“¾æŽ¥é€‚用于 %s +reset_password_wrong_user=您以 %s 登录，但æ¢å¤è´¦å·é“¾æŽ¥æ˜¯ç”¨äºŽ %s。 password_too_short=密ç é•¿åº¦ä¸èƒ½å°‘于 %d ä½ã€‚ non_local_account=éžæœ¬åœ°å¸æˆ·ä¸èƒ½é€šè¿‡ Forgejo çš„ web ç•Œé¢æ›´æ”¹å¯†ç ã€‚ verify=éªŒè¯ @@ -450,7 +443,7 @@ oauth_signup_submit=完æˆè´¦å· oauth_signin_tab=绑定到现有å¸å· oauth_signin_title=登录以授æƒç»‘定å¸æˆ· oauth_signin_submit=ç»‘å®šè´¦å· -oauth.signin.error=处ç†æŽˆæƒè¯·æ±‚时出错。如果此错误ä»ç„¶å­˜åœ¨ï¼Œè¯·è”系站点管ç†å‘˜ã€‚ +oauth.signin.error=处ç†æŽˆæƒè¯·æ±‚时出错。 如果此错误ä»ç„¶å­˜â€‹â€‹åœ¨ï¼Œè¯·è”系站点管ç†å‘˜ã€‚ oauth.signin.error.access_denied=授æƒè¯·æ±‚被拒ç»ã€‚ oauth.signin.error.temporarily_unavailable=授æƒå¤±è´¥ï¼Œå› ä¸ºè®¤è¯æœåŠ¡å™¨æš‚æ—¶ä¸å¯ç”¨ã€‚请ç¨åŽå†è¯•ã€‚ openid_connect_submit=连接 @@ -464,7 +457,7 @@ disable_forgot_password_mail_admin=å¸æˆ·æ¢å¤ä»…在设置电å­é‚®ä»¶åŽå¯ç”¨ email_domain_blacklisted=您ä¸èƒ½ä½¿ç”¨æ‚¨çš„电å­é‚®ä»¶åœ°å€æ³¨å†Œã€‚ authorize_application=åº”ç”¨æŽˆæƒ authorize_redirect_notice=如果您授æƒæ­¤åº”用，您将会被é‡å®šå‘到 %s。 -authorize_application_created_by=此应用由 %s 创建。 +authorize_application_created_by=此应用由%s创建。 authorize_application_description=如果您å…许，它将能够读å–和修改您的所有å¸æˆ·ä¿¡æ¯ï¼ŒåŒ…括ç§äººä»“库和组织。 authorize_title=æŽˆæƒ %s 访问您的å¸æˆ·ï¼Ÿ authorization_failed=授æƒå¤±è´¥ @@ -478,13 +471,11 @@ change_unconfirmed_email_summary = 修改用æ¥æŽ¥æ”¶æ¿€æ´»é‚®ä»¶çš„é‚®ç®±åœ°å€ change_unconfirmed_email_error = 无法修改邮箱地å€ï¼š %v tab_signin = 登录 tab_signup = 注册 -hint_login = å·²ç»æœ‰è´¦æˆ·äº†å—？立å³ç™»å½•ï¼ +hint_login = 已创建账户？立å³ç™»å½• back_to_sign_in = 返回登录 sign_in_openid = 继续使用 OpenID sign_up_button = ç«‹å³æ³¨å†Œã€‚ hint_register = 需è¦è´¦å·ï¼Ÿç«‹å³æ³¨å†Œã€‚ -unauthorized_credentials = 凭æ®ä¸æ­£ç¡®æˆ–已过期。请é‡è¯•æ‚¨çš„命令，或查看 %s 以获å–æ›´å¤šä¿¡æ¯ -use_onetime_code = ä½¿ç”¨ä¸€æ¬¡æ€§ä»£ç  [mail] view_it_on=在 %s 上查看 @@ -513,8 +504,8 @@ reset_password.text=如果此请求是您本人作出的，则请在 %s register_success=注册æˆåŠŸ -issue_assigned.pull=@%[1]s 已将仓库 %[3]s 中的åˆå¹¶è¯·æ±‚ %[2]s 指派给您。 -issue_assigned.issue=@%[1]s 已将仓库 %[3]s ä¸­çš„å·¥å• %[2]s 指派给您。 +issue_assigned.pull=@%[1]s 已将仓库 %[3]s 中的åˆå¹¶è¯·æ±‚ %[2]s 指派给您 +issue_assigned.issue=@%[1]s 已将仓库 %[3]s ä¸­çš„å·¥å• %[2]s 指派给您 issue.x_mentioned_you=@%s æ到了您： issue.action.force_push=%[1]s 强制从 %[3]s æŽ¨é€ %[2]s 至 [4]s。 @@ -526,8 +517,8 @@ issue.action.merge=@%[1]s å°† #%[2]d åˆå¹¶åˆ° #%[3]s。 issue.action.approve=@%[1]s 批准了此åˆå¹¶è¯·æ±‚。 issue.action.reject=@%[1]s 请求更改此åˆå¹¶è¯·æ±‚。 issue.action.review=@%[1]s 评论了这个åˆå¹¶è¯·æ±‚。 -issue.action.review_dismissed=@%[1]s å–消了 %[2]s 对此åˆå¹¶è¯·æ±‚的上一个评审。 -issue.action.ready_for_review=@%[1]s 标记了此åˆå¹¶è¯·æ±‚为已准备好接å—评审。 +issue.action.review_dismissed=@%[1]s æ‹’ç»äº† %[2]s 对此åˆå¹¶è¯·æ±‚的上个审核。 +issue.action.ready_for_review=@%[1]s 标记此åˆå¹¶è¯·æ±‚已评审通过。 issue.action.new=@%[1]s 创建了 #%[2]d. issue.in_tree_path=在 %s 中： @@ -600,14 +591,14 @@ Content=内容 SSPISeparatorReplacement=分隔符 SSPIDefaultLanguage=默认语言 -require_error=` ä¸èƒ½ä¸ºç©ºã€‚` -alpha_dash_error=` 应åªåŒ…å«å­—æ¯æ•°å­—ã€ç ´æŠ˜å·ï¼ˆâ€œ-â€ï¼‰å’Œä¸‹åˆ’线（“_â€ï¼‰å­—符。` +require_error=ä¸èƒ½ä¸ºç©ºã€‚ +alpha_dash_error=` åªå…许包å«å­—æ¯æ•°å­—ã€ç ´æŠ˜å·ï¼ˆâ€œ-â€ï¼‰å’Œä¸‹åˆ’线（“_â€ï¼‰å­—符。 alpha_dash_dot_error=` 应该åªåŒ…å«åŠè§’å­—æ¯ã€æ•°å­—ã€ç ´æŠ˜å·ï¼ˆâ€œ-â€ï¼‰ã€ä¸‹åˆ’线（“_â€ï¼‰å’ŒåŠè§’å¥å·ï¼ˆâ€œ.â€ï¼‰ 。` git_ref_name_error=` 必须是格å¼è‰¯å¥½çš„ git 引用å称。` -size_error=`长度必须为 %s。` -min_size_error=`长度最å°ä¸º %s 个字符。` -max_size_error=`长度最大为 %s 个字符。` -email_error=`ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„邮箱地å€ã€‚` +size_error=长度必须为 %s。 +min_size_error=长度最å°ä¸º %s 个字符。 +max_size_error=长度最大为 %s 个字符。 +email_error=ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„邮箱地å€ã€‚ url_error=`'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ URL。` include_error=`必须包å«å­å­—符串 "%s"。` glob_pattern_error=`匹é…模å¼æ— æ•ˆï¼š%s.` @@ -617,7 +608,7 @@ invalid_group_team_map_error=`映射无效： %s` unknown_error=未知错误： captcha_incorrect=验è¯ç ä¸æ­£ç¡®ã€‚ password_not_match=密ç ä¸åŒ¹é…。 -lang_select_error=从列表中选择一个语言。 +lang_select_error=从列表中选出语言 username_been_taken=用户å已被使用。 username_change_not_local_user=éžæœ¬åœ°ç”¨æˆ·ä¸å…许更改用户å。 @@ -642,12 +633,12 @@ password_lowercase_one=至少一个å°å†™å­—符 password_uppercase_one=至少一个大写字符 password_digit_one=至少一个数字 password_special_one=至少一个特殊字符(标点符å·ï¼Œæ‹¬å·ï¼Œå¼•å·ç­‰) -enterred_invalid_repo_name=输入的仓库å称ä¸æ­£ç¡®ã€‚ +enterred_invalid_repo_name=输入的仓库å称ä¸æ­£ç¡® enterred_invalid_org_name=您输入的组织å称ä¸æ­£ç¡®ã€‚ enterred_invalid_owner_name=新的所有者å称无效。 -enterred_invalid_password=输入的密ç ä¸æ­£ç¡®ã€‚ -user_not_exist=该用户ä¸å­˜åœ¨ã€‚ -team_not_exist=团队ä¸å­˜åœ¨ã€‚ +enterred_invalid_password=输入的密ç ä¸æ­£ç¡® +user_not_exist=该用户ä¸å­˜åœ¨ +team_not_exist=团队ä¸å­˜åœ¨ last_org_owner=您ä¸èƒ½ä»Žâ€œæ‰€æœ‰è€…â€å›¢é˜Ÿä¸­åˆ é™¤æœ€åŽä¸€ä¸ªç”¨æˆ·ã€‚组织中必须至少有一个所有者。 cannot_add_org_to_team=组织ä¸èƒ½è¢«åŠ å…¥åˆ°å›¢é˜Ÿä¸­ã€‚ duplicate_invite_to_team=此用户已被邀请为团队æˆå‘˜ã€‚ @@ -668,7 +659,9 @@ org_still_own_packages=该组织下ä»æœ‰è½¯ä»¶åŒ…，请先删除它们。 target_branch_not_exist=目标分支ä¸å­˜åœ¨ã€‚ username_error_no_dots = ` åªèƒ½åŒ…å«è‹±æ–‡å­—æ¯ä¸Žæ•°å­—（“0-9â€ã€â€œa-zâ€ã€â€œA-Zâ€ï¼‰ã€æ¨ªæ ï¼ˆâ€œ-â€ï¼‰ 与下划线（“_â€ï¼‰ã€‚ 开头与结尾的字符åªèƒ½ä½¿ç”¨è‹±æ–‡å­—æ¯æˆ–数字，且ä¸èƒ½åŒ…å«è¿žç»­çš„éžå­—æ¯éžæ•°å­—字符。` -admin_cannot_delete_self=当您是管ç†å‘˜æ—¶ï¼Œæ‚¨ä¸èƒ½åˆ é™¤è‡ªå·±ã€‚请先移除您的管ç†å‘˜æƒé™ã€‚ +admin_cannot_delete_self = 您无法以管ç†å‘˜çš„身份删除自己。请先移除您的管ç†å‘˜æƒé™ã€‚ + +admin_cannot_delete_self=当您是管ç†å‘˜æ—¶ï¼Œæ‚¨ä¸èƒ½åˆ é™¤è‡ªå·±ã€‚请先移除您的管ç†å‘˜æƒé™ unsupported_login_type = 该账å·ä½¿ç”¨çš„登录方å¼ä¸æ”¯æŒåˆ é™¤æ­¤è´¦æˆ·ã€‚ unset_password = 当å‰ç™»å½•ç”¨æˆ·å°šæœªè®¾ç½®å¯†ç ã€‚ required_prefix = 输入必须以“%sâ€å¼€å¤´ @@ -682,7 +675,7 @@ Pronouns = 代称 Biography = 简历 [user] -change_avatar=修改头åƒâ€¦ +change_avatar=ä¿®æ”¹å¤´åƒ joined_on=加入于 %s repositories=仓库列表 activity=公开活动 @@ -713,7 +706,7 @@ follow_blocked_user = 您ä¸èƒ½å…³æ³¨è¯¥ç”¨æˆ·ï¼Œå› ä¸ºæ‚¨å·²å±è”½è¯¥ç”¨æˆ·æˆ– block = å±è”½ unblock = 解除å±è”½ block_user.detail_3 = 您将无法将彼此添加为仓库å作者。 -followers_one = %d 关注者 +followers_one = %d ä½å…³æ³¨è€… following_one = %d 关注 public_activity.visibility_hint.self_public = 您的活动对所有人都是å¯è§çš„，但在ç§äººç©ºé—´ä¸­çš„交互除外。é…置。 public_activity.visibility_hint.admin_public = 此活动对所有人å¯è§ï¼Œä½†ä½œä¸ºç®¡ç†å‘˜ï¼Œæ‚¨è¿˜å¯ä»¥çœ‹åˆ°ç§äººç©ºé—´ä¸­çš„交互。 @@ -723,7 +716,6 @@ followers.title.one = 关注者 followers.title.few = 关注者 following.title.one = 关注 following.title.few = 关注 -public_activity.visibility_hint.self_private_profile = 由于您的个人资料是ç§æœ‰çš„，因此您的活动åªæœ‰æ‚¨å’Œå®žä¾‹ç®¡ç†å‘˜å¯è§ã€‚é…置。 [settings] profile=ä¸ªäººä¿¡æ¯ @@ -745,9 +737,9 @@ uid=UID webauthn=两步验è¯ï¼ˆå®‰å…¨å¯†é’¥ï¼‰ public_profile=å…¬å¼€ä¿¡æ¯ -biography_placeholder=å‘他人介ç»ä¸€ä¸‹ä½ è‡ªå·±ï¼ï¼ˆæ”¯æŒ Markdown） +biography_placeholder=å‘Šè¯‰æˆ‘ä»¬ä¸€ç‚¹æ‚¨è‡ªå·±ï¼ (您å¯ä»¥ä½¿ç”¨Markdown) location_placeholder=与他人分享你的大概ä½ç½® -profile_desc=关于您 +profile_desc=控制您的个人资料对其他用户的显示方å¼ã€‚您的主è¦ç”µå­é‚®ä»¶åœ°å€å°†ç”¨äºŽé€šçŸ¥ã€å¯†ç æ¢å¤å’ŒåŸºäºŽç½‘页界é¢çš„ Git æ“作。 password_username_disabled=ä¸å…许éžæœ¬åœ°ç”¨æˆ·æ›´æ”¹ä»–们的用户å。更多详情请è”系您的系统管ç†å‘˜ã€‚ full_name=å…¨å website=个人网站 @@ -757,17 +749,17 @@ update_profile=更新个人资料 update_language=更改语言 update_language_not_found=语言 %s ä¸å¯ç”¨ã€‚ update_language_success=语言已更新。 -update_profile_success=您的个人资料已ç»æ›´æ–°ã€‚ +update_profile_success=您的资料信æ¯å·²ç»æ›´æ–° change_username=您的用户å已更改。 change_username_prompt=注æ„：更改您的用户å也更改您的å¸æˆ· URL。 -change_username_redirect_prompt=在其他用户使用您的旧用户å注册å‰ï¼Œæ­¤æ—§ç”¨æˆ·å将会é‡å®šå‘到您的新用户å。 +change_username_redirect_prompt=在其他用户使用您的旧用户å注册å‰ï¼Œæ­¤æ—§ç”¨æˆ·å将会é‡å®šå‘到您的新用户å continue=继续æ“作 cancel=å–消æ“作 language=ç•Œé¢è¯­è¨€ ui=主题 -hidden_comment_types=éšè—的注释类型 -hidden_comment_types_description=此处选中的注释类型ä¸ä¼šæ˜¾ç¤ºåœ¨å·¥å•é¡µé¢ä¸­ã€‚例如，勾选“标签â€å°†ç§»é™¤æ‰€æœ‰â€œ<用户>添加/删除了<标签>â€æ³¨é‡Šã€‚ -hidden_comment_types.ref_tooltip=注释此问题在何处被æåŠè¿‡ï¼Œå¦‚å¦ä¸€ä¸ªé—®é¢˜ã€ä»£ç æ交等… +hidden_comment_types=éšè—的评论类型 +hidden_comment_types_description=此处选中的注释类型ä¸ä¼šæ˜¾ç¤ºåœ¨é—®é¢˜é¡µé¢ä¸­ã€‚比如，勾选â€æ ‡ç­¾â€œåˆ é™¤æ‰€æœ‰ " 添加/删除的 diff --git a/templates/repo/diff/comments.tmpl b/templates/repo/diff/comments.tmpl index b36f20269e..2e0c85d0a1 100644 --- a/templates/repo/diff/comments.tmpl +++ b/templates/repo/diff/comments.tmpl @@ -1,6 +1,6 @@ {{range .comments}} -{{$createdStr:= DateUtils.TimeSince .CreatedUnix}} +{{$createdStr:= TimeSinceUnix .CreatedUnix ctx.Locale}}
{{if .OriginalAuthor}} {{ctx.AvatarUtils.Avatar nil}} @@ -53,7 +53,7 @@
-
+
{{if .RenderedContent}} {{.RenderedContent}} {{else}} diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl index 024577afcc..110f8ac60b 100644 --- a/templates/repo/diff/compare.tmpl +++ b/templates/repo/diff/compare.tmpl @@ -212,13 +212,9 @@ {{if .Repository.ArchivedUnix.IsZero}} {{ctx.Locale.Tr "repo.archive.title"}} {{else}} - {{ctx.Locale.Tr "repo.archive.title_date" (DateUtils.AbsoluteLong .Repository.ArchivedUnix)}} + {{ctx.Locale.Tr "repo.archive.title_date" (DateTime "long" .Repository.ArchivedUnix)}} {{end}}
- {{else}} -
- {{ctx.Locale.Tr "repo.pulls.sign_in_require" .SignInLink}} -
{{end}} {{if $.IsSigned}}
diff --git a/templates/repo/diff/options_dropdown.tmpl b/templates/repo/diff/options_dropdown.tmpl index 44b0743e09..09b7b80e41 100644 --- a/templates/repo/diff/options_dropdown.tmpl +++ b/templates/repo/diff/options_dropdown.tmpl @@ -1,6 +1,7 @@
{{svg "octicon-kebab-horizontal"}}
+ {{ctx.Locale.Tr "repo.diff.show_diff_stats"}} {{if .Issue.Index}} {{ctx.Locale.Tr "repo.diff.download_patch"}} {{ctx.Locale.Tr "repo.diff.download_diff"}} @@ -10,9 +11,6 @@ {{else if .Commit.ID.String}} {{ctx.Locale.Tr "repo.diff.download_patch"}} {{ctx.Locale.Tr "repo.diff.download_diff"}} - {{else if .Diff}} - {{ctx.Locale.Tr "repo.diff.download_patch"}} - {{ctx.Locale.Tr "repo.diff.download_diff"}} {{end}} {{ctx.Locale.Tr "repo.pulls.expand_files"}} {{ctx.Locale.Tr "repo.pulls.collapse_files"}} diff --git a/templates/repo/editor/commit_form.tmpl b/templates/repo/editor/commit_form.tmpl index fc04289b70..9f81b1d3a0 100644 --- a/templates/repo/editor/commit_form.tmpl +++ b/templates/repo/editor/commit_form.tmpl @@ -9,7 +9,7 @@ {{ctx.Locale.Tr "repo.editor.commit_changes"}} {{- end}}
- +
@@ -26,7 +26,7 @@
{{/* it should match the code in issue-home.js */}} @@ -47,7 +53,7 @@ {{if .Repository.ArchivedUnix.IsZero}} {{ctx.Locale.Tr "repo.archive.title"}} {{else}} - {{ctx.Locale.Tr "repo.archive.title_date" (DateUtils.AbsoluteLong .Repository.ArchivedUnix)}} + {{ctx.Locale.Tr "repo.archive.title_date" (DateTime "long" .Repository.ArchivedUnix)}} {{end}}
{{end}} @@ -107,7 +113,6 @@ / {{- if eq $i $l -}} {{$v}} - {{- else -}} {{$p := index $.Paths $i}}{{$v}} {{- end -}} @@ -152,22 +157,6 @@ {{else if .IsBlame}} {{template "repo/blame" .}} {{else}}{{/* IsViewDirectory */}} - {{/* display the search bar only if */}} - {{$isCommit := StringUtils.HasPrefix .BranchNameSubURL "commit"}} - {{if and (not $isCommit) (or .CodeIndexerDisabled (and (not .TagName) (eq .Repository.DefaultBranch .BranchName)))}} -
-
- - {{template "shared/search/combo_multi" - dict - "Value" .Keyword - "Disabled" .CodeIndexerUnavailable - "Placeholder" (ctx.Locale.Tr "search.code_kind") - "Selected" (index .CodeSearchOptions 0) - "Options" .CodeSearchOptions}} -
-
- {{end}} {{template "repo/view_list" .}} {{end}}
diff --git a/templates/repo/issue/card.tmpl b/templates/repo/issue/card.tmpl index c29c14a54b..0b255d6705 100644 --- a/templates/repo/issue/card.tmpl +++ b/templates/repo/issue/card.tmpl @@ -24,7 +24,7 @@
{{if not $.Page.Repository}}{{.Repo.FullName}}{{end}}#{{.Index}} - {{$timeStr := DateUtils.TimeSince .GetLastEventTimestamp}} + {{$timeStr := TimeSinceUnix .GetLastEventTimestamp ctx.Locale}} {{if .OriginalAuthor}} {{ctx.Locale.Tr .GetLastEventLabelFake $timeStr .OriginalAuthor}} {{else if gt .Poster.ID 0}} diff --git a/templates/repo/issue/filter_actions.tmpl b/templates/repo/issue/filter_actions.tmpl index 58b1ef8ecd..a341448bcc 100644 --- a/templates/repo/issue/filter_actions.tmpl +++ b/templates/repo/issue/filter_actions.tmpl @@ -1,9 +1,9 @@
{{if not .Repository.IsArchived}} - {{if and .IsShowClosed.Has .IsShowClosed.Value}} + {{if .IsShowClosed}} - {{else if and .IsShowClosed.Has (not .IsShowClosed.Value)}} + {{else}} {{end}} {{if $.IsRepoAdmin}} diff --git a/templates/repo/issue/filter_list.tmpl b/templates/repo/issue/filter_list.tmpl index 0e1d8f8036..09f87b582f 100644 --- a/templates/repo/issue/filter_list.tmpl +++ b/templates/repo/issue/filter_list.tmpl @@ -146,11 +146,13 @@ {{svg "octicon-triangle-down" 14 "dropdown icon"}}
- {{ctx.Locale.Tr "repo.issues.filter_sort.relevance"}} - {{$o := .}} - {{range $opt := StringUtils.Make "latest" "oldest" "recentupdate" "leastupdate" "mostcomment" "leastcomment" "nearduedate" "farduedate"}} - {{$text := ctx.Locale.Tr (printf "repo.issues.filter_sort.%s" $opt)}} - {{$text}} - {{end}} + {{ctx.Locale.Tr "repo.issues.filter_sort.latest"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.recentupdate"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.leastupdate"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.mostcomment"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.leastcomment"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.nearduedate"}} + {{ctx.Locale.Tr "repo.issues.filter_sort.farduedate"}}
diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index 8b8b194f46..e5dc8cb605 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -30,7 +30,7 @@
- {{$closedDate:= DateUtils.TimeSince .Milestone.ClosedDateUnix}} + {{$closedDate:= TimeSinceUnix .Milestone.ClosedDateUnix ctx.Locale}} {{if .IsClosed}} {{svg "octicon-clock"}} {{ctx.Locale.Tr "repo.milestones.closed" $closedDate}} {{else}} @@ -38,7 +38,7 @@ {{if .Milestone.DeadlineString}} {{svg "octicon-calendar"}} - {{DateUtils.AbsoluteShort (.Milestone.DeadlineString|DateUtils.ParseLegacy)}} + {{DateTime "short" .Milestone.DeadlineString}} {{else}} {{svg "octicon-calendar"}} diff --git a/templates/repo/issue/milestone_new.tmpl b/templates/repo/issue/milestone_new.tmpl index 4a5f0a15ba..9f32df00e3 100644 --- a/templates/repo/issue/milestone_new.tmpl +++ b/templates/repo/issue/milestone_new.tmpl @@ -35,15 +35,8 @@
- {{template "shared/combomarkdowneditor" (dict - "MarkdownPreviewUrl" (print .Repository.Link "/markup") - "MarkdownPreviewContext" .RepoLink - "TextareaName" "content" - "TextareaPlaceholder" (ctx.Locale.Tr "repo.milestones.desc") - "TextareaAriaLabel" (ctx.Locale.Tr "repo.milestones.desc") - "TextareaContent" .content - "EasyMDE" true - )}} + +
diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index fab483c79d..63a6f6b26a 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -49,19 +49,19 @@ {{if .UpdatedUnix}}
{{svg "octicon-clock"}} - {{ctx.Locale.Tr "repo.milestones.update_ago" (DateUtils.TimeSince .UpdatedUnix)}} + {{ctx.Locale.Tr "repo.milestones.update_ago" (TimeSinceUnix .UpdatedUnix ctx.Locale)}}
{{end}}
{{if .IsClosed}} - {{$closedDate:= DateUtils.TimeSince .ClosedDateUnix}} + {{$closedDate:= TimeSinceUnix .ClosedDateUnix ctx.Locale}} {{svg "octicon-clock" 14}} {{ctx.Locale.Tr "repo.milestones.closed" $closedDate}} {{else}} {{if .DeadlineString}} {{svg "octicon-calendar" 14}} - {{DateUtils.AbsoluteShort (.DeadlineString|DateUtils.ParseLegacy)}} + {{DateTime "short" .DeadlineString}} {{else}} {{svg "octicon-calendar" 14}} diff --git a/templates/repo/issue/navbar.tmpl b/templates/repo/issue/navbar.tmpl index 4d90ca3c0e..30e42c77cc 100644 --- a/templates/repo/issue/navbar.tmpl +++ b/templates/repo/issue/navbar.tmpl @@ -1,4 +1,4 @@ -
+

{{ctx.Locale.Tr "repo.labels"}} {{ctx.Locale.Tr "repo.milestones"}} -

+ diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index c2cf4ee7a7..fe10c1f9b9 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -140,7 +140,42 @@
{{end}}
- {{template "repo/issue/view_content/sidebar/assignees" dict "isExistingIssue" false "." .}} + +
+ + {{ctx.Locale.Tr "repo.issues.new.assignees"}} + {{if .HasIssuesOrPullsWritePermission}} + {{svg "octicon-gear" 16 "tw-ml-1"}} + {{end}} + +
+
+ {{svg "octicon-search" 16}} + +
+
{{ctx.Locale.Tr "repo.issues.new.clear_assignees"}}
+ {{range .Assignees}} + + {{svg "octicon-check"}} + + {{ctx.AvatarUtils.Avatar . 28 "tw-mr-2"}}{{template "repo/search_name" .}} + + + {{end}} +
+
+
+ + {{ctx.Locale.Tr "repo.issues.new.no_assignees"}} + +
+ {{range .Assignees}} + + {{ctx.AvatarUtils.Avatar . 28 "tw-mr-2 tw-align-middle"}}{{.GetDisplayName}} + + {{end}} +
+
{{if and .PageIsComparePull (not (eq .HeadRepo.FullName .BaseCompareRepo.FullName)) .CanWriteToHeadRepo}}
diff --git a/templates/repo/issue/openclose.tmpl b/templates/repo/issue/openclose.tmpl index efe4fa6756..eb2d6e09ee 100644 --- a/templates/repo/issue/openclose.tmpl +++ b/templates/repo/issue/openclose.tmpl @@ -1,5 +1,5 @@ -
- +
+ {{if .PageIsMilestones}} {{svg "octicon-milestone" 16 "tw-mr-2"}} {{else if .PageIsPullList}} @@ -9,14 +9,8 @@ {{end}} {{ctx.Locale.PrettyNumber .OpenCount}} {{ctx.Locale.Tr "repo.issues.open_title"}} - + {{svg "octicon-check" 16 "tw-mr-2"}} {{ctx.Locale.PrettyNumber .ClosedCount}} {{ctx.Locale.Tr "repo.issues.closed_title"}} - {{if not .PageIsMilestones}} - - {{svg "octicon-eye" 16 "tw-mr-2"}} - {{ctx.Locale.PrettyNumber (.AllCount)}} {{ctx.Locale.Tr "repo.issues.all_title"}} - - {{end}}
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 8eac2d78cf..683dea8425 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -6,7 +6,7 @@ - {{$createdStr:= DateUtils.TimeSince .Issue.CreatedUnix}} + {{$createdStr:= TimeSinceUnix .Issue.CreatedUnix ctx.Locale}}
@@ -52,7 +52,7 @@
-
+
{{if .Issue.RenderedContent}} {{.Issue.RenderedContent}} {{else}} @@ -90,7 +90,7 @@ {{template "repo/issue/comment_tab" .}} {{.CsrfTokenHtml}}
-
+
{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .DisableStatusChange)}} {{if .Issue.IsClosed}} - + +
diff --git a/templates/repo/issue/view_content/add_reaction.tmpl b/templates/repo/issue/view_content/add_reaction.tmpl index 5d4aa2298e..37931f287e 100644 --- a/templates/repo/issue/view_content/add_reaction.tmpl +++ b/templates/repo/issue/view_content/add_reaction.tmpl @@ -1,5 +1,5 @@ {{if .ctxData.IsSigned}} -
+
{{svg "octicon-smiley"}} diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index c8eabb9345..08c83c07d7 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -1,7 +1,7 @@ {{template "base/alert"}} {{range .Issue.Comments}} {{if call $.ShouldShowCommentType .Type}} - {{$createdStr:= DateUtils.TimeSince .CreatedUnix}} + {{$createdStr:= TimeSinceUnix .CreatedUnix ctx.Locale}} + {{$teamName := "Ghost Team"}} + {{if .AssigneeTeam}} + {{$teamName = .AssigneeTeam.Name}} + {{end}} + {{if .RemovedAssignee}} + {{ctx.Locale.Tr "repo.issues.review.remove_review_request" $teamName $createdStr}} + {{else}} + {{ctx.Locale.Tr "repo.issues.review.add_review_request" $teamName $createdStr}} + {{end}} + {{end}} + +
{{else if and (eq .Type 29) (or (gt .CommitsNum 0) .IsForcePush)}} {{if and .Issue.IsClosed (gt .ID $.LatestCloseCommentID)}} @@ -551,7 +561,7 @@ {{template "shared/user/authorlink" .Poster}} {{if .IsForcePush}} - {{ctx.Locale.Tr "repo.issues.force_push_codes" $.Issue.PullRequest.HeadBranch (ShortSha .OldCommit) ($.Issue.Repo.CommitLink .OldCommit) (ShortSha .NewCommit) ($.Issue.Repo.CommitLink .NewCommit) $createdStr "ui sha"}} + {{ctx.Locale.Tr "repo.issues.force_push_codes" $.Issue.PullRequest.HeadBranch (ShortSha .OldCommit) ($.Issue.Repo.CommitLink .OldCommit) (ShortSha .NewCommit) ($.Issue.Repo.CommitLink .NewCommit) $createdStr}} {{else}} {{ctx.Locale.TrN (len .Commits) "repo.issues.push_commit_1" "repo.issues.push_commits_n" (len .Commits) $createdStr}} {{end}} diff --git a/templates/repo/issue/view_content/context_menu.tmpl b/templates/repo/issue/view_content/context_menu.tmpl index 5fc5af400f..4afd73c371 100644 --- a/templates/repo/issue/view_content/context_menu.tmpl +++ b/templates/repo/issue/view_content/context_menu.tmpl @@ -1,4 +1,4 @@ -
+
{{svg "octicon-kebab-horizontal"}} @@ -11,7 +11,7 @@ {{end}}
{{ctx.Locale.Tr "repo.issues.context.copy_link"}}
{{if and .ctxData.IsSigned (not .ctxData.Repository.IsArchived)}} -
{{ctx.Locale.Tr "repo.issues.context.quote_reply"}}
+
{{ctx.Locale.Tr "repo.issues.context.quote_reply"}}
{{if not .ctxData.UnitIssuesGlobalDisabled}}
{{ctx.Locale.Tr "repo.issues.context.reference_issue"}}
{{end}} diff --git a/templates/repo/issue/view_content/conversation.tmpl b/templates/repo/issue/view_content/conversation.tmpl index 4f70e799a2..c788a61132 100644 --- a/templates/repo/issue/view_content/conversation.tmpl +++ b/templates/repo/issue/view_content/conversation.tmpl @@ -51,7 +51,7 @@
{{range .comments}} - {{$createdSubStr:= DateUtils.TimeSince .CreatedUnix}} + {{$createdSubStr:= TimeSinceUnix .CreatedUnix ctx.Locale}}
@@ -85,7 +85,7 @@
-
+
{{if .RenderedContent}} {{.RenderedContent}} {{else}} @@ -106,7 +106,7 @@
{{end}}
-
+
{{if $resolved}}
@@ -115,7 +115,7 @@
{{end}}
-
+
{{if and $.CanMarkConversation $isNotPending}}
{{svg "octicon-triangle-down"}}
- - {{ctx.Locale.Tr "repo.pulls.update_branch"}} - - - {{ctx.Locale.Tr "repo.pulls.update_branch_rebase"}} - + {{ctx.Locale.Tr "repo.pulls.update_branch"}} + {{ctx.Locale.Tr "repo.pulls.update_branch_rebase"}}
{{end}} {{if and $.UpdateAllowed (not $.UpdateByRebaseAllowed)}} -
+ {{$.CsrfTokenHtml}}
@@ -126,7 +126,7 @@ {{end}} {{else}} - {{$createdStr:= DateUtils.TimeSince .Issue.CreatedUnix}} + {{$createdStr:= TimeSinceUnix .Issue.CreatedUnix ctx.Locale}} {{if .Issue.OriginalAuthor}} {{ctx.Locale.Tr "repo.issues.opened_by_fake" $createdStr .Issue.OriginalAuthor}} diff --git a/templates/repo/pulse.tmpl b/templates/repo/pulse.tmpl index 082fc8eb92..3554cf6a19 100644 --- a/templates/repo/pulse.tmpl +++ b/templates/repo/pulse.tmpl @@ -1,5 +1,5 @@

- {{DateUtils.AbsoluteLong .DateFrom}} - {{DateUtils.AbsoluteLong .DateUntil}} + {{DateTime "long" .DateFrom}} - {{DateTime "long" .DateUntil}}
@@ -135,7 +135,7 @@ {{.TagName}} {{.Title | RenderEmoji $.Context | RenderCodeBlock}} {{end}} - {{DateUtils.TimeSince .CreatedUnix}} + {{TimeSinceUnix .CreatedUnix ctx.Locale}}

{{end}}
@@ -154,7 +154,7 @@

{{ctx.Locale.Tr "repo.activity.merged_prs_label"}} #{{.Index}} {{RenderRefIssueTitle $.Context .Issue.Title}} - {{DateUtils.TimeSince .MergedUnix}} + {{TimeSinceUnix .MergedUnix ctx.Locale}}

{{end}}
@@ -173,7 +173,7 @@

{{ctx.Locale.Tr "repo.activity.opened_prs_label"}} #{{.Index}} {{RenderRefIssueTitle $.Context .Issue.Title}} - {{DateUtils.TimeSince .Issue.CreatedUnix}} + {{TimeSinceUnix .Issue.CreatedUnix ctx.Locale}}

{{end}}

@@ -192,7 +192,7 @@

{{ctx.Locale.Tr "repo.activity.closed_issue_label"}} #{{.Index}} {{RenderRefIssueTitle $.Context .Title}} - {{DateUtils.TimeSince .ClosedUnix}} + {{TimeSinceUnix .ClosedUnix ctx.Locale}}

{{end}}
@@ -211,7 +211,7 @@

{{ctx.Locale.Tr "repo.activity.new_issue_label"}} #{{.Index}} {{RenderRefIssueTitle $.Context .Title}} - {{DateUtils.TimeSince .CreatedUnix}} + {{TimeSinceUnix .CreatedUnix ctx.Locale}}

{{end}}
@@ -232,7 +232,7 @@ {{else}} {{RenderRefIssueTitle $.Context .Title}} {{end}} - {{DateUtils.TimeSince .UpdatedUnix}} + {{TimeSinceUnix .UpdatedUnix ctx.Locale}}

{{end}}
diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index a760e0730e..cc5c6702f3 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -51,7 +51,7 @@ {{ctx.Locale.Tr "repo.released_this"}} {{if $release.CreatedUnix}} - {{DateUtils.TimeSince $release.CreatedUnix}} + {{TimeSinceUnix $release.CreatedUnix ctx.Locale}} {{end}} {{if and (not $release.IsDraft) ($.Permission.CanRead $.UnitTypeCode)}} | {{ctx.Locale.Tr "repo.release.ahead.commits" $release.NumCommitsBehind}} {{ctx.Locale.Tr "repo.release.ahead.target" $release.TargetBehind}} @@ -84,7 +84,7 @@
  • - {{svg "octicon-file-zip" 16 "tw-mr-1"}}{{ctx.Locale.Tr "repo.release.source_code"}} (TAR.GZ) + {{svg "octicon-file-zip" 16 "tw-mr-1"}}{{ctx.Locale.Tr "repo.release.source_code"}} (ZIP)
    {{ctx.Locale.TrN .Release.ArchiveDownloadCount.TarGz "repo.release.download_count_one" "repo.release.download_count_few" (ctx.Locale.PrettyNumber .Release.ArchiveDownloadCount.TarGz)}} diff --git a/templates/repo/release_tag_header.tmpl b/templates/repo/release_tag_header.tmpl index 63d0689c50..dafe9f2fa6 100644 --- a/templates/repo/release_tag_header.tmpl +++ b/templates/repo/release_tag_header.tmpl @@ -5,20 +5,15 @@

    - {{ctx.Locale.TrN .NumReleases "repo.n_release_one" "repo.n_release_few" (ctx.Locale.PrettyNumber .NumReleases)}} + {{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)}} + {{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"}} {{end}} diff --git a/templates/repo/search.tmpl b/templates/repo/search.tmpl index 34707bc8da..6d114c81e4 100644 --- a/templates/repo/search.tmpl +++ b/templates/repo/search.tmpl @@ -5,7 +5,7 @@ {{if $.CodeIndexerDisabled}} {{$branchURLPrefix := printf "%s/search/branch/" $.RepoLink}} {{$tagURLPrefix := printf "%s/search/tag/" $.RepoLink}} - {{$suffix := printf "?q=%s&mode=%s" (.Keyword|QueryEscape) .CodeSearchMode}} + {{$suffix := printf "?q=%s&fuzzy=%t" (.Keyword|QueryEscape) .IsFuzzy}} {{template "repo/branch_dropdown" dict "root" . "ContainerClasses" "tw-mb-3" "branchURLPrefix" $branchURLPrefix "branchURLSuffix" $suffix "tagURLPrefix" $tagURLPrefix "tagURLSuffix" $suffix}} {{end}} {{template "shared/search/code/search" .}} diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl index 91ef1df623..4bc3abf6fb 100644 --- a/templates/repo/settings/deploy_keys.tmpl +++ b/templates/repo/settings/deploy_keys.tmpl @@ -55,7 +55,7 @@ {{.Fingerprint}}
    -

    {{ctx.Locale.Tr "settings.added_on" (DateUtils.AbsoluteShort .CreatedUnix)}} — {{svg "octicon-info"}} {{if .HasUsed}}{{ctx.Locale.Tr "settings.last_used"}} {{DateUtils.AbsoluteShort .UpdatedUnix}}{{else}}{{ctx.Locale.Tr "settings.no_activity"}}{{end}} - {{ctx.Locale.Tr "settings.can_read_info"}}{{if not .IsReadOnly}} / {{ctx.Locale.Tr "settings.can_write_info"}} {{end}}

    +

    {{ctx.Locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix)}} — {{svg "octicon-info"}} {{if .HasUsed}}{{ctx.Locale.Tr "settings.last_used"}} {{DateTime "short" .UpdatedUnix}}{{else}}{{ctx.Locale.Tr "settings.no_activity"}}{{end}} - {{ctx.Locale.Tr "settings.can_read_info"}}{{if not .IsReadOnly}} / {{ctx.Locale.Tr "settings.can_write_info"}} {{end}}

    diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs.tmpl index 069fdecb33..6d7aac229d 100644 --- a/templates/repo/settings/lfs.tmpl +++ b/templates/repo/settings/lfs.tmpl @@ -17,7 +17,7 @@ {{ctx.Locale.TrSize .Size}} - {{DateUtils.TimeSince .CreatedUnix}} + {{TimeSince .CreatedUnix.AsTime ctx.Locale}} {{ctx.Locale.Tr "repo.settings.lfs_findcommits"}}
    -
    -

    - {{ctx.Locale.Tr "repo.settings.default_update_style_desc"}} -

    -
    - {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
    - {{if (eq $prUnit.PullRequestsConfig.DefaultUpdateStyle "merge")}} - {{ctx.Locale.Tr "repo.pulls.update_branch"}} - {{end}} - {{if (eq $prUnit.PullRequestsConfig.DefaultUpdateStyle "rebase")}} - {{ctx.Locale.Tr "repo.pulls.update_branch_rebase"}} - {{end}} -
    -
    -
    {{ctx.Locale.Tr "repo.pulls.update_branch"}}
    -
    {{ctx.Locale.Tr "repo.pulls.update_branch_rebase"}}
    -
    -
    -
    diff --git a/templates/repo/settings/webhook/history.tmpl b/templates/repo/settings/webhook/history.tmpl index f82aec1390..8ee1446a16 100644 --- a/templates/repo/settings/webhook/history.tmpl +++ b/templates/repo/settings/webhook/history.tmpl @@ -29,7 +29,7 @@ {{.UUID}}
    - {{DateUtils.TimeSince .Delivered}} + {{TimeSince .Delivered.AsTime ctx.Locale}}
    diff --git a/templates/repo/sub_menu.tmpl b/templates/repo/sub_menu.tmpl index 598cfc5c80..ddf01b33ed 100644 --- a/templates/repo/sub_menu.tmpl +++ b/templates/repo/sub_menu.tmpl @@ -1,6 +1,6 @@ {{if and (not .HideRepoInfo) (not .IsBlame)}}
    -
    +
    {{if and (.Permission.CanRead $.UnitTypeCode) (not .IsEmptyRepo)}} {{svg "octicon-history"}} {{ctx.Locale.TrN .CommitsCount "repo.n_commit_one" "repo.n_commit_few" (printf "%d" .CommitsCount | SafeHTML)}} @@ -13,7 +13,7 @@ {{svg "octicon-tag"}} {{ctx.Locale.TrN .NumTags "repo.n_tag_one" "repo.n_tag_few" (printf "%d" .NumTags | SafeHTML)}} {{end}} - + {{$fileSizeFields := ctx.Locale.TrSize .Repository.Size}} {{svg "octicon-database"}} {{$fileSizeFields.PrettyNumber}} {{$fileSizeFields.TranslatedUnit}} diff --git a/templates/repo/tag/list.tmpl b/templates/repo/tag/list.tmpl index 8aa4a806c8..82f3dc04a9 100644 --- a/templates/repo/tag/list.tmpl +++ b/templates/repo/tag/list.tmpl @@ -27,7 +27,7 @@
    {{if $.Permission.CanRead $.UnitTypeCode}} {{if .CreatedUnix}} - {{svg "octicon-clock" 16 "tw-mr-1"}}{{DateUtils.TimeSince .CreatedUnix}} + {{svg "octicon-clock" 16 "tw-mr-1"}}{{TimeSinceUnix .CreatedUnix ctx.Locale}} {{end}} {{svg "octicon-git-commit" 16 "tw-mr-1"}}{{ShortSha .Sha1}} diff --git a/templates/repo/user_cards.tmpl b/templates/repo/user_cards.tmpl index fbd4ef0cee..88178dbf31 100644 --- a/templates/repo/user_cards.tmpl +++ b/templates/repo/user_cards.tmpl @@ -20,7 +20,7 @@ {{else if .Location}} {{svg "octicon-location"}} {{.Location}} {{else}} - {{svg "octicon-calendar"}} {{ctx.Locale.Tr "user.joined_on" (DateUtils.AbsoluteShort .CreatedUnix)}} + {{svg "octicon-calendar"}} {{ctx.Locale.Tr "user.joined_on" (DateTime "short" .CreatedUnix)}} {{end}}
    diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index b2443e82c4..d127c2ef24 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -18,7 +18,7 @@ {{if .LatestCommit}} {{if .LatestCommit.Committer}}
    - {{DateUtils.TimeSince .LatestCommit.Committer.When}} + {{TimeSince .LatestCommit.Committer.When ctx.Locale}}
    {{end}} {{end}} diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl index 6d6af58c48..b750e9129e 100644 --- a/templates/repo/view_list.tmpl +++ b/templates/repo/view_list.tmpl @@ -8,7 +8,7 @@
    - {{if .LatestCommit}}{{if .LatestCommit.Committer}}{{DateUtils.TimeSince .LatestCommit.Committer.When}}{{end}}{{end}} + {{if .LatestCommit}}{{if .LatestCommit.Committer}}{{TimeSince .LatestCommit.Committer.When ctx.Locale}}{{end}}{{end}} @@ -62,7 +62,7 @@ {{end}} - {{if $commit}}{{DateUtils.TimeSince $commit.Committer.When}}{{end}} + {{if $commit}}{{TimeSince $commit.Committer.When ctx.Locale}}{{end}} {{end}} diff --git a/templates/repo/wiki/pages.tmpl b/templates/repo/wiki/pages.tmpl index 43ab0f9a14..42c36a9f46 100644 --- a/templates/repo/wiki/pages.tmpl +++ b/templates/repo/wiki/pages.tmpl @@ -19,7 +19,7 @@ {{.Name}} {{svg "octicon-chevron-right"}} - {{$timeSince := DateUtils.TimeSince .UpdatedUnix}} + {{$timeSince := TimeSinceUnix .UpdatedUnix ctx.Locale}} {{ctx.Locale.Tr "repo.wiki.last_updated" $timeSince}} {{end}} diff --git a/templates/repo/wiki/revision.tmpl b/templates/repo/wiki/revision.tmpl index 045cc41d81..7fca703843 100644 --- a/templates/repo/wiki/revision.tmpl +++ b/templates/repo/wiki/revision.tmpl @@ -9,7 +9,7 @@ {{.revision}} {{svg "octicon-home"}} {{$title}}
    - {{$timeSince := DateUtils.TimeSince .Author.When}} + {{$timeSince := TimeSince .Author.When ctx.Locale}} {{ctx.Locale.Tr "repo.wiki.last_commit_info" .Author.Name $timeSince}}
    diff --git a/templates/repo/wiki/search.tmpl b/templates/repo/wiki/search.tmpl index 7f4cb9c5a2..0bccd40840 100644 --- a/templates/repo/wiki/search.tmpl +++ b/templates/repo/wiki/search.tmpl @@ -1,7 +1,7 @@ {{if .Results}} {{range .Results}} - - {{.Title}} + + {{.Filename}} {{range .LineCodes}}

    {{.}}

    {{end}} diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl index 9f77976f35..40af307524 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -48,7 +48,7 @@     {{.CommitCount}} {{svg "octicon-history"}} {{$title}}
    - {{$timeSince := DateUtils.TimeSince .Author.When}} + {{$timeSince := TimeSince .Author.When ctx.Locale}} {{ctx.Locale.Tr "repo.wiki.last_commit_info" .Author.Name $timeSince}}
    • diff --git a/templates/shared/actions/runner_edit.tmpl b/templates/shared/actions/runner_edit.tmpl index 54250f830b..d60f10b71f 100644 --- a/templates/shared/actions/runner_edit.tmpl +++ b/templates/shared/actions/runner_edit.tmpl @@ -13,7 +13,7 @@
    - {{if .Runner.LastOnline}}{{DateUtils.TimeSince .Runner.LastOnline}}{{else}}{{ctx.Locale.Tr "never"}}{{end}} + {{if .Runner.LastOnline}}{{TimeSinceUnix .Runner.LastOnline ctx.Locale}}{{else}}{{ctx.Locale.Tr "never"}}{{end}}
    @@ -70,7 +70,7 @@ {{ShortSha .CommitSHA}} {{if .IsStopped}} - {{DateUtils.TimeSince .Stopped}} + {{TimeSinceUnix .Stopped ctx.Locale}} {{else}}-{{end}} {{end}} diff --git a/templates/shared/actions/runner_list.tmpl b/templates/shared/actions/runner_list.tmpl index 5bc61f4f64..abbf2204a8 100644 --- a/templates/shared/actions/runner_list.tmpl +++ b/templates/shared/actions/runner_list.tmpl @@ -73,7 +73,7 @@ {{range .AgentLabels}}{{.}}{{end}} - {{if .LastOnline}}{{DateUtils.TimeSince .LastOnline}}{{else}}{{ctx.Locale.Tr "never"}}{{end}} + {{if .LastOnline}}{{TimeSinceUnix .LastOnline ctx.Locale}}{{else}}{{ctx.Locale.Tr "never"}}{{end}} {{if .Editable $.RunnerOwnerID $.RunnerRepoID}} {{svg "octicon-pencil"}} diff --git a/templates/shared/blocked_users_list.tmpl b/templates/shared/blocked_users_list.tmpl index f445c1bb10..409b7f4aa5 100644 --- a/templates/shared/blocked_users_list.tmpl +++ b/templates/shared/blocked_users_list.tmpl @@ -9,7 +9,7 @@ {{template "shared/user/name" .}}
    - {{ctx.Locale.Tr "settings.blocked_since" (DateUtils.AbsoluteShort .CreatedUnix)}} + {{ctx.Locale.Tr "settings.blocked_since" (DateTime "short" .CreatedUnix)}}
    diff --git a/templates/shared/combomarkdowneditor.tmpl b/templates/shared/combomarkdowneditor.tmpl index 0620cca65f..48f72b6991 100644 --- a/templates/shared/combomarkdowneditor.tmpl +++ b/templates/shared/combomarkdowneditor.tmpl @@ -39,12 +39,11 @@ Template Attributes:
    - {{svg "octicon-mention"}} {{svg "octicon-cross-reference"}}
    - + {{if .EasyMDE}} {{end}} @@ -62,30 +61,4 @@ Template Attributes:
    {{ctx.Locale.Tr "loading"}}
    - -
    -
    {{ctx.Locale.Tr "editor.table_modal.header"}}
    - -
    - - - - - - - - - - - - - -
    -
    - -
    - - -
    -
    diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index b71fde685e..f96c1828d2 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -60,7 +60,7 @@ #{{.Index}} {{end}} - {{$timeStr := DateUtils.TimeSince .GetLastEventTimestamp}} + {{$timeStr := TimeSinceUnix .GetLastEventTimestamp ctx.Locale}} {{if .OriginalAuthor}} {{ctx.Locale.Tr .GetLastEventLabelFake $timeStr .OriginalAuthor}} {{else if gt .Poster.ID 0}} @@ -70,13 +70,21 @@ {{end}} {{if .IsPull}}
    - {{svg "gitea-double-chevron-right" 12}}
    {{/* inline to remove the spaces between spans */}} {{if ne .RepoID .PullRequest.BaseRepoID}}{{.PullRequest.BaseRepo.OwnerName}}:{{end}}{{.PullRequest.BaseBranch}}
    + {{svg "gitea-double-chevron-left" 12}} + {{if .PullRequest.HeadRepo}} +
    + + {{/* inline to remove the spaces between spans */}} + {{if ne .RepoID .PullRequest.HeadRepoID}}{{.PullRequest.HeadRepo.OwnerName}}:{{end}}{{.PullRequest.HeadBranch}} + +
    + {{end}}
    {{end}} {{if and .Milestone (ne $.listType "milestone")}} @@ -109,7 +117,7 @@ {{svg "octicon-calendar" 14}} - {{DateUtils.AbsoluteShort .DeadlineUnix}} + {{DateTime "short" (.DeadlineUnix.FormatDate)}}     {{end}} diff --git a/templates/shared/search/code/results.tmpl b/templates/shared/search/code/results.tmpl index 5525d0c715..fe375579bd 100644 --- a/templates/shared/search/code/results.tmpl +++ b/templates/shared/search/code/results.tmpl @@ -1,7 +1,7 @@
    {{range $term := .SearchResultLanguages}} + href="?q={{$.Keyword}}{{if ne $.Language $term.Language}}&l={{$term.Language}}{{end}}&fuzzy={{$.IsFuzzy}}"> {{$term.Language}}
    {{$term.Count}}
    @@ -13,7 +13,7 @@ {{$repo := or $.Repo (index $.RepoMaps .RepoID)}}
    -

    +

    {{svg "octicon-chevron-down"}} diff --git a/templates/shared/search/code/search.tmpl b/templates/shared/search/code/search.tmpl index 9457da988a..6a52bb9462 100644 --- a/templates/shared/search/code/search.tmpl +++ b/templates/shared/search/code/search.tmpl @@ -1,12 +1,11 @@ - - {{template "shared/search/combo_multi" + {{template "shared/search/combo_fuzzy" dict "Value" .Keyword "Disabled" .CodeIndexerUnavailable + "IsFuzzy" .IsFuzzy "Placeholder" (ctx.Locale.Tr "search.code_kind") - "Selected" $.CodeSearchMode - "Options" $.CodeSearchOptions}} + "CodeIndexerDisabled" $.CodeIndexerDisabled}}
    @@ -15,23 +14,6 @@

    {{ctx.Locale.Tr "search.code_search_unavailable"}}

    {{else}} - {{if .CodeSearchPath}} -
    - - @ - {{$href := ""}} - {{- range $i, $path := StringUtils.Split .CodeSearchPath "/" -}} - {{if eq $i 0}} - {{$href = $path}} - {{else}} - {{$href = StringUtils.Join (StringUtils.Make $href $path) "/"}} - {{end}} - / - {{$path}} - {{- end -}} - -
    - {{end}} {{if .CodeIndexerDisabled}}

    {{ctx.Locale.Tr "search.code_search_by_git_grep"}}

    diff --git a/templates/shared/search/combo_fuzzy.tmpl b/templates/shared/search/combo_fuzzy.tmpl index 6dfec4c288..38189b0518 100644 --- a/templates/shared/search/combo_fuzzy.tmpl +++ b/templates/shared/search/combo_fuzzy.tmpl @@ -2,12 +2,14 @@ {{/* Disabled (optional) - if search field/button has to be disabled */}} {{/* Placeholder (optional) - placeholder text to be used */}} {{/* IsFuzzy - state of the fuzzy/union search toggle */}} +{{/* CodeIndexerDisabled (optional) - if the performed search is done using git-grep */}} {{/* Tooltip (optional) - a tooltip to be displayed on button hover */}}
    {{template "shared/search/input" dict "Value" .Value "Disabled" .Disabled "Placeholder" .Placeholder}} {{template "shared/search/fuzzy" dict "Disabled" .Disabled - "IsFuzzy" .IsFuzzy}} + "IsFuzzy" .IsFuzzy + "CodeIndexerDisabled" .CodeIndexerDisabled}} {{template "shared/search/button" dict "Disabled" .Disabled "Tooltip" .Tooltip}}
    diff --git a/templates/shared/search/combo_multi.tmpl b/templates/shared/search/combo_multi.tmpl deleted file mode 100644 index 07d0ea8839..0000000000 --- a/templates/shared/search/combo_multi.tmpl +++ /dev/null @@ -1,25 +0,0 @@ -{{/* Value - value of the search field (for search results page) */}} -{{/* Disabled (optional) - if search field/button has to be disabled */}} -{{/* Placeholder (optional) - placeholder text to be used */}} -{{/* Selected - the currently selected option */}} -{{/* Options - options available to choose from */}} -{{/* Tooltip (optional) - a tooltip to be displayed on button hover */}} -
    - {{template "shared/search/input" dict "Value" .Value "Disabled" .Disabled "Placeholder" .Placeholder}} -
    - {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
    - {{ctx.Locale.Tr (printf "search.%s" .Selected)}} -
    -
    - {{range $opt := .Options}} - {{$isActive := eq $.Selected $opt}} - - {{end}} -
    -
    - {{template "shared/search/button" dict "Disabled" .Disabled "Tooltip" .Tooltip}} -
    diff --git a/templates/shared/search/fuzzy.tmpl b/templates/shared/search/fuzzy.tmpl index f0344c32b7..25cfc5762c 100644 --- a/templates/shared/search/fuzzy.tmpl +++ b/templates/shared/search/fuzzy.tmpl @@ -1,15 +1,21 @@ {{/* Disabled (optional) - if dropdown has to be disabled */}} {{/* IsFuzzy - state of the fuzzy search toggle */}} -
    +
    + {{$fuzzyType := "fuzzy"}} + {{if .CodeIndexerDisabled}} + {{$fuzzyType = "union"}} + {{end}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
    {{if .IsFuzzy}}{{/* - */}}{{ctx.Locale.Tr "search.fuzzy"}}{{/* +
    {{/* + if code indexer is disabled display fuzzy as union + */}}{{if .IsFuzzy}}{{/* + */}}{{ctx.Locale.Tr (printf "search.%s" $fuzzyType)}}{{/* */}}{{else}}{{/* */}}{{ctx.Locale.Tr "search.exact"}}{{/* */}}{{end}}
    -
    {{/* - */}}{{ctx.Locale.Tr "search.fuzzy"}}
    +
    {{/* + */}}{{ctx.Locale.Tr (printf "search.%s" $fuzzyType)}}
    {{ctx.Locale.Tr "search.exact"}}
    diff --git a/templates/shared/searchbottom.tmpl b/templates/shared/searchbottom.tmpl index 4e0bd9570b..bee0397259 100644 --- a/templates/shared/searchbottom.tmpl +++ b/templates/shared/searchbottom.tmpl @@ -7,7 +7,7 @@
    {{if not .result.UpdatedUnix.IsZero}} - {{ctx.Locale.Tr "explore.code_last_indexed_at" (DateUtils.TimeSince .result.UpdatedUnix)}} + {{ctx.Locale.Tr "explore.code_last_indexed_at" (TimeSinceUnix .result.UpdatedUnix ctx.Locale)}} {{end}}
    diff --git a/templates/shared/secrets/add_list.tmpl b/templates/shared/secrets/add_list.tmpl index 59596d1013..ea59459083 100644 --- a/templates/shared/secrets/add_list.tmpl +++ b/templates/shared/secrets/add_list.tmpl @@ -28,7 +28,7 @@
    - {{ctx.Locale.Tr "settings.added_on" (DateUtils.AbsoluteShort .CreatedUnix)}} + {{ctx.Locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix)}}
    - {{ctx.Locale.Tr "settings.added_on" (DateUtils.AbsoluteShort .CreatedUnix)}} + {{ctx.Locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix)}}

    - {{if .EnableInternalSignIn}}
    {{.CsrfTokenHtml}}
    @@ -18,8 +17,9 @@
    {{if or (not .DisablePassword) .LinkAccountMode}} -
    +
    + {{ctx.Locale.Tr "auth.forgot_password"}}
    {{end}} @@ -44,7 +44,6 @@
    - {{end}} {{template "user/auth/oauth_container" .}}
    @@ -53,15 +52,11 @@
    {{template "user/auth/webauthn_error" .}} + {{if .ShowRegistrationButton}}
    - {{if .ShowRegistrationButton}}
    {{ctx.Locale.Tr "auth.hint_register" (printf "%s/user/sign_up" AppSubUrl)}} -
    -
    - {{end}} -
    - {{ctx.Locale.Tr "auth.forgot_password"}}
    + {{end}}
    diff --git a/templates/user/auth/twofa_scratch.tmpl b/templates/user/auth/twofa_scratch.tmpl index 7d7e3c1b54..23ad77f2a9 100644 --- a/templates/user/auth/twofa_scratch.tmpl +++ b/templates/user/auth/twofa_scratch.tmpl @@ -16,7 +16,6 @@
    - {{ctx.Locale.Tr "auth.use_onetime_code"}}
    diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index bd2a3800a2..60aa194534 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -37,9 +37,6 @@ {{else if .GetOpType.InActions "merge_pull_request"}} {{$index := index .GetIssueInfos 0}} {{ctx.Locale.Tr "action.merge_pull_request" (printf "%s/pulls/%s" (.GetRepoLink ctx) $index) $index (.ShortRepoPath ctx)}} - {{else if .GetOpType.InActions "auto_merge_pull_request"}} - {{$index := index .GetIssueInfos 0}} - {{ctx.Locale.Tr "action.auto_merge_pull_request" (printf "%s/pulls/%s" (.GetRepoLink ctx) $index) $index (.ShortRepoPath ctx)}} {{else if .GetOpType.InActions "close_issue"}} {{$index := index .GetIssueInfos 0}} {{ctx.Locale.Tr "action.close_issue" (printf "%s/issues/%s" (.GetRepoLink ctx) $index) $index (.ShortRepoPath ctx)}} @@ -81,7 +78,7 @@ {{$reviewer := index .GetIssueInfos 1}} {{ctx.Locale.Tr "action.review_dismissed" (printf "%s/pulls/%s" (.GetRepoLink ctx) $index) $index (.ShortRepoPath ctx) $reviewer}} {{end}} - {{DateUtils.TimeSince .GetCreate}} + {{TimeSince .GetCreate ctx.Locale}}
    {{if .GetOpType.InActions "commit_repo" "mirror_sync_push"}} {{$push := ActionContent2Commits .}} diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index 2039bf44e3..09d282b029 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -4,7 +4,7 @@
    {{template "base/alert" .}}
    -
    +
    {{svg "octicon-issue-opened" 16 "tw-mr-2"}} {{ctx.Locale.PrettyNumber .IssueStats.OpenCount}} {{ctx.Locale.Tr "repo.issues.open_title"}} diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index 3d046110ae..fe8e246db6 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -35,7 +35,7 @@
    -
    +
    {{svg "octicon-milestone" 16 "tw-mr-2"}} {{ctx.Locale.PrettyNumber .MilestoneStats.OpenCount}} {{ctx.Locale.Tr "repo.issues.open_title"}} @@ -104,19 +104,19 @@ {{if .UpdatedUnix}}
    {{svg "octicon-clock"}} - {{ctx.Locale.Tr "repo.milestones.update_ago" (DateUtils.TimeSince .UpdatedUnix)}} + {{ctx.Locale.Tr "repo.milestones.update_ago" (TimeSinceUnix .UpdatedUnix ctx.Locale)}}
    {{end}}
    {{if .IsClosed}} - {{$closedDate:= DateUtils.TimeSince .ClosedDateUnix}} + {{$closedDate:= TimeSinceUnix .ClosedDateUnix ctx.Locale}} {{svg "octicon-clock" 14}} {{ctx.Locale.Tr "repo.milestones.closed" $closedDate}} {{else}} {{if .DeadlineString}} {{svg "octicon-calendar" 14}} - {{DateUtils.AbsoluteShort (.DeadlineString|DateUtils.ParseLegacy)}} + {{DateTime "short" .DeadlineString}} {{else}} {{svg "octicon-calendar" 14}} diff --git a/templates/user/dashboard/navbar.tmpl b/templates/user/dashboard/navbar.tmpl index f1059c75ff..1fa356f95d 100644 --- a/templates/user/dashboard/navbar.tmpl +++ b/templates/user/dashboard/navbar.tmpl @@ -6,8 +6,8 @@ {{ctx.AvatarUtils.Avatar .ContextUser}} {{.ContextUser.ShortName 40}} - {{if .ContextUser.Visibility.IsLimited}}
    {{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}
    {{end}} - {{if .ContextUser.Visibility.IsPrivate}}
    {{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}
    {{end}} + {{if .ContextUser.Visibility.IsLimited}}
    {{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}
    {{end}} + {{if .ContextUser.Visibility.IsPrivate}}
    {{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}
    {{end}}     {{svg "octicon-triangle-down" 14 "dropdown icon"}} @@ -20,8 +20,8 @@ {{ctx.AvatarUtils.Avatar .SignedUser}} {{.SignedUser.ShortName 40}} - {{if .SignedUser.Visibility.IsLimited}}
    {{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}
    {{end}} - {{if .SignedUser.Visibility.IsPrivate}}
    {{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}
    {{end}} + {{if .SignedUser.Visibility.IsLimited}}
    {{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}
    {{end}} + {{if .SignedUser.Visibility.IsPrivate}}
    {{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}
    {{end}}     {{range .Orgs}} @@ -29,8 +29,8 @@ {{ctx.AvatarUtils.Avatar .}} {{.ShortName 40}} - {{if .Visibility.IsLimited}}
    {{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}
    {{end}} - {{if .Visibility.IsPrivate}}
    {{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}
    {{end}} + {{if .Visibility.IsLimited}}
    {{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}
    {{end}} + {{if .Visibility.IsPrivate}}
    {{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}
    {{end}}     {{end}} diff --git a/templates/user/notification/notification_div.tmpl b/templates/user/notification/notification_div.tmpl index 3340c83e63..5c27ba8b41 100644 --- a/templates/user/notification/notification_div.tmpl +++ b/templates/user/notification/notification_div.tmpl @@ -2,7 +2,7 @@
    {{$notificationUnreadCount := call .NotificationUnreadCount}}
    -
    +
    {{ctx.Locale.Tr "notification.unread"}}
    {{$notificationUnreadCount}}
    @@ -67,9 +67,9 @@
    {{if .Issue}} - {{DateUtils.TimeSince .Issue.UpdatedUnix}} + {{TimeSinceUnix .Issue.UpdatedUnix ctx.Locale}} {{else}} - {{DateUtils.TimeSince .UpdatedUnix}} + {{TimeSinceUnix .UpdatedUnix ctx.Locale}} {{end}}
    diff --git a/templates/user/notification/notification_subscriptions.tmpl b/templates/user/notification/notification_subscriptions.tmpl index 0b8193f797..0a3ae99b40 100644 --- a/templates/user/notification/notification_subscriptions.tmpl +++ b/templates/user/notification/notification_subscriptions.tmpl @@ -2,7 +2,7 @@
    -
    +
    {{ctx.Locale.Tr "notification.subscriptions"}} diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 1f39576ac2..477b838b0f 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -14,17 +14,13 @@ {{if .ContextUser.KeepActivityPrivate}} {{ctx.Locale.Tr "user.public_activity.visibility_hint.self_private" "/user/settings#keep-activity-private"}} {{else}} - {{if eq .ContextUser.Visibility 2}} - {{ctx.Locale.Tr "user.public_activity.visibility_hint.self_private_profile" "/user/settings#visibility-setting"}} - {{else}} - {{ctx.Locale.Tr "user.public_activity.visibility_hint.self_public" "/user/settings#keep-activity-private"}} - {{end}} + {{ctx.Locale.Tr "user.public_activity.visibility_hint.self_public" "/user/settings#keep-activity-private"}} {{end}}

    {{else}} {{if .IsAdmin}}
    - {{if or .ContextUser.KeepActivityPrivate (eq .ContextUser.Visibility 2)}} + {{if .ContextUser.KeepActivityPrivate}} {{ctx.Locale.Tr "user.public_activity.visibility_hint.admin_private"}} {{else}} {{ctx.Locale.Tr "user.public_activity.visibility_hint.admin_public"}} diff --git a/templates/user/settings/account.tmpl b/templates/user/settings/account.tmpl index 55431392c7..a97136f407 100644 --- a/templates/user/settings/account.tmpl +++ b/templates/user/settings/account.tmpl @@ -40,9 +40,9 @@
    -
    {{ctx.Locale.Tr "settings.email_desc"}}
    {{if $.EnableNotifyMail}}
    +
    {{ctx.Locale.Tr "settings.email_desc"}}
    {{$.CsrfTokenHtml}} diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl index 2aeabc6903..04d4dcdb18 100644 --- a/templates/user/settings/applications.tmpl +++ b/templates/user/settings/applications.tmpl @@ -36,7 +36,7 @@
    -

    {{ctx.Locale.Tr "settings.added_on" (DateUtils.AbsoluteShort .CreatedUnix)}} — {{svg "octicon-info"}} {{if .HasUsed}}{{ctx.Locale.Tr "settings.last_used"}} {{DateUtils.AbsoluteShort .UpdatedUnix}}{{else}}{{ctx.Locale.Tr "settings.no_activity"}}{{end}}

    +

    {{ctx.Locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix)}} — {{svg "octicon-info"}} {{if .HasUsed}}{{ctx.Locale.Tr "settings.last_used"}} {{DateTime "short" .UpdatedUnix}}{{else}}{{ctx.Locale.Tr "settings.no_activity"}}{{end}}

    @@ -75,7 +75,7 @@ {{ctx.Locale.Tr "settings.select_permissions"}}

    -

    {{ctx.Locale.Tr "settings.access_token_desc" (printf "%s/api/swagger" AppSubUrl) "https://forgejo.org/docs/latest/user/token-scope/"}}

    +

    {{ctx.Locale.Tr "settings.access_token_desc" (HTMLFormat `href="%s/api/swagger" target="_blank"` AppSubUrl) (`href="https://forgejo.org/docs/latest/user/token-scope/" target="_blank"`|SafeHTML)}}

    {{.Application.Name}}
    -

    {{ctx.Locale.Tr "settings.added_on" (DateUtils.AbsoluteShort .CreatedUnix)}}

    +

    {{ctx.Locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix)}}

    diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl index 23cd86fce7..f5e91cedff 100644 --- a/templates/user/settings/keys_gpg.tmpl +++ b/templates/user/settings/keys_gpg.tmpl @@ -64,9 +64,13 @@

    - {{ctx.Locale.Tr "settings.added_on" (DateUtils.AbsoluteShort .AddedUnix)}} - - - {{if not .ExpiredUnix.IsZero}}{{ctx.Locale.Tr "settings.valid_until_date" (DateUtils.AbsoluteShort .ExpiredUnix)}}{{else}}{{ctx.Locale.Tr "settings.valid_forever"}}{{end}} + {{ctx.Locale.Tr "settings.added_on" (DateTime "short" .AddedUnix)}} + - + {{if not .ExpiredUnix.IsZero}} + {{ctx.Locale.Tr "settings.valid_until_date" (DateTime "short" .ExpiredUnix)}} + {{else}} + {{ctx.Locale.Tr "settings.valid_forever"}} + {{end}}

    diff --git a/templates/user/settings/keys_principal.tmpl b/templates/user/settings/keys_principal.tmpl index 754bc374c2..94b1b2c8ff 100644 --- a/templates/user/settings/keys_principal.tmpl +++ b/templates/user/settings/keys_principal.tmpl @@ -22,7 +22,7 @@
    {{.Name}}
    -

    {{ctx.Locale.Tr "settings.added_on" (DateUtils.AbsoluteShort .CreatedUnix)}} — {{svg "octicon-info" 16}} {{if .HasUsed}}{{ctx.Locale.Tr "settings.last_used"}} {{DateUtils.AbsoluteShort .UpdatedUnix}}{{else}}{{ctx.Locale.Tr "settings.no_activity"}}{{end}}

    +

    {{ctx.Locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix)}} — {{svg "octicon-info" 16}} {{if .HasUsed}}{{ctx.Locale.Tr "settings.last_used"}} {{DateTime "short" .UpdatedUnix}}{{else}}{{ctx.Locale.Tr "settings.no_activity"}}{{end}}

    diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl index 9cedc498fe..058dc9ceb7 100644 --- a/templates/user/settings/keys_ssh.tmpl +++ b/templates/user/settings/keys_ssh.tmpl @@ -53,7 +53,7 @@ {{.Fingerprint}}
    -

    {{ctx.Locale.Tr "settings.added_on" (DateUtils.AbsoluteShort .CreatedUnix)}} — {{svg "octicon-info"}} {{if .HasUsed}}{{ctx.Locale.Tr "settings.last_used"}} {{DateUtils.AbsoluteShort .UpdatedUnix}}{{else}}{{ctx.Locale.Tr "settings.no_activity"}}{{end}}

    +

    {{ctx.Locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix)}} — {{svg "octicon-info"}} {{if .HasUsed}}{{ctx.Locale.Tr "settings.last_used"}} {{DateTime "short" .UpdatedUnix}}{{else}}{{ctx.Locale.Tr "settings.no_activity"}}{{end}}

    diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl index 4cc30d66cf..a092a42032 100644 --- a/templates/user/settings/profile.tmpl +++ b/templates/user/settings/profile.tmpl @@ -4,125 +4,124 @@ {{ctx.Locale.Tr "settings.public_profile"}}
    +

    {{ctx.Locale.Tr "settings.profile_desc"}}

    {{.CsrfTokenHtml}} -
    - {{ctx.Locale.Tr "settings.profile_desc"}} -
    - -
    - {{ctx.Locale.Tr "settings.privacy"}} - -
    +
    + +

    {{.SignedUser.Email}}

    +
    +
    + + +
    +
    + + +
    +
    + + +
    -
    diff --git a/templates/user/settings/security/webauthn.tmpl b/templates/user/settings/security/webauthn.tmpl index b04bcf4291..346f61c2ad 100644 --- a/templates/user/settings/security/webauthn.tmpl +++ b/templates/user/settings/security/webauthn.tmpl @@ -12,7 +12,7 @@
    {{.Name}}
    -

    {{ctx.Locale.Tr "settings.added_on" (DateUtils.AbsoluteShort .CreatedUnix)}}

    +

    {{ctx.Locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix)}}

    diff --git a/templates/webhook/new/discord.tmpl b/templates/webhook/new/discord.tmpl index 455a96c1f4..48ac84fc6b 100644 --- a/templates/webhook/new/discord.tmpl +++ b/templates/webhook/new/discord.tmpl @@ -5,9 +5,9 @@
    -
    +
    - +
    diff --git a/tests/e2e/.eslintrc.yaml b/tests/e2e/.eslintrc.yaml new file mode 100644 index 0000000000..1486431524 --- /dev/null +++ b/tests/e2e/.eslintrc.yaml @@ -0,0 +1,24 @@ +plugins: + - eslint-plugin-playwright + +extends: + - ../../.eslintrc.yaml + - plugin:playwright/recommended + +parserOptions: + sourceType: module + ecmaVersion: latest + +env: + browser: true + +rules: + playwright/no-conditional-in-test: [0] + playwright/no-conditional-expect: [0] + playwright/no-networkidle: [0] + playwright/no-skipped-test: [2, {allowConditional: true}] + playwright/prefer-comparison-matcher: [2] + playwright/prefer-equality-matcher: [2] + playwright/prefer-to-contain: [2] + playwright/prefer-to-have-length: [2] + playwright/require-to-throw-message: [2] diff --git a/tests/e2e/README.md b/tests/e2e/README.md index 35fc5e7d1d..65520115e6 100644 --- a/tests/e2e/README.md +++ b/tests/e2e/README.md @@ -77,7 +77,7 @@ and playwright to perform tests on it. > (e.g. when only creating new content), > or that they restore the initial state for the next browser run. -#### With the playwright UI: +#### With the playwright UI: Playwright ships with an integrated UI mode which allows you to run individual tests and to debug them by seeing detailed traces of what playwright does. @@ -90,7 +90,7 @@ npx playwright test --ui #### Running individual tests ``` -npx playwright test actions.test.e2e.ts:9 +npx playwright test actions.test.e2e.js:9 ``` First, specify the complete test filename, @@ -110,32 +110,29 @@ If you have a [forgejo runner](https://code.forgejo.org/forgejo/runner/), you can use it to run the test jobs: ``` -forgejo-runner exec -W .forgejo/workflows/testing.yml -j test-e2e +forgejo-runner exec -W .forgejo/workflows/e2e.yml --event=pull_request ``` -Note that the CI workflow has some logic to run tests based on changed files only. -This might conflict with your local setup and not run all the desired tests -because it might only look at file changes in your latest commit. - ### Run e2e tests with another database This approach is not currently used, -neither in the CI/CD nor by core contributors on their local machines. +neither in the CI/CD nor by core contributors on their lcoal machines. It is still documented for the sake of completeness: You can also perform e2e tests using MariaDB/MySQL or PostgreSQL if you want. Setup a MySQL database inside docker ``` -docker run -e "MYSQL_DATABASE=test" -e "MYSQL_ALLOW_EMPTY_PASSWORD=yes" -p 3306:3306 --rm --name mysql mysql:latest #(Ctrl-c to stop the database) +docker run -e "MYSQL_DATABASE=test" -e "MYSQL_ALLOW_EMPTY_PASSWORD=yes" -p 3306:3306 --rm --name mysql mysql:latest #(just ctrl-c to stop db and clean the container) +docker run -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" --rm --name elasticsearch elasticsearch:7.6.0 #(in a second terminal, just ctrl-c to stop db and clean the container) ``` Start tests based on the database container ``` -TEST_MYSQL_HOST=localhost:3306 TEST_MYSQL_DBNAME=test?multiStatements=true TEST_MYSQL_USERNAME=root TEST_MYSQL_PASSWORD='' make test-e2e-mysql +TEST_MYSQL_HOST=localhost:3306 TEST_MYSQL_DBNAME=test TEST_MYSQL_USERNAME=root TEST_MYSQL_PASSWORD='' make test-e2e-mysql ``` Setup a pgsql database inside docker ``` -docker run -e POSTGRES_DB=test -e POSTGRES_PASSWORD=password -p 5432:5432 --rm --name pgsql postgres:latest #(Ctrl-c to stop the database) +docker run -e "POSTGRES_DB=test" -p 5432:5432 --rm --name pgsql postgres:latest #(just ctrl-c to stop db and clean the container) ``` Start tests based on the database container ``` @@ -144,7 +141,7 @@ TEST_PGSQL_HOST=localhost:5432 TEST_PGSQL_DBNAME=test TEST_PGSQL_USERNAME=postgr ### Running individual tests -Example command to run `example.test.e2e.ts` test file: +Example command to run `example.test.e2e.js` test file: > **Note** > Unlike integration tests, this filtering is at the file level, not function @@ -155,113 +152,26 @@ For SQLite: make test-e2e-sqlite#example ``` +### Visual testing + +> **Warning** +> This is not currently used by most Forgejo contributors. +> Your help to improve the situation and allow for visual testing is appreciated. + +Although the main goal of e2e is assertion testing, we have added a framework for visual regress testing. If you are working on front-end features, please use the following: + - Check out `main`, `make clean frontend`, and run e2e tests with `VISUAL_TEST=1` to generate outputs. This will initially fail, as no screenshots exist. You can run the e2e tests again to assert it passes. + - Check out your branch, `make clean frontend`, and run e2e tests with `VISUAL_TEST=1`. You should be able to assert you front-end changes don't break any other tests unintentionally. + +VISUAL_TEST=1 will create screenshots in tests/e2e/test-snapshots. The test will fail the first time this is enabled (until we get visual test image persistence figured out), because it will be testing against an empty screenshot folder. + +ACCEPT_VISUAL=1 will overwrite the snapshot images with new images. + ## Tips and tricks If you know noteworthy tests that can act as an inspiration for new tests, please add some details here. -### Understanding and waiting for page loads - -[Waiting for a load state](https://playwright.dev/docs/api/class-frame#frame-wait-for-load-state) -sound like a convenient way to ensure the page was loaded, -but it only works once and consecutive calls to it -(e.g. after clicking a button which should reload a page) -return immediately without waiting for *another* load event. - -If you match something which is on both the old and the new page, -you might succeed before the page was reloaded, -although the code using a `waitForLoadState` might intuitively suggest -the page was changed before. - -Interacting with the page before the reload -(e.g. by opening a dropdown) -might then race and result in flaky tests, -depending on the speed of the hardware running the test. - -A possible way to test that an interaction worked is by checking for a known change first. -For example: - -- you submit a form and you want to check that the content persisted -- checking for the content directly would succeed even without a page reload -- check for a success message first (will wait until it appears), then verify the content - -Alternatively, if you know the backend request that will be made before the reload, -you can explicitly wait for it: - -~~~js -const submitted = page.waitForResponse('/my/backend/post/request'); -await page.locator('button').first().click(); // perform your interaction -await submitted; -~~~ - -If the page redirects to another URL, -you can alternatively use: - -~~~js -await page.waitForURL('**/target.html'); -~~~ - -### Visual testing - -Due to size and frequent updates, we do not host screenshots in the Forgejo repository. -However, it is good practice to ensure that your test is capable of generating relevant and stable screenshots. -Forgejo is regularly tested against visual regressions in a dedicated repository which contains the screenshots: -https://code.forgejo.org/forgejo/visual-browser-testing/ - -For tests that consume only the `page`, -screenshots are automatically created at the end of each test. - -If your test visits different relevant screens or pages during the test, -or creates a custom `page` from context -(e.g. for tests that require a signed-in user) -calling `await save_visual(page);` explicitly in relevant positions is encouraged. - -Please confirm locally that your screenshots are stable by performing several runs of your test. -When screenshots are available and reproducible, -check in your test without the screenshots. - -When your screenshots differ between runs, -for example because dynamic elements (e.g. timestamps, commit hashes etc) -change between runs, -mask these elements in the `save_visual` function in `utils_e2e.ts`. - -#### Working with screenshots - -The following environment variables control visual testing: - -`VISUAL_TEST=1` will create screenshots in tests/e2e/test-snapshots. - The test will fail the first time, - because the screenshots are not included with Forgejo. - Subsequent runs will comopare against your local copy of the screenshots. - -`ACCEPT_VISUAL=1` will overwrite the snapshot images with new images. - -### Only sign in if necessary - -Signing in takes time and is actually executed step-by-step. -If your test does not rely on a user account, skip this step. - -~~~js -test('For anyone', async ({page}) => { - await page.goto('/somepage'); -~~~ - -If you need a user account, you can use something like: - -~~~js -import {test} from './utils_e2e.ts'; - -// reuse user2 token from scope `shared` -test.use({user: 'user2', authScope: 'shared'}) - -test('For signed users only', async ({page}) => { - -}) -~~~ - -users are created in [utils_e2e_test.go](utils_e2e_test.go) - ### Run tests very selectively Browser testing can take some time. @@ -290,86 +200,21 @@ Run `make lint-frontend-fix`. ### Define new repos Take a look at `declare_repos_test.go` to see how to add your repositories. -Feel free to improve the logic used there if you need more advanced functionality, -it is a simplified version of the code used in the integration tests. +Feel free to improve the logic used there if you need more advanced functionality +(it is a simplified version of the code used in the integration tests). ### Accessibility testing If you can, perform automated accessibility testing using [AxeCore](https://github.com/dequelabs/axe-core-npm/blob/develop/packages/playwright/README.md). -Take a look at `shared/forms.ts` and some other places for inspiration. +Take a look at `shared/forms.js` and some other places for inspiration. ### List related files coverage -To speed up the CI pipelines and avoid running expensive tests too often, -only a selection of tests is run by default, based on the changed files. +If you think your playwright tests covers an important aspect of some template, CSS or backend files, +consider adding the paths to `.forgejo/workflows/e2e.yml` in the path filter. -At the top of each playwright test file, -list the files or file patterns that are covered by your test. -Often, these are files that you modified for your feature or bugfix, -or that you looked at (and might still have open in your IDE), -because your fix depends on their behaviour. +It ensures that future modifications to this file will be tested as well. -#### Which files to watch? - -The set of files your test "watches" depends on the kind of test you write. -If you only test for the presence of an element and do no accessibility or placement checks, -you won't detect broken visual appearance and there is little reason to watch CSS files. - -However, if your test also checks that an element is correctly positioned -(e.g. that it does not overflow the page), -or has accessibility properties (includes colour contrast), -also list stylesheets that define the behaviour your test depends on. - -Watching the place that generate the selectors you use -(typically templates, but can also be JavaScript) -is a must, to ensure that someone modifying the markup notices that your selectors fail -(e.g. because an id or class was renamed). - -If you are unsure about the exact set of files, feel free to ask other contributors. - -#### How to specify the patterns? - -You put filenames and patterns as blocks between two `// @watch` comments. -An example that watches changes on (in order) -a single file, -a full recursive subfolder, -two files with a shorthand pattern, -and a set of files with a certain ending: - -~~~ -// @watch start -// templates/webhook/shared-settings.tmpl -// templates/repo/settings/** -// web_src/css/{form,repo}.css -// web_src/css/modules/*.css -// @watch end -~~~ - -The patterns are evaluated on a "first-match" basis. -Under the hood, [gobwas/glob](https://github.com/gobwas/glob) is used. - -## Grouped retry for interactions - -Sometimes, it can be necessary to retry certain interactions together. -Consider the following procedure: - -1. click to open a dropdown -2. interact with content in the dropdown - -When for some reason the dropdown does not open, -for example because of it taking time to initialize after page load, -the click will succeed, -but the depending interaction won't, -although playwright repeatedly tries to find the content. - -You can [group statements using toPass]()https://playwright.dev/docs/test-assertions#expecttopass). -This code retries the dropdown click until the second item is found. - -~~~js -await expect(async () => { - await page.locator('.dropdown').click(); - await page.locator('.dropdown .item').first().click(); -}).toPass(); -~~~ +Currently, we do not run the e2e tests on all changes. diff --git a/tests/e2e/actions.test.e2e.js b/tests/e2e/actions.test.e2e.js new file mode 100644 index 0000000000..b049a93ed9 --- /dev/null +++ b/tests/e2e/actions.test.e2e.js @@ -0,0 +1,79 @@ +// @ts-check +import {expect} from '@playwright/test'; +import {test, login_user, load_logged_in_context} from './utils_e2e.js'; + +test.beforeAll(async ({browser}, workerInfo) => { + await login_user(browser, workerInfo, 'user2'); +}); + +const workflow_trigger_notification_text = 'This workflow has a workflow_dispatch event trigger.'; + +test('workflow dispatch present', async ({browser}, workerInfo) => { + const context = await load_logged_in_context(browser, workerInfo, 'user2'); + /** @type {import('@playwright/test').Page} */ + const page = await context.newPage(); + + await page.goto('/user2/test_workflows/actions?workflow=test-dispatch.yml&actor=0&status=0'); + + await expect(page.getByText(workflow_trigger_notification_text)).toBeVisible(); + + const run_workflow_btn = page.locator('#workflow_dispatch_dropdown>button'); + await expect(run_workflow_btn).toBeVisible(); + + const menu = page.locator('#workflow_dispatch_dropdown>.menu'); + await expect(menu).toBeHidden(); + await run_workflow_btn.click(); + await expect(menu).toBeVisible(); +}); + +test('workflow dispatch error: missing inputs', async ({browser}, workerInfo) => { + test.skip(workerInfo.project.name === 'Mobile Safari', 'Flaky behaviour on mobile safari; see https://codeberg.org/forgejo/forgejo/pulls/3334#issuecomment-2033383'); + + const context = await load_logged_in_context(browser, workerInfo, 'user2'); + /** @type {import('@playwright/test').Page} */ + const page = await context.newPage(); + + await page.goto('/user2/test_workflows/actions?workflow=test-dispatch.yml&actor=0&status=0'); + await page.waitForLoadState('networkidle'); + + await page.locator('#workflow_dispatch_dropdown>button').click(); + + // Remove the required attribute so we can trigger the error message! + await page.evaluate(() => { + const elem = document.querySelector('input[name="inputs[string2]"]'); + elem?.removeAttribute('required'); + }); + + await page.locator('#workflow-dispatch-submit').click(); + await page.waitForLoadState('networkidle'); + + await expect(page.getByText('Require value for input "String w/o. default".')).toBeVisible(); +}); + +test('workflow dispatch success', async ({browser}, workerInfo) => { + test.skip(workerInfo.project.name === 'Mobile Safari', 'Flaky behaviour on mobile safari; see https://codeberg.org/forgejo/forgejo/pulls/3334#issuecomment-2033383'); + + const context = await load_logged_in_context(browser, workerInfo, 'user2'); + /** @type {import('@playwright/test').Page} */ + const page = await context.newPage(); + + await page.goto('/user2/test_workflows/actions?workflow=test-dispatch.yml&actor=0&status=0'); + await page.waitForLoadState('networkidle'); + + await page.locator('#workflow_dispatch_dropdown>button').click(); + + await page.type('input[name="inputs[string2]"]', 'abc'); + await page.locator('#workflow-dispatch-submit').click(); + await page.waitForLoadState('networkidle'); + + await expect(page.getByText('Workflow run was successfully requested.')).toBeVisible(); + + await expect(page.locator('.run-list>:first-child .run-list-meta', {hasText: 'now'})).toBeVisible(); +}); + +test('workflow dispatch box not available for unauthenticated users', async ({page}) => { + await page.goto('/user2/test_workflows/actions?workflow=test-dispatch.yml&actor=0&status=0'); + await page.waitForLoadState('networkidle'); + + await expect(page.locator('body')).not.toContainText(workflow_trigger_notification_text); +}); diff --git a/tests/e2e/actions.test.e2e.ts b/tests/e2e/actions.test.e2e.ts deleted file mode 100644 index 4e93b89ee0..0000000000 --- a/tests/e2e/actions.test.e2e.ts +++ /dev/null @@ -1,75 +0,0 @@ -// @watch start -// templates/repo/actions/** -// web_src/css/actions.css -// web_src/js/components/ActionRunStatus.vue -// web_src/js/components/RepoActionView.vue -// modules/actions/** -// modules/structs/workflow.go -// routers/api/v1/repo/action.go -// routers/web/repo/actions/** -// @watch end - -import {expect} from '@playwright/test'; -import {save_visual, test} from './utils_e2e.ts'; - -const workflow_trigger_notification_text = 'This workflow has a workflow_dispatch event trigger.'; -test.describe('Workflow Authenticated user2', () => { - test.use({user: 'user2'}); - - test('workflow dispatch present', async ({page}) => { - await page.goto('/user2/test_workflows/actions?workflow=test-dispatch.yml&actor=0&status=0'); - - await expect(page.getByText(workflow_trigger_notification_text)).toBeVisible(); - - const run_workflow_btn = page.locator('#workflow_dispatch_dropdown>button'); - await expect(run_workflow_btn).toBeVisible(); - - const menu = page.locator('#workflow_dispatch_dropdown>.menu'); - await expect(menu).toBeHidden(); - await run_workflow_btn.click(); - await expect(menu).toBeVisible(); - await save_visual(page); - }); - - test('dispatch error: missing inputs', async ({page}, testInfo) => { - test.skip(testInfo.project.name === 'Mobile Safari', 'Flaky behaviour on mobile safari; see https://codeberg.org/forgejo/forgejo/pulls/3334#issuecomment-2033383'); - - await page.goto('/user2/test_workflows/actions?workflow=test-dispatch.yml&actor=0&status=0'); - - await page.locator('#workflow_dispatch_dropdown>button').click(); - - // Remove the required attribute so we can trigger the error message! - await page.evaluate(() => { - const elem = document.querySelector('input[name="inputs[string2]"]'); - elem?.removeAttribute('required'); - }); - - await page.locator('#workflow-dispatch-submit').click(); - - await expect(page.getByText('Require value for input "String w/o. default".')).toBeVisible(); - await save_visual(page); - }); - - test('dispatch success', async ({page}, testInfo) => { - test.skip(testInfo.project.name === 'Mobile Safari', 'Flaky behaviour on mobile safari; see https://codeberg.org/forgejo/forgejo/pulls/3334#issuecomment-2033383'); - await page.goto('/user2/test_workflows/actions?workflow=test-dispatch.yml&actor=0&status=0'); - - await page.locator('#workflow_dispatch_dropdown>button').click(); - - await page.fill('input[name="inputs[string2]"]', 'abc'); - await save_visual(page); - await page.locator('#workflow-dispatch-submit').click(); - - await expect(page.getByText('Workflow run was successfully requested.')).toBeVisible(); - - await expect(page.locator('.run-list>:first-child .run-list-meta', {hasText: 'now'})).toBeVisible(); - await save_visual(page); - }); -}); - -test('workflow dispatch box not available for unauthenticated users', async ({page}) => { - await page.goto('/user2/test_workflows/actions?workflow=test-dispatch.yml&actor=0&status=0'); - - await expect(page.locator('body')).not.toContainText(workflow_trigger_notification_text); - await save_visual(page); -}); diff --git a/tests/e2e/changes.go b/tests/e2e/changes.go deleted file mode 100644 index 1e5533bc6b..0000000000 --- a/tests/e2e/changes.go +++ /dev/null @@ -1,115 +0,0 @@ -// Copyright 2024 The Forgejo Authors. All rights reserved. -// SPDX-License-Identifier: GPL-3.0-or-later - -package e2e - -import ( - "bufio" - "os" - "strings" - - "code.gitea.io/gitea/modules/log" - - "github.com/gobwas/glob" -) - -var ( - changesetFiles []string - changesetAvailable bool - globalFullRun bool -) - -func initChangedFiles() { - var changes string - changes, changesetAvailable = os.LookupEnv("CHANGED_FILES") - // the output of the Action seems to actually contain \n and not a newline literal - changesetFiles = strings.Split(changes, `\n`) - log.Info("Only running tests covered by a subset of test files. Received the following list of CHANGED_FILES: %q", changesetFiles) - - globalPatterns := []string{ - // meta and config - "Makefile", - "playwright.config.ts", - ".forgejo/workflows/testing.yml", - "tests/e2e/*.go", - "tests/e2e/shared/*", - // frontend files - "web_src/js/{index,utils}.*", - "web_src/css/{base,index}.css", - // templates and helpers - "templates/base/**", - "modules/templates/**", - } - fullRunPatterns := []glob.Glob{} - for _, expr := range globalPatterns { - fullRunPatterns = append(fullRunPatterns, glob.MustCompile(expr, '.', '/')) - } - globalFullRun = false - for _, changedFile := range changesetFiles { - for _, pattern := range fullRunPatterns { - if pattern.Match(changedFile) { - globalFullRun = true - log.Info("Changed files match global test pattern, running all tests") - return - } - } - } -} - -func canSkipTest(testFile string) bool { - // run all tests when environment variable is not set or changes match global pattern - if !changesetAvailable || globalFullRun { - return false - } - - for _, changedFile := range changesetFiles { - if strings.HasSuffix(testFile, changedFile) { - return false - } - for _, pattern := range getWatchPatterns(testFile) { - if pattern.Match(changedFile) { - return false - } - } - } - return true -} - -func getWatchPatterns(filename string) []glob.Glob { - file, err := os.Open(filename) - if err != nil { - log.Fatal(err.Error()) - } - defer file.Close() - scanner := bufio.NewScanner(file) - - watchSection := false - patterns := []glob.Glob{} - for scanner.Scan() { - line := scanner.Text() - // check for watch block - if strings.HasPrefix(line, "// @watch") { - if watchSection { - break - } - watchSection = true - } - if !watchSection { - continue - } - - line = strings.TrimPrefix(line, "// ") - if line != "" { - globPattern, err := glob.Compile(line, '.', '/') - if err != nil { - log.Fatal("Invalid glob pattern '%s' (skipped): %v", line, err) - } - patterns = append(patterns, globPattern) - } - } - // if no watch block in file - if !watchSection { - patterns = append(patterns, glob.MustCompile("*")) - } - return patterns -} diff --git a/tests/e2e/clipboard-copy.test.e2e.ts b/tests/e2e/clipboard-copy.test.e2e.ts deleted file mode 100644 index 2ae0e0dfff..0000000000 --- a/tests/e2e/clipboard-copy.test.e2e.ts +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright 2024 The Forgejo Authors. All rights reserved. -// SPDX-License-Identifier: GPL-3.0-or-later - -// @watch start -// templates/repo/home.tmpl -// templates/repo/diff/box.tmpl -// web_src/js/features/clipboard.js -// @watch end - -import {expect} from '@playwright/test'; -import {save_visual, test} from './utils_e2e.ts'; - -test('copy src file path to clipboard', async ({page}, workerInfo) => { - test.skip(['Mobile Safari', 'webkit'].includes(workerInfo.project.name), 'Apple clipboard API addon - starting at just $499!'); - - const response = await page.goto('/user2/repo1/src/branch/master/README.md'); - expect(response?.status()).toBe(200); - - await page.click('[data-clipboard-text]'); - const clipboardText = await page.evaluate(() => navigator.clipboard.readText()); - expect(clipboardText).toContain('README.md'); - await save_visual(page); -}); - -test('copy diff file path to clipboard', async ({page}, workerInfo) => { - test.skip(['Mobile Safari', 'webkit'].includes(workerInfo.project.name), 'Apple clipboard API addon - starting at just $499!'); - - const response = await page.goto('/user2/repo1/src/commit/65f1bf27bc3bf70f64657658635e66094edbcb4d/README.md'); - expect(response?.status()).toBe(200); - - await page.click('[data-clipboard-text]'); - const clipboardText = await page.evaluate(() => navigator.clipboard.readText()); - expect(clipboardText).toContain('README.md'); - await expect(page.getByText('Copied')).toBeVisible(); - await save_visual(page); -}); diff --git a/tests/e2e/commit-graph-branch-selector.test.e2e.js b/tests/e2e/commit-graph-branch-selector.test.e2e.js new file mode 100644 index 0000000000..db849320b9 --- /dev/null +++ b/tests/e2e/commit-graph-branch-selector.test.e2e.js @@ -0,0 +1,25 @@ +// @ts-check +import {expect} from '@playwright/test'; +import {test, login_user, load_logged_in_context} from './utils_e2e.js'; + +test.beforeAll(async ({browser}, workerInfo) => { + await login_user(browser, workerInfo, 'user2'); +}); + +test('Switch branch', async ({browser}, workerInfo) => { + const context = await load_logged_in_context(browser, workerInfo, 'user2'); + const page = await context.newPage(); + const response = await page.goto('/user2/repo1/graph'); + await expect(response?.status()).toBe(200); + + await page.click('#flow-select-refs-dropdown'); + const input = page.locator('#flow-select-refs-dropdown'); + await input.pressSequentially('develop', {delay: 50}); + await input.press('Enter'); + + await page.waitForLoadState('networkidle'); + + await expect(page.locator('#loading-indicator')).toBeHidden(); + await expect(page.locator('#rel-container')).toBeVisible(); + await expect(page.locator('#rev-container')).toBeVisible(); +}); diff --git a/tests/e2e/dashboard-ci-status.test.e2e.js b/tests/e2e/dashboard-ci-status.test.e2e.js new file mode 100644 index 0000000000..1ff68b6334 --- /dev/null +++ b/tests/e2e/dashboard-ci-status.test.e2e.js @@ -0,0 +1,21 @@ +// @ts-check +import {expect} from '@playwright/test'; +import {test, login_user, load_logged_in_context} from './utils_e2e.js'; + +test.beforeAll(async ({browser}, workerInfo) => { + await login_user(browser, workerInfo, 'user2'); +}); + +test('Correct link and tooltip', async ({browser}, workerInfo) => { + const context = await load_logged_in_context(browser, workerInfo, 'user2'); + const page = await context.newPage(); + const response = await page.goto('/?repo-search-query=test_workflows'); + await expect(response?.status()).toBe(200); + + await page.waitForLoadState('networkidle'); + + const repoStatus = page.locator('.dashboard-repos .repo-owner-name-list > li:nth-child(1) > a:nth-child(2)'); + + await expect(repoStatus).toHaveAttribute('href', '/user2/test_workflows/actions', {timeout: 10000}); + await expect(repoStatus).toHaveAttribute('data-tooltip-content', 'Failure'); +}); diff --git a/tests/e2e/dashboard-ci-status.test.e2e.ts b/tests/e2e/dashboard-ci-status.test.e2e.ts deleted file mode 100644 index d35fe299ff..0000000000 --- a/tests/e2e/dashboard-ci-status.test.e2e.ts +++ /dev/null @@ -1,28 +0,0 @@ -// @watch start -// web_src/js/components/DashboardRepoList.vue -// @watch end - -import {expect} from '@playwright/test'; -import {test} from './utils_e2e.ts'; - -test.use({user: 'user2'}); - -test.describe.configure({retries: 2}); - -test('Correct link and tooltip', async ({page}, testInfo) => { - if (testInfo.retry) { - await page.goto('/user2/test_workflows/actions'); - } - - const searchResponse = page.waitForResponse((resp) => resp.url().includes('/repo/search?') && resp.status() === 200); - const response = await page.goto('/?repo-search-query=test_workflows'); - expect(response?.status()).toBe(200); - - await searchResponse; - - const repoStatus = page.locator('.dashboard-repos .repo-owner-name-list > li:nth-child(1) > a:nth-child(2)'); - await expect(repoStatus).toHaveAttribute('href', '/user2/test_workflows/actions', {timeout: 10000}); - await expect(repoStatus).toHaveAttribute('data-tooltip-content', /^(Error|Failure)$/); - // ToDo: Ensure stable screenshot of dashboard. Known to be flaky: https://code.forgejo.org/forgejo/visual-browser-testing/commit/206d4cfb7a4af6d8d7043026cdd4d63708798b2a - // await save_visual(page); -}); diff --git a/tests/e2e/declare_repos_test.go b/tests/e2e/declare_repos_test.go index c55a42ac66..7057b26b6f 100644 --- a/tests/e2e/declare_repos_test.go +++ b/tests/e2e/declare_repos_test.go @@ -5,6 +5,7 @@ package e2e import ( "fmt" + "strconv" "strings" "testing" "time" @@ -22,31 +23,14 @@ import ( // first entry represents filename // the following entries define the full file content over time -type FileChanges struct { - Filename string - CommitMsg string - Versions []string -} +type FileChanges [][]string // put your Git repo declarations in here // feel free to amend the helper function below or use the raw variant directly func DeclareGitRepos(t *testing.T) func() { cleanupFunctions := []func(){ - newRepo(t, 2, "diff-test", []FileChanges{{ - Filename: "testfile", - Versions: []string{"hello", "hallo", "hola", "native", "ubuntu-latest", "- runs-on: ubuntu-latest", "- runs-on: debian-latest"}, - }}), - newRepo(t, 2, "mentions-highlighted", []FileChanges{ - { - Filename: "history1.md", - Versions: []string{""}, - CommitMsg: "A commit message which mentions @user2 in the title\nand has some additional text which mentions @user1", - }, - { - Filename: "history2.md", - Versions: []string{""}, - CommitMsg: "Another commit which mentions @user1 in the title\nand @user2 in the text", - }, + newRepo(t, 2, "diff-test", FileChanges{ + {"testfile", "hello", "hallo", "hola", "native", "ubuntu-latest", "- runs-on: ubuntu-latest", "- runs-on: debian-latest"}, }), // add your repo declarations here } @@ -58,7 +42,7 @@ func DeclareGitRepos(t *testing.T) func() { } } -func newRepo(t *testing.T, userID int64, repoName string, fileChanges []FileChanges) func() { +func newRepo(t *testing.T, userID int64, repoName string, fileChanges FileChanges) func() { user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: userID}) somerepo, _, cleanupFunc := tests.CreateDeclarativeRepo(t, user, repoName, []unit_model.Type{unit_model.TypeCode, unit_model.TypeIssues}, nil, @@ -66,25 +50,19 @@ func newRepo(t *testing.T, userID int64, repoName string, fileChanges []FileChan ) for _, file := range fileChanges { - for i, version := range file.Versions { - operation := "update" - if i == 0 { - operation = "create" + changeLen := len(file) + for i := 1; i < changeLen; i++ { + operation := "create" + if i != 1 { + operation = "update" } - - // default to unique commit messages - commitMsg := file.CommitMsg - if commitMsg == "" { - commitMsg = fmt.Sprintf("Patch: %s-%d", file.Filename, i+1) - } - resp, err := files_service.ChangeRepoFiles(git.DefaultContext, somerepo, user, &files_service.ChangeRepoFilesOptions{ Files: []*files_service.ChangeRepoFile{{ Operation: operation, - TreePath: file.Filename, - ContentReader: strings.NewReader(version), + TreePath: file[0], + ContentReader: strings.NewReader(file[i]), }}, - Message: commitMsg, + Message: fmt.Sprintf("Patch: %s-%s", file[0], strconv.Itoa(i)), OldBranch: "main", NewBranch: "main", Author: &files_service.IdentityOptions{ diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go index 8e4a9653cd..44a6897bf4 100644 --- a/tests/e2e/e2e_test.go +++ b/tests/e2e/e2e_test.go @@ -8,6 +8,7 @@ package e2e import ( + "bytes" "context" "fmt" "net/url" @@ -37,14 +38,18 @@ func TestMain(m *testing.M) { defer cancel() tests.InitTest(true) - initChangedFiles() testE2eWebRoutes = routers.NormalRoutes() + os.Unsetenv("GIT_AUTHOR_NAME") + os.Unsetenv("GIT_AUTHOR_EMAIL") + os.Unsetenv("GIT_AUTHOR_DATE") + os.Unsetenv("GIT_COMMITTER_NAME") + os.Unsetenv("GIT_COMMITTER_EMAIL") + os.Unsetenv("GIT_COMMITTER_DATE") + err := unittest.InitFixtures( unittest.FixturesOptions{ - Dir: filepath.Join(setting.AppWorkPath, "models/fixtures/"), - Base: setting.AppWorkPath, - Dirs: []string{"tests/e2e/fixtures/"}, + Dir: filepath.Join(filepath.Dir(setting.AppPath), "models/fixtures/"), }, ) if err != nil { @@ -72,7 +77,7 @@ func TestMain(m *testing.M) { // TestE2e should be the only test e2e necessary. It will collect all "*.test.e2e.js" files in this directory and build a test for each. func TestE2e(t *testing.T) { // Find the paths of all e2e test files in test directory. - searchGlob := filepath.Join(filepath.Dir(setting.AppPath), "tests", "e2e", "*.test.e2e.ts") + searchGlob := filepath.Join(filepath.Dir(setting.AppPath), "tests", "e2e", "*.test.e2e.js") paths, err := filepath.Glob(searchGlob) if err != nil { t.Fatal(err) @@ -82,7 +87,6 @@ func TestE2e(t *testing.T) { runArgs := []string{"npx", "playwright", "test"} - _, testVisual := os.LookupEnv("VISUAL_TEST") // To update snapshot outputs if _, set := os.LookupEnv("ACCEPT_VISUAL"); set { runArgs = append(runArgs, "--update-snapshots") @@ -96,32 +100,29 @@ func TestE2e(t *testing.T) { _, filename := filepath.Split(path) testname := filename[:len(filename)-len(filepath.Ext(path))] - if canSkipTest(path) { - fmt.Printf("No related changes for test, skipping: %s\n", filename) - continue - } - t.Run(testname, func(t *testing.T) { // Default 2 minute timeout onForgejoRun(t, func(*testing.T, *url.URL) { defer DeclareGitRepos(t)() thisTest := runArgs - // when all tests are run, use unique artifacts directories per test to preserve artifacts from other tests - if testVisual { - thisTest = append(thisTest, "--output=tests/e2e/test-artifacts/"+testname) - } thisTest = append(thisTest, path) cmd := exec.Command(runArgs[0], thisTest...) cmd.Env = os.Environ() cmd.Env = append(cmd.Env, fmt.Sprintf("GITEA_URL=%s", setting.AppURL)) - cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr + var stdout, stderr bytes.Buffer + cmd.Stdout = &stdout + cmd.Stderr = &stderr err := cmd.Run() - if err != nil && !testVisual { + if err != nil { + // Currently colored output is conflicting. Using Printf until that is resolved. + fmt.Printf("%v", stdout.String()) + fmt.Printf("%v", stderr.String()) log.Fatal("Playwright Failed: %s", err) } + + fmt.Printf("%v", stdout.String()) }) }) } diff --git a/tests/e2e/example.test.e2e.ts b/tests/e2e/example.test.e2e.js similarity index 71% rename from tests/e2e/example.test.e2e.ts rename to tests/e2e/example.test.e2e.js index 97c5b8684b..86abdf685e 100644 --- a/tests/e2e/example.test.e2e.ts +++ b/tests/e2e/example.test.e2e.js @@ -1,32 +1,32 @@ -// @watch start -// templates/user/auth/** -// web_src/js/features/user-** -// modules/{user,auth}/** -// @watch end - +// @ts-check import {expect} from '@playwright/test'; -import {save_visual, test} from './utils_e2e.ts'; +import {test, login_user, save_visual} from './utils_e2e.js'; + +test.beforeAll(async ({browser}, workerInfo) => { + await login_user(browser, workerInfo, 'user2'); +}); test('Load Homepage', async ({page}) => { const response = await page.goto('/'); - expect(response?.status()).toBe(200); // Status OK + await expect(response?.status()).toBe(200); // Status OK await expect(page).toHaveTitle(/^Forgejo: Beyond coding. We Forge.\s*$/); await expect(page.locator('.logo')).toHaveAttribute('src', '/assets/img/logo.svg'); }); test('Register Form', async ({page}, workerInfo) => { const response = await page.goto('/user/sign_up'); - expect(response?.status()).toBe(200); // Status OK - await page.fill('input[name=user_name]', `e2e-test-${workerInfo.workerIndex}`); - await page.fill('input[name=email]', `e2e-test-${workerInfo.workerIndex}@test.com`); - await page.fill('input[name=password]', 'test123test123'); - await page.fill('input[name=retype]', 'test123test123'); + await expect(response?.status()).toBe(200); // Status OK + await page.type('input[name=user_name]', `e2e-test-${workerInfo.workerIndex}`); + await page.type('input[name=email]', `e2e-test-${workerInfo.workerIndex}@test.com`); + await page.type('input[name=password]', 'test123test123'); + await page.type('input[name=retype]', 'test123test123'); await page.click('form button.ui.primary.button:visible'); // Make sure we routed to the home page. Else login failed. - expect(page.url()).toBe(`${workerInfo.project.use.baseURL}/`); + await expect(page.url()).toBe(`${workerInfo.project.use.baseURL}/`); await expect(page.locator('.secondary-nav span>img.ui.avatar')).toBeVisible(); await expect(page.locator('.ui.positive.message.flash-success')).toHaveText('Account was successfully created. Welcome!'); - await save_visual(page); + + save_visual(page); }); // eslint-disable-next-line playwright/no-skipped-test diff --git a/tests/e2e/explore.test.e2e.ts b/tests/e2e/explore.test.e2e.js similarity index 85% rename from tests/e2e/explore.test.e2e.ts rename to tests/e2e/explore.test.e2e.js index 1bb5af3cc6..9603443b35 100644 --- a/tests/e2e/explore.test.e2e.ts +++ b/tests/e2e/explore.test.e2e.js @@ -1,13 +1,8 @@ +// @ts-check // document is a global in evaluate, so it's safe to ignore here // eslint playwright/no-conditional-in-test: 0 - -// @watch start -// templates/explore/** -// web_src/modules/fomantic/** -// @watch end - import {expect} from '@playwright/test'; -import {save_visual, test} from './utils_e2e.ts'; +import {test} from './utils_e2e.js'; test('Explore view taborder', async ({page}) => { await page.goto('/explore/repos'); @@ -41,6 +36,5 @@ test('Explore view taborder', async ({page}) => { break; } } - expect(res).toBe(exp); - await save_visual(page); + await expect(res).toBe(exp); }); diff --git a/tests/e2e/fixtures/comment.yml b/tests/e2e/fixtures/comment.yml deleted file mode 100644 index f3f8a2d8e8..0000000000 --- a/tests/e2e/fixtures/comment.yml +++ /dev/null @@ -1,22 +0,0 @@ -- - id: 1001 - type: 0 # comment - poster_id: 2 - issue_id: 1 # in repo_id 1 - content: "## Lorem Ipsum\nI would like to say that **I am not appealed** that it took _so long_ for this `feature` to be [created](https://example.com) $e^{\\pi i} + 1 = 0$\n$$e^{\\pi i} + 1 = 0$$\n#1\n```js\nconsole.log('evil')\nalert('evil')\n```\n:+1: :100:" - created_unix: 946684811 - updated_unix: 946684811 - content_version: 1 - -- - id: 1002 - type: 21 # code comment - poster_id: 2 - issue_id: 19 - content: "## Lorem Ipsum\nI would like to say that **I am not appealed** that it took _so long_ for this `feature` to be [created](https://example.com) $e^{\\pi i} + 1 = 0$\n$$e^{\\pi i} + 1 = 0$$\n#1\n```js\nconsole.log('evil')\nalert('evil')\n```\n:+1: :100:" - review_id: 1001 - line: 1 - tree_path: "test1.txt" - created_unix: 946684812 - invalidated: false - content_version: 1 diff --git a/tests/e2e/fixtures/review.yml b/tests/e2e/fixtures/review.yml deleted file mode 100644 index 0892c54e55..0000000000 --- a/tests/e2e/fixtures/review.yml +++ /dev/null @@ -1,8 +0,0 @@ -- - id: 1001 - type: 22 - reviewer_id: 1 - issue_id: 2 - content: "Review Comment" - updated_unix: 946684810 - created_unix: 946684810 diff --git a/tests/e2e/git-notes.test.e2e.ts b/tests/e2e/git-notes.test.e2e.ts deleted file mode 100644 index 1e2cbe76fc..0000000000 --- a/tests/e2e/git-notes.test.e2e.ts +++ /dev/null @@ -1,30 +0,0 @@ -// @ts-check -import {expect} from '@playwright/test'; -import {save_visual, test} from './utils_e2e.ts'; - -test.use({user: 'user2'}); - -test('Change git note', async ({page}) => { - let response = await page.goto('/user2/repo1/commit/65f1bf27bc3bf70f64657658635e66094edbcb4d'); - expect(response?.status()).toBe(200); - - // An add button should not be present, because the commit already has a commit note - await expect(page.locator('#commit-notes-add-button')).toHaveCount(0); - - await page.locator('#commit-notes-edit-button').click(); - - let textarea = page.locator('textarea[name="notes"]'); - await expect(textarea).toBeVisible(); - await textarea.fill('This is a new note'); - await save_visual(page); - - await page.locator('#notes-save-button').click(); - await save_visual(page); - - response = await page.goto('/user2/repo1/commit/65f1bf27bc3bf70f64657658635e66094edbcb4d'); - expect(response?.status()).toBe(200); - - textarea = page.locator('textarea[name="notes"]'); - await expect(textarea).toHaveText('This is a new note'); - await save_visual(page); -}); diff --git a/tests/e2e/issue-comment.test.e2e.js b/tests/e2e/issue-comment.test.e2e.js new file mode 100644 index 0000000000..ee2e3a4c89 --- /dev/null +++ b/tests/e2e/issue-comment.test.e2e.js @@ -0,0 +1,63 @@ +// @ts-check +import {expect} from '@playwright/test'; +import {test, login_user, login} from './utils_e2e.js'; + +test.beforeAll(async ({browser}, workerInfo) => { + await login_user(browser, workerInfo, 'user2'); +}); + +test('Hyperlink paste behaviour', async ({browser}, workerInfo) => { + test.skip(['Mobile Safari', 'Mobile Chrome', 'webkit'].includes(workerInfo.project.name), 'Mobile clients seem to have very weird behaviour with this test, which I cannot confirm with real usage'); + const page = await login({browser}, workerInfo); + await page.goto('/user2/repo1/issues/new'); + await page.locator('textarea').click(); + // same URL + await page.locator('textarea').fill('https://codeberg.org/forgejo/forgejo#some-anchor'); + await page.locator('textarea').press('Shift+Home'); + await page.locator('textarea').press('ControlOrMeta+c'); + await page.locator('textarea').press('ControlOrMeta+v'); + await expect(page.locator('textarea')).toHaveValue('https://codeberg.org/forgejo/forgejo#some-anchor'); + // other text + await page.locator('textarea').fill('Some other text'); + await page.locator('textarea').press('ControlOrMeta+a'); + await page.locator('textarea').press('ControlOrMeta+v'); + await expect(page.locator('textarea')).toHaveValue('[Some other text](https://codeberg.org/forgejo/forgejo#some-anchor)'); + // subset of URL + await page.locator('textarea').fill('https://codeberg.org/forgejo/forgejo#some'); + await page.locator('textarea').press('ControlOrMeta+a'); + await page.locator('textarea').press('ControlOrMeta+v'); + await expect(page.locator('textarea')).toHaveValue('https://codeberg.org/forgejo/forgejo#some-anchor'); + // superset of URL + await page.locator('textarea').fill('https://codeberg.org/forgejo/forgejo#some-anchor-on-the-page'); + await page.locator('textarea').press('ControlOrMeta+a'); + await page.locator('textarea').press('ControlOrMeta+v'); + await expect(page.locator('textarea')).toHaveValue('https://codeberg.org/forgejo/forgejo#some-anchor'); + // completely separate URL + await page.locator('textarea').fill('http://example.com'); + await page.locator('textarea').press('ControlOrMeta+a'); + await page.locator('textarea').press('ControlOrMeta+v'); + await expect(page.locator('textarea')).toHaveValue('https://codeberg.org/forgejo/forgejo#some-anchor'); +}); + +test('Always focus edit tab first on edit', async ({browser}, workerInfo) => { + const page = await login({browser}, workerInfo); + const response = await page.goto('/user2/repo1/issues/1'); + await expect(response?.status()).toBe(200); + + // Switch to preview tab and save + await page.click('#issue-1 .comment-container .context-menu'); + await page.click('#issue-1 .comment-container .menu>.edit-content'); + await page.locator('#issue-1 .comment-container a[data-tab-for=markdown-previewer]').click(); + await page.click('#issue-1 .comment-container .save'); + + await page.waitForLoadState('networkidle'); + + // Edit again and assert that edit tab should be active (and not preview tab) + await page.click('#issue-1 .comment-container .context-menu'); + await page.click('#issue-1 .comment-container .menu>.edit-content'); + const editTab = page.locator('#issue-1 .comment-container a[data-tab-for=markdown-writer]'); + const previewTab = page.locator('#issue-1 .comment-container a[data-tab-for=markdown-previewer]'); + + await expect(editTab).toHaveClass(/active/); + await expect(previewTab).not.toHaveClass(/active/); +}); diff --git a/tests/e2e/issue-comment.test.e2e.ts b/tests/e2e/issue-comment.test.e2e.ts deleted file mode 100644 index 1c19f98c48..0000000000 --- a/tests/e2e/issue-comment.test.e2e.ts +++ /dev/null @@ -1,203 +0,0 @@ -// @watch start -// web_src/js/features/comp/** -// web_src/js/features/repo-** -// templates/repo/issue/view_content/* -// @watch end - -import {expect} from '@playwright/test'; -import {test, save_visual} from './utils_e2e.ts'; - -test.use({user: 'user2'}); - -test('Menu accessibility', async ({page}) => { - await page.goto('/user2/repo1/issues/1'); - await expect(page.getByLabel('user2 reacted eyes. Remove eyes')).toBeVisible(); - await expect(page.getByLabel('reacted laugh. Remove laugh')).toBeVisible(); - await expect(page.locator('#issue-1').getByLabel('Comment menu')).toBeVisible(); - await expect(page.locator('#issue-1').getByRole('heading').getByLabel('Add reaction')).toBeVisible(); - page.getByLabel('reacted laugh. Remove').click(); - await expect(page.getByLabel('user1 reacted laugh. Add laugh')).toBeVisible(); - page.getByLabel('user1 reacted laugh.').click(); - await expect(page.getByLabel('user1, user2 reacted laugh. Remove laugh')).toBeVisible(); -}); - -test('Hyperlink paste behaviour', async ({page}, workerInfo) => { - test.skip(['Mobile Safari', 'Mobile Chrome', 'webkit'].includes(workerInfo.project.name), 'Mobile clients seem to have very weird behaviour with this test, which I cannot confirm with real usage'); - await page.goto('/user2/repo1/issues/new'); - await page.locator('textarea').click(); - // same URL - await page.locator('textarea').fill('https://codeberg.org/forgejo/forgejo#some-anchor'); - await page.locator('textarea').press('Shift+Home'); - await page.locator('textarea').press('ControlOrMeta+c'); - await page.locator('textarea').press('ControlOrMeta+v'); - await expect(page.locator('textarea')).toHaveValue('https://codeberg.org/forgejo/forgejo#some-anchor'); - // other text - await page.locator('textarea').fill('Some other text'); - await page.locator('textarea').press('ControlOrMeta+a'); - await page.locator('textarea').press('ControlOrMeta+v'); - await expect(page.locator('textarea')).toHaveValue('[Some other text](https://codeberg.org/forgejo/forgejo#some-anchor)'); - // subset of URL - await page.locator('textarea').fill('https://codeberg.org/forgejo/forgejo#some'); - await page.locator('textarea').press('ControlOrMeta+a'); - await page.locator('textarea').press('ControlOrMeta+v'); - await expect(page.locator('textarea')).toHaveValue('https://codeberg.org/forgejo/forgejo#some-anchor'); - // superset of URL - await page.locator('textarea').fill('https://codeberg.org/forgejo/forgejo#some-anchor-on-the-page'); - await page.locator('textarea').press('ControlOrMeta+a'); - await page.locator('textarea').press('ControlOrMeta+v'); - await expect(page.locator('textarea')).toHaveValue('https://codeberg.org/forgejo/forgejo#some-anchor'); - // completely separate URL - await page.locator('textarea').fill('http://example.com'); - await page.locator('textarea').press('ControlOrMeta+a'); - await page.locator('textarea').press('ControlOrMeta+v'); - await expect(page.locator('textarea')).toHaveValue('https://codeberg.org/forgejo/forgejo#some-anchor'); - await page.locator('textarea').fill(''); -}); - -test('Always focus edit tab first on edit', async ({page}) => { - const response = await page.goto('/user2/repo1/issues/1'); - expect(response?.status()).toBe(200); - - // Switch to preview tab and save - await page.click('#issue-1 .comment-container .context-menu'); - await page.click('#issue-1 .comment-container .menu>.edit-content'); - await page.locator('#issue-1 .comment-container a[data-tab-for=markdown-previewer]').click(); - await page.click('#issue-1 .comment-container .save'); - - await page.waitForLoadState(); - - // Edit again and assert that edit tab should be active (and not preview tab) - await page.click('#issue-1 .comment-container .context-menu'); - await page.click('#issue-1 .comment-container .menu>.edit-content'); - const editTab = page.locator('#issue-1 .comment-container a[data-tab-for=markdown-writer]'); - const previewTab = page.locator('#issue-1 .comment-container a[data-tab-for=markdown-previewer]'); - - await expect(editTab).toHaveClass(/active/); - await expect(previewTab).not.toHaveClass(/active/); - await save_visual(page); -}); - -test('Reset content of comment edit field on cancel', async ({page}) => { - const response = await page.goto('/user2/repo1/issues/1'); - expect(response?.status()).toBe(200); - - const editorTextarea = page.locator('[id="_combo_markdown_editor_1"]'); - - // Change the content of the edit field - await page.click('#issue-1 .comment-container .context-menu'); - await page.click('#issue-1 .comment-container .menu>.edit-content'); - await expect(editorTextarea).toHaveValue('content for the first issue'); - await editorTextarea.fill('some random string'); - await expect(editorTextarea).toHaveValue('some random string'); - await page.click('#issue-1 .comment-container .edit .cancel'); - - // Edit again and assert that the edit field should be reset to the initial content - await page.click('#issue-1 .comment-container .context-menu'); - await page.click('#issue-1 .comment-container .menu>.edit-content'); - await expect(editorTextarea).toHaveValue('content for the first issue'); - await save_visual(page); -}); - -test('Quote reply', async ({page}, workerInfo) => { - test.skip(workerInfo.project.name !== 'firefox', 'Uses Firefox specific selection quirks'); - const response = await page.goto('/user2/repo1/issues/1'); - expect(response?.status()).toBe(200); - - const editorTextarea = page.locator('textarea.markdown-text-editor'); - - // Full quote. - await page.click('#issuecomment-1001 .comment-container .context-menu'); - await page.click('#issuecomment-1001 .quote-reply'); - - await expect(editorTextarea).toHaveValue('@user2 wrote in http://localhost:3003/user2/repo1/issues/1#issuecomment-1001:\n\n' + - '> ## [](#lorem-ipsum)Lorem Ipsum\n' + - '> \n' + - '> I would like to say that **I am not appealed** that it took _so long_ for this `feature` to be [created](https://example.com) \\(e^{\\pi i} + 1 = 0\\)\n' + - '> \n' + - '> \\[e^{\\pi i} + 1 = 0\\]\n' + - '> \n' + - '> #1\n' + - '> \n' + - '> ```js\n' + - "> console.log('evil')\n" + - "> alert('evil')\n" + - '> ```\n' + - '> \n' + - '> :+1: :100:\n\n'); - - await editorTextarea.fill(''); - - // Partial quote. - await page.click('#issuecomment-1001 .comment-container .context-menu'); - - await page.evaluate(() => { - const range = new Range(); - range.setStart(document.querySelector('#issuecomment-1001-content #user-content-lorem-ipsum').childNodes[1], 6); - range.setEnd(document.querySelector('#issuecomment-1001-content p').childNodes[1].childNodes[0], 7); - - const selection = window.getSelection(); - - // Add range to window selection - selection.addRange(range); - }); - - await page.click('#issuecomment-1001 .quote-reply'); - - await expect(editorTextarea).toHaveValue('@user2 wrote in http://localhost:3003/user2/repo1/issues/1#issuecomment-1001:\n\n' + - '> ## Ipsum\n' + - '> \n' + - '> I would like to say that **I am no**\n\n'); - - await editorTextarea.fill(''); - - // Another partial quote. - await page.click('#issuecomment-1001 .comment-container .context-menu'); - - await page.evaluate(() => { - const range = new Range(); - range.setStart(document.querySelector('#issuecomment-1001-content p').childNodes[1].childNodes[0], 7); - range.setEnd(document.querySelector('#issuecomment-1001-content p').childNodes[7].childNodes[0], 3); - - const selection = window.getSelection(); - - // Add range to window selection - selection.addRange(range); - }); - - await page.click('#issuecomment-1001 .quote-reply'); - - await expect(editorTextarea).toHaveValue('@user2 wrote in http://localhost:3003/user2/repo1/issues/1#issuecomment-1001:\n\n' + - '> **t appealed** that it took _so long_ for this `feature` to be [cre](https://example.com)\n\n'); - - await editorTextarea.fill(''); -}); - -test('Pull quote reply', async ({page}, workerInfo) => { - test.skip(workerInfo.project.name !== 'firefox', 'Uses Firefox specific selection quirks'); - const response = await page.goto('/user2/commitsonpr/pulls/1/files'); - expect(response?.status()).toBe(200); - - const editorTextarea = page.locator('textarea.markdown-text-editor'); - - // Full quote with no reply handler being open. - await page.click('.comment-code-cloud .context-menu'); - await page.click('.comment-code-cloud .quote-reply'); - - await expect(editorTextarea).toHaveValue('@user2 wrote in http://localhost:3003/user2/commitsonpr/pulls/1/files#issuecomment-1002:\n\n' + - '> ## [](#lorem-ipsum)Lorem Ipsum\n' + - '> \n' + - '> I would like to say that **I am not appealed** that it took _so long_ for this `feature` to be [created](https://example.com) \\(e^{\\pi i} + 1 = 0\\)\n' + - '> \n' + - '> \\[e^{\\pi i} + 1 = 0\\]\n' + - '> \n' + - '> #1\n' + - '> \n' + - '> ```js\n' + - "> console.log('evil')\n" + - "> alert('evil')\n" + - '> ```\n' + - '> \n' + - '> :+1: :100:\n\n'); - - await editorTextarea.fill(''); -}); diff --git a/tests/e2e/issue-sidebar.test.e2e.js b/tests/e2e/issue-sidebar.test.e2e.js new file mode 100644 index 0000000000..0311910a34 --- /dev/null +++ b/tests/e2e/issue-sidebar.test.e2e.js @@ -0,0 +1,143 @@ +// @ts-check +import {expect} from '@playwright/test'; +import {test, login_user, login} from './utils_e2e.js'; + +test.beforeAll(async ({browser}, workerInfo) => { + await login_user(browser, workerInfo, 'user2'); +}); + +// belongs to test: Pull: Toggle WIP +const prTitle = 'pull5'; + +async function click_toggle_wip({page}) { + await page.locator('.toggle-wip>a').click(); + await page.waitForLoadState('networkidle'); +} + +async function check_wip({page}, is) { + const elemTitle = '#issue-title-display'; + const stateLabel = '.issue-state-label'; + await expect(page.locator(elemTitle)).toContainText(prTitle); + await expect(page.locator(elemTitle)).toContainText('#5'); + if (is) { + await expect(page.locator(elemTitle)).toContainText('WIP'); + await expect(page.locator(stateLabel)).toContainText('Draft'); + } else { + await expect(page.locator(elemTitle)).not.toContainText('WIP'); + await expect(page.locator(stateLabel)).toContainText('Open'); + } +} + +test('Pull: Toggle WIP', async ({browser}, 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'); + const page = await login({browser}, workerInfo); + const response = await page.goto('/user2/repo1/pulls/5'); + await expect(response?.status()).toBe(200); // Status OK + // initial state + await check_wip({page}, false); + // toggle to WIP + await click_toggle_wip({page}); + await check_wip({page}, true); + // remove WIP + await click_toggle_wip({page}); + await check_wip({page}, false); + + // manually edit title to another prefix + await page.locator('#issue-title-edit-show').click(); + await page.locator('#issue-title-editor input').fill(`[WIP] ${prTitle}`); + await page.getByText('Save').click(); + await page.waitForLoadState('networkidle'); + await check_wip({page}, true); + // remove again + await click_toggle_wip({page}); + await check_wip({page}, false); + // check maximum title length is handled gracefully + const maxLenStr = prTitle + 'a'.repeat(240); + await page.locator('#issue-title-edit-show').click(); + await page.locator('#issue-title-editor input').fill(maxLenStr); + await page.getByText('Save').click(); + await page.waitForLoadState('networkidle'); + await click_toggle_wip({page}); + await check_wip({page}, true); + await click_toggle_wip({page}); + await check_wip({page}, false); + await expect(page.locator('h1')).toContainText(maxLenStr); + // restore original title + await page.locator('#issue-title-edit-show').click(); + await page.locator('#issue-title-editor input').fill(prTitle); + await page.getByText('Save').click(); + await check_wip({page}, false); +}); + +test('Issue: Labels', async ({browser}, 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'); + const page = await login({browser}, workerInfo); + // select label list in sidebar only + const labelList = page.locator('.issue-content-right .labels-list a'); + const response = await page.goto('/user2/repo1/issues/1'); + await expect(response?.status()).toBe(200); + // preconditions + await expect(labelList.filter({hasText: 'label1'})).toBeVisible(); + await expect(labelList.filter({hasText: 'label2'})).toBeHidden(); + // add label2 + await page.locator('.select-label').click(); + // label search could be tested this way: + // await page.locator('.select-label input').fill('label2'); + await page.locator('.select-label .item').filter({hasText: 'label2'}).click(); + await page.locator('.select-label').click(); + await page.waitForLoadState('networkidle'); + await expect(labelList.filter({hasText: 'label2'})).toBeVisible(); + // test removing label again + await page.locator('.select-label').click(); + await page.locator('.select-label .item').filter({hasText: 'label2'}).click(); + await page.locator('.select-label').click(); + await page.waitForLoadState('networkidle'); + await expect(labelList.filter({hasText: 'label2'})).toBeHidden(); + await expect(labelList.filter({hasText: 'label1'})).toBeVisible(); +}); + +test('Issue: Milestone', async ({browser}, 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'); + const page = await login({browser}, workerInfo); + + const response = await page.goto('/user2/repo1/issues/1'); + await expect(response?.status()).toBe(200); + + const selectedMilestone = page.locator('.issue-content-right .select-milestone.list'); + const milestoneDropdown = page.locator('.issue-content-right .select-milestone.dropdown'); + await expect(selectedMilestone).toContainText('No milestone'); + + // Add milestone. + await milestoneDropdown.click(); + await page.getByRole('option', {name: 'milestone1'}).click(); + await expect(selectedMilestone).toContainText('milestone1'); + await expect(page.locator('.timeline-item.event').last()).toContainText('user2 added this to the milestone1 milestone'); + + // Clear milestone. + await milestoneDropdown.click(); + await page.getByText('Clear milestone', {exact: true}).click(); + await expect(selectedMilestone).toContainText('No milestone'); + await expect(page.locator('.timeline-item.event').last()).toContainText('user2 removed this from the milestone1 milestone'); +}); + +test('New Issue: Milestone', async ({browser}, 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'); + const page = await login({browser}, workerInfo); + + const response = await page.goto('/user2/repo1/issues/new'); + await expect(response?.status()).toBe(200); + + const selectedMilestone = page.locator('.issue-content-right .select-milestone.list'); + const milestoneDropdown = page.locator('.issue-content-right .select-milestone.dropdown'); + await expect(selectedMilestone).toContainText('No milestone'); + + // Add milestone. + await milestoneDropdown.click(); + await page.getByRole('option', {name: 'milestone1'}).click(); + await expect(selectedMilestone).toContainText('milestone1'); + + // Clear milestone. + await milestoneDropdown.click(); + await page.getByText('Clear milestone', {exact: true}).click(); + await expect(selectedMilestone).toContainText('No milestone'); +}); diff --git a/tests/e2e/issue-sidebar.test.e2e.ts b/tests/e2e/issue-sidebar.test.e2e.ts deleted file mode 100644 index fe2a6cec87..0000000000 --- a/tests/e2e/issue-sidebar.test.e2e.ts +++ /dev/null @@ -1,264 +0,0 @@ -// @watch start -// templates/repo/issue/view_content/** -// web_src/css/repo/issue-** -// web_src/js/features/repo-issue** -// @watch end - -/* eslint playwright/expect-expect: ["error", { "assertFunctionNames": ["check_wip"] }] */ - -import {expect, type Page} from '@playwright/test'; -import {save_visual, test} from './utils_e2e.ts'; - -test.use({user: 'user2'}); - -test.describe('Pull: Toggle WIP', () => { - const prTitle = 'pull5'; - - async function toggle_wip_to({page}, should: boolean) { - await page.waitForLoadState('domcontentloaded'); - if (should) { - await page.getByText('Still in progress?').click(); - } else { - await page.getByText('Ready for review?').click(); - } - } - - async function check_wip({page}, is: boolean) { - const elemTitle = 'h1'; - const stateLabel = '.issue-state-label'; - await page.waitForLoadState('domcontentloaded'); - await expect(page.locator(elemTitle)).toContainText(prTitle); - await expect(page.locator(elemTitle)).toContainText('#5'); - if (is) { - await expect(page.locator(elemTitle)).toContainText('WIP'); - await expect(page.locator(stateLabel)).toContainText('Draft'); - } else { - await expect(page.locator(elemTitle)).not.toContainText('WIP'); - await expect(page.locator(stateLabel)).toContainText('Open'); - } - } - - test.beforeEach(async ({page}) => { - const response = await page.goto('/user2/repo1/pulls/5'); - expect(response?.status()).toBe(200); // Status OK - // ensure original title - await page.locator('#issue-title-edit-show').click(); - await page.locator('#issue-title-editor input').fill(prTitle); - await page.getByText('Save').click(); - await check_wip({page}, false); - }); - - 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); - // remove WIP - await toggle_wip_to({page}, false); - await check_wip({page}, false); - }); - - test('manual edit', 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'); - // manually edit title to another prefix - await page.locator('#issue-title-edit-show').click(); - await page.locator('#issue-title-editor input').fill(`[WIP] ${prTitle}`); - await page.getByText('Save').click(); - await check_wip({page}, true); - // remove again - await toggle_wip_to({page}, false); - await check_wip({page}, false); - }); - - test('maximum title length', 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'); - // check maximum title length is handled gracefully - const maxLenStr = prTitle + 'a'.repeat(240); - await page.locator('#issue-title-edit-show').click(); - await page.locator('#issue-title-editor input').fill(maxLenStr); - await page.getByText('Save').click(); - await expect(page.locator('h1')).toContainText(maxLenStr); - await check_wip({page}, false); - await toggle_wip_to({page}, true); - await check_wip({page}, true); - await expect(page.locator('h1')).toContainText(maxLenStr); - await toggle_wip_to({page}, false); - await check_wip({page}, false); - await expect(page.locator('h1')).toContainText(maxLenStr); - }); -}); - -test('Issue: Labels', 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'); - - async function submitLabels({page}: { page: Page }) { - const submitted = page.waitForResponse('/user2/repo1/issues/labels'); - await page.locator('textarea').first().click(); // close via unrelated element - await submitted; - await page.waitForLoadState(); - } - - // select label list in sidebar only - const labelList = page.locator('.issue-content-right .labels-list a'); - const response = await page.goto('/user2/repo1/issues/1'); - expect(response?.status()).toBe(200); - - // restore initial state - await page.locator('.select-label').click(); - const responsePromise = page.waitForResponse('/user2/repo1/issues/labels'); - await page.getByText('Clear labels').click(); - await responsePromise; - await expect(labelList.filter({hasText: 'label1'})).toBeHidden(); - await expect(labelList.filter({hasText: 'label2'})).toBeHidden(); - - // add both labels - await page.locator('.select-label').click(); - // label search could be tested this way: - // await page.locator('.select-label input').fill('label2'); - await page.locator('.select-label .item').filter({hasText: 'label2'}).click(); - await page.locator('.select-label .item').filter({hasText: 'label1'}).click(); - await submitLabels({page}); - await expect(labelList.filter({hasText: 'label2'})).toBeVisible(); - await expect(labelList.filter({hasText: 'label1'})).toBeVisible(); - - // test removing label2 again - // due to a race condition, the page could still be "reloading", - // closing the dropdown after it was clicked. - // Retry the interaction as a group - // also see https://playwright.dev/docs/test-assertions#expecttopass - await expect(async () => { - await page.locator('.select-label').click(); - await page.locator('.select-label .item').filter({hasText: 'label2'}).click(); - }).toPass(); - await submitLabels({page}); - await expect(labelList.filter({hasText: 'label2'})).toBeHidden(); - await expect(labelList.filter({hasText: 'label1'})).toBeVisible(); -}); - -test('Issue: Assignees', 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'); - // select label list in sidebar only - const assigneesList = page.locator('.issue-content-right .assignees.list .selected .item a'); - - const response = await page.goto('/org3/repo3/issues/1'); - expect(response?.status()).toBe(200); - // Clear all assignees - await page.locator('.select-assignees-modify.dropdown').click(); - await page.locator('.select-assignees-modify.dropdown .no-select.item').click(); - await expect(assigneesList.filter({hasText: 'user2'})).toBeHidden(); - await expect(assigneesList.filter({hasText: 'user4'})).toBeHidden(); - await expect(page.locator('.ui.assignees.list .item.no-select')).toBeVisible(); - await expect(page.locator('.select-assign-me')).toBeVisible(); - - // Assign other user (with searchbox) - await page.locator('.select-assignees-modify.dropdown').click(); - await page.type('.select-assignees-modify .menu .search input', 'user4'); - await expect(page.locator('.select-assignees-modify .menu .item').filter({hasText: 'user2'})).toBeHidden(); - await expect(page.locator('.select-assignees-modify .menu .item').filter({hasText: 'user4'})).toBeVisible(); - await page.locator('.select-assignees-modify .menu .item').filter({hasText: 'user4'}).click(); - await page.locator('.select-assignees-modify.dropdown').click(); - await expect(assigneesList.filter({hasText: 'user4'})).toBeVisible(); - - // remove user4 - await page.locator('.select-assignees-modify.dropdown').click(); - await page.locator('.select-assignees-modify .menu .item').filter({hasText: 'user4'}).click(); - await page.locator('.select-assignees-modify.dropdown').click(); - await expect(page.locator('.ui.assignees.list .item.no-select')).toBeVisible(); - await expect(assigneesList.filter({hasText: 'user4'})).toBeHidden(); - - // Test assign me - await page.locator('.ui.assignees .select-assign-me').click(); - await expect(assigneesList.filter({hasText: 'user2'})).toBeVisible(); - await expect(page.locator('.ui.assignees.list .item.no-select')).toBeHidden(); -}); - -test('New Issue: Assignees', 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'); - // select label list in sidebar only - const assigneesList = page.locator('.issue-content-right .assignees.list .selected .item'); - - const response = await page.goto('/org3/repo3/issues/new'); - expect(response?.status()).toBe(200); - // preconditions - await expect(page.locator('.ui.assignees.list .item.no-select')).toBeVisible(); - await expect(assigneesList.filter({hasText: 'user2'})).toBeHidden(); - await expect(assigneesList.filter({hasText: 'user4'})).toBeHidden(); - - // Assign other user (with searchbox) - await page.locator('.select-assignees.dropdown').click(); - await page.fill('.select-assignees .menu .search input', 'user4'); - await expect(page.locator('.select-assignees .menu .item').filter({hasText: 'user2'})).toBeHidden(); - await expect(page.locator('.select-assignees .menu .item').filter({hasText: 'user4'})).toBeVisible(); - await page.locator('.select-assignees .menu .item').filter({hasText: 'user4'}).click(); - await page.locator('.select-assignees.dropdown').click(); - await expect(assigneesList.filter({hasText: 'user4'})).toBeVisible(); - await save_visual(page); - - // remove user4 - await page.locator('.select-assignees.dropdown').click(); - await page.locator('.select-assignees .menu .item').filter({hasText: 'user4'}).click(); - await page.locator('.select-assignees.dropdown').click(); - await expect(page.locator('.ui.assignees.list .item.no-select')).toBeVisible(); - await expect(assigneesList.filter({hasText: 'user4'})).toBeHidden(); - - // Test assign me - await page.locator('.ui.assignees .select-assign-me').click(); - await expect(assigneesList.filter({hasText: 'user2'})).toBeVisible(); - await expect(page.locator('.ui.assignees.list .item.no-select')).toBeHidden(); - - await page.locator('.select-assignees.dropdown').click(); - await page.fill('.select-assignees .menu .search input', ''); - await page.locator('.select-assignees.dropdown .no-select.item').click(); - await expect(page.locator('.select-assign-me')).toBeVisible(); - await save_visual(page); -}); - -test('Issue: Milestone', 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'); - - const response = await page.goto('/user2/repo1/issues/1'); - expect(response?.status()).toBe(200); - - const selectedMilestone = page.locator('.issue-content-right .select-milestone.list'); - const milestoneDropdown = page.locator('.issue-content-right .select-milestone.dropdown'); - await expect(selectedMilestone).toContainText('No milestone'); - - // Add milestone. - await milestoneDropdown.click(); - await page.getByRole('option', {name: 'milestone1'}).click(); - await expect(selectedMilestone).toContainText('milestone1'); - await expect(page.locator('.timeline-item.event').last()).toContainText('user2 added this to the milestone1 milestone'); - - // Clear milestone. - await milestoneDropdown.click(); - await page.getByText('Clear milestone', {exact: true}).click(); - await expect(selectedMilestone).toContainText('No milestone'); - await expect(page.locator('.timeline-item.event').last()).toContainText('user2 removed this from the milestone1 milestone'); -}); - -test('New Issue: Milestone', 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'); - - const response = await page.goto('/user2/repo1/issues/new'); - expect(response?.status()).toBe(200); - - const selectedMilestone = page.locator('.issue-content-right .select-milestone.list'); - const milestoneDropdown = page.locator('.issue-content-right .select-milestone.dropdown'); - await expect(selectedMilestone).toContainText('No milestone'); - await save_visual(page); - - // Add milestone. - await milestoneDropdown.click(); - await page.getByRole('option', {name: 'milestone1'}).click(); - await expect(selectedMilestone).toContainText('milestone1'); - await save_visual(page); - - // Clear milestone. - await milestoneDropdown.click(); - await page.getByText('Clear milestone', {exact: true}).click(); - await expect(selectedMilestone).toContainText('No milestone'); - await save_visual(page); -}); diff --git a/tests/e2e/markdown-editor.test.e2e.js b/tests/e2e/markdown-editor.test.e2e.js new file mode 100644 index 0000000000..4a3b414b10 --- /dev/null +++ b/tests/e2e/markdown-editor.test.e2e.js @@ -0,0 +1,177 @@ +// @ts-check +import {expect} from '@playwright/test'; +import {test, load_logged_in_context, login_user} from './utils_e2e.js'; + +test.beforeAll(async ({browser}, workerInfo) => { + await login_user(browser, workerInfo, 'user2'); +}); + +test('markdown indentation', async ({browser}, workerInfo) => { + const context = await load_logged_in_context(browser, workerInfo, 'user2'); + + const initText = `* first\n* second\n* third\n* last`; + + const page = await context.newPage(); + const response = await page.goto('/user2/repo1/issues/new'); + await expect(response?.status()).toBe(200); + + const textarea = page.locator('textarea[name=content]'); + const tab = ' '; + const indent = page.locator('button[data-md-action="indent"]'); + const unindent = page.locator('button[data-md-action="unindent"]'); + await textarea.fill(initText); + await textarea.click(); // Tab handling is disabled until pointer event or input. + + // Indent, then unindent first line + await textarea.focus(); + await textarea.evaluate((it) => it.setSelectionRange(0, 0)); + await indent.click(); + await expect(textarea).toHaveValue(`${tab}* first\n* second\n* third\n* last`); + await unindent.click(); + await expect(textarea).toHaveValue(initText); + + // Indent second line while somewhere inside of it + await textarea.focus(); + await textarea.press('ArrowDown'); + await textarea.press('ArrowRight'); + await textarea.press('ArrowRight'); + await indent.click(); + await expect(textarea).toHaveValue(`* first\n${tab}* second\n* third\n* last`); + + // Subsequently, select a chunk of 2nd and 3rd line and indent both, preserving the cursor position in relation to text + await textarea.focus(); + await textarea.evaluate((it) => it.setSelectionRange(it.value.indexOf('cond'), it.value.indexOf('hird'))); + await indent.click(); + const lines23 = `* first\n${tab}${tab}* second\n${tab}* third\n* last`; + await expect(textarea).toHaveValue(lines23); + await expect(textarea).toHaveJSProperty('selectionStart', lines23.indexOf('cond')); + await expect(textarea).toHaveJSProperty('selectionEnd', lines23.indexOf('hird')); + + // Then unindent twice, erasing all indents. + await unindent.click(); + await expect(textarea).toHaveValue(`* first\n${tab}* second\n* third\n* last`); + await unindent.click(); + await expect(textarea).toHaveValue(initText); + + // Indent and unindent with cursor at the end of the line + await textarea.focus(); + await textarea.evaluate((it) => it.setSelectionRange(it.value.indexOf('cond'), it.value.indexOf('cond'))); + await textarea.press('End'); + await indent.click(); + await expect(textarea).toHaveValue(`* first\n${tab}* second\n* third\n* last`); + await unindent.click(); + await expect(textarea).toHaveValue(initText); + + // Check that Tab does work after input + await textarea.focus(); + await textarea.evaluate((it) => it.setSelectionRange(it.value.length, it.value.length)); + await textarea.press('Shift+Enter'); // Avoid triggering the prefix continuation feature + await textarea.pressSequentially('* least'); + await indent.click(); + await expect(textarea).toHaveValue(`* first\n* second\n* third\n* last\n${tab}* least`); + + // Check that partial indents are cleared + await textarea.focus(); + await textarea.fill(initText); + await textarea.evaluate((it) => it.setSelectionRange(it.value.indexOf('* second'), it.value.indexOf('* second'))); + await textarea.pressSequentially(' '); + await unindent.click(); + await expect(textarea).toHaveValue(initText); +}); + +test('markdown list continuation', async ({browser}, workerInfo) => { + const context = await load_logged_in_context(browser, workerInfo, 'user2'); + + const initText = `* first\n* second\n* third\n* last`; + + const page = await context.newPage(); + const response = await page.goto('/user2/repo1/issues/new'); + await expect(response?.status()).toBe(200); + + const textarea = page.locator('textarea[name=content]'); + const tab = ' '; + const indent = page.locator('button[data-md-action="indent"]'); + await textarea.fill(initText); + + // Test continuation of '* ' prefix + await textarea.evaluate((it) => it.setSelectionRange(it.value.indexOf('cond'), it.value.indexOf('cond'))); + await textarea.press('End'); + await textarea.press('Enter'); + await textarea.pressSequentially('middle'); + await expect(textarea).toHaveValue(`* first\n* second\n* middle\n* third\n* last`); + + // Test continuation of ' * ' prefix + await indent.click(); + await textarea.press('Enter'); + await textarea.pressSequentially('muddle'); + await expect(textarea).toHaveValue(`* first\n* second\n${tab}* middle\n${tab}* muddle\n* third\n* last`); + + // Test breaking in the middle of a line + await textarea.evaluate((it) => it.setSelectionRange(it.value.lastIndexOf('ddle'), it.value.lastIndexOf('ddle'))); + await textarea.pressSequentially('tate'); + await textarea.press('Enter'); + await textarea.pressSequentially('me'); + await expect(textarea).toHaveValue(`* first\n* second\n${tab}* middle\n${tab}* mutate\n${tab}* meddle\n* third\n* last`); + + // Test not triggering when Shift held + await textarea.fill(initText); + await textarea.evaluate((it) => it.setSelectionRange(it.value.length, it.value.length)); + await textarea.press('Shift+Enter'); + await textarea.press('Enter'); + await textarea.pressSequentially('...but not least'); + await expect(textarea).toHaveValue(`* first\n* second\n* third\n* last\n\n...but not least`); + + // Test continuation of ordered list + await textarea.fill(`1. one\n2. two`); + await textarea.evaluate((it) => it.setSelectionRange(it.value.length, it.value.length)); + await textarea.press('Enter'); + await textarea.pressSequentially('three'); + await expect(textarea).toHaveValue(`1. one\n2. two\n3. three`); + + // Test continuation of alternative ordered list syntax + await textarea.fill(`1) one\n2) two`); + await textarea.evaluate((it) => it.setSelectionRange(it.value.length, it.value.length)); + await textarea.press('Enter'); + await textarea.pressSequentially('three'); + await expect(textarea).toHaveValue(`1) one\n2) two\n3) three`); + + // Test continuation of blockquote + await textarea.fill(`> knowledge is power`); + await textarea.evaluate((it) => it.setSelectionRange(it.value.length, it.value.length)); + await textarea.press('Enter'); + await textarea.pressSequentially('france is bacon'); + await expect(textarea).toHaveValue(`> knowledge is power\n> france is bacon`); + + // Test continuation of checklists + await textarea.fill(`- [ ] have a problem\n- [x] create a solution`); + await textarea.evaluate((it) => it.setSelectionRange(it.value.length, it.value.length)); + await textarea.press('Enter'); + await textarea.pressSequentially('write a test'); + await expect(textarea).toHaveValue(`- [ ] have a problem\n- [x] create a solution\n- [ ] write a test`); + + // Test all conceivable syntax (except ordered lists) + const prefixes = [ + '- ', // A space between the bullet and the content is required. + ' - ', // I have seen single space in front of -/* being used and even recommended, I think. + '* ', + '+ ', + ' ', + ' ', + ' - ', + '\t', + '\t\t* ', + '> ', + '> > ', + '- [ ] ', + '- [ ]', // This does seem to render, so allow. + '* [ ] ', + '+ [ ] ', + ]; + for (const prefix of prefixes) { + await textarea.fill(`${prefix}one`); + await textarea.evaluate((it) => it.setSelectionRange(it.value.length, it.value.length)); + await textarea.press('Enter'); + await textarea.pressSequentially('two'); + await expect(textarea).toHaveValue(`${prefix}one\n${prefix}two`); + } +}); diff --git a/tests/e2e/markdown-editor.test.e2e.ts b/tests/e2e/markdown-editor.test.e2e.ts deleted file mode 100644 index 35e9de2ea6..0000000000 --- a/tests/e2e/markdown-editor.test.e2e.ts +++ /dev/null @@ -1,251 +0,0 @@ -// @watch start -// web_src/js/features/comp/ComboMarkdownEditor.js -// web_src/css/editor/combomarkdowneditor.css -// templates/shared/combomarkdowneditor.tmpl -// @watch end - -import {expect} from '@playwright/test'; -import {save_visual, test} from './utils_e2e.ts'; - -test.use({user: 'user2'}); - -test('Markdown image preview behaviour', async ({page}, workerInfo) => { - test.skip(workerInfo.project.name === 'Mobile Safari', 'Flaky behaviour on mobile safari;'); - - // Editing the root README.md file for image preview - const editPath = '/user2/repo1/src/branch/master/README.md'; - - const response = await page.goto(editPath, {waitUntil: 'domcontentloaded'}); - expect(response?.status()).toBe(200); - - // Click 'Edit file' tab - await page.locator('[data-tooltip-content="Edit file"]').click(); - - // This yields the monaco editor - const editor = page.getByRole('presentation').nth(0); - await editor.click(); - // Clear all the content - await page.keyboard.press('ControlOrMeta+KeyA'); - // Add the image - await page.keyboard.type('![Logo of Forgejo](./assets/logo.svg "Logo of Forgejo")'); - - // Click 'Preview' tab - await page.locator('a[data-tab="preview"]').click(); - - // Check for the image preview via the expected attribute - const preview = page.locator('div[data-tab="preview"] p[dir="auto"] a'); - await expect(preview).toHaveAttribute('href', 'http://localhost:3003/user2/repo1/media/branch/master/assets/logo.svg'); - await save_visual(page); -}); - -test('markdown indentation', async ({page}) => { - const initText = `* first\n* second\n* third\n* last`; - - const response = await page.goto('/user2/repo1/issues/new'); - expect(response?.status()).toBe(200); - - const textarea = page.locator('textarea[name=content]'); - const tab = ' '; - const indent = page.locator('button[data-md-action="indent"]'); - const unindent = page.locator('button[data-md-action="unindent"]'); - await textarea.fill(initText); - await textarea.click(); // Tab handling is disabled until pointer event or input. - - // Indent, then unindent first line - await textarea.focus(); - await textarea.evaluate((it:HTMLTextAreaElement) => it.setSelectionRange(0, 0)); - await indent.click(); - await expect(textarea).toHaveValue(`${tab}* first\n* second\n* third\n* last`); - await unindent.click(); - await expect(textarea).toHaveValue(initText); - - // Indent second line while somewhere inside of it - await textarea.focus(); - await textarea.press('ArrowDown'); - await textarea.press('ArrowRight'); - await textarea.press('ArrowRight'); - await indent.click(); - await expect(textarea).toHaveValue(`* first\n${tab}* second\n* third\n* last`); - - // Subsequently, select a chunk of 2nd and 3rd line and indent both, preserving the cursor position in relation to text - await textarea.focus(); - await textarea.evaluate((it:HTMLTextAreaElement) => it.setSelectionRange(it.value.indexOf('cond'), it.value.indexOf('hird'))); - await indent.click(); - const lines23 = `* first\n${tab}${tab}* second\n${tab}* third\n* last`; - await expect(textarea).toHaveValue(lines23); - await expect(textarea).toHaveJSProperty('selectionStart', lines23.indexOf('cond')); - await expect(textarea).toHaveJSProperty('selectionEnd', lines23.indexOf('hird')); - - // Then unindent twice, erasing all indents. - await unindent.click(); - await expect(textarea).toHaveValue(`* first\n${tab}* second\n* third\n* last`); - await unindent.click(); - await expect(textarea).toHaveValue(initText); - - // Indent and unindent with cursor at the end of the line - await textarea.focus(); - await textarea.evaluate((it:HTMLTextAreaElement) => it.setSelectionRange(it.value.indexOf('cond'), it.value.indexOf('cond'))); - await textarea.press('End'); - await indent.click(); - await expect(textarea).toHaveValue(`* first\n${tab}* second\n* third\n* last`); - await unindent.click(); - await expect(textarea).toHaveValue(initText); - - // Check that Tab does work after input - await textarea.focus(); - await textarea.evaluate((it:HTMLTextAreaElement) => it.setSelectionRange(it.value.length, it.value.length)); - await textarea.press('Shift+Enter'); // Avoid triggering the prefix continuation feature - await textarea.pressSequentially('* least'); - await indent.click(); - await expect(textarea).toHaveValue(`* first\n* second\n* third\n* last\n${tab}* least`); - - // Check that partial indents are cleared - await textarea.focus(); - await textarea.fill(initText); - await textarea.evaluate((it:HTMLTextAreaElement) => it.setSelectionRange(it.value.indexOf('* second'), it.value.indexOf('* second'))); - await textarea.pressSequentially(' '); - await unindent.click(); - await expect(textarea).toHaveValue(initText); -}); - -test('markdown list continuation', async ({page}) => { - const initText = `* first\n* second`; - - const response = await page.goto('/user2/repo1/issues/new'); - expect(response?.status()).toBe(200); - - const textarea = page.locator('textarea[name=content]'); - const tab = ' '; - const indent = page.locator('button[data-md-action="indent"]'); - await textarea.fill(initText); - - // Test continuation of ' * ' prefix - await textarea.evaluate((it:HTMLTextAreaElement) => it.setSelectionRange(it.value.indexOf('rst'), it.value.indexOf('rst'))); - await indent.click(); - await textarea.press('End'); - await textarea.press('Enter'); - await textarea.pressSequentially('muddle'); - await expect(textarea).toHaveValue(`${tab}* first\n${tab}* muddle\n* second`); - - // Test breaking in the middle of a line - await textarea.evaluate((it:HTMLTextAreaElement) => it.setSelectionRange(it.value.lastIndexOf('ddle'), it.value.lastIndexOf('ddle'))); - await textarea.pressSequentially('tate'); - await textarea.press('Enter'); - await textarea.pressSequentially('me'); - await expect(textarea).toHaveValue(`${tab}* first\n${tab}* mutate\n${tab}* meddle\n* second`); - - // Test not triggering when Shift held - await textarea.fill(initText); - await textarea.evaluate((it:HTMLTextAreaElement) => it.setSelectionRange(it.value.length, it.value.length)); - await textarea.press('Shift+Enter'); - await textarea.press('Enter'); - await textarea.pressSequentially('...but not least'); - await expect(textarea).toHaveValue(`* first\n* second\n\n...but not least`); - - // Test continuation of ordered list - await textarea.fill(`1. one`); - await textarea.evaluate((it:HTMLTextAreaElement) => it.setSelectionRange(it.value.length, it.value.length)); - await textarea.press('Enter'); - await textarea.pressSequentially(' '); - await textarea.press('Enter'); - await textarea.pressSequentially('three'); - await textarea.press('Enter'); - await textarea.press('Enter'); - await expect(textarea).toHaveValue(`1. one\n2. \n3. three\n\n`); - - // Test continuation of alternative ordered list syntax - await textarea.fill(`1) one`); - await textarea.evaluate((it:HTMLTextAreaElement) => it.setSelectionRange(it.value.length, it.value.length)); - await textarea.press('Enter'); - await textarea.pressSequentially(' '); - await textarea.press('Enter'); - await textarea.pressSequentially('three'); - await textarea.press('Enter'); - await textarea.press('Enter'); - await expect(textarea).toHaveValue(`1) one\n2) \n3) three\n\n`); - - // Test continuation of checklists - await textarea.fill(`- [ ]have a problem\n- [x]create a solution`); - await textarea.evaluate((it:HTMLTextAreaElement) => it.setSelectionRange(it.value.length, it.value.length)); - await textarea.press('Enter'); - await textarea.pressSequentially('write a test'); - await expect(textarea).toHaveValue(`- [ ]have a problem\n- [x]create a solution\n- [ ]write a test`); - - // Test all conceivable syntax (except ordered lists) - const prefixes = [ - '- ', // A space between the bullet and the content is required. - ' - ', // I have seen single space in front of -/* being used and even recommended, I think. - '* ', - '+ ', - ' ', - ' ', - ' - ', - '\t', - '\t\t* ', - '> ', - '> > ', - '- [ ] ', - '* [ ] ', - '+ [ ] ', - ]; - for (const prefix of prefixes) { - await textarea.fill(`${prefix}one`); - await textarea.evaluate((it:HTMLTextAreaElement) => it.setSelectionRange(it.value.length, it.value.length)); - await textarea.press('Enter'); - await textarea.pressSequentially(' '); - await textarea.press('Enter'); - await textarea.pressSequentially('two'); - await textarea.press('Enter'); - await textarea.press('Enter'); - await expect(textarea).toHaveValue(`${prefix}one\n${prefix} \n${prefix}two\n\n`); - } -}); - -test('markdown insert table', async ({page}) => { - const response = await page.goto('/user2/repo1/issues/new'); - expect(response?.status()).toBe(200); - - const newTableButton = page.locator('button[data-md-action="new-table"]'); - await newTableButton.click(); - - const newTableModal = page.locator('div[data-markdown-table-modal-id="0"]'); - await expect(newTableModal).toBeVisible(); - await save_visual(page); - - await newTableModal.locator('input[name="table-rows"]').fill('3'); - await newTableModal.locator('input[name="table-columns"]').fill('2'); - - await newTableModal.locator('button[data-selector-name="ok-button"]').click(); - - await expect(newTableModal).toBeHidden(); - - const textarea = page.locator('textarea[name=content]'); - await expect(textarea).toHaveValue('| Header | Header |\n|---------|---------|\n| Content | Content |\n| Content | Content |\n| Content | Content |\n'); - await save_visual(page); -}); - -test('text expander has higher prio then prefix continuation', async ({page}) => { - const response = await page.goto('/user2/repo1/issues/new'); - expect(response?.status()).toBe(200); - - const textarea = page.locator('textarea[name=content]'); - const initText = `* first`; - await textarea.fill(initText); - await textarea.evaluate((it:HTMLTextAreaElement) => it.setSelectionRange(it.value.indexOf('rst'), it.value.indexOf('rst'))); - await textarea.press('End'); - - // Test emoji completion - await textarea.press('Enter'); - await textarea.pressSequentially(':smile_c'); - await textarea.press('Enter'); - await expect(textarea).toHaveValue(`* first\n* 😸`); - - // Test username completion - await textarea.press('Enter'); - await textarea.pressSequentially('@user'); - await textarea.press('Enter'); - await expect(textarea).toHaveValue(`* first\n* 😸\n* @user2 `); - - await textarea.press('Enter'); - await expect(textarea).toHaveValue(`* first\n* 😸\n* @user2 \n* `); -}); diff --git a/tests/e2e/markup.test.e2e.ts b/tests/e2e/markup.test.e2e.js similarity index 72% rename from tests/e2e/markup.test.e2e.ts rename to tests/e2e/markup.test.e2e.js index 398a0a6300..920537d08f 100644 --- a/tests/e2e/markup.test.e2e.ts +++ b/tests/e2e/markup.test.e2e.js @@ -1,17 +1,14 @@ -// @watch start -// web_src/css/markup/** -// @watch end - +// @ts-check import {expect} from '@playwright/test'; -import {save_visual, test} from './utils_e2e.ts'; +import {test} from './utils_e2e.js'; test('markup with #xyz-mode-only', async ({page}) => { const response = await page.goto('/user2/repo1/issues/1'); - expect(response?.status()).toBe(200); + await expect(response?.status()).toBe(200); + await page.waitForLoadState('networkidle'); const comment = page.locator('.comment-body>.markup', {hasText: 'test markup light/dark-mode-only'}); await expect(comment).toBeVisible(); await expect(comment.locator('[src$="#gh-light-mode-only"]')).toBeVisible(); await expect(comment.locator('[src$="#gh-dark-mode-only"]')).toBeHidden(); - await save_visual(page); }); diff --git a/tests/e2e/org-settings.test.e2e.ts b/tests/e2e/org-settings.test.e2e.js similarity index 60% rename from tests/e2e/org-settings.test.e2e.ts rename to tests/e2e/org-settings.test.e2e.js index df554e0674..5ff0975a26 100644 --- a/tests/e2e/org-settings.test.e2e.ts +++ b/tests/e2e/org-settings.test.e2e.js @@ -1,27 +1,23 @@ -// @watch start -// templates/org/team/new.tmpl -// web_src/css/form.css -// web_src/js/features/org-team.js -// @watch end - +// @ts-check import {expect} from '@playwright/test'; -import {save_visual, test} from './utils_e2e.ts'; -import {validate_form} from './shared/forms.ts'; +import {test, login_user, login} from './utils_e2e.js'; +import {validate_form} from './shared/forms.js'; -test.use({user: 'user2'}); +test.beforeAll(async ({browser}, workerInfo) => { + await login_user(browser, workerInfo, 'user2'); +}); -test('org team settings', async ({page}, workerInfo) => { +test('org team settings', async ({browser}, workerInfo) => { test.skip(workerInfo.project.name === 'Mobile Safari', 'Cannot get it to work - as usual'); + const page = await login({browser}, workerInfo); const response = await page.goto('/org/org3/teams/team1/edit'); - expect(response?.status()).toBe(200); + await expect(response?.status()).toBe(200); await page.locator('input[name="permission"][value="admin"]').click(); await expect(page.locator('.hide-unless-checked')).toBeHidden(); - await save_visual(page); await page.locator('input[name="permission"][value="read"]').click(); await expect(page.locator('.hide-unless-checked')).toBeVisible(); - await save_visual(page); // we are validating the form here to include the part that could be hidden await validate_form({page}); diff --git a/tests/e2e/profile_actions.test.e2e.ts b/tests/e2e/profile_actions.test.e2e.js similarity index 78% rename from tests/e2e/profile_actions.test.e2e.ts rename to tests/e2e/profile_actions.test.e2e.js index a66dc43aab..dcec0cd83c 100644 --- a/tests/e2e/profile_actions.test.e2e.ts +++ b/tests/e2e/profile_actions.test.e2e.js @@ -1,16 +1,14 @@ -// @watch start -// routers/web/user/** -// templates/shared/user/** -// web_src/js/features/common-global.js -// @watch end - +// @ts-check import {expect} from '@playwright/test'; -import {save_visual, test} from './utils_e2e.ts'; +import {test, login_user, load_logged_in_context} from './utils_e2e.js'; -test.use({user: 'user2'}); +test('Follow actions', async ({browser}, workerInfo) => { + await login_user(browser, workerInfo, 'user2'); + const context = await load_logged_in_context(browser, workerInfo, 'user2'); + const page = await context.newPage(); -test('Follow actions', async ({page}) => { await page.goto('/user1'); + await page.waitForLoadState('networkidle'); // Check if following and then unfollowing works. // This checks that the event listeners of @@ -27,7 +25,6 @@ test('Follow actions', async ({page}) => { await page.locator('.block').click(); await expect(page.locator('#block-user')).toBeVisible(); - await save_visual(page); await page.locator('#block-user .ok').click(); await expect(page.locator('.block')).toContainText('Unblock'); await expect(page.locator('#block-user')).toBeHidden(); @@ -37,7 +34,6 @@ test('Follow actions', async ({page}) => { const flashMessage = page.locator('#flash-message'); await expect(flashMessage).toBeVisible(); await expect(flashMessage).toContainText('You cannot follow this user because you have blocked this user or this user has blocked you.'); - await save_visual(page); // Unblock interaction. await page.locator('.block').click(); diff --git a/tests/e2e/reaction-selectors.test.e2e.ts b/tests/e2e/reaction-selectors.test.e2e.js similarity index 75% rename from tests/e2e/reaction-selectors.test.e2e.ts rename to tests/e2e/reaction-selectors.test.e2e.js index 54b7d91869..2a9c62bb4d 100644 --- a/tests/e2e/reaction-selectors.test.e2e.ts +++ b/tests/e2e/reaction-selectors.test.e2e.js @@ -1,14 +1,12 @@ -// @watch start -// web_src/js/features/comp/ReactionSelector.js -// routers/web/repo/issue.go -// @watch end +// @ts-check +import {expect} from '@playwright/test'; +import {test, login_user, load_logged_in_context} from './utils_e2e.js'; -import {expect, type Locator} from '@playwright/test'; -import {save_visual, test} from './utils_e2e.ts'; +test.beforeAll(async ({browser}, workerInfo) => { + await login_user(browser, workerInfo, 'user2'); +}); -test.use({user: 'user2'}); - -const assertReactionCounts = (comment: Locator, counts: unknown) => +const assertReactionCounts = (comment, counts) => expect(async () => { await expect(comment.locator('.reactions')).toBeVisible(); @@ -24,19 +22,21 @@ const assertReactionCounts = (comment: Locator, counts: unknown) => ]), ), ); - // eslint-disable-next-line playwright/no-standalone-expect return expect(reactions).toStrictEqual(counts); }).toPass(); -async function toggleReaction(menu: Locator, reaction: string) { +async function toggleReaction(menu, reaction) { await menu.evaluateAll((menus) => menus[0].focus()); await menu.locator('.add-reaction').click(); await menu.locator(`[role=menuitem][data-reaction-content="${reaction}"]`).click(); } -test('Reaction Selectors', async ({page}) => { +test('Reaction Selectors', async ({browser}, workerInfo) => { + const context = await load_logged_in_context(browser, workerInfo, 'user2'); + const page = await context.newPage(); + const response = await page.goto('/user2/repo1/issues/1'); - expect(response?.status()).toBe(200); + await expect(response?.status()).toBe(200); const comment = page.locator('.comment#issuecomment-2').first(); @@ -62,5 +62,4 @@ test('Reaction Selectors', async ({page}) => { await toggleReaction(topPicker, 'laugh'); await assertReactionCounts(comment, {'laugh': 2}); - await save_visual(page); }); diff --git a/tests/e2e/release.test.e2e.ts b/tests/e2e/release.test.e2e.js similarity index 74% rename from tests/e2e/release.test.e2e.ts rename to tests/e2e/release.test.e2e.js index 49c67793e6..ac1e101f98 100644 --- a/tests/e2e/release.test.e2e.ts +++ b/tests/e2e/release.test.e2e.js @@ -1,26 +1,23 @@ -// @watch start -// models/repo/attachment.go -// modules/structs/attachment.go -// routers/web/repo/** -// services/attachment/** -// services/release/** -// templates/repo/release/** -// web_src/js/features/repo-release.js -// @watch end - +// @ts-check import {expect} from '@playwright/test'; -import {save_visual, test} from './utils_e2e.ts'; -import {validate_form} from './shared/forms.ts'; +import {test, login_user, save_visual, load_logged_in_context} from './utils_e2e.js'; +import {validate_form} from './shared/forms.js'; -test.use({user: 'user2'}); +test.beforeAll(async ({browser}, workerInfo) => { + await login_user(browser, workerInfo, 'user2'); +}); test.describe.configure({ timeout: 30000, }); -test('External Release Attachments', async ({page, isMobile}) => { +test('External Release Attachments', async ({browser, isMobile}, workerInfo) => { test.skip(isMobile); + const context = await load_logged_in_context(browser, workerInfo, 'user2'); + /** @type {import('@playwright/test').Page} */ + const page = await context.newPage(); + // Click "New Release" await page.goto('/user2/repo2/releases'); await page.click('.button.small.primary'); @@ -35,19 +32,15 @@ test('External Release Attachments', async ({page, isMobile}) => { await page.fill('input[name=attachment-new-name-2]', 'Test'); await page.fill('input[name=attachment-new-exturl-2]', 'https://forgejo.org/'); await page.click('.remove-rel-attach'); - await save_visual(page); + save_visual(page); await page.click('.button.small.primary'); // Validate release page and click edit await expect(page).toHaveURL('/user2/repo2/releases'); await expect(page.locator('.download[open] li')).toHaveCount(3); - await expect(page.locator('.download[open] li:nth-of-type(1)')).toContainText('Source code (ZIP)'); - await expect(page.locator('.download[open] li:nth-of-type(1) a')).toHaveAttribute('href', '/user2/repo2/archive/2.0.zip'); - await expect(page.locator('.download[open] li:nth-of-type(2)')).toContainText('Source code (TAR.GZ)'); - await expect(page.locator('.download[open] li:nth-of-type(2) a')).toHaveAttribute('href', '/user2/repo2/archive/2.0.tar.gz'); await expect(page.locator('.download[open] li:nth-of-type(3)')).toContainText('Test'); await expect(page.locator('.download[open] li:nth-of-type(3) a')).toHaveAttribute('href', 'https://forgejo.org/'); - await save_visual(page); + save_visual(page); await page.locator('.octicon-pencil').first().click(); // Validate edit page and edit the release @@ -62,7 +55,7 @@ test('External Release Attachments', async ({page, isMobile}) => { await expect(page.locator('.attachment_edit:visible')).toHaveCount(4); await page.locator('.attachment_edit:visible').nth(2).fill('Test3'); await page.locator('.attachment_edit:visible').nth(3).fill('https://gitea.com/'); - await save_visual(page); + save_visual(page); await page.click('.button.small.primary'); // Validate release page and click edit @@ -72,7 +65,7 @@ test('External Release Attachments', async ({page, isMobile}) => { await expect(page.locator('.download[open] li:nth-of-type(3) a')).toHaveAttribute('href', 'https://gitea.io/'); await expect(page.locator('.download[open] li:nth-of-type(4)')).toContainText('Test3'); await expect(page.locator('.download[open] li:nth-of-type(4) a')).toHaveAttribute('href', 'https://gitea.com/'); - await save_visual(page); + save_visual(page); await page.locator('.octicon-pencil').first().click(); // Delete release diff --git a/tests/e2e/repo-activity-contributors.test.e2e.ts b/tests/e2e/repo-activity-contributors.test.e2e.ts deleted file mode 100644 index ece62cfaba..0000000000 --- a/tests/e2e/repo-activity-contributors.test.e2e.ts +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2024 The Forgejo Authors. All rights reserved. -// SPDX-License-Identifier: GPL-3.0-or-later - -// @watch start -// web_src/js/features/contributors.js -// web_src/js/components/RepoContributors.vue -// templates/repo/* -// @watch end - -import {expect} from '@playwright/test'; -import {test} from './utils_e2e.ts'; - -test('Contributor graph', async ({page}) => { - await page.goto('/user2/commits_search_test/activity/contributors'); - await page.getByRole('link', {name: '2 Commits'}).click(); - await expect(page.getByRole('cell', {name: 'Bob'})).toHaveCount(2); -}); diff --git a/tests/e2e/repo-code.test.e2e.ts b/tests/e2e/repo-code.test.e2e.js similarity index 62% rename from tests/e2e/repo-code.test.e2e.ts rename to tests/e2e/repo-code.test.e2e.js index 11b710c956..62c4f557c1 100644 --- a/tests/e2e/repo-code.test.e2e.ts +++ b/tests/e2e/repo-code.test.e2e.js @@ -1,14 +1,12 @@ -// @watch start -// web_src/js/features/repo-code.js -// web_src/css/repo.css -// services/gitdiff/** -// @watch end +// @ts-check +import {expect} from '@playwright/test'; +import {test, login_user, load_logged_in_context} from './utils_e2e.js'; -import {expect, type Page} from '@playwright/test'; -import {save_visual, test} from './utils_e2e.ts'; -import {accessibilityCheck} from './shared/accessibility.ts'; +test.beforeAll(async ({browser}, workerInfo) => { + await login_user(browser, workerInfo, 'user2'); +}); -async function assertSelectedLines(page: Page, nums: string[]) { +async function assertSelectedLines(page, nums) { const pageAssertions = async () => { expect( await Promise.all((await page.locator('tr.active [data-line-number]').all()).map((line) => line.getAttribute('data-line-number'))), @@ -30,11 +28,14 @@ async function assertSelectedLines(page: Page, nums: string[]) { return pageAssertions(); } -test('Line Range Selection', async ({page}) => { +test('Line Range Selection', async ({browser}, workerInfo) => { + const context = await load_logged_in_context(browser, workerInfo, 'user2'); + const page = await context.newPage(); + const filePath = '/user2/repo1/src/branch/master/README.md?display=source'; const response = await page.goto(filePath); - expect(response?.status()).toBe(200); + await expect(response?.status()).toBe(200); await assertSelectedLines(page, []); await page.locator('span#L1').click(); @@ -49,7 +50,6 @@ test('Line Range Selection', async ({page}) => { // out-of-bounds end line await page.goto(`${filePath}#L1-L100`); await assertSelectedLines(page, ['1', '2', '3']); - await save_visual(page); }); test('Readable diff', async ({page}, workerInfo) => { @@ -65,7 +65,7 @@ test('Readable diff', async ({page}, workerInfo) => { ]; for (const thisDiff of expectedDiffs) { const response = await page.goto('/user2/diff-test/commits/branch/main'); - expect(response?.status()).toBe(200); // Status OK + await expect(response?.status()).toBe(200); // Status OK await page.getByText(`Patch: ${thisDiff.id}`).click(); if (thisDiff.removed) { await expect(page.getByText(thisDiff.removed, {exact: true})).toHaveClass(/removed-code/); @@ -76,26 +76,11 @@ test('Readable diff', async ({page}, workerInfo) => { await expect(page.getByText(thisDiff.added, {exact: true})).toHaveCSS('background-color', 'rgb(134, 239, 172)'); } } - await save_visual(page); }); -test.describe('As authenticated user', () => { - test.use({user: 'user2'}); - - test('Username highlighted in commits', async ({page}) => { - await page.goto('/user2/mentions-highlighted/commits/branch/main'); - // check first commit - await page.getByRole('link', {name: 'A commit message which'}).click(); - await expect(page.getByRole('link', {name: '@user2'})).toHaveCSS('background-color', /(.*)/); - await expect(page.getByRole('link', {name: '@user1'})).toHaveCSS('background-color', 'rgba(0, 0, 0, 0)'); - await accessibilityCheck({page}, ['.commit-header'], [], []); - await save_visual(page); - // check second commit - await page.goto('/user2/mentions-highlighted/commits/branch/main'); - await page.locator('tbody').getByRole('link', {name: 'Another commit which mentions'}).click(); - await expect(page.getByRole('link', {name: '@user2'})).toHaveCSS('background-color', /(.*)/); - await expect(page.getByRole('link', {name: '@user1'})).toHaveCSS('background-color', 'rgba(0, 0, 0, 0)'); - await accessibilityCheck({page}, ['.commit-header'], [], []); - await save_visual(page); - }); +test('Commit graph overflow', async ({page}) => { + await page.goto('/user2/diff-test/graph'); + await expect(page.getByRole('button', {name: 'Mono'})).toBeInViewport({ratio: 1}); + await expect(page.getByRole('button', {name: 'Color'})).toBeInViewport({ratio: 1}); + await expect(page.locator('.selection.search.dropdown')).toBeInViewport({ratio: 1}); }); diff --git a/tests/e2e/repo-commitgraph.test.e2e.ts b/tests/e2e/repo-commitgraph.test.e2e.ts deleted file mode 100644 index e8b85c5997..0000000000 --- a/tests/e2e/repo-commitgraph.test.e2e.ts +++ /dev/null @@ -1,49 +0,0 @@ -// @watch start -// templates/repo/graph.tmpl -// web_src/css/features/gitgraph.css -// web_src/js/features/repo-graph.js -// @watch end - -import {expect} from '@playwright/test'; -import {save_visual, test} from './utils_e2e.ts'; - -test('Commit graph overflow', async ({page}) => { - const response = await page.goto('/user2/repo1/graph'); - expect(response?.status()).toBe(200); - - await page.click('#flow-select-refs-dropdown'); - const input = page.locator('#flow-select-refs-dropdown'); - await input.press('Enter'); - await input.press('Enter'); - await input.press('Enter'); - await input.press('Enter'); - await input.press('Enter'); - await input.press('Enter'); - await input.press('Enter'); - await input.press('Enter'); - await input.press('Enter'); - await input.press('Enter'); - - await expect(page.locator('#flow-select-refs-dropdown')).toBeInViewport({ratio: 1}); - await expect(page.getByRole('button', {name: 'Mono'})).toBeInViewport({ratio: 1}); - await expect(page.getByRole('button', {name: 'Color'})).toBeInViewport({ratio: 1}); - await expect(page.locator('.selection.search.dropdown')).toBeInViewport({ratio: 1}); - await save_visual(page); -}); - -test('Switch branch', async ({page}) => { - const response = await page.goto('/user2/repo1/graph'); - expect(response?.status()).toBe(200); - - await page.click('#flow-select-refs-dropdown'); - const input = page.locator('#flow-select-refs-dropdown'); - await input.pressSequentially('develop', {delay: 50}); - await input.press('Enter'); - - await page.waitForLoadState(); - - await expect(page.locator('#loading-indicator')).toBeHidden(); - await expect(page.locator('#rel-container')).toBeVisible(); - await expect(page.locator('#rev-container')).toBeVisible(); - await save_visual(page); -}); diff --git a/tests/e2e/repo-migrate.test.e2e.ts b/tests/e2e/repo-migrate.test.e2e.js similarity index 53% rename from tests/e2e/repo-migrate.test.e2e.ts rename to tests/e2e/repo-migrate.test.e2e.js index 5e67f89ed1..63328e0900 100644 --- a/tests/e2e/repo-migrate.test.e2e.ts +++ b/tests/e2e/repo-migrate.test.e2e.js @@ -1,41 +1,32 @@ -// @watch start -// web_src/js/features/repo-migrate.js -// @watch end - +// @ts-check import {expect} from '@playwright/test'; -import {test, save_visual, test_context} from './utils_e2e.ts'; +import {test, login_user, load_logged_in_context} from './utils_e2e.js'; -test.use({user: 'user2'}); +test.beforeAll(({browser}, workerInfo) => login_user(browser, workerInfo, 'user2')); -test('Migration Progress Page', async ({page, browser}, workerInfo) => { +test('Migration Progress Page', async ({page: unauthedPage, browser}, workerInfo) => { test.skip(workerInfo.project.name === 'Mobile Safari', 'Flaky actionability checks on Mobile Safari'); - expect((await page.goto('/user2/invalidrepo'))?.status(), 'repo should not exist yet').toBe(404); + const page = await (await load_logged_in_context(browser, workerInfo, 'user2')).newPage(); + + await expect((await page.goto('/user2/invalidrepo'))?.status(), 'repo should not exist yet').toBe(404); await page.goto('/repo/migrate?service_type=1'); const form = page.locator('form'); await form.getByRole('textbox', {name: 'Repository Name'}).fill('invalidrepo'); await form.getByRole('textbox', {name: 'Migrate / Clone from URL'}).fill('https://codeberg.org/forgejo/invalidrepo'); - await save_visual(page); await form.locator('button.primary').click({timeout: 5000}); await expect(page).toHaveURL('user2/invalidrepo'); - await save_visual(page); - const ctx = await test_context(browser); - const unauthenticatedPage = await ctx.newPage(); - expect((await unauthenticatedPage.goto('/user2/invalidrepo'))?.status(), 'public migration page should be accessible').toBe(200); - await expect(unauthenticatedPage.locator('#repo_migrating_progress')).toBeVisible(); + await expect((await unauthedPage.goto('/user2/invalidrepo'))?.status(), 'public migration page should be accessible').toBe(200); + await expect(unauthedPage.locator('#repo_migrating_progress')).toBeVisible(); await page.reload(); await expect(page.locator('#repo_migrating_failed')).toBeVisible(); - await save_visual(page); await page.getByRole('button', {name: 'Delete this repository'}).click(); const deleteModal = page.locator('#delete-repo-modal'); await deleteModal.getByRole('textbox', {name: 'Confirmation string'}).fill('user2/invalidrepo'); - await save_visual(page); await deleteModal.getByRole('button', {name: 'Delete repository'}).click(); await expect(page).toHaveURL('/'); - // checked last to preserve the order of screenshots from first run - await save_visual(unauthenticatedPage); }); diff --git a/tests/e2e/repo-new.test.e2e.ts b/tests/e2e/repo-new.test.e2e.ts deleted file mode 100644 index ad202825a0..0000000000 --- a/tests/e2e/repo-new.test.e2e.ts +++ /dev/null @@ -1,127 +0,0 @@ -// @watch start -// templates/repo/create**.tmpl -// web_src/css/{form,repo}.css -// @watch end - -import {expect} from '@playwright/test'; -import {test, dynamic_id, save_visual} from './utils_e2e.ts'; -import {validate_form} from './shared/forms.ts'; - -test.use({user: 'user2'}); - -test('New repo: invalid', async ({page}) => { - const response = await page.goto('/repo/create'); - expect(response?.status()).toBe(200); - // check that relevant form content is hidden or available - await expect(page.getByRole('group', {name: 'Use a template You can select'}).getByRole('combobox')).toBeVisible(); - await expect(page.getByText('.gitignore Select .gitignore')).toBeHidden(); - await expect(page.getByText('Labels Select a label set')).toBeHidden(); - await validate_form({page}, 'fieldset'); - await save_visual(page); - - await page.getByLabel('Repository name').fill('*invalid'); - await page.getByRole('button', {name: 'Create repository'}).click(); - await expect(page.getByText('Repository name should contain only alphanumeric')).toBeVisible(); - await save_visual(page); -}); - -test('New repo: initialize', async ({page}, workerInfo) => { - const response = await page.goto('/repo/create'); - expect(response?.status()).toBe(200); - // check that relevant form content is hidden or available - await expect(page.getByRole('group', {name: 'Use a template You can select'}).getByRole('combobox')).toBeVisible(); - await expect(page.getByText('.gitignore Select .gitignore')).toBeHidden(); - // fill initialization section - await page.getByText('Start the Git history with').click(); - await page.getByText('Select .gitignore templates').click(); - await page.getByLabel('.gitignore Select .gitignore').fill('Go'); - await page.getByRole('option', {name: 'Go', exact: true}).click(); - await page.keyboard.press('Escape'); - await page.getByLabel('License Select a license file').click(); - await page.getByRole('option', {name: 'MIT', exact: true}).click(); - await page.keyboard.press('Escape'); - // add advanced settings - await page.getByText('Click to expand').click(); - await page.getByPlaceholder('master').fill('main'); - await page.getByLabel('Make repository a template').check(); - - await validate_form({page}, 'fieldset'); - await save_visual(page); - const reponame = dynamic_id(); - await page.getByLabel('Repository name').fill(reponame); - await page.getByRole('button', {name: 'Create repository'}).click(); - await expect(page.getByRole('link', {name: '.gitignore'})).toBeVisible(); - await expect(page.getByRole('link', {name: 'LICENSE', exact: true})).toBeVisible(); - if (!workerInfo.project.name.includes('Mobile')) { - await expect(page.getByText('Template', {exact: true})).toBeVisible(); - } - await save_visual(page); -}); - -test('New repo: initialize later', async ({page}) => { - const response = await page.goto('/repo/create'); - expect(response?.status()).toBe(200); - - const reponame = dynamic_id(); - await page.getByLabel('Repository name').fill(reponame); - await page.getByPlaceholder('Enter short description').fill(`Description for repo ${reponame}`); - await page.getByText('Click to expand').click(); - await page.getByPlaceholder('master').fill('devbranch'); - await validate_form({page}, 'fieldset'); - await page.getByRole('button', {name: 'Create repository'}).click(); - expect(page.url()).toBe(`http://localhost:3003/user2/${reponame}`); - await expect(page.getByRole('link', {name: 'New file'})).toBeVisible(); - await expect(page.getByRole('heading', {name: 'Creating a new repository on'})).toBeVisible(); - await save_visual(page); - - // add a README - await page.getByRole('link', {name: 'New file'}).click(); - // wait for loading spinner to disappear - // Otherwise, filling the filename might not populate the tree_path form field or preview tab - // The editor has race conditions, likely related to https://codeberg.org/forgejo/forgejo/issues/3371 - await expect(page.locator('.is-loading')).toBeHidden(); - await page.locator('.view-lines').click(); - await page.keyboard.type('# Heading\n\nHello Forgejo!'); - await page.getByPlaceholder('Name your file…').fill('README.md'); - await expect(page.getByText('Preview')).toBeVisible(); - await page.getByPlaceholder('Add ""').fill('My first commit message'); - await page.getByRole('button', {name: 'Commit changes'}).click(); - expect(page.url()).toBe(`http://localhost:3003/user2/${reponame}/src/branch/devbranch/README.md`); - await expect(page.getByRole('link', {name: 'My first commit message'})).toBeVisible(); - await expect(page.getByText('Hello Forgejo!')).toBeVisible(); - await save_visual(page); -}); - -test('New repo: from template', async ({page}, workerInfo) => { - test.skip(['Mobile Safari', 'webkit'].includes(workerInfo.project.name), 'WebKit browsers seem to have CORS issues with localhost here.'); - const response = await page.goto('/repo/create'); - expect(response?.status()).toBe(200); - - const reponame = dynamic_id(); - await page.getByRole('group', {name: 'Use a template You can select'}).getByRole('combobox').click(); - await page.getByRole('option', {name: 'user27/template1'}).click(); - await page.getByText('Git content (Default branch)').click(); - await save_visual(page); - await page.getByLabel('Repository name').fill(reponame); - await page.getByRole('button', {name: 'Create repository'}).click(); - await expect(page.getByRole('link', {name: `${reponame}.log`})).toBeVisible(); - await save_visual(page); -}); - -test('New repo: label set', async ({page}) => { - await page.goto('/repo/create'); - - const reponame = dynamic_id(); - await page.getByText('Click to expand').click(); - await page.getByLabel('Labels Select a label set').click(); - await page.getByRole('option', {name: 'Advanced (Kind/Bug, Kind/'}).click(); - // close dropdown via unrelated click - await page.getByText('You can select an existing').click(); - await save_visual(page); - await page.getByLabel('Repository name').fill(reponame); - await page.getByRole('button', {name: 'Create repository'}).click(); - await page.goto(`/user2/${reponame}/issues`); - await page.getByRole('link', {name: 'Labels'}).click(); - await expect(page.getByText('Kind/Bug Something is not')).toBeVisible(); - await save_visual(page); -}); diff --git a/tests/e2e/repo-settings.test.e2e.js b/tests/e2e/repo-settings.test.e2e.js new file mode 100644 index 0000000000..b7b0884b26 --- /dev/null +++ b/tests/e2e/repo-settings.test.e2e.js @@ -0,0 +1,48 @@ +// @ts-check +import {expect} from '@playwright/test'; +import {test, login_user, login} from './utils_e2e.js'; +import {validate_form} from './shared/forms.js'; + +test.beforeAll(async ({browser}, workerInfo) => { + await login_user(browser, workerInfo, 'user2'); +}); + +test('repo webhook settings', async ({browser}, workerInfo) => { + test.skip(workerInfo.project.name === 'Mobile Safari', 'Cannot get it to work - as usual'); + const page = await login({browser}, workerInfo); + const response = await page.goto('/user2/repo1/settings/hooks/forgejo/new'); + await expect(response?.status()).toBe(200); + + await page.locator('input[name="events"][value="choose_events"]').click(); + await expect(page.locator('.hide-unless-checked')).toBeVisible(); + + // check accessibility including the custom events (now visible) part + await validate_form({page}, 'fieldset'); + + await page.locator('input[name="events"][value="push_only"]').click(); + await expect(page.locator('.hide-unless-checked')).toBeHidden(); + await page.locator('input[name="events"][value="send_everything"]').click(); + await expect(page.locator('.hide-unless-checked')).toBeHidden(); +}); + +test('repo branch protection settings', async ({browser}, workerInfo) => { + test.skip(workerInfo.project.name === 'Mobile Safari', 'Cannot get it to work - as usual'); + const page = await login({browser}, workerInfo); + const response = await page.goto('/user2/repo1/settings/branches/edit'); + await expect(response?.status()).toBe(200); + + await validate_form({page}, 'fieldset'); + + // verify header is new + await expect(page.locator('h4')).toContainText('new'); + await page.locator('input[name="rule_name"]').fill('testrule'); + await page.getByText('Save rule').click(); + // verify header is in edit mode + await page.waitForLoadState('networkidle'); + await page.getByText('Edit').click(); + await expect(page.locator('h4')).toContainText('Protection rules for branch'); + // delete the rule for the next test + await page.goBack(); + await page.getByText('Delete rule').click(); + await page.getByText('Yes').click(); +}); diff --git a/tests/e2e/repo-settings.test.e2e.ts b/tests/e2e/repo-settings.test.e2e.ts deleted file mode 100644 index 3d260866fb..0000000000 --- a/tests/e2e/repo-settings.test.e2e.ts +++ /dev/null @@ -1,64 +0,0 @@ -// @watch start -// templates/webhook/shared-settings.tmpl -// templates/repo/settings/** -// web_src/css/{form,repo}.css -// web_src/css/modules/grid.css -// web_src/js/features/comp/WebHookEditor.js -// @watch end - -import {expect} from '@playwright/test'; -import {test, save_visual} from './utils_e2e.ts'; -import {validate_form} from './shared/forms.ts'; - -test.use({user: 'user2'}); - -test('repo webhook settings', async ({page}, workerInfo) => { - test.skip(workerInfo.project.name === 'Mobile Safari', 'Cannot get it to work - as usual'); - const response = await page.goto('/user2/repo1/settings/hooks/forgejo/new'); - expect(response?.status()).toBe(200); - - await page.locator('input[name="events"][value="choose_events"]').click(); - await expect(page.locator('.hide-unless-checked')).toBeVisible(); - - // check accessibility including the custom events (now visible) part - await validate_form({page}, 'fieldset'); - await save_visual(page); - - await page.locator('input[name="events"][value="push_only"]').click(); - await expect(page.locator('.hide-unless-checked')).toBeHidden(); - await page.locator('input[name="events"][value="send_everything"]').click(); - await expect(page.locator('.hide-unless-checked')).toBeHidden(); - await save_visual(page); -}); - -test.describe('repo branch protection settings', () => { - test('form', async ({page}, {project}) => { - test.skip(project.name === 'Mobile Safari', 'Cannot get it to work - as usual'); - const response = await page.goto('/user2/repo1/settings/branches/edit'); - expect(response?.status()).toBe(200); - - await validate_form({page}, 'fieldset'); - - // verify header is new - await expect(page.locator('h4')).toContainText('new'); - await page.locator('input[name="rule_name"]').fill('testrule'); - await save_visual(page); - await page.getByText('Save rule').click(); - // verify header is in edit mode - await page.waitForLoadState('domcontentloaded'); - await save_visual(page); - await page.getByText('Edit').click(); - await expect(page.locator('h4')).toContainText('Protection rules for branch'); - await save_visual(page); - }); - - test.afterEach(async ({page}) => { - // delete the rule for the next test - await page.goto('/user2/repo1/settings/branches/'); - await page.waitForLoadState('domcontentloaded'); - test.skip(await page.getByText('Delete rule').isHidden(), 'Nothing to delete at this time'); - await page.getByText('Delete rule').click(); - await page.getByText('Yes').click(); - await page.waitForLoadState('load'); - }); -}); diff --git a/tests/e2e/repo-wiki.test.e2e.js b/tests/e2e/repo-wiki.test.e2e.js new file mode 100644 index 0000000000..4599fbd0c7 --- /dev/null +++ b/tests/e2e/repo-wiki.test.e2e.js @@ -0,0 +1,16 @@ +// @ts-check +import {expect} from '@playwright/test'; +import {test} from './utils_e2e.js'; + +test(`Search for long titles and test for no overflow`, async ({page}, workerInfo) => { + test.skip(workerInfo.project.name === 'Mobile Safari', 'Fails as always, see https://codeberg.org/forgejo/forgejo/pulls/5326#issuecomment-2313275'); + await page.goto('/user2/repo1/wiki'); + await page.waitForLoadState('networkidle'); + await page.getByPlaceholder('Search wiki').fill('spaces'); + await page.getByPlaceholder('Search wiki').click(); + // workaround: HTMX listens on keyup events, playwright's fill only triggers the input event + // so we manually "type" the last letter + await page.getByPlaceholder('Search wiki').dispatchEvent('keyup'); + // timeout is necessary because HTMX search could be slow + await expect(page.locator('#wiki-search a[href]')).toBeInViewport({ratio: 1}); +}); diff --git a/tests/e2e/repo-wiki.test.e2e.ts b/tests/e2e/repo-wiki.test.e2e.ts deleted file mode 100644 index 4ce66da8bc..0000000000 --- a/tests/e2e/repo-wiki.test.e2e.ts +++ /dev/null @@ -1,41 +0,0 @@ -// @watch start -// templates/repo/wiki/** -// web_src/css/repo** -// @watch end - -import {expect} from '@playwright/test'; -import {save_visual, test} from './utils_e2e.ts'; - -for (const searchTerm of ['space', 'consectetur']) { - for (const width of [null, 2560, 4000]) { - test(`Search for '${searchTerm}' and test for no overflow ${width && `on ${width}-wide viewport` || ''}`, async ({page, viewport}, workerInfo) => { - test.skip(workerInfo.project.name === 'Mobile Safari', 'Fails as always, see https://codeberg.org/forgejo/forgejo/pulls/5326#issuecomment-2313275'); - - await page.setViewportSize({ - width: width ?? viewport.width, - height: 1440, // We're testing that we fit horizontally - vertical scrolling is fine. - }); - await page.goto('/user2/repo1/wiki'); - await page.getByPlaceholder('Search wiki').fill(searchTerm); - await page.getByPlaceholder('Search wiki').click(); - // workaround: HTMX listens on keyup events, playwright's fill only triggers the input event - // so we manually "type" the last letter - await page.getByPlaceholder('Search wiki').dispatchEvent('keyup'); - // timeout is necessary because HTMX search could be slow - await expect(page.locator('#wiki-search a[href]')).toBeInViewport({ratio: 1}); - await save_visual(page); - }); - } -} - -test(`Search results show titles (and not file names)`, async ({page}, workerInfo) => { - test.skip(workerInfo.project.name === 'Mobile Safari', 'Fails as always, see https://codeberg.org/forgejo/forgejo/pulls/5326#issuecomment-2313275'); - await page.goto('/user2/repo1/wiki'); - await page.getByPlaceholder('Search wiki').fill('spaces'); - await page.getByPlaceholder('Search wiki').click(); - // workaround: HTMX listens on keyup events, playwright's fill only triggers the input event - // so we manually "type" the last letter - await page.getByPlaceholder('Search wiki').dispatchEvent('keyup'); - await expect(page.locator('#wiki-search a[href] b')).toHaveText('Page With Spaced Name'); - await save_visual(page); -}); diff --git a/tests/e2e/right-settings-button.test.e2e.ts b/tests/e2e/right-settings-button.test.e2e.js similarity index 76% rename from tests/e2e/right-settings-button.test.e2e.ts rename to tests/e2e/right-settings-button.test.e2e.js index 3bea329ba0..4f2b09b4c1 100644 --- a/tests/e2e/right-settings-button.test.e2e.ts +++ b/tests/e2e/right-settings-button.test.e2e.js @@ -1,16 +1,18 @@ -// @watch start -// templates/org/** -// templates/repo/** -// web_src/js/webcomponents/overflow-menu.js -// @watch end - +// @ts-check import {expect} from '@playwright/test'; -import {save_visual, test} from './utils_e2e.ts'; +import {test, login_user, load_logged_in_context} from './utils_e2e.js'; -test.describe('desktop viewport as user 2', () => { - test.use({user: 'user2', viewport: {width: 1920, height: 300}}); +test.beforeAll(async ({browser}, workerInfo) => { + await login_user(browser, workerInfo, 'user2'); +}); + +test.describe('desktop viewport', () => { + test.use({viewport: {width: 1920, height: 300}}); + + test('Settings button on right of repo header', async ({browser}, workerInfo) => { + const context = await load_logged_in_context(browser, workerInfo, 'user2'); + const page = await context.newPage(); - test('Settings button on right of repo header', async ({page}) => { await page.goto('/user2/repo1'); const settingsBtn = page.locator('.overflow-menu-items>#settings-btn'); @@ -20,21 +22,11 @@ test.describe('desktop viewport as user 2', () => { await expect(page.locator('.overflow-menu-button')).toHaveCount(0); }); - test('Settings button on right of org header', async ({page}) => { - await page.goto('/org3'); + test('Settings button on right of repo header also when add more button is shown', async ({browser}, workerInfo) => { + await login_user(browser, workerInfo, 'user12'); + const context = await load_logged_in_context(browser, workerInfo, 'user12'); + const page = await context.newPage(); - const settingsBtn = page.locator('.overflow-menu-items>#settings-btn'); - await expect(settingsBtn).toBeVisible(); - await expect(settingsBtn).toHaveClass(/right/); - - await expect(page.locator('.overflow-menu-button')).toHaveCount(0); - }); -}); - -test.describe('desktop viewport as user12', () => { - test.use({user: 'user12', viewport: {width: 1920, height: 300}}); - - test('Settings button on right of repo header also when add more button is shown', async ({page}) => { await page.goto('/user12/repo10'); const settingsBtn = page.locator('.overflow-menu-items>#settings-btn'); @@ -43,10 +35,19 @@ test.describe('desktop viewport as user12', () => { await expect(page.locator('.overflow-menu-button')).toHaveCount(0); }); -}); -test.describe('desktop viewport, unauthenticated', () => { - test.use({viewport: {width: 1920, height: 300}}); + test('Settings button on right of org header', async ({browser}, workerInfo) => { + const context = await load_logged_in_context(browser, workerInfo, 'user2'); + const page = await context.newPage(); + + await page.goto('/org3'); + + const settingsBtn = page.locator('.overflow-menu-items>#settings-btn'); + await expect(settingsBtn).toBeVisible(); + await expect(settingsBtn).toHaveClass(/right/); + + await expect(page.locator('.overflow-menu-button')).toHaveCount(0); + }); test('User overview overflow menu should not be influenced', async ({page}) => { await page.goto('/user2'); @@ -54,14 +55,16 @@ test.describe('desktop viewport, unauthenticated', () => { await expect(page.locator('.overflow-menu-items>#settings-btn')).toHaveCount(0); await expect(page.locator('.overflow-menu-button')).toHaveCount(0); - await save_visual(page); }); }); test.describe('small viewport', () => { - test.use({user: 'user2', viewport: {width: 800, height: 300}}); + test.use({viewport: {width: 800, height: 300}}); + + test('Settings button in overflow menu of repo header', async ({browser}, workerInfo) => { + const context = await load_logged_in_context(browser, workerInfo, 'user2'); + const page = await context.newPage(); - test('Settings button in overflow menu of repo header', async ({page}) => { await page.goto('/user2/repo1'); await expect(page.locator('.overflow-menu-items>#settings-btn')).toHaveCount(0); @@ -79,10 +82,12 @@ test.describe('small viewport', () => { const items = shownItems.concat(overflowItems); expect(Array.from(new Set(items))).toHaveLength(items.length); - await save_visual(page); }); - test('Settings button in overflow menu of org header', async ({page}) => { + test('Settings button in overflow menu of org header', async ({browser}, workerInfo) => { + const context = await load_logged_in_context(browser, workerInfo, 'user2'); + const page = await context.newPage(); + await page.goto('/org3'); await expect(page.locator('.overflow-menu-items>#settings-btn')).toHaveCount(0); @@ -101,10 +106,6 @@ test.describe('small viewport', () => { const items = shownItems.concat(overflowItems); expect(Array.from(new Set(items))).toHaveLength(items.length); }); -}); - -test.describe('small viewport, unauthenticated', () => { - test.use({viewport: {width: 800, height: 300}}); test('User overview overflow menu should not be influenced', async ({page}) => { await page.goto('/user2'); @@ -123,6 +124,5 @@ test.describe('small viewport, unauthenticated', () => { const items = shownItems.concat(overflowItems); expect(Array.from(new Set(items))).toHaveLength(items.length); - await save_visual(page); }); }); diff --git a/tests/e2e/shared/accessibility.ts b/tests/e2e/shared/accessibility.ts deleted file mode 100644 index 1b59d89485..0000000000 --- a/tests/e2e/shared/accessibility.ts +++ /dev/null @@ -1,35 +0,0 @@ -import {expect, type Page} from '@playwright/test'; -import {AxeBuilder} from '@axe-core/playwright'; - -export async function accessibilityCheck({page}: {page: Page}, includes: string[], excludes: string[], disabledRules: string[]) { - // contrast of inline links is still a global issue in Forgejo - disabledRules.push('link-in-text-block'); - - let accessibilityScanner = new AxeBuilder({page}) - .disableRules(disabledRules); - // passing the whole array seems to be not supported, - // iterating has the nice side-effectof skipping this if the array is empty - for (const incl of includes) { - // passing the whole array seems to be not supported - accessibilityScanner = accessibilityScanner.include(incl); - } - for (const excl of excludes) { - accessibilityScanner = accessibilityScanner.exclude(excl); - } - - // scan the page both in dark and light theme - let accessibilityScanResults = await accessibilityScanner.analyze(); - expect(accessibilityScanResults.violations).toEqual([]); - await page.emulateMedia({colorScheme: 'dark'}); - // in https://codeberg.org/forgejo/forgejo/pulls/5899 there have been - // some weird failures related to contrast scanning, - // reporting for colours that haven't been used and no trace in the - // screenshots. - // Since this was only happening with some browsers and not always, - // my bet is on a transition effect on dark/light mode switch. - // Waiting a little seems to work around this. - await page.waitForTimeout(100); // eslint-disable-line playwright/no-wait-for-timeout - accessibilityScanResults = await accessibilityScanner.analyze(); - expect(accessibilityScanResults.violations).toEqual([]); - await page.emulateMedia({colorScheme: 'light'}); -} diff --git a/tests/e2e/shared/forms.ts b/tests/e2e/shared/forms.js similarity index 56% rename from tests/e2e/shared/forms.ts rename to tests/e2e/shared/forms.js index fc608489b0..0ffd6eef2d 100644 --- a/tests/e2e/shared/forms.ts +++ b/tests/e2e/shared/forms.js @@ -1,19 +1,20 @@ -import {expect, type Page} from '@playwright/test'; -import {accessibilityCheck} from './accessibility.ts'; +import {expect} from '@playwright/test'; +import {AxeBuilder} from '@axe-core/playwright'; -export async function validate_form({page}: {page: Page}, scope: 'form' | 'fieldset' = 'form') { - const excludedElements = [ +export async function validate_form({page}, scope) { + scope ??= 'form'; + const accessibilityScanResults = await new AxeBuilder({page}) + // disable checking for link style - should be fixed, but not now + .disableRules('link-in-text-block') + .include(scope) // exclude automated tooltips from accessibility scan, remove when fixed - 'span[data-tooltip-content', + .exclude('span[data-tooltip-content') // exclude weird non-semantic HTML disabled content - '.disabled', - // legacy dropdowns don't use semantic HTML yet, - // avoid using these where possible - '.ui.dropdown', - ]; - await accessibilityCheck({page}, [scope], excludedElements, []); + .exclude('.disabled') + .analyze(); + expect(accessibilityScanResults.violations).toEqual([]); - // assert CSS properties that needed to be overridden for forms (ensure they remain active) + // assert CSS properties that needed to be overriden for forms (ensure they remain active) const boxes = page.getByRole('checkbox').or(page.getByRole('radio')); for (const b of await boxes.all()) { await expect(b).toHaveCSS('margin-left', '0px'); @@ -25,19 +26,19 @@ export async function validate_form({page}: {page: Page}, scope: 'form' | 'field // might be necessary to adjust in case colons are strictly necessary in help text for (const l of await page.locator('label').all()) { const str = await l.textContent(); - expect(str.split('\n')[0]).not.toContain(':'); + await expect(str.split('\n')[0]).not.toContain(':'); } - // check that multiple help texts are correctly aligned to each other + // check that multiple help text are correctly aligned to each other // used for example to separate read/write permissions in team permission matrix for (const l of await page.locator('label:has(.help + .help)').all()) { const helpLabels = await l.locator('.help').all(); const boxes = await Promise.all(helpLabels.map((help) => help.boundingBox())); for (let i = 1; i < boxes.length; i++) { // help texts vertically aligned on top of each other - expect(boxes[i].x).toBe(boxes[0].x); + await expect(boxes[i].x).toBe(boxes[0].x); // help texts don't horizontally intersect each other - expect(boxes[i].y + boxes[i].height).toBeGreaterThanOrEqual(boxes[i - 1].y + boxes[i - 1].height); + await expect(boxes[i].y + boxes[i].height).toBeGreaterThanOrEqual(boxes[i - 1].y + boxes[i - 1].height); } } } diff --git a/tests/e2e/user-settings.test.e2e.ts b/tests/e2e/user-settings.test.e2e.ts deleted file mode 100644 index b36a17b5b2..0000000000 --- a/tests/e2e/user-settings.test.e2e.ts +++ /dev/null @@ -1,65 +0,0 @@ -// @watch start -// templates/user/settings/**.tmpl -// web_src/css/{form,user}.css -// @watch end - -import {expect} from '@playwright/test'; -import {test, save_visual, login_user, login} from './utils_e2e.ts'; -import {validate_form} from './shared/forms.ts'; - -test.beforeAll(async ({browser}, workerInfo) => { - await login_user(browser, workerInfo, 'user2'); -}); - -test('User: Profile settings', async ({browser}, workerInfo) => { - const page = await login({browser}, workerInfo); - await page.goto('/user/settings'); - - await page.getByLabel('Full name').fill('SecondUser'); - await page.locator('#pronouns-dropdown').click(); - await page.getByRole('option', {name: 'she/her'}).click(); - await page.getByPlaceholder('Tell others a little bit').fill('I am a playwright test running for several seconds.'); - await page.getByPlaceholder('Tell others a little bit').press('Tab'); - await page.getByLabel('Website').fill('https://forgejo.org'); - await page.getByPlaceholder('Share your approximate').fill('on a computer chip'); - await page.getByLabel('User visibility').click(); - await page.getByLabel('Visible only to signed-in').click(); - await page.getByLabel('Hide email address Your email').uncheck(); - await page.getByLabel('Hide activity from profile').check(); - - await validate_form({page}, 'fieldset'); - await save_visual(page); - await page.getByRole('button', {name: 'Update profile'}).click(); - await expect(page.getByText('Your profile has been updated.')).toBeVisible(); - await page.getByRole('link', {name: 'public activity'}).click(); - await expect(page.getByText('Your activity is only visible')).toBeVisible(); - await save_visual(page); - - await page.goto('/user2'); - await expect(page.getByText('SecondUser')).toBeVisible(); - await expect(page.getByText('on a computer chip')).toBeVisible(); - await expect(page.locator('li').filter({hasText: 'user2@example.com'})).toBeVisible(); - await expect(page.locator('li').filter({hasText: 'https://forgejo.org'})).toBeVisible(); - await expect(page.getByText('I am a playwright test')).toBeVisible(); - await save_visual(page); - - await page.goto('/user/settings'); - await page.locator('#pronouns-dropdown').click(); - await page.getByRole('option', {name: 'Custom'}).click(); - await page.getByLabel('Custom pronouns').fill('rob/ot'); - await page.getByLabel('User visibility').click(); - await page.getByLabel('Visible to everyone').click(); - await page.getByLabel('Hide email address Your email').check(); - await page.getByLabel('Hide activity from profile').uncheck(); - await expect(page.getByText('Your profile has been updated.')).toBeHidden(); - await validate_form({page}, 'fieldset'); - await save_visual(page); - await page.getByRole('button', {name: 'Update profile'}).click(); - await expect(page.getByText('Your profile has been updated.')).toBeVisible(); - - await page.goto('/user2'); - await expect(page.getByText('SecondUser')).toBeVisible(); - await expect(page.locator('li').filter({hasText: 'user2@example.com'})).toBeHidden(); - await page.goto('/user2?tab=activity'); - await expect(page.getByText('Your activity is visible to everyone')).toBeVisible(); -}); diff --git a/tests/e2e/utils_e2e.js b/tests/e2e/utils_e2e.js new file mode 100644 index 0000000000..98d762fbcc --- /dev/null +++ b/tests/e2e/utils_e2e.js @@ -0,0 +1,82 @@ +import {expect, test as baseTest} from '@playwright/test'; + +export const test = baseTest.extend({ + context: async ({browser}, use) => { + return use(await test_context(browser)); + }, +}); + +async function test_context(browser, options) { + const context = await browser.newContext(options); + + context.on('page', (page) => { + page.on('pageerror', (err) => expect(err).toBeUndefined()); + }); + + return context; +} + +const ARTIFACTS_PATH = `tests/e2e/test-artifacts`; +const LOGIN_PASSWORD = 'password'; + +// log in user and store session info. This should generally be +// run in test.beforeAll(), then the session can be loaded in tests. +export async function login_user(browser, workerInfo, user) { + test.setTimeout(60000); + // Set up a new context + const context = await test_context(browser); + const page = await context.newPage(); + + // Route to login page + // Note: this could probably be done more quickly with a POST + const response = await page.goto('/user/login'); + await expect(response?.status()).toBe(200); // Status OK + + // Fill out form + await page.type('input[name=user_name]', user); + await page.type('input[name=password]', LOGIN_PASSWORD); + await page.click('form button.ui.primary.button:visible'); + + await page.waitForLoadState('networkidle'); + + await expect(page.url(), {message: `Failed to login user ${user}`}).toBe(`${workerInfo.project.use.baseURL}/`); + + // Save state + await context.storageState({path: `${ARTIFACTS_PATH}/state-${user}-${workerInfo.workerIndex}.json`}); + + return context; +} + +export async function load_logged_in_context(browser, workerInfo, user) { + let context; + try { + context = await test_context(browser, {storageState: `${ARTIFACTS_PATH}/state-${user}-${workerInfo.workerIndex}.json`}); + } catch (err) { + if (err.code === 'ENOENT') { + throw new Error(`Could not find state for '${user}'. Did you call login_user(browser, workerInfo, '${user}') in test.beforeAll()?`); + } + } + return context; +} + +export async function login({browser}, workerInfo) { + const context = await load_logged_in_context(browser, workerInfo, 'user2'); + return await context.newPage(); +} + +export async function save_visual(page) { + // Optionally include visual testing + if (process.env.VISUAL_TEST) { + await page.waitForLoadState('networkidle'); + // Mock page/version string + await page.locator('footer div.ui.left').evaluate((node) => node.innerHTML = 'MOCK'); + await expect(page).toHaveScreenshot({ + fullPage: true, + timeout: 20000, + mask: [ + page.locator('.secondary-nav span>img.ui.avatar'), + page.locator('.ui.dropdown.jump.item span>img.ui.avatar'), + ], + }); + } +} diff --git a/tests/e2e/utils_e2e.ts b/tests/e2e/utils_e2e.ts deleted file mode 100644 index ff921a2cf3..0000000000 --- a/tests/e2e/utils_e2e.ts +++ /dev/null @@ -1,154 +0,0 @@ -import {expect, test as baseTest, type Browser, type BrowserContextOptions, type APIRequestContext, type TestInfo, type Page} from '@playwright/test'; - -import * as path from 'node:path'; - -const AUTH_PATH = 'tests/e2e/.auth'; - -type AuthScope = 'logout' | 'shared' | 'webauthn'; - -export type TestOptions = { - forEachTest: void - user: string | null; - authScope: AuthScope; -}; - -export const test = baseTest.extend({ - context: async ({browser, user, authScope, contextOptions}, use, {project}) => { - if (user && authScope) { - const browserName = project.name.toLowerCase().replace(' ', '-'); - contextOptions.storageState = path.join(AUTH_PATH, `state-${browserName}-${user}-${authScope}.json`); - } else { - // if no user is given, ensure to have clean state - contextOptions.storageState = {cookies: [], origins: []}; - } - - return use(await test_context(browser, contextOptions)); - }, - user: null, - authScope: 'shared', -}); - -export async function test_context(browser: Browser, options?: BrowserContextOptions) { - const context = await browser.newContext(options); - - context.on('page', (page) => { - page.on('pageerror', (err) => expect(err).toBeUndefined()); - }); - - return context; -} - -const ARTIFACTS_PATH = `tests/e2e/test-artifacts`; -const LOGIN_PASSWORD = 'password'; - -// log in user and store session info. This should generally be -// run in test.beforeAll(), then the session can be loaded in tests. -export async function login_user(browser: Browser, workerInfo: TestInfo, user: string) { - test.setTimeout(60000); - // Set up a new context - const context = await test_context(browser); - const page = await context.newPage(); - - // Route to login page - // Note: this could probably be done more quickly with a POST - const response = await page.goto('/user/login'); - expect(response?.status()).toBe(200); // Status OK - - // Fill out form - await page.fill('input[name=user_name]', user); - await page.fill('input[name=password]', LOGIN_PASSWORD); - await page.click('form button.ui.primary.button:visible'); - - await page.waitForLoadState(); - - expect(page.url(), {message: `Failed to login user ${user}`}).toBe(`${workerInfo.project.use.baseURL}/`); - - // Save state - await context.storageState({path: `${ARTIFACTS_PATH}/state-${user}-${workerInfo.workerIndex}.json`}); - - return context; -} - -export async function load_logged_in_context(browser: Browser, workerInfo: TestInfo, user: string) { - try { - return await test_context(browser, {storageState: `${ARTIFACTS_PATH}/state-${user}-${workerInfo.workerIndex}.json`}); - } catch (err) { - if (err.code === 'ENOENT') { - throw new Error(`Could not find state for '${user}'. Did you call login_user(browser, workerInfo, '${user}') in test.beforeAll()?`); - } - } -} - -export async function login({browser}: {browser: Browser}, workerInfo: TestInfo) { - const context = await load_logged_in_context(browser, workerInfo, 'user2'); - return await context?.newPage(); -} - -export async function save_visual(page: Page) { - // Optionally include visual testing - if (process.env.VISUAL_TEST) { - await page.waitForLoadState('domcontentloaded'); - // Mock/replace dynamic content which can have different size (and thus cannot simply be masked below) - await page.locator('footer .left-links').evaluate((node) => node.innerHTML = 'MOCK'); - // replace timestamps in repos to mask them later down - await page.locator('.flex-item-body > relative-time').filter({hasText: /now|minute/}).evaluateAll((nodes) => { - for (const node of nodes) node.outerHTML = 'relative time in repo'; - }); - // dynamically generated UUIDs - await page.getByText('dyn-id-').evaluateAll((nodes) => { - for (const node of nodes) node.innerHTML = node.innerHTML.replaceAll(/dyn-id-[a-f0-9-]+/g, 'dynamic-id'); - }); - // repeat above, work around https://github.com/microsoft/playwright/issues/34152 - await page.getByText('dyn-id-').evaluateAll((nodes) => { - for (const node of nodes) node.innerHTML = node.innerHTML.replaceAll(/dyn-id-[a-f0-9-]+/g, 'dynamic-id'); - }); - await page.locator('relative-time').evaluateAll((nodes) => { - for (const node of nodes) node.outerHTML = 'time element'; - }); - // used for instance for security keys - await page.locator('absolute-date').evaluateAll((nodes) => { - for (const node of nodes) node.outerHTML = 'time element'; - }); - await expect(page).toHaveScreenshot({ - fullPage: true, - timeout: 20000, - mask: [ - page.locator('.ui.avatar'), - page.locator('.sha'), - page.locator('#repo_migrating'), - // update order of recently created repos is not fully deterministic - page.locator('.flex-item-main').filter({hasText: 'relative time in repo'}), - page.locator('#activity-feed'), - page.locator('#user-heatmap'), - // dynamic IDs in fixed-size inputs - page.locator('input[value*="dyn-id-"]'), - ], - }); - } -} - -// Create a temporary user and login to that user and store session info. -// This should ideally run on a per test basis. -export async function create_temp_user(browser: Browser, workerInfo: TestInfo, request: APIRequestContext) { - const username = globalThis.crypto.randomUUID(); - const newUser = await request.post(`/api/v1/admin/users`, { - headers: { - 'Content-Type': 'application/json', - 'Authorization': `Basic ${btoa(`user1:${LOGIN_PASSWORD}`)}`, - }, - data: { - username, - email: `${username}@host.invalid`, - password: LOGIN_PASSWORD, - must_change_password: false, - }, - }); - expect(newUser.ok()).toBeTruthy(); - - return {context: await login_user(browser, workerInfo, username), username}; -} - -// returns a random string with a pattern that can be filtered for screenshots automatically -export function dynamic_id() { - return `dyn-id-${globalThis.crypto.randomUUID()}`; -} diff --git a/tests/e2e/utils_e2e_test.go b/tests/e2e/utils_e2e_test.go index 96fd905363..cfd3ff9e3b 100644 --- a/tests/e2e/utils_e2e_test.go +++ b/tests/e2e/utils_e2e_test.go @@ -5,38 +5,22 @@ package e2e import ( "context" - "crypto/rand" - "encoding/hex" - "fmt" "net" "net/http" "net/url" - "os" - "path/filepath" - "regexp" - "strings" "testing" "time" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/json" - modules_session "code.gitea.io/gitea/modules/session" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/tests" - "code.forgejo.org/go-chi/session" "github.com/stretchr/testify/require" ) -var rootPathRe = regexp.MustCompile("\\[repository\\]\nROOT\\s=\\s.*") - func onForgejoRunTB(t testing.TB, callback func(testing.TB, *url.URL), prepare ...bool) { if len(prepare) == 0 || prepare[0] { defer tests.PrepareTestEnv(t, 1)() } - createSessions(t) - s := http.Server{ Handler: testE2eWebRoutes, } @@ -53,13 +37,7 @@ func onForgejoRunTB(t testing.TB, callback func(testing.TB, *url.URL), prepare . require.NoError(t, err) u.Host = listener.Addr().String() - // Override repository root in config. - conf, err := os.ReadFile(setting.CustomConf) - require.NoError(t, err) - require.NoError(t, os.WriteFile(setting.CustomConf, rootPathRe.ReplaceAll(conf, []byte("[repository]\nROOT = "+setting.RepoRootPath)), 0o644)) - defer func() { - require.NoError(t, os.WriteFile(setting.CustomConf, conf, 0o644)) ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute) s.Shutdown(ctx) cancel() @@ -76,118 +54,3 @@ func onForgejoRun(t *testing.T, callback func(*testing.T, *url.URL), prepare ... callback(t.(*testing.T), u) }, prepare...) } - -func createSessions(t testing.TB) { - t.Helper() - // copied from playwright.config.ts - browsers := []string{ - "chromium", - "firefox", - "webkit", - "Mobile Chrome", - "Mobile Safari", - } - scopes := []string{ - "shared", - } - users := []string{ - "user1", - "user2", - "user12", - "user40", - } - - authState := filepath.Join(filepath.Dir(setting.AppPath), "tests", "e2e", ".auth") - err := os.RemoveAll(authState) - require.NoError(t, err) - - err = os.MkdirAll(authState, os.ModePerm) - require.NoError(t, err) - - createSessionCookie := stateHelper(t) - - for _, user := range users { - u := unittest.AssertExistsAndLoadBean(t, &user_model.User{LowerName: strings.ToLower(user)}) - for _, browser := range browsers { - for _, scope := range scopes { - stateFile := strings.ReplaceAll(strings.ToLower(fmt.Sprintf("state-%s-%s-%s.json", browser, user, scope)), " ", "-") - createSessionCookie(filepath.Join(authState, stateFile), u) - } - } - } -} - -func stateHelper(t testing.TB) func(stateFile string, user *user_model.User) { - type Cookie struct { - Name string `json:"name"` - Value string `json:"value"` - Domain string `json:"domain"` - Path string `json:"path"` - Expires int `json:"expires"` - HTTPOnly bool `json:"httpOnly"` - Secure bool `json:"secure"` - SameSite string `json:"sameSite"` - } - - type BrowserState struct { - Cookies []Cookie `json:"cookies"` - Origins []string `json:"origins"` - } - - options := session.Options{ - Provider: setting.SessionConfig.Provider, - ProviderConfig: setting.SessionConfig.ProviderConfig, - CookieName: setting.SessionConfig.CookieName, - CookiePath: setting.SessionConfig.CookiePath, - Gclifetime: setting.SessionConfig.Gclifetime, - Maxlifetime: setting.SessionConfig.Maxlifetime, - Secure: setting.SessionConfig.Secure, - SameSite: setting.SessionConfig.SameSite, - Domain: setting.SessionConfig.Domain, - } - - opt := session.PrepareOptions([]session.Options{options}) - - vsp := modules_session.VirtualSessionProvider{} - err := vsp.Init(opt.Maxlifetime, opt.ProviderConfig) - require.NoError(t, err) - - return func(stateFile string, user *user_model.User) { - buf := make([]byte, opt.IDLength/2) - _, err = rand.Read(buf) - require.NoError(t, err) - - sessionID := hex.EncodeToString(buf) - - s, err := vsp.Read(sessionID) - require.NoError(t, err) - - err = s.Set("uid", user.ID) - require.NoError(t, err) - - err = s.Release() - require.NoError(t, err) - - state := BrowserState{ - Cookies: []Cookie{ - { - Name: opt.CookieName, - Value: sessionID, - Domain: setting.Domain, - Path: "/", - Expires: -1, - HTTPOnly: true, - Secure: false, - SameSite: "Lax", - }, - }, - Origins: []string{}, - } - - jsonData, err := json.Marshal(state) - require.NoError(t, err) - - err = os.WriteFile(stateFile, jsonData, 0o644) - require.NoError(t, err) - } -} diff --git a/tests/e2e/webauthn.test.e2e.ts b/tests/e2e/webauthn.test.e2e.js similarity index 62% rename from tests/e2e/webauthn.test.e2e.ts rename to tests/e2e/webauthn.test.e2e.js index 144f52e374..e11c17c331 100644 --- a/tests/e2e/webauthn.test.e2e.ts +++ b/tests/e2e/webauthn.test.e2e.js @@ -1,23 +1,22 @@ // Copyright 2024 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT - -// @watch start -// templates/user/auth/** -// templates/user/settings/** -// web_src/js/features/user-** -// @watch end +// @ts-check import {expect} from '@playwright/test'; -import {test, save_visual, create_temp_user, login_user} from './utils_e2e.ts'; +import {test, login_user, load_logged_in_context} from './utils_e2e.js'; -test('WebAuthn register & login flow', async ({browser, request}, workerInfo) => { +test.beforeAll(async ({browser}, workerInfo) => { + await login_user(browser, workerInfo, 'user40'); +}); + +test('WebAuthn register & login flow', async ({browser}, workerInfo) => { test.skip(workerInfo.project.name !== 'chromium', 'Uses Chrome protocol'); - const {context, username} = await create_temp_user(browser, workerInfo, request); + const context = await load_logged_in_context(browser, workerInfo, 'user40'); const page = await context.newPage(); // Register a security key. let response = await page.goto('/user/settings/security'); - expect(response?.status()).toBe(200); + await expect(response?.status()).toBe(200); // https://github.com/microsoft/playwright/issues/7276#issuecomment-1516768428 const cdpSession = await page.context().newCDPSession(page); @@ -30,25 +29,23 @@ test('WebAuthn register & login flow', async ({browser, request}, workerInfo) => transport: 'usb', automaticPresenceSimulation: true, isUserVerified: true, + backupEligibility: true, }, }); await page.locator('input#nickname').fill('Testing Security Key'); - await save_visual(page); await page.getByText('Add security key').click(); // Logout. - await expect(async () => { - await page.locator('div[aria-label="Profile and settings…"]').click(); - await page.getByText('Sign Out').click(); - }).toPass(); + await page.locator('div[aria-label="Profile and settings…"]').click(); + await page.getByText('Sign Out').click(); await page.waitForURL(`${workerInfo.project.use.baseURL}/`); // Login. response = await page.goto('/user/login'); - expect(response?.status()).toBe(200); + await expect(response?.status()).toBe(200); - await page.getByLabel('Username or email address').fill(username); + await page.getByLabel('Username or email address').fill('user40'); await page.getByLabel('Password').fill('password'); await page.getByRole('button', {name: 'Sign in'}).click(); await page.waitForURL(`${workerInfo.project.use.baseURL}/user/webauthn`); @@ -56,12 +53,8 @@ test('WebAuthn register & login flow', async ({browser, request}, workerInfo) => // Cleanup. response = await page.goto('/user/settings/security'); - expect(response?.status()).toBe(200); + await expect(response?.status()).toBe(200); await page.getByRole('button', {name: 'Remove'}).click(); - await save_visual(page); await page.getByRole('button', {name: 'Yes'}).click(); - await page.waitForLoadState(); - - // verify the user can login without a key - await login_user(browser, workerInfo, username); + await page.waitForURL(`${workerInfo.project.use.baseURL}/user/settings/security`); }); diff --git a/tests/fuzz/fuzz_test.go b/tests/fuzz/fuzz_test.go index d16f26c085..25a6ed8213 100644 --- a/tests/fuzz/fuzz_test.go +++ b/tests/fuzz/fuzz_test.go @@ -27,7 +27,6 @@ var renderContext = markup.RenderContext{ func FuzzMarkdownRenderRaw(f *testing.F) { f.Fuzz(func(t *testing.T, data []byte) { - setting.IsInTesting = true setting.AppURL = "http://localhost:3000/" markdown.RenderRaw(&renderContext, bytes.NewReader(data), io.Discard) }) @@ -35,7 +34,6 @@ func FuzzMarkdownRenderRaw(f *testing.F) { func FuzzMarkupPostProcess(f *testing.F) { f.Fuzz(func(t *testing.T, data []byte) { - setting.IsInTesting = true setting.AppURL = "http://localhost:3000/" markup.PostProcess(&renderContext, bytes.NewReader(data), io.Discard) }) diff --git a/tests/gitea-repositories-meta/user2/repo1.wiki.git/objects/53/0ab3e043bf2295fd1cec3129bf203a4349597a b/tests/gitea-repositories-meta/user2/repo1.wiki.git/objects/53/0ab3e043bf2295fd1cec3129bf203a4349597a deleted file mode 100644 index eeae5d2b64..0000000000 Binary files a/tests/gitea-repositories-meta/user2/repo1.wiki.git/objects/53/0ab3e043bf2295fd1cec3129bf203a4349597a and /dev/null differ diff --git a/tests/gitea-repositories-meta/user2/repo1.wiki.git/objects/a6/dc41d9e96df65286a79f5625ec51635e47f752 b/tests/gitea-repositories-meta/user2/repo1.wiki.git/objects/a6/dc41d9e96df65286a79f5625ec51635e47f752 deleted file mode 100644 index 1aecac1f1b..0000000000 Binary files a/tests/gitea-repositories-meta/user2/repo1.wiki.git/objects/a6/dc41d9e96df65286a79f5625ec51635e47f752 and /dev/null differ diff --git a/tests/gitea-repositories-meta/user2/repo1.wiki.git/objects/bf/29486462016efad8872371078932d8c2cb5253 b/tests/gitea-repositories-meta/user2/repo1.wiki.git/objects/bf/29486462016efad8872371078932d8c2cb5253 deleted file mode 100644 index ab5b5954cb..0000000000 Binary files a/tests/gitea-repositories-meta/user2/repo1.wiki.git/objects/bf/29486462016efad8872371078932d8c2cb5253 and /dev/null differ diff --git a/tests/gitea-repositories-meta/user2/repo1.wiki.git/objects/c0/b5b381e2df9f66d11e8c95fe7467b8fb7f3e4e b/tests/gitea-repositories-meta/user2/repo1.wiki.git/objects/c0/b5b381e2df9f66d11e8c95fe7467b8fb7f3e4e deleted file mode 100644 index 0474927fd2..0000000000 Binary files a/tests/gitea-repositories-meta/user2/repo1.wiki.git/objects/c0/b5b381e2df9f66d11e8c95fe7467b8fb7f3e4e and /dev/null differ diff --git a/tests/gitea-repositories-meta/user2/repo1.wiki.git/objects/d4/9ac742d44063dcf69d4e0afe725813b777dd89 b/tests/gitea-repositories-meta/user2/repo1.wiki.git/objects/d4/9ac742d44063dcf69d4e0afe725813b777dd89 deleted file mode 100644 index 9dc276f37d..0000000000 --- a/tests/gitea-repositories-meta/user2/repo1.wiki.git/objects/d4/9ac742d44063dcf69d4e0afe725813b777dd89 +++ /dev/null @@ -1 +0,0 @@ -xÍn›@…»ž§¸û*ñ†áGjªŒmJ±‰C1–“ì~R0Ó§i}’*ïU·•ºÊ*gw>éHç˺¶­5˜6}§¥€3”)Sh²´0 —9ÍTƨáž;2i2Óå®-É^j§óLò4wSžÛªp™mSTÈ­‚Û\9V†Ô1Sép"ºê¸Õ¼|ùùëÇ“„î.Z>É법us™uíG 63˜…¥ð)"9ÓóG­Þ¶.÷å¡.áâO¦ž¬ ò#XþJ$›ØûË ¨?o<1½_Š)nƒ/±~æá6¹ëÕcS­ûl<ÔXŽiÒ–b3{@Ÿ÷B,g±øÏ ” ¯‘ÛËK|½ÆEÐ[ß0\ïƒÉaWñÝ¢Ræ|¤øi{º¹žxd… ÃÉßô9<ÐÙÒšg>»¨Š KOvÉ"D§J„sEàêØœzòÏÆ[Í_s!2Ï¡év%ìe©Èo(½” \ No newline at end of file diff --git a/tests/gitea-repositories-meta/user2/repo1.wiki.git/objects/df/6b6d9a97608bc8b56d4f30cde5af00f0681ccf b/tests/gitea-repositories-meta/user2/repo1.wiki.git/objects/df/6b6d9a97608bc8b56d4f30cde5af00f0681ccf deleted file mode 100644 index 3927778ddf..0000000000 Binary files a/tests/gitea-repositories-meta/user2/repo1.wiki.git/objects/df/6b6d9a97608bc8b56d4f30cde5af00f0681ccf and /dev/null differ diff --git a/tests/gitea-repositories-meta/user2/repo1.wiki.git/objects/f5/4f5a6b7c4f83b606600e43186165854f189530 b/tests/gitea-repositories-meta/user2/repo1.wiki.git/objects/f5/4f5a6b7c4f83b606600e43186165854f189530 deleted file mode 100644 index a69fc57996..0000000000 Binary files a/tests/gitea-repositories-meta/user2/repo1.wiki.git/objects/f5/4f5a6b7c4f83b606600e43186165854f189530 and /dev/null differ diff --git a/tests/gitea-repositories-meta/user2/repo1.wiki.git/refs/heads/master b/tests/gitea-repositories-meta/user2/repo1.wiki.git/refs/heads/master index bd0c0d7efe..38984b12b7 100644 --- a/tests/gitea-repositories-meta/user2/repo1.wiki.git/refs/heads/master +++ b/tests/gitea-repositories-meta/user2/repo1.wiki.git/refs/heads/master @@ -1 +1 @@ -f54f5a6b7c4f83b606600e43186165854f189530 +0dca5bd9b5d7ef937710e056f575e86c0184ba85 diff --git a/tests/integration/README.md b/tests/integration/README.md index d83685388e..f0fbf94df9 100644 --- a/tests/integration/README.md +++ b/tests/integration/README.md @@ -61,21 +61,22 @@ make test-sqlite ### Run MySQL integration tests Setup a MySQL database inside docker ``` -docker run -e MYSQL_DATABASE=test -e MYSQL_ALLOW_EMPTY_PASSWORD=yes -p 3306:3306 --rm --name mysql mysql:latest #(Ctrl-c to stop the database) +docker run -e "MYSQL_DATABASE=test" -e "MYSQL_ALLOW_EMPTY_PASSWORD=yes" -p 3306:3306 --rm --name mysql mysql:latest #(just ctrl-c to stop db and clean the container) +docker run -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" --rm --name elasticsearch elasticsearch:7.6.0 #(in a second terminal, just ctrl-c to stop db and clean the container) ``` Start tests based on the database container ``` -TEST_MYSQL_HOST=localhost:3306 TEST_MYSQL_DBNAME=test?multiStatements=true TEST_MYSQL_USERNAME=root TEST_MYSQL_PASSWORD='' make test-mysql +TEST_MYSQL_HOST=localhost:3306 TEST_MYSQL_DBNAME=test TEST_MYSQL_USERNAME=root TEST_MYSQL_PASSWORD='' make test-mysql ``` ### Run pgsql integration tests Setup a pgsql database inside docker ``` -docker run -e "POSTGRES_DB=test" -e POSTGRES_PASSWORD=postgres -p 5432:5432 --rm --name pgsql postgres:latest #(Ctrl-c to stop the database) +docker run -e "POSTGRES_DB=test" -p 5432:5432 --rm --name pgsql postgres:latest #(just ctrl-c to stop db and clean the container) ``` Start tests based on the database container ``` -TEST_STORAGE_TYPE=local TEST_PGSQL_HOST=localhost:5432 TEST_PGSQL_DBNAME=test TEST_PGSQL_USERNAME=postgres TEST_PGSQL_PASSWORD=postgres make test-pgsql +TEST_PGSQL_HOST=localhost:5432 TEST_PGSQL_DBNAME=test TEST_PGSQL_USERNAME=postgres TEST_PGSQL_PASSWORD=postgres make test-pgsql ``` ### Running individual tests diff --git a/tests/integration/actions_commit_status_test.go b/tests/integration/actions_commit_status_test.go index 0dae5db344..ace0fbd323 100644 --- a/tests/integration/actions_commit_status_test.go +++ b/tests/integration/actions_commit_status_test.go @@ -14,7 +14,6 @@ import ( "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" "code.gitea.io/gitea/services/actions" "code.gitea.io/gitea/services/automerge" @@ -24,7 +23,7 @@ import ( func TestActionsAutomerge(t *testing.T) { onGiteaRun(t, func(t *testing.T, u *url.URL) { - defer test.MockVariableValue(&setting.Actions.Enabled, true)() + assert.True(t, setting.Actions.Enabled, "Actions should be enabled") ctx := db.DefaultContext @@ -35,7 +34,7 @@ func TestActionsAutomerge(t *testing.T) { assert.False(t, pr.HasMerged, "PR should not be merged") assert.Equal(t, issues_model.PullRequestStatusMergeable, pr.Status, "PR should be mergeable") - scheduled, err := automerge.ScheduleAutoMerge(ctx, user, pr, repo_model.MergeStyleMerge, "Dummy", false) + scheduled, err := automerge.ScheduleAutoMerge(ctx, user, pr, repo_model.MergeStyleMerge, "Dummy") require.NoError(t, err, "PR should be scheduled for automerge") assert.True(t, scheduled, "PR should be scheduled for automerge") diff --git a/tests/integration/actions_job_test.go b/tests/integration/actions_job_test.go deleted file mode 100644 index 5af3519b93..0000000000 --- a/tests/integration/actions_job_test.go +++ /dev/null @@ -1,417 +0,0 @@ -// Copyright 2024 The Gitea Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -package integration - -import ( - "encoding/base64" - "fmt" - "net/http" - "net/url" - "testing" - "time" - - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - - runnerv1 "code.gitea.io/actions-proto-go/runner/v1" - "github.com/stretchr/testify/assert" -) - -func TestJobWithNeeds(t *testing.T) { - if !setting.Database.Type.IsSQLite3() { - t.Skip() - } - testCases := []struct { - treePath string - fileContent string - outcomes map[string]*mockTaskOutcome - expectedStatuses map[string]string - }{ - { - treePath: ".gitea/workflows/job-with-needs.yml", - fileContent: `name: job-with-needs -on: - push: - paths: - - '.gitea/workflows/job-with-needs.yml' -jobs: - job1: - runs-on: ubuntu-latest - steps: - - run: echo job1 - job2: - runs-on: ubuntu-latest - needs: [job1] - steps: - - run: echo job2 -`, - outcomes: map[string]*mockTaskOutcome{ - "job1": { - result: runnerv1.Result_RESULT_SUCCESS, - }, - "job2": { - result: runnerv1.Result_RESULT_SUCCESS, - }, - }, - expectedStatuses: map[string]string{ - "job1": actions_model.StatusSuccess.String(), - "job2": actions_model.StatusSuccess.String(), - }, - }, - { - treePath: ".gitea/workflows/job-with-needs-fail.yml", - fileContent: `name: job-with-needs-fail -on: - push: - paths: - - '.gitea/workflows/job-with-needs-fail.yml' -jobs: - job1: - runs-on: ubuntu-latest - steps: - - run: echo job1 - job2: - runs-on: ubuntu-latest - needs: [job1] - steps: - - run: echo job2 -`, - outcomes: map[string]*mockTaskOutcome{ - "job1": { - result: runnerv1.Result_RESULT_FAILURE, - }, - }, - expectedStatuses: map[string]string{ - "job1": actions_model.StatusFailure.String(), - "job2": actions_model.StatusSkipped.String(), - }, - }, - { - treePath: ".gitea/workflows/job-with-needs-fail-if.yml", - fileContent: `name: job-with-needs-fail-if -on: - push: - paths: - - '.gitea/workflows/job-with-needs-fail-if.yml' -jobs: - job1: - runs-on: ubuntu-latest - steps: - - run: echo job1 - job2: - runs-on: ubuntu-latest - if: ${{ always() }} - needs: [job1] - steps: - - run: echo job2 -`, - outcomes: map[string]*mockTaskOutcome{ - "job1": { - result: runnerv1.Result_RESULT_FAILURE, - }, - "job2": { - result: runnerv1.Result_RESULT_SUCCESS, - }, - }, - expectedStatuses: map[string]string{ - "job1": actions_model.StatusFailure.String(), - "job2": actions_model.StatusSuccess.String(), - }, - }, - } - onGiteaRun(t, func(t *testing.T, u *url.URL) { - user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) - session := loginUser(t, user2.Name) - token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) - - apiRepo := createActionsTestRepo(t, token, "actions-jobs-with-needs", false) - runner := newMockRunner() - runner.registerAsRepoRunner(t, user2.Name, apiRepo.Name, "mock-runner", []string{"ubuntu-latest"}) - - for _, tc := range testCases { - t.Run(fmt.Sprintf("test %s", tc.treePath), func(t *testing.T) { - // create the workflow file - opts := getWorkflowCreateFileOptions(user2, apiRepo.DefaultBranch, fmt.Sprintf("create %s", tc.treePath), tc.fileContent) - fileResp := createWorkflowFile(t, token, user2.Name, apiRepo.Name, tc.treePath, opts) - - // fetch and execute task - for i := 0; i < len(tc.outcomes); i++ { - task := runner.fetchTask(t) - jobName := getTaskJobNameByTaskID(t, token, user2.Name, apiRepo.Name, task.Id) - outcome := tc.outcomes[jobName] - assert.NotNil(t, outcome) - runner.execTask(t, task, outcome) - } - - // check result - req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/actions/tasks", user2.Name, apiRepo.Name)). - AddTokenAuth(token) - resp := MakeRequest(t, req, http.StatusOK) - var actionTaskRespAfter api.ActionTaskResponse - DecodeJSON(t, resp, &actionTaskRespAfter) - for _, apiTask := range actionTaskRespAfter.Entries { - if apiTask.HeadSHA != fileResp.Commit.SHA { - continue - } - status := apiTask.Status - assert.Equal(t, status, tc.expectedStatuses[apiTask.Name]) - } - }) - } - - httpContext := NewAPITestContext(t, user2.Name, apiRepo.Name, auth_model.AccessTokenScopeWriteRepository) - doAPIDeleteRepository(httpContext)(t) - }) -} - -func TestJobNeedsMatrix(t *testing.T) { - if !setting.Database.Type.IsSQLite3() { - t.Skip() - } - testCases := []struct { - treePath string - fileContent string - outcomes map[string]*mockTaskOutcome - expectedTaskNeeds map[string]*runnerv1.TaskNeed // jobID => TaskNeed - }{ - { - treePath: ".gitea/workflows/jobs-outputs-with-matrix.yml", - fileContent: `name: jobs-outputs-with-matrix -on: - push: - paths: - - '.gitea/workflows/jobs-outputs-with-matrix.yml' -jobs: - job1: - runs-on: ubuntu-latest - outputs: - output_1: ${{ steps.gen_output.outputs.output_1 }} - output_2: ${{ steps.gen_output.outputs.output_2 }} - output_3: ${{ steps.gen_output.outputs.output_3 }} - strategy: - matrix: - version: [1, 2, 3] - steps: - - name: Generate output - id: gen_output - run: | - version="${{ matrix.version }}" - echo "output_${version}=${version}" >> "$GITHUB_OUTPUT" - job2: - runs-on: ubuntu-latest - needs: [job1] - steps: - - run: echo '${{ toJSON(needs.job1.outputs) }}' -`, - outcomes: map[string]*mockTaskOutcome{ - "job1 (1)": { - result: runnerv1.Result_RESULT_SUCCESS, - outputs: map[string]string{ - "output_1": "1", - "output_2": "", - "output_3": "", - }, - }, - "job1 (2)": { - result: runnerv1.Result_RESULT_SUCCESS, - outputs: map[string]string{ - "output_1": "", - "output_2": "2", - "output_3": "", - }, - }, - "job1 (3)": { - result: runnerv1.Result_RESULT_SUCCESS, - outputs: map[string]string{ - "output_1": "", - "output_2": "", - "output_3": "3", - }, - }, - }, - expectedTaskNeeds: map[string]*runnerv1.TaskNeed{ - "job1": { - Result: runnerv1.Result_RESULT_SUCCESS, - Outputs: map[string]string{ - "output_1": "1", - "output_2": "2", - "output_3": "3", - }, - }, - }, - }, - { - treePath: ".gitea/workflows/jobs-outputs-with-matrix-failure.yml", - fileContent: `name: jobs-outputs-with-matrix-failure -on: - push: - paths: - - '.gitea/workflows/jobs-outputs-with-matrix-failure.yml' -jobs: - job1: - runs-on: ubuntu-latest - outputs: - output_1: ${{ steps.gen_output.outputs.output_1 }} - output_2: ${{ steps.gen_output.outputs.output_2 }} - output_3: ${{ steps.gen_output.outputs.output_3 }} - strategy: - matrix: - version: [1, 2, 3] - steps: - - name: Generate output - id: gen_output - run: | - version="${{ matrix.version }}" - echo "output_${version}=${version}" >> "$GITHUB_OUTPUT" - job2: - runs-on: ubuntu-latest - if: ${{ always() }} - needs: [job1] - steps: - - run: echo '${{ toJSON(needs.job1.outputs) }}' -`, - outcomes: map[string]*mockTaskOutcome{ - "job1 (1)": { - result: runnerv1.Result_RESULT_SUCCESS, - outputs: map[string]string{ - "output_1": "1", - "output_2": "", - "output_3": "", - }, - }, - "job1 (2)": { - result: runnerv1.Result_RESULT_FAILURE, - outputs: map[string]string{ - "output_1": "", - "output_2": "", - "output_3": "", - }, - }, - "job1 (3)": { - result: runnerv1.Result_RESULT_SUCCESS, - outputs: map[string]string{ - "output_1": "", - "output_2": "", - "output_3": "3", - }, - }, - }, - expectedTaskNeeds: map[string]*runnerv1.TaskNeed{ - "job1": { - Result: runnerv1.Result_RESULT_FAILURE, - Outputs: map[string]string{ - "output_1": "1", - "output_2": "", - "output_3": "3", - }, - }, - }, - }, - } - onGiteaRun(t, func(t *testing.T, u *url.URL) { - user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) - session := loginUser(t, user2.Name) - token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) - - apiRepo := createActionsTestRepo(t, token, "actions-jobs-outputs-with-matrix", false) - runner := newMockRunner() - runner.registerAsRepoRunner(t, user2.Name, apiRepo.Name, "mock-runner", []string{"ubuntu-latest"}) - - for _, tc := range testCases { - t.Run(fmt.Sprintf("test %s", tc.treePath), func(t *testing.T) { - opts := getWorkflowCreateFileOptions(user2, apiRepo.DefaultBranch, fmt.Sprintf("create %s", tc.treePath), tc.fileContent) - createWorkflowFile(t, token, user2.Name, apiRepo.Name, tc.treePath, opts) - - for i := 0; i < len(tc.outcomes); i++ { - task := runner.fetchTask(t) - jobName := getTaskJobNameByTaskID(t, token, user2.Name, apiRepo.Name, task.Id) - outcome := tc.outcomes[jobName] - assert.NotNil(t, outcome) - runner.execTask(t, task, outcome) - } - - task := runner.fetchTask(t) - actualTaskNeeds := task.Needs - assert.Len(t, actualTaskNeeds, len(tc.expectedTaskNeeds)) - for jobID, tn := range tc.expectedTaskNeeds { - actualNeed := actualTaskNeeds[jobID] - assert.Equal(t, tn.Result, actualNeed.Result) - assert.Len(t, actualNeed.Outputs, len(tn.Outputs)) - for outputKey, outputValue := range tn.Outputs { - assert.Equal(t, outputValue, actualNeed.Outputs[outputKey]) - } - } - }) - } - - httpContext := NewAPITestContext(t, user2.Name, apiRepo.Name, auth_model.AccessTokenScopeWriteRepository) - doAPIDeleteRepository(httpContext)(t) - }) -} - -func createActionsTestRepo(t *testing.T, authToken, repoName string, isPrivate bool) *api.Repository { - req := NewRequestWithJSON(t, "POST", "/api/v1/user/repos", &api.CreateRepoOption{ - Name: repoName, - Private: isPrivate, - Readme: "Default", - AutoInit: true, - DefaultBranch: "main", - }).AddTokenAuth(authToken) - resp := MakeRequest(t, req, http.StatusCreated) - var apiRepo api.Repository - DecodeJSON(t, resp, &apiRepo) - return &apiRepo -} - -func getWorkflowCreateFileOptions(u *user_model.User, branch, msg, content string) *api.CreateFileOptions { - return &api.CreateFileOptions{ - FileOptions: api.FileOptions{ - BranchName: branch, - Message: msg, - Author: api.Identity{ - Name: u.Name, - Email: u.Email, - }, - Committer: api.Identity{ - Name: u.Name, - Email: u.Email, - }, - Dates: api.CommitDateOptions{ - Author: time.Now(), - Committer: time.Now(), - }, - }, - ContentBase64: base64.StdEncoding.EncodeToString([]byte(content)), - } -} - -func createWorkflowFile(t *testing.T, authToken, ownerName, repoName, treePath string, opts *api.CreateFileOptions) *api.FileResponse { - req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s", ownerName, repoName, treePath), opts). - AddTokenAuth(authToken) - resp := MakeRequest(t, req, http.StatusCreated) - var fileResponse api.FileResponse - DecodeJSON(t, resp, &fileResponse) - return &fileResponse -} - -// getTaskJobNameByTaskID get the job name of the task by task ID -// there is currently not an API for querying a task by ID so we have to list all the tasks -func getTaskJobNameByTaskID(t *testing.T, authToken, ownerName, repoName string, taskID int64) string { - // FIXME: we may need to query several pages - req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/actions/tasks", ownerName, repoName)). - AddTokenAuth(authToken) - resp := MakeRequest(t, req, http.StatusOK) - var taskRespBefore api.ActionTaskResponse - DecodeJSON(t, resp, &taskRespBefore) - for _, apiTask := range taskRespBefore.Entries { - if apiTask.ID == taskID { - return apiTask.Name - } - } - return "" -} diff --git a/tests/integration/actions_log_test.go b/tests/integration/actions_log_test.go deleted file mode 100644 index d66eada950..0000000000 --- a/tests/integration/actions_log_test.go +++ /dev/null @@ -1,163 +0,0 @@ -// Copyright 2024 The Gitea Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -package integration - -import ( - "fmt" - "net/http" - "net/url" - "strings" - "testing" - "time" - - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/storage" - "code.gitea.io/gitea/modules/test" - - runnerv1 "code.gitea.io/actions-proto-go/runner/v1" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "google.golang.org/protobuf/types/known/timestamppb" -) - -func TestDownloadTaskLogs(t *testing.T) { - if !setting.Database.Type.IsSQLite3() { - t.Skip() - } - now := time.Now() - testCases := []struct { - treePath string - fileContent string - outcome *mockTaskOutcome - zstdEnabled bool - }{ - { - treePath: ".gitea/workflows/download-task-logs-zstd.yml", - fileContent: `name: download-task-logs-zstd -on: - push: - paths: - - '.gitea/workflows/download-task-logs-zstd.yml' -jobs: - job1: - runs-on: ubuntu-latest - steps: - - run: echo job1 with zstd enabled -`, - outcome: &mockTaskOutcome{ - result: runnerv1.Result_RESULT_SUCCESS, - logRows: []*runnerv1.LogRow{ - { - Time: timestamppb.New(now.Add(1 * time.Second)), - Content: " \U0001F433 docker create image", - }, - { - Time: timestamppb.New(now.Add(2 * time.Second)), - Content: "job1 zstd enabled", - }, - { - Time: timestamppb.New(now.Add(3 * time.Second)), - Content: "\U0001F3C1 Job succeeded", - }, - }, - }, - zstdEnabled: true, - }, - { - treePath: ".gitea/workflows/download-task-logs-no-zstd.yml", - fileContent: `name: download-task-logs-no-zstd -on: - push: - paths: - - '.gitea/workflows/download-task-logs-no-zstd.yml' -jobs: - job1: - runs-on: ubuntu-latest - steps: - - run: echo job1 with zstd disabled -`, - outcome: &mockTaskOutcome{ - result: runnerv1.Result_RESULT_SUCCESS, - logRows: []*runnerv1.LogRow{ - { - Time: timestamppb.New(now.Add(4 * time.Second)), - Content: " \U0001F433 docker create image", - }, - { - Time: timestamppb.New(now.Add(5 * time.Second)), - Content: "job1 zstd disabled", - }, - { - Time: timestamppb.New(now.Add(6 * time.Second)), - Content: "\U0001F3C1 Job succeeded", - }, - }, - }, - zstdEnabled: false, - }, - } - onGiteaRun(t, func(t *testing.T, u *url.URL) { - user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) - session := loginUser(t, user2.Name) - token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) - - apiRepo := createActionsTestRepo(t, token, "actions-download-task-logs", false) - repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: apiRepo.ID}) - runner := newMockRunner() - runner.registerAsRepoRunner(t, user2.Name, repo.Name, "mock-runner", []string{"ubuntu-latest"}) - - for _, tc := range testCases { - t.Run(fmt.Sprintf("test %s", tc.treePath), func(t *testing.T) { - var resetFunc func() - if tc.zstdEnabled { - resetFunc = test.MockVariableValue(&setting.Actions.LogCompression, "zstd") - assert.True(t, setting.Actions.LogCompression.IsZstd()) - } else { - resetFunc = test.MockVariableValue(&setting.Actions.LogCompression, "none") - assert.False(t, setting.Actions.LogCompression.IsZstd()) - } - - // create the workflow file - opts := getWorkflowCreateFileOptions(user2, repo.DefaultBranch, fmt.Sprintf("create %s", tc.treePath), tc.fileContent) - createWorkflowFile(t, token, user2.Name, repo.Name, tc.treePath, opts) - - // fetch and execute task - task := runner.fetchTask(t) - runner.execTask(t, task, tc.outcome) - - // check whether the log file exists - logFileName := fmt.Sprintf("%s/%02x/%d.log", repo.FullName(), task.Id%256, task.Id) - if setting.Actions.LogCompression.IsZstd() { - logFileName += ".zst" - } - _, err := storage.Actions.Stat(logFileName) - require.NoError(t, err) - - // download task logs and check content - runIndex := task.Context.GetFields()["run_number"].GetStringValue() - req := NewRequest(t, "GET", fmt.Sprintf("/%s/%s/actions/runs/%s/jobs/0/logs", user2.Name, repo.Name, runIndex)). - AddTokenAuth(token) - resp := MakeRequest(t, req, http.StatusOK) - logTextLines := strings.Split(strings.TrimSpace(resp.Body.String()), "\n") - assert.Len(t, logTextLines, len(tc.outcome.logRows)) - for idx, lr := range tc.outcome.logRows { - assert.Equal( - t, - fmt.Sprintf("%s %s", lr.Time.AsTime().Format("2006-01-02T15:04:05.0000000Z07:00"), lr.Content), - logTextLines[idx], - ) - } - - resetFunc() - }) - } - - httpContext := NewAPITestContext(t, user2.Name, repo.Name, auth_model.AccessTokenScopeWriteRepository) - doAPIDeleteRepository(httpContext)(t) - }) -} diff --git a/tests/integration/actions_runner_test.go b/tests/integration/actions_runner_test.go deleted file mode 100644 index 0ffd97a208..0000000000 --- a/tests/integration/actions_runner_test.go +++ /dev/null @@ -1,162 +0,0 @@ -// Copyright 2024 The Gitea Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -package integration - -import ( - "context" - "fmt" - "net/http" - "testing" - "time" - - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/modules/setting" - - pingv1 "code.gitea.io/actions-proto-go/ping/v1" - "code.gitea.io/actions-proto-go/ping/v1/pingv1connect" - runnerv1 "code.gitea.io/actions-proto-go/runner/v1" - "code.gitea.io/actions-proto-go/runner/v1/runnerv1connect" - "connectrpc.com/connect" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "google.golang.org/protobuf/types/known/timestamppb" -) - -type mockRunner struct { - client *mockRunnerClient -} - -type mockRunnerClient struct { - pingServiceClient pingv1connect.PingServiceClient - runnerServiceClient runnerv1connect.RunnerServiceClient -} - -func newMockRunner() *mockRunner { - client := newMockRunnerClient("", "") - return &mockRunner{client: client} -} - -func newMockRunnerClient(uuid, token string) *mockRunnerClient { - baseURL := fmt.Sprintf("%sapi/actions", setting.AppURL) - - opt := connect.WithInterceptors(connect.UnaryInterceptorFunc(func(next connect.UnaryFunc) connect.UnaryFunc { - return func(ctx context.Context, req connect.AnyRequest) (connect.AnyResponse, error) { - if uuid != "" { - req.Header().Set("x-runner-uuid", uuid) - } - if token != "" { - req.Header().Set("x-runner-token", token) - } - return next(ctx, req) - } - })) - - client := &mockRunnerClient{ - pingServiceClient: pingv1connect.NewPingServiceClient(http.DefaultClient, baseURL, opt), - runnerServiceClient: runnerv1connect.NewRunnerServiceClient(http.DefaultClient, baseURL, opt), - } - - return client -} - -func (r *mockRunner) doPing(t *testing.T) { - resp, err := r.client.pingServiceClient.Ping(context.Background(), connect.NewRequest(&pingv1.PingRequest{ - Data: "mock-runner", - })) - require.NoError(t, err) - require.Equal(t, "Hello, mock-runner!", resp.Msg.Data) -} - -func (r *mockRunner) doRegister(t *testing.T, name, token string, labels []string) { - r.doPing(t) - resp, err := r.client.runnerServiceClient.Register(context.Background(), connect.NewRequest(&runnerv1.RegisterRequest{ - Name: name, - Token: token, - Version: "mock-runner-version", - Labels: labels, - })) - require.NoError(t, err) - r.client = newMockRunnerClient(resp.Msg.Runner.Uuid, resp.Msg.Runner.Token) -} - -func (r *mockRunner) registerAsRepoRunner(t *testing.T, ownerName, repoName, runnerName string, labels []string) { - if !setting.Database.Type.IsSQLite3() { - // registering a mock runner when using a database other than SQLite leaves leftovers - t.FailNow() - } - session := loginUser(t, ownerName) - token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) - req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/actions/runners/registration-token", ownerName, repoName)).AddTokenAuth(token) - resp := MakeRequest(t, req, http.StatusOK) - var registrationToken struct { - Token string `json:"token"` - } - DecodeJSON(t, resp, ®istrationToken) - r.doRegister(t, runnerName, registrationToken.Token, labels) -} - -func (r *mockRunner) fetchTask(t *testing.T, timeout ...time.Duration) *runnerv1.Task { - fetchTimeout := 10 * time.Second - if len(timeout) > 0 { - fetchTimeout = timeout[0] - } - ddl := time.Now().Add(fetchTimeout) - var task *runnerv1.Task - for time.Now().Before(ddl) { - resp, err := r.client.runnerServiceClient.FetchTask(context.Background(), connect.NewRequest(&runnerv1.FetchTaskRequest{ - TasksVersion: 0, - })) - require.NoError(t, err) - if resp.Msg.Task != nil { - task = resp.Msg.Task - break - } - time.Sleep(time.Second) - } - assert.NotNil(t, task, "failed to fetch a task") - return task -} - -type mockTaskOutcome struct { - result runnerv1.Result - outputs map[string]string - logRows []*runnerv1.LogRow - execTime time.Duration -} - -func (r *mockRunner) execTask(t *testing.T, task *runnerv1.Task, outcome *mockTaskOutcome) { - for idx, lr := range outcome.logRows { - resp, err := r.client.runnerServiceClient.UpdateLog(context.Background(), connect.NewRequest(&runnerv1.UpdateLogRequest{ - TaskId: task.Id, - Index: int64(idx), - Rows: []*runnerv1.LogRow{lr}, - NoMore: idx == len(outcome.logRows)-1, - })) - require.NoError(t, err) - assert.EqualValues(t, idx+1, resp.Msg.AckIndex) - } - sentOutputKeys := make([]string, 0, len(outcome.outputs)) - for outputKey, outputValue := range outcome.outputs { - resp, err := r.client.runnerServiceClient.UpdateTask(context.Background(), connect.NewRequest(&runnerv1.UpdateTaskRequest{ - State: &runnerv1.TaskState{ - Id: task.Id, - Result: runnerv1.Result_RESULT_UNSPECIFIED, - }, - Outputs: map[string]string{outputKey: outputValue}, - })) - require.NoError(t, err) - sentOutputKeys = append(sentOutputKeys, outputKey) - assert.ElementsMatch(t, sentOutputKeys, resp.Msg.SentOutputs) - } - time.Sleep(outcome.execTime) - resp, err := r.client.runnerServiceClient.UpdateTask(context.Background(), connect.NewRequest(&runnerv1.UpdateTaskRequest{ - State: &runnerv1.TaskState{ - Id: task.Id, - Result: outcome.result, - StoppedAt: timestamppb.Now(), - }, - })) - require.NoError(t, err) - assert.Equal(t, outcome.result, resp.Msg.State.Result) -} diff --git a/tests/integration/actions_trigger_test.go b/tests/integration/actions_trigger_test.go index 25bdc8018f..de646f05b5 100644 --- a/tests/integration/actions_trigger_test.go +++ b/tests/integration/actions_trigger_test.go @@ -5,14 +5,12 @@ package integration import ( "fmt" - "net/http" "net/url" "strings" "testing" "time" actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" issues_model "code.gitea.io/gitea/models/issues" @@ -24,11 +22,9 @@ import ( "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/gitrepo" "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/test" webhook_module "code.gitea.io/gitea/modules/webhook" actions_service "code.gitea.io/gitea/services/actions" - issue_service "code.gitea.io/gitea/services/issue" pull_service "code.gitea.io/gitea/services/pull" release_service "code.gitea.io/gitea/services/release" repo_service "code.gitea.io/gitea/services/repository" @@ -39,317 +35,6 @@ import ( "github.com/stretchr/testify/require" ) -func TestPullRequestCommitStatus(t *testing.T) { - onGiteaRun(t, func(t *testing.T, u *url.URL) { - user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) // owner of the base repo - session := loginUser(t, "user2") - token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue) - - // prepare the repository - files := make([]*files_service.ChangeRepoFile, 0, 10) - for _, onType := range []string{ - "opened", - "synchronize", - "labeled", - "unlabeled", - "assigned", - "unassigned", - "milestoned", - "demilestoned", - "closed", - "reopened", - } { - files = append(files, &files_service.ChangeRepoFile{ - Operation: "create", - TreePath: fmt.Sprintf(".forgejo/workflows/%s.yml", onType), - ContentReader: strings.NewReader(fmt.Sprintf(`name: %[1]s -on: - pull_request: - types: - - %[1]s -jobs: - %[1]s: - runs-on: docker - steps: - - run: true -`, onType)), - }) - } - baseRepo, _, f := tests.CreateDeclarativeRepo(t, user2, "repo-pull-request", - []unit_model.Type{unit_model.TypeActions}, nil, files) - defer f() - baseGitRepo, err := gitrepo.OpenRepository(db.DefaultContext, baseRepo) - require.NoError(t, err) - defer func() { - baseGitRepo.Close() - }() - - // prepare the repository labels - labelStr := "/api/v1/repos/user2/repo-pull-request/labels" - labelsCount := 2 - labels := make([]*api.Label, labelsCount) - for i := 0; i < labelsCount; i++ { - color := "abcdef" - req := NewRequestWithJSON(t, "POST", labelStr, &api.CreateLabelOption{ - Name: fmt.Sprintf("label%d", i), - Color: color, - }).AddTokenAuth(token) - resp := MakeRequest(t, req, http.StatusCreated) - labels[i] = new(api.Label) - DecodeJSON(t, resp, &labels[i]) - assert.Equal(t, color, labels[i].Color) - } - - // create the pull request - testEditFileToNewBranch(t, session, "user2", "repo-pull-request", "main", "wip-something", "README.md", "Hello, world 1") - testPullCreate(t, session, "user2", "repo-pull-request", true, "main", "wip-something", "Commit status PR") - pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: baseRepo.ID}) - require.NoError(t, pr.LoadIssue(db.DefaultContext)) - - // prepare the assignees - issueURL := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%s", "user2", "repo-pull-request", fmt.Sprintf("%d", pr.Issue.Index)) - - // prepare the labels - labelURL := fmt.Sprintf("%s/labels", issueURL) - - // prepare the milestone - milestoneStr := "/api/v1/repos/user2/repo-pull-request/milestones" - req := NewRequestWithJSON(t, "POST", milestoneStr, &api.CreateMilestoneOption{ - Title: "mymilestone", - State: "open", - }).AddTokenAuth(token) - resp := MakeRequest(t, req, http.StatusCreated) - milestone := new(api.Milestone) - DecodeJSON(t, resp, &milestone) - - // check that one of the status associated with the commit sha matches both - // context & state - checkCommitStatus := func(sha, context string, state api.CommitStatusState) bool { - commitStatuses, _, err := git_model.GetLatestCommitStatus(db.DefaultContext, pr.BaseRepoID, sha, db.ListOptionsAll) - require.NoError(t, err) - for _, commitStatus := range commitStatuses { - if state == commitStatus.State && context == commitStatus.Context { - return true - } - } - return false - } - - assertActionRun := func(t *testing.T, sha, onType string, action api.HookIssueAction, actionRun *actions_model.ActionRun) { - assert.Equal(t, fmt.Sprintf("%s.yml", onType), actionRun.WorkflowID) - assert.Equal(t, sha, actionRun.CommitSHA) - assert.Equal(t, actions_module.GithubEventPullRequest, actionRun.TriggerEvent) - event, err := actionRun.GetPullRequestEventPayload() - require.NoError(t, err) - assert.Equal(t, action, event.Action) - } - - type assertType func(t *testing.T, sha, onType string, action api.HookIssueAction, actionRuns []*actions_model.ActionRun) - assertActionRuns := func(t *testing.T, sha, onType string, action api.HookIssueAction, actionRuns []*actions_model.ActionRun) { - require.Len(t, actionRuns, 1) - assertActionRun(t, sha, onType, action, actionRuns[0]) - } - - for _, testCase := range []struct { - onType string - jobID string - doSomething func() - actionRunCount int - action api.HookIssueAction - assert assertType - }{ - { - onType: "opened", - doSomething: func() {}, - actionRunCount: 1, - action: api.HookIssueOpened, - assert: assertActionRuns, - }, - { - onType: "synchronize", - doSomething: func() { - testEditFile(t, session, "user2", "repo-pull-request", "wip-something", "README.md", "Hello, world 2") - }, - actionRunCount: 1, - action: api.HookIssueSynchronized, - assert: assertActionRuns, - }, - { - onType: "labeled", - doSomething: func() { - req := NewRequestWithJSON(t, "POST", labelURL, &api.IssueLabelsOption{ - Labels: []any{labels[0].ID, labels[1].ID}, - }).AddTokenAuth(token) - MakeRequest(t, req, http.StatusOK) - }, - actionRunCount: 2, - action: api.HookIssueLabelUpdated, - assert: func(t *testing.T, sha, onType string, action api.HookIssueAction, actionRuns []*actions_model.ActionRun) { - assertActionRun(t, sha, onType, api.HookIssueLabelUpdated, actionRuns[0]) - assertActionRun(t, sha, onType, api.HookIssueLabelUpdated, actionRuns[1]) - }, - }, - { - onType: "unlabeled", - doSomething: func() { - req := NewRequestWithJSON(t, "PUT", labelURL, &api.IssueLabelsOption{ - Labels: []any{labels[0].ID}, - }).AddTokenAuth(token) - MakeRequest(t, req, http.StatusOK) - }, - actionRunCount: 3, - action: api.HookIssueLabelCleared, - assert: func(t *testing.T, sha, onType string, action api.HookIssueAction, actionRuns []*actions_model.ActionRun) { - foundPayloadWithLabels := false - knownLabels := []string{"label0", "label1"} - for _, actionRun := range actionRuns { - assert.Equal(t, sha, actionRun.CommitSHA) - assert.Equal(t, actions_module.GithubEventPullRequest, actionRun.TriggerEvent) - event, err := actionRun.GetPullRequestEventPayload() - require.NoError(t, err) - switch event.Action { - case api.HookIssueLabelUpdated: - assert.Equal(t, "labeled.yml", actionRun.WorkflowID) - assert.Equal(t, "label0", event.Label.Name) - require.Len(t, event.PullRequest.Labels, 1) - assert.Contains(t, "label0", event.PullRequest.Labels[0].Name) - case api.HookIssueLabelCleared: - assert.Equal(t, "unlabeled.yml", actionRun.WorkflowID) - assert.Contains(t, knownLabels, event.Label.Name) - if len(event.PullRequest.Labels) > 0 { - foundPayloadWithLabels = true - assert.Contains(t, knownLabels, event.PullRequest.Labels[0].Name) - } - default: - require.Fail(t, fmt.Sprintf("unexpected action '%s'", event.Action)) - } - } - assert.True(t, foundPayloadWithLabels, "expected at least one clear label payload with non empty labels") - }, - }, - { - onType: "assigned", - doSomething: func() { - req := NewRequestWithJSON(t, "PATCH", issueURL, &api.EditIssueOption{ - Assignees: []string{"user2"}, - }).AddTokenAuth(token) - MakeRequest(t, req, http.StatusCreated) - }, - actionRunCount: 1, - action: api.HookIssueAssigned, - assert: assertActionRuns, - }, - { - onType: "unassigned", - doSomething: func() { - req := NewRequestWithJSON(t, "PATCH", issueURL, &api.EditIssueOption{ - Assignees: []string{}, - }).AddTokenAuth(token) - MakeRequest(t, req, http.StatusCreated) - }, - actionRunCount: 1, - action: api.HookIssueUnassigned, - assert: assertActionRuns, - }, - { - onType: "milestoned", - doSomething: func() { - req := NewRequestWithJSON(t, "PATCH", issueURL, &api.EditIssueOption{ - Milestone: &milestone.ID, - }).AddTokenAuth(token) - MakeRequest(t, req, http.StatusCreated) - }, - actionRunCount: 1, - action: api.HookIssueMilestoned, - assert: assertActionRuns, - }, - { - onType: "demilestoned", - doSomething: func() { - var zero int64 - req := NewRequestWithJSON(t, "PATCH", issueURL, &api.EditIssueOption{ - Milestone: &zero, - }).AddTokenAuth(token) - MakeRequest(t, req, http.StatusCreated) - }, - actionRunCount: 1, - action: api.HookIssueDemilestoned, - assert: assertActionRuns, - }, - { - onType: "closed", - doSomething: func() { - sha, err := baseGitRepo.GetRefCommitID(pr.GetGitRefName()) - require.NoError(t, err) - err = issue_service.ChangeStatus(db.DefaultContext, pr.Issue, user2, sha, true) - require.NoError(t, err) - }, - actionRunCount: 1, - action: api.HookIssueClosed, - assert: assertActionRuns, - }, - { - onType: "reopened", - doSomething: func() { - sha, err := baseGitRepo.GetRefCommitID(pr.GetGitRefName()) - require.NoError(t, err) - err = issue_service.ChangeStatus(db.DefaultContext, pr.Issue, user2, sha, false) - require.NoError(t, err) - }, - actionRunCount: 1, - action: api.HookIssueReOpened, - assert: assertActionRuns, - }, - } { - t.Run(testCase.onType, func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - defer func() { - // cleanup leftovers, start from scratch - unittest.AssertSuccessfulDelete(t, &actions_model.ActionRun{RepoID: baseRepo.ID}) - unittest.AssertSuccessfulDelete(t, &actions_model.ActionRunJob{RepoID: baseRepo.ID}) - }() - - // trigger the onType event - testCase.doSomething() - count := testCase.actionRunCount - context := fmt.Sprintf("%[1]s / %[1]s (pull_request)", testCase.onType) - - var actionRuns []*actions_model.ActionRun - - // wait for ActionRun(s) to be created - require.Eventually(t, func() bool { - actionRuns = make([]*actions_model.ActionRun, 0) - require.NoError(t, db.GetEngine(db.DefaultContext).Where("repo_id=?", baseRepo.ID).Find(&actionRuns)) - return len(actionRuns) == count - }, 30*time.Second, 1*time.Second) - - // verify the expected ActionRuns were created - sha, err := baseGitRepo.GetRefCommitID(pr.GetGitRefName()) - require.NoError(t, err) - // verify the commit status changes to CommitStatusSuccess when the job changes to StatusSuccess - require.Eventually(t, func() bool { - return checkCommitStatus(sha, context, api.CommitStatusPending) - }, 30*time.Second, 1*time.Second) - for _, actionRun := range actionRuns { - // verify the expected ActionRunJob was created and is StatusWaiting - job := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{RunID: actionRun.ID, CommitSHA: sha}) - assert.Equal(t, actions_model.StatusWaiting, job.Status) - - // change the state of the job to success - job.Status = actions_model.StatusSuccess - actions_service.CreateCommitStatus(db.DefaultContext, job) - } - // verify the commit status changed to CommitStatusSuccess because the job(s) changed to StatusSuccess - require.Eventually(t, func() bool { - return checkCommitStatus(sha, context, api.CommitStatusSuccess) - }, 30*time.Second, 1*time.Second) - - testCase.assert(t, sha, testCase.onType, testCase.action, actionRuns) - }) - } - }) -} - func TestPullRequestTargetEvent(t *testing.T) { onGiteaRun(t, func(t *testing.T, u *url.URL) { user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) // owner of the base repo diff --git a/tests/integration/admin_user_test.go b/tests/integration/admin_user_test.go index 93499e9139..8cdaac3c72 100644 --- a/tests/integration/admin_user_test.go +++ b/tests/integration/admin_user_test.go @@ -4,20 +4,14 @@ package integration import ( - "context" "fmt" "net/http" "strconv" "testing" - "time" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/tests" "github.com/stretchr/testify/assert" @@ -95,104 +89,3 @@ func TestAdminDeleteUser(t *testing.T) { assertUserDeleted(t, userID, true) unittest.CheckConsistencyFor(t, &user_model.User{}) } - -func TestSourceId(t *testing.T) { - defer tests.PrepareTestEnv(t)() - - testUser23 := &user_model.User{ - Name: "ausersourceid23", - LoginName: "ausersourceid23", - Email: "ausersourceid23@example.com", - Passwd: "ausersourceid23password", - Type: user_model.UserTypeIndividual, - LoginType: auth_model.Plain, - LoginSource: 23, - } - defer createUser(context.Background(), t, testUser23)() - - session := loginUser(t, "user1") - token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadAdmin) - - // Our new user start with 'a' so it should be the first one - req := NewRequest(t, "GET", "/api/v1/admin/users?limit=1").AddTokenAuth(token) - resp := session.MakeRequest(t, req, http.StatusOK) - var users []api.User - DecodeJSON(t, resp, &users) - assert.Len(t, users, 1) - assert.Equal(t, "ausersourceid23", users[0].UserName) - - // Now our new user should not be in the list, because we filter by source_id 0 - req = NewRequest(t, "GET", "/api/v1/admin/users?limit=1&source_id=0").AddTokenAuth(token) - resp = session.MakeRequest(t, req, http.StatusOK) - DecodeJSON(t, resp, &users) - assert.Len(t, users, 1) - assert.Equal(t, "the_34-user.with.all.allowedChars", users[0].UserName) - - // Now our new user should be in the list, because we filter by source_id 23 - req = NewRequest(t, "GET", "/api/v1/admin/users?limit=1&source_id=23").AddTokenAuth(token) - resp = session.MakeRequest(t, req, http.StatusOK) - DecodeJSON(t, resp, &users) - assert.Len(t, users, 1) - assert.Equal(t, "ausersourceid23", users[0].UserName) -} - -func TestAdminViewUsersSorted(t *testing.T) { - defer tests.PrepareTestEnv(t)() - createTimestamp := time.Now().Unix() - 1000 - updateTimestamp := time.Now().Unix() - 500 - sess := db.GetEngine(context.Background()) - - // Create 10 users with login source 44 - for i := int64(1); i <= 10; i++ { - name := "sorttest" + strconv.Itoa(int(i)) - user := &user_model.User{ - Name: name, - LowerName: name, - LoginName: name, - Email: name + "@example.com", - Passwd: name + ".password", - Type: user_model.UserTypeIndividual, - LoginType: auth_model.OAuth2, - LoginSource: 44, - CreatedUnix: timeutil.TimeStamp(createTimestamp - i), - UpdatedUnix: timeutil.TimeStamp(updateTimestamp - i), - } - if _, err := sess.NoAutoTime().Insert(user); err != nil { - t.Fatalf("Failed to create user: %v", err) - } - } - - session := loginUser(t, "user1") - token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadAdmin) - - testCases := []struct { - loginSource int64 - sortType string - expectedUsers []string - }{ - {0, "alphabetically", []string{"the_34-user.with.all.allowedChars", "user1", "user10", "user11"}}, - {0, "reversealphabetically", []string{"user9", "user8", "user5", "user40"}}, - {0, "newest", []string{"user40", "user39", "user38", "user37"}}, - {0, "oldest", []string{"user1", "user2", "user4", "user5"}}, - {44, "recentupdate", []string{"sorttest1", "sorttest2", "sorttest3", "sorttest4"}}, - {44, "leastupdate", []string{"sorttest10", "sorttest9", "sorttest8", "sorttest7"}}, - } - - for _, testCase := range testCases { - req := NewRequest( - t, - "GET", - fmt.Sprintf("/api/v1/admin/users?sort=%s&limit=4&source_id=%d", - testCase.sortType, - testCase.loginSource), - ).AddTokenAuth(token) - resp := session.MakeRequest(t, req, http.StatusOK) - - var users []api.User - DecodeJSON(t, resp, &users) - assert.Len(t, users, 4) - for i, user := range users { - assert.Equalf(t, testCase.expectedUsers[i], user.UserName, "Sort type: %s, index %d", testCase.sortType, i) - } - } -} diff --git a/tests/integration/api_actions_artifact_test.go b/tests/integration/api_actions_artifact_test.go index 6393fc53cc..2798024c16 100644 --- a/tests/integration/api_actions_artifact_test.go +++ b/tests/integration/api_actions_artifact_test.go @@ -23,15 +23,8 @@ type getUploadArtifactRequest struct { RetentionDays int64 } -func prepareTestEnvActionsArtifacts(t *testing.T) func() { - t.Helper() - f := tests.PrepareTestEnv(t, 1) - tests.PrepareArtifactsStorage(t) - return f -} - func TestActionsArtifactUploadSingleFile(t *testing.T) { - defer prepareTestEnvActionsArtifacts(t)() + defer tests.PrepareTestEnv(t)() // acquire artifact upload url req := NewRequestWithJSON(t, "POST", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts", getUploadArtifactRequest{ @@ -45,27 +38,27 @@ func TestActionsArtifactUploadSingleFile(t *testing.T) { // get upload url idx := strings.Index(uploadResp.FileContainerResourceURL, "/api/actions_pipeline/_apis/pipelines/") - url := uploadResp.FileContainerResourceURL[idx:] + "?itemPath=artifact/abc-2.txt" + url := uploadResp.FileContainerResourceURL[idx:] + "?itemPath=artifact/abc.txt" // upload artifact chunk - body := strings.Repeat("C", 1024) + body := strings.Repeat("A", 1024) req = NewRequestWithBody(t, "PUT", url, strings.NewReader(body)). AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a"). SetHeader("Content-Range", "bytes 0-1023/1024"). SetHeader("x-tfs-filelength", "1024"). - SetHeader("x-actions-results-md5", "XVlf820rMInUi64wmMi6EA==") // base64(md5(body)) + SetHeader("x-actions-results-md5", "1HsSe8LeLWh93ILaw1TEFQ==") // base64(md5(body)) MakeRequest(t, req, http.StatusOK) t.Logf("Create artifact confirm") // confirm artifact upload - req = NewRequest(t, "PATCH", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts?artifactName=artifact-single"). + req = NewRequest(t, "PATCH", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts?artifactName=artifact"). AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a") MakeRequest(t, req, http.StatusOK) } func TestActionsArtifactUploadInvalidHash(t *testing.T) { - defer prepareTestEnvActionsArtifacts(t)() + defer tests.PrepareTestEnv(t)() // artifact id 54321 not exist url := "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts/8e5b948a454515dbabfc7eb718ddddddd/upload?itemPath=artifact/abc.txt" @@ -80,7 +73,7 @@ func TestActionsArtifactUploadInvalidHash(t *testing.T) { } func TestActionsArtifactConfirmUploadWithoutName(t *testing.T) { - defer prepareTestEnvActionsArtifacts(t)() + defer tests.PrepareTestEnv(t)() req := NewRequest(t, "PATCH", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts"). AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a") @@ -89,7 +82,7 @@ func TestActionsArtifactConfirmUploadWithoutName(t *testing.T) { } func TestActionsArtifactUploadWithoutToken(t *testing.T) { - defer prepareTestEnvActionsArtifacts(t)() + defer tests.PrepareTestEnv(t)() req := NewRequestWithJSON(t, "POST", "/api/actions_pipeline/_apis/pipelines/workflows/1/artifacts", nil) MakeRequest(t, req, http.StatusUnauthorized) @@ -115,36 +108,26 @@ type ( ) func TestActionsArtifactDownload(t *testing.T) { - defer prepareTestEnvActionsArtifacts(t)() + defer tests.PrepareTestEnv(t)() req := NewRequest(t, "GET", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts"). AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a") resp := MakeRequest(t, req, http.StatusOK) var listResp listArtifactsResponse DecodeJSON(t, resp, &listResp) - assert.Equal(t, int64(2), listResp.Count) + assert.Equal(t, int64(1), listResp.Count) + assert.Equal(t, "artifact", listResp.Value[0].Name) + assert.Contains(t, listResp.Value[0].FileContainerResourceURL, "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts") - // Return list might be in any order. Get one file. - var artifactIdx int - for i, artifact := range listResp.Value { - if artifact.Name == "artifact-download" { - artifactIdx = i - break - } - } - assert.NotNil(t, artifactIdx) - assert.Equal(t, "artifact-download", listResp.Value[artifactIdx].Name) - assert.Contains(t, listResp.Value[artifactIdx].FileContainerResourceURL, "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts") - - idx := strings.Index(listResp.Value[artifactIdx].FileContainerResourceURL, "/api/actions_pipeline/_apis/pipelines/") - url := listResp.Value[artifactIdx].FileContainerResourceURL[idx+1:] + "?itemPath=artifact-download" + idx := strings.Index(listResp.Value[0].FileContainerResourceURL, "/api/actions_pipeline/_apis/pipelines/") + url := listResp.Value[0].FileContainerResourceURL[idx+1:] + "?itemPath=artifact" req = NewRequest(t, "GET", url). AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a") resp = MakeRequest(t, req, http.StatusOK) var downloadResp downloadArtifactResponse DecodeJSON(t, resp, &downloadResp) assert.Len(t, downloadResp.Value, 1) - assert.Equal(t, "artifact-download/abc.txt", downloadResp.Value[0].Path) + assert.Equal(t, "artifact/abc.txt", downloadResp.Value[0].Path) assert.Equal(t, "file", downloadResp.Value[0].ItemType) assert.Contains(t, downloadResp.Value[0].ContentLocation, "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts") @@ -153,13 +136,12 @@ func TestActionsArtifactDownload(t *testing.T) { req = NewRequest(t, "GET", url). AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a") resp = MakeRequest(t, req, http.StatusOK) - body := strings.Repeat("A", 1024) - assert.Equal(t, body, resp.Body.String()) + assert.Equal(t, resp.Body.String(), body) } func TestActionsArtifactUploadMultipleFile(t *testing.T) { - defer prepareTestEnvActionsArtifacts(t)() + defer tests.PrepareTestEnv(t)() const testArtifactName = "multi-files" @@ -181,14 +163,14 @@ func TestActionsArtifactUploadMultipleFile(t *testing.T) { files := []uploadingFile{ { - Path: "abc-3.txt", - Content: strings.Repeat("D", 1024), - MD5: "9nqj7E8HZmfQtPifCJ5Zww==", + Path: "abc.txt", + Content: strings.Repeat("A", 1024), + MD5: "1HsSe8LeLWh93ILaw1TEFQ==", }, { - Path: "xyz/def-2.txt", - Content: strings.Repeat("E", 1024), - MD5: "/s1kKvxeHlUX85vaTaVxuA==", + Path: "xyz/def.txt", + Content: strings.Repeat("B", 1024), + MD5: "6fgADK/7zjadf+6cB9Q1CQ==", }, } @@ -215,9 +197,9 @@ func TestActionsArtifactUploadMultipleFile(t *testing.T) { } func TestActionsArtifactDownloadMultiFiles(t *testing.T) { - defer prepareTestEnvActionsArtifacts(t)() + defer tests.PrepareTestEnv(t)() - const testArtifactName = "multi-file-download" + const testArtifactName = "multi-files" req := NewRequest(t, "GET", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts"). AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a") @@ -244,7 +226,7 @@ func TestActionsArtifactDownloadMultiFiles(t *testing.T) { DecodeJSON(t, resp, &downloadResp) assert.Len(t, downloadResp.Value, 2) - downloads := [][]string{{"multi-file-download/abc.txt", "B"}, {"multi-file-download/xyz/def.txt", "C"}} + downloads := [][]string{{"multi-files/abc.txt", "A"}, {"multi-files/xyz/def.txt", "B"}} for _, v := range downloadResp.Value { var bodyChar string var path string @@ -265,12 +247,13 @@ func TestActionsArtifactDownloadMultiFiles(t *testing.T) { req = NewRequest(t, "GET", url). AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a") resp = MakeRequest(t, req, http.StatusOK) - assert.Equal(t, strings.Repeat(bodyChar, 1024), resp.Body.String()) + body := strings.Repeat(bodyChar, 1024) + assert.Equal(t, resp.Body.String(), body) } } func TestActionsArtifactUploadWithRetentionDays(t *testing.T) { - defer prepareTestEnvActionsArtifacts(t)() + defer tests.PrepareTestEnv(t)() // acquire artifact upload url req := NewRequestWithJSON(t, "POST", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts", getUploadArtifactRequest{ @@ -306,7 +289,7 @@ func TestActionsArtifactUploadWithRetentionDays(t *testing.T) { } func TestActionsArtifactOverwrite(t *testing.T) { - defer prepareTestEnvActionsArtifacts(t)() + defer tests.PrepareTestEnv(t)() { // download old artifact uploaded by tests above, it should 1024 A @@ -317,7 +300,7 @@ func TestActionsArtifactOverwrite(t *testing.T) { DecodeJSON(t, resp, &listResp) idx := strings.Index(listResp.Value[0].FileContainerResourceURL, "/api/actions_pipeline/_apis/pipelines/") - url := listResp.Value[0].FileContainerResourceURL[idx+1:] + "?itemPath=artifact-download" + url := listResp.Value[0].FileContainerResourceURL[idx+1:] + "?itemPath=artifact" req = NewRequest(t, "GET", url). AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a") resp = MakeRequest(t, req, http.StatusOK) @@ -337,14 +320,14 @@ func TestActionsArtifactOverwrite(t *testing.T) { // upload same artifact, it uses 4096 B req := NewRequestWithJSON(t, "POST", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts", getUploadArtifactRequest{ Type: "actions_storage", - Name: "artifact-download", + Name: "artifact", }).AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a") resp := MakeRequest(t, req, http.StatusOK) var uploadResp uploadArtifactResponse DecodeJSON(t, resp, &uploadResp) idx := strings.Index(uploadResp.FileContainerResourceURL, "/api/actions_pipeline/_apis/pipelines/") - url := uploadResp.FileContainerResourceURL[idx:] + "?itemPath=artifact-download/abc.txt" + url := uploadResp.FileContainerResourceURL[idx:] + "?itemPath=artifact/abc.txt" body := strings.Repeat("B", 4096) req = NewRequestWithBody(t, "PUT", url, strings.NewReader(body)). AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a"). @@ -354,7 +337,7 @@ func TestActionsArtifactOverwrite(t *testing.T) { MakeRequest(t, req, http.StatusOK) // confirm artifact upload - req = NewRequest(t, "PATCH", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts?artifactName=artifact-download"). + req = NewRequest(t, "PATCH", "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts?artifactName=artifact"). AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a") MakeRequest(t, req, http.StatusOK) } @@ -369,15 +352,15 @@ func TestActionsArtifactOverwrite(t *testing.T) { var uploadedItem listArtifactsResponseItem for _, item := range listResp.Value { - if item.Name == "artifact-download" { + if item.Name == "artifact" { uploadedItem = item break } } - assert.Equal(t, "artifact-download", uploadedItem.Name) + assert.Equal(t, "artifact", uploadedItem.Name) idx := strings.Index(uploadedItem.FileContainerResourceURL, "/api/actions_pipeline/_apis/pipelines/") - url := uploadedItem.FileContainerResourceURL[idx+1:] + "?itemPath=artifact-download" + url := uploadedItem.FileContainerResourceURL[idx+1:] + "?itemPath=artifact" req = NewRequest(t, "GET", url). AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a") resp = MakeRequest(t, req, http.StatusOK) diff --git a/tests/integration/api_actions_artifact_v4_test.go b/tests/integration/api_actions_artifact_v4_test.go index 43df1aeee0..b2c25a2e70 100644 --- a/tests/integration/api_actions_artifact_v4_test.go +++ b/tests/integration/api_actions_artifact_v4_test.go @@ -7,14 +7,12 @@ import ( "bytes" "crypto/sha256" "encoding/hex" - "encoding/xml" "io" "net/http" "strings" "testing" "time" - "code.gitea.io/gitea/modules/storage" "code.gitea.io/gitea/routers/api/actions" actions_service "code.gitea.io/gitea/services/actions" "code.gitea.io/gitea/tests" @@ -80,13 +78,13 @@ func uploadArtifact(t *testing.T, body string) string { } func TestActionsArtifactV4UploadSingleFile(t *testing.T) { - defer prepareTestEnvActionsArtifacts(t)() + defer tests.PrepareTestEnv(t)() body := strings.Repeat("A", 1024) uploadArtifact(t, body) } func TestActionsArtifactV4UploadSingleFileWrongChecksum(t *testing.T) { - defer prepareTestEnvActionsArtifacts(t)() + defer tests.PrepareTestEnv(t)() token, err := actions_service.CreateAuthorizationToken(48, 792, 193) require.NoError(t, err) @@ -130,7 +128,7 @@ func TestActionsArtifactV4UploadSingleFileWrongChecksum(t *testing.T) { } func TestActionsArtifactV4UploadSingleFileWithRetentionDays(t *testing.T) { - defer prepareTestEnvActionsArtifacts(t)() + defer tests.PrepareTestEnv(t)() token, err := actions_service.CreateAuthorizationToken(48, 792, 193) require.NoError(t, err) @@ -177,143 +175,15 @@ func TestActionsArtifactV4UploadSingleFileWithRetentionDays(t *testing.T) { assert.True(t, finalizeResp.Ok) } -func TestActionsArtifactV4UploadSingleFileWithPotentialHarmfulBlockID(t *testing.T) { - defer prepareTestEnvActionsArtifacts(t)() - - token, err := actions_service.CreateAuthorizationToken(48, 792, 193) - require.NoError(t, err) - - // acquire artifact upload url - req := NewRequestWithBody(t, "POST", "/twirp/github.actions.results.api.v1.ArtifactService/CreateArtifact", toProtoJSON(&actions.CreateArtifactRequest{ - Version: 4, - Name: "artifactWithPotentialHarmfulBlockID", - WorkflowRunBackendId: "792", - WorkflowJobRunBackendId: "193", - })).AddTokenAuth(token) - resp := MakeRequest(t, req, http.StatusOK) - var uploadResp actions.CreateArtifactResponse - protojson.Unmarshal(resp.Body.Bytes(), &uploadResp) - assert.True(t, uploadResp.Ok) - assert.Contains(t, uploadResp.SignedUploadUrl, "/twirp/github.actions.results.api.v1.ArtifactService/UploadArtifact") - - // get upload urls - idx := strings.Index(uploadResp.SignedUploadUrl, "/twirp/") - url := uploadResp.SignedUploadUrl[idx:] + "&comp=block&blockid=%2f..%2fmyfile" - blockListURL := uploadResp.SignedUploadUrl[idx:] + "&comp=blocklist" - - // upload artifact chunk - body := strings.Repeat("A", 1024) - req = NewRequestWithBody(t, "PUT", url, strings.NewReader(body)) - MakeRequest(t, req, http.StatusCreated) - - // verify that the exploit didn't work - _, err = storage.Actions.Stat("myfile") - require.Error(t, err) - - // upload artifact blockList - blockList := &actions.BlockList{ - Latest: []string{ - "/../myfile", - }, - } - rawBlockList, err := xml.Marshal(blockList) - require.NoError(t, err) - req = NewRequestWithBody(t, "PUT", blockListURL, bytes.NewReader(rawBlockList)) - MakeRequest(t, req, http.StatusCreated) - - t.Logf("Create artifact confirm") - - sha := sha256.Sum256([]byte(body)) - - // confirm artifact upload - req = NewRequestWithBody(t, "POST", "/twirp/github.actions.results.api.v1.ArtifactService/FinalizeArtifact", toProtoJSON(&actions.FinalizeArtifactRequest{ - Name: "artifactWithPotentialHarmfulBlockID", - Size: 1024, - Hash: wrapperspb.String("sha256:" + hex.EncodeToString(sha[:])), - WorkflowRunBackendId: "792", - WorkflowJobRunBackendId: "193", - })). - AddTokenAuth(token) - resp = MakeRequest(t, req, http.StatusOK) - var finalizeResp actions.FinalizeArtifactResponse - protojson.Unmarshal(resp.Body.Bytes(), &finalizeResp) - assert.True(t, finalizeResp.Ok) -} - -func TestActionsArtifactV4UploadSingleFileWithChunksOutOfOrder(t *testing.T) { - defer prepareTestEnvActionsArtifacts(t)() - - token, err := actions_service.CreateAuthorizationToken(48, 792, 193) - require.NoError(t, err) - - // acquire artifact upload url - req := NewRequestWithBody(t, "POST", "/twirp/github.actions.results.api.v1.ArtifactService/CreateArtifact", toProtoJSON(&actions.CreateArtifactRequest{ - Version: 4, - Name: "artifactWithChunksOutOfOrder", - WorkflowRunBackendId: "792", - WorkflowJobRunBackendId: "193", - })).AddTokenAuth(token) - resp := MakeRequest(t, req, http.StatusOK) - var uploadResp actions.CreateArtifactResponse - protojson.Unmarshal(resp.Body.Bytes(), &uploadResp) - assert.True(t, uploadResp.Ok) - assert.Contains(t, uploadResp.SignedUploadUrl, "/twirp/github.actions.results.api.v1.ArtifactService/UploadArtifact") - - // get upload urls - idx := strings.Index(uploadResp.SignedUploadUrl, "/twirp/") - block1URL := uploadResp.SignedUploadUrl[idx:] + "&comp=block&blockid=block1" - block2URL := uploadResp.SignedUploadUrl[idx:] + "&comp=block&blockid=block2" - blockListURL := uploadResp.SignedUploadUrl[idx:] + "&comp=blocklist" - - // upload artifact chunks - bodyb := strings.Repeat("B", 1024) - req = NewRequestWithBody(t, "PUT", block2URL, strings.NewReader(bodyb)) - MakeRequest(t, req, http.StatusCreated) - - bodya := strings.Repeat("A", 1024) - req = NewRequestWithBody(t, "PUT", block1URL, strings.NewReader(bodya)) - MakeRequest(t, req, http.StatusCreated) - - // upload artifact blockList - blockList := &actions.BlockList{ - Latest: []string{ - "block1", - "block2", - }, - } - rawBlockList, err := xml.Marshal(blockList) - require.NoError(t, err) - req = NewRequestWithBody(t, "PUT", blockListURL, bytes.NewReader(rawBlockList)) - MakeRequest(t, req, http.StatusCreated) - - t.Logf("Create artifact confirm") - - sha := sha256.Sum256([]byte(bodya + bodyb)) - - // confirm artifact upload - req = NewRequestWithBody(t, "POST", "/twirp/github.actions.results.api.v1.ArtifactService/FinalizeArtifact", toProtoJSON(&actions.FinalizeArtifactRequest{ - Name: "artifactWithChunksOutOfOrder", - Size: 2048, - Hash: wrapperspb.String("sha256:" + hex.EncodeToString(sha[:])), - WorkflowRunBackendId: "792", - WorkflowJobRunBackendId: "193", - })). - AddTokenAuth(token) - resp = MakeRequest(t, req, http.StatusOK) - var finalizeResp actions.FinalizeArtifactResponse - protojson.Unmarshal(resp.Body.Bytes(), &finalizeResp) - assert.True(t, finalizeResp.Ok) -} - func TestActionsArtifactV4DownloadSingle(t *testing.T) { - defer prepareTestEnvActionsArtifacts(t)() + defer tests.PrepareTestEnv(t)() token, err := actions_service.CreateAuthorizationToken(48, 792, 193) require.NoError(t, err) // acquire artifact upload url req := NewRequestWithBody(t, "POST", "/twirp/github.actions.results.api.v1.ArtifactService/ListArtifacts", toProtoJSON(&actions.ListArtifactsRequest{ - NameFilter: wrapperspb.String("artifact-v4-download"), + NameFilter: wrapperspb.String("artifact"), WorkflowRunBackendId: "792", WorkflowJobRunBackendId: "193", })).AddTokenAuth(token) @@ -324,7 +194,7 @@ func TestActionsArtifactV4DownloadSingle(t *testing.T) { // confirm artifact upload req = NewRequestWithBody(t, "POST", "/twirp/github.actions.results.api.v1.ArtifactService/GetSignedArtifactURL", toProtoJSON(&actions.GetSignedArtifactURLRequest{ - Name: "artifact-v4-download", + Name: "artifact", WorkflowRunBackendId: "792", WorkflowJobRunBackendId: "193", })). @@ -336,20 +206,20 @@ func TestActionsArtifactV4DownloadSingle(t *testing.T) { req = NewRequest(t, "GET", finalizeResp.SignedUrl) resp = MakeRequest(t, req, http.StatusOK) - body := strings.Repeat("D", 1024) + body := strings.Repeat("A", 1024) assert.Equal(t, "bytes", resp.Header().Get("accept-ranges")) assert.Equal(t, body, resp.Body.String()) // Download artifact via user-facing URL - req = NewRequest(t, "GET", "/user5/repo4/actions/runs/188/artifacts/artifact-v4-download") + req = NewRequest(t, "GET", "/user5/repo4/actions/runs/188/artifacts/artifact") resp = MakeRequest(t, req, http.StatusOK) assert.Equal(t, "bytes", resp.Header().Get("accept-ranges")) assert.Equal(t, body, resp.Body.String()) // Partial artifact download - req = NewRequest(t, "GET", "/user5/repo4/actions/runs/188/artifacts/artifact-v4-download").SetHeader("range", "bytes=0-99") + req = NewRequest(t, "GET", "/user5/repo4/actions/runs/188/artifacts/artifact").SetHeader("range", "bytes=0-99") resp = MakeRequest(t, req, http.StatusPartialContent) - body = strings.Repeat("D", 100) + body = strings.Repeat("A", 100) assert.Equal(t, "bytes 0-99/1024", resp.Header().Get("content-range")) assert.Equal(t, body, resp.Body.String()) } @@ -357,13 +227,13 @@ func TestActionsArtifactV4DownloadSingle(t *testing.T) { func TestActionsArtifactV4DownloadRange(t *testing.T) { defer tests.PrepareTestEnv(t)() - bstr := strings.Repeat("D", 100) + bstr := strings.Repeat("B", 100) body := strings.Repeat("A", 100) + bstr token := uploadArtifact(t, body) // Download (Actions API) req := NewRequestWithBody(t, "POST", "/twirp/github.actions.results.api.v1.ArtifactService/GetSignedArtifactURL", toProtoJSON(&actions.GetSignedArtifactURLRequest{ - Name: "artifact-v4-download", + Name: "artifact", WorkflowRunBackendId: "792", WorkflowJobRunBackendId: "193", })). @@ -375,25 +245,25 @@ func TestActionsArtifactV4DownloadRange(t *testing.T) { req = NewRequest(t, "GET", finalizeResp.SignedUrl).SetHeader("range", "bytes=100-199") resp = MakeRequest(t, req, http.StatusPartialContent) - assert.Equal(t, "bytes 100-199/1024", resp.Header().Get("content-range")) + assert.Equal(t, "bytes 100-199/200", resp.Header().Get("content-range")) assert.Equal(t, bstr, resp.Body.String()) // Download (user-facing API) - req = NewRequest(t, "GET", "/user5/repo4/actions/runs/188/artifacts/artifact-v4-download").SetHeader("range", "bytes=100-199") + req = NewRequest(t, "GET", "/user5/repo4/actions/runs/188/artifacts/artifact").SetHeader("range", "bytes=100-199") resp = MakeRequest(t, req, http.StatusPartialContent) - assert.Equal(t, "bytes 100-199/1024", resp.Header().Get("content-range")) + assert.Equal(t, "bytes 100-199/200", resp.Header().Get("content-range")) assert.Equal(t, bstr, resp.Body.String()) } func TestActionsArtifactV4Delete(t *testing.T) { - defer prepareTestEnvActionsArtifacts(t)() + defer tests.PrepareTestEnv(t)() token, err := actions_service.CreateAuthorizationToken(48, 792, 193) require.NoError(t, err) // delete artifact by name req := NewRequestWithBody(t, "POST", "/twirp/github.actions.results.api.v1.ArtifactService/DeleteArtifact", toProtoJSON(&actions.DeleteArtifactRequest{ - Name: "artifact-v4-download", + Name: "artifact", WorkflowRunBackendId: "792", WorkflowJobRunBackendId: "193", })).AddTokenAuth(token) diff --git a/tests/integration/api_activitypub_actor_test.go b/tests/integration/api_activitypub_actor_test.go index de4d669c9d..7506c786da 100644 --- a/tests/integration/api_activitypub_actor_test.go +++ b/tests/integration/api_activitypub_actor_test.go @@ -5,12 +5,12 @@ package integration import ( "net/http" + "net/url" "testing" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/test" "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" ap "github.com/go-ap/activitypub" "github.com/stretchr/testify/assert" @@ -20,29 +20,31 @@ import ( 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") + onGiteaRun(t, func(*testing.T, *url.URL) { + req := NewRequest(t, "GET", "/api/v1/activitypub/actor") + resp := MakeRequest(t, req, http.StatusOK) + body := resp.Body.Bytes() + assert.Contains(t, string(body), "@context") - var actor ap.Actor - err := actor.UnmarshalJSON(resp.Body.Bytes()) - require.NoError(t, err) + var actor ap.Actor + err := actor.UnmarshalJSON(body) + 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()) + 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) + 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) + 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 index 846ae79891..55935e4ab6 100644 --- a/tests/integration/api_activitypub_person_test.go +++ b/tests/integration/api_activitypub_person_test.go @@ -4,19 +4,18 @@ package integration import ( + "context" "fmt" "net/http" + "net/http/httptest" "net/url" "testing" "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/activitypub" "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/tests" ap "github.com/go-ap/activitypub" "github.com/stretchr/testify/assert" @@ -24,61 +23,86 @@ import ( ) func TestActivityPubPerson(t *testing.T) { - defer test.MockVariableValue(&setting.Federation.Enabled, true)() - defer test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())() - defer tests.PrepareTestEnv(t)() + setting.Federation.Enabled = true + testWebRoutes = routers.NormalRoutes() + defer func() { + setting.Federation.Enabled = false + testWebRoutes = routers.NormalRoutes() + }() - userID := 2 - username := "user2" - req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/activitypub/user-id/%v", userID)) - resp := MakeRequest(t, req, http.StatusOK) - assert.Contains(t, resp.Body.String(), "@context") + onGiteaRun(t, func(*testing.T, *url.URL) { + userID := 2 + username := "user2" + req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/activitypub/user-id/%v", userID)) + resp := MakeRequest(t, req, http.StatusOK) + body := resp.Body.Bytes() + assert.Contains(t, string(body), "@context") - var person ap.Person - err := person.UnmarshalJSON(resp.Body.Bytes()) - require.NoError(t, err) + var person ap.Person + err := person.UnmarshalJSON(body) + require.NoError(t, err) - assert.Equal(t, ap.PersonType, person.Type) - assert.Equal(t, username, person.PreferredUsername.String()) - keyID := person.GetID().String() - assert.Regexp(t, fmt.Sprintf("activitypub/user-id/%v$", userID), keyID) - assert.Regexp(t, fmt.Sprintf("activitypub/user-id/%v/outbox$", userID), person.Outbox.GetID().String()) - assert.Regexp(t, fmt.Sprintf("activitypub/user-id/%v/inbox$", userID), person.Inbox.GetID().String()) + assert.Equal(t, ap.PersonType, person.Type) + assert.Equal(t, username, person.PreferredUsername.String()) + keyID := person.GetID().String() + assert.Regexp(t, fmt.Sprintf("activitypub/user-id/%v$", userID), keyID) + assert.Regexp(t, fmt.Sprintf("activitypub/user-id/%v/outbox$", userID), person.Outbox.GetID().String()) + assert.Regexp(t, fmt.Sprintf("activitypub/user-id/%v/inbox$", userID), person.Inbox.GetID().String()) - pubKey := person.PublicKey - assert.NotNil(t, pubKey) - publicKeyID := keyID + "#main-key" - assert.Equal(t, pubKey.ID.String(), publicKeyID) + pubKey := person.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) + pubKeyPem := pubKey.PublicKeyPem + assert.NotNil(t, pubKeyPem) + assert.Regexp(t, "^-----BEGIN PUBLIC KEY-----", pubKeyPem) + }) } func TestActivityPubMissingPerson(t *testing.T) { - defer test.MockVariableValue(&setting.Federation.Enabled, true)() - defer test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())() - defer tests.PrepareTestEnv(t)() + setting.Federation.Enabled = true + testWebRoutes = routers.NormalRoutes() + defer func() { + setting.Federation.Enabled = false + testWebRoutes = routers.NormalRoutes() + }() - 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") + onGiteaRun(t, func(*testing.T, *url.URL) { + 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())() + setting.Federation.Enabled = true + testWebRoutes = routers.NormalRoutes() + defer func() { + setting.Federation.Enabled = false + 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}) + srv := httptest.NewServer(testWebRoutes) + defer srv.Close() - user1url := u.JoinPath("/api/v1/activitypub/user-id/1").String() + "#main-key" - cf, err := activitypub.GetClientFactory(db.DefaultContext) + onGiteaRun(t, func(*testing.T, *url.URL) { + appURL := setting.AppURL + setting.AppURL = srv.URL + "/" + defer func() { + setting.Database.LogSQL = false + setting.AppURL = appURL + }() + username1 := "user1" + ctx := context.Background() + user1, err := user_model.GetUserByName(ctx, username1) + require.NoError(t, err) + user1url := fmt.Sprintf("%s/api/v1/activitypub/user-id/1#main-key", srv.URL) + cf, err := activitypub.GetClientFactory(ctx) 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() + user2inboxurl := fmt.Sprintf("%s/api/v1/activitypub/user-id/2/inbox", srv.URL) // Signed request succeeds resp, err := c.Post([]byte{}, user2inboxurl) diff --git a/tests/integration/api_activitypub_repository_test.go b/tests/integration/api_activitypub_repository_test.go index 2ca7d42e2a..737f580061 100644 --- a/tests/integration/api_activitypub_repository_test.go +++ b/tests/integration/api_activitypub_repository_test.go @@ -18,90 +18,111 @@ import ( "code.gitea.io/gitea/modules/activitypub" forgefed_modules "code.gitea.io/gitea/modules/forgefed" "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" "code.gitea.io/gitea/routers" - "code.gitea.io/gitea/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())() - defer tests.PrepareTestEnv(t)() + setting.Federation.Enabled = true + testWebRoutes = routers.NormalRoutes() + defer func() { + setting.Federation.Enabled = false + testWebRoutes = routers.NormalRoutes() + }() - repositoryID := 2 - req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/activitypub/repository-id/%v", repositoryID)) - resp := MakeRequest(t, req, http.StatusOK) - assert.Contains(t, resp.Body.String(), "@context") + onGiteaRun(t, func(*testing.T, *url.URL) { + repositoryID := 2 + req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/activitypub/repository-id/%v", repositoryID)) + resp := MakeRequest(t, req, http.StatusOK) + body := resp.Body.Bytes() + assert.Contains(t, string(body), "@context") - var repository forgefed_modules.Repository - err := repository.UnmarshalJSON(resp.Body.Bytes()) - require.NoError(t, err) + var repository forgefed_modules.Repository + err := repository.UnmarshalJSON(body) + require.NoError(t, err) - assert.Regexp(t, fmt.Sprintf("activitypub/repository-id/%v$", repositoryID), repository.GetID().String()) + assert.Regexp(t, fmt.Sprintf("activitypub/repository-id/%v$", 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)() + setting.Federation.Enabled = true + testWebRoutes = routers.NormalRoutes() + defer func() { + setting.Federation.Enabled = false + testWebRoutes = routers.NormalRoutes() + }() - repositoryID := 9999999 - req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/activitypub/repository-id/%v", repositoryID)) - resp := MakeRequest(t, req, http.StatusNotFound) - assert.Contains(t, resp.Body.String(), "repository does not exist") + onGiteaRun(t, func(*testing.T, *url.URL) { + repositoryID := 9999999 + req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/activitypub/repository-id/%v", 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())() + setting.Federation.Enabled = true + testWebRoutes = routers.NormalRoutes() + defer func() { + setting.Federation.Enabled = false + testWebRoutes = routers.NormalRoutes() + }() + + srv := httptest.NewServer(testWebRoutes) + defer srv.Close() 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 + responseBody := fmt.Sprintf(`{"links":[{"href":"http://%s/api/v1/nodeinfo","rel":"http://nodeinfo.diaspora.software/ns/schema/2.1"}]}`, req.Host) + t.Logf("response: %s", responseBody) // TODO: as soon as content-type will become important: content-type: application/json;charset=utf-8 - fmt.Fprintf(res, `{"links":[{"href":"http://%s/api/v1/nodeinfo","rel":"http://nodeinfo.diaspora.software/ns/schema/2.1"}]}`, req.Host) + fmt.Fprint(res, responseBody) }) federatedRoutes.HandleFunc("/api/v1/nodeinfo", func(res http.ResponseWriter, req *http.Request) { // curl -H "Accept: application/json" https://federated-repo.prod.meissa.de/api/v1/nodeinfo - fmt.Fprint(res, `{"version":"2.1","software":{"name":"forgejo","version":"1.20.0+dev-3183-g976d79044",`+ - `"repository":"https://codeberg.org/forgejo/forgejo.git","homepage":"https://forgejo.org/"},`+ - `"protocols":["activitypub"],"services":{"inbound":[],"outbound":["rss2.0"]},`+ + responseBody := fmt.Sprintf(`{"version":"2.1","software":{"name":"forgejo","version":"1.20.0+dev-3183-g976d79044",` + + `"repository":"https://codeberg.org/forgejo/forgejo.git","homepage":"https://forgejo.org/"},` + + `"protocols":["activitypub"],"services":{"inbound":[],"outbound":["rss2.0"]},` + `"openRegistrations":true,"usage":{"users":{"total":14,"activeHalfyear":2}},"metadata":{}}`) + fmt.Fprint(res, responseBody) }) federatedRoutes.HandleFunc("/api/v1/activitypub/user-id/15", 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, `{"@context":["https://www.w3.org/ns/activitystreams","https://w3id.org/security/v1"],`+ - `"id":"https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/15","type":"Person",`+ - `"icon":{"type":"Image","mediaType":"image/png","url":"https://federated-repo.prod.meissa.de/avatars/1bb05d9a5f6675ed0272af9ea193063c"},`+ - `"url":"https://federated-repo.prod.meissa.de/stargoose1","inbox":"https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/15/inbox",`+ - `"outbox":"https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/15/outbox","preferredUsername":"stargoose1",`+ - `"publicKey":{"id":"https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/15#main-key","owner":"https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/15",`+ - `"publicKeyPem":"-----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`+ + responseBody := fmt.Sprintf(`{"@context":["https://www.w3.org/ns/activitystreams","https://w3id.org/security/v1"],` + + `"id":"https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/15","type":"Person",` + + `"icon":{"type":"Image","mediaType":"image/png","url":"https://federated-repo.prod.meissa.de/avatars/1bb05d9a5f6675ed0272af9ea193063c"},` + + `"url":"https://federated-repo.prod.meissa.de/stargoose1","inbox":"https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/15/inbox",` + + `"outbox":"https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/15/outbox","preferredUsername":"stargoose1",` + + `"publicKey":{"id":"https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/15#main-key","owner":"https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/15",` + + `"publicKeyPem":"-----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"}}`) + fmt.Fprint(res, responseBody) }) federatedRoutes.HandleFunc("/api/v1/activitypub/user-id/30", func(res http.ResponseWriter, req *http.Request) { // curl -H "Accept: application/json" https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/3 - fmt.Fprint(res, `{"@context":["https://www.w3.org/ns/activitystreams","https://w3id.org/security/v1"],`+ - `"id":"https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/30","type":"Person",`+ - `"icon":{"type":"Image","mediaType":"image/png","url":"https://federated-repo.prod.meissa.de/avatars/9c03f03d1c1f13f21976a22489326fe1"},`+ - `"url":"https://federated-repo.prod.meissa.de/stargoose2","inbox":"https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/30/inbox",`+ - `"outbox":"https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/30/outbox","preferredUsername":"stargoose2",`+ - `"publicKey":{"id":"https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/30#main-key","owner":"https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/30",`+ - `"publicKeyPem":"-----BEGIN PUBLIC KEY-----\nMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAyv5NytsfqpWXSrwuk8a3\n0W1zE13QJioXb/e3opgN2CfKZkdm3hb+4+mGKoU/rCqegnL9/AO0Aw+R8fCHXx44\n`+ - `iNkdVpdY8Dzq+tQ9IetPWbyVIBvSzGgvpqfS05JuVPsy8cBX9wByODjr5kq7k1/v\nY1G7E3uh0a/XJc+mZutwGC3gPgR93NSrqsvTPN4wdhCCu9uj02S8OBoKuSYaPkU+\n`+ - `tZ4CEDpnclAOw/eNiH4x2irMvVtruEgtlTA5K2I4YJrmtGLidus47FCyc8/zEKUh\nAeiD8KWDvqsQgOhUwcQgRxAnYVCoMD9cnE+WFFRHTuQecNlmdNFs3Cr0yKcWjDde\n`+ - `trvnehW7LfPveGb0tHRHPuVAJpncTOidUR5h/7pqMyvKHzuAHWomm9rEaGUxd/7a\nL1CFjAf39+QIEgu0Anj8mIc7CTiz+DQhDz+0jBOsQ0iDXc5GeBz7X9Xv4Jp966nq\n`+ + responseBody := fmt.Sprintf(`{"@context":["https://www.w3.org/ns/activitystreams","https://w3id.org/security/v1"],` + + `"id":"https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/30","type":"Person",` + + `"icon":{"type":"Image","mediaType":"image/png","url":"https://federated-repo.prod.meissa.de/avatars/9c03f03d1c1f13f21976a22489326fe1"},` + + `"url":"https://federated-repo.prod.meissa.de/stargoose2","inbox":"https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/30/inbox",` + + `"outbox":"https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/30/outbox","preferredUsername":"stargoose2",` + + `"publicKey":{"id":"https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/30#main-key","owner":"https://federated-repo.prod.meissa.de/api/v1/activitypub/user-id/30",` + + `"publicKeyPem":"-----BEGIN PUBLIC KEY-----\nMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAyv5NytsfqpWXSrwuk8a3\n0W1zE13QJioXb/e3opgN2CfKZkdm3hb+4+mGKoU/rCqegnL9/AO0Aw+R8fCHXx44\n` + + `iNkdVpdY8Dzq+tQ9IetPWbyVIBvSzGgvpqfS05JuVPsy8cBX9wByODjr5kq7k1/v\nY1G7E3uh0a/XJc+mZutwGC3gPgR93NSrqsvTPN4wdhCCu9uj02S8OBoKuSYaPkU+\n` + + `tZ4CEDpnclAOw/eNiH4x2irMvVtruEgtlTA5K2I4YJrmtGLidus47FCyc8/zEKUh\nAeiD8KWDvqsQgOhUwcQgRxAnYVCoMD9cnE+WFFRHTuQecNlmdNFs3Cr0yKcWjDde\n` + + `trvnehW7LfPveGb0tHRHPuVAJpncTOidUR5h/7pqMyvKHzuAHWomm9rEaGUxd/7a\nL1CFjAf39+QIEgu0Anj8mIc7CTiz+DQhDz+0jBOsQ0iDXc5GeBz7X9Xv4Jp966nq\n` + `MUR0GQGXvfZQN9IqMO+WoUVy10Ddhns1EWGlA0x4fecnAgMBAAE=\n-----END PUBLIC KEY-----\n"}}`) + fmt.Fprint(res, responseBody) }) federatedRoutes.HandleFunc("/", func(res http.ResponseWriter, req *http.Request) { @@ -110,24 +131,32 @@ func TestActivityPubRepositoryInboxValid(t *testing.T) { federatedSrv := httptest.NewServer(federatedRoutes) defer federatedSrv.Close() - onGiteaRun(t, func(t *testing.T, u *url.URL) { + onGiteaRun(t, func(*testing.T, *url.URL) { + appURL := setting.AppURL + setting.AppURL = srv.URL + "/" + defer func() { + setting.Database.LogSQL = false + setting.AppURL = appURL + }() actionsUser := user.NewActionsUser() repositoryID := 2 - timeNow := time.Now().UTC() - cf, err := activitypub.GetClientFactory(db.DefaultContext) require.NoError(t, err) c, err := cf.WithKeys(db.DefaultContext, actionsUser, "not used") require.NoError(t, err) - repoInboxURL := u.JoinPath(fmt.Sprintf("/api/v1/activitypub/repository-id/%d/inbox", repositoryID)).String() + repoInboxURL := fmt.Sprintf( + "%s/api/v1/activitypub/repository-id/%v/inbox", + srv.URL, repositoryID) + + timeNow := time.Now().UTC() activity1 := []byte(fmt.Sprintf( `{"type":"Like",`+ `"startTime":"%s",`+ `"actor":"%s/api/v1/activitypub/user-id/15",`+ - `"object":"%s"}`, + `"object":"%s/api/v1/activitypub/repository-id/%v"}`, timeNow.Format(time.RFC3339), - federatedSrv.URL, u.JoinPath(fmt.Sprintf("/api/v1/activitypub/repository-id/%d", repositoryID)).String())) + federatedSrv.URL, srv.URL, repositoryID)) t.Logf("activity: %s", activity1) resp, err := c.Post(activity1, repoInboxURL) @@ -143,10 +172,10 @@ func TestActivityPubRepositoryInboxValid(t *testing.T) { `{"type":"Like",`+ `"startTime":"%s",`+ `"actor":"%s/api/v1/activitypub/user-id/30",`+ - `"object":"%s"}`, + `"object":"%s/api/v1/activitypub/repository-id/%v"}`, // 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())) + federatedSrv.URL, srv.URL, repositoryID)) t.Logf("activity: %s", activity2) resp, err = c.Post(activity2, repoInboxURL) @@ -158,15 +187,17 @@ func TestActivityPubRepositoryInboxValid(t *testing.T) { // The same user sends another like activity otherRepositoryID := 3 - otherRepoInboxURL := u.JoinPath(fmt.Sprintf("/api/v1/activitypub/repository-id/%d/inbox", otherRepositoryID)).String() + otherRepoInboxURL := fmt.Sprintf( + "%s/api/v1/activitypub/repository-id/%v/inbox", + srv.URL, otherRepositoryID) activity3 := []byte(fmt.Sprintf( `{"type":"Like",`+ `"startTime":"%s",`+ `"actor":"%s/api/v1/activitypub/user-id/30",`+ - `"object":"%s"}`, + `"object":"%s/api/v1/activitypub/repository-id/%v"}`, // 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())) + federatedSrv.URL, srv.URL, otherRepositoryID)) t.Logf("activity: %s", activity3) resp, err = c.Post(activity3, otherRepoInboxURL) @@ -184,18 +215,32 @@ func TestActivityPubRepositoryInboxValid(t *testing.T) { } func TestActivityPubRepositoryInboxInvalid(t *testing.T) { - defer test.MockVariableValue(&setting.Federation.Enabled, true)() - defer test.MockVariableValue(&testWebRoutes, routers.NormalRoutes())() + setting.Federation.Enabled = true + testWebRoutes = routers.NormalRoutes() + defer func() { + setting.Federation.Enabled = false + testWebRoutes = routers.NormalRoutes() + }() - onGiteaRun(t, func(t *testing.T, u *url.URL) { + srv := httptest.NewServer(testWebRoutes) + defer srv.Close() + + onGiteaRun(t, func(*testing.T, *url.URL) { + appURL := setting.AppURL + setting.AppURL = srv.URL + "/" + defer func() { + setting.Database.LogSQL = false + setting.AppURL = appURL + }() actionsUser := user.NewActionsUser() repositoryID := 2 cf, err := activitypub.GetClientFactory(db.DefaultContext) require.NoError(t, err) c, err := cf.WithKeys(db.DefaultContext, actionsUser, "not used") require.NoError(t, err) + repoInboxURL := fmt.Sprintf("%s/api/v1/activitypub/repository-id/%v/inbox", + srv.URL, repositoryID) - repoInboxURL := u.JoinPath(fmt.Sprintf("/api/v1/activitypub/repository-id/%v/inbox", repositoryID)).String() activity := []byte(`{"type":"Wrong"}`) resp, err := c.Post(activity, repoInboxURL) require.NoError(t, err) diff --git a/tests/integration/api_admin_actions_test.go b/tests/integration/api_admin_actions_test.go deleted file mode 100644 index 22590dc4c4..0000000000 --- a/tests/integration/api_admin_actions_test.go +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright 2024 The Forgejo Authors c/o Codeberg e.V.. All rights reserved. -// SPDX-License-Identifier: MIT - -package integration - -import ( - "fmt" - "net/http" - "testing" - - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/routers/api/v1/shared" - "code.gitea.io/gitea/tests" - - "github.com/stretchr/testify/assert" -) - -func TestAPISearchActionJobs_GlobalRunner(t *testing.T) { - defer tests.PrepareTestEnv(t)() - - job := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{ID: 393}) - adminUsername := "user1" - token := getUserToken(t, adminUsername, auth_model.AccessTokenScopeWriteAdmin) - - req := NewRequest( - t, - "GET", - fmt.Sprintf("/api/v1/admin/runners/jobs?labels=%s", "ubuntu-latest"), - ).AddTokenAuth(token) - res := MakeRequest(t, req, http.StatusOK) - - var jobs shared.RunJobList - DecodeJSON(t, res, &jobs) - - assert.Len(t, jobs.Body, 1) - assert.EqualValues(t, job.ID, jobs.Body[0].ID) -} diff --git a/tests/integration/api_admin_org_test.go b/tests/integration/api_admin_org_test.go index 823ef2f136..a29d0ba1d7 100644 --- a/tests/integration/api_admin_org_test.go +++ b/tests/integration/api_admin_org_test.go @@ -5,6 +5,7 @@ package integration import ( "net/http" + "net/url" "strings" "testing" @@ -18,55 +19,57 @@ import ( ) func TestAPIAdminOrgCreate(t *testing.T) { - defer tests.PrepareTestEnv(t)() - session := loginUser(t, "user1") - token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteAdmin) + onGiteaRun(t, func(*testing.T, *url.URL) { + session := loginUser(t, "user1") + token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteAdmin) - org := api.CreateOrgOption{ - UserName: "user2_org", - FullName: "User2's organization", - Description: "This organization created by admin for user2", - Website: "https://try.gitea.io", - Location: "Shanghai", - Visibility: "private", - } - req := NewRequestWithJSON(t, "POST", "/api/v1/admin/users/user2/orgs", &org). - AddTokenAuth(token) - resp := MakeRequest(t, req, http.StatusCreated) + org := api.CreateOrgOption{ + UserName: "user2_org", + FullName: "User2's organization", + Description: "This organization created by admin for user2", + Website: "https://try.gitea.io", + Location: "Shanghai", + Visibility: "private", + } + req := NewRequestWithJSON(t, "POST", "/api/v1/admin/users/user2/orgs", &org). + AddTokenAuth(token) + resp := MakeRequest(t, req, http.StatusCreated) - var apiOrg api.Organization - DecodeJSON(t, resp, &apiOrg) + var apiOrg api.Organization + DecodeJSON(t, resp, &apiOrg) - assert.Equal(t, org.UserName, apiOrg.Name) - assert.Equal(t, org.FullName, apiOrg.FullName) - assert.Equal(t, org.Description, apiOrg.Description) - assert.Equal(t, org.Website, apiOrg.Website) - assert.Equal(t, org.Location, apiOrg.Location) - assert.Equal(t, org.Visibility, apiOrg.Visibility) + assert.Equal(t, org.UserName, apiOrg.Name) + assert.Equal(t, org.FullName, apiOrg.FullName) + assert.Equal(t, org.Description, apiOrg.Description) + assert.Equal(t, org.Website, apiOrg.Website) + assert.Equal(t, org.Location, apiOrg.Location) + assert.Equal(t, org.Visibility, apiOrg.Visibility) - unittest.AssertExistsAndLoadBean(t, &user_model.User{ - Name: org.UserName, - LowerName: strings.ToLower(org.UserName), - FullName: org.FullName, + unittest.AssertExistsAndLoadBean(t, &user_model.User{ + Name: org.UserName, + LowerName: strings.ToLower(org.UserName), + FullName: org.FullName, + }) }) } func TestAPIAdminOrgCreateBadVisibility(t *testing.T) { - defer tests.PrepareTestEnv(t)() - session := loginUser(t, "user1") - token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteAdmin) + onGiteaRun(t, func(*testing.T, *url.URL) { + session := loginUser(t, "user1") + token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteAdmin) - org := api.CreateOrgOption{ - UserName: "user2_org", - FullName: "User2's organization", - Description: "This organization created by admin for user2", - Website: "https://try.gitea.io", - Location: "Shanghai", - Visibility: "notvalid", - } - req := NewRequestWithJSON(t, "POST", "/api/v1/admin/users/user2/orgs", &org). - AddTokenAuth(token) - MakeRequest(t, req, http.StatusUnprocessableEntity) + org := api.CreateOrgOption{ + UserName: "user2_org", + FullName: "User2's organization", + Description: "This organization created by admin for user2", + Website: "https://try.gitea.io", + Location: "Shanghai", + Visibility: "notvalid", + } + req := NewRequestWithJSON(t, "POST", "/api/v1/admin/users/user2/orgs", &org). + AddTokenAuth(token) + MakeRequest(t, req, http.StatusUnprocessableEntity) + }) } func TestAPIAdminOrgCreateNotAdmin(t *testing.T) { diff --git a/tests/integration/api_branch_test.go b/tests/integration/api_branch_test.go index aa22b15ea1..63159f3c41 100644 --- a/tests/integration/api_branch_test.go +++ b/tests/integration/api_branch_test.go @@ -5,18 +5,18 @@ package integration import ( "net/http" - "net/http/httptest" "net/url" "testing" auth_model "code.gitea.io/gitea/models/auth" + "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/unittest" "code.gitea.io/gitea/modules/git" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/tests" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func testAPIGetBranch(t *testing.T, branchName string, exists bool) { @@ -188,37 +188,6 @@ func testAPICreateBranch(t testing.TB, session *TestSession, user, repo, oldBran return resp.Result().StatusCode == status } -func TestAPIUpdateBranch(t *testing.T) { - onGiteaRun(t, func(t *testing.T, _ *url.URL) { - t.Run("UpdateBranchWithEmptyRepo", func(t *testing.T) { - testAPIUpdateBranch(t, "user10", "repo6", "master", "test", http.StatusNotFound) - }) - t.Run("UpdateBranchWithSameBranchNames", func(t *testing.T) { - resp := testAPIUpdateBranch(t, "user2", "repo1", "master", "master", http.StatusUnprocessableEntity) - assert.Contains(t, resp.Body.String(), "Cannot rename a branch using the same name or rename to a branch that already exists.") - }) - t.Run("UpdateBranchThatAlreadyExists", func(t *testing.T) { - resp := testAPIUpdateBranch(t, "user2", "repo1", "master", "branch2", http.StatusUnprocessableEntity) - assert.Contains(t, resp.Body.String(), "Cannot rename a branch using the same name or rename to a branch that already exists.") - }) - t.Run("UpdateBranchWithNonExistentBranch", func(t *testing.T) { - resp := testAPIUpdateBranch(t, "user2", "repo1", "i-dont-exist", "new-branch-name", http.StatusNotFound) - assert.Contains(t, resp.Body.String(), "Branch doesn't exist.") - }) - t.Run("RenameBranchNormalScenario", func(t *testing.T) { - testAPIUpdateBranch(t, "user2", "repo1", "branch2", "new-branch-name", http.StatusNoContent) - }) - }) -} - -func testAPIUpdateBranch(t *testing.T, ownerName, repoName, from, to string, expectedHTTPStatus int) *httptest.ResponseRecorder { - token := getUserToken(t, ownerName, auth_model.AccessTokenScopeWriteRepository) - req := NewRequestWithJSON(t, "PATCH", "api/v1/repos/"+ownerName+"/"+repoName+"/branches/"+from, &api.UpdateBranchRepoOption{ - Name: to, - }).AddTokenAuth(token) - return MakeRequest(t, req, expectedHTTPStatus) -} - func TestAPIBranchProtection(t *testing.T) { defer tests.PrepareTestEnv(t)() @@ -265,17 +234,35 @@ func TestAPIBranchProtection(t *testing.T) { } func TestAPICreateBranchWithSyncBranches(t *testing.T) { + defer tests.PrepareTestEnv(t)() + + branches, err := db.Find[git_model.Branch](db.DefaultContext, git_model.FindBranchOptions{ + RepoID: 1, + }) + require.NoError(t, err) + assert.Len(t, branches, 4) + + // make a broke repository with no branch on database + _, err = db.DeleteByBean(db.DefaultContext, git_model.Branch{RepoID: 1}) + require.NoError(t, err) + onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) { - unittest.AssertCount(t, &git_model.Branch{RepoID: 1}, 4) - - // make a broke repository with no branch on database - unittest.AssertSuccessfulDelete(t, &git_model.Branch{RepoID: 1}) - ctx := NewAPITestContext(t, "user2", "repo1", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) giteaURL.Path = ctx.GitPath() testAPICreateBranch(t, ctx.Session, "user2", "repo1", "", "new_branch", http.StatusCreated) - - unittest.AssertExistsIf(t, true, &git_model.Branch{RepoID: 1, Name: "new_branch"}) }) + + branches, err = db.Find[git_model.Branch](db.DefaultContext, git_model.FindBranchOptions{ + RepoID: 1, + }) + require.NoError(t, err) + assert.Len(t, branches, 5) + + branches, err = db.Find[git_model.Branch](db.DefaultContext, git_model.FindBranchOptions{ + RepoID: 1, + Keyword: "new_branch", + }) + require.NoError(t, err) + assert.Len(t, branches, 1) } diff --git a/tests/integration/api_feed_user_test.go b/tests/integration/api_feed_user_test.go index e0e5faed1b..7f3824963a 100644 --- a/tests/integration/api_feed_user_test.go +++ b/tests/integration/api_feed_user_test.go @@ -16,7 +16,6 @@ import ( ) func TestFeed(t *testing.T) { - defer tests.AddFixtures("tests/integration/fixtures/TestFeed/")() defer tests.PrepareTestEnv(t)() t.Run("User", func(t *testing.T) { @@ -43,28 +42,6 @@ func TestFeed(t *testing.T) { t.Run("Repo", func(t *testing.T) { t.Run("Normal", func(t *testing.T) { - t.Run("Atom", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - req := NewRequest(t, "GET", "/user2/repo1.atom") - resp := MakeRequest(t, req, http.StatusOK) - - data := resp.Body.String() - assert.Contains(t, data, `= 3 { - hash := parts[0] - size, err := strconv.Atoi(parts[1]) - if err != nil { - continue - } - file := parts[2] - - checksum := Checksum{ - Hash: hash, - Size: size, - File: file, - } - - if isMD5Sum { - result.MD5Sum = append(result.MD5Sum, checksum) - } else if isBLAKE2b { - result.BLAKE2B = append(result.BLAKE2B, checksum) - } - } - } - } - - assert.Equal(t, "Forgejo", result.Origin) - assert.Equal(t, "Forgejo", result.Label) - assert.Equal(t, "Sisyphus", 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, "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, "base/pkglist.classic", result.BLAKE2B[0].File) - }) - - t.Run("pkglist.classic", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - req = NewRequest(t, "GET", url+"/pkglist.classic") - resp := MakeRequest(t, req, http.StatusOK) - - body := resp.Body - defer body.Reset() - - type RpmHeader struct { - Magic [8]byte - Nindex uint32 - Hsize uint32 - } - - type RpmHdrIndex struct { - Tag uint32 - Type uint32 - Offset uint32 - Count uint32 - } - - type Metadata struct { - Name string - Version string - Release string - Summary []string - Description []string - BuildTime int - Size int - License string - Packager string - Group []string - URL string - Arch string - SourceRpm string - ProvideNames []string - RequireFlags []int - RequireNames []string - RequireVersions []string - ChangeLogTimes []int - ChangeLogNames []string - ChangeLogTexts []string - ProvideFlags []int - ProvideVersions []string - DirIndexes []int - BaseNames []string - DirNames []string - DistTag string - AptIndexLegacyFileName string - AptIndexLegacyFileSize int - MD5Sum string - BLAKE2B string - AptIndexLegacyDirectory string - } - - var result Metadata - - const rpmHeaderMagic = "\x8e\xad\xe8\x01\x00\x00\x00\x00" - - var hdr RpmHeader - for { - if err := binary.Read(body, binary.BigEndian, &hdr); err != nil { - if err == io.EOF { - break - } - require.NoError(t, err) - } - - if !bytes.Equal(hdr.Magic[:], []byte(rpmHeaderMagic)) { - require.NoError(t, err) - } - - nindex := hdr.Nindex - index := make([]RpmHdrIndex, nindex) - if err := binary.Read(body, binary.BigEndian, &index); err != nil { - require.NoError(t, err) - } - - data := make([]byte, hdr.Hsize) - if err := binary.Read(body, binary.BigEndian, &data); err != nil { - require.NoError(t, err) - } - - var indexPtrs []*RpmHdrIndex - for i := range index { - indexPtrs = append(indexPtrs, &index[i]) - } - - for _, idx := range indexPtrs { - tag := binary.BigEndian.Uint32([]byte{byte(idx.Tag >> 24), byte(idx.Tag >> 16), byte(idx.Tag >> 8), byte(idx.Tag)}) - typ := binary.BigEndian.Uint32([]byte{byte(idx.Type >> 24), byte(idx.Type >> 16), byte(idx.Type >> 8), byte(idx.Type)}) - offset := binary.BigEndian.Uint32([]byte{byte(idx.Offset >> 24), byte(idx.Offset >> 16), byte(idx.Offset >> 8), byte(idx.Offset)}) - count := binary.BigEndian.Uint32([]byte{byte(idx.Count >> 24), byte(idx.Count >> 16), byte(idx.Count >> 8), byte(idx.Count)}) - - if typ == 6 || typ == 8 || typ == 9 { - elem := data[offset:] - for j := uint32(0); j < count; j++ { - strEnd := bytes.IndexByte(elem, 0) - if strEnd == -1 { - require.NoError(t, err) - } - switch tag { - case 1000: - result.Name = string(elem[:strEnd]) - case 1001: - result.Version = string(elem[:strEnd]) - case 1002: - result.Release = string(elem[:strEnd]) - case 1004: - var summaries []string - for i := uint32(0); i < count; i++ { - summaries = append(summaries, string(elem[:strEnd])) - } - result.Summary = summaries - case 1005: - var descriptions []string - for i := uint32(0); i < count; i++ { - descriptions = append(descriptions, string(elem[:strEnd])) - } - result.Description = descriptions - case 1014: - result.License = string(elem[:strEnd]) - case 1015: - result.Packager = string(elem[:strEnd]) - case 1016: - var groups []string - for i := uint32(0); i < count; i++ { - groups = append(groups, string(elem[:strEnd])) - } - result.Group = groups - case 1020: - result.URL = string(elem[:strEnd]) - case 1022: - result.Arch = string(elem[:strEnd]) - case 1044: - result.SourceRpm = string(elem[:strEnd]) - case 1047: - var provideNames []string - for i := uint32(0); i < count; i++ { - provideNames = append(provideNames, string(elem[:strEnd])) - } - result.ProvideNames = provideNames - case 1049: - var requireNames []string - for i := uint32(0); i < count; i++ { - requireNames = append(requireNames, string(elem[:strEnd])) - } - result.RequireNames = requireNames - case 1050: - var requireVersions []string - for i := uint32(0); i < count; i++ { - requireVersions = append(requireVersions, string(elem[:strEnd])) - } - result.RequireVersions = requireVersions - case 1081: - var changeLogNames []string - for i := uint32(0); i < count; i++ { - changeLogNames = append(changeLogNames, string(elem[:strEnd])) - } - result.ChangeLogNames = changeLogNames - case 1082: - var changeLogTexts []string - for i := uint32(0); i < count; i++ { - changeLogTexts = append(changeLogTexts, string(elem[:strEnd])) - } - result.ChangeLogTexts = changeLogTexts - case 1113: - var provideVersions []string - for i := uint32(0); i < count; i++ { - provideVersions = append(provideVersions, string(elem[:strEnd])) - } - result.ProvideVersions = provideVersions - case 1117: - var baseNames []string - for i := uint32(0); i < count; i++ { - baseNames = append(baseNames, string(elem[:strEnd])) - } - result.BaseNames = baseNames - case 1118: - var dirNames []string - for i := uint32(0); i < count; i++ { - dirNames = append(dirNames, string(elem[:strEnd])) - } - result.DirNames = dirNames - case 1155: - result.DistTag = string(elem[:strEnd]) - case 1000000: - result.AptIndexLegacyFileName = string(elem[:strEnd]) - case 1000005: - result.MD5Sum = string(elem[:strEnd]) - case 1000009: - result.BLAKE2B = string(elem[:strEnd]) - case 1000010: - result.AptIndexLegacyDirectory = string(elem[:strEnd]) - } - elem = elem[strEnd+1:] - } - } else if typ == 4 { - elem := data[offset:] - for j := uint32(0); j < count; j++ { - val := binary.BigEndian.Uint32(elem) - switch tag { - case 1006: - result.BuildTime = int(val) - case 1009: - result.Size = int(val) - case 1048: - var requireFlags []int - for i := uint32(0); i < count; i++ { - requireFlags = append(requireFlags, int(val)) - } - result.RequireFlags = requireFlags - case 1080: - var changeLogTimes []int - for i := uint32(0); i < count; i++ { - changeLogTimes = append(changeLogTimes, int(val)) - } - result.ChangeLogTimes = changeLogTimes - case 1112: - var provideFlags []int - for i := uint32(0); i < count; i++ { - provideFlags = append(provideFlags, int(val)) - } - result.ProvideFlags = provideFlags - case 1116: - var dirIndexes []int - for i := uint32(0); i < count; i++ { - dirIndexes = append(dirIndexes, int(val)) - } - result.DirIndexes = dirIndexes - case 1000001: - result.AptIndexLegacyFileSize = int(val) - } - elem = elem[4:] - } - } else { - require.NoError(t, err) - } - } - } - assert.Equal(t, "gitea-test", result.Name) - assert.Equal(t, "1.0.2", result.Version) - assert.Equal(t, "1", result.Release) - assert.Equal(t, []string{"RPM package summary"}, result.Summary) - assert.Equal(t, []string{"RPM package description"}, result.Description) - assert.Equal(t, 1678225964, result.BuildTime) - assert.Equal(t, 13, result.Size) - assert.Equal(t, "MIT", result.License) - assert.Equal(t, "KN4CK3R", result.Packager) - assert.Equal(t, []string{"System"}, result.Group) - 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, []int{16777226, 16777226, 16777226, 16777226, 16777226, 16777226, 16777226}, result.RequireFlags) - assert.Equal(t, []string{"", "", "", "", "", "", ""}, 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) - assert.Equal(t, []string{"- Changelog message."}, result.ChangeLogTexts) - assert.Equal(t, []int{8, 8}, result.ProvideFlags) - assert.Equal(t, []string{"1.0.2-1", "1.0.2-1"}, result.ProvideVersions) - assert.Equal(t, []int(nil), result.DirIndexes) - assert.Equal(t, []string{"hello"}, result.BaseNames) - assert.Equal(t, []string{"/usr/local/bin/"}, result.DirNames) - assert.Equal(t, "", result.DistTag) - assert.Equal(t, "gitea-test-1.0.2-1.x86_64.rpm", result.AptIndexLegacyFileName) - assert.Equal(t, 7116, result.AptIndexLegacyFileSize) - assert.Equal(t, "9ea82dd62968719aea19c08cd2ced79a", result.MD5Sum) - assert.Equal(t, "8ba7f1f52a47b23997aa2de21b305cc71974d51f0c54fb53cb927156284dafdcc233d514a46c020e4a0666e218529e0284933c5873d24c2555830d7627140f7d", result.BLAKE2B) - assert.Equal(t, "RPMS.classic", result.AptIndexLegacyDirectory) - }) - - t.Run("pkglist.classic.xz", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - req := NewRequest(t, "GET", url+"/pkglist.classic.xz") - pkglistXZResp := MakeRequest(t, req, http.StatusOK) - pkglistXZ := pkglistXZResp.Body - defer pkglistXZ.Reset() - - req2 := NewRequest(t, "GET", url+"/pkglist.classic") - pkglistResp := MakeRequest(t, req2, http.StatusOK) - pkglist := pkglistResp.Body - defer pkglist.Reset() - - assert.Less(t, pkglistXZ.Len(), pkglist.Len()) - - xzReader, err := xz.NewReader(pkglistXZ) - require.NoError(t, err) - - var unxzData bytes.Buffer - _, err = io.Copy(&unxzData, xzReader) - require.NoError(t, err) - - assert.Equal(t, unxzData.Len(), pkglist.Len()) - - content, _ := packages_module.NewHashedBuffer() - defer content.Close() - - h := sha256.New() - w := io.MultiWriter(content, h) - - _, err = io.Copy(w, pkglist) - require.NoError(t, err) - - hashMD5Classic, _, hashSHA256Classic, _, hashBlake2bClassic := content.Sums() - - contentUnxz, _ := packages_module.NewHashedBuffer() - defer contentUnxz.Close() - - _, err = io.Copy(io.MultiWriter(contentUnxz, sha256.New()), &unxzData) - require.NoError(t, err) - - hashMD5Unxz, _, hashSHA256Unxz, _, hashBlake2bUnxz := contentUnxz.Sums() - - assert.Equal(t, fmt.Sprintf("%x", hashSHA256Classic), fmt.Sprintf("%x", hashSHA256Unxz)) - assert.Equal(t, fmt.Sprintf("%x", hashBlake2bClassic), fmt.Sprintf("%x", hashBlake2bUnxz)) - assert.Equal(t, fmt.Sprintf("%x", hashMD5Classic), fmt.Sprintf("%x", hashMD5Unxz)) - }) - }) - - t.Run("Delete", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - req := NewRequest(t, "DELETE", fmt.Sprintf("%s.repo/%s/RPMS.classic/%s-%s.%s.rpm", groupURL, packageArchitecture, packageName, packageVersion, packageArchitecture)) - MakeRequest(t, req, http.StatusUnauthorized) - - req = NewRequest(t, "DELETE", fmt.Sprintf("%s.repo/%s/RPMS.classic/%s-%s.%s.rpm", groupURL, packageArchitecture, packageName, packageVersion, packageArchitecture)). - AddBasicAuth(user.Name) - MakeRequest(t, req, http.StatusNoContent) - - pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeAlt) - require.NoError(t, err) - assert.Empty(t, pvs) - req = NewRequest(t, "DELETE", fmt.Sprintf("%s.repo/%s/RPMS.classic/%s-%s.%s.rpm", groupURL, packageArchitecture, packageName, packageVersion, packageArchitecture)). - AddBasicAuth(user.Name) - MakeRequest(t, req, http.StatusNotFound) - }) - }) - } -} diff --git a/tests/integration/api_packages_arch_test.go b/tests/integration/api_packages_arch_test.go index 57db324a2f..af275de442 100644 --- a/tests/integration/api_packages_arch_test.go +++ b/tests/integration/api_packages_arch_test.go @@ -14,7 +14,6 @@ import ( "io" "net/http" "strings" - "sync" "testing" "testing/fstest" @@ -223,14 +222,8 @@ HMhNSS1IzUsBcpJAPFAwwUXSM0u4BjoaR8EoGAWjgGQAAILFeyQADAAA t.Run(fmt.Sprintf("RepositoryDB[%s]", group), func(t *testing.T) { defer tests.PrintCurrentTest(t)() - req := NewRequest(t, "GET", groupURL+"/x86_64/base.db.tar.gz") - MakeRequest(t, req, http.StatusOK) - - req = NewRequest(t, "GET", groupURL+"/x86_64/base.files") - MakeRequest(t, req, http.StatusOK) - - req = NewRequest(t, "GET", groupURL+"/x86_64/base.files.tar.gz") - MakeRequest(t, req, http.StatusOK) + req := NewRequest(t, "GET", rootURL+"/repository.key") + respPub := MakeRequest(t, req, http.StatusOK) req = NewRequest(t, "GET", groupURL+"/x86_64/base.db") respPkg := MakeRequest(t, req, http.StatusOK) @@ -238,32 +231,23 @@ HMhNSS1IzUsBcpJAPFAwwUXSM0u4BjoaR8EoGAWjgGQAAILFeyQADAAA req = NewRequest(t, "GET", groupURL+"/x86_64/base.db.sig") respSig := MakeRequest(t, req, http.StatusOK) - req = NewRequest(t, "GET", rootURL+"/repository.key") - respPub := MakeRequest(t, req, http.StatusOK) - if err := gpgVerify(respPub.Body.Bytes(), respSig.Body.Bytes(), respPkg.Body.Bytes()); err != nil { t.Fatal(err) } files, err := listTarGzFiles(respPkg.Body.Bytes()) require.NoError(t, err) - require.Len(t, files, 2) + require.Len(t, files, 1) for s, d := range files { - if strings.HasSuffix(s, "/desc") { - name := getProperty(string(d.Data), "NAME") - ver := getProperty(string(d.Data), "VERSION") - require.Equal(t, name+"-"+ver+"/desc", s) - fn := getProperty(string(d.Data), "FILENAME") - pgp := getProperty(string(d.Data), "PGPSIG") - req = NewRequest(t, "GET", groupURL+"/x86_64/"+fn+".sig") - respSig := MakeRequest(t, req, http.StatusOK) - decodeString, err := base64.StdEncoding.DecodeString(pgp) - require.NoError(t, err) - require.Equal(t, respSig.Body.Bytes(), decodeString) - } else if strings.HasSuffix(s, "/files") { - require.True(t, strings.HasPrefix(string(d.Data), "%FILES%")) - } else { - require.Failf(t, "unknown item", "fileName:%s", s) - } + name := getProperty(string(d.Data), "NAME") + ver := getProperty(string(d.Data), "VERSION") + require.Equal(t, name+"-"+ver+"/desc", s) + fn := getProperty(string(d.Data), "FILENAME") + pgp := getProperty(string(d.Data), "PGPSIG") + req = NewRequest(t, "GET", groupURL+"/x86_64/"+fn+".sig") + respSig := MakeRequest(t, req, http.StatusOK) + decodeString, err := base64.StdEncoding.DecodeString(pgp) + require.NoError(t, err) + require.Equal(t, respSig.Body.Bytes(), decodeString) } }) @@ -274,15 +258,11 @@ HMhNSS1IzUsBcpJAPFAwwUXSM0u4BjoaR8EoGAWjgGQAAILFeyQADAAA AddBasicAuth(user.Name) MakeRequest(t, req, http.StatusCreated) - req = NewRequestWithBody(t, "DELETE", rootURL+"/base/notfound/1.0.0-1/any", nil). + req = NewRequestWithBody(t, "DELETE", rootURL+"/base/notfound/1.0.0-1", nil). AddBasicAuth(user.Name) MakeRequest(t, req, http.StatusNotFound) - req = NewRequestWithBody(t, "DELETE", groupURL+"/test/1.0.0-1/x86_64", nil). - AddBasicAuth(user.Name) - MakeRequest(t, req, http.StatusNoContent) - - req = NewRequestWithBody(t, "DELETE", groupURL+"/test/1.0.0-1/any", nil). + req = NewRequestWithBody(t, "DELETE", groupURL+"/test/1.0.0-1", nil). AddBasicAuth(user.Name) MakeRequest(t, req, http.StatusNoContent) @@ -290,22 +270,12 @@ HMhNSS1IzUsBcpJAPFAwwUXSM0u4BjoaR8EoGAWjgGQAAILFeyQADAAA respPkg := MakeRequest(t, req, http.StatusOK) files, err := listTarGzFiles(respPkg.Body.Bytes()) require.NoError(t, err) - require.Len(t, files, 2) + require.Len(t, files, 1) // other pkg in L225 - req = NewRequestWithBody(t, "DELETE", groupURL+"/test2/1.0.0-1/any", nil). + req = NewRequestWithBody(t, "DELETE", groupURL+"/test2/1.0.0-1", nil). AddBasicAuth(user.Name) MakeRequest(t, req, http.StatusNoContent) - - req = NewRequest(t, "GET", groupURL+"/x86_64/base.db"). - AddBasicAuth(user.Name) - MakeRequest(t, req, http.StatusNotFound) - - req = NewRequestWithBody(t, "DELETE", groupURL+"/test/1.0.0-1/aarch64", nil). - AddBasicAuth(user.Name) - MakeRequest(t, req, http.StatusNoContent) - - req = NewRequest(t, "GET", groupURL+"/aarch64/base.db"). - AddBasicAuth(user.Name) + req = NewRequest(t, "GET", groupURL+"/x86_64/base.db") MakeRequest(t, req, http.StatusNotFound) }) @@ -324,57 +294,12 @@ HMhNSS1IzUsBcpJAPFAwwUXSM0u4BjoaR8EoGAWjgGQAAILFeyQADAAA resp := MakeRequest(t, req, http.StatusOK) require.Equal(t, pkgs[key], resp.Body.Bytes()) - req = NewRequestWithBody(t, "DELETE", groupURL+"/test2/1.0.0-1/any", nil). + req = NewRequestWithBody(t, "DELETE", groupURL+"/test2/1.0.0-1", nil). AddBasicAuth(user.Name) MakeRequest(t, req, http.StatusNoContent) }) } } - t.Run("Concurrent Upload", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - var wg sync.WaitGroup - - targets := []string{"any", "aarch64", "x86_64"} - for _, tag := range targets { - wg.Add(1) - go func(i string) { - defer wg.Done() - req := NewRequestWithBody(t, "PUT", rootURL, bytes.NewReader(pkgs[i])). - AddBasicAuth(user.Name) - MakeRequest(t, req, http.StatusCreated) - }(tag) - } - wg.Wait() - for _, target := range targets { - req := NewRequestWithBody(t, "DELETE", rootURL+"/test/1.0.0-1/"+target, nil). - AddBasicAuth(user.Name) - MakeRequest(t, req, http.StatusNoContent) - } - }) - t.Run("Package Arch Test", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - req := NewRequestWithBody(t, "PUT", rootURL, bytes.NewReader(pkgs["any"])). - AddBasicAuth(user.Name) - MakeRequest(t, req, http.StatusCreated) - - req = NewRequest(t, "GET", rootURL+"/x86_64/base.db") - respPkg := MakeRequest(t, req, http.StatusOK) - - files, err := listTarGzFiles(respPkg.Body.Bytes()) - require.NoError(t, err) - require.Len(t, files, 2) - - req = NewRequestWithBody(t, "PUT", rootURL, bytes.NewReader(pkgs["otherXZ"])). - AddBasicAuth(user.Name) - MakeRequest(t, req, http.StatusCreated) - - req = NewRequest(t, "GET", rootURL+"/x86_64/base.db") - respPkg = MakeRequest(t, req, http.StatusOK) - - files, err = listTarGzFiles(respPkg.Body.Bytes()) - require.NoError(t, err) - require.Len(t, files, 4) - }) } func getProperty(data, key string) string { @@ -393,10 +318,10 @@ func getProperty(data, key string) string { func listTarGzFiles(data []byte) (fstest.MapFS, error) { reader, err := gzip.NewReader(bytes.NewBuffer(data)) + defer reader.Close() if err != nil { return nil, err } - defer reader.Close() tarRead := tar.NewReader(reader) files := make(fstest.MapFS) for { diff --git a/tests/integration/api_packages_composer_test.go b/tests/integration/api_packages_composer_test.go index 9d25cc4d64..9cdcd07e37 100644 --- a/tests/integration/api_packages_composer_test.go +++ b/tests/integration/api_packages_composer_test.go @@ -37,7 +37,6 @@ func TestPackageComposer(t *testing.T) { packageType := "composer-plugin" packageAuthor := "Gitea Authors" packageLicense := "MIT" - packageBin := "./bin/script" var buf bytes.Buffer archive := zip.NewWriter(&buf) @@ -51,9 +50,6 @@ func TestPackageComposer(t *testing.T) { { "name": "` + packageAuthor + `" } - ], - "bin": [ - "` + packageBin + `" ] }`)) archive.Close() @@ -215,8 +211,6 @@ func TestPackageComposer(t *testing.T) { assert.Len(t, pkgs[0].Authors, 1) assert.Equal(t, packageAuthor, pkgs[0].Authors[0].Name) assert.Equal(t, "zip", pkgs[0].Dist.Type) - assert.Equal(t, "4f5fa464c3cb808a1df191dbf6cb75363f8b7072", pkgs[0].Dist.Checksum) - assert.Len(t, pkgs[0].Bin, 1) - assert.Equal(t, packageBin, pkgs[0].Bin[0]) + assert.Equal(t, "7b40bfd6da811b2b78deec1e944f156dbb2c747b", pkgs[0].Dist.Checksum) }) } diff --git a/tests/integration/api_packages_cran_test.go b/tests/integration/api_packages_cran_test.go index d64b592327..31864d1ab7 100644 --- a/tests/integration/api_packages_cran_test.go +++ b/tests/integration/api_packages_cran_test.go @@ -116,14 +116,6 @@ func TestPackageCran(t *testing.T) { MakeRequest(t, req, http.StatusOK) }) - t.Run("DownloadArchived", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - req := NewRequest(t, "GET", fmt.Sprintf("%s/src/contrib/Archive/%s/%s_%s.tar.gz", url, packageName, packageName, packageVersion)). - AddBasicAuth(user.Name) - MakeRequest(t, req, http.StatusOK) - }) - t.Run("Enumerate", func(t *testing.T) { defer tests.PrintCurrentTest(t)() diff --git a/tests/integration/api_packages_maven_test.go b/tests/integration/api_packages_maven_test.go index b453f10b69..7ada3b28ac 100644 --- a/tests/integration/api_packages_maven_test.go +++ b/tests/integration/api_packages_maven_test.go @@ -8,7 +8,6 @@ import ( "net/http" "strconv" "strings" - "sync" "testing" "code.gitea.io/gitea/models/db" @@ -255,35 +254,3 @@ func TestPackageMaven(t *testing.T) { assert.NotContains(t, resp.Body.String(), "Internal server error") }) } - -func TestPackageMavenConcurrent(t *testing.T) { - defer tests.PrepareTestEnv(t)() - - user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) - - groupID := "com.gitea" - artifactID := "test-project" - packageVersion := "1.0.1" - - root := fmt.Sprintf("/api/packages/%s/maven/%s/%s", user.Name, strings.ReplaceAll(groupID, ".", "/"), artifactID) - - putFile := func(t *testing.T, path, content string, expectedStatus int) { - req := NewRequestWithBody(t, "PUT", root+path, strings.NewReader(content)). - AddBasicAuth(user.Name) - MakeRequest(t, req, expectedStatus) - } - - t.Run("Concurrent Upload", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - var wg sync.WaitGroup - for i := 0; i < 10; i++ { - wg.Add(1) - go func(i int) { - putFile(t, fmt.Sprintf("/%s/%s.jar", packageVersion, strconv.Itoa(i)), "test", http.StatusCreated) - wg.Done() - }(i) - } - wg.Wait() - }) -} diff --git a/tests/integration/api_packages_pypi_test.go b/tests/integration/api_packages_pypi_test.go index a75bae85ac..ef03dbe509 100644 --- a/tests/integration/api_packages_pypi_test.go +++ b/tests/integration/api_packages_pypi_test.go @@ -33,16 +33,15 @@ func TestPackagePyPI(t *testing.T) { packageVersion := "1!1.0.1+r1234" packageAuthor := "KN4CK3R" packageDescription := "Test Description" - projectURL := "https://example.com" content := "test" hashSHA256 := "9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08" root := fmt.Sprintf("/api/packages/%s/pypi", user.Name) - createBasicMultipartFile := func(filename, packageName, content string) (body *bytes.Buffer, writer *multipart.Writer, closer func() error) { - body = &bytes.Buffer{} - writer = multipart.NewWriter(body) + uploadFile := func(t *testing.T, filename, content string, expectedStatus int) { + body := &bytes.Buffer{} + writer := multipart.NewWriter(body) part, _ := writer.CreateFormFile("content", filename) _, _ = io.Copy(part, strings.NewReader(content)) @@ -54,27 +53,14 @@ func TestPackagePyPI(t *testing.T) { writer.WriteField("sha256_digest", hashSHA256) writer.WriteField("requires_python", "3.6") - return body, writer, writer.Close - } + _ = writer.Close() - uploadHelper := func(t *testing.T, body *bytes.Buffer, contentType string, expectedStatus int) { req := NewRequestWithBody(t, "POST", root, body). - SetHeader("Content-Type", contentType). + SetHeader("Content-Type", writer.FormDataContentType()). AddBasicAuth(user.Name) MakeRequest(t, req, expectedStatus) } - uploadFile := func(t *testing.T, filename, content string, expectedStatus int) { - body, writer, closeFunc := createBasicMultipartFile(filename, packageName, content) - - writer.WriteField("project_urls", "DOCUMENTATION , https://readthedocs.org") - writer.WriteField("project_urls", fmt.Sprintf("Home-page, %s", projectURL)) - - _ = closeFunc() - - uploadHelper(t, body, writer.FormDataContentType(), expectedStatus) - } - t.Run("Upload", func(t *testing.T) { defer tests.PrintCurrentTest(t)() @@ -89,7 +75,6 @@ func TestPackagePyPI(t *testing.T) { require.NoError(t, err) assert.Nil(t, pd.SemVer) assert.IsType(t, &pypi.Metadata{}, pd.Metadata) - assert.Equal(t, projectURL, pd.Metadata.(*pypi.Metadata).ProjectURL) assert.Equal(t, packageName, pd.Package.Name) assert.Equal(t, packageVersion, pd.Version.Version) @@ -149,48 +134,6 @@ func TestPackagePyPI(t *testing.T) { uploadFile(t, "test.tar.gz", content, http.StatusConflict) }) - t.Run("UploadUsingDeprecatedHomepageMetadata", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - pkgName := "homepage-package" - body, writer, closeFunc := createBasicMultipartFile("test.whl", pkgName, content) - - writer.WriteField("home_page", projectURL) - - _ = closeFunc() - - uploadHelper(t, body, writer.FormDataContentType(), http.StatusCreated) - - pvs, err := packages.GetVersionsByPackageName(db.DefaultContext, user.ID, packages.TypePyPI, pkgName) - require.NoError(t, err) - assert.Len(t, pvs, 1) - - pd, err := packages.GetPackageDescriptor(db.DefaultContext, pvs[0]) - require.NoError(t, err) - assert.IsType(t, &pypi.Metadata{}, pd.Metadata) - assert.Equal(t, projectURL, pd.Metadata.(*pypi.Metadata).ProjectURL) - }) - - t.Run("UploadWithoutAnyHomepageURLMetadata", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - pkgName := "no-project-url-or-homepage-package" - body, writer, closeFunc := createBasicMultipartFile("test.whl", pkgName, content) - - _ = closeFunc() - - uploadHelper(t, body, writer.FormDataContentType(), http.StatusCreated) - - pvs, err := packages.GetVersionsByPackageName(db.DefaultContext, user.ID, packages.TypePyPI, pkgName) - require.NoError(t, err) - assert.Len(t, pvs, 1) - - pd, err := packages.GetPackageDescriptor(db.DefaultContext, pvs[0]) - require.NoError(t, err) - assert.IsType(t, &pypi.Metadata{}, pd.Metadata) - assert.Empty(t, pd.Metadata.(*pypi.Metadata).ProjectURL) - }) - t.Run("Download", func(t *testing.T) { defer tests.PrintCurrentTest(t)() @@ -205,7 +148,7 @@ func TestPackagePyPI(t *testing.T) { downloadFile("test.whl") downloadFile("test.tar.gz") - pvs, err := packages.GetVersionsByPackageName(db.DefaultContext, user.ID, packages.TypePyPI, packageName) + pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypePyPI) require.NoError(t, err) assert.Len(t, pvs, 1) assert.Equal(t, int64(2), pvs[0].DownloadCount) diff --git a/tests/integration/api_packages_swift_test.go b/tests/integration/api_packages_swift_test.go index 3c2a8b0694..5b6229f721 100644 --- a/tests/integration/api_packages_swift_test.go +++ b/tests/integration/api_packages_swift_test.go @@ -43,24 +43,6 @@ func TestPackageSwift(t *testing.T) { url := fmt.Sprintf("/api/packages/%s/swift", user.Name) - t.Run("CheckLogin", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - req := NewRequestWithBody(t, "POST", url, strings.NewReader("")) - MakeRequest(t, req, http.StatusUnauthorized) - - req = NewRequestWithBody(t, "POST", url, strings.NewReader("")). - AddBasicAuth(user.Name) - MakeRequest(t, req, http.StatusOK) - - req = NewRequestWithBody(t, "POST", url+"/login", strings.NewReader("")) - MakeRequest(t, req, http.StatusUnauthorized) - - req = NewRequestWithBody(t, "POST", url+"/login", strings.NewReader("")). - AddBasicAuth(user.Name) - MakeRequest(t, req, http.StatusOK) - }) - t.Run("CheckAcceptMediaType", func(t *testing.T) { defer tests.PrintCurrentTest(t)() diff --git a/tests/integration/api_pull_review_test.go b/tests/integration/api_pull_review_test.go index b66e65ee41..b7e5130cb8 100644 --- a/tests/integration/api_pull_review_test.go +++ b/tests/integration/api_pull_review_test.go @@ -60,9 +60,6 @@ func TestAPIPullReviewCreateDeleteComment(t *testing.T) { var reviews []*api.PullReview DecodeJSON(t, resp, &reviews) for _, review := range reviews { - if review.State == api.ReviewStateRequestReview { - continue - } req := NewRequestf(t, http.MethodDelete, "/api/v1/repos/%s/pulls/%d/reviews/%d", repo.FullName(), pullIssue.Index, review.ID). AddTokenAuth(token) MakeRequest(t, req, http.StatusNoContent) @@ -96,7 +93,7 @@ func TestAPIPullReviewCreateDeleteComment(t *testing.T) { DecodeJSON(t, resp, &getReview) require.EqualValues(t, getReview, review) } - requireReviewCount(2) + requireReviewCount(1) newCommentBody := "first new line" var reviewComment api.PullReviewComment @@ -143,7 +140,7 @@ func TestAPIPullReviewCreateDeleteComment(t *testing.T) { AddTokenAuth(token) MakeRequest(t, req, http.StatusNoContent) } - requireReviewCount(1) + requireReviewCount(0) }) } } @@ -163,7 +160,7 @@ func TestAPIPullReview(t *testing.T) { var reviews []*api.PullReview DecodeJSON(t, resp, &reviews) - if !assert.Len(t, reviews, 8) { + if !assert.Len(t, reviews, 6) { return } for _, r := range reviews { diff --git a/tests/integration/api_pull_test.go b/tests/integration/api_pull_test.go index 7b95d441dd..51c25fb75f 100644 --- a/tests/integration/api_pull_test.go +++ b/tests/integration/api_pull_test.go @@ -7,8 +7,6 @@ import ( "fmt" "io" "net/http" - "net/url" - "strings" "testing" auth_model "code.gitea.io/gitea/models/auth" @@ -19,7 +17,6 @@ import ( user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" "code.gitea.io/gitea/services/forms" issue_service "code.gitea.io/gitea/services/issue" "code.gitea.io/gitea/tests" @@ -312,38 +309,3 @@ func doAPIGetPullFiles(ctx APITestContext, pr *api.PullRequest, callback func(*t } } } - -func TestAPIPullDeleteBranchPerms(t *testing.T) { - onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) { - user2Session := loginUser(t, "user2") - user4Session := loginUser(t, "user4") - testRepoFork(t, user4Session, "user2", "repo1", "user4", "repo1") - testEditFileToNewBranch(t, user2Session, "user2", "repo1", "master", "base-pr", "README.md", "Hello, World\n(Edited - base PR)\n") - - req := NewRequestWithValues(t, "POST", "/user4/repo1/compare/master...user2/repo1:base-pr", map[string]string{ - "_csrf": GetCSRF(t, user4Session, "/user4/repo1/compare/master...user2/repo1:base-pr"), - "title": "Testing PR", - }) - resp := user4Session.MakeRequest(t, req, http.StatusOK) - elem := strings.Split(test.RedirectURL(resp), "/") - - token := getTokenForLoggedInUser(t, user4Session, auth_model.AccessTokenScopeWriteRepository) - req = NewRequestWithValues(t, "POST", "/api/v1/repos/user4/repo1/pulls/"+elem[4]+"/merge", map[string]string{ - "do": "merge", - "delete_branch_after_merge": "on", - }).AddTokenAuth(token) - resp = user4Session.MakeRequest(t, req, http.StatusForbidden) - - type userResponse struct { - Message string `json:"message"` - } - var bodyResp userResponse - DecodeJSON(t, resp, &bodyResp) - - assert.EqualValues(t, "insufficient permission to delete head branch", bodyResp.Message) - - // Check that the branch still exist. - req = NewRequest(t, "GET", "/api/v1/repos/user2/repo1/branches/base-pr").AddTokenAuth(token) - user4Session.MakeRequest(t, req, http.StatusOK) - }) -} diff --git a/tests/integration/api_releases_test.go b/tests/integration/api_releases_test.go index 1327daf57e..1bd8a643ad 100644 --- a/tests/integration/api_releases_test.go +++ b/tests/integration/api_releases_test.go @@ -76,7 +76,6 @@ func TestAPIListReleases(t *testing.T) { testFilterByLen(true, url.Values{"draft": {"false"}, "pre-release": {"false"}}, 1, "exclude drafts and pre-releases") testFilterByLen(true, url.Values{"pre-release": {"true"}}, 1, "only get pre-release") testFilterByLen(true, url.Values{"draft": {"true"}, "pre-release": {"true"}}, 0, "there is no pre-release draft") - testFilterByLen(true, url.Values{"q": {"release"}}, 3, "keyword") } func createNewReleaseUsingAPI(t *testing.T, token string, owner *user_model.User, repo *repo_model.Repository, name, target, title, desc string) *api.Release { diff --git a/tests/integration/api_repo_actions_test.go b/tests/integration/api_repo_actions_test.go deleted file mode 100644 index 9c3b6aa2b6..0000000000 --- a/tests/integration/api_repo_actions_test.go +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright 2025 The Forgejo Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -package integration - -import ( - "net/http" - "testing" - - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/routers/api/v1/shared" - "code.gitea.io/gitea/tests" - - "github.com/stretchr/testify/assert" -) - -func TestAPISearchActionJobs_RepoRunner(t *testing.T) { - defer tests.PrepareTestEnv(t)() - - repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) - user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) - token := getUserToken(t, user2.LowerName, auth_model.AccessTokenScopeWriteRepository) - job := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{ID: 393}) - - req := NewRequestf( - t, - "GET", - "/api/v1/repos/%s/%s/actions/runners/jobs?labels=%s", - repo.OwnerName, repo.Name, - "ubuntu-latest", - ).AddTokenAuth(token) - res := MakeRequest(t, req, http.StatusOK) - - var jobs shared.RunJobList - DecodeJSON(t, res, &jobs) - - assert.Len(t, jobs.Body, 1) - assert.EqualValues(t, job.ID, jobs.Body[0].ID) -} diff --git a/tests/integration/api_repo_archive_test.go b/tests/integration/api_repo_archive_test.go index fab3dedfab..a16136a39b 100644 --- a/tests/integration/api_repo_archive_test.go +++ b/tests/integration/api_repo_archive_test.go @@ -63,43 +63,3 @@ func TestAPIDownloadArchive(t *testing.T) { link, _ = url.Parse(fmt.Sprintf("/api/v1/repos/%s/%s/archive/master", user2.Name, repo.Name)) MakeRequest(t, NewRequest(t, "GET", link.String()).AddTokenAuth(token), http.StatusBadRequest) } - -func TestAPIDownloadArchive2(t *testing.T) { - defer tests.PrepareTestEnv(t)() - - repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) - user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) - session := loginUser(t, user2.LowerName) - token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadRepository) - - link, _ := url.Parse(fmt.Sprintf("/api/v1/repos/%s/%s/zipball/master", user2.Name, repo.Name)) - resp := MakeRequest(t, NewRequest(t, "GET", link.String()).AddTokenAuth(token), http.StatusOK) - bs, err := io.ReadAll(resp.Body) - require.NoError(t, err) - assert.Len(t, bs, 320) - - link, _ = url.Parse(fmt.Sprintf("/api/v1/repos/%s/%s/tarball/master", user2.Name, repo.Name)) - resp = MakeRequest(t, NewRequest(t, "GET", link.String()).AddTokenAuth(token), http.StatusOK) - bs, err = io.ReadAll(resp.Body) - require.NoError(t, err) - assert.Len(t, bs, 266) - - // Must return a link to a commit ID as the "immutable" archive link - linkHeaderRe := regexp.MustCompile(`^<(https?://.*/api/v1/repos/user2/repo1/archive/[a-f0-9]+\.tar\.gz.*)>; rel="immutable"$`) - m := linkHeaderRe.FindStringSubmatch(resp.Header().Get("Link")) - assert.NotEmpty(t, m[1]) - resp = MakeRequest(t, NewRequest(t, "GET", m[1]).AddTokenAuth(token), http.StatusOK) - bs2, err := io.ReadAll(resp.Body) - require.NoError(t, err) - // The locked URL should give the same bytes as the non-locked one - assert.EqualValues(t, bs, bs2) - - link, _ = url.Parse(fmt.Sprintf("/api/v1/repos/%s/%s/bundle/master", user2.Name, repo.Name)) - resp = MakeRequest(t, NewRequest(t, "GET", link.String()).AddTokenAuth(token), http.StatusOK) - bs, err = io.ReadAll(resp.Body) - require.NoError(t, err) - assert.Len(t, bs, 382) - - link, _ = url.Parse(fmt.Sprintf("/api/v1/repos/%s/%s/archive/master", user2.Name, repo.Name)) - MakeRequest(t, NewRequest(t, "GET", link.String()).AddTokenAuth(token), http.StatusBadRequest) -} diff --git a/tests/integration/api_repo_branch_test.go b/tests/integration/api_repo_branch_test.go index 83159022ea..5488eca1dc 100644 --- a/tests/integration/api_repo_branch_test.go +++ b/tests/integration/api_repo_branch_test.go @@ -29,13 +29,9 @@ func TestAPIRepoBranchesPlain(t *testing.T) { repo3 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 3}) user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) session := loginUser(t, user1.LowerName) - - // public only token should be forbidden - publicOnlyToken := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopePublicOnly, auth_model.AccessTokenScopeWriteRepository) - link, _ := url.Parse(fmt.Sprintf("/api/v1/repos/org3/%s/branches", repo3.Name)) // a plain repo - MakeRequest(t, NewRequest(t, "GET", link.String()).AddTokenAuth(publicOnlyToken), http.StatusForbidden) - token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) + + link, _ := url.Parse(fmt.Sprintf("/api/v1/repos/org3/%s/branches", repo3.Name)) // a plain repo resp := MakeRequest(t, NewRequest(t, "GET", link.String()).AddTokenAuth(token), http.StatusOK) bs, err := io.ReadAll(resp.Body) require.NoError(t, err) @@ -47,8 +43,6 @@ func TestAPIRepoBranchesPlain(t *testing.T) { assert.EqualValues(t, "master", branches[1].Name) link2, _ := url.Parse(fmt.Sprintf("/api/v1/repos/org3/%s/branches/test_branch", repo3.Name)) - MakeRequest(t, NewRequest(t, "GET", link2.String()).AddTokenAuth(publicOnlyToken), http.StatusForbidden) - resp = MakeRequest(t, NewRequest(t, "GET", link2.String()).AddTokenAuth(token), http.StatusOK) bs, err = io.ReadAll(resp.Body) require.NoError(t, err) @@ -56,8 +50,6 @@ func TestAPIRepoBranchesPlain(t *testing.T) { require.NoError(t, json.Unmarshal(bs, &branch)) assert.EqualValues(t, "test_branch", branch.Name) - MakeRequest(t, NewRequest(t, "POST", link.String()).AddTokenAuth(publicOnlyToken), http.StatusForbidden) - req := NewRequest(t, "POST", link.String()).AddTokenAuth(token) req.Header.Add("Content-Type", "application/json") req.Body = io.NopCloser(bytes.NewBufferString(`{"new_branch_name":"test_branch2", "old_branch_name": "test_branch", "old_ref_name":"refs/heads/test_branch"}`)) @@ -82,7 +74,6 @@ func TestAPIRepoBranchesPlain(t *testing.T) { link3, _ := url.Parse(fmt.Sprintf("/api/v1/repos/org3/%s/branches/test_branch2", repo3.Name)) MakeRequest(t, NewRequest(t, "DELETE", link3.String()), http.StatusNotFound) - MakeRequest(t, NewRequest(t, "DELETE", link3.String()).AddTokenAuth(publicOnlyToken), http.StatusForbidden) MakeRequest(t, NewRequest(t, "DELETE", link3.String()).AddTokenAuth(token), http.StatusNoContent) require.NoError(t, err) diff --git a/tests/integration/api_repo_compare_test.go b/tests/integration/api_repo_compare_test.go index d4b170e60e..f3188eb49f 100644 --- a/tests/integration/api_repo_compare_test.go +++ b/tests/integration/api_repo_compare_test.go @@ -35,25 +35,4 @@ func TestAPICompareBranches(t *testing.T) { assert.Equal(t, 2, apiResp.TotalCommits) assert.Len(t, apiResp.Commits, 2) - assert.Len(t, apiResp.Files, 3) -} - -func TestAPICompareCommits(t *testing.T) { - defer tests.PrepareTestEnv(t)() - - user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) - // Login as User2. - session := loginUser(t, user.Name) - token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) - - req := NewRequestf(t, "GET", "/api/v1/repos/user2/repo20/compare/c8e31bc...8babce9"). - AddTokenAuth(token) - resp := MakeRequest(t, req, http.StatusOK) - - var apiResp *api.Compare - DecodeJSON(t, resp, &apiResp) - - assert.Equal(t, 2, apiResp.TotalCommits) - assert.Len(t, apiResp.Commits, 2) - assert.Len(t, apiResp.Files, 3) } diff --git a/tests/integration/api_repo_git_notes_test.go b/tests/integration/api_repo_git_notes_test.go index 1b5e5d652c..9f3e927077 100644 --- a/tests/integration/api_repo_git_notes_test.go +++ b/tests/integration/api_repo_git_notes_test.go @@ -4,13 +4,11 @@ package integration import ( - "fmt" "net/http" "net/url" "testing" auth_model "code.gitea.io/gitea/models/auth" - repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" api "code.gitea.io/gitea/modules/structs" @@ -18,7 +16,7 @@ import ( "github.com/stretchr/testify/assert" ) -func TestAPIReposGetGitNotes(t *testing.T) { +func TestAPIReposGitNotes(t *testing.T) { onGiteaRun(t, func(*testing.T, *url.URL) { user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) // Login as User2. @@ -46,53 +44,3 @@ func TestAPIReposGetGitNotes(t *testing.T) { assert.NotNil(t, apiData.Commit.RepoCommit.Verification) }) } - -func TestAPIReposSetGitNotes(t *testing.T) { - onGiteaRun(t, func(*testing.T, *url.URL) { - repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) - user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}) - - session := loginUser(t, user.Name) - token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) - - req := NewRequestf(t, "GET", "/api/v1/repos/%s/git/notes/65f1bf27bc3bf70f64657658635e66094edbcb4d", repo.FullName()) - resp := MakeRequest(t, req, http.StatusOK) - var apiData api.Note - DecodeJSON(t, resp, &apiData) - assert.Equal(t, "This is a test note\n", apiData.Message) - - req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/git/notes/65f1bf27bc3bf70f64657658635e66094edbcb4d", repo.FullName()), &api.NoteOptions{ - Message: "This is a new note", - }).AddTokenAuth(token) - resp = MakeRequest(t, req, http.StatusOK) - DecodeJSON(t, resp, &apiData) - assert.Equal(t, "This is a new note\n", apiData.Message) - - req = NewRequestf(t, "GET", "/api/v1/repos/%s/git/notes/65f1bf27bc3bf70f64657658635e66094edbcb4d", repo.FullName()) - resp = MakeRequest(t, req, http.StatusOK) - DecodeJSON(t, resp, &apiData) - assert.Equal(t, "This is a new note\n", apiData.Message) - }) -} - -func TestAPIReposDeleteGitNotes(t *testing.T) { - onGiteaRun(t, func(*testing.T, *url.URL) { - repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) - user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}) - - session := loginUser(t, user.Name) - token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) - - req := NewRequestf(t, "GET", "/api/v1/repos/%s/git/notes/65f1bf27bc3bf70f64657658635e66094edbcb4d", repo.FullName()) - resp := MakeRequest(t, req, http.StatusOK) - var apiData api.Note - DecodeJSON(t, resp, &apiData) - assert.Equal(t, "This is a test note\n", apiData.Message) - - req = NewRequestf(t, "DELETE", "/api/v1/repos/%s/git/notes/65f1bf27bc3bf70f64657658635e66094edbcb4d", repo.FullName()).AddTokenAuth(token) - MakeRequest(t, req, http.StatusNoContent) - - req = NewRequestf(t, "GET", "/api/v1/repos/%s/git/notes/65f1bf27bc3bf70f64657658635e66094edbcb4d", repo.FullName()) - MakeRequest(t, req, http.StatusNotFound) - }) -} diff --git a/tests/integration/api_token_test.go b/tests/integration/api_token_test.go index f94a0986f2..9c7bf37330 100644 --- a/tests/integration/api_token_test.go +++ b/tests/integration/api_token_test.go @@ -23,27 +23,10 @@ func TestAPICreateAndDeleteToken(t *testing.T) { defer tests.PrepareTestEnv(t)() user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) - newAccessToken := createAPIAccessTokenWithoutCleanUp(t, "test-key-1", user, []auth_model.AccessTokenScope{auth_model.AccessTokenScopeAll}) + newAccessToken := createAPIAccessTokenWithoutCleanUp(t, "test-key-1", user, nil) deleteAPIAccessToken(t, newAccessToken, user) - newAccessToken = createAPIAccessTokenWithoutCleanUp(t, "test-key-2", user, []auth_model.AccessTokenScope{auth_model.AccessTokenScopeAll}) - deleteAPIAccessToken(t, newAccessToken, user) -} - -func TestAPIGetTokens(t *testing.T) { - defer tests.PrepareTestEnv(t)() - user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) - - // with basic auth... - req := NewRequest(t, "GET", "/api/v1/users/user2/tokens"). - AddBasicAuth(user.Name) - MakeRequest(t, req, http.StatusOK) - - // ... or with a token. - newAccessToken := createAPIAccessTokenWithoutCleanUp(t, "test-key-1", user, []auth_model.AccessTokenScope{auth_model.AccessTokenScopeAll}) - req = NewRequest(t, "GET", "/api/v1/users/user2/tokens"). - AddTokenAuth(newAccessToken.Token) - MakeRequest(t, req, http.StatusOK) + newAccessToken = createAPIAccessTokenWithoutCleanUp(t, "test-key-2", user, nil) deleteAPIAccessToken(t, newAccessToken, user) } @@ -89,19 +72,19 @@ func TestAPIDeleteTokensPermission(t *testing.T) { user4 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 4}) // admin can delete tokens for other users - createAPIAccessTokenWithoutCleanUp(t, "test-key-1", user2, []auth_model.AccessTokenScope{auth_model.AccessTokenScopeAll}) + createAPIAccessTokenWithoutCleanUp(t, "test-key-1", user2, nil) req := NewRequest(t, "DELETE", "/api/v1/users/"+user2.LoginName+"/tokens/test-key-1"). AddBasicAuth(admin.Name) MakeRequest(t, req, http.StatusNoContent) // non-admin can delete tokens for himself - createAPIAccessTokenWithoutCleanUp(t, "test-key-2", user2, []auth_model.AccessTokenScope{auth_model.AccessTokenScopeAll}) + createAPIAccessTokenWithoutCleanUp(t, "test-key-2", user2, nil) req = NewRequest(t, "DELETE", "/api/v1/users/"+user2.LoginName+"/tokens/test-key-2"). AddBasicAuth(user2.Name) MakeRequest(t, req, http.StatusNoContent) // non-admin can't delete tokens for other users - createAPIAccessTokenWithoutCleanUp(t, "test-key-3", user2, []auth_model.AccessTokenScope{auth_model.AccessTokenScopeAll}) + createAPIAccessTokenWithoutCleanUp(t, "test-key-3", user2, nil) req = NewRequest(t, "DELETE", "/api/v1/users/"+user2.LoginName+"/tokens/test-key-3"). AddBasicAuth(user4.Name) MakeRequest(t, req, http.StatusForbidden) @@ -537,7 +520,7 @@ func runTestCase(t *testing.T, testCase *requiredScopeTestCase, user *user_model unauthorizedScopes = append(unauthorizedScopes, cateogoryUnauthorizedScopes...) } - accessToken := createAPIAccessTokenWithoutCleanUp(t, "test-token", user, unauthorizedScopes) + accessToken := createAPIAccessTokenWithoutCleanUp(t, "test-token", user, &unauthorizedScopes) defer deleteAPIAccessToken(t, accessToken, user) // Request the endpoint. Verify that permission is denied. @@ -549,12 +532,20 @@ func runTestCase(t *testing.T, testCase *requiredScopeTestCase, user *user_model // createAPIAccessTokenWithoutCleanUp Create an API access token and assert that // creation succeeded. The caller is responsible for deleting the token. -func createAPIAccessTokenWithoutCleanUp(t *testing.T, tokenName string, user *user_model.User, scopes []auth_model.AccessTokenScope) api.AccessToken { +func createAPIAccessTokenWithoutCleanUp(t *testing.T, tokenName string, user *user_model.User, scopes *[]auth_model.AccessTokenScope) api.AccessToken { payload := map[string]any{ - "name": tokenName, - "scopes": scopes, + "name": tokenName, + } + if scopes != nil { + for _, scope := range *scopes { + scopes, scopesExists := payload["scopes"].([]string) + if !scopesExists { + scopes = make([]string, 0) + } + scopes = append(scopes, string(scope)) + payload["scopes"] = scopes + } } - log.Debug("Requesting creation of token with scopes: %v", scopes) req := NewRequestWithJSON(t, "POST", "/api/v1/users/"+user.LoginName+"/tokens", payload). AddBasicAuth(user.Name) @@ -572,7 +563,8 @@ func createAPIAccessTokenWithoutCleanUp(t *testing.T, tokenName string, user *us return newAccessToken } -// deleteAPIAccessToken deletes an API access token and assert that deletion succeeded. +// createAPIAccessTokenWithoutCleanUp Delete an API access token and assert that +// deletion succeeded. func deleteAPIAccessToken(t *testing.T, accessToken api.AccessToken, user *user_model.User) { req := NewRequestf(t, "DELETE", "/api/v1/users/"+user.LoginName+"/tokens/%d", accessToken.ID). AddBasicAuth(user.Name) diff --git a/tests/integration/api_twofa_test.go b/tests/integration/api_twofa_test.go index 9de096ed2f..0bb20255a2 100644 --- a/tests/integration/api_twofa_test.go +++ b/tests/integration/api_twofa_test.go @@ -15,7 +15,6 @@ import ( "code.gitea.io/gitea/tests" "github.com/pquerna/otp/totp" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -38,8 +37,9 @@ func TestAPITwoFactor(t *testing.T) { tfa := &auth_model.TwoFactor{ UID: user.ID, } + require.NoError(t, tfa.SetSecret(otpKey.Secret())) - require.NoError(t, auth_model.NewTwoFactor(db.DefaultContext, tfa, otpKey.Secret())) + require.NoError(t, auth_model.NewTwoFactor(db.DefaultContext, tfa)) req = NewRequest(t, "GET", "/api/v1/user"). AddBasicAuth(user.Name) @@ -58,24 +58,3 @@ func TestAPITwoFactor(t *testing.T) { req.Header.Set("X-Forgejo-OTP", passcode) MakeRequest(t, req, http.StatusOK) } - -func TestAPIWebAuthn(t *testing.T) { - defer tests.PrepareTestEnv(t)() - - user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 32}) - unittest.AssertExistsAndLoadBean(t, &auth_model.WebAuthnCredential{UserID: user.ID}) - - req := NewRequest(t, "GET", "/api/v1/user") - req.SetBasicAuth(user.Name, "notpassword") - - resp := MakeRequest(t, req, http.StatusUnauthorized) - - type userResponse struct { - Message string `json:"message"` - } - var userParsed userResponse - - DecodeJSON(t, resp, &userParsed) - - assert.EqualValues(t, "Basic authorization is not allowed while having security keys enrolled", userParsed.Message) -} diff --git a/tests/integration/api_user_actions_test.go b/tests/integration/api_user_actions_test.go deleted file mode 100644 index f9c9c1df4e..0000000000 --- a/tests/integration/api_user_actions_test.go +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright 2025 The Forgejo Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -package integration - -import ( - "fmt" - "net/http" - "testing" - - actions_model "code.gitea.io/gitea/models/actions" - auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/routers/api/v1/shared" - "code.gitea.io/gitea/tests" - - "github.com/stretchr/testify/assert" -) - -func TestAPISearchActionJobs_UserRunner(t *testing.T) { - defer tests.PrepareTestEnv(t)() - - normalUsername := "user2" - session := loginUser(t, normalUsername) - token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteUser) - job := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{ID: 394}) - - req := NewRequest(t, "GET", - fmt.Sprintf("/api/v1/user/actions/runners/jobs?labels=%s", "debian-latest")). - AddTokenAuth(token) - res := MakeRequest(t, req, http.StatusOK) - - var jobs shared.RunJobList - DecodeJSON(t, res, &jobs) - - assert.Len(t, jobs.Body, 1) - assert.EqualValues(t, job.ID, jobs.Body[0].ID) -} diff --git a/tests/integration/api_user_search_test.go b/tests/integration/api_user_search_test.go index ab52b26531..2ecd338987 100644 --- a/tests/integration/api_user_search_test.go +++ b/tests/integration/api_user_search_test.go @@ -40,19 +40,6 @@ func TestAPIUserSearchLoggedIn(t *testing.T) { assert.Contains(t, user.UserName, query) assert.NotEmpty(t, user.Email) } - - publicToken := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadUser, auth_model.AccessTokenScopePublicOnly) - req = NewRequestf(t, "GET", "/api/v1/users/search?q=%s", query). - AddTokenAuth(publicToken) - resp = MakeRequest(t, req, http.StatusOK) - results = SearchResults{} - DecodeJSON(t, resp, &results) - assert.NotEmpty(t, results.Data) - for _, user := range results.Data { - assert.Contains(t, user.UserName, query) - assert.NotEmpty(t, user.Email) - assert.Equal(t, "public", user.Visibility) - } } func TestAPIUserSearchNotLoggedIn(t *testing.T) { @@ -143,39 +130,3 @@ func TestAPIUserSearchNotLoggedInUserHidden(t *testing.T) { DecodeJSON(t, resp, &results) assert.Empty(t, results.Data) } - -func TestAPIUserSearchByEmail(t *testing.T) { - defer tests.PrepareTestEnv(t)() - - // admin can search user with private email - adminUsername := "user1" - session := loginUser(t, adminUsername) - token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadUser) - query := "user2@example.com" - req := NewRequestf(t, "GET", "/api/v1/users/search?q=%s", query). - AddTokenAuth(token) - resp := MakeRequest(t, req, http.StatusOK) - - var results SearchResults - DecodeJSON(t, resp, &results) - assert.Len(t, results.Data, 1) - assert.Equal(t, query, results.Data[0].Email) - - // no login user can not search user with private email - req = NewRequestf(t, "GET", "/api/v1/users/search?q=%s", query) - resp = MakeRequest(t, req, http.StatusOK) - DecodeJSON(t, resp, &results) - assert.Empty(t, results.Data) - - // user can search self with private email - user2 := "user2" - session = loginUser(t, user2) - token = getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadUser) - req = NewRequestf(t, "GET", "/api/v1/users/search?q=%s", query). - AddTokenAuth(token) - resp = MakeRequest(t, req, http.StatusOK) - - DecodeJSON(t, resp, &results) - assert.Len(t, results.Data, 1) - assert.Equal(t, query, results.Data[0].Email) -} diff --git a/tests/integration/api_wiki_test.go b/tests/integration/api_wiki_test.go index 638b90a4aa..e5eb7a52c1 100644 --- a/tests/integration/api_wiki_test.go +++ b/tests/integration/api_wiki_test.go @@ -9,7 +9,6 @@ import ( "encoding/base64" "fmt" "net/http" - "net/url" "testing" auth_model "code.gitea.io/gitea/models/auth" @@ -132,32 +131,9 @@ func TestAPIListWikiPages(t *testing.T) { Message: "Add Home.md\n", }, }, - { - Title: "Long Page", - HTMLURL: meta[1].HTMLURL, - SubURL: "Long-Page", - LastCommit: &api.WikiCommit{ - ID: "d49ac742d44063dcf69d4e0afe725813b777dd89", - Author: &api.CommitUser{ - Identity: api.Identity{ - Name: "Oto Šťáva", - Email: "oto.stava@gmail.com", - }, - Date: "2024-11-23T11:16:51Z", - }, - Committer: &api.CommitUser{ - Identity: api.Identity{ - Name: "Oto Šťáva", - Email: "oto.stava@gmail.com", - }, - Date: "2024-11-23T11:16:51Z", - }, - Message: "add long page\n", - }, - }, { Title: "Page With Image", - HTMLURL: meta[2].HTMLURL, + HTMLURL: meta[1].HTMLURL, SubURL: "Page-With-Image", LastCommit: &api.WikiCommit{ ID: "0cf15c3f66ec8384480ed9c3cf87c9e97fbb0ec3", @@ -180,7 +156,7 @@ func TestAPIListWikiPages(t *testing.T) { }, { Title: "Page With Spaced Name", - HTMLURL: meta[3].HTMLURL, + HTMLURL: meta[2].HTMLURL, SubURL: "Page-With-Spaced-Name", LastCommit: &api.WikiCommit{ ID: "c10d10b7e655b3dab1f53176db57c8219a5488d6", @@ -203,7 +179,7 @@ func TestAPIListWikiPages(t *testing.T) { }, { Title: "Unescaped File", - HTMLURL: meta[4].HTMLURL, + HTMLURL: meta[3].HTMLURL, SubURL: "Unescaped-File", LastCommit: &api.WikiCommit{ ID: "0dca5bd9b5d7ef937710e056f575e86c0184ba85", @@ -224,40 +200,17 @@ func TestAPIListWikiPages(t *testing.T) { Message: "add unescaped file\n", }, }, - { - Title: "XSS", - HTMLURL: meta[5].HTMLURL, - SubURL: "XSS", - LastCommit: &api.WikiCommit{ - ID: "f54f5a6b7c4f83b606600e43186165854f189530", - Author: &api.CommitUser{ - Identity: api.Identity{ - Name: "Gusted", - Email: "valid@example.org", - }, - Date: "2024-01-31T00:00:00Z", - }, - Committer: &api.CommitUser{ - Identity: api.Identity{ - Name: "Gusted", - Email: "valid@example.org", - }, - Date: "2024-01-31T00:00:00Z", - }, - Message: "Yay XSS", - }, - }, } assert.Equal(t, dummymeta, meta) } func TestAPINewWikiPage(t *testing.T) { - defer tests.PrepareTestEnv(t)() for _, title := range []string{ "New page", "&&&&", } { + defer tests.PrepareTestEnv(t)() username := "user2" session := loginUser(t, username) token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) @@ -433,26 +386,26 @@ func TestAPIListPageRevisions(t *testing.T) { } func TestAPIWikiNonMasterBranch(t *testing.T) { - onGiteaRun(t, func(t *testing.T, _ *url.URL) { - user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) - repo, _, f := tests.CreateDeclarativeRepoWithOptions(t, user, tests.DeclarativeRepoOptions{ - WikiBranch: optional.Some("main"), - }) - defer f() + defer tests.PrepareTestEnv(t)() - uris := []string{ - "revisions/Home", - "pages", - "page/Home", - } - baseURL := fmt.Sprintf("/api/v1/repos/%s/wiki", repo.FullName()) - for _, uri := range uris { - t.Run(uri, func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - req := NewRequestf(t, "GET", "%s/%s", baseURL, uri) - MakeRequest(t, req, http.StatusOK) - }) - } + user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) + repo, _, f := tests.CreateDeclarativeRepoWithOptions(t, user, tests.DeclarativeRepoOptions{ + WikiBranch: optional.Some("main"), }) + defer f() + + uris := []string{ + "revisions/Home", + "pages", + "page/Home", + } + baseURL := fmt.Sprintf("/api/v1/repos/%s/wiki", repo.FullName()) + for _, uri := range uris { + t.Run(uri, func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + req := NewRequestf(t, "GET", "%s/%s", baseURL, uri) + MakeRequest(t, req, http.StatusOK) + }) + } } diff --git a/tests/integration/attachment_test.go b/tests/integration/attachment_test.go index 7bd3e680f7..95c9c9f753 100644 --- a/tests/integration/attachment_test.go +++ b/tests/integration/attachment_test.go @@ -30,7 +30,7 @@ func generateImg() bytes.Buffer { return buff } -func createAttachment(t *testing.T, session *TestSession, csrf, repoURL, filename string, buff bytes.Buffer, expectedStatus int) string { +func createAttachment(t *testing.T, session *TestSession, repoURL, filename string, buff bytes.Buffer, expectedStatus int) string { body := &bytes.Buffer{} // Setup multi-part @@ -42,6 +42,8 @@ func createAttachment(t *testing.T, session *TestSession, csrf, repoURL, filenam err = writer.Close() require.NoError(t, err) + csrf := GetCSRF(t, session, repoURL) + req := NewRequestWithBody(t, "POST", repoURL+"/issues/attachments", body) req.Header.Add("X-Csrf-Token", csrf) req.Header.Add("Content-Type", writer.FormDataContentType()) @@ -58,14 +60,14 @@ func createAttachment(t *testing.T, session *TestSession, csrf, repoURL, filenam func TestCreateAnonymousAttachment(t *testing.T) { defer tests.PrepareTestEnv(t)() session := emptyTestSession(t) - createAttachment(t, session, GetCSRF(t, session, "/user/login"), "user2/repo1", "image.png", generateImg(), http.StatusSeeOther) + createAttachment(t, session, "user2/repo1", "image.png", generateImg(), http.StatusSeeOther) } func TestCreateIssueAttachment(t *testing.T) { defer tests.PrepareTestEnv(t)() const repoURL = "user2/repo1" session := loginUser(t, "user2") - uuid := createAttachment(t, session, GetCSRF(t, session, repoURL), repoURL, "image.png", generateImg(), http.StatusOK) + uuid := createAttachment(t, session, repoURL, "image.png", generateImg(), http.StatusOK) req := NewRequest(t, "GET", repoURL+"/issues/new") resp := session.MakeRequest(t, req, http.StatusOK) diff --git a/tests/integration/auth_ldap_test.go b/tests/integration/auth_ldap_test.go index 62a7d18904..04c8a4b614 100644 --- a/tests/integration/auth_ldap_test.go +++ b/tests/integration/auth_ldap_test.go @@ -185,6 +185,7 @@ func TestLDAPUserSignin(t *testing.T) { assert.Equal(t, u.UserName, htmlDoc.GetInputValueByName("name")) assert.Equal(t, u.FullName, htmlDoc.GetInputValueByName("full_name")) + assert.Equal(t, u.Email, htmlDoc.Find("#signed-user-email").Text()) } func TestLDAPAuthChange(t *testing.T) { @@ -244,7 +245,8 @@ func TestLDAPUserSync(t *testing.T) { } defer tests.PrepareTestEnv(t)() addAuthSourceLDAP(t, "", "", "", "") - auth.SyncExternalUsers(context.Background(), true) + err := auth.SyncExternalUsers(context.Background(), true) + require.NoError(t, err) // Check if users exists for _, gitLDAPUser := range gitLDAPUsers { diff --git a/tests/integration/auth_token_test.go b/tests/integration/auth_token_test.go index d1fd5dda83..2c39c87da2 100644 --- a/tests/integration/auth_token_test.go +++ b/tests/integration/auth_token_test.go @@ -84,7 +84,7 @@ func TestLTACookie(t *testing.T) { assert.True(t, found) rawValidator, err := hex.DecodeString(validator) require.NoError(t, err) - unittest.AssertExistsAndLoadBean(t, &auth.AuthorizationToken{LookupKey: lookupKey, HashedValidator: auth.HashValidator(rawValidator), UID: user.ID, Purpose: auth.LongTermAuthorization}) + unittest.AssertExistsAndLoadBean(t, &auth.AuthorizationToken{LookupKey: lookupKey, HashedValidator: auth.HashValidator(rawValidator), UID: user.ID}) // Check if the LTA cookie it provides authentication. // If LTA cookie provides authentication /user/login shouldn't return status 200. @@ -143,7 +143,7 @@ func TestLTAExpiry(t *testing.T) { assert.True(t, found) // Ensure it's not expired. - lta := unittest.AssertExistsAndLoadBean(t, &auth.AuthorizationToken{UID: user.ID, LookupKey: lookupKey, Purpose: auth.LongTermAuthorization}) + lta := unittest.AssertExistsAndLoadBean(t, &auth.AuthorizationToken{UID: user.ID, LookupKey: lookupKey}) assert.False(t, lta.IsExpired()) // Manually stub LTA's expiry. @@ -151,7 +151,7 @@ func TestLTAExpiry(t *testing.T) { require.NoError(t, err) // Ensure it's expired. - lta = unittest.AssertExistsAndLoadBean(t, &auth.AuthorizationToken{UID: user.ID, LookupKey: lookupKey, Purpose: auth.LongTermAuthorization}) + lta = unittest.AssertExistsAndLoadBean(t, &auth.AuthorizationToken{UID: user.ID, LookupKey: lookupKey}) assert.True(t, lta.IsExpired()) // Should return 200 OK, because LTA doesn't provide authorization anymore. @@ -160,5 +160,5 @@ func TestLTAExpiry(t *testing.T) { session.MakeRequest(t, req, http.StatusOK) // Ensure it's deleted. - unittest.AssertNotExistsBean(t, &auth.AuthorizationToken{UID: user.ID, LookupKey: lookupKey, Purpose: auth.LongTermAuthorization}) + unittest.AssertNotExistsBean(t, &auth.AuthorizationToken{UID: user.ID, LookupKey: lookupKey}) } diff --git a/tests/integration/block_test.go b/tests/integration/block_test.go index 1fa201a0be..b17a445bf8 100644 --- a/tests/integration/block_test.go +++ b/tests/integration/block_test.go @@ -147,20 +147,6 @@ func TestBlockUserFromOrganization(t *testing.T) { session.MakeRequest(t, req, http.StatusInternalServerError) }) }) - - t.Run("Block the doer", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - req := NewRequestWithValues(t, "POST", org.OrganisationLink()+"/settings/blocked_users/block", map[string]string{ - "_csrf": GetCSRF(t, session, org.OrganisationLink()+"/settings/blocked_users"), - "uname": doer.Name, - }) - session.MakeRequest(t, req, http.StatusSeeOther) - assert.False(t, unittest.BeanExists(t, &user_model.BlockedUser{BlockID: doer.ID, UserID: org.ID})) - flashCookie := session.GetCookie(forgejo_context.CookieNameFlash) - assert.NotNil(t, flashCookie) - assert.EqualValues(t, "error%3DYou%2Bcannot%2Bblock%2Byourself.", flashCookie.Value) - }) } // TestBlockActions ensures that certain actions cannot be performed as a doer diff --git a/tests/integration/cmd_admin_test.go b/tests/integration/cmd_admin_test.go index b493dff919..576b09eefd 100644 --- a/tests/integration/cmd_admin_test.go +++ b/tests/integration/cmd_admin_test.go @@ -10,7 +10,6 @@ import ( "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -45,7 +44,6 @@ func Test_Cmd_AdminUser(t *testing.T) { }, } { t.Run(testCase.name, func(t *testing.T) { - defer tests.PrintCurrentTest(t)() name := "testuser" options := []string{"user", "create", "--username", name, "--password", "password", "--email", name + "@example.com"} diff --git a/tests/integration/cmd_forgejo_actions_test.go b/tests/integration/cmd_forgejo_actions_test.go index bda69edb80..067cdefb88 100644 --- a/tests/integration/cmd_forgejo_actions_test.go +++ b/tests/integration/cmd_forgejo_actions_test.go @@ -15,7 +15,6 @@ import ( repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -68,7 +67,6 @@ func Test_CmdForgejo_Actions(t *testing.T) { }, } { t.Run(testCase.testName, func(t *testing.T) { - defer tests.PrintCurrentTest(t)() output, err := runMainApp("forgejo-cli", "actions", "register", "--secret", testCase.secret, "--scope", testCase.scope) assert.EqualValues(t, "", output) diff --git a/tests/integration/codeowner_test.go b/tests/integration/codeowner_test.go index e8200219c4..71661bc56b 100644 --- a/tests/integration/codeowner_test.go +++ b/tests/integration/codeowner_test.go @@ -6,7 +6,6 @@ package integration import ( "context" "fmt" - "net/http" "net/url" "os" "path" @@ -14,7 +13,6 @@ import ( "testing" "time" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" unit_model "code.gitea.io/gitea/models/unit" @@ -138,64 +136,5 @@ func TestCodeOwner(t *testing.T) { unittest.AssertExistsIf(t, true, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 4}) unittest.AssertExistsIf(t, false, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 5}) }) - t.Run("From a forked repository", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - session := loginUser(t, "user1") - - r := fmt.Sprintf("%suser1/repo1.git", u.String()) - remoteURL, _ := url.Parse(r) - remoteURL.User = url.UserPassword("user1", userPassword) - doGitAddRemote(dstPath, "forked-2", remoteURL)(t) - - err := git.NewCommand(git.DefaultContext, "push", "forked-2", "HEAD:branch").Run(&git.RunOpts{Dir: dstPath}) - require.NoError(t, err) - - req := NewRequestWithValues(t, "POST", repo.FullName()+"/compare/main...user1/repo1:branch", map[string]string{ - "_csrf": GetCSRF(t, session, repo.FullName()+"/compare/main...user1/repo1:branch"), - "title": "pull request", - }) - session.MakeRequest(t, req, http.StatusOK) - - pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadBranch: "branch"}) - unittest.AssertExistsIf(t, true, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 4}) - }) - - t.Run("Codeowner user with no permission", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - // Make repository private, only user2 (owner of repository) has now access to this repository. - repo.IsPrivate = true - _, err := db.GetEngine(db.DefaultContext).Cols("is_private").Update(repo) - require.NoError(t, err) - - err = os.WriteFile(path.Join(dstPath, "README.md"), []byte("## very sensitive info"), 0o666) - require.NoError(t, err) - - err = git.AddChanges(dstPath, true) - require.NoError(t, err) - - err = 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 secrets to the README.", - }) - require.NoError(t, err) - - err = git.NewCommand(git.DefaultContext, "push", "origin", "HEAD:refs/for/main", "-o", "topic=codeowner-private").Run(&git.RunOpts{Dir: dstPath}) - require.NoError(t, err) - - // In CODEOWNERS file the codeowner for README.md is user5, but does not have access to this private repository. - pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadBranch: "user2/codeowner-private"}) - unittest.AssertExistsIf(t, false, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 5}) - }) }) } diff --git a/tests/integration/commit_status_test.go b/tests/integration/commit_status_test.go deleted file mode 100644 index 924fc5b074..0000000000 --- a/tests/integration/commit_status_test.go +++ /dev/null @@ -1,206 +0,0 @@ -// Copyright 2024 The Forgejo Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -package integration - -import ( - "testing" - - "code.gitea.io/gitea/models/db" - git_model "code.gitea.io/gitea/models/git" - "code.gitea.io/gitea/models/unittest" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestGetLatestCommitStatusForPairs(t *testing.T) { - require.NoError(t, unittest.PrepareTestDatabase()) - - t.Run("Empty", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - pairs, err := git_model.GetLatestCommitStatusForPairs(db.DefaultContext, nil) - require.NoError(t, err) - assert.EqualValues(t, map[int64][]*git_model.CommitStatus{}, pairs) - }) - - t.Run("Repo 1", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - pairs, err := git_model.GetLatestCommitStatusForPairs(db.DefaultContext, []git_model.RepoSHA{{RepoID: 1, SHA: "1234123412341234123412341234123412341234"}}) - require.NoError(t, err) - - assert.EqualValues(t, map[int64][]*git_model.CommitStatus{ - 1: { - { - ID: 7, - Index: 6, - RepoID: 1, - State: structs.CommitStatusPending, - SHA: "1234123412341234123412341234123412341234", - TargetURL: "https://example.com/builds/", - Description: "My awesome deploy service", - ContextHash: "ae9547713a6665fc4261d0756904932085a41cf2", - Context: "deploy/awesomeness", - CreatorID: 2, - }, - { - ID: 4, - Index: 4, - State: structs.CommitStatusFailure, - TargetURL: "https://example.com/builds/", - Description: "My awesome CI-service", - Context: "ci/awesomeness", - CreatorID: 2, - RepoID: 1, - SHA: "1234123412341234123412341234123412341234", - ContextHash: "c65f4d64a3b14a3eced0c9b36799e66e1bd5ced7", - }, - { - ID: 3, - Index: 3, - State: structs.CommitStatusSuccess, - TargetURL: "https://example.com/coverage/", - Description: "My awesome Coverage service", - Context: "cov/awesomeness", - CreatorID: 2, - RepoID: 1, - SHA: "1234123412341234123412341234123412341234", - ContextHash: "3929ac7bccd3fa1bf9b38ddedb77973b1b9a8cfe", - }, - }, - }, pairs) - }) - t.Run("Repo 62", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - pairs, err := git_model.GetLatestCommitStatusForPairs(db.DefaultContext, []git_model.RepoSHA{{RepoID: 62, SHA: "774f93df12d14931ea93259ae93418da4482fcc1"}}) - require.NoError(t, err) - - assert.EqualValues(t, map[int64][]*git_model.CommitStatus{ - 62: { - { - ID: 8, - Index: 2, - RepoID: 62, - State: structs.CommitStatusError, - TargetURL: "/user2/test_workflows/actions", - Description: "My awesome deploy service - v2", - Context: "deploy/awesomeness", - SHA: "774f93df12d14931ea93259ae93418da4482fcc1", - ContextHash: "ae9547713a6665fc4261d0756904932085a41cf2", - CreatorID: 2, - }, - }, - }, pairs) - }) - - t.Run("Repo 62 non-existent sha", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - pairs, err := git_model.GetLatestCommitStatusForPairs(db.DefaultContext, []git_model.RepoSHA{{RepoID: 62, SHA: "774f93df12d14931ea93259ae93418da4482fcc"}}) - require.NoError(t, err) - - assert.EqualValues(t, map[int64][]*git_model.CommitStatus{}, pairs) - }) - - t.Run("SHA with non-existent repo id", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - pairs, err := git_model.GetLatestCommitStatusForPairs(db.DefaultContext, []git_model.RepoSHA{{RepoID: 1, SHA: "774f93df12d14931ea93259ae93418da4482fcc1"}}) - require.NoError(t, err) - - assert.EqualValues(t, map[int64][]*git_model.CommitStatus{}, pairs) - }) -} - -func TestGetLatestCommitStatusForRepoCommitIDs(t *testing.T) { - require.NoError(t, unittest.PrepareTestDatabase()) - - t.Run("Empty", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - repoStatuses, err := git_model.GetLatestCommitStatusForRepoCommitIDs(db.DefaultContext, 62, nil) - require.NoError(t, err) - assert.EqualValues(t, map[string][]*git_model.CommitStatus{}, repoStatuses) - }) - - t.Run("Repo 1", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - repoStatuses, err := git_model.GetLatestCommitStatusForRepoCommitIDs(db.DefaultContext, 1, []string{"1234123412341234123412341234123412341234"}) - require.NoError(t, err) - assert.EqualValues(t, map[string][]*git_model.CommitStatus{ - "1234123412341234123412341234123412341234": { - { - ID: 3, - Index: 3, - State: structs.CommitStatusSuccess, - TargetURL: "https://example.com/coverage/", - Description: "My awesome Coverage service", - Context: "cov/awesomeness", - CreatorID: 2, - RepoID: 1, - SHA: "1234123412341234123412341234123412341234", - ContextHash: "3929ac7bccd3fa1bf9b38ddedb77973b1b9a8cfe", - }, - { - ID: 4, - Index: 4, - State: structs.CommitStatusFailure, - TargetURL: "https://example.com/builds/", - Description: "My awesome CI-service", - Context: "ci/awesomeness", - CreatorID: 2, - RepoID: 1, - SHA: "1234123412341234123412341234123412341234", - ContextHash: "c65f4d64a3b14a3eced0c9b36799e66e1bd5ced7", - }, - { - ID: 7, - Index: 6, - RepoID: 1, - State: structs.CommitStatusPending, - SHA: "1234123412341234123412341234123412341234", - TargetURL: "https://example.com/builds/", - Description: "My awesome deploy service", - ContextHash: "ae9547713a6665fc4261d0756904932085a41cf2", - Context: "deploy/awesomeness", - CreatorID: 2, - }, - }, - }, repoStatuses) - }) - - t.Run("Repo 62", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - repoStatuses, err := git_model.GetLatestCommitStatusForRepoCommitIDs(db.DefaultContext, 62, []string{"774f93df12d14931ea93259ae93418da4482fcc1"}) - require.NoError(t, err) - assert.EqualValues(t, map[string][]*git_model.CommitStatus{ - "774f93df12d14931ea93259ae93418da4482fcc1": { - { - ID: 8, - Index: 2, - RepoID: 62, - State: structs.CommitStatusError, - TargetURL: "/user2/test_workflows/actions", - Description: "My awesome deploy service - v2", - Context: "deploy/awesomeness", - SHA: "774f93df12d14931ea93259ae93418da4482fcc1", - ContextHash: "ae9547713a6665fc4261d0756904932085a41cf2", - CreatorID: 2, - }, - }, - }, repoStatuses) - }) - - t.Run("Repo 62 non-existent sha", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - repoStatuses, err := git_model.GetLatestCommitStatusForRepoCommitIDs(db.DefaultContext, 62, []string{"774f93df12d14931ea93259ae93418da4482fcc"}) - require.NoError(t, err) - assert.EqualValues(t, map[string][]*git_model.CommitStatus{}, repoStatuses) - }) - - t.Run("non-existent repo ID", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - repoStatuses, err := git_model.GetLatestCommitStatusForRepoCommitIDs(db.DefaultContext, 1, []string{"774f93df12d14931ea93259ae93418da4482fcc"}) - require.NoError(t, err) - assert.EqualValues(t, map[string][]*git_model.CommitStatus{}, repoStatuses) - }) -} diff --git a/tests/integration/compare_test.go b/tests/integration/compare_test.go index d134ebf40a..c65335c469 100644 --- a/tests/integration/compare_test.go +++ b/tests/integration/compare_test.go @@ -23,7 +23,6 @@ import ( files_service "code.gitea.io/gitea/services/repository/files" "code.gitea.io/gitea/tests" - "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -41,7 +40,7 @@ func TestCompareTag(t *testing.T) { req = NewRequest(t, "GET", "/user2/repo1/compare/invalid") resp = session.MakeRequest(t, req, http.StatusNotFound) - assert.NotContains(t, resp.Body.String(), ">500<", "expect 404 page not 500") + assert.False(t, strings.Contains(resp.Body.String(), ">500<"), "expect 404 page not 500") } // Compare with inferred default branch (master) @@ -68,114 +67,6 @@ func inspectCompare(t *testing.T, htmlDoc *HTMLDoc, diffCount int, diffChanges [ } } -func TestComparePatchAndDiffMenuEntries(t *testing.T) { - defer tests.PrepareTestEnv(t)() - - session := loginUser(t, "user2") - req := NewRequest(t, "GET", "/user2/repo-release/compare/v1.0...v2.0") - resp := session.MakeRequest(t, req, http.StatusOK) - htmlDoc := NewHTMLParser(t, resp.Body) - downloadOptions := htmlDoc.doc.Find("a.item[download]") - var patchDownloadEntryPresent bool - var diffDownloadEntryPresent bool - downloadOptions.Each(func(idx int, c *goquery.Selection) { - value, exists := c.Attr("download") - if exists && strings.HasSuffix(value, ".patch") { - patchDownloadEntryPresent = true - } - - if exists && strings.HasSuffix(value, ".diff") { - diffDownloadEntryPresent = true - } - }) - - assert.True(t, patchDownloadEntryPresent, "Patch file download entry should be present") - assert.True(t, diffDownloadEntryPresent, "Diff file download entry should be present") -} - -func TestComparePatchDownload(t *testing.T) { - defer tests.PrepareTestEnv(t)() - - session := loginUser(t, "user2") - req := NewRequest(t, "GET", "/user2/repo-release/compare/v1.0...v2.0.patch") - attendedResponse := `From 4380f99290b2b3922733ff82c57afad915ace907 Mon Sep 17 00:00:00 2001 -From: user1 -Date: Mon, 17 Apr 2023 14:39:35 +0200 -Subject: [PATCH 1/3] feature v2 - ---- - feature | 0 - 1 file changed, 0 insertions(+), 0 deletions(-) - create mode 100644 feature - -diff --git a/feature b/feature -new file mode 100644 -index 0000000..e69de29 - -From 79f9d88f1b054d650f88da0bd658e21f7b0cf6ec Mon Sep 17 00:00:00 2001 -From: user1 -Date: Mon, 17 Apr 2023 14:38:53 +0200 -Subject: [PATCH 2/3] bugfix - ---- - bugfix | 0 - 1 file changed, 0 insertions(+), 0 deletions(-) - create mode 100644 bugfix - -diff --git a/bugfix b/bugfix -new file mode 100644 -index 0000000..e69de29 - -From 7197b56fdc75b453f47c9110938cb46a303579fd Mon Sep 17 00:00:00 2001 -From: user1 -Date: Mon, 17 Apr 2023 14:42:34 +0200 -Subject: [PATCH 3/3] readme: v2 - ---- - README.md | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/README.md b/README.md -index 6dfe48a..bc7068d 100644 ---- a/README.md -+++ b/README.md -@@ -1,3 +1,3 @@ - # Releases test repo - --With a v1.0 -+With a v1.0 and a v2.0 -` - - resp := session.MakeRequest(t, req, http.StatusOK) - assert.Equal(t, attendedResponse, resp.Body.String()) -} - -func TestCompareDiffDownload(t *testing.T) { - defer tests.PrepareTestEnv(t)() - - session := loginUser(t, "user2") - req := NewRequest(t, "GET", "/user2/repo-release/compare/v1.0...v2.0.diff") - attendedResponse := `diff --git a/README.md b/README.md -index 6dfe48a..bc7068d 100644 ---- a/README.md -+++ b/README.md -@@ -1,3 +1,3 @@ - # Releases test repo - --With a v1.0 -+With a v1.0 and a v2.0 -diff --git a/bugfix b/bugfix -new file mode 100644 -index 0000000..e69de29 -diff --git a/feature b/feature -new file mode 100644 -index 0000000..e69de29 -` - - resp := session.MakeRequest(t, req, http.StatusOK) - assert.Equal(t, attendedResponse, resp.Body.String()) -} - // Git commit graph for repo20 // * 8babce9 (origin/remove-files-b) Add a dummy file // * b67e43a Delete test.csv and link_hi @@ -400,43 +291,3 @@ func TestCompareCodeExpand(t *testing.T) { }) }) } - -func TestCompareSignedIn(t *testing.T) { - onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) { - // Setup the test with a connected user - session := loginUser(t, "user1") - testRepoFork(t, session, "user2", "repo1", "user1", "repo1") - testCreateBranch(t, session, "user1", "repo1", "branch/master", "recent-push", http.StatusSeeOther) - testEditFile(t, session, "user1", "repo1", "recent-push", "README.md", "Hello recently!\n") - - newPrSelector := "button.ui.button.primary.show-form" - - t.Run("PR creation button displayed if logged in", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - req := NewRequest(t, "GET", "/user1/repo1/compare/master...recent-push") - resp := session.MakeRequest(t, req, http.StatusOK) - htmlDoc := NewHTMLParser(t, resp.Body) - - // Check that the "Sign in" button doesn't show up - htmlDoc.AssertElement(t, "a[href='/user/login?redirect_to=%2Fuser1%2Frepo1%2Fcompare%2Fmaster...recent-push']", false) - - // Check that the "New pull request" button shows up - htmlDoc.AssertElement(t, newPrSelector, true) - }) - - t.Run("no PR creation button but display warning", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - req := NewRequest(t, "GET", "/user1/repo1/compare/master...recent-push") - resp := MakeRequest(t, req, http.StatusOK) - htmlDoc := NewHTMLParser(t, resp.Body) - - // Check that the "Sign in" button shows up - htmlDoc.AssertElement(t, "a[href='/user/login?redirect_to=%2Fuser1%2Frepo1%2Fcompare%2Fmaster...recent-push']", true) - - // Check that the "New pull request" button doesn't show up - htmlDoc.AssertElement(t, newPrSelector, false) - }) - }) -} diff --git a/tests/integration/csrf_test.go b/tests/integration/csrf_test.go index fcb9661b8a..a789859889 100644 --- a/tests/integration/csrf_test.go +++ b/tests/integration/csrf_test.go @@ -5,10 +5,12 @@ package integration import ( "net/http" + "strings" "testing" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/tests" "github.com/stretchr/testify/assert" @@ -23,12 +25,28 @@ func TestCsrfProtection(t *testing.T) { req := NewRequestWithValues(t, "POST", "/user/settings", map[string]string{ "_csrf": "fake_csrf", }) - resp := session.MakeRequest(t, req, http.StatusBadRequest) - assert.Contains(t, resp.Body.String(), "Invalid CSRF token") + session.MakeRequest(t, req, http.StatusSeeOther) + + resp := session.MakeRequest(t, req, http.StatusSeeOther) + loc := resp.Header().Get("Location") + assert.Equal(t, setting.AppSubURL+"/", loc) + resp = session.MakeRequest(t, NewRequest(t, "GET", loc), http.StatusOK) + htmlDoc := NewHTMLParser(t, resp.Body) + assert.Equal(t, "Bad Request: invalid CSRF token", + strings.TrimSpace(htmlDoc.doc.Find(".ui.message").Text()), + ) // test web form csrf via header. TODO: should use an UI api to test req = NewRequest(t, "POST", "/user/settings") req.Header.Add("X-Csrf-Token", "fake_csrf") - resp = session.MakeRequest(t, req, http.StatusBadRequest) - assert.Contains(t, resp.Body.String(), "Invalid CSRF token") + session.MakeRequest(t, req, http.StatusSeeOther) + + resp = session.MakeRequest(t, req, http.StatusSeeOther) + loc = resp.Header().Get("Location") + assert.Equal(t, setting.AppSubURL+"/", loc) + resp = session.MakeRequest(t, NewRequest(t, "GET", loc), http.StatusOK) + htmlDoc = NewHTMLParser(t, resp.Body) + assert.Equal(t, "Bad Request: invalid CSRF token", + strings.TrimSpace(htmlDoc.doc.Find(".ui.message").Text()), + ) } diff --git a/tests/integration/dummy_lang_test.go b/tests/integration/dummy_lang_test.go deleted file mode 100644 index d26ea6edc4..0000000000 --- a/tests/integration/dummy_lang_test.go +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2024 The Forgejo Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -package integration - -import ( - "net/http" - "testing" - - "code.gitea.io/gitea/tests" - - "github.com/stretchr/testify/assert" -) - -func TestKeyLocale(t *testing.T) { - defer tests.PrepareTestEnv(t)() - - req := NewRequest(t, "GET", "/user2/repo1/issues?lang=dummy") - resp := MakeRequest(t, req, http.StatusOK) - - htmlDoc := NewHTMLParser(t, resp.Body) - newButton := htmlDoc.doc.Find(".list-header-issues > .issue-list-new") - assert.Equal(t, "(repo.issues.new)", newButton.Text()) -} diff --git a/tests/integration/easymde_test.go b/tests/integration/easymde_test.go index 2b4630d8b4..c8203d36be 100644 --- a/tests/integration/easymde_test.go +++ b/tests/integration/easymde_test.go @@ -6,19 +6,14 @@ package integration import ( "net/http" "testing" - - "code.gitea.io/gitea/tests" ) func TestEasyMDESwitch(t *testing.T) { - defer tests.PrepareTestEnv(t)() session := loginUser(t, "user2") testEasyMDESwitch(t, session, "user2/glob/issues/1", false) testEasyMDESwitch(t, session, "user2/glob/issues/new", false) testEasyMDESwitch(t, session, "user2/glob/wiki?action=_new", true) testEasyMDESwitch(t, session, "user2/glob/releases/new", true) - testEasyMDESwitch(t, session, "user2/glob/milestones/new", true) - testEasyMDESwitch(t, session, "user2/repo1/milestones/1/edit", true) } func testEasyMDESwitch(t *testing.T, session *TestSession, url string, expected bool) { diff --git a/tests/integration/editor_test.go b/tests/integration/editor_test.go index 96d388ddb9..4ed6485717 100644 --- a/tests/integration/editor_test.go +++ b/tests/integration/editor_test.go @@ -1,5 +1,4 @@ // Copyright 2017 The Gitea Authors. All rights reserved. -// Copyright 2024 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT package integration @@ -28,6 +27,35 @@ import ( "github.com/stretchr/testify/require" ) +func TestCreateFile(t *testing.T) { + onGiteaRun(t, func(t *testing.T, u *url.URL) { + session := loginUser(t, "user2") + testCreateFile(t, session, "user2", "repo1", "master", "test.txt", "Content") + }) +} + +func testCreateFile(t *testing.T, session *TestSession, user, repo, branch, filePath, content string) *httptest.ResponseRecorder { + // Request editor page + newURL := fmt.Sprintf("/%s/%s/_new/%s/", user, repo, branch) + req := NewRequest(t, "GET", newURL) + resp := session.MakeRequest(t, req, http.StatusOK) + + doc := NewHTMLParser(t, resp.Body) + lastCommit := doc.GetInputValueByName("last_commit") + assert.NotEmpty(t, lastCommit) + + // Save new file to master branch + req = NewRequestWithValues(t, "POST", newURL, map[string]string{ + "_csrf": doc.GetCSRF(), + "last_commit": lastCommit, + "tree_path": filePath, + "content": content, + "commit_choice": "direct", + "commit_mail_id": "3", + }) + return session.MakeRequest(t, req, http.StatusSeeOther) +} + func TestCreateFileOnProtectedBranch(t *testing.T) { onGiteaRun(t, func(t *testing.T, u *url.URL) { session := loginUser(t, "user2") diff --git a/tests/integration/fixtures/TestFeed/action.yml b/tests/integration/fixtures/TestFeed/action.yml deleted file mode 100644 index c00e4bcc59..0000000000 --- a/tests/integration/fixtures/TestFeed/action.yml +++ /dev/null @@ -1,9 +0,0 @@ -- id: 1001 - user_id: 2 - op_type: 10 # close issue - act_user_id: 2 - comment_id: 1001 - repo_id: 1 # public - is_private: false - created_unix: 1680454039 - content: '1|This is a very long text, so lets scream together: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa…' diff --git a/tests/integration/fixtures/TestFeed/comment.yml b/tests/integration/fixtures/TestFeed/comment.yml deleted file mode 100644 index bfa0c8c3ef..0000000000 --- a/tests/integration/fixtures/TestFeed/comment.yml +++ /dev/null @@ -1,8 +0,0 @@ -- - id: 1001 - type: 0 # comment - poster_id: 2 - issue_id: 1 # in repo_id 1 - content: "This is a very long text, so lets scream together: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" - created_unix: 1729602027 - updated_unix: 1729602027 diff --git a/tests/integration/fixtures/TestFeed/team.yml b/tests/integration/fixtures/TestFeed/team.yml deleted file mode 100644 index da27ac7c0c..0000000000 --- a/tests/integration/fixtures/TestFeed/team.yml +++ /dev/null @@ -1,21 +0,0 @@ -- - id: 1001 - org_id: 3 - lower_name: no_code - name: no_code - authorize: 1 # read - num_repos: 1 - num_members: 1 - includes_all_repositories: false - can_create_org_repo: false - -- - id: 1002 - org_id: 3 - lower_name: read_code - name: no_code - authorize: 1 # read - num_repos: 1 - num_members: 1 - includes_all_repositories: false - can_create_org_repo: false diff --git a/tests/integration/fixtures/TestFeed/team_repo.yml b/tests/integration/fixtures/TestFeed/team_repo.yml deleted file mode 100644 index 922d1ef51e..0000000000 --- a/tests/integration/fixtures/TestFeed/team_repo.yml +++ /dev/null @@ -1,11 +0,0 @@ -- - id: 1001 - org_id: 3 - team_id: 1001 - repo_id: 3 - -- - id: 1002 - org_id: 3 - team_id: 1002 - repo_id: 3 diff --git a/tests/integration/fixtures/TestFeed/team_unit.yml b/tests/integration/fixtures/TestFeed/team_unit.yml deleted file mode 100644 index 9fcb4396dc..0000000000 --- a/tests/integration/fixtures/TestFeed/team_unit.yml +++ /dev/null @@ -1,83 +0,0 @@ -- - id: 1001 - team_id: 1001 - type: 1 - access_mode: 0 - -- - id: 1002 - team_id: 1001 - type: 2 - access_mode: 1 - -- - id: 1003 - team_id: 1001 - type: 3 - access_mode: 1 - -- - id: 1004 - team_id: 1001 - type: 4 - access_mode: 1 - -- - id: 1005 - team_id: 1001 - type: 5 - access_mode: 1 - -- - id: 1006 - team_id: 1001 - type: 6 - access_mode: 1 - -- - id: 1007 - team_id: 1001 - type: 7 - access_mode: 1 - -- - id: 1008 - team_id: 1002 - type: 1 - access_mode: 1 - -- - id: 1009 - team_id: 1002 - type: 2 - access_mode: 1 - -- - id: 1010 - team_id: 1002 - type: 3 - access_mode: 1 - -- - id: 1011 - team_id: 1002 - type: 4 - access_mode: 1 - -- - id: 1012 - team_id: 1002 - type: 5 - access_mode: 1 - -- - id: 1013 - team_id: 1002 - type: 6 - access_mode: 1 - -- - id: 1014 - team_id: 1002 - type: 7 - access_mode: 1 diff --git a/tests/integration/fixtures/TestFeed/team_user.yml b/tests/integration/fixtures/TestFeed/team_user.yml deleted file mode 100644 index 15fa3ebb1d..0000000000 --- a/tests/integration/fixtures/TestFeed/team_user.yml +++ /dev/null @@ -1,11 +0,0 @@ -- - id: 1001 - org_id: 3 - team_id: 1001 - uid: 8 - -- - id: 1002 - org_id: 3 - team_id: 1002 - uid: 9 diff --git a/tests/integration/fixtures/TestPullCombinedReviewRequest/review.yml b/tests/integration/fixtures/TestPullCombinedReviewRequest/review.yml deleted file mode 100644 index deea4492e9..0000000000 --- a/tests/integration/fixtures/TestPullCombinedReviewRequest/review.yml +++ /dev/null @@ -1,21 +0,0 @@ -- - id: 1001 - type: 4 - reviewer_id: 2 - issue_id: 3 - official: true - stale: false - original_author_id: 0 - updated_unix: 1000000000 - created_unix: 1000000000 - -- - id: 1002 - type: 4 - reviewer_id: 11 - issue_id: 3 - official: true - stale: false - original_author_id: 0 - updated_unix: 1000000000 - created_unix: 1000000000 diff --git a/tests/integration/wiki_test.go b/tests/integration/git_clone_wiki_test.go similarity index 68% rename from tests/integration/wiki_test.go rename to tests/integration/git_clone_wiki_test.go index 30170086d2..ec99374c81 100644 --- a/tests/integration/wiki_test.go +++ b/tests/integration/git_clone_wiki_test.go @@ -6,18 +6,15 @@ package integration import ( "context" "fmt" - "net/http" "net/url" "os" "path/filepath" - "strings" "testing" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/tests" - "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) @@ -36,6 +33,8 @@ func assertFileEqual(t *testing.T, p string, content []byte) { func TestRepoCloneWiki(t *testing.T) { onGiteaRun(t, func(t *testing.T, u *url.URL) { + defer tests.PrepareTestEnv(t)() + dstPath := t.TempDir() r := fmt.Sprintf("%suser2/repo1.wiki.git", u.String()) @@ -51,23 +50,3 @@ func TestRepoCloneWiki(t *testing.T) { }) }) } - -func Test_RepoWikiPages(t *testing.T) { - defer tests.PrepareTestEnv(t)() - - url := "/user2/repo1/wiki/?action=_pages" - req := NewRequest(t, "GET", url) - resp := MakeRequest(t, req, http.StatusOK) - - doc := NewHTMLParser(t, resp.Body) - expectedPagePaths := []string{ - "Home", "Long-Page", "Page-With-Image", "Page-With-Spaced-Name", "Unescaped-File", "XSS", - } - doc.Find("tr").Each(func(i int, s *goquery.Selection) { - firstAnchor := s.Find("a").First() - href, _ := firstAnchor.Attr("href") - pagePath := strings.TrimPrefix(href, "/user2/repo1/wiki/") - - assert.EqualValues(t, expectedPagePaths[i], pagePath) - }) -} diff --git a/tests/integration/git_helper_for_declarative_test.go b/tests/integration/git_helper_for_declarative_test.go index 83d8177460..490d4caae0 100644 --- a/tests/integration/git_helper_for_declarative_test.go +++ b/tests/integration/git_helper_for_declarative_test.go @@ -12,13 +12,13 @@ import ( "os" "path" "path/filepath" - "regexp" "strconv" "testing" "time" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/ssh" "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/tests" @@ -33,10 +33,8 @@ func withKeyFile(t *testing.T, keyname string, callback func(string)) { require.NoError(t, err) keyFile := filepath.Join(tmpDir, keyname) - pubkey, privkey, err := util.GenerateSSHKeypair() + err = ssh.GenKeyPair(keyFile) require.NoError(t, err) - require.NoError(t, os.WriteFile(keyFile, privkey, 0o600)) - require.NoError(t, os.WriteFile(keyFile+".pub", pubkey, 0o600)) err = os.WriteFile(path.Join(tmpDir, "ssh"), []byte("#!/bin/bash\n"+ "ssh -o \"UserKnownHostsFile=/dev/null\" -o \"StrictHostKeyChecking=no\" -o \"IdentitiesOnly=yes\" -i \""+keyFile+"\" \"$@\""), 0o700) @@ -60,8 +58,6 @@ func createSSHUrl(gitPath string, u *url.URL) *url.URL { return &u2 } -var rootPathRe = regexp.MustCompile("\\[repository\\]\nROOT\\s=\\s.*") - func onGiteaRun[T testing.TB](t T, callback func(T, *url.URL)) { defer tests.PrepareTestEnv(t, 1)() s := http.Server{ @@ -80,13 +76,7 @@ func onGiteaRun[T testing.TB](t T, callback func(T, *url.URL)) { require.NoError(t, err) u.Host = listener.Addr().String() - // Override repository root in config. - conf, err := os.ReadFile(setting.CustomConf) - require.NoError(t, err) - require.NoError(t, os.WriteFile(setting.CustomConf, rootPathRe.ReplaceAll(conf, []byte("[repository]\nROOT = "+setting.RepoRootPath)), 0o600)) - defer func() { - require.NoError(t, os.WriteFile(setting.CustomConf, conf, 0o600)) ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute) s.Shutdown(ctx) cancel() diff --git a/tests/integration/git_push_test.go b/tests/integration/git_push_test.go index 50b4de9219..c9c33dc110 100644 --- a/tests/integration/git_push_test.go +++ b/tests/integration/git_push_test.go @@ -19,7 +19,6 @@ import ( repo_module "code.gitea.io/gitea/modules/repository" "code.gitea.io/gitea/modules/test" repo_service "code.gitea.io/gitea/services/repository" - "code.gitea.io/gitea/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -41,7 +40,7 @@ func testGitPush(t *testing.T, u *url.URL) { forEachObjectFormat(t, func(t *testing.T, objectFormat git.ObjectFormat) { t.Run("Push branches at once", func(t *testing.T) { runTestGitPush(t, u, objectFormat, func(t *testing.T, gitPath string) (pushed, deleted []string) { - for i := 0; i < 10; i++ { + for i := 0; i < 100; i++ { branchName := fmt.Sprintf("branch-%d", i) pushed = append(pushed, branchName) doGitCreateBranch(gitPath, branchName)(t) @@ -89,7 +88,7 @@ func testGitPush(t *testing.T, u *url.URL) { t.Run("Push branches one by one", func(t *testing.T) { runTestGitPush(t, u, objectFormat, func(t *testing.T, gitPath string) (pushed, deleted []string) { - for i := 0; i < 10; i++ { + for i := 0; i < 100; i++ { branchName := fmt.Sprintf("branch-%d", i) doGitCreateBranch(gitPath, branchName)(t) doGitPushTestRepository(gitPath, "origin", branchName)(t) @@ -104,7 +103,7 @@ func testGitPush(t *testing.T, u *url.URL) { doGitPushTestRepository(gitPath, "origin", "master")(t) // make sure master is the default branch instead of a branch we are going to delete pushed = append(pushed, "master") - for i := 0; i < 10; i++ { + for i := 0; i < 100; i++ { branchName := fmt.Sprintf("branch-%d", i) pushed = append(pushed, branchName) doGitCreateBranch(gitPath, branchName)(t) @@ -140,7 +139,6 @@ func testGitPush(t *testing.T, u *url.URL) { } func runTestGitPush(t *testing.T, u *url.URL, objectFormat git.ObjectFormat, gitOperation func(t *testing.T, gitPath string) (pushed, deleted []string)) { - defer tests.PrintCurrentTest(t, 1)() user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) repo, err := repo_service.CreateRepository(db.DefaultContext, user, user, repo_service.CreateRepoOptions{ Name: "repo-to-push", diff --git a/tests/integration/git_test.go b/tests/integration/git_test.go index 551912b273..2c46fdde68 100644 --- a/tests/integration/git_test.go +++ b/tests/integration/git_test.go @@ -8,7 +8,6 @@ import ( "crypto/rand" "encoding/hex" "fmt" - "io" "net/http" "net/url" "os" @@ -40,8 +39,8 @@ import ( ) const ( - littleSize = 1024 // 1KiB - bigSize = 32 * 1024 * 1024 // 32MiB + littleSize = 1024 // 1ko + bigSize = 128 * 1024 * 1024 // 128Mo ) func TestGit(t *testing.T) { @@ -300,26 +299,53 @@ func lockFileTest(t *testing.T, filename, repoPath string) { require.NoError(t, err) } -func doCommitAndPush(t *testing.T, size int64, repoPath, prefix string) string { - name := generateCommitWithNewData(t, size, repoPath, "user2@example.com", "User Two", prefix) - _, _, err := git.NewCommand(git.DefaultContext, "push", "origin", "master").RunStdString(&git.RunOpts{Dir: repoPath}) // Push +func doCommitAndPush(t *testing.T, size int, repoPath, prefix string) string { + name, err := generateCommitWithNewData(size, repoPath, "user2@example.com", "User Two", prefix) + require.NoError(t, err) + _, _, err = git.NewCommand(git.DefaultContext, "push", "origin", "master").RunStdString(&git.RunOpts{Dir: repoPath}) // Push require.NoError(t, err) return name } -func generateCommitWithNewData(t *testing.T, size int64, repoPath, email, fullName, prefix string) string { - t.Helper() +func generateCommitWithNewData(size int, repoPath, email, fullName, prefix string) (string, error) { + // Generate random file + bufSize := 4 * 1024 + if bufSize > size { + bufSize = size + } + + buffer := make([]byte, bufSize) + tmpFile, err := os.CreateTemp(repoPath, prefix) - require.NoError(t, err) + if err != nil { + return "", err + } defer tmpFile.Close() - _, err = io.CopyN(tmpFile, rand.Reader, size) - require.NoError(t, err) + written := 0 + for written < size { + n := size - written + if n > bufSize { + n = bufSize + } + _, err := rand.Read(buffer[:n]) + if err != nil { + return "", err + } + n, err = tmpFile.Write(buffer[:n]) + if err != nil { + return "", err + } + written += n + } // Commit // Now here we should explicitly allow lfs filters to run globalArgs := git.AllowLFSFiltersArgs() - require.NoError(t, git.AddChangesWithArgs(repoPath, globalArgs, false, filepath.Base(tmpFile.Name()))) - require.NoError(t, git.CommitChangesWithArgs(repoPath, globalArgs, git.CommitChangesOptions{ + err = git.AddChangesWithArgs(repoPath, globalArgs, false, filepath.Base(tmpFile.Name())) + if err != nil { + return "", err + } + err = git.CommitChangesWithArgs(repoPath, globalArgs, git.CommitChangesOptions{ Committer: &git.Signature{ Email: email, Name: fullName, @@ -331,8 +357,8 @@ func generateCommitWithNewData(t *testing.T, size int64, repoPath, email, fullNa When: time.Now(), }, Message: fmt.Sprintf("Testing commit @ %v", time.Now()), - })) - return filepath.Base(tmpFile.Name()) + }) + return filepath.Base(tmpFile.Name()), err } func doBranchProtect(baseCtx *APITestContext, dstPath string) func(t *testing.T) { @@ -343,34 +369,12 @@ func doBranchProtect(baseCtx *APITestContext, dstPath string) func(t *testing.T) ctx := NewAPITestContext(t, baseCtx.Username, baseCtx.Reponame, auth_model.AccessTokenScopeWriteRepository) - t.Run("PushToNewProtectedBranch", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - t.Run("CreateBranchProtected", doGitCreateBranch(dstPath, "before-create-1")) - t.Run("ProtectProtectedBranch", doProtectBranch(ctx, "before-create-1", parameterProtectBranch{ - "enable_push": "all", - "apply_to_admins": "on", - })) - t.Run("PushProtectedBranch", doGitPushTestRepository(dstPath, "origin", "before-create-1")) - - t.Run("GenerateCommit", func(t *testing.T) { - generateCommitWithNewData(t, littleSize, dstPath, "user2@example.com", "User Two", "protected-file-data-") - }) - - t.Run("ProtectProtectedBranch", doProtectBranch(ctx, "before-create-2", parameterProtectBranch{ - "enable_push": "all", - "protected_file_patterns": "protected-file-data-*", - "apply_to_admins": "on", - })) - - doGitPushTestRepositoryFail(dstPath, "origin", "HEAD:before-create-2")(t) - }) - t.Run("FailToPushToProtectedBranch", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() t.Run("ProtectProtectedBranch", doProtectBranch(ctx, "protected")) t.Run("Create modified-protected-branch", doGitCheckoutBranch(dstPath, "-b", "modified-protected-branch", "protected")) t.Run("GenerateCommit", func(t *testing.T) { - generateCommitWithNewData(t, littleSize, dstPath, "user2@example.com", "User Two", "branch-data-file-") + _, err := generateCommitWithNewData(littleSize, dstPath, "user2@example.com", "User Two", "branch-data-file-") + require.NoError(t, err) }) doGitPushTestRepositoryFail(dstPath, "origin", "modified-protected-branch:protected")(t) @@ -379,10 +383,10 @@ func doBranchProtect(baseCtx *APITestContext, dstPath string) func(t *testing.T) t.Run("PushToUnprotectedBranch", doGitPushTestRepository(dstPath, "origin", "modified-protected-branch:unprotected")) t.Run("FailToPushProtectedFilesToProtectedBranch", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() t.Run("Create modified-protected-file-protected-branch", doGitCheckoutBranch(dstPath, "-b", "modified-protected-file-protected-branch", "protected")) t.Run("GenerateCommit", func(t *testing.T) { - generateCommitWithNewData(t, littleSize, dstPath, "user2@example.com", "User Two", "protected-file-") + _, err := generateCommitWithNewData(littleSize, dstPath, "user2@example.com", "User Two", "protected-file-") + require.NoError(t, err) }) t.Run("ProtectedFilePathsApplyToAdmins", doProtectBranch(ctx, "protected")) @@ -393,13 +397,13 @@ func doBranchProtect(baseCtx *APITestContext, dstPath string) func(t *testing.T) }) t.Run("PushUnprotectedFilesToProtectedBranch", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() t.Run("Create modified-unprotected-file-protected-branch", doGitCheckoutBranch(dstPath, "-b", "modified-unprotected-file-protected-branch", "protected")) t.Run("UnprotectedFilePaths", doProtectBranch(ctx, "protected", parameterProtectBranch{ "unprotected_file_patterns": "unprotected-file-*", })) t.Run("GenerateCommit", func(t *testing.T) { - generateCommitWithNewData(t, littleSize, dstPath, "user2@example.com", "User Two", "unprotected-file-") + _, err := generateCommitWithNewData(littleSize, dstPath, "user2@example.com", "User Two", "unprotected-file-") + require.NoError(t, err) }) doGitPushTestRepository(dstPath, "origin", "modified-unprotected-file-protected-branch:protected")(t) doGitCheckoutBranch(dstPath, "protected")(t) @@ -415,19 +419,19 @@ func doBranchProtect(baseCtx *APITestContext, dstPath string) func(t *testing.T) })) t.Run("WhitelistedUserFailToForcePushToProtectedBranch", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() t.Run("Create toforce", doGitCheckoutBranch(dstPath, "-b", "toforce", "master")) t.Run("GenerateCommit", func(t *testing.T) { - generateCommitWithNewData(t, littleSize, dstPath, "user2@example.com", "User Two", "branch-data-file-") + _, err := generateCommitWithNewData(littleSize, dstPath, "user2@example.com", "User Two", "branch-data-file-") + require.NoError(t, err) }) doGitPushTestRepositoryFail(dstPath, "-f", "origin", "toforce:protected")(t) }) t.Run("WhitelistedUserPushToProtectedBranch", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() t.Run("Create topush", doGitCheckoutBranch(dstPath, "-b", "topush", "protected")) t.Run("GenerateCommit", func(t *testing.T) { - generateCommitWithNewData(t, littleSize, dstPath, "user2@example.com", "User Two", "branch-data-file-") + _, err := generateCommitWithNewData(littleSize, dstPath, "user2@example.com", "User Two", "branch-data-file-") + require.NoError(t, err) }) doGitPushTestRepository(dstPath, "origin", "topush:protected")(t) }) @@ -667,7 +671,8 @@ func doAutoPRMerge(baseCtx *APITestContext, dstPath string) func(t *testing.T) { t.Run("CheckoutProtected", doGitCheckoutBranch(dstPath, "protected")) t.Run("PullProtected", doGitPull(dstPath, "origin", "protected")) t.Run("GenerateCommit", func(t *testing.T) { - generateCommitWithNewData(t, littleSize, dstPath, "user2@example.com", "User Two", "branch-data-file-") + _, err := generateCommitWithNewData(littleSize, dstPath, "user2@example.com", "User Two", "branch-data-file-") + require.NoError(t, err) }) t.Run("PushToUnprotectedBranch", doGitPushTestRepository(dstPath, "origin", "protected:unprotected3")) var pr api.PullRequest @@ -759,11 +764,6 @@ func doInternalReferences(ctx *APITestContext, dstPath string) func(t *testing.T require.Error(t, gitErr) assert.Contains(t, stdErr, fmt.Sprintf("remote: Forgejo: The deletion of refs/pull/%d/head is skipped as it's an internal reference.", pr1.Index)) assert.Contains(t, stdErr, fmt.Sprintf("[remote rejected] refs/pull/%d/head (hook declined)", pr1.Index)) - - _, stdErr, gitErr = git.NewCommand(git.DefaultContext, "push", "origin", "--force").AddDynamicArguments(fmt.Sprintf("HEAD~1:refs/pull/%d/head", pr1.Index)).RunStdString(&git.RunOpts{Dir: dstPath}) - require.Error(t, gitErr) - assert.Contains(t, stdErr, fmt.Sprintf("remote: Forgejo: The modification of refs/pull/%d/head is skipped as it's an internal reference.", pr1.Index)) - assert.Contains(t, stdErr, fmt.Sprintf("[remote rejected] HEAD~1 -> refs/pull/%d/head (hook declined)", pr1.Index)) } } diff --git a/tests/integration/incoming_email_test.go b/tests/integration/incoming_email_test.go index 66f833b28d..fdc0425b54 100644 --- a/tests/integration/incoming_email_test.go +++ b/tests/integration/incoming_email_test.go @@ -4,7 +4,6 @@ package integration import ( - "encoding/base32" "io" "net" "net/smtp" @@ -76,51 +75,6 @@ func TestIncomingEmail(t *testing.T) { assert.Equal(t, payload, p) }) - tokenEncoding := base32.StdEncoding.WithPadding(base32.NoPadding) - t.Run("Deprecated token version", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - payload := []byte{1, 2, 3, 4, 5} - - token, err := token_service.CreateToken(token_service.ReplyHandlerType, user, payload) - require.NoError(t, err) - assert.NotEmpty(t, token) - - // Set the token to version 1. - unencodedToken, err := tokenEncoding.DecodeString(token) - require.NoError(t, err) - unencodedToken[0] = 1 - token = tokenEncoding.EncodeToString(unencodedToken) - - ht, u, p, err := token_service.ExtractToken(db.DefaultContext, token) - require.ErrorContains(t, err, "unsupported token version: 1") - assert.Equal(t, token_service.UnknownHandlerType, ht) - assert.Nil(t, u) - assert.Nil(t, p) - }) - - t.Run("MAC check", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - payload := []byte{1, 2, 3, 4, 5} - - token, err := token_service.CreateToken(token_service.ReplyHandlerType, user, payload) - require.NoError(t, err) - assert.NotEmpty(t, token) - - // Modify the MAC. - unencodedToken, err := tokenEncoding.DecodeString(token) - require.NoError(t, err) - unencodedToken[len(unencodedToken)-1] ^= 0x01 - token = tokenEncoding.EncodeToString(unencodedToken) - - ht, u, p, err := token_service.ExtractToken(db.DefaultContext, token) - require.ErrorContains(t, err, "verification failed") - assert.Equal(t, token_service.UnknownHandlerType, ht) - assert.Nil(t, u) - assert.Nil(t, p) - }) - t.Run("Handler", func(t *testing.T) { t.Run("Reply", func(t *testing.T) { checkReply := func(t *testing.T, payload []byte, issue *issues_model.Issue, commentType issues_model.CommentType) { diff --git a/tests/integration/integration_test.go b/tests/integration/integration_test.go index 06d2586d1c..e43200f4cb 100644 --- a/tests/integration/integration_test.go +++ b/tests/integration/integration_test.go @@ -159,6 +159,13 @@ func TestMain(m *testing.M) { } } + os.Unsetenv("GIT_AUTHOR_NAME") + os.Unsetenv("GIT_AUTHOR_EMAIL") + os.Unsetenv("GIT_AUTHOR_DATE") + os.Unsetenv("GIT_COMMITTER_NAME") + os.Unsetenv("GIT_COMMITTER_EMAIL") + os.Unsetenv("GIT_COMMITTER_DATE") + err := unittest.InitFixtures( unittest.FixturesOptions{ Dir: filepath.Join(filepath.Dir(setting.AppPath), "models/fixtures/"), @@ -656,17 +663,12 @@ func VerifyJSONSchema(t testing.TB, resp *httptest.ResponseRecorder, schemaFile require.NoError(t, schemaValidation) } -// GetCSRF returns CSRF token from body -// If it fails, it means the CSRF token is not found in the response body returned by the url with the given session. -// In this case, you should find a better url to get it. func GetCSRF(t testing.TB, session *TestSession, urlStr string) string { t.Helper() req := NewRequest(t, "GET", urlStr) resp := session.MakeRequest(t, req, http.StatusOK) doc := NewHTMLParser(t, resp.Body) - csrf := doc.GetCSRF() - require.NotEmpty(t, csrf) - return csrf + return doc.GetCSRF() } func GetHTMLTitle(t testing.TB, session *TestSession, urlStr string) string { diff --git a/tests/integration/issue_test.go b/tests/integration/issue_test.go index 4c0a64ad70..909242efc6 100644 --- a/tests/integration/issue_test.go +++ b/tests/integration/issue_test.go @@ -500,7 +500,7 @@ func TestIssueCommentAttachment(t *testing.T) { link, exists := htmlDoc.doc.Find("#comment-form").Attr("action") assert.True(t, exists, "The template has changed") - uuid := createAttachment(t, session, GetCSRF(t, session, repoURL), repoURL, "image.png", generateImg(), http.StatusOK) + uuid := createAttachment(t, session, repoURL, "image.png", generateImg(), http.StatusOK) commentCount := htmlDoc.doc.Find(".comment-list .comment .render-content").Length() @@ -1301,38 +1301,3 @@ func TestIssueUserDashboard(t *testing.T) { htmlDoc.AssertElement(t, sel, true) } } - -func TestIssueOrgDashboard(t *testing.T) { - defer tests.PrepareTestEnv(t)() - - user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) - session := loginUser(t, user.Name) - - // assert 'your_repositories' is the default filter for org dashboards - const sel = ".dashboard .ui.list-header.dropdown .ui.menu a.active.item[href^='?type=your_repositories']" - - for _, path := range []string{"/org/org3/issues", "/org/org3/pulls"} { - req := NewRequest(t, "GET", path) - resp := session.MakeRequest(t, req, http.StatusOK) - htmlDoc := NewHTMLParser(t, resp.Body) - htmlDoc.AssertElement(t, sel, true) - } -} - -func TestIssueCount(t *testing.T) { - defer tests.PrepareTestEnv(t)() - - req := NewRequest(t, "GET", "/user2/repo1/issues") - resp := MakeRequest(t, req, http.StatusOK) - - htmlDoc := NewHTMLParser(t, resp.Body) - - openCount := htmlDoc.doc.Find("a[data-test-name='open-issue-count']").Text() - assert.Contains(t, openCount, "1\u00a0Open") - - closedCount := htmlDoc.doc.Find("a[data-test-name='closed-issue-count']").Text() - assert.Contains(t, closedCount, "1\u00a0Closed") - - allCount := htmlDoc.doc.Find("a[data-test-name='all-issue-count']").Text() - assert.Contains(t, allCount, "2\u00a0All") -} diff --git a/tests/integration/last_updated_time_test.go b/tests/integration/last_updated_time_test.go index 34ba9a471f..e7bf3a4a07 100644 --- a/tests/integration/last_updated_time_test.go +++ b/tests/integration/last_updated_time_test.go @@ -2,56 +2,61 @@ package integration import ( "net/http" + "net/url" "path" "strings" "testing" - "code.gitea.io/gitea/tests" - "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" ) func TestRepoLastUpdatedTime(t *testing.T) { - defer tests.PrepareTestEnv(t)() - user := "user2" - session := loginUser(t, user) + onGiteaRun(t, func(t *testing.T, u *url.URL) { + user := "user2" + session := loginUser(t, user) - req := NewRequest(t, "GET", "/explore/repos?q=repo1") - resp := session.MakeRequest(t, req, http.StatusOK) - doc := NewHTMLParser(t, resp.Body) - node := doc.doc.Find(".flex-item-main:has(a[href='/user2/repo1']) .flex-item-body").First() - { - buf := "" - findTextNonNested(t, node, &buf) - assert.Equal(t, "Updated", strings.TrimSpace(buf)) - } + req := NewRequest(t, "GET", path.Join("explore", "repos")) + resp := session.MakeRequest(t, req, http.StatusOK) + doc := NewHTMLParser(t, resp.Body) + node := doc.doc.Find(".flex-item-body").First() - // Relative time should be present as a descendent - assert.Contains(t, node.Find("relative-time").Text(), "2024-11-10") + { + buf := "" + findTextNonNested(t, node, &buf) + assert.Equal(t, "Updated", strings.TrimSpace(buf)) + } + + // Relative time should be present as a descendent + { + relativeTime := node.Find("relative-time").Text() + assert.True(t, strings.HasPrefix(relativeTime, "19")) // ~1970, might underflow with timezone + } + }) } func TestBranchLastUpdatedTime(t *testing.T) { - defer tests.PrepareTestEnv(t)() - user := "user2" - repo := "repo1" - session := loginUser(t, user) + onGiteaRun(t, func(t *testing.T, u *url.URL) { + user := "user2" + repo := "repo1" + session := loginUser(t, user) - req := NewRequest(t, "GET", path.Join(user, repo, "branches")) - resp := session.MakeRequest(t, req, http.StatusOK) - doc := NewHTMLParser(t, resp.Body) - node := doc.doc.Find("p:has(span.commit-message)") + req := NewRequest(t, "GET", path.Join(user, repo, "branches")) + resp := session.MakeRequest(t, req, http.StatusOK) + doc := NewHTMLParser(t, resp.Body) + node := doc.doc.Find("p:has(span.commit-message)") - { - buf := "" - findTextNonNested(t, node, &buf) - assert.Contains(t, buf, "Updated") - } + { + buf := "" + findTextNonNested(t, node, &buf) + assert.True(t, strings.Contains(buf, "Updated")) + } - { - relativeTime := node.Find("relative-time").Text() - assert.True(t, strings.HasPrefix(relativeTime, "2017")) - } + { + relativeTime := node.Find("relative-time").Text() + assert.True(t, strings.HasPrefix(relativeTime, "2017")) + } + }) } // Find all text that are direct descendents diff --git a/tests/integration/links_test.go b/tests/integration/links_test.go index e9ad933b24..68d7008e02 100644 --- a/tests/integration/links_test.go +++ b/tests/integration/links_test.go @@ -12,7 +12,6 @@ import ( "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/test" - forgejo_context "code.gitea.io/gitea/services/context" "code.gitea.io/gitea/tests" "github.com/stretchr/testify/assert" @@ -191,6 +190,11 @@ func TestRedirectsWebhooks(t *testing.T) { {from: "/user/settings/hooks/" + kind + "/new", to: "/user/login", verb: "GET"}, {from: "/admin/system-hooks/" + kind + "/new", to: "/user/login", verb: "GET"}, {from: "/admin/default-hooks/" + kind + "/new", to: "/user/login", verb: "GET"}, + {from: "/user2/repo1/settings/hooks/" + kind + "/new", to: "/", verb: "POST"}, + {from: "/admin/system-hooks/" + kind + "/new", to: "/", verb: "POST"}, + {from: "/admin/default-hooks/" + kind + "/new", to: "/", verb: "POST"}, + {from: "/user2/repo1/settings/hooks/1", to: "/", verb: "POST"}, + {from: "/admin/hooks/1", to: "/", verb: "POST"}, } for _, info := range redirects { req := NewRequest(t, info.verb, info.from) @@ -198,24 +202,6 @@ func TestRedirectsWebhooks(t *testing.T) { assert.EqualValues(t, path.Join(setting.AppSubURL, info.to), test.RedirectURL(resp), info.from) } } - - for _, kind := range []string{"forgejo", "gitea"} { - csrf := []struct { - from string - verb string - }{ - {from: "/user2/repo1/settings/hooks/" + kind + "/new", verb: "POST"}, - {from: "/admin/hooks/1", verb: "POST"}, - {from: "/admin/system-hooks/" + kind + "/new", verb: "POST"}, - {from: "/admin/default-hooks/" + kind + "/new", verb: "POST"}, - {from: "/user2/repo1/settings/hooks/1", verb: "POST"}, - } - for _, info := range csrf { - req := NewRequest(t, info.verb, info.from) - resp := MakeRequest(t, req, http.StatusBadRequest) - assert.Contains(t, resp.Body.String(), forgejo_context.CsrfErrorString) - } - } } func TestRepoLinks(t *testing.T) { diff --git a/tests/integration/mention_test.go b/tests/integration/mention_test.go deleted file mode 100644 index 36a0ccb312..0000000000 --- a/tests/integration/mention_test.go +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2024 The Forgejo Authors. All rights reserved. -// SPDX-License-Identifier: GPL-3.0-or-later - -package integration - -import ( - "net/http" - "testing" - - "github.com/stretchr/testify/assert" -) - -func TestHeadMentionCSS(t *testing.T) { - userSession := loginUser(t, "user2") - resp := userSession.MakeRequest(t, NewRequest(t, "GET", "/"), http.StatusOK) - assert.Contains(t, resp.Body.String(), `.mention[href="/user2" i]`) - - guestSession := emptyTestSession(t) - resp = guestSession.MakeRequest(t, NewRequest(t, "GET", "/"), http.StatusOK) - assert.NotContains(t, resp.Body.String(), `.mention[href="`) -} diff --git a/tests/integration/migrate_test.go b/tests/integration/migrate_test.go index c1e12f8267..43cfc4f37d 100644 --- a/tests/integration/migrate_test.go +++ b/tests/integration/migrate_test.go @@ -5,6 +5,7 @@ package integration import ( + "context" "fmt" "net/http" "net/url" @@ -16,15 +17,13 @@ import ( "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" "code.gitea.io/gitea/modules/translation" "code.gitea.io/gitea/services/migrations" - "code.gitea.io/gitea/tests" + "code.gitea.io/gitea/services/repository" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -59,8 +58,16 @@ func TestMigrateLocalPath(t *testing.T) { func TestMigrate(t *testing.T) { onGiteaRun(t, func(t *testing.T, u *url.URL) { - defer test.MockVariableValue(&setting.Migrations.AllowLocalNetworks, true)() - defer test.MockVariableValue(&setting.AppVer, "1.16.0")() + AllowLocalNetworks := setting.Migrations.AllowLocalNetworks + setting.Migrations.AllowLocalNetworks = true + AppVer := setting.AppVer + // Gitea SDK (go-sdk) need to parse the AppVer from server response, so we must set it to a valid version string. + setting.AppVer = "1.16.0" + defer func() { + setting.Migrations.AllowLocalNetworks = AllowLocalNetworks + setting.AppVer = AppVer + migrations.Init() + }() require.NoError(t, migrations.Init()) ownerName := "user2" @@ -75,152 +82,42 @@ func TestMigrate(t *testing.T) { {svc: structs.GiteaService}, {svc: structs.ForgejoService}, } { - t.Run(s.svc.Name(), func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - // Step 0: verify the repo is available - req := NewRequestf(t, "GET", "/%s/%s", ownerName, repoName) - _ = session.MakeRequest(t, req, http.StatusOK) - // Step 1: get the Gitea migration form - req = NewRequestf(t, "GET", "/repo/migrate/?service_type=%d", s.svc) - resp := session.MakeRequest(t, req, http.StatusOK) - // Step 2: load the form - htmlDoc := NewHTMLParser(t, resp.Body) - // Check form title - title := htmlDoc.doc.Find("title").Text() - assert.Contains(t, title, translation.NewLocale("en-US").TrString("new_migrate.title")) - // Get the link of migration button - link, exists := htmlDoc.doc.Find(`form.ui.form[action^="/repo/migrate"]`).Attr("action") - assert.True(t, exists, "The template has changed") - // Step 4: submit the migration to only migrate issues - migratedRepoName := "otherrepo-" + s.svc.Name() - req = NewRequestWithValues(t, "POST", link, map[string]string{ - "_csrf": htmlDoc.GetCSRF(), - "service": fmt.Sprintf("%d", s.svc), - "clone_addr": fmt.Sprintf("%s%s/%s", u, ownerName, repoName), - "auth_token": token, - "issues": "on", - "repo_name": migratedRepoName, - "description": "", - "uid": fmt.Sprintf("%d", repoOwner.ID), - }) - resp = session.MakeRequest(t, req, http.StatusSeeOther) - // Step 5: a redirection displays the migrated repository - assert.EqualValues(t, fmt.Sprintf("/%s/%s", ownerName, migratedRepoName), test.RedirectURL(resp)) - // Step 6: check the repo was created - unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{Name: migratedRepoName}) + // Step 0: verify the repo is available + req := NewRequestf(t, "GET", "/%s/%s", ownerName, repoName) + _ = session.MakeRequest(t, req, http.StatusOK) + // Step 1: get the Gitea migration form + req = NewRequestf(t, "GET", "/repo/migrate/?service_type=%d", s.svc) + resp := session.MakeRequest(t, req, http.StatusOK) + // Step 2: load the form + htmlDoc := NewHTMLParser(t, resp.Body) + // Check form title + title := htmlDoc.doc.Find("title").Text() + assert.Contains(t, title, translation.NewLocale("en-US").TrString("new_migrate.title")) + // Get the link of migration button + link, exists := htmlDoc.doc.Find(`form.ui.form[action^="/repo/migrate"]`).Attr("action") + assert.True(t, exists, "The template has changed") + // Step 4: submit the migration to only migrate issues + migratedRepoName := "otherrepo" + req = NewRequestWithValues(t, "POST", link, map[string]string{ + "_csrf": htmlDoc.GetCSRF(), + "service": fmt.Sprintf("%d", s.svc), + "clone_addr": fmt.Sprintf("%s%s/%s", u, ownerName, repoName), + "auth_token": token, + "issues": "on", + "repo_name": migratedRepoName, + "description": "", + "uid": fmt.Sprintf("%d", repoOwner.ID), }) - } - }) -} + resp = session.MakeRequest(t, req, http.StatusSeeOther) + // Step 5: a redirection displays the migrated repository + loc := resp.Header().Get("Location") + assert.EqualValues(t, fmt.Sprintf("/%s/%s", ownerName, migratedRepoName), loc) + // Step 6: check the repo was created + repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{Name: migratedRepoName}) -func TestMigrateWithWiki(t *testing.T) { - onGiteaRun(t, func(t *testing.T, u *url.URL) { - defer test.MockVariableValue(&setting.Migrations.AllowLocalNetworks, true)() - defer test.MockVariableValue(&setting.AppVer, "1.16.0")() - require.NoError(t, migrations.Init()) - - ownerName := "user2" - repoName := "repo1" - repoOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: ownerName}) - session := loginUser(t, ownerName) - token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeReadMisc) - - for _, s := range []struct { - svc structs.GitServiceType - }{ - {svc: structs.GiteaService}, - {svc: structs.ForgejoService}, - } { - t.Run(s.svc.Name(), func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - // Step 0: verify the repo is available - req := NewRequestf(t, "GET", "/%s/%s", ownerName, repoName) - _ = session.MakeRequest(t, req, http.StatusOK) - // Step 1: get the Gitea migration form - req = NewRequestf(t, "GET", "/repo/migrate/?service_type=%d", s.svc) - resp := session.MakeRequest(t, req, http.StatusOK) - // Step 2: load the form - htmlDoc := NewHTMLParser(t, resp.Body) - // Check form title - title := htmlDoc.doc.Find("title").Text() - assert.Contains(t, title, translation.NewLocale("en-US").TrString("new_migrate.title")) - // Step 4: submit the migration to only migrate issues - migratedRepoName := "otherrepo-" + s.svc.Name() - req = NewRequestWithValues(t, "POST", "/repo/migrate", map[string]string{ - "_csrf": GetCSRF(t, session, "/repo/migrate"), - "service": fmt.Sprintf("%d", s.svc), - "clone_addr": fmt.Sprintf("%s%s/%s", u, ownerName, repoName), - "auth_token": token, - "issues": "on", - "wiki": "on", - "repo_name": migratedRepoName, - "description": "", - "uid": fmt.Sprintf("%d", repoOwner.ID), - }) - resp = session.MakeRequest(t, req, http.StatusSeeOther) - // Step 5: a redirection displays the migrated repository - assert.EqualValues(t, fmt.Sprintf("/%s/%s", ownerName, migratedRepoName), test.RedirectURL(resp)) - // Step 6: check the repo was created and load the repo - migratedRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{Name: migratedRepoName}) - // Step 7: check if the wiki is enabled - assert.True(t, migratedRepo.UnitEnabled(db.DefaultContext, unit.TypeWiki)) - }) - } - }) -} - -func TestMigrateWithReleases(t *testing.T) { - onGiteaRun(t, func(t *testing.T, u *url.URL) { - defer test.MockVariableValue(&setting.Migrations.AllowLocalNetworks, true)() - defer test.MockVariableValue(&setting.AppVer, "1.16.0")() - require.NoError(t, migrations.Init()) - - ownerName := "user2" - repoName := "repo1" - repoOwner := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: ownerName}) - session := loginUser(t, ownerName) - token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeReadMisc) - - for _, s := range []struct { - svc structs.GitServiceType - }{ - {svc: structs.GiteaService}, - {svc: structs.ForgejoService}, - } { - t.Run(s.svc.Name(), func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - // Step 0: verify the repo is available - req := NewRequestf(t, "GET", "/%s/%s", ownerName, repoName) - _ = session.MakeRequest(t, req, http.StatusOK) - // Step 1: get the Gitea migration form - req = NewRequestf(t, "GET", "/repo/migrate/?service_type=%d", s.svc) - resp := session.MakeRequest(t, req, http.StatusOK) - // Step 2: load the form - htmlDoc := NewHTMLParser(t, resp.Body) - // Check form title - title := htmlDoc.doc.Find("title").Text() - assert.Contains(t, title, translation.NewLocale("en-US").TrString("new_migrate.title")) - // Step 4: submit the migration to only migrate issues - migratedRepoName := "otherrepo-" + s.svc.Name() - req = NewRequestWithValues(t, "POST", "/repo/migrate", map[string]string{ - "_csrf": GetCSRF(t, session, "/repo/migrate"), - "service": fmt.Sprintf("%d", s.svc), - "clone_addr": fmt.Sprintf("%s%s/%s", u, ownerName, repoName), - "auth_token": token, - "issues": "on", - "releases": "on", - "repo_name": migratedRepoName, - "description": "", - "uid": fmt.Sprintf("%d", repoOwner.ID), - }) - resp = session.MakeRequest(t, req, http.StatusSeeOther) - // Step 5: a redirection displays the migrated repository - assert.EqualValues(t, fmt.Sprintf("/%s/%s", ownerName, migratedRepoName), test.RedirectURL(resp)) - // Step 6: check the repo was created and load the repo - migratedRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{Name: migratedRepoName}) - // Step 7: check if releases are enabled - assert.True(t, migratedRepo.UnitEnabled(db.DefaultContext, unit.TypeReleases)) - }) + // Step 7: delete the repository, so we can test with other services + err := repository.DeleteRepository(context.Background(), repoOwner, repo, false) + require.NoError(t, err) } }) } diff --git a/tests/integration/migration-test/forgejo-v1.19.0.mysql.sql.gz b/tests/integration/migration-test/forgejo-v1.19.0.mysql.sql.gz new file mode 100644 index 0000000000..4cea13baf8 Binary files /dev/null and b/tests/integration/migration-test/forgejo-v1.19.0.mysql.sql.gz differ diff --git a/tests/integration/migration-test/forgejo-v1.19.0.postgres.sql.gz b/tests/integration/migration-test/forgejo-v1.19.0.postgres.sql.gz new file mode 100644 index 0000000000..7fdc409dbb Binary files /dev/null and b/tests/integration/migration-test/forgejo-v1.19.0.postgres.sql.gz differ diff --git a/tests/integration/migration-test/forgejo-v1.19.0.sqlite3.sql.gz b/tests/integration/migration-test/forgejo-v1.19.0.sqlite3.sql.gz new file mode 100644 index 0000000000..dba4bafbdc Binary files /dev/null and b/tests/integration/migration-test/forgejo-v1.19.0.sqlite3.sql.gz differ diff --git a/tests/integration/migration-test/gitea-v1.6.4.mysql.sql.gz b/tests/integration/migration-test/gitea-v1.6.4.mysql.sql.gz index fdbd7ff7be..30cca8b382 100644 Binary files a/tests/integration/migration-test/gitea-v1.6.4.mysql.sql.gz and b/tests/integration/migration-test/gitea-v1.6.4.mysql.sql.gz differ diff --git a/tests/integration/migration-test/gitea-v1.6.4.postgres.sql.gz b/tests/integration/migration-test/gitea-v1.6.4.postgres.sql.gz index 2cbc109946..bd66f6ba4f 100644 Binary files a/tests/integration/migration-test/gitea-v1.6.4.postgres.sql.gz and b/tests/integration/migration-test/gitea-v1.6.4.postgres.sql.gz differ diff --git a/tests/integration/migration-test/gitea-v1.6.4.sqlite3.sql.gz b/tests/integration/migration-test/gitea-v1.6.4.sqlite3.sql.gz index 321803bfba..a777c53025 100644 Binary files a/tests/integration/migration-test/gitea-v1.6.4.sqlite3.sql.gz and b/tests/integration/migration-test/gitea-v1.6.4.sqlite3.sql.gz differ diff --git a/tests/integration/migration-test/gitea-v1.7.0.mysql.sql.gz b/tests/integration/migration-test/gitea-v1.7.0.mysql.sql.gz index dcaad58784..d0ab10891c 100644 Binary files a/tests/integration/migration-test/gitea-v1.7.0.mysql.sql.gz and b/tests/integration/migration-test/gitea-v1.7.0.mysql.sql.gz differ diff --git a/tests/integration/migration-test/gitea-v1.7.0.postgres.sql.gz b/tests/integration/migration-test/gitea-v1.7.0.postgres.sql.gz index 7a3bdc1cd7..e4716c6b43 100644 Binary files a/tests/integration/migration-test/gitea-v1.7.0.postgres.sql.gz and b/tests/integration/migration-test/gitea-v1.7.0.postgres.sql.gz differ diff --git a/tests/integration/migration-test/gitea-v1.7.0.sqlite3.sql.gz b/tests/integration/migration-test/gitea-v1.7.0.sqlite3.sql.gz index d753f4d2b8..3155249b07 100644 Binary files a/tests/integration/migration-test/gitea-v1.7.0.sqlite3.sql.gz and b/tests/integration/migration-test/gitea-v1.7.0.sqlite3.sql.gz differ diff --git a/tests/integration/milestone_test.go b/tests/integration/milestone_test.go index 0a475e0967..ba46740a19 100644 --- a/tests/integration/milestone_test.go +++ b/tests/integration/milestone_test.go @@ -23,20 +23,3 @@ func TestViewMilestones(t *testing.T) { placeholder, _ := search.Attr("placeholder") assert.Equal(t, "Search milestones...", placeholder) } - -func TestMilestonesCount(t *testing.T) { - defer tests.PrepareTestEnv(t)() - - req := NewRequest(t, "GET", "/user2/repo1/milestones") - resp := MakeRequest(t, req, http.StatusOK) - - htmlDoc := NewHTMLParser(t, resp.Body) - - openCount := htmlDoc.doc.Find("a[data-test-name='open-issue-count']").Text() - assert.Contains(t, openCount, "2\u00a0Open") - - closedCount := htmlDoc.doc.Find("a[data-test-name='closed-issue-count']").Text() - assert.Contains(t, closedCount, "1\u00a0Closed") - - assert.Empty(t, htmlDoc.doc.Find("a[data-test-name='all-issue-count']").Nodes) -} diff --git a/tests/integration/mirror_push_test.go b/tests/integration/mirror_push_test.go index fa62219707..2dda4d6836 100644 --- a/tests/integration/mirror_push_test.go +++ b/tests/integration/mirror_push_test.go @@ -323,82 +323,3 @@ func TestSSHPushMirror(t *testing.T) { }) }) } - -func TestPushMirrorSettings(t *testing.T) { - onGiteaRun(t, func(t *testing.T, u *url.URL) { - defer test.MockVariableValue(&setting.Migrations.AllowLocalNetworks, true)() - defer test.MockVariableValue(&setting.Mirror.Enabled, true)() - require.NoError(t, migrations.Init()) - - user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) - srcRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2}) - srcRepo2 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 3}) - assert.False(t, srcRepo.HasWiki()) - sess := loginUser(t, user.Name) - pushToRepo, _, f := tests.CreateDeclarativeRepoWithOptions(t, user, tests.DeclarativeRepoOptions{ - Name: optional.Some("push-mirror-test"), - AutoInit: optional.Some(false), - EnabledUnits: optional.Some([]unit.Type{unit.TypeCode}), - }) - defer f() - - t.Run("Adding", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - req := NewRequestWithValues(t, "POST", fmt.Sprintf("/%s/settings", srcRepo2.FullName()), map[string]string{ - "_csrf": GetCSRF(t, sess, fmt.Sprintf("/%s/settings", srcRepo2.FullName())), - "action": "push-mirror-add", - "push_mirror_address": u.String() + pushToRepo.FullName(), - "push_mirror_interval": "0", - }) - sess.MakeRequest(t, req, http.StatusSeeOther) - - req = NewRequestWithValues(t, "POST", fmt.Sprintf("/%s/settings", srcRepo.FullName()), map[string]string{ - "_csrf": GetCSRF(t, sess, fmt.Sprintf("/%s/settings", srcRepo.FullName())), - "action": "push-mirror-add", - "push_mirror_address": u.String() + pushToRepo.FullName(), - "push_mirror_interval": "0", - }) - sess.MakeRequest(t, req, http.StatusSeeOther) - - flashCookie := sess.GetCookie(gitea_context.CookieNameFlash) - assert.NotNil(t, flashCookie) - assert.Contains(t, flashCookie.Value, "success") - }) - - mirrors, _, err := repo_model.GetPushMirrorsByRepoID(db.DefaultContext, srcRepo.ID, db.ListOptions{}) - require.NoError(t, err) - assert.Len(t, mirrors, 1) - mirrorID := mirrors[0].ID - - mirrors, _, err = repo_model.GetPushMirrorsByRepoID(db.DefaultContext, srcRepo2.ID, db.ListOptions{}) - require.NoError(t, err) - assert.Len(t, mirrors, 1) - - t.Run("Interval", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - unittest.AssertExistsAndLoadBean(t, &repo_model.PushMirror{ID: mirrorID - 1}) - - req := NewRequestWithValues(t, "POST", fmt.Sprintf("/%s/settings", srcRepo.FullName()), map[string]string{ - "_csrf": GetCSRF(t, sess, fmt.Sprintf("/%s/settings", srcRepo.FullName())), - "action": "push-mirror-update", - "push_mirror_id": strconv.FormatInt(mirrorID-1, 10), - "push_mirror_interval": "10m0s", - }) - sess.MakeRequest(t, req, http.StatusNotFound) - - req = NewRequestWithValues(t, "POST", fmt.Sprintf("/%s/settings", srcRepo.FullName()), map[string]string{ - "_csrf": GetCSRF(t, sess, fmt.Sprintf("/%s/settings", srcRepo.FullName())), - "action": "push-mirror-update", - "push_mirror_id": strconv.FormatInt(mirrorID, 10), - "push_mirror_interval": "10m0s", - }) - sess.MakeRequest(t, req, http.StatusSeeOther) - - flashCookie := sess.GetCookie(gitea_context.CookieNameFlash) - assert.NotNil(t, flashCookie) - assert.Contains(t, flashCookie.Value, "success") - }) - }) -} diff --git a/tests/integration/notification_test.go b/tests/integration/notification_test.go deleted file mode 100644 index 6195ec2282..0000000000 --- a/tests/integration/notification_test.go +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2024 The Forgejo Authors. All rights reserved. -// SPDX-License-Identifier: GPL-3.0-or-later - -package integration - -import ( - "net/http" - "testing" - - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/tests" -) - -func TestNotification(t *testing.T) { - defer tests.PrepareTestEnv(t)() - - user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) - session := loginUser(t, user2.Name) - - req := NewRequest(t, "GET", "/notifications") - resp := session.MakeRequest(t, req, http.StatusOK) - htmlDoc := NewHTMLParser(t, resp.Body) - - // Unread and pinned notification. - htmlDoc.AssertElement(t, ".notifications-link[href='/user2/repo1/pulls/3']", true) - htmlDoc.AssertElement(t, ".notifications-link[href='/user2/repo1/issues/4']", true) - htmlDoc.AssertElement(t, ".notifications-link[href='/user2/repo2/issues/1']", true) - - // Read notification. - htmlDoc.AssertElement(t, ".notifications-link[href='/user2/repo2/pulls/2']", false) -} diff --git a/tests/integration/oauth_test.go b/tests/integration/oauth_test.go index 6b5a1feb16..0d5e9a0472 100644 --- a/tests/integration/oauth_test.go +++ b/tests/integration/oauth_test.go @@ -11,7 +11,6 @@ import ( "fmt" "io" "net/http" - "net/http/httptest" "net/url" "strings" "testing" @@ -25,7 +24,6 @@ import ( api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/test" "code.gitea.io/gitea/routers/web/auth" - forgejo_context "code.gitea.io/gitea/services/context" "code.gitea.io/gitea/tests" "github.com/markbates/goth" @@ -691,117 +689,6 @@ func TestSignInOAuthCallbackRedirectToEscaping(t *testing.T) { assert.Equal(t, "/login/oauth/authorize?redirect_uri=https://translate.example.org", test.RedirectURL(resp)) } -func setupMockOIDCServer() *httptest.Server { - var mockServer *httptest.Server - mockServer = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - switch r.URL.Path { - case "/.well-known/openid-configuration": - w.WriteHeader(http.StatusOK) - w.Write([]byte(`{ - "issuer": "` + mockServer.URL + `", - "authorization_endpoint": "` + mockServer.URL + `/authorize", - "token_endpoint": "` + mockServer.URL + `/token", - "userinfo_endpoint": "` + mockServer.URL + `/userinfo" - }`)) - default: - http.NotFound(w, r) - } - })) - return mockServer -} - -func TestSignInOauthCallbackSyncSSHKeys(t *testing.T) { - defer tests.PrepareTestEnv(t)() - mockServer := setupMockOIDCServer() - defer mockServer.Close() - - sourceName := "oidc" - authPayload := authSourcePayloadOpenIDConnect(sourceName, mockServer.URL+"/") - authPayload["oauth2_attribute_ssh_public_key"] = "sshpubkey" - authSource := addAuthSource(t, authPayload) - - userID := "5678" - user := &user_model.User{ - Name: "oidc.user", - Email: "oidc.user@example.com", - Passwd: "oidc.userpassword", - Type: user_model.UserTypeIndividual, - LoginType: auth_model.OAuth2, - LoginSource: authSource.ID, - LoginName: userID, - IsActive: true, - } - defer createUser(context.Background(), t, user)() - - for _, tt := range []struct { - name string - rawData map[string]any - parsedKeySets []string - }{ - { - name: "Add keys", - rawData: map[string]any{ - "sshpubkey": []any{ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINDRDoephkaFELacrNNe2fqAwedhRB1MKOpLEHlPuczO nocomment", - }, - }, - parsedKeySets: []string{ - "SHA256:X/mW7JUQ8J8yhrKBbZ/pJni8qx7zPA1DTFsi8ftpDwg", - }, - }, - { - name: "Update keys", - rawData: map[string]any{ - "sshpubkey": []any{ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMLLMOLFMouSJmzOASKKv178d+7op4utSxcugF9tVVch nocomment", - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGyDh9sg1IGQGa0U363wcGXrDlGBhZI3UHvS7we/0d+T nocomment", - }, - }, - parsedKeySets: []string{ - "SHA256:gsyG4JNmY5XoLBK5lSzuwD3EXcaDBiDKBkqDkpQTH6Q", - "SHA256:bbEKB1Qpumgk6QrgiN6t/kIvtUZvIQ8rqQBz8yYPzYw", - }, - }, - { - name: "Remove keys", - rawData: map[string]any{ - "sshpubkey": []any{}, - }, - parsedKeySets: []string{}, - }, - } { - t.Run(tt.name, func(t *testing.T) { - defer mockCompleteUserAuth(func(res http.ResponseWriter, req *http.Request) (goth.User, error) { - return goth.User{ - Provider: sourceName, - UserID: userID, - Email: user.Email, - RawData: tt.rawData, - }, nil - })() - - session := emptyTestSession(t) - - req := NewRequest(t, "GET", fmt.Sprintf("/user/oauth2/%s/callback?code=XYZ&state=XYZ", sourceName)) - resp := session.MakeRequest(t, req, http.StatusSeeOther) - assert.Equal(t, "/", test.RedirectURL(resp)) - - req = NewRequest(t, "GET", "/user/settings/keys") - resp = session.MakeRequest(t, req, http.StatusOK) - - htmlDoc := NewHTMLParser(t, resp.Body) - divs := htmlDoc.doc.Find("#keys-ssh .flex-item .flex-item-body:not(:last-child)") - - syncedKeys := make([]string, divs.Length()) - for i := 0; i < divs.Length(); i++ { - syncedKeys[i] = strings.TrimSpace(divs.Eq(i).Text()) - } - - assert.ElementsMatch(t, tt.parsedKeySets, syncedKeys, "Unequal number of keys") - }) - } -} - func TestSignUpViaOAuthWithMissingFields(t *testing.T) { defer tests.PrepareTestEnv(t)() // enable auto-creation of accounts via OAuth2 @@ -916,16 +803,6 @@ func TestOAuthIntrospection(t *testing.T) { }) } -func requireCookieCSRF(t *testing.T, resp http.ResponseWriter) string { - for _, c := range resp.(*httptest.ResponseRecorder).Result().Cookies() { - if c.Name == "_csrf" { - return c.Value - } - } - require.True(t, false, "_csrf not found in cookies") - return "" -} - func TestOAuth_GrantScopesReadUser(t *testing.T) { defer tests.PrepareTestEnv(t)() @@ -963,18 +840,19 @@ func TestOAuth_GrantScopesReadUser(t *testing.T) { authorizeResp := ctx.MakeRequest(t, authorizeReq, http.StatusSeeOther) authcode := strings.Split(strings.Split(authorizeResp.Body.String(), "?code=")[1], "&")[0] + htmlDoc := NewHTMLParser(t, authorizeResp.Body) grantReq := NewRequestWithValues(t, "POST", "/login/oauth/grant", map[string]string{ - "_csrf": requireCookieCSRF(t, authorizeResp), + "_csrf": htmlDoc.GetCSRF(), "client_id": app.ClientID, "redirect_uri": "a", "state": "thestate", "granted": "true", }) - grantResp := ctx.MakeRequest(t, grantReq, http.StatusBadRequest) - assert.NotContains(t, grantResp.Body.String(), forgejo_context.CsrfErrorString) + grantResp := ctx.MakeRequest(t, grantReq, http.StatusSeeOther) + htmlDocGrant := NewHTMLParser(t, grantResp.Body) accessTokenReq := NewRequestWithValues(t, "POST", "/login/oauth/access_token", map[string]string{ - "_csrf": requireCookieCSRF(t, authorizeResp), + "_csrf": htmlDocGrant.GetCSRF(), "grant_type": "authorization_code", "client_id": app.ClientID, "client_secret": app.ClientSecret, @@ -1043,18 +921,19 @@ func TestOAuth_GrantScopesFailReadRepository(t *testing.T) { authorizeResp := ctx.MakeRequest(t, authorizeReq, http.StatusSeeOther) authcode := strings.Split(strings.Split(authorizeResp.Body.String(), "?code=")[1], "&")[0] + htmlDoc := NewHTMLParser(t, authorizeResp.Body) grantReq := NewRequestWithValues(t, "POST", "/login/oauth/grant", map[string]string{ - "_csrf": requireCookieCSRF(t, authorizeResp), + "_csrf": htmlDoc.GetCSRF(), "client_id": app.ClientID, "redirect_uri": "a", "state": "thestate", "granted": "true", }) - grantResp := ctx.MakeRequest(t, grantReq, http.StatusBadRequest) - assert.NotContains(t, grantResp.Body.String(), forgejo_context.CsrfErrorString) + grantResp := ctx.MakeRequest(t, grantReq, http.StatusSeeOther) + htmlDocGrant := NewHTMLParser(t, grantResp.Body) accessTokenReq := NewRequestWithValues(t, "POST", "/login/oauth/access_token", map[string]string{ - "_csrf": requireCookieCSRF(t, authorizeResp), + "_csrf": htmlDocGrant.GetCSRF(), "grant_type": "authorization_code", "client_id": app.ClientID, "client_secret": app.ClientSecret, @@ -1121,18 +1000,19 @@ func TestOAuth_GrantScopesReadRepository(t *testing.T) { authorizeResp := ctx.MakeRequest(t, authorizeReq, http.StatusSeeOther) authcode := strings.Split(strings.Split(authorizeResp.Body.String(), "?code=")[1], "&")[0] + htmlDoc := NewHTMLParser(t, authorizeResp.Body) grantReq := NewRequestWithValues(t, "POST", "/login/oauth/grant", map[string]string{ - "_csrf": requireCookieCSRF(t, authorizeResp), + "_csrf": htmlDoc.GetCSRF(), "client_id": app.ClientID, "redirect_uri": "a", "state": "thestate", "granted": "true", }) - grantResp := ctx.MakeRequest(t, grantReq, http.StatusBadRequest) - assert.NotContains(t, grantResp.Body.String(), forgejo_context.CsrfErrorString) + grantResp := ctx.MakeRequest(t, grantReq, http.StatusSeeOther) + htmlDocGrant := NewHTMLParser(t, grantResp.Body) accessTokenReq := NewRequestWithValues(t, "POST", "/login/oauth/access_token", map[string]string{ - "_csrf": requireCookieCSRF(t, authorizeResp), + "_csrf": htmlDocGrant.GetCSRF(), "grant_type": "authorization_code", "client_id": app.ClientID, "client_secret": app.ClientSecret, @@ -1202,18 +1082,19 @@ func TestOAuth_GrantScopesReadPrivateGroups(t *testing.T) { authorizeResp := ctx.MakeRequest(t, authorizeReq, http.StatusSeeOther) authcode := strings.Split(strings.Split(authorizeResp.Body.String(), "?code=")[1], "&")[0] + htmlDoc := NewHTMLParser(t, authorizeResp.Body) grantReq := NewRequestWithValues(t, "POST", "/login/oauth/grant", map[string]string{ - "_csrf": requireCookieCSRF(t, authorizeResp), + "_csrf": htmlDoc.GetCSRF(), "client_id": app.ClientID, "redirect_uri": "a", "state": "thestate", "granted": "true", }) - grantResp := ctx.MakeRequest(t, grantReq, http.StatusBadRequest) - assert.NotContains(t, grantResp.Body.String(), forgejo_context.CsrfErrorString) + grantResp := ctx.MakeRequest(t, grantReq, http.StatusSeeOther) + htmlDocGrant := NewHTMLParser(t, grantResp.Body) accessTokenReq := NewRequestWithValues(t, "POST", "/login/oauth/access_token", map[string]string{ - "_csrf": requireCookieCSRF(t, authorizeResp), + "_csrf": htmlDocGrant.GetCSRF(), "grant_type": "authorization_code", "client_id": app.ClientID, "client_secret": app.ClientSecret, @@ -1283,18 +1164,19 @@ func TestOAuth_GrantScopesReadOnlyPublicGroups(t *testing.T) { authorizeResp := ctx.MakeRequest(t, authorizeReq, http.StatusSeeOther) authcode := strings.Split(strings.Split(authorizeResp.Body.String(), "?code=")[1], "&")[0] + htmlDoc := NewHTMLParser(t, authorizeResp.Body) grantReq := NewRequestWithValues(t, "POST", "/login/oauth/grant", map[string]string{ - "_csrf": requireCookieCSRF(t, authorizeResp), + "_csrf": htmlDoc.GetCSRF(), "client_id": app.ClientID, "redirect_uri": "a", "state": "thestate", "granted": "true", }) - grantResp := ctx.MakeRequest(t, grantReq, http.StatusBadRequest) - assert.NotContains(t, grantResp.Body.String(), forgejo_context.CsrfErrorString) + grantResp := ctx.MakeRequest(t, grantReq, http.StatusSeeOther) + htmlDocGrant := NewHTMLParser(t, grantResp.Body) accessTokenReq := NewRequestWithValues(t, "POST", "/login/oauth/access_token", map[string]string{ - "_csrf": requireCookieCSRF(t, authorizeResp), + "_csrf": htmlDocGrant.GetCSRF(), "grant_type": "authorization_code", "client_id": app.ClientID, "client_secret": app.ClientSecret, @@ -1378,18 +1260,19 @@ func TestOAuth_GrantScopesReadPublicGroupsWithTheReadScope(t *testing.T) { authorizeResp := ctx.MakeRequest(t, authorizeReq, http.StatusSeeOther) authcode := strings.Split(strings.Split(authorizeResp.Body.String(), "?code=")[1], "&")[0] + htmlDoc := NewHTMLParser(t, authorizeResp.Body) grantReq := NewRequestWithValues(t, "POST", "/login/oauth/grant", map[string]string{ - "_csrf": requireCookieCSRF(t, authorizeResp), + "_csrf": htmlDoc.GetCSRF(), "client_id": app.ClientID, "redirect_uri": "a", "state": "thestate", "granted": "true", }) - grantResp := ctx.MakeRequest(t, grantReq, http.StatusBadRequest) - assert.NotContains(t, grantResp.Body.String(), forgejo_context.CsrfErrorString) + grantResp := ctx.MakeRequest(t, grantReq, http.StatusSeeOther) + htmlDocGrant := NewHTMLParser(t, grantResp.Body) accessTokenReq := NewRequestWithValues(t, "POST", "/login/oauth/access_token", map[string]string{ - "_csrf": requireCookieCSRF(t, authorizeResp), + "_csrf": htmlDocGrant.GetCSRF(), "grant_type": "authorization_code", "client_id": app.ClientID, "client_secret": app.ClientSecret, diff --git a/tests/integration/opengraph_test.go b/tests/integration/opengraph_test.go index d54f59c9b8..8d29e4548d 100644 --- a/tests/integration/opengraph_test.go +++ b/tests/integration/opengraph_test.go @@ -4,7 +4,6 @@ package integration import ( - "image" "net/http" "testing" @@ -13,7 +12,6 @@ import ( "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) func TestOpenGraphProperties(t *testing.T) { @@ -44,7 +42,7 @@ func TestOpenGraphProperties(t *testing.T) { "og:title": "User Thirty", "og:url": setting.AppURL + "user30", "og:type": "profile", - "og:image": setting.AppURL + "assets/img/avatar_default.png", + "og:image": "https://secure.gravatar.com/avatar/eae1f44b34ff27284cb0792c7601c89c?d=identicon", "og:site_name": siteName, }, }, @@ -56,7 +54,7 @@ func TestOpenGraphProperties(t *testing.T) { "og:url": setting.AppURL + "the_34-user.with.all.allowedChars", "og:description": "some [commonmark](https://commonmark.org/)!", "og:type": "profile", - "og:image": setting.AppURL + "assets/img/avatar_default.png", + "og:image": setting.AppURL + "avatars/avatar34", "og:site_name": siteName, }, }, @@ -64,109 +62,75 @@ func TestOpenGraphProperties(t *testing.T) { name: "issue", url: "/user2/repo1/issues/1", expected: map[string]string{ - "og:title": "issue1", - "og:url": setting.AppURL + "user2/repo1/issues/1", - "og:description": "content for the first issue", - "og:type": "object", - "og:image": setting.AppURL + "user2/repo1/issues/1/summary-card", - "og:image:alt": "Summary card of an issue titled \"issue1\" in repository user2/repo1", - "og:image:width": "1200", - "og:image:height": "600", - "og:site_name": siteName, + "og:title": "issue1", + "og:url": setting.AppURL + "user2/repo1/issues/1", + "og:description": "content for the first issue", + "og:type": "object", + "og:image": "https://secure.gravatar.com/avatar/ab53a2911ddf9b4817ac01ddcd3d975f?d=identicon", + "og:site_name": siteName, }, }, { name: "pull request", url: "/user2/repo1/pulls/2", expected: map[string]string{ - "og:title": "issue2", - "og:url": setting.AppURL + "user2/repo1/pulls/2", - "og:description": "content for the second issue", - "og:type": "object", - "og:image": setting.AppURL + "user2/repo1/pulls/2/summary-card", - "og:image:alt": "Summary card of an issue titled \"issue2\" in repository user2/repo1", - "og:image:width": "1200", - "og:image:height": "600", - "og:site_name": siteName, + "og:title": "issue2", + "og:url": setting.AppURL + "user2/repo1/pulls/2", + "og:description": "content for the second issue", + "og:type": "object", + "og:image": "https://secure.gravatar.com/avatar/ab53a2911ddf9b4817ac01ddcd3d975f?d=identicon", + "og:site_name": siteName, }, }, { name: "file in repo", url: "/user27/repo49/src/branch/master/test/test.txt", expected: map[string]string{ - "og:title": "repo49/test/test.txt at master", - "og:url": setting.AppURL + "/user27/repo49/src/branch/master/test/test.txt", - "og:type": "object", - "og:image": setting.AppURL + "user27/repo49/-/summary-card", - "og:image:alt": "Summary card of repository user27/repo49", - "og:image:width": "1200", - "og:image:height": "600", - "og:site_name": siteName, + "og:title": "repo49/test/test.txt at master", + "og:url": setting.AppURL + "/user27/repo49/src/branch/master/test/test.txt", + "og:type": "object", + "og:image": "https://secure.gravatar.com/avatar/7095710e927665f1bdd1ced94152f232?d=identicon", + "og:site_name": siteName, }, }, { name: "wiki page for repo without description", url: "/user2/repo1/wiki/Page-With-Spaced-Name", expected: map[string]string{ - "og:title": "Page With Spaced Name", - "og:url": setting.AppURL + "/user2/repo1/wiki/Page-With-Spaced-Name", - "og:type": "object", - "og:image": setting.AppURL + "user2/repo1/-/summary-card", - "og:image:alt": "Summary card of repository user2/repo1", - "og:image:width": "1200", - "og:image:height": "600", - "og:site_name": siteName, + "og:title": "Page With Spaced Name", + "og:url": setting.AppURL + "/user2/repo1/wiki/Page-With-Spaced-Name", + "og:type": "object", + "og:image": "https://secure.gravatar.com/avatar/ab53a2911ddf9b4817ac01ddcd3d975f?d=identicon", + "og:site_name": siteName, }, }, { name: "index page for repo without description", url: "/user2/repo1", expected: map[string]string{ - "og:title": "repo1", - "og:url": setting.AppURL + "user2/repo1", - "og:type": "object", - "og:image": setting.AppURL + "user2/repo1/-/summary-card", - "og:image:alt": "Summary card of repository user2/repo1", - "og:image:width": "1200", - "og:image:height": "600", - "og:site_name": siteName, + "og:title": "repo1", + "og:url": setting.AppURL + "user2/repo1", + "og:type": "object", + "og:image": "https://secure.gravatar.com/avatar/ab53a2911ddf9b4817ac01ddcd3d975f?d=identicon", + "og:site_name": siteName, }, }, { name: "index page for repo with description", url: "/user27/repo49", expected: map[string]string{ - "og:title": "repo49", - "og:url": setting.AppURL + "user27/repo49", - "og:description": "A wonderful repository with more than just a README.md", - "og:type": "object", - "og:image": setting.AppURL + "user27/repo49/-/summary-card", - "og:image:alt": "Summary card of repository user27/repo49", - "og:image:width": "1200", - "og:image:height": "600", - "og:site_name": siteName, - }, - }, - { - name: "release", - url: "/user2/repo1/releases/tag/v1.1", - expected: map[string]string{ - "og:title": "testing-release - user2/repo1", - "og:url": setting.AppURL + "user2/repo1/releases/tag/v1.1", - "og:type": "object", - "og:image": setting.AppURL + "user2/repo1/releases/summary-card/v1.1", - "og:image:alt": "Summary card of an release titled \"testing-release\" in repository user2/repo1", - "og:image:width": "1200", - "og:image:height": "600", - "og:site_name": siteName, + "og:title": "repo49", + "og:url": setting.AppURL + "user27/repo49", + "og:description": "A wonderful repository with more than just a README.md", + "og:type": "object", + "og:image": "https://secure.gravatar.com/avatar/7095710e927665f1bdd1ced94152f232?d=identicon", + "og:site_name": siteName, }, }, } for _, tc := range cases { t.Run(tc.name, func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - req := NewRequest(t, "GET", tc.url) resp := MakeRequest(t, req, http.StatusOK) doc := NewHTMLParser(t, resp.Body) @@ -184,45 +148,3 @@ func TestOpenGraphProperties(t *testing.T) { }) } } - -func TestOpenGraphSummaryCard(t *testing.T) { - defer tests.PrepareTestEnv(t)() - - cases := []struct { - name string - url string - }{ - { - name: "repo", - url: "/user2/repo1/-/summary-card", - }, - { - name: "issue", - url: "/user2/repo1/issues/1/summary-card", - }, - { - name: "pull request", - url: "/user2/repo1/pulls/2/summary-card", - }, - { - name: "release", - url: "/user2/repo1/releases/summary-card/v1.1", - }, - } - - for _, tc := range cases { - t.Run(tc.name, func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - req := NewRequest(t, "GET", tc.url) - resp := MakeRequest(t, req, http.StatusOK) - - assert.Equal(t, "image/png", resp.Header().Get("Content-Type")) - img, imgType, err := image.Decode(resp.Body) - require.NoError(t, err) - assert.Equal(t, "png", imgType) - assert.Equal(t, 1200, img.Bounds().Dx()) - assert.Equal(t, 600, img.Bounds().Dy()) - }) - } -} diff --git a/tests/integration/org_settings_test.go b/tests/integration/org_settings_test.go deleted file mode 100644 index 56b7b02271..0000000000 --- a/tests/integration/org_settings_test.go +++ /dev/null @@ -1,89 +0,0 @@ -// Copyright 2024 The Forgejo Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -package integration - -import ( - "fmt" - "net/http" - "testing" - - auth_model "code.gitea.io/gitea/models/auth" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" - - "github.com/stretchr/testify/assert" -) - -func getOrgSettingsFormData(t *testing.T, session *TestSession, orgName string) map[string]string { - return map[string]string{ - "_csrf": GetCSRF(t, session, fmt.Sprintf("/org/%s/settings", orgName)), - "name": orgName, - "full_name": "", - "email": "", - "description": "", - "website": "", - "location": "", - "visibility": "0", - "repo_admin_change_team_access": "on", - "max_repo_creation": "-1", - } -} - -func getOrgSettings(t *testing.T, token, orgName string) *api.Organization { - t.Helper() - - req := NewRequestf(t, "GET", "/api/v1/orgs/%s", orgName).AddTokenAuth(token) - resp := MakeRequest(t, req, http.StatusOK) - - var org *api.Organization - DecodeJSON(t, resp, &org) - - return org -} - -func TestOrgSettingsChangeEmail(t *testing.T) { - defer tests.PrepareTestEnv(t)() - - const orgName = "org3" - settingsURL := fmt.Sprintf("/org/%s/settings", orgName) - - session := loginUser(t, "user1") - token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeReadOrganization) - - t.Run("Invalid", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - settings := getOrgSettingsFormData(t, session, orgName) - - settings["email"] = "invalid" - session.MakeRequest(t, NewRequestWithValues(t, "POST", settingsURL, settings), http.StatusOK) - - org := getOrgSettings(t, token, orgName) - assert.Equal(t, "org3@example.com", org.Email) - }) - - t.Run("Valid", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - settings := getOrgSettingsFormData(t, session, orgName) - - settings["email"] = "example@example.com" - session.MakeRequest(t, NewRequestWithValues(t, "POST", settingsURL, settings), http.StatusSeeOther) - - org := getOrgSettings(t, token, orgName) - assert.Equal(t, "example@example.com", org.Email) - }) - - t.Run("Empty", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - settings := getOrgSettingsFormData(t, session, orgName) - - settings["email"] = "" - session.MakeRequest(t, NewRequestWithValues(t, "POST", settingsURL, settings), http.StatusSeeOther) - - org := getOrgSettings(t, token, orgName) - assert.Empty(t, org.Email) - }) -} diff --git a/tests/integration/org_team_invite_test.go b/tests/integration/org_team_invite_test.go index 2fe296e8c3..d04199a2c1 100644 --- a/tests/integration/org_team_invite_test.go +++ b/tests/integration/org_team_invite_test.go @@ -10,7 +10,6 @@ import ( "strings" "testing" - "code.gitea.io/gitea/models/auth" "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/organization" "code.gitea.io/gitea/models/unittest" @@ -294,10 +293,8 @@ func TestOrgTeamEmailInviteRedirectsNewUserWithActivation(t *testing.T) { require.NoError(t, err) session.jar.SetCookies(baseURL, cr.Cookies()) - code, err := user.GenerateEmailAuthorizationCode(db.DefaultContext, auth.UserActivation) - require.NoError(t, err) - - req = NewRequestWithValues(t, "POST", "/user/activate?code="+url.QueryEscape(code), map[string]string{ + activateURL := fmt.Sprintf("/user/activate?code=%s", user.GenerateEmailActivateCode("doesnotexist@example.com")) + req = NewRequestWithValues(t, "POST", activateURL, map[string]string{ "password": "examplePassword!1", }) diff --git a/tests/integration/org_test.go b/tests/integration/org_test.go index 74579d7d51..a1e448be8a 100644 --- a/tests/integration/org_test.go +++ b/tests/integration/org_test.go @@ -10,9 +10,6 @@ import ( "testing" auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/organization" - "code.gitea.io/gitea/models/perm" - "code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" api "code.gitea.io/gitea/modules/structs" @@ -28,7 +25,6 @@ func TestOrgRepos(t *testing.T) { users = []string{"user1", "user2"} cases = map[string][]string{ "alphabetically": {"repo21", "repo3", "repo5"}, - "recentupdate": {"repo21", "repo5", "repo3"}, "reversealphabetically": {"repo5", "repo3", "repo21"}, } ) @@ -208,7 +204,9 @@ func TestTeamSearch(t *testing.T) { var results TeamSearchResults session := loginUser(t, user.Name) + csrf := GetCSRF(t, session, "/"+org.Name) req := NewRequestf(t, "GET", "/org/%s/teams/-/search?q=%s", org.Name, "_team") + req.Header.Add("X-Csrf-Token", csrf) resp := session.MakeRequest(t, req, http.StatusOK) DecodeJSON(t, resp, &results) assert.NotEmpty(t, results.Data) @@ -219,7 +217,9 @@ func TestTeamSearch(t *testing.T) { // no access if not organization member user5 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 5}) session = loginUser(t, user5.Name) + csrf = GetCSRF(t, session, "/"+org.Name) req = NewRequestf(t, "GET", "/org/%s/teams/-/search?q=%s", org.Name, "team") + req.Header.Add("X-Csrf-Token", csrf) session.MakeRequest(t, req, http.StatusNotFound) } @@ -247,22 +247,3 @@ func TestOrgDashboardLabels(t *testing.T) { assert.True(t, ok) assert.Contains(t, labelFilterHref, "labels=3%2c-4") } - -func TestOwnerTeamUnit(t *testing.T) { - defer tests.PrepareTestEnv(t)() - - user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) - org := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3, Type: user_model.UserTypeOrganization}) - session := loginUser(t, user.Name) - - unittest.AssertExistsAndLoadBean(t, &organization.TeamUnit{TeamID: 1, Type: unit.TypeIssues, AccessMode: perm.AccessModeOwner}) - - req := NewRequestWithValues(t, "GET", fmt.Sprintf("/org/%s/teams/owners/edit", org.Name), map[string]string{ - "_csrf": GetCSRF(t, session, fmt.Sprintf("/org/%s/teams/owners/edit", org.Name)), - "team_name": "Owners", - "Description": "Just a description", - }) - session.MakeRequest(t, req, http.StatusOK) - - unittest.AssertExistsAndLoadBean(t, &organization.TeamUnit{TeamID: 1, Type: unit.TypeIssues, AccessMode: perm.AccessModeOwner}) -} diff --git a/tests/integration/pull_commit_test.go b/tests/integration/pull_commit_test.go deleted file mode 100644 index 5ef6d6ceca..0000000000 --- a/tests/integration/pull_commit_test.go +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2024 The Gitea Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -package integration - -import ( - "net/http" - "testing" - - pull_service "code.gitea.io/gitea/services/pull" - "code.gitea.io/gitea/tests" - - "github.com/stretchr/testify/assert" -) - -func TestListPullCommits(t *testing.T) { - defer tests.PrepareTestEnv(t)() - session := loginUser(t, "user5") - req := NewRequest(t, "GET", "/user2/repo1/pulls/3/commits/list") - resp := session.MakeRequest(t, req, http.StatusOK) - - var pullCommitList struct { - Commits []pull_service.CommitInfo `json:"commits"` - LastReviewCommitSha string `json:"last_review_commit_sha"` - } - DecodeJSON(t, resp, &pullCommitList) - - if assert.Len(t, pullCommitList.Commits, 2) { - assert.Equal(t, "5f22f7d0d95d614d25a5b68592adb345a4b5c7fd", pullCommitList.Commits[0].ID) - assert.Equal(t, "4a357436d925b5c974181ff12a994538ddc5a269", pullCommitList.Commits[1].ID) - } - assert.Equal(t, "4a357436d925b5c974181ff12a994538ddc5a269", pullCommitList.LastReviewCommitSha) -} diff --git a/tests/integration/pull_create_test.go b/tests/integration/pull_create_test.go index 7ccbce2eae..8bf48f4f6e 100644 --- a/tests/integration/pull_create_test.go +++ b/tests/integration/pull_create_test.go @@ -72,30 +72,6 @@ func testPullCreate(t *testing.T, session *TestSession, user, repo string, toSel return resp } -func testPullCreateDirectly(t *testing.T, session *TestSession, baseRepoOwner, baseRepoName, baseBranch, headRepoOwner, headRepoName, headBranch, title string) *httptest.ResponseRecorder { - headCompare := headBranch - if headRepoOwner != "" { - if headRepoName != "" { - headCompare = fmt.Sprintf("%s/%s:%s", headRepoOwner, headRepoName, headBranch) - } else { - headCompare = fmt.Sprintf("%s:%s", headRepoOwner, headBranch) - } - } - req := NewRequest(t, "GET", fmt.Sprintf("/%s/%s/compare/%s...%s", baseRepoOwner, baseRepoName, baseBranch, headCompare)) - resp := session.MakeRequest(t, req, http.StatusOK) - - // Submit the form for creating the pull - htmlDoc := NewHTMLParser(t, resp.Body) - link, exists := htmlDoc.doc.Find("form.ui.form").Attr("action") - assert.True(t, exists, "The template has changed") - req = NewRequestWithValues(t, "POST", link, map[string]string{ - "_csrf": htmlDoc.GetCSRF(), - "title": title, - }) - resp = session.MakeRequest(t, req, http.StatusOK) - return resp -} - func TestPullCreate(t *testing.T) { onGiteaRun(t, func(t *testing.T, u *url.URL) { session := loginUser(t, "user1") @@ -336,10 +312,6 @@ func TestRecentlyPushed(t *testing.T) { []repo_model.RepoUnit{{ RepoID: repo.ID, Type: unit_model.TypePullRequests, - Config: &repo_model.PullRequestsConfig{ - AllowMerge: true, - AllowSquash: true, - }, }}, nil) require.NoError(t, err) @@ -531,63 +503,5 @@ func TestRecentlyPushed(t *testing.T) { link, _ := htmlDoc.Find(".ui.message a[href*='/src/branch/']").Attr("href") assert.Equal(t, "/user1/repo1/src/branch/recent-push", link) }) - - // Test that visiting the base repo does not show any banner if - // the branches have corresponding PRs (open or merged) - t.Run("branches with merged or open PRs are not shown", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - respChildPR := testPullCreateDirectly(t, session, "user2", "repo1", "master", "user1", "repo1", "recent-push", "Child Pull Request") - elemChildPR := strings.Split(test.RedirectURL(respChildPR), "/") - assert.EqualValues(t, "user2", elemChildPR[1]) - assert.EqualValues(t, "repo1", elemChildPR[2]) - assert.EqualValues(t, "pulls", elemChildPR[3]) - session2 := loginUser(t, "user2") - // Merge the PR from the fork - testPullMerge(t, session2, elemChildPR[1], elemChildPR[2], elemChildPR[4], repo_model.MergeStyleSquash, false) - - respBasePR := testPullCreate(t, session, "user2", "repo1", true, "master", "recent-push-base", "Base Pull Request") - elemBasePR := strings.Split(test.RedirectURL(respBasePR), "/") - assert.EqualValues(t, "pulls", elemBasePR[3]) - // Leave the PR from the base repo open (it conflicts with the PR from the fork anyway) - - // Count recently pushed branches on the base repo - req := NewRequest(t, "GET", "/user2/repo1") - resp := session.MakeRequest(t, req, http.StatusOK) - htmlDoc := NewHTMLParser(t, resp.Body) - - messages := htmlDoc.Find(".ui.message") - - // None of the branches should be shown, as they have either already been merged already, - // or have an open PR, so it doesn't make sense to make a new PR for any of them. - assert.Equal(t, 0, messages.Length()) - }) - }) -} - -/* -Setup: -The base repository is: user2/repo1 -Fork repository to: user1/repo1 -Push extra commit to: user2/repo1, which changes README.md -Create a PR on user1/repo1 - -Test checks: -Check if pull request can be created from base to the fork repository. -*/ -func TestPullCreatePrFromBaseToFork(t *testing.T) { - onGiteaRun(t, func(t *testing.T, u *url.URL) { - sessionFork := loginUser(t, "user1") - testRepoFork(t, sessionFork, "user2", "repo1", "user1", "repo1") - - // Edit base repository - sessionBase := loginUser(t, "user2") - testEditFile(t, sessionBase, "user2", "repo1", "master", "README.md", "Hello, World (Edited)\n") - - // Create a PR - resp := testPullCreateDirectly(t, sessionFork, "user1", "repo1", "master", "user2", "repo1", "master", "This is a pull title") - // check the redirected URL - url := test.RedirectURL(resp) - assert.Regexp(t, "^/user1/repo1/pulls/[0-9]*$", url) }) } diff --git a/tests/integration/pull_merge_test.go b/tests/integration/pull_merge_test.go index a0ba99f3b9..0f25bdebac 100644 --- a/tests/integration/pull_merge_test.go +++ b/tests/integration/pull_merge_test.go @@ -37,7 +37,6 @@ import ( "code.gitea.io/gitea/modules/test" "code.gitea.io/gitea/modules/translation" "code.gitea.io/gitea/services/automerge" - forgejo_context "code.gitea.io/gitea/services/context" "code.gitea.io/gitea/services/forms" "code.gitea.io/gitea/services/pull" commitstatus_service "code.gitea.io/gitea/services/repository/commitstatus" @@ -822,7 +821,6 @@ func TestPullMergeBranchProtect(t *testing.T) { } for _, withAPIOrWeb := range []string{"api", "web"} { t.Run(testCase.name+" "+withAPIOrWeb, func(t *testing.T) { - defer tests.PrintCurrentTest(t)() branch := testCase.name + "-" + withAPIOrWeb unprotected := branch + "-unprotected" doGitCheckoutBranch(dstPath, "master")(t) @@ -835,7 +833,8 @@ func TestPullMergeBranchProtect(t *testing.T) { ctx = NewAPITestContext(t, testCase.doer, "not used", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) ctx.Username = owner ctx.Reponame = repo - generateCommitWithNewData(t, littleSize, dstPath, "user2@example.com", "User Two", testCase.filename) + _, err := generateCommitWithNewData(littleSize, dstPath, "user2@example.com", "User Two", testCase.filename) + require.NoError(t, err) doGitPushTestRepository(dstPath, "origin", branch+":"+unprotected)(t) pr, err := doAPICreatePullRequest(ctx, owner, repo, branch, unprotected)(t) require.NoError(t, err) @@ -846,192 +845,180 @@ func TestPullMergeBranchProtect(t *testing.T) { }) } -func testPullAutoMergeAfterCommitStatusSucceed(t *testing.T, ctx APITestContext, forkName string, approval, deleteBranch, withAPI bool) { - // prepare environment (fork repo, create user) - user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) - testRepoFork(t, ctx.Session, "user2", "repo1", "user1", forkName) - defer func() { - testDeleteRepository(t, ctx.Session, "user1", forkName) - }() +func TestPullAutoMergeAfterCommitStatusSucceed(t *testing.T) { + onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) { + // create a pull request + session := loginUser(t, "user1") + user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) + forkedName := "repo1-1" + testRepoFork(t, session, "user2", "repo1", "user1", forkedName) + defer func() { + testDeleteRepository(t, session, "user1", forkedName) + }() + testEditFile(t, session, "user1", forkedName, "master", "README.md", "Hello, World (Edited)\n") + testPullCreate(t, session, "user1", forkedName, false, "master", "master", "Indexer notifier test pull") - // create a pull request with some changes - branchName := "master" - if deleteBranch { - branchName = "new_branch_1" - testEditFileToNewBranch(t, ctx.Session, "user1", forkName, "master", branchName, "README.md", "Hello, World (Edited)\n") - } else { - testEditFile(t, ctx.Session, "user1", forkName, "master", "README.md", "Hello, World (Edited)\n") - } - testPullCreate(t, ctx.Session, "user1", forkName, false, "master", branchName, "Indexer notifier test pull") + baseRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user2", Name: "repo1"}) + forkedRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user1", Name: forkedName}) + pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ + BaseRepoID: baseRepo.ID, + BaseBranch: "master", + HeadRepoID: forkedRepo.ID, + HeadBranch: "master", + }) - baseRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user2", Name: "repo1"}) - forkedRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user1", Name: forkName}) - pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ - BaseRepoID: baseRepo.ID, - BaseBranch: "master", - HeadRepoID: forkedRepo.ID, - HeadBranch: branchName, - }) + // add protected branch for commit status + csrf := GetCSRF(t, session, "/user2/repo1/settings/branches") + // Change master branch to protected + req := NewRequestWithValues(t, "POST", "/user2/repo1/settings/branches/edit", map[string]string{ + "_csrf": csrf, + "rule_name": "master", + "enable_push": "true", + "enable_status_check": "true", + "status_check_contexts": "gitea/actions", + }) + session.MakeRequest(t, req, http.StatusSeeOther) - if deleteBranch { - // check if new branch exists - forkedGitRepo, err := gitrepo.OpenRepository(db.DefaultContext, forkedRepo) + // first time insert automerge record, return true + scheduled, err := automerge.ScheduleAutoMerge(db.DefaultContext, user1, pr, repo_model.MergeStyleMerge, "auto merge test") require.NoError(t, err) - newBranch, err := forkedGitRepo.GetBranch(branchName) + assert.True(t, scheduled) + + // second time insert automerge record, return false because it does exist + scheduled, err = automerge.ScheduleAutoMerge(db.DefaultContext, user1, pr, repo_model.MergeStyleMerge, "auto merge test") + require.Error(t, err) + assert.False(t, scheduled) + + // reload pr again + pr = unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: pr.ID}) + assert.False(t, pr.HasMerged) + assert.Empty(t, pr.MergedCommitID) + + // update commit status to success, then it should be merged automatically + baseGitRepo, err := gitrepo.OpenRepository(db.DefaultContext, baseRepo) + require.NoError(t, err) + sha, err := baseGitRepo.GetRefCommitID(pr.GetGitRefName()) + require.NoError(t, err) + masterCommitID, err := baseGitRepo.GetBranchCommitID("master") require.NoError(t, err) - assert.NotNil(t, newBranch) - forkedGitRepo.Close() - } - // schedule pull request for automerge - if withAPI { - mergePullRequestForm := forms.MergePullRequestForm{ - MergeMessageField: "auto merge test", - Do: string(repo_model.MergeStyleMerge), - MergeWhenChecksSucceed: true, - DeleteBranchAfterMerge: deleteBranch, - } + branches, _, err := baseGitRepo.GetBranchNames(0, 100) + require.NoError(t, err) + assert.ElementsMatch(t, []string{"sub-home-md-img-check", "home-md-img-check", "pr-to-update", "branch2", "DefaultBranch", "develop", "feature/1", "master"}, branches) + baseGitRepo.Close() + defer func() { + testResetRepo(t, baseRepo.RepoPath(), "master", masterCommitID) + }() - // first time scheduling an automerge pull request, should return a 201 - ctx.ExpectedCode = http.StatusCreated - doAPIMergePullRequestForm(t, ctx, "user2", "repo1", pr.Index, &mergePullRequestForm) + err = commitstatus_service.CreateCommitStatus(db.DefaultContext, baseRepo, user1, sha, &git_model.CommitStatus{ + State: api.CommitStatusSuccess, + TargetURL: "https://gitea.com", + Context: "gitea/actions", + }) + require.NoError(t, err) - // second time scheduling an automerge pull request, should return a 409 - ctx.ExpectedCode = http.StatusConflict - doAPIMergePullRequestForm(t, ctx, "user2", "repo1", pr.Index, &mergePullRequestForm) - } else { - mergePullRequestForm := map[string]string{ - "merge_message_field": "auto merge test", - "do": string(repo_model.MergeStyleMerge), - "merge_when_checks_succeed": "true", - "delete_branch_after_merge": strconv.FormatBool(deleteBranch), - } + time.Sleep(2 * time.Second) - // first time scheduling an automerge pull request, should return a 200 - testPullMergeForm(t, ctx.Session, http.StatusOK, "user2", "repo1", strconv.FormatInt(pr.Index, 10), mergePullRequestForm) + // realod pr again + pr = unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: pr.ID}) + assert.True(t, pr.HasMerged) + assert.NotEmpty(t, pr.MergedCommitID) - // second time scheduling an automerge pull request, should delete the previous scheduled automerge and return a 200 again - testPullMergeForm(t, ctx.Session, http.StatusOK, "user2", "repo1", strconv.FormatInt(pr.Index, 10), mergePullRequestForm) - } - - // reload PR again - pr = unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: pr.ID}) - assert.False(t, pr.HasMerged) - assert.Empty(t, pr.MergedCommitID) - - // update commit status to success, then it should be merged automatically - baseGitRepo, err := gitrepo.OpenRepository(db.DefaultContext, baseRepo) - require.NoError(t, err) - sha, err := baseGitRepo.GetRefCommitID(pr.GetGitRefName()) - require.NoError(t, err) - masterCommitID, err := baseGitRepo.GetBranchCommitID("master") - require.NoError(t, err) - - branches, _, err := baseGitRepo.GetBranchNames(0, 100) - require.NoError(t, err) - assert.ElementsMatch(t, []string{"sub-home-md-img-check", "home-md-img-check", "pr-to-update", "branch2", "DefaultBranch", "develop", "feature/1", "master"}, branches) - baseGitRepo.Close() - defer func() { - testResetRepo(t, baseRepo.RepoPath(), "master", masterCommitID) - }() - - err = commitstatus_service.CreateCommitStatus(db.DefaultContext, baseRepo, user1, sha, &git_model.CommitStatus{ - State: api.CommitStatusSuccess, - TargetURL: "https://gitea.com", - Context: "gitea/actions", + unittest.AssertNotExistsBean(t, &pull_model.AutoMerge{PullID: pr.ID}) }) - require.NoError(t, err) +} - time.Sleep(2 * time.Second) +func TestPullAutoMergeAfterCommitStatusSucceedAndApproval(t *testing.T) { + onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) { + // create a pull request + session := loginUser(t, "user1") + user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) + forkedName := "repo1-2" + testRepoFork(t, session, "user2", "repo1", "user1", forkedName) + defer func() { + testDeleteRepository(t, session, "user1", forkedName) + }() + testEditFile(t, session, "user1", forkedName, "master", "README.md", "Hello, World (Edited)\n") + testPullCreate(t, session, "user1", forkedName, false, "master", "master", "Indexer notifier test pull") - // approve PR if necessary - if approval { - // reload PR again + baseRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user2", Name: "repo1"}) + forkedRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user1", Name: forkedName}) + pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ + BaseRepoID: baseRepo.ID, + BaseBranch: "master", + HeadRepoID: forkedRepo.ID, + HeadBranch: "master", + }) + + // add protected branch for commit status + csrf := GetCSRF(t, session, "/user2/repo1/settings/branches") + // Change master branch to protected + req := NewRequestWithValues(t, "POST", "/user2/repo1/settings/branches/edit", map[string]string{ + "_csrf": csrf, + "rule_name": "master", + "enable_push": "true", + "enable_status_check": "true", + "status_check_contexts": "gitea/actions", + "required_approvals": "1", + }) + session.MakeRequest(t, req, http.StatusSeeOther) + + // first time insert automerge record, return true + scheduled, err := automerge.ScheduleAutoMerge(db.DefaultContext, user1, pr, repo_model.MergeStyleMerge, "auto merge test") + require.NoError(t, err) + assert.True(t, scheduled) + + // second time insert automerge record, return false because it does exist + scheduled, err = automerge.ScheduleAutoMerge(db.DefaultContext, user1, pr, repo_model.MergeStyleMerge, "auto merge test") + require.Error(t, err) + assert.False(t, scheduled) + + // reload pr again + pr = unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: pr.ID}) + assert.False(t, pr.HasMerged) + assert.Empty(t, pr.MergedCommitID) + + // update commit status to success, then it should be merged automatically + baseGitRepo, err := gitrepo.OpenRepository(db.DefaultContext, baseRepo) + require.NoError(t, err) + sha, err := baseGitRepo.GetRefCommitID(pr.GetGitRefName()) + require.NoError(t, err) + masterCommitID, err := baseGitRepo.GetBranchCommitID("master") + require.NoError(t, err) + baseGitRepo.Close() + defer func() { + testResetRepo(t, baseRepo.RepoPath(), "master", masterCommitID) + }() + + err = commitstatus_service.CreateCommitStatus(db.DefaultContext, baseRepo, user1, sha, &git_model.CommitStatus{ + State: api.CommitStatusSuccess, + TargetURL: "https://gitea.com", + Context: "gitea/actions", + }) + require.NoError(t, err) + + time.Sleep(2 * time.Second) + + // reload pr again pr = unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: pr.ID}) assert.False(t, pr.HasMerged) assert.Empty(t, pr.MergedCommitID) // approve the PR from non-author approveSession := loginUser(t, "user2") - req := NewRequest(t, "GET", fmt.Sprintf("/user2/repo1/pulls/%d", pr.Index)) + req = NewRequest(t, "GET", fmt.Sprintf("/user2/repo1/pulls/%d", pr.Index)) resp := approveSession.MakeRequest(t, req, http.StatusOK) htmlDoc := NewHTMLParser(t, resp.Body) testSubmitReview(t, approveSession, htmlDoc.GetCSRF(), "user2", "repo1", strconv.Itoa(int(pr.Index)), sha, "approve", http.StatusOK) time.Sleep(2 * time.Second) - } - // reload PR again - pr = unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: pr.ID}) - assert.True(t, pr.HasMerged) - assert.NotEmpty(t, pr.MergedCommitID) + // realod pr again + pr = unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: pr.ID}) + assert.True(t, pr.HasMerged) + assert.NotEmpty(t, pr.MergedCommitID) - unittest.AssertNotExistsBean(t, &pull_model.AutoMerge{PullID: pr.ID}) - - if deleteBranch { - // check if new branch got removed - forkedGitRepo, err := gitrepo.OpenRepository(db.DefaultContext, forkedRepo) - require.NoError(t, err) - _, err = forkedGitRepo.GetBranch(branchName) - require.Error(t, err) - assert.True(t, git.IsErrBranchNotExist(err)) - forkedGitRepo.Close() - } -} - -func TestPullAutoMergeAfterCommitStatusSucceed(t *testing.T) { - onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) { - for _, testCase := range []struct { - name string - forkName string - approval bool - deleteBranch bool - }{ - { - name: "TestPullAutoMergeAfterCommitStatusSucceed", - forkName: "repo1-1", - approval: false, - deleteBranch: false, - }, - { - name: "TestPullAutoMergeAfterCommitStatusSucceedWithBranchDeletion", - forkName: "repo1-2", - approval: false, - deleteBranch: true, - }, - { - name: "TestPullAutoMergeAfterCommitStatusSucceedAndApproval", - forkName: "repo1-3", - approval: true, - deleteBranch: false, - }, - { - name: "TestPullAutoMergeAfterCommitStatusSucceedAndApprovalWithBranchDeletion", - forkName: "repo1-4", - approval: true, - deleteBranch: true, - }, - } { - // perform all tests with API and web routes - for _, withAPI := range []bool{false, true} { - t.Run(testCase.name, func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - protectedBranch := parameterProtectBranch{ - "enable_push": "true", - "enable_status_check": "true", - "status_check_contexts": "gitea/actions", - } - if testCase.approval { - protectedBranch["required_approvals"] = "1" - } - ctx := NewAPITestContext(t, "user2", "repo1", auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser) - doProtectBranch(ctx, "master", protectedBranch)(t) - - ctx = NewAPITestContext(t, "user1", "repo1", auth_model.AccessTokenScopeWriteRepository) - testPullAutoMergeAfterCommitStatusSucceed(t, ctx, testCase.forkName, testCase.approval, testCase.deleteBranch, withAPI) - }) - } - } + unittest.AssertNotExistsBean(t, &pull_model.AutoMerge{PullID: pr.ID}) }) } @@ -1106,12 +1093,12 @@ func TestPullAutoMergeAfterCommitStatusSucceedAndApprovalForAgitFlow(t *testing. user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) // first time insert automerge record, return true - scheduled, err := automerge.ScheduleAutoMerge(db.DefaultContext, user1, pr, repo_model.MergeStyleMerge, "auto merge test", false) + scheduled, err := automerge.ScheduleAutoMerge(db.DefaultContext, user1, pr, repo_model.MergeStyleMerge, "auto merge test") require.NoError(t, err) assert.True(t, scheduled) // second time insert automerge record, return false because it does exist - scheduled, err = automerge.ScheduleAutoMerge(db.DefaultContext, user1, pr, repo_model.MergeStyleMerge, "auto merge test", false) + scheduled, err = automerge.ScheduleAutoMerge(db.DefaultContext, user1, pr, repo_model.MergeStyleMerge, "auto merge test") require.Error(t, err) assert.False(t, scheduled) @@ -1163,34 +1150,3 @@ func TestPullAutoMergeAfterCommitStatusSucceedAndApprovalForAgitFlow(t *testing. unittest.AssertNotExistsBean(t, &pull_model.AutoMerge{PullID: pr.ID}) }) } - -func TestPullDeleteBranchPerms(t *testing.T) { - onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) { - user2Session := loginUser(t, "user2") - user4Session := loginUser(t, "user4") - testRepoFork(t, user4Session, "user2", "repo1", "user4", "repo1") - testEditFileToNewBranch(t, user2Session, "user2", "repo1", "master", "base-pr", "README.md", "Hello, World\n(Edited - base PR)\n") - - req := NewRequestWithValues(t, "POST", "/user4/repo1/compare/master...user2/repo1:base-pr", map[string]string{ - "_csrf": GetCSRF(t, user4Session, "/user4/repo1/compare/master...user2/repo1:base-pr"), - "title": "Testing PR", - }) - resp := user4Session.MakeRequest(t, req, http.StatusOK) - elem := strings.Split(test.RedirectURL(resp), "/") - - req = NewRequestWithValues(t, "POST", "/user4/repo1/pulls/"+elem[4]+"/merge", map[string]string{ - "_csrf": GetCSRF(t, user4Session, "/user4/repo1/pulls/"+elem[4]), - "do": "merge", - "delete_branch_after_merge": "on", - }) - user4Session.MakeRequest(t, req, http.StatusOK) - - flashCookie := user4Session.GetCookie(forgejo_context.CookieNameFlash) - assert.NotNil(t, flashCookie) - assert.EqualValues(t, "error%3DYou%2Bdon%2527t%2Bhave%2Bpermission%2Bto%2Bdelete%2Bthe%2Bhead%2Bbranch.", flashCookie.Value) - - // Check that the branch still exist. - req = NewRequest(t, "GET", "/user2/repo1/src/branch/base-pr") - user4Session.MakeRequest(t, req, http.StatusOK) - }) -} diff --git a/tests/integration/pull_review_test.go b/tests/integration/pull_review_test.go index 1319db29bf..d15a7bd130 100644 --- a/tests/integration/pull_review_test.go +++ b/tests/integration/pull_review_test.go @@ -5,7 +5,6 @@ package integration import ( "context" - "fmt" "net/http" "net/http/httptest" "net/url" @@ -19,8 +18,8 @@ import ( repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/gitrepo" - repo_module "code.gitea.io/gitea/modules/repository" "code.gitea.io/gitea/modules/test" issue_service "code.gitea.io/gitea/services/issue" repo_service "code.gitea.io/gitea/services/repository" @@ -64,74 +63,6 @@ func loadComment(t *testing.T, commentID string) *issues_model.Comment { return unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{ID: id}) } -func TestPullView_SelfReviewNotification(t *testing.T) { - onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) { - user1Session := loginUser(t, "user1") - user2Session := loginUser(t, "user2") - - user1csrf := GetCSRF(t, user1Session, "/") - oldUser1NotificationCount := getUserNotificationCount(t, user1Session, user1csrf) - - user2csrf := GetCSRF(t, user2Session, "/") - oldUser2NotificationCount := getUserNotificationCount(t, user2Session, user2csrf) - - user1 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) - user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) - - repo, _, f := tests.CreateDeclarativeRepo(t, user2, "test_reviewer", nil, nil, []*files_service.ChangeRepoFile{ - { - Operation: "create", - TreePath: "CODEOWNERS", - ContentReader: strings.NewReader("README.md @user5\n"), - }, - }) - defer f() - - // we need to add user1 as collaborator so it can be added as reviewer - err := repo_module.AddCollaborator(db.DefaultContext, repo, user1) - require.NoError(t, err) - - // create a new branch to prepare for pull request - _, err = files_service.ChangeRepoFiles(db.DefaultContext, repo, user2, &files_service.ChangeRepoFilesOptions{ - NewBranch: "codeowner-basebranch", - Files: []*files_service.ChangeRepoFile{ - { - Operation: "update", - TreePath: "README.md", - ContentReader: strings.NewReader("# This is a new project\n"), - }, - }, - }) - require.NoError(t, err) - - // Create a pull request. - resp := testPullCreate(t, user2Session, "user2", "test_reviewer", false, repo.DefaultBranch, "codeowner-basebranch", "Test Pull Request") - prURL := test.RedirectURL(resp) - elem := strings.Split(prURL, "/") - assert.EqualValues(t, "pulls", elem[3]) - - req := NewRequest(t, http.MethodGet, prURL) - resp = MakeRequest(t, req, http.StatusOK) - doc := NewHTMLParser(t, resp.Body) - attributeFilter := fmt.Sprintf("[data-update-url='/%s/%s/issues/request_review']", user2.Name, repo.Name) - issueID, ok := doc.Find(attributeFilter).Attr("data-issue-id") - assert.True(t, ok, "doc must contain data-issue-id") - - user1csrf = GetCSRF(t, user1Session, "/") - testAssignReviewer(t, user1Session, user1csrf, user2.Name, repo.Name, issueID, "1", http.StatusOK) - - // both user notification should keep the same notification count since - // user2 added itself as reviewer. - user1csrf = GetCSRF(t, user1Session, "/") - notificationCount := getUserNotificationCount(t, user1Session, user1csrf) - assert.Equal(t, oldUser1NotificationCount, notificationCount) - - user2csrf = GetCSRF(t, user2Session, "/") - notificationCount = getUserNotificationCount(t, user2Session, user2csrf) - assert.Equal(t, oldUser2NotificationCount, notificationCount) - }) -} - func TestPullView_ResolveInvalidatedReviewComment(t *testing.T) { defer tests.PrepareTestEnv(t)() session := loginUser(t, "user1") @@ -352,18 +283,32 @@ func TestPullView_CodeOwner(t *testing.T) { onGiteaRun(t, func(t *testing.T, u *url.URL) { user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) - repo, _, f := tests.CreateDeclarativeRepo(t, user2, "test_codeowner", nil, nil, []*files_service.ChangeRepoFile{ - { - Operation: "create", - TreePath: "CODEOWNERS", - ContentReader: strings.NewReader("README.md @user5\n"), + // Create the repo. + repo, err := repo_service.CreateRepositoryDirectly(db.DefaultContext, user2, user2, repo_service.CreateRepoOptions{ + Name: "test_codeowner", + Readme: "Default", + AutoInit: true, + ObjectFormatName: git.Sha1ObjectFormat.Name(), + DefaultBranch: "master", + }) + require.NoError(t, err) + + // add CODEOWNERS to default branch + _, err = files_service.ChangeRepoFiles(db.DefaultContext, repo, user2, &files_service.ChangeRepoFilesOptions{ + OldBranch: repo.DefaultBranch, + Files: []*files_service.ChangeRepoFile{ + { + Operation: "create", + TreePath: "CODEOWNERS", + ContentReader: strings.NewReader("README.md @user5\n"), + }, }, }) - defer f() + require.NoError(t, err) t.Run("First Pull Request", func(t *testing.T) { // create a new branch to prepare for pull request - _, err := files_service.ChangeRepoFiles(db.DefaultContext, repo, user2, &files_service.ChangeRepoFilesOptions{ + _, err = files_service.ChangeRepoFiles(db.DefaultContext, repo, user2, &files_service.ChangeRepoFilesOptions{ NewBranch: "codeowner-basebranch", Files: []*files_service.ChangeRepoFile{ { @@ -383,7 +328,7 @@ func TestPullView_CodeOwner(t *testing.T) { unittest.AssertExistsIf(t, true, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 5}) require.NoError(t, pr.LoadIssue(db.DefaultContext)) - err = issue_service.ChangeTitle(db.DefaultContext, pr.Issue, user2, "[WIP] Test Pull Request") + err := issue_service.ChangeTitle(db.DefaultContext, pr.Issue, user2, "[WIP] Test Pull Request") require.NoError(t, err) prUpdated1 := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: pr.ID}) require.NoError(t, prUpdated1.LoadIssue(db.DefaultContext)) @@ -397,7 +342,7 @@ func TestPullView_CodeOwner(t *testing.T) { }) // change the default branch CODEOWNERS file to change README.md's codeowner - _, err := files_service.ChangeRepoFiles(db.DefaultContext, repo, user2, &files_service.ChangeRepoFilesOptions{ + _, err = files_service.ChangeRepoFiles(db.DefaultContext, repo, user2, &files_service.ChangeRepoFilesOptions{ Files: []*files_service.ChangeRepoFile{ { Operation: "update", @@ -452,18 +397,10 @@ func TestPullView_CodeOwner(t *testing.T) { require.NoError(t, err) session := loginUser(t, "user5") + testPullCreate(t, session, "user5", "test_codeowner_fork", false, forkedRepo.DefaultBranch, "codeowner-basebranch-forked", "Test Pull Request2") - // create a pull request on the forked repository, code reviewers should not be mentioned - testPullCreateDirectly(t, session, "user5", "test_codeowner_fork", forkedRepo.DefaultBranch, "", "", "codeowner-basebranch-forked", "Test Pull Request on Forked Repository") - - pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: forkedRepo.ID, HeadBranch: "codeowner-basebranch-forked"}) + pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadBranch: "codeowner-basebranch-forked"}) unittest.AssertExistsIf(t, false, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 8}) - - // create a pull request to base repository, code reviewers should be mentioned - testPullCreateDirectly(t, session, repo.OwnerName, repo.Name, repo.DefaultBranch, forkedRepo.OwnerName, forkedRepo.Name, "codeowner-basebranch-forked", "Test Pull Request3") - - pr = unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadRepoID: forkedRepo.ID, HeadBranch: "codeowner-basebranch-forked"}) - unittest.AssertExistsIf(t, true, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 8}) }) }) } @@ -544,28 +481,6 @@ func TestPullView_GivenApproveOrRejectReviewOnClosedPR(t *testing.T) { }) } -func testNofiticationCount(t *testing.T, session *TestSession, csrf string, expectedSubmitStatus int) *httptest.ResponseRecorder { - options := map[string]string{ - "_csrf": csrf, - } - - req := NewRequestWithValues(t, "GET", "/", options) - return session.MakeRequest(t, req, expectedSubmitStatus) -} - -func testAssignReviewer(t *testing.T, session *TestSession, csrf, owner, repo, pullID, reviewer string, expectedSubmitStatus int) *httptest.ResponseRecorder { - options := map[string]string{ - "_csrf": csrf, - "action": "attach", - "issue_ids": pullID, - "id": reviewer, - } - - submitURL := path.Join(owner, repo, "issues", "request_review") - req := NewRequestWithValues(t, "POST", submitURL, options) - return session.MakeRequest(t, req, expectedSubmitStatus) -} - func testSubmitReview(t *testing.T, session *TestSession, csrf, owner, repo, pullNumber, commitID, reviewType string, expectedSubmitStatus int) *httptest.ResponseRecorder { options := map[string]string{ "_csrf": csrf, @@ -594,9 +509,3 @@ func testIssueClose(t *testing.T, session *TestSession, owner, repo, issueNumber req = NewRequestWithValues(t, "POST", closeURL, options) return session.MakeRequest(t, req, http.StatusOK) } - -func getUserNotificationCount(t *testing.T, session *TestSession, csrf string) string { - resp := testNofiticationCount(t, session, csrf, http.StatusOK) - doc := NewHTMLParser(t, resp.Body) - return doc.Find(`.notification_count`).Text() -} diff --git a/tests/integration/pull_test.go b/tests/integration/pull_test.go index 8f951f05ab..10dbad2228 100644 --- a/tests/integration/pull_test.go +++ b/tests/integration/pull_test.go @@ -65,37 +65,3 @@ func TestPullManuallyMergeWarning(t *testing.T) { assert.NotContains(t, mergeInstructions, warningMessage) }) } - -func TestPullCombinedReviewRequest(t *testing.T) { - defer tests.AddFixtures("tests/integration/fixtures/TestPullCombinedReviewRequest/")() - defer tests.PrepareTestEnv(t)() - - session := loginUser(t, "user2") - - helper := func(t *testing.T, action, userID, expectedText string) { - t.Helper() - - req := NewRequestWithValues(t, "POST", "/user2/repo1/pulls/request_review", map[string]string{ - "_csrf": GetCSRF(t, session, "/user2/repo1/pulls/3"), - "issue_ids": "3", - "action": action, - "id": userID, - }) - session.MakeRequest(t, req, http.StatusOK) - - req = NewRequest(t, "GET", "/user2/repo1/pulls/3") - resp := session.MakeRequest(t, req, http.StatusOK) - htmlDoc := NewHTMLParser(t, resp.Body) - - assert.Contains(t, htmlDoc.Find(".timeline-item:has(.review-request-list)").Last().Text(), expectedText) - } - - helper(t, "detach", "2", "refused to review") - helper(t, "attach", "4", "requested reviews from user4 and removed review requests for user2") - helper(t, "attach", "9", "requested reviews from user4, user9 and removed review requests for user2") - helper(t, "attach", "2", "requested reviews from user4, user9") - helper(t, "detach", "4", "requested review from user9") - helper(t, "detach", "11", "requested reviews from user9 and removed review requests for user11") - helper(t, "detach", "9", "removed review request for user11") - helper(t, "detach", "2", "removed review requests for user11, user2") -} diff --git a/tests/integration/pull_update_test.go b/tests/integration/pull_update_test.go index f36ea88c2b..08041f0717 100644 --- a/tests/integration/pull_update_test.go +++ b/tests/integration/pull_update_test.go @@ -4,7 +4,6 @@ package integration import ( - "fmt" "net/http" "net/url" "strings" @@ -17,9 +16,6 @@ import ( "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/setting" - api "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" pull_service "code.gitea.io/gitea/services/pull" repo_service "code.gitea.io/gitea/services/repository" files_service "code.gitea.io/gitea/services/repository/files" @@ -87,102 +83,6 @@ func TestAPIPullUpdateByRebase(t *testing.T) { }) } -func TestAPIViewUpdateSettings(t *testing.T) { - onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) { - defer tests.PrepareTestEnv(t)() - // Create PR to test - user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) - org26 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 26}) - pr := createOutdatedPR(t, user, org26) - - // Test GetDiverging - diffCount, err := pull_service.GetDiverging(git.DefaultContext, pr) - require.NoError(t, err) - assert.EqualValues(t, 1, diffCount.Behind) - assert.EqualValues(t, 1, diffCount.Ahead) - require.NoError(t, pr.LoadBaseRepo(db.DefaultContext)) - require.NoError(t, pr.LoadIssue(db.DefaultContext)) - - session := loginUser(t, "user2") - token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeAll) - - defaultUpdateStyle := "rebase" - editOption := api.EditRepoOption{ - DefaultUpdateStyle: &defaultUpdateStyle, - } - - req := NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", pr.BaseRepo.OwnerName, pr.BaseRepo.Name), editOption).AddTokenAuth(token) - session.MakeRequest(t, req, http.StatusOK) - assertViewPullUpdate(t, pr, session, "rebase", true) - - defaultUpdateStyle = "merge" - req = NewRequestWithJSON(t, "PATCH", fmt.Sprintf("/api/v1/repos/%s/%s", pr.BaseRepo.OwnerName, pr.BaseRepo.Name), editOption).AddTokenAuth(token) - session.MakeRequest(t, req, http.StatusOK) - assertViewPullUpdate(t, pr, session, "merge", true) - }) -} - -func TestViewPullUpdateByMerge(t *testing.T) { - onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) { - testViewPullUpdate(t, "merge") - }) -} - -func TestViewPullUpdateByRebase(t *testing.T) { - onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) { - testViewPullUpdate(t, "rebase") - }) -} - -func testViewPullUpdate(t *testing.T, updateStyle string) { - defer test.MockVariableValue(&setting.Repository.PullRequest.DefaultUpdateStyle, updateStyle)() - defer tests.PrepareTestEnv(t)() - // Create PR to test - user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) - org26 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 26}) - pr := createOutdatedPR(t, user, org26) - - // Test GetDiverging - diffCount, err := pull_service.GetDiverging(git.DefaultContext, pr) - require.NoError(t, err) - assert.EqualValues(t, 1, diffCount.Behind) - assert.EqualValues(t, 1, diffCount.Ahead) - require.NoError(t, pr.LoadBaseRepo(db.DefaultContext)) - require.NoError(t, pr.LoadIssue(db.DefaultContext)) - - session := loginUser(t, "user2") - assertViewPullUpdate(t, pr, session, updateStyle, true) -} - -func assertViewPullUpdate(t *testing.T, pr *issues_model.PullRequest, session *TestSession, expectedStyle string, dropdownExpected bool) { - req := NewRequest(t, "GET", fmt.Sprintf("%s/%s/pulls/%d", pr.BaseRepo.OwnerName, pr.BaseRepo.Name, pr.Issue.Index)) - resp := session.MakeRequest(t, req, http.StatusOK) - - htmlDoc := NewHTMLParser(t, resp.Body) - // Verify that URL of the update button is shown correctly. - var mainExpectedURL string - mergeExpectedURL := fmt.Sprintf("/%s/%s/pulls/%d/update?style=merge", pr.BaseRepo.OwnerName, pr.BaseRepo.Name, pr.Issue.Index) - rebaseExpectedURL := fmt.Sprintf("/%s/%s/pulls/%d/update?style=rebase", pr.BaseRepo.OwnerName, pr.BaseRepo.Name, pr.Issue.Index) - if expectedStyle == "rebase" { - mainExpectedURL = rebaseExpectedURL - if dropdownExpected { - htmlDoc.AssertElement(t, fmt.Sprintf(".update-button .dropdown .menu .item[data-do=\"%s\"]:not(.active.selected)", mergeExpectedURL), true) - htmlDoc.AssertElement(t, fmt.Sprintf(".update-button .dropdown .menu .active.selected.item[data-do=\"%s\"]", rebaseExpectedURL), true) - } - } else { - mainExpectedURL = mergeExpectedURL - if dropdownExpected { - htmlDoc.AssertElement(t, fmt.Sprintf(".update-button .dropdown .menu .active.selected.item[data-do=\"%s\"]", mergeExpectedURL), true) - htmlDoc.AssertElement(t, fmt.Sprintf(".update-button .dropdown .menu .item[data-do=\"%s\"]:not(.active.selected)", rebaseExpectedURL), true) - } - } - if dropdownExpected { - htmlDoc.AssertElement(t, fmt.Sprintf(".update-button .button[data-do=\"%s\"]", mainExpectedURL), true) - } else { - htmlDoc.AssertElement(t, fmt.Sprintf("form[action=\"%s\"]", mainExpectedURL), true) - } -} - func createOutdatedPR(t *testing.T, actor, forkOrg *user_model.User) *issues_model.PullRequest { baseRepo, _, _ := tests.CreateDeclarativeRepo(t, actor, "repo-pr-update", nil, nil, nil) diff --git a/tests/integration/release_test.go b/tests/integration/release_test.go index c535c6c93d..48c2b37c91 100644 --- a/tests/integration/release_test.go +++ b/tests/integration/release_test.go @@ -272,35 +272,6 @@ func TestViewReleaseListLogin(t *testing.T) { }, links) } -func TestViewReleaseListKeyword(t *testing.T) { - defer tests.PrepareTestEnv(t)() - - repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) - - link := repo.Link() + "/releases?q=testing" - - session := loginUser(t, "user1") - req := NewRequest(t, "GET", link) - rsp := session.MakeRequest(t, req, http.StatusOK) - - htmlDoc := NewHTMLParser(t, rsp.Body) - releases := htmlDoc.Find("#release-list li.ui.grid") - assert.Equal(t, 1, releases.Length()) - - links := make([]string, 0, 5) - releases.Each(func(i int, s *goquery.Selection) { - link, exist := s.Find(".release-list-title a").Attr("href") - if !exist { - return - } - links = append(links, link) - }) - - assert.EqualValues(t, []string{ - "/user2/repo1/releases/tag/v1.1", - }, links) -} - func TestReleaseOnCommit(t *testing.T) { defer tests.PrepareTestEnv(t)() diff --git a/tests/integration/rename_branch_test.go b/tests/integration/rename_branch_test.go index 20d4c9b48f..a96cbf5623 100644 --- a/tests/integration/rename_branch_test.go +++ b/tests/integration/rename_branch_test.go @@ -22,6 +22,8 @@ func TestRenameBranch(t *testing.T) { } func testRenameBranch(t *testing.T, u *url.URL) { + defer tests.PrepareTestEnv(t)() + repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) unittest.AssertExistsAndLoadBean(t, &git_model.Branch{RepoID: repo.ID, Name: "master"}) diff --git a/tests/integration/repo_branch_test.go b/tests/integration/repo_branch_test.go index df9ea9a97c..2aa299479a 100644 --- a/tests/integration/repo_branch_test.go +++ b/tests/integration/repo_branch_test.go @@ -18,6 +18,7 @@ import ( "code.gitea.io/gitea/models/unittest" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/graceful" + "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/test" "code.gitea.io/gitea/modules/translation" repo_service "code.gitea.io/gitea/services/repository" @@ -156,8 +157,15 @@ func TestCreateBranchInvalidCSRF(t *testing.T) { "_csrf": "fake_csrf", "new_branch_name": "test", }) - resp := session.MakeRequest(t, req, http.StatusBadRequest) - assert.Contains(t, resp.Body.String(), "Invalid CSRF token") + resp := session.MakeRequest(t, req, http.StatusSeeOther) + loc := resp.Header().Get("Location") + assert.Equal(t, setting.AppSubURL+"/", loc) + resp = session.MakeRequest(t, NewRequest(t, "GET", loc), http.StatusOK) + htmlDoc := NewHTMLParser(t, resp.Body) + assert.Equal(t, + "Bad Request: invalid CSRF token", + strings.TrimSpace(htmlDoc.doc.Find(".ui.message").Text()), + ) } func TestDatabaseMissingABranch(t *testing.T) { diff --git a/tests/integration/repo_collaborator_test.go b/tests/integration/repo_collaborator_test.go index 292cd5862b..beeb950f5a 100644 --- a/tests/integration/repo_collaborator_test.go +++ b/tests/integration/repo_collaborator_test.go @@ -5,33 +5,33 @@ package integration import ( "net/http" + "net/url" "strings" "testing" - "code.gitea.io/gitea/tests" - "github.com/stretchr/testify/assert" ) // TestRepoCollaborators is a test for contents of Collaborators tab in the repo settings // It only covers a few elements and can be extended as needed func TestRepoCollaborators(t *testing.T) { - defer tests.PrepareTestEnv(t)() - session := loginUser(t, "user2") + onGiteaRun(t, func(t *testing.T, u *url.URL) { + session := loginUser(t, "user2") - // Visit Collaborators tab of repo settings - response := session.MakeRequest(t, NewRequest(t, "GET", "/user2/repo1/settings/collaboration"), http.StatusOK) - page := NewHTMLParser(t, response.Body).Find(".repo-setting-content") + // Visit Collaborators tab of repo settings + response := session.MakeRequest(t, NewRequest(t, "GET", "/user2/repo1/settings/collaboration"), http.StatusOK) + page := NewHTMLParser(t, response.Body).Find(".repo-setting-content") - // Veirfy header - assert.EqualValues(t, "Collaborators", strings.TrimSpace(page.Find("h4").Text())) + // Veirfy header + assert.EqualValues(t, "Collaborators", strings.TrimSpace(page.Find("h4").Text())) - // Veirfy button text - page = page.Find("#repo-collab-form") - assert.EqualValues(t, "Add collaborator", strings.TrimSpace(page.Find("button.primary").Text())) + // Veirfy button text + page = page.Find("#repo-collab-form") + assert.EqualValues(t, "Add collaborator", strings.TrimSpace(page.Find("button.primary").Text())) - // Veirfy placeholder - placeholder, exists := page.Find("#search-user-box input").Attr("placeholder") - assert.True(t, exists) - assert.EqualValues(t, "Search users...", placeholder) + // Veirfy placeholder + placeholder, exists := page.Find("#search-user-box input").Attr("placeholder") + assert.True(t, exists) + assert.EqualValues(t, "Search users...", placeholder) + }) } diff --git a/tests/integration/repo_fork_test.go b/tests/integration/repo_fork_test.go index b2e40671ba..2627749836 100644 --- a/tests/integration/repo_fork_test.go +++ b/tests/integration/repo_fork_test.go @@ -17,7 +17,6 @@ import ( "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/test" "code.gitea.io/gitea/routers" repo_service "code.gitea.io/gitea/services/repository" @@ -239,34 +238,3 @@ func TestRepoForkToOrg(t *testing.T) { }) }) } - -func TestForkListPrivateRepo(t *testing.T) { - forkItemSelector := ".tw-flex.tw-items-center.tw-py-2" - - onGiteaRun(t, func(t *testing.T, u *url.URL) { - session := loginUser(t, "user5") - org23 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 23, Visibility: structs.VisibleTypePrivate}) - - testRepoFork(t, session, "user2", "repo1", org23.Name, "repo1") - - t.Run("Anomynous", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - req := NewRequest(t, "GET", "/user2/repo1/forks") - resp := MakeRequest(t, req, http.StatusOK) - htmlDoc := NewHTMLParser(t, resp.Body) - - htmlDoc.AssertElement(t, forkItemSelector, false) - }) - - t.Run("Logged in", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - req := NewRequest(t, "GET", "/user2/repo1/forks") - resp := session.MakeRequest(t, req, http.StatusOK) - htmlDoc := NewHTMLParser(t, resp.Body) - - htmlDoc.AssertElement(t, forkItemSelector, true) - }) - }) -} diff --git a/tests/integration/repo_generate_test.go b/tests/integration/repo_generate_test.go index bcee0df417..c475c92eef 100644 --- a/tests/integration/repo_generate_test.go +++ b/tests/integration/repo_generate_test.go @@ -7,19 +7,14 @@ package integration import ( "fmt" "net/http" - "net/url" "strconv" "strings" "testing" - repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" "code.gitea.io/gitea/modules/translation" - files_service "code.gitea.io/gitea/services/repository/files" "code.gitea.io/gitea/tests" "github.com/stretchr/testify/assert" @@ -43,7 +38,7 @@ func assertRepoCreateForm(t *testing.T, htmlDoc *HTMLDoc, owner *user_model.User // the template menu is loaded client-side, so don't assert the option exists assert.Equal(t, templateID, htmlDoc.GetInputValueByName("repo_template"), "Unexpected repo_template selection") - for _, name := range []string{"issue_labels", "gitignores", "license", "object_format_name"} { + for _, name := range []string{"issue_labels", "gitignores", "license", "readme", "object_format_name"} { htmlDoc.AssertDropdownHasOptions(t, name) } } @@ -79,14 +74,10 @@ func testRepoGenerate(t *testing.T, session *TestSession, templateID, templateOw // Step4: check the existence of the generated repo req = NewRequestf(t, "GET", "/%s/%s", generateOwner.Name, generateRepoName) session.MakeRequest(t, req, http.StatusOK) -} -func testRepoGenerateWithFixture(t *testing.T, session *TestSession, templateID, templateOwnerName, templateRepoName string, user, generateOwner *user_model.User, generateRepoName string) { - testRepoGenerate(t, session, templateID, templateOwnerName, templateRepoName, user, generateOwner, generateRepoName) - - // check substituted values in Readme - req := NewRequestf(t, "GET", "/%s/%s/raw/branch/master/README.md", generateOwner.Name, generateRepoName) - resp := session.MakeRequest(t, req, http.StatusOK) + // Step5: check substituted values in Readme + req = NewRequestf(t, "GET", "/%s/%s/raw/branch/master/README.md", generateOwner.Name, generateRepoName) + resp = session.MakeRequest(t, req, http.StatusOK) body := fmt.Sprintf(`# %s Readme Owner: %s Link: /%s/%s @@ -132,7 +123,7 @@ func TestRepoGenerate(t *testing.T) { session := loginUser(t, userName) user := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: userName}) - testRepoGenerateWithFixture(t, session, "44", "user27", "template1", user, user, "generated1") + testRepoGenerate(t, session, "44", "user27", "template1", user, user, "generated1") } func TestRepoGenerateToOrg(t *testing.T) { @@ -142,84 +133,5 @@ func TestRepoGenerateToOrg(t *testing.T) { user := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: userName}) org := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: "org3"}) - testRepoGenerateWithFixture(t, session, "44", "user27", "template1", user, org, "generated2") -} - -func TestRepoCreateFormTrimSpace(t *testing.T) { - defer tests.PrepareTestEnv(t)() - user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) - session := loginUser(t, user.Name) - - req := NewRequestWithValues(t, "POST", "/repo/create", map[string]string{ - "_csrf": GetCSRF(t, session, "/repo/create"), - "uid": "2", - "repo_name": " spaced-name ", - }) - resp := session.MakeRequest(t, req, http.StatusSeeOther) - - assert.EqualValues(t, "/user2/spaced-name", test.RedirectURL(resp)) - unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerID: 2, Name: "spaced-name"}) -} - -func TestRepoGenerateTemplating(t *testing.T) { - onGiteaRun(t, func(t *testing.T, u *url.URL) { - input := `# $REPO_NAME - This is a Repo By $REPO_OWNER - ThisIsThe${REPO_NAME}InAnInlineWay` - expected := `# %s - This is a Repo By %s - ThisIsThe%sInAnInlineWay` - templateName := "my_template" - generatedName := "my_generated" - - userName := "user1" - session := loginUser(t, userName) - user := unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: userName}) - - template, _, f := tests.CreateDeclarativeRepoWithOptions(t, user, tests.DeclarativeRepoOptions{ - Name: optional.Some(templateName), - IsTemplate: optional.Some(true), - Files: optional.Some([]*files_service.ChangeRepoFile{ - { - Operation: "create", - TreePath: ".forgejo/template", - ContentReader: strings.NewReader("Readme.md"), - }, - { - Operation: "create", - TreePath: "Readme.md", - ContentReader: strings.NewReader(input), - }, - }), - }) - defer f() - - // The repo.TemplateID field is not initalized. Luckly the ID field holds the expected value - templateID := strconv.FormatInt(template.ID, 10) - - testRepoGenerate( - t, - session, - templateID, - user.Name, - templateName, - user, - user, - generatedName, - ) - - req := NewRequestf( - t, - "GET", "/%s/%s/raw/branch/%s/Readme.md", - user.Name, - generatedName, - template.DefaultBranch, - ) - resp := session.MakeRequest(t, req, http.StatusOK) - body := fmt.Sprintf(expected, - generatedName, - user.Name, - generatedName) - assert.Equal(t, body, resp.Body.String()) - }) + testRepoGenerate(t, session, "44", "user27", "template1", user, org, "generated2") } diff --git a/tests/integration/repo_git_note_test.go b/tests/integration/repo_git_note_test.go deleted file mode 100644 index 6ad57c81b0..0000000000 --- a/tests/integration/repo_git_note_test.go +++ /dev/null @@ -1,72 +0,0 @@ -package integration - -import ( - "net/http" - "net/url" - "testing" - - "code.gitea.io/gitea/tests" - - "github.com/stretchr/testify/assert" -) - -func TestRepoModifyGitNotes(t *testing.T) { - onGiteaRun(t, func(*testing.T, *url.URL) { - session := loginUser(t, "user2") - - req := NewRequest(t, "GET", "/user2/repo1/commit/65f1bf27bc3bf70f64657658635e66094edbcb4d") - resp := MakeRequest(t, req, http.StatusOK) - assert.Contains(t, resp.Body.String(), "
    This is a test note\n
    ") - assert.Contains(t, resp.Body.String(), "commit-notes-display-area") - - t.Run("Set", func(t *testing.T) { - req = NewRequestWithValues(t, "POST", "/user2/repo1/commit/65f1bf27bc3bf70f64657658635e66094edbcb4d/notes", map[string]string{ - "_csrf": GetCSRF(t, session, "/user2/repo1"), - "notes": "This is a new note", - }) - session.MakeRequest(t, req, http.StatusSeeOther) - - req = NewRequest(t, "GET", "/user2/repo1/commit/65f1bf27bc3bf70f64657658635e66094edbcb4d") - resp = MakeRequest(t, req, http.StatusOK) - assert.Contains(t, resp.Body.String(), "
    This is a new note\n
    ") - assert.Contains(t, resp.Body.String(), "commit-notes-display-area") - }) - - t.Run("Delete", func(t *testing.T) { - req = NewRequestWithValues(t, "POST", "/user2/repo1/commit/65f1bf27bc3bf70f64657658635e66094edbcb4d/notes/remove", map[string]string{ - "_csrf": GetCSRF(t, session, "/user2/repo1"), - }) - session.MakeRequest(t, req, http.StatusSeeOther) - - req = NewRequest(t, "GET", "/user2/repo1/commit/65f1bf27bc3bf70f64657658635e66094edbcb4d") - resp = MakeRequest(t, req, http.StatusOK) - assert.NotContains(t, resp.Body.String(), "commit-notes-display-area") - }) - }) -} - -func TestRepoGitNotesButtonsVisible(t *testing.T) { - onGiteaRun(t, func(*testing.T, *url.URL) { - t.Run("With Permission", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - session := loginUser(t, "user2") - - req := NewRequest(t, "GET", "/user2/repo1/commit/65f1bf27bc3bf70f64657658635e66094edbcb4d") - resp := session.MakeRequest(t, req, http.StatusOK) - - assert.Contains(t, resp.Body.String(), "id=\"commit-notes-edit-button\"") - assert.Contains(t, resp.Body.String(), "data-modal=\"#delete-note-modal\"") - }) - - t.Run("Without Permission", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - req := NewRequest(t, "GET", "/user2/repo1/commit/65f1bf27bc3bf70f64657658635e66094edbcb4d") - resp := MakeRequest(t, req, http.StatusOK) - - assert.NotContains(t, resp.Body.String(), "id=\"commit-notes-edit-button\"") - assert.NotContains(t, resp.Body.String(), "data-modal=\"#delete-note-modal\"") - }) - }) -} diff --git a/tests/integration/repo_issue_title_test.go b/tests/integration/repo_issue_title_test.go index cf517a7a40..5199be91bc 100644 --- a/tests/integration/repo_issue_title_test.go +++ b/tests/integration/repo_issue_title_test.go @@ -39,7 +39,7 @@ func TestIssueTitles(t *testing.T) { titleHTML := []string{ "Title", - `ðŸ‘`, + `ðŸ‘`, `code`, } diff --git a/tests/integration/repo_migration_ui_test.go b/tests/integration/repo_migration_ui_test.go index 594b09b490..40688d4a60 100644 --- a/tests/integration/repo_migration_ui_test.go +++ b/tests/integration/repo_migration_ui_test.go @@ -5,26 +5,26 @@ package integration import ( "net/http" + "net/url" "testing" - "code.gitea.io/gitea/tests" - "github.com/PuerkitoBio/goquery" "github.com/stretchr/testify/assert" ) func TestRepoMigrationUI(t *testing.T) { - defer tests.PrepareTestEnv(t)() - sessionUser1 := loginUser(t, "user1") - // Nothing is tested in plain Git migration form right now - testRepoMigrationFormGitHub(t, sessionUser1) - testRepoMigrationFormGitea(t, sessionUser1) - testRepoMigrationFormGitLab(t, sessionUser1) - testRepoMigrationFormGogs(t, sessionUser1) - testRepoMigrationFormOneDev(t, sessionUser1) - testRepoMigrationFormGitBucket(t, sessionUser1) - testRepoMigrationFormCodebase(t, sessionUser1) - testRepoMigrationFormForgejo(t, sessionUser1) + onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) { + sessionUser1 := loginUser(t, "user1") + // Nothing is tested in plain Git migration form right now + testRepoMigrationFormGitHub(t, sessionUser1) + testRepoMigrationFormGitea(t, sessionUser1) + testRepoMigrationFormGitLab(t, sessionUser1) + testRepoMigrationFormGogs(t, sessionUser1) + testRepoMigrationFormOneDev(t, sessionUser1) + testRepoMigrationFormGitBucket(t, sessionUser1) + testRepoMigrationFormCodebase(t, sessionUser1) + testRepoMigrationFormForgejo(t, sessionUser1) + }) } func testRepoMigrationFormGitHub(t *testing.T, session *TestSession) { diff --git a/tests/integration/repo_search_test.go b/tests/integration/repo_search_test.go index 6189dc1150..c7a31f473b 100644 --- a/tests/integration/repo_search_test.go +++ b/tests/integration/repo_search_test.go @@ -78,27 +78,26 @@ func testSearchRepo(t *testing.T, indexer bool) { code_indexer.UpdateRepoIndexer(repo) } - testSearch(t, "/user2/glob/search?q=", []string{}, indexer) testSearch(t, "/user2/glob/search?q=loren&page=1", []string{"a.txt"}, indexer) - testSearch(t, "/user2/glob/search?q=loren&page=1&mode=exact", []string{"a.txt"}, indexer) + testSearch(t, "/user2/glob/search?q=loren&page=1&fuzzy=false", []string{"a.txt"}, indexer) if indexer { // fuzzy search: matches both file3 (x/b.txt) and file1 (a.txt) // when indexer is enabled - testSearch(t, "/user2/glob/search?q=file3&mode=fuzzy&page=1", []string{"x/b.txt", "a.txt"}, indexer) - testSearch(t, "/user2/glob/search?q=file4&mode=fuzzy&page=1", []string{"x/b.txt", "a.txt"}, indexer) - testSearch(t, "/user2/glob/search?q=file5&mode=fuzzy&page=1", []string{"x/b.txt", "a.txt"}, indexer) + testSearch(t, "/user2/glob/search?q=file3&page=1", []string{"x/b.txt", "a.txt"}, indexer) + testSearch(t, "/user2/glob/search?q=file4&page=1", []string{"x/b.txt", "a.txt"}, indexer) + testSearch(t, "/user2/glob/search?q=file5&page=1", []string{"x/b.txt", "a.txt"}, indexer) } else { // fuzzy search: Union/OR of all the keywords // when indexer is disabled - testSearch(t, "/user2/glob/search?q=file3+file1&mode=union&page=1", []string{"a.txt", "x/b.txt"}, indexer) - testSearch(t, "/user2/glob/search?q=file4&mode=union&page=1", []string{}, indexer) - testSearch(t, "/user2/glob/search?q=file5&mode=union&page=1", []string{}, indexer) + testSearch(t, "/user2/glob/search?q=file3+file1&page=1", []string{"a.txt", "x/b.txt"}, indexer) + testSearch(t, "/user2/glob/search?q=file4&page=1", []string{}, indexer) + testSearch(t, "/user2/glob/search?q=file5&page=1", []string{}, indexer) } - testSearch(t, "/user2/glob/search?q=file3&page=1&mode=exact", []string{"x/b.txt"}, indexer) - testSearch(t, "/user2/glob/search?q=file4&page=1&mode=exact", []string{}, indexer) - testSearch(t, "/user2/glob/search?q=file5&page=1&mode=exact", []string{}, indexer) + testSearch(t, "/user2/glob/search?q=file3&page=1&fuzzy=false", []string{"x/b.txt"}, indexer) + testSearch(t, "/user2/glob/search?q=file4&page=1&fuzzy=false", []string{}, indexer) + testSearch(t, "/user2/glob/search?q=file5&page=1&fuzzy=false", []string{}, indexer) } func testSearch(t *testing.T, url string, expected []string, indexer bool) { @@ -114,19 +113,21 @@ func testSearch(t *testing.T, url string, expected []string, indexer bool) { branchDropdown := container.Find(".js-branch-tag-selector") assert.EqualValues(t, indexer, len(branchDropdown.Nodes) == 0) - dropdownOptions := container. - Find(".menu[data-test-tag=fuzzy-dropdown]"). - Find("input[type=radio][name=mode]"). - Map(func(_ int, sel *goquery.Selection) string { - attr, exists := sel.Attr("value") - assert.True(t, exists) - return attr - }) + // if indexer is disabled "fuzzy" should be displayed as "union" + expectedFuzzy := "Fuzzy" + if !indexer { + expectedFuzzy = "Union" + } - if indexer { - assert.EqualValues(t, []string{"exact", "fuzzy"}, dropdownOptions) - } else { - assert.EqualValues(t, []string{"exact", "union", "regexp"}, dropdownOptions) + fuzzyDropdown := container.Find(".ui.dropdown[data-test-tag=fuzzy-dropdown]") + actualFuzzyText := fuzzyDropdown.Find(".menu .item[data-value=true]").First().Text() + assert.EqualValues(t, expectedFuzzy, actualFuzzyText) + + if fuzzyDropdown. + Find("input[name=fuzzy][value=true]"). + Length() != 0 { + actualFuzzyText = fuzzyDropdown.Find("div.text").First().Text() + assert.EqualValues(t, expectedFuzzy, actualFuzzyText) } filenames := resultFilenames(t, doc) diff --git a/tests/integration/repo_tag_test.go b/tests/integration/repo_tag_test.go index 0ce0e142b9..d5539cb259 100644 --- a/tests/integration/repo_tag_test.go +++ b/tests/integration/repo_tag_test.go @@ -5,20 +5,18 @@ package integration import ( - "fmt" "net/http" "net/url" "strings" "testing" "code.gitea.io/gitea/models" - auth_model "code.gitea.io/gitea/models/auth" + "code.gitea.io/gitea/models/db" + git_model "code.gitea.io/gitea/models/git" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/git" - repo_module "code.gitea.io/gitea/modules/repository" - api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/services/release" "code.gitea.io/gitea/tests" @@ -32,6 +30,20 @@ func TestTagViewWithoutRelease(t *testing.T) { repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}) + defer func() { + releases, err := db.Find[repo_model.Release](db.DefaultContext, repo_model.FindReleasesOptions{ + IncludeTags: true, + TagNames: []string{"no-release"}, + RepoID: repo.ID, + }) + require.NoError(t, err) + + for _, release := range releases { + _, err = db.DeleteByID[repo_model.Release](db.DefaultContext, release.ID) + require.NoError(t, err) + } + }() + err := release.CreateNewTag(git.DefaultContext, owner, repo, "master", "no-release", "release-less tag") require.NoError(t, err) @@ -57,27 +69,27 @@ func TestTagViewWithoutRelease(t *testing.T) { } func TestCreateNewTagProtected(t *testing.T) { - onGiteaRun(t, func(t *testing.T, u *url.URL) { - repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) - owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}) + defer tests.PrepareTestEnv(t)() - t.Run("Code", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() + repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) + owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}) - err := release.CreateNewTag(git.DefaultContext, owner, repo, "master", "t-first", "first tag") - require.NoError(t, err) + t.Run("Code", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() - err = release.CreateNewTag(git.DefaultContext, owner, repo, "master", "v-2", "second tag") - require.Error(t, err) - assert.True(t, models.IsErrProtectedTagName(err)) + err := release.CreateNewTag(git.DefaultContext, owner, repo, "master", "t-first", "first tag") + require.NoError(t, err) - err = release.CreateNewTag(git.DefaultContext, owner, repo, "master", "v-1.1", "third tag") - require.NoError(t, err) - }) + err = release.CreateNewTag(git.DefaultContext, owner, repo, "master", "v-2", "second tag") + require.Error(t, err) + assert.True(t, models.IsErrProtectedTagName(err)) - t.Run("Git", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() + err = release.CreateNewTag(git.DefaultContext, owner, repo, "master", "v-1.1", "third tag") + require.NoError(t, err) + }) + t.Run("Git", func(t *testing.T) { + onGiteaRun(t, func(t *testing.T, u *url.URL) { httpContext := NewAPITestContext(t, owner.Name, repo.Name) dstPath := t.TempDir() @@ -94,10 +106,10 @@ func TestCreateNewTagProtected(t *testing.T) { require.Error(t, err) assert.Contains(t, err.Error(), "Tag v-2 is protected") }) + }) - t.Run("GitTagForce", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - + t.Run("GitTagForce", func(t *testing.T) { + onGiteaRun(t, func(t *testing.T, u *url.URL) { httpContext := NewAPITestContext(t, owner.Name, repo.Name) dstPath := t.TempDir() @@ -107,7 +119,13 @@ func TestCreateNewTagProtected(t *testing.T) { doGitClone(dstPath, u)(t) - _, _, err := git.NewCommand(git.DefaultContext, "tag", "v-1.1", "-m", "force update v2", "--force").RunStdString(&git.RunOpts{Dir: dstPath}) + _, _, err := git.NewCommand(git.DefaultContext, "tag", "v-1.1", "-m", "force update", "--force").RunStdString(&git.RunOpts{Dir: dstPath}) + require.NoError(t, err) + + _, _, err = git.NewCommand(git.DefaultContext, "push", "--tags").RunStdString(&git.RunOpts{Dir: dstPath}) + require.NoError(t, err) + + _, _, err = git.NewCommand(git.DefaultContext, "tag", "v-1.1", "-m", "force update v2", "--force").RunStdString(&git.RunOpts{Dir: dstPath}) require.NoError(t, err) _, _, err = git.NewCommand(git.DefaultContext, "push", "--tags").RunStdString(&git.RunOpts{Dir: dstPath}) @@ -123,86 +141,25 @@ func TestCreateNewTagProtected(t *testing.T) { assert.Contains(t, tagsTab.Text(), "force update v2") }) }) -} -func TestSyncRepoTags(t *testing.T) { - onGiteaRun(t, func(t *testing.T, u *url.URL) { - repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) - owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}) - - t.Run("Git", func(t *testing.T) { - httpContext := NewAPITestContext(t, owner.Name, repo.Name) - - dstPath := t.TempDir() - - u.Path = httpContext.GitPath() - u.User = url.UserPassword(owner.Name, userPassword) - - doGitClone(dstPath, u)(t) - - _, _, err := git.NewCommand(git.DefaultContext, "tag", "v2", "-m", "this is an annotated tag").RunStdString(&git.RunOpts{Dir: dstPath}) - require.NoError(t, err) - - _, _, err = git.NewCommand(git.DefaultContext, "push", "--tags").RunStdString(&git.RunOpts{Dir: dstPath}) - require.NoError(t, err) - - testTag := func(t *testing.T) { - t.Helper() - req := NewRequestf(t, "GET", "/%s/releases/tag/v2", repo.FullName()) - resp := MakeRequest(t, req, http.StatusOK) - htmlDoc := NewHTMLParser(t, resp.Body) - tagsTab := htmlDoc.Find(".release-list-title") - assert.Contains(t, tagsTab.Text(), "this is an annotated tag") - } - - // Make sure `SyncRepoTags` doesn't modify annotated tags. - testTag(t) - require.NoError(t, repo_module.SyncRepoTags(git.DefaultContext, repo.ID)) - testTag(t) - }) - }) -} - -func TestRepushTag(t *testing.T) { - onGiteaRun(t, func(t *testing.T, u *url.URL) { - repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) - owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}) - session := loginUser(t, owner.LowerName) - token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) - - httpContext := NewAPITestContext(t, owner.Name, repo.Name) - - dstPath := t.TempDir() - - u.Path = httpContext.GitPath() - u.User = url.UserPassword(owner.Name, userPassword) - - doGitClone(dstPath, u)(t) - - // create and push a tag - _, _, err := git.NewCommand(git.DefaultContext, "tag", "v2.0").RunStdString(&git.RunOpts{Dir: dstPath}) - require.NoError(t, err) - _, _, err = git.NewCommand(git.DefaultContext, "push", "origin", "--tags", "v2.0").RunStdString(&git.RunOpts{Dir: dstPath}) - require.NoError(t, err) - // create a release for the tag - createdRelease := createNewReleaseUsingAPI(t, token, owner, repo, "v2.0", "", "Release of v2.0", "desc") - assert.False(t, createdRelease.IsDraft) - // delete the tag - _, _, err = git.NewCommand(git.DefaultContext, "push", "origin", "--delete", "v2.0").RunStdString(&git.RunOpts{Dir: dstPath}) - require.NoError(t, err) - // query the release by API and it should be a draft - req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/releases/tags/%s", owner.Name, repo.Name, "v2.0")) - resp := MakeRequest(t, req, http.StatusOK) - var respRelease *api.Release - DecodeJSON(t, resp, &respRelease) - assert.True(t, respRelease.IsDraft) - // re-push the tag - _, _, err = git.NewCommand(git.DefaultContext, "push", "origin", "--tags", "v2.0").RunStdString(&git.RunOpts{Dir: dstPath}) - require.NoError(t, err) - // query the release by API and it should not be a draft - req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/releases/tags/%s", owner.Name, repo.Name, "v2.0")) - resp = MakeRequest(t, req, http.StatusOK) - DecodeJSON(t, resp, &respRelease) - assert.False(t, respRelease.IsDraft) + // Cleanup + releases, err := db.Find[repo_model.Release](db.DefaultContext, repo_model.FindReleasesOptions{ + IncludeTags: true, + TagNames: []string{"v-1", "v-1.1"}, + RepoID: repo.ID, }) + require.NoError(t, err) + + for _, release := range releases { + _, err = db.DeleteByID[repo_model.Release](db.DefaultContext, release.ID) + require.NoError(t, err) + } + + protectedTags, err := git_model.GetProtectedTags(db.DefaultContext, repo.ID) + require.NoError(t, err) + + for _, protectedTag := range protectedTags { + err = git_model.DeleteProtectedTag(db.DefaultContext, protectedTag) + require.NoError(t, err) + } } diff --git a/tests/integration/repo_test.go b/tests/integration/repo_test.go index 90fc19c193..2d12df700b 100644 --- a/tests/integration/repo_test.go +++ b/tests/integration/repo_test.go @@ -902,7 +902,7 @@ func TestRepoFollowSymlink(t *testing.T) { symlinkURL, ok := htmlDoc.Find(".file-actions .button[data-kind='follow-symlink']").Attr("href") if shouldExist { assert.True(t, ok) - assert.Equal(t, expectedSymlinkURL, symlinkURL) + assert.EqualValues(t, expectedSymlinkURL, symlinkURL) } else { assert.False(t, ok) } @@ -1009,29 +1009,16 @@ func TestRepoCodeSearchForm(t *testing.T) { resp := MakeRequest(t, req, http.StatusOK) htmlDoc := NewHTMLParser(t, resp.Body) - formEl := htmlDoc.doc.Find("form[data-test-tag=codesearch]") - - action, exists := formEl.Attr("action") + action, exists := htmlDoc.doc.Find("form[data-test-tag=codesearch]").Attr("action") assert.True(t, exists) + branchSubURL := "/branch/master" + if indexer { assert.NotContains(t, action, branchSubURL) } else { assert.Contains(t, action, branchSubURL) } - - filepath, exists := formEl.Find("input[name=path]").Attr("value") - assert.True(t, exists) - assert.Empty(t, filepath) - - req = NewRequest(t, "GET", "/user2/glob/src/branch/master/x/y") - resp = MakeRequest(t, req, http.StatusOK) - - filepath, exists = NewHTMLParser(t, resp.Body).doc. - Find("form[data-test-tag=codesearch] input[name=path]"). - Attr("value") - assert.True(t, exists) - assert.Equal(t, "x/y", filepath) } t.Run("indexer disabled", func(t *testing.T) { @@ -1061,42 +1048,6 @@ func TestFileHistoryPager(t *testing.T) { }) } -func TestRepoIssueSorting(t *testing.T) { - defer tests.PrepareTestEnv(t)() - - t.Run("Dropdown content", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - req := NewRequest(t, "GET", "/user2/repo1/issues") - resp := MakeRequest(t, req, http.StatusOK) - htmlDoc := NewHTMLParser(t, resp.Body) - - assert.Equal(t, - 9, - htmlDoc.Find(`.list-header-sort .menu a`).Length(), - "Wrong amount of sort options in dropdown") - - menuItemsHTML := htmlDoc.Find(`.list-header-sort .menu`).Text() - locale := translation.NewLocale("en-US") - for _, key := range []string{ - "relevance", - "latest", - "oldest", - "recentupdate", - "leastupdate", - "mostcomment", - "leastcomment", - "nearduedate", - "farduedate", - } { - assert.Contains(t, - menuItemsHTML, - locale.Tr("repo.issues.filter_sort."+key), - "Sort option %s ('%s') not found in dropdown", key, locale.Tr("repo.issues.filter_sort."+key)) - } - }) -} - func TestRepoIssueFilterLinks(t *testing.T) { defer tests.PrepareTestEnv(t)() @@ -1153,7 +1104,7 @@ func TestRepoIssueFilterLinks(t *testing.T) { t.Run("Fuzzy", func(t *testing.T) { defer tests.PrintCurrentTest(t)() - req := NewRequest(t, "GET", "/user2/repo1/issues?fuzzy=false") + req := NewRequest(t, "GET", "/user2/repo1/issues?fuzzy=true") resp := MakeRequest(t, req, http.StatusOK) htmlDoc := NewHTMLParser(t, resp.Body) @@ -1170,7 +1121,7 @@ func TestRepoIssueFilterLinks(t *testing.T) { assert.Contains(t, href, "&project=") assert.Contains(t, href, "&assignee=") assert.Contains(t, href, "&poster=") - assert.Contains(t, href, "&fuzzy=false") + assert.Contains(t, href, "&fuzzy=true") }) assert.True(t, called) }) @@ -1250,7 +1201,7 @@ func TestRepoIssueFilterLinks(t *testing.T) { assert.True(t, called) }) - t.Run("Milestone", func(t *testing.T) { + t.Run("Miilestone", func(t *testing.T) { defer tests.PrintCurrentTest(t)() req := NewRequest(t, "GET", "/user2/repo1/issues?milestone=1") @@ -1426,39 +1377,3 @@ func TestRepoIssueFilterLinks(t *testing.T) { assert.True(t, called) }) } - -func TestRepoSubmoduleView(t *testing.T) { - onGiteaRun(t, func(t *testing.T, u *url.URL) { - user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) - repo, _, f := tests.CreateDeclarativeRepo(t, user2, "", []unit_model.Type{unit_model.TypeCode}, nil, nil) - defer f() - - // Clone the repository, add a submodule and push it. - dstPath := t.TempDir() - - uClone := *u - uClone.Path = repo.FullName() - uClone.User = url.UserPassword(user2.Name, userPassword) - - t.Run("Clone", doGitClone(dstPath, &uClone)) - - _, _, err := git.NewCommand(git.DefaultContext, "submodule", "add").AddDynamicArguments(u.JoinPath("/user2/repo1").String()).RunStdString(&git.RunOpts{Dir: dstPath}) - require.NoError(t, err) - - _, _, err = git.NewCommand(git.DefaultContext, "add", "repo1", ".gitmodules").RunStdString(&git.RunOpts{Dir: dstPath}) - require.NoError(t, err) - - _, _, err = git.NewCommand(git.DefaultContext, "commit", "-m", "add submodule").RunStdString(&git.RunOpts{Dir: dstPath}) - require.NoError(t, err) - - _, _, err = git.NewCommand(git.DefaultContext, "push").RunStdString(&git.RunOpts{Dir: dstPath}) - require.NoError(t, err) - - // Check that the submodule entry exist and the link is correct. - req := NewRequest(t, "GET", "/"+repo.FullName()) - resp := MakeRequest(t, req, http.StatusOK) - - htmlDoc := NewHTMLParser(t, resp.Body) - htmlDoc.AssertElement(t, fmt.Sprintf(`tr[data-entryname="repo1"] a[href="%s"]`, u.JoinPath("/user2/repo1").String()), true) - }) -} diff --git a/tests/integration/repo_view_test.go b/tests/integration/repo_view_test.go index 46e75063bc..7c280e2491 100644 --- a/tests/integration/repo_view_test.go +++ b/tests/integration/repo_view_test.go @@ -62,9 +62,8 @@ func createRepoAndGetContext(t *testing.T, files []string, deleteMdReadme bool) } func TestRepoView_FindReadme(t *testing.T) { - onGiteaRun(t, func(t *testing.T, u *url.URL) { - t.Run("PrioOneLocalizedMdReadme", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() + t.Run("PrioOneLocalizedMdReadme", func(t *testing.T) { + onGiteaRun(t, func(t *testing.T, u *url.URL) { ctx, f := createRepoAndGetContext(t, []string{"README.en.md", "README.en.org", "README.org", "README.txt", "README.tex"}, false) defer f() @@ -74,8 +73,9 @@ func TestRepoView_FindReadme(t *testing.T) { assert.Equal(t, "README.en.md", file.Name()) }) - t.Run("PrioTwoMdReadme", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() + }) + t.Run("PrioTwoMdReadme", func(t *testing.T) { + onGiteaRun(t, func(t *testing.T, u *url.URL) { ctx, f := createRepoAndGetContext(t, []string{"README.en.org", "README.org", "README.txt", "README.tex"}, false) defer f() @@ -85,8 +85,9 @@ func TestRepoView_FindReadme(t *testing.T) { assert.Equal(t, "README.md", file.Name()) }) - t.Run("PrioThreeLocalizedOrgReadme", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() + }) + t.Run("PrioThreeLocalizedOrgReadme", func(t *testing.T) { + onGiteaRun(t, func(t *testing.T, u *url.URL) { ctx, f := createRepoAndGetContext(t, []string{"README.en.org", "README.org", "README.txt", "README.tex"}, true) defer f() @@ -96,8 +97,9 @@ func TestRepoView_FindReadme(t *testing.T) { assert.Equal(t, "README.en.org", file.Name()) }) - t.Run("PrioFourOrgReadme", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() + }) + t.Run("PrioFourOrgReadme", func(t *testing.T) { + onGiteaRun(t, func(t *testing.T, u *url.URL) { ctx, f := createRepoAndGetContext(t, []string{"README.org", "README.txt", "README.tex"}, true) defer f() @@ -107,8 +109,9 @@ func TestRepoView_FindReadme(t *testing.T) { assert.Equal(t, "README.org", file.Name()) }) - t.Run("PrioFiveTxtReadme", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() + }) + t.Run("PrioFiveTxtReadme", func(t *testing.T) { + onGiteaRun(t, func(t *testing.T, u *url.URL) { ctx, f := createRepoAndGetContext(t, []string{"README.txt", "README", "README.tex"}, true) defer f() @@ -118,8 +121,9 @@ func TestRepoView_FindReadme(t *testing.T) { assert.Equal(t, "README.txt", file.Name()) }) - t.Run("PrioSixWithoutExtensionReadme", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() + }) + t.Run("PrioSixWithoutExtensionReadme", func(t *testing.T) { + onGiteaRun(t, func(t *testing.T, u *url.URL) { ctx, f := createRepoAndGetContext(t, []string{"README", "README.tex"}, true) defer f() @@ -129,8 +133,9 @@ func TestRepoView_FindReadme(t *testing.T) { assert.Equal(t, "README", file.Name()) }) - t.Run("PrioSevenAnyReadme", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() + }) + t.Run("PrioSevenAnyReadme", func(t *testing.T) { + onGiteaRun(t, func(t *testing.T, u *url.URL) { ctx, f := createRepoAndGetContext(t, []string{"README.tex"}, true) defer f() @@ -140,8 +145,9 @@ func TestRepoView_FindReadme(t *testing.T) { assert.Equal(t, "README.tex", file.Name()) }) - t.Run("DoNotPickReadmeIfNonPresent", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() + }) + t.Run("DoNotPickReadmeIfNonPresent", func(t *testing.T) { + onGiteaRun(t, func(t *testing.T, u *url.URL) { ctx, f := createRepoAndGetContext(t, []string{}, true) defer f() diff --git a/tests/integration/repo_webhook_test.go b/tests/integration/repo_webhook_test.go index 37bad56b9e..b98fce0f4a 100644 --- a/tests/integration/repo_webhook_test.go +++ b/tests/integration/repo_webhook_test.go @@ -172,7 +172,6 @@ func TestWebhookForms(t *testing.T) { })) t.Run("discord/required", testWebhookForms("discord", session, map[string]string{ - "username": "john", "payload_url": "https://discord.example.com", })) t.Run("discord/optional", testWebhookForms("discord", session, map[string]string{ @@ -316,7 +315,6 @@ func assertInput(t testing.TB, form *goquery.Selection, name string) string { func testWebhookForms(name string, session *TestSession, validFields map[string]string, invalidPatches ...map[string]string) func(t *testing.T) { return func(t *testing.T) { - defer tests.PrintCurrentTest(t)() t.Run("repo1", func(t *testing.T) { testWebhookFormsShared(t, "/user2/repo1/settings/hooks", name, session, validFields, invalidPatches...) }) diff --git a/tests/integration/repo_wiki_test.go b/tests/integration/repo_wiki_test.go index 6115010ba4..316c04503a 100644 --- a/tests/integration/repo_wiki_test.go +++ b/tests/integration/repo_wiki_test.go @@ -29,9 +29,9 @@ func TestWikiSearchContent(t *testing.T) { return el.Text() }) assert.Equal(t, []string{ - "Home", - "Page With Spaced Name", - "Unescaped File", + "Home.md", + "Page-With-Spaced-Name.md", + "Unescaped File.md", }, res) } diff --git a/tests/integration/repofiles_change_test.go b/tests/integration/repofiles_change_test.go index 1896971046..9790b36183 100644 --- a/tests/integration/repofiles_change_test.go +++ b/tests/integration/repofiles_change_test.go @@ -18,7 +18,6 @@ import ( "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" files_service "code.gitea.io/gitea/services/repository/files" - "code.gitea.io/gitea/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -64,8 +63,8 @@ func getDeleteRepoFilesOptions(repo *repo_model.Repository) *files_service.Chang Files: []*files_service.ChangeRepoFile{ { Operation: "delete", - TreePath: "README_new.md", - SHA: "dbf8d00e022e05b7e5cf7e535de857de57925647", + TreePath: "README.md", + SHA: "4b4851ad51df6a7d9f25c979345979eaeb5b349f", }, }, LastCommitID: "", @@ -245,142 +244,184 @@ func getExpectedFileResponseForRepofilesUpdate(commitID, filename, lastCommitSHA } } -func TestChangeRepoFiles(t *testing.T) { +func TestChangeRepoFilesForCreate(t *testing.T) { + // setup onGiteaRun(t, func(t *testing.T, u *url.URL) { doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) + opts := getCreateRepoFilesOptions(repo) - gitRepo, err := gitrepo.OpenRepository(git.DefaultContext, repo) + // test + filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts) + + // asserts require.NoError(t, err) + gitRepo, _ := gitrepo.OpenRepository(git.DefaultContext, repo) defer gitRepo.Close() - t.Run("Create", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - opts := getCreateRepoFilesOptions(repo) - filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts) - require.NoError(t, err) - - commitID, err := gitRepo.GetBranchCommitID(opts.NewBranch) - require.NoError(t, err) - lastCommit, err := gitRepo.GetCommitByPath("new/file.txt") - require.NoError(t, err) - expectedFileResponse := getExpectedFileResponseForRepofilesCreate(commitID, lastCommit.ID.String()) + commitID, _ := gitRepo.GetBranchCommitID(opts.NewBranch) + lastCommit, _ := gitRepo.GetCommitByPath("new/file.txt") + expectedFileResponse := getExpectedFileResponseForRepofilesCreate(commitID, lastCommit.ID.String()) + assert.NotNil(t, expectedFileResponse) + if expectedFileResponse != nil { assert.EqualValues(t, expectedFileResponse.Content, filesResponse.Files[0]) assert.EqualValues(t, expectedFileResponse.Commit.SHA, filesResponse.Commit.SHA) assert.EqualValues(t, expectedFileResponse.Commit.HTMLURL, filesResponse.Commit.HTMLURL) assert.EqualValues(t, expectedFileResponse.Commit.Author.Email, filesResponse.Commit.Author.Email) assert.EqualValues(t, expectedFileResponse.Commit.Author.Name, filesResponse.Commit.Author.Name) - }) + } + }) +} - t.Run("Update", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - opts := getUpdateRepoFilesOptions(repo) - filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts) - require.NoError(t, err) +func TestChangeRepoFilesForUpdate(t *testing.T) { + // setup + onGiteaRun(t, func(t *testing.T, u *url.URL) { + doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) + repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) + opts := getUpdateRepoFilesOptions(repo) - commit, err := gitRepo.GetBranchCommit(opts.NewBranch) - require.NoError(t, err) - lastCommit, err := commit.GetCommitByPath(opts.Files[0].TreePath) - require.NoError(t, err) - expectedFileResponse := getExpectedFileResponseForRepofilesUpdate(commit.ID.String(), opts.Files[0].TreePath, lastCommit.ID.String()) - assert.EqualValues(t, expectedFileResponse.Content, filesResponse.Files[0]) - assert.EqualValues(t, expectedFileResponse.Commit.SHA, filesResponse.Commit.SHA) - assert.EqualValues(t, expectedFileResponse.Commit.HTMLURL, filesResponse.Commit.HTMLURL) - assert.EqualValues(t, expectedFileResponse.Commit.Author.Email, filesResponse.Commit.Author.Email) - assert.EqualValues(t, expectedFileResponse.Commit.Author.Name, filesResponse.Commit.Author.Name) - }) + // test + filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts) - t.Run("Update and move", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - opts := getUpdateRepoFilesOptions(repo) - opts.Files[0].SHA = "dbf8d00e022e05b7e5cf7e535de857de57925647" - opts.Files[0].FromTreePath = "README.md" - opts.Files[0].TreePath = "README_new.md" // new file name, README_new.md - filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts) - require.NoError(t, err) + // asserts + require.NoError(t, err) + gitRepo, _ := gitrepo.OpenRepository(git.DefaultContext, repo) + defer gitRepo.Close() - commit, err := gitRepo.GetBranchCommit(opts.NewBranch) - require.NoError(t, err) - lastCommit, err := commit.GetCommitByPath(opts.Files[0].TreePath) - require.NoError(t, err) - expectedFileResponse := getExpectedFileResponseForRepofilesUpdate(commit.ID.String(), opts.Files[0].TreePath, lastCommit.ID.String()) + commit, _ := gitRepo.GetBranchCommit(opts.NewBranch) + lastCommit, _ := commit.GetCommitByPath(opts.Files[0].TreePath) + expectedFileResponse := getExpectedFileResponseForRepofilesUpdate(commit.ID.String(), opts.Files[0].TreePath, lastCommit.ID.String()) + assert.EqualValues(t, expectedFileResponse.Content, filesResponse.Files[0]) + assert.EqualValues(t, expectedFileResponse.Commit.SHA, filesResponse.Commit.SHA) + assert.EqualValues(t, expectedFileResponse.Commit.HTMLURL, filesResponse.Commit.HTMLURL) + assert.EqualValues(t, expectedFileResponse.Commit.Author.Email, filesResponse.Commit.Author.Email) + assert.EqualValues(t, expectedFileResponse.Commit.Author.Name, filesResponse.Commit.Author.Name) + }) +} - // assert that the old file no longer exists in the last commit of the branch - fromEntry, err := commit.GetTreeEntryByPath(opts.Files[0].FromTreePath) - switch err.(type) { - case git.ErrNotExist: - // correct, continue - default: - t.Fatalf("expected git.ErrNotExist, got:%v", err) - } - toEntry, err := commit.GetTreeEntryByPath(opts.Files[0].TreePath) - require.NoError(t, err) - assert.Nil(t, fromEntry) // Should no longer exist here - assert.NotNil(t, toEntry) // Should exist here - // assert SHA has remained the same but paths use the new file name - assert.EqualValues(t, expectedFileResponse.Content.SHA, filesResponse.Files[0].SHA) - assert.EqualValues(t, expectedFileResponse.Content.Name, filesResponse.Files[0].Name) - assert.EqualValues(t, expectedFileResponse.Content.Path, filesResponse.Files[0].Path) - assert.EqualValues(t, expectedFileResponse.Content.URL, filesResponse.Files[0].URL) - assert.EqualValues(t, expectedFileResponse.Commit.SHA, filesResponse.Commit.SHA) - assert.EqualValues(t, expectedFileResponse.Commit.HTMLURL, filesResponse.Commit.HTMLURL) - }) +func TestChangeRepoFilesForUpdateWithFileMove(t *testing.T) { + // setup + onGiteaRun(t, func(t *testing.T, u *url.URL) { + doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) + repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) + opts := getUpdateRepoFilesOptions(repo) + opts.Files[0].FromTreePath = "README.md" + opts.Files[0].TreePath = "README_new.md" // new file name, README_new.md - t.Run("Change without branch names", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - opts := getUpdateRepoFilesOptions(repo) - opts.OldBranch = "" - opts.NewBranch = "" - opts.Files[0].TreePath = "README_new.md" - opts.Files[0].SHA = "dbf8d00e022e05b7e5cf7e535de857de57925647" + // test + filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts) - filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts) - require.NoError(t, err) + // asserts + require.NoError(t, err) + gitRepo, _ := gitrepo.OpenRepository(git.DefaultContext, repo) + defer gitRepo.Close() - commit, _ := gitRepo.GetBranchCommit(repo.DefaultBranch) - lastCommit, _ := commit.GetCommitByPath(opts.Files[0].TreePath) - expectedFileResponse := getExpectedFileResponseForRepofilesUpdate(commit.ID.String(), opts.Files[0].TreePath, lastCommit.ID.String()) - assert.EqualValues(t, expectedFileResponse.Content, filesResponse.Files[0]) - }) + commit, _ := gitRepo.GetBranchCommit(opts.NewBranch) + lastCommit, _ := commit.GetCommitByPath(opts.Files[0].TreePath) + expectedFileResponse := getExpectedFileResponseForRepofilesUpdate(commit.ID.String(), opts.Files[0].TreePath, lastCommit.ID.String()) + // assert that the old file no longer exists in the last commit of the branch + fromEntry, err := commit.GetTreeEntryByPath(opts.Files[0].FromTreePath) + switch err.(type) { + case git.ErrNotExist: + // correct, continue + default: + t.Fatalf("expected git.ErrNotExist, got:%v", err) + } + toEntry, err := commit.GetTreeEntryByPath(opts.Files[0].TreePath) + require.NoError(t, err) + assert.Nil(t, fromEntry) // Should no longer exist here + assert.NotNil(t, toEntry) // Should exist here + // assert SHA has remained the same but paths use the new file name + assert.EqualValues(t, expectedFileResponse.Content.SHA, filesResponse.Files[0].SHA) + assert.EqualValues(t, expectedFileResponse.Content.Name, filesResponse.Files[0].Name) + assert.EqualValues(t, expectedFileResponse.Content.Path, filesResponse.Files[0].Path) + assert.EqualValues(t, expectedFileResponse.Content.URL, filesResponse.Files[0].URL) + assert.EqualValues(t, expectedFileResponse.Commit.SHA, filesResponse.Commit.SHA) + assert.EqualValues(t, expectedFileResponse.Commit.HTMLURL, filesResponse.Commit.HTMLURL) + }) +} - t.Run("Delete files", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - opts := getDeleteRepoFilesOptions(repo) +// Test opts with branch names removed, should get same results as above test +func TestChangeRepoFilesWithoutBranchNames(t *testing.T) { + // setup + onGiteaRun(t, func(t *testing.T, u *url.URL) { + doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) + repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) + opts := getUpdateRepoFilesOptions(repo) + opts.OldBranch = "" + opts.NewBranch = "" - filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts) - require.NoError(t, err) - expectedFileResponse := getExpectedFileResponseForRepofilesDelete() - assert.NotNil(t, filesResponse) - assert.Nil(t, filesResponse.Files[0]) - assert.EqualValues(t, expectedFileResponse.Commit.Message, filesResponse.Commit.Message) - assert.EqualValues(t, expectedFileResponse.Commit.Author.Identity, filesResponse.Commit.Author.Identity) - assert.EqualValues(t, expectedFileResponse.Commit.Committer.Identity, filesResponse.Commit.Committer.Identity) - assert.EqualValues(t, expectedFileResponse.Verification, filesResponse.Verification) + // test + filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts) - filesResponse, err = files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts) - assert.Nil(t, filesResponse) - expectedError := "repository file does not exist [path: " + opts.Files[0].TreePath + "]" - assert.EqualError(t, err, expectedError) - }) + // asserts + require.NoError(t, err) + gitRepo, _ := gitrepo.OpenRepository(git.DefaultContext, repo) + defer gitRepo.Close() - t.Run("Delete without branch name", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - opts := getDeleteRepoFilesOptions(repo) - opts.OldBranch = "" - opts.NewBranch = "" - opts.Files[0].SHA = "103ff9234cefeee5ec5361d22b49fbb04d385885" - opts.Files[0].TreePath = "new/file.txt" + commit, _ := gitRepo.GetBranchCommit(repo.DefaultBranch) + lastCommit, _ := commit.GetCommitByPath(opts.Files[0].TreePath) + expectedFileResponse := getExpectedFileResponseForRepofilesUpdate(commit.ID.String(), opts.Files[0].TreePath, lastCommit.ID.String()) + assert.EqualValues(t, expectedFileResponse.Content, filesResponse.Files[0]) + }) +} - filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts) - require.NoError(t, err) - expectedFileResponse := getExpectedFileResponseForRepofilesDelete() - assert.NotNil(t, filesResponse) - assert.Nil(t, filesResponse.Files[0]) - assert.EqualValues(t, expectedFileResponse.Commit.Message, filesResponse.Commit.Message) - assert.EqualValues(t, expectedFileResponse.Commit.Author.Identity, filesResponse.Commit.Author.Identity) - assert.EqualValues(t, expectedFileResponse.Commit.Committer.Identity, filesResponse.Commit.Committer.Identity) - assert.EqualValues(t, expectedFileResponse.Verification, filesResponse.Verification) - }) +func TestChangeRepoFilesForDelete(t *testing.T) { + onGiteaRun(t, testDeleteRepoFiles) +} + +func testDeleteRepoFiles(t *testing.T, u *url.URL) { + // setup + unittest.PrepareTestEnv(t) + doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) + repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) + opts := getDeleteRepoFilesOptions(repo) + + t.Run("Delete README.md file", func(t *testing.T) { + filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts) + require.NoError(t, err) + expectedFileResponse := getExpectedFileResponseForRepofilesDelete() + assert.NotNil(t, filesResponse) + assert.Nil(t, filesResponse.Files[0]) + assert.EqualValues(t, expectedFileResponse.Commit.Message, filesResponse.Commit.Message) + assert.EqualValues(t, expectedFileResponse.Commit.Author.Identity, filesResponse.Commit.Author.Identity) + assert.EqualValues(t, expectedFileResponse.Commit.Committer.Identity, filesResponse.Commit.Committer.Identity) + assert.EqualValues(t, expectedFileResponse.Verification, filesResponse.Verification) + }) + + t.Run("Verify README.md has been deleted", func(t *testing.T) { + filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts) + assert.Nil(t, filesResponse) + expectedError := "repository file does not exist [path: " + opts.Files[0].TreePath + "]" + assert.EqualError(t, err, expectedError) + }) +} + +// Test opts with branch names removed, same results +func TestChangeRepoFilesForDeleteWithoutBranchNames(t *testing.T) { + onGiteaRun(t, testDeleteRepoFilesWithoutBranchNames) +} + +func testDeleteRepoFilesWithoutBranchNames(t *testing.T, u *url.URL) { + // setup + unittest.PrepareTestEnv(t) + doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) + repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) + + opts := getDeleteRepoFilesOptions(repo) + opts.OldBranch = "" + opts.NewBranch = "" + + t.Run("Delete README.md without Branch Name", func(t *testing.T) { + filesResponse, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, doer, opts) + require.NoError(t, err) + expectedFileResponse := getExpectedFileResponseForRepofilesDelete() + assert.NotNil(t, filesResponse) + assert.Nil(t, filesResponse.Files[0]) + assert.EqualValues(t, expectedFileResponse.Commit.Message, filesResponse.Commit.Message) + assert.EqualValues(t, expectedFileResponse.Commit.Author.Identity, filesResponse.Commit.Author.Identity) + assert.EqualValues(t, expectedFileResponse.Commit.Committer.Identity, filesResponse.Commit.Committer.Identity) + assert.EqualValues(t, expectedFileResponse.Verification, filesResponse.Verification) }) } diff --git a/tests/integration/setting_test.go b/tests/integration/setting_test.go index 5635faad38..29615b3ecf 100644 --- a/tests/integration/setting_test.go +++ b/tests/integration/setting_test.go @@ -1,5 +1,4 @@ // Copyright 2017 The Gitea Authors. All rights reserved. -// Copyright 2024 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT package integration diff --git a/tests/integration/signin_test.go b/tests/integration/signin_test.go index f8e2e079ca..77e19bba96 100644 --- a/tests/integration/signin_test.go +++ b/tests/integration/signin_test.go @@ -1,5 +1,4 @@ // Copyright 2017 The Gitea Authors. All rights reserved. -// Copyright 2024 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT package integration @@ -13,7 +12,6 @@ import ( "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" "code.gitea.io/gitea/modules/translation" "code.gitea.io/gitea/tests" @@ -95,49 +93,3 @@ func TestSigninWithRememberMe(t *testing.T) { req = NewRequest(t, "GET", "/user/settings") session.MakeRequest(t, req, http.StatusOK) } - -func TestDisableSignin(t *testing.T) { - defer tests.PrepareTestEnv(t)() - // Mock alternative auth ways as enabled - defer test.MockVariableValue(&setting.Service.EnableOpenIDSignIn, true)() - defer test.MockVariableValue(&setting.Service.EnableOpenIDSignUp, true)() - t.Run("Disabled", func(t *testing.T) { - defer test.MockVariableValue(&setting.Service.EnableInternalSignIn, false)() - - t.Run("UI", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - req := NewRequest(t, "GET", "/user/login") - resp := MakeRequest(t, req, http.StatusOK) - htmlDoc := NewHTMLParser(t, resp.Body) - htmlDoc.AssertElement(t, "form[action='/user/login']", false) - htmlDoc.AssertElement(t, ".divider-text", false) - }) - - t.Run("Signin", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - req := NewRequest(t, "POST", "/user/login") - MakeRequest(t, req, http.StatusForbidden) - }) - }) - - t.Run("Enabled", func(t *testing.T) { - defer test.MockVariableValue(&setting.Service.EnableInternalSignIn, true)() - - t.Run("UI", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - req := NewRequest(t, "GET", "/user/login") - resp := MakeRequest(t, req, http.StatusOK) - htmlDoc := NewHTMLParser(t, resp.Body) - htmlDoc.AssertElement(t, "form[action='/user/login']", true) - htmlDoc.AssertElement(t, ".divider-text", true) - }) - - t.Run("Signin", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - req := NewRequest(t, "POST", "/user/login") - MakeRequest(t, req, http.StatusOK) - }) - }) -} diff --git a/tests/integration/signup_test.go b/tests/integration/signup_test.go index 39533bbf89..d5df41fabf 100644 --- a/tests/integration/signup_test.go +++ b/tests/integration/signup_test.go @@ -1,5 +1,4 @@ // Copyright 2017 The Gitea Authors. All rights reserved. -// Copyright 2025 The Forgejo Authors. All rights reserved. // SPDX-License-Identifier: MIT package integration @@ -208,28 +207,3 @@ func TestSignupImageCaptcha(t *testing.T) { unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: "captcha-test", IsActive: true}) } - -func TestSignupFormUI(t *testing.T) { - defer tests.PrepareTestEnv(t)() - t.Run("UI", func(t *testing.T) { - // Mock alternative auth ways as enabled - defer test.MockVariableValue(&setting.Service.EnableOpenIDSignIn, true)() - defer test.MockVariableValue(&setting.Service.EnableOpenIDSignUp, true)() - t.Run("Internal registration enabled", func(t *testing.T) { - defer test.MockVariableValue(&setting.Service.AllowOnlyExternalRegistration, false)() - req := NewRequest(t, "GET", "/user/sign_up") - resp := MakeRequest(t, req, http.StatusOK) - htmlDoc := NewHTMLParser(t, resp.Body) - htmlDoc.AssertElement(t, "form[action='/user/sign_up'] input#user_name", true) - htmlDoc.AssertElement(t, ".divider-text", true) - }) - t.Run("Internal registration disabled", func(t *testing.T) { - defer test.MockVariableValue(&setting.Service.AllowOnlyExternalRegistration, true)() - req := NewRequest(t, "GET", "/user/sign_up") - resp := MakeRequest(t, req, http.StatusOK) - htmlDoc := NewHTMLParser(t, resp.Body) - htmlDoc.AssertElement(t, "form[action='/user/sign_up'] input#user_name", false) - htmlDoc.AssertElement(t, ".divider-text", false) - }) - }) -} diff --git a/tests/integration/swagger_test.go b/tests/integration/swagger_test.go deleted file mode 100644 index 584601f7f9..0000000000 --- a/tests/integration/swagger_test.go +++ /dev/null @@ -1,100 +0,0 @@ -// Copyright 2024 The Forgejo Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -package integration - -import ( - "net/http" - "strings" - "testing" - - "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/tests" - - swagger_spec "github.com/go-openapi/spec" - "github.com/stretchr/testify/require" -) - -func getSwagger(t *testing.T) *swagger_spec.Swagger { - t.Helper() - - resp := MakeRequest(t, NewRequest(t, "GET", "/swagger.v1.json"), http.StatusOK) - - swagger := new(swagger_spec.Swagger) - - decoder := json.NewDecoder(resp.Body) - require.NoError(t, decoder.Decode(swagger)) - - return swagger -} - -func checkSwaggerMethodResponse(t *testing.T, path string, method *swagger_spec.Operation, name string, statusCode int, responseType string) { - t.Helper() - - if method == nil { - return - } - - val, ok := method.Responses.StatusCodeResponses[statusCode] - if !ok { - t.Errorf("%s %s is missing response status code %d in swagger", name, path, statusCode) - return - } - - if responseType != val.Ref.String() { - t.Errorf("%s %s has %s response type for %d in swagger (expected %s)", name, path, val.Ref.String(), statusCode, responseType) - } -} - -func checkSwaggerPathResponse(t *testing.T, paths map[string]swagger_spec.PathItem, pathMatch string, statusCode int, responseType string) { - t.Helper() - - for pathName, pathData := range paths { - if pathName != pathMatch { - continue - } - - checkSwaggerMethodResponse(t, pathName, pathData.Get, "GET", statusCode, responseType) - checkSwaggerMethodResponse(t, pathName, pathData.Put, "PUT", statusCode, responseType) - checkSwaggerMethodResponse(t, pathName, pathData.Post, "POST", statusCode, responseType) - checkSwaggerMethodResponse(t, pathName, pathData.Patch, "PATCH", statusCode, responseType) - checkSwaggerMethodResponse(t, pathName, pathData.Delete, "DELETE", statusCode, responseType) - checkSwaggerMethodResponse(t, pathName, pathData.Options, "OPTIONS", statusCode, responseType) - - return - } -} - -func checkSwaggerRouteResponse(t *testing.T, paths map[string]swagger_spec.PathItem, prefix string, statusCode int, responseType string) { - t.Helper() - - for pathName, pathData := range paths { - if !strings.HasPrefix(pathName, prefix) { - continue - } - - checkSwaggerMethodResponse(t, pathName, pathData.Get, "GET", statusCode, responseType) - checkSwaggerMethodResponse(t, pathName, pathData.Put, "PUT", statusCode, responseType) - checkSwaggerMethodResponse(t, pathName, pathData.Post, "POST", statusCode, responseType) - checkSwaggerMethodResponse(t, pathName, pathData.Patch, "PATCH", statusCode, responseType) - checkSwaggerMethodResponse(t, pathName, pathData.Delete, "DELETE", statusCode, responseType) - checkSwaggerMethodResponse(t, pathName, pathData.Options, "OPTIONS", statusCode, responseType) - } -} - -func TestSwaggerUserRoute(t *testing.T) { - defer tests.PrepareTestEnv(t)() - - swagger := getSwagger(t) - - checkSwaggerPathResponse(t, swagger.Paths.Paths, "/user", http.StatusUnauthorized, "#/responses/unauthorized") - checkSwaggerRouteResponse(t, swagger.Paths.Paths, "/user/", http.StatusUnauthorized, "#/responses/unauthorized") -} - -func TestSwaggerUsersRoute(t *testing.T) { - defer tests.PrepareTestEnv(t)() - - swagger := getSwagger(t) - - checkSwaggerRouteResponse(t, swagger.Paths.Paths, "/users/{username}", http.StatusNotFound, "#/responses/notFound") -} diff --git a/tests/integration/user_avatar_test.go b/tests/integration/user_avatar_test.go index a7c0264aaa..a5805d0eda 100644 --- a/tests/integration/user_avatar_test.go +++ b/tests/integration/user_avatar_test.go @@ -10,78 +10,85 @@ import ( "io" "mime/multipart" "net/http" + "net/url" "testing" "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/avatar" - "code.gitea.io/gitea/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) func TestUserAvatar(t *testing.T) { - defer tests.PrepareTestEnv(t)() - user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) // owner of the repo3, is an org + onGiteaRun(t, func(t *testing.T, u *url.URL) { + user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) // owner of the repo3, is an org - seed := user2.Email - if len(seed) == 0 { - seed = user2.Name - } + seed := user2.Email + if len(seed) == 0 { + seed = user2.Name + } - img, err := avatar.RandomImage([]byte(seed)) - if err != nil { - require.NoError(t, err) - return - } + img, err := avatar.RandomImage([]byte(seed)) + if err != nil { + require.NoError(t, err) + return + } - session := loginUser(t, "user2") - csrf := GetCSRF(t, session, "/user/settings") + session := loginUser(t, "user2") + csrf := GetCSRF(t, session, "/user/settings") - imgData := &bytes.Buffer{} + imgData := &bytes.Buffer{} - body := &bytes.Buffer{} + body := &bytes.Buffer{} - // Setup multi-part - writer := multipart.NewWriter(body) - writer.WriteField("source", "local") - part, err := writer.CreateFormFile("avatar", "avatar-for-testuseravatar.png") - if err != nil { - require.NoError(t, err) - return - } + // Setup multi-part + writer := multipart.NewWriter(body) + writer.WriteField("source", "local") + part, err := writer.CreateFormFile("avatar", "avatar-for-testuseravatar.png") + if err != nil { + require.NoError(t, err) + return + } - if err := png.Encode(imgData, img); err != nil { - require.NoError(t, err) - return - } + if err := png.Encode(imgData, img); err != nil { + require.NoError(t, err) + return + } - if _, err := io.Copy(part, imgData); err != nil { - require.NoError(t, err) - return - } + if _, err := io.Copy(part, imgData); err != nil { + require.NoError(t, err) + return + } - if err := writer.Close(); err != nil { - require.NoError(t, err) - return - } + if err := writer.Close(); err != nil { + require.NoError(t, err) + return + } - req := NewRequestWithBody(t, "POST", "/user/settings/avatar", body) - req.Header.Add("X-Csrf-Token", csrf) - req.Header.Add("Content-Type", writer.FormDataContentType()) + req := NewRequestWithBody(t, "POST", "/user/settings/avatar", body) + req.Header.Add("X-Csrf-Token", csrf) + req.Header.Add("Content-Type", writer.FormDataContentType()) - session.MakeRequest(t, req, http.StatusSeeOther) + session.MakeRequest(t, req, http.StatusSeeOther) - user2 = unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) // owner of the repo3, is an org + user2 = unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) // owner of the repo3, is an org - req = NewRequest(t, "GET", user2.AvatarLinkWithSize(db.DefaultContext, 0)) - _ = session.MakeRequest(t, req, http.StatusOK) + req = NewRequest(t, "GET", user2.AvatarLinkWithSize(db.DefaultContext, 0)) + _ = session.MakeRequest(t, req, http.StatusOK) - req = NewRequestf(t, "GET", "/%s.png", user2.Name) - resp := MakeRequest(t, req, http.StatusSeeOther) - assert.EqualValues(t, fmt.Sprintf("/avatars/%s", user2.Avatar), resp.Header().Get("location")) + testGetAvatarRedirect(t, user2) - // Can't test if the response matches because the image is re-generated on upload but checking that this at least doesn't give a 404 should be enough. + // Can't test if the response matches because the image is re-generated on upload but checking that this at least doesn't give a 404 should be enough. + }) +} + +func testGetAvatarRedirect(t *testing.T, user *user_model.User) { + t.Run(fmt.Sprintf("getAvatarRedirect_%s", user.Name), func(t *testing.T) { + req := NewRequestf(t, "GET", "/%s.png", user.Name) + resp := MakeRequest(t, req, http.StatusSeeOther) + assert.EqualValues(t, fmt.Sprintf("/avatars/%s", user.Avatar), resp.Header().Get("location")) + }) } diff --git a/tests/integration/user_count_test.go b/tests/integration/user_count_test.go index 8fb78a61ee..e76c30c1d4 100644 --- a/tests/integration/user_count_test.go +++ b/tests/integration/user_count_test.go @@ -75,9 +75,8 @@ func (countTest *userCountTest) Init(t *testing.T, doerID, userID int64) { require.NoError(t, err) countTest.memberCount, err = organization.CountOrgMembers(db.DefaultContext, &organization.FindOrgMembersOpts{ - Doer: countTest.doer, - OrgID: org.ID, - IsDoerMember: isMember, + OrgID: org.ID, + PublicOnly: !isMember, }) require.NoError(t, err) @@ -99,7 +98,6 @@ func (countTest *userCountTest) getCount(doc *goquery.Document, name string) (in func (countTest *userCountTest) TestPage(t *testing.T, page string, orgLink bool) { t.Run(page, func(t *testing.T) { - defer tests.PrintCurrentTest(t)() var userLink string if orgLink { diff --git a/tests/integration/user_profile_activity_test.go b/tests/integration/user_profile_activity_test.go index f1269e5e93..0592523076 100644 --- a/tests/integration/user_profile_activity_test.go +++ b/tests/integration/user_profile_activity_test.go @@ -1,16 +1,13 @@ // Copyright 2024 The Forgejo Authors. All rights reserved. -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT package integration import ( "net/http" - "strconv" + "net/url" "testing" - "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/tests" - "github.com/stretchr/testify/assert" ) @@ -19,64 +16,56 @@ import ( // - Public activity tab // - Banner/hint in the tab // - "Configure" link in the hint -// These elements might depend on the following: -// - Profile visibility -// - Public activity visibility func TestUserProfileActivity(t *testing.T) { - defer tests.PrepareTestEnv(t)() - // This test needs multiple users with different access statuses to check for all possible states - userAdmin := loginUser(t, "user1") - userRegular := loginUser(t, "user2") - // Activity availability should be the same for guest and another non-admin user, so this is not tested separately - userGuest := emptyTestSession(t) + onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) { + // This test needs multiple users with different access statuses to check for all possible states + userAdmin := loginUser(t, "user1") + userRegular := loginUser(t, "user2") + // Activity availability should be the same for guest and another non-admin user, so this is not tested separately + userGuest := emptyTestSession(t) - // = Public profile, public activity = + // = Public = - // Set activity visibility of user2 to public. This is the default, but won't hurt to set it before testing. - testChangeUserActivityVisibility(t, userRegular, "off") + // Set activity visibility of user2 to public. This is the default, but won't hurt to set it before testing. + testChangeUserActivityVisibility(t, userRegular, "off") - // Verify availability of RSS button and activity tab - testUser2ActivityButtonsAvailability(t, userAdmin, true) - testUser2ActivityButtonsAvailability(t, userRegular, true) - testUser2ActivityButtonsAvailability(t, userGuest, true) + // Verify availability of RSS button and activity tab + testUser2ActivityButtonsAvailability(t, userAdmin, true) + testUser2ActivityButtonsAvailability(t, userRegular, true) + testUser2ActivityButtonsAvailability(t, userGuest, true) - // Verify the hint for all types of users: admin, self, guest - testUser2ActivityVisibility(t, userAdmin, "This activity is visible to everyone, but as an administrator you can also see interactions in private spaces.", true) - testUser2ActivityVisibility(t, userRegular, "Your activity is visible to everyone, except for interactions in private spaces. Configure.", true) - testUser2ActivityVisibility(t, userGuest, "", true) + // Verify the hint for all types of users: admin, self, guest + testUser2ActivityVisibility(t, userAdmin, "This activity is visible to everyone, but as an administrator you can also see interactions in private spaces.", true) + hintLink := testUser2ActivityVisibility(t, userRegular, "Your activity is visible to everyone, except for interactions in private spaces. Configure.", true) + testUser2ActivityVisibility(t, userGuest, "", true) - // = Private profile, but public activity = + // When viewing own profile, the user is offered to configure activity visibility. Verify that the link is correct and works, also check that it links back to the activity tab. + linkCorrect := assert.EqualValues(t, "/user/settings#keep-activity-private", hintLink) + if linkCorrect { + page := NewHTMLParser(t, userRegular.MakeRequest(t, NewRequest(t, "GET", hintLink), http.StatusOK).Body) + activityLink, exists := page.Find(".field:has(.checkbox#keep-activity-private) .help a").Attr("href") + assert.True(t, exists) + assert.EqualValues(t, "/user2?tab=activity", activityLink) + } - // Set profile visibility of user2 to private - testChangeUserProfileVisibility(t, userRegular, structs.VisibleTypePrivate) + // = Private = - // When profile activity is configured as public, but the profile is private, tell the user about this and link to visibility settings. - hintLink := testUser2ActivityVisibility(t, userRegular, "Your activity is only visible to you and the instance administrators because your profile is private. Configure.", true) - assert.EqualValues(t, "/user/settings#visibility-setting", hintLink) + // Set activity visibility of user2 to private + testChangeUserActivityVisibility(t, userRegular, "on") - // When the profile is private, tell the admin about this. - testUser2ActivityVisibility(t, userAdmin, "This activity is visible to you because you're an administrator, but the user wants it to remain private.", true) + // Verify availability of RSS button and activity tab + testUser2ActivityButtonsAvailability(t, userAdmin, true) + testUser2ActivityButtonsAvailability(t, userRegular, true) + testUser2ActivityButtonsAvailability(t, userGuest, false) - // Set profile visibility of user2 back to public - testChangeUserProfileVisibility(t, userRegular, structs.VisibleTypePublic) + // Verify the hint for all types of users: admin, self, guest + testUser2ActivityVisibility(t, userAdmin, "This activity is visible to you because you're an administrator, but the user wants it to remain private.", true) + hintLink = testUser2ActivityVisibility(t, userRegular, "Your activity is only visible to you and the instance administrators. Configure.", true) + testUser2ActivityVisibility(t, userGuest, "This user has disabled the public visibility of the activity.", false) - // = Private acitivty = - - // Set activity visibility of user2 to private - testChangeUserActivityVisibility(t, userRegular, "on") - - // Verify availability of RSS button and activity tab - testUser2ActivityButtonsAvailability(t, userAdmin, true) - testUser2ActivityButtonsAvailability(t, userRegular, true) - testUser2ActivityButtonsAvailability(t, userGuest, false) - - // Verify the hint for all types of users: admin, self, guest - testUser2ActivityVisibility(t, userAdmin, "This activity is visible to you because you're an administrator, but the user wants it to remain private.", true) - hintLink = testUser2ActivityVisibility(t, userRegular, "Your activity is only visible to you and the instance administrators. Configure.", true) - testUser2ActivityVisibility(t, userGuest, "This user has disabled the public visibility of the activity.", false) - - // Verify that Configure link is correct - assert.EqualValues(t, "/user/settings#keep-activity-private", hintLink) + // Verify that Configure link is correct + assert.EqualValues(t, "/user/settings#keep-activity-private", hintLink) + }) } // testChangeUserActivityVisibility allows to easily change visibility of public activity for a user @@ -89,15 +78,6 @@ func testChangeUserActivityVisibility(t *testing.T, session *TestSession, newSta }), http.StatusSeeOther) } -// testChangeUserProfileVisibility allows to easily change visibility of user's profile -func testChangeUserProfileVisibility(t *testing.T, session *TestSession, newValue structs.VisibleType) { - t.Helper() - session.MakeRequest(t, NewRequestWithValues(t, "POST", "/user/settings", map[string]string{ - "_csrf": GetCSRF(t, session, "/user/settings"), - "visibility": strconv.Itoa(int(newValue)), - }), http.StatusSeeOther) -} - // testUser2ActivityVisibility checks visibility of UI elements on /?tab=activity // It also returns the account visibility link if it is present on the page. func testUser2ActivityVisibility(t *testing.T, session *TestSession, hint string, availability bool) string { diff --git a/tests/integration/user_profile_follows_test.go b/tests/integration/user_profile_follows_test.go index 24b74268e6..bad0944d88 100644 --- a/tests/integration/user_profile_follows_test.go +++ b/tests/integration/user_profile_follows_test.go @@ -6,11 +6,10 @@ package integration import ( "fmt" "net/http" + "net/url" "strings" "testing" - "code.gitea.io/gitea/tests" - "github.com/stretchr/testify/assert" ) @@ -20,92 +19,92 @@ import ( // - Followers and Following lists have correct amounts of items // - %d followers and %following counters are always present and always have correct numbers and use correct plurals func TestUserProfileFollows(t *testing.T) { - defer tests.PrepareTestEnv(t)() + onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) { + // This test needs 3 users to check for all possible states + // The accounts of user3 and user4 are not functioning + user1 := loginUser(t, "user1") + user2 := loginUser(t, "user2") + user5 := loginUser(t, "user5") - // This test needs 3 users to check for all possible states - // The accounts of user3 and user4 are not functioning - user1 := loginUser(t, "user1") - user2 := loginUser(t, "user2") - user5 := loginUser(t, "user5") + followersLink := "#profile-avatar-card a[href='/user1?tab=followers']" + followingLink := "#profile-avatar-card a[href='/user1?tab=following']" + listHeader := ".user-cards h2" + listItems := ".user-cards .list" - followersLink := "#profile-avatar-card a[href='/user1?tab=followers']" - followingLink := "#profile-avatar-card a[href='/user1?tab=following']" - listHeader := ".user-cards h2" - listItems := ".user-cards .list" + // = No follows = - // = No follows = + var followCount int - var followCount int + // Request the profile of user1, the Followers tab + response := user1.MakeRequest(t, NewRequest(t, "GET", "/user1?tab=followers"), http.StatusOK) + page := NewHTMLParser(t, response.Body) - // Request the profile of user1, the Followers tab - response := user1.MakeRequest(t, NewRequest(t, "GET", "/user1?tab=followers"), http.StatusOK) - page := NewHTMLParser(t, response.Body) + // Verify that user1 has no followers + testSelectorEquals(t, page, followersLink, "0 followers") + testSelectorEquals(t, page, listHeader, "Followers") + testListCount(t, page, listItems, followCount) - // Verify that user1 has no followers - testSelectorEquals(t, page, followersLink, "0 followers") - testSelectorEquals(t, page, listHeader, "Followers") - testListCount(t, page, listItems, followCount) + // Request the profile of user1, the Following tab + response = user1.MakeRequest(t, NewRequest(t, "GET", "/user1?tab=following"), http.StatusOK) + page = NewHTMLParser(t, response.Body) - // Request the profile of user1, the Following tab - response = user1.MakeRequest(t, NewRequest(t, "GET", "/user1?tab=following"), http.StatusOK) - page = NewHTMLParser(t, response.Body) + // Verify that user1 does not follow anyone + testSelectorEquals(t, page, followingLink, "0 following") + testSelectorEquals(t, page, listHeader, "Following") + testListCount(t, page, listItems, followCount) - // Verify that user1 does not follow anyone - testSelectorEquals(t, page, followingLink, "0 following") - testSelectorEquals(t, page, listHeader, "Following") - testListCount(t, page, listItems, followCount) + // Make user1 and user2 follow each other + testUserFollowUser(t, user1, "user2") + testUserFollowUser(t, user2, "user1") - // Make user1 and user2 follow each other - testUserFollowUser(t, user1, "user2") - testUserFollowUser(t, user2, "user1") + // = 1 follow each = - // = 1 follow each = + followCount++ - followCount++ + // Request the profile of user1, the Followers tab + response = user1.MakeRequest(t, NewRequest(t, "GET", "/user1?tab=followers"), http.StatusOK) + page = NewHTMLParser(t, response.Body) - // Request the profile of user1, the Followers tab - response = user1.MakeRequest(t, NewRequest(t, "GET", "/user1?tab=followers"), http.StatusOK) - page = NewHTMLParser(t, response.Body) + // Verify it is now followed by 1 user + testSelectorEquals(t, page, followersLink, "1 follower") + testSelectorEquals(t, page, listHeader, "Follower") + testListCount(t, page, listItems, followCount) - // Verify it is now followed by 1 user - testSelectorEquals(t, page, followersLink, "1 follower") - testSelectorEquals(t, page, listHeader, "Follower") - testListCount(t, page, listItems, followCount) + // Request the profile of user1, the Following tab + response = user1.MakeRequest(t, NewRequest(t, "GET", "/user1?tab=following"), http.StatusOK) + page = NewHTMLParser(t, response.Body) - // Request the profile of user1, the Following tab - response = user1.MakeRequest(t, NewRequest(t, "GET", "/user1?tab=following"), http.StatusOK) - page = NewHTMLParser(t, response.Body) + // Verify it now follows follows 1 user + testSelectorEquals(t, page, followingLink, "1 following") + testSelectorEquals(t, page, listHeader, "Following") + testListCount(t, page, listItems, followCount) - // Verify it now follows follows 1 user - testSelectorEquals(t, page, followingLink, "1 following") - testSelectorEquals(t, page, listHeader, "Following") - testListCount(t, page, listItems, followCount) + // Make user1 and user3 follow each other + testUserFollowUser(t, user1, "user5") + testUserFollowUser(t, user5, "user1") - // Make user1 and user3 follow each other - testUserFollowUser(t, user1, "user5") - testUserFollowUser(t, user5, "user1") + // = 2 follows = - // = 2 follows = + followCount++ - followCount++ + // Request the profile of user1, the Followers tab + response = user1.MakeRequest(t, NewRequest(t, "GET", "/user1?tab=followers"), http.StatusOK) + page = NewHTMLParser(t, response.Body) - // Request the profile of user1, the Followers tab - response = user1.MakeRequest(t, NewRequest(t, "GET", "/user1?tab=followers"), http.StatusOK) - page = NewHTMLParser(t, response.Body) + // Verify it is now followed by 2 users + testSelectorEquals(t, page, followersLink, "2 followers") + testSelectorEquals(t, page, listHeader, "Followers") + testListCount(t, page, listItems, followCount) - // Verify it is now followed by 2 users - testSelectorEquals(t, page, followersLink, "2 followers") - testSelectorEquals(t, page, listHeader, "Followers") - testListCount(t, page, listItems, followCount) + // Request the profile of user1, the Following tab + response = user1.MakeRequest(t, NewRequest(t, "GET", "/user1?tab=following"), http.StatusOK) + page = NewHTMLParser(t, response.Body) - // Request the profile of user1, the Following tab - response = user1.MakeRequest(t, NewRequest(t, "GET", "/user1?tab=following"), http.StatusOK) - page = NewHTMLParser(t, response.Body) - - // Verify it now follows follows 2 users - testSelectorEquals(t, page, followingLink, "2 following") - testSelectorEquals(t, page, listHeader, "Following") - testListCount(t, page, listItems, followCount) + // Verify it now follows follows 2 users + testSelectorEquals(t, page, followingLink, "2 following") + testSelectorEquals(t, page, listHeader, "Following") + testListCount(t, page, listItems, followCount) + }) } // testUserFollowUser simply follows a user `following` by session of user `follower` diff --git a/tests/integration/user_redirect_test.go b/tests/integration/user_redirect_test.go deleted file mode 100644 index fef0c7cb67..0000000000 --- a/tests/integration/user_redirect_test.go +++ /dev/null @@ -1,274 +0,0 @@ -// Copyright 2024 The Forgejo Authors. All rights reserved. -// SPDX-License-Identifier: GPL-3.0-or-later - -package integration - -import ( - "net/http" - "testing" - "time" - - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/timeutil" - forgejo_context "code.gitea.io/gitea/services/context" - "code.gitea.io/gitea/tests" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -func TestUserRedirect(t *testing.T) { - defer tests.PrepareTestEnv(t)() - defer test.MockVariableValue(&setting.Service.UsernameCooldownPeriod, 1)() - - session := loginUser(t, "user2") - - t.Run("Rename user normally", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - req := NewRequestWithValues(t, "POST", "/user/settings", map[string]string{ - "_csrf": GetCSRF(t, session, "/user/settings"), - "name": "user2-new", - }) - session.MakeRequest(t, req, http.StatusSeeOther) - - flashCookie := session.GetCookie(forgejo_context.CookieNameFlash) - assert.NotNil(t, flashCookie) - assert.EqualValues(t, "success%3DYour%2Bprofile%2Bhas%2Bbeen%2Bupdated.", flashCookie.Value) - - unittest.AssertExistsIf(t, true, &user_model.Redirect{LowerName: "user2", RedirectUserID: 2}) - }) - - t.Run("Create new user", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - req := NewRequestWithValues(t, "POST", "/user/sign_up", map[string]string{ - "_csrf": GetCSRF(t, emptyTestSession(t), "/user/sign_up"), - "user_name": "user2", - "email": "doesnotexist@example.com", - "password": "examplePassword!1", - "retype": "examplePassword!1", - }) - resp := MakeRequest(t, req, http.StatusOK) - - htmlDoc := NewHTMLParser(t, resp.Body) - flashMessage := htmlDoc.Find(`.flash-message`).Text() - assert.Contains(t, flashMessage, "The username cannot be claimed, because its cooldown period is not yet over. It can be claimed on") - }) - - t.Run("Rename another user", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - session := loginUser(t, "user4") - req := NewRequestWithValues(t, "POST", "/user/settings", map[string]string{ - "_csrf": GetCSRF(t, session, "/user/settings"), - "name": "user2", - }) - session.MakeRequest(t, req, http.StatusSeeOther) - - flashCookie := session.GetCookie(forgejo_context.CookieNameFlash) - assert.NotNil(t, flashCookie) - assert.Contains(t, flashCookie.Value, "error%3DThe%2Busername%2Bcannot%2Bbe%2Bclaimed%252C%2Bbecause%2Bits%2Bcooldown%2Bperiod%2Bis%2Bnot%2Byet%2Bover.%2BIt%2Bcan%2Bbe%2Bclaimed%2Bon") - }) - - t.Run("Admin rename user", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - session := loginUser(t, "user1") - req := NewRequestWithValues(t, "POST", "/admin/users/4/edit", map[string]string{ - "_csrf": GetCSRF(t, session, "/admin/users/4/edit"), - "user_name": "user2", - "email": "user4@example.com", - "login_type": "0-0", - }) - session.MakeRequest(t, req, http.StatusSeeOther) - flashCookie := session.GetCookie(forgejo_context.CookieNameFlash) - assert.NotNil(t, flashCookie) - assert.EqualValues(t, "success%3DThe%2Buser%2Baccount%2Bhas%2Bbeen%2Bupdated.", flashCookie.Value) - - unittest.AssertExistsIf(t, true, &user_model.User{LowerName: "user2"}) - unittest.AssertExistsIf(t, false, &user_model.Redirect{LowerName: "user2", RedirectUserID: 2}) - }) - - t.Run("Reclaim username", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - req := NewRequestWithValues(t, "POST", "/user/settings", map[string]string{ - "_csrf": GetCSRF(t, session, "/user/settings"), - "name": "user2-new-2", - }) - session.MakeRequest(t, req, http.StatusSeeOther) - - flashCookie := session.GetCookie(forgejo_context.CookieNameFlash) - assert.NotNil(t, flashCookie) - assert.EqualValues(t, "success%3DYour%2Bprofile%2Bhas%2Bbeen%2Bupdated.", flashCookie.Value) - - unittest.AssertExistsIf(t, true, &user_model.Redirect{LowerName: "user2-new", RedirectUserID: 2}) - - req = NewRequestWithValues(t, "POST", "/user/settings", map[string]string{ - "_csrf": GetCSRF(t, session, "/user/settings"), - "name": "user2-new", - }) - session.MakeRequest(t, req, http.StatusSeeOther) - - flashCookie = session.GetCookie(forgejo_context.CookieNameFlash) - assert.NotNil(t, flashCookie) - assert.EqualValues(t, "success%3DYour%2Bprofile%2Bhas%2Bbeen%2Bupdated.", flashCookie.Value) - - unittest.AssertExistsIf(t, false, &user_model.Redirect{LowerName: "user2-new", RedirectUserID: 2}) - unittest.AssertExistsIf(t, true, &user_model.Redirect{LowerName: "user2-new-2", RedirectUserID: 2}) - }) - - t.Run("Profile note", func(t *testing.T) { - getPrompt := func(t *testing.T) string { - req := NewRequest(t, "GET", "/user/settings") - resp := session.MakeRequest(t, req, http.StatusOK) - htmlDoc := NewHTMLParser(t, resp.Body) - - return htmlDoc.Find("input[name='name'] + .help").Text() - } - - t.Run("No cooldown", func(t *testing.T) { - defer test.MockVariableValue(&setting.Service.UsernameCooldownPeriod, 0)() - defer tests.PrintCurrentTest(t)() - - assert.Contains(t, getPrompt(t), "The old username will redirect until someone claims it.") - }) - - t.Run("With cooldown", func(t *testing.T) { - defer test.MockVariableValue(&setting.Service.UsernameCooldownPeriod, 8)() - defer tests.PrintCurrentTest(t)() - - assert.Contains(t, getPrompt(t), "The old username will be available to everyone after a cooldown period of 8 days, you can still reclaim the old username during the cooldown period.") - }) - }) - - t.Run("Org settings note", func(t *testing.T) { - getPrompt := func(t *testing.T) string { - req := NewRequest(t, "GET", "/org/org3/settings") - resp := session.MakeRequest(t, req, http.StatusOK) - htmlDoc := NewHTMLParser(t, resp.Body) - - return htmlDoc.Find("#org_name + .help").Text() - } - - t.Run("No cooldown", func(t *testing.T) { - defer test.MockVariableValue(&setting.Service.UsernameCooldownPeriod, 0)() - defer tests.PrintCurrentTest(t)() - - assert.Contains(t, getPrompt(t), "The old name will redirect until it is claimed.") - }) - - t.Run("With cooldown", func(t *testing.T) { - defer test.MockVariableValue(&setting.Service.UsernameCooldownPeriod, 8)() - defer tests.PrintCurrentTest(t)() - - assert.Contains(t, getPrompt(t), "The old username will be available to everyone after a cooldown period of 8 days, you can still reclaim the old username during the cooldown period.") - }) - }) -} - -// NOTE: This is a unit test but written in the integration test to ensure this runs on all databases. -func TestLimitUserRedirects(t *testing.T) { - defer tests.PrepareTestEnv(t)() - - _, err := db.GetEngine(db.DefaultContext).NoAutoTime().Insert(&user_model.Redirect{RedirectUserID: 1, LowerName: "legacy", CreatedUnix: 0}, - &user_model.Redirect{RedirectUserID: 1, LowerName: "past", CreatedUnix: timeutil.TimeStampNow().AddDuration(-48 * time.Hour)}, - &user_model.Redirect{RedirectUserID: 1, LowerName: "recent", CreatedUnix: timeutil.TimeStampNow().AddDuration(-12 * time.Hour)}, - &user_model.Redirect{RedirectUserID: 1, LowerName: "future", CreatedUnix: timeutil.TimeStampNow().AddDuration(time.Hour)}) - require.NoError(t, err) - - require.NoError(t, user_model.LimitUserRedirects(db.DefaultContext, 1, 3)) - - unittest.AssertExistsIf(t, false, &user_model.Redirect{LowerName: "legacy"}) - unittest.AssertExistsIf(t, true, &user_model.Redirect{LowerName: "past"}) - unittest.AssertExistsIf(t, true, &user_model.Redirect{LowerName: "recent"}) - unittest.AssertExistsIf(t, true, &user_model.Redirect{LowerName: "future"}) - - require.NoError(t, user_model.LimitUserRedirects(db.DefaultContext, 1, 1)) - - unittest.AssertExistsIf(t, false, &user_model.Redirect{LowerName: "legacy"}) - unittest.AssertExistsIf(t, false, &user_model.Redirect{LowerName: "past"}) - unittest.AssertExistsIf(t, false, &user_model.Redirect{LowerName: "recent"}) - unittest.AssertExistsIf(t, true, &user_model.Redirect{LowerName: "future"}) -} - -// NOTE: This is a unit test but written in the integration test to ensure this runs on all databases. -func TestCanClaimUsername(t *testing.T) { - require.NoError(t, unittest.PrepareTestDatabase()) - - _, err := db.GetEngine(db.DefaultContext).NoAutoTime().Insert(&user_model.Redirect{RedirectUserID: 1, LowerName: "legacy", CreatedUnix: 0}, - &user_model.Redirect{RedirectUserID: 1, LowerName: "past", CreatedUnix: timeutil.TimeStampNow().AddDuration(-48 * time.Hour)}, - &user_model.Redirect{RedirectUserID: 1, LowerName: "recent", CreatedUnix: timeutil.TimeStampNow().AddDuration(-12 * time.Hour)}, - &user_model.Redirect{RedirectUserID: 1, LowerName: "future", CreatedUnix: timeutil.TimeStampNow().AddDuration(time.Hour)}, - &user_model.Redirect{RedirectUserID: 3, LowerName: "recent-org", CreatedUnix: timeutil.TimeStampNow().AddDuration(-12 * time.Hour)}) - require.NoError(t, err) - - testCase := func(t *testing.T, legacy, past, recent, future bool, doerID int64) { - t.Helper() - - ok, _, err := user_model.CanClaimUsername(db.DefaultContext, "legacy", doerID) - require.NoError(t, err) - assert.Equal(t, legacy, ok) - - ok, _, err = user_model.CanClaimUsername(db.DefaultContext, "past", doerID) - require.NoError(t, err) - assert.Equal(t, past, ok) - - ok, _, err = user_model.CanClaimUsername(db.DefaultContext, "recent", doerID) - require.NoError(t, err) - assert.Equal(t, recent, ok) - - ok, _, err = user_model.CanClaimUsername(db.DefaultContext, "future", doerID) - require.NoError(t, err) - assert.Equal(t, future, ok) - } - - t.Run("No cooldown", func(t *testing.T) { - defer test.MockVariableValue(&setting.Service.UsernameCooldownPeriod, 0)() - - testCase(t, true, true, true, true, -1) - }) - - t.Run("1 day cooldown", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - defer test.MockVariableValue(&setting.Service.UsernameCooldownPeriod, 1)() - - testCase(t, true, true, false, false, -1) - }) - - t.Run("1 week cooldown", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - defer test.MockVariableValue(&setting.Service.UsernameCooldownPeriod, 7)() - - testCase(t, true, false, false, false, -1) - - t.Run("Own username", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - defer test.MockVariableValue(&setting.Service.UsernameCooldownPeriod, 7)() - - testCase(t, true, true, true, true, 1) - }) - }) - - t.Run("Organisation", func(t *testing.T) { - defer test.MockVariableValue(&setting.Service.UsernameCooldownPeriod, 1)() - - t.Run("Not owner", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - ok, _, err := user_model.CanClaimUsername(db.DefaultContext, "recent-org", -1) - require.NoError(t, err) - assert.False(t, ok) - }) - t.Run("Owner", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - ok, _, err := user_model.CanClaimUsername(db.DefaultContext, "recent-org", 2) - require.NoError(t, err) - assert.True(t, ok) - }) - }) -} diff --git a/tests/integration/user_test.go b/tests/integration/user_test.go index d2b5f112a3..73976b9a35 100644 --- a/tests/integration/user_test.go +++ b/tests/integration/user_test.go @@ -5,18 +5,14 @@ package integration import ( - "bytes" - "encoding/hex" "fmt" "net/http" - "net/url" "strconv" "strings" "testing" "time" auth_model "code.gitea.io/gitea/models/auth" - "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" unit_model "code.gitea.io/gitea/models/unit" @@ -118,7 +114,10 @@ func TestRenameReservedUsername(t *testing.T) { "avatar", "avatars", "captcha", + "commits", + "debug", "devtest", + "error", "explore", "favicon.ico", "ghost", @@ -127,12 +126,16 @@ func TestRenameReservedUsername(t *testing.T) { "manifest.json", "metrics", "milestones", + "new", "notifications", "org", "pulls", + "raw", "repo", "repo-avatars", "robots.txt", + "search", + "serviceworker.js", "ssh_info", "swagger.v1.json", "user", @@ -816,195 +819,3 @@ func TestUserTOTPEnrolled(t *testing.T) { assert.True(t, called) }) } - -func TestUserRepos(t *testing.T) { - defer tests.PrepareTestEnv(t)() - - cases := map[string][]string{ - "alphabetically": {"repo6", "repo7", "repo8"}, - "recentupdate": {"repo7", "repo8", "repo6"}, - "reversealphabetically": {"repo8", "repo7", "repo6"}, - } - - session := loginUser(t, "user10") - for sortBy, repos := range cases { - req := NewRequest(t, "GET", "/user10?sort="+sortBy) - resp := session.MakeRequest(t, req, http.StatusOK) - - htmlDoc := NewHTMLParser(t, resp.Body) - - sel := htmlDoc.doc.Find("a.name") - assert.Len(t, repos, len(sel.Nodes)) - for i := 0; i < len(repos); i++ { - assert.EqualValues(t, repos[i], strings.TrimSpace(sel.Eq(i).Text())) - } - } -} - -func TestUserActivate(t *testing.T) { - defer tests.PrepareTestEnv(t)() - defer test.MockVariableValue(&setting.Service.RegisterEmailConfirm, true)() - - called := false - code := "" - defer test.MockVariableValue(&mailer.SendAsync, func(msgs ...*mailer.Message) { - called = true - assert.Len(t, msgs, 1) - assert.Equal(t, `"doesnotexist" `, msgs[0].To) - assert.EqualValues(t, translation.NewLocale("en-US").Tr("mail.activate_account"), msgs[0].Subject) - - messageDoc := NewHTMLParser(t, bytes.NewBuffer([]byte(msgs[0].Body))) - link, ok := messageDoc.Find("a").Attr("href") - assert.True(t, ok) - u, err := url.Parse(link) - require.NoError(t, err) - code = u.Query()["code"][0] - })() - - session := emptyTestSession(t) - req := NewRequestWithValues(t, "POST", "/user/sign_up", map[string]string{ - "_csrf": GetCSRF(t, session, "/user/sign_up"), - "user_name": "doesnotexist", - "email": "doesnotexist@example.com", - "password": "examplePassword!1", - "retype": "examplePassword!1", - }) - session.MakeRequest(t, req, http.StatusOK) - assert.True(t, called) - - queryCode, err := url.QueryUnescape(code) - require.NoError(t, err) - - lookupKey, validator, ok := strings.Cut(queryCode, ":") - assert.True(t, ok) - - rawValidator, err := hex.DecodeString(validator) - require.NoError(t, err) - - authToken, err := auth_model.FindAuthToken(db.DefaultContext, lookupKey, auth_model.UserActivation) - require.NoError(t, err) - assert.False(t, authToken.IsExpired()) - assert.EqualValues(t, authToken.HashedValidator, auth_model.HashValidator(rawValidator)) - - req = NewRequest(t, "POST", "/user/activate?code="+code) - session.MakeRequest(t, req, http.StatusOK) - - unittest.AssertNotExistsBean(t, &auth_model.AuthorizationToken{ID: authToken.ID}) - unittest.AssertExistsAndLoadBean(t, &user_model.User{Name: "doesnotexist", IsActive: true}) -} - -func TestUserPasswordReset(t *testing.T) { - defer tests.PrepareTestEnv(t)() - - user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) - - called := false - code := "" - defer test.MockVariableValue(&mailer.SendAsync, func(msgs ...*mailer.Message) { - if called { - return - } - called = true - - assert.Len(t, msgs, 1) - assert.Equal(t, user2.EmailTo(), msgs[0].To) - assert.EqualValues(t, translation.NewLocale("en-US").Tr("mail.reset_password"), msgs[0].Subject) - - messageDoc := NewHTMLParser(t, bytes.NewBuffer([]byte(msgs[0].Body))) - link, ok := messageDoc.Find("a").Attr("href") - assert.True(t, ok) - u, err := url.Parse(link) - require.NoError(t, err) - code = u.Query()["code"][0] - })() - - session := emptyTestSession(t) - req := NewRequestWithValues(t, "POST", "/user/forgot_password", map[string]string{ - "_csrf": GetCSRF(t, session, "/user/forgot_password"), - "email": user2.Email, - }) - session.MakeRequest(t, req, http.StatusOK) - assert.True(t, called) - - queryCode, err := url.QueryUnescape(code) - require.NoError(t, err) - - lookupKey, validator, ok := strings.Cut(queryCode, ":") - assert.True(t, ok) - - rawValidator, err := hex.DecodeString(validator) - require.NoError(t, err) - - authToken, err := auth_model.FindAuthToken(db.DefaultContext, lookupKey, auth_model.PasswordReset) - require.NoError(t, err) - assert.False(t, authToken.IsExpired()) - assert.EqualValues(t, authToken.HashedValidator, auth_model.HashValidator(rawValidator)) - - req = NewRequestWithValues(t, "POST", "/user/recover_account", map[string]string{ - "_csrf": GetCSRF(t, session, "/user/recover_account"), - "code": code, - "password": "new_password", - }) - session.MakeRequest(t, req, http.StatusSeeOther) - - unittest.AssertNotExistsBean(t, &auth_model.AuthorizationToken{ID: authToken.ID}) - assert.True(t, unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}).ValidatePassword("new_password")) -} - -func TestActivateEmailAddress(t *testing.T) { - defer tests.PrepareTestEnv(t)() - defer test.MockVariableValue(&setting.Service.RegisterEmailConfirm, true)() - - user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) - - called := false - code := "" - defer test.MockVariableValue(&mailer.SendAsync, func(msgs ...*mailer.Message) { - if called { - return - } - called = true - - assert.Len(t, msgs, 1) - assert.Equal(t, "newemail@example.org", msgs[0].To) - assert.EqualValues(t, translation.NewLocale("en-US").Tr("mail.activate_email"), msgs[0].Subject) - - messageDoc := NewHTMLParser(t, bytes.NewBuffer([]byte(msgs[0].Body))) - link, ok := messageDoc.Find("a").Attr("href") - assert.True(t, ok) - u, err := url.Parse(link) - require.NoError(t, err) - code = u.Query()["code"][0] - })() - - session := loginUser(t, user2.Name) - req := NewRequestWithValues(t, "POST", "/user/settings/account/email", map[string]string{ - "_csrf": GetCSRF(t, session, "/user/settings"), - "email": "newemail@example.org", - }) - session.MakeRequest(t, req, http.StatusSeeOther) - assert.True(t, called) - - queryCode, err := url.QueryUnescape(code) - require.NoError(t, err) - - lookupKey, validator, ok := strings.Cut(queryCode, ":") - assert.True(t, ok) - - rawValidator, err := hex.DecodeString(validator) - require.NoError(t, err) - - authToken, err := auth_model.FindAuthToken(db.DefaultContext, lookupKey, auth_model.EmailActivation("newemail@example.org")) - require.NoError(t, err) - assert.False(t, authToken.IsExpired()) - assert.EqualValues(t, authToken.HashedValidator, auth_model.HashValidator(rawValidator)) - - req = NewRequestWithValues(t, "POST", "/user/activate_email", map[string]string{ - "code": code, - "email": "newemail@example.org", - }) - session.MakeRequest(t, req, http.StatusSeeOther) - - unittest.AssertNotExistsBean(t, &auth_model.AuthorizationToken{ID: authToken.ID}) - unittest.AssertExistsAndLoadBean(t, &user_model.EmailAddress{UID: user2.ID, IsActivated: true, Email: "newemail@example.org"}) -} diff --git a/tests/integration/xss_test.go b/tests/integration/xss_test.go index 6ac5b062f2..70038cf560 100644 --- a/tests/integration/xss_test.go +++ b/tests/integration/xss_test.go @@ -4,16 +4,25 @@ package integration import ( + "context" "fmt" "net/http" + "net/url" + "os" + "path/filepath" "testing" + "time" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/unittest" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/tests" + gogit "github.com/go-git/go-git/v5" + "github.com/go-git/go-git/v5/plumbing/object" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestXSSUserFullName(t *testing.T) { @@ -41,29 +50,67 @@ func TestXSSUserFullName(t *testing.T) { } func TestXSSWikiLastCommitInfo(t *testing.T) { - defer tests.PrepareTestEnv(t)() - // Check on page view. - t.Run("Page view", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() + onGiteaRun(t, func(t *testing.T, u *url.URL) { + // Prepare the environment. + dstPath := t.TempDir() + r := fmt.Sprintf("%suser2/repo1.wiki.git", u.String()) + u, err := url.Parse(r) + require.NoError(t, err) + u.User = url.UserPassword("user2", userPassword) + require.NoError(t, git.CloneWithArgs(context.Background(), git.AllowLFSFiltersArgs(), u.String(), dstPath, git.CloneRepoOptions{})) - req := NewRequest(t, http.MethodGet, "/user2/repo1/wiki/XSS") - resp := MakeRequest(t, req, http.StatusOK) - htmlDoc := NewHTMLParser(t, resp.Body) + // Use go-git here, because using git wouldn't work, it has code to remove + // `<`, `>` and `\n` in user names. Even though this is permitted and + // wouldn't result in a error by a Git server. + gitRepo, err := gogit.PlainOpen(dstPath) + require.NoError(t, err) - htmlDoc.AssertElement(t, "script.evil", false) - assert.Contains(t, htmlDoc.Find(".ui.sub.header").Text(), `Gusted edited this page 2024-01-31`) - }) + w, err := gitRepo.Worktree() + require.NoError(t, err) - // Check on revisions page. - t.Run("Revision page", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() + filename := filepath.Join(dstPath, "Home.md") + err = os.WriteFile(filename, []byte("Oh, a XSS attack?"), 0o644) + require.NoError(t, err) - req := NewRequest(t, http.MethodGet, "/user2/repo1/wiki/XSS?action=_revision") - resp := MakeRequest(t, req, http.StatusOK) - htmlDoc := NewHTMLParser(t, resp.Body) + _, err = w.Add("Home.md") + require.NoError(t, err) - htmlDoc.AssertElement(t, "script.evil", false) - assert.Contains(t, htmlDoc.Find(".ui.sub.header").Text(), `Gusted edited this page 2024-01-31`) + _, err = w.Commit("Yay XSS", &gogit.CommitOptions{ + Author: &object.Signature{ + Name: `Gusted`, + Email: "valid@example.org", + When: time.Date(2024, time.January, 31, 0, 0, 0, 0, time.UTC), + }, + }) + require.NoError(t, err) + + // Push. + _, _, err = git.NewCommand(git.DefaultContext, "push").AddArguments(git.ToTrustedCmdArgs([]string{"origin", "master"})...).RunStdString(&git.RunOpts{Dir: dstPath}) + require.NoError(t, err) + + // Check on page view. + t.Run("Page view", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + req := NewRequest(t, http.MethodGet, "/user2/repo1/wiki/Home") + resp := MakeRequest(t, req, http.StatusOK) + htmlDoc := NewHTMLParser(t, resp.Body) + + htmlDoc.AssertElement(t, "script.evil", false) + assert.Contains(t, htmlDoc.Find(".ui.sub.header").Text(), `Gusted edited this page 2024-01-31`) + }) + + // Check on revisions page. + t.Run("Revision page", func(t *testing.T) { + defer tests.PrintCurrentTest(t)() + + req := NewRequest(t, http.MethodGet, "/user2/repo1/wiki/Home?action=_revision") + resp := MakeRequest(t, req, http.StatusOK) + htmlDoc := NewHTMLParser(t, resp.Body) + + htmlDoc.AssertElement(t, "script.evil", false) + assert.Contains(t, htmlDoc.Find(".ui.sub.header").Text(), `Gusted edited this page 2024-01-31`) + }) }) } diff --git a/tests/mysql.ini.tmpl b/tests/mysql.ini.tmpl index e15e79952b..f24590a76b 100644 --- a/tests/mysql.ini.tmpl +++ b/tests/mysql.ini.tmpl @@ -113,6 +113,3 @@ REPLY_TO_ADDRESS = incoming+%{token}@localhost [actions] ENABLED = true - -[ui.notification] -EVENT_SOURCE_UPDATE_TIME = 1s diff --git a/tests/pgsql.ini.tmpl b/tests/pgsql.ini.tmpl index 340531fb38..b58d753b6c 100644 --- a/tests/pgsql.ini.tmpl +++ b/tests/pgsql.ini.tmpl @@ -112,7 +112,7 @@ MINIO_BASE_PATH = avatars/ MINIO_BASE_PATH = repo-avatars/ [storage] -STORAGE_TYPE = {{TEST_STORAGE_TYPE}} +STORAGE_TYPE = minio SERVE_DIRECT = false MINIO_ENDPOINT = minio:9000 MINIO_ACCESS_KEY_ID = 123456 @@ -127,6 +127,3 @@ ENABLED = true [actions] ENABLED = true - -[ui.notification] -EVENT_SOURCE_UPDATE_TIME = 1s diff --git a/tests/sqlite.ini.tmpl b/tests/sqlite.ini.tmpl index 277916a539..51234e3c8f 100644 --- a/tests/sqlite.ini.tmpl +++ b/tests/sqlite.ini.tmpl @@ -5,7 +5,6 @@ RUN_MODE = prod [database] DB_TYPE = sqlite3 PATH = tests/{{TEST_TYPE}}/gitea-{{TEST_TYPE}}-sqlite/gitea.db -SQLITE_JOURNAL_MODE = MEMORY [indexer] REPO_INDEXER_ENABLED = true @@ -114,6 +113,3 @@ RENDER_CONTENT_MODE=sanitized [actions] ENABLED = true - -[ui.notification] -EVENT_SOURCE_UPDATE_TIME = 1s diff --git a/tests/test_utils.go b/tests/test_utils.go index b3c03a30a1..ee1068961c 100644 --- a/tests/test_utils.go +++ b/tests/test_utils.go @@ -48,8 +48,6 @@ func exitf(format string, args ...any) { os.Exit(1) } -var preparedDir string - func InitTest(requireGitea bool) { log.RegisterEventWriter("test", testlogger.NewTestLoggerWriter) @@ -177,46 +175,6 @@ func InitTest(requireGitea bool) { log.Fatal("db.Exec: CREATE SCHEMA: %v", err) } } - - case setting.Database.Type.IsSQLite3(): - setting.Database.Path = ":memory:" - } - - setting.Repository.Local.LocalCopyPath = os.TempDir() - dir, err := os.MkdirTemp("", "prepared-forgejo") - if err != nil { - log.Fatal("os.MkdirTemp: %v", err) - } - preparedDir = dir - - setting.Repository.Local.LocalCopyPath, err = os.MkdirTemp("", "local-upload") - if err != nil { - log.Fatal("os.MkdirTemp: %v", err) - } - - if err := unittest.CopyDir(path.Join(filepath.Dir(setting.AppPath), "tests/gitea-repositories-meta"), dir); err != nil { - log.Fatal("os.RemoveAll: %v", err) - } - ownerDirs, err := os.ReadDir(dir) - if err != nil { - log.Fatal("os.ReadDir: %v", err) - } - - for _, ownerDir := range ownerDirs { - if !ownerDir.Type().IsDir() { - continue - } - repoDirs, err := os.ReadDir(filepath.Join(dir, ownerDir.Name())) - if err != nil { - log.Fatal("os.ReadDir: %v", err) - } - for _, repoDir := range repoDirs { - _ = os.MkdirAll(filepath.Join(dir, ownerDir.Name(), repoDir.Name(), "objects", "pack"), 0o755) - _ = os.MkdirAll(filepath.Join(dir, ownerDir.Name(), repoDir.Name(), "objects", "info"), 0o755) - _ = os.MkdirAll(filepath.Join(dir, ownerDir.Name(), repoDir.Name(), "refs", "heads"), 0o755) - _ = os.MkdirAll(filepath.Join(dir, ownerDir.Name(), repoDir.Name(), "refs", "tag"), 0o755) - _ = os.MkdirAll(filepath.Join(dir, ownerDir.Name(), repoDir.Name(), "refs", "pull"), 0o755) - } } routers.InitWebInstalled(graceful.GetManager().HammerContext()) @@ -266,30 +224,47 @@ func cancelProcesses(t testing.TB, delay time.Duration) { t.Logf("PrepareTestEnv: all processes cancelled within %s", time.Since(start)) } -func PrepareGitRepoDirectory(t testing.TB) { - var err error - setting.RepoRootPath, err = os.MkdirTemp(t.TempDir(), "forgejo-repo-rooth") - require.NoError(t, err) - require.NoError(t, unittest.CopyDir(preparedDir, setting.RepoRootPath)) -} +func PrepareTestEnv(t testing.TB, skip ...int) func() { + t.Helper() + ourSkip := 1 + if len(skip) > 0 { + ourSkip += skip[0] + } + deferFn := PrintCurrentTest(t, ourSkip) -func PrepareArtifactsStorage(t testing.TB) { - // prepare actions artifacts directory and files - require.NoError(t, storage.Clean(storage.ActionsArtifacts)) + // kill all background processes to prevent them from interfering with the fixture loading + // see https://codeberg.org/forgejo/forgejo/issues/2962 + cancelProcesses(t, 30*time.Second) + t.Cleanup(func() { cancelProcesses(t, 0) }) // cancel remaining processes in a non-blocking way - s, err := storage.NewStorage(setting.LocalStorageType, &setting.Storage{ - Path: filepath.Join(filepath.Dir(setting.AppPath), "tests", "testdata", "data", "artifacts"), - }) - require.NoError(t, err) - require.NoError(t, s.IterateObjects("", func(p string, obj storage.Object) error { - _, err = storage.Copy(storage.ActionsArtifacts, p, s, p) - return err - })) -} + // load database fixtures + require.NoError(t, unittest.LoadFixtures()) + + // load git repo fixtures + require.NoError(t, util.RemoveAll(setting.RepoRootPath)) + require.NoError(t, unittest.CopyDir(path.Join(filepath.Dir(setting.AppPath), "tests/gitea-repositories-meta"), setting.RepoRootPath)) + ownerDirs, err := os.ReadDir(setting.RepoRootPath) + if err != nil { + require.NoError(t, err, "unable to read the new repo root: %v\n", err) + } + for _, ownerDir := range ownerDirs { + if !ownerDir.Type().IsDir() { + continue + } + repoDirs, err := os.ReadDir(filepath.Join(setting.RepoRootPath, ownerDir.Name())) + if err != nil { + require.NoError(t, err, "unable to read the new repo root: %v\n", err) + } + for _, repoDir := range repoDirs { + _ = os.MkdirAll(filepath.Join(setting.RepoRootPath, ownerDir.Name(), repoDir.Name(), "objects", "pack"), 0o755) + _ = os.MkdirAll(filepath.Join(setting.RepoRootPath, ownerDir.Name(), repoDir.Name(), "objects", "info"), 0o755) + _ = os.MkdirAll(filepath.Join(setting.RepoRootPath, ownerDir.Name(), repoDir.Name(), "refs", "heads"), 0o755) + _ = os.MkdirAll(filepath.Join(setting.RepoRootPath, ownerDir.Name(), repoDir.Name(), "refs", "tag"), 0o755) + } + } -func PrepareLFSStorage(t testing.TB) { // load LFS object fixtures - // (LFS storage can be on any of several backends, including remote servers, so init it with the storage API) + // (LFS storage can be on any of several backends, including remote servers, so we init it with the storage API) lfsFixtures, err := storage.NewStorage(setting.LocalStorageType, &setting.Storage{ Path: filepath.Join(filepath.Dir(setting.AppPath), "tests/gitea-lfs-meta"), }) @@ -299,9 +274,7 @@ func PrepareLFSStorage(t testing.TB) { _, err := storage.Copy(storage.LFS, path, lfsFixtures, path) return err })) -} -func PrepareCleanPackageData(t testing.TB) { // clear all package data require.NoError(t, db.TruncateBeans(db.DefaultContext, &packages_model.Package{}, @@ -313,28 +286,17 @@ func PrepareCleanPackageData(t testing.TB) { &packages_model.PackageCleanupRule{}, )) require.NoError(t, storage.Clean(storage.Packages)) -} -func PrepareTestEnv(t testing.TB, skip ...int) func() { - t.Helper() - deferFn := PrintCurrentTest(t, util.OptionalArg(skip)+1) - - cancelProcesses(t, 30*time.Second) - t.Cleanup(func() { cancelProcesses(t, 0) }) // cancel remaining processes in a non-blocking way - - // load database fixtures - require.NoError(t, unittest.LoadFixtures()) - - // do not add more Prepare* functions here, only call necessary ones in the related test functions - PrepareGitRepoDirectory(t) - PrepareLFSStorage(t) - PrepareCleanPackageData(t) return deferFn } func PrintCurrentTest(t testing.TB, skip ...int) func() { t.Helper() - return testlogger.PrintCurrentTest(t, util.OptionalArg(skip)+1) + actualSkip := 1 + if len(skip) > 0 { + actualSkip = skip[0] + 1 + } + return testlogger.PrintCurrentTest(t, actualSkip) } // Printf takes a format and args and prints the string to os.Stdout diff --git a/tests/testdata/data/artifacts/26/1/1712166500347189545.chunk b/tests/testdata/data/artifacts/26/1/1712166500347189545.chunk deleted file mode 100644 index bc7c569e9e..0000000000 --- a/tests/testdata/data/artifacts/26/1/1712166500347189545.chunk +++ /dev/null @@ -1 +0,0 @@ -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA \ No newline at end of file diff --git a/tests/testdata/data/artifacts/26/19/1712348022422036662.chunk b/tests/testdata/data/artifacts/26/19/1712348022422036662.chunk deleted file mode 100644 index b4fb0b0783..0000000000 --- a/tests/testdata/data/artifacts/26/19/1712348022422036662.chunk +++ /dev/null @@ -1 +0,0 @@ -BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB \ No newline at end of file diff --git a/tests/testdata/data/artifacts/26/20/1712348022423431524.chunk b/tests/testdata/data/artifacts/26/20/1712348022423431524.chunk deleted file mode 100644 index 45b2320ec4..0000000000 --- a/tests/testdata/data/artifacts/26/20/1712348022423431524.chunk +++ /dev/null @@ -1 +0,0 @@ -CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC \ No newline at end of file diff --git a/tests/testdata/data/artifacts/27/5/1730330775594233150.chunk b/tests/testdata/data/artifacts/27/5/1730330775594233150.chunk deleted file mode 100644 index b1d6b8e046..0000000000 --- a/tests/testdata/data/artifacts/27/5/1730330775594233150.chunk +++ /dev/null @@ -1 +0,0 @@ -DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD \ No newline at end of file diff --git a/tools/generate-images.js b/tools/generate-images.js index d28e0916f7..0bd3af29e4 100755 --- a/tools/generate-images.js +++ b/tools/generate-images.js @@ -1,6 +1,6 @@ #!/usr/bin/env node -import imageminZopfli from 'imagemin-zopfli'; // eslint-disable-line import-x/no-unresolved -import {loadSVGFromString, Canvas, Rect, util} from 'fabric/node'; // eslint-disable-line import-x/no-unresolved +import imageminZopfli from 'imagemin-zopfli'; // eslint-disable-line i/no-unresolved +import {loadSVGFromString, Canvas, Rect, util} from 'fabric/node'; // eslint-disable-line i/no-unresolved import {optimize} from 'svgo'; import {readFile, writeFile} from 'node:fs/promises'; import {argv, exit} from 'node:process'; diff --git a/tools/migrate_locales.sh b/tools/migrate_locales.sh deleted file mode 100755 index f02fe702cc..0000000000 --- a/tools/migrate_locales.sh +++ /dev/null @@ -1,145 +0,0 @@ -#!/bin/bash - -# Copyright 2024 The Forgejo Authors. All rights reserved. -# SPDX-License-Identifier: MIT - -if [ -z "$1" ] || [ -z "$2" ] -then - echo "USAGE: $0 section key [key1 [keyN]]" - exit 1 -fi - -if ! [ -d ../options/locale_next ] -then - echo 'Call this script from the `tools` directory.' - exit 1 -fi - -destsection="$1" -keyJSON="$destsection.$2" -key1="" -keyN="" -if [ -n "$3" ] -then - key1="$3" -else - key1="$2" -fi -if [ -n "$4" ] -then - keyN="$4" -fi - -cd ../options/locale - -# Migrate the string in one file. -function process() { - file="$1" - exec 3<$file - - val1="" - valN="" - cursection="" - line1=0 - lineN=0 - lineNumber=0 - - # Parse the file - while read -u 3 line - do - ((++lineNumber)) - if [[ $line =~ ^\[[-._a-zA-Z0-9]+\]$ ]] - then - cursection="${line#[}" - cursection="${cursection%]}" - elif [ "$cursection" = "$destsection" ] - then - key="${line%%=*}" - value="${line#*=}" - key="$(echo $key)" # Trim leading/trailing whitespace - value="$(echo $value)" - - if [ "$key" = "$key1" ] - then - val1="$value" - line1=$lineNumber - fi - if [ -n "$keyN" ] && [ "$key" = "$keyN" ] - then - valN="$value" - lineN=$lineNumber - fi - - if [ -n "$val1" ] && ( [ -n "$valN" ] || [ -z "$keyN" ] ) - then - # Found all desired strings - break - fi - fi - done - - if [ -n "$val1" ] || [ -n "$valN" ] - then - localename="${file#locale_}" - localename="${localename%.ini}" - localename="${localename%-*}" - - if [ "$file" = "locale_en-US.ini" ] - then - # Delete migrated string from source file - if [ $line1 -gt 0 ] && [ $lineN -gt 0 ] && [ $lineN -ne $line1 ] - then - sed -i "${line1}d;${lineN}d" "$file" - elif [ $line1 -gt 0 ] - then - sed -i "${line1}d" "$file" - elif [ $lineN -gt 0 ] - then - sed -i "${lineN}d" "$file" - fi - fi - - # Write JSON - jsonfile="../locale_next/${file/.ini/.json}" - - pluralform="other" - oneform="one" - case $localename in - "be" | "bs" | "cnr" | "csb" | "hr" | "lt" | "pl" | "ru" | "sr" | "szl" | "uk" | "wen") - # These languages have no "other" form and use "many" instead. - pluralform="many" - ;; - "ace" | "ay" | "bm" | "bo" | "cdo" | "cpx" | "crh" | "dz" | "gan" | "hak" | "hnj" | "hsn" | "id" | "ig" | "ii" | "ja" | "jbo" | "jv" | "kde" | "kea" | "km" | "ko" | "kos" | "lkt" | "lo" | "lzh" | "ms" | "my" | "nan" | "nqo" | "osa" | "sah" | "ses" | "sg" | "son" | "su" | "th" | "tlh" | "to" | "tok" | "tpi" | "tt" | "vi" | "wo" | "wuu" | "yo" | "yue" | "zh") - # These languages have no singular form. - oneform="" - ;; - *) - ;; - esac - - content="" - if [ -z "$keyN" ] - then - content="$(jq --arg val "$val1" ".$keyJSON = \$val" < "$jsonfile")" - else - object='{}' - if [ -n "$val1" ] && [ -n "$oneform" ] - then - object=$(jq --arg val "$val1" ".$oneform = \$val" <<< "$object") - fi - if [ -n "$valN" ] - then - object=$(jq --arg val "$valN" ".$pluralform = \$val" <<< "$object") - fi - content="$(jq --argjson val "$object" ".$keyJSON = \$val" < "$jsonfile")" - fi - jq . <<< "$content" > "$jsonfile" - fi -} - -for file in *.ini -do - process "$file" & -done -wait - diff --git a/tsconfig.json b/tsconfig.json deleted file mode 100644 index 88130812fe..0000000000 --- a/tsconfig.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "include": [ - "*", - "tests/e2e/**/*", - "tools/**/*", - "web_src/js/**/*", - ], - "compilerOptions": { - "target": "ESNext", - "module": "ESNext", - "moduleResolution": "Bundler", - "lib": ["dom", "dom.iterable", "dom.asynciterable", "esnext"], - "allowImportingTsExtensions": true, - "allowJs": true, - "allowSyntheticDefaultImports": true, - "alwaysStrict": true, - "esModuleInterop": true, - "isolatedModules": true, - "noEmit": true, - "resolveJsonModule": true, - "skipLibCheck": true, - "verbatimModuleSyntax": true, - "stripInternal": true, - "strict": false, - "noUnusedLocals": true, - "noUnusedParameters": true, - "noPropertyAccessFromIndexSignature": false, - "exactOptionalPropertyTypes": false, - } -} diff --git a/vitest.config.ts b/vitest.config.js similarity index 100% rename from vitest.config.ts rename to vitest.config.js diff --git a/web_src/css/base.css b/web_src/css/base.css index dd761a1b75..4c1317ba79 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -250,20 +250,6 @@ h1.error-code { gap: 0.5rem; } -.button-sequence { - display: flex; - flex-flow: wrap; - gap: 0.5em; -} - -.button-sequence.right { - justify-content: end; -} - -.button-sequence .ui.button { - margin: 0 !important; -} - .button-row .ui.button { margin-right: 0; } @@ -652,6 +638,97 @@ img.ui.avatar, background: var(--color-active); } +.ui.form .fields.error .field textarea, +.ui.form .fields.error .field select, +.ui.form .fields.error .field input:not([type]), +.ui.form .fields.error .field input[type="date"], +.ui.form .fields.error .field input[type="datetime-local"], +.ui.form .fields.error .field input[type="email"], +.ui.form .fields.error .field input[type="number"], +.ui.form .fields.error .field input[type="password"], +.ui.form .fields.error .field input[type="search"], +.ui.form .fields.error .field input[type="tel"], +.ui.form .fields.error .field input[type="time"], +.ui.form .fields.error .field input[type="text"], +.ui.form .fields.error .field input[type="file"], +.ui.form .fields.error .field input[type="url"], +.ui.form .fields.error .field .ui.dropdown, +.ui.form .fields.error .field .ui.dropdown .item, +.ui.form .field.error .ui.dropdown, +.ui.form .field.error .ui.dropdown .text, +.ui.form .field.error .ui.dropdown .item, +.ui.form .field.error textarea, +.ui.form .field.error select, +.ui.form .field.error input:not([type]), +.ui.form .field.error input[type="date"], +.ui.form .field.error input[type="datetime-local"], +.ui.form .field.error input[type="email"], +.ui.form .field.error input[type="number"], +.ui.form .field.error input[type="password"], +.ui.form .field.error input[type="search"], +.ui.form .field.error input[type="tel"], +.ui.form .field.error input[type="time"], +.ui.form .field.error input[type="text"], +.ui.form .field.error input[type="file"], +.ui.form .field.error input[type="url"], +.ui.form .field.error select:focus, +.ui.form .field.error input:not([type]):focus, +.ui.form .field.error input[type="date"]:focus, +.ui.form .field.error input[type="datetime-local"]:focus, +.ui.form .field.error input[type="email"]:focus, +.ui.form .field.error input[type="number"]:focus, +.ui.form .field.error input[type="password"]:focus, +.ui.form .field.error input[type="search"]:focus, +.ui.form .field.error input[type="tel"]:focus, +.ui.form .field.error input[type="time"]:focus, +.ui.form .field.error input[type="text"]:focus, +.ui.form .field.error input[type="file"]:focus, +.ui.form .field.error input[type="url"]:focus { + background-color: var(--color-error-bg); + border-color: var(--color-error-border); + color: var(--color-error-text); +} + +.ui.form .fields.error .field .ui.dropdown, +.ui.form .field.error .ui.dropdown, +.ui.form .fields.error .field .ui.dropdown:hover, +.ui.form .field.error .ui.dropdown:hover { + border-color: var(--color-error-border) !important; +} + +.ui.form .fields.error .field .ui.dropdown .menu .item:hover, +.ui.form .field.error .ui.dropdown .menu .item:hover { + background-color: var(--color-error-bg-hover); +} + +.ui.form .fields.error .field .ui.dropdown .menu .active.item, +.ui.form .field.error .ui.dropdown .menu .active.item { + background-color: var(--color-error-bg-active) !important; +} + +.ui.form .fields.error .dropdown .menu, +.ui.form .field.error .dropdown .menu { + border-color: var(--color-error-border) !important; +} + +input:-webkit-autofill, +input:-webkit-autofill:focus, +input:-webkit-autofill:hover, +input:-webkit-autofill:active, +.ui.form .field.field input:-webkit-autofill, +.ui.form .field.field input:-webkit-autofill:focus, +.ui.form .field.field input:-webkit-autofill:hover, +.ui.form .field.field input:-webkit-autofill:active { + -webkit-background-clip: text; + -webkit-text-fill-color: var(--color-text); + box-shadow: 0 0 0 100px var(--color-primary-light-6) inset !important; + border-color: var(--color-primary-light-4) !important; +} + +.ui.form .field.muted { + opacity: var(--opacity-disabled); +} + .text.primary { color: var(--color-primary) !important; } diff --git a/web_src/css/features/gitgraph.css b/web_src/css/features/gitgraph.css index 726ac7e9e2..4da871da61 100644 --- a/web_src/css/features/gitgraph.css +++ b/web_src/css/features/gitgraph.css @@ -23,18 +23,6 @@ #git-graph-heading { align-items: center; } - - #git-graph-heading-left { - margin-right: 1rem; - } - - #git-graph-heading h2 { - flex-shrink: 0; - } - - #git-graph-container #flow-select-refs-dropdown { - min-width: 250px; - } } @media (max-width: 767.98px) { @@ -46,10 +34,15 @@ #git-graph-heading-left { margin-bottom: 1rem; } + + h2, + #flow-select-refs-dropdown { + max-width: 100%; + } } #git-graph-container #flow-select-refs-dropdown { - flex-wrap: wrap; + min-width: 250px; } #git-graph-container #flow-select-refs-dropdown .ui.label { diff --git a/web_src/css/form.css b/web_src/css/form.css index 916d76fd0c..a8867009bc 100644 --- a/web_src/css/form.css +++ b/web_src/css/form.css @@ -1,5 +1,5 @@ fieldset { - margin: 0.2em 0 0.3em; + margin: 0.5em 0 1em; padding: 0; } @@ -8,12 +8,6 @@ fieldset legend { margin-bottom: 0.75em; } -fieldset + fieldset > legend { - width: 100%; - padding-top: 1em; - border-top: 1px solid var(--color-secondary); -} - fieldset label { display: block; margin-bottom: 0.6em; @@ -24,11 +18,6 @@ fieldset label:has(input[type="number"]) { font-weight: var(--font-weight-medium); } -/* override inline style on custom input elements */ -fieldset label .ui.dropdown { - width: 100% !important; -} - fieldset .help { font-weight: var(--font-weight-normal); } @@ -38,17 +27,9 @@ fieldset .help { padding-bottom: 0; } -fieldset label > input, -fieldset label > textarea, -fieldset label > .ui.dropdown, -fieldset label + .ui.dropdown { - margin-top: 0.28rem !important; -} - -fieldset label > input[type="checkbox"], -fieldset label > input[type="radio"] { +fieldset input[type="checkbox"], +fieldset input[type="radio"] { margin-right: 0.75em; - margin-top: 0 !important; vertical-align: initial !important; /* overrides a semantic.css rule, remove when obsolete */ } @@ -161,101 +142,6 @@ textarea:focus, color: var(--color-input-text); } -/* error messages */ -fieldset label.error textarea, -fieldset label.error select, -fieldset label.error input, -.ui.form .fields.error .field textarea, -.ui.form .fields.error .field select, -.ui.form .fields.error .field input:not([type]), -.ui.form .fields.error .field input[type="date"], -.ui.form .fields.error .field input[type="datetime-local"], -.ui.form .fields.error .field input[type="email"], -.ui.form .fields.error .field input[type="number"], -.ui.form .fields.error .field input[type="password"], -.ui.form .fields.error .field input[type="search"], -.ui.form .fields.error .field input[type="tel"], -.ui.form .fields.error .field input[type="time"], -.ui.form .fields.error .field input[type="text"], -.ui.form .fields.error .field input[type="file"], -.ui.form .fields.error .field input[type="url"], -.ui.form .fields.error .field .ui.dropdown, -.ui.form .fields.error .field .ui.dropdown .item, -.ui.form .field.error .ui.dropdown, -.ui.form .field.error .ui.dropdown .text, -.ui.form .field.error .ui.dropdown .item, -.ui.form .field.error textarea, -.ui.form .field.error select, -.ui.form .field.error input:not([type]), -.ui.form .field.error input[type="date"], -.ui.form .field.error input[type="datetime-local"], -.ui.form .field.error input[type="email"], -.ui.form .field.error input[type="number"], -.ui.form .field.error input[type="password"], -.ui.form .field.error input[type="search"], -.ui.form .field.error input[type="tel"], -.ui.form .field.error input[type="time"], -.ui.form .field.error input[type="text"], -.ui.form .field.error input[type="file"], -.ui.form .field.error input[type="url"], -.ui.form .field.error select:focus, -.ui.form .field.error input:not([type]):focus, -.ui.form .field.error input[type="date"]:focus, -.ui.form .field.error input[type="datetime-local"]:focus, -.ui.form .field.error input[type="email"]:focus, -.ui.form .field.error input[type="number"]:focus, -.ui.form .field.error input[type="password"]:focus, -.ui.form .field.error input[type="search"]:focus, -.ui.form .field.error input[type="tel"]:focus, -.ui.form .field.error input[type="time"]:focus, -.ui.form .field.error input[type="text"]:focus, -.ui.form .field.error input[type="file"]:focus, -.ui.form .field.error input[type="url"]:focus { - background-color: var(--color-error-bg); - border-color: var(--color-error-border); - color: var(--color-error-text); -} - -.ui.form .fields.error .field .ui.dropdown, -.ui.form .field.error .ui.dropdown, -.ui.form .fields.error .field .ui.dropdown:hover, -.ui.form .field.error .ui.dropdown:hover { - border-color: var(--color-error-border) !important; -} - -.ui.form .fields.error .field .ui.dropdown .menu .item:hover, -.ui.form .field.error .ui.dropdown .menu .item:hover { - background-color: var(--color-error-bg-hover); -} - -.ui.form .fields.error .field .ui.dropdown .menu .active.item, -.ui.form .field.error .ui.dropdown .menu .active.item { - background-color: var(--color-error-bg-active) !important; -} - -.ui.form .fields.error .dropdown .menu, -.ui.form .field.error .dropdown .menu { - border-color: var(--color-error-border) !important; -} - -input:-webkit-autofill, -input:-webkit-autofill:focus, -input:-webkit-autofill:hover, -input:-webkit-autofill:active, -.ui.form .field.field input:-webkit-autofill, -.ui.form .field.field input:-webkit-autofill:focus, -.ui.form .field.field input:-webkit-autofill:hover, -.ui.form .field.field input:-webkit-autofill:active { - -webkit-background-clip: text; - -webkit-text-fill-color: var(--color-text); - box-shadow: 0 0 0 100px var(--color-primary-light-6) inset !important; - border-color: var(--color-primary-light-4) !important; -} - -.ui.form .field.muted { - opacity: var(--opacity-disabled); -} - .ui.form .field > label, .ui.form .inline.fields > label, .ui.form .inline.fields .field > label, @@ -514,12 +400,14 @@ input:-webkit-autofill:active, .repository.new.fork form .header { padding-left: 280px !important; } + .repository.new.repo form .inline.field > label, .repository.new.migrate form .inline.field > label, .repository.new.fork form .inline.field > label { text-align: right; width: 250px !important; word-wrap: break-word; } + .repository.new.repo form .help, .repository.new.migrate form .help, .repository.new.fork form .help { margin-left: 265px !important; @@ -529,8 +417,10 @@ input:-webkit-autofill:active, .repository.new.fork form .optional .title { margin-left: 250px !important; } + .repository.new.repo form .inline.field > input, .repository.new.migrate form .inline.field > input, .repository.new.fork form .inline.field > input, + .repository.new.repo form .inline.field > textarea, .repository.new.migrate form .inline.field > textarea, .repository.new.fork form .inline.field > textarea { width: 50%; @@ -550,6 +440,7 @@ input:-webkit-autofill:active, } } +.repository.new.repo form .dropdown .text, .repository.new.migrate form .dropdown .text, .repository.new.fork form .dropdown .text { margin-right: 0 !important; @@ -562,6 +453,7 @@ input:-webkit-autofill:active, text-align: center; } +.repository.new.repo form .selection.dropdown, .repository.new.migrate form .selection.dropdown, .repository.new.fork form .selection.dropdown, .repository.new.fork form .field a { @@ -598,12 +490,30 @@ input:-webkit-autofill:active, } } +.repository.new.repo .ui.form .selection.dropdown:not(.owner) { + width: 50% !important; +} + @media (max-width: 767.98px) { .repository.new.repo .ui.form .selection.dropdown:not(.owner) { width: 100% !important; } } +/* form fields with additional content besides their label, used on login form + * use like
    */ +.form-field-content-aside-label { + display: grid; + grid-template-columns: 1fr 1fr; +} +.form-field-content-aside-label > *:nth-child(2) { + text-align: right; + margin-bottom: 4px; +} +.form-field-content-aside-label input { + grid-column: span 2; +} + .ui.form .field > .selection.dropdown { min-width: 14em; /* matches the default min width */ } diff --git a/web_src/css/index.css b/web_src/css/index.css index 12830299cf..49ceb2c8ce 100644 --- a/web_src/css/index.css +++ b/web_src/css/index.css @@ -17,7 +17,6 @@ @import "./modules/checkbox.css"; @import "./modules/modal.css"; -@import "./modules/switch.css"; @import "./modules/select.css"; @import "./modules/tippy.css"; @import "./modules/breadcrumb.css"; diff --git a/web_src/css/modules/container.css b/web_src/css/modules/container.css index 95c71b207f..f394d6c06d 100644 --- a/web_src/css/modules/container.css +++ b/web_src/css/modules/container.css @@ -3,14 +3,12 @@ .ui.container { display: block; - --container-width: 100%; - max-width: var(--container-width); + max-width: 100%; } @media (max-width: 767.98px) { .ui.ui.ui.container:not(.fluid) { - --container-width: auto; - width: var(--container-width); + width: auto; margin-left: 1em; margin-right: 1em; } @@ -18,8 +16,7 @@ @media (min-width: 768px) and (max-width: 991.98px) { .ui.ui.ui.container:not(.fluid) { - --container-width: 723px; - width: var(--container-width); + width: 723px; margin-left: auto; margin-right: auto; } @@ -27,8 +24,7 @@ @media (min-width: 992px) and (max-width: 1199.98px) { .ui.ui.ui.container:not(.fluid) { - --container-width: 933px; - width: var(--container-width); + width: 933px; margin-left: auto; margin-right: auto; } @@ -36,16 +32,14 @@ @media (min-width: 1200px) { .ui.ui.ui.container:not(.fluid) { - --container-width: 1127px; - width: var(--container-width); + width: 1127px; margin-left: auto; margin-right: auto; } } .ui.fluid.container { - --container-width: 100%; - width: var(--container-width); + width: 100%; } .ui[class*="center aligned"].container { @@ -54,8 +48,7 @@ /* overwrite width of containers inside the main page content div (div with class "page-content") */ .page-content .ui.ui.ui.container:not(.fluid) { - --container-width: 1280px; - width: var(--container-width); + width: 1280px; max-width: calc(100% - calc(2 * var(--page-margin-x))); margin-left: auto; margin-right: auto; diff --git a/web_src/css/modules/switch.css b/web_src/css/modules/switch.css deleted file mode 100644 index a9499a84aa..0000000000 --- a/web_src/css/modules/switch.css +++ /dev/null @@ -1,34 +0,0 @@ -.switch { - display: grid; - grid-auto-flow: column; - height: fit-content; - align-items: center; - align-self: center; - background: var(--color-menu); - border: 1px solid var(--color-input-border); - border-radius: var(--border-radius); -} - -.switch .item { - display: flex; - align-items: center; - padding: .5em 1.125em; - color: var(--color-text); - border-radius: var(--border-radius); - text-wrap: nowrap; -} - -.switch .active.item { - background: var(--color-active); - outline: 1px solid var(--color-input-border); -} - -@media (pointer: coarse) { - .switch .item { - padding: .75em 1.125em; - } -} - -.switch button.item { - background: transparent; -} diff --git a/web_src/css/repo.css b/web_src/css/repo.css index b8cd3c08bb..3bc1a1e6e1 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -4,6 +4,10 @@ user-select: none; } +.repository .owner.dropdown { + min-width: 40% !important; +} + .repository .unicode-escaped .escaped-code-point[data-escaped]::before { visibility: visible; content: attr(data-escaped); @@ -385,11 +389,6 @@ td .commit-summary { cursor: default; } -.code-search + #repo-files-table { - border-top-left-radius: 0; - border-top-right-radius: 0; -} - .view-raw { display: flex; justify-content: center; @@ -926,6 +925,16 @@ td .commit-summary { border-radius: var(--border-radius); } +@media (max-width: 767.98px) { + .repository.view.issue .comment-list .comment .content .form .button { + width: 100%; + margin: 0; + } + .repository.view.issue .comment-list .comment .content .form .button:not(:last-child) { + margin-bottom: 1rem; + } +} + .repository.view.issue .comment-list .comment .merge-section { background-color: var(--color-box-body); } @@ -1709,6 +1718,26 @@ td .commit-summary { max-width: initial; /* remove fomantic over 100% width */ } +.repository .diff-stats { + clear: both; + margin-bottom: 5px; + max-height: 200px; + height: fit-content; + overflow: auto; + padding-left: 0; +} + +.repository .diff-stats li { + list-style: none; + padding-bottom: 4px; + margin-bottom: 4px; + padding-left: 6px; +} + +.repository .diff-stats li + li { + border-top: 1px solid var(--color-secondary); +} + .repository .repo-search-result { padding-top: 10px; padding-bottom: 10px; @@ -1819,6 +1848,10 @@ details.repo-search-result summary::marker { color: var(--color-success-text); } +.repository .ui.attached.isSigned.isVerified.message .pull-right { + color: var(--color-text); +} + .repository .ui.attached.isSigned.isVerified.message .ui.text { color: var(--color-success-text); } @@ -1985,27 +2018,15 @@ details.repo-search-result summary::marker { box-shadow: none; } -.repository .repository-summary .repository-menu { - display: grid; - grid-template-columns: repeat(4, 1fr); - padding: 0; -} - -@media (max-width: 767.98px) { - .repository .repository-summary .repository-menu { - grid-template-rows: repeat(2, 1fr); - grid-template-columns: repeat(2, 1fr); - } -} - .repository .repository-summary .segment.sub-menu { border: none; display: flex; align-items: center; padding: 0; + overflow: hidden; } -.repository .repository-summary .item { +.repository .repository-summary .sub-menu .item { flex: 1; height: 30px; line-height: var(--line-height-default); @@ -2013,13 +2034,12 @@ details.repo-search-result summary::marker { align-items: center; justify-content: center; gap: 0.25em; + padding: 0 0.5em; /* make the UI look better for narrow (mobile) view */ text-decoration: none; - border-radius: var(--border-radius); } -.repository .repository-summary .item.active { +.repository .repository-summary .sub-menu .item.active { background: var(--color-secondary); - font-weight: var(--font-weight-medium); } .repository .repository-summary .segment.language-stats { @@ -2236,6 +2256,7 @@ details.repo-search-result summary::marker { background: var(--color-box-header); border-bottom: 1px solid var(--color-secondary) !important; font-weight: var(--font-weight-normal) !important; + padding: 0.5rem 1rem; margin: 0 !important; position: relative; color: var(--color-text); @@ -2246,10 +2267,6 @@ details.repo-search-result summary::marker { align-items: center; } -.timeline .ui.comment-header { - padding: 0.5rem 1rem; -} - .comment-header::before, .comment-header::after { right: 100%; @@ -2829,6 +2846,7 @@ tbody.commit-list { } .commits-table .commits-table-left { align-items: initial !important; + margin-bottom: 6px; } .commits-table .commits-table-right form > div:nth-child(1) { order: 1; /* the "commit search" input */ @@ -2877,7 +2895,7 @@ tbody.commit-list { .commit-status-header { /* reset the default ".ui.attached.header" styles, to use the outer border */ border: none !important; - /* add a bottom border to make sure there is always a divider between the header and list when the list is scrolling */ + /* add a bottom border to make sure the there is always a divider between the header and list when the list is scrolling */ border-bottom: 1px solid var(--color-secondary) !important; /* use negative margin to avoid the newly added border conflict with the list's top border */ margin: 0 0 -1px !important; diff --git a/web_src/css/repo/issue-list.css b/web_src/css/repo/issue-list.css index 07ae5a5683..9143b01384 100644 --- a/web_src/css/repo/issue-list.css +++ b/web_src/css/repo/issue-list.css @@ -2,7 +2,7 @@ display: flex; flex-wrap: wrap-reverse; justify-content: space-between; - align-items: center; + align-items: flex-start; gap: 1rem; margin-top: 1rem; } diff --git a/web_src/css/review.css b/web_src/css/review.css index c1ef21bdc0..a198edf6c5 100644 --- a/web_src/css/review.css +++ b/web_src/css/review.css @@ -76,6 +76,19 @@ max-width: none; padding: 0.75rem !important; } + .comment-code-cloud .code-comment-buttons { + margin: 0.5rem 0 0.25rem !important; + } + .comment-code-cloud .code-comment-buttons .code-comment-buttons-buttons { + width: 100%; + } + .comment-code-cloud .ui.buttons { + width: 100%; + margin: 0 !important; + } + .comment-code-cloud .ui.buttons .button { + flex: 1; + } } .comment-code-cloud .comments .comment { @@ -170,6 +183,14 @@ display: block; } +@media (max-width: 767.98px) { + .comment-code-cloud .button { + width: 100%; + margin: 0 !important; + margin-bottom: 0.75rem !important; + } +} + .diff-file-body .comment-form { margin: 0 0 0 3em; } diff --git a/web_src/css/themes/theme-forgejo-dark-deuteranopia-protanopia.css b/web_src/css/themes/theme-forgejo-dark-deuteranopia-protanopia.css index e0765aba4a..b30cfd6b23 100644 --- a/web_src/css/themes/theme-forgejo-dark-deuteranopia-protanopia.css +++ b/web_src/css/themes/theme-forgejo-dark-deuteranopia-protanopia.css @@ -1,9 +1,11 @@ @import "./theme-forgejo-dark.css"; :root { - /* removed rows/words: use red colors from vanilla forgejo-dark */ + --color-diff-removed-word-bg: #693f17; + --color-diff-removed-row-border: #693f17; + --color-diff-removed-row-bg: #221b17; --color-diff-added-word-bg: #214d88; --color-diff-added-row-border: #214d88; - --color-diff-added-row-bg: #18184f; + --color-diff-added-row-bg: #13233a; --color-code-bg: #0d1117; } diff --git a/web_src/css/themes/theme-forgejo-dark-tritanopia.css b/web_src/css/themes/theme-forgejo-dark-tritanopia.css index e4fc303481..aefdaa1bf7 100644 --- a/web_src/css/themes/theme-forgejo-dark-tritanopia.css +++ b/web_src/css/themes/theme-forgejo-dark-tritanopia.css @@ -1,9 +1,11 @@ @import "./theme-forgejo-dark.css"; :root { - /* removed rows/words: use red colors from vanilla forgejo-dark */ + --color-diff-removed-word-bg: #792e2e; + --color-diff-removed-row-border: #792e2e; + --color-diff-removed-row-bg: #25171c; --color-diff-added-word-bg: #214d88; --color-diff-added-row-border: #214d88; - --color-diff-added-row-bg: #152846; + --color-diff-added-row-bg: #13233a; --color-code-bg: #0d1117; } diff --git a/web_src/css/themes/theme-forgejo-dark.css b/web_src/css/themes/theme-forgejo-dark.css index bc321f38a8..9622add8e5 100644 --- a/web_src/css/themes/theme-forgejo-dark.css +++ b/web_src/css/themes/theme-forgejo-dark.css @@ -140,23 +140,6 @@ --color-pink-dark-2: #b11d5f; --color-brown-dark-2: #a47252; --color-black-dark-2: #111827; - /* ansi colors used for actions console and console files */ - --color-ansi-black: #1d2328; - --color-ansi-red: #cc4848; - --color-ansi-green: #87ab63; - --color-ansi-yellow: #cc9903; - --color-ansi-blue: #3a8ac6; - --color-ansi-magenta: #d22e8b; - --color-ansi-cyan: #00918a; - --color-ansi-white: var(--color-console-fg-subtle); - --color-ansi-bright-black: #424851; - --color-ansi-bright-red: #d15a5a; - --color-ansi-bright-green: #93b373; - --color-ansi-bright-yellow: #eaaf03; - --color-ansi-bright-blue: #4e96cc; - --color-ansi-bright-magenta: #d74397; - --color-ansi-bright-cyan: #00b6ad; - --color-ansi-bright-white: var(--color-console-fg); /* other colors */ --color-gold: #b1983b; --color-white: #ffffff; diff --git a/web_src/css/themes/theme-forgejo-light-deuteranopia-protanopia.css b/web_src/css/themes/theme-forgejo-light-deuteranopia-protanopia.css index 8744cbb581..eb48b7598d 100644 --- a/web_src/css/themes/theme-forgejo-light-deuteranopia-protanopia.css +++ b/web_src/css/themes/theme-forgejo-light-deuteranopia-protanopia.css @@ -1,11 +1,11 @@ @import "./theme-forgejo-light.css"; :root { - --color-diff-removed-word-bg: #c8c850; - --color-diff-removed-row-border: #c8c850; - --color-diff-removed-row-bg: #ffecc4; - --color-diff-added-word-bg: #b8c0ff; - --color-diff-added-row-border: #b8c0ff; - --color-diff-added-row-bg: #e0e0ff; + --color-diff-removed-word-bg: #ffdbb0; + --color-diff-removed-row-border: #ffdbb0; + --color-diff-removed-row-bg: #fffaf3; + --color-diff-added-word-bg: #b1dbff; + --color-diff-added-row-border: #b1dbff; + --color-diff-added-row-bg: #eef9ff; --color-code-bg: #ffffff; } diff --git a/web_src/css/themes/theme-forgejo-light-tritanopia.css b/web_src/css/themes/theme-forgejo-light-tritanopia.css index 3f875e4a7f..208da5597f 100644 --- a/web_src/css/themes/theme-forgejo-light-tritanopia.css +++ b/web_src/css/themes/theme-forgejo-light-tritanopia.css @@ -1,11 +1,11 @@ @import "./theme-forgejo-light.css"; :root { - --color-diff-removed-word-bg: #ffb8c0; - --color-diff-removed-row-border: #ffb8c0; - --color-diff-removed-row-bg: #ffd8d8; - --color-diff-added-word-bg: #b8c0ff; - --color-diff-added-row-border: #b8c0ff; - --color-diff-added-row-bg: #c0e8ff; + --color-diff-removed-word-bg: #ffd0ce; + --color-diff-removed-row-border: #ffd0ce; + --color-diff-removed-row-bg: #fff5f4; + --color-diff-added-word-bg: #b1dbff; + --color-diff-added-row-border: #eef9ff; + --color-diff-added-row-bg: #eef9ff; --color-code-bg: #ffffff; } diff --git a/web_src/css/themes/theme-forgejo-light.css b/web_src/css/themes/theme-forgejo-light.css index c86ea53314..201818964b 100644 --- a/web_src/css/themes/theme-forgejo-light.css +++ b/web_src/css/themes/theme-forgejo-light.css @@ -157,23 +157,6 @@ --color-pink-dark-2: #b11d5f; --color-brown-dark-2: #835b42; --color-black-dark-2: #000000; - /* ansi colors used for actions console and console files */ - --color-ansi-black: #1f2326; - --color-ansi-red: #cc4848; - --color-ansi-green: #87ab63; - --color-ansi-yellow: #cc9903; - --color-ansi-blue: #3a8ac6; - --color-ansi-magenta: #d22e8b; - --color-ansi-cyan: #00918a; - --color-ansi-white: var(--color-console-fg-subtle); - --color-ansi-bright-black: #46494d; - --color-ansi-bright-red: #d15a5a; - --color-ansi-bright-green: #93b373; - --color-ansi-bright-yellow: #eaaf03; - --color-ansi-bright-blue: #4e96cc; - --color-ansi-bright-magenta: #d74397; - --color-ansi-bright-cyan: #00b6ad; - --color-ansi-bright-white: var(--color-console-fg); /* other colors */ --color-gold: #b1983b; --color-white: #ffffff; @@ -269,7 +252,7 @@ --color-nav-text: var(--color-text); --color-secondary-nav-bg: var(--color-body); --color-label-text: var(--color-text); - --color-label-bg: #cacaca7b; + --color-label-bg: #cacaca5b; --color-label-hover-bg: #cacacaa0; --color-label-active-bg: #cacacaff; --color-label-bg-alt: #cacacaff; diff --git a/web_src/css/user.css b/web_src/css/user.css index bceb16fcf9..16d431e2a7 100644 --- a/web_src/css/user.css +++ b/web_src/css/user.css @@ -143,3 +143,7 @@ .notifications-item:hover .notifications-updated { display: none; } + +#pronouns-dropdown, #pronouns-custom { + width: 140px; +} diff --git a/web_src/fomantic/package-lock.json b/web_src/fomantic/package-lock.json index 7499b6f68e..2401294105 100644 --- a/web_src/fomantic/package-lock.json +++ b/web_src/fomantic/package-lock.json @@ -132,17 +132,17 @@ } }, "node_modules/@octokit/core": { - "version": "6.1.3", - "resolved": "https://registry.npmjs.org/@octokit/core/-/core-6.1.3.tgz", - "integrity": "sha512-z+j7DixNnfpdToYsOutStDgeRzJSMnbj8T1C/oQjB6Aa+kRfNjs/Fn7W6c8bmlt6mfy3FkgeKBRnDjxQow5dow==", + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/@octokit/core/-/core-6.1.2.tgz", + "integrity": "sha512-hEb7Ma4cGJGEUNOAVmyfdB/3WirWMg5hDuNFVejGEDFqupeOysLc2sG6HJxY2etBp5YQu5Wtxwi020jS9xlUwg==", "license": "MIT", "peer": true, "dependencies": { "@octokit/auth-token": "^5.0.0", - "@octokit/graphql": "^8.1.2", - "@octokit/request": "^9.1.4", - "@octokit/request-error": "^6.1.6", - "@octokit/types": "^13.6.2", + "@octokit/graphql": "^8.0.0", + "@octokit/request": "^9.0.0", + "@octokit/request-error": "^6.0.1", + "@octokit/types": "^13.0.0", "before-after-hook": "^3.0.2", "universal-user-agent": "^7.0.0" }, @@ -161,13 +161,13 @@ } }, "node_modules/@octokit/core/node_modules/@octokit/endpoint": { - "version": "10.1.2", - "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-10.1.2.tgz", - "integrity": "sha512-XybpFv9Ms4hX5OCHMZqyODYqGTZ3H6K6Vva+M9LR7ib/xr1y1ZnlChYv9H680y77Vd/i/k+thXApeRASBQkzhA==", + "version": "10.1.1", + "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-10.1.1.tgz", + "integrity": "sha512-JYjh5rMOwXMJyUpj028cu0Gbp7qe/ihxfJMLc8VZBMMqSwLgOxDI1911gV4Enl1QSavAQNJcwmwBF9M0VvLh6Q==", "license": "MIT", "peer": true, "dependencies": { - "@octokit/types": "^13.6.2", + "@octokit/types": "^13.0.0", "universal-user-agent": "^7.0.2" }, "engines": { @@ -175,23 +175,22 @@ } }, "node_modules/@octokit/core/node_modules/@octokit/openapi-types": { - "version": "23.0.1", - "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-23.0.1.tgz", - "integrity": "sha512-izFjMJ1sir0jn0ldEKhZ7xegCTj/ObmEDlEfpFrx4k/JyZSMRHbO3/rBwgE7f3m2DHt+RrNGIVw4wSmwnm3t/g==", + "version": "22.2.0", + "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-22.2.0.tgz", + "integrity": "sha512-QBhVjcUa9W7Wwhm6DBFu6ZZ+1/t/oYxqc2tp81Pi41YNuJinbFRx8B133qVOrAaBbF7D/m0Et6f9/pZt9Rc+tg==", "license": "MIT", "peer": true }, "node_modules/@octokit/core/node_modules/@octokit/request": { - "version": "9.2.0", - "resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.2.0.tgz", - "integrity": "sha512-kXLfcxhC4ozCnAXy2ff+cSxpcF0A1UqxjvYMqNuPIeOAzJbVWQ+dy5G2fTylofB/gTbObT8O6JORab+5XtA1Kw==", + "version": "9.1.3", + "resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.1.3.tgz", + "integrity": "sha512-V+TFhu5fdF3K58rs1pGUJIDH5RZLbZm5BI+MNF+6o/ssFNT4vWlCh/tVpF3NxGtP15HUxTTMUbsG5llAuU2CZA==", "license": "MIT", "peer": true, "dependencies": { "@octokit/endpoint": "^10.0.0", "@octokit/request-error": "^6.0.1", - "@octokit/types": "^13.6.2", - "fast-content-type-parse": "^2.0.0", + "@octokit/types": "^13.1.0", "universal-user-agent": "^7.0.2" }, "engines": { @@ -199,26 +198,26 @@ } }, "node_modules/@octokit/core/node_modules/@octokit/request-error": { - "version": "6.1.6", - "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.6.tgz", - "integrity": "sha512-pqnVKYo/at0NuOjinrgcQYpEbv4snvP3bKMRqHaD9kIsk9u1LCpb2smHZi8/qJfgeNqLo5hNW4Z7FezNdEo0xg==", + "version": "6.1.4", + "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.4.tgz", + "integrity": "sha512-VpAhIUxwhWZQImo/dWAN/NpPqqojR6PSLgLYAituLM6U+ddx9hCioFGwBr5Mi+oi5CLeJkcAs3gJ0PYYzU6wUg==", "license": "MIT", "peer": true, "dependencies": { - "@octokit/types": "^13.6.2" + "@octokit/types": "^13.0.0" }, "engines": { "node": ">= 18" } }, "node_modules/@octokit/core/node_modules/@octokit/types": { - "version": "13.7.0", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.7.0.tgz", - "integrity": "sha512-BXfRP+3P3IN6fd4uF3SniaHKOO4UXWBfkdR3vA8mIvaoO/wLjGN5qivUtW0QRitBHHMcfC41SLhNVYIZZE+wkA==", + "version": "13.5.0", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.5.0.tgz", + "integrity": "sha512-HdqWTf5Z3qwDVlzCrP8UJquMwunpDiMPt5er+QjGzL4hqr/vBVY/MauQgS1xWxCDT1oMx1EULyqxncdCY/NVSQ==", "license": "MIT", "peer": true, "dependencies": { - "@octokit/openapi-types": "^23.0.1" + "@octokit/openapi-types": "^22.2.0" } }, "node_modules/@octokit/core/node_modules/before-after-hook": { @@ -253,14 +252,14 @@ "license": "ISC" }, "node_modules/@octokit/graphql": { - "version": "8.1.2", - "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-8.1.2.tgz", - "integrity": "sha512-bdlj/CJVjpaz06NBpfHhp4kGJaRZfz7AzC+6EwUImRtrwIw8dIgJ63Xg0OzV9pRn3rIzrt5c2sa++BL0JJ8GLw==", + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-8.1.1.tgz", + "integrity": "sha512-ukiRmuHTi6ebQx/HFRCXKbDlOh/7xEV6QUXaE7MJEKGNAncGI/STSbOkl12qVXZrfZdpXctx5O9X1AIaebiDBg==", "license": "MIT", "peer": true, "dependencies": { - "@octokit/request": "^9.1.4", - "@octokit/types": "^13.6.2", + "@octokit/request": "^9.0.0", + "@octokit/types": "^13.0.0", "universal-user-agent": "^7.0.0" }, "engines": { @@ -268,13 +267,13 @@ } }, "node_modules/@octokit/graphql/node_modules/@octokit/endpoint": { - "version": "10.1.2", - "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-10.1.2.tgz", - "integrity": "sha512-XybpFv9Ms4hX5OCHMZqyODYqGTZ3H6K6Vva+M9LR7ib/xr1y1ZnlChYv9H680y77Vd/i/k+thXApeRASBQkzhA==", + "version": "10.1.1", + "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-10.1.1.tgz", + "integrity": "sha512-JYjh5rMOwXMJyUpj028cu0Gbp7qe/ihxfJMLc8VZBMMqSwLgOxDI1911gV4Enl1QSavAQNJcwmwBF9M0VvLh6Q==", "license": "MIT", "peer": true, "dependencies": { - "@octokit/types": "^13.6.2", + "@octokit/types": "^13.0.0", "universal-user-agent": "^7.0.2" }, "engines": { @@ -282,23 +281,22 @@ } }, "node_modules/@octokit/graphql/node_modules/@octokit/openapi-types": { - "version": "23.0.1", - "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-23.0.1.tgz", - "integrity": "sha512-izFjMJ1sir0jn0ldEKhZ7xegCTj/ObmEDlEfpFrx4k/JyZSMRHbO3/rBwgE7f3m2DHt+RrNGIVw4wSmwnm3t/g==", + "version": "22.2.0", + "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-22.2.0.tgz", + "integrity": "sha512-QBhVjcUa9W7Wwhm6DBFu6ZZ+1/t/oYxqc2tp81Pi41YNuJinbFRx8B133qVOrAaBbF7D/m0Et6f9/pZt9Rc+tg==", "license": "MIT", "peer": true }, "node_modules/@octokit/graphql/node_modules/@octokit/request": { - "version": "9.2.0", - "resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.2.0.tgz", - "integrity": "sha512-kXLfcxhC4ozCnAXy2ff+cSxpcF0A1UqxjvYMqNuPIeOAzJbVWQ+dy5G2fTylofB/gTbObT8O6JORab+5XtA1Kw==", + "version": "9.1.3", + "resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.1.3.tgz", + "integrity": "sha512-V+TFhu5fdF3K58rs1pGUJIDH5RZLbZm5BI+MNF+6o/ssFNT4vWlCh/tVpF3NxGtP15HUxTTMUbsG5llAuU2CZA==", "license": "MIT", "peer": true, "dependencies": { "@octokit/endpoint": "^10.0.0", "@octokit/request-error": "^6.0.1", - "@octokit/types": "^13.6.2", - "fast-content-type-parse": "^2.0.0", + "@octokit/types": "^13.1.0", "universal-user-agent": "^7.0.2" }, "engines": { @@ -306,26 +304,26 @@ } }, "node_modules/@octokit/graphql/node_modules/@octokit/request-error": { - "version": "6.1.6", - "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.6.tgz", - "integrity": "sha512-pqnVKYo/at0NuOjinrgcQYpEbv4snvP3bKMRqHaD9kIsk9u1LCpb2smHZi8/qJfgeNqLo5hNW4Z7FezNdEo0xg==", + "version": "6.1.4", + "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.4.tgz", + "integrity": "sha512-VpAhIUxwhWZQImo/dWAN/NpPqqojR6PSLgLYAituLM6U+ddx9hCioFGwBr5Mi+oi5CLeJkcAs3gJ0PYYzU6wUg==", "license": "MIT", "peer": true, "dependencies": { - "@octokit/types": "^13.6.2" + "@octokit/types": "^13.0.0" }, "engines": { "node": ">= 18" } }, "node_modules/@octokit/graphql/node_modules/@octokit/types": { - "version": "13.7.0", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.7.0.tgz", - "integrity": "sha512-BXfRP+3P3IN6fd4uF3SniaHKOO4UXWBfkdR3vA8mIvaoO/wLjGN5qivUtW0QRitBHHMcfC41SLhNVYIZZE+wkA==", + "version": "13.5.0", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.5.0.tgz", + "integrity": "sha512-HdqWTf5Z3qwDVlzCrP8UJquMwunpDiMPt5er+QjGzL4hqr/vBVY/MauQgS1xWxCDT1oMx1EULyqxncdCY/NVSQ==", "license": "MIT", "peer": true, "dependencies": { - "@octokit/openapi-types": "^23.0.1" + "@octokit/openapi-types": "^22.2.0" } }, "node_modules/@octokit/graphql/node_modules/universal-user-agent": { @@ -494,12 +492,12 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.10.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.7.tgz", - "integrity": "sha512-V09KvXxFiutGp6B7XkpaDXlNadZxrzajcY50EuoLIpQ6WWYCSvf19lVIazzfIzQvhUN2HjX12spLojTnhuKlGg==", + "version": "22.5.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.5.tgz", + "integrity": "sha512-Xjs4y5UPO/CLdzpgR6GirZJx36yScjh73+2NlLlkFRSoQN8B0DpfXPdZGnvVmLRLOsqDpOfTNv7D9trgGhmOIA==", "license": "MIT", "dependencies": { - "undici-types": "~6.20.0" + "undici-types": "~6.19.2" } }, "node_modules/@types/vinyl": { @@ -1117,9 +1115,9 @@ } }, "node_modules/browserslist": { - "version": "4.24.4", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz", - "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==", + "version": "4.23.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz", + "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==", "funding": [ { "type": "opencollective", @@ -1136,10 +1134,10 @@ ], "license": "MIT", "dependencies": { - "caniuse-lite": "^1.0.30001688", - "electron-to-chromium": "^1.5.73", - "node-releases": "^2.0.19", - "update-browserslist-db": "^1.1.1" + "caniuse-lite": "^1.0.30001646", + "electron-to-chromium": "^1.5.4", + "node-releases": "^2.0.18", + "update-browserslist-db": "^1.1.0" }, "bin": { "browserslist": "cli.js" @@ -1193,44 +1191,16 @@ } }, "node_modules/call-bind": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz", - "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "license": "MIT", "dependencies": { - "call-bind-apply-helpers": "^1.0.0", "es-define-property": "^1.0.0", - "get-intrinsic": "^1.2.4", - "set-function-length": "^1.2.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/call-bind-apply-helpers": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz", - "integrity": "sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==", - "license": "MIT", - "dependencies": { "es-errors": "^1.3.0", - "function-bind": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/call-bound": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz", - "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==", - "license": "MIT", - "dependencies": { - "call-bind-apply-helpers": "^1.0.1", - "get-intrinsic": "^1.2.6" + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" }, "engines": { "node": ">= 0.4" @@ -1249,9 +1219,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001695", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001695.tgz", - "integrity": "sha512-vHyLade6wTgI2u1ec3WQBxv+2BrTERV28UXQu9LO6lZ9pYeMk34vjXFLOxo1A4UBA8XTL4njRQZdno/yYaSmWw==", + "version": "1.0.30001660", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001660.tgz", + "integrity": "sha512-GacvNTTuATm26qC74pt+ad1fW15mlQ/zuTzzY1ZoIzECTP8HURDfF43kNxPgf7H1jmelCBQTTbBNxdSXOA7Bqg==", "funding": [ { "type": "opencollective", @@ -1649,9 +1619,9 @@ "license": "MIT" }, "node_modules/cross-spawn": { - "version": "6.0.6", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz", - "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==", + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "license": "MIT", "dependencies": { "nice-try": "^1.0.4", @@ -1863,20 +1833,6 @@ "node": ">=0.3.1" } }, - "node_modules/dunder-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", - "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", - "license": "MIT", - "dependencies": { - "call-bind-apply-helpers": "^1.0.1", - "es-errors": "^1.3.0", - "gopd": "^1.2.0" - }, - "engines": { - "node": ">= 0.4" - } - }, "node_modules/duplexer2": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", @@ -2005,9 +1961,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.83", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.83.tgz", - "integrity": "sha512-LcUDPqSt+V0QmI47XLzZrz5OqILSMGsPFkDYus22rIbgorSvBYEFqq854ltTmUdHkY92FSdAAvsh4jWEULMdfQ==", + "version": "1.5.23", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.23.tgz", + "integrity": "sha512-mBhODedOXg4v5QWwl21DjM5amzjmI1zw9EPrPK/5Wx7C8jt33bpZNrC7OhHUG3pxRtbLpr3W2dXT+Ph1SsfRZA==", "license": "ISC" }, "node_modules/emoji-regex": { @@ -2048,10 +2004,13 @@ } }, "node_modules/es-define-property": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", - "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", "license": "MIT", + "dependencies": { + "get-intrinsic": "^1.2.4" + }, "engines": { "node": ">= 0.4" } @@ -2065,18 +2024,6 @@ "node": ">= 0.4" } }, - "node_modules/es-object-atoms": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", - "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", - "license": "MIT", - "dependencies": { - "es-errors": "^1.3.0" - }, - "engines": { - "node": ">= 0.4" - } - }, "node_modules/es5-ext": { "version": "0.10.64", "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz", @@ -2332,23 +2279,6 @@ "node": ">= 0.10" } }, - "node_modules/fast-content-type-parse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-content-type-parse/-/fast-content-type-parse-2.0.1.tgz", - "integrity": "sha512-nGqtvLrj5w0naR6tDPfB4cUmYCqouzyQiz6C5y/LtcDllJdrcc6WaWW6iXyIIOErTa/XRybj28aasdn4LkVk6Q==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/fastify" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/fastify" - } - ], - "license": "MIT", - "peer": true - }, "node_modules/fast-levenshtein": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz", @@ -2567,9 +2497,9 @@ } }, "node_modules/foreground-child/node_modules/cross-spawn": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", - "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "license": "MIT", "dependencies": { "path-key": "^3.1.0", @@ -2688,7 +2618,7 @@ "version": "1.2.13", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", - "deprecated": "Upgrade to fsevents v2 to mitigate potential security issues", + "deprecated": "The v1 package contains DANGEROUS / INSECURE binaries. Upgrade to safe fsevents v2", "hasInstallScript": true, "license": "MIT", "optional": true, @@ -2732,21 +2662,16 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.7.tgz", - "integrity": "sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "license": "MIT", "dependencies": { - "call-bind-apply-helpers": "^1.0.1", - "es-define-property": "^1.0.1", "es-errors": "^1.3.0", - "es-object-atoms": "^1.0.0", "function-bind": "^1.1.2", - "get-proto": "^1.0.0", - "gopd": "^1.2.0", - "has-symbols": "^1.1.0", - "hasown": "^2.0.2", - "math-intrinsics": "^1.1.0" + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" }, "engines": { "node": ">= 0.4" @@ -2761,19 +2686,6 @@ "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==", "license": "ISC" }, - "node_modules/get-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", - "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", - "license": "MIT", - "dependencies": { - "dunder-proto": "^1.0.1", - "es-object-atoms": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - } - }, "node_modules/get-stream": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", @@ -2955,12 +2867,12 @@ } }, "node_modules/gopd": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", - "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", "license": "MIT", - "engines": { - "node": ">= 0.4" + "dependencies": { + "get-intrinsic": "^1.1.3" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -4373,10 +4285,22 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/has-proto": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", + "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/has-symbols": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", - "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", "license": "MIT", "engines": { "node": ">= 0.4" @@ -4695,9 +4619,9 @@ "license": "MIT" }, "node_modules/is-core-module": { - "version": "2.16.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", - "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz", + "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==", "license": "MIT", "dependencies": { "hasown": "^2.0.2" @@ -5628,15 +5552,6 @@ "node": ">=0.10.0" } }, - "node_modules/math-intrinsics": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", - "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", - "license": "MIT", - "engines": { - "node": ">= 0.4" - } - }, "node_modules/merge-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", @@ -5845,9 +5760,9 @@ "license": "ISC" }, "node_modules/nan": { - "version": "2.22.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.0.tgz", - "integrity": "sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==", + "version": "2.20.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz", + "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==", "license": "MIT", "optional": true }, @@ -5972,9 +5887,9 @@ } }, "node_modules/node-releases": { - "version": "2.0.19", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz", - "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==", + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz", + "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==", "license": "MIT" }, "node_modules/node.extend": { @@ -6156,16 +6071,14 @@ } }, "node_modules/object.assign": { - "version": "4.1.7", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz", - "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==", + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz", + "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==", "license": "MIT", "dependencies": { - "call-bind": "^1.0.8", - "call-bound": "^1.0.3", + "call-bind": "^1.0.5", "define-properties": "^1.2.1", - "es-object-atoms": "^1.0.0", - "has-symbols": "^1.1.0", + "has-symbols": "^1.0.3", "object-keys": "^1.1.1" }, "engines": { @@ -6326,9 +6239,9 @@ } }, "node_modules/package-json-from-dist": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", - "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz", + "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==", "license": "BlueOak-1.0.0" }, "node_modules/parse-filepath": { @@ -6928,21 +6841,18 @@ "license": "ISC" }, "node_modules/resolve": { - "version": "1.22.10", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", - "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", "license": "MIT", "dependencies": { - "is-core-module": "^2.16.0", + "is-core-module": "^2.13.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, "bin": { "resolve": "bin/resolve" }, - "engines": { - "node": ">= 0.4" - }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -7504,9 +7414,9 @@ } }, "node_modules/spdx-license-ids": { - "version": "3.0.21", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz", - "integrity": "sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==", + "version": "3.0.20", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz", + "integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==", "license": "CC0-1.0" }, "node_modules/split-string": { @@ -8221,9 +8131,9 @@ } }, "node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "version": "6.19.8", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", + "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", "license": "MIT" }, "node_modules/union-value": { @@ -8319,9 +8229,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.2.tgz", - "integrity": "sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz", + "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==", "funding": [ { "type": "opencollective", @@ -8338,8 +8248,8 @@ ], "license": "MIT", "dependencies": { - "escalade": "^3.2.0", - "picocolors": "^1.1.1" + "escalade": "^3.1.2", + "picocolors": "^1.0.1" }, "bin": { "update-browserslist-db": "cli.js" @@ -8349,9 +8259,9 @@ } }, "node_modules/update-browserslist-db/node_modules/picocolors": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", - "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz", + "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==", "license": "ISC" }, "node_modules/urix": { diff --git a/web_src/js/components/.eslintrc.yaml b/web_src/js/components/.eslintrc.yaml new file mode 100644 index 0000000000..0d233442bc --- /dev/null +++ b/web_src/js/components/.eslintrc.yaml @@ -0,0 +1,21 @@ +plugins: + - eslint-plugin-vue + - eslint-plugin-vue-scoped-css + +extends: + - ../../../.eslintrc.yaml + - plugin:vue/vue3-recommended + - plugin:vue-scoped-css/vue3-recommended + +parserOptions: + sourceType: module + ecmaVersion: latest + +env: + browser: true + +rules: + vue/attributes-order: [0] + vue/html-closing-bracket-spacing: [2, {startTag: never, endTag: never, selfClosingTag: never}] + vue/max-attributes-per-line: [0] + vue-scoped-css/enforce-style-type: [0] diff --git a/web_src/js/components/ActionRunStatus.vue b/web_src/js/components/ActionRunStatus.vue index eb7f780fbe..7ada543fea 100644 --- a/web_src/js/components/ActionRunStatus.vue +++ b/web_src/js/components/ActionRunStatus.vue @@ -28,13 +28,12 @@ export default { }; diff --git a/web_src/js/components/DashboardRepoList.vue b/web_src/js/components/DashboardRepoList.vue index 007891a39f..69a8ced47d 100644 --- a/web_src/js/components/DashboardRepoList.vue +++ b/web_src/js/components/DashboardRepoList.vue @@ -78,6 +78,7 @@ const sfc = { searchURL() { return `${this.subUrl}/repo/search?sort=updated&order=desc&uid=${this.uid}&team_id=${this.teamId}&q=${this.searchQuery }&page=${this.page}&limit=${this.searchLimit}&mode=${this.repoTypes[this.reposFilter].searchMode + }${this.reposFilter !== 'all' ? '&exclusive=1' : '' }${this.archivedFilter === 'archived' ? '&archived=true' : ''}${this.archivedFilter === 'unarchived' ? '&archived=false' : '' }${this.privateFilter === 'private' ? '&is_private=true' : ''}${this.privateFilter === 'public' ? '&is_private=false' : '' }`; @@ -358,9 +359,9 @@ export default sfc; // activate the IDE's Vue plugin
    - - +
    - +
    +
    diff --git a/web_src/js/components/RepoActionView.test.js b/web_src/js/components/RepoActionView.test.js index 0b9527ced1..8c4e1506be 100644 --- a/web_src/js/components/RepoActionView.test.js +++ b/web_src/js/components/RepoActionView.test.js @@ -103,115 +103,3 @@ test('processes ##[group] and ##[endgroup]', async () => { // Check if after the log list exists another log line expect(wrapper.get('.job-log-list + .job-log-line > .log-msg').text()).toEqual('A line outside the group'); }); - -test('load multiple steps on a finished action', async () => { - Object.defineProperty(document.documentElement, 'lang', {value: 'en'}); - vi.spyOn(global, 'fetch').mockImplementation((url, opts) => { - if (url.endsWith('/artifacts')) { - return Promise.resolve({ - ok: true, - json: vi.fn().mockResolvedValue( - { - artifacts: [], - }, - ), - }); - } - - const postBody = JSON.parse(opts.body); - const stepsLog_value = []; - for (const cursor of postBody.logCursors) { - if (cursor.expanded) { - stepsLog_value.push( - { - step: cursor.step, - cursor: 0, - lines: [ - {index: 1, message: `Step #${cursor.step + 1} Log #1`, timestamp: 0}, - {index: 1, message: `Step #${cursor.step + 1} Log #2`, timestamp: 0}, - {index: 1, message: `Step #${cursor.step + 1} Log #3`, timestamp: 0}, - ], - }, - ); - } - } - const jobs_value = { - state: { - run: { - status: 'success', - commit: { - pusher: {}, - }, - }, - currentJob: { - steps: [ - { - summary: 'Test Step #1', - duration: '1s', - status: 'success', - }, - { - summary: 'Test Step #2', - duration: '1s', - status: 'success', - }, - ], - }, - }, - logs: { - stepsLog: opts.body?.includes('"cursor":null') ? stepsLog_value : [], - }, - }; - - return Promise.resolve({ - ok: true, - json: vi.fn().mockResolvedValue( - jobs_value, - ), - }); - }); - - const wrapper = mount(RepoActionView, { - props: { - actionsURL: 'https://example.com/example-org/example-repo/actions', - runIndex: '1', - jobIndex: '2', - locale: { - approve: '', - cancel: '', - rerun: '', - artifactsTitle: '', - areYouSure: '', - confirmDeleteArtifact: '', - rerun_all: '', - showTimeStamps: '', - showLogSeconds: '', - showFullScreen: '', - downloadLogs: '', - status: { - unknown: '', - waiting: '', - running: '', - success: '', - failure: '', - cancelled: '', - skipped: '', - blocked: '', - }, - }, - }, - }); - await flushPromises(); - // Click on both steps to start their log loading in fast succession... - await wrapper.get('.job-step-section:nth-of-type(1) .job-step-summary').trigger('click'); - await wrapper.get('.job-step-section:nth-of-type(2) .job-step-summary').trigger('click'); - await flushPromises(); - - // Verify both step's logs were loaded - expect(wrapper.get('.job-step-section:nth-of-type(1) .job-log-line:nth-of-type(1) .log-msg').text()).toEqual('Step #1 Log #1'); - expect(wrapper.get('.job-step-section:nth-of-type(1) .job-log-line:nth-of-type(2) .log-msg').text()).toEqual('Step #1 Log #2'); - expect(wrapper.get('.job-step-section:nth-of-type(1) .job-log-line:nth-of-type(3) .log-msg').text()).toEqual('Step #1 Log #3'); - expect(wrapper.get('.job-step-section:nth-of-type(2) .job-log-line:nth-of-type(1) .log-msg').text()).toEqual('Step #2 Log #1'); - expect(wrapper.get('.job-step-section:nth-of-type(2) .job-log-line:nth-of-type(2) .log-msg').text()).toEqual('Step #2 Log #2'); - expect(wrapper.get('.job-step-section:nth-of-type(2) .job-log-line:nth-of-type(3) .log-msg').text()).toEqual('Step #2 Log #3'); -}); diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index 136ad3693d..4e8e18e80b 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -26,7 +26,6 @@ const sfc = { return { // internal state loading: false, - needLoadingWithLogCursors: null, intervalID: null, currentJobStepsStates: [], artifacts: [], @@ -42,7 +41,6 @@ const sfc = { run: { link: '', title: '', - titleHTML: '', status: '', canCancel: false, canApprove: false, @@ -116,9 +114,7 @@ const sfc = { toggleStepLogs(idx) { this.currentJobStepsStates[idx].expanded = !this.currentJobStepsStates[idx].expanded; if (this.currentJobStepsStates[idx].expanded) { - // request data load immediately instead of waiting for next timer interval (which, if the job is done, will - // never happen because the interval will have been disabled) - this.loadJob(); + this.loadJob(); // try to load the data immediately instead of waiting for next timer interval } }, // cancel a run @@ -233,16 +229,13 @@ const sfc = { await this.loadJob(); }, - getLogCursors() { - return this.currentJobStepsStates.map((it, idx) => { + async fetchJob() { + const logCursors = this.currentJobStepsStates.map((it, idx) => { // cursor is used to indicate the last position of the logs // it's only used by backend, frontend just reads it and passes it back, it and can be any type. // for example: make cursor=null means the first time to fetch logs, cursor=eof means no more logs, etc return {step: idx, cursor: it.cursor, expanded: it.expanded}; }); - }, - - async fetchJob(logCursors) { const resp = await POST(`${this.actionsURL}/runs/${this.runIndex}/jobs/${this.jobIndex}`, { data: {logCursors}, }); @@ -250,45 +243,19 @@ const sfc = { }, async loadJob() { - let myLoadingLogCursors = this.getLogCursors(); - if (this.loading) { - // loadJob is already executing; but it's possible that our log cursor request has changed since it started. If - // the interval load is active, that problem would solve itself, but if it isn't (say we're viewing a "done" - // job), then the change to the requested cursors may never be loaded. To address this we set our newest - // requested log cursors into a state property and rely on loadJob to retry at the end of its execution if it - // notices these have changed. - this.needLoadingWithLogCursors = myLoadingLogCursors; - return; - } - + if (this.loading) return; try { this.loading = true; - // Since no async operations occured since fetching myLoadingLogCursors, we can be sure that we have the most - // recent needed log cursors, so we can reset needLoadingWithLogCursors -- it could be stale if exceptions - // occurred in previous load attempts. - this.needLoadingWithLogCursors = null; let job, artifacts; - - while (true) { - try { - [job, artifacts] = await Promise.all([ - this.fetchJob(myLoadingLogCursors), - this.fetchArtifacts(), // refresh artifacts if upload-artifact step done - ]); - } catch (err) { - if (err instanceof TypeError) return; // avoid network error while unloading page - throw err; - } - - // We can be done as long as needLoadingWithLogCursors is null, or the same as what we just loaded. - if (this.needLoadingWithLogCursors === null || JSON.stringify(this.needLoadingWithLogCursors) === JSON.stringify(myLoadingLogCursors)) { - this.needLoadingWithLogCursors = null; - break; - } - - // Otherwise we need to retry that. - myLoadingLogCursors = this.needLoadingWithLogCursors; + try { + [job, artifacts] = await Promise.all([ + this.fetchJob(), + this.fetchArtifacts(), // refresh artifacts if upload-artifact step done + ]); + } catch (err) { + if (err instanceof TypeError) return; // avoid network error while unloading page + throw err; } this.artifacts = artifacts['artifacts'] || []; @@ -425,8 +392,9 @@ export function initRepositoryActionView() {
    - -

    +

    + {{ run.title }} +

    @@ -570,13 +537,11 @@ export function initRepositoryActionView() { .action-info-summary-title { display: flex; - align-items: center; - gap: 0.5em; } .action-info-summary-title-text { font-size: 20px; - margin: 0; + margin: 0 0 0 8px; flex: 1; overflow-wrap: anywhere; } diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue index 07ad336cf7..dec2599c0d 100644 --- a/web_src/js/components/RepoContributors.vue +++ b/web_src/js/components/RepoContributors.vue @@ -1,6 +1,5 @@
    - {{if .ContextUser.IsOrganization}} - {{template "org/header" .}} - {{else}} - {{template "shared/user/org_profile_avatar" .}} -
    - {{template "user/overview/header" .}} -
    - {{end}} +
    + {{template "shared/user/org_profile_avatar" .}} +
    + {{template "user/overview/header" .}} +
    {{template "projects/view" .}}
    diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl index 2ef7031aef..62debfc0ae 100644 --- a/templates/org/settings/options.tmpl +++ b/templates/org/settings/options.tmpl @@ -6,18 +6,14 @@
    {{.CsrfTokenHtml}} -
    diff --git a/templates/package/content/alt.tmpl b/templates/package/content/alt.tmpl deleted file mode 100644 index 9a5e9c7656..0000000000 --- a/templates/package/content/alt.tmpl +++ /dev/null @@ -1,49 +0,0 @@ -{{if eq .PackageDescriptor.Package.Type "alt"}} -

    {{ctx.Locale.Tr "packages.installation"}}

    -
    -
    -
    - - 
    {{- if gt (len .Groups) 1 -}}
-# {{ctx.Locale.Tr "packages.alt.repository.multiple_groups"}}
-
-{{end -}}
-# {{ctx.Locale.Tr "packages.alt.setup"}}
-{{- range $group := .Groups}}
-	{{- if $group}}{{$group = print "/" $group}}{{end}}
-apt-repo add rpm  _arch_ classic
-
-{{- end}}
    -
    -
    - -
    - 
    # {{ctx.Locale.Tr "packages.alt.registry.install"}}
-apt-get update
-apt-get install {{$.PackageDescriptor.Package.Name}}
    -
    -
    -
    - -
    -
    -
    - -

    {{ctx.Locale.Tr "packages.alt.repository"}}

    -
    - - - - - - - -
    {{ctx.Locale.Tr "packages.alt.repository.architectures"}}
    		{{StringUtils.Join .Architectures ", "}}
    -
    - - {{if or .PackageDescriptor.Metadata.Summary .PackageDescriptor.Metadata.Description}} -

    {{ctx.Locale.Tr "packages.about"}}

    - {{if .PackageDescriptor.Metadata.Summary}}
    {{.PackageDescriptor.Metadata.Summary}}
    {{end}} - {{if .PackageDescriptor.Metadata.Description}}
    {{.PackageDescriptor.Metadata.Description}}
    {{end}} - {{end}} -{{end}} diff --git a/templates/package/content/arch.tmpl b/templates/package/content/arch.tmpl index 6a041d323b..bcc24b585b 100644 --- a/templates/package/content/arch.tmpl +++ b/templates/package/content/arch.tmpl @@ -16,16 +16,16 @@ pacman-key --lsign-key '{{$.SignMail}}'     
    
 {{- if gt (len $.Groups) 1 -}}
-# {{ctx.Locale.Tr "packages.arch.pacman.repo.multi" $.PackageDescriptor.Package.LowerName}}
+# {{ctx.Locale.Tr "packages.arch.pacman.repo.multi"  $.PackageDescriptor.Package.LowerName}}
 
 {{end -}}
 {{- $GroupSize := (len .Groups) -}}
-{{-  range $i,$v := .Groups -}}
+{{-  range $i,$v :=  .Groups -}}
 {{- if gt $i 0}}
 {{end -}}{{- if gt $GroupSize 1 -}}
 # {{ctx.Locale.Tr "packages.arch.pacman.repo.multi.item" .}}
 {{end -}}
-[{{$.PackageDescriptor.Owner.LowerName}}.{{$.PackageRegistryHost}}]
+[{{$.PackageDescriptor.Owner.LowerName}}.{{$.RegistryHost}}]
 SigLevel = Required
 Server = 
 {{end -}}
diff --git a/templates/package/content/container.tmpl b/templates/package/content/container.tmpl
index dd1c24269b..b5fdcfeb1b 100644
--- a/templates/package/content/container.tmpl
+++ b/templates/package/content/container.tmpl
@@ -5,13 +5,13 @@
 			
    
 				
 				{{if eq .PackageDescriptor.Metadata.Type "helm"}}
-				
    helm pull oci://{{.PackageRegistryHost}}/{{.PackageDescriptor.Owner.LowerName}}/{{.PackageDescriptor.Package.LowerName}} --version {{.PackageDescriptor.Version.LowerVersion}}
    
+				
    helm pull oci://{{.RegistryHost}}/{{.PackageDescriptor.Owner.LowerName}}/{{.PackageDescriptor.Package.LowerName}} --version {{.PackageDescriptor.Version.LowerVersion}}
    
 				{{else}}
 					{{$separator := ":"}}
 					{{if not .PackageDescriptor.Metadata.IsTagged}}
 						{{$separator = "@"}}
 					{{end}}
-					
    docker pull {{.PackageRegistryHost}}/{{.PackageDescriptor.Owner.LowerName}}/{{.PackageDescriptor.Package.LowerName}}{{$separator}}{{.PackageDescriptor.Version.LowerVersion}}
    
+					
    docker pull {{.RegistryHost}}/{{.PackageDescriptor.Owner.LowerName}}/{{.PackageDescriptor.Package.LowerName}}{{$separator}}{{.PackageDescriptor.Version.LowerVersion}}
    
 				{{end}}
 			
    
 			
    
@@ -24,7 +24,7 @@
    {{if .PackageDescriptor.Metadata.Manifests}} -

    {{ctx.Locale.Tr "packages.container.images.title"}}

    +

    {{ctx.Locale.Tr "packages.container.multi_arch"}}

    @@ -36,13 +36,11 @@ {{range .PackageDescriptor.Metadata.Manifests}} - {{if ne .Platform "unknown/unknown"}} - + - - {{end}} + {{end}}
    {{.Digest}} {{.Platform}} {{ctx.Locale.TrSize .Size}}
    diff --git a/templates/package/content/nuget.tmpl b/templates/package/content/nuget.tmpl index c8568845f1..ea665c7bbc 100644 --- a/templates/package/content/nuget.tmpl +++ b/templates/package/content/nuget.tmpl @@ -35,12 +35,11 @@ - {{$tooltipSearchInNuget := ctx.Locale.Tr "packages.search_in_external_registry" "nuget.org"}} {{range $framework, $dependencies := .PackageDescriptor.Metadata.Dependencies}} {{range $dependencies}} - {{.ID}} {{svg "octicon-link-external"}} - {{.Version}} {{svg "octicon-link-external"}} + {{.ID}} + {{.Version}} {{$framework}} {{end}} diff --git a/templates/package/metadata/alt.tmpl b/templates/package/metadata/alt.tmpl deleted file mode 100644 index 16fb52e9b1..0000000000 --- a/templates/package/metadata/alt.tmpl +++ /dev/null @@ -1,4 +0,0 @@ -{{if eq .PackageDescriptor.Package.Type "alt"}} - {{if .PackageDescriptor.Metadata.ProjectURL}}
    {{svg "octicon-link-external" 16 "tw-mr-2"}} {{ctx.Locale.Tr "packages.details.project_site"}}
    {{end}} - {{if .PackageDescriptor.Metadata.License}}
    {{svg "octicon-law" 16 "tw-mr-2"}} {{.PackageDescriptor.Metadata.License}}
    {{end}} -{{end}} diff --git a/templates/package/metadata/arch.tmpl b/templates/package/metadata/arch.tmpl index 89001b979c..822973eb7d 100644 --- a/templates/package/metadata/arch.tmpl +++ b/templates/package/metadata/arch.tmpl @@ -1,4 +1,4 @@ {{if eq .PackageDescriptor.Package.Type "arch"}} - {{if .PackageDescriptor.Metadata.ProjectURL}}
    {{svg "octicon-link-external" 16 "tw-mr-2"}} {{ctx.Locale.Tr "packages.details.project_site"}}
    {{end}} - {{range .PackageDescriptor.Metadata.License}}
    {{svg "octicon-law" 16 "tw-mr-2"}} {{.}}
    {{end}} + {{range .PackageDescriptor.Metadata.License}}
    {{svg "octicon-law" 16 "gt-mr-3"}} {{.}}
    {{end}} + {{if .PackageDescriptor.Metadata.ProjectURL}}
    {{svg "octicon-link-external" 16 "mr-3"}} {{ctx.Locale.Tr "packages.details.project_site"}}
    {{end}} {{end}} diff --git a/templates/package/shared/cleanup_rules/preview.tmpl b/templates/package/shared/cleanup_rules/preview.tmpl index da034fec7a..0d9c4b0d46 100644 --- a/templates/package/shared/cleanup_rules/preview.tmpl +++ b/templates/package/shared/cleanup_rules/preview.tmpl @@ -22,7 +22,7 @@ {{.Version.Version}} {{.Creator.Name}} {{ctx.Locale.TrSize .CalculateBlobSize}} - {{DateUtils.AbsoluteShort .Version.CreatedUnix}} + {{DateTime "short" .Version.CreatedUnix}} {{else}} diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl index 19b41d0bc8..36f8bc1522 100644 --- a/templates/package/shared/list.tmpl +++ b/templates/package/shared/list.tmpl @@ -24,7 +24,7 @@ {{svg .Package.Type.SVGName 16}} {{.Package.Type.Name}}
    - {{$timeStr := DateUtils.TimeSince .Version.CreatedUnix}} + {{$timeStr := TimeSinceUnix .Version.CreatedUnix ctx.Locale}} {{$hasRepositoryAccess := false}} {{if .Repository}} {{$hasRepositoryAccess = index $.RepositoryAccessMap .Repository.ID}} diff --git a/templates/package/shared/versionlist.tmpl b/templates/package/shared/versionlist.tmpl index 7a1059e262..e5c568e059 100644 --- a/templates/package/shared/versionlist.tmpl +++ b/templates/package/shared/versionlist.tmpl @@ -25,7 +25,7 @@
    {{.Version.LowerVersion}}
    - {{ctx.Locale.Tr "packages.published_by" (DateUtils.TimeSince .Version.CreatedUnix) .Creator.HomeLink .Creator.GetDisplayName}} + {{ctx.Locale.Tr "packages.published_by" (TimeSinceUnix .Version.CreatedUnix ctx.Locale) .Creator.HomeLink .Creator.GetDisplayName}}
    diff --git a/templates/package/view.tmpl b/templates/package/view.tmpl index 18220e904b..fe88e54317 100644 --- a/templates/package/view.tmpl +++ b/templates/package/view.tmpl @@ -8,7 +8,7 @@

    {{.PackageDescriptor.Package.Name}} ({{.PackageDescriptor.Version.Version}})

    - {{$timeStr := DateUtils.TimeSince .PackageDescriptor.Version.CreatedUnix}} + {{$timeStr := TimeSinceUnix .PackageDescriptor.Version.CreatedUnix ctx.Locale}} {{if .HasRepositoryAccess}} {{ctx.Locale.Tr "packages.published_by_in" $timeStr .PackageDescriptor.Creator.HomeLink .PackageDescriptor.Creator.GetDisplayName .PackageDescriptor.Repository.Link .PackageDescriptor.Repository.FullName}} {{else}} @@ -37,7 +37,6 @@ {{template "package/content/pub" .}} {{template "package/content/pypi" .}} {{template "package/content/rpm" .}} - {{template "package/content/alt" .}} {{template "package/content/rubygems" .}} {{template "package/content/swift" .}} {{template "package/content/vagrant" .}} @@ -49,7 +48,7 @@ {{if .HasRepositoryAccess}}
    {{svg "octicon-repo" 16 "tw-mr-2"}} {{.PackageDescriptor.Repository.FullName}}
    {{end}} -
    {{svg "octicon-calendar" 16 "tw-mr-2"}} {{DateUtils.TimeSince .PackageDescriptor.Version.CreatedUnix}}
    +
    {{svg "octicon-calendar" 16 "tw-mr-2"}} {{TimeSinceUnix .PackageDescriptor.Version.CreatedUnix ctx.Locale}}
    {{svg "octicon-download" 16 "tw-mr-2"}} {{.PackageDescriptor.Version.DownloadCount}}
    {{template "package/metadata/alpine" .}} {{template "package/metadata/arch" .}} @@ -69,7 +68,6 @@ {{template "package/metadata/pub" .}} {{template "package/metadata/pypi" .}} {{template "package/metadata/rpm" .}} - {{template "package/metadata/alt" .}} {{template "package/metadata/rubygems" .}} {{template "package/metadata/swift" .}} {{template "package/metadata/vagrant" .}} @@ -96,7 +94,7 @@ {{range .LatestVersions}}
    {{.Version}} - {{DateUtils.AbsoluteShort .CreatedUnix}} + {{DateTime "short" .CreatedUnix}}
    {{end}}
    diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index 5da2757748..b892cff996 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -1,6 +1,6 @@ {{if and $.CanWriteProjects (not $.Repository.IsArchived)}}
    -
    +
    {{svg "octicon-project-symlink" 16 "tw-mr-2"}} {{ctx.Locale.PrettyNumber .OpenCount}} {{ctx.Locale.Tr "repo.issues.open_title"}} diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index 08b08b95e5..564ec1b13d 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -1,7 +1,7 @@ {{$canWriteProject := and .CanWriteProjects (or (not .Repository) (not .Repository.IsArchived))}}
    -
    +

    {{.Project.Title}}

    {{if $canWriteProject}}
    diff --git a/templates/repo/actions/dispatch.tmpl b/templates/repo/actions/dispatch.tmpl index 48c2aa5a26..2372e61ebb 100644 --- a/templates/repo/actions/dispatch.tmpl +++ b/templates/repo/actions/dispatch.tmpl @@ -33,9 +33,7 @@ {{if eq $val.Type "boolean"}}
    - {{/* These two inputs need to stay in exactly this order (checkbox first, hidden second) or boolean fields wont work correctly! */}} - - +
    {{else}} diff --git a/templates/repo/actions/no_workflows.tmpl b/templates/repo/actions/no_workflows.tmpl index fb3a77fb9a..88d6e513ef 100644 --- a/templates/repo/actions/no_workflows.tmpl +++ b/templates/repo/actions/no_workflows.tmpl @@ -2,8 +2,7 @@ {{svg "octicon-no-entry" 48}}

    {{ctx.Locale.Tr "actions.runs.no_workflows"}}

    {{if and .CanWriteCode .CanWriteActions}} -

    {{ctx.Locale.Tr "actions.runs.no_workflows.help_write_access" "https://forgejo.org/docs/latest/user/actions/#quick-start" "https://forgejo.org/docs/latest/admin/runner-installation/"}}

    - {{else}} -

    {{ctx.Locale.Tr "actions.runs.no_workflows.help_no_write_access" "https://forgejo.org/docs/latest/user/actions/"}}

    +

    {{ctx.Locale.Tr "actions.runs.no_workflows.quick_start" "https://forgejo.org/docs/latest/admin/actions/"}}

    {{end}} +

    {{ctx.Locale.Tr "actions.runs.no_workflows.documentation" "https://forgejo.org/docs/latest/admin/actions/"}}

    diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl index 060fc1b66a..7bab492d7b 100644 --- a/templates/repo/actions/runs_list.tmpl +++ b/templates/repo/actions/runs_list.tmpl @@ -27,13 +27,13 @@
    - {{if .IsRefDeleted}} - {{.PrettyRef}} + {{if .RefLink}} + {{.PrettyRef}} {{else}} - {{.PrettyRef}} + {{.PrettyRef}} {{end}}
    -
    {{svg "octicon-calendar" 16}}{{DateUtils.TimeSince .Updated}}
    +
    {{svg "octicon-calendar" 16}}{{TimeSinceUnix .Updated ctx.Locale}}
    {{svg "octicon-stopwatch" 16}}{{.Duration}}
    diff --git a/templates/repo/actions/status.tmpl b/templates/repo/actions/status.tmpl index 99fa74ac17..a0e02cf8d7 100644 --- a/templates/repo/actions/status.tmpl +++ b/templates/repo/actions/status.tmpl @@ -17,15 +17,13 @@ {{svg "octicon-check-circle-fill" $size (printf "text green %s" $className)}} {{else if eq .status "skipped"}} {{svg "octicon-skip" $size (printf "text grey %s" $className)}} -{{else if eq .status "cancelled"}} - {{svg "octicon-stop" $size (printf "text grey %s" $className)}} {{else if eq .status "waiting"}} {{svg "octicon-clock" $size (printf "text yellow %s" $className)}} {{else if eq .status "blocked"}} {{svg "octicon-blocked" $size (printf "text yellow %s" $className)}} {{else if eq .status "running"}} {{svg "octicon-meter" $size (printf "text yellow job-status-rotate %s" $className)}} -{{else}}{{/*failure, unknown*/}} +{{else if or (eq .status "failure") or (eq .status "cancelled") or (eq .status "unknown")}} {{svg "octicon-x-circle-fill" $size (printf "text red %s" $className)}} {{end}} diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index c60017ba87..f5bffb097e 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -27,7 +27,7 @@ {{template "repo/commit_statuses" dict "Status" (index $.CommitStatus .DefaultBranchBranch.DBBranch.CommitID) "Statuses" (index $.CommitStatuses .DefaultBranchBranch.DBBranch.CommitID)}}
    -

    {{svg "octicon-git-commit" 16 "tw-mr-1"}}{{ShortSha .DefaultBranchBranch.DBBranch.CommitID}} · {{RenderCommitMessage $.Context .DefaultBranchBranch.DBBranch.CommitMessage (.Repository.ComposeMetas ctx)}} · {{ctx.Locale.Tr "org.repo_updated" (DateUtils.TimeSince .DefaultBranchBranch.DBBranch.CommitTime)}}{{if .DefaultBranchBranch.DBBranch.Pusher}}  {{template "shared/user/avatarlink" dict "user" .DefaultBranchBranch.DBBranch.Pusher}}{{template "shared/user/namelink" .DefaultBranchBranch.DBBranch.Pusher}}{{end}}

    +

    {{svg "octicon-git-commit" 16 "tw-mr-1"}}{{ShortSha .DefaultBranchBranch.DBBranch.CommitID}} · {{RenderCommitMessage $.Context .DefaultBranchBranch.DBBranch.CommitMessage (.Repository.ComposeMetas ctx)}} · {{ctx.Locale.Tr "org.repo_updated" (TimeSince .DefaultBranchBranch.DBBranch.CommitTime.AsTime ctx.Locale)}} {{if .DefaultBranchBranch.DBBranch.Pusher}}  {{template "shared/user/avatarlink" dict "user" .DefaultBranchBranch.DBBranch.Pusher}}{{template "shared/user/namelink" .DefaultBranchBranch.DBBranch.Pusher}}{{end}}

    {{if and $.IsWriter (not $.Repository.IsArchived) (not .IsDeleted)}} @@ -92,7 +92,7 @@ {{.DBBranch.Name}}
    -

    {{ctx.Locale.Tr "repo.branch.deleted_by" .DBBranch.DeletedBy.Name}} {{DateUtils.TimeSince .DBBranch.DeletedUnix}}

    +

    {{ctx.Locale.Tr "repo.branch.deleted_by" .DBBranch.DeletedBy.Name}} {{TimeSinceUnix .DBBranch.DeletedUnix ctx.Locale}}

    {{else}}
    {{.DBBranch.Name}} @@ -102,7 +102,7 @@ {{template "repo/commit_statuses" dict "Status" (index $.CommitStatus .DBBranch.CommitID) "Statuses" (index $.CommitStatuses .DBBranch.CommitID)}}
    -

    {{svg "octicon-git-commit" 16 "tw-mr-1"}}{{ShortSha .DBBranch.CommitID}} · {{RenderCommitMessage $.Context .DBBranch.CommitMessage ($.Repository.ComposeMetas ctx)}} · {{ctx.Locale.Tr "org.repo_updated" (DateUtils.TimeSince .DBBranch.CommitTime)}}{{if .DBBranch.Pusher}}  {{template "shared/user/avatarlink" dict "user" .DBBranch.Pusher}}  {{template "shared/user/namelink" .DBBranch.Pusher}}{{end}}

    +

    {{svg "octicon-git-commit" 16 "tw-mr-1"}}{{ShortSha .DBBranch.CommitID}} · {{RenderCommitMessage $.Context .DBBranch.CommitMessage ($.Repository.ComposeMetas ctx)}} · {{ctx.Locale.Tr "org.repo_updated" (TimeSince .DBBranch.CommitTime.AsTime ctx.Locale)}} {{if .DBBranch.Pusher}}  {{template "shared/user/avatarlink" dict "user" .DBBranch.Pusher}}  {{template "shared/user/namelink" .DBBranch.Pusher}}{{end}}

    {{end}} diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl index dcb1792485..f2bda8e627 100644 --- a/templates/repo/branch_dropdown.tmpl +++ b/templates/repo/branch_dropdown.tmpl @@ -70,7 +70,7 @@
    {{/* show dummy elements before Vue componment is mounted, this code must match the code in BranchTagSelector.vue */}}
    -
    {{end}} @@ -157,12 +152,11 @@ {{ctx.AvatarUtils.AvatarByEmail .Commit.Author.Email .Commit.Author.Email 28 "tw-mr-2"}} {{.Commit.Author.Name}} {{end}} - {{DateUtils.TimeSince .Commit.Author.When}} + {{TimeSince .Commit.Author.When ctx.Locale}} {{if or (ne .Commit.Committer.Name .Commit.Author.Name) (ne .Commit.Committer.Email .Commit.Author.Email)}} - • {{ctx.Locale.Tr "repo.diff.committed_by"}} {{if ne .Verification.CommittingUser.ID 0}} - {{ctx.AvatarUtils.Avatar .Verification.CommittingUser 28 "tw-mr-2"}} + {{ctx.AvatarUtils.Avatar .Verification.CommittingUser 28 "tw-mx-2"}} {{.Commit.Committer.Name}} {{else}} {{ctx.AvatarUtils.AvatarByEmail .Commit.Committer.Email .Commit.Committer.Name 28 "tw-mr-2"}} @@ -265,7 +259,7 @@
    {{end}} {{if .NoteRendered}} -
    +
    {{svg "octicon-note" 16 "tw-mr-2"}} {{ctx.Locale.Tr "repo.diff.git-notes"}}: {{if .NoteAuthor}} @@ -279,61 +273,11 @@ {{else}} {{.NoteCommit.Author.Name}} {{end}} - {{DateUtils.TimeSince .NoteCommit.Author.When}} - {{if and ($.Permission.CanWrite $.UnitTypeCode) (not $.Repository.IsArchived) (not .IsDeleted)}} -
    - - -
    - - {{end}} + {{TimeSince .NoteCommit.Author.When ctx.Locale}}
    -
    + 
    {{.NoteRendered | SanitizeHTML}}
    - {{if and ($.Permission.CanWrite $.UnitTypeCode) (not $.Repository.IsArchived) (not .IsDeleted)}} -
    -
    - {{.CsrfTokenHtml}} - -
    - -
    - -
    - -
    -
    -
    - {{end}} - {{else if and ($.Permission.CanWrite $.UnitTypeCode) (not $.Repository.IsArchived) (not .IsDeleted)}} -
    -
    - {{.CsrfTokenHtml}} - -
    - -
    - -
    - -
    -
    -
    {{end}} {{template "repo/diff/box" .}}
    diff --git a/templates/repo/commits_list.tmpl b/templates/repo/commits_list.tmpl index b23de20583..c8c695e332 100644 --- a/templates/repo/commits_list.tmpl +++ b/templates/repo/commits_list.tmpl @@ -74,9 +74,9 @@ {{end}} {{if .Committer}} - {{DateUtils.TimeSince .Committer.When}} + {{TimeSince .Committer.When ctx.Locale}} {{else}} - {{DateUtils.TimeSince .Author.When}} + {{TimeSince .Author.When ctx.Locale}} {{end}} diff --git a/templates/repo/contributors.tmpl b/templates/repo/contributors.tmpl index c71312fc6c..f7f5d796f4 100644 --- a/templates/repo/contributors.tmpl +++ b/templates/repo/contributors.tmpl @@ -1,7 +1,6 @@ {{if .Permission.CanRead $.UnitTypeCode}}
    {{ctx.Locale.TrN .MaxCreationLimit "repo.form.reach_limit_of_creation_1" "repo.form.reach_limit_of_creation_n" .MaxCreationLimit}}

    {{end}} -
    - {{template "repo/create_basic" .}} -
    +
    + +
    + + + {{ctx.AvatarUtils.Avatar .ContextUser 28 "mini"}} + {{.ContextUser.ShortName 40}} + + {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
    +
    + {{ctx.AvatarUtils.Avatar .SignedUser 28 "mini"}} + {{.SignedUser.ShortName 40}} +
    + {{range .Orgs}} +
    + {{ctx.AvatarUtils.Avatar . 28 "mini"}} + {{.ShortName 40}} +
    + {{end}} +
    +
    + {{ctx.Locale.Tr "repo.owner_helper"}} +
    -
    - - {{ctx.Locale.Tr "repo.new_from_template"}} - {{ctx.Locale.Tr "repo.new_from_template_description"}} - - {{template "repo/create_from_template" .}} -
    +
    + + + {{ctx.Locale.Tr "repo.repo_name_helper"}} +
    +
    + +
    + + +
    + {{if .IsForcedPrivate}} + {{ctx.Locale.Tr "repo.visibility_helper_forced"}} + {{end}} + {{ctx.Locale.Tr "repo.visibility_description"}} +
    +
    + + +
    +
    + + +
    + +
    +
    + +
    + + +
    +
    + + +
    +
    +
    + +
    + + +
    +
    + + +
    +
    +
    + +
    + + +
    +
    + + +
    +
    +
    + +
    + + +
    +
    +
    -
    - {{ctx.Locale.Tr "repo.auto_init"}} - {{template "repo/create_init" .}} -
    +
    + +
    + +
    {{ctx.Locale.Tr "repo.issue_labels_helper"}}
    +
    +
    {{ctx.Locale.Tr "repo.issue_labels_helper"}}
    + {{range .LabelTemplateFiles}} +
    {{.DisplayName}}

    ({{.Description}})

    + {{end}} +
    +
    +
    -
    - {{ctx.Locale.Tr "repo.new_advanced"}} -
    {{ctx.Locale.Tr "repo.new_advanced_expand"}} - {{template "repo/create_advanced" .}} -
    -
    +
    + +
    + +
    + +
    {{ctx.Locale.Tr "repo.repo_gitignore_helper"}}
    +
    + {{range .Gitignores}} +
    {{.}}
    + {{end}} +
    +
    + {{ctx.Locale.Tr "repo.repo_gitignore_helper_desc"}} +
    +
    + +
    + +
    {{ctx.Locale.Tr "repo.license_helper"}}
    +
    +
    {{ctx.Locale.Tr "repo.license_helper"}}
    + {{range .Licenses}} +
    {{.}}
    + {{end}} +
    +
    + {{ctx.Locale.Tr "repo.license_helper_desc" "https://choosealicense.com/"}} +
    + +
    + +
    + +
    {{ctx.Locale.Tr "repo.readme_helper"}}
    +
    + {{range .Readmes}} +
    {{.}}
    + {{end}} +
    +
    + {{ctx.Locale.Tr "repo.readme_helper_desc"}} +
    +
    +
    + + +
    +
    +
    + + + {{ctx.Locale.Tr "repo.default_branch_helper"}} +
    +
    + +
    + +
    {{.DefaultObjectFormat.Name}}
    +
    + {{range .SupportedObjectFormats}} +
    {{.Name}}
    + {{end}} +
    +
    + {{ctx.Locale.Tr "repo.object_format_helper"}} +
    +
    + +
    + + +
    +
    +
    +
    +
    + +
    -
    diff --git a/templates/repo/create_advanced.tmpl b/templates/repo/create_advanced.tmpl deleted file mode 100644 index c0274701f8..0000000000 --- a/templates/repo/create_advanced.tmpl +++ /dev/null @@ -1,45 +0,0 @@ - - -{{$supportedFormatsLength := len .SupportedObjectFormats}} -{{/* Only offer object format selection if there is an actual choice */}} -{{if ge $supportedFormatsLength 2}} - -{{else}} - -{{end}} - - - - diff --git a/templates/repo/create_basic.tmpl b/templates/repo/create_basic.tmpl deleted file mode 100644 index 0396629fef..0000000000 --- a/templates/repo/create_basic.tmpl +++ /dev/null @@ -1,47 +0,0 @@ - - - - diff --git a/templates/repo/create_from_template.tmpl b/templates/repo/create_from_template.tmpl deleted file mode 100644 index 47cda3df02..0000000000 --- a/templates/repo/create_from_template.tmpl +++ /dev/null @@ -1,49 +0,0 @@ - -{{/* If the dropdown is inside the label, the focus works correctly and it is more accessible. - However, the Javascript takes the focus and opens the dropdown again immediately after closing. - When the user interacts (via mouse or keyboard), the dropdown closes again. - Due to the fieldset legend, this solutions is probably acceptable until the dropdown can be fixed properly. */}} - - -
    - {{ctx.Locale.Tr "repo.template.items"}} - - - - - - - - -
    diff --git a/templates/repo/create_init.tmpl b/templates/repo/create_init.tmpl deleted file mode 100644 index 729b44c8e6..0000000000 --- a/templates/repo/create_init.tmpl +++ /dev/null @@ -1,56 +0,0 @@ - - -
    - - - - - {{$supportedReadmesLength := len .Readmes}} - {{/* Only offer README selection if there is an actual choice */}} - {{if ge $supportedReadmesLength 2}} - - {{else}} - - {{end}} -
    diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index e24c880746..230e49752f 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -85,6 +85,7 @@ diffFileInfo.files.push(...diffDataFiles); window.config.pageData.diffFileInfo = diffFileInfo; +
    {{end}}
    {{if $showFileTree}} @@ -129,7 +130,7 @@
    {{if $file.IsRenamed}}{{$file.OldName}} → {{end}}{{$file.Name}} {{if .IsLFSFile}} ({{ctx.Locale.Tr "repo.stored_lfs"}}){{end}} - + {{if $file.IsGenerated}} {{ctx.Locale.Tr "repo.diff.generated"}} {{end}} @@ -247,8 +248,8 @@
    {{end}}
    - - + +