From e67d60d3368614c87b3d15ed9948fa17209bb120 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 22 Feb 2023 23:26:48 +0800 Subject: [PATCH 001/340] Fix some more hidden problems (#23074) (#23075) Backport #23074 --- templates/admin/auth/edit.tmpl | 2 +- templates/admin/user/edit.tmpl | 2 +- web_src/js/features/admin/common.js | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl index 36d335f32364..d64ee188af15 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -117,7 +117,7 @@ -
+
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl index 7d31eb4d2b9b..5dd1f531fda9 100644 --- a/templates/admin/user/edit.tmpl +++ b/templates/admin/user/edit.tmpl @@ -122,7 +122,7 @@
-
+
diff --git a/web_src/js/features/admin/common.js b/web_src/js/features/admin/common.js index 092cf770be41..d023e0bc3695 100644 --- a/web_src/js/features/admin/common.js +++ b/web_src/js/features/admin/common.js @@ -50,11 +50,11 @@ export function initAdminCommon() { function onUsePagedSearchChange() { if ($('#use_paged_search').prop('checked')) { - showElem($('.search-page-size')) - .find('input').attr('required', 'required'); + showElem('.search-page-size'); + $('.search-page-size').find('input').attr('required', 'required'); } else { - hideElem($('.search-page-size')) - .find('input').removeAttr('required'); + hideElem('.search-page-size'); + $('.search-page-size').find('input').removeAttr('required'); } } From 75eaf9907604b1689e491b4fb4354b2d0b9ac3b6 Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Thu, 23 Feb 2023 02:34:47 +0200 Subject: [PATCH 002/340] Wrap unless-check in docker manifests (#23079) (#23081) Backport #23079 Should fix the following: > failed to render template: Evaluation error: Helper 'unless' called with wrong number of arguments, needed 2 but got 3 https://go.dev/play/p/h7bt7MWKTcv Signed-off-by: jolheiser Co-authored-by: John Olheiser --- docker/manifest.rootless.tmpl | 2 +- docker/manifest.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/manifest.rootless.tmpl b/docker/manifest.rootless.tmpl index 46a397c828d8..ef48dd1684b0 100644 --- a/docker/manifest.rootless.tmpl +++ b/docker/manifest.rootless.tmpl @@ -1,6 +1,6 @@ image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}{{#if (hasPrefix "refs/heads/release/v" build.ref)}}{{trimPrefix "refs/heads/release/v" build.ref}}-{{/if}}dev{{/if}}-rootless {{#if build.tags}} -{{#unless contains "-rc" build.tag}} +{{#unless (contains "-rc" build.tag)}} tags: {{#each build.tags}} - {{this}}-rootless diff --git a/docker/manifest.tmpl b/docker/manifest.tmpl index b4ba5a76ed4a..018d87e9796b 100644 --- a/docker/manifest.tmpl +++ b/docker/manifest.tmpl @@ -1,6 +1,6 @@ image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}{{#if (hasPrefix "refs/heads/release/v" build.ref)}}{{trimPrefix "refs/heads/release/v" build.ref}}-{{/if}}dev{{/if}} {{#if build.tags}} -{{#unless contains "-rc" build.tag }} +{{#unless (contains "-rc" build.tag)}} tags: {{#each build.tags}} - {{this}} From 0ac3be14829125f0c12be4e69195e6cb095353f4 Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Thu, 23 Feb 2023 10:32:15 +0200 Subject: [PATCH 003/340] Improve accessibility for issue comments (#22612) (#23083) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Backport #22612 ### Preamble Gitea is an extremely great and smart solution perfectly suitable for smaller systems and self-hosted Git-powered setups. However, there is a group of people who have indredible difficulties in using Gitea, rendering it useless in many cases. Those people are blind developers using [screen readers](https://en.wikipedia.org/wiki/Screen_reader). Unfortunately, the frontend framework is super convoluted, and Go templates don’t allow accessibility improvements in a straightforward way. As a blind developer myself, I'm trying to start fixing smaller accessibility quirks with intention to go deeper and eventually, alone or not, make Gitea at least mostly accessible for screen reader users. ### What This Fix Does My blind fellows and me navigate webpages not very similarly to how a sighted person does it. For instance, we love semantic HTML markup like headings, lists, tables etc. because our screen readers allow us to jump by those landmarks with a single keypress. Currently in Gitea issue comments are not marked up with headings. I'm trying to fix this by adding an appropriate [ARIA](https://www.w3.org/WAI/standards-guidelines/aria/) role for comment header and also by enclosing the comment itself in a semantical article element. Co-authored-by: Andre Polykanine Co-authored-by: Lunny Xiao Co-authored-by: John Olheiser --- templates/repo/issue/view_content.tmpl | 6 +++--- templates/repo/issue/view_content/comments.tmpl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 887dd2c42da8..08ba50904587 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -27,7 +27,7 @@ {{end}}
-
+
{{if .Issue.OriginalAuthor}} @@ -69,7 +69,7 @@ {{end}}
-
+
{{if .Issue.RenderedContent}} {{.Issue.RenderedContent|Str2html}} @@ -85,7 +85,7 @@
{{$reactions := .Issue.Reactions.GroupByType}} {{if $reactions}} -
+
{{template "repo/issue/view_content/reactions" Dict "ctx" $ "ActionURL" (Printf "%s/issues/%d/reactions" $.RepoLink .Issue.Index) "Reactions" $reactions}}
{{end}} diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 8894a7ffd206..94b46bd9f13a 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -22,7 +22,7 @@ {{end}}
-
+
{{if .OriginalAuthor}} @@ -69,7 +69,7 @@ {{end}}
-
+
{{if .RenderedContent}} {{.RenderedContent|Str2html}} @@ -85,7 +85,7 @@
{{$reactions := .Reactions.GroupByType}} {{if $reactions}} -
+
{{template "repo/issue/view_content/reactions" Dict "ctx" $ "ActionURL" (Printf "%s/comments/%d/reactions" $.RepoLink .ID) "Reactions" $reactions}}
{{end}} From aff432b1976de68abe4b266bd322ddd57cbeed42 Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Thu, 23 Feb 2023 10:39:30 +0200 Subject: [PATCH 004/340] Nest metadata in refactoring docs (#23087) (#23091) Backport #23087 Whitespace was missing from refactoring docs metadata. backport label applied so it is included in versioned docs. Co-authored-by: techknowlogick --- .../doc/developers/guidelines-refactoring.en-us.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/content/doc/developers/guidelines-refactoring.en-us.md b/docs/content/doc/developers/guidelines-refactoring.en-us.md index 2d607720dcb8..29025f25f752 100644 --- a/docs/content/doc/developers/guidelines-refactoring.en-us.md +++ b/docs/content/doc/developers/guidelines-refactoring.en-us.md @@ -6,11 +6,11 @@ weight: 20 toc: false draft: false menu: -sidebar: -parent: "developers" -name: "Guidelines for Refactoring" -weight: 20 -identifier: "guidelines-refactoring" + sidebar: + parent: "developers" + name: "Guidelines for Refactoring" + weight: 20 + identifier: "guidelines-refactoring" --- # Guidelines for Refactoring From ced94f2e0df249d1779f349e11922bfad61cba67 Mon Sep 17 00:00:00 2001 From: HesterG Date: Thu, 23 Feb 2023 20:56:03 +0800 Subject: [PATCH 005/340] Add accessibility to the menu on the navbar (#23059) (#23095) Backport #23059 This PR is trying to add accessibility to the menu as mentioned in #23053 so the menu can be accessed using keyboard (A quick demo is added below), with a reference to [PR2612](https://github.com/go-gitea/gitea/pull/22612). The goal is to make the menu accessible merely using keyboard like shown below. And this PR might need confirmation from developers using screen readers. --- templates/base/head_navbar.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index 059363b72d07..10bbf655b5b9 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -18,9 +18,9 @@ {{end}} - +
From b4ed3f07e44975e971dcbbf1afcdedbf874c0820 Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Fri, 24 Feb 2023 02:47:35 +0200 Subject: [PATCH 006/340] Fix commit name in Apply Patch page (#23086) (#23099) Backport #23086 Fixes https://github.com/go-gitea/gitea/issues/22621#issuecomment-1439309200 Co-authored-by: yp05327 <576951401@qq.com> --- routers/web/repo/patch.go | 3 +++ templates/repo/editor/commit_form.tmpl | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/routers/web/repo/patch.go b/routers/web/repo/patch.go index 12b26f38e901..0ffec0c4ea46 100644 --- a/routers/web/repo/patch.go +++ b/routers/web/repo/patch.go @@ -25,6 +25,8 @@ const ( func NewDiffPatch(ctx *context.Context) { canCommit := renderCommitRights(ctx) + ctx.Data["PageIsPatch"] = true + ctx.Data["TreePath"] = "" ctx.Data["commit_summary"] = "" @@ -51,6 +53,7 @@ func NewDiffPatchPost(ctx *context.Context) { if form.CommitChoice == frmCommitChoiceNewBranch { branchName = form.NewBranchName } + ctx.Data["PageIsPatch"] = true ctx.Data["TreePath"] = "" ctx.Data["BranchLink"] = ctx.Repo.RepoLink + "/src/" + ctx.Repo.BranchNameSubURL() ctx.Data["FileContent"] = form.Content diff --git a/templates/repo/editor/commit_form.tmpl b/templates/repo/editor/commit_form.tmpl index 7fac7f13bc24..c6c48c5a838c 100644 --- a/templates/repo/editor/commit_form.tmpl +++ b/templates/repo/editor/commit_form.tmpl @@ -9,7 +9,7 @@ {{.locale.Tr "repo.editor.commit_changes"}} {{- end}}
- +
From ddf61373f691a584844f141bc4728948fe142dc3 Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Fri, 24 Feb 2023 04:45:18 +0200 Subject: [PATCH 007/340] Add wrapper to author to avoid long name ui problem (#23030) (#23098) Backport #23030 This PR is a possible solution for issue #22866. Main change is to add a `author-wrapper` class around author name, like the wrapper added to message. The `max-width` is set to 200px on PC, and 100px on mobile device for now. Which will work like below: 2023-02-21 11 57 53 2023-02-21 11 58 43 And `title` is added to the wrapper like it did in message wrapper. So the full author name will show on hover. Co-authored-by: HesterG Co-authored-by: Lunny Xiao --- templates/repo/view_list.tmpl | 6 +++--- web_src/less/_repository.less | 19 +++++++++++++++---- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl index 6fcf60daef13..9540c872c2c5 100644 --- a/templates/repo/view_list.tmpl +++ b/templates/repo/view_list.tmpl @@ -8,14 +8,14 @@ {{if .LatestCommitUser}} {{avatar $.Context .LatestCommitUser 24}} {{if .LatestCommitUser.FullName}} - {{.LatestCommitUser.FullName}} + {{.LatestCommitUser.FullName}} {{else}} - {{if .LatestCommit.Author}}{{.LatestCommit.Author.Name}}{{else}}{{.LatestCommitUser.Name}}{{end}} + {{if .LatestCommit.Author}}{{.LatestCommit.Author.Name}}{{else}}{{.LatestCommitUser.Name}}{{end}} {{end}} {{else}} {{if .LatestCommit.Author}} {{avatarByEmail $.Context .LatestCommit.Author.Email .LatestCommit.Author.Name 24}} - {{.LatestCommit.Author.Name}} + {{.LatestCommit.Author.Name}} {{end}} {{end}} diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 627a5f6c2f6d..83e8e1f338e1 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -237,6 +237,8 @@ } #repo-files-table { + table-layout: fixed; + thead { th { padding-top: 8px; @@ -2885,7 +2887,8 @@ tbody.commit-list { vertical-align: baseline; } -.message-wrapper { +.message-wrapper, +.author-wrapper { overflow: hidden; text-overflow: ellipsis; max-width: calc(100% - 50px); @@ -2893,6 +2896,10 @@ tbody.commit-list { vertical-align: middle; } +.author-wrapper { + max-width: 180px; +} + // in the commit list, messages can wrap so we can use inline .commit-list .message-wrapper { display: inline; @@ -2912,6 +2919,10 @@ tbody.commit-list { display: block; max-width: calc(100vw - 70px); } + + .author-wrapper { + max-width: 80px; + } } @media @mediaMd { @@ -2920,7 +2931,7 @@ tbody.commit-list { } th .message-wrapper { - max-width: 280px; + max-width: 120px; } } @@ -2930,7 +2941,7 @@ tbody.commit-list { } th .message-wrapper { - max-width: 490px; + max-width: 350px; } } @@ -2940,7 +2951,7 @@ tbody.commit-list { } th .message-wrapper { - max-width: 680px; + max-width: 525px; } } From 4d3e2b23b86f5be8eaf649980ed3fa81b5997e3b Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Fri, 24 Feb 2023 08:36:25 +0200 Subject: [PATCH 008/340] Fix SyncOnCommit always return false in API of push_mirrors (#23088) (#23100) Backport #23088 Fix: #22990 --- Before, the return value of the api is always false,regrardless of whether the entry of `sync_on_commit` is true or false. I have confirmed that the value of `sync_on_commit` dropped into the database is correct. So, I think it is enough to make some small changes. Co-authored-by: sillyguodong <33891828+sillyguodong@users.noreply.github.com> Co-authored-by: Lunny Xiao --- services/convert/mirror.go | 1 + 1 file changed, 1 insertion(+) diff --git a/services/convert/mirror.go b/services/convert/mirror.go index 1dcfc9b64dcf..f7a8e17fd0c9 100644 --- a/services/convert/mirror.go +++ b/services/convert/mirror.go @@ -24,6 +24,7 @@ func ToPushMirror(pm *repo_model.PushMirror) (*api.PushMirror, error) { LastUpdateUnix: pm.LastUpdateUnix.FormatLong(), LastError: pm.LastError, Interval: pm.Interval.String(), + SyncOnCommit: pm.SyncOnCommit, }, nil } From 5ddf67a9c2325282a2121672d7d7ea77789e2cf8 Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Fri, 24 Feb 2023 11:40:36 +0200 Subject: [PATCH 009/340] Make issue meta dropdown support Enter, confirm before reloading (#23014) (#23102) Backport #23014 As the title. Label/assignee share the same code. * Close #22607 * Close #20727 Also: * partially fix for #21742, now the comment reaction and menu work with keyboard. * partially fix for #17705, in most cases the comment won't be lost. * partially fix for #21539 * partially fix for #20347 * partially fix for #7329 ### The `Enter` support Before, if user presses Enter, the dropdown just disappears and nothing happens or the window reloads. After, Enter can be used to select/deselect labels, and press Esc to hide the dropdown to update the labels (still no way to cancel .... maybe you can do a Cmd+R or F5 to refresh the window to discard the changes .....) This is only a quick patch, the UX is still not perfect, but it's much better than before. ### The `confirm` before reloading And more fixes for the `reload` problem, the new behaviors: * If nothing changes (just show/hide the dropdown), then the page won't be reloaded. * If there are draft comments, show a confirm dialog before reloading, to avoid losing comments. That's the best effect can be done at the moment, unless completely refactor these dropdown related code. Screenshot of the confirm dialog:
![image](https://user-images.githubusercontent.com/2114189/220538288-e2da8459-6a4e-43cb-8596-74057f8a03a2.png)
Co-authored-by: wxiaoguang Co-authored-by: Brecht Van Lommel Co-authored-by: Lunny Xiao --- .../repo/issue/view_content/add_reaction.tmpl | 2 +- .../repo/issue/view_content/context_menu.tmpl | 10 ++-- .../repo/issue/view_content/sidebar.tmpl | 2 +- web_src/js/features/aria.js | 3 +- web_src/js/features/repo-legacy.js | 49 ++++++++++++++----- 5 files changed, 46 insertions(+), 20 deletions(-) diff --git a/templates/repo/issue/view_content/add_reaction.tmpl b/templates/repo/issue/view_content/add_reaction.tmpl index 9bd9022d28ab..bfa8a7e12234 100644 --- a/templates/repo/issue/view_content/add_reaction.tmpl +++ b/templates/repo/issue/view_content/add_reaction.tmpl @@ -7,7 +7,7 @@
{{.ctx.locale.Tr "repo.pick_reaction"}}
{{range $value := AllowedReactions}} -
{{ReactionToEmoji $value}}
+ {{ReactionToEmoji $value}} {{end}}
diff --git a/templates/repo/issue/view_content/context_menu.tmpl b/templates/repo/issue/view_content/context_menu.tmpl index b96fd86af5d0..b4b9403b2af7 100644 --- a/templates/repo/issue/view_content/context_menu.tmpl +++ b/templates/repo/issue/view_content/context_menu.tmpl @@ -10,16 +10,16 @@ {{else}} {{$referenceUrl = Printf "%s/files#%s" .ctx.Issue.Link .item.HashTag}} {{end}} -
{{.ctx.locale.Tr "repo.issues.context.copy_link"}}
-
{{.ctx.locale.Tr "repo.issues.context.quote_reply"}}
+ {{.ctx.locale.Tr "repo.issues.context.copy_link"}} + {{.ctx.locale.Tr "repo.issues.context.quote_reply"}} {{if not .ctx.UnitIssuesGlobalDisabled}} -
{{.ctx.locale.Tr "repo.issues.context.reference_issue"}}
+ {{.ctx.locale.Tr "repo.issues.context.reference_issue"}} {{end}} {{if or .ctx.Permission.IsAdmin .IsCommentPoster .ctx.HasIssuesOrPullsWritePermission}}
-
{{.ctx.locale.Tr "repo.issues.context.edit"}}
+ {{.ctx.locale.Tr "repo.issues.context.edit"}} {{if .delete}} -
{{.ctx.locale.Tr "repo.issues.context.delete"}}
+ {{.ctx.locale.Tr "repo.issues.context.delete"}} {{end}} {{end}}
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 2b24825b5f7b..d9c506243705 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -121,7 +121,7 @@
{{end}} -
{{.locale.Tr "repo.issues.new.clear_labels"}}
+ {{.locale.Tr "repo.issues.new.clear_labels"}} {{if or .Labels .OrgLabels}} {{$previousExclusiveScope := "_no_scope"}} {{range .Labels}} diff --git a/web_src/js/features/aria.js b/web_src/js/features/aria.js index a5ac84e4464c..373d667c5f73 100644 --- a/web_src/js/features/aria.js +++ b/web_src/js/features/aria.js @@ -81,7 +81,8 @@ function attachOneDropdownAria($dropdown) { $dropdown.on('keydown', (e) => { // here it must use keydown event before dropdown's keyup handler, otherwise there is no Enter event in our keyup handler if (e.key === 'Enter') { - const $item = $dropdown.dropdown('get item', $dropdown.dropdown('get value')); + let $item = $dropdown.dropdown('get item', $dropdown.dropdown('get value')); + if (!$item) $item = $menu.find('> .item.selected'); // when dropdown filters items by input, there is no "value", so query the "selected" item // if the selected item is clickable, then trigger the click event. in the future there could be a special CSS class for it. if ($item && $item.is('a')) $item[0].click(); } diff --git a/web_src/js/features/repo-legacy.js b/web_src/js/features/repo-legacy.js index 8178ed6547f0..a9229c0d1e6f 100644 --- a/web_src/js/features/repo-legacy.js +++ b/web_src/js/features/repo-legacy.js @@ -29,6 +29,26 @@ import {hideElem, showElem} from '../utils/dom.js'; const {csrfToken} = window.config; +// if there are draft comments (more than 20 chars), confirm before reloading, to avoid losing comments +function reloadConfirmDraftComment() { + const commentTextareas = [ + document.querySelector('.edit-content-zone:not(.gt-hidden) textarea'), + document.querySelector('.edit_area'), + ]; + for (const textarea of commentTextareas) { + // Most users won't feel too sad if they lose a comment with 10 or 20 chars, they can re-type these in seconds. + // But if they have typed more (like 50) chars and the comment is lost, they will be very unhappy. + if (textarea && textarea.value.trim().length > 20) { + textarea.parentElement.scrollIntoView(); + if (!window.confirm('Page will be reloaded, but there are draft comments. Continuing to reload will discard the comments. Continue?')) { + return; + } + break; + } + } + window.location.reload(); +} + export function initRepoCommentForm() { const $commentForm = $('.comment.form'); if ($commentForm.length === 0) { @@ -86,12 +106,15 @@ export function initRepoCommentForm() { let hasUpdateAction = $listMenu.data('action') === 'update'; const items = {}; - $(`.${selector}`).dropdown('setting', 'onHide', () => { - hasUpdateAction = $listMenu.data('action') === 'update'; // Update the var - if (hasUpdateAction) { - // TODO: Add batch functionality and make this 1 network request. - (async function() { - for (const [elementId, item] of Object.entries(items)) { + $(`.${selector}`).dropdown({ + 'action': 'nothing', // do not hide the menu if user presses Enter + fullTextSearch: 'exact', + async onHide() { + hasUpdateAction = $listMenu.data('action') === 'update'; // Update the var + if (hasUpdateAction) { + // TODO: Add batch functionality and make this 1 network request. + const itemEntries = Object.entries(items); + for (const [elementId, item] of itemEntries) { await updateIssuesMeta( item['update-url'], item.action, @@ -99,9 +122,11 @@ export function initRepoCommentForm() { elementId, ); } - window.location.reload(); - })(); - } + if (itemEntries.length) { + reloadConfirmDraftComment(); + } + } + }, }); $listMenu.find('.item:not(.no-select)').on('click', function (e) { @@ -196,7 +221,7 @@ export function initRepoCommentForm() { 'clear', $listMenu.data('issue-id'), '', - ).then(() => window.location.reload()); + ).then(reloadConfirmDraftComment); } $(this).parent().find('.item').each(function () { @@ -239,7 +264,7 @@ export function initRepoCommentForm() { '', $menu.data('issue-id'), $(this).data('id'), - ).then(() => window.location.reload()); + ).then(reloadConfirmDraftComment); } let icon = ''; @@ -272,7 +297,7 @@ export function initRepoCommentForm() { '', $menu.data('issue-id'), $(this).data('id'), - ).then(() => window.location.reload()); + ).then(reloadConfirmDraftComment); } $list.find('.selected').html(''); From e02e752f688d8822d0da6e824f303f3819195eb9 Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Fri, 24 Feb 2023 15:17:03 +0200 Subject: [PATCH 010/340] Fix nil context in RenderMarkdownToHtml (#23092) (#23108) Backport #23092 Fix #23082. This bug is caused by a nil context in https://github.com/go-gitea/gitea/issues/23082#issuecomment-1441276546 . Co-authored-by: Zettat123 Co-authored-by: Lunny Xiao --- modules/templates/helper.go | 3 ++- templates/package/content/cargo.tmpl | 2 +- templates/package/content/chef.tmpl | 2 +- templates/package/content/npm.tmpl | 2 +- templates/package/content/pub.tmpl | 2 +- templates/package/content/pypi.tmpl | 4 ++-- templates/repo/issue/comment_tab.tmpl | 10 +++++----- templates/repo/issue/fields/checkboxes.tmpl | 2 +- templates/repo/issue/fields/dropdown.tmpl | 6 +++--- templates/repo/issue/fields/header.tmpl | 8 ++++---- templates/repo/issue/fields/input.tmpl | 2 +- templates/repo/issue/fields/markdown.tmpl | 2 +- templates/repo/issue/fields/textarea.tmpl | 2 +- 13 files changed, 24 insertions(+), 23 deletions(-) diff --git a/modules/templates/helper.go b/modules/templates/helper.go index 4ffd0a5dee03..b7bd07670cf7 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -174,8 +174,9 @@ func NewFuncMap() []template.FuncMap { "RenderEmojiPlain": emoji.ReplaceAliases, "ReactionToEmoji": ReactionToEmoji, "RenderNote": RenderNote, - "RenderMarkdownToHtml": func(input string) template.HTML { + "RenderMarkdownToHtml": func(ctx context.Context, input string) template.HTML { output, err := markdown.RenderString(&markup.RenderContext{ + Ctx: ctx, URLPrefix: setting.AppSubURL, }, input) if err != nil { diff --git a/templates/package/content/cargo.tmpl b/templates/package/content/cargo.tmpl index f78647ca69c6..410a81d9017a 100644 --- a/templates/package/content/cargo.tmpl +++ b/templates/package/content/cargo.tmpl @@ -26,7 +26,7 @@ git-fetch-with-cli = true
{{if or .PackageDescriptor.Metadata.Description .PackageDescriptor.Metadata.Readme}}

{{.locale.Tr "packages.about"}}

{{if .PackageDescriptor.Metadata.Description}}
{{.PackageDescriptor.Metadata.Description}}
{{end}} - {{if .PackageDescriptor.Metadata.Readme}}
{{RenderMarkdownToHtml .PackageDescriptor.Metadata.Readme}}
{{end}} + {{if .PackageDescriptor.Metadata.Readme}}
{{RenderMarkdownToHtml $.Context .PackageDescriptor.Metadata.Readme}}
{{end}} {{end}} {{if .PackageDescriptor.Metadata.Dependencies}} diff --git a/templates/package/content/chef.tmpl b/templates/package/content/chef.tmpl index edc175f9bedd..d80ecdf40317 100644 --- a/templates/package/content/chef.tmpl +++ b/templates/package/content/chef.tmpl @@ -20,7 +20,7 @@

{{.locale.Tr "packages.about"}}

{{if .PackageDescriptor.Metadata.Description}}

{{.PackageDescriptor.Metadata.Description}}

{{end}} - {{if .PackageDescriptor.Metadata.LongDescription}}{{RenderMarkdownToHtml .PackageDescriptor.Metadata.LongDescription}}{{end}} + {{if .PackageDescriptor.Metadata.LongDescription}}{{RenderMarkdownToHtml $.Context .PackageDescriptor.Metadata.LongDescription}}{{end}}
{{end}} diff --git a/templates/package/content/npm.tmpl b/templates/package/content/npm.tmpl index ea514c5263ad..d0c037b38a6d 100644 --- a/templates/package/content/npm.tmpl +++ b/templates/package/content/npm.tmpl @@ -25,7 +25,7 @@
{{if .PackageDescriptor.Metadata.Readme}}
- {{RenderMarkdownToHtml .PackageDescriptor.Metadata.Readme}} + {{RenderMarkdownToHtml $.Context .PackageDescriptor.Metadata.Readme}}
{{else if .PackageDescriptor.Metadata.Description}} {{.PackageDescriptor.Metadata.Description}} diff --git a/templates/package/content/pub.tmpl b/templates/package/content/pub.tmpl index e81439d4daec..d5676fca5a5d 100644 --- a/templates/package/content/pub.tmpl +++ b/templates/package/content/pub.tmpl @@ -14,6 +14,6 @@ {{if or .PackageDescriptor.Metadata.Description .PackageDescriptor.Metadata.Readme}}

{{.locale.Tr "packages.about"}}

{{if .PackageDescriptor.Metadata.Description}}
{{.PackageDescriptor.Metadata.Description}}
{{end}} - {{if .PackageDescriptor.Metadata.Readme}}
{{RenderMarkdownToHtml .PackageDescriptor.Metadata.Readme}}
{{end}} + {{if .PackageDescriptor.Metadata.Readme}}
{{RenderMarkdownToHtml $.Context .PackageDescriptor.Metadata.Readme}}
{{end}} {{end}} {{end}} diff --git a/templates/package/content/pypi.tmpl b/templates/package/content/pypi.tmpl index 830ba9bd67e5..8dbed5395ebd 100644 --- a/templates/package/content/pypi.tmpl +++ b/templates/package/content/pypi.tmpl @@ -16,9 +16,9 @@

{{if .PackageDescriptor.Metadata.Summary}}{{.PackageDescriptor.Metadata.Summary}}{{end}}

{{if .PackageDescriptor.Metadata.LongDescription}} - {{RenderMarkdownToHtml .PackageDescriptor.Metadata.LongDescription}} + {{RenderMarkdownToHtml $.Context .PackageDescriptor.Metadata.LongDescription}} {{else if .PackageDescriptor.Metadata.Description}} - {{RenderMarkdownToHtml .PackageDescriptor.Metadata.Description}} + {{RenderMarkdownToHtml $.Context .PackageDescriptor.Metadata.Description}} {{end}}
{{end}} diff --git a/templates/repo/issue/comment_tab.tmpl b/templates/repo/issue/comment_tab.tmpl index 86efa8c833b0..b04a3c6bbbb4 100644 --- a/templates/repo/issue/comment_tab.tmpl +++ b/templates/repo/issue/comment_tab.tmpl @@ -2,15 +2,15 @@ {{range .Fields}} {{if eq .Type "input"}} - {{template "repo/issue/fields/input" .}} + {{template "repo/issue/fields/input" Dict "Context" $.Context "item" .}} {{else if eq .Type "markdown"}} - {{template "repo/issue/fields/markdown" .}} + {{template "repo/issue/fields/markdown" Dict "Context" $.Context "item" .}} {{else if eq .Type "textarea"}} - {{template "repo/issue/fields/textarea" .}} + {{template "repo/issue/fields/textarea" Dict "Context" $.Context "item" .}} {{else if eq .Type "dropdown"}} - {{template "repo/issue/fields/dropdown" .}} + {{template "repo/issue/fields/dropdown" Dict "Context" $.Context "item" .}} {{else if eq .Type "checkboxes"}} - {{template "repo/issue/fields/checkboxes" .}} + {{template "repo/issue/fields/checkboxes" Dict "Context" $.Context "item" .}} {{end}} {{end}} {{else}} diff --git a/templates/repo/issue/fields/checkboxes.tmpl b/templates/repo/issue/fields/checkboxes.tmpl index b70334681f22..80835b649a50 100644 --- a/templates/repo/issue/fields/checkboxes.tmpl +++ b/templates/repo/issue/fields/checkboxes.tmpl @@ -1,7 +1,7 @@
{{template "repo/issue/fields/header" .}} {{$field := .}} - {{range $i, $opt := .Attributes.options}} + {{range $i, $opt := .item.Attributes.options}}
diff --git a/templates/repo/issue/fields/dropdown.tmpl b/templates/repo/issue/fields/dropdown.tmpl index 83c2bb4aac89..9adce5602f9a 100644 --- a/templates/repo/issue/fields/dropdown.tmpl +++ b/templates/repo/issue/fields/dropdown.tmpl @@ -1,12 +1,12 @@
{{template "repo/issue/fields/header" .}} {{/* FIXME: required validation */}} -
- +
+
- {{range $i, $opt := .Attributes.options}} + {{range $i, $opt := .item.Attributes.options}}
{{$opt}}
{{end}}
diff --git a/templates/repo/issue/fields/header.tmpl b/templates/repo/issue/fields/header.tmpl index fb8511b4f0bd..6034fed5fd23 100644 --- a/templates/repo/issue/fields/header.tmpl +++ b/templates/repo/issue/fields/header.tmpl @@ -1,6 +1,6 @@ -{{if .Attributes.label}} -

{{.Attributes.label}}{{if .Validations.required}}{{end}}

+{{if .item.Attributes.label}} +

{{.item.Attributes.label}}{{if .item.Validations.required}}{{end}}

{{end}} -{{if .Attributes.description}} - {{RenderMarkdownToHtml .Attributes.description}} +{{if .item.Attributes.description}} + {{RenderMarkdownToHtml .Context .item.Attributes.description}} {{end}} diff --git a/templates/repo/issue/fields/input.tmpl b/templates/repo/issue/fields/input.tmpl index d73354f6d392..3fc8a8651048 100644 --- a/templates/repo/issue/fields/input.tmpl +++ b/templates/repo/issue/fields/input.tmpl @@ -1,4 +1,4 @@
{{template "repo/issue/fields/header" .}} - +
diff --git a/templates/repo/issue/fields/markdown.tmpl b/templates/repo/issue/fields/markdown.tmpl index 8236171523e0..fd5b6afd227f 100644 --- a/templates/repo/issue/fields/markdown.tmpl +++ b/templates/repo/issue/fields/markdown.tmpl @@ -1,3 +1,3 @@
-
{{RenderMarkdownToHtml .Attributes.value}}
+
{{RenderMarkdownToHtml .Context .item.Attributes.value}}
diff --git a/templates/repo/issue/fields/textarea.tmpl b/templates/repo/issue/fields/textarea.tmpl index 5ad82e246084..4b390fc9d6e0 100644 --- a/templates/repo/issue/fields/textarea.tmpl +++ b/templates/repo/issue/fields/textarea.tmpl @@ -2,5 +2,5 @@ {{template "repo/issue/fields/header" .}} {{/* FIXME: preview markdown result */}} {{/* FIXME: required validation for markdown editor */}} - +
From 27e307142b11c9f2fd0a9c534baec833e8485fe1 Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Fri, 24 Feb 2023 16:05:36 +0200 Subject: [PATCH 011/340] Fix db.Find bug (#23115) (#23119) Backport #23115 Caused by #20821 Fix #23110 --- models/db/{list_options.go => list.go} | 4 +-- models/db/list_test.go | 48 ++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) rename models/db/{list_options.go => list.go} (98%) create mode 100644 models/db/list_test.go diff --git a/models/db/list_options.go b/models/db/list.go similarity index 98% rename from models/db/list_options.go rename to models/db/list.go index 2456f90f3b4f..9fb4d0741fde 100644 --- a/models/db/list_options.go +++ b/models/db/list.go @@ -134,7 +134,7 @@ func Find[T any](ctx context.Context, opts FindOptions, objects *[]T) error { if !opts.IsListAll() { sess.Limit(opts.GetSkipTake()) } - return sess.Find(&objects) + return sess.Find(objects) } // Count represents a common count function which accept an options interface @@ -148,5 +148,5 @@ func FindAndCount[T any](ctx context.Context, opts FindOptions, objects *[]T) (i if !opts.IsListAll() { sess.Limit(opts.GetSkipTake()) } - return sess.FindAndCount(&objects) + return sess.FindAndCount(objects) } diff --git a/models/db/list_test.go b/models/db/list_test.go new file mode 100644 index 000000000000..ffef1e4948ee --- /dev/null +++ b/models/db/list_test.go @@ -0,0 +1,48 @@ +// Copyright 2023 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package db_test + +import ( + "testing" + + "code.gitea.io/gitea/models/db" + repo_model "code.gitea.io/gitea/models/repo" + "code.gitea.io/gitea/models/unittest" + + "github.com/stretchr/testify/assert" + "xorm.io/builder" +) + +type mockListOptions struct { + db.ListOptions +} + +func (opts *mockListOptions) IsListAll() bool { + return true +} + +func (opts *mockListOptions) ToConds() builder.Cond { + return builder.NewCond() +} + +func TestFind(t *testing.T) { + assert.NoError(t, unittest.PrepareTestDatabase()) + xe := unittest.GetXORMEngine() + assert.NoError(t, xe.Sync(&repo_model.RepoUnit{})) + + opts := mockListOptions{} + var repoUnits []repo_model.RepoUnit + err := db.Find(db.DefaultContext, &opts, &repoUnits) + assert.NoError(t, err) + assert.EqualValues(t, 83, len(repoUnits)) + + cnt, err := db.Count(db.DefaultContext, &opts, new(repo_model.RepoUnit)) + assert.NoError(t, err) + assert.EqualValues(t, 83, cnt) + + repoUnits = make([]repo_model.RepoUnit, 0, 10) + newCnt, err := db.FindAndCount(db.DefaultContext, &opts, &repoUnits) + assert.NoError(t, err) + assert.EqualValues(t, cnt, newCnt) +} From 5beb29ad35bcf070641b20b2c31013ecda1e2763 Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Fri, 24 Feb 2023 16:47:48 +0200 Subject: [PATCH 012/340] Fix height for sticky head on large screen on PR page (#23111) (#23123) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Backport #23111 Right now on the PR 'File Change' Tab, the file title header sticky to the top on large screens has wrong height, resulting in wrong ui behavior when scrolling down. This PR is to fix this. Before: 截屏2023-02-24 17 12 29 After: 截屏2023-02-24 21 10 12 Co-authored-by: HesterG --- web_src/less/_repository.less | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 83e8e1f338e1..4862e30962a3 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -3269,17 +3269,9 @@ td.blob-excerpt { .ui.attached.header.diff-file-header { &.sticky-2nd-row { position: sticky; - top: 46px; + top: 77px; z-index: 7; - - @media @mediaMd { - top: 77px; - } - - @media @mediaSm { - top: 77px; - } - + @media (max-width: 480px) { position: static; } From f0340c28f15609251434400175a806f0b51e7f74 Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 24 Feb 2023 18:05:36 +0100 Subject: [PATCH 013/340] Change style to improve whitespaces trimming inside inline markdown code (#23093) (#23120) Backport #23093 Given mardown source ``` x ` a` y x `a ` y x ` a ` y ``` Render 2023-02-23 15 33 14 Fixes #23080. Co-authored-by: HesterG Co-authored-by: Lunny Xiao --- web_src/less/markup/content.less | 1 + 1 file changed, 1 insertion(+) diff --git a/web_src/less/markup/content.less b/web_src/less/markup/content.less index 2a9ca3db5a57..725a3d9886f5 100644 --- a/web_src/less/markup/content.less +++ b/web_src/less/markup/content.less @@ -415,6 +415,7 @@ padding: .2em .4em; margin: 0; font-size: 85%; + white-space: break-spaces; background-color: var(--color-markup-code-block); border-radius: 4px; } From 80c1264f4b88e7e2490b0d6f5f32d84a6936b50e Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Fri, 24 Feb 2023 22:17:21 +0200 Subject: [PATCH 014/340] Show empty repos in Admin Repository Management page (#23114) (#23130) Backport #23114 The **Admin Repository Management** page and the **Explore Repository** page both use the `RenderRepoSearch` function. In this function, the `OnlyShowRelevant` search option is `true` when querying repositories for admin page. https://github.com/go-gitea/gitea/blob/edf98a2dc30956c8e04b778bb7f1ce55c14ba963/routers/web/explore/repo.go#L99-L115 Refer to [#19361](https://github.com/go-gitea/gitea/pull/19361/files#diff-8058dfb85557010e0592d586675ec62ce406af7068e6311f39c160deac37f149R497), the repositories with `is_empty=true` will be hidden if `OnlyShowRelevant` is `true`. Administrators should be able to see all repositories. So `OnlyShowRelevant` shouldn't be set to `true` . Co-authored-by: Zettat123 Co-authored-by: Andrew Thornton --- routers/web/admin/repos.go | 7 ++++--- routers/web/explore/repo.go | 37 +++++++++++++++++++------------------ 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/routers/web/admin/repos.go b/routers/web/admin/repos.go index dc5432c54998..1c4754f6d8a3 100644 --- a/routers/web/admin/repos.go +++ b/routers/web/admin/repos.go @@ -33,9 +33,10 @@ func Repos(ctx *context.Context) { ctx.Data["PageIsAdminRepositories"] = true explore.RenderRepoSearch(ctx, &explore.RepoSearchOptions{ - Private: true, - PageSize: setting.UI.Admin.RepoPagingNum, - TplName: tplRepos, + Private: true, + PageSize: setting.UI.Admin.RepoPagingNum, + TplName: tplRepos, + OnlyShowRelevant: false, }) } diff --git a/routers/web/explore/repo.go b/routers/web/explore/repo.go index e9684dd2865d..058971b9b89e 100644 --- a/routers/web/explore/repo.go +++ b/routers/web/explore/repo.go @@ -23,14 +23,17 @@ const ( // RepoSearchOptions when calling search repositories type RepoSearchOptions struct { - OwnerID int64 - Private bool - Restricted bool - PageSize int - TplName base.TplName + OwnerID int64 + Private bool + Restricted bool + PageSize int + OnlyShowRelevant bool + TplName base.TplName } // RenderRepoSearch render repositories search page +// This function is also used to render the Admin Repository Management page. +// The isAdmin param should be set to true when rendering the Admin page. func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) { // Sitemap index for sitemap paths page := int(ctx.ParamsInt64("idx")) @@ -48,11 +51,10 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) { } var ( - repos []*repo_model.Repository - count int64 - err error - orderBy db.SearchOrderBy - onlyShowRelevant bool + repos []*repo_model.Repository + count int64 + err error + orderBy db.SearchOrderBy ) ctx.Data["SortType"] = ctx.FormString("sort") @@ -84,11 +86,9 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) { orderBy = db.SearchOrderByRecentUpdated } - onlyShowRelevant = !ctx.FormBool(relevantReposOnlyParam) - keyword := ctx.FormTrim("q") - ctx.Data["OnlyShowRelevant"] = onlyShowRelevant + ctx.Data["OnlyShowRelevant"] = opts.OnlyShowRelevant topicOnly := ctx.FormBool("topic") ctx.Data["TopicOnly"] = topicOnly @@ -111,7 +111,7 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) { TopicOnly: topicOnly, Language: language, IncludeDescription: setting.UI.SearchRepoDescription, - OnlyShowRelevant: onlyShowRelevant, + OnlyShowRelevant: opts.OnlyShowRelevant, }) if err != nil { ctx.ServerError("SearchRepository", err) @@ -158,9 +158,10 @@ func Repos(ctx *context.Context) { } RenderRepoSearch(ctx, &RepoSearchOptions{ - PageSize: setting.UI.ExplorePagingNum, - OwnerID: ownerID, - Private: ctx.Doer != nil, - TplName: tplExploreRepos, + PageSize: setting.UI.ExplorePagingNum, + OwnerID: ownerID, + Private: ctx.Doer != nil, + TplName: tplExploreRepos, + OnlyShowRelevant: !ctx.FormBool(relevantReposOnlyParam), }) } From 7c3196ceaca30411e5fbfd45eb7ac28b261a85c2 Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Fri, 24 Feb 2023 23:46:11 +0200 Subject: [PATCH 015/340] Avoid warning for system setting when start up (#23054) (#23116) Backport #23054 Partially fix #23050 After #22294 merged, it always has a warning log like `cannot get context cache` when starting up. This should not affect any real life but it's annoying. This PR will fix the problem. That means when starting up, getting the system settings will not try from the cache but will read from the database directly. Co-authored-by: Lunny Xiao Co-authored-by: Lauris BH --- models/avatars/avatar.go | 4 +-- models/avatars/avatar_test.go | 2 +- models/repo.go | 4 +-- models/system/setting.go | 49 ++++++++++++++++++------------ models/system/setting_test.go | 6 ++-- models/unittest/testdb.go | 2 +- models/user/avatar.go | 2 +- modules/repository/commits_test.go | 2 +- modules/templates/helper.go | 2 +- routers/init.go | 2 +- routers/web/admin/config.go | 2 +- 11 files changed, 43 insertions(+), 34 deletions(-) diff --git a/models/avatars/avatar.go b/models/avatars/avatar.go index 6cf05dd284b1..265ee6428e36 100644 --- a/models/avatars/avatar.go +++ b/models/avatars/avatar.go @@ -153,7 +153,7 @@ func generateEmailAvatarLink(ctx context.Context, email string, size int, final return DefaultAvatarLink() } - enableFederatedAvatar := system_model.GetSettingBool(ctx, system_model.KeyPictureEnableFederatedAvatar) + enableFederatedAvatar := system_model.GetSettingWithCacheBool(ctx, system_model.KeyPictureEnableFederatedAvatar) var err error if enableFederatedAvatar && system_model.LibravatarService != nil { @@ -174,7 +174,7 @@ func generateEmailAvatarLink(ctx context.Context, email string, size int, final return urlStr } - disableGravatar := system_model.GetSettingBool(ctx, system_model.KeyPictureDisableGravatar) + disableGravatar := system_model.GetSettingWithCacheBool(ctx, system_model.KeyPictureDisableGravatar) if !disableGravatar { // copy GravatarSourceURL, because we will modify its Path. avatarURLCopy := *system_model.GravatarSourceURL diff --git a/models/avatars/avatar_test.go b/models/avatars/avatar_test.go index a3cb36d0e132..59daaeb6695a 100644 --- a/models/avatars/avatar_test.go +++ b/models/avatars/avatar_test.go @@ -28,7 +28,7 @@ func enableGravatar(t *testing.T) { err := system_model.SetSettingNoVersion(db.DefaultContext, system_model.KeyPictureDisableGravatar, "false") assert.NoError(t, err) setting.GravatarSource = gravatarSource - err = system_model.Init() + err = system_model.Init(db.DefaultContext) assert.NoError(t, err) } diff --git a/models/repo.go b/models/repo.go index 38dc3f1ab184..5a1e2e028e81 100644 --- a/models/repo.go +++ b/models/repo.go @@ -39,9 +39,9 @@ import ( var ItemsPerPage = 40 // Init initialize model -func Init() error { +func Init(ctx context.Context) error { unit.LoadUnitConfig() - return system_model.Init() + return system_model.Init(ctx) } // DeleteRepository deletes a repository for a user or organization. diff --git a/models/system/setting.go b/models/system/setting.go index 098d9a1832b7..6af759dc8a1c 100644 --- a/models/system/setting.go +++ b/models/system/setting.go @@ -79,8 +79,8 @@ func IsErrDataExpired(err error) bool { return ok } -// GetSettingNoCache returns specific setting without using the cache -func GetSettingNoCache(ctx context.Context, key string) (*Setting, error) { +// GetSetting returns specific setting without using the cache +func GetSetting(ctx context.Context, key string) (*Setting, error) { v, err := GetSettings(ctx, []string{key}) if err != nil { return nil, err @@ -93,11 +93,11 @@ func GetSettingNoCache(ctx context.Context, key string) (*Setting, error) { const contextCacheKey = "system_setting" -// GetSetting returns the setting value via the key -func GetSetting(ctx context.Context, key string) (string, error) { +// GetSettingWithCache returns the setting value via the key +func GetSettingWithCache(ctx context.Context, key string) (string, error) { return cache.GetWithContextCache(ctx, contextCacheKey, key, func() (string, error) { return cache.GetString(genSettingCacheKey(key), func() (string, error) { - res, err := GetSettingNoCache(ctx, key) + res, err := GetSetting(ctx, key) if err != nil { return "", err } @@ -110,6 +110,15 @@ func GetSetting(ctx context.Context, key string) (string, error) { // none existing keys and errors are ignored and result in false func GetSettingBool(ctx context.Context, key string) bool { s, _ := GetSetting(ctx, key) + if s == nil { + return false + } + v, _ := strconv.ParseBool(s.SettingValue) + return v +} + +func GetSettingWithCacheBool(ctx context.Context, key string) bool { + s, _ := GetSettingWithCache(ctx, key) v, _ := strconv.ParseBool(s) return v } @@ -120,7 +129,7 @@ func GetSettings(ctx context.Context, keys []string) (map[string]*Setting, error keys[i] = strings.ToLower(keys[i]) } settings := make([]*Setting, 0, len(keys)) - if err := db.GetEngine(db.DefaultContext). + if err := db.GetEngine(ctx). Where(builder.In("setting_key", keys)). Find(&settings); err != nil { return nil, err @@ -151,9 +160,9 @@ func (settings AllSettings) GetVersion(key string) int { } // GetAllSettings returns all settings from user -func GetAllSettings() (AllSettings, error) { +func GetAllSettings(ctx context.Context) (AllSettings, error) { settings := make([]*Setting, 0, 5) - if err := db.GetEngine(db.DefaultContext). + if err := db.GetEngine(ctx). Find(&settings); err != nil { return nil, err } @@ -168,12 +177,12 @@ func GetAllSettings() (AllSettings, error) { func DeleteSetting(ctx context.Context, setting *Setting) error { cache.RemoveContextData(ctx, contextCacheKey, setting.SettingKey) cache.Remove(genSettingCacheKey(setting.SettingKey)) - _, err := db.GetEngine(db.DefaultContext).Delete(setting) + _, err := db.GetEngine(ctx).Delete(setting) return err } func SetSettingNoVersion(ctx context.Context, key, value string) error { - s, err := GetSettingNoCache(ctx, key) + s, err := GetSetting(ctx, key) if IsErrSettingIsNotExist(err) { return SetSetting(ctx, &Setting{ SettingKey: key, @@ -189,7 +198,7 @@ func SetSettingNoVersion(ctx context.Context, key, value string) error { // SetSetting updates a users' setting for a specific key func SetSetting(ctx context.Context, setting *Setting) error { - if err := upsertSettingValue(strings.ToLower(setting.SettingKey), setting.SettingValue, setting.Version); err != nil { + if err := upsertSettingValue(ctx, strings.ToLower(setting.SettingKey), setting.SettingValue, setting.Version); err != nil { return err } @@ -205,8 +214,8 @@ func SetSetting(ctx context.Context, setting *Setting) error { return nil } -func upsertSettingValue(key, value string, version int) error { - return db.WithTx(db.DefaultContext, func(ctx context.Context) error { +func upsertSettingValue(parentCtx context.Context, key, value string, version int) error { + return db.WithTx(parentCtx, func(ctx context.Context) error { e := db.GetEngine(ctx) // here we use a general method to do a safe upsert for different databases (and most transaction levels) @@ -249,9 +258,9 @@ var ( LibravatarService *libravatar.Libravatar ) -func Init() error { +func Init(ctx context.Context) error { var disableGravatar bool - disableGravatarSetting, err := GetSettingNoCache(db.DefaultContext, KeyPictureDisableGravatar) + disableGravatarSetting, err := GetSetting(ctx, KeyPictureDisableGravatar) if IsErrSettingIsNotExist(err) { disableGravatar = setting_module.GetDefaultDisableGravatar() disableGravatarSetting = &Setting{SettingValue: strconv.FormatBool(disableGravatar)} @@ -262,7 +271,7 @@ func Init() error { } var enableFederatedAvatar bool - enableFederatedAvatarSetting, err := GetSettingNoCache(db.DefaultContext, KeyPictureEnableFederatedAvatar) + enableFederatedAvatarSetting, err := GetSetting(ctx, KeyPictureEnableFederatedAvatar) if IsErrSettingIsNotExist(err) { enableFederatedAvatar = setting_module.GetDefaultEnableFederatedAvatar(disableGravatar) enableFederatedAvatarSetting = &Setting{SettingValue: strconv.FormatBool(enableFederatedAvatar)} @@ -275,13 +284,13 @@ func Init() error { if setting_module.OfflineMode { disableGravatar = true enableFederatedAvatar = false - if !GetSettingBool(db.DefaultContext, KeyPictureDisableGravatar) { - if err := SetSettingNoVersion(db.DefaultContext, KeyPictureDisableGravatar, "true"); err != nil { + if !GetSettingBool(ctx, KeyPictureDisableGravatar) { + if err := SetSettingNoVersion(ctx, KeyPictureDisableGravatar, "true"); err != nil { return fmt.Errorf("Failed to set setting %q: %w", KeyPictureDisableGravatar, err) } } - if GetSettingBool(db.DefaultContext, KeyPictureEnableFederatedAvatar) { - if err := SetSettingNoVersion(db.DefaultContext, KeyPictureEnableFederatedAvatar, "false"); err != nil { + if GetSettingBool(ctx, KeyPictureEnableFederatedAvatar) { + if err := SetSettingNoVersion(ctx, KeyPictureEnableFederatedAvatar, "false"); err != nil { return fmt.Errorf("Failed to set setting %q: %w", KeyPictureEnableFederatedAvatar, err) } } diff --git a/models/system/setting_test.go b/models/system/setting_test.go index fbd04088e6d5..e6997ad78326 100644 --- a/models/system/setting_test.go +++ b/models/system/setting_test.go @@ -40,10 +40,10 @@ func TestSettings(t *testing.T) { value, err := system.GetSetting(db.DefaultContext, keyName) assert.NoError(t, err) - assert.EqualValues(t, updatedSetting.SettingValue, value) + assert.EqualValues(t, updatedSetting.SettingValue, value.SettingValue) // get all settings - settings, err = system.GetAllSettings() + settings, err = system.GetAllSettings(db.DefaultContext) assert.NoError(t, err) assert.Len(t, settings, 3) assert.EqualValues(t, updatedSetting.SettingValue, settings[strings.ToLower(updatedSetting.SettingKey)].SettingValue) @@ -51,7 +51,7 @@ func TestSettings(t *testing.T) { // delete setting err = system.DeleteSetting(db.DefaultContext, &system.Setting{SettingKey: strings.ToLower(keyName)}) assert.NoError(t, err) - settings, err = system.GetAllSettings() + settings, err = system.GetAllSettings(db.DefaultContext) assert.NoError(t, err) assert.Len(t, settings, 2) } diff --git a/models/unittest/testdb.go b/models/unittest/testdb.go index 7e327f2bd22e..2bc41084ba87 100644 --- a/models/unittest/testdb.go +++ b/models/unittest/testdb.go @@ -113,7 +113,7 @@ func MainTest(m *testing.M, testOpts *TestOptions) { if err = storage.Init(); err != nil { fatalTestError("storage.Init: %v\n", err) } - if err = system_model.Init(); err != nil { + if err = system_model.Init(db.DefaultContext); err != nil { fatalTestError("models.Init: %v\n", err) } diff --git a/models/user/avatar.go b/models/user/avatar.go index 9af2a9acc220..3d1e2ed20b91 100644 --- a/models/user/avatar.go +++ b/models/user/avatar.go @@ -67,7 +67,7 @@ func (u *User) AvatarLinkWithSize(ctx context.Context, size int) string { useLocalAvatar := false autoGenerateAvatar := false - disableGravatar := system_model.GetSettingBool(ctx, system_model.KeyPictureDisableGravatar) + disableGravatar := system_model.GetSettingWithCacheBool(ctx, system_model.KeyPictureDisableGravatar) switch { case u.UseCustomAvatar: diff --git a/modules/repository/commits_test.go b/modules/repository/commits_test.go index 2bd8de38aa1e..a407083f3a89 100644 --- a/modules/repository/commits_test.go +++ b/modules/repository/commits_test.go @@ -106,7 +106,7 @@ func enableGravatar(t *testing.T) { err := system_model.SetSettingNoVersion(db.DefaultContext, system_model.KeyPictureDisableGravatar, "false") assert.NoError(t, err) setting.GravatarSource = "https://secure.gravatar.com/avatar" - err = system_model.Init() + err = system_model.Init(db.DefaultContext) assert.NoError(t, err) } diff --git a/modules/templates/helper.go b/modules/templates/helper.go index b7bd07670cf7..17ac68dc6bcf 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -92,7 +92,7 @@ func NewFuncMap() []template.FuncMap { return setting.AssetVersion }, "DisableGravatar": func(ctx context.Context) bool { - return system_model.GetSettingBool(ctx, system_model.KeyPictureDisableGravatar) + return system_model.GetSettingWithCacheBool(ctx, system_model.KeyPictureDisableGravatar) }, "DefaultShowFullName": func() bool { return setting.UI.DefaultShowFullName diff --git a/routers/init.go b/routers/init.go index 6a51de669ade..d3f822dc8345 100644 --- a/routers/init.go +++ b/routers/init.go @@ -150,7 +150,7 @@ func GlobalInitInstalled(ctx context.Context) { mustInit(system.Init) mustInit(oauth2.Init) - mustInit(models.Init) + mustInitCtx(ctx, models.Init) mustInit(repo_service.Init) // Booting long running goroutines. diff --git a/routers/web/admin/config.go b/routers/web/admin/config.go index 2566cbe42b2d..075fb423dc5f 100644 --- a/routers/web/admin/config.go +++ b/routers/web/admin/config.go @@ -103,7 +103,7 @@ func Config(ctx *context.Context) { ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminConfig"] = true - systemSettings, err := system_model.GetAllSettings() + systemSettings, err := system_model.GetAllSettings(ctx) if err != nil { ctx.ServerError("system_model.GetAllSettings", err) return From 28625fba5bec01ef8278d6bf4ae40a3319ba301a Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Sat, 25 Feb 2023 05:43:26 +0200 Subject: [PATCH 016/340] Redirect to the commit page after applying patch (#23056) (#23127) Backport #23056 Fixes https://github.com/go-gitea/gitea/issues/22621 Co-authored-by: yp05327 <576951401@qq.com> --- routers/web/repo/patch.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/routers/web/repo/patch.go b/routers/web/repo/patch.go index 0ffec0c4ea46..efb4662496c3 100644 --- a/routers/web/repo/patch.go +++ b/routers/web/repo/patch.go @@ -27,8 +27,6 @@ func NewDiffPatch(ctx *context.Context) { ctx.Data["PageIsPatch"] = true - ctx.Data["TreePath"] = "" - ctx.Data["commit_summary"] = "" ctx.Data["commit_message"] = "" if canCommit { @@ -54,7 +52,6 @@ func NewDiffPatchPost(ctx *context.Context) { branchName = form.NewBranchName } ctx.Data["PageIsPatch"] = true - ctx.Data["TreePath"] = "" ctx.Data["BranchLink"] = ctx.Repo.RepoLink + "/src/" + ctx.Repo.BranchNameSubURL() ctx.Data["FileContent"] = form.Content ctx.Data["commit_summary"] = form.CommitSummary @@ -89,13 +86,14 @@ func NewDiffPatchPost(ctx *context.Context) { message += "\n\n" + form.CommitMessage } - if _, err := files.ApplyDiffPatch(ctx, ctx.Repo.Repository, ctx.Doer, &files.ApplyDiffPatchOptions{ + fileResponse, err := files.ApplyDiffPatch(ctx, ctx.Repo.Repository, ctx.Doer, &files.ApplyDiffPatchOptions{ LastCommitID: form.LastCommit, OldBranch: ctx.Repo.BranchName, NewBranch: branchName, Message: message, Content: strings.ReplaceAll(form.Content, "\r", ""), - }); err != nil { + }) + if err != nil { if models.IsErrBranchAlreadyExists(err) { // User has specified a branch that already exists branchErr := err.(models.ErrBranchAlreadyExists) @@ -114,6 +112,6 @@ func NewDiffPatchPost(ctx *context.Context) { if form.CommitChoice == frmCommitChoiceNewBranch && ctx.Repo.Repository.UnitEnabled(ctx, unit.TypePullRequests) { ctx.Redirect(ctx.Repo.RepoLink + "/compare/" + util.PathEscapeSegments(ctx.Repo.BranchName) + "..." + util.PathEscapeSegments(form.NewBranchName)) } else { - ctx.Redirect(ctx.Repo.RepoLink + "/src/branch/" + util.PathEscapeSegments(branchName) + "/" + util.PathEscapeSegments(form.TreePath)) + ctx.Redirect(ctx.Repo.RepoLink + "/commit/" + fileResponse.Commit.SHA) } } From a3694b698983b27a26c3fe96957d1e81884363e1 Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Sat, 25 Feb 2023 13:30:32 +0200 Subject: [PATCH 017/340] Fix secrets overview page missing from docs sidebar (#23143) (#23145) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Backport #23143 There was a warning while building the docs: `Building sites … WARN 2023/02/25 08:56:37 "/workspace/gitea/docs/content/doc/secrets/overview.en-us.md:1:1": duplicate menu entry with identifier "overview" in menu "sidebar"`. ### Before ![image](https://user-images.githubusercontent.com/20454870/221348741-55cef254-f2ac-4507-9a66-818b406c668f.png) ### After ![image](https://user-images.githubusercontent.com/20454870/221348757-42066303-e1b7-43fe-9c4f-e05182fbabdd.png) Signed-off-by: Yarden Shoham --- docs/content/doc/packages/overview.en-us.md | 2 +- docs/content/doc/secrets/overview.en-us.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/content/doc/packages/overview.en-us.md b/docs/content/doc/packages/overview.en-us.md index 1199d9ede0a9..f93fec639349 100644 --- a/docs/content/doc/packages/overview.en-us.md +++ b/docs/content/doc/packages/overview.en-us.md @@ -9,7 +9,7 @@ menu: parent: "packages" name: "Overview" weight: 1 - identifier: "overview" + identifier: "packages-overview" --- # Package Registry diff --git a/docs/content/doc/secrets/overview.en-us.md b/docs/content/doc/secrets/overview.en-us.md index 21fb65f98d3d..1b63d179d789 100644 --- a/docs/content/doc/secrets/overview.en-us.md +++ b/docs/content/doc/secrets/overview.en-us.md @@ -9,7 +9,7 @@ menu: parent: "secrets" name: "Overview" weight: 1 - identifier: "overview" + identifier: "secrets-overview" --- # Secrets From 27879bc45ed942d966d2316391c3e6c8d190e8a0 Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Sat, 25 Feb 2023 17:25:58 +0200 Subject: [PATCH 018/340] Fix DBConsistency checks on MSSQL (#23132) (#23134) Backport #23132 Unfortunately xorm's `builder.Select(...).From(...)` does not escape the table names. This is mostly not a problem but is a problem with the `user` table. This PR simply escapes the user table. No other uses of `From("user")` where found in the codebase so I think this should be all that is needed. Fix #23064 Signed-off-by: Andrew Thornton Co-authored-by: zeripath --- models/issues/label.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/models/issues/label.go b/models/issues/label.go index 0dd12fb5c9af..90e4eb458f84 100644 --- a/models/issues/label.go +++ b/models/issues/label.go @@ -778,7 +778,7 @@ func CountOrphanedLabels(ctx context.Context) (int64, error) { norepo, err := db.GetEngine(ctx).Table("label"). Where(builder.And( builder.Gt{"repo_id": 0}, - builder.NotIn("repo_id", builder.Select("id").From("repository")), + builder.NotIn("repo_id", builder.Select("id").From("`repository`")), )). Count() if err != nil { @@ -788,7 +788,7 @@ func CountOrphanedLabels(ctx context.Context) (int64, error) { noorg, err := db.GetEngine(ctx).Table("label"). Where(builder.And( builder.Gt{"org_id": 0}, - builder.NotIn("org_id", builder.Select("id").From("user")), + builder.NotIn("org_id", builder.Select("id").From("`user`")), )). Count() if err != nil { @@ -809,7 +809,7 @@ func DeleteOrphanedLabels(ctx context.Context) error { if _, err := db.GetEngine(ctx). Where(builder.And( builder.Gt{"repo_id": 0}, - builder.NotIn("repo_id", builder.Select("id").From("repository")), + builder.NotIn("repo_id", builder.Select("id").From("`repository`")), )). Delete(Label{}); err != nil { return err @@ -819,7 +819,7 @@ func DeleteOrphanedLabels(ctx context.Context) error { if _, err := db.GetEngine(ctx). Where(builder.And( builder.Gt{"org_id": 0}, - builder.NotIn("org_id", builder.Select("id").From("user")), + builder.NotIn("org_id", builder.Select("id").From("`user`")), )). Delete(Label{}); err != nil { return err From 1bc4ffc33739c661891278c3987c16bf63142ad6 Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Sun, 26 Feb 2023 14:20:44 +0200 Subject: [PATCH 019/340] Return 404 instead of 403 if user can not access the repo (#23155) (#23158) Backport #23155 Fixes https://github.com/go-gitea/gitea/issues/23150 Before: ![image](https://user-images.githubusercontent.com/18380374/221390802-2317c6bc-d163-4def-b68b-6bb297143fe2.png) After: ![image](https://user-images.githubusercontent.com/18380374/221390823-87490351-39c3-4a40-b1d2-11fc5b85fa24.png) Co-authored-by: yp05327 <576951401@qq.com> Co-authored-by: Lunny Xiao --- routers/web/repo/http.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/web/repo/http.go b/routers/web/repo/http.go index 9d4ffccc6de5..002843d103c9 100644 --- a/routers/web/repo/http.go +++ b/routers/web/repo/http.go @@ -228,7 +228,7 @@ func httpBase(ctx *context.Context) (h *serviceHandler) { } if !p.CanAccess(accessMode, unitType) { - ctx.PlainText(http.StatusForbidden, "User permission denied") + ctx.PlainText(http.StatusNotFound, "Repository not found") return } } From 9aae54c81f91acaea58ff3ffd2a5cb068a3a3543 Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Mon, 27 Feb 2023 16:43:15 +0200 Subject: [PATCH 020/340] Remove useless comment in #23114 (#23173) (#23175) Backport #23173 The `isAdmin` param is no longer used so the comment should be removed. https://github.com/go-gitea/gitea/blob/d27d36f2f4dd389050e613967ad2a5d02d250acc/routers/web/explore/repo.go#L36-L37 Co-authored-by: Zettat123 --- routers/web/explore/repo.go | 1 - 1 file changed, 1 deletion(-) diff --git a/routers/web/explore/repo.go b/routers/web/explore/repo.go index 058971b9b89e..cc3af8cb2c11 100644 --- a/routers/web/explore/repo.go +++ b/routers/web/explore/repo.go @@ -33,7 +33,6 @@ type RepoSearchOptions struct { // RenderRepoSearch render repositories search page // This function is also used to render the Admin Repository Management page. -// The isAdmin param should be set to true when rendering the Admin page. func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) { // Sitemap index for sitemap paths page := int(ctx.ParamsInt64("idx")) From 9d7ef0ad633a5bac164b67610dc16c95db739d73 Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Mon, 27 Feb 2023 22:59:36 +0200 Subject: [PATCH 021/340] Add word-break to sidebar-item-link (#23146) (#23180) Backport #23146 Fixes https://github.com/go-gitea/gitea/issues/22953 ![image](https://user-images.githubusercontent.com/18380374/221351117-1e4b8922-04ca-4717-8e3b-c338a61bc062.png) Co-authored-by: yp05327 <576951401@qq.com> Co-authored-by: delvh --- web_src/less/_repository.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 4862e30962a3..a8106c5bf8c1 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -3250,8 +3250,8 @@ td.blob-excerpt { } .sidebar-item-link { - display: inline-flex; align-items: center; + word-break: break-all; } .diff-file-box[data-folded="true"] .diff-file-body { From 111c5092878c1701909d89fd1075262cf415d6f2 Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Tue, 28 Feb 2023 00:29:17 +0200 Subject: [PATCH 022/340] Add InsecureSkipVerify to Minio Client for Storage (#23166) (#23177) Backport #23166 Allows using Minio with untrusted certificates Closes #23128 Signed-off-by: Yarden Shoham Co-authored-by: techknowlogick --- custom/conf/app.example.ini | 6 +++++ .../doc/advanced/config-cheat-sheet.en-us.md | 6 +++++ .../doc/advanced/config-cheat-sheet.zh-cn.md | 2 ++ modules/setting/storage.go | 1 + modules/storage/minio.go | 22 +++++++++++-------- 5 files changed, 28 insertions(+), 9 deletions(-) diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index b478785a0770..b7875c12dd8e 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -1871,6 +1871,9 @@ ROUTER = console ;; ;; Minio enabled ssl only available when STORAGE_TYPE is `minio` ;MINIO_USE_SSL = false +;; +;; Minio skip SSL verification available when STORAGE_TYPE is `minio` +;MINIO_INSECURE_SKIP_VERIFY = false ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -2552,6 +2555,9 @@ ROUTER = console ;; ;; Minio enabled ssl only available when STORAGE_TYPE is `minio` ;MINIO_USE_SSL = false +;; +;; Minio skip SSL verification available when STORAGE_TYPE is `minio` +;MINIO_INSECURE_SKIP_VERIFY = false ;[proxy] ;; Enable the proxy, all requests to external via HTTP will be affected diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/advanced/config-cheat-sheet.en-us.md index 36e9919bc709..bd6e61a3ad43 100644 --- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md +++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md @@ -854,6 +854,7 @@ Default templates for project boards: - `MINIO_LOCATION`: **us-east-1**: Minio location to create bucket only available when STORAGE_TYPE is `minio` - `MINIO_BASE_PATH`: **attachments/**: Minio base path on the bucket only available when STORAGE_TYPE is `minio` - `MINIO_USE_SSL`: **false**: Minio enabled ssl only available when STORAGE_TYPE is `minio` +- `MINIO_INSECURE_SKIP_VERIFY`: **false**: Minio skip SSL verification available when STORAGE_TYPE is `minio` ## Log (`log`) @@ -1268,6 +1269,7 @@ is `data/lfs` and the default of `MINIO_BASE_PATH` is `lfs/`. - `MINIO_LOCATION`: **us-east-1**: Minio location to create bucket only available when `STORAGE_TYPE` is `minio` - `MINIO_BASE_PATH`: **lfs/**: Minio base path on the bucket only available when `STORAGE_TYPE` is `minio` - `MINIO_USE_SSL`: **false**: Minio enabled ssl only available when `STORAGE_TYPE` is `minio` +- `MINIO_INSECURE_SKIP_VERIFY`: **false**: Minio skip SSL verification available when STORAGE_TYPE is `minio` ## Storage (`storage`) @@ -1280,6 +1282,7 @@ Default storage configuration for attachments, lfs, avatars and etc. - `MINIO_BUCKET`: **gitea**: Minio bucket to store the data only available when `STORAGE_TYPE` is `minio` - `MINIO_LOCATION`: **us-east-1**: Minio location to create bucket only available when `STORAGE_TYPE` is `minio` - `MINIO_USE_SSL`: **false**: Minio enabled ssl only available when `STORAGE_TYPE` is `minio` +- `MINIO_INSECURE_SKIP_VERIFY`: **false**: Minio skip SSL verification available when STORAGE_TYPE is `minio` And you can also define a customize storage like below: @@ -1298,6 +1301,8 @@ MINIO_BUCKET = gitea MINIO_LOCATION = us-east-1 ; Minio enabled ssl only available when STORAGE_TYPE is `minio` MINIO_USE_SSL = false +; Minio skip SSL verification available when STORAGE_TYPE is `minio` +MINIO_INSECURE_SKIP_VERIFY = false ``` And used by `[attachment]`, `[lfs]` and etc. as `STORAGE_TYPE`. @@ -1318,6 +1323,7 @@ is `data/repo-archive` and the default of `MINIO_BASE_PATH` is `repo-archive/`. - `MINIO_LOCATION`: **us-east-1**: Minio location to create bucket only available when `STORAGE_TYPE` is `minio` - `MINIO_BASE_PATH`: **repo-archive/**: Minio base path on the bucket only available when `STORAGE_TYPE` is `minio` - `MINIO_USE_SSL`: **false**: Minio enabled ssl only available when `STORAGE_TYPE` is `minio` +- `MINIO_INSECURE_SKIP_VERIFY`: **false**: Minio skip SSL verification available when STORAGE_TYPE is `minio` ## Proxy (`proxy`) diff --git a/docs/content/doc/advanced/config-cheat-sheet.zh-cn.md b/docs/content/doc/advanced/config-cheat-sheet.zh-cn.md index 2598f16a1496..aae64d97bac1 100644 --- a/docs/content/doc/advanced/config-cheat-sheet.zh-cn.md +++ b/docs/content/doc/advanced/config-cheat-sheet.zh-cn.md @@ -431,6 +431,8 @@ MINIO_BUCKET = gitea MINIO_LOCATION = us-east-1 ; Minio enabled ssl only available when STORAGE_TYPE is `minio` MINIO_USE_SSL = false +; Minio skip SSL verification available when STORAGE_TYPE is `minio` +MINIO_INSECURE_SKIP_VERIFY = false ``` 然后你在 `[attachment]`, `[lfs]` 等中可以把这个名字用作 `STORAGE_TYPE` 的值。 diff --git a/modules/setting/storage.go b/modules/setting/storage.go index 9197c5f8bb37..4d401614e492 100644 --- a/modules/setting/storage.go +++ b/modules/setting/storage.go @@ -41,6 +41,7 @@ func getStorage(rootCfg ConfigProvider, name, typ string, targetSec *ini.Section sec.Key("MINIO_BUCKET").MustString("gitea") sec.Key("MINIO_LOCATION").MustString("us-east-1") sec.Key("MINIO_USE_SSL").MustBool(false) + sec.Key("MINIO_INSECURE_SKIP_VERIFY").MustBool(false) if targetSec == nil { targetSec, _ = rootCfg.NewSection(name) diff --git a/modules/storage/minio.go b/modules/storage/minio.go index 912f820ede0c..c427d8d7e312 100644 --- a/modules/storage/minio.go +++ b/modules/storage/minio.go @@ -5,7 +5,9 @@ package storage import ( "context" + "crypto/tls" "io" + "net/http" "net/url" "os" "path" @@ -42,13 +44,14 @@ const MinioStorageType Type = "minio" // MinioStorageConfig represents the configuration for a minio storage type MinioStorageConfig struct { - Endpoint string `ini:"MINIO_ENDPOINT"` - AccessKeyID string `ini:"MINIO_ACCESS_KEY_ID"` - SecretAccessKey string `ini:"MINIO_SECRET_ACCESS_KEY"` - Bucket string `ini:"MINIO_BUCKET"` - Location string `ini:"MINIO_LOCATION"` - BasePath string `ini:"MINIO_BASE_PATH"` - UseSSL bool `ini:"MINIO_USE_SSL"` + Endpoint string `ini:"MINIO_ENDPOINT"` + AccessKeyID string `ini:"MINIO_ACCESS_KEY_ID"` + SecretAccessKey string `ini:"MINIO_SECRET_ACCESS_KEY"` + Bucket string `ini:"MINIO_BUCKET"` + Location string `ini:"MINIO_LOCATION"` + BasePath string `ini:"MINIO_BASE_PATH"` + UseSSL bool `ini:"MINIO_USE_SSL"` + InsecureSkipVerify bool `ini:"MINIO_INSECURE_SKIP_VERIFY"` } // MinioStorage returns a minio bucket storage @@ -90,8 +93,9 @@ func NewMinioStorage(ctx context.Context, cfg interface{}) (ObjectStorage, error log.Info("Creating Minio storage at %s:%s with base path %s", config.Endpoint, config.Bucket, config.BasePath) minioClient, err := minio.New(config.Endpoint, &minio.Options{ - Creds: credentials.NewStaticV4(config.AccessKeyID, config.SecretAccessKey, ""), - Secure: config.UseSSL, + Creds: credentials.NewStaticV4(config.AccessKeyID, config.SecretAccessKey, ""), + Secure: config.UseSSL, + Transport: &http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: config.InsecureSkipVerify}}, }) if err != nil { return nil, convertMinioErr(err) From 6c6a7e7d974840f075817f960fa664645f7d1213 Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Tue, 28 Feb 2023 14:42:40 +0200 Subject: [PATCH 023/340] Avoid too long names for actions (#23162) (#23190) Backport #23162 The name of the job or step comes from the workflow file, while the name of the runner comes from its registration. If the strings used for these names are too long, they could cause db issues. Co-authored-by: Jason Song --- models/actions/run.go | 1 + models/actions/task.go | 3 ++- routers/api/actions/runner/runner.go | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/models/actions/run.go b/models/actions/run.go index 14d191c814e3..bf3db3cb23be 100644 --- a/models/actions/run.go +++ b/models/actions/run.go @@ -194,6 +194,7 @@ func InsertRun(ctx context.Context, run *ActionRun, jobs []*jobparser.SingleWork if len(needs) > 0 { status = StatusBlocked } + job.Name, _ = util.SplitStringAtByteN(job.Name, 255) runJobs = append(runJobs, &ActionRunJob{ RunID: run.ID, RepoID: run.RepoID, diff --git a/models/actions/task.go b/models/actions/task.go index 5b6206c34642..ffec4c92aa8d 100644 --- a/models/actions/task.go +++ b/models/actions/task.go @@ -298,8 +298,9 @@ func CreateTaskForRunner(ctx context.Context, runner *ActionRunner) (*ActionTask if len(workflowJob.Steps) > 0 { steps := make([]*ActionTaskStep, len(workflowJob.Steps)) for i, v := range workflowJob.Steps { + name, _ := util.SplitStringAtByteN(v.String(), 255) steps[i] = &ActionTaskStep{ - Name: v.String(), + Name: name, TaskID: task.ID, Index: int64(i), RepoID: task.RepoID, diff --git a/routers/api/actions/runner/runner.go b/routers/api/actions/runner/runner.go index 7dbab9da0a2b..d0bfb2363e0c 100644 --- a/routers/api/actions/runner/runner.go +++ b/routers/api/actions/runner/runner.go @@ -12,6 +12,7 @@ import ( "code.gitea.io/gitea/modules/actions" "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/util" actions_service "code.gitea.io/gitea/services/actions" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" @@ -55,9 +56,10 @@ func (s *Service) Register( } // create new runner + name, _ := util.SplitStringAtByteN(req.Msg.Name, 255) runner := &actions_model.ActionRunner{ UUID: gouuid.New().String(), - Name: req.Msg.Name, + Name: name, OwnerID: runnerToken.OwnerID, RepoID: runnerToken.RepoID, AgentLabels: req.Msg.AgentLabels, From 7528ce60e77ae438efdd1b4f0a9c4a06d3ee2eb4 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Tue, 28 Feb 2023 17:46:23 -0500 Subject: [PATCH 024/340] Make `gitea serv` respect git binary home (#23138) (#23197) Backport #23138 Close #23137 The old code is too old (8-9 years ago) Let's try to execute the git commands from git bin home directly. The verb has been checked above, it could only be: * git-upload-pack * git-upload-archive * git-receive-pack * git-lfs-authenticate Co-authored-by: wxiaoguang --- cmd/serv.go | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/cmd/serv.go b/cmd/serv.go index 145d1b9e935f..d7510845a5be 100644 --- a/cmd/serv.go +++ b/cmd/serv.go @@ -11,6 +11,7 @@ import ( "net/url" "os" "os/exec" + "path/filepath" "regexp" "strconv" "strings" @@ -290,17 +291,21 @@ func runServ(c *cli.Context) error { return nil } - // Special handle for Windows. - if setting.IsWindows { - verb = strings.Replace(verb, "-", " ", 1) - } - var gitcmd *exec.Cmd - verbs := strings.Split(verb, " ") - if len(verbs) == 2 { - gitcmd = exec.CommandContext(ctx, verbs[0], verbs[1], repoPath) - } else { - gitcmd = exec.CommandContext(ctx, verb, repoPath) + gitBinPath := filepath.Dir(git.GitExecutable) // e.g. /usr/bin + gitBinVerb := filepath.Join(gitBinPath, verb) // e.g. /usr/bin/git-upload-pack + if _, err := os.Stat(gitBinVerb); err != nil { + // if the command "git-upload-pack" doesn't exist, try to split "git-upload-pack" to use the sub-command with git + // ps: Windows only has "git.exe" in the bin path, so Windows always uses this way + verbFields := strings.SplitN(verb, "-", 2) + if len(verbFields) == 2 { + // use git binary with the sub-command part: "C:\...\bin\git.exe", "upload-pack", ... + gitcmd = exec.CommandContext(ctx, git.GitExecutable, verbFields[1], repoPath) + } + } + if gitcmd == nil { + // by default, use the verb (it has been checked above by allowedCommands) + gitcmd = exec.CommandContext(ctx, gitBinVerb, repoPath) } process.SetSysProcAttribute(gitcmd) From 13918ad344e197d547e49538c98641c4e9d68b64 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Tue, 28 Feb 2023 17:53:15 -0500 Subject: [PATCH 025/340] Pass `--global` when calling `git config --get`, for consistency with `git config --set` (#23157) (#23199) Backport #23157 This arose out of #22451; it seems we are checking using non-global settings to see if a config value is set, in order to decide whether to call another global(-indeed) configuration command. This PR changes it so that both the check and the set are for global configuration. Co-authored-by: Philip Peterson --- modules/git/git.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/git/git.go b/modules/git/git.go index 2feb242ac5dd..24cfea8c7fe1 100644 --- a/modules/git/git.go +++ b/modules/git/git.go @@ -312,7 +312,7 @@ func CheckGitVersionAtLeast(atLeast string) error { } func configSet(key, value string) error { - stdout, _, err := NewCommand(DefaultContext, "config", "--get").AddDynamicArguments(key).RunStdString(nil) + stdout, _, err := NewCommand(DefaultContext, "config", "--global", "--get").AddDynamicArguments(key).RunStdString(nil) if err != nil && !err.IsExitCode(1) { return fmt.Errorf("failed to get git config %s, err: %w", key, err) } @@ -331,7 +331,7 @@ func configSet(key, value string) error { } func configSetNonExist(key, value string) error { - _, _, err := NewCommand(DefaultContext, "config", "--get").AddDynamicArguments(key).RunStdString(nil) + _, _, err := NewCommand(DefaultContext, "config", "--global", "--get").AddDynamicArguments(key).RunStdString(nil) if err == nil { // already exist return nil @@ -349,7 +349,7 @@ func configSetNonExist(key, value string) error { } func configAddNonExist(key, value string) error { - _, _, err := NewCommand(DefaultContext, "config", "--get").AddDynamicArguments(key, regexp.QuoteMeta(value)).RunStdString(nil) + _, _, err := NewCommand(DefaultContext, "config", "--global", "--get").AddDynamicArguments(key, regexp.QuoteMeta(value)).RunStdString(nil) if err == nil { // already exist return nil @@ -366,7 +366,7 @@ func configAddNonExist(key, value string) error { } func configUnsetAll(key, value string) error { - _, _, err := NewCommand(DefaultContext, "config", "--get").AddDynamicArguments(key).RunStdString(nil) + _, _, err := NewCommand(DefaultContext, "config", "--global", "--get").AddDynamicArguments(key).RunStdString(nil) if err == nil { // exist, need to remove _, _, err = NewCommand(DefaultContext, "config", "--global", "--unset-all").AddDynamicArguments(key, regexp.QuoteMeta(value)).RunStdString(nil) From bb8ef28913fee650c4255c0d252e7c319e34a984 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 1 Mar 2023 06:53:45 +0800 Subject: [PATCH 026/340] Fix Fomantic UI's `touchstart` fastclick, always use `click` for click events (#23065) (#23195) Backport #23065 Using `touchstart` for `click` events is a black magic for mobile browsers (Google: `fastclick`). However, it causes many UX problems if the fastclick is used without careful design. Fomantic UI uses this fastclick for its `dimmer` and `dropdown`, it makes mobile users feel strange when they "touch" the dropdown menu. This PR uses a simple patch to fix that behavior. Then the Fomantic dropdown only uses `click` for click events. This PR is simple enough and won't cause hidden bugs even if the patch doesn't work. In the future, if there are more patches for Fomantic UI, the patches could be placed in a directory like `web_src/fomantic/patches/001-fix-click-touchstart`, etc. Co-authored-by: Lunny Xiao --- Makefile | 2 ++ web_src/fomantic/build/semantic.js | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 717d7cafc660..8bfc7ddcaff8 100644 --- a/Makefile +++ b/Makefile @@ -859,6 +859,8 @@ fomantic: cp -f $(FOMANTIC_WORK_DIR)/theme.config.less $(FOMANTIC_WORK_DIR)/node_modules/fomantic-ui/src/theme.config cp -rf $(FOMANTIC_WORK_DIR)/_site $(FOMANTIC_WORK_DIR)/node_modules/fomantic-ui/src/ cd $(FOMANTIC_WORK_DIR) && npx gulp -f node_modules/fomantic-ui/gulpfile.js build + # fomantic uses "touchstart" as click event for some browsers, it's not ideal, so we force fomantic to always use "click" as click event + $(SED_INPLACE) -e 's/clickEvent[ \t]*=/clickEvent = "click", unstableClickEvent =/g' $(FOMANTIC_WORK_DIR)/build/semantic.js $(SED_INPLACE) -e 's/\r//g' $(FOMANTIC_WORK_DIR)/build/semantic.css $(FOMANTIC_WORK_DIR)/build/semantic.js rm -f $(FOMANTIC_WORK_DIR)/build/*.min.* diff --git a/web_src/fomantic/build/semantic.js b/web_src/fomantic/build/semantic.js index 77c82ca6fdcd..6304c6faf49e 100644 --- a/web_src/fomantic/build/semantic.js +++ b/web_src/fomantic/build/semantic.js @@ -2118,7 +2118,7 @@ $.fn.dimmer = function(parameters) { moduleNamespace = 'module-' + namespace, moduleSelector = $allModules.selector || '', - clickEvent = ('ontouchstart' in document.documentElement) + clickEvent = "click", unstableClickEvent = ('ontouchstart' in document.documentElement) ? 'touchstart' : 'click', @@ -2850,7 +2850,7 @@ $.fn.dropdown = function(parameters) { moduleSelector = $allModules.selector || '', hasTouch = ('ontouchstart' in document.documentElement), - clickEvent = hasTouch + clickEvent = "click", unstableClickEvent = hasTouch ? 'touchstart' : 'click', From ff7057a46dfc3e1db83e26ea770246a7e253f450 Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Wed, 1 Mar 2023 00:54:24 +0200 Subject: [PATCH 027/340] Change button text for commenting and closing an issue at the same time (#23135) (#23182) Backport #23135 Close #10468 Without SimpleMDE/EasyMDE, using Simple Textarea, the button text could be changed when content changes. After introducing SimpleMDE/EasyMDE, there is no code for updating the button text. ![image](https://user-images.githubusercontent.com/2114189/221334034-8d556cd5-1136-4ba0-8faa-a65ffadd7fb7.png) --------- Co-authored-by: wxiaoguang --- web_src/js/features/comp/EasyMDE.js | 3 +++ web_src/js/features/repo-legacy.js | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/web_src/js/features/comp/EasyMDE.js b/web_src/js/features/comp/EasyMDE.js index 182e6b429df4..2979627b0096 100644 --- a/web_src/js/features/comp/EasyMDE.js +++ b/web_src/js/features/comp/EasyMDE.js @@ -77,6 +77,9 @@ export async function createCommentEasyMDE(textarea, easyMDEOptions = {}) { const inputField = easyMDE.codemirror.getInputField(); + easyMDE.codemirror.on('change', (...args) => { + easyMDEOptions?.onChange?.(...args); + }); easyMDE.codemirror.setOption('extraKeys', { 'Cmd-Enter': codeMirrorQuickSubmit, 'Ctrl-Enter': codeMirrorQuickSubmit, diff --git a/web_src/js/features/repo-legacy.js b/web_src/js/features/repo-legacy.js index a9229c0d1e6f..118475e32e2c 100644 --- a/web_src/js/features/repo-legacy.js +++ b/web_src/js/features/repo-legacy.js @@ -85,12 +85,18 @@ export function initRepoCommentForm() { } (async () => { + const $statusButton = $('#status-button'); for (const textarea of $commentForm.find('textarea:not(.review-textarea, .no-easymde)')) { // Don't initialize EasyMDE for the dormant #edit-content-form if (textarea.closest('#edit-content-form')) { continue; } - const easyMDE = await createCommentEasyMDE(textarea); + const easyMDE = await createCommentEasyMDE(textarea, { + 'onChange': () => { + const value = easyMDE?.value().trim(); + $statusButton.text($statusButton.attr(value.length === 0 ? 'data-status' : 'data-status-and-comment')); + }, + }); initEasyMDEImagePaste(easyMDE, $commentForm.find('.dropzone')); } })(); From 3d8412dd51760fd715be7650f5bdc81228f6ba87 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Wed, 1 Mar 2023 15:59:36 -0500 Subject: [PATCH 028/340] Use the correct selector to hide the checkmark of selected labels on clear (#23224) (#23228) Backport #23224 Regression of #10107 (https://github.com/go-gitea/gitea/pull/10107/files#diff-a15e36f2f9c13339f7fdd38bc2887db2ff2945cb8434464318ab9105fcc846bdR460) Fix #22222 Before: the "clear" action couldn't remove these check marks. ![image](https://user-images.githubusercontent.com/2114189/222212998-c9f33459-b71d-4e80-8588-2935f3b7050c.png) After: the "clear" action can remove these check marks. ![image](https://user-images.githubusercontent.com/2114189/222213048-2be98ed0-cac0-4e27-b72c-1dd0ac2637d5.png) Co-authored-by: wxiaoguang --- web_src/js/features/repo-legacy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/js/features/repo-legacy.js b/web_src/js/features/repo-legacy.js index 118475e32e2c..8c2a0207cb0f 100644 --- a/web_src/js/features/repo-legacy.js +++ b/web_src/js/features/repo-legacy.js @@ -232,7 +232,7 @@ export function initRepoCommentForm() { $(this).parent().find('.item').each(function () { $(this).removeClass('checked'); - $(this).find('.octicon').addClass('invisible'); + $(this).find('.octicon-check').addClass('invisible'); }); if (selector === 'select-reviewers-modify' || selector === 'select-assignees-modify') { From 39178b57561110737a54c8ba52d5e96640804df8 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Wed, 1 Mar 2023 18:53:41 -0500 Subject: [PATCH 029/340] Do not create commit graph for temporary repos (#23219) (#23229) Backport #23219 When fetching remotes for conflict checking, skip unnecessary and potentially slow writing of commit graphs. In a test with the Blender repository, this reduces conflict checking time for one pull request from about 2s to 0.1s. Co-authored-by: Brecht Van Lommel --- services/pull/temp_repo.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/services/pull/temp_repo.go b/services/pull/temp_repo.go index e0d6b4a158f6..2bef671555e0 100644 --- a/services/pull/temp_repo.go +++ b/services/pull/temp_repo.go @@ -67,6 +67,12 @@ func createTemporaryRepo(ctx context.Context, pr *issues_model.PullRequest) (str remoteRepoName := "head_repo" baseBranch := "base" + fetchArgs := git.TrustedCmdArgs{"--no-tags"} + if git.CheckGitVersionAtLeast("2.25.0") == nil { + // Writing the commit graph can be slow and is not needed here + fetchArgs = append(fetchArgs, "--no-write-commit-graph") + } + // Add head repo remote. addCacheRepo := func(staging, cache string) error { p := filepath.Join(staging, ".git", "objects", "info", "alternates") @@ -108,7 +114,7 @@ func createTemporaryRepo(ctx context.Context, pr *issues_model.PullRequest) (str outbuf.Reset() errbuf.Reset() - if err := git.NewCommand(ctx, "fetch", "origin", "--no-tags").AddDashesAndList(pr.BaseBranch+":"+baseBranch, pr.BaseBranch+":original_"+baseBranch). + if err := git.NewCommand(ctx, "fetch", "origin").AddArguments(fetchArgs...).AddDashesAndList(pr.BaseBranch+":"+baseBranch, pr.BaseBranch+":original_"+baseBranch). Run(&git.RunOpts{ Dir: tmpBasePath, Stdout: &outbuf, @@ -171,7 +177,7 @@ func createTemporaryRepo(ctx context.Context, pr *issues_model.PullRequest) (str } else { headBranch = pr.GetGitRefName() } - if err := git.NewCommand(ctx, "fetch", "--no-tags").AddDynamicArguments(remoteRepoName, headBranch+":"+trackingBranch). + if err := git.NewCommand(ctx, "fetch").AddArguments(fetchArgs...).AddDynamicArguments(remoteRepoName, headBranch+":"+trackingBranch). Run(&git.RunOpts{ Dir: tmpBasePath, Stdout: &outbuf, From 5d5f907e7fcf1dee4eaca205f8e43f50e5884a58 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Wed, 1 Mar 2023 21:57:34 -0500 Subject: [PATCH 030/340] Add loading yaml label template files (#22976) (#23232) Backport #22976 Extract from #11669 and enhancement to #22585 to support exclusive scoped labels in label templates * Move label template functionality to label module * Fix handling of color codes * Add Advanced label template Co-authored-by: Lauris BH --- models/issues/label.go | 115 ++++++++++------------ models/issues/label_test.go | 2 - modules/label/label.go | 46 +++++++++ modules/label/parser.go | 126 ++++++++++++++++++++++++ modules/label/parser_test.go | 72 ++++++++++++++ modules/options/repo.go | 44 +++++++++ modules/repository/create.go | 3 +- modules/repository/init.go | 134 ++++---------------------- options/label/Advanced.yaml | 70 ++++++++++++++ routers/api/v1/org/label.go | 33 +++---- routers/api/v1/repo/label.go | 52 +++++----- routers/api/v1/repo/repo.go | 3 +- routers/web/org/org_labels.go | 5 +- routers/web/repo/issue_label.go | 5 +- services/migrations/gitea_uploader.go | 19 ++-- 15 files changed, 488 insertions(+), 241 deletions(-) create mode 100644 modules/label/label.go create mode 100644 modules/label/parser.go create mode 100644 modules/label/parser_test.go create mode 100644 modules/options/repo.go create mode 100644 options/label/Advanced.yaml diff --git a/models/issues/label.go b/models/issues/label.go index 90e4eb458f84..35c649e8f24d 100644 --- a/models/issues/label.go +++ b/models/issues/label.go @@ -7,12 +7,12 @@ package issues import ( "context" "fmt" - "regexp" "strconv" "strings" "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/label" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" @@ -78,9 +78,6 @@ func (err ErrLabelNotExist) Unwrap() error { return util.ErrNotExist } -// LabelColorPattern is a regexp witch can validate LabelColor -var LabelColorPattern = regexp.MustCompile("^#?(?:[0-9a-fA-F]{6}|[0-9a-fA-F]{3})$") - // Label represents a label of repository for issues. type Label struct { ID int64 `xorm:"pk autoincr"` @@ -109,12 +106,12 @@ func init() { } // CalOpenIssues sets the number of open issues of a label based on the already stored number of closed issues. -func (label *Label) CalOpenIssues() { - label.NumOpenIssues = label.NumIssues - label.NumClosedIssues +func (l *Label) CalOpenIssues() { + l.NumOpenIssues = l.NumIssues - l.NumClosedIssues } // CalOpenOrgIssues calculates the open issues of a label for a specific repo -func (label *Label) CalOpenOrgIssues(ctx context.Context, repoID, labelID int64) { +func (l *Label) CalOpenOrgIssues(ctx context.Context, repoID, labelID int64) { counts, _ := CountIssuesByRepo(ctx, &IssuesOptions{ RepoID: repoID, LabelIDs: []int64{labelID}, @@ -122,22 +119,22 @@ func (label *Label) CalOpenOrgIssues(ctx context.Context, repoID, labelID int64) }) for _, count := range counts { - label.NumOpenRepoIssues += count + l.NumOpenRepoIssues += count } } // LoadSelectedLabelsAfterClick calculates the set of selected labels when a label is clicked -func (label *Label) LoadSelectedLabelsAfterClick(currentSelectedLabels []int64, currentSelectedExclusiveScopes []string) { +func (l *Label) LoadSelectedLabelsAfterClick(currentSelectedLabels []int64, currentSelectedExclusiveScopes []string) { var labelQuerySlice []string labelSelected := false - labelID := strconv.FormatInt(label.ID, 10) - labelScope := label.ExclusiveScope() + labelID := strconv.FormatInt(l.ID, 10) + labelScope := l.ExclusiveScope() for i, s := range currentSelectedLabels { - if s == label.ID { + if s == l.ID { labelSelected = true - } else if -s == label.ID { + } else if -s == l.ID { labelSelected = true - label.IsExcluded = true + l.IsExcluded = true } else if s != 0 { // Exclude other labels in the same scope from selection if s < 0 || labelScope == "" || labelScope != currentSelectedExclusiveScopes[i] { @@ -148,23 +145,23 @@ func (label *Label) LoadSelectedLabelsAfterClick(currentSelectedLabels []int64, if !labelSelected { labelQuerySlice = append(labelQuerySlice, labelID) } - label.IsSelected = labelSelected - label.QueryString = strings.Join(labelQuerySlice, ",") + l.IsSelected = labelSelected + l.QueryString = strings.Join(labelQuerySlice, ",") } // BelongsToOrg returns true if label is an organization label -func (label *Label) BelongsToOrg() bool { - return label.OrgID > 0 +func (l *Label) BelongsToOrg() bool { + return l.OrgID > 0 } // BelongsToRepo returns true if label is a repository label -func (label *Label) BelongsToRepo() bool { - return label.RepoID > 0 +func (l *Label) BelongsToRepo() bool { + return l.RepoID > 0 } // Get color as RGB values in 0..255 range -func (label *Label) ColorRGB() (float64, float64, float64, error) { - color, err := strconv.ParseUint(label.Color[1:], 16, 64) +func (l *Label) ColorRGB() (float64, float64, float64, error) { + color, err := strconv.ParseUint(l.Color[1:], 16, 64) if err != nil { return 0, 0, 0, err } @@ -176,9 +173,9 @@ func (label *Label) ColorRGB() (float64, float64, float64, error) { } // Determine if label text should be light or dark to be readable on background color -func (label *Label) UseLightTextColor() bool { - if strings.HasPrefix(label.Color, "#") { - if r, g, b, err := label.ColorRGB(); err == nil { +func (l *Label) UseLightTextColor() bool { + if strings.HasPrefix(l.Color, "#") { + if r, g, b, err := l.ColorRGB(); err == nil { // Perceived brightness from: https://www.w3.org/TR/AERT/#color-contrast // In the future WCAG 3 APCA may be a better solution brightness := (0.299*r + 0.587*g + 0.114*b) / 255 @@ -190,40 +187,26 @@ func (label *Label) UseLightTextColor() bool { } // Return scope substring of label name, or empty string if none exists -func (label *Label) ExclusiveScope() string { - if !label.Exclusive { +func (l *Label) ExclusiveScope() string { + if !l.Exclusive { return "" } - lastIndex := strings.LastIndex(label.Name, "/") - if lastIndex == -1 || lastIndex == 0 || lastIndex == len(label.Name)-1 { + lastIndex := strings.LastIndex(l.Name, "/") + if lastIndex == -1 || lastIndex == 0 || lastIndex == len(l.Name)-1 { return "" } - return label.Name[:lastIndex] + return l.Name[:lastIndex] } // NewLabel creates a new label -func NewLabel(ctx context.Context, label *Label) error { - if !LabelColorPattern.MatchString(label.Color) { - return fmt.Errorf("bad color code: %s", label.Color) - } - - // normalize case - label.Color = strings.ToLower(label.Color) - - // add leading hash - if label.Color[0] != '#' { - label.Color = "#" + label.Color - } - - // convert 3-character shorthand into 6-character version - if len(label.Color) == 4 { - r := label.Color[1] - g := label.Color[2] - b := label.Color[3] - label.Color = fmt.Sprintf("#%c%c%c%c%c%c", r, r, g, g, b, b) +func NewLabel(ctx context.Context, l *Label) error { + color, err := label.NormalizeColor(l.Color) + if err != nil { + return err } + l.Color = color - return db.Insert(ctx, label) + return db.Insert(ctx, l) } // NewLabels creates new labels @@ -234,11 +217,14 @@ func NewLabels(labels ...*Label) error { } defer committer.Close() - for _, label := range labels { - if !LabelColorPattern.MatchString(label.Color) { - return fmt.Errorf("bad color code: %s", label.Color) + for _, l := range labels { + color, err := label.NormalizeColor(l.Color) + if err != nil { + return err } - if err := db.Insert(ctx, label); err != nil { + l.Color = color + + if err := db.Insert(ctx, l); err != nil { return err } } @@ -247,15 +233,18 @@ func NewLabels(labels ...*Label) error { // UpdateLabel updates label information. func UpdateLabel(l *Label) error { - if !LabelColorPattern.MatchString(l.Color) { - return fmt.Errorf("bad color code: %s", l.Color) + color, err := label.NormalizeColor(l.Color) + if err != nil { + return err } + l.Color = color + return updateLabelCols(db.DefaultContext, l, "name", "description", "color", "exclusive") } // DeleteLabel delete a label func DeleteLabel(id, labelID int64) error { - label, err := GetLabelByID(db.DefaultContext, labelID) + l, err := GetLabelByID(db.DefaultContext, labelID) if err != nil { if IsErrLabelNotExist(err) { return nil @@ -271,10 +260,10 @@ func DeleteLabel(id, labelID int64) error { sess := db.GetEngine(ctx) - if label.BelongsToOrg() && label.OrgID != id { + if l.BelongsToOrg() && l.OrgID != id { return nil } - if label.BelongsToRepo() && label.RepoID != id { + if l.BelongsToRepo() && l.RepoID != id { return nil } @@ -682,14 +671,14 @@ func newIssueLabels(ctx context.Context, issue *Issue, labels []*Label, doer *us if err = issue.LoadRepo(ctx); err != nil { return err } - for _, label := range labels { + for _, l := range labels { // Don't add already present labels and invalid labels - if HasIssueLabel(ctx, issue.ID, label.ID) || - (label.RepoID != issue.RepoID && label.OrgID != issue.Repo.OwnerID) { + if HasIssueLabel(ctx, issue.ID, l.ID) || + (l.RepoID != issue.RepoID && l.OrgID != issue.Repo.OwnerID) { continue } - if err = newIssueLabel(ctx, issue, label, doer); err != nil { + if err = newIssueLabel(ctx, issue, l, doer); err != nil { return fmt.Errorf("newIssueLabel: %w", err) } } diff --git a/models/issues/label_test.go b/models/issues/label_test.go index 0e45e0db0bac..1f6ce4f42ee7 100644 --- a/models/issues/label_test.go +++ b/models/issues/label_test.go @@ -15,8 +15,6 @@ import ( "github.com/stretchr/testify/assert" ) -// TODO TestGetLabelTemplateFile - func TestLabel_CalOpenIssues(t *testing.T) { assert.NoError(t, unittest.PrepareTestDatabase()) label := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 1}) diff --git a/modules/label/label.go b/modules/label/label.go new file mode 100644 index 000000000000..d3ef0e1dc967 --- /dev/null +++ b/modules/label/label.go @@ -0,0 +1,46 @@ +// Copyright 2023 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package label + +import ( + "fmt" + "regexp" + "strings" +) + +// colorPattern is a regexp which can validate label color +var colorPattern = regexp.MustCompile("^#?(?:[0-9a-fA-F]{6}|[0-9a-fA-F]{3})$") + +// Label represents label information loaded from template +type Label struct { + Name string `yaml:"name"` + Color string `yaml:"color"` + Description string `yaml:"description,omitempty"` + Exclusive bool `yaml:"exclusive,omitempty"` +} + +// NormalizeColor normalizes a color string to a 6-character hex code +func NormalizeColor(color string) (string, error) { + // normalize case + color = strings.TrimSpace(strings.ToLower(color)) + + // add leading hash + if len(color) == 6 || len(color) == 3 { + color = "#" + color + } + + if !colorPattern.MatchString(color) { + return "", fmt.Errorf("bad color code: %s", color) + } + + // convert 3-character shorthand into 6-character version + if len(color) == 4 { + r := color[1] + g := color[2] + b := color[3] + color = fmt.Sprintf("#%c%c%c%c%c%c", r, r, g, g, b, b) + } + + return color, nil +} diff --git a/modules/label/parser.go b/modules/label/parser.go new file mode 100644 index 000000000000..768c72a61b01 --- /dev/null +++ b/modules/label/parser.go @@ -0,0 +1,126 @@ +// Copyright 2023 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package label + +import ( + "errors" + "fmt" + "strings" + + "code.gitea.io/gitea/modules/options" + + "gopkg.in/yaml.v3" +) + +type labelFile struct { + Labels []*Label `yaml:"labels"` +} + +// ErrTemplateLoad represents a "ErrTemplateLoad" kind of error. +type ErrTemplateLoad struct { + TemplateFile string + OriginalError error +} + +// IsErrTemplateLoad checks if an error is a ErrTemplateLoad. +func IsErrTemplateLoad(err error) bool { + _, ok := err.(ErrTemplateLoad) + return ok +} + +func (err ErrTemplateLoad) Error() string { + return fmt.Sprintf("Failed to load label template file '%s': %v", err.TemplateFile, err.OriginalError) +} + +// GetTemplateFile loads the label template file by given name, +// then parses and returns a list of name-color pairs and optionally description. +func GetTemplateFile(name string) ([]*Label, error) { + data, err := options.GetRepoInitFile("label", name+".yaml") + if err == nil && len(data) > 0 { + return parseYamlFormat(name+".yaml", data) + } + + data, err = options.GetRepoInitFile("label", name+".yml") + if err == nil && len(data) > 0 { + return parseYamlFormat(name+".yml", data) + } + + data, err = options.GetRepoInitFile("label", name) + if err != nil { + return nil, ErrTemplateLoad{name, fmt.Errorf("GetRepoInitFile: %w", err)} + } + + return parseLegacyFormat(name, data) +} + +func parseYamlFormat(name string, data []byte) ([]*Label, error) { + lf := &labelFile{} + + if err := yaml.Unmarshal(data, lf); err != nil { + return nil, err + } + + // Validate label data and fix colors + for _, l := range lf.Labels { + l.Color = strings.TrimSpace(l.Color) + if len(l.Name) == 0 || len(l.Color) == 0 { + return nil, ErrTemplateLoad{name, errors.New("label name and color are required fields")} + } + color, err := NormalizeColor(l.Color) + if err != nil { + return nil, ErrTemplateLoad{name, fmt.Errorf("bad HTML color code '%s' in label: %s", l.Color, l.Name)} + } + l.Color = color + } + + return lf.Labels, nil +} + +func parseLegacyFormat(name string, data []byte) ([]*Label, error) { + lines := strings.Split(string(data), "\n") + list := make([]*Label, 0, len(lines)) + for i := 0; i < len(lines); i++ { + line := strings.TrimSpace(lines[i]) + if len(line) == 0 { + continue + } + + parts, description, _ := strings.Cut(line, ";") + + color, name, ok := strings.Cut(parts, " ") + if !ok { + return nil, ErrTemplateLoad{name, fmt.Errorf("line is malformed: %s", line)} + } + + color, err := NormalizeColor(color) + if err != nil { + return nil, ErrTemplateLoad{name, fmt.Errorf("bad HTML color code '%s' in line: %s", color, line)} + } + + list = append(list, &Label{ + Name: strings.TrimSpace(name), + Color: color, + Description: strings.TrimSpace(description), + }) + } + + return list, nil +} + +// LoadFormatted loads the labels' list of a template file as a string separated by comma +func LoadFormatted(name string) (string, error) { + var buf strings.Builder + list, err := GetTemplateFile(name) + if err != nil { + return "", err + } + + for i := 0; i < len(list); i++ { + if i > 0 { + buf.WriteString(", ") + } + buf.WriteString(list[i].Name) + } + return buf.String(), nil +} diff --git a/modules/label/parser_test.go b/modules/label/parser_test.go new file mode 100644 index 000000000000..5c8042f66863 --- /dev/null +++ b/modules/label/parser_test.go @@ -0,0 +1,72 @@ +// Copyright 2023 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package label + +import ( + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func TestYamlParser(t *testing.T) { + data := []byte(`labels: + - name: priority/low + exclusive: true + color: "#0000ee" + description: "Low priority" + - name: priority/medium + exclusive: true + color: "0e0" + description: "Medium priority" + - name: priority/high + exclusive: true + color: "#ee0000" + description: "High priority" + - name: type/bug + color: "#f00" + description: "Bug"`) + + labels, err := parseYamlFormat("test", data) + require.NoError(t, err) + require.Len(t, labels, 4) + assert.Equal(t, "priority/low", labels[0].Name) + assert.True(t, labels[0].Exclusive) + assert.Equal(t, "#0000ee", labels[0].Color) + assert.Equal(t, "Low priority", labels[0].Description) + assert.Equal(t, "priority/medium", labels[1].Name) + assert.True(t, labels[1].Exclusive) + assert.Equal(t, "#00ee00", labels[1].Color) + assert.Equal(t, "Medium priority", labels[1].Description) + assert.Equal(t, "priority/high", labels[2].Name) + assert.True(t, labels[2].Exclusive) + assert.Equal(t, "#ee0000", labels[2].Color) + assert.Equal(t, "High priority", labels[2].Description) + assert.Equal(t, "type/bug", labels[3].Name) + assert.False(t, labels[3].Exclusive) + assert.Equal(t, "#ff0000", labels[3].Color) + assert.Equal(t, "Bug", labels[3].Description) +} + +func TestLegacyParser(t *testing.T) { + data := []byte(`#ee0701 bug ; Something is not working +#cccccc duplicate ; This issue or pull request already exists +#84b6eb enhancement`) + + labels, err := parseLegacyFormat("test", data) + require.NoError(t, err) + require.Len(t, labels, 3) + assert.Equal(t, "bug", labels[0].Name) + assert.False(t, labels[0].Exclusive) + assert.Equal(t, "#ee0701", labels[0].Color) + assert.Equal(t, "Something is not working", labels[0].Description) + assert.Equal(t, "duplicate", labels[1].Name) + assert.False(t, labels[1].Exclusive) + assert.Equal(t, "#cccccc", labels[1].Color) + assert.Equal(t, "This issue or pull request already exists", labels[1].Description) + assert.Equal(t, "enhancement", labels[2].Name) + assert.False(t, labels[2].Exclusive) + assert.Equal(t, "#84b6eb", labels[2].Color) + assert.Empty(t, labels[2].Description) +} diff --git a/modules/options/repo.go b/modules/options/repo.go new file mode 100644 index 000000000000..1480f7808176 --- /dev/null +++ b/modules/options/repo.go @@ -0,0 +1,44 @@ +// Copyright 2023 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package options + +import ( + "fmt" + "os" + "path" + "strings" + + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/util" +) + +// GetRepoInitFile returns repository init files +func GetRepoInitFile(tp, name string) ([]byte, error) { + cleanedName := strings.TrimLeft(path.Clean("/"+name), "/") + relPath := path.Join("options", tp, cleanedName) + + // Use custom file when available. + customPath := path.Join(setting.CustomPath, relPath) + isFile, err := util.IsFile(customPath) + if err != nil { + log.Error("Unable to check if %s is a file. Error: %v", customPath, err) + } + if isFile { + return os.ReadFile(customPath) + } + + switch tp { + case "readme": + return Readme(cleanedName) + case "gitignore": + return Gitignore(cleanedName) + case "license": + return License(cleanedName) + case "label": + return Labels(cleanedName) + default: + return []byte{}, fmt.Errorf("Invalid init file type") + } +} diff --git a/modules/repository/create.go b/modules/repository/create.go index 1704ea792cbf..6a1fa41b6b87 100644 --- a/modules/repository/create.go +++ b/modules/repository/create.go @@ -23,6 +23,7 @@ import ( user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/models/webhook" "code.gitea.io/gitea/modules/git" + "code.gitea.io/gitea/modules/label" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" @@ -189,7 +190,7 @@ func CreateRepository(doer, u *user_model.User, opts CreateRepoOptions) (*repo_m // Check if label template exist if len(opts.IssueLabels) > 0 { - if _, err := GetLabelTemplateFile(opts.IssueLabels); err != nil { + if _, err := label.GetTemplateFile(opts.IssueLabels); err != nil { return nil, err } } diff --git a/modules/repository/init.go b/modules/repository/init.go index 771b68a4916f..49c8d2a904d1 100644 --- a/modules/repository/init.go +++ b/modules/repository/init.go @@ -18,6 +18,7 @@ import ( repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/git" + "code.gitea.io/gitea/modules/label" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/options" "code.gitea.io/gitea/modules/setting" @@ -40,114 +41,6 @@ var ( LabelTemplates map[string]string ) -// ErrIssueLabelTemplateLoad represents a "ErrIssueLabelTemplateLoad" kind of error. -type ErrIssueLabelTemplateLoad struct { - TemplateFile string - OriginalError error -} - -// IsErrIssueLabelTemplateLoad checks if an error is a ErrIssueLabelTemplateLoad. -func IsErrIssueLabelTemplateLoad(err error) bool { - _, ok := err.(ErrIssueLabelTemplateLoad) - return ok -} - -func (err ErrIssueLabelTemplateLoad) Error() string { - return fmt.Sprintf("Failed to load label template file '%s': %v", err.TemplateFile, err.OriginalError) -} - -// GetRepoInitFile returns repository init files -func GetRepoInitFile(tp, name string) ([]byte, error) { - cleanedName := strings.TrimLeft(path.Clean("/"+name), "/") - relPath := path.Join("options", tp, cleanedName) - - // Use custom file when available. - customPath := path.Join(setting.CustomPath, relPath) - isFile, err := util.IsFile(customPath) - if err != nil { - log.Error("Unable to check if %s is a file. Error: %v", customPath, err) - } - if isFile { - return os.ReadFile(customPath) - } - - switch tp { - case "readme": - return options.Readme(cleanedName) - case "gitignore": - return options.Gitignore(cleanedName) - case "license": - return options.License(cleanedName) - case "label": - return options.Labels(cleanedName) - default: - return []byte{}, fmt.Errorf("Invalid init file type") - } -} - -// GetLabelTemplateFile loads the label template file by given name, -// then parses and returns a list of name-color pairs and optionally description. -func GetLabelTemplateFile(name string) ([][3]string, error) { - data, err := GetRepoInitFile("label", name) - if err != nil { - return nil, ErrIssueLabelTemplateLoad{name, fmt.Errorf("GetRepoInitFile: %w", err)} - } - - lines := strings.Split(string(data), "\n") - list := make([][3]string, 0, len(lines)) - for i := 0; i < len(lines); i++ { - line := strings.TrimSpace(lines[i]) - if len(line) == 0 { - continue - } - - parts := strings.SplitN(line, ";", 2) - - fields := strings.SplitN(parts[0], " ", 2) - if len(fields) != 2 { - return nil, ErrIssueLabelTemplateLoad{name, fmt.Errorf("line is malformed: %s", line)} - } - - color := strings.Trim(fields[0], " ") - if len(color) == 6 { - color = "#" + color - } - if !issues_model.LabelColorPattern.MatchString(color) { - return nil, ErrIssueLabelTemplateLoad{name, fmt.Errorf("bad HTML color code in line: %s", line)} - } - - var description string - - if len(parts) > 1 { - description = strings.TrimSpace(parts[1]) - } - - fields[1] = strings.TrimSpace(fields[1]) - list = append(list, [3]string{fields[1], color, description}) - } - - return list, nil -} - -func loadLabels(labelTemplate string) ([]string, error) { - list, err := GetLabelTemplateFile(labelTemplate) - if err != nil { - return nil, err - } - - labels := make([]string, len(list)) - for i := 0; i < len(list); i++ { - labels[i] = list[i][0] - } - return labels, nil -} - -// LoadLabelsFormatted loads the labels' list of a template file as a string separated by comma -func LoadLabelsFormatted(labelTemplate string) (string, error) { - labels, err := loadLabels(labelTemplate) - return strings.Join(labels, ", "), err -} - // LoadRepoConfig loads the repository config func LoadRepoConfig() { // Load .gitignore and license files and readme templates. @@ -158,6 +51,14 @@ func LoadRepoConfig() { if err != nil { log.Fatal("Failed to get %s files: %v", t, err) } + if t == "label" { + for i, f := range files { + ext := strings.ToLower(filepath.Ext(f)) + if ext == ".yaml" || ext == ".yml" { + files[i] = f[:len(f)-len(ext)] + } + } + } customPath := path.Join(setting.CustomPath, "options", t) isDir, err := util.IsDir(customPath) if err != nil { @@ -190,7 +91,7 @@ func LoadRepoConfig() { // Load label templates LabelTemplates = make(map[string]string) for _, templateFile := range LabelTemplatesFiles { - labels, err := LoadLabelsFormatted(templateFile) + labels, err := label.LoadFormatted(templateFile) if err != nil { log.Error("Failed to load labels: %v", err) } @@ -235,7 +136,7 @@ func prepareRepoCommit(ctx context.Context, repo *repo_model.Repository, tmpDir, } // README - data, err := GetRepoInitFile("readme", opts.Readme) + data, err := options.GetRepoInitFile("readme", opts.Readme) if err != nil { return fmt.Errorf("GetRepoInitFile[%s]: %w", opts.Readme, err) } @@ -263,7 +164,7 @@ func prepareRepoCommit(ctx context.Context, repo *repo_model.Repository, tmpDir, var buf bytes.Buffer names := strings.Split(opts.Gitignores, ",") for _, name := range names { - data, err = GetRepoInitFile("gitignore", name) + data, err = options.GetRepoInitFile("gitignore", name) if err != nil { return fmt.Errorf("GetRepoInitFile[%s]: %w", name, err) } @@ -281,7 +182,7 @@ func prepareRepoCommit(ctx context.Context, repo *repo_model.Repository, tmpDir, // LICENSE if len(opts.License) > 0 { - data, err = GetRepoInitFile("license", opts.License) + data, err = options.GetRepoInitFile("license", opts.License) if err != nil { return fmt.Errorf("GetRepoInitFile[%s]: %w", opts.License, err) } @@ -443,7 +344,7 @@ func initRepository(ctx context.Context, repoPath string, u *user_model.User, re // InitializeLabels adds a label set to a repository using a template func InitializeLabels(ctx context.Context, id int64, labelTemplate string, isOrg bool) error { - list, err := GetLabelTemplateFile(labelTemplate) + list, err := label.GetTemplateFile(labelTemplate) if err != nil { return err } @@ -451,9 +352,10 @@ func InitializeLabels(ctx context.Context, id int64, labelTemplate string, isOrg labels := make([]*issues_model.Label, len(list)) for i := 0; i < len(list); i++ { labels[i] = &issues_model.Label{ - Name: list[i][0], - Description: list[i][2], - Color: list[i][1], + Name: list[i].Name, + Exclusive: list[i].Exclusive, + Description: list[i].Description, + Color: list[i].Color, } if isOrg { labels[i].OrgID = id diff --git a/options/label/Advanced.yaml b/options/label/Advanced.yaml new file mode 100644 index 000000000000..27b2c146372b --- /dev/null +++ b/options/label/Advanced.yaml @@ -0,0 +1,70 @@ +labels: + - name: "Kind/Bug" + color: ee0701 + description: Something is not working + - name: "Kind/Feature" + color: 0288d1 + description: New functionality + - name: "Kind/Enhancement" + color: 84b6eb + description: Improve existing functionality + - name: "Kind/Security" + color: 9c27b0 + description: This is security issue + - name: "Kind/Testing" + color: 795548 + description: Issue or pull request related to testing + - name: "Kind/Breaking" + color: c62828 + description: Breaking change that won't be backward compatible + - name: "Kind/Documentation" + color: 37474f + description: Documentation changes + - name: "Reviewed/Duplicate" + exclusive: true + color: 616161 + description: This issue or pull request already exists + - name: "Reviewed/Invalid" + exclusive: true + color: 546e7a + description: Invalid issue + - name: "Reviewed/Confirmed" + exclusive: true + color: 795548 + description: Issue has been confirmed + - name: "Reviewed/Won't Fix" + exclusive: true + color: eeeeee + description: This issue won't be fixed + - name: "Status/Need More Info" + exclusive: true + color: 424242 + description: Feedback is required to reproduce issue or to continue work + - name: "Status/Blocked" + exclusive: true + color: 880e4f + description: Something is blocking this issue or pull request + - name: "Status/Abandoned" + exclusive: true + color: "222222" + description: Somebody has started to work on this but abandoned work + - name: "Priority/Critical" + exclusive: true + color: b71c1c + description: The priority is critical + priority: critical + - name: "Priority/High" + exclusive: true + color: d32f2f + description: The priority is high + priority: high + - name: "Priority/Medium" + exclusive: true + color: e64a19 + description: The priority is medium + priority: medium + - name: "Priority/Low" + exclusive: true + color: 4caf50 + description: The priority is low + priority: low diff --git a/routers/api/v1/org/label.go b/routers/api/v1/org/label.go index 938fe79df64c..183c1e6cc8a8 100644 --- a/routers/api/v1/org/label.go +++ b/routers/api/v1/org/label.go @@ -4,13 +4,13 @@ package org import ( - "fmt" "net/http" "strconv" "strings" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/label" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/web" "code.gitea.io/gitea/routers/api/v1/utils" @@ -84,13 +84,12 @@ func CreateLabel(ctx *context.APIContext) { // "$ref": "#/responses/validationError" form := web.GetForm(ctx).(*api.CreateLabelOption) form.Color = strings.Trim(form.Color, " ") - if len(form.Color) == 6 { - form.Color = "#" + form.Color - } - if !issues_model.LabelColorPattern.MatchString(form.Color) { - ctx.Error(http.StatusUnprocessableEntity, "ColorPattern", fmt.Errorf("bad color code: %s", form.Color)) + color, err := label.NormalizeColor(form.Color) + if err != nil { + ctx.Error(http.StatusUnprocessableEntity, "Color", err) return } + form.Color = color label := &issues_model.Label{ Name: form.Name, @@ -183,7 +182,7 @@ func EditLabel(ctx *context.APIContext) { // "422": // "$ref": "#/responses/validationError" form := web.GetForm(ctx).(*api.EditLabelOption) - label, err := issues_model.GetLabelInOrgByID(ctx, ctx.Org.Organization.ID, ctx.ParamsInt64(":id")) + l, err := issues_model.GetLabelInOrgByID(ctx, ctx.Org.Organization.ID, ctx.ParamsInt64(":id")) if err != nil { if issues_model.IsErrOrgLabelNotExist(err) { ctx.NotFound() @@ -194,30 +193,28 @@ func EditLabel(ctx *context.APIContext) { } if form.Name != nil { - label.Name = *form.Name + l.Name = *form.Name } if form.Exclusive != nil { - label.Exclusive = *form.Exclusive + l.Exclusive = *form.Exclusive } if form.Color != nil { - label.Color = strings.Trim(*form.Color, " ") - if len(label.Color) == 6 { - label.Color = "#" + label.Color - } - if !issues_model.LabelColorPattern.MatchString(label.Color) { - ctx.Error(http.StatusUnprocessableEntity, "ColorPattern", fmt.Errorf("bad color code: %s", label.Color)) + color, err := label.NormalizeColor(*form.Color) + if err != nil { + ctx.Error(http.StatusUnprocessableEntity, "Color", err) return } + l.Color = color } if form.Description != nil { - label.Description = *form.Description + l.Description = *form.Description } - if err := issues_model.UpdateLabel(label); err != nil { + if err := issues_model.UpdateLabel(l); err != nil { ctx.Error(http.StatusInternalServerError, "UpdateLabel", err) return } - ctx.JSON(http.StatusOK, convert.ToLabel(label, nil, ctx.Org.Organization.AsUser())) + ctx.JSON(http.StatusOK, convert.ToLabel(l, nil, ctx.Org.Organization.AsUser())) } // DeleteLabel delete a label for an organization diff --git a/routers/api/v1/repo/label.go b/routers/api/v1/repo/label.go index a06d26e83733..6cb231f596c8 100644 --- a/routers/api/v1/repo/label.go +++ b/routers/api/v1/repo/label.go @@ -5,13 +5,12 @@ package repo import ( - "fmt" "net/http" "strconv" - "strings" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/label" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/web" "code.gitea.io/gitea/routers/api/v1/utils" @@ -93,14 +92,14 @@ func GetLabel(ctx *context.APIContext) { // "$ref": "#/responses/Label" var ( - label *issues_model.Label - err error + l *issues_model.Label + err error ) strID := ctx.Params(":id") if intID, err2 := strconv.ParseInt(strID, 10, 64); err2 != nil { - label, err = issues_model.GetLabelInRepoByName(ctx, ctx.Repo.Repository.ID, strID) + l, err = issues_model.GetLabelInRepoByName(ctx, ctx.Repo.Repository.ID, strID) } else { - label, err = issues_model.GetLabelInRepoByID(ctx, ctx.Repo.Repository.ID, intID) + l, err = issues_model.GetLabelInRepoByID(ctx, ctx.Repo.Repository.ID, intID) } if err != nil { if issues_model.IsErrRepoLabelNotExist(err) { @@ -111,7 +110,7 @@ func GetLabel(ctx *context.APIContext) { return } - ctx.JSON(http.StatusOK, convert.ToLabel(label, ctx.Repo.Repository, nil)) + ctx.JSON(http.StatusOK, convert.ToLabel(l, ctx.Repo.Repository, nil)) } // CreateLabel create a label for a repository @@ -145,28 +144,27 @@ func CreateLabel(ctx *context.APIContext) { // "$ref": "#/responses/validationError" form := web.GetForm(ctx).(*api.CreateLabelOption) - form.Color = strings.Trim(form.Color, " ") - if len(form.Color) == 6 { - form.Color = "#" + form.Color - } - if !issues_model.LabelColorPattern.MatchString(form.Color) { - ctx.Error(http.StatusUnprocessableEntity, "ColorPattern", fmt.Errorf("bad color code: %s", form.Color)) + + color, err := label.NormalizeColor(form.Color) + if err != nil { + ctx.Error(http.StatusUnprocessableEntity, "StringToColor", err) return } + form.Color = color - label := &issues_model.Label{ + l := &issues_model.Label{ Name: form.Name, Exclusive: form.Exclusive, Color: form.Color, RepoID: ctx.Repo.Repository.ID, Description: form.Description, } - if err := issues_model.NewLabel(ctx, label); err != nil { + if err := issues_model.NewLabel(ctx, l); err != nil { ctx.Error(http.StatusInternalServerError, "NewLabel", err) return } - ctx.JSON(http.StatusCreated, convert.ToLabel(label, ctx.Repo.Repository, nil)) + ctx.JSON(http.StatusCreated, convert.ToLabel(l, ctx.Repo.Repository, nil)) } // EditLabel modify a label for a repository @@ -206,7 +204,7 @@ func EditLabel(ctx *context.APIContext) { // "$ref": "#/responses/validationError" form := web.GetForm(ctx).(*api.EditLabelOption) - label, err := issues_model.GetLabelInRepoByID(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":id")) + l, err := issues_model.GetLabelInRepoByID(ctx, ctx.Repo.Repository.ID, ctx.ParamsInt64(":id")) if err != nil { if issues_model.IsErrRepoLabelNotExist(err) { ctx.NotFound() @@ -217,30 +215,28 @@ func EditLabel(ctx *context.APIContext) { } if form.Name != nil { - label.Name = *form.Name + l.Name = *form.Name } if form.Exclusive != nil { - label.Exclusive = *form.Exclusive + l.Exclusive = *form.Exclusive } if form.Color != nil { - label.Color = strings.Trim(*form.Color, " ") - if len(label.Color) == 6 { - label.Color = "#" + label.Color - } - if !issues_model.LabelColorPattern.MatchString(label.Color) { - ctx.Error(http.StatusUnprocessableEntity, "ColorPattern", fmt.Errorf("bad color code: %s", label.Color)) + color, err := label.NormalizeColor(*form.Color) + if err != nil { + ctx.Error(http.StatusUnprocessableEntity, "StringToColor", err) return } + l.Color = color } if form.Description != nil { - label.Description = *form.Description + l.Description = *form.Description } - if err := issues_model.UpdateLabel(label); err != nil { + if err := issues_model.UpdateLabel(l); err != nil { ctx.Error(http.StatusInternalServerError, "UpdateLabel", err) return } - ctx.JSON(http.StatusOK, convert.ToLabel(label, ctx.Repo.Repository, nil)) + ctx.JSON(http.StatusOK, convert.ToLabel(l, ctx.Repo.Repository, nil)) } // DeleteLabel delete a label for a repository diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go index 0395198e209a..8490eb99f93e 100644 --- a/routers/api/v1/repo/repo.go +++ b/routers/api/v1/repo/repo.go @@ -19,6 +19,7 @@ import ( user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/git" + "code.gitea.io/gitea/modules/label" "code.gitea.io/gitea/modules/log" repo_module "code.gitea.io/gitea/modules/repository" "code.gitea.io/gitea/modules/setting" @@ -248,7 +249,7 @@ func CreateUserRepo(ctx *context.APIContext, owner *user_model.User, opt api.Cre ctx.Error(http.StatusConflict, "", "The repository with the same name already exists.") } else if db.IsErrNameReserved(err) || db.IsErrNamePatternNotAllowed(err) || - repo_module.IsErrIssueLabelTemplateLoad(err) { + label.IsErrTemplateLoad(err) { ctx.Error(http.StatusUnprocessableEntity, "", err) } else { ctx.Error(http.StatusInternalServerError, "CreateRepository", err) diff --git a/routers/web/org/org_labels.go b/routers/web/org/org_labels.go index e96627762bd5..9ce05680d7bd 100644 --- a/routers/web/org/org_labels.go +++ b/routers/web/org/org_labels.go @@ -9,6 +9,7 @@ import ( "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/label" repo_module "code.gitea.io/gitea/modules/repository" "code.gitea.io/gitea/modules/web" "code.gitea.io/gitea/services/forms" @@ -103,8 +104,8 @@ func InitializeLabels(ctx *context.Context) { } if err := repo_module.InitializeLabels(ctx, ctx.Org.Organization.ID, form.TemplateName, true); err != nil { - if repo_module.IsErrIssueLabelTemplateLoad(err) { - originalErr := err.(repo_module.ErrIssueLabelTemplateLoad).OriginalError + if label.IsErrTemplateLoad(err) { + originalErr := err.(label.ErrTemplateLoad).OriginalError ctx.Flash.Error(ctx.Tr("repo.issues.label_templates.fail_to_load_file", form.TemplateName, originalErr)) ctx.Redirect(ctx.Org.OrgLink + "/settings/labels") return diff --git a/routers/web/repo/issue_label.go b/routers/web/repo/issue_label.go index d4fece9f014b..31bf85fedb29 100644 --- a/routers/web/repo/issue_label.go +++ b/routers/web/repo/issue_label.go @@ -11,6 +11,7 @@ import ( "code.gitea.io/gitea/models/organization" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/label" "code.gitea.io/gitea/modules/log" repo_module "code.gitea.io/gitea/modules/repository" "code.gitea.io/gitea/modules/web" @@ -41,8 +42,8 @@ func InitializeLabels(ctx *context.Context) { } if err := repo_module.InitializeLabels(ctx, ctx.Repo.Repository.ID, form.TemplateName, false); err != nil { - if repo_module.IsErrIssueLabelTemplateLoad(err) { - originalErr := err.(repo_module.ErrIssueLabelTemplateLoad).OriginalError + if label.IsErrTemplateLoad(err) { + originalErr := err.(label.ErrTemplateLoad).OriginalError ctx.Flash.Error(ctx.Tr("repo.issues.label_templates.fail_to_load_file", form.TemplateName, originalErr)) ctx.Redirect(ctx.Repo.RepoLink + "/labels") return diff --git a/services/migrations/gitea_uploader.go b/services/migrations/gitea_uploader.go index 20370d99f982..8b259a362b1e 100644 --- a/services/migrations/gitea_uploader.go +++ b/services/migrations/gitea_uploader.go @@ -21,6 +21,7 @@ import ( repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/git" + "code.gitea.io/gitea/modules/label" "code.gitea.io/gitea/modules/log" base "code.gitea.io/gitea/modules/migration" repo_module "code.gitea.io/gitea/modules/repository" @@ -217,18 +218,20 @@ func (g *GiteaLocalUploader) CreateMilestones(milestones ...*base.Milestone) err // CreateLabels creates labels func (g *GiteaLocalUploader) CreateLabels(labels ...*base.Label) error { lbs := make([]*issues_model.Label, 0, len(labels)) - for _, label := range labels { - // We must validate color here: - if !issues_model.LabelColorPattern.MatchString("#" + label.Color) { - log.Warn("Invalid label color: #%s for label: %s in migration to %s/%s", label.Color, label.Name, g.repoOwner, g.repoName) - label.Color = "ffffff" + for _, l := range labels { + if color, err := label.NormalizeColor(l.Color); err != nil { + log.Warn("Invalid label color: #%s for label: %s in migration to %s/%s", l.Color, l.Name, g.repoOwner, g.repoName) + l.Color = "#ffffff" + } else { + l.Color = color } lbs = append(lbs, &issues_model.Label{ RepoID: g.repo.ID, - Name: label.Name, - Description: label.Description, - Color: "#" + label.Color, + Name: l.Name, + Exclusive: l.Exclusive, + Description: l.Description, + Color: l.Color, }) } From 4c1e24864ffaa64b2a465cfe5912a73a19ec4c03 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Thu, 2 Mar 2023 00:12:41 -0500 Subject: [PATCH 031/340] Order pull request conflict checking by recently updated, for each push (#23220) (#23225) Backport #23220 When a change is pushed to the default branch and many pull requests are open for that branch, conflict checking can take some time. Previously it would go from oldest to newest pull request. Now prioritize pull requests that are likely being actively worked on or prepared for merging. This only changes the order within one push to one repository, but the change is trivial and can already be quite helpful for smaller Gitea instances where a few repositories have most pull requests. A global order would require deeper changes to queues. Co-authored-by: Brecht Van Lommel Co-authored-by: Lunny Xiao --- models/issues/pull_list.go | 1 + 1 file changed, 1 insertion(+) diff --git a/models/issues/pull_list.go b/models/issues/pull_list.go index f4efd916c867..6c9e8c4e05fb 100644 --- a/models/issues/pull_list.go +++ b/models/issues/pull_list.go @@ -111,6 +111,7 @@ func GetUnmergedPullRequestsByBaseInfo(repoID int64, branch string) ([]*PullRequ return prs, db.GetEngine(db.DefaultContext). Where("base_repo_id=? AND base_branch=? AND has_merged=? AND issue.is_closed=?", repoID, branch, false, false). + OrderBy("issue.updated_unix DESC"). Join("INNER", "issue", "issue.id=pull_request.issue_id"). Find(&prs) } From 085a4debd562dea5f10bd6ade655b69b270396f6 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Thu, 2 Mar 2023 02:12:33 -0500 Subject: [PATCH 032/340] Fix incorrect checkbox behaviors in the dashboard repolist's filter (#23147) (#23205) Backport #23147 Co-author: yp05327 , this PR is based on yp05327's #22813. The problems of the old DashboardRepoList / repolist.tmpl: * It mixes many different frameworks together * It "just works", bug on bug * It uses many anti-pattern of Vue This PR: * Fix bugs and close #22800 * Decouple the "checkbox" elements from Fomantic UI (only use CSS styles) * Simplify the HTML layout * Simplify JS logic * Make it easier to refactor the DashboardRepoList into a pure Vue component in the future. ### Screenshots #### Default ![image](https://user-images.githubusercontent.com/2114189/221355768-a3eb5b23-85b4-4e3d-b906-844d8b15539d.png) #### Click "Archived" to make it checked ![image](https://user-images.githubusercontent.com/2114189/221355777-9a104ddf-52a7-4504-869a-43a73827d802.png) #### Click "Archived" to make it intermediate ![image](https://user-images.githubusercontent.com/2114189/221355802-0f67a073-67ad-4e92-84a6-558c432103a5.png) #### Click "Archived" to make it unchecked ![image](https://user-images.githubusercontent.com/2114189/221355810-acf1d9d8-ccce-47fe-a02e-70cf4e666331.png) Co-authored-by: wxiaoguang Co-authored-by: yp05327 <576951401@qq.com> Co-authored-by: Lunny Xiao --- templates/user/dashboard/repolist.tmpl | 82 ++++++++----------- web_src/js/components/DashboardRepoList.js | 91 +++++++--------------- 2 files changed, 60 insertions(+), 113 deletions(-) diff --git a/templates/user/dashboard/repolist.tmpl b/templates/user/dashboard/repolist.tmpl index 22af578fc39c..97234176bd21 100644 --- a/templates/user/dashboard/repolist.tmpl +++ b/templates/user/dashboard/repolist.tmpl @@ -46,56 +46,38 @@
{{svg "octicon-filter" 16}}
-
- -
- - -
-
- - -
-
- - -
- -
-
- -
- - -
-
- - -
-
- - -
- -
+ +
+ + + +
+ + +
+ + +
+
diff --git a/web_src/js/components/DashboardRepoList.js b/web_src/js/components/DashboardRepoList.js index 0a009e78d151..2328cc83a90c 100644 --- a/web_src/js/components/DashboardRepoList.js +++ b/web_src/js/components/DashboardRepoList.js @@ -87,6 +87,7 @@ function initVueComponents(app) { } return { + hasMounted: false, // accessing $refs in computed() need to wait for mounted tab, repos: [], reposTotalCount: 0, @@ -134,7 +135,19 @@ function initVueComponents(app) { }, repoTypeCount() { return this.counts[`${this.reposFilter}:${this.archivedFilter}:${this.privateFilter}`]; - } + }, + checkboxArchivedFilterTitle() { + return this.hasMounted && this.$refs.checkboxArchivedFilter?.getAttribute(`data-title-${this.archivedFilter}`); + }, + checkboxArchivedFilterProps() { + return {checked: this.archivedFilter === 'archived', indeterminate: this.archivedFilter === 'both'}; + }, + checkboxPrivateFilterTitle() { + return this.hasMounted && this.$refs.checkboxPrivateFilter?.getAttribute(`data-title-${this.privateFilter}`); + }, + checkboxPrivateFilterProps() { + return {checked: this.privateFilter === 'private', indeterminate: this.privateFilter === 'both'}; + }, }, mounted() { @@ -144,10 +157,11 @@ function initVueComponents(app) { initTooltip(elTooltip); } $(el).find('.dropdown').dropdown(); - this.setCheckboxes(); nextTick(() => { this.$refs.search.focus(); }); + + this.hasMounted = true; }, methods: { @@ -156,39 +170,6 @@ function initVueComponents(app) { this.updateHistory(); }, - setCheckboxes() { - switch (this.archivedFilter) { - case 'unarchived': - $('#archivedFilterCheckbox').checkbox('set unchecked'); - break; - case 'archived': - $('#archivedFilterCheckbox').checkbox('set checked'); - break; - case 'both': - $('#archivedFilterCheckbox').checkbox('set indeterminate'); - break; - default: - this.archivedFilter = 'unarchived'; - $('#archivedFilterCheckbox').checkbox('set unchecked'); - break; - } - switch (this.privateFilter) { - case 'public': - $('#privateFilterCheckbox').checkbox('set unchecked'); - break; - case 'private': - $('#privateFilterCheckbox').checkbox('set checked'); - break; - case 'both': - $('#privateFilterCheckbox').checkbox('set indeterminate'); - break; - default: - this.privateFilter = 'both'; - $('#privateFilterCheckbox').checkbox('set indeterminate'); - break; - } - }, - changeReposFilter(filter) { this.reposFilter = filter; this.repos = []; @@ -245,45 +226,29 @@ function initVueComponents(app) { }, toggleArchivedFilter() { - switch (this.archivedFilter) { - case 'both': - this.archivedFilter = 'unarchived'; - break; - case 'unarchived': - this.archivedFilter = 'archived'; - break; - case 'archived': - this.archivedFilter = 'both'; - break; - default: - this.archivedFilter = 'unarchived'; - break; + if (this.archivedFilter === 'unarchived') { + this.archivedFilter = 'archived'; + } else if (this.archivedFilter === 'archived') { + this.archivedFilter = 'both'; + } else { // including both + this.archivedFilter = 'unarchived'; } this.page = 1; this.repos = []; - this.setCheckboxes(); this.counts[`${this.reposFilter}:${this.archivedFilter}:${this.privateFilter}`] = 0; this.searchRepos(); }, togglePrivateFilter() { - switch (this.privateFilter) { - case 'both': - this.privateFilter = 'public'; - break; - case 'public': - this.privateFilter = 'private'; - break; - case 'private': - this.privateFilter = 'both'; - break; - default: - this.privateFilter = 'both'; - break; + if (this.privateFilter === 'both') { + this.privateFilter = 'public'; + } else if (this.privateFilter === 'public') { + this.privateFilter = 'private'; + } else { // including private + this.privateFilter = 'both'; } this.page = 1; this.repos = []; - this.setCheckboxes(); this.counts[`${this.reposFilter}:${this.archivedFilter}:${this.privateFilter}`] = 0; this.searchRepos(); }, From 9843a0b741ae3690cd56bdad538f2cf35ccb2903 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Thu, 2 Mar 2023 11:47:07 -0500 Subject: [PATCH 033/340] Close the temp file when dumping database to make the temp file can be deleted on Windows (#23249) (#23251) Backport #23249 There was no `dbDump.Close()` before, Windows doesn't like to delete opened files. Co-authored-by: wxiaoguang --- cmd/dump.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/dump.go b/cmd/dump.go index c879d2fbee07..600ec4f32eb0 100644 --- a/cmd/dump.go +++ b/cmd/dump.go @@ -272,6 +272,7 @@ func runDump(ctx *cli.Context) error { fatal("Failed to create tmp file: %v", err) } defer func() { + _ = dbDump.Close() if err := util.Remove(dbDump.Name()); err != nil { log.Warn("Unable to remove temporary file: %s: Error: %v", dbDump.Name(), err) } From f8a40dafb946da1eb28ccf6e18de2a151de420fc Mon Sep 17 00:00:00 2001 From: Giteabot Date: Thu, 2 Mar 2023 11:49:05 -0500 Subject: [PATCH 034/340] Allow `
-
+
@@ -62,12 +62,12 @@
-
+
-
+
diff --git a/templates/repo/editor/commit_form.tmpl b/templates/repo/editor/commit_form.tmpl index c6c48c5a838c..7ac0ed3df19f 100644 --- a/templates/repo/editor/commit_form.tmpl +++ b/templates/repo/editor/commit_form.tmpl @@ -58,7 +58,7 @@
-
+
{{svg "octicon-git-branch"}} From 9309098eab6446df0de625dfc2ec67936bdbb0f9 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Thu, 2 Mar 2023 15:05:10 -0500 Subject: [PATCH 036/340] Fix switched citation format (#23250) (#23253) Backport #23250 Due to switched input parameters, the citation texts for Bibtex and Apa were switched. This pull request fixes #23244 Co-authored-by: Blender Defender --- web_src/js/features/citation.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/js/features/citation.js b/web_src/js/features/citation.js index 38288456248d..c40b1adddd14 100644 --- a/web_src/js/features/citation.js +++ b/web_src/js/features/citation.js @@ -2,7 +2,7 @@ import $ from 'jquery'; const {pageData} = window.config; -const initInputCitationValue = async ($citationCopyBibtex, $citationCopyApa) => { +const initInputCitationValue = async ($citationCopyApa, $citationCopyBibtex) => { const [{Cite, plugins}] = await Promise.all([ import(/* webpackChunkName: "citation-js-core" */'@citation-js/core'), import(/* webpackChunkName: "citation-js-formats" */'@citation-js/plugin-software-formats'), From ef8209a953e7af14c1ee5c68678c2da959f511fb Mon Sep 17 00:00:00 2001 From: Giteabot Date: Thu, 2 Mar 2023 17:36:21 -0500 Subject: [PATCH 037/340] Use async await to fix empty quote reply at first time (#23168) (#23256) Backport #23168 The reason why quote reply is empty is when quote reply is clicked, it triggers the click function on `.comment-form-reply` button, and when the first time this function is triggered, easyMDE for the reply has not yet initialized, so that click handler of `.quote-reply` button in `repo-legacy.js` got an `undefined` as easyMDE, and the following lines which put quoted reply into the easyMDE is not executed. The workaround in this PR is to pass the replied content to '.comment-form-reply' button if easyMDE is not yet initialized (quote reply first clicked) and put the replied content into it the after easyMDE is created. Now quote reply on first click: https://user-images.githubusercontent.com/17645053/221452823-fc699d50-1649-4af1-952e-f04fc8d2978e.mov
Update: The above change is not appropriate as stated in the [comment](https://github.com/go-gitea/gitea/pull/23168#issuecomment-1445562284) Use await instead Close #22075. Close #23247. Co-authored-by: HesterG --- web_src/js/features/repo-issue.js | 30 +++++++++++++++++------------- web_src/js/features/repo-legacy.js | 11 +++++------ 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index 4fc8bb5e62d9..4163fb120e52 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -418,6 +418,22 @@ function assignMenuAttributes(menu) { return id; } +export async function handleReply($el) { + hideElem($el); + const form = $el.closest('.comment-code-cloud').find('.comment-form'); + form.removeClass('gt-hidden'); + const $textarea = form.find('textarea'); + let easyMDE = getAttachedEasyMDE($textarea); + if (!easyMDE) { + await attachTribute($textarea.get(), {mentions: true, emoji: true}); + easyMDE = await createCommentEasyMDE($textarea); + } + $textarea.focus(); + easyMDE.codemirror.focus(); + assignMenuAttributes(form.find('.menu')); + return easyMDE; +} + export function initRepoPullRequestReview() { if (window.location.hash && window.location.hash.startsWith('#issuecomment-')) { const commentDiv = $(window.location.hash); @@ -455,19 +471,7 @@ export function initRepoPullRequestReview() { $(document).on('click', 'button.comment-form-reply', async function (e) { e.preventDefault(); - - hideElem($(this)); - const form = $(this).closest('.comment-code-cloud').find('.comment-form'); - form.removeClass('gt-hidden'); - const $textarea = form.find('textarea'); - let easyMDE = getAttachedEasyMDE($textarea); - if (!easyMDE) { - await attachTribute($textarea.get(), {mentions: true, emoji: true}); - easyMDE = await createCommentEasyMDE($textarea); - } - $textarea.focus(); - easyMDE.codemirror.focus(); - assignMenuAttributes(form.find('.menu')); + await handleReply($(this)); }); const $reviewBox = $('.review-box-panel'); diff --git a/web_src/js/features/repo-legacy.js b/web_src/js/features/repo-legacy.js index 8c2a0207cb0f..22113af169e3 100644 --- a/web_src/js/features/repo-legacy.js +++ b/web_src/js/features/repo-legacy.js @@ -6,7 +6,7 @@ import { initRepoIssueBranchSelect, initRepoIssueCodeCommentCancel, initRepoIssueCommentDelete, initRepoIssueComments, initRepoIssueDependencyDelete, initRepoIssueReferenceIssue, initRepoIssueStatusButton, initRepoIssueTitleEdit, initRepoIssueWipToggle, - initRepoPullRequestUpdate, updateIssuesMeta, + initRepoPullRequestUpdate, updateIssuesMeta, handleReply } from './repo-issue.js'; import {initUnicodeEscapeButton} from './repo-unicode-escape.js'; import {svg} from '../svg.js'; @@ -613,15 +613,15 @@ function initRepoIssueCommentEdit() { $(document).on('click', '.edit-content', onEditContent); // Quote reply - $(document).on('click', '.quote-reply', function (event) { + $(document).on('click', '.quote-reply', async function (event) { + event.preventDefault(); const target = $(this).data('target'); const quote = $(`#${target}`).text().replace(/\n/g, '\n> '); const content = `> ${quote}\n\n`; let easyMDE; if ($(this).hasClass('quote-reply-diff')) { - const $parent = $(this).closest('.comment-code-cloud'); - $parent.find('button.comment-form-reply').trigger('click'); - easyMDE = getAttachedEasyMDE($parent.find('[name="content"]')); + const $replyBtn = $(this).closest('.comment-code-cloud').find('button.comment-form-reply'); + easyMDE = await handleReply($replyBtn); } else { // for normal issue/comment page easyMDE = getAttachedEasyMDE($('#comment-form .edit_area')); @@ -637,6 +637,5 @@ function initRepoIssueCommentEdit() { easyMDE.codemirror.setCursor(easyMDE.codemirror.lineCount(), 0); }); } - event.preventDefault(); }); } From 574182e1eb9b2a0b35b7940c11563f07499c40ee Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 3 Mar 2023 12:41:00 -0500 Subject: [PATCH 038/340] Revert relative links to absolute links in mail templates (#23267) (#23269) Backport #23267 Follow #21986 , fix regression. The mail templates should always use `AppURL` (the full absolute URL) Co-authored-by: wxiaoguang --- templates/mail/issue/assigned.tmpl | 2 +- templates/mail/issue/default.tmpl | 6 +++--- templates/mail/release.tmpl | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/mail/issue/assigned.tmpl b/templates/mail/issue/assigned.tmpl index 232a41b56f8a..05bed6902221 100644 --- a/templates/mail/issue/assigned.tmpl +++ b/templates/mail/issue/assigned.tmpl @@ -8,7 +8,7 @@ {{.Subject}} -{{$repo_url := printf "%s" (Escape .Issue.Repo.Link) (Escape .Issue.Repo.FullName)}} +{{$repo_url := printf "%s" (Escape .Issue.Repo.HTMLURL) (Escape .Issue.Repo.FullName)}} {{$link := printf "#%d" (Escape .Link) .Issue.Index}}

diff --git a/templates/mail/issue/default.tmpl b/templates/mail/issue/default.tmpl index 3bda408a0581..64dbb3df681e 100644 --- a/templates/mail/issue/default.tmpl +++ b/templates/mail/issue/default.tmpl @@ -20,11 +20,11 @@ {{if eq .ActionName "push"}}

{{if .Comment.IsForcePush}} - {{$oldCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.Link .Comment.OldCommit}} + {{$oldCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.HTMLURL .Comment.OldCommit}} {{$oldShortSha := ShortSha .Comment.OldCommit}} {{$oldCommitLink := printf "%[2]s" (Escape $oldCommitUrl) (Escape $oldShortSha)}} - {{$newCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.Link .Comment.NewCommit}} + {{$newCommitUrl := printf "%s/commit/%s" .Comment.Issue.PullRequest.BaseRepo.HTMLURL .Comment.NewCommit}} {{$newShortSha := ShortSha .Comment.NewCommit}} {{$newCommitLink := printf "%[2]s" (Escape $newCommitUrl) (Escape $newShortSha)}} @@ -72,7 +72,7 @@

    {{range .Comment.Commits}}
  • - + {{ShortSha .ID.String}} - {{.Summary}}
    • diff --git a/templates/mail/release.tmpl b/templates/mail/release.tmpl index 42504335231a..b2acdce8b2b4 100644 --- a/templates/mail/release.tmpl +++ b/templates/mail/release.tmpl @@ -11,8 +11,8 @@ -{{$release_url := printf "%s" (.Release.Link | Escape) (.Release.TagName | Escape)}} -{{$repo_url := printf "%s" (.Release.Repo.Link | Escape) (.Release.Repo.FullName | Escape)}} +{{$release_url := printf "%s" (.Release.HTMLURL | Escape) (.Release.TagName | Escape)}} +{{$repo_url := printf "%s" (.Release.Repo.HTMLURL | Escape) (.Release.Repo.FullName | Escape)}}

    {{.locale.Tr "mail.release.new.text" .Release.Publisher.Name $release_url $repo_url | Str2html}} From 464bbd747edb3054bca061ad3ddbaf3555790764 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 3 Mar 2023 14:42:46 -0500 Subject: [PATCH 039/340] Fix commit retrieval by tag (#21804) (#23266) Backport #21804 It is not correct to return tag data when commit data is requested, so remove the hacky code that overwrote parts of a commit with parts of a tag. This fixes commit retrieval by tag for both the latest commit in the UI and the commit info on tag webhook events. Fixes: https://github.com/go-gitea/gitea/issues/21687 Replaces: https://github.com/go-gitea/gitea/pull/21693 Screenshot 2022-11-13 at 15 26 37 image Co-authored-by: silverwind --- modules/git/repo_commit_gogit.go | 39 ------------------ modules/git/repo_commit_nogogit.go | 4 -- modules/git/repo_commit_test.go | 5 ++- modules/git/repo_ref_test.go | 12 ++++-- modules/git/repo_stats_test.go | 4 +- modules/git/repo_tag_test.go | 9 ++-- modules/git/repo_test.go | 6 +-- modules/git/tests/repos/repo1_bare/index | Bin 0 -> 65 bytes modules/git/tests/repos/repo1_bare/logs/HEAD | 1 + .../repos/repo1_bare/logs/refs/heads/master | 1 + .../1c/91d130dc5fb75fd2d9f586a058650889cfe7fb | Bin 0 -> 813 bytes .../28/b55526e7100924d864dd89e35c1ea62e7a5a32 | Bin 0 -> 818 bytes .../36/f97d9a96457e2bab511db30fe2db03893ebc64 | Bin 0 -> 770 bytes .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 0 -> 15 bytes .../93/3305878a3c9ad485c29b87fb662a73a9675c4b | Bin 0 -> 770 bytes .../ce/064814f4a0d337b333e646ece456cd39fab612 | Bin 0 -> 815 bytes .../cf/8b0b492a950b358a7ce7f9d01b18aef48a6b2d | Bin 0 -> 827 bytes .../tests/repos/repo1_bare/refs/heads/master | 2 +- .../repos/repo1_bare/refs/tags/signed-tag | 1 + 19 files changed, 26 insertions(+), 58 deletions(-) create mode 100644 modules/git/tests/repos/repo1_bare/index create mode 100644 modules/git/tests/repos/repo1_bare/objects/1c/91d130dc5fb75fd2d9f586a058650889cfe7fb create mode 100644 modules/git/tests/repos/repo1_bare/objects/28/b55526e7100924d864dd89e35c1ea62e7a5a32 create mode 100644 modules/git/tests/repos/repo1_bare/objects/36/f97d9a96457e2bab511db30fe2db03893ebc64 create mode 100644 modules/git/tests/repos/repo1_bare/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 create mode 100644 modules/git/tests/repos/repo1_bare/objects/93/3305878a3c9ad485c29b87fb662a73a9675c4b create mode 100644 modules/git/tests/repos/repo1_bare/objects/ce/064814f4a0d337b333e646ece456cd39fab612 create mode 100644 modules/git/tests/repos/repo1_bare/objects/cf/8b0b492a950b358a7ce7f9d01b18aef48a6b2d create mode 100644 modules/git/tests/repos/repo1_bare/refs/tags/signed-tag diff --git a/modules/git/repo_commit_gogit.go b/modules/git/repo_commit_gogit.go index 72de158e6e11..ce0af936140d 100644 --- a/modules/git/repo_commit_gogit.go +++ b/modules/git/repo_commit_gogit.go @@ -7,7 +7,6 @@ package git import ( - "fmt" "strings" "github.com/go-git/go-git/v5/plumbing" @@ -67,38 +66,6 @@ func (repo *Repository) IsCommitExist(name string) bool { return err == nil } -func convertPGPSignatureForTag(t *object.Tag) *CommitGPGSignature { - if t.PGPSignature == "" { - return nil - } - - var w strings.Builder - var err error - - if _, err = fmt.Fprintf(&w, - "object %s\ntype %s\ntag %s\ntagger ", - t.Target.String(), t.TargetType.Bytes(), t.Name); err != nil { - return nil - } - - if err = t.Tagger.Encode(&w); err != nil { - return nil - } - - if _, err = fmt.Fprintf(&w, "\n\n"); err != nil { - return nil - } - - if _, err = fmt.Fprintf(&w, t.Message); err != nil { - return nil - } - - return &CommitGPGSignature{ - Signature: t.PGPSignature, - Payload: strings.TrimSpace(w.String()) + "\n", - } -} - func (repo *Repository) getCommit(id SHA1) (*Commit, error) { var tagObject *object.Tag @@ -122,12 +89,6 @@ func (repo *Repository) getCommit(id SHA1) (*Commit, error) { commit := convertCommit(gogitCommit) commit.repo = repo - if tagObject != nil { - commit.CommitMessage = strings.TrimSpace(tagObject.Message) - commit.Author = &tagObject.Tagger - commit.Signature = convertPGPSignatureForTag(tagObject) - } - tree, err := gogitCommit.Tree() if err != nil { return nil, err diff --git a/modules/git/repo_commit_nogogit.go b/modules/git/repo_commit_nogogit.go index 7373d01c8efb..d5eb723100a7 100644 --- a/modules/git/repo_commit_nogogit.go +++ b/modules/git/repo_commit_nogogit.go @@ -107,10 +107,6 @@ func (repo *Repository) getCommitFromBatchReader(rd *bufio.Reader, id SHA1) (*Co return nil, err } - commit.CommitMessage = strings.TrimSpace(tag.Message) - commit.Author = tag.Tagger - commit.Signature = tag.Signature - return commit, nil case "commit": commit, err := CommitFromReader(repo, id, io.LimitReader(rd, size)) diff --git a/modules/git/repo_commit_test.go b/modules/git/repo_commit_test.go index af8c0592fe22..729fb0ba103a 100644 --- a/modules/git/repo_commit_test.go +++ b/modules/git/repo_commit_test.go @@ -43,12 +43,13 @@ func TestGetTagCommitWithSignature(t *testing.T) { assert.NoError(t, err) defer bareRepo1.Close() - commit, err := bareRepo1.GetCommit("3ad28a9149a2864384548f3d17ed7f38014c9e8a") + // both the tag and the commit are signed here, this validates only the commit signature + commit, err := bareRepo1.GetCommit("28b55526e7100924d864dd89e35c1ea62e7a5a32") assert.NoError(t, err) assert.NotNil(t, commit) assert.NotNil(t, commit.Signature) // test that signature is not in message - assert.Equal(t, "tag", commit.CommitMessage) + assert.Equal(t, "signed-commit\n", commit.CommitMessage) } func TestGetCommitWithBadCommitID(t *testing.T) { diff --git a/modules/git/repo_ref_test.go b/modules/git/repo_ref_test.go index 776d7ce3e15b..c08ea1276039 100644 --- a/modules/git/repo_ref_test.go +++ b/modules/git/repo_ref_test.go @@ -19,13 +19,14 @@ func TestRepository_GetRefs(t *testing.T) { refs, err := bareRepo1.GetRefs() assert.NoError(t, err) - assert.Len(t, refs, 5) + assert.Len(t, refs, 6) expectedRefs := []string{ BranchPrefix + "branch1", BranchPrefix + "branch2", BranchPrefix + "master", TagPrefix + "test", + TagPrefix + "signed-tag", NotesRef, } @@ -43,9 +44,12 @@ func TestRepository_GetRefsFiltered(t *testing.T) { refs, err := bareRepo1.GetRefsFiltered(TagPrefix) assert.NoError(t, err) - if assert.Len(t, refs, 1) { - assert.Equal(t, TagPrefix+"test", refs[0].Name) + if assert.Len(t, refs, 2) { + assert.Equal(t, TagPrefix+"signed-tag", refs[0].Name) assert.Equal(t, "tag", refs[0].Type) - assert.Equal(t, "3ad28a9149a2864384548f3d17ed7f38014c9e8a", refs[0].Object.String()) + assert.Equal(t, "36f97d9a96457e2bab511db30fe2db03893ebc64", refs[0].Object.String()) + assert.Equal(t, TagPrefix+"test", refs[1].Name) + assert.Equal(t, "tag", refs[1].Type) + assert.Equal(t, "3ad28a9149a2864384548f3d17ed7f38014c9e8a", refs[1].Object.String()) } } diff --git a/modules/git/repo_stats_test.go b/modules/git/repo_stats_test.go index 668ed6799998..3d032385ee28 100644 --- a/modules/git/repo_stats_test.go +++ b/modules/git/repo_stats_test.go @@ -24,9 +24,9 @@ func TestRepository_GetCodeActivityStats(t *testing.T) { assert.NoError(t, err) assert.NotNil(t, code) - assert.EqualValues(t, 9, code.CommitCount) + assert.EqualValues(t, 10, code.CommitCount) assert.EqualValues(t, 3, code.AuthorCount) - assert.EqualValues(t, 9, code.CommitCountInAllBranches) + assert.EqualValues(t, 10, code.CommitCountInAllBranches) assert.EqualValues(t, 10, code.Additions) assert.EqualValues(t, 1, code.Deletions) assert.Len(t, code.Authors, 3) diff --git a/modules/git/repo_tag_test.go b/modules/git/repo_tag_test.go index 589349a72c9e..8ccfec3eb23e 100644 --- a/modules/git/repo_tag_test.go +++ b/modules/git/repo_tag_test.go @@ -25,11 +25,14 @@ func TestRepository_GetTags(t *testing.T) { assert.NoError(t, err) return } - assert.Len(t, tags, 1) + assert.Len(t, tags, 2) assert.Equal(t, len(tags), total) - assert.EqualValues(t, "test", tags[0].Name) - assert.EqualValues(t, "3ad28a9149a2864384548f3d17ed7f38014c9e8a", tags[0].ID.String()) + assert.EqualValues(t, "signed-tag", tags[0].Name) + assert.EqualValues(t, "36f97d9a96457e2bab511db30fe2db03893ebc64", tags[0].ID.String()) assert.EqualValues(t, "tag", tags[0].Type) + assert.EqualValues(t, "test", tags[1].Name) + assert.EqualValues(t, "3ad28a9149a2864384548f3d17ed7f38014c9e8a", tags[1].ID.String()) + assert.EqualValues(t, "tag", tags[1].Type) } func TestRepository_GetTag(t *testing.T) { diff --git a/modules/git/repo_test.go b/modules/git/repo_test.go index 2a39148192cf..044b9d406502 100644 --- a/modules/git/repo_test.go +++ b/modules/git/repo_test.go @@ -14,10 +14,10 @@ func TestGetLatestCommitTime(t *testing.T) { bareRepo1Path := filepath.Join(testReposDir, "repo1_bare") lct, err := GetLatestCommitTime(DefaultContext, bareRepo1Path) assert.NoError(t, err) - // Time is Sun Jul 21 22:43:13 2019 +0200 + // Time is Sun Nov 13 16:40:14 2022 +0100 // which is the time of commit - // feaf4ba6bc635fec442f46ddd4512416ec43c2c2 (refs/heads/master) - assert.EqualValues(t, 1563741793, lct.Unix()) + // ce064814f4a0d337b333e646ece456cd39fab612 (refs/heads/master) + assert.EqualValues(t, 1668354014, lct.Unix()) } func TestRepoIsEmpty(t *testing.T) { diff --git a/modules/git/tests/repos/repo1_bare/index b/modules/git/tests/repos/repo1_bare/index new file mode 100644 index 0000000000000000000000000000000000000000..65d675154f23ffb2d0196e017d44a5e7017550f5 GIT binary patch literal 65 zcmZ?q402{*U|<4bhL9jvS0E+HV4z^Y<=qr}%;|LA&IJiiy? 1563741799 +0200 push +feaf4ba6bc635fec442f46ddd4512416ec43c2c2 ce064814f4a0d337b333e646ece456cd39fab612 silverwind 1668354026 +0100 push diff --git a/modules/git/tests/repos/repo1_bare/logs/refs/heads/master b/modules/git/tests/repos/repo1_bare/logs/refs/heads/master index cef4ca2dcb90..46da5fe0b15a 100644 --- a/modules/git/tests/repos/repo1_bare/logs/refs/heads/master +++ b/modules/git/tests/repos/repo1_bare/logs/refs/heads/master @@ -1 +1,2 @@ 37991dec2c8e592043f47155ce4808d4580f9123 feaf4ba6bc635fec442f46ddd4512416ec43c2c2 silverwind 1563741799 +0200 push +feaf4ba6bc635fec442f46ddd4512416ec43c2c2 ce064814f4a0d337b333e646ece456cd39fab612 silverwind 1668354026 +0100 push diff --git a/modules/git/tests/repos/repo1_bare/objects/1c/91d130dc5fb75fd2d9f586a058650889cfe7fb b/modules/git/tests/repos/repo1_bare/objects/1c/91d130dc5fb75fd2d9f586a058650889cfe7fb new file mode 100644 index 0000000000000000000000000000000000000000..fb50b65f9ff04e722d4df5c734d8d64eb761f61a GIT binary patch literal 813 zcmV+|1Je9>0hN=$TCJP2Xxf!d&!#WIA07Sc z-}rko{0TTwlo3WUgn)${giP`CznT8;VLjH5rUu{sK1DZeAB1KIV%zk|TN3F%IRhBb z9PLkq5Je@VG#Xt$hdF;uMI+|B`^$-rht7qT6PT^;8KmNjgm2tCMa{5fZwl-At?ceGLjp0z2VhpHLt`~~|T~IpX0N;HyZB}>LdTjFq zF7l@L56{<9jqruT;wT6UKle|G7x5{QKjX-fT;KL)2Am#GHi~cTebB~Cf59;O2y2us z(Q_epA>N*DazSBOChX)i#BS@jqmH89jSn6w)NisbKr|Sq zKEn4(PPFFq+6X7=xN~Zc?G8aT6uQR%({_S$js!VG_XbOmqKqND4Fk5fN@vAH~};niGA@JCnu z_3!z6)Bg!1LY7GRS_~FYf>0=a_Ip(SJ6PZ9v8lngzehK1Hvpj>g2c50y4%O*Pc8rf zG?6>&lG|c65Myy2c?(cORdEEv&>#cn;eT#O%WN=JZb^8w&z{L#EE2i{f zDp{`5TdSUEVm^~jFW!M?r|4cH-Ch%`pz7&#OcxOCjAa*vnfw%;_#lA&E?^rm-YuBz zz}NV6*2?Z-9QGZa+xp1k6^WdIMp-WPfn^oTe1GX#JK=j{#R!Rk0KAnMCh%iMGe=Yn0HhHTH69K_~U#mDD#e)F9tuV$mC%km(m@{ITImFHXqaPvM==o#v(HMUn( zlDyj;vP8@8#iz>A9Cq3|tE|O|FHe3E9%f#j#nC)54D~8L&_)2_2crD#DhJV>=IXK6 z)!QoLuVEx%Q9j$6^RN2;!0yv_)I;6m{vC;FZPQ{;f=(R-K=Npw7p>&(l6@8&$7z*5 zR;SrLxVfhH2`L=(B5!Nh!33A^!&=@JAJ1%q47Tw2e$55I3@>}<<=%>|$k`@q=*`dg z5Eawb*CsrD#%s1sHClT+^KxBY6s0CE%3fqU`_+JBR{+jpQw19}dWl+_>)h=Mx1+wf z#s?$l$7^Q2=WdHwM@5CSMwVqJr268sa<%Z*ZeS>YE?!jU<&)_Sdy~)WR5$0bGg2&{ zPo-avmv=s%HQgC*}wMDx!J97h3X@&33Vm3fD-(!hEBf-4BoO w+B0=nHhnM})sQ$Zu`>Mc0{H$)Tub=nj2RgJWsLA8)wL?W{qj=y0e4SSEbv>W@Bjb+ literal 0 HcmV?d00001 diff --git a/modules/git/tests/repos/repo1_bare/objects/36/f97d9a96457e2bab511db30fe2db03893ebc64 b/modules/git/tests/repos/repo1_bare/objects/36/f97d9a96457e2bab511db30fe2db03893ebc64 new file mode 100644 index 0000000000000000000000000000000000000000..c96b843902407e9468f8851fa80fc054dbb045c4 GIT binary patch literal 770 zcmV+d1O5DX0d14HvZGcMMIG}M%Bg1%pbJ#FU1lD{jD&y;E{GXP7Z9MY_iMY#o%lq1 ztzg$l_MBA*o}+$ypT9$szl$Wf0t-&#^UhDQ2zA`e{UXt9*zKT^ob!U@_>^^lEkoI z4PQe!O<7f9Uq4S&G{ZS~ns*2d%@HowK>5dGSmPTXQ4mB)5DK+Xl$)1RZ4A_q8eY2@ z_||YHb<@>)#a4yE*<{=oq^kSRW4+?ewoecRe60M{4gf3atUrm_ZKuJdBTO#p#7zpv zw=+DEDI2tQrM1)IBA$!L&xi%_R9=lc^ldi_EE^tb^$%_+6%=J3u1y;D%-UcYXo}G4rI7Wyu9?uR0&U~S;kG`2#y8}*6I48-3+3Do-kT?PxcE%O8bp__jX$sDQ#?B> zulhl6G1c84gT9Pj(ywxGhZdUNRKFe1Q_7zwv^N3u1`i286*iq(DN}sl>qf0kmy%_3 zI^viZ+2$w#wG4J4YM)gwqq++wU*E22AL3T147JBQtaBdjQiDbgiEY_PxGH&SEx$}` z3nSeUm+>-8{!IY5Jp)=-!z7MU8^(T0&%@iOI(y7c`~C!<{Bq5pl=#|7;-*S^W4N5) z^UxF~$_%+;Z%6oG;xSouf^x_DmVYKe;g(m@k&_*+QBKd9u zA0m_9>7kwHsNy}bRB=vF#@Z^&eN~aN14N^1fBk{|K$8~!I}*i_|8F9H1G4HoaeVlG AYybcN literal 0 HcmV?d00001 diff --git a/modules/git/tests/repos/repo1_bare/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/modules/git/tests/repos/repo1_bare/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 new file mode 100644 index 0000000000000000000000000000000000000000..adf64119a33d7621aeeaa505d30adb58afaa5559 GIT binary patch literal 15 WcmbxJ#nW*WL@ocIdmEWK9r>)TVA>E9|chi@fKQQ|1m;JrD|G8lWLE?Ch7x~Q>^Z7+l zzY@MNdOq_CQQtqMLetuB0yEe|mbq8r*sw#@ADN1QH5N5#z+>U|~0sL6( zL+E0M+1b9?LC;X|p6E@XXjS_kr#cw0prS=Jdn5OJ5~|wvVH?V&tT|{3W~{!4F>Xgi z;rBs~{Yg-)Ad~&QTbxVJPbkn1wHPaog-^tb5~GzY!kFXm;Kf?4YDI-oIe3s`^YkcL z`XfD@YJH+F*knvkJ}nfzkoM>eTL=SsnV>$Xgp8|9va2-RV(-l~$B|?wP;gLt7-scm zS5B5{EK1#c%)K4ec`Vq2yWp;ttu>){clYkB;Pza?*L-JiP3XhzDjGyF;GEr345RdM zJ5SwvTk7D7DQBHcHqB18W7Lt;K0-+wa;T{miC{y_DIF@6cW&Y&SG{ygdFGanmtG#V zl+ChiE~!VjS`2+&qU5U;hq!B!+J>cisE&;Ww%)RR*A7`iG%A)~!1Z8Cce-nBO|S?w zr30dN>XXBHKV0nX%LWJYDrEd1Kg)qQP73>>m1-j9ByHVE^;{sSs+O~r!WO7k)ULd0kV*bOeT~H&k&Dn zMBPl5C@Y0L19<^>u|$O+aHRksgo4O&0t-HbFSvpuvSqINk(}!GiN;smLGllb{`$B5 zz3%@cSpZ~S6c|<@DTZYjqWJmWjQ;oH?Qxsx8~N?;+Ue&0M0%!2hI{j*MscA3(>0k3Gy?^E;pJ^ z(;jH6;gw(KV>;=9N;%49M`e@N^gD+)xSP7^$;_(aXur<-%dx92T_c7dD`Oen3?5=& zB?X=H4Xc7I;hXn*A05#Lj_i&~Nb7vWB*|j|sl1Cj_X@Lv6LV-?2=b&!QY6&pkh9yx zP1NQXCXXzVPY*Am@$?XjHd9t)4Et$8w6}z(i!h(yWMWFDj(tXuP!ftOUaEH3f~Or# zqjvQ!0UA;3AMZ;YH(+~p5Q^63T5{fO5FhxKf~nVpJT`L+pC@;kfg9sMko#>E#~r}m&H zC9~{mtIj10?v&|haRypt;cc89-lkc}>^jsV?Rm5x1PSWr&`ehDi6Yy@O8Al=yiXNt zet(HzvWE2zBCFno>&4qBrqUS9riqL4J45ML zt1~RHNXU$$DAP<4iB@0jWrGp4b23kFh(8yMdol%6gbz>bRqsjLcsYexWom2fz7u@N z;xHcI(jBU6V4jxB&BLoed9R_>9(olKq;9IufUzjktsXKSCBHsr+qj?2BkP=FAM|^H tX@=8L;`x@o11ve0?*#chs$T~2%NhNo{g*MsN2(6NZ@;`GegOD(SMvVNmv;aF literal 0 HcmV?d00001 diff --git a/modules/git/tests/repos/repo1_bare/objects/cf/8b0b492a950b358a7ce7f9d01b18aef48a6b2d b/modules/git/tests/repos/repo1_bare/objects/cf/8b0b492a950b358a7ce7f9d01b18aef48a6b2d new file mode 100644 index 0000000000000000000000000000000000000000..1152b25bb8318c8fcb2b11de4e18b0185eeef25f GIT binary patch literal 827 zcmV-B1H}Az0hN={!^kHPlWms3wlCQ+oE z+1}FGT9cLcZCfumNmAr5%Y+aPGLB-390DrOAjJzzk3Y7OV*+b`<h9v z2Wyta=yLImAN_ z##D*&bKCI+=#th#k4y$ay2Gw=-kC+PcK|`jjN8nf!*%IpqL{nz)+J<)0Kt;-?sL-(FZT_ z_%1)Ja-7%pVDO_(pohavsk_^@gi26+d ze6;S@2WbyS_wCYAJn{`gHf|{Gl+X&cVNE{_>?{D{&>rk%J+H-C*Qr>8L7lv+#3wU9 zCJm0wIdl^Ex4mm`76`^`{>e-?7~HLfhL87JzrHOl@`cpL2B!f?4O<<1H> z!c*yCAY>(?x~CS*PS%Ui^+K^Sv$K<6c#;jaz?R!yMDYw&R`1g=NF?EMQ_H?6NpSVy zyM4QAGd+4Y)b{o;9&AXC&+RZ^mFBsXA1A`|=XQ{IA%T<+tqh+ke}Q{Q%RZ FW`6CxpoRbd literal 0 HcmV?d00001 diff --git a/modules/git/tests/repos/repo1_bare/refs/heads/master b/modules/git/tests/repos/repo1_bare/refs/heads/master index c5e92eb22976..9b0de228190a 100644 --- a/modules/git/tests/repos/repo1_bare/refs/heads/master +++ b/modules/git/tests/repos/repo1_bare/refs/heads/master @@ -1 +1 @@ -feaf4ba6bc635fec442f46ddd4512416ec43c2c2 +ce064814f4a0d337b333e646ece456cd39fab612 diff --git a/modules/git/tests/repos/repo1_bare/refs/tags/signed-tag b/modules/git/tests/repos/repo1_bare/refs/tags/signed-tag new file mode 100644 index 000000000000..3998a68507d4 --- /dev/null +++ b/modules/git/tests/repos/repo1_bare/refs/tags/signed-tag @@ -0,0 +1 @@ +36f97d9a96457e2bab511db30fe2db03893ebc64 From 1322cd7a58f6c2041624eddaf9393cc8947e5a5d Mon Sep 17 00:00:00 2001 From: Giteabot Date: Sat, 4 Mar 2023 00:38:11 -0500 Subject: [PATCH 040/340] Use correct README link to render the README (#23152) (#23264) Backport #23152 `renderReadmeFile` needs `readmeTreelink` as parameter but gets `treeLink`. The values of them look like as following: `treeLink`: `/{OwnerName}/{RepoName}/src/branch/{BranchName}` `readmeTreelink`: `/{OwnerName}/{RepoName}/src/branch/{BranchName}/{ReadmeFileName}` `path.Dir` in https://github.com/go-gitea/gitea/blob/8540fc45b11eff9a73753ca139f8ea5c38509bf5/routers/web/repo/view.go#L316 should convert `readmeTreelink` into `/{OwnerName}/{RepoName}/src/branch/{BranchName}` instead of the current `/{OwnerName}/{RepoName}/src/branch`. Fixes #23151 Co-authored-by: yp05327 <576951401@qq.com> Co-authored-by: Jason Song Co-authored-by: John Olheiser Co-authored-by: silverwind --- models/fixtures/repository.yml | 2 +- routers/web/repo/view.go | 2 +- .../40/3d76c604cb569323864e06a07b85d466924802 | Bin 0 -> 68 bytes .../78/fb907e3a3309eae4fe8fef030874cebbf1cd5e | Bin 0 -> 158 bytes .../f3/fa0f5cc797fc4c02a1b8bec9de4b2072fcdbdf | Bin 0 -> 53 bytes .../repo1.git/refs/heads/home-md-img-check | 1 + tests/integration/repo_test.go | 20 ++++++++++++++++++ 7 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 tests/gitea-repositories-meta/user2/repo1.git/objects/40/3d76c604cb569323864e06a07b85d466924802 create mode 100644 tests/gitea-repositories-meta/user2/repo1.git/objects/78/fb907e3a3309eae4fe8fef030874cebbf1cd5e create mode 100644 tests/gitea-repositories-meta/user2/repo1.git/objects/f3/fa0f5cc797fc4c02a1b8bec9de4b2072fcdbdf create mode 100644 tests/gitea-repositories-meta/user2/repo1.git/refs/heads/home-md-img-check diff --git a/models/fixtures/repository.yml b/models/fixtures/repository.yml index 58f9b919acfb..dd8facb7a313 100644 --- a/models/fixtures/repository.yml +++ b/models/fixtures/repository.yml @@ -25,7 +25,7 @@ fork_id: 0 is_template: false template_id: 0 - size: 6708 + size: 7028 is_fsck_enabled: true close_issues_via_commit_in_any_branch: false diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index e3c61fa408bd..8663e1138208 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -186,7 +186,7 @@ func renderDirectory(ctx *context.Context, treeLink string) { return } - renderReadmeFile(ctx, readmeFile, treeLink) + renderReadmeFile(ctx, readmeFile, fmt.Sprintf("%s/%s", treeLink, readmeFile.name)) } // localizedExtensions prepends the provided language code with and without a diff --git a/tests/gitea-repositories-meta/user2/repo1.git/objects/40/3d76c604cb569323864e06a07b85d466924802 b/tests/gitea-repositories-meta/user2/repo1.git/objects/40/3d76c604cb569323864e06a07b85d466924802 new file mode 100644 index 0000000000000000000000000000000000000000..ea0bf76d0cc85bb9d51720cae227d440a93a3388 GIT binary patch literal 68 zcmV-K0K5Nq0ZYosPf{?mU{F>lN-fAYEpczHPS& zC9f~@aEDl;W009N39E*sXI<5;4X;{IO4!g5>D~|jp1>4Yqlns~AsAelglXl4oEcm7 zp{8}D{+yrt0l#;or3hS3t5L3)uaC!@?b|zK77<1wfmdvZ>7?h|^#4_o MxNRTl4+U^QjwQiQZvX%Q literal 0 HcmV?d00001 diff --git a/tests/gitea-repositories-meta/user2/repo1.git/objects/f3/fa0f5cc797fc4c02a1b8bec9de4b2072fcdbdf b/tests/gitea-repositories-meta/user2/repo1.git/objects/f3/fa0f5cc797fc4c02a1b8bec9de4b2072fcdbdf new file mode 100644 index 0000000000000000000000000000000000000000..9b20f8af3f2d52f51ef5053a55a15ed946fda5a7 GIT binary patch literal 53 zcmb Date: Sat, 4 Mar 2023 00:38:31 -0500 Subject: [PATCH 041/340] Fix GetFilesChangedBetween if the file name may be escaped (#23272) (#23279) Backport #23272 The code for GetFilesChangedBetween uses `git diff --name-only base..head` to get the names of files changed between base and head however this forgets that git will escape certain values. This PR simply switches to use `-z` which has the `NUL` character as the separator. Ref https://github.com/go-gitea/gitea/pull/22568#discussion_r1123138096 Signed-off-by: Andrew Thornton Co-authored-by: zeripath Co-authored-by: techknowlogick --- modules/git/repo_compare.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/git/repo_compare.go b/modules/git/repo_compare.go index 9a4d66f2f521..439455e3c295 100644 --- a/modules/git/repo_compare.go +++ b/modules/git/repo_compare.go @@ -277,11 +277,18 @@ func (repo *Repository) GetPatch(base, head string, w io.Writer) error { // GetFilesChangedBetween returns a list of all files that have been changed between the given commits func (repo *Repository) GetFilesChangedBetween(base, head string) ([]string, error) { - stdout, _, err := NewCommand(repo.Ctx, "diff", "--name-only").AddDynamicArguments(base + ".." + head).RunStdString(&RunOpts{Dir: repo.Path}) + stdout, _, err := NewCommand(repo.Ctx, "diff", "--name-only", "-z").AddDynamicArguments(base + ".." + head).RunStdString(&RunOpts{Dir: repo.Path}) if err != nil { return nil, err } - return strings.Split(stdout, "\n"), err + split := strings.Split(stdout, "\000") + + // Because Git will always emit filenames with a terminal NUL ignore the last entry in the split - which will always be empty. + if len(split) > 0 { + split = split[:len(split)-1] + } + + return split, err } // GetDiffFromMergeBase generates and return patch data from merge base to head From a4158d1904b04c4f4b499cf8b9505aca3bb70d11 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Sat, 4 Mar 2023 09:23:49 -0500 Subject: [PATCH 042/340] Avoid panic caused by broken payload when creating commit status (#23216) (#23294) Backport #23216 When creating commit status for Actons jobs, a payload with nil `HeadCommit` will cause panic. Reported at: https://gitea.com/gitea/act_runner/issues/28#issuecomment-732166 Although the `HeadCommit` probably can not be nil after #23215, `CreateCommitStatus` should protect itself, to avoid being broken in the future. In addition, it's enough to print error log instead of returning err when `CreateCommitStatus` failed. Co-authored-by: Jason Song Co-authored-by: delvh --- routers/api/actions/runner/runner.go | 2 +- routers/web/repo/actions/view.go | 22 +++++++++++++++------- services/actions/clear_tasks.go | 22 +++++++++++++++++----- services/actions/commit_status.go | 10 ++++++++++ services/actions/notifier_helper.go | 3 ++- 5 files changed, 45 insertions(+), 14 deletions(-) diff --git a/routers/api/actions/runner/runner.go b/routers/api/actions/runner/runner.go index d0bfb2363e0c..839f776fe8de 100644 --- a/routers/api/actions/runner/runner.go +++ b/routers/api/actions/runner/runner.go @@ -150,7 +150,7 @@ func (s *Service) UpdateTask( } if err := actions_service.CreateCommitStatus(ctx, task.Job); err != nil { - log.Error("Update commit status failed: %v", err) + log.Error("Update commit status for job %v failed: %v", task.Job.ID, err) // go on } diff --git a/routers/web/repo/actions/view.go b/routers/web/repo/actions/view.go index 5370310e8d9d..86894ce55b11 100644 --- a/routers/web/repo/actions/view.go +++ b/routers/web/repo/actions/view.go @@ -15,6 +15,7 @@ import ( "code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/modules/actions" context_module "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/modules/web" @@ -207,15 +208,18 @@ func Rerun(ctx *context_module.Context) { job.Stopped = 0 if err := db.WithTx(ctx, func(ctx context.Context) error { - if _, err := actions_model.UpdateRunJob(ctx, job, builder.Eq{"status": status}, "task_id", "status", "started", "stopped"); err != nil { - return err - } - return actions_service.CreateCommitStatus(ctx, job) + _, err := actions_model.UpdateRunJob(ctx, job, builder.Eq{"status": status}, "task_id", "status", "started", "stopped") + return err }); err != nil { ctx.Error(http.StatusInternalServerError, err.Error()) return } + if err := actions_service.CreateCommitStatus(ctx, job); err != nil { + log.Error("Update commit status for job %v failed: %v", job.ID, err) + // go on + } + ctx.JSON(http.StatusOK, struct{}{}) } @@ -248,9 +252,6 @@ func Cancel(ctx *context_module.Context) { if err := actions_model.StopTask(ctx, job.TaskID, actions_model.StatusCancelled); err != nil { return err } - if err := actions_service.CreateCommitStatus(ctx, job); err != nil { - return err - } } return nil }); err != nil { @@ -258,6 +259,13 @@ func Cancel(ctx *context_module.Context) { return } + for _, job := range jobs { + if err := actions_service.CreateCommitStatus(ctx, job); err != nil { + log.Error("Update commit status for job %v failed: %v", job.ID, err) + // go on + } + } + ctx.JSON(http.StatusOK, struct{}{}) } diff --git a/services/actions/clear_tasks.go b/services/actions/clear_tasks.go index 583e588de405..6f8e95218d67 100644 --- a/services/actions/clear_tasks.go +++ b/services/actions/clear_tasks.go @@ -43,6 +43,7 @@ func stopTasks(ctx context.Context, opts actions_model.FindTaskOptions) error { return fmt.Errorf("find tasks: %w", err) } + jobs := make([]*actions_model.ActionRunJob, 0, len(tasks)) for _, task := range tasks { if err := db.WithTx(ctx, func(ctx context.Context) error { if err := actions_model.StopTask(ctx, task.ID, actions_model.StatusFailure); err != nil { @@ -51,7 +52,8 @@ func stopTasks(ctx context.Context, opts actions_model.FindTaskOptions) error { if err := task.LoadJob(ctx); err != nil { return err } - return CreateCommitStatus(ctx, task.Job) + jobs = append(jobs, task.Job) + return nil }); err != nil { log.Warn("Cannot stop task %v: %v", task.ID, err) // go on @@ -61,6 +63,14 @@ func stopTasks(ctx context.Context, opts actions_model.FindTaskOptions) error { remove() } } + + for _, job := range jobs { + if err := CreateCommitStatus(ctx, job); err != nil { + log.Error("Update commit status for job %v failed: %v", job.ID, err) + // go on + } + } + return nil } @@ -80,14 +90,16 @@ func CancelAbandonedJobs(ctx context.Context) error { job.Status = actions_model.StatusCancelled job.Stopped = now if err := db.WithTx(ctx, func(ctx context.Context) error { - if _, err := actions_model.UpdateRunJob(ctx, job, nil, "status", "stopped"); err != nil { - return err - } - return CreateCommitStatus(ctx, job) + _, err := actions_model.UpdateRunJob(ctx, job, nil, "status", "stopped") + return err }); err != nil { log.Warn("cancel abandoned job %v: %v", job.ID, err) // go on } + if err := CreateCommitStatus(ctx, job); err != nil { + log.Error("Update commit status for job %v failed: %v", job.ID, err) + // go on + } } return nil diff --git a/services/actions/commit_status.go b/services/actions/commit_status.go index efb5ec6d44a3..4f313493523e 100644 --- a/services/actions/commit_status.go +++ b/services/actions/commit_status.go @@ -30,6 +30,16 @@ func CreateCommitStatus(ctx context.Context, job *actions_model.ActionRunJob) er return fmt.Errorf("GetPushEventPayload: %w", err) } + // Since the payload comes from json data, we should check if it's broken, or it will cause panic + switch { + case payload.Repo == nil: + return fmt.Errorf("repo is missing in event payload") + case payload.Pusher == nil: + return fmt.Errorf("pusher is missing in event payload") + case payload.HeadCommit == nil: + return fmt.Errorf("head commit is missing in event payload") + } + creator, err := user_model.GetUserByID(ctx, payload.Pusher.ID) if err != nil { return fmt.Errorf("GetUserByID: %w", err) diff --git a/services/actions/notifier_helper.go b/services/actions/notifier_helper.go index df67d2fa116d..f4f6a3aa5287 100644 --- a/services/actions/notifier_helper.go +++ b/services/actions/notifier_helper.go @@ -180,7 +180,8 @@ func notify(ctx context.Context, input *notifyInput) error { } else { for _, job := range jobs { if err := CreateCommitStatus(ctx, job); err != nil { - log.Error("CreateCommitStatus: %v", err) + log.Error("Update commit status for job %v failed: %v", job.ID, err) + // go on } } } From 8142408d3a95a97f305a12d3d1f9b1731211d0dd Mon Sep 17 00:00:00 2001 From: Giteabot Date: Sat, 4 Mar 2023 13:02:50 -0500 Subject: [PATCH 043/340] Fill head commit to in payload when notifying push commits for mirroring (#23215) (#23292) Backport #23215 Just like what has been done when pushing manually: https://github.com/go-gitea/gitea/blob/7a5af25592003ddc3017fcd7b822a3e02fc40ef6/services/repository/push.go#L225-L226 Before: image After: image Co-authored-by: Jason Song Co-authored-by: delvh Co-authored-by: Lunny Xiao --- services/mirror/mirror_pull.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/services/mirror/mirror_pull.go b/services/mirror/mirror_pull.go index 126d2bf35468..60699294c18b 100644 --- a/services/mirror/mirror_pull.go +++ b/services/mirror/mirror_pull.go @@ -499,6 +499,13 @@ func SyncPullMirror(ctx context.Context, repoID int64) bool { theCommits.Commits = theCommits.Commits[:setting.UI.FeedMaxCommitNum] } + if newCommit, err := gitRepo.GetCommit(newCommitID); err != nil { + log.Error("SyncMirrors [repo: %-v]: unable to get commit %s: %v", m.Repo, newCommitID, err) + continue + } else { + theCommits.HeadCommit = repo_module.CommitToPushCommit(newCommit) + } + theCommits.CompareURL = m.Repo.ComposeCompareURL(oldCommitID, newCommitID) notification.NotifySyncPushCommits(ctx, m.Repo.MustOwner(ctx), m.Repo, &repo_module.PushUpdateOptions{ From 83903535e3710b3f6dcbef20bd8f349182a24abe Mon Sep 17 00:00:00 2001 From: Giteabot Date: Sat, 4 Mar 2023 14:55:12 -0500 Subject: [PATCH 044/340] Fix code wrap for unbroken lines (#23268) (#23293) Backport #23268 ## The Problem `overflow-wrap: break-word` doesn't work well for unbroken lines. Use `overflow-wrap: anywhere` instead, and remove legacy alias `word-wrap` ## Before ![image](https://user-images.githubusercontent.com/2114189222743939-5f38d9e4-18d8-4ae0-8078-4b3a59195a30.png) ## After ![image](https://user-images.githubusercontent.com/2114189/222743833-0e0cfdbb-7b2e-420d-99f9-b1b45dde521a.png) Co-authored-by: wxiaoguang Co-authored-by: silverwind --- web_src/less/_base.less | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web_src/less/_base.less b/web_src/less/_base.less index a73dae6bf37a..1cf65e784cd4 100644 --- a/web_src/less/_base.less +++ b/web_src/less/_base.less @@ -2121,8 +2121,7 @@ a.ui.label:hover { font: 12px var(--fonts-monospace); white-space: pre-wrap; word-break: break-all; - overflow-wrap: break-word; - word-wrap: break-word; + overflow-wrap: anywhere; } .blame .code-inner { From a926994bfe31eb8a4b44dabef2e35e86f724affe Mon Sep 17 00:00:00 2001 From: Giteabot Date: Sat, 4 Mar 2023 20:09:58 -0500 Subject: [PATCH 045/340] Re-add accidentally removed `hacking-on-gitea.zh-cn.md` (#23297) (#23305) --- .../doc/developers/hacking-on-gitea.zh-cn.md | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 docs/content/doc/developers/hacking-on-gitea.zh-cn.md diff --git a/docs/content/doc/developers/hacking-on-gitea.zh-cn.md b/docs/content/doc/developers/hacking-on-gitea.zh-cn.md new file mode 100644 index 000000000000..3e8cd3ec573a --- /dev/null +++ b/docs/content/doc/developers/hacking-on-gitea.zh-cn.md @@ -0,0 +1,43 @@ +--- +date: "2016-12-01T16:00:00+02:00" +title: "加入 Gitea 开源" +slug: "hacking-on-gitea" +weight: 10 +toc: false +draft: false +menu: + sidebar: + parent: "developers" + name: "加入 Gitea 开源" + weight: 10 + identifier: "hacking-on-gitea" +--- + +# Hacking on Gitea + +首先你需要一些运行环境，这和 [从源代码安装]({{< relref "doc/installation/from-source.zh-cn.md" >}}) 相同，如果你还没有设置好，可以先阅读那个章节。 + +如果你想为 Gitea 贡献代码，你需要 Fork 这个项目并且以 `master` 为开发分支。Gitea 使用 Govendor +来管理依赖，因此所有依赖项都被工具自动 copy 在 vendor 子目录下。用下面的命令来下载源码： + +``` +go get -d code.gitea.io/gitea +``` + +然后你可以在 Github 上 fork [Gitea 项目](https://github.com/go-gitea/gitea)，之后可以通过下面的命令进入源码目录： + +``` +cd $GOPATH/src/code.gitea.io/gitea +``` + +要创建 pull requests 你还需要在源码中新增一个 remote 指向你 Fork 的地址，直接推送到 origin 的话会告诉你没有写权限： + +``` +git remote rename origin upstream +git remote add origin git@github.com:/gitea.git +git fetch --all --prune +``` + +然后你就可以开始开发了。你可以看一下 `Makefile` 的内容。`make test` 可以运行测试程序， `make build` 将生成一个 `gitea` 可运行文件在根目录。如果你的提交比较复杂，尽量多写一些单元测试代码。 + +好了，到这里你已经设置好了所有的开发 Gitea 所需的环境。欢迎成为 Gitea 的 Contributor。 From ff96f804b64d9179d01b58c2863ce11cdd532fb9 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Sun, 5 Mar 2023 02:13:50 -0500 Subject: [PATCH 046/340] update to mermaid v10 (#23178) (#23299) Backport #23178 fix #23153 Co-authored-by: techknowlogick Co-authored-by: silverwind Co-authored-by: delvh --- package-lock.json | 256 +++++++++++++++++++++++++++++------ package.json | 2 +- web_src/js/markup/mermaid.js | 41 +++--- webpack.config.js | 2 +- 4 files changed, 233 insertions(+), 68 deletions(-) diff --git a/package-lock.json b/package-lock.json index 641a42b84670..7ec6d09d1996 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,7 +31,7 @@ "less": "4.1.3", "less-loader": "11.1.0", "license-checker-webpack-plugin": "0.2.1", - "mermaid": "9.3.0", + "mermaid": "10.0.2", "mini-css-extract-plugin": "2.7.2", "monaco-editor": "0.34.1", "monaco-editor-webpack-plugin": "7.0.1", @@ -2680,6 +2680,14 @@ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", "dev": true }, + "node_modules/cose-base": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/cose-base/-/cose-base-1.0.3.tgz", + "integrity": "sha512-s9whTXInMSgAp/NVXVNuVxVKzGH2qck3aQlVHxDCdAEPgtMKwc4Wq6/QKhgdEdgbLSi9rBTAcPoRa6JpiG4ksg==", + "dependencies": { + "layout-base": "^1.0.0" + } + }, "node_modules/cosmiconfig": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.0.0.tgz", @@ -2888,6 +2896,53 @@ "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz", "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==" }, + "node_modules/cytoscape": { + "version": "3.23.0", + "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.23.0.tgz", + "integrity": "sha512-gRZqJj/1kiAVPkrVFvz/GccxsXhF3Qwpptl32gKKypO4IlqnKBjTOu+HbXtEggSGzC5KCaHp3/F7GgENrtsFkA==", + "dependencies": { + "heap": "^0.2.6", + "lodash": "^4.17.21" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/cytoscape-cose-bilkent": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/cytoscape-cose-bilkent/-/cytoscape-cose-bilkent-4.1.0.tgz", + "integrity": "sha512-wgQlVIUJF13Quxiv5e1gstZ08rnZj2XaLHGoFMYXz7SkNfCDOOteKBE6SYRfA9WxxI/iBc3ajfDoc6hb/MRAHQ==", + "dependencies": { + "cose-base": "^1.0.0" + }, + "peerDependencies": { + "cytoscape": "^3.2.0" + } + }, + "node_modules/cytoscape-fcose": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/cytoscape-fcose/-/cytoscape-fcose-2.2.0.tgz", + "integrity": "sha512-ki1/VuRIHFCzxWNrsshHYPs6L7TvLu3DL+TyIGEsRcvVERmxokbf5Gdk7mFxZnTdiGtnA4cfSmjZJMviqSuZrQ==", + "dependencies": { + "cose-base": "^2.2.0" + }, + "peerDependencies": { + "cytoscape": "^3.2.0" + } + }, + "node_modules/cytoscape-fcose/node_modules/cose-base": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/cose-base/-/cose-base-2.2.0.tgz", + "integrity": "sha512-AzlgcsCbUMymkADOJtQm3wO9S3ltPfYOFD5033keQn9NJzIbtnZj+UdBJe7DYml/8TdbtHJW3j58SOnKhWY/5g==", + "dependencies": { + "layout-base": "^2.0.0" + } + }, + "node_modules/cytoscape-fcose/node_modules/layout-base": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/layout-base/-/layout-base-2.0.1.tgz", + "integrity": "sha512-dp3s92+uNI1hWIpPGH3jK2kxE2lMjdXdr+DH8ynZHpd6PUlH6x6cbuXnoMmiNumznqaNO31xu9e79F0uuZ0JFg==" + }, "node_modules/d3": { "version": "7.8.2", "resolved": "https://registry.npmjs.org/d3/-/d3-7.8.2.tgz", @@ -3267,11 +3322,11 @@ } }, "node_modules/dagre-d3-es": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/dagre-d3-es/-/dagre-d3-es-7.0.6.tgz", - "integrity": "sha512-CaaE/nZh205ix+Up4xsnlGmpog5GGm81Upi2+/SBHxwNwrccBb3K51LzjZ1U6hgvOlAEUsVWf1xSTzCyKpJ6+Q==", + "version": "7.0.9", + "resolved": "https://registry.npmjs.org/dagre-d3-es/-/dagre-d3-es-7.0.9.tgz", + "integrity": "sha512-rYR4QfVmy+sR44IBDvVtcAmOReGBvRCWDpO2QjYwqgh9yijw6eSHBqaPG/LIOEy7aBsniLvtMW6pg19qJhq60w==", "dependencies": { - "d3": "^7.7.0", + "d3": "^7.8.2", "lodash-es": "^4.17.21" } }, @@ -3298,6 +3353,11 @@ "node": ">=12" } }, + "node_modules/dayjs": { + "version": "1.11.7", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz", + "integrity": "sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==" + }, "node_modules/debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -3632,9 +3692,9 @@ } }, "node_modules/dompurify": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.1.tgz", - "integrity": "sha512-ewwFzHzrrneRjxzmK6oVz/rZn9VWspGFRDb4/rRtIsM1n36t9AKma/ye8syCpcw+XJ25kOK/hOG7t1j2I2yBqA==" + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.3.tgz", + "integrity": "sha512-q6QaLcakcRjebxjg8/+NP+h0rPfatOgOzc46Fst9VAA3jF2ApfKBNKMzdP4DYTqtUMXSCd5pRS/8Po/OmoCHZQ==" }, "node_modules/domutils": { "version": "3.0.1", @@ -3681,6 +3741,11 @@ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz", "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==" }, + "node_modules/elkjs": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/elkjs/-/elkjs-0.8.2.tgz", + "integrity": "sha512-L6uRgvZTH+4OF5NE/MBbzQx/WYpru1xCBE9respNj6qznEewGUIfhzmm7horWWxbNO2M0WckQypGctR8lH79xQ==" + }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -5043,6 +5108,11 @@ "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz", "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==" }, + "node_modules/heap": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/heap/-/heap-0.2.7.tgz", + "integrity": "sha512-2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg==" + }, "node_modules/hosted-git-info": { "version": "2.8.9", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", @@ -5877,6 +5947,11 @@ "integrity": "sha512-5FZRzrZzNTBruuurWpvZnvP9pum+fe0HcK8z/ooo+U+Hmp4vtbyp1/QDsqmufirXy4egGzbaH/y2uCZf+6W5Kg==", "dev": true }, + "node_modules/layout-base": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/layout-base/-/layout-base-1.0.2.tgz", + "integrity": "sha512-8h2oVEZNktL4BH2JCOI90iD1yXwL6iNW7KcCKT2QZgQJR2vbqDsldCTPRU9NifTCqHZci57XvQQ15YTu+sTYPg==" + }, "node_modules/less": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/less/-/less-4.1.3.tgz", @@ -6049,8 +6124,7 @@ "node_modules/lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "node_modules/lodash-es": { "version": "4.17.21", @@ -6393,20 +6467,26 @@ } }, "node_modules/mermaid": { - "version": "9.3.0", - "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-9.3.0.tgz", - "integrity": "sha512-mGl0BM19TD/HbU/LmlaZbjBi//tojelg8P/mxD6pPZTAYaI+VawcyBdqRsoUHSc7j71PrMdJ3HBadoQNdvP5cg==", + "version": "10.0.2", + "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-10.0.2.tgz", + "integrity": "sha512-slwoB9WdNUT+/W9VhxLYRLZ0Ey12fIE+cAZjm3FmHTD+0F1uoJETfsNbVS1POnvQZhFYzfT6/z6hJZXgecqVBA==", "dependencies": { "@braintree/sanitize-url": "^6.0.0", - "d3": "^7.0.0", - "dagre-d3-es": "7.0.6", - "dompurify": "2.4.1", + "cytoscape": "^3.23.0", + "cytoscape-cose-bilkent": "^4.1.0", + "cytoscape-fcose": "^2.1.0", + "d3": "^7.4.0", + "dagre-d3-es": "7.0.9", + "dayjs": "^1.11.7", + "dompurify": "2.4.3", + "elkjs": "^0.8.2", "khroma": "^2.0.0", "lodash-es": "^4.17.21", - "moment-mini": "^2.24.0", "non-layered-tidy-tree-layout": "^2.0.2", "stylis": "^4.1.2", - "uuid": "^9.0.0" + "ts-dedent": "^2.2.0", + "uuid": "^9.0.0", + "web-worker": "^1.2.0" } }, "node_modules/micromatch": { @@ -6531,11 +6611,6 @@ "integrity": "sha512-nPdMG0Pd09HuSsr7QOKUXO2Jr9eqaDiZvDwdyIhNG5SHYujkQHYKDfGQkulBxvbDHz8oHLsTgKN86LSwYzSHAg==", "dev": true }, - "node_modules/moment-mini": { - "version": "2.29.4", - "resolved": "https://registry.npmjs.org/moment-mini/-/moment-mini-2.29.4.tgz", - "integrity": "sha512-uhXpYwHFeiTbY9KSgPPRoo1nt8OxNVdMVoTBYHfSEKeRkIkwGpO+gERmhuhBtzfaeOyTkykSrm2+noJBgqt3Hg==" - }, "node_modules/monaco-editor": { "version": "0.34.1", "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.34.1.tgz", @@ -8807,6 +8882,14 @@ "node": ">=8" } }, + "node_modules/ts-dedent": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgz", + "integrity": "sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==", + "engines": { + "node": ">=6.10" + } + }, "node_modules/tsconfig-paths": { "version": "3.14.1", "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz", @@ -9315,6 +9398,11 @@ "node": ">=10.13.0" } }, + "node_modules/web-worker": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/web-worker/-/web-worker-1.2.0.tgz", + "integrity": "sha512-PgF341avzqyx60neE9DD+XS26MMNMoUQRz9NOZwW32nPQrF6p77f1htcnjBSEV8BGMKZ16choqUG4hyI0Hx7mA==" + }, "node_modules/webidl-conversions": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", @@ -11774,6 +11862,14 @@ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", "dev": true }, + "cose-base": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/cose-base/-/cose-base-1.0.3.tgz", + "integrity": "sha512-s9whTXInMSgAp/NVXVNuVxVKzGH2qck3aQlVHxDCdAEPgtMKwc4Wq6/QKhgdEdgbLSi9rBTAcPoRa6JpiG4ksg==", + "requires": { + "layout-base": "^1.0.0" + } + }, "cosmiconfig": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.0.0.tgz", @@ -11937,6 +12033,46 @@ "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz", "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==" }, + "cytoscape": { + "version": "3.23.0", + "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.23.0.tgz", + "integrity": "sha512-gRZqJj/1kiAVPkrVFvz/GccxsXhF3Qwpptl32gKKypO4IlqnKBjTOu+HbXtEggSGzC5KCaHp3/F7GgENrtsFkA==", + "requires": { + "heap": "^0.2.6", + "lodash": "^4.17.21" + } + }, + "cytoscape-cose-bilkent": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/cytoscape-cose-bilkent/-/cytoscape-cose-bilkent-4.1.0.tgz", + "integrity": "sha512-wgQlVIUJF13Quxiv5e1gstZ08rnZj2XaLHGoFMYXz7SkNfCDOOteKBE6SYRfA9WxxI/iBc3ajfDoc6hb/MRAHQ==", + "requires": { + "cose-base": "^1.0.0" + } + }, + "cytoscape-fcose": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/cytoscape-fcose/-/cytoscape-fcose-2.2.0.tgz", + "integrity": "sha512-ki1/VuRIHFCzxWNrsshHYPs6L7TvLu3DL+TyIGEsRcvVERmxokbf5Gdk7mFxZnTdiGtnA4cfSmjZJMviqSuZrQ==", + "requires": { + "cose-base": "^2.2.0" + }, + "dependencies": { + "cose-base": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/cose-base/-/cose-base-2.2.0.tgz", + "integrity": "sha512-AzlgcsCbUMymkADOJtQm3wO9S3ltPfYOFD5033keQn9NJzIbtnZj+UdBJe7DYml/8TdbtHJW3j58SOnKhWY/5g==", + "requires": { + "layout-base": "^2.0.0" + } + }, + "layout-base": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/layout-base/-/layout-base-2.0.1.tgz", + "integrity": "sha512-dp3s92+uNI1hWIpPGH3jK2kxE2lMjdXdr+DH8ynZHpd6PUlH6x6cbuXnoMmiNumznqaNO31xu9e79F0uuZ0JFg==" + } + } + }, "d3": { "version": "7.8.2", "resolved": "https://registry.npmjs.org/d3/-/d3-7.8.2.tgz", @@ -12208,11 +12344,11 @@ } }, "dagre-d3-es": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/dagre-d3-es/-/dagre-d3-es-7.0.6.tgz", - "integrity": "sha512-CaaE/nZh205ix+Up4xsnlGmpog5GGm81Upi2+/SBHxwNwrccBb3K51LzjZ1U6hgvOlAEUsVWf1xSTzCyKpJ6+Q==", + "version": "7.0.9", + "resolved": "https://registry.npmjs.org/dagre-d3-es/-/dagre-d3-es-7.0.9.tgz", + "integrity": "sha512-rYR4QfVmy+sR44IBDvVtcAmOReGBvRCWDpO2QjYwqgh9yijw6eSHBqaPG/LIOEy7aBsniLvtMW6pg19qJhq60w==", "requires": { - "d3": "^7.7.0", + "d3": "^7.8.2", "lodash-es": "^4.17.21" } }, @@ -12233,6 +12369,11 @@ "whatwg-url": "^11.0.0" } }, + "dayjs": { + "version": "1.11.7", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz", + "integrity": "sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==" + }, "debug": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", @@ -12472,9 +12613,9 @@ } }, "dompurify": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.1.tgz", - "integrity": "sha512-ewwFzHzrrneRjxzmK6oVz/rZn9VWspGFRDb4/rRtIsM1n36t9AKma/ye8syCpcw+XJ25kOK/hOG7t1j2I2yBqA==" + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.3.tgz", + "integrity": "sha512-q6QaLcakcRjebxjg8/+NP+h0rPfatOgOzc46Fst9VAA3jF2ApfKBNKMzdP4DYTqtUMXSCd5pRS/8Po/OmoCHZQ==" }, "domutils": { "version": "3.0.1", @@ -12518,6 +12659,11 @@ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz", "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==" }, + "elkjs": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/elkjs/-/elkjs-0.8.2.tgz", + "integrity": "sha512-L6uRgvZTH+4OF5NE/MBbzQx/WYpru1xCBE9respNj6qznEewGUIfhzmm7horWWxbNO2M0WckQypGctR8lH79xQ==" + }, "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -13548,6 +13694,11 @@ "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz", "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==" }, + "heap": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/heap/-/heap-0.2.7.tgz", + "integrity": "sha512-2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg==" + }, "hosted-git-info": { "version": "2.8.9", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", @@ -14129,6 +14280,11 @@ "integrity": "sha512-5FZRzrZzNTBruuurWpvZnvP9pum+fe0HcK8z/ooo+U+Hmp4vtbyp1/QDsqmufirXy4egGzbaH/y2uCZf+6W5Kg==", "dev": true }, + "layout-base": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/layout-base/-/layout-base-1.0.2.tgz", + "integrity": "sha512-8h2oVEZNktL4BH2JCOI90iD1yXwL6iNW7KcCKT2QZgQJR2vbqDsldCTPRU9NifTCqHZci57XvQQ15YTu+sTYPg==" + }, "less": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/less/-/less-4.1.3.tgz", @@ -14251,8 +14407,7 @@ "lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "lodash-es": { "version": "4.17.21", @@ -14531,20 +14686,26 @@ "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==" }, "mermaid": { - "version": "9.3.0", - "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-9.3.0.tgz", - "integrity": "sha512-mGl0BM19TD/HbU/LmlaZbjBi//tojelg8P/mxD6pPZTAYaI+VawcyBdqRsoUHSc7j71PrMdJ3HBadoQNdvP5cg==", + "version": "10.0.2", + "resolved": "https://registry.npmjs.org/mermaid/-/mermaid-10.0.2.tgz", + "integrity": "sha512-slwoB9WdNUT+/W9VhxLYRLZ0Ey12fIE+cAZjm3FmHTD+0F1uoJETfsNbVS1POnvQZhFYzfT6/z6hJZXgecqVBA==", "requires": { "@braintree/sanitize-url": "^6.0.0", - "d3": "^7.0.0", - "dagre-d3-es": "7.0.6", - "dompurify": "2.4.1", + "cytoscape": "^3.23.0", + "cytoscape-cose-bilkent": "^4.1.0", + "cytoscape-fcose": "^2.1.0", + "d3": "^7.4.0", + "dagre-d3-es": "7.0.9", + "dayjs": "^1.11.7", + "dompurify": "2.4.3", + "elkjs": "^0.8.2", "khroma": "^2.0.0", "lodash-es": "^4.17.21", - "moment-mini": "^2.24.0", "non-layered-tidy-tree-layout": "^2.0.2", "stylis": "^4.1.2", - "uuid": "^9.0.0" + "ts-dedent": "^2.2.0", + "uuid": "^9.0.0", + "web-worker": "^1.2.0" } }, "micromatch": { @@ -14634,11 +14795,6 @@ } } }, - "moment-mini": { - "version": "2.29.4", - "resolved": "https://registry.npmjs.org/moment-mini/-/moment-mini-2.29.4.tgz", - "integrity": "sha512-uhXpYwHFeiTbY9KSgPPRoo1nt8OxNVdMVoTBYHfSEKeRkIkwGpO+gERmhuhBtzfaeOyTkykSrm2+noJBgqt3Hg==" - }, "monaco-editor": { "version": "0.34.1", "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.34.1.tgz", @@ -16340,6 +16496,11 @@ "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==", "dev": true }, + "ts-dedent": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgz", + "integrity": "sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==" + }, "tsconfig-paths": { "version": "3.14.1", "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz", @@ -16674,6 +16835,11 @@ "graceful-fs": "^4.1.2" } }, + "web-worker": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/web-worker/-/web-worker-1.2.0.tgz", + "integrity": "sha512-PgF341avzqyx60neE9DD+XS26MMNMoUQRz9NOZwW32nPQrF6p77f1htcnjBSEV8BGMKZ16choqUG4hyI0Hx7mA==" + }, "webidl-conversions": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", diff --git a/package.json b/package.json index fc063d66dacb..c4457fe9708f 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "less": "4.1.3", "less-loader": "11.1.0", "license-checker-webpack-plugin": "0.2.1", - "mermaid": "9.3.0", + "mermaid": "10.0.2", "mini-css-extract-plugin": "2.7.2", "monaco-editor": "0.34.1", "monaco-editor-webpack-plugin": "7.0.1", diff --git a/web_src/js/markup/mermaid.js b/web_src/js/markup/mermaid.js index 60f53d2b341d..b519e2dcdc35 100644 --- a/web_src/js/markup/mermaid.js +++ b/web_src/js/markup/mermaid.js @@ -37,14 +37,10 @@ export async function renderMermaid() { continue; } - let valid; try { - valid = mermaid.parse(source); + await mermaid.parse(source); } catch (err) { displayError(el, err); - } - - if (!valid) { el.closest('pre').classList.remove('is-loading'); continue; } @@ -52,22 +48,25 @@ export async function renderMermaid() { try { // can't use bindFunctions here because we can't cross the iframe boundary. This // means js-based interactions won't work but they aren't intended to work either - mermaid.mermaidAPI.render('mermaid', source, (svgStr) => { - const heightStr = (svgStr.match(/viewBox="(.+?)"/) || ['', ''])[1].split(/\s+/)[3]; - if (!heightStr) return displayError(el, new Error('Could not determine chart height')); - const iframe = document.createElement('iframe'); - iframe.classList.add('markup-render'); - iframe.sandbox = 'allow-scripts'; - iframe.style.height = `${Math.ceil(parseFloat(heightStr))}px`; - iframe.srcdoc = ` ${svgStr}`; - const mermaidBlock = document.createElement('div'); - mermaidBlock.classList.add('mermaid-block'); - mermaidBlock.append(iframe); - const btn = makeCodeCopyButton(); - btn.setAttribute('data-clipboard-text', source); - mermaidBlock.append(btn); - el.closest('pre').replaceWith(mermaidBlock); - }); + const {svg} = await mermaid.render('mermaid', source); + const heightStr = (svg.match(/viewBox="(.+?)"/) || ['', ''])[1].split(/\s+/)[3]; + if (!heightStr) return displayError(el, new Error('Could not determine chart height')); + + const iframe = document.createElement('iframe'); + iframe.classList.add('markup-render'); + iframe.sandbox = 'allow-scripts'; + iframe.style.height = `${Math.ceil(parseFloat(heightStr))}px`; + iframe.srcdoc = ` ${svg}`; + + const mermaidBlock = document.createElement('div'); + mermaidBlock.classList.add('mermaid-block'); + mermaidBlock.append(iframe); + + const btn = makeCodeCopyButton(); + btn.setAttribute('data-clipboard-text', source); + + mermaidBlock.append(btn); + el.closest('pre').replaceWith(mermaidBlock); } catch (err) { displayError(el, err); } diff --git a/webpack.config.js b/webpack.config.js index 2ac463abef2b..245791e7ea6e 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -234,7 +234,7 @@ export default { 'khroma@*': {licenseName: 'MIT'}, // https://github.com/fabiospampinato/khroma/pull/33 }, emitError: true, - allow: '(Apache-2.0 OR BSD-2-Clause OR BSD-3-Clause OR MIT OR ISC OR CPAL-1.0 OR Unlicense)', + allow: '(Apache-2.0 OR BSD-2-Clause OR BSD-3-Clause OR MIT OR ISC OR CPAL-1.0 OR Unlicense OR EPL-1.0 OR EPL-2.0)', ignore: [ 'font-awesome', ], From a2a9b0f977461e3132bb78a276f47e3c0b42a8c4 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Sun, 5 Mar 2023 02:14:12 -0500 Subject: [PATCH 047/340] Support sanitising the URL by removing extra slashes in the URL (#21333) (#23300) Backport #21333 Changes in this PR : Strips incoming request URL of additional slashes (/). For example an input like `https://git.data.coop//halfd/new-website.git` is translated to `https://git.data.coop/halfd/new-website.git` Fixes https://github.com/go-gitea/gitea/issues/20462 Fix #23242 Co-authored-by: Sandeep Bhat Co-authored-by: zeripath Co-authored-by: Jason Song Co-authored-by: Lunny Xiao Co-authored-by: delvh --- routers/common/middleware.go | 35 +++++++++++++++- routers/common/middleware_test.go | 70 +++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 2 deletions(-) create mode 100644 routers/common/middleware_test.go diff --git a/routers/common/middleware.go b/routers/common/middleware.go index 4f9d43c36218..2abdcb583d8f 100644 --- a/routers/common/middleware.go +++ b/routers/common/middleware.go @@ -16,7 +16,7 @@ import ( "code.gitea.io/gitea/modules/web/routing" "github.com/chi-middleware/proxy" - "github.com/go-chi/chi/v5/middleware" + chi "github.com/go-chi/chi/v5" ) // Middlewares returns common middlewares @@ -48,7 +48,8 @@ func Middlewares() []func(http.Handler) http.Handler { handlers = append(handlers, proxy.ForwardedHeaders(opt)) } - handlers = append(handlers, middleware.StripSlashes) + // Strip slashes. + handlers = append(handlers, stripSlashesMiddleware) if !setting.Log.DisableRouterLog { handlers = append(handlers, routing.NewLoggerHandler()) @@ -81,3 +82,33 @@ func Middlewares() []func(http.Handler) http.Handler { }) return handlers } + +func stripSlashesMiddleware(next http.Handler) http.Handler { + return http.HandlerFunc(func(resp http.ResponseWriter, req *http.Request) { + var urlPath string + rctx := chi.RouteContext(req.Context()) + if rctx != nil && rctx.RoutePath != "" { + urlPath = rctx.RoutePath + } else if req.URL.RawPath != "" { + urlPath = req.URL.RawPath + } else { + urlPath = req.URL.Path + } + + sanitizedPath := &strings.Builder{} + prevWasSlash := false + for _, chr := range strings.TrimRight(urlPath, "/") { + if chr != '/' || !prevWasSlash { + sanitizedPath.WriteRune(chr) + } + prevWasSlash = chr == '/' + } + + if rctx == nil { + req.URL.Path = sanitizedPath.String() + } else { + rctx.RoutePath = sanitizedPath.String() + } + next.ServeHTTP(resp, req) + }) +} diff --git a/routers/common/middleware_test.go b/routers/common/middleware_test.go new file mode 100644 index 000000000000..f16b9374eca7 --- /dev/null +++ b/routers/common/middleware_test.go @@ -0,0 +1,70 @@ +// Copyright 2022 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT +package common + +import ( + "net/http" + "net/http/httptest" + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestStripSlashesMiddleware(t *testing.T) { + type test struct { + name string + expectedPath string + inputPath string + } + + tests := []test{ + { + name: "path with multiple slashes", + inputPath: "https://github.com///go-gitea//gitea.git", + expectedPath: "/go-gitea/gitea.git", + }, + { + name: "path with no slashes", + inputPath: "https://github.com/go-gitea/gitea.git", + expectedPath: "/go-gitea/gitea.git", + }, + { + name: "path with slashes in the middle", + inputPath: "https://git.data.coop//halfd/new-website.git", + expectedPath: "/halfd/new-website.git", + }, + { + name: "path with slashes in the middle", + inputPath: "https://git.data.coop//halfd/new-website.git", + expectedPath: "/halfd/new-website.git", + }, + { + name: "path with slashes in the end", + inputPath: "/user2//repo1/", + expectedPath: "/user2/repo1", + }, + { + name: "path with slashes and query params", + inputPath: "/repo//migrate?service_type=3", + expectedPath: "/repo/migrate", + }, + { + name: "path with encoded slash", + inputPath: "/user2/%2F%2Frepo1", + expectedPath: "/user2/%2F%2Frepo1", + }, + } + + for _, tt := range tests { + testMiddleware := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + assert.Equal(t, tt.expectedPath, r.URL.Path) + }) + + // pass the test middleware to validate the changes + handlerToTest := stripSlashesMiddleware(testMiddleware) + // create a mock request to use + req := httptest.NewRequest("GET", tt.inputPath, nil) + // call the handler using a mock response recorder + handlerToTest.ServeHTTP(httptest.NewRecorder(), req) + } +} From 1edb57eda9826a5b7402e92d516d6b9097eb8ad3 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Sun, 5 Mar 2023 05:59:58 -0500 Subject: [PATCH 048/340] Fix various bugs for "install" page (#23194) (#23286) Backport #23194 ## TLDR * Fix the broken page / broken image problem when click "Install" * Fix the Password Hash Algorithm display problem for #22942 * Close #20089 * Close #23183 * Close #23184 ## Details ### The broken page / broken image problem when clicking on "Install" (Redirect failed after install - #23184) Before: when clicking on "install", all new requests will fail, because the server has been restarted. Users just see a broken page with broken images, sometimes the server is not ready but the user would have been redirect to "/user/login" page, then the users see a new broken page (connection refused or something wrong ...) After: only check InstallLock=true for necessary handlers, and sleep for a while before restarting the server, then the browser has enough time to load the "post-install" page. And there is a script to check whether "/user/login" is ready, the user will only be redirected to the login page when the server is ready. ### During new instance setup fill 'Gitea Base URL' with window.location.origin - #20089 If the "app_url" input contains `localhost` (the default value from config), use current window's location href as the `app_url` (aka ROOT_URL) ### Fix the Password Hash Algorithm display problem for "Provide the ability to set password hash algorithm parameters #22942" Before: the UI shows `pbkdf2$50000$50`

    ![image](https://user-images.githubusercontent.com/2114189/221917143-e1e54798-1698-4fee-a18d-00c48081fc39.png)
    After: the UI shows `pbkdf2`
    ![image](https://user-images.githubusercontent.com/2114189/221916999-97a15be8-2ebb-4a01-bf93-dac18e354fcc.png)
    ### GET data: net::ERR_INVALID_URL #23183 Cause by empty `data:` in `` Co-authored-by: wxiaoguang Co-authored-by: Jason Song Co-authored-by: Lunny Xiao Co-authored-by: techknowlogick --- modules/auth/password/hash/setting.go | 29 ++++++++++++---- options/locale/locale_en-US.ini | 2 +- routers/install/install.go | 48 ++++++++++++++++++--------- routers/install/routes.go | 13 ++++++-- templates/base/head.tmpl | 2 +- templates/post-install.tmpl | 4 +-- web_src/js/features/install.js | 39 +++++++++++++++++++++- 7 files changed, 107 insertions(+), 30 deletions(-) diff --git a/modules/auth/password/hash/setting.go b/modules/auth/password/hash/setting.go index 70169743040a..f0715f31e1a4 100644 --- a/modules/auth/password/hash/setting.go +++ b/modules/auth/password/hash/setting.go @@ -41,9 +41,8 @@ var RecommendedHashAlgorithms = []string{ "pbkdf2_hi", } -// SetDefaultPasswordHashAlgorithm will take a provided algorithmName and dealias it to -// a complete algorithm specification. -func SetDefaultPasswordHashAlgorithm(algorithmName string) (string, *PasswordHashAlgorithm) { +// hashAlgorithmToSpec converts an algorithm name or a specification to a full algorithm specification +func hashAlgorithmToSpec(algorithmName string) string { if algorithmName == "" { algorithmName = DefaultHashAlgorithmName } @@ -52,10 +51,26 @@ func SetDefaultPasswordHashAlgorithm(algorithmName string) (string, *PasswordHas algorithmName = alias alias, has = aliasAlgorithmNames[algorithmName] } + return algorithmName +} - // algorithmName should now be a full algorithm specification - // e.g. pbkdf2$50000$50 rather than pbdkf2 - DefaultHashAlgorithm = Parse(algorithmName) +// SetDefaultPasswordHashAlgorithm will take a provided algorithmName and de-alias it to +// a complete algorithm specification. +func SetDefaultPasswordHashAlgorithm(algorithmName string) (string, *PasswordHashAlgorithm) { + algoSpec := hashAlgorithmToSpec(algorithmName) + // now we get a full specification, e.g. pbkdf2$50000$50 rather than pbdkf2 + DefaultHashAlgorithm = Parse(algoSpec) + return algoSpec, DefaultHashAlgorithm +} - return algorithmName, DefaultHashAlgorithm +// ConfigHashAlgorithm will try to find a "recommended algorithm name" defined by RecommendedHashAlgorithms for config +// This function is not fast and is only used for the installation page +func ConfigHashAlgorithm(algorithm string) string { + algorithm = hashAlgorithmToSpec(algorithm) + for _, recommAlgo := range RecommendedHashAlgorithms { + if algorithm == hashAlgorithmToSpec(recommAlgo) { + return recommAlgo + } + } + return algorithm } diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index df66ce23390f..b2fb837bf02f 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -237,7 +237,6 @@ internal_token_failed = Failed to generate internal token: %v secret_key_failed = Failed to generate secret key: %v save_config_failed = Failed to save configuration: %v invalid_admin_setting = Administrator account setting is invalid: %v -install_success = Welcome! Thank you for choosing Gitea. Have fun and take care! invalid_log_root_path = The log path is invalid: %v default_keep_email_private = Hide Email Addresses by Default default_keep_email_private_popup = Hide email addresses of new user accounts by default. @@ -248,6 +247,7 @@ default_enable_timetracking_popup = Enable time tracking for new repositories by no_reply_address = Hidden Email Domain no_reply_address_helper = Domain name for users with a hidden email address. For example, the username 'joe' will be logged in Git as 'joe@noreply.example.org' if the hidden email domain is set to 'noreply.example.org'. password_algorithm = Password Hash Algorithm +invalid_password_algorithm = Invalid password hash algorithm password_algorithm_helper = Set the password hashing algorithm. Algorithms have differing requirements and strength. `argon2` whilst having good characteristics uses a lot of memory and may be inappropriate for small systems. enable_update_checker = Enable Update Checker enable_update_checker_helper = Checks for new version releases periodically by connecting to gitea.io. diff --git a/routers/install/install.go b/routers/install/install.go index a3d64e5f73a5..a377c2950ba3 100644 --- a/routers/install/install.go +++ b/routers/install/install.go @@ -59,11 +59,6 @@ func Init(ctx goctx.Context) func(next http.Handler) http.Handler { dbTypeNames := getSupportedDbTypeNames() return func(next http.Handler) http.Handler { return http.HandlerFunc(func(resp http.ResponseWriter, req *http.Request) { - if setting.InstallLock { - resp.Header().Add("Refresh", "1; url="+setting.AppURL+"user/login") - _ = rnd.HTML(resp, http.StatusOK, string(tplPostInstall), nil) - return - } locale := middleware.Locale(resp, req) startTime := time.Now() ctx := context.Context{ @@ -93,6 +88,11 @@ func Init(ctx goctx.Context) func(next http.Handler) http.Handler { // Install render installation page func Install(ctx *context.Context) { + if setting.InstallLock { + InstallDone(ctx) + return + } + form := forms.InstallForm{} // Database settings @@ -162,7 +162,7 @@ func Install(ctx *context.Context) { form.DefaultAllowCreateOrganization = setting.Service.DefaultAllowCreateOrganization form.DefaultEnableTimetracking = setting.Service.DefaultEnableTimetracking form.NoReplyAddress = setting.Service.NoReplyAddress - form.PasswordAlgorithm = setting.PasswordHashAlgo + form.PasswordAlgorithm = hash.ConfigHashAlgorithm(setting.PasswordHashAlgo) middleware.AssignForm(form, ctx.Data) ctx.HTML(http.StatusOK, tplInstall) @@ -234,6 +234,11 @@ func checkDatabase(ctx *context.Context, form *forms.InstallForm) bool { // SubmitInstall response for submit install items func SubmitInstall(ctx *context.Context) { + if setting.InstallLock { + InstallDone(ctx) + return + } + var err error form := *web.GetForm(ctx).(*forms.InstallForm) @@ -277,7 +282,6 @@ func SubmitInstall(ctx *context.Context) { setting.Database.Charset = form.Charset setting.Database.Path = form.DbPath setting.Database.LogSQL = !setting.IsProd - setting.PasswordHashAlgo = form.PasswordAlgorithm if !checkDatabase(ctx, &form) { return @@ -499,6 +503,12 @@ func SubmitInstall(ctx *context.Context) { } if len(form.PasswordAlgorithm) > 0 { + var algorithm *hash.PasswordHashAlgorithm + setting.PasswordHashAlgo, algorithm = hash.SetDefaultPasswordHashAlgorithm(form.PasswordAlgorithm) + if algorithm == nil { + ctx.RenderWithErr(ctx.Tr("install.invalid_password_algorithm"), tplInstall, &form) + return + } cfg.Section("security").Key("PASSWORD_HASH_ALGO").SetValue(form.PasswordAlgorithm) } @@ -571,18 +581,26 @@ func SubmitInstall(ctx *context.Context) { } log.Info("First-time run install finished!") + InstallDone(ctx) - ctx.Flash.Success(ctx.Tr("install.install_success")) - - ctx.RespHeader().Add("Refresh", "1; url="+setting.AppURL+"user/login") - ctx.HTML(http.StatusOK, tplPostInstall) - - // Now get the http.Server from this request and shut it down - // NB: This is not our hammerable graceful shutdown this is http.Server.Shutdown - srv := ctx.Value(http.ServerContextKey).(*http.Server) go func() { + // Sleep for a while to make sure the user's browser has loaded the post-install page and its assets (images, css, js) + // What if this duration is not long enough? That's impossible -- if the user can't load the simple page in time, how could they install or use Gitea in the future .... + time.Sleep(3 * time.Second) + + // Now get the http.Server from this request and shut it down + // NB: This is not our hammerable graceful shutdown this is http.Server.Shutdown + srv := ctx.Value(http.ServerContextKey).(*http.Server) if err := srv.Shutdown(graceful.GetManager().HammerContext()); err != nil { log.Error("Unable to shutdown the install server! Error: %v", err) } + + // After the HTTP server for "install" shuts down, the `runWeb()` will continue to run the "normal" server }() } + +// InstallDone shows the "post-install" page, makes it easier to develop the page. +// The name is not called as "PostInstall" to avoid misinterpretation as a handler for "POST /install" +func InstallDone(ctx *context.Context) { //nolint + ctx.HTML(http.StatusOK, tplPostInstall) +} diff --git a/routers/install/routes.go b/routers/install/routes.go index 9aa5a88d24b1..a8efc92fe17c 100644 --- a/routers/install/routes.go +++ b/routers/install/routes.go @@ -6,6 +6,7 @@ package install import ( goctx "context" "fmt" + "html" "net/http" "path" @@ -37,7 +38,7 @@ func installRecovery(ctx goctx.Context) func(next http.Handler) http.Handler { // Why we need this? The first recover will try to render a beautiful // error page for user, but the process can still panic again, then // we have to just recover twice and send a simple error page that - // should not panic any more. + // should not panic anymore. defer func() { if err := recover(); err != nil { combinedErr := fmt.Sprintf("PANIC: %v\n%s", err, log.Stack(2)) @@ -107,8 +108,9 @@ func Routes(ctx goctx.Context) *web.Route { r.Use(installRecovery(ctx)) r.Use(Init(ctx)) - r.Get("/", Install) + r.Get("/", Install) // it must be on the root, because the "install.js" use the window.location to replace the "localhost" AppURL r.Post("/", web.Bind(forms.InstallForm{}), SubmitInstall) + r.Get("/post-install", InstallDone) r.Get("/api/healthz", healthcheck.Check) r.NotFound(web.Wrap(installNotFound)) @@ -116,5 +118,10 @@ func Routes(ctx goctx.Context) *web.Route { } func installNotFound(w http.ResponseWriter, req *http.Request) { - http.Redirect(w, req, setting.AppURL, http.StatusFound) + w.Header().Add("Content-Type", "text/html; charset=utf-8") + w.Header().Add("Refresh", fmt.Sprintf("1; url=%s", setting.AppSubURL+"/")) + // do not use 30x status, because the "post-install" page needs to use 404/200 to detect if Gitea has been installed. + // the fetch API could follow 30x requests to the page with 200 status. + w.WriteHeader(http.StatusNotFound) + _, _ = fmt.Fprintf(w, `Not Found. Go to default page.`, html.EscapeString(setting.AppSubURL+"/")) } diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index c552dcfd2d98..d179140b23b2 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -4,7 +4,7 @@ {{if .Title}}{{.Title | RenderEmojiPlain}} - {{end}}{{if .Repository.Name}}{{.Repository.Name}} - {{end}}{{AppName}} - + {{if .ManifestData}}{{end}} diff --git a/templates/post-install.tmpl b/templates/post-install.tmpl index 0d6cd3082c18..f237a6e01b10 100644 --- a/templates/post-install.tmpl +++ b/templates/post-install.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
    +
    @@ -13,7 +13,7 @@
    -

    {{AppSubUrl}}/user/login

    +

    {{.locale.Tr "loading"}}

    diff --git a/web_src/js/features/install.js b/web_src/js/features/install.js index 2ba6fe1279e0..23122ca4c383 100644 --- a/web_src/js/features/install.js +++ b/web_src/js/features/install.js @@ -2,10 +2,18 @@ import $ from 'jquery'; import {hideElem, showElem} from '../utils/dom.js'; export function initInstall() { - if ($('.page-content.install').length === 0) { + const $page = $('.page-content.install'); + if ($page.length === 0) { return; } + if ($page.is('.post-install')) { + initPostInstall(); + } else { + initPreInstall(); + } +} +function initPreInstall() { const defaultDbUser = 'gitea'; const defaultDbName = 'gitea'; @@ -40,6 +48,18 @@ export function initInstall() { } // else: for SQLite3, the default path is always prepared by backend code (setting) }).trigger('change'); + const $appUrl = $('#app_url'); + const configAppUrl = $appUrl.val(); + if (configAppUrl.includes('://localhost')) { + $appUrl.val(window.location.href); + } + + const $domain = $('#domain'); + const configDomain = $domain.val().trim(); + if (configDomain === 'localhost') { + $domain.val(window.location.hostname); + } + // TODO: better handling of exclusive relations. $('#offline-mode input').on('change', function () { if ($(this).is(':checked')) { @@ -83,3 +103,20 @@ export function initInstall() { } }); } + +function initPostInstall() { + const el = document.getElementById('goto-user-login'); + if (!el) return; + + const targetUrl = el.getAttribute('href'); + let tid = setInterval(async () => { + try { + const resp = await fetch(targetUrl); + if (tid && resp.status === 200) { + clearInterval(tid); + tid = null; + window.location.href = targetUrl; + } + } catch {} + }, 1000); +} From 17ae7e335effda0f88b1df83b6918ff9b131f914 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Sun, 5 Mar 2023 07:38:46 -0500 Subject: [PATCH 049/340] Add basic documentation for labels, including scoped labels (#23304) (#23309) Backport #23304 Part of #22974 Co-authored-by: Brecht Van Lommel Co-authored-by: delvh --- docs/content/doc/usage/labels.en-us.md | 42 ++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 docs/content/doc/usage/labels.en-us.md diff --git a/docs/content/doc/usage/labels.en-us.md b/docs/content/doc/usage/labels.en-us.md new file mode 100644 index 000000000000..bf07c074edc6 --- /dev/null +++ b/docs/content/doc/usage/labels.en-us.md @@ -0,0 +1,42 @@ +--- +date: "2023-03-04T19:00:00+00:00" +title: "Usage: Labels" +slug: "labels" +weight: 13 +toc: false +draft: false +menu: + sidebar: + parent: "usage" + name: "Labels" + weight: 13 + identifier: "labels" +--- + +# Labels + +You can use labels to classify issues and pull requests and to improve your overview over them. + +## Creating Labels + +For repositories, labels can be created by going to `Issues` and clicking on `Labels`. + +For organizations, you can define organization-wide labels that are shared with all organization repositories, including both already-existing repositories as well as newly created ones. Organization-wide labels can be created in the organization `Settings`. + +Labels have a mandatory name, a mandatory color, an optional description, and must either be exclusive or not (see `Scoped labels` below). + +When you create a repository, you can ensure certain labels exist by using the `Issue Labels` option. This option lists a number of available label sets that are [configured globally on your instance](../customizing-gitea/#labels). Its contained labels will all be created as well while creating the repository. + +## Scoped Labels + +A scoped label is a label that contains `/` in its name (not at either end of the name). For example labels `kind/bug` and `kind/enhancement` both have scope `kind`. Such labels will display the scope with slightly darker color. + +The scope of a label is determined based on the **last** `/`, so for example the scope of label `scope/subscope/item` is `scope/subscope`. + +Scoped labels can be marked as exclusive. This ensures at most a single label with the same scope is assigned to an issue or pull request. For example, if `kind/bug` and `kind/enhancement` are marked exclusive, an issue can only be classified as a bug or an enhancement. + +## Filtering by Label + +Issue and pull request lists can be filtered by label. Selecting multiple labels shows issues and pull requests that have all selected labels assigned. + +By holding alt to click the label, issues and pull requests with the chosen label are excluded from the list. From e3b1ebbbfed7fac634eedf62a28d9dfdb990d22d Mon Sep 17 00:00:00 2001 From: Giteabot Date: Sun, 5 Mar 2023 10:05:11 -0500 Subject: [PATCH 050/340] Scoped labels: set aria-disabled on muted Exclusive option for a11y (#23306) (#23311) Backport #23306 It is convenient to be able to toggle off this option after removing / from the name. This ensures the muted state is communicated to blind users even when the input is not fully disabled. Part of #22974 Co-authored-by: Brecht Van Lommel Co-authored-by: Lunny Xiao --- web_src/js/features/comp/LabelEdit.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web_src/js/features/comp/LabelEdit.js b/web_src/js/features/comp/LabelEdit.js index 313d4068218b..18676d25e6cc 100644 --- a/web_src/js/features/comp/LabelEdit.js +++ b/web_src/js/features/comp/LabelEdit.js @@ -13,6 +13,7 @@ function updateExclusiveLabelEdit(form) { if (isExclusiveScopeName(nameInput.val())) { exclusiveField.removeClass('muted'); + exclusiveField.removeAttr('aria-disabled'); if (exclusiveCheckbox.prop('checked') && exclusiveCheckbox.data('exclusive-warn')) { exclusiveWarning.removeClass('gt-hidden'); } else { @@ -20,6 +21,7 @@ function updateExclusiveLabelEdit(form) { } } else { exclusiveField.addClass('muted'); + exclusiveField.attr('aria-disabled', 'true'); exclusiveWarning.addClass('gt-hidden'); } } From d1d15306d1c760b93d928c4eec09d01e1528b889 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 6 Mar 2023 03:45:43 -0500 Subject: [PATCH 051/340] Change interactiveBorder to fix popup preview (#23169) (#23314) Backport #23169 Close #23073. Used the solution as reference to the reply: https://github.com/go-gitea/gitea/issues/23073#issuecomment-1440124609 Here made the change inside the `contextpopup.js` because this is where the popup component is created and tippy configuration is given. Co-authored-by: Hester Gong Co-authored-by: Lunny Xiao --- web_src/js/features/contextpopup.js | 1 + 1 file changed, 1 insertion(+) diff --git a/web_src/js/features/contextpopup.js b/web_src/js/features/contextpopup.js index 61f71209083c..7a40e3b8d5b9 100644 --- a/web_src/js/features/contextpopup.js +++ b/web_src/js/features/contextpopup.js @@ -31,6 +31,7 @@ export function initContextPopups() { createTippy(this, { content: el, interactive: true, + interactiveBorder: 5, onShow: () => { el.firstChild.dispatchEvent(new CustomEvent('us-load-context-popup', {detail: {owner, repo, index}})); } From ee3d9330a82d5483b7d832593b6615d3d3a34f31 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 6 Mar 2023 05:44:02 -0500 Subject: [PATCH 052/340] Update hacking-on-gitea-zh_cn documentation (#23315) (#23323) Backport #23315 This PR fix outdated hacking-on-gitea-zh_cn documentation. Co-authored-by: Lunny Xiao Co-authored-by: Jason Song --- .../doc/developers/hacking-on-gitea.zh-cn.md | 334 +++++++++++++++++- 1 file changed, 320 insertions(+), 14 deletions(-) diff --git a/docs/content/doc/developers/hacking-on-gitea.zh-cn.md b/docs/content/doc/developers/hacking-on-gitea.zh-cn.md index 3e8cd3ec573a..9c9141bf50cd 100644 --- a/docs/content/doc/developers/hacking-on-gitea.zh-cn.md +++ b/docs/content/doc/developers/hacking-on-gitea.zh-cn.md @@ -1,6 +1,6 @@ --- date: "2016-12-01T16:00:00+02:00" -title: "加入 Gitea 开源" +title: "玩转 Gitea" slug: "hacking-on-gitea" weight: 10 toc: false @@ -8,36 +8,342 @@ draft: false menu: sidebar: parent: "developers" - name: "加入 Gitea 开源" + name: "玩转 Gitea" weight: 10 identifier: "hacking-on-gitea" --- # Hacking on Gitea -首先你需要一些运行环境，这和 [从源代码安装]({{< relref "doc/installation/from-source.zh-cn.md" >}}) 相同，如果你还没有设置好，可以先阅读那个章节。 +**目录** -如果你想为 Gitea 贡献代码，你需要 Fork 这个项目并且以 `master` 为开发分支。Gitea 使用 Govendor -来管理依赖，因此所有依赖项都被工具自动 copy 在 vendor 子目录下。用下面的命令来下载源码： +{{< toc >}} -``` -go get -d code.gitea.io/gitea -``` +## 快速入门 + +要获得快速工作的开发环境，您可以使用 Gitpod。 + +[![在 Gitpod 中打开](/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/go-gitea/gitea) + +## 安装 Golang + +您需要 [安装 go]( https://golang.org/doc/install ) 并设置您的 go 环境。 + +接下来，[使用 npm 安装 Node.js](https://nodejs.org/en/download/) ，这是构建 +JavaScript 和 CSS 文件的必要工具。最低支持的 Node.js 版本是 {{< min-node-version >}} +并且推荐使用最新的 LTS 版本。 + +**注意** ：当执行需要外部工具的 make 任务时，比如 +`make watch-backend`，Gitea 会自动下载并构建这些必要的组件。为了能够使用这些，你必须 +将 `"$GOPATH"/bin` 目录加入到可执行路径上。如果你不把go bin目录添加到可执行路径你必须手动 +指定可执行程序路径。 -然后你可以在 Github 上 fork [Gitea 项目](https://github.com/go-gitea/gitea)，之后可以通过下面的命令进入源码目录： +**注意2** ：Go版本 {{< min-go-version >}} 或更高版本是必须的。Gitea 使用 `gofmt` 来 +格式化源代码。然而，`gofmt` 的结果可能因 `go` 的版本而有差异。因此推荐安装我们持续集成使用 +的 Go版本。截至上次更新，Go 版本应该是 {{< go-version >}}。 +## 安装 Make + +Gitea 大量使用 `Make` 来自动化任务和改进开发。本指南涵盖了如何安装 Make。 + +### 在 Linux 上 + +使用包管理器安装。 + +在 Ubuntu/Debian 上： + +```bash +sudo apt-get install make ``` -cd $GOPATH/src/code.gitea.io/gitea + +在 Fedora/RHEL/CentOS 上： + +```bash +sudo yum install make ``` -要创建 pull requests 你还需要在源码中新增一个 remote 指向你 Fork 的地址，直接推送到 origin 的话会告诉你没有写权限： +### 在 Windows 上 + +Make 的这三个发行版都可以在 Windows 上运行： +- [单个二进制构建]( http://www.equation.com/servlet/equation.cmd?fa=make )。复制到某处并添加到 `PATH`。 + - [32 位版本](http://www.equation.com/ftpdir/make/32/make.exe) + - [64 位版本](http://www.equation.com/ftpdir/make/64/make.exe) +- [MinGW-w64](https://www.mingw-w64.org) / [MSYS2](https://www.msys2.org/)。 + - MSYS2 是一个工具和库的集合，为您提供一个易于使用的环境来构建、安装和运行本机 Windows 软件，它包括 MinGW-w64。 + - 在 MingGW-w64 中，二进制文件称为 `mingw32-make.exe` 而不是 `make.exe`。将 `bin` 文件夹添加到 `PATH`。 + - 在 MSYS2 中，您可以直接使用 `make`。请参阅 [MSYS2 移植](https://www.msys2.org/wiki/Porting/)。 + - 要使用 CGO_ENABLED（例如：SQLite3）编译 Gitea，您可能需要使用 [tdm-gcc](https://jmeubank.github.io/tdm-gcc/) 而不是 MSYS2 gcc，因为 MSYS2 gcc 标头缺少一些 Windows -只有 CRT 函数像 _beginthread 一样。 +- [Chocolatey包管理器]( https://chocolatey.org/packages/make )。运行`choco install make` + +**注意** ：如果您尝试在 Windows 命令提示符下使用 make 进行构建，您可能会遇到问题。建议使用上述提示（Git bash 或 MinGW），但是如果您只有命令提示符（或可能是 PowerShell），则可以使用 [set](https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/set_1) 命令，例如 `set TAGS=bindata`。 + +## 下载并克隆 Gitea 源代码 + +获取源代码的推荐方法是使用 `git clone`。 + +```bash +git clone https://github.com/go-gitea/gitea ``` + +（自从go modules出现后，不再需要构建 go 项目从 `$GOPATH` 中获取，因此不再推荐使用 `go get` 方法。） + +## 派生 Gitea + +如上所述下载主要的 Gitea 源代码。然后，派生 [Gitea 仓库](https://github.com/go-gitea/gitea)， +并为您的本地仓库切换 git 远程源，或添加另一个远程源： + +```bash +# 将原来的 Gitea origin 重命名为 upstream git remote rename origin upstream -git remote add origin git@github.com:/gitea.git +git remote add origin "git@github.com:$GITHUB_USERNAME/gitea.git" git fetch --all --prune ``` -然后你就可以开始开发了。你可以看一下 `Makefile` 的内容。`make test` 可以运行测试程序， `make build` 将生成一个 `gitea` 可运行文件在根目录。如果你的提交比较复杂，尽量多写一些单元测试代码。 +或者： + +```bash +# 为我们的 fork 添加新的远程 +git remote add "$FORK_NAME" "git@github.com:$GITHUB_USERNAME/gitea.git" +git fetch --all --prune +``` + +为了能够创建合并请求，应将分叉存储库添加为 Gitea 本地仓库的远程，否则无法推送更改。 + +## 构建 Gitea（基本） + +看看我们的 +说明 +关于如何 从源代码构建 。 + +从源代码构建的最简单推荐方法是： + +```bash +TAGS="bindata sqlite sqlite_unlock_notify" make build +``` + +`build` 目标将同时执行 `frontend` 和 `backend` 子目标。如果存在 `bindata` 标签，资源文件将被编译成二进制文件。建议在进行前端开发时省略 `bindata` 标签，以便实时反映更改。 + +有关所有可用的 `make` 目标，请参阅 `make help`。另请参阅 [`.drone.yml`](https://github.com/go-gitea/gitea/blob/main/.drone.yml) 以了解我们的持续集成是如何工作的。 + +## 持续构建 + +要在源文件更改时运行并持续构建： + +```bash +# 对于前端和后端 +make watch + +# 或者：只看前端文件（html/js/css） +make watch-frontend + +# 或者：只看后端文件 (go) +make watch-backend +``` + +在 macOS 上，监视所有后端源文件可能会达到默认的打开文件限制，这可以通过当前 shell 的 `ulimit -n 12288` 或所有未来 shell 的 shell 启动文件来增加。 + +### 格式化、代码分析和拼写检查 + +我们的持续集成将拒绝未通过代码检查（包括格式检查、代码分析和拼写检查）的 PR。 + +你应该格式化你的代码： + +```bash +make fmt +``` + +并检查源代码： + +```bash +# lint 前端和后端代码 +make lint +# 仅 lint 后端代码 +make lint-backend +``` + +**注意** ：`gofmt` 的结果取决于 `go` 的版本。您应该运行与持续集成相同的 go 版本。 + +### 处理 JS 和 CSS + +前端开发应遵循 [Guidelines for Frontend Development]({{ < 相关参考 "doc/developers/guidelines-frontend.en-us.md" > }}) + +要使用前端资源构建，请使用上面提到的“watch-frontend”目标或只构建一次： + +```bash +make build && ./gitea +``` + +在提交之前，确保 linters 通过： + +```bash +make lint-frontend +``` + +### 配置本地 ElasticSearch 实例 + +使用 docker 启动本地 ElasticSearch 实例： + +```sh +mkdir -p $(pwd) /data/elasticsearch +sudo chown -R 1000:1000 $(pwd) /data/elasticsearch +docker run --rm --memory= "4g" -p 127.0.0.1:9200:9200 -p 127.0.0.1:9300:9300 -e "discovery.type=single-node" -v "$(pwd)/data /elasticsearch:/usr/share/elasticsearch/data" docker.elastic.co/elasticsearch/elasticsearch:7.16.3 +``` + +配置`app.ini`： + +```ini +[indexer] +ISSUE_INDEXER_TYPE = elasticsearch +ISSUE_INDEXER_CONN_STR = http://elastic:changeme@localhost:9200 +REPO_INDEXER_ENABLED = true +REPO_INDEXER_TYPE = elasticsearch +REPO_INDEXER_CONN_STR = http://elastic:changeme@localhost:9200 +``` + +### 构建和添加 SVGs + +SVG 图标是使用 `make svg` 目标构建的，该目标将 `build/generate-svg.js` 中定义的图标源编译到输出目录 `public/img/svg` 中。可以在 `web_src/svg` 目录中添加自定义图标。 + +### 构建 Logo + +Gitea Logo的 PNG 和 SVG 版本是使用 `TAGS="gitea" make generate-images` 目标从单个 SVG 源文件 assets/logo.svg 构建的。要运行它，Node.js 和 npm 必须可用。 + +通过更新 `assets/logo.svg` 并运行 `make generate-images`，同样的过程也可用于从 SVG 源文件生成自定义 Logo PNG。忽略 gitea 编译选项将仅更新用户指定的 LOGO 文件。 + +### 更新 API + +创建新的 API 路由或修改现有的 API 路由时，您**必须** +更新和/或创建 [Swagger](https://swagger.io/docs/specification/2-0/what-is-swagger/) +这些使用 [go-swagger](https://goswagger.io/) 评论的文档。 +[规范]( https://goswagger.io/use/spec.html#annotation-syntax )中描述了这些注释的结构。 +如果您想了解更多有关 Swagger 结构的信息，可以查看 +[Swagger 2.0 文档](https://swagger.io/docs/specification/2-0/basic-structure/) +或与添加新 API 端点的先前 PR 进行比较，例如 [PR #5483](https://github.com/go-gitea/gitea/pull/5843/files#diff-2e0a7b644cf31e1c8ef7d76b444fe3aaR20) + +您应该注意不要破坏下游用户依赖的 API。在稳定的 API 上，一般来说添加是可以接受的，但删除 +或对 API 进行根本性更改将会被拒绝。 + +创建或更改 API 端点后，请用以下命令重新生成 Swagger 文档： + +```bash +make generate-swagger +``` + +您应该验证生成的 Swagger 文件并使用以下命令对其进行拼写检查： + +```bash +make swagger-validate misspell-check +``` + +您应该提交更改后的 swagger JSON 文件。持续集成服务器将使用以下方法检查是否已完成： + +```bash +make swagger-check +``` + +**注意** ：请注意，您应该使用 Swagger 2.0 文档，而不是 OpenAPI 3 文档。 + +### 创建新的配置选项 + +创建新的配置选项时，将它们添加到 `modules/setting` 的对应文件。您应该将信息添加到 `custom/conf/app.ini` +并到 配置备忘单 +在 `docs/content/doc/advanced/config-cheat-sheet.en-us.md` 中找到 + +### 更改Logo + +更改 Gitea Logo SVG 时，您将需要运行并提交结果的： + +```bash +make generate-images +``` + +这将创建必要的 Gitea 图标和其他图标。 + +### 数据库迁移 + +如果您对数据库中的任何数据库持久结构进行重大更改 +`models/` 目录，您将需要进行新的迁移。可以找到这些 +在 `models/migrations/` 中。您可以确保您的迁移适用于主要 +数据库类型使用： + +```bash +make test-sqlite-migration # 将 SQLite 切换为适当的数据库 +``` + +## 测试 + +Gitea 运行两种类型的测试：单元测试和集成测试。 + +### 单元测试 + +`go test` 系统中的`*_test.go` 涵盖了单元测试。 +您可以设置环境变量 `GITEA_UNIT_TESTS_LOG_SQL=1` 以在详细模式下运行测试时显示所有 SQL 语句（即设置`GOTESTFLAGS=-v` 时）。 + +```bash +TAGS="bindata sqlite sqlite_unlock_notify" make test # Runs the unit tests +``` + +### 集成测试 + +单元测试不会也不能完全单独测试 Gitea。因此，我们编写了集成测试；但是，这些依赖于数据库。 + +```bash +TAGS="bindata sqlite sqlite_unlock_notify" make build test-sqlite +``` + +将在 SQLite 环境中运行集成测试。集成测试需要安装 `git lfs`。其他数据库测试可用，但 +可能需要适应当地环境。 + +看看 [`tests/integration/README.md`](https://github.com/go-gitea/gitea/blob/main/tests/integration/README.md) 有关更多信息以及如何运行单个测试。 + +### 测试 PR + +我们的持续集成将测试代码是否通过了单元测试，并且所有支持的数据库都将在 Docker 环境中通过集成测试。 +还将测试从几个最新版本的 Gitea 迁移。 + +请在PR中附带提交适当的单元测试和集成测试。 + +## 网站文档 + +该网站的文档位于 `docs/` 中。如果你改变了文档内容，你可以使用以下测试方法进行持续集成： + +```bash +# 来自 Gitea 中的 docs 目录 +make trans-copy clean build +``` + +运行此任务依赖于 [Hugo](https://gohugo.io/)。请注意：这可能会生成一些未跟踪的 Git 对象， +需要被清理干净。 + +## Visual Studio Code + +`contrib/ide/vscode` 中为 Visual Studio Code 提供了 `launch.json` 和 `tasks.json`。查看 +[`contrib/ide/README.md`](https://github.com/go-gitea/gitea/blob/main/contrib/ide/README.md) 了解更多信息。 + +## Goland + +单击 `/main.go` 中函数 `func main()` 上的 `Run Application` 箭头 +可以快速启动一个可调试的 Gitea 实例。 + +`Run/Debug Configuration` 中的 `Output Directory` 必须设置为 +gitea 项目目录（包含 `main.go` 和 `go.mod`）， +否则，启动实例的工作目录是 GoLand 的临时目录 +并防止 Gitea 在开发环境中加载动态资源（例如：模板）。 + +要在 GoLand 中使用 SQLite 运行单元测试，请设置 `-tags sqlite,sqlite_unlock_notify` +在 `运行/调试配置` 的 `Go 工具参数` 中。 + +## 提交 PR + +对更改感到满意后，将它们推送并打开拉取请求。它建议您允许 Gitea Managers 和 Owners 修改您的 PR +分支，因为我们需要在合并之前将其更新为 main 和/或可能是能够直接帮助解决问题。 + +任何 PR 都需要 Gitea 维护者的两次批准，并且需要通过持续集成。看看我们的 +[CONTRIBUTING.md](https://github.com/go-gitea/gitea/blob/main/CONTRIBUTING.md) +文档。 + +如果您需要更多帮助，请访问 [Discord](https://discord.gg/gitea) #Develop 频道 +并在那里聊天。 -好了，到这里你已经设置好了所有的开发 Gitea 所需的环境。欢迎成为 Gitea 的 Contributor。 +现在，您已准备好 Hacking Gitea。 From b1e68f39e737f6d130ffa8b423ee7da3075b12d7 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 6 Mar 2023 09:35:07 -0500 Subject: [PATCH 053/340] Properly flush unique queues on startup (#23154) (#23201) Backport #23154 There have been a number of reports of PRs being blocked whilst being checked which have been difficult to debug. In investigating #23050 I have realised that whilst the Warn there is somewhat of a miscall there was a real bug in the way that the LevelUniqueQueue was being restored on start-up of the PersistableChannelUniqueQueue. Next there is a conflict in the setting of the internal leveldb queue name - This wasn't being set so it was being overridden by other unique queues. This PR fixes these bugs and adds a testcase. Thanks to @brechtvl for noticing the second issue. Fix #23050 and others Signed-off-by: Andrew Thornton Co-authored-by: zeripath Co-authored-by: techknowlogick Co-authored-by: delvh --- modules/queue/queue_channel.go | 5 +- modules/queue/queue_disk_channel.go | 29 +- modules/queue/queue_disk_channel_test.go | 8 +- modules/queue/unique_queue_channel.go | 4 +- modules/queue/unique_queue_channel_test.go | 7 + modules/queue/unique_queue_disk_channel.go | 41 ++- .../queue/unique_queue_disk_channel_test.go | 259 ++++++++++++++++++ 7 files changed, 332 insertions(+), 21 deletions(-) create mode 100644 modules/queue/unique_queue_disk_channel_test.go diff --git a/modules/queue/queue_channel.go b/modules/queue/queue_channel.go index 6f75b8357eab..baac09739395 100644 --- a/modules/queue/queue_channel.go +++ b/modules/queue/queue_channel.go @@ -124,7 +124,10 @@ func (q *ChannelQueue) Shutdown() { log.Trace("ChannelQueue: %s Flushing", q.name) // We can't use Cleanup here because that will close the channel if err := q.FlushWithContext(q.terminateCtx); err != nil { - log.Warn("ChannelQueue: %s Terminated before completed flushing", q.name) + count := atomic.LoadInt64(&q.numInQueue) + if count > 0 { + log.Warn("ChannelQueue: %s Terminated before completed flushing", q.name) + } return } log.Debug("ChannelQueue: %s Flushed", q.name) diff --git a/modules/queue/queue_disk_channel.go b/modules/queue/queue_disk_channel.go index c7526714c65c..91f91f0dfc80 100644 --- a/modules/queue/queue_disk_channel.go +++ b/modules/queue/queue_disk_channel.go @@ -94,7 +94,8 @@ func NewPersistableChannelQueue(handle HandlerFunc, cfg, exemplar interface{}) ( }, Workers: 0, }, - DataDir: config.DataDir, + DataDir: config.DataDir, + QueueName: config.Name + "-level", } levelQueue, err := NewLevelQueue(wrappedHandle, levelCfg, exemplar) @@ -172,16 +173,18 @@ func (q *PersistableChannelQueue) Run(atShutdown, atTerminate func(func())) { atShutdown(q.Shutdown) atTerminate(q.Terminate) - if lq, ok := q.internal.(*LevelQueue); ok && lq.byteFIFO.Len(lq.shutdownCtx) != 0 { + if lq, ok := q.internal.(*LevelQueue); ok && lq.byteFIFO.Len(lq.terminateCtx) != 0 { // Just run the level queue - we shut it down once it's flushed go q.internal.Run(func(_ func()) {}, func(_ func()) {}) go func() { - for !q.IsEmpty() { - _ = q.internal.Flush(0) + for !lq.IsEmpty() { + _ = lq.Flush(0) select { case <-time.After(100 * time.Millisecond): - case <-q.internal.(*LevelQueue).shutdownCtx.Done(): - log.Warn("LevelQueue: %s shut down before completely flushed", q.internal.(*LevelQueue).Name()) + case <-lq.shutdownCtx.Done(): + if lq.byteFIFO.Len(lq.terminateCtx) > 0 { + log.Warn("LevelQueue: %s shut down before completely flushed", q.internal.(*LevelQueue).Name()) + } return } } @@ -316,10 +319,22 @@ func (q *PersistableChannelQueue) Shutdown() { // Redirect all remaining data in the chan to the internal channel log.Trace("PersistableChannelQueue: %s Redirecting remaining data", q.delayedStarter.name) close(q.channelQueue.dataChan) + countOK, countLost := 0, 0 for data := range q.channelQueue.dataChan { - _ = q.internal.Push(data) + err := q.internal.Push(data) + if err != nil { + log.Error("PersistableChannelQueue: %s Unable redirect %v due to: %v", q.delayedStarter.name, data, err) + countLost++ + } else { + countOK++ + } atomic.AddInt64(&q.channelQueue.numInQueue, -1) } + if countLost > 0 { + log.Warn("PersistableChannelQueue: %s %d will be restored on restart, %d lost", q.delayedStarter.name, countOK, countLost) + } else if countOK > 0 { + log.Warn("PersistableChannelQueue: %s %d will be restored on restart", q.delayedStarter.name, countOK) + } log.Trace("PersistableChannelQueue: %s Done Redirecting remaining data", q.delayedStarter.name) log.Debug("PersistableChannelQueue: %s Shutdown", q.delayedStarter.name) diff --git a/modules/queue/queue_disk_channel_test.go b/modules/queue/queue_disk_channel_test.go index 318610355e43..4f14a5d79df9 100644 --- a/modules/queue/queue_disk_channel_test.go +++ b/modules/queue/queue_disk_channel_test.go @@ -39,7 +39,7 @@ func TestPersistableChannelQueue(t *testing.T) { Workers: 1, BoostWorkers: 0, MaxWorkers: 10, - Name: "first", + Name: "test-queue", }, &testData{}) assert.NoError(t, err) @@ -135,7 +135,7 @@ func TestPersistableChannelQueue(t *testing.T) { Workers: 1, BoostWorkers: 0, MaxWorkers: 10, - Name: "second", + Name: "test-queue", }, &testData{}) assert.NoError(t, err) @@ -227,7 +227,7 @@ func TestPersistableChannelQueue_Pause(t *testing.T) { Workers: 1, BoostWorkers: 0, MaxWorkers: 10, - Name: "first", + Name: "test-queue", }, &testData{}) assert.NoError(t, err) @@ -433,7 +433,7 @@ func TestPersistableChannelQueue_Pause(t *testing.T) { Workers: 1, BoostWorkers: 0, MaxWorkers: 10, - Name: "second", + Name: "test-queue", }, &testData{}) assert.NoError(t, err) pausable, ok = queue.(Pausable) diff --git a/modules/queue/unique_queue_channel.go b/modules/queue/unique_queue_channel.go index c43bd1db3f7d..62c051aa3935 100644 --- a/modules/queue/unique_queue_channel.go +++ b/modules/queue/unique_queue_channel.go @@ -177,7 +177,9 @@ func (q *ChannelUniqueQueue) Shutdown() { go func() { log.Trace("ChannelUniqueQueue: %s Flushing", q.name) if err := q.FlushWithContext(q.terminateCtx); err != nil { - log.Warn("ChannelUniqueQueue: %s Terminated before completed flushing", q.name) + if !q.IsEmpty() { + log.Warn("ChannelUniqueQueue: %s Terminated before completed flushing", q.name) + } return } log.Debug("ChannelUniqueQueue: %s Flushed", q.name) diff --git a/modules/queue/unique_queue_channel_test.go b/modules/queue/unique_queue_channel_test.go index 9372694b87a6..824015b834fe 100644 --- a/modules/queue/unique_queue_channel_test.go +++ b/modules/queue/unique_queue_channel_test.go @@ -8,10 +8,13 @@ import ( "testing" "time" + "code.gitea.io/gitea/modules/log" + "github.com/stretchr/testify/assert" ) func TestChannelUniqueQueue(t *testing.T) { + _ = log.NewLogger(1000, "console", "console", `{"level":"warn","stacktracelevel":"NONE","stderr":true}`) handleChan := make(chan *testData) handle := func(data ...Data) []Data { for _, datum := range data { @@ -52,6 +55,8 @@ func TestChannelUniqueQueue(t *testing.T) { } func TestChannelUniqueQueue_Batch(t *testing.T) { + _ = log.NewLogger(1000, "console", "console", `{"level":"warn","stacktracelevel":"NONE","stderr":true}`) + handleChan := make(chan *testData) handle := func(data ...Data) []Data { for _, datum := range data { @@ -98,6 +103,8 @@ func TestChannelUniqueQueue_Batch(t *testing.T) { } func TestChannelUniqueQueue_Pause(t *testing.T) { + _ = log.NewLogger(1000, "console", "console", `{"level":"warn","stacktracelevel":"NONE","stderr":true}`) + lock := sync.Mutex{} var queue Queue var err error diff --git a/modules/queue/unique_queue_disk_channel.go b/modules/queue/unique_queue_disk_channel.go index 405726182dcb..cc8a807c6723 100644 --- a/modules/queue/unique_queue_disk_channel.go +++ b/modules/queue/unique_queue_disk_channel.go @@ -94,7 +94,8 @@ func NewPersistableChannelUniqueQueue(handle HandlerFunc, cfg, exemplar interfac }, Workers: 0, }, - DataDir: config.DataDir, + DataDir: config.DataDir, + QueueName: config.Name + "-level", } queue.channelQueue = channelUniqueQueue.(*ChannelUniqueQueue) @@ -209,17 +210,29 @@ func (q *PersistableChannelUniqueQueue) Run(atShutdown, atTerminate func(func()) atTerminate(q.Terminate) _ = q.channelQueue.AddWorkers(q.channelQueue.workers, 0) - if luq, ok := q.internal.(*LevelUniqueQueue); ok && luq.ByteFIFOUniqueQueue.byteFIFO.Len(luq.shutdownCtx) != 0 { + if luq, ok := q.internal.(*LevelUniqueQueue); ok && !luq.IsEmpty() { // Just run the level queue - we shut it down once it's flushed - go q.internal.Run(func(_ func()) {}, func(_ func()) {}) + go luq.Run(func(_ func()) {}, func(_ func()) {}) go func() { - _ = q.internal.Flush(0) - log.Debug("LevelUniqueQueue: %s flushed so shutting down", q.internal.(*LevelUniqueQueue).Name()) - q.internal.(*LevelUniqueQueue).Shutdown() - GetManager().Remove(q.internal.(*LevelUniqueQueue).qid) + _ = luq.Flush(0) + for !luq.IsEmpty() { + _ = luq.Flush(0) + select { + case <-time.After(100 * time.Millisecond): + case <-luq.shutdownCtx.Done(): + if luq.byteFIFO.Len(luq.terminateCtx) > 0 { + log.Warn("LevelUniqueQueue: %s shut down before completely flushed", luq.Name()) + } + return + } + } + log.Debug("LevelUniqueQueue: %s flushed so shutting down", luq.Name()) + luq.Shutdown() + GetManager().Remove(luq.qid) }() } else { log.Debug("PersistableChannelUniqueQueue: %s Skipping running the empty level queue", q.delayedStarter.name) + _ = q.internal.Flush(0) q.internal.(*LevelUniqueQueue).Shutdown() GetManager().Remove(q.internal.(*LevelUniqueQueue).qid) } @@ -285,8 +298,20 @@ func (q *PersistableChannelUniqueQueue) Shutdown() { // Redirect all remaining data in the chan to the internal channel close(q.channelQueue.dataChan) log.Trace("PersistableChannelUniqueQueue: %s Redirecting remaining data", q.delayedStarter.name) + countOK, countLost := 0, 0 for data := range q.channelQueue.dataChan { - _ = q.internal.Push(data) + err := q.internal.(*LevelUniqueQueue).Push(data) + if err != nil { + log.Error("PersistableChannelUniqueQueue: %s Unable redirect %v due to: %v", q.delayedStarter.name, data, err) + countLost++ + } else { + countOK++ + } + } + if countLost > 0 { + log.Warn("PersistableChannelUniqueQueue: %s %d will be restored on restart, %d lost", q.delayedStarter.name, countOK, countLost) + } else if countOK > 0 { + log.Warn("PersistableChannelUniqueQueue: %s %d will be restored on restart", q.delayedStarter.name, countOK) } log.Trace("PersistableChannelUniqueQueue: %s Done Redirecting remaining data", q.delayedStarter.name) diff --git a/modules/queue/unique_queue_disk_channel_test.go b/modules/queue/unique_queue_disk_channel_test.go new file mode 100644 index 000000000000..fd76163f4aac --- /dev/null +++ b/modules/queue/unique_queue_disk_channel_test.go @@ -0,0 +1,259 @@ +// Copyright 2023 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package queue + +import ( + "fmt" + "strconv" + "sync" + "testing" + "time" + + "code.gitea.io/gitea/modules/log" + + "github.com/stretchr/testify/assert" +) + +func TestPersistableChannelUniqueQueue(t *testing.T) { + tmpDir := t.TempDir() + fmt.Printf("TempDir %s\n", tmpDir) + _ = log.NewLogger(1000, "console", "console", `{"level":"warn","stacktracelevel":"NONE","stderr":true}`) + + // Common function to create the Queue + newQueue := func(name string, handle func(data ...Data) []Data) Queue { + q, err := NewPersistableChannelUniqueQueue(handle, + PersistableChannelUniqueQueueConfiguration{ + Name: name, + DataDir: tmpDir, + QueueLength: 200, + MaxWorkers: 1, + BlockTimeout: 1 * time.Second, + BoostTimeout: 5 * time.Minute, + BoostWorkers: 1, + Workers: 0, + }, "task-0") + assert.NoError(t, err) + return q + } + + // runs the provided queue and provides some timer function + type channels struct { + readyForShutdown chan struct{} // closed when shutdown functions have been assigned + readyForTerminate chan struct{} // closed when terminate functions have been assigned + signalShutdown chan struct{} // Should close to signal shutdown + doneShutdown chan struct{} // closed when shutdown function is done + queueTerminate []func() // list of atTerminate functions to call atTerminate - need to be accessed with lock + } + runQueue := func(q Queue, lock *sync.Mutex) *channels { + chans := &channels{ + readyForShutdown: make(chan struct{}), + readyForTerminate: make(chan struct{}), + signalShutdown: make(chan struct{}), + doneShutdown: make(chan struct{}), + } + go q.Run(func(atShutdown func()) { + go func() { + lock.Lock() + select { + case <-chans.readyForShutdown: + default: + close(chans.readyForShutdown) + } + lock.Unlock() + <-chans.signalShutdown + atShutdown() + close(chans.doneShutdown) + }() + }, func(atTerminate func()) { + lock.Lock() + defer lock.Unlock() + select { + case <-chans.readyForTerminate: + default: + close(chans.readyForTerminate) + } + chans.queueTerminate = append(chans.queueTerminate, atTerminate) + }) + + return chans + } + + // call to shutdown and terminate the queue associated with the channels + doTerminate := func(chans *channels, lock *sync.Mutex) { + <-chans.readyForTerminate + + lock.Lock() + callbacks := []func(){} + callbacks = append(callbacks, chans.queueTerminate...) + lock.Unlock() + + for _, callback := range callbacks { + callback() + } + } + + mapLock := sync.Mutex{} + executedInitial := map[string][]string{} + hasInitial := map[string][]string{} + + fillQueue := func(name string, done chan struct{}) { + t.Run("Initial Filling: "+name, func(t *testing.T) { + lock := sync.Mutex{} + + startAt100Queued := make(chan struct{}) + stopAt20Shutdown := make(chan struct{}) // stop and shutdown at the 20th item + + handle := func(data ...Data) []Data { + <-startAt100Queued + for _, datum := range data { + s := datum.(string) + mapLock.Lock() + executedInitial[name] = append(executedInitial[name], s) + mapLock.Unlock() + if s == "task-20" { + close(stopAt20Shutdown) + } + } + return nil + } + + q := newQueue(name, handle) + + // add 100 tasks to the queue + for i := 0; i < 100; i++ { + _ = q.Push("task-" + strconv.Itoa(i)) + } + close(startAt100Queued) + + chans := runQueue(q, &lock) + + <-chans.readyForShutdown + <-stopAt20Shutdown + close(chans.signalShutdown) + <-chans.doneShutdown + _ = q.Push("final") + + // check which tasks are still in the queue + for i := 0; i < 100; i++ { + if has, _ := q.(UniqueQueue).Has("task-" + strconv.Itoa(i)); has { + mapLock.Lock() + hasInitial[name] = append(hasInitial[name], "task-"+strconv.Itoa(i)) + mapLock.Unlock() + } + } + if has, _ := q.(UniqueQueue).Has("final"); has { + mapLock.Lock() + hasInitial[name] = append(hasInitial[name], "final") + mapLock.Unlock() + } else { + assert.Fail(t, "UnqueQueue %s should have \"final\"", name) + } + doTerminate(chans, &lock) + mapLock.Lock() + assert.Equal(t, 101, len(executedInitial[name])+len(hasInitial[name])) + mapLock.Unlock() + }) + close(done) + } + + doneA := make(chan struct{}) + doneB := make(chan struct{}) + + go fillQueue("QueueA", doneA) + go fillQueue("QueueB", doneB) + + <-doneA + <-doneB + + executedEmpty := map[string][]string{} + hasEmpty := map[string][]string{} + emptyQueue := func(name string, done chan struct{}) { + t.Run("Empty Queue: "+name, func(t *testing.T) { + lock := sync.Mutex{} + stop := make(chan struct{}) + + // collect the tasks that have been executed + handle := func(data ...Data) []Data { + lock.Lock() + for _, datum := range data { + mapLock.Lock() + executedEmpty[name] = append(executedEmpty[name], datum.(string)) + mapLock.Unlock() + if datum.(string) == "final" { + close(stop) + } + } + lock.Unlock() + return nil + } + + q := newQueue(name, handle) + chans := runQueue(q, &lock) + + <-chans.readyForShutdown + <-stop + close(chans.signalShutdown) + <-chans.doneShutdown + + // check which tasks are still in the queue + for i := 0; i < 100; i++ { + if has, _ := q.(UniqueQueue).Has("task-" + strconv.Itoa(i)); has { + mapLock.Lock() + hasEmpty[name] = append(hasEmpty[name], "task-"+strconv.Itoa(i)) + mapLock.Unlock() + } + } + doTerminate(chans, &lock) + + mapLock.Lock() + assert.Equal(t, 101, len(executedInitial[name])+len(executedEmpty[name])) + assert.Equal(t, 0, len(hasEmpty[name])) + mapLock.Unlock() + }) + close(done) + } + + doneA = make(chan struct{}) + doneB = make(chan struct{}) + + go emptyQueue("QueueA", doneA) + go emptyQueue("QueueB", doneB) + + <-doneA + <-doneB + + mapLock.Lock() + t.Logf("TestPersistableChannelUniqueQueue executedInitiallyA=%v, executedInitiallyB=%v, executedToEmptyA=%v, executedToEmptyB=%v", + len(executedInitial["QueueA"]), len(executedInitial["QueueB"]), len(executedEmpty["QueueA"]), len(executedEmpty["QueueB"])) + + // reset and rerun + executedInitial = map[string][]string{} + hasInitial = map[string][]string{} + executedEmpty = map[string][]string{} + hasEmpty = map[string][]string{} + mapLock.Unlock() + + doneA = make(chan struct{}) + doneB = make(chan struct{}) + + go fillQueue("QueueA", doneA) + go fillQueue("QueueB", doneB) + + <-doneA + <-doneB + + doneA = make(chan struct{}) + doneB = make(chan struct{}) + + go emptyQueue("QueueA", doneA) + go emptyQueue("QueueB", doneB) + + <-doneA + <-doneB + + mapLock.Lock() + t.Logf("TestPersistableChannelUniqueQueue executedInitiallyA=%v, executedInitiallyB=%v, executedToEmptyA=%v, executedToEmptyB=%v", + len(executedInitial["QueueA"]), len(executedInitial["QueueB"]), len(executedEmpty["QueueA"]), len(executedEmpty["QueueB"])) + mapLock.Unlock() +} From dcf1717793f92dc11ea3d65ef0f3bb25243905e6 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 6 Mar 2023 11:32:40 -0500 Subject: [PATCH 054/340] Add context when rendering labels or emojis (#23281) (#23319) Backport #23281 This branch continues the work of #23092 and attempts to rid the codebase of any `nil` contexts when using a `RenderContext`. Anything that renders markdown or does post processing may call `markup.sha1CurrentPatternProcessor()`, and this runs `git.OpenRepository()`, which needs a context. It will panic if the context is `nil`. This branch attempts to _always_ include a context when creating a `RenderContext` to prevent future crashes. Co-authored-by: Jonathan Tran --- modules/csv/csv_test.go | 6 ++- modules/markup/console/console_test.go | 4 +- modules/markup/csv/csv_test.go | 4 +- modules/markup/html.go | 3 +- modules/markup/html_internal_test.go | 43 +++++++++++++++---- modules/markup/html_test.go | 14 ++++++ modules/markup/markdown/markdown_test.go | 23 ++++++---- modules/markup/orgmode/orgmode_test.go | 4 ++ modules/templates/helper.go | 21 ++++----- templates/projects/view.tmpl | 2 +- templates/repo/activity.tmpl | 14 +++--- templates/repo/commits_list.tmpl | 2 +- templates/repo/issue/labels/label.tmpl | 2 +- templates/repo/issue/labels/label_list.tmpl | 8 ++-- templates/repo/issue/list.tmpl | 4 +- templates/repo/issue/milestone_issues.tmpl | 4 +- templates/repo/issue/new_form.tmpl | 8 ++-- .../repo/issue/view_content/comments.tmpl | 8 ++-- .../repo/issue/view_content/sidebar.tmpl | 16 +++---- templates/repo/projects/view.tmpl | 2 +- templates/repo/settings/lfs_file_find.tmpl | 2 +- templates/shared/issuelist.tmpl | 4 +- templates/user/dashboard/feeds.tmpl | 14 +++--- 23 files changed, 136 insertions(+), 76 deletions(-) diff --git a/modules/csv/csv_test.go b/modules/csv/csv_test.go index c627597fa3c9..6b91a81fc479 100644 --- a/modules/csv/csv_test.go +++ b/modules/csv/csv_test.go @@ -11,6 +11,7 @@ import ( "strings" "testing" + "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/markup" "github.com/stretchr/testify/assert" @@ -229,7 +230,10 @@ John Doe john@doe.com This,note,had,a,lot,of,commas,to,test,delimiters`, } for n, c := range cases { - delimiter := determineDelimiter(&markup.RenderContext{RelativePath: c.filename}, []byte(decodeSlashes(t, c.csv))) + delimiter := determineDelimiter(&markup.RenderContext{ + Ctx: git.DefaultContext, + RelativePath: c.filename, + }, []byte(decodeSlashes(t, c.csv))) assert.EqualValues(t, c.expectedDelimiter, delimiter, "case %d: delimiter should be equal, expected '%c' got '%c'", n, c.expectedDelimiter, delimiter) } } diff --git a/modules/markup/console/console_test.go b/modules/markup/console/console_test.go index 506f86194cb9..2337d91ac544 100644 --- a/modules/markup/console/console_test.go +++ b/modules/markup/console/console_test.go @@ -7,6 +7,7 @@ import ( "strings" "testing" + "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/markup" "github.com/stretchr/testify/assert" @@ -23,7 +24,8 @@ func TestRenderConsole(t *testing.T) { canRender := render.CanRender("test", strings.NewReader(k)) assert.True(t, canRender) - err := render.Render(&markup.RenderContext{}, strings.NewReader(k), &buf) + err := render.Render(&markup.RenderContext{Ctx: git.DefaultContext}, + strings.NewReader(k), &buf) assert.NoError(t, err) assert.EqualValues(t, v, buf.String()) } diff --git a/modules/markup/csv/csv_test.go b/modules/markup/csv/csv_test.go index b9f5769be28b..8c07184b21ee 100644 --- a/modules/markup/csv/csv_test.go +++ b/modules/markup/csv/csv_test.go @@ -7,6 +7,7 @@ import ( "strings" "testing" + "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/markup" "github.com/stretchr/testify/assert" @@ -23,7 +24,8 @@ func TestRenderCSV(t *testing.T) { for k, v := range kases { var buf strings.Builder - err := render.Render(&markup.RenderContext{}, strings.NewReader(k), &buf) + err := render.Render(&markup.RenderContext{Ctx: git.DefaultContext}, + strings.NewReader(k), &buf) assert.NoError(t, err) assert.EqualValues(t, v, buf.String()) } diff --git a/modules/markup/html.go b/modules/markup/html.go index bcb38f99eb4a..76fc54cf465e 100644 --- a/modules/markup/html.go +++ b/modules/markup/html.go @@ -291,9 +291,10 @@ func RenderDescriptionHTML( // RenderEmoji for when we want to just process emoji and shortcodes // in various places it isn't already run through the normal markdown processor func RenderEmoji( + ctx *RenderContext, content string, ) (string, error) { - return renderProcessString(&RenderContext{}, emojiProcessors, content) + return renderProcessString(ctx, emojiProcessors, content) } var ( diff --git a/modules/markup/html_internal_test.go b/modules/markup/html_internal_test.go index 6746c40d1831..a048f1f52788 100644 --- a/modules/markup/html_internal_test.go +++ b/modules/markup/html_internal_test.go @@ -9,6 +9,7 @@ import ( "strings" "testing" + "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" @@ -70,8 +71,13 @@ var localMetas = map[string]string{ func TestRender_IssueIndexPattern(t *testing.T) { // numeric: render inputs without valid mentions test := func(s string) { - testRenderIssueIndexPattern(t, s, s, &RenderContext{}) - testRenderIssueIndexPattern(t, s, s, &RenderContext{Metas: numericMetas}) + testRenderIssueIndexPattern(t, s, s, &RenderContext{ + Ctx: git.DefaultContext, + }) + testRenderIssueIndexPattern(t, s, s, &RenderContext{ + Ctx: git.DefaultContext, + Metas: numericMetas, + }) } // should not render anything when there are no mentions @@ -119,7 +125,10 @@ func TestRender_IssueIndexPattern2(t *testing.T) { links[i] = numericIssueLink(util.URLJoin(TestRepoURL, path), "ref-issue", index, marker) } expectedNil := fmt.Sprintf(expectedFmt, links...) - testRenderIssueIndexPattern(t, s, expectedNil, &RenderContext{Metas: localMetas}) + testRenderIssueIndexPattern(t, s, expectedNil, &RenderContext{ + Ctx: git.DefaultContext, + Metas: localMetas, + }) class := "ref-issue" if isExternal { @@ -130,7 +139,10 @@ func TestRender_IssueIndexPattern2(t *testing.T) { links[i] = numericIssueLink(prefix, class, index, marker) } expectedNum := fmt.Sprintf(expectedFmt, links...) - testRenderIssueIndexPattern(t, s, expectedNum, &RenderContext{Metas: numericMetas}) + testRenderIssueIndexPattern(t, s, expectedNum, &RenderContext{ + Ctx: git.DefaultContext, + Metas: numericMetas, + }) } // should render freestanding mentions @@ -164,7 +176,10 @@ func TestRender_IssueIndexPattern3(t *testing.T) { // alphanumeric: render inputs without valid mentions test := func(s string) { - testRenderIssueIndexPattern(t, s, s, &RenderContext{Metas: alphanumericMetas}) + testRenderIssueIndexPattern(t, s, s, &RenderContext{ + Ctx: git.DefaultContext, + Metas: alphanumericMetas, + }) } test("") test("this is a test") @@ -194,7 +209,10 @@ func TestRender_IssueIndexPattern4(t *testing.T) { links[i] = externalIssueLink("https://someurl.com/someUser/someRepo/", "ref-issue ref-external-issue", name) } expected := fmt.Sprintf(expectedFmt, links...) - testRenderIssueIndexPattern(t, s, expected, &RenderContext{Metas: alphanumericMetas}) + testRenderIssueIndexPattern(t, s, expected, &RenderContext{ + Ctx: git.DefaultContext, + Metas: alphanumericMetas, + }) } test("OTT-1234 test", "%s test", "OTT-1234") test("test T-12 issue", "test %s issue", "T-12") @@ -214,7 +232,10 @@ func TestRender_IssueIndexPattern5(t *testing.T) { } expected := fmt.Sprintf(expectedFmt, links...) - testRenderIssueIndexPattern(t, s, expected, &RenderContext{Metas: metas}) + testRenderIssueIndexPattern(t, s, expected, &RenderContext{ + Ctx: git.DefaultContext, + Metas: metas, + }) } test("abc ISSUE-123 def", "abc %s def", @@ -235,7 +256,10 @@ func TestRender_IssueIndexPattern5(t *testing.T) { []string{"ISSUE-123"}, ) - testRenderIssueIndexPattern(t, "will not match", "will not match", &RenderContext{Metas: regexpMetas}) + testRenderIssueIndexPattern(t, "will not match", "will not match", &RenderContext{ + Ctx: git.DefaultContext, + Metas: regexpMetas, + }) } func testRenderIssueIndexPattern(t *testing.T, input, expected string, ctx *RenderContext) { @@ -255,6 +279,7 @@ func TestRender_AutoLink(t *testing.T) { test := func(input, expected string) { var buffer strings.Builder err := PostProcess(&RenderContext{ + Ctx: git.DefaultContext, URLPrefix: TestRepoURL, Metas: localMetas, }, strings.NewReader(input), &buffer) @@ -263,6 +288,7 @@ func TestRender_AutoLink(t *testing.T) { buffer.Reset() err = PostProcess(&RenderContext{ + Ctx: git.DefaultContext, URLPrefix: TestRepoURL, Metas: localMetas, IsWiki: true, @@ -292,6 +318,7 @@ func TestRender_FullIssueURLs(t *testing.T) { test := func(input, expected string) { var result strings.Builder err := postProcess(&RenderContext{ + Ctx: git.DefaultContext, URLPrefix: TestRepoURL, Metas: localMetas, }, []processor{fullIssuePatternProcessor}, strings.NewReader(input), &result) diff --git a/modules/markup/html_test.go b/modules/markup/html_test.go index aea1d9267682..f8b84485c06d 100644 --- a/modules/markup/html_test.go +++ b/modules/markup/html_test.go @@ -91,6 +91,7 @@ func TestRender_CrossReferences(t *testing.T) { test := func(input, expected string) { buffer, err := RenderString(&RenderContext{ + Ctx: git.DefaultContext, RelativePath: "a.md", URLPrefix: setting.AppSubURL, Metas: localMetas, @@ -135,6 +136,7 @@ func TestRender_links(t *testing.T) { test := func(input, expected string) { buffer, err := RenderString(&RenderContext{ + Ctx: git.DefaultContext, RelativePath: "a.md", URLPrefix: TestRepoURL, }, input) @@ -234,6 +236,7 @@ func TestRender_email(t *testing.T) { test := func(input, expected string) { res, err := RenderString(&RenderContext{ + Ctx: git.DefaultContext, RelativePath: "a.md", URLPrefix: TestRepoURL, }, input) @@ -292,6 +295,7 @@ func TestRender_emoji(t *testing.T) { test := func(input, expected string) { expected = strings.ReplaceAll(expected, "&", "&") buffer, err := RenderString(&RenderContext{ + Ctx: git.DefaultContext, RelativePath: "a.md", URLPrefix: TestRepoURL, }, input) @@ -355,11 +359,13 @@ func TestRender_ShortLinks(t *testing.T) { test := func(input, expected, expectedWiki string) { buffer, err := markdown.RenderString(&RenderContext{ + Ctx: git.DefaultContext, URLPrefix: tree, }, input) assert.NoError(t, err) assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(buffer)) buffer, err = markdown.RenderString(&RenderContext{ + Ctx: git.DefaultContext, URLPrefix: TestRepoURL, Metas: localMetas, IsWiki: true, @@ -461,12 +467,14 @@ func TestRender_RelativeImages(t *testing.T) { test := func(input, expected, expectedWiki string) { buffer, err := markdown.RenderString(&RenderContext{ + Ctx: git.DefaultContext, URLPrefix: tree, Metas: localMetas, }, input) assert.NoError(t, err) assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(buffer)) buffer, err = markdown.RenderString(&RenderContext{ + Ctx: git.DefaultContext, URLPrefix: TestRepoURL, Metas: localMetas, IsWiki: true, @@ -501,6 +509,7 @@ func Test_ParseClusterFuzz(t *testing.T) { var res strings.Builder err := PostProcess(&RenderContext{ + Ctx: git.DefaultContext, URLPrefix: "https://example.com", Metas: localMetas, }, strings.NewReader(data), &res) @@ -511,6 +520,7 @@ func Test_ParseClusterFuzz(t *testing.T) { res.Reset() err = PostProcess(&RenderContext{ + Ctx: git.DefaultContext, URLPrefix: "https://example.com", Metas: localMetas, }, strings.NewReader(data), &res) @@ -531,6 +541,7 @@ func TestIssue16020(t *testing.T) { var res strings.Builder err := PostProcess(&RenderContext{ + Ctx: git.DefaultContext, URLPrefix: "https://example.com", Metas: localMetas, }, strings.NewReader(data), &res) @@ -547,6 +558,7 @@ func BenchmarkEmojiPostprocess(b *testing.B) { for i := 0; i < b.N; i++ { var res strings.Builder err := PostProcess(&RenderContext{ + Ctx: git.DefaultContext, URLPrefix: "https://example.com", Metas: localMetas, }, strings.NewReader(data), &res) @@ -557,6 +569,7 @@ func BenchmarkEmojiPostprocess(b *testing.B) { func TestFuzz(t *testing.T) { s := "t/l/issues/8#/../../a" renderContext := RenderContext{ + Ctx: git.DefaultContext, URLPrefix: "https://example.com/go-gitea/gitea", Metas: map[string]string{ "user": "go-gitea", @@ -574,6 +587,7 @@ func TestIssue18471(t *testing.T) { var res strings.Builder err := PostProcess(&RenderContext{ + Ctx: git.DefaultContext, URLPrefix: "https://example.com", Metas: localMetas, }, strings.NewReader(data), &res) diff --git a/modules/markup/markdown/markdown_test.go b/modules/markup/markdown/markdown_test.go index bb458a65c1c2..0c7650a5ffab 100644 --- a/modules/markup/markdown/markdown_test.go +++ b/modules/markup/markdown/markdown_test.go @@ -52,12 +52,14 @@ func TestRender_StandardLinks(t *testing.T) { test := func(input, expected, expectedWiki string) { buffer, err := RenderString(&markup.RenderContext{ + Ctx: git.DefaultContext, URLPrefix: setting.AppSubURL, }, input) assert.NoError(t, err) assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(buffer)) buffer, err = RenderString(&markup.RenderContext{ + Ctx: git.DefaultContext, URLPrefix: setting.AppSubURL, IsWiki: true, }, input) @@ -81,6 +83,7 @@ func TestRender_Images(t *testing.T) { test := func(input, expected string) { buffer, err := RenderString(&markup.RenderContext{ + Ctx: git.DefaultContext, URLPrefix: setting.AppSubURL, }, input) assert.NoError(t, err) @@ -311,6 +314,7 @@ func TestTotal_RenderWiki(t *testing.T) { for i := 0; i < len(testCases); i += 2 { line, err := RenderString(&markup.RenderContext{ + Ctx: git.DefaultContext, URLPrefix: AppSubURL, IsWiki: true, }, testCases[i]) @@ -339,6 +343,7 @@ func TestTotal_RenderString(t *testing.T) { for i := 0; i < len(testCases); i += 2 { line, err := RenderString(&markup.RenderContext{ + Ctx: git.DefaultContext, URLPrefix: AppSubURL, }, testCases[i]) assert.NoError(t, err) @@ -348,17 +353,17 @@ func TestTotal_RenderString(t *testing.T) { func TestRender_RenderParagraphs(t *testing.T) { test := func(t *testing.T, str string, cnt int) { - res, err := RenderRawString(&markup.RenderContext{}, str) + res, err := RenderRawString(&markup.RenderContext{Ctx: git.DefaultContext}, str) assert.NoError(t, err) assert.Equal(t, cnt, strings.Count(res, "image1
    image2

    ` - res, err := RenderRawString(&markup.RenderContext{}, testcase) + res, err := RenderRawString(&markup.RenderContext{Ctx: git.DefaultContext}, testcase) assert.NoError(t, err) assert.Equal(t, expected, res) } @@ -407,7 +412,7 @@ func TestRenderEmojiInLinks_Issue12331(t *testing.T) { testcase := `[Link with emoji :moon: in text](https://gitea.io)` expected := `

    Link with emoji 🌔 in text

    ` - res, err := RenderString(&markup.RenderContext{}, testcase) + res, err := RenderString(&markup.RenderContext{Ctx: git.DefaultContext}, testcase) assert.NoError(t, err) assert.Equal(t, expected, res) } @@ -441,7 +446,7 @@ func TestColorPreview(t *testing.T) { } for _, test := range positiveTests { - res, err := RenderString(&markup.RenderContext{}, test.testcase) + res, err := RenderString(&markup.RenderContext{Ctx: git.DefaultContext}, test.testcase) assert.NoError(t, err, "Unexpected error in testcase: %q", test.testcase) assert.Equal(t, test.expected, res, "Unexpected result in testcase %q", test.testcase) @@ -461,7 +466,7 @@ func TestColorPreview(t *testing.T) { } for _, test := range negativeTests { - res, err := RenderString(&markup.RenderContext{}, test) + res, err := RenderString(&markup.RenderContext{Ctx: git.DefaultContext}, test) assert.NoError(t, err, "Unexpected error in testcase: %q", test) assert.NotContains(t, res, `` for _, label := range labels { // Protect against nil value in labels - shouldn't happen but would cause a panic if so @@ -396,7 +396,7 @@ func NewFuncMap() []template.FuncMap { continue } htmlCode += fmt.Sprintf("%s ", - repoLink, label.ID, RenderLabel(label)) + repoLink, label.ID, RenderLabel(ctx, label)) } htmlCode += "" return template.HTML(htmlCode) @@ -808,7 +808,7 @@ func RenderIssueTitle(ctx context.Context, text, urlPrefix string, metas map[str } // RenderLabel renders a label -func RenderLabel(label *issues_model.Label) string { +func RenderLabel(ctx context.Context, label *issues_model.Label) string { labelScope := label.ExclusiveScope() textColor := "#111" @@ -821,12 +821,12 @@ func RenderLabel(label *issues_model.Label) string { if labelScope == "" { // Regular label return fmt.Sprintf("
    %s
    ", - textColor, label.Color, description, RenderEmoji(label.Name)) + textColor, label.Color, description, RenderEmoji(ctx, label.Name)) } // Scoped label - scopeText := RenderEmoji(labelScope) - itemText := RenderEmoji(label.Name[len(labelScope)+1:]) + scopeText := RenderEmoji(ctx, labelScope) + itemText := RenderEmoji(ctx, label.Name[len(labelScope)+1:]) itemColor := label.Color scopeColor := label.Color @@ -869,8 +869,9 @@ func RenderLabel(label *issues_model.Label) string { } // RenderEmoji renders html text with emoji post processors -func RenderEmoji(text string) template.HTML { - renderedText, err := markup.RenderEmoji(template.HTMLEscapeString(text)) +func RenderEmoji(ctx context.Context, text string) template.HTML { + renderedText, err := markup.RenderEmoji(&markup.RenderContext{Ctx: ctx}, + template.HTMLEscapeString(text)) if err != nil { log.Error("RenderEmoji: %v", err) return template.HTML("") diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index b25cf2526ebe..eabeff49269b 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -234,7 +234,7 @@ {{if or .Labels .Assignees}}
    {{range .Labels}} - {{RenderLabel .}} + {{RenderLabel $.Context .}} {{end}}
    {{range .Assignees}} diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl index 255951824d27..ae1d426bc074 100644 --- a/templates/repo/activity.tmpl +++ b/templates/repo/activity.tmpl @@ -129,7 +129,7 @@ {{$.locale.Tr "repo.activity.published_release_label"}} {{.TagName}} {{if not .IsTag}} - {{.Title | RenderEmoji}} + {{.Title | RenderEmoji $.Context}} {{end}} {{TimeSinceUnix .CreatedUnix $.locale}}

    @@ -149,7 +149,7 @@ {{range .Activity.MergedPRs}}

    {{$.locale.Tr "repo.activity.merged_prs_label"}} - #{{.Index}} {{.Issue.Title | RenderEmoji}} + #{{.Index}} {{.Issue.Title | RenderEmoji $.Context}} {{TimeSinceUnix .MergedUnix $.locale}}

    {{end}} @@ -168,7 +168,7 @@ {{range .Activity.OpenedPRs}}

    {{$.locale.Tr "repo.activity.opened_prs_label"}} - #{{.Index}} {{.Issue.Title | RenderEmoji}} + #{{.Index}} {{.Issue.Title | RenderEmoji $.Context}} {{TimeSinceUnix .Issue.CreatedUnix $.locale}}

    {{end}} @@ -187,7 +187,7 @@ {{range .Activity.ClosedIssues}}

    {{$.locale.Tr "repo.activity.closed_issue_label"}} - #{{.Index}} {{.Title | RenderEmoji}} + #{{.Index}} {{.Title | RenderEmoji $.Context}} {{TimeSinceUnix .ClosedUnix $.locale}}

    {{end}} @@ -206,7 +206,7 @@ {{range .Activity.OpenedIssues}}

    {{$.locale.Tr "repo.activity.new_issue_label"}} - #{{.Index}} {{.Title | RenderEmoji}} + #{{.Index}} {{.Title | RenderEmoji $.Context}} {{TimeSinceUnix .CreatedUnix $.locale}}

    {{end}} @@ -227,9 +227,9 @@ {{$.locale.Tr "repo.activity.unresolved_conv_label"}} #{{.Index}} {{if .IsPull}} - {{.Title | RenderEmoji}} + {{.Title | RenderEmoji $.Context}} {{else}} - {{.Title | RenderEmoji}} + {{.Title | RenderEmoji $.Context}} {{end}} {{TimeSinceUnix .UpdatedUnix $.locale}}

    diff --git a/templates/repo/commits_list.tmpl b/templates/repo/commits_list.tmpl index eaf86ab4e1fe..36333c554079 100644 --- a/templates/repo/commits_list.tmpl +++ b/templates/repo/commits_list.tmpl @@ -61,7 +61,7 @@ {{if $.PageIsWiki}} - {{.Summary | RenderEmoji}} + {{.Summary | RenderEmoji $.Context}} {{else}} {{$commitLink:= printf "%s/commit/%s" $commitRepoLink (PathEscape .ID.String)}} {{RenderCommitMessageLinkSubject $.Context .Message $commitRepoLink $commitLink $.Repository.ComposeMetas}} diff --git a/templates/repo/issue/labels/label.tmpl b/templates/repo/issue/labels/label.tmpl index 6e9177aec292..01016281ad3c 100644 --- a/templates/repo/issue/labels/label.tmpl +++ b/templates/repo/issue/labels/label.tmpl @@ -3,5 +3,5 @@ id="label_{{.label.ID}}" href="{{.root.RepoLink}}/{{if or .root.IsPull .root.Issue.IsPull}}pulls{{else}}issues{{end}}?labels={{.label.ID}}"{{/* FIXME: use .root.Issue.Link or create .root.Link */}} > - {{RenderLabel .label}} + {{RenderLabel $.Context .label}} diff --git a/templates/repo/issue/labels/label_list.tmpl b/templates/repo/issue/labels/label_list.tmpl index e8f00fa256ce..2c8ace8d7524 100644 --- a/templates/repo/issue/labels/label_list.tmpl +++ b/templates/repo/issue/labels/label_list.tmpl @@ -31,8 +31,8 @@
  • - {{RenderLabel .}} - {{if .Description}}
    {{.Description | RenderEmoji}}{{end}} + {{RenderLabel $.Context .}} + {{if .Description}}
    {{.Description | RenderEmoji $.Context}}{{end}}
    {{if $.PageIsOrgSettingsLabels}} @@ -70,8 +70,8 @@
  • - {{RenderLabel .}} - {{if .Description}}
    {{.Description | RenderEmoji}}{{end}} + {{RenderLabel $.Context .}} + {{if .Description}}
    {{.Description | RenderEmoji $.Context}}{{end}}
    {{svg "octicon-issue-opened"}} {{$.locale.Tr "repo.issues.label_open_issues" .NumOpenRepoIssues}} diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 2b1bea822fbf..ddc197a8896a 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -57,7 +57,7 @@
    {{end}} {{$previousExclusiveScope = $exclusiveScope}} - {{if .IsExcluded}}{{svg "octicon-circle-slash"}}{{else if .IsSelected}}{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}{{end}} {{RenderLabel .}} + {{if .IsExcluded}}{{svg "octicon-circle-slash"}}{{else if .IsSelected}}{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}{{end}} {{RenderLabel $.Context .}} {{end}}
    @@ -231,7 +231,7 @@ {{end}} {{$previousExclusiveScope = $exclusiveScope}}
    - {{if contain $.SelLabelIDs .ID}}{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}{{end}} {{RenderLabel .}} + {{if contain $.SelLabelIDs .ID}}{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}{{end}} {{RenderLabel $.Context .}}
    {{end}}
    • diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index fca95974469f..46050a276893 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -58,7 +58,7 @@ {{.locale.Tr "repo.issues.filter_label_exclude" | Safe}} {{.locale.Tr "repo.issues.filter_label_no_select"}} {{range .Labels}} - {{if .IsExcluded}}{{svg "octicon-circle-slash"}}{{else if contain $.SelLabelIDs .ID}}{{svg "octicon-check"}}{{end}} {{RenderLabel .}} + {{if .IsExcluded}}{{svg "octicon-circle-slash"}}{{else if contain $.SelLabelIDs .ID}}{{svg "octicon-check"}}{{end}} {{RenderLabel $.Context .}} {{end}}
    @@ -161,7 +161,7 @@
    {{range .Labels}}
    - {{if contain $.SelLabelIDs .ID}}{{svg "octicon-check"}}{{end}} {{RenderLabel .}} + {{if contain $.SelLabelIDs .ID}}{{svg "octicon-check"}}{{end}} {{RenderLabel $.Context .}}
    {{end}}
    diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index 8346d07a13c6..ac5aaa480188 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -60,8 +60,8 @@
    {{end}} {{$previousExclusiveScope = $exclusiveScope}} - {{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}  {{RenderLabel .}} - {{if .Description}}
    {{.Description | RenderEmoji}}{{end}}     + {{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}  {{RenderLabel $.Context .}} + {{if .Description}}
    {{.Description | RenderEmoji $.Context}}{{end}}     {{end}}
    @@ -72,8 +72,8 @@
    {{end}} {{$previousExclusiveScope = $exclusiveScope}} - {{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}  {{RenderLabel .}} - {{if .Description}}
    {{.Description | RenderEmoji}}{{end}}     + {{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}  {{RenderLabel $.Context .}} + {{if .Description}}
    {{.Description | RenderEmoji $.Context}}{{end}}     {{end}} {{else}}
    {{.locale.Tr "repo.issues.new.no_items"}}
    diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index 94b46bd9f13a..bc4188678057 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -180,11 +180,11 @@ {{template "shared/user/authorlink" .Poster}} {{if and .AddedLabels (not .RemovedLabels)}} - {{$.locale.TrN (len .AddedLabels) "repo.issues.add_label" "repo.issues.add_labels" (RenderLabels .AddedLabels $.RepoLink) $createdStr | Safe}} + {{$.locale.TrN (len .AddedLabels) "repo.issues.add_label" "repo.issues.add_labels" (RenderLabels $.Context .AddedLabels $.RepoLink) $createdStr | Safe}} {{else if and (not .AddedLabels) .RemovedLabels}} - {{$.locale.TrN (len .RemovedLabels) "repo.issues.remove_label" "repo.issues.remove_labels" (RenderLabels .RemovedLabels $.RepoLink) $createdStr | Safe}} + {{$.locale.TrN (len .RemovedLabels) "repo.issues.remove_label" "repo.issues.remove_labels" (RenderLabels $.Context .RemovedLabels $.RepoLink) $createdStr | Safe}} {{else}} - {{$.locale.Tr "repo.issues.add_remove_labels" (RenderLabels .AddedLabels $.RepoLink) (RenderLabels .RemovedLabels $.RepoLink) $createdStr | Safe}} + {{$.locale.Tr "repo.issues.add_remove_labels" (RenderLabels $.Context .AddedLabels $.RepoLink) (RenderLabels $.Context .RemovedLabels $.RepoLink) $createdStr | Safe}} {{end}}
    @@ -231,7 +231,7 @@ {{template "shared/user/avatarlink" Dict "Context" $.Context "user" .Poster}} {{template "shared/user/authorlink" .Poster}} - {{$.locale.Tr "repo.issues.change_title_at" (.OldTitle|RenderEmoji) (.NewTitle|RenderEmoji) $createdStr | Safe}} + {{$.locale.Tr "repo.issues.change_title_at" (.OldTitle|RenderEmoji $.Context) (.NewTitle|RenderEmoji $.Context) $createdStr | Safe}}
    {{else if eq .Type 11}} diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index d9c506243705..0728f5390a18 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -130,8 +130,8 @@
    {{end}} {{$previousExclusiveScope = $exclusiveScope}} - {{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}  {{RenderLabel .}} - {{if .Description}}
    {{.Description | RenderEmoji}}{{end}}     + {{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}  {{RenderLabel $.Context .}} + {{if .Description}}
    {{.Description | RenderEmoji $.Context}}{{end}}     {{end}}
    {{$previousExclusiveScope := "_no_scope"}} @@ -141,8 +141,8 @@
    {{end}} {{$previousExclusiveScope = $exclusiveScope}} - {{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}  {{RenderLabel .}} - {{if .Description}}
    {{.Description | RenderEmoji}}{{end}}     + {{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}  {{RenderLabel $.Context .}} + {{if .Description}}
    {{.Description | RenderEmoji $.Context}}{{end}}     {{end}} {{else}}
    {{.locale.Tr "repo.issues.new.no_items"}}
    @@ -487,8 +487,8 @@ {{range .BlockingDependencies}}
    - - #{{.Issue.Index}} {{.Issue.Title | RenderEmoji}} + + #{{.Issue.Index}} {{.Issue.Title | RenderEmoji $.Context}}
    {{.Repository.OwnerName}}/{{.Repository.Name}} @@ -514,8 +514,8 @@ {{range .BlockedByDependencies}}
    - - #{{.Issue.Index}} {{.Issue.Title | RenderEmoji}} + + #{{.Issue.Index}} {{.Issue.Title | RenderEmoji $.Context}}
    {{.Repository.OwnerName}}/{{.Repository.Name}} diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index a4ada8735356..0c49c1d02579 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -245,7 +245,7 @@ {{if or .Labels .Assignees}}
    {{range .Labels}} - {{RenderLabel .}} + {{RenderLabel $.Context .}} {{end}}
    {{range .Assignees}} diff --git a/templates/repo/settings/lfs_file_find.tmpl b/templates/repo/settings/lfs_file_find.tmpl index d5983ca1cc8d..81cb6498374a 100644 --- a/templates/repo/settings/lfs_file_find.tmpl +++ b/templates/repo/settings/lfs_file_find.tmpl @@ -19,7 +19,7 @@ - {{.Summary | RenderEmoji}} + {{.Summary | RenderEmoji $.Context}} diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index a43047c79de9..6f3fd0f9167d 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -34,7 +34,7 @@
    - {{RenderEmoji .Title | RenderCodeBlock}} + {{RenderEmoji $.Context .Title | RenderCodeBlock}} {{if .IsPull}} {{if (index $.CommitStatuses .PullRequest.ID)}} {{template "repo/commit_statuses" dict "Status" (index $.CommitLastStatus .PullRequest.ID) "Statuses" (index $.CommitStatuses .PullRequest.ID) "root" $}} @@ -42,7 +42,7 @@ {{end}} {{range .Labels}} - {{RenderLabel .}} + {{RenderLabel $.Context .}} {{end}}
    diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index 3f156249ffa6..f2dc5d00ad82 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -72,7 +72,7 @@ {{$index := index .GetIssueInfos 0}} {{$.locale.Tr "action.comment_pull" ((printf "%s/pulls/%s" .GetRepoLink $index) |Escape) $index (.ShortRepoPath|Escape) | Str2html}} {{else if eq .GetOpType 24}} - {{$linkText := .Content | RenderEmoji}} + {{$linkText := .Content | RenderEmoji $.Context}} {{$.locale.Tr "action.publish_release" (.GetRepoLink|Escape) ((printf "%s/releases/tag/%s" .GetRepoLink .GetTag)|Escape) (.ShortRepoPath|Escape) $linkText | Str2html}} {{else if eq .GetOpType 25}} {{$index := index .GetIssueInfos 0}} @@ -99,20 +99,20 @@
{{else if eq .GetOpType 6}} - {{index .GetIssueInfos 1 | RenderEmoji | RenderCodeBlock}} + {{index .GetIssueInfos 1 | RenderEmoji $.Context | RenderCodeBlock}} {{else if eq .GetOpType 7}} - {{index .GetIssueInfos 1 | RenderEmoji | RenderCodeBlock}} + {{index .GetIssueInfos 1 | RenderEmoji $.Context | RenderCodeBlock}} {{else if or (eq .GetOpType 10) (eq .GetOpType 21) (eq .GetOpType 22) (eq .GetOpType 23)}} - {{.GetIssueTitle | RenderEmoji | RenderCodeBlock}} + {{.GetIssueTitle | RenderEmoji $.Context | RenderCodeBlock}} {{$comment := index .GetIssueInfos 1}} - {{if gt (len $comment) 0}}

{{$comment | RenderEmoji}}

{{end}} + {{if gt (len $comment) 0}}

{{$comment | RenderEmoji $.Context}}

{{end}} {{else if eq .GetOpType 11}}

{{index .GetIssueInfos 1}}

{{else if or (eq .GetOpType 12) (eq .GetOpType 13) (eq .GetOpType 14) (eq .GetOpType 15)}} - {{.GetIssueTitle | RenderEmoji | RenderCodeBlock}} + {{.GetIssueTitle | RenderEmoji $.Context | RenderCodeBlock}} {{else if eq .GetOpType 25}}

{{$.locale.Tr "action.review_dismissed_reason"}}

-

{{index .GetIssueInfos 2 | RenderEmoji}}

+

{{index .GetIssueInfos 2 | RenderEmoji $.Context}}

{{end}}

{{TimeSince .GetCreate $.locale}}

From 233a3997064ee1a72f3bcc802546e6213d871f5b Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 6 Mar 2023 13:05:35 -0500 Subject: [PATCH 055/340] Fix broken code editor diff preview (#23307) (#23320) Backport #23307 Close #23265, the code editor diff preview has been broken for long time. * Fix the regression for `data-line-num` * `.code-diff` is necessary to show the line number * Fix the regression for #12434 * The diff: [12434](https://github.com/go-gitea/gitea/pull/12434/files?diff=unified&w=1) * It hides the Type(4) (aka HunkHeader) for unexpected cases. Diff with ignoring whitespaces: https://github.com/go-gitea/gitea/pull/23307/files?diff=unified&w=1 Before: see the issue #23265 After: ![image](https://user-images.githubusercontent.com/2114189/222942810-286dc9af-0b39-4e9d-8585-8c299b881241.png) Co-authored-by: wxiaoguang --- services/gitdiff/gitdiff.go | 2 +- templates/repo/diff/section_unified.tmpl | 63 +++++++++++++----------- templates/repo/editor/diff_preview.tmpl | 2 +- 3 files changed, 35 insertions(+), 32 deletions(-) diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go index 4a74c1a8944e..c50e8137ab18 100644 --- a/services/gitdiff/gitdiff.go +++ b/services/gitdiff/gitdiff.go @@ -474,7 +474,7 @@ func ParsePatch(maxLines, maxLineCharacters, maxFiles int, reader io.Reader, ski sb := strings.Builder{} // OK let's set a reasonable buffer size. - // This should be let's say at least the size of maxLineCharacters or 4096 whichever is larger. + // This should be at least the size of maxLineCharacters or 4096 whichever is larger. readerSize := maxLineCharacters if readerSize < 4096 { readerSize = 4096 diff --git a/templates/repo/diff/section_unified.tmpl b/templates/repo/diff/section_unified.tmpl index 63cd510221fb..e0ec85f9a6ac 100644 --- a/templates/repo/diff/section_unified.tmpl +++ b/templates/repo/diff/section_unified.tmpl @@ -1,9 +1,9 @@ {{$file := .file}} {{range $j, $section := $file.Sections}} {{range $k, $line := $section.Lines}} - {{if or $.root.AfterCommitID (ne .GetType 4)}} - - {{if eq .GetType 4}} + + {{if eq .GetType 4}} + {{if $.root.AfterCommitID}} {{if or (eq $line.GetExpandDirection 3) (eq $line.GetExpandDirection 5)}} @@ -22,35 +22,38 @@ {{end}} {{else}} - - + {{/* for code file preview page or comment diffs on pull comment pages, do not show the expansion arrows */}} + {{end}} - {{$inlineDiff := $section.GetComputedInlineDiffFor $line $.root.locale -}} - {{if $inlineDiff.EscapeStatus.Escaped}}{{end}} - - {{if eq .GetType 4}} - {{/* - */}}{{template "repo/diff/section_code" dict "diff" $inlineDiff "locale" $.root.locale}}{{/* - */}} - {{else}} - {{/* - */}}{{if and $.root.SignedUserID $.root.PageIsPullFiles}}{{/* - */}}{{/* - */}}{{svg "octicon-plus"}}{{/* - */}}{{/* - */}}{{end}}{{/* - */}}{{template "repo/diff/section_code" dict "diff" $inlineDiff "locale" $.root.locale}}{{/* - */}} - {{end}} - - {{if gt (len $line.Comments) 0}} - - - - {{template "repo/diff/conversation" mergeinto $.root "comments" $line.Comments}} - - + {{else}} + + + {{end}} + {{$inlineDiff := $section.GetComputedInlineDiffFor $line $.root.locale -}} + {{if $inlineDiff.EscapeStatus.Escaped}}{{end}} + + {{if eq .GetType 4}} + {{/* + */}}{{template "repo/diff/section_code" dict "diff" $inlineDiff "locale" $.root.locale}}{{/* + */}} + {{else}} + {{/* + */}}{{if and $.root.SignedUserID $.root.PageIsPullFiles}}{{/* + */}}{{/* + */}}{{svg "octicon-plus"}}{{/* + */}}{{/* + */}}{{end}}{{/* + */}}{{template "repo/diff/section_code" dict "diff" $inlineDiff "locale" $.root.locale}}{{/* + */}} {{end}} + + {{if gt (len $line.Comments) 0}} + + + + {{template "repo/diff/conversation" mergeinto $.root "comments" $line.Comments}} + + {{end}} {{end}} {{end}} diff --git a/templates/repo/editor/diff_preview.tmpl b/templates/repo/editor/diff_preview.tmpl index e6956648ca8b..e2e922be343c 100644 --- a/templates/repo/editor/diff_preview.tmpl +++ b/templates/repo/editor/diff_preview.tmpl @@ -1,6 +1,6 @@
-
+
{{template "repo/diff/section_unified" dict "file" .File "root" $}} From af4767df5c061a21a68b442e223446303b5d77de Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 6 Mar 2023 13:59:53 -0500 Subject: [PATCH 056/340] Scoped labels: don't require holding alt key to remove (#23303) (#23331) Backport #23303 Alt doesn't work on all browsers, the simplest solution for v1.19 is to just not require it and toggle the label by just clicking. Part of #22974 Co-authored-by: Brecht Van Lommel --- web_src/js/features/repo-legacy.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/web_src/js/features/repo-legacy.js b/web_src/js/features/repo-legacy.js index 22113af169e3..5173a5b59907 100644 --- a/web_src/js/features/repo-legacy.js +++ b/web_src/js/features/repo-legacy.js @@ -145,7 +145,6 @@ export function initRepoCommentForm() { const clickedItem = $(this); const scope = $(this).attr('data-scope'); - const canRemoveScope = e.altKey; $(this).parent().find('.item').each(function () { if (scope) { @@ -153,11 +152,7 @@ export function initRepoCommentForm() { if ($(this).attr('data-scope') !== scope) { return true; } - if ($(this).is(clickedItem)) { - if (!canRemoveScope && $(this).hasClass('checked')) { - return true; - } - } else if (!$(this).hasClass('checked')) { + if (!$(this).is(clickedItem) && !$(this).hasClass('checked')) { return true; } } else if (!$(this).is(clickedItem)) { From 2f7bbdf8c9cd8c36bfbb39b7cd477d4be09926ba Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 6 Mar 2023 14:48:04 -0500 Subject: [PATCH 057/340] Fix incorrect project links and use symlink icon for org-wide projects (#23325) (#23336) Backport #23325 Fix displaying same projects icons between user/repo projects. And fix incorrect projects links. A part of https://github.com/go-gitea/gitea/pull/22865. ![image](https://user-images.githubusercontent.com/18380374/223044279-7b620ff1-d88a-4146-97e6-531bbf269761.png) ![image](https://user-images.githubusercontent.com/18380374/223044390-42911e3f-1f6b-439f-8441-4f3ebf99ea13.png) ![image](https://user-images.githubusercontent.com/18380374/223044437-5cad5391-0f95-4c8b-b0a3-32e263e2854f.png) Co-authored-by: yp05327 <576951401@qq.com> --- templates/org/menu.tmpl | 2 +- templates/projects/list.tmpl | 4 ++-- templates/repo/issue/new_form.tmpl | 12 ++++++------ templates/repo/projects/list.tmpl | 2 +- templates/shared/issuelist.tmpl | 4 ++-- templates/user/overview/header.tmpl | 2 +- templates/user/profile.tmpl | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/templates/org/menu.tmpl b/templates/org/menu.tmpl index 7ca47cd32c56..25f459c09c56 100644 --- a/templates/org/menu.tmpl +++ b/templates/org/menu.tmpl @@ -4,7 +4,7 @@ {{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}} - {{svg "octicon-project"}} {{.locale.Tr "user.projects"}} + {{svg "octicon-project-symlink"}} {{.locale.Tr "user.projects"}} {{if .IsPackageEnabled}} diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index 8d9594e2b477..489189ec45a1 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -12,7 +12,7 @@ {{template "base/alert" .}}
- {{svg "octicon-project" 16 "gt-mr-3"}} + {{svg "octicon-project-symlink" 16 "gt-mr-3"}} {{JsPrettyNumber .OpenCount}} {{.locale.Tr "repo.issues.open_title"}} @@ -38,7 +38,7 @@
{{range .Projects}}
  • - {{svg "octicon-project"}} {{.Title}} + {{svg "octicon-project-symlink"}} {{.Title}}
    {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} {{if .IsClosed}} diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index ac5aaa480188..4ce4ffb8e3a4 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -176,8 +176,8 @@ {{.locale.Tr "repo.issues.new.open_projects"}}
    {{range .OpenProjects}} - - {{svg "octicon-project" 18 "gt-mr-3"}} + + {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} {{.Title}} {{end}} @@ -188,8 +188,8 @@ {{.locale.Tr "repo.issues.new.closed_projects"}}
    • {{range .ClosedProjects}} - - {{svg "octicon-project" 18 "gt-mr-3"}} + + {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} {{.Title}} {{end}} @@ -201,8 +201,8 @@ {{.locale.Tr "repo.issues.new.no_projects"}}
    {{if .Project}} - - {{svg "octicon-project" 18 "gt-mr-3"}} + + {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} {{.Project.Title}} {{end}} diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl index fc4770e5d8d4..929a1b4c6fb8 100644 --- a/templates/repo/projects/list.tmpl +++ b/templates/repo/projects/list.tmpl @@ -40,7 +40,7 @@
    {{range .Projects}}
  • - {{svg "octicon-project"}} {{.Title}} + {{svg "octicon-project"}} {{.Title}}
    {{$closedDate:= TimeSinceUnix .ClosedDateUnix $.locale}} {{if .IsClosed}} diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index 6f3fd0f9167d..16bb3c1ec7fe 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -87,8 +87,8 @@ {{end}} {{if .Project}} - - {{svg "octicon-project" 14 "gt-mr-2"}}{{.Project.Title}} + + {{if .Project.IsOrganizationProject}}{{svg "octicon-project-symlink" 14 "gt-mr-2"}}{{else}}{{svg "octicon-project" 14 "gt-mr-2"}}{{end}}{{.Project.Title}} {{end}} {{if .Ref}} diff --git a/templates/user/overview/header.tmpl b/templates/user/overview/header.tmpl index 2449f5fc323e..ce9ecb46adbc 100644 --- a/templates/user/overview/header.tmpl +++ b/templates/user/overview/header.tmpl @@ -23,7 +23,7 @@ {{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}} - {{svg "octicon-project"}} {{.locale.Tr "user.projects"}} + {{svg "octicon-project-symlink"}} {{.locale.Tr "user.projects"}} {{if (not .UnitPackagesGlobalDisabled)}} diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index fcaec60eaec4..5b445bdb0078 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -107,7 +107,7 @@ {{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}} - {{svg "octicon-project"}} {{.locale.Tr "user.projects"}} + {{svg "octicon-project-symlink"}} {{.locale.Tr "user.projects"}} {{if .IsPackageEnabled}} From dfab6e2d1c821408792a0d9b602eec7097f3840d Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 6 Mar 2023 16:05:42 -0500 Subject: [PATCH 058/340] Fix incorrect redirect link of delete org project (#23327) (#23339) Backport #23327 A part of https://github.com/go-gitea/gitea/pull/22865/commits The old code will cause 500 error. Co-authored-by: yp05327 <576951401@qq.com> Co-authored-by: John Olheiser --- routers/web/org/projects.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go index 6449d12de105..046100c72e2f 100644 --- a/routers/web/org/projects.go +++ b/routers/web/org/projects.go @@ -205,7 +205,7 @@ func DeleteProject(ctx *context.Context) { } ctx.JSON(http.StatusOK, map[string]interface{}{ - "redirect": ctx.Repo.RepoLink + "/projects", + "redirect": ctx.ContextUser.HomeLink() + "/-/projects", }) } From 8ab50be000f47d25c43db71594af3fe9a7ff1287 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 6 Mar 2023 16:35:51 -0500 Subject: [PATCH 059/340] Remove unnecessary space on link (#23334) (#23340) Backport #23334 The action run title has a blank. This PR removes it. Co-authored-by: Lunny Xiao Co-authored-by: techknowlogick --- templates/repo/actions/runs_list.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl index a01d2165795b..ffabe534c8bb 100644 --- a/templates/repo/actions/runs_list.tmpl +++ b/templates/repo/actions/runs_list.tmpl @@ -7,7 +7,7 @@
    - {{.Title}} + {{- .Title -}} {{if .RefLink}} From 61f91bdc7e0ed3bd286d269faad56756f5b97c6d Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 6 Mar 2023 18:52:29 -0500 Subject: [PATCH 060/340] Update documentation for the new YAML label file format (#23020) (#23341) Backport #23020 update documentation to include an overview of the yaml label template that is part of PR #22976 Signed-off-by: Jon Roadley-Battin Co-authored-by: JonRB <4564448+eeyrjmr@users.noreply.github.com> Co-authored-by: Yarden Shoham Co-authored-by: Lauris BH Co-authored-by: John Olheiser Co-authored-by: delvh --- .../doc/advanced/customizing-gitea.en-us.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/docs/content/doc/advanced/customizing-gitea.en-us.md b/docs/content/doc/advanced/customizing-gitea.en-us.md index 18fc1b3e73d1..bad6342aad44 100644 --- a/docs/content/doc/advanced/customizing-gitea.en-us.md +++ b/docs/content/doc/advanced/customizing-gitea.en-us.md @@ -282,9 +282,22 @@ To add custom .gitignore, add a file with existing [.gitignore rules](https://gi ### Labels -To add a custom label set, add a file that follows the [label format](https://github.com/go-gitea/gitea/blob/main/options/label/Default) to `$GITEA_CUSTOM/options/label` +Starting with Gitea 1.19, you can add a file that follows the [YAML label format](https://github.com/go-gitea/gitea/blob/main/options/label/Advanced.yaml) to `$GITEA_CUSTOM/options/label`: + +```yaml +labels: + - name: "foo/bar" # name of the label that will appear in the dropdown + exclusive: true # whether to use the exclusive namespace for scoped labels. scoped delimiter is / + color: aabbcc # hex colour coding + description: Some label # long description of label intent + ``` + +The [legacy file format](https://github.com/go-gitea/gitea/blob/main/options/label/Default) can still be used following the format below, however we strongly recommend using the newer YAML format instead. + `#hex-color label name ; label description` +For more information, see the [labels documentation]({{< relref "doc/usage/labels.en-us.md" >}}). + ### Licenses To add a custom license, add a file with the license text to `$GITEA_CUSTOM/options/license` From 6be6c19daf93c720718ce65c71fcf288d6e070e3 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 6 Mar 2023 22:11:55 -0500 Subject: [PATCH 061/340] Fix PR view misalignment caused by long name file (#23321) (#23335) Backport #23321 Close #23248 The UI after this PR: https://user-images.githubusercontent.com/17645053/223009758-7f0c9f12-d346-4cb2-a605-729fddce732f.mov Co-authored-by: Hester Gong Co-authored-by: Lunny Xiao --- templates/repo/diff/box.tmpl | 4 ++-- web_src/less/_repository.less | 19 +++++++++++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 4e6879650ddc..afd471368fa8 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -79,7 +79,7 @@ {{$isExpandable := or (gt $file.Addition 0) (gt $file.Deletion 0) $file.IsBin}}

    -
    +
    {{if $file.ShouldBeHidden}} {{svg "octicon-chevron-right" 18}} @@ -96,7 +96,7 @@ {{template "repo/diff/stats" dict "file" . "root" $}} {{end}}
    - {{if $file.IsRenamed}}{{$file.OldName}} → {{end}}{{$file.Name}}{{if .IsLFSFile}} ({{$.locale.Tr "repo.stored_lfs"}}){{end}} + {{if $file.IsRenamed}}{{$file.OldName}} → {{end}}{{$file.Name}}{{if .IsLFSFile}} ({{$.locale.Tr "repo.stored_lfs"}}){{end}} {{if $file.IsGenerated}} {{$.locale.Tr "repo.diff.generated"}} {{end}} diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index a8106c5bf8c1..74079170a1b2 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -1663,8 +1663,14 @@ align-items: center; .file { - flex: 1; - word-break: break-all; + min-width: 0; + .file-link { + max-width: fit-content; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + overflow: hidden; + } } .button { @@ -3276,6 +3282,15 @@ td.blob-excerpt { position: static; } } + + .diff-file-header-actions { + flex-shrink: 0; + } + + .diff-file-name { + flex: auto; + min-width: 100px; + } } .diff-file-body { From e8e871b44e2afa1e82055c6153cc2a857f651d77 Mon Sep 17 00:00:00 2001 From: sillyguodong <33891828+sillyguodong@users.noreply.github.com> Date: Tue, 7 Mar 2023 18:47:23 +0800 Subject: [PATCH 062/340] Fix cannot reopen after pushing commits to a closed PR (#23189) (#23324) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Backport: #23189 Close: #22784 1. On GH, we can reopen a PR which was closed before after pushing commits. After reopening PR, we can see the commits that were pushed after closing PR in the time line. So the case of [issue](https://github.com/go-gitea/gitea/issues/22784) is a bug which needs to be fixed. 2. After closing a PR and pushing commits, `headBranchSha` is not equal to `sha`(which is the last commit ID string of reference). If the judgement exists, the button of reopen will not display. So, skip the judgement if the status of PR is closed. ![image](https://user-images.githubusercontent.com/33891828/222037529-651fccf9-0bba-433e-b2f0-79c17e0cc812.png) 3. Even if PR is already close, we should still insert comment record into DB when we push commits. So we should still call function `CreatePushPullComment()`. https://github.com/go-gitea/gitea/blob/067b0c2664d127c552ccdfd264257caca4907a77/services/pull/pull.go#L260-L282 So, I add a switch(`includeClosed`) to the `GetUnmergedPullRequestsByHeadInfo` func to control whether the status of PR must be open. In this case, by setting `includeClosed` to `true`, we can query the closed PR. ![image](https://user-images.githubusercontent.com/33891828/222621045-bb80987c-10c5-4eac-aa0c-1fb9c6aefb51.png) 4. In the loop of comments, I use the`latestCloseCommentID` variable to record the last occurrence of the close comment. In the go template, if the status of PR is closed, the comments whose type is `CommentTypePullRequestPush(29)` after `latestCloseCommentID` won't be rendered. ![image](https://user-images.githubusercontent.com/33891828/222058913-c91cf3e3-819b-40c5-8015-654b31eeccff.png) e.g. 1). The initial status of the PR is opened. ![image](https://user-images.githubusercontent.com/33891828/222453617-33c5093e-f712-4cd6-8489-9f87e2075869.png) 2). Then I click the button of `Close`. PR is closed now. ![image](https://user-images.githubusercontent.com/33891828/222453694-25c588a9-c121-4897-9ae5-0b13cf33d20b.png) 3). I try to push a commit to this PR, even though its current status is closed. ![image](https://user-images.githubusercontent.com/33891828/222453916-361678fb-7321-410d-9e37-5a26e8095638.png) But in comments list, this commit do not display.This is as expected ：） ![image](https://user-images.githubusercontent.com/33891828/222454169-7617a791-78d2-404e-be5e-77d555f93313.png) 4). Click the `Reopen` button, the commit which is pushed after closing PR display now. ![image](https://user-images.githubusercontent.com/33891828/222454533-897893b6-b96e-4701-b5cb-b1800f382b8f.png) --------- Co-authored-by: Lunny Xiao --- models/issues/pull_list.go | 15 +++++++++------ models/issues/pull_test.go | 2 +- routers/web/repo/issue.go | 17 ++++++++++++----- routers/web/repo/pull.go | 2 +- services/pull/pull.go | 6 +++--- templates/repo/issue/view_content/comments.tmpl | 4 ++++ 6 files changed, 30 insertions(+), 16 deletions(-) diff --git a/models/issues/pull_list.go b/models/issues/pull_list.go index 6c9e8c4e05fb..9d361c5c5da9 100644 --- a/models/issues/pull_list.go +++ b/models/issues/pull_list.go @@ -52,13 +52,16 @@ func listPullRequestStatement(baseRepoID int64, opts *PullRequestsOptions) (*xor // GetUnmergedPullRequestsByHeadInfo returns all pull requests that are open and has not been merged // by given head information (repo and branch). -func GetUnmergedPullRequestsByHeadInfo(repoID int64, branch string) ([]*PullRequest, error) { +// arg `includeClosed` controls whether the SQL returns closed PRs +func GetUnmergedPullRequestsByHeadInfo(repoID int64, branch string, includeClosed bool) ([]*PullRequest, error) { prs := make([]*PullRequest, 0, 2) - return prs, db.GetEngine(db.DefaultContext). - Where("head_repo_id = ? AND head_branch = ? AND has_merged = ? AND issue.is_closed = ? AND flow = ?", - repoID, branch, false, false, PullRequestFlowGithub). + sess := db.GetEngine(db.DefaultContext). Join("INNER", "issue", "issue.id = pull_request.issue_id"). - Find(&prs) + Where("head_repo_id = ? AND head_branch = ? AND has_merged = ? AND flow = ?", repoID, branch, false, PullRequestFlowGithub) + if !includeClosed { + sess.Where("issue.is_closed = ?", false) + } + return prs, sess.Find(&prs) } // CanMaintainerWriteToBranch check whether user is a maintainer and could write to the branch @@ -71,7 +74,7 @@ func CanMaintainerWriteToBranch(p access_model.Permission, branch string, user * return false } - prs, err := GetUnmergedPullRequestsByHeadInfo(p.Units[0].RepoID, branch) + prs, err := GetUnmergedPullRequestsByHeadInfo(p.Units[0].RepoID, branch, false) if err != nil { return false } diff --git a/models/issues/pull_test.go b/models/issues/pull_test.go index 8ce8eecc4aa8..bcd33329eb9b 100644 --- a/models/issues/pull_test.go +++ b/models/issues/pull_test.go @@ -118,7 +118,7 @@ func TestHasUnmergedPullRequestsByHeadInfo(t *testing.T) { func TestGetUnmergedPullRequestsByHeadInfo(t *testing.T) { assert.NoError(t, unittest.PrepareTestDatabase()) - prs, err := issues_model.GetUnmergedPullRequestsByHeadInfo(1, "branch2") + prs, err := issues_model.GetUnmergedPullRequestsByHeadInfo(1, "branch2", false) assert.NoError(t, err) assert.Len(t, prs, 1) for _, pr := range prs { diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 05ba26a70cda..2b1991f262d8 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -1415,11 +1415,12 @@ func ViewIssue(ctx *context.Context) { } var ( - role issues_model.RoleDescriptor - ok bool - marked = make(map[int64]issues_model.RoleDescriptor) - comment *issues_model.Comment - participants = make([]*user_model.User, 1, 10) + role issues_model.RoleDescriptor + ok bool + marked = make(map[int64]issues_model.RoleDescriptor) + comment *issues_model.Comment + participants = make([]*user_model.User, 1, 10) + latestCloseCommentID int64 ) if ctx.Repo.Repository.IsTimetrackerEnabled(ctx) { if ctx.IsSigned { @@ -1626,9 +1627,15 @@ func ViewIssue(ctx *context.Context) { comment.Type == issues_model.CommentTypeStopTracking { // drop error since times could be pruned from DB.. _ = comment.LoadTime() + } else if comment.Type == issues_model.CommentTypeClose { + // record ID of latest closed comment. + // if PR is closed, the comments whose type is CommentTypePullRequestPush(29) after latestCloseCommentID won't be rendered. + latestCloseCommentID = comment.ID } } + ctx.Data["LatestCloseCommentID"] = latestCloseCommentID + // Combine multiple label assignments into a single comment combineLabelComments(issue) diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go index 38b9f22cbf3d..830c8ad62616 100644 --- a/routers/web/repo/pull.go +++ b/routers/web/repo/pull.go @@ -587,7 +587,7 @@ func PrepareViewPullInfo(ctx *context.Context, issue *issues_model.Issue) *git.C ctx.Data["HeadBranchCommitID"] = headBranchSha ctx.Data["PullHeadCommitID"] = sha - if pull.HeadRepo == nil || !headBranchExist || headBranchSha != sha { + if pull.HeadRepo == nil || !headBranchExist || (!pull.Issue.IsClosed && (headBranchSha != sha)) { ctx.Data["IsPullRequestBroken"] = true if pull.IsSameRepo() { ctx.Data["HeadTarget"] = pull.HeadBranch diff --git a/services/pull/pull.go b/services/pull/pull.go index 0d260c93b1ec..a19e88b33b65 100644 --- a/services/pull/pull.go +++ b/services/pull/pull.go @@ -257,7 +257,7 @@ func AddTestPullRequestTask(doer *user_model.User, repoID int64, branch string, // If you don't let it run all the way then you will lose data // TODO: graceful: AddTestPullRequestTask needs to become a queue! - prs, err := issues_model.GetUnmergedPullRequestsByHeadInfo(repoID, branch) + prs, err := issues_model.GetUnmergedPullRequestsByHeadInfo(repoID, branch, true) if err != nil { log.Error("Find pull requests [head_repo_id: %d, head_branch: %s]: %v", repoID, branch, err) return @@ -500,7 +500,7 @@ func (errs errlist) Error() string { // CloseBranchPulls close all the pull requests who's head branch is the branch func CloseBranchPulls(doer *user_model.User, repoID int64, branch string) error { - prs, err := issues_model.GetUnmergedPullRequestsByHeadInfo(repoID, branch) + prs, err := issues_model.GetUnmergedPullRequestsByHeadInfo(repoID, branch, false) if err != nil { return err } @@ -536,7 +536,7 @@ func CloseRepoBranchesPulls(ctx context.Context, doer *user_model.User, repo *re var errs errlist for _, branch := range branches { - prs, err := issues_model.GetUnmergedPullRequestsByHeadInfo(repo.ID, branch.Name) + prs, err := issues_model.GetUnmergedPullRequestsByHeadInfo(repo.ID, branch.Name, false) if err != nil { return err } diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index bc4188678057..c1d30e17212f 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -697,6 +697,10 @@
    {{else if and (eq .Type 29) (or (gt .CommitsNum 0) .IsForcePush)}} + + {{if and .Issue.IsClosed (gt .ID $.LatestCloseCommentID)}} + {{continue}} + {{end}}
    {{svg "octicon-repo-push"}} From ecae62837c85708b129952d3fa976006a4e13d0f Mon Sep 17 00:00:00 2001 From: Giteabot Date: Tue, 7 Mar 2023 07:11:44 -0500 Subject: [PATCH 063/340] Refactor `setting.Database.UseXXX` to methods (#23354) (#23356) Backport #23354 Replace #23350. Refactor `setting.Database.UseMySQL` to `setting.Database.Type.IsMySQL()`. To avoid mismatching between `Type` and `UseXXX`. This refactor can fix the bug mentioned in #23350, so it should be backported. Co-authored-by: Jason Song --- cmd/convert.go | 2 +- cmd/dump.go | 2 +- models/activities/action.go | 6 +-- models/activities/action_test.go | 2 +- models/activities/user_heatmap.go | 4 +- models/db/common.go | 2 +- models/db/engine.go | 4 +- models/db/index.go | 2 +- models/db/sequence.go | 4 +- models/git/commit_status.go | 2 +- models/migrations/base/db.go | 28 +++++------ models/migrations/v1_12/v139.go | 4 +- models/migrations/v1_13/v140.go | 2 +- models/migrations/v1_13/v145.go | 8 +-- models/migrations/v1_13/v151.go | 8 +-- models/migrations/v1_14/v158.go | 10 ++-- models/migrations/v1_14/v175.go | 2 +- models/migrations/v1_15/v184.go | 4 +- models/migrations/v1_16/v191.go | 2 +- models/migrations/v1_17/v217.go | 2 +- models/migrations/v1_17/v218.go | 2 +- models/migrations/v1_17/v223.go | 4 +- models/migrations/v1_18/v225.go | 2 +- models/migrations/v1_19/v232.go | 2 +- models/migrations/v1_19/v242.go | 2 +- models/project/project.go | 4 +- models/repo/repo_list.go | 2 +- models/unittest/testdb.go | 2 +- modules/doctor/dbconsistency.go | 2 +- modules/setting/database.go | 49 +++++++++++-------- routers/init.go | 2 +- routers/install/install.go | 6 +-- routers/web/healthcheck/check.go | 2 +- tests/integration/markup_external_test.go | 2 +- .../migration-test/migration_test.go | 10 ++-- tests/test_utils.go | 6 +-- 36 files changed, 103 insertions(+), 96 deletions(-) diff --git a/cmd/convert.go b/cmd/convert.go index 30e7d01e11a9..d9b89495c1bf 100644 --- a/cmd/convert.go +++ b/cmd/convert.go @@ -35,7 +35,7 @@ func runConvert(ctx *cli.Context) error { log.Info("Log path: %s", setting.Log.RootPath) log.Info("Configuration file: %s", setting.CustomConf) - if !setting.Database.UseMySQL { + if !setting.Database.Type.IsMySQL() { fmt.Println("This command can only be used with a MySQL database") return nil } diff --git a/cmd/dump.go b/cmd/dump.go index 600ec4f32eb0..c802849f8e50 100644 --- a/cmd/dump.go +++ b/cmd/dump.go @@ -279,7 +279,7 @@ func runDump(ctx *cli.Context) error { }() targetDBType := ctx.String("database") - if len(targetDBType) > 0 && targetDBType != setting.Database.Type { + if len(targetDBType) > 0 && targetDBType != setting.Database.Type.String() { log.Info("Dumping database %s => %s...", setting.Database.Type, targetDBType) } else { log.Info("Dumping database...") diff --git a/models/activities/action.go b/models/activities/action.go index 2e845bf89e66..a0f6827963ba 100644 --- a/models/activities/action.go +++ b/models/activities/action.go @@ -99,7 +99,7 @@ func (a *Action) TableIndices() []*schemas.Index { actUserIndex.AddColumn("act_user_id", "repo_id", "created_unix", "user_id", "is_deleted") indices := []*schemas.Index{actUserIndex, repoIndex} - if setting.Database.UsePostgreSQL { + if setting.Database.Type.IsPostgreSQL() { cudIndex := schemas.NewIndex("c_u_d", schemas.IndexType) cudIndex.AddColumn("created_unix", "user_id", "is_deleted") indices = append(indices, cudIndex) @@ -640,7 +640,7 @@ func DeleteIssueActions(ctx context.Context, repoID, issueID int64) error { // CountActionCreatedUnixString count actions where created_unix is an empty string func CountActionCreatedUnixString(ctx context.Context) (int64, error) { - if setting.Database.UseSQLite3 { + if setting.Database.Type.IsSQLite3() { return db.GetEngine(ctx).Where(`created_unix = ""`).Count(new(Action)) } return 0, nil @@ -648,7 +648,7 @@ func CountActionCreatedUnixString(ctx context.Context) (int64, error) { // FixActionCreatedUnixString set created_unix to zero if it is an empty string func FixActionCreatedUnixString(ctx context.Context) (int64, error) { - if setting.Database.UseSQLite3 { + if setting.Database.Type.IsSQLite3() { res, err := db.GetEngine(ctx).Exec(`UPDATE action SET created_unix = 0 WHERE created_unix = ""`) if err != nil { return 0, err diff --git a/models/activities/action_test.go b/models/activities/action_test.go index f37e58f685d4..c444c59126f6 100644 --- a/models/activities/action_test.go +++ b/models/activities/action_test.go @@ -234,7 +234,7 @@ func TestGetFeedsCorrupted(t *testing.T) { } func TestConsistencyUpdateAction(t *testing.T) { - if !setting.Database.UseSQLite3 { + if !setting.Database.Type.IsSQLite3() { t.Skip("Test is only for SQLite database.") } assert.NoError(t, unittest.PrepareTestDatabase()) diff --git a/models/activities/user_heatmap.go b/models/activities/user_heatmap.go index 3370103a556f..d3f0f0db73b2 100644 --- a/models/activities/user_heatmap.go +++ b/models/activities/user_heatmap.go @@ -39,9 +39,9 @@ func getUserHeatmapData(user *user_model.User, team *organization.Team, doer *us groupBy := "created_unix / 900 * 900" groupByName := "timestamp" // We need this extra case because mssql doesn't allow grouping by alias switch { - case setting.Database.UseMySQL: + case setting.Database.Type.IsMySQL(): groupBy = "created_unix DIV 900 * 900" - case setting.Database.UseMSSQL: + case setting.Database.Type.IsMSSQL(): groupByName = groupBy } diff --git a/models/db/common.go b/models/db/common.go index 76c7c119f413..af6130c9f255 100644 --- a/models/db/common.go +++ b/models/db/common.go @@ -15,7 +15,7 @@ import ( // BuildCaseInsensitiveLike returns a condition to check if the given value is like the given key case-insensitively. // Handles especially SQLite correctly as UPPER there only transforms ASCII letters. func BuildCaseInsensitiveLike(key, value string) builder.Cond { - if setting.Database.UseSQLite3 { + if setting.Database.Type.IsSQLite3() { return builder.Like{"UPPER(" + key + ")", util.ToUpperASCII(value)} } return builder.Like{"UPPER(" + key + ")", strings.ToUpper(value)} diff --git a/models/db/engine.go b/models/db/engine.go index 3d05fa8b6385..128b955e8763 100755 --- a/models/db/engine.go +++ b/models/db/engine.go @@ -100,12 +100,12 @@ func newXORMEngine() (*xorm.Engine, error) { var engine *xorm.Engine - if setting.Database.UsePostgreSQL && len(setting.Database.Schema) > 0 { + if setting.Database.Type.IsPostgreSQL() && len(setting.Database.Schema) > 0 { // OK whilst we sort out our schema issues - create a schema aware postgres registerPostgresSchemaDriver() engine, err = xorm.NewEngine("postgresschema", connStr) } else { - engine, err = xorm.NewEngine(setting.Database.Type, connStr) + engine, err = xorm.NewEngine(setting.Database.Type.String(), connStr) } if err != nil { diff --git a/models/db/index.go b/models/db/index.go index f840a62c8913..7609d8fb6e6c 100644 --- a/models/db/index.go +++ b/models/db/index.go @@ -73,7 +73,7 @@ func postgresGetNextResourceIndex(ctx context.Context, tableName string, groupID // GetNextResourceIndex generates a resource index, it must run in the same transaction where the resource is created func GetNextResourceIndex(ctx context.Context, tableName string, groupID int64) (int64, error) { - if setting.Database.UsePostgreSQL { + if setting.Database.Type.IsPostgreSQL() { return postgresGetNextResourceIndex(ctx, tableName, groupID) } diff --git a/models/db/sequence.go b/models/db/sequence.go index 6d801d022fbc..f49ad935de09 100644 --- a/models/db/sequence.go +++ b/models/db/sequence.go @@ -13,7 +13,7 @@ import ( // CountBadSequences looks for broken sequences from recreate-table mistakes func CountBadSequences(_ context.Context) (int64, error) { - if !setting.Database.UsePostgreSQL { + if !setting.Database.Type.IsPostgreSQL() { return 0, nil } @@ -34,7 +34,7 @@ func CountBadSequences(_ context.Context) (int64, error) { // FixBadSequences fixes for broken sequences from recreate-table mistakes func FixBadSequences(_ context.Context) error { - if !setting.Database.UsePostgreSQL { + if !setting.Database.Type.IsPostgreSQL() { return nil } diff --git a/models/git/commit_status.go b/models/git/commit_status.go index 489507f71050..82cbb2363739 100644 --- a/models/git/commit_status.go +++ b/models/git/commit_status.go @@ -65,7 +65,7 @@ func postgresGetCommitStatusIndex(ctx context.Context, repoID int64, sha string) // GetNextCommitStatusIndex retried 3 times to generate a resource index func GetNextCommitStatusIndex(ctx context.Context, repoID int64, sha string) (int64, error) { - if setting.Database.UsePostgreSQL { + if setting.Database.Type.IsPostgreSQL() { return postgresGetCommitStatusIndex(ctx, repoID, sha) } diff --git a/models/migrations/base/db.go b/models/migrations/base/db.go index dcf99c96ae81..b038ad73372e 100644 --- a/models/migrations/base/db.go +++ b/models/migrations/base/db.go @@ -89,7 +89,7 @@ func RecreateTable(sess *xorm.Session, bean interface{}) error { hasID = hasID || (column.IsPrimaryKey && column.IsAutoIncrement) } - if hasID && setting.Database.UseMSSQL { + if hasID && setting.Database.Type.IsMSSQL() { if _, err := sess.Exec(fmt.Sprintf("SET IDENTITY_INSERT `%s` ON", tempTableName)); err != nil { log.Error("Unable to set identity insert for table %s. Error: %v", tempTableName, err) return err @@ -143,7 +143,7 @@ func RecreateTable(sess *xorm.Session, bean interface{}) error { return err } - if hasID && setting.Database.UseMSSQL { + if hasID && setting.Database.Type.IsMSSQL() { if _, err := sess.Exec(fmt.Sprintf("SET IDENTITY_INSERT `%s` OFF", tempTableName)); err != nil { log.Error("Unable to switch off identity insert for table %s. Error: %v", tempTableName, err) return err @@ -151,7 +151,7 @@ func RecreateTable(sess *xorm.Session, bean interface{}) error { } switch { - case setting.Database.UseSQLite3: + case setting.Database.Type.IsSQLite3(): // SQLite will drop all the constraints on the old table if _, err := sess.Exec(fmt.Sprintf("DROP TABLE `%s`", tableName)); err != nil { log.Error("Unable to drop old table %s. Error: %v", tableName, err) @@ -178,7 +178,7 @@ func RecreateTable(sess *xorm.Session, bean interface{}) error { return err } - case setting.Database.UseMySQL: + case setting.Database.Type.IsMySQL(): // MySQL will drop all the constraints on the old table if _, err := sess.Exec(fmt.Sprintf("DROP TABLE `%s`", tableName)); err != nil { log.Error("Unable to drop old table %s. Error: %v", tableName, err) @@ -205,7 +205,7 @@ func RecreateTable(sess *xorm.Session, bean interface{}) error { log.Error("Unable to recreate uniques on table %s. Error: %v", tableName, err) return err } - case setting.Database.UsePostgreSQL: + case setting.Database.Type.IsPostgreSQL(): var originalSequences []string type sequenceData struct { LastValue int `xorm:"'last_value'"` @@ -296,7 +296,7 @@ func RecreateTable(sess *xorm.Session, bean interface{}) error { } - case setting.Database.UseMSSQL: + case setting.Database.Type.IsMSSQL(): // MSSQL will drop all the constraints on the old table if _, err := sess.Exec(fmt.Sprintf("DROP TABLE `%s`", tableName)); err != nil { log.Error("Unable to drop old table %s. Error: %v", tableName, err) @@ -323,7 +323,7 @@ func DropTableColumns(sess *xorm.Session, tableName string, columnNames ...strin // TODO: This will not work if there are foreign keys switch { - case setting.Database.UseSQLite3: + case setting.Database.Type.IsSQLite3(): // First drop the indexes on the columns res, errIndex := sess.Query(fmt.Sprintf("PRAGMA index_list(`%s`)", tableName)) if errIndex != nil { @@ -405,7 +405,7 @@ func DropTableColumns(sess *xorm.Session, tableName string, columnNames ...strin return err } - case setting.Database.UsePostgreSQL: + case setting.Database.Type.IsPostgreSQL(): cols := "" for _, col := range columnNames { if cols != "" { @@ -416,7 +416,7 @@ func DropTableColumns(sess *xorm.Session, tableName string, columnNames ...strin if _, err := sess.Exec(fmt.Sprintf("ALTER TABLE `%s` %s", tableName, cols)); err != nil { return fmt.Errorf("Drop table `%s` columns %v: %v", tableName, columnNames, err) } - case setting.Database.UseMySQL: + case setting.Database.Type.IsMySQL(): // Drop indexes on columns first sql := fmt.Sprintf("SHOW INDEX FROM %s WHERE column_name IN ('%s')", tableName, strings.Join(columnNames, "','")) res, err := sess.Query(sql) @@ -444,7 +444,7 @@ func DropTableColumns(sess *xorm.Session, tableName string, columnNames ...strin if _, err := sess.Exec(fmt.Sprintf("ALTER TABLE `%s` %s", tableName, cols)); err != nil { return fmt.Errorf("Drop table `%s` columns %v: %v", tableName, columnNames, err) } - case setting.Database.UseMSSQL: + case setting.Database.Type.IsMSSQL(): cols := "" for _, col := range columnNames { if cols != "" { @@ -543,13 +543,13 @@ func newXORMEngine() (*xorm.Engine, error) { func deleteDB() error { switch { - case setting.Database.UseSQLite3: + case setting.Database.Type.IsSQLite3(): if err := util.Remove(setting.Database.Path); err != nil { return err } return os.MkdirAll(path.Dir(setting.Database.Path), os.ModePerm) - case setting.Database.UseMySQL: + case setting.Database.Type.IsMySQL(): db, err := sql.Open("mysql", fmt.Sprintf("%s:%s@tcp(%s)/", setting.Database.User, setting.Database.Passwd, setting.Database.Host)) if err != nil { @@ -565,7 +565,7 @@ func deleteDB() error { return err } return nil - case setting.Database.UsePostgreSQL: + case setting.Database.Type.IsPostgreSQL(): db, err := sql.Open("postgres", fmt.Sprintf("postgres://%s:%s@%s/?sslmode=%s", setting.Database.User, setting.Database.Passwd, setting.Database.Host, setting.Database.SSLMode)) if err != nil { @@ -612,7 +612,7 @@ func deleteDB() error { } return nil } - case setting.Database.UseMSSQL: + case setting.Database.Type.IsMSSQL(): host, port := setting.ParseMSSQLHostPort(setting.Database.Host) db, err := sql.Open("mssql", fmt.Sprintf("server=%s; port=%s; database=%s; user id=%s; password=%s;", host, port, "master", setting.Database.User, setting.Database.Passwd)) diff --git a/models/migrations/v1_12/v139.go b/models/migrations/v1_12/v139.go index 725b8fa30597..279aa7df87dc 100644 --- a/models/migrations/v1_12/v139.go +++ b/models/migrations/v1_12/v139.go @@ -13,9 +13,9 @@ func PrependRefsHeadsToIssueRefs(x *xorm.Engine) error { var query string switch { - case setting.Database.UseMSSQL: + case setting.Database.Type.IsMSSQL(): query = "UPDATE `issue` SET `ref` = 'refs/heads/' + `ref` WHERE `ref` IS NOT NULL AND `ref` <> '' AND `ref` NOT LIKE 'refs/%'" - case setting.Database.UseMySQL: + case setting.Database.Type.IsMySQL(): query = "UPDATE `issue` SET `ref` = CONCAT('refs/heads/', `ref`) WHERE `ref` IS NOT NULL AND `ref` <> '' AND `ref` NOT LIKE 'refs/%';" default: query = "UPDATE `issue` SET `ref` = 'refs/heads/' || `ref` WHERE `ref` IS NOT NULL AND `ref` <> '' AND `ref` NOT LIKE 'refs/%'" diff --git a/models/migrations/v1_13/v140.go b/models/migrations/v1_13/v140.go index 3de9eaaf7cda..4d87b955fdff 100644 --- a/models/migrations/v1_13/v140.go +++ b/models/migrations/v1_13/v140.go @@ -41,7 +41,7 @@ func FixLanguageStatsToSaveSize(x *xorm.Engine) error { // Delete language stat statuses truncExpr := "TRUNCATE TABLE" - if setting.Database.UseSQLite3 { + if setting.Database.Type.IsSQLite3() { truncExpr = "DELETE FROM" } diff --git a/models/migrations/v1_13/v145.go b/models/migrations/v1_13/v145.go index c96e79f8a0ee..ee40bfc77f86 100644 --- a/models/migrations/v1_13/v145.go +++ b/models/migrations/v1_13/v145.go @@ -21,7 +21,7 @@ func IncreaseLanguageField(x *xorm.Engine) error { return err } - if setting.Database.UseSQLite3 { + if setting.Database.Type.IsSQLite3() { // SQLite maps VARCHAR to TEXT without size so we're done return nil } @@ -41,11 +41,11 @@ func IncreaseLanguageField(x *xorm.Engine) error { } switch { - case setting.Database.UseMySQL: + case setting.Database.Type.IsMySQL(): if _, err := sess.Exec(fmt.Sprintf("ALTER TABLE language_stat MODIFY COLUMN language %s", sqlType)); err != nil { return err } - case setting.Database.UseMSSQL: + case setting.Database.Type.IsMSSQL(): // Yet again MSSQL just has to be awkward. // Here we have to drop the constraints first and then rebuild them constraints := make([]string, 0) @@ -71,7 +71,7 @@ func IncreaseLanguageField(x *xorm.Engine) error { if err := sess.CreateUniques(new(LanguageStat)); err != nil { return err } - case setting.Database.UsePostgreSQL: + case setting.Database.Type.IsPostgreSQL(): if _, err := sess.Exec(fmt.Sprintf("ALTER TABLE language_stat ALTER COLUMN language TYPE %s", sqlType)); err != nil { return err } diff --git a/models/migrations/v1_13/v151.go b/models/migrations/v1_13/v151.go index 9490c1778c6a..9aa71ec29f13 100644 --- a/models/migrations/v1_13/v151.go +++ b/models/migrations/v1_13/v151.go @@ -17,13 +17,13 @@ import ( func SetDefaultPasswordToArgon2(x *xorm.Engine) error { switch { - case setting.Database.UseMySQL: + case setting.Database.Type.IsMySQL(): _, err := x.Exec("ALTER TABLE `user` ALTER passwd_hash_algo SET DEFAULT 'argon2';") return err - case setting.Database.UsePostgreSQL: + case setting.Database.Type.IsPostgreSQL(): _, err := x.Exec("ALTER TABLE `user` ALTER COLUMN passwd_hash_algo SET DEFAULT 'argon2';") return err - case setting.Database.UseMSSQL: + case setting.Database.Type.IsMSSQL(): // need to find the constraint and drop it, then recreate it. sess := x.NewSession() defer sess.Close() @@ -53,7 +53,7 @@ func SetDefaultPasswordToArgon2(x *xorm.Engine) error { } return sess.Commit() - case setting.Database.UseSQLite3: + case setting.Database.Type.IsSQLite3(): // drop through default: log.Fatal("Unrecognized DB") diff --git a/models/migrations/v1_14/v158.go b/models/migrations/v1_14/v158.go index 7ea80a659ed2..2029829ff990 100644 --- a/models/migrations/v1_14/v158.go +++ b/models/migrations/v1_14/v158.go @@ -62,7 +62,7 @@ func UpdateCodeCommentReplies(x *xorm.Engine) error { return err } - if setting.Database.UseMSSQL { + if setting.Database.Type.IsMSSQL() { if _, err := sess.Exec(sqlSelect + " INTO #temp_comments" + sqlTail); err != nil { log.Error("unable to create temporary table") return err @@ -72,13 +72,13 @@ func UpdateCodeCommentReplies(x *xorm.Engine) error { comments := make([]*Comment, 0, batchSize) switch { - case setting.Database.UseMySQL: + case setting.Database.Type.IsMySQL(): sqlCmd = sqlSelect + sqlTail + " LIMIT " + strconv.Itoa(batchSize) + ", " + strconv.Itoa(start) - case setting.Database.UsePostgreSQL: + case setting.Database.Type.IsPostgreSQL(): fallthrough - case setting.Database.UseSQLite3: + case setting.Database.Type.IsSQLite3(): sqlCmd = sqlSelect + sqlTail + " LIMIT " + strconv.Itoa(batchSize) + " OFFSET " + strconv.Itoa(start) - case setting.Database.UseMSSQL: + case setting.Database.Type.IsMSSQL(): sqlCmd = "SELECT TOP " + strconv.Itoa(batchSize) + " * FROM #temp_comments WHERE " + "(id NOT IN ( SELECT TOP " + strconv.Itoa(start) + " id FROM #temp_comments ORDER BY id )) ORDER BY id" default: diff --git a/models/migrations/v1_14/v175.go b/models/migrations/v1_14/v175.go index f1b9b974c6aa..70d72b260033 100644 --- a/models/migrations/v1_14/v175.go +++ b/models/migrations/v1_14/v175.go @@ -14,7 +14,7 @@ import ( ) func FixPostgresIDSequences(x *xorm.Engine) error { - if !setting.Database.UsePostgreSQL { + if !setting.Database.Type.IsPostgreSQL() { return nil } diff --git a/models/migrations/v1_15/v184.go b/models/migrations/v1_15/v184.go index 48f8b62165cc..caf41b6048ed 100644 --- a/models/migrations/v1_15/v184.go +++ b/models/migrations/v1_15/v184.go @@ -54,11 +54,11 @@ func RenameTaskErrorsToMessage(x *xorm.Engine) error { } switch { - case setting.Database.UseMySQL: + case setting.Database.Type.IsMySQL(): if _, err := sess.Exec("ALTER TABLE `task` CHANGE errors message text"); err != nil { return err } - case setting.Database.UseMSSQL: + case setting.Database.Type.IsMSSQL(): if _, err := sess.Exec("sp_rename 'task.errors', 'message', 'COLUMN'"); err != nil { return err } diff --git a/models/migrations/v1_16/v191.go b/models/migrations/v1_16/v191.go index 2d2c3d1a587a..c618783c08e8 100644 --- a/models/migrations/v1_16/v191.go +++ b/models/migrations/v1_16/v191.go @@ -16,7 +16,7 @@ func AlterIssueAndCommentTextFieldsToLongText(x *xorm.Engine) error { return err } - if setting.Database.UseMySQL { + if setting.Database.Type.IsMySQL() { if _, err := sess.Exec("ALTER TABLE `issue` CHANGE `content` `content` LONGTEXT"); err != nil { return err } diff --git a/models/migrations/v1_17/v217.go b/models/migrations/v1_17/v217.go index 3ca9215f0937..3f970b68a540 100644 --- a/models/migrations/v1_17/v217.go +++ b/models/migrations/v1_17/v217.go @@ -16,7 +16,7 @@ func AlterHookTaskTextFieldsToLongText(x *xorm.Engine) error { return err } - if setting.Database.UseMySQL { + if setting.Database.Type.IsMySQL() { if _, err := sess.Exec("ALTER TABLE `hook_task` CHANGE `payload_content` `payload_content` LONGTEXT, CHANGE `request_content` `request_content` LONGTEXT, change `response_content` `response_content` LONGTEXT"); err != nil { return err } diff --git a/models/migrations/v1_17/v218.go b/models/migrations/v1_17/v218.go index 675fd1df94fb..ae91ba0c494b 100644 --- a/models/migrations/v1_17/v218.go +++ b/models/migrations/v1_17/v218.go @@ -38,7 +38,7 @@ func (*improveActionTableIndicesAction) TableIndices() []*schemas.Index { actUserIndex := schemas.NewIndex("au_r_c_u_d", schemas.IndexType) actUserIndex.AddColumn("act_user_id", "repo_id", "created_unix", "user_id", "is_deleted") indices := []*schemas.Index{actUserIndex, repoIndex} - if setting.Database.UsePostgreSQL { + if setting.Database.Type.IsPostgreSQL() { cudIndex := schemas.NewIndex("c_u_d", schemas.IndexType) cudIndex.AddColumn("created_unix", "user_id", "is_deleted") indices = append(indices, cudIndex) diff --git a/models/migrations/v1_17/v223.go b/models/migrations/v1_17/v223.go index a23d9916b383..6c61dbc53ae4 100644 --- a/models/migrations/v1_17/v223.go +++ b/models/migrations/v1_17/v223.go @@ -65,11 +65,11 @@ func RenameCredentialIDBytes(x *xorm.Engine) error { } switch { - case setting.Database.UseMySQL: + case setting.Database.Type.IsMySQL(): if _, err := sess.Exec("ALTER TABLE `webauthn_credential` CHANGE credential_id_bytes credential_id VARBINARY(1024)"); err != nil { return err } - case setting.Database.UseMSSQL: + case setting.Database.Type.IsMSSQL(): if _, err := sess.Exec("sp_rename 'webauthn_credential.credential_id_bytes', 'credential_id', 'COLUMN'"); err != nil { return err } diff --git a/models/migrations/v1_18/v225.go b/models/migrations/v1_18/v225.go index 786772c143bd..b0ac3777fc24 100644 --- a/models/migrations/v1_18/v225.go +++ b/models/migrations/v1_18/v225.go @@ -16,7 +16,7 @@ func AlterPublicGPGKeyContentFieldsToMediumText(x *xorm.Engine) error { return err } - if setting.Database.UseMySQL { + if setting.Database.Type.IsMySQL() { if _, err := sess.Exec("ALTER TABLE `gpg_key` CHANGE `content` `content` MEDIUMTEXT"); err != nil { return err } diff --git a/models/migrations/v1_19/v232.go b/models/migrations/v1_19/v232.go index 89b595c54375..9caf587c1e9c 100644 --- a/models/migrations/v1_19/v232.go +++ b/models/migrations/v1_19/v232.go @@ -16,7 +16,7 @@ func AlterPackageVersionMetadataToLongText(x *xorm.Engine) error { return err } - if setting.Database.UseMySQL { + if setting.Database.Type.IsMySQL() { if _, err := sess.Exec("ALTER TABLE `package_version` MODIFY COLUMN `metadata_json` LONGTEXT"); err != nil { return err } diff --git a/models/migrations/v1_19/v242.go b/models/migrations/v1_19/v242.go index 517c7767b874..4470835214f3 100644 --- a/models/migrations/v1_19/v242.go +++ b/models/migrations/v1_19/v242.go @@ -17,7 +17,7 @@ func AlterPublicGPGKeyImportContentFieldToMediumText(x *xorm.Engine) error { return err } - if setting.Database.UseMySQL { + if setting.Database.Type.IsMySQL() { if _, err := sess.Exec("ALTER TABLE `gpg_key_import` CHANGE `content` `content` MEDIUMTEXT"); err != nil { return err } diff --git a/models/project/project.go b/models/project/project.go index 931ef44675af..3a410f59f1a7 100644 --- a/models/project/project.go +++ b/models/project/project.go @@ -416,7 +416,7 @@ func DeleteProjectByID(ctx context.Context, id int64) error { func DeleteProjectByRepoID(ctx context.Context, repoID int64) error { switch { - case setting.Database.UseSQLite3: + case setting.Database.Type.IsSQLite3(): if _, err := db.GetEngine(ctx).Exec("DELETE FROM project_issue WHERE project_issue.id IN (SELECT project_issue.id FROM project_issue INNER JOIN project WHERE project.id = project_issue.project_id AND project.repo_id = ?)", repoID); err != nil { return err } @@ -426,7 +426,7 @@ func DeleteProjectByRepoID(ctx context.Context, repoID int64) error { if _, err := db.GetEngine(ctx).Table("project").Where("repo_id = ? ", repoID).Delete(&Project{}); err != nil { return err } - case setting.Database.UsePostgreSQL: + case setting.Database.Type.IsPostgreSQL(): if _, err := db.GetEngine(ctx).Exec("DELETE FROM project_issue USING project WHERE project.id = project_issue.project_id AND project.repo_id = ? ", repoID); err != nil { return err } diff --git a/models/repo/repo_list.go b/models/repo/repo_list.go index d64368daa6b2..d9cd905a1936 100644 --- a/models/repo/repo_list.go +++ b/models/repo/repo_list.go @@ -498,7 +498,7 @@ func SearchRepositoryCondition(opts *SearchRepoOptions) builder.Cond { subQueryCond := builder.NewCond() // Topic checking. Topics are present. - if setting.Database.UsePostgreSQL { // postgres stores the topics as json and not as text + if setting.Database.Type.IsPostgreSQL() { // postgres stores the topics as json and not as text subQueryCond = subQueryCond.Or(builder.And(builder.NotNull{"topics"}, builder.Neq{"(topics)::text": "[]"})) } else { subQueryCond = subQueryCond.Or(builder.And(builder.Neq{"topics": "null"}, builder.Neq{"topics": "[]"})) diff --git a/models/unittest/testdb.go b/models/unittest/testdb.go index 2bc41084ba87..cff1489a7c7b 100644 --- a/models/unittest/testdb.go +++ b/models/unittest/testdb.go @@ -76,7 +76,7 @@ func MainTest(m *testing.M, testOpts *TestOptions) { setting.SSH.BuiltinServerUser = "builtinuser" setting.SSH.Port = 3000 setting.SSH.Domain = "try.gitea.io" - setting.Database.UseSQLite3 = true + setting.Database.Type = "sqlite3" setting.Repository.DefaultBranch = "master" // many test code still assume that default branch is called "master" repoRootPath, err := os.MkdirTemp(os.TempDir(), "repos") if err != nil { diff --git a/modules/doctor/dbconsistency.go b/modules/doctor/dbconsistency.go index bb560ac6a350..541fc736f44b 100644 --- a/modules/doctor/dbconsistency.go +++ b/modules/doctor/dbconsistency.go @@ -155,7 +155,7 @@ func checkDBConsistency(ctx context.Context, logger log.Logger, autofix bool) er // TODO: function to recalc all counters - if setting.Database.UsePostgreSQL { + if setting.Database.Type.IsPostgreSQL() { consistencyChecks = append(consistencyChecks, consistencyCheck{ Name: "Sequence values", Counter: db.CountBadSequences, diff --git a/modules/setting/database.go b/modules/setting/database.go index 49865a38a284..d7a5078fe914 100644 --- a/modules/setting/database.go +++ b/modules/setting/database.go @@ -27,7 +27,7 @@ var ( // Database holds the database settings Database = struct { - Type string + Type DatabaseType Host string Name string User string @@ -39,10 +39,6 @@ var ( Charset string Timeout int // seconds SQLiteJournalMode string - UseSQLite3 bool - UseMySQL bool - UseMSSQL bool - UsePostgreSQL bool DBConnectRetries int DBConnectBackoff time.Duration MaxIdleConns int @@ -59,24 +55,13 @@ var ( // LoadDBSetting loads the database settings func LoadDBSetting() { sec := CfgProvider.Section("database") - Database.Type = sec.Key("DB_TYPE").String() + Database.Type = DatabaseType(sec.Key("DB_TYPE").String()) defaultCharset := "utf8" - Database.UseMySQL = false - Database.UseSQLite3 = false - Database.UsePostgreSQL = false - Database.UseMSSQL = false - switch Database.Type { - case "sqlite3": - Database.UseSQLite3 = true - case "mysql": - Database.UseMySQL = true + if Database.Type.IsMySQL() { defaultCharset = "utf8mb4" - case "postgres": - Database.UsePostgreSQL = true - case "mssql": - Database.UseMSSQL = true } + Database.Host = sec.Key("HOST").String() Database.Name = sec.Key("NAME").String() Database.User = sec.Key("USER").String() @@ -86,7 +71,7 @@ func LoadDBSetting() { Database.Schema = sec.Key("SCHEMA").String() Database.SSLMode = sec.Key("SSL_MODE").MustString("disable") Database.Charset = sec.Key("CHARSET").In(defaultCharset, []string{"utf8", "utf8mb4"}) - if Database.UseMySQL && defaultCharset != "utf8mb4" { + if Database.Type.IsMySQL() && defaultCharset != "utf8mb4" { log.Error("Deprecated database mysql charset utf8 support, please use utf8mb4 or convert utf8 to utf8mb4.") } @@ -95,7 +80,7 @@ func LoadDBSetting() { Database.SQLiteJournalMode = sec.Key("SQLITE_JOURNAL_MODE").MustString("") Database.MaxIdleConns = sec.Key("MAX_IDLE_CONNS").MustInt(2) - if Database.UseMySQL { + if Database.Type.IsMySQL() { Database.ConnMaxLifetime = sec.Key("CONN_MAX_LIFETIME").MustDuration(3 * time.Second) } else { Database.ConnMaxLifetime = sec.Key("CONN_MAX_LIFETIME").MustDuration(0) @@ -207,3 +192,25 @@ func ParseMSSQLHostPort(info string) (string, string) { } return host, port } + +type DatabaseType string + +func (t DatabaseType) String() string { + return string(t) +} + +func (t DatabaseType) IsSQLite3() bool { + return t == "sqlite3" +} + +func (t DatabaseType) IsMySQL() bool { + return t == "mysql" +} + +func (t DatabaseType) IsMSSQL() bool { + return t == "mssql" +} + +func (t DatabaseType) IsPostgreSQL() bool { + return t == "postgres" +} diff --git a/routers/init.go b/routers/init.go index d3f822dc8345..8cf53fc108de 100644 --- a/routers/init.go +++ b/routers/init.go @@ -141,7 +141,7 @@ func GlobalInitInstalled(ctx context.Context) { if setting.EnableSQLite3 { log.Info("SQLite3 support is enabled") - } else if setting.Database.UseSQLite3 { + } else if setting.Database.Type.IsSQLite3() { log.Fatal("SQLite3 support is disabled, but it is used for database setting. Please get or build a Gitea release with SQLite3 support.") } diff --git a/routers/install/install.go b/routers/install/install.go index a377c2950ba3..8e2d19c73271 100644 --- a/routers/install/install.go +++ b/routers/install/install.go @@ -104,7 +104,7 @@ func Install(ctx *context.Context) { form.DbSchema = setting.Database.Schema form.Charset = setting.Database.Charset - curDBType := setting.Database.Type + curDBType := setting.Database.Type.String() var isCurDBTypeSupported bool for _, dbType := range setting.SupportedDatabaseTypes { if dbType == curDBType { @@ -272,7 +272,7 @@ func SubmitInstall(ctx *context.Context) { // ---- Basic checks are passed, now test configuration. // Test database setting. - setting.Database.Type = form.DbType + setting.Database.Type = setting.DatabaseType(form.DbType) setting.Database.Host = form.DbHost setting.Database.User = form.DbUser setting.Database.Passwd = form.DbPasswd @@ -392,7 +392,7 @@ func SubmitInstall(ctx *context.Context) { log.Error("Failed to load custom conf '%s': %v", setting.CustomConf, err) } } - cfg.Section("database").Key("DB_TYPE").SetValue(setting.Database.Type) + cfg.Section("database").Key("DB_TYPE").SetValue(setting.Database.Type.String()) cfg.Section("database").Key("HOST").SetValue(setting.Database.Host) cfg.Section("database").Key("NAME").SetValue(setting.Database.Name) cfg.Section("database").Key("USER").SetValue(setting.Database.User) diff --git a/routers/web/healthcheck/check.go b/routers/web/healthcheck/check.go index 1142a0aec5d5..e11dd2aca2e8 100644 --- a/routers/web/healthcheck/check.go +++ b/routers/web/healthcheck/check.go @@ -100,7 +100,7 @@ func checkDatabase(checks checks) status { st.Time = getCheckTime() } - if setting.Database.UseSQLite3 && st.Status == pass { + if setting.Database.Type.IsSQLite3() && st.Status == pass { if !setting.EnableSQLite3 { st.Status = fail st.Time = getCheckTime() diff --git a/tests/integration/markup_external_test.go b/tests/integration/markup_external_test.go index 6ea0226ec620..c0e08a4f4f1f 100644 --- a/tests/integration/markup_external_test.go +++ b/tests/integration/markup_external_test.go @@ -19,7 +19,7 @@ import ( func TestExternalMarkupRenderer(t *testing.T) { defer tests.PrepareTestEnv(t)() - if !setting.Database.UseSQLite3 { + if !setting.Database.Type.IsSQLite3() { t.Skip() return } diff --git a/tests/integration/migration-test/migration_test.go b/tests/integration/migration-test/migration_test.go index f030f566ce44..4152379a9b80 100644 --- a/tests/integration/migration-test/migration_test.go +++ b/tests/integration/migration-test/migration_test.go @@ -94,7 +94,7 @@ func availableVersions() ([]string, error) { return nil, err } defer migrationsDir.Close() - versionRE, err := regexp.Compile("gitea-v(?P.+)\\." + regexp.QuoteMeta(setting.Database.Type) + "\\.sql.gz") + versionRE, err := regexp.Compile("gitea-v(?P.+)\\." + regexp.QuoteMeta(setting.Database.Type.String()) + "\\.sql.gz") if err != nil { return nil, err } @@ -149,7 +149,7 @@ func restoreOldDB(t *testing.T, version string) bool { } switch { - case setting.Database.UseSQLite3: + case setting.Database.Type.IsSQLite3(): util.Remove(setting.Database.Path) err := os.MkdirAll(path.Dir(setting.Database.Path), os.ModePerm) assert.NoError(t, err) @@ -162,7 +162,7 @@ func restoreOldDB(t *testing.T, version string) bool { assert.NoError(t, err) db.Close() - case setting.Database.UseMySQL: + case setting.Database.Type.IsMySQL(): db, err := sql.Open("mysql", fmt.Sprintf("%s:%s@tcp(%s)/", setting.Database.User, setting.Database.Passwd, setting.Database.Host)) assert.NoError(t, err) @@ -184,7 +184,7 @@ func restoreOldDB(t *testing.T, version string) bool { assert.NoError(t, err) db.Close() - case setting.Database.UsePostgreSQL: + case setting.Database.Type.IsPostgreSQL(): var db *sql.DB var err error if setting.Database.Host[0] == '/' { @@ -252,7 +252,7 @@ func restoreOldDB(t *testing.T, version string) bool { assert.NoError(t, err) db.Close() - case setting.Database.UseMSSQL: + case setting.Database.Type.IsMSSQL(): host, port := setting.ParseMSSQLHostPort(setting.Database.Host) db, err := sql.Open("mssql", fmt.Sprintf("server=%s; port=%s; database=%s; user id=%s; password=%s;", host, port, "master", setting.Database.User, setting.Database.Passwd)) diff --git a/tests/test_utils.go b/tests/test_utils.go index 9e9f97a5f5d1..58bc65a3fe9c 100644 --- a/tests/test_utils.go +++ b/tests/test_utils.go @@ -72,7 +72,7 @@ func InitTest(requireGitea bool) { } switch { - case setting.Database.UseMySQL: + case setting.Database.Type.IsMySQL(): connType := "tcp" if len(setting.Database.Host) > 0 && setting.Database.Host[0] == '/' { // looks like a unix socket connType = "unix" @@ -87,7 +87,7 @@ func InitTest(requireGitea bool) { if _, err = db.Exec(fmt.Sprintf("CREATE DATABASE IF NOT EXISTS %s", setting.Database.Name)); err != nil { log.Fatal("db.Exec: %v", err) } - case setting.Database.UsePostgreSQL: + case setting.Database.Type.IsPostgreSQL(): var db *sql.DB var err error if setting.Database.Host[0] == '/' { @@ -144,7 +144,7 @@ func InitTest(requireGitea bool) { } } - case setting.Database.UseMSSQL: + case setting.Database.Type.IsMSSQL(): host, port := setting.ParseMSSQLHostPort(setting.Database.Host) db, err := sql.Open("mssql", fmt.Sprintf("server=%s; port=%s; database=%s; user id=%s; password=%s;", host, port, "master", setting.Database.User, setting.Database.Passwd)) From 10df304b2fcaaa931f1b966999c5b37aebefbea6 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Tue, 7 Mar 2023 08:38:13 -0500 Subject: [PATCH 064/340] Fix various ImageDiff/SVG bugs (#23312) (#23358) Backport #23312 Replace #23310, Close #19733 And fix various UI problems, including regressions from #22959 #22950 and more. ## SVG Detection The old regexp may mismatch non-SVG files. This PR adds new tests for those cases. ## UI Changes ### Before ![image](https://user-images.githubusercontent.com/2114189/222967716-f6ad8721-f46a-4a3f-9eb0-a89e488d3436.png) ![image](https://user-images.githubusercontent.com/2114189/222967780-8af8981a-e69d-4304-9dc4-0235582fa4f4.png) ### After ![image](https://user-images.githubusercontent.com/2114189/222967575-c21c23d4-0200-4e09-aac3-57895e853000.png) ![image](https://user-images.githubusercontent.com/2114189/222967585-8b8da262-bc96-441a-9851-8d3845f2659d.png) ![image](https://user-images.githubusercontent.com/2114189/222967595-58d9bea5-6df4-41fa-bf8a-86704117959d.png) ![image](https://user-images.githubusercontent.com/2114189/222967608-38757c1a-b8bd-4ebf-b7a8-3b30edb7f303.png) ![image](https://user-images.githubusercontent.com/2114189/222967623-9849a339-6fae-4484-8fa5-939e2fdacbf5.png) ![image](https://user-images.githubusercontent.com/2114189/222967633-4383d7dd-62ba-47a3-8c10-86f7ca7757ae.png) Co-authored-by: wxiaoguang Co-authored-by: Lunny Xiao --- modules/typesniffer/typesniffer.go | 21 +++++++++++++++------ modules/typesniffer/typesniffer_test.go | 25 ++++++++++++++++++++++++- web_src/js/features/imagediff.js | 15 +++++++-------- web_src/less/features/imagediff.less | 5 +++-- 4 files changed, 49 insertions(+), 17 deletions(-) diff --git a/modules/typesniffer/typesniffer.go b/modules/typesniffer/typesniffer.go index c9fef953ce70..5b215496b80c 100644 --- a/modules/typesniffer/typesniffer.go +++ b/modules/typesniffer/typesniffer.go @@ -4,6 +4,7 @@ package typesniffer import ( + "bytes" "fmt" "io" "net/http" @@ -24,8 +25,9 @@ const ( ) var ( - svgTagRegex = regexp.MustCompile(`(?si)\A\s*(?:(||>))\s*)*\/]`) - svgTagInXMLRegex = regexp.MustCompile(`(?si)\A<\?xml\b.*?\?>\s*(?:(||>))\s*)*\/]`) + svgComment = regexp.MustCompile(`(?s)`) + svgTagRegex = regexp.MustCompile(`(?si)\A\s*(?:(|>))\s*)*\s*(?:(|>))\s*)*")).IsSvgImage()) assert.True(t, DetectContentType([]byte(" ")).IsSvgImage()) assert.True(t, DetectContentType([]byte(``)).IsSvgImage()) - assert.True(t, DetectContentType([]byte("")).IsSvgImage()) assert.True(t, DetectContentType([]byte(``)).IsSvgImage()) assert.True(t, DetectContentType([]byte(` `)).IsSvgImage()) @@ -57,6 +56,10 @@ func TestIsSvgImage(t *testing.T) { `)).IsSvgImage()) + + // the DetectContentType should work for incomplete data, because only beginning bytes are used for detection + assert.True(t, DetectContentType([]byte(`....`)).IsSvgImage()) + assert.False(t, DetectContentType([]byte{}).IsSvgImage()) assert.False(t, DetectContentType([]byte("svg")).IsSvgImage()) assert.False(t, DetectContentType([]byte("")).IsSvgImage()) @@ -68,6 +71,26 @@ func TestIsSvgImage(t *testing.T) { assert.False(t, DetectContentType([]byte(` `)).IsSvgImage()) + + assert.False(t, DetectContentType([]byte(` + +
    + + +
    +`)).IsSvgImage()) + + assert.False(t, DetectContentType([]byte(` + +
    + + +
    +`)).IsSvgImage()) + assert.False(t, DetectContentType([]byte(``)).IsSvgImage()) + assert.False(t, DetectContentType([]byte(``)).IsSvgImage()) } func TestIsPDF(t *testing.T) { diff --git a/web_src/js/features/imagediff.js b/web_src/js/features/imagediff.js index 7a285f1f8dbc..a26b927c33de 100644 --- a/web_src/js/features/imagediff.js +++ b/web_src/js/features/imagediff.js @@ -129,8 +129,8 @@ export function initImageDiff() { initOverlay(createContext($imageAfter[2], $imageBefore[2])); } - hideElem($container.find('> .loader')); $container.find('> .gt-hidden').removeClass('gt-hidden'); + hideElem($container.find('.ui.loader')); } function initSideBySide(sizes) { @@ -155,7 +155,7 @@ export function initImageDiff() { height: sizes.size1.height * factor }); sizes.image1.parent().css({ - margin: `${sizes.ratio[1] * factor + 15}px ${sizes.ratio[0] * factor}px ${sizes.ratio[1] * factor}px`, + margin: `10px auto`, width: sizes.size1.width * factor + 2, height: sizes.size1.height * factor + 2 }); @@ -164,7 +164,7 @@ export function initImageDiff() { height: sizes.size2.height * factor }); sizes.image2.parent().css({ - margin: `${sizes.ratio[3] * factor}px ${sizes.ratio[2] * factor}px`, + margin: `10px auto`, width: sizes.size2.width * factor + 2, height: sizes.size2.height * factor + 2 }); @@ -255,13 +255,12 @@ export function initImageDiff() { width: sizes.size2.width * factor + 2, height: sizes.size2.height * factor + 2 }); + + // some inner elements are `position: absolute`, so the container's height must be large enough + // the "css(width, height)" is somewhat hacky and not easy to understand, it could be improved in the future sizes.image2.parent().parent().css({ width: sizes.max.width * factor + 2, - height: sizes.max.height * factor + 2 - }); - $container.find('.onion-skin').css({ - width: sizes.max.width * factor + 2, - height: sizes.max.height * factor + 4 + height: sizes.max.height * factor + 2 + 20 /* extra height for inner "position: absolute" elements */, }); const $range = $container.find("input[type='range']"); diff --git a/web_src/less/features/imagediff.less b/web_src/less/features/imagediff.less index a9ba7f8c8f36..07763c15e126 100644 --- a/web_src/less/features/imagediff.less +++ b/web_src/less/features/imagediff.less @@ -1,6 +1,6 @@ .image-diff-container { text-align: center; - padding: 30px 0; + padding: 1em 0; img { border: 1px solid var(--color-primary-light-7); @@ -22,6 +22,7 @@ display: inline-block; line-height: 0; vertical-align: top; + margin: 0 1em; .side-header { font-weight: bold; @@ -98,7 +99,7 @@ } input { - width: 300px; + max-width: 300px; } } } From ed25e094abfc93e83c6fecb5d82ce64d0e220717 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Tue, 7 Mar 2023 17:15:19 -0500 Subject: [PATCH 065/340] Fix adding of empty class name (#23352) (#23360) Backport #23352 This PR is to fix the error shown below. The reason is because [`class-name` prop](https://github.com/go-gitea/gitea/blob/main/web_src/js/components/ActionRunStatus.vue#L6) given to `svg` component has a space, and classList cannot add empty string. https://user-images.githubusercontent.com/17645053/223346720-c7f9de43-5e69-4ecf-93c0-90bf04090693.mov Co-authored-by: Hester Gong Co-authored-by: Lunny Xiao --- web_src/js/svg.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web_src/js/svg.js b/web_src/js/svg.js index 2132ad312037..6476f16bfb3e 100644 --- a/web_src/js/svg.js +++ b/web_src/js/svg.js @@ -80,7 +80,8 @@ export function svg(name, size = 16, className = '') { const svgNode = document.firstChild; if (size !== 16) svgNode.setAttribute('width', String(size)); if (size !== 16) svgNode.setAttribute('height', String(size)); - if (className) svgNode.classList.add(...className.split(/\s+/)); + // filter array to remove empty string + if (className) svgNode.classList.add(...className.split(/\s+/).filter(Boolean)); return serializer.serializeToString(svgNode); } From cf80f829b49b35fd91854798f9ead913145782f1 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Wed, 8 Mar 2023 03:03:05 -0500 Subject: [PATCH 066/340] Do not recognize text files as audio (#23355) (#23368) Backport #23355 Close #17108 This PR uses a trick (removing the ID3 tag) to detect the content again to to see whether the content is text type. Co-authored-by: wxiaoguang Co-authored-by: delvh Co-authored-by: techknowlogick Co-authored-by: Lunny Xiao --- modules/typesniffer/typesniffer.go | 10 ++++++++++ modules/typesniffer/typesniffer_test.go | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/modules/typesniffer/typesniffer.go b/modules/typesniffer/typesniffer.go index 5b215496b80c..7887fd42b72e 100644 --- a/modules/typesniffer/typesniffer.go +++ b/modules/typesniffer/typesniffer.go @@ -106,6 +106,16 @@ func DetectContentType(data []byte) SniffedType { } } + if strings.HasPrefix(ct, "audio/") && bytes.HasPrefix(data, []byte("ID3")) { + // The MP3 detection is quite inaccurate, any content with "ID3" prefix will result in "audio/mpeg". + // So remove the "ID3" prefix and detect again, if result is text, then it must be text content. + // This works especially because audio files contain many unprintable/invalid characters like `0x00` + ct2 := http.DetectContentType(data[3:]) + if strings.HasPrefix(ct2, "text/") { + ct = ct2 + } + } + return SniffedType{ct} } diff --git a/modules/typesniffer/typesniffer_test.go b/modules/typesniffer/typesniffer_test.go index 2bafdffd141c..6c6da34aa006 100644 --- a/modules/typesniffer/typesniffer_test.go +++ b/modules/typesniffer/typesniffer_test.go @@ -109,6 +109,10 @@ func TestIsAudio(t *testing.T) { mp3, _ := base64.StdEncoding.DecodeString("SUQzBAAAAAABAFRYWFgAAAASAAADbWFqb3JfYnJhbmQAbXA0MgBUWFhYAAAAEQAAA21pbm9yX3Zl") assert.True(t, DetectContentType(mp3).IsAudio()) assert.False(t, DetectContentType([]byte("plain text")).IsAudio()) + + assert.True(t, DetectContentType([]byte("ID3Toy\000")).IsAudio()) + assert.True(t, DetectContentType([]byte("ID3Toy\n====\t* hi 🌞, ...")).IsText()) // test ID3 tag for plain text + assert.True(t, DetectContentType([]byte("ID3Toy\n====\t* hi 🌞, ..."+"🌛"[0:2])).IsText()) // test ID3 tag with incomplete UTF8 char } func TestDetectContentTypeFromReader(t *testing.T) { From cd7bd8568ce45fde21dab566ff74a899056f4ec0 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 8 Mar 2023 23:18:53 +0800 Subject: [PATCH 067/340] Fix incorrect display for comment context menu (#23343) (#23344) Backport #23343 Fix a regression of #23014: the `a` couldn't be used here because Fomantic UI has style conflicts: `.ui.comments .comment .actions a { display: inline-block; }` Co-authored-by: Lunny Xiao --- templates/repo/issue/view_content/context_menu.tmpl | 10 +++++----- web_src/js/features/aria.js | 5 +++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/templates/repo/issue/view_content/context_menu.tmpl b/templates/repo/issue/view_content/context_menu.tmpl index b4b9403b2af7..c1f3ba955d51 100644 --- a/templates/repo/issue/view_content/context_menu.tmpl +++ b/templates/repo/issue/view_content/context_menu.tmpl @@ -10,16 +10,16 @@ {{else}} {{$referenceUrl = Printf "%s/files#%s" .ctx.Issue.Link .item.HashTag}} {{end}} - {{.ctx.locale.Tr "repo.issues.context.copy_link"}} - {{.ctx.locale.Tr "repo.issues.context.quote_reply"}} +
    {{.ctx.locale.Tr "repo.issues.context.copy_link"}}
    +
    {{.ctx.locale.Tr "repo.issues.context.quote_reply"}}
    {{if not .ctx.UnitIssuesGlobalDisabled}} - {{.ctx.locale.Tr "repo.issues.context.reference_issue"}} +
    {{.ctx.locale.Tr "repo.issues.context.reference_issue"}}
    {{end}} {{if or .ctx.Permission.IsAdmin .IsCommentPoster .ctx.HasIssuesOrPullsWritePermission}}
    - {{.ctx.locale.Tr "repo.issues.context.edit"}} +
    {{.ctx.locale.Tr "repo.issues.context.edit"}}
    {{if .delete}} - {{.ctx.locale.Tr "repo.issues.context.delete"}} +
    {{.ctx.locale.Tr "repo.issues.context.delete"}}
    {{end}} {{end}}
    diff --git a/web_src/js/features/aria.js b/web_src/js/features/aria.js index 373d667c5f73..46944336adc1 100644 --- a/web_src/js/features/aria.js +++ b/web_src/js/features/aria.js @@ -83,8 +83,9 @@ function attachOneDropdownAria($dropdown) { if (e.key === 'Enter') { let $item = $dropdown.dropdown('get item', $dropdown.dropdown('get value')); if (!$item) $item = $menu.find('> .item.selected'); // when dropdown filters items by input, there is no "value", so query the "selected" item - // if the selected item is clickable, then trigger the click event. in the future there could be a special CSS class for it. - if ($item && $item.is('a')) $item[0].click(); + // if the selected item is clickable, then trigger the click event. + // we can not click any item without check, because Fomantic code might also handle the Enter event. that would result in double click. + if ($item && ($item.is('a') || $item.is('.js-aria-clickable'))) $item[0].click(); } }); From 2ba58fab22737d73e459c40f9ee6fab3c9947d8c Mon Sep 17 00:00:00 2001 From: delvh Date: Wed, 8 Mar 2023 18:57:09 +0100 Subject: [PATCH 068/340] Pass context to avatar for projects view (#23359) (#23378) Backport of #23359. Previously, a 500 response was returned when - an issue had assignees - the issue was assigned to a project - you tried to view this project --- templates/projects/view.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index eabeff49269b..4fdeb139e0ca 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -238,7 +238,7 @@ {{end}}
    {{range .Assignees}} - {{avatar . 28 "mini gt-mr-3"}} + {{avatar $.Context . 28 "mini gt-mr-3"}} {{end}}

    From 54c674c93644093a1dd693b50c743cdc6120b6a7 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Wed, 8 Mar 2023 15:17:31 -0500 Subject: [PATCH 069/340] Fix panic when getting notes by ref (#23372) (#23377) Backport #23372 Fix #23357 . Now the `/repos/{owner}/{repo}/git/notes/{sha}` API supports getting notes by a ref or sha (https://try.gitea.io/api/swagger#/repository/repoGetNote). But the `GetNote` func can only accept commit ID. https://github.com/go-gitea/gitea/blob/a12f5757372f751d25f9e5ca1f168f6920ded894/modules/git/notes_nogogit.go#L18 So we need to convert the query parameter to commit ID before calling `GetNote`. Co-authored-by: Zettat123 Co-authored-by: techknowlogick --- routers/api/v1/repo/notes.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/routers/api/v1/repo/notes.go b/routers/api/v1/repo/notes.go index 2d1f3291f8b9..74969f2cad7c 100644 --- a/routers/api/v1/repo/notes.go +++ b/routers/api/v1/repo/notes.go @@ -58,8 +58,18 @@ func getNote(ctx *context.APIContext, identifier string) { return } + commitSHA, err := ctx.Repo.GitRepo.ConvertToSHA1(identifier) + if err != nil { + if git.IsErrNotExist(err) { + ctx.NotFound(err) + } else { + ctx.Error(http.StatusInternalServerError, "ConvertToSHA1", err) + } + return + } + var note git.Note - if err := git.GetNote(ctx, ctx.Repo.GitRepo, identifier, ¬e); err != nil { + if err := git.GetNote(ctx, ctx.Repo.GitRepo, commitSHA.String(), ¬e); err != nil { if git.IsErrNotExist(err) { ctx.NotFound(identifier) return From 87c31c2ffef29cd7b1cb5b33964071b733a8a700 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Wed, 8 Mar 2023 17:33:05 -0500 Subject: [PATCH 070/340] Set `X-Gitea-Debug` header once (#23361) (#23381) --- modules/context/api.go | 2 +- modules/context/context.go | 4 ++-- modules/httpcache/httpcache.go | 12 ++++++------ routers/install/routes.go | 2 +- routers/web/base.go | 2 +- routers/web/user/avatar.go | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/context/api.go b/modules/context/api.go index 3f938948aed6..f7a338469124 100644 --- a/modules/context/api.go +++ b/modules/context/api.go @@ -244,7 +244,7 @@ func APIContexter() func(http.Handler) http.Handler { } } - httpcache.AddCacheControlToHeader(ctx.Resp.Header(), 0, "no-transform") + httpcache.SetCacheControlInHeader(ctx.Resp.Header(), 0, "no-transform") ctx.Resp.Header().Set(`X-Frame-Options`, setting.CORSConfig.XFrameOptions) ctx.Data["Context"] = &ctx diff --git a/modules/context/context.go b/modules/context/context.go index a2088217ff38..f2c6b129fef4 100644 --- a/modules/context/context.go +++ b/modules/context/context.go @@ -388,7 +388,7 @@ func (ctx *Context) SetServeHeaders(opts *ServeHeaderOptions) { if duration == 0 { duration = 5 * time.Minute } - httpcache.AddCacheControlToHeader(header, duration) + httpcache.SetCacheControlInHeader(header, duration) if !opts.LastModified.IsZero() { header.Set("Last-Modified", opts.LastModified.UTC().Format(http.TimeFormat)) @@ -753,7 +753,7 @@ func Contexter(ctx context.Context) func(next http.Handler) http.Handler { } } - httpcache.AddCacheControlToHeader(ctx.Resp.Header(), 0, "no-transform") + httpcache.SetCacheControlInHeader(ctx.Resp.Header(), 0, "no-transform") ctx.Resp.Header().Set(`X-Frame-Options`, setting.CORSConfig.XFrameOptions) ctx.Data["CsrfToken"] = ctx.csrf.GetToken() diff --git a/modules/httpcache/httpcache.go b/modules/httpcache/httpcache.go index f0caa30eb82b..46e0152ef455 100644 --- a/modules/httpcache/httpcache.go +++ b/modules/httpcache/httpcache.go @@ -15,8 +15,8 @@ import ( "code.gitea.io/gitea/modules/setting" ) -// AddCacheControlToHeader adds suitable cache-control headers to response -func AddCacheControlToHeader(h http.Header, maxAge time.Duration, additionalDirectives ...string) { +// SetCacheControlInHeader sets suitable cache-control headers in the response +func SetCacheControlInHeader(h http.Header, maxAge time.Duration, additionalDirectives ...string) { directives := make([]string, 0, 2+len(additionalDirectives)) // "max-age=0 + must-revalidate" (aka "no-cache") is preferred instead of "no-store" @@ -31,7 +31,7 @@ func AddCacheControlToHeader(h http.Header, maxAge time.Duration, additionalDire directives = append(directives, "max-age=0", "private", "must-revalidate") // to remind users they are using non-prod setting. - h.Add("X-Gitea-Debug", "RUN_MODE="+setting.RunMode) + h.Set("X-Gitea-Debug", "RUN_MODE="+setting.RunMode) } h.Set("Cache-Control", strings.Join(append(directives, additionalDirectives...), ", ")) @@ -50,7 +50,7 @@ func HandleTimeCache(req *http.Request, w http.ResponseWriter, fi os.FileInfo) ( // HandleGenericTimeCache handles time-based caching for a HTTP request func HandleGenericTimeCache(req *http.Request, w http.ResponseWriter, lastModified time.Time) (handled bool) { - AddCacheControlToHeader(w.Header(), setting.StaticCacheTime) + SetCacheControlInHeader(w.Header(), setting.StaticCacheTime) ifModifiedSince := req.Header.Get("If-Modified-Since") if ifModifiedSince != "" { @@ -81,7 +81,7 @@ func HandleGenericETagCache(req *http.Request, w http.ResponseWriter, etag strin return true } } - AddCacheControlToHeader(w.Header(), setting.StaticCacheTime) + SetCacheControlInHeader(w.Header(), setting.StaticCacheTime) return false } @@ -125,6 +125,6 @@ func HandleGenericETagTimeCache(req *http.Request, w http.ResponseWriter, etag s } } } - AddCacheControlToHeader(w.Header(), setting.StaticCacheTime) + SetCacheControlInHeader(w.Header(), setting.StaticCacheTime) return false } diff --git a/routers/install/routes.go b/routers/install/routes.go index a8efc92fe17c..82d9c34b41f1 100644 --- a/routers/install/routes.go +++ b/routers/install/routes.go @@ -64,7 +64,7 @@ func installRecovery(ctx goctx.Context) func(next http.Handler) http.Handler { "SignedUserName": "", } - httpcache.AddCacheControlToHeader(w.Header(), 0, "no-transform") + httpcache.SetCacheControlInHeader(w.Header(), 0, "no-transform") w.Header().Set(`X-Frame-Options`, setting.CORSConfig.XFrameOptions) if !setting.IsProd { diff --git a/routers/web/base.go b/routers/web/base.go index b0d8a7c3f1e6..e537382a638a 100644 --- a/routers/web/base.go +++ b/routers/web/base.go @@ -158,7 +158,7 @@ func Recovery(ctx goctx.Context) func(next http.Handler) http.Handler { store["SignedUserName"] = "" } - httpcache.AddCacheControlToHeader(w.Header(), 0, "no-transform") + httpcache.SetCacheControlInHeader(w.Header(), 0, "no-transform") w.Header().Set(`X-Frame-Options`, setting.CORSConfig.XFrameOptions) if !setting.IsProd { diff --git a/routers/web/user/avatar.go b/routers/web/user/avatar.go index 2dba74822e53..7ad65cd51e39 100644 --- a/routers/web/user/avatar.go +++ b/routers/web/user/avatar.go @@ -17,7 +17,7 @@ func cacheableRedirect(ctx *context.Context, location string) { // here we should not use `setting.StaticCacheTime`, it is pretty long (default: 6 hours) // we must make sure the redirection cache time is short enough, otherwise a user won't see the updated avatar in 6 hours // it's OK to make the cache time short, it is only a redirection, and doesn't cost much to make a new request - httpcache.AddCacheControlToHeader(ctx.Resp.Header(), 5*time.Minute) + httpcache.SetCacheControlInHeader(ctx.Resp.Header(), 5*time.Minute) ctx.Redirect(location) } From e269e8901f243b6d95920a9883d5f8b0ece908a5 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Thu, 9 Mar 2023 14:56:31 -0500 Subject: [PATCH 071/340] Fix incorrect NotFound conditions in org/projects.go (#23384) (#23395) Backport #23384 A part of https://github.com/go-gitea/gitea/pull/22865 user/org project's `RepoID` is always 0, we need to check `OwnerID` Co-authored-by: yp05327 <576951401@qq.com> --- routers/web/org/projects.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go index 046100c72e2f..2401005eb735 100644 --- a/routers/web/org/projects.go +++ b/routers/web/org/projects.go @@ -193,7 +193,7 @@ func DeleteProject(ctx *context.Context) { } return } - if p.RepoID != ctx.Repo.Repository.ID { + if p.OwnerID != ctx.ContextUser.ID { ctx.NotFound("", nil) return } @@ -226,7 +226,7 @@ func EditProject(ctx *context.Context) { } return } - if p.RepoID != ctx.Repo.Repository.ID { + if p.OwnerID != ctx.ContextUser.ID { ctx.NotFound("", nil) return } @@ -260,7 +260,7 @@ func EditProjectPost(ctx *context.Context) { } return } - if p.RepoID != ctx.Repo.Repository.ID { + if p.OwnerID != ctx.ContextUser.ID { ctx.NotFound("", nil) return } From 975785dd42206e0ec22d515f83198f23a10ac445 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Thu, 9 Mar 2023 21:21:12 -0500 Subject: [PATCH 072/340] Rename `canWriteUnit` to `canWriteProjects` (#23386) (#23399) Backport #23386 A part of https://github.com/go-gitea/gitea/pull/22865 Co-authored-by: yp05327 <576951401@qq.com> --- routers/web/org/projects.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go index 2401005eb735..30a58081f0ab 100644 --- a/routers/web/org/projects.go +++ b/routers/web/org/projects.go @@ -103,7 +103,7 @@ func Projects(ctx *context.Context) { pager.AddParam(ctx, "state", "State") ctx.Data["Page"] = pager - ctx.Data["CanWriteProjects"] = canWriteUnit(ctx) + ctx.Data["CanWriteProjects"] = canWriteProjects(ctx) ctx.Data["IsShowClosed"] = isShowClosed ctx.Data["PageIsViewProjects"] = true ctx.Data["SortType"] = sortType @@ -111,7 +111,7 @@ func Projects(ctx *context.Context) { ctx.HTML(http.StatusOK, tplProjects) } -func canWriteUnit(ctx *context.Context) bool { +func canWriteProjects(ctx *context.Context) bool { if ctx.ContextUser.IsOrganization() { return ctx.Org.CanWriteUnit(ctx, unit.TypeProjects) } @@ -122,7 +122,7 @@ func canWriteUnit(ctx *context.Context) bool { func NewProject(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("repo.projects.new") ctx.Data["BoardTypes"] = project_model.GetBoardConfig() - ctx.Data["CanWriteProjects"] = canWriteUnit(ctx) + ctx.Data["CanWriteProjects"] = canWriteProjects(ctx) ctx.Data["HomeLink"] = ctx.ContextUser.HomeLink() shared_user.RenderUserHeader(ctx) ctx.HTML(http.StatusOK, tplProjectsNew) @@ -135,7 +135,7 @@ func NewProjectPost(ctx *context.Context) { shared_user.RenderUserHeader(ctx) if ctx.HasError() { - ctx.Data["CanWriteProjects"] = canWriteUnit(ctx) + ctx.Data["CanWriteProjects"] = canWriteProjects(ctx) ctx.Data["PageIsViewProjects"] = true ctx.Data["BoardTypes"] = project_model.GetBoardConfig() ctx.HTML(http.StatusOK, tplProjectsNew) @@ -214,7 +214,7 @@ func EditProject(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("repo.projects.edit") ctx.Data["PageIsEditProjects"] = true ctx.Data["PageIsViewProjects"] = true - ctx.Data["CanWriteProjects"] = canWriteUnit(ctx) + ctx.Data["CanWriteProjects"] = canWriteProjects(ctx) shared_user.RenderUserHeader(ctx) p, err := project_model.GetProjectByID(ctx, ctx.ParamsInt64(":id")) @@ -243,7 +243,7 @@ func EditProjectPost(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("repo.projects.edit") ctx.Data["PageIsEditProjects"] = true ctx.Data["PageIsViewProjects"] = true - ctx.Data["CanWriteProjects"] = canWriteUnit(ctx) + ctx.Data["CanWriteProjects"] = canWriteProjects(ctx) shared_user.RenderUserHeader(ctx) if ctx.HasError() { @@ -332,7 +332,7 @@ func ViewProject(ctx *context.Context) { project.RenderedContent = project.Description ctx.Data["LinkedPRs"] = linkedPrsMap ctx.Data["PageIsViewProjects"] = true - ctx.Data["CanWriteProjects"] = canWriteUnit(ctx) + ctx.Data["CanWriteProjects"] = canWriteProjects(ctx) ctx.Data["Project"] = project ctx.Data["IssuesMap"] = issuesMap ctx.Data["Boards"] = boards From e9991b1f060a08e5fbfbf56a3ef92cde74488143 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Thu, 9 Mar 2023 22:15:39 -0500 Subject: [PATCH 073/340] Refactor and tidy-up the merge/update branch code (#22568) (#23365) Backport #22568 The merge and update branch code was previously a little tangled and had some very long functions. The functions were not very clear in their reasoning and there were deficiencies in their logging and at least one bug in the handling of LFS for update by rebase. This PR substantially refactors this code and splits things out to into separate functions. It also attempts to tidy up the calls by wrapping things in "context"s. There are also attempts to improve logging when there are errors. Signed-off-by: Andrew Thornton Signed-off-by: Andrew Thornton Co-authored-by: zeripath Co-authored-by: techknowlogick Co-authored-by: delvh --- modules/git/pipeline/revlist.go | 5 +- services/pull/lfs.go | 2 +- services/pull/merge.go | 495 +++++--------------------------- services/pull/merge_merge.go | 25 ++ services/pull/merge_prepare.go | 297 +++++++++++++++++++ services/pull/merge_rebase.go | 50 ++++ services/pull/merge_squash.go | 53 ++++ services/pull/patch.go | 17 +- services/pull/pull.go | 14 +- services/pull/temp_repo.go | 194 ++++++------- services/pull/update.go | 105 ++++--- services/pull/update_rebase.go | 107 +++++++ 12 files changed, 757 insertions(+), 607 deletions(-) create mode 100644 services/pull/merge_merge.go create mode 100644 services/pull/merge_prepare.go create mode 100644 services/pull/merge_rebase.go create mode 100644 services/pull/merge_squash.go create mode 100644 services/pull/update_rebase.go diff --git a/modules/git/pipeline/revlist.go b/modules/git/pipeline/revlist.go index 09bb2c8b3c84..d88ebe78ef20 100644 --- a/modules/git/pipeline/revlist.go +++ b/modules/git/pipeline/revlist.go @@ -42,7 +42,10 @@ func RevListObjects(ctx context.Context, revListWriter *io.PipeWriter, wg *sync. defer revListWriter.Close() stderr := new(bytes.Buffer) var errbuf strings.Builder - cmd := git.NewCommand(ctx, "rev-list", "--objects").AddDynamicArguments(headSHA).AddArguments("--not").AddDynamicArguments(baseSHA) + cmd := git.NewCommand(ctx, "rev-list", "--objects").AddDynamicArguments(headSHA) + if baseSHA != "" { + cmd = cmd.AddArguments("--not").AddDynamicArguments(baseSHA) + } if err := cmd.Run(&git.RunOpts{ Dir: tmpBasePath, Stdout: revListWriter, diff --git a/services/pull/lfs.go b/services/pull/lfs.go index dc4ca006e491..39433724684e 100644 --- a/services/pull/lfs.go +++ b/services/pull/lfs.go @@ -116,7 +116,7 @@ func createLFSMetaObjectsFromCatFileBatch(catFileBatchReader *io.PipeReader, wg } // Then we need to check that this pointer is in the db - if _, err := git_model.GetLFSMetaObjectByOid(db.DefaultContext, pr.HeadRepo.ID, pointer.Oid); err != nil { + if _, err := git_model.GetLFSMetaObjectByOid(db.DefaultContext, pr.HeadRepoID, pointer.Oid); err != nil { if err == git_model.ErrLFSObjectNotExist { log.Warn("During merge of: %d in %-v, there is a pointer to LFS Oid: %s which although present in the LFS store is not associated with the head repo %-v", pr.Index, pr.BaseRepo, pointer.Oid, pr.HeadRepo) continue diff --git a/services/pull/merge.go b/services/pull/merge.go index ad428427cc18..afa924fc109a 100644 --- a/services/pull/merge.go +++ b/services/pull/merge.go @@ -5,8 +5,6 @@ package pull import ( - "bufio" - "bytes" "context" "fmt" "os" @@ -14,7 +12,6 @@ import ( "regexp" "strconv" "strings" - "time" "code.gitea.io/gitea/models" "code.gitea.io/gitea/models/db" @@ -34,22 +31,17 @@ import ( repo_module "code.gitea.io/gitea/modules/repository" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" - asymkey_service "code.gitea.io/gitea/services/asymkey" issue_service "code.gitea.io/gitea/services/issue" ) // GetDefaultMergeMessage returns default message used when merging pull request func GetDefaultMergeMessage(ctx context.Context, baseGitRepo *git.Repository, pr *issues_model.PullRequest, mergeStyle repo_model.MergeStyle) (message, body string, err error) { - if err := pr.LoadHeadRepo(ctx); err != nil { - return "", "", err - } if err := pr.LoadBaseRepo(ctx); err != nil { return "", "", err } - if pr.BaseRepo == nil { - return "", "", repo_model.ErrRepoNotExist{ID: pr.BaseRepoID} + if err := pr.LoadHeadRepo(ctx); err != nil { + return "", "", err } - if err := pr.LoadIssue(ctx); err != nil { return "", "", err } @@ -144,18 +136,19 @@ func expandDefaultMergeMessage(template string, vars map[string]string) (message // Merge merges pull request to base repository. // Caller should check PR is ready to be merged (review and status checks) func Merge(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.User, baseGitRepo *git.Repository, mergeStyle repo_model.MergeStyle, expectedHeadCommitID, message string, wasAutoMerged bool) error { - if err := pr.LoadHeadRepo(ctx); err != nil { - log.Error("LoadHeadRepo: %v", err) - return fmt.Errorf("LoadHeadRepo: %w", err) - } else if err := pr.LoadBaseRepo(ctx); err != nil { - log.Error("LoadBaseRepo: %v", err) - return fmt.Errorf("LoadBaseRepo: %w", err) + if err := pr.LoadBaseRepo(ctx); err != nil { + log.Error("Unable to load base repo: %v", err) + return fmt.Errorf("unable to load base repo: %w", err) + } else if err := pr.LoadHeadRepo(ctx); err != nil { + log.Error("Unable to load head repo: %v", err) + return fmt.Errorf("unable to load head repo: %w", err) } pullWorkingPool.CheckIn(fmt.Sprint(pr.ID)) defer pullWorkingPool.CheckOut(fmt.Sprint(pr.ID)) // Removing an auto merge pull and ignore if not exist + // FIXME: is this the correct point to do this? Shouldn't this be after IsMergeStyleAllowed? if err := pull_model.DeleteScheduledAutoMerge(ctx, pr.ID); err != nil && !db.IsErrNotExist(err) { return err } @@ -179,7 +172,7 @@ func Merge(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.U // Run the merge in the hammer context to prevent cancellation hammerCtx := graceful.GetManager().HammerContext() - pr.MergedCommitID, err = rawMerge(hammerCtx, pr, doer, mergeStyle, expectedHeadCommitID, message) + pr.MergedCommitID, err = doMergeAndPush(hammerCtx, pr, doer, mergeStyle, expectedHeadCommitID, message) if err != nil { return err } @@ -189,18 +182,18 @@ func Merge(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.U pr.MergerID = doer.ID if _, err := pr.SetMerged(hammerCtx); err != nil { - log.Error("SetMerged [%d]: %v", pr.ID, err) + log.Error("SetMerged %-v: %v", pr, err) } if err := pr.LoadIssue(hammerCtx); err != nil { - log.Error("LoadIssue [%d]: %v", pr.ID, err) + log.Error("LoadIssue %-v: %v", pr, err) } if err := pr.Issue.LoadRepo(hammerCtx); err != nil { - log.Error("LoadRepo for issue [%d]: %v", pr.ID, err) + log.Error("pr.Issue.LoadRepo %-v: %v", pr, err) } if err := pr.Issue.Repo.LoadOwner(hammerCtx); err != nil { - log.Error("LoadOwner for PR [%d]: %v", pr.ID, err) + log.Error("LoadOwner for %-v: %v", pr, err) } if wasAutoMerged { @@ -239,326 +232,43 @@ func Merge(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.U return nil } -// rawMerge perform the merge operation without changing any pull information in database -func rawMerge(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.User, mergeStyle repo_model.MergeStyle, expectedHeadCommitID, message string) (string, error) { +// doMergeAndPush performs the merge operation without changing any pull information in database and pushes it up to the base repository +func doMergeAndPush(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.User, mergeStyle repo_model.MergeStyle, expectedHeadCommitID, message string) (string, error) { // Clone base repo. - tmpBasePath, err := createTemporaryRepo(ctx, pr) + mergeCtx, cancel, err := createTemporaryRepoForMerge(ctx, pr, doer, expectedHeadCommitID) if err != nil { - log.Error("CreateTemporaryPath: %v", err) return "", err } - defer func() { - if err := repo_module.RemoveTemporaryPath(tmpBasePath); err != nil { - log.Error("Merge: RemoveTemporaryPath: %s", err) - } - }() - - baseBranch := "base" - trackingBranch := "tracking" - stagingBranch := "staging" - - if expectedHeadCommitID != "" { - trackingCommitID, _, err := git.NewCommand(ctx, "show-ref", "--hash").AddDynamicArguments(git.BranchPrefix + trackingBranch).RunStdString(&git.RunOpts{Dir: tmpBasePath}) - if err != nil { - log.Error("show-ref[%s] --hash refs/heads/trackingn: %v", tmpBasePath, git.BranchPrefix+trackingBranch, err) - return "", fmt.Errorf("getDiffTree: %w", err) - } - if strings.TrimSpace(trackingCommitID) != expectedHeadCommitID { - return "", models.ErrSHADoesNotMatch{ - GivenSHA: expectedHeadCommitID, - CurrentSHA: trackingCommitID, - } - } - } - - var outbuf, errbuf strings.Builder - - // Enable sparse-checkout - sparseCheckoutList, err := getDiffTree(ctx, tmpBasePath, baseBranch, trackingBranch) - if err != nil { - log.Error("getDiffTree(%s, %s, %s): %v", tmpBasePath, baseBranch, trackingBranch, err) - return "", fmt.Errorf("getDiffTree: %w", err) - } - - infoPath := filepath.Join(tmpBasePath, ".git", "info") - if err := os.MkdirAll(infoPath, 0o700); err != nil { - log.Error("Unable to create .git/info in %s: %v", tmpBasePath, err) - return "", fmt.Errorf("Unable to create .git/info in tmpBasePath: %w", err) - } - - sparseCheckoutListPath := filepath.Join(infoPath, "sparse-checkout") - if err := os.WriteFile(sparseCheckoutListPath, []byte(sparseCheckoutList), 0o600); err != nil { - log.Error("Unable to write .git/info/sparse-checkout file in %s: %v", tmpBasePath, err) - return "", fmt.Errorf("Unable to write .git/info/sparse-checkout file in tmpBasePath: %w", err) - } - - gitConfigCommand := func() *git.Command { - return git.NewCommand(ctx, "config", "--local") - } - - // Switch off LFS process (set required, clean and smudge here also) - if err := gitConfigCommand().AddArguments("filter.lfs.process", ""). - Run(&git.RunOpts{ - Dir: tmpBasePath, - Stdout: &outbuf, - Stderr: &errbuf, - }); err != nil { - log.Error("git config [filter.lfs.process -> <> ]: %v\n%s\n%s", err, outbuf.String(), errbuf.String()) - return "", fmt.Errorf("git config [filter.lfs.process -> <> ]: %w\n%s\n%s", err, outbuf.String(), errbuf.String()) - } - outbuf.Reset() - errbuf.Reset() - - if err := gitConfigCommand().AddArguments("filter.lfs.required", "false"). - Run(&git.RunOpts{ - Dir: tmpBasePath, - Stdout: &outbuf, - Stderr: &errbuf, - }); err != nil { - log.Error("git config [filter.lfs.required -> ]: %v\n%s\n%s", err, outbuf.String(), errbuf.String()) - return "", fmt.Errorf("git config [filter.lfs.required -> ]: %w\n%s\n%s", err, outbuf.String(), errbuf.String()) - } - outbuf.Reset() - errbuf.Reset() - - if err := gitConfigCommand().AddArguments("filter.lfs.clean", ""). - Run(&git.RunOpts{ - Dir: tmpBasePath, - Stdout: &outbuf, - Stderr: &errbuf, - }); err != nil { - log.Error("git config [filter.lfs.clean -> <> ]: %v\n%s\n%s", err, outbuf.String(), errbuf.String()) - return "", fmt.Errorf("git config [filter.lfs.clean -> <> ]: %w\n%s\n%s", err, outbuf.String(), errbuf.String()) - } - outbuf.Reset() - errbuf.Reset() - - if err := gitConfigCommand().AddArguments("filter.lfs.smudge", ""). - Run(&git.RunOpts{ - Dir: tmpBasePath, - Stdout: &outbuf, - Stderr: &errbuf, - }); err != nil { - log.Error("git config [filter.lfs.smudge -> <> ]: %v\n%s\n%s", err, outbuf.String(), errbuf.String()) - return "", fmt.Errorf("git config [filter.lfs.smudge -> <> ]: %w\n%s\n%s", err, outbuf.String(), errbuf.String()) - } - outbuf.Reset() - errbuf.Reset() - - if err := gitConfigCommand().AddArguments("core.sparseCheckout", "true"). - Run(&git.RunOpts{ - Dir: tmpBasePath, - Stdout: &outbuf, - Stderr: &errbuf, - }); err != nil { - log.Error("git config [core.sparseCheckout -> true ]: %v\n%s\n%s", err, outbuf.String(), errbuf.String()) - return "", fmt.Errorf("git config [core.sparsecheckout -> true]: %w\n%s\n%s", err, outbuf.String(), errbuf.String()) - } - outbuf.Reset() - errbuf.Reset() - - // Read base branch index - if err := git.NewCommand(ctx, "read-tree", "HEAD"). - Run(&git.RunOpts{ - Dir: tmpBasePath, - Stdout: &outbuf, - Stderr: &errbuf, - }); err != nil { - log.Error("git read-tree HEAD: %v\n%s\n%s", err, outbuf.String(), errbuf.String()) - return "", fmt.Errorf("Unable to read base branch in to the index: %w\n%s\n%s", err, outbuf.String(), errbuf.String()) - } - outbuf.Reset() - errbuf.Reset() - - sig := doer.NewGitSig() - committer := sig - - // Determine if we should sign. If no signKeyID, use --no-gpg-sign to countermand the sign config (from gitconfig) - var signArgs git.TrustedCmdArgs - sign, signKeyID, signer, _ := asymkey_service.SignMerge(ctx, pr, doer, tmpBasePath, "HEAD", trackingBranch) - if sign { - if pr.BaseRepo.GetTrustModel() == repo_model.CommitterTrustModel || pr.BaseRepo.GetTrustModel() == repo_model.CollaboratorCommitterTrustModel { - committer = signer - } - signArgs = git.ToTrustedCmdArgs([]string{"-S" + signKeyID}) - } else { - signArgs = append(signArgs, "--no-gpg-sign") - } - - commitTimeStr := time.Now().Format(time.RFC3339) - - // Because this may call hooks we should pass in the environment - env := append(os.Environ(), - "GIT_AUTHOR_NAME="+sig.Name, - "GIT_AUTHOR_EMAIL="+sig.Email, - "GIT_AUTHOR_DATE="+commitTimeStr, - "GIT_COMMITTER_NAME="+committer.Name, - "GIT_COMMITTER_EMAIL="+committer.Email, - "GIT_COMMITTER_DATE="+commitTimeStr, - ) + defer cancel() // Merge commits. switch mergeStyle { case repo_model.MergeStyleMerge: - cmd := git.NewCommand(ctx, "merge", "--no-ff", "--no-commit").AddDynamicArguments(trackingBranch) - if err := runMergeCommand(pr, mergeStyle, cmd, tmpBasePath); err != nil { - log.Error("Unable to merge tracking into base: %v", err) + if err := doMergeStyleMerge(mergeCtx, message); err != nil { return "", err } - - if err := commitAndSignNoAuthor(ctx, pr, message, signArgs, tmpBasePath, env); err != nil { - log.Error("Unable to make final commit: %v", err) + case repo_model.MergeStyleRebase, repo_model.MergeStyleRebaseMerge: + if err := doMergeStyleRebase(mergeCtx, mergeStyle, message); err != nil { return "", err } - case repo_model.MergeStyleRebase: - fallthrough - case repo_model.MergeStyleRebaseUpdate: - fallthrough - case repo_model.MergeStyleRebaseMerge: - // Checkout head branch - if err := git.NewCommand(ctx, "checkout", "-b").AddDynamicArguments(stagingBranch, trackingBranch). - Run(&git.RunOpts{ - Dir: tmpBasePath, - Stdout: &outbuf, - Stderr: &errbuf, - }); err != nil { - log.Error("git checkout base prior to merge post staging rebase [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String()) - return "", fmt.Errorf("git checkout base prior to merge post staging rebase [%s:%s -> %s:%s]: %w\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String()) - } - outbuf.Reset() - errbuf.Reset() - - // Rebase before merging - if err := git.NewCommand(ctx, "rebase").AddDynamicArguments(baseBranch). - Run(&git.RunOpts{ - Dir: tmpBasePath, - Stdout: &outbuf, - Stderr: &errbuf, - }); err != nil { - // Rebase will leave a REBASE_HEAD file in .git if there is a conflict - if _, statErr := os.Stat(filepath.Join(tmpBasePath, ".git", "REBASE_HEAD")); statErr == nil { - var commitSha string - ok := false - failingCommitPaths := []string{ - filepath.Join(tmpBasePath, ".git", "rebase-apply", "original-commit"), // Git < 2.26 - filepath.Join(tmpBasePath, ".git", "rebase-merge", "stopped-sha"), // Git >= 2.26 - } - for _, failingCommitPath := range failingCommitPaths { - if _, statErr := os.Stat(failingCommitPath); statErr == nil { - commitShaBytes, readErr := os.ReadFile(failingCommitPath) - if readErr != nil { - // Abandon this attempt to handle the error - log.Error("git rebase staging on to base [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String()) - return "", fmt.Errorf("git rebase staging on to base [%s:%s -> %s:%s]: %w\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String()) - } - commitSha = strings.TrimSpace(string(commitShaBytes)) - ok = true - break - } - } - if !ok { - log.Error("Unable to determine failing commit sha for this rebase message. Cannot cast as models.ErrRebaseConflicts.") - log.Error("git rebase staging on to base [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String()) - return "", fmt.Errorf("git rebase staging on to base [%s:%s -> %s:%s]: %w\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String()) - } - log.Debug("RebaseConflict at %s [%s:%s -> %s:%s]: %v\n%s\n%s", commitSha, pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String()) - return "", models.ErrRebaseConflicts{ - Style: mergeStyle, - CommitSHA: commitSha, - StdOut: outbuf.String(), - StdErr: errbuf.String(), - Err: err, - } - } - log.Error("git rebase staging on to base [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String()) - return "", fmt.Errorf("git rebase staging on to base [%s:%s -> %s:%s]: %w\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String()) - } - outbuf.Reset() - errbuf.Reset() - - // not need merge, just update by rebase. so skip - if mergeStyle == repo_model.MergeStyleRebaseUpdate { - break - } - - // Checkout base branch again - if err := git.NewCommand(ctx, "checkout").AddDynamicArguments(baseBranch). - Run(&git.RunOpts{ - Dir: tmpBasePath, - Stdout: &outbuf, - Stderr: &errbuf, - }); err != nil { - log.Error("git checkout base prior to merge post staging rebase [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String()) - return "", fmt.Errorf("git checkout base prior to merge post staging rebase [%s:%s -> %s:%s]: %w\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String()) - } - outbuf.Reset() - errbuf.Reset() - - cmd := git.NewCommand(ctx, "merge") - if mergeStyle == repo_model.MergeStyleRebase { - cmd.AddArguments("--ff-only") - } else { - cmd.AddArguments("--no-ff", "--no-commit") - } - cmd.AddDynamicArguments(stagingBranch) - - // Prepare merge with commit - if err := runMergeCommand(pr, mergeStyle, cmd, tmpBasePath); err != nil { - log.Error("Unable to merge staging into base: %v", err) - return "", err - } - if mergeStyle == repo_model.MergeStyleRebaseMerge { - if err := commitAndSignNoAuthor(ctx, pr, message, signArgs, tmpBasePath, env); err != nil { - log.Error("Unable to make final commit: %v", err) - return "", err - } - } case repo_model.MergeStyleSquash: - // Merge with squash - cmd := git.NewCommand(ctx, "merge", "--squash").AddDynamicArguments(trackingBranch) - if err := runMergeCommand(pr, mergeStyle, cmd, tmpBasePath); err != nil { - log.Error("Unable to merge --squash tracking into base: %v", err) + if err := doMergeStyleSquash(mergeCtx, message); err != nil { return "", err } - - if err = pr.Issue.LoadPoster(ctx); err != nil { - log.Error("LoadPoster: %v", err) - return "", fmt.Errorf("LoadPoster: %w", err) - } - sig := pr.Issue.Poster.NewGitSig() - if setting.Repository.PullRequest.AddCoCommitterTrailers && committer.String() != sig.String() { - // add trailer - message += fmt.Sprintf("\nCo-authored-by: %s\nCo-committed-by: %s\n", sig.String(), sig.String()) - } - if err := git.NewCommand(ctx, "commit"). - AddArguments(signArgs...). - AddOptionFormat("--author='%s <%s>'", sig.Name, sig.Email). - AddOptionFormat("--message=%s", message). - Run(&git.RunOpts{ - Env: env, - Dir: tmpBasePath, - Stdout: &outbuf, - Stderr: &errbuf, - }); err != nil { - log.Error("git commit [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String()) - return "", fmt.Errorf("git commit [%s:%s -> %s:%s]: %w\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String()) - } - outbuf.Reset() - errbuf.Reset() default: return "", models.ErrInvalidMergeStyle{ID: pr.BaseRepo.ID, Style: mergeStyle} } // OK we should cache our current head and origin/headbranch - mergeHeadSHA, err := git.GetFullCommitID(ctx, tmpBasePath, "HEAD") + mergeHeadSHA, err := git.GetFullCommitID(ctx, mergeCtx.tmpBasePath, "HEAD") if err != nil { return "", fmt.Errorf("Failed to get full commit id for HEAD: %w", err) } - mergeBaseSHA, err := git.GetFullCommitID(ctx, tmpBasePath, "original_"+baseBranch) + mergeBaseSHA, err := git.GetFullCommitID(ctx, mergeCtx.tmpBasePath, "original_"+baseBranch) if err != nil { return "", fmt.Errorf("Failed to get full commit id for origin/%s: %w", pr.BaseBranch, err) } - mergeCommitID, err := git.GetFullCommitID(ctx, tmpBasePath, baseBranch) + mergeCommitID, err := git.GetFullCommitID(ctx, mergeCtx.tmpBasePath, baseBranch) if err != nil { return "", fmt.Errorf("Failed to get full commit id for the new merge: %w", err) } @@ -567,7 +277,7 @@ func rawMerge(ctx context.Context, pr *issues_model.PullRequest, doer *user_mode // I think in the interests of data safety - failures to push to the lfs should prevent // the merge as you can always remerge. if setting.LFS.StartServer { - if err := LFSPush(ctx, tmpBasePath, mergeHeadSHA, mergeBaseSHA, pr); err != nil { + if err := LFSPush(ctx, mergeCtx.tmpBasePath, mergeHeadSHA, mergeBaseSHA, pr); err != nil { return "", err } } @@ -576,167 +286,92 @@ func rawMerge(ctx context.Context, pr *issues_model.PullRequest, doer *user_mode err = pr.HeadRepo.LoadOwner(ctx) if err != nil { if !user_model.IsErrUserNotExist(err) { - log.Error("Can't find user: %d for head repository - %v", pr.HeadRepo.OwnerID, err) + log.Error("Can't find user: %d for head repository in %-v: %v", pr.HeadRepo.OwnerID, pr, err) return "", err } - log.Error("Can't find user: %d for head repository - defaulting to doer: %s - %v", pr.HeadRepo.OwnerID, doer.Name, err) + log.Warn("Can't find user: %d for head repository in %-v - defaulting to doer: %s - %v", pr.HeadRepo.OwnerID, pr, doer.Name, err) headUser = doer } else { headUser = pr.HeadRepo.Owner } - var pushCmd *git.Command - if mergeStyle == repo_model.MergeStyleRebaseUpdate { - // force push the rebase result to head branch - env = repo_module.FullPushingEnvironment( - headUser, - doer, - pr.HeadRepo, - pr.HeadRepo.Name, - pr.ID, - ) - pushCmd = git.NewCommand(ctx, "push", "-f", "head_repo").AddDynamicArguments(stagingBranch + ":" + git.BranchPrefix + pr.HeadBranch) - } else { - env = repo_module.FullPushingEnvironment( - headUser, - doer, - pr.BaseRepo, - pr.BaseRepo.Name, - pr.ID, - ) - pushCmd = git.NewCommand(ctx, "push", "origin").AddDynamicArguments(baseBranch + ":" + git.BranchPrefix + pr.BaseBranch) - } + mergeCtx.env = repo_module.FullPushingEnvironment( + headUser, + doer, + pr.BaseRepo, + pr.BaseRepo.Name, + pr.ID, + ) + pushCmd := git.NewCommand(ctx, "push", "origin").AddDynamicArguments(baseBranch + ":" + git.BranchPrefix + pr.BaseBranch) // Push back to upstream. // TODO: this cause an api call to "/api/internal/hook/post-receive/...", // that prevents us from doint the whole merge in one db transaction - if err := pushCmd.Run(&git.RunOpts{ - Env: env, - Dir: tmpBasePath, - Stdout: &outbuf, - Stderr: &errbuf, - }); err != nil { - if strings.Contains(errbuf.String(), "non-fast-forward") { + if err := pushCmd.Run(mergeCtx.RunOpts()); err != nil { + if strings.Contains(mergeCtx.errbuf.String(), "non-fast-forward") { return "", &git.ErrPushOutOfDate{ - StdOut: outbuf.String(), - StdErr: errbuf.String(), + StdOut: mergeCtx.outbuf.String(), + StdErr: mergeCtx.errbuf.String(), Err: err, } - } else if strings.Contains(errbuf.String(), "! [remote rejected]") { + } else if strings.Contains(mergeCtx.errbuf.String(), "! [remote rejected]") { err := &git.ErrPushRejected{ - StdOut: outbuf.String(), - StdErr: errbuf.String(), + StdOut: mergeCtx.outbuf.String(), + StdErr: mergeCtx.errbuf.String(), Err: err, } err.GenerateMessage() return "", err } - return "", fmt.Errorf("git push: %s", errbuf.String()) + return "", fmt.Errorf("git push: %s", mergeCtx.errbuf.String()) } - outbuf.Reset() - errbuf.Reset() + mergeCtx.outbuf.Reset() + mergeCtx.errbuf.Reset() return mergeCommitID, nil } -func commitAndSignNoAuthor(ctx context.Context, pr *issues_model.PullRequest, message string, signArgs git.TrustedCmdArgs, tmpBasePath string, env []string) error { - var outbuf, errbuf strings.Builder - if err := git.NewCommand(ctx, "commit").AddArguments(signArgs...).AddOptionFormat("--message=%s", message). - Run(&git.RunOpts{ - Env: env, - Dir: tmpBasePath, - Stdout: &outbuf, - Stderr: &errbuf, - }); err != nil { - log.Error("git commit [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String()) - return fmt.Errorf("git commit [%s:%s -> %s:%s]: %w\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String()) +func commitAndSignNoAuthor(ctx *mergeContext, message string) error { + if err := git.NewCommand(ctx, "commit").AddArguments(ctx.signArg...).AddOptionFormat("--message=%s", message). + Run(ctx.RunOpts()); err != nil { + log.Error("git commit %-v: %v\n%s\n%s", ctx.pr, err, ctx.outbuf.String(), ctx.errbuf.String()) + return fmt.Errorf("git commit %v: %w\n%s\n%s", ctx.pr, err, ctx.outbuf.String(), ctx.errbuf.String()) } return nil } -func runMergeCommand(pr *issues_model.PullRequest, mergeStyle repo_model.MergeStyle, cmd *git.Command, tmpBasePath string) error { - var outbuf, errbuf strings.Builder - if err := cmd.Run(&git.RunOpts{ - Dir: tmpBasePath, - Stdout: &outbuf, - Stderr: &errbuf, - }); err != nil { +func runMergeCommand(ctx *mergeContext, mergeStyle repo_model.MergeStyle, cmd *git.Command) error { + if err := cmd.Run(ctx.RunOpts()); err != nil { // Merge will leave a MERGE_HEAD file in the .git folder if there is a conflict - if _, statErr := os.Stat(filepath.Join(tmpBasePath, ".git", "MERGE_HEAD")); statErr == nil { + if _, statErr := os.Stat(filepath.Join(ctx.tmpBasePath, ".git", "MERGE_HEAD")); statErr == nil { // We have a merge conflict error - log.Debug("MergeConflict [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String()) + log.Debug("MergeConflict %-v: %v\n%s\n%s", ctx.pr, err, ctx.outbuf.String(), ctx.errbuf.String()) return models.ErrMergeConflicts{ Style: mergeStyle, - StdOut: outbuf.String(), - StdErr: errbuf.String(), + StdOut: ctx.outbuf.String(), + StdErr: ctx.errbuf.String(), Err: err, } - } else if strings.Contains(errbuf.String(), "refusing to merge unrelated histories") { - log.Debug("MergeUnrelatedHistories [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String()) + } else if strings.Contains(ctx.errbuf.String(), "refusing to merge unrelated histories") { + log.Debug("MergeUnrelatedHistories %-v: %v\n%s\n%s", ctx.pr, err, ctx.outbuf.String(), ctx.errbuf.String()) return models.ErrMergeUnrelatedHistories{ Style: mergeStyle, - StdOut: outbuf.String(), - StdErr: errbuf.String(), + StdOut: ctx.outbuf.String(), + StdErr: ctx.errbuf.String(), Err: err, } } - log.Error("git merge [%s:%s -> %s:%s]: %v\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String()) - return fmt.Errorf("git merge [%s:%s -> %s:%s]: %w\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String()) + log.Error("git merge %-v: %v\n%s\n%s", ctx.pr, err, ctx.outbuf.String(), ctx.errbuf.String()) + return fmt.Errorf("git merge %v: %w\n%s\n%s", ctx.pr, err, ctx.outbuf.String(), ctx.errbuf.String()) } + ctx.outbuf.Reset() + ctx.errbuf.Reset() return nil } var escapedSymbols = regexp.MustCompile(`([*[?! \\])`) -func getDiffTree(ctx context.Context, repoPath, baseBranch, headBranch string) (string, error) { - getDiffTreeFromBranch := func(repoPath, baseBranch, headBranch string) (string, error) { - var outbuf, errbuf strings.Builder - // Compute the diff-tree for sparse-checkout - if err := git.NewCommand(ctx, "diff-tree", "--no-commit-id", "--name-only", "-r", "-z", "--root").AddDynamicArguments(baseBranch, headBranch). - Run(&git.RunOpts{ - Dir: repoPath, - Stdout: &outbuf, - Stderr: &errbuf, - }); err != nil { - return "", fmt.Errorf("git diff-tree [%s base:%s head:%s]: %s", repoPath, baseBranch, headBranch, errbuf.String()) - } - return outbuf.String(), nil - } - - scanNullTerminatedStrings := func(data []byte, atEOF bool) (advance int, token []byte, err error) { - if atEOF && len(data) == 0 { - return 0, nil, nil - } - if i := bytes.IndexByte(data, '\x00'); i >= 0 { - return i + 1, data[0:i], nil - } - if atEOF { - return len(data), data, nil - } - return 0, nil, nil - } - - list, err := getDiffTreeFromBranch(repoPath, baseBranch, headBranch) - if err != nil { - return "", err - } - - // Prefixing '/' for each entry, otherwise all files with the same name in subdirectories would be matched. - out := bytes.Buffer{} - scanner := bufio.NewScanner(strings.NewReader(list)) - scanner.Split(scanNullTerminatedStrings) - for scanner.Scan() { - filepath := scanner.Text() - // escape '*', '?', '[', spaces and '!' prefix - filepath = escapedSymbols.ReplaceAllString(filepath, `\$1`) - // no necessary to escape the first '#' symbol because the first symbol is '/' - fmt.Fprintf(&out, "/%s\n", filepath) - } - - return out.String(), nil -} - // IsUserAllowedToMerge check if user is allowed to merge PR with given permissions and branch protections func IsUserAllowedToMerge(ctx context.Context, pr *issues_model.PullRequest, p access_model.Permission, user *user_model.User) (bool, error) { if user == nil { diff --git a/services/pull/merge_merge.go b/services/pull/merge_merge.go new file mode 100644 index 000000000000..0f7664297aa8 --- /dev/null +++ b/services/pull/merge_merge.go @@ -0,0 +1,25 @@ +// Copyright 2023 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package pull + +import ( + repo_model "code.gitea.io/gitea/models/repo" + "code.gitea.io/gitea/modules/git" + "code.gitea.io/gitea/modules/log" +) + +// doMergeStyleMerge merges the tracking into the current HEAD - which is assumed to tbe staging branch (equal to the pr.BaseBranch) +func doMergeStyleMerge(ctx *mergeContext, message string) error { + cmd := git.NewCommand(ctx, "merge", "--no-ff", "--no-commit").AddDynamicArguments(trackingBranch) + if err := runMergeCommand(ctx, repo_model.MergeStyleMerge, cmd); err != nil { + log.Error("%-v Unable to merge tracking into base: %v", ctx.pr, err) + return err + } + + if err := commitAndSignNoAuthor(ctx, message); err != nil { + log.Error("%-v Unable to make final commit: %v", ctx.pr, err) + return err + } + return nil +} diff --git a/services/pull/merge_prepare.go b/services/pull/merge_prepare.go new file mode 100644 index 000000000000..2ba821961a2b --- /dev/null +++ b/services/pull/merge_prepare.go @@ -0,0 +1,297 @@ +// Copyright 2023 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package pull + +import ( + "bufio" + "bytes" + "context" + "fmt" + "io" + "os" + "path/filepath" + "strings" + "time" + + "code.gitea.io/gitea/models" + issues_model "code.gitea.io/gitea/models/issues" + repo_model "code.gitea.io/gitea/models/repo" + user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/git" + "code.gitea.io/gitea/modules/log" + asymkey_service "code.gitea.io/gitea/services/asymkey" +) + +type mergeContext struct { + *prContext + doer *user_model.User + sig *git.Signature + committer *git.Signature + signArg git.TrustedCmdArgs + env []string +} + +func (ctx *mergeContext) RunOpts() *git.RunOpts { + ctx.outbuf.Reset() + ctx.errbuf.Reset() + return &git.RunOpts{ + Env: ctx.env, + Dir: ctx.tmpBasePath, + Stdout: ctx.outbuf, + Stderr: ctx.errbuf, + } +} + +func createTemporaryRepoForMerge(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.User, expectedHeadCommitID string) (mergeCtx *mergeContext, cancel context.CancelFunc, err error) { + // Clone base repo. + prCtx, cancel, err := createTemporaryRepoForPR(ctx, pr) + if err != nil { + log.Error("createTemporaryRepoForPR: %v", err) + return nil, cancel, err + } + + mergeCtx = &mergeContext{ + prContext: prCtx, + doer: doer, + } + + if expectedHeadCommitID != "" { + trackingCommitID, _, err := git.NewCommand(ctx, "show-ref", "--hash").AddDynamicArguments(git.BranchPrefix + trackingBranch).RunStdString(&git.RunOpts{Dir: mergeCtx.tmpBasePath}) + if err != nil { + defer cancel() + log.Error("failed to get sha of head branch in %-v: show-ref[%s] --hash refs/heads/tracking: %v", mergeCtx.pr, mergeCtx.tmpBasePath, err) + return nil, nil, fmt.Errorf("unable to get sha of head branch in %v %w", pr, err) + } + if strings.TrimSpace(trackingCommitID) != expectedHeadCommitID { + defer cancel() + return nil, nil, models.ErrSHADoesNotMatch{ + GivenSHA: expectedHeadCommitID, + CurrentSHA: trackingCommitID, + } + } + } + + mergeCtx.outbuf.Reset() + mergeCtx.errbuf.Reset() + if err := prepareTemporaryRepoForMerge(mergeCtx); err != nil { + defer cancel() + return nil, nil, err + } + + mergeCtx.sig = doer.NewGitSig() + mergeCtx.committer = mergeCtx.sig + + // Determine if we should sign + sign, keyID, signer, _ := asymkey_service.SignMerge(ctx, mergeCtx.pr, mergeCtx.doer, mergeCtx.tmpBasePath, "HEAD", trackingBranch) + if sign { + mergeCtx.signArg = git.ToTrustedCmdArgs([]string{"-S" + keyID}) + if pr.BaseRepo.GetTrustModel() == repo_model.CommitterTrustModel || pr.BaseRepo.GetTrustModel() == repo_model.CollaboratorCommitterTrustModel { + mergeCtx.committer = signer + } + } else { + mergeCtx.signArg = git.ToTrustedCmdArgs([]string{"--no-gpg-sign"}) + } + + commitTimeStr := time.Now().Format(time.RFC3339) + + // Because this may call hooks we should pass in the environment + mergeCtx.env = append(os.Environ(), + "GIT_AUTHOR_NAME="+mergeCtx.sig.Name, + "GIT_AUTHOR_EMAIL="+mergeCtx.sig.Email, + "GIT_AUTHOR_DATE="+commitTimeStr, + "GIT_COMMITTER_NAME="+mergeCtx.committer.Name, + "GIT_COMMITTER_EMAIL="+mergeCtx.committer.Email, + "GIT_COMMITTER_DATE="+commitTimeStr, + ) + + return mergeCtx, cancel, nil +} + +// prepareTemporaryRepoForMerge takes a repository that has been created using createTemporaryRepo +// it then sets up the sparse-checkout and other things +func prepareTemporaryRepoForMerge(ctx *mergeContext) error { + infoPath := filepath.Join(ctx.tmpBasePath, ".git", "info") + if err := os.MkdirAll(infoPath, 0o700); err != nil { + log.Error("%-v Unable to create .git/info in %s: %v", ctx.pr, ctx.tmpBasePath, err) + return fmt.Errorf("Unable to create .git/info in tmpBasePath: %w", err) + } + + // Enable sparse-checkout + // Here we use the .git/info/sparse-checkout file as described in the git documentation + sparseCheckoutListFile, err := os.OpenFile(filepath.Join(infoPath, "sparse-checkout"), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o600) + if err != nil { + log.Error("%-v Unable to write .git/info/sparse-checkout file in %s: %v", ctx.pr, ctx.tmpBasePath, err) + return fmt.Errorf("Unable to write .git/info/sparse-checkout file in tmpBasePath: %w", err) + } + defer sparseCheckoutListFile.Close() // we will close it earlier but we need to ensure it is closed if there is an error + + if err := getDiffTree(ctx, ctx.tmpBasePath, baseBranch, trackingBranch, sparseCheckoutListFile); err != nil { + log.Error("%-v getDiffTree(%s, %s, %s): %v", ctx.pr, ctx.tmpBasePath, baseBranch, trackingBranch, err) + return fmt.Errorf("getDiffTree: %w", err) + } + + if err := sparseCheckoutListFile.Close(); err != nil { + log.Error("%-v Unable to close .git/info/sparse-checkout file in %s: %v", ctx.pr, ctx.tmpBasePath, err) + return fmt.Errorf("Unable to close .git/info/sparse-checkout file in tmpBasePath: %w", err) + } + + gitConfigCommand := func() *git.Command { + return git.NewCommand(ctx, "config", "--local") + } + + setConfig := func(key, value string) error { + if err := gitConfigCommand().AddArguments(git.ToTrustedCmdArgs([]string{key, value})...). + Run(ctx.RunOpts()); err != nil { + if value == "" { + value = "<>" + } + log.Error("git config [%s -> %s ]: %v\n%s\n%s", key, value, err, ctx.outbuf.String(), ctx.errbuf.String()) + return fmt.Errorf("git config [%s -> %s ]: %w\n%s\n%s", key, value, err, ctx.outbuf.String(), ctx.errbuf.String()) + } + ctx.outbuf.Reset() + ctx.errbuf.Reset() + + return nil + } + + // Switch off LFS process (set required, clean and smudge here also) + if err := setConfig("filter.lfs.process", ""); err != nil { + return err + } + + if err := setConfig("filter.lfs.required", "false"); err != nil { + return err + } + + if err := setConfig("filter.lfs.clean", ""); err != nil { + return err + } + + if err := setConfig("filter.lfs.smudge", ""); err != nil { + return err + } + + if err := setConfig("core.sparseCheckout", "true"); err != nil { + return err + } + + // Read base branch index + if err := git.NewCommand(ctx, "read-tree", "HEAD"). + Run(ctx.RunOpts()); err != nil { + log.Error("git read-tree HEAD: %v\n%s\n%s", err, ctx.outbuf.String(), ctx.errbuf.String()) + return fmt.Errorf("Unable to read base branch in to the index: %w\n%s\n%s", err, ctx.outbuf.String(), ctx.errbuf.String()) + } + ctx.outbuf.Reset() + ctx.errbuf.Reset() + + return nil +} + +// getDiffTree returns a string containing all the files that were changed between headBranch and baseBranch +// the filenames are escaped so as to fit the format required for .git/info/sparse-checkout +func getDiffTree(ctx context.Context, repoPath, baseBranch, headBranch string, out io.Writer) error { + diffOutReader, diffOutWriter, err := os.Pipe() + if err != nil { + log.Error("Unable to create os.Pipe for %s", repoPath) + return err + } + defer func() { + _ = diffOutReader.Close() + _ = diffOutWriter.Close() + }() + + scanNullTerminatedStrings := func(data []byte, atEOF bool) (advance int, token []byte, err error) { + if atEOF && len(data) == 0 { + return 0, nil, nil + } + if i := bytes.IndexByte(data, '\x00'); i >= 0 { + return i + 1, data[0:i], nil + } + if atEOF { + return len(data), data, nil + } + return 0, nil, nil + } + + err = git.NewCommand(ctx, "diff-tree", "--no-commit-id", "--name-only", "-r", "-r", "-z", "--root").AddDynamicArguments(baseBranch, headBranch). + Run(&git.RunOpts{ + Dir: repoPath, + Stdout: diffOutWriter, + PipelineFunc: func(ctx context.Context, cancel context.CancelFunc) error { + // Close the writer end of the pipe to begin processing + _ = diffOutWriter.Close() + defer func() { + // Close the reader on return to terminate the git command if necessary + _ = diffOutReader.Close() + }() + + // Now scan the output from the command + scanner := bufio.NewScanner(diffOutReader) + scanner.Split(scanNullTerminatedStrings) + for scanner.Scan() { + filepath := scanner.Text() + // escape '*', '?', '[', spaces and '!' prefix + filepath = escapedSymbols.ReplaceAllString(filepath, `\$1`) + // no necessary to escape the first '#' symbol because the first symbol is '/' + fmt.Fprintf(out, "/%s\n", filepath) + } + return scanner.Err() + }, + }) + return err +} + +// rebaseTrackingOnToBase checks out the tracking branch as staging and rebases it on to the base branch +// if there is a conflict it will return a models.ErrRebaseConflicts +func rebaseTrackingOnToBase(ctx *mergeContext, mergeStyle repo_model.MergeStyle) error { + // Checkout head branch + if err := git.NewCommand(ctx, "checkout", "-b").AddDynamicArguments(stagingBranch, trackingBranch). + Run(ctx.RunOpts()); err != nil { + return fmt.Errorf("unable to git checkout tracking as staging in temp repo for %v: %w\n%s\n%s", ctx.pr, err, ctx.outbuf.String(), ctx.errbuf.String()) + } + ctx.outbuf.Reset() + ctx.errbuf.Reset() + + // Rebase before merging + if err := git.NewCommand(ctx, "rebase").AddDynamicArguments(baseBranch). + Run(ctx.RunOpts()); err != nil { + // Rebase will leave a REBASE_HEAD file in .git if there is a conflict + if _, statErr := os.Stat(filepath.Join(ctx.tmpBasePath, ".git", "REBASE_HEAD")); statErr == nil { + var commitSha string + ok := false + failingCommitPaths := []string{ + filepath.Join(ctx.tmpBasePath, ".git", "rebase-apply", "original-commit"), // Git < 2.26 + filepath.Join(ctx.tmpBasePath, ".git", "rebase-merge", "stopped-sha"), // Git >= 2.26 + } + for _, failingCommitPath := range failingCommitPaths { + if _, statErr := os.Stat(failingCommitPath); statErr == nil { + commitShaBytes, readErr := os.ReadFile(failingCommitPath) + if readErr != nil { + // Abandon this attempt to handle the error + return fmt.Errorf("unable to git rebase staging on to base in temp repo for %v: %w\n%s\n%s", ctx.pr, err, ctx.outbuf.String(), ctx.errbuf.String()) + } + commitSha = strings.TrimSpace(string(commitShaBytes)) + ok = true + break + } + } + if !ok { + log.Error("Unable to determine failing commit sha for failing rebase in temp repo for %-v. Cannot cast as models.ErrRebaseConflicts.", ctx.pr) + return fmt.Errorf("unable to git rebase staging on to base in temp repo for %v: %w\n%s\n%s", ctx.pr, err, ctx.outbuf.String(), ctx.errbuf.String()) + } + log.Debug("Conflict when rebasing staging on to base in %-v at %s: %v\n%s\n%s", ctx.pr, commitSha, err, ctx.outbuf.String(), ctx.errbuf.String()) + return models.ErrRebaseConflicts{ + CommitSHA: commitSha, + Style: mergeStyle, + StdOut: ctx.outbuf.String(), + StdErr: ctx.errbuf.String(), + Err: err, + } + } + return fmt.Errorf("unable to git rebase staging on to base in temp repo for %v: %w\n%s\n%s", ctx.pr, err, ctx.outbuf.String(), ctx.errbuf.String()) + } + ctx.outbuf.Reset() + ctx.errbuf.Reset() + return nil +} diff --git a/services/pull/merge_rebase.go b/services/pull/merge_rebase.go new file mode 100644 index 000000000000..d3bb86d4aa08 --- /dev/null +++ b/services/pull/merge_rebase.go @@ -0,0 +1,50 @@ +// Copyright 2023 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package pull + +import ( + "fmt" + + repo_model "code.gitea.io/gitea/models/repo" + "code.gitea.io/gitea/modules/git" + "code.gitea.io/gitea/modules/log" +) + +// doMergeStyleRebase rebaases the tracking branch on the base branch as the current HEAD with or with a merge commit to the original pr branch +func doMergeStyleRebase(ctx *mergeContext, mergeStyle repo_model.MergeStyle, message string) error { + if err := rebaseTrackingOnToBase(ctx, mergeStyle); err != nil { + return err + } + + // Checkout base branch again + if err := git.NewCommand(ctx, "checkout").AddDynamicArguments(baseBranch). + Run(ctx.RunOpts()); err != nil { + log.Error("git checkout base prior to merge post staging rebase %-v: %v\n%s\n%s", ctx.pr, err, ctx.outbuf.String(), ctx.errbuf.String()) + return fmt.Errorf("git checkout base prior to merge post staging rebase %v: %w\n%s\n%s", ctx.pr, err, ctx.outbuf.String(), ctx.errbuf.String()) + } + ctx.outbuf.Reset() + ctx.errbuf.Reset() + + cmd := git.NewCommand(ctx, "merge") + if mergeStyle == repo_model.MergeStyleRebase { + cmd.AddArguments("--ff-only") + } else { + cmd.AddArguments("--no-ff", "--no-commit") + } + cmd.AddDynamicArguments(stagingBranch) + + // Prepare merge with commit + if err := runMergeCommand(ctx, mergeStyle, cmd); err != nil { + log.Error("Unable to merge staging into base: %v", err) + return err + } + if mergeStyle == repo_model.MergeStyleRebaseMerge { + if err := commitAndSignNoAuthor(ctx, message); err != nil { + log.Error("Unable to make final commit: %v", err) + return err + } + } + + return nil +} diff --git a/services/pull/merge_squash.go b/services/pull/merge_squash.go new file mode 100644 index 000000000000..0a8cc0167e40 --- /dev/null +++ b/services/pull/merge_squash.go @@ -0,0 +1,53 @@ +// Copyright 2023 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package pull + +import ( + "fmt" + + repo_model "code.gitea.io/gitea/models/repo" + "code.gitea.io/gitea/modules/git" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" +) + +// doMergeStyleSquash squashes the tracking branch on the current HEAD (=base) +func doMergeStyleSquash(ctx *mergeContext, message string) error { + cmd := git.NewCommand(ctx, "merge", "--squash").AddDynamicArguments(trackingBranch) + if err := runMergeCommand(ctx, repo_model.MergeStyleSquash, cmd); err != nil { + log.Error("%-v Unable to merge --squash tracking into base: %v", ctx.pr, err) + return err + } + + if err := ctx.pr.Issue.LoadPoster(ctx); err != nil { + log.Error("%-v Issue[%d].LoadPoster: %v", ctx.pr, ctx.pr.Issue.ID, err) + return fmt.Errorf("LoadPoster: %w", err) + } + sig := ctx.pr.Issue.Poster.NewGitSig() + if len(ctx.signArg) == 0 { + if err := git.NewCommand(ctx, "commit"). + AddOptionFormat("--author='%s <%s>'", sig.Name, sig.Email). + AddOptionFormat("--message=%s", message). + Run(ctx.RunOpts()); err != nil { + log.Error("git commit %-v: %v\n%s\n%s", ctx.pr, err, ctx.outbuf.String(), ctx.errbuf.String()) + return fmt.Errorf("git commit [%s:%s -> %s:%s]: %w\n%s\n%s", ctx.pr.HeadRepo.FullName(), ctx.pr.HeadBranch, ctx.pr.BaseRepo.FullName(), ctx.pr.BaseBranch, err, ctx.outbuf.String(), ctx.errbuf.String()) + } + } else { + if setting.Repository.PullRequest.AddCoCommitterTrailers && ctx.committer.String() != sig.String() { + // add trailer + message += fmt.Sprintf("\nCo-authored-by: %s\nCo-committed-by: %s\n", sig.String(), sig.String()) + } + if err := git.NewCommand(ctx, "commit"). + AddArguments(ctx.signArg...). + AddOptionFormat("--author='%s <%s>'", sig.Name, sig.Email). + AddOptionFormat("--message=%s", message). + Run(ctx.RunOpts()); err != nil { + log.Error("git commit %-v: %v\n%s\n%s", ctx.pr, err, ctx.outbuf.String(), ctx.errbuf.String()) + return fmt.Errorf("git commit [%s:%s -> %s:%s]: %w\n%s\n%s", ctx.pr.HeadRepo.FullName(), ctx.pr.HeadBranch, ctx.pr.BaseRepo.FullName(), ctx.pr.BaseBranch, err, ctx.outbuf.String(), ctx.errbuf.String()) + } + } + ctx.outbuf.Reset() + ctx.errbuf.Reset() + return nil +} diff --git a/services/pull/patch.go b/services/pull/patch.go index c2ccc75bdccd..9277355720dc 100644 --- a/services/pull/patch.go +++ b/services/pull/patch.go @@ -22,7 +22,6 @@ import ( "code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/process" - repo_module "code.gitea.io/gitea/modules/repository" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" @@ -64,25 +63,21 @@ func TestPatch(pr *issues_model.PullRequest) error { defer finished() // Clone base repo. - tmpBasePath, err := createTemporaryRepo(ctx, pr) + prCtx, cancel, err := createTemporaryRepoForPR(ctx, pr) if err != nil { - log.Error("CreateTemporaryPath: %v", err) + log.Error("createTemporaryRepoForPR %-v: %v", pr, err) return err } - defer func() { - if err := repo_module.RemoveTemporaryPath(tmpBasePath); err != nil { - log.Error("Merge: RemoveTemporaryPath: %s", err) - } - }() + defer cancel() - gitRepo, err := git.OpenRepository(ctx, tmpBasePath) + gitRepo, err := git.OpenRepository(ctx, prCtx.tmpBasePath) if err != nil { return fmt.Errorf("OpenRepository: %w", err) } defer gitRepo.Close() // 1. update merge base - pr.MergeBase, _, err = git.NewCommand(ctx, "merge-base", "--", "base", "tracking").RunStdString(&git.RunOpts{Dir: tmpBasePath}) + pr.MergeBase, _, err = git.NewCommand(ctx, "merge-base", "--", "base", "tracking").RunStdString(&git.RunOpts{Dir: prCtx.tmpBasePath}) if err != nil { var err2 error pr.MergeBase, err2 = gitRepo.GetRefCommitID(git.BranchPrefix + "base") @@ -101,7 +96,7 @@ func TestPatch(pr *issues_model.PullRequest) error { } // 2. Check for conflicts - if conflicts, err := checkConflicts(ctx, pr, gitRepo, tmpBasePath); err != nil || conflicts || pr.Status == issues_model.PullRequestStatusEmpty { + if conflicts, err := checkConflicts(ctx, pr, gitRepo, prCtx.tmpBasePath); err != nil || conflicts || pr.Status == issues_model.PullRequestStatusEmpty { return err } diff --git a/services/pull/pull.go b/services/pull/pull.go index a19e88b33b65..d8923d0d5725 100644 --- a/services/pull/pull.go +++ b/services/pull/pull.go @@ -349,18 +349,14 @@ func AddTestPullRequestTask(doer *user_model.User, repoID int64, branch string, // checkIfPRContentChanged checks if diff to target branch has changed by push // A commit can be considered to leave the PR untouched if the patch/diff with its merge base is unchanged func checkIfPRContentChanged(ctx context.Context, pr *issues_model.PullRequest, oldCommitID, newCommitID string) (hasChanged bool, err error) { - tmpBasePath, err := createTemporaryRepo(ctx, pr) + prCtx, cancel, err := createTemporaryRepoForPR(ctx, pr) if err != nil { - log.Error("CreateTemporaryRepo: %v", err) + log.Error("CreateTemporaryRepoForPR %-v: %v", pr, err) return false, err } - defer func() { - if err := repo_module.RemoveTemporaryPath(tmpBasePath); err != nil { - log.Error("checkIfPRContentChanged: RemoveTemporaryPath: %s", err) - } - }() + defer cancel() - tmpRepo, err := git.OpenRepository(ctx, tmpBasePath) + tmpRepo, err := git.OpenRepository(ctx, prCtx.tmpBasePath) if err != nil { return false, fmt.Errorf("OpenRepository: %w", err) } @@ -379,7 +375,7 @@ func checkIfPRContentChanged(ctx context.Context, pr *issues_model.PullRequest, } if err := cmd.Run(&git.RunOpts{ - Dir: tmpBasePath, + Dir: prCtx.tmpBasePath, Stdout: stdoutWriter, PipelineFunc: func(ctx context.Context, cancel context.CancelFunc) error { _ = stdoutWriter.Close() diff --git a/services/pull/temp_repo.go b/services/pull/temp_repo.go index 2bef671555e0..146470780671 100644 --- a/services/pull/temp_repo.go +++ b/services/pull/temp_repo.go @@ -19,49 +19,85 @@ import ( repo_module "code.gitea.io/gitea/modules/repository" ) -// createTemporaryRepo creates a temporary repo with "base" for pr.BaseBranch and "tracking" for pr.HeadBranch +// Temporary repos created here use standard branch names to help simplify +// merging code +const ( + baseBranch = "base" // equivalent to pr.BaseBranch + trackingBranch = "tracking" // equivalent to pr.HeadBranch + stagingBranch = "staging" // this is used for a working branch +) + +type prContext struct { + context.Context + tmpBasePath string + pr *issues_model.PullRequest + outbuf *strings.Builder // we keep these around to help reduce needless buffer recreation, + errbuf *strings.Builder // any use should be preceded by a Reset and preferably after use +} + +func (ctx *prContext) RunOpts() *git.RunOpts { + ctx.outbuf.Reset() + ctx.errbuf.Reset() + return &git.RunOpts{ + Dir: ctx.tmpBasePath, + Stdout: ctx.outbuf, + Stderr: ctx.errbuf, + } +} + +// createTemporaryRepoForPR creates a temporary repo with "base" for pr.BaseBranch and "tracking" for pr.HeadBranch // it also create a second base branch called "original_base" -func createTemporaryRepo(ctx context.Context, pr *issues_model.PullRequest) (string, error) { +func createTemporaryRepoForPR(ctx context.Context, pr *issues_model.PullRequest) (prCtx *prContext, cancel context.CancelFunc, err error) { if err := pr.LoadHeadRepo(ctx); err != nil { - log.Error("LoadHeadRepo: %v", err) - return "", fmt.Errorf("LoadHeadRepo: %w", err) + log.Error("%-v LoadHeadRepo: %v", pr, err) + return nil, nil, fmt.Errorf("%v LoadHeadRepo: %w", pr, err) } else if pr.HeadRepo == nil { - log.Error("Pr %d HeadRepo %d does not exist", pr.ID, pr.HeadRepoID) - return "", &repo_model.ErrRepoNotExist{ + log.Error("%-v HeadRepo %d does not exist", pr, pr.HeadRepoID) + return nil, nil, &repo_model.ErrRepoNotExist{ ID: pr.HeadRepoID, } } else if err := pr.LoadBaseRepo(ctx); err != nil { - log.Error("LoadBaseRepo: %v", err) - return "", fmt.Errorf("LoadBaseRepo: %w", err) + log.Error("%-v LoadBaseRepo: %v", pr, err) + return nil, nil, fmt.Errorf("%v LoadBaseRepo: %w", pr, err) } else if pr.BaseRepo == nil { - log.Error("Pr %d BaseRepo %d does not exist", pr.ID, pr.BaseRepoID) - return "", &repo_model.ErrRepoNotExist{ + log.Error("%-v BaseRepo %d does not exist", pr, pr.BaseRepoID) + return nil, nil, &repo_model.ErrRepoNotExist{ ID: pr.BaseRepoID, } } else if err := pr.HeadRepo.LoadOwner(ctx); err != nil { - log.Error("HeadRepo.LoadOwner: %v", err) - return "", fmt.Errorf("HeadRepo.LoadOwner: %w", err) + log.Error("%-v HeadRepo.LoadOwner: %v", pr, err) + return nil, nil, fmt.Errorf("%v HeadRepo.LoadOwner: %w", pr, err) } else if err := pr.BaseRepo.LoadOwner(ctx); err != nil { - log.Error("BaseRepo.LoadOwner: %v", err) - return "", fmt.Errorf("BaseRepo.LoadOwner: %w", err) + log.Error("%-v BaseRepo.LoadOwner: %v", pr, err) + return nil, nil, fmt.Errorf("%v BaseRepo.LoadOwner: %w", pr, err) } // Clone base repo. tmpBasePath, err := repo_module.CreateTemporaryPath("pull") if err != nil { - log.Error("CreateTemporaryPath: %v", err) - return "", err + log.Error("CreateTemporaryPath[%-v]: %v", pr, err) + return nil, nil, err + } + prCtx = &prContext{ + Context: ctx, + tmpBasePath: tmpBasePath, + pr: pr, + outbuf: &strings.Builder{}, + errbuf: &strings.Builder{}, + } + cancel = func() { + if err := repo_module.RemoveTemporaryPath(tmpBasePath); err != nil { + log.Error("Error whilst removing removing temporary repo for %-v: %v", pr, err) + } } baseRepoPath := pr.BaseRepo.RepoPath() headRepoPath := pr.HeadRepo.RepoPath() if err := git.InitRepository(ctx, tmpBasePath, false); err != nil { - log.Error("git init tmpBasePath: %v", err) - if err := repo_module.RemoveTemporaryPath(tmpBasePath); err != nil { - log.Error("CreateTempRepo: RemoveTemporaryPath: %s", err) - } - return "", err + log.Error("Unable to init tmpBasePath for %-v: %v", pr, err) + cancel() + return nil, nil, err } remoteRepoName := "head_repo" @@ -73,99 +109,63 @@ func createTemporaryRepo(ctx context.Context, pr *issues_model.PullRequest) (str fetchArgs = append(fetchArgs, "--no-write-commit-graph") } - // Add head repo remote. - addCacheRepo := func(staging, cache string) error { - p := filepath.Join(staging, ".git", "objects", "info", "alternates") + // addCacheRepo adds git alternatives for the cacheRepoPath in the repoPath + addCacheRepo := func(repoPath, cacheRepoPath string) error { + p := filepath.Join(repoPath, ".git", "objects", "info", "alternates") f, err := os.OpenFile(p, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0o600) if err != nil { - log.Error("Could not create .git/objects/info/alternates file in %s: %v", staging, err) + log.Error("Could not create .git/objects/info/alternates file in %s: %v", repoPath, err) return err } defer f.Close() - data := filepath.Join(cache, "objects") + data := filepath.Join(cacheRepoPath, "objects") if _, err := fmt.Fprintln(f, data); err != nil { - log.Error("Could not write to .git/objects/info/alternates file in %s: %v", staging, err) + log.Error("Could not write to .git/objects/info/alternates file in %s: %v", repoPath, err) return err } return nil } + // Add head repo remote. if err := addCacheRepo(tmpBasePath, baseRepoPath); err != nil { - log.Error("Unable to add base repository to temporary repo [%s -> %s]: %v", pr.BaseRepo.FullName(), tmpBasePath, err) - if err := repo_module.RemoveTemporaryPath(tmpBasePath); err != nil { - log.Error("CreateTempRepo: RemoveTemporaryPath: %s", err) - } - return "", fmt.Errorf("Unable to add base repository to temporary repo [%s -> tmpBasePath]: %w", pr.BaseRepo.FullName(), err) + log.Error("%-v Unable to add base repository to temporary repo [%s -> %s]: %v", pr, pr.BaseRepo.FullName(), tmpBasePath, err) + cancel() + return nil, nil, fmt.Errorf("Unable to add base repository to temporary repo [%s -> tmpBasePath]: %w", pr.BaseRepo.FullName(), err) } - var outbuf, errbuf strings.Builder if err := git.NewCommand(ctx, "remote", "add", "-t").AddDynamicArguments(pr.BaseBranch).AddArguments("-m").AddDynamicArguments(pr.BaseBranch).AddDynamicArguments("origin", baseRepoPath). - Run(&git.RunOpts{ - Dir: tmpBasePath, - Stdout: &outbuf, - Stderr: &errbuf, - }); err != nil { - log.Error("Unable to add base repository as origin [%s -> %s]: %v\n%s\n%s", pr.BaseRepo.FullName(), tmpBasePath, err, outbuf.String(), errbuf.String()) - if err := repo_module.RemoveTemporaryPath(tmpBasePath); err != nil { - log.Error("CreateTempRepo: RemoveTemporaryPath: %s", err) - } - return "", fmt.Errorf("Unable to add base repository as origin [%s -> tmpBasePath]: %w\n%s\n%s", pr.BaseRepo.FullName(), err, outbuf.String(), errbuf.String()) + Run(prCtx.RunOpts()); err != nil { + log.Error("%-v Unable to add base repository as origin [%s -> %s]: %v\n%s\n%s", pr, pr.BaseRepo.FullName(), tmpBasePath, err, prCtx.outbuf.String(), prCtx.errbuf.String()) + cancel() + return nil, nil, fmt.Errorf("Unable to add base repository as origin [%s -> tmpBasePath]: %w\n%s\n%s", pr.BaseRepo.FullName(), err, prCtx.outbuf.String(), prCtx.errbuf.String()) } - outbuf.Reset() - errbuf.Reset() if err := git.NewCommand(ctx, "fetch", "origin").AddArguments(fetchArgs...).AddDashesAndList(pr.BaseBranch+":"+baseBranch, pr.BaseBranch+":original_"+baseBranch). - Run(&git.RunOpts{ - Dir: tmpBasePath, - Stdout: &outbuf, - Stderr: &errbuf, - }); err != nil { - log.Error("Unable to fetch origin base branch [%s:%s -> base, original_base in %s]: %v:\n%s\n%s", pr.BaseRepo.FullName(), pr.BaseBranch, tmpBasePath, err, outbuf.String(), errbuf.String()) - if err := repo_module.RemoveTemporaryPath(tmpBasePath); err != nil { - log.Error("CreateTempRepo: RemoveTemporaryPath: %s", err) - } - return "", fmt.Errorf("Unable to fetch origin base branch [%s:%s -> base, original_base in tmpBasePath]: %w\n%s\n%s", pr.BaseRepo.FullName(), pr.BaseBranch, err, outbuf.String(), errbuf.String()) + Run(prCtx.RunOpts()); err != nil { + log.Error("%-v Unable to fetch origin base branch [%s:%s -> base, original_base in %s]: %v:\n%s\n%s", pr, pr.BaseRepo.FullName(), pr.BaseBranch, tmpBasePath, err, prCtx.outbuf.String(), prCtx.errbuf.String()) + cancel() + return nil, nil, fmt.Errorf("Unable to fetch origin base branch [%s:%s -> base, original_base in tmpBasePath]: %w\n%s\n%s", pr.BaseRepo.FullName(), pr.BaseBranch, err, prCtx.outbuf.String(), prCtx.errbuf.String()) } - outbuf.Reset() - errbuf.Reset() if err := git.NewCommand(ctx, "symbolic-ref").AddDynamicArguments("HEAD", git.BranchPrefix+baseBranch). - Run(&git.RunOpts{ - Dir: tmpBasePath, - Stdout: &outbuf, - Stderr: &errbuf, - }); err != nil { - log.Error("Unable to set HEAD as base branch [%s]: %v\n%s\n%s", tmpBasePath, err, outbuf.String(), errbuf.String()) - if err := repo_module.RemoveTemporaryPath(tmpBasePath); err != nil { - log.Error("CreateTempRepo: RemoveTemporaryPath: %s", err) - } - return "", fmt.Errorf("Unable to set HEAD as base branch [tmpBasePath]: %w\n%s\n%s", err, outbuf.String(), errbuf.String()) + Run(prCtx.RunOpts()); err != nil { + log.Error("%-v Unable to set HEAD as base branch in [%s]: %v\n%s\n%s", pr, tmpBasePath, err, prCtx.outbuf.String(), prCtx.errbuf.String()) + cancel() + return nil, nil, fmt.Errorf("Unable to set HEAD as base branch in tmpBasePath: %w\n%s\n%s", err, prCtx.outbuf.String(), prCtx.errbuf.String()) } - outbuf.Reset() - errbuf.Reset() if err := addCacheRepo(tmpBasePath, headRepoPath); err != nil { - log.Error("Unable to add head repository to temporary repo [%s -> %s]: %v", pr.HeadRepo.FullName(), tmpBasePath, err) - if err := repo_module.RemoveTemporaryPath(tmpBasePath); err != nil { - log.Error("CreateTempRepo: RemoveTemporaryPath: %s", err) - } - return "", fmt.Errorf("Unable to head base repository to temporary repo [%s -> tmpBasePath]: %w", pr.HeadRepo.FullName(), err) + log.Error("%-v Unable to add head repository to temporary repo [%s -> %s]: %v", pr, pr.HeadRepo.FullName(), tmpBasePath, err) + cancel() + return nil, nil, fmt.Errorf("Unable to add head base repository to temporary repo [%s -> tmpBasePath]: %w", pr.HeadRepo.FullName(), err) } if err := git.NewCommand(ctx, "remote", "add").AddDynamicArguments(remoteRepoName, headRepoPath). - Run(&git.RunOpts{ - Dir: tmpBasePath, - Stdout: &outbuf, - Stderr: &errbuf, - }); err != nil { - log.Error("Unable to add head repository as head_repo [%s -> %s]: %v\n%s\n%s", pr.HeadRepo.FullName(), tmpBasePath, err, outbuf.String(), errbuf.String()) - if err := repo_module.RemoveTemporaryPath(tmpBasePath); err != nil { - log.Error("CreateTempRepo: RemoveTemporaryPath: %s", err) - } - return "", fmt.Errorf("Unable to add head repository as head_repo [%s -> tmpBasePath]: %w\n%s\n%s", pr.HeadRepo.FullName(), err, outbuf.String(), errbuf.String()) + Run(prCtx.RunOpts()); err != nil { + log.Error("%-v Unable to add head repository as head_repo [%s -> %s]: %v\n%s\n%s", pr, pr.HeadRepo.FullName(), tmpBasePath, err, prCtx.outbuf.String(), prCtx.errbuf.String()) + cancel() + return nil, nil, fmt.Errorf("Unable to add head repository as head_repo [%s -> tmpBasePath]: %w\n%s\n%s", pr.HeadRepo.FullName(), err, prCtx.outbuf.String(), prCtx.errbuf.String()) } - outbuf.Reset() - errbuf.Reset() trackingBranch := "tracking" // Fetch head branch @@ -178,24 +178,18 @@ func createTemporaryRepo(ctx context.Context, pr *issues_model.PullRequest) (str headBranch = pr.GetGitRefName() } if err := git.NewCommand(ctx, "fetch").AddArguments(fetchArgs...).AddDynamicArguments(remoteRepoName, headBranch+":"+trackingBranch). - Run(&git.RunOpts{ - Dir: tmpBasePath, - Stdout: &outbuf, - Stderr: &errbuf, - }); err != nil { - if err := repo_module.RemoveTemporaryPath(tmpBasePath); err != nil { - log.Error("CreateTempRepo: RemoveTemporaryPath: %s", err) - } + Run(prCtx.RunOpts()); err != nil { + cancel() if !git.IsBranchExist(ctx, pr.HeadRepo.RepoPath(), pr.HeadBranch) { - return "", models.ErrBranchDoesNotExist{ + return nil, nil, models.ErrBranchDoesNotExist{ BranchName: pr.HeadBranch, } } - log.Error("Unable to fetch head_repo head branch [%s:%s -> tracking in %s]: %v:\n%s\n%s", pr.HeadRepo.FullName(), pr.HeadBranch, tmpBasePath, err, outbuf.String(), errbuf.String()) - return "", fmt.Errorf("Unable to fetch head_repo head branch [%s:%s -> tracking in tmpBasePath]: %w\n%s\n%s", pr.HeadRepo.FullName(), headBranch, err, outbuf.String(), errbuf.String()) + log.Error("%-v Unable to fetch head_repo head branch [%s:%s -> tracking in %s]: %v:\n%s\n%s", pr, pr.HeadRepo.FullName(), pr.HeadBranch, tmpBasePath, err, prCtx.outbuf.String(), prCtx.errbuf.String()) + return nil, nil, fmt.Errorf("Unable to fetch head_repo head branch [%s:%s -> tracking in tmpBasePath]: %w\n%s\n%s", pr.HeadRepo.FullName(), headBranch, err, prCtx.outbuf.String(), prCtx.errbuf.String()) } - outbuf.Reset() - errbuf.Reset() + prCtx.outbuf.Reset() + prCtx.errbuf.Reset() - return tmpBasePath, nil + return prCtx, cancel, nil } diff --git a/services/pull/update.go b/services/pull/update.go index b9525cf0c980..b977dbdba9fe 100644 --- a/services/pull/update.go +++ b/services/pull/update.go @@ -16,61 +16,67 @@ import ( user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" - repo_module "code.gitea.io/gitea/modules/repository" ) // Update updates pull request with base branch. -func Update(ctx context.Context, pull *issues_model.PullRequest, doer *user_model.User, message string, rebase bool) error { - var ( - pr *issues_model.PullRequest - style repo_model.MergeStyle - ) +func Update(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.User, message string, rebase bool) error { + if pr.Flow == issues_model.PullRequestFlowAGit { + // TODO: update of agit flow pull request's head branch is unsupported + return fmt.Errorf("update of agit flow pull request's head branch is unsupported") + } - pullWorkingPool.CheckIn(fmt.Sprint(pull.ID)) - defer pullWorkingPool.CheckOut(fmt.Sprint(pull.ID)) + pullWorkingPool.CheckIn(fmt.Sprint(pr.ID)) + defer pullWorkingPool.CheckOut(fmt.Sprint(pr.ID)) - if rebase { - pr = pull - style = repo_model.MergeStyleRebaseUpdate - } else { - // use merge functions but switch repo's and branch's - pr = &issues_model.PullRequest{ - HeadRepoID: pull.BaseRepoID, - BaseRepoID: pull.HeadRepoID, - HeadBranch: pull.BaseBranch, - BaseBranch: pull.HeadBranch, - } - style = repo_model.MergeStyleMerge + diffCount, err := GetDiverging(ctx, pr) + if err != nil { + return err + } else if diffCount.Behind == 0 { + return fmt.Errorf("HeadBranch of PR %d is up to date", pr.Index) } - if pull.Flow == issues_model.PullRequestFlowAGit { - // TODO: Not support update agit flow pull request's head branch - return fmt.Errorf("Not support update agit flow pull request's head branch") + if rebase { + defer func() { + go AddTestPullRequestTask(doer, pr.BaseRepo.ID, pr.BaseBranch, false, "", "") + }() + + return updateHeadByRebaseOnToBase(ctx, pr, doer, message) } + if err := pr.LoadBaseRepo(ctx); err != nil { + log.Error("unable to load BaseRepo for %-v during update-by-merge: %v", pr, err) + return fmt.Errorf("unable to load BaseRepo for PR[%d] during update-by-merge: %w", pr.ID, err) + } if err := pr.LoadHeadRepo(ctx); err != nil { - log.Error("LoadHeadRepo: %v", err) - return fmt.Errorf("LoadHeadRepo: %w", err) - } else if err = pr.LoadBaseRepo(ctx); err != nil { - log.Error("LoadBaseRepo: %v", err) - return fmt.Errorf("LoadBaseRepo: %w", err) + log.Error("unable to load HeadRepo for PR %-v during update-by-merge: %v", pr, err) + return fmt.Errorf("unable to load HeadRepo for PR[%d] during update-by-merge: %w", pr.ID, err) + } + if pr.HeadRepo == nil { + // LoadHeadRepo will swallow ErrRepoNotExist so if pr.HeadRepo is still nil recreate the error + err := repo_model.ErrRepoNotExist{ + ID: pr.HeadRepoID, + } + log.Error("unable to load HeadRepo for PR %-v during update-by-merge: %v", pr, err) + return fmt.Errorf("unable to load HeadRepo for PR[%d] during update-by-merge: %w", pr.ID, err) } - diffCount, err := GetDiverging(ctx, pull) - if err != nil { - return err - } else if diffCount.Behind == 0 { - return fmt.Errorf("HeadBranch of PR %d is up to date", pull.Index) + // use merge functions but switch repos and branches + reversePR := &issues_model.PullRequest{ + ID: pr.ID, + + HeadRepoID: pr.BaseRepoID, + HeadRepo: pr.BaseRepo, + HeadBranch: pr.BaseBranch, + + BaseRepoID: pr.HeadRepoID, + BaseRepo: pr.HeadRepo, + BaseBranch: pr.HeadBranch, } - _, err = rawMerge(ctx, pr, doer, style, "", message) + _, err = doMergeAndPush(ctx, reversePR, doer, repo_model.MergeStyleMerge, "", message) defer func() { - if rebase { - go AddTestPullRequestTask(doer, pr.BaseRepo.ID, pr.BaseBranch, false, "", "") - return - } - go AddTestPullRequestTask(doer, pr.HeadRepo.ID, pr.HeadBranch, false, "", "") + go AddTestPullRequestTask(doer, reversePR.HeadRepo.ID, reversePR.HeadBranch, false, "", "") }() return err @@ -159,27 +165,16 @@ func IsUserAllowedToUpdate(ctx context.Context, pull *issues_model.PullRequest, // GetDiverging determines how many commits a PR is ahead or behind the PR base branch func GetDiverging(ctx context.Context, pr *issues_model.PullRequest) (*git.DivergeObject, error) { - log.Trace("GetDiverging[%d]: compare commits", pr.ID) - if err := pr.LoadBaseRepo(ctx); err != nil { - return nil, err - } - if err := pr.LoadHeadRepo(ctx); err != nil { - return nil, err - } - - tmpRepo, err := createTemporaryRepo(ctx, pr) + log.Trace("GetDiverging[%-v]: compare commits", pr) + prCtx, cancel, err := createTemporaryRepoForPR(ctx, pr) if err != nil { if !models.IsErrBranchDoesNotExist(err) { - log.Error("CreateTemporaryRepo: %v", err) + log.Error("CreateTemporaryRepoForPR %-v: %v", pr, err) } return nil, err } - defer func() { - if err := repo_module.RemoveTemporaryPath(tmpRepo); err != nil { - log.Error("Merge: RemoveTemporaryPath: %s", err) - } - }() + defer cancel() - diff, err := git.GetDivergingCommits(ctx, tmpRepo, "base", "tracking") + diff, err := git.GetDivergingCommits(ctx, prCtx.tmpBasePath, baseBranch, trackingBranch) return &diff, err } diff --git a/services/pull/update_rebase.go b/services/pull/update_rebase.go new file mode 100644 index 000000000000..8e7bfa0ffd4c --- /dev/null +++ b/services/pull/update_rebase.go @@ -0,0 +1,107 @@ +// Copyright 2023 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package pull + +import ( + "context" + "fmt" + "strings" + + issues_model "code.gitea.io/gitea/models/issues" + repo_model "code.gitea.io/gitea/models/repo" + user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/git" + "code.gitea.io/gitea/modules/log" + repo_module "code.gitea.io/gitea/modules/repository" + "code.gitea.io/gitea/modules/setting" +) + +// updateHeadByRebaseOnToBase handles updating a PR's head branch by rebasing it on the PR current base branch +func updateHeadByRebaseOnToBase(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.User, message string) error { + // "Clone" base repo and add the cache headers for the head repo and branch + mergeCtx, cancel, err := createTemporaryRepoForMerge(ctx, pr, doer, "") + if err != nil { + return err + } + defer cancel() + + // Determine the old merge-base before the rebase - we use this for LFS push later on + oldMergeBase, _, _ := git.NewCommand(ctx, "merge-base").AddDashesAndList(baseBranch, trackingBranch).RunStdString(&git.RunOpts{Dir: mergeCtx.tmpBasePath}) + oldMergeBase = strings.TrimSpace(oldMergeBase) + + // Rebase the tracking branch on to the base as the staging branch + if err := rebaseTrackingOnToBase(mergeCtx, repo_model.MergeStyleRebaseUpdate); err != nil { + return err + } + + if setting.LFS.StartServer { + // Now we need to ensure that the head repository contains any LFS objects between the new base and the old mergebase + // It's questionable about where this should go - either after or before the push + // I think in the interests of data safety - failures to push to the lfs should prevent + // the push as you can always re-rebase. + if err := LFSPush(ctx, mergeCtx.tmpBasePath, baseBranch, oldMergeBase, &issues_model.PullRequest{ + HeadRepoID: pr.BaseRepoID, + BaseRepoID: pr.HeadRepoID, + }); err != nil { + log.Error("Unable to push lfs objects between %s and %s up to head branch in %-v: %v", baseBranch, oldMergeBase, pr, err) + return err + } + } + + // Now determine who the pushing author should be + var headUser *user_model.User + if err := pr.HeadRepo.LoadOwner(ctx); err != nil { + if !user_model.IsErrUserNotExist(err) { + log.Error("Can't find user: %d for head repository in %-v - %v", pr.HeadRepo.OwnerID, pr, err) + return err + } + log.Error("Can't find user: %d for head repository in %-v - defaulting to doer: %-v - %v", pr.HeadRepo.OwnerID, pr, doer, err) + headUser = doer + } else { + headUser = pr.HeadRepo.Owner + } + + pushCmd := git.NewCommand(ctx, "push", "-f", "head_repo"). + AddDynamicArguments(stagingBranch + ":" + git.BranchPrefix + pr.HeadBranch) + + // Push back to the head repository. + // TODO: this cause an api call to "/api/internal/hook/post-receive/...", + // that prevents us from doint the whole merge in one db transaction + mergeCtx.outbuf.Reset() + mergeCtx.errbuf.Reset() + + if err := pushCmd.Run(&git.RunOpts{ + Env: repo_module.FullPushingEnvironment( + headUser, + doer, + pr.HeadRepo, + pr.HeadRepo.Name, + pr.ID, + ), + Dir: mergeCtx.tmpBasePath, + Stdout: mergeCtx.outbuf, + Stderr: mergeCtx.errbuf, + }); err != nil { + if strings.Contains(mergeCtx.errbuf.String(), "non-fast-forward") { + return &git.ErrPushOutOfDate{ + StdOut: mergeCtx.outbuf.String(), + StdErr: mergeCtx.errbuf.String(), + Err: err, + } + } else if strings.Contains(mergeCtx.errbuf.String(), "! [remote rejected]") { + err := &git.ErrPushRejected{ + StdOut: mergeCtx.outbuf.String(), + StdErr: mergeCtx.errbuf.String(), + Err: err, + } + err.GenerateMessage() + return err + } + return fmt.Errorf("git push: %s", mergeCtx.errbuf.String()) + } + mergeCtx.outbuf.Reset() + mergeCtx.errbuf.Reset() + + return nil +} From 43cf04c031e32fa63de861382e1cb4677b0aa50e Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 10 Mar 2023 06:45:07 -0500 Subject: [PATCH 074/340] Fix broken Chroma CSS styles (#23174) (#23402) Backport #23174 The CSS styles in Gitea themes are out-of-sync of Chroma's styles. This PR introduces a `chroma-style-diff.go` tool to compare the diff. The missing CSS styles have been added manually. They are left as empty to reduce arguments because there was no color for them before. And this PR fixes #22348, with just 2 lines changed: `.chroma .kt & .n`, these colors are taken from GitHub. It's good enough for #22348 ![image](https://user-images.githubusercontent.com/2114189/221551941-0d27d11d-e71e-498f-8e88-92b558fe4a18.png) Co-authored-by: wxiaoguang Co-authored-by: silverwind --- .stylelintrc.yaml | 6 ++ web_src/less/chroma/chroma-style-diff.go | 79 ++++++++++++++++++++++++ web_src/less/chroma/dark.less | 14 +++-- web_src/less/chroma/light.less | 13 +++- web_src/less/themes/theme-arc-green.less | 1 + 5 files changed, 105 insertions(+), 8 deletions(-) create mode 100644 web_src/less/chroma/chroma-style-diff.go diff --git a/.stylelintrc.yaml b/.stylelintrc.yaml index ca0f16b07b6c..c488d0677f18 100644 --- a/.stylelintrc.yaml +++ b/.stylelintrc.yaml @@ -1,12 +1,18 @@ plugins: - stylelint-declaration-strict-value +ignoreFiles: + - "**/*.go" + overrides: - files: ["**/*.less"] customSyntax: postcss-less - files: ["**/chroma/*", "**/codemirror/*", "**/standalone/*", "**/console/*"] rules: scale-unlimited/declaration-strict-value: null + - files: ["**/chroma/*", "**/codemirror/*"] + rules: + block-no-empty: null rules: alpha-value-notation: null diff --git a/web_src/less/chroma/chroma-style-diff.go b/web_src/less/chroma/chroma-style-diff.go new file mode 100644 index 000000000000..424325968955 --- /dev/null +++ b/web_src/less/chroma/chroma-style-diff.go @@ -0,0 +1,79 @@ +// Copyright 2023 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +//go:build ignore + +/* +This tool is used to compare the CSS names in a chroma builtin styles with the Gitea theme CSS names. + +It outputs the difference between the two sets of CSS names, eg: + +``` +CSS names not in builtin: +.chroma .ln +---- +Builtin CSS names not in file: +.chroma .vm +``` + +Developers could use this tool to re-sync the CSS names in the Gitea theme. +*/ + +package main + +import ( + "os" + "regexp" + "strings" + + "github.com/alecthomas/chroma/v2" +) + +func main() { + if len(os.Args) != 2 { + println("Usage: chroma-style-diff css-or-less-file") + os.Exit(1) + } + + data, err := os.ReadFile(os.Args[1]) + if err != nil { + println(err.Error()) + os.Exit(1) + } + + content := string(data) + + // a simple CSS parser to collect CSS names + content = regexp.MustCompile("//.*\r?\n").ReplaceAllString(content, "\n") + content = regexp.MustCompile("/\\*.*?\\*/").ReplaceAllString(content, "") + matches := regexp.MustCompile("\\s*([-.#:\\w\\s]+)\\s*\\{[^}]*}").FindAllStringSubmatch(content, -1) + + cssNames := map[string]bool{} + for _, matchGroup := range matches { + cssName := strings.TrimSpace(matchGroup[1]) + cssNames[cssName] = true + } + + // collect Chroma builtin CSS names + builtin := map[string]bool{} + for tokenType, cssName := range chroma.StandardTypes { + if tokenType > 0 && cssName != "" { + builtin[".chroma ."+cssName] = true + } + } + + // show the diff + println("CSS names not in builtin:") + for cssName := range cssNames { + if !builtin[cssName] { + println(cssName) + } + } + println("----") + println("Builtin CSS names not in file:") + for cssName := range builtin { + if !cssNames[cssName] { + println(cssName) + } + } +} diff --git a/web_src/less/chroma/dark.less b/web_src/less/chroma/dark.less index 4be9cf7912e0..1b0c722a164c 100644 --- a/web_src/less/chroma/dark.less +++ b/web_src/less/chroma/dark.less @@ -7,17 +7,19 @@ .chroma .cpf { color: #649bc4; } /* CommentPreprocFile */ .chroma .cs { color: #9075cd; } /* CommentSpecial */ .chroma .dl { color: #649bc4; } /* LiteralStringDelimiter */ +.chroma .fm {} /* NameFunctionMagic */ +.chroma .g {} /* Generic */ .chroma .gd { color: #ffffff; background-color: #5f3737; } /* GenericDeleted */ .chroma .ge { color: #ddee30; } /* GenericEmph */ .chroma .gh { color: #ffaa10; } /* GenericHeading */ .chroma .gi { color: #ffffff; background-color: #3a523a; } /* GenericInserted */ +.chroma .gl {} /* GenericUnderline */ .chroma .go { color: #777e94; } /* GenericOutput */ .chroma .gp { color: #ebdbb2; } /* GenericPrompt */ .chroma .gr { color: #ff4433; } /* GenericError */ .chroma .gs { color: #ebdbb2; } /* GenericStrong */ .chroma .gt { color: #ff7540; } /* GenericTraceback */ .chroma .gu { color: #b8bb26; } /* GenericSubheading */ -.chroma .hl { background-color: #3f424d; } /* LineHighlight */ .chroma .il { color: #649bc4; } /* LiteralNumberIntegerLong */ .chroma .k { color: #ff7540; } /* Keyword */ .chroma .kc { color: #649bc4; } /* KeywordConstant */ @@ -25,16 +27,16 @@ .chroma .kn { color: #ffaa10; } /* KeywordNamespace */ .chroma .kp { color: #5f8700; } /* KeywordPseudo */ .chroma .kr { color: #ff7540; } /* KeywordReserved */ -.chroma .kt { color: #fabd2f; } /* KeywordType */ -.chroma .ln { color: #7f8699; } /* LineNumbers */ -.chroma .lnt { color: #7f8699; } /* LineNumbersTable */ +.chroma .kt { color: #ff7b72; } /* KeywordType */ +.chroma .l {} /* Literal */ +.chroma .ld {} /* LiteralDate */ .chroma .m { color: #649bc4; } /* LiteralNumber */ .chroma .mb { color: #649bc4; } /* LiteralNumberBin */ .chroma .mf { color: #649bc4; } /* LiteralNumberFloat */ .chroma .mh { color: #649bc4; } /* LiteralNumberHex */ .chroma .mi { color: #649bc4; } /* LiteralNumberInteger */ .chroma .mo { color: #649bc4; } /* LiteralNumberOct */ -.chroma .n { color: #fabd2f; } /* Name */ +.chroma .n { color: #c9d1d9; } /* Name */ .chroma .na { color: #b8bb26; } /* NameAttribute */ .chroma .nb { color: #fabd2f; } /* NameBuiltin */ .chroma .nc { color: #ffaa10; } /* NameClass */ @@ -51,6 +53,7 @@ .chroma .o { color: #ff7540; } /* Operator */ .chroma .ow { color: #5f8700; } /* OperatorWord */ .chroma .p { color: #d2d4db; } /* Punctuation */ +.chroma .py {} /* NameProperty */ .chroma .s { color: #b8bb26; } /* LiteralString */ .chroma .s1 { color: #b8bb26; } /* LiteralStringSingle */ .chroma .s2 { color: #b8bb26; } /* LiteralStringDouble */ @@ -67,4 +70,5 @@ .chroma .vc { color: #ff7540; } /* NameVariableClass */ .chroma .vg { color: #ffaa10; } /* NameVariableGlobal */ .chroma .vi { color: #ffaa10; } /* NameVariableInstance */ +.chroma .vm {} /* NameVariableMagic */ .chroma .w { color: #7f8699; } /* TextWhitespace */ diff --git a/web_src/less/chroma/light.less b/web_src/less/chroma/light.less index 2e811844c2dd..4bfce8fe7172 100644 --- a/web_src/less/chroma/light.less +++ b/web_src/less/chroma/light.less @@ -7,16 +7,19 @@ .chroma .cpf { color: #4c4dbc; } /* CommentPreprocFile */ .chroma .cs { color: #999999; } /* CommentSpecial */ .chroma .dl { color: #106303; } /* LiteralStringDelimiter */ +.chroma .fm {} /* NameFunctionMagic */ +.chroma .g {} /* Generic */ .chroma .gd { color: #000000; background-color: #ffdddd; } /* GenericDeleted */ .chroma .ge { color: #000000; } /* GenericEmph */ .chroma .gh { color: #999999; } /* GenericHeading */ .chroma .gi { color: #000000; background-color: #ddffdd; } /* GenericInserted */ +.chroma .gl {} /* GenericUnderline */ .chroma .go { color: #888888; } /* GenericOutput */ .chroma .gp { color: #555555; } /* GenericPrompt */ .chroma .gr { color: #aa0000; } /* GenericError */ +.chroma .gs {} /* GenericStrong */ .chroma .gt { color: #aa0000; } /* GenericTraceback */ .chroma .gu { color: #aaaaaa; } /* GenericSubheading */ -.chroma .hl { background-color: #e5e5e5; } /* LineHighlight */ .chroma .il { color: #009999; } /* LiteralNumberIntegerLong */ .chroma .k { color: #d73a49; } /* Keyword */ .chroma .kc { color: #d73a49; } /* KeywordConstant */ @@ -25,14 +28,15 @@ .chroma .kp { color: #d73a49; } /* KeywordPseudo */ .chroma .kr { color: #d73a49; } /* KeywordReserved */ .chroma .kt { color: #445588; } /* KeywordType */ -.chroma .ln { color: #7f7f7f; } /* LineNumbers */ -.chroma .lnt { color: #7f7f7f; } /* LineNumbersTable */ +.chroma .l {} /* Literal */ +.chroma .ld {} /* LiteralDate */ .chroma .m { color: #009999; } /* LiteralNumber */ .chroma .mb { color: #009999; } /* LiteralNumberBin */ .chroma .mf { color: #009999; } /* LiteralNumberFloat */ .chroma .mh { color: #009999; } /* LiteralNumberHex */ .chroma .mi { color: #009999; } /* LiteralNumberInteger */ .chroma .mo { color: #009999; } /* LiteralNumberOct */ +.chroma .n {} /* Name */ .chroma .na { color: #d73a49; } /* NameAttribute */ .chroma .nb { color: #005cc5; } /* NameBuiltin */ .chroma .nc { color: #445588; } /* NameClass */ @@ -48,6 +52,8 @@ .chroma .nx { color: #24292e; } /* NameOther */ .chroma .o { color: #d73a49; } /* Operator */ .chroma .ow { color: #d73a49; } /* OperatorWord */ +.chroma .p {} /* Punctuation */ +.chroma .py {} /* NameProperty */ .chroma .s { color: #106303; } /* LiteralString */ .chroma .s1 { color: #cc7a00; } /* LiteralStringSingle */ .chroma .s2 { color: #106303; } /* LiteralStringDouble */ @@ -64,4 +70,5 @@ .chroma .vc { color: #008080; } /* NameVariableClass */ .chroma .vg { color: #008080; } /* NameVariableGlobal */ .chroma .vi { color: #008080; } /* NameVariableInstance */ +.chroma .vm {} /* NameVariableMagic */ .chroma .w { color: #bbbbbb; } /* TextWhitespace */ diff --git a/web_src/less/themes/theme-arc-green.less b/web_src/less/themes/theme-arc-green.less index 2f06f33aca70..17b8f9bae034 100644 --- a/web_src/less/themes/theme-arc-green.less +++ b/web_src/less/themes/theme-arc-green.less @@ -1,3 +1,4 @@ +@import "../chroma/base.less"; @import "../chroma/dark.less"; @import "../codemirror/dark.less"; From edb618c136acfba84b34b9afc12245c078323d2b Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 10 Mar 2023 09:29:28 -0500 Subject: [PATCH 075/340] Handle OpenID discovery URL errors a little nicer when creating/editing sources (#23397) (#23403) Backport #23397 When there is an error creating a new openIDConnect authentication source try to handle the error a little better. Close #23283 Signed-off-by: Andrew Thornton Co-authored-by: zeripath --- cmd/admin.go | 11 ++++++++- options/locale/locale_en-US.ini | 2 ++ routers/web/admin/auths.go | 23 +++++++++++++++++++ .../auth/source/oauth2/source_register.go | 4 ++++ templates/admin/auth/source/oauth.tmpl | 2 +- 5 files changed, 40 insertions(+), 2 deletions(-) diff --git a/cmd/admin.go b/cmd/admin.go index b913b817bdc5..f9fb1b6c68f0 100644 --- a/cmd/admin.go +++ b/cmd/admin.go @@ -7,6 +7,7 @@ package cmd import ( "errors" "fmt" + "net/url" "os" "strings" "text/tabwriter" @@ -469,11 +470,19 @@ func runAddOauth(c *cli.Context) error { return err } + config := parseOAuth2Config(c) + if config.Provider == "openidConnect" { + discoveryURL, err := url.Parse(config.OpenIDConnectAutoDiscoveryURL) + if err != nil || (discoveryURL.Scheme != "http" && discoveryURL.Scheme != "https") { + return fmt.Errorf("invalid Auto Discovery URL: %s (this must be a valid URL starting with http:// or https://)", config.OpenIDConnectAutoDiscoveryURL) + } + } + return auth_model.CreateSource(&auth_model.Source{ Type: auth_model.OAuth2, Name: c.String("name"), IsActive: true, - Cfg: parseOAuth2Config(c), + Cfg: config, }) } diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index b2fb837bf02f..f0db595496db 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2806,6 +2806,8 @@ auths.still_in_used = The authentication source is still in use. Convert or dele auths.deletion_success = The authentication source has been deleted. auths.login_source_exist = The authentication source '%s' already exists. auths.login_source_of_type_exist = An authentication source of this type already exists. +auths.unable_to_initialize_openid = Unable to initialize OpenID Connect Provider: %s +auths.invalid_openIdConnectAutoDiscoveryURL = Invalid Auto Discovery URL (this must be a valid URL starting with http:// or https://) config.server_config = Server Configuration config.app_name = Site Title diff --git a/routers/web/admin/auths.go b/routers/web/admin/auths.go index 8ce45720fec3..d2953f753d7a 100644 --- a/routers/web/admin/auths.go +++ b/routers/web/admin/auths.go @@ -271,6 +271,15 @@ func NewAuthSourcePost(ctx *context.Context) { } case auth.OAuth2: config = parseOAuth2Config(form) + oauth2Config := config.(*oauth2.Source) + if oauth2Config.Provider == "openidConnect" { + discoveryURL, err := url.Parse(oauth2Config.OpenIDConnectAutoDiscoveryURL) + if err != nil || (discoveryURL.Scheme != "http" && discoveryURL.Scheme != "https") { + ctx.Data["Err_DiscoveryURL"] = true + ctx.RenderWithErr(ctx.Tr("admin.auths.invalid_openIdConnectAutoDiscoveryURL"), tplAuthNew, form) + return + } + } case auth.SSPI: var err error config, err = parseSSPIConfig(ctx, form) @@ -305,6 +314,10 @@ func NewAuthSourcePost(ctx *context.Context) { if auth.IsErrSourceAlreadyExist(err) { ctx.Data["Err_Name"] = true ctx.RenderWithErr(ctx.Tr("admin.auths.login_source_exist", err.(auth.ErrSourceAlreadyExist).Name), tplAuthNew, form) + } else if oauth2.IsErrOpenIDConnectInitialize(err) { + ctx.Data["Err_DiscoveryURL"] = true + unwrapped := err.(oauth2.ErrOpenIDConnectInitialize).Unwrap() + ctx.RenderWithErr(ctx.Tr("admin.auths.unable_to_initialize_openid", unwrapped), tplAuthNew, form) } else { ctx.ServerError("auth.CreateSource", err) } @@ -389,6 +402,15 @@ func EditAuthSourcePost(ctx *context.Context) { } case auth.OAuth2: config = parseOAuth2Config(form) + oauth2Config := config.(*oauth2.Source) + if oauth2Config.Provider == "openidConnect" { + discoveryURL, err := url.Parse(oauth2Config.OpenIDConnectAutoDiscoveryURL) + if err != nil || (discoveryURL.Scheme != "http" && discoveryURL.Scheme != "https") { + ctx.Data["Err_DiscoveryURL"] = true + ctx.RenderWithErr(ctx.Tr("admin.auths.invalid_openIdConnectAutoDiscoveryURL"), tplAuthEdit, form) + return + } + } case auth.SSPI: config, err = parseSSPIConfig(ctx, form) if err != nil { @@ -408,6 +430,7 @@ func EditAuthSourcePost(ctx *context.Context) { if err := auth.UpdateSource(source); err != nil { if oauth2.IsErrOpenIDConnectInitialize(err) { ctx.Flash.Error(err.Error(), true) + ctx.Data["Err_DiscoveryURL"] = true ctx.HTML(http.StatusOK, tplAuthEdit) } else { ctx.ServerError("UpdateSource", err) diff --git a/services/auth/source/oauth2/source_register.go b/services/auth/source/oauth2/source_register.go index 3527d54b65c5..82a36acaa67d 100644 --- a/services/auth/source/oauth2/source_register.go +++ b/services/auth/source/oauth2/source_register.go @@ -36,6 +36,10 @@ func (err ErrOpenIDConnectInitialize) Error() string { return fmt.Sprintf("Failed to initialize OpenID Connect Provider with name '%s' with url '%s': %v", err.ProviderName, err.OpenIDConnectAutoDiscoveryURL, err.Cause) } +func (err ErrOpenIDConnectInitialize) Unwrap() error { + return err.Cause +} + // wrapOpenIDConnectInitializeError is used to wrap the error but this cannot be done in modules/auth/oauth2 // inside oauth2: import cycle not allowed models -> modules/auth/oauth2 -> models func wrapOpenIDConnectInitializeError(err error, providerName string, source *Source) error { diff --git a/templates/admin/auth/source/oauth.tmpl b/templates/admin/auth/source/oauth.tmpl index b7ee00822f52..1080937f9134 100644 --- a/templates/admin/auth/source/oauth.tmpl +++ b/templates/admin/auth/source/oauth.tmpl @@ -24,7 +24,7 @@
    -
    +
    From e259daeff85f70ab1744efbbf28fcfcd21e2ac3b Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 10 Mar 2023 11:08:28 -0500 Subject: [PATCH 076/340] Add missing tabs to org projects page (#22705) (#23412) Backport #22705 by @yp05327 Fixes https://github.com/go-gitea/gitea/issues/22676 Context Data `IsOrganizationMember` and `IsOrganizationOwner` is used to control the visibility of `people` and `team` tab. https://github.com/go-gitea/gitea/blob/2871ea08096cba15546f357d0ec473734ee9d8be/templates/org/menu.tmpl#L19-L40 And because of the reuse of user projects page, User Context is changed to Organization Context. But the value of `IsOrganizationMember` and `IsOrganizationOwner` are not being given. I reused func `HandleOrgAssignment` to add them to the ctx, but may have some unnecessary variables, idk whether it is ok. I found there is a missing `PageIsViewProjects` at create project page. Co-authored-by: yp05327 <576951401@qq.com> --- models/organization/org.go | 26 ++++++++++ models/user/user.go | 5 ++ modules/context/org.go | 78 ++++++++++++++++------------- routers/web/org/home.go | 1 + routers/web/org/projects.go | 1 + routers/web/shared/user/header.go | 2 + routers/web/user/code.go | 1 + routers/web/user/profile.go | 1 + routers/web/web.go | 40 +++++++++------ services/context/user.go | 9 ---- templates/org/menu.tmpl | 8 +-- templates/user/overview/header.tmpl | 6 ++- 12 files changed, 115 insertions(+), 63 deletions(-) diff --git a/models/organization/org.go b/models/organization/org.go index f05027be729d..269b3e83288d 100644 --- a/models/organization/org.go +++ b/models/organization/org.go @@ -239,6 +239,32 @@ func (org *Organization) CustomAvatarRelativePath() string { return org.Avatar } +// UnitPermission returns unit permission +func (org *Organization) UnitPermission(ctx context.Context, doer *user_model.User, unitType unit.Type) perm.AccessMode { + if doer != nil { + teams, err := GetUserOrgTeams(ctx, org.ID, doer.ID) + if err != nil { + log.Error("GetUserOrgTeams: %v", err) + return perm.AccessModeNone + } + + if err := teams.LoadUnits(ctx); err != nil { + log.Error("LoadUnits: %v", err) + return perm.AccessModeNone + } + + if len(teams) > 0 { + return teams.UnitMaxAccess(unitType) + } + } + + if org.Visibility.IsPublic() { + return perm.AccessModeRead + } + + return perm.AccessModeNone +} + // CreateOrganization creates record of a new organization. func CreateOrganization(org *Organization, owner *user_model.User) (err error) { if !owner.CanCreateOrganization() { diff --git a/models/user/user.go b/models/user/user.go index f6fafe64f391..454779b9ea36 100644 --- a/models/user/user.go +++ b/models/user/user.go @@ -393,6 +393,11 @@ func (u *User) IsOrganization() bool { return u.Type == UserTypeOrganization } +// IsIndividual returns true if user is actually a individual user. +func (u *User) IsIndividual() bool { + return u.Type == UserTypeIndividual +} + // DisplayName returns full name if it's not empty, // returns username otherwise. func (u *User) DisplayName() string { diff --git a/modules/context/org.go b/modules/context/org.go index 0add7f2c0c3d..39a3038f910c 100644 --- a/modules/context/org.go +++ b/modules/context/org.go @@ -11,7 +11,6 @@ import ( "code.gitea.io/gitea/models/perm" "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/structs" ) @@ -31,29 +30,34 @@ type Organization struct { } func (org *Organization) CanWriteUnit(ctx *Context, unitType unit.Type) bool { - if ctx.Doer == nil { - return false - } - return org.UnitPermission(ctx, ctx.Doer.ID, unitType) >= perm.AccessModeWrite + return org.Organization.UnitPermission(ctx, ctx.Doer, unitType) >= perm.AccessModeWrite } -func (org *Organization) UnitPermission(ctx *Context, doerID int64, unitType unit.Type) perm.AccessMode { - if doerID > 0 { - teams, err := organization.GetUserOrgTeams(ctx, org.Organization.ID, doerID) - if err != nil { - log.Error("GetUserOrgTeams: %v", err) - return perm.AccessModeNone - } - if len(teams) > 0 { - return teams.UnitMaxAccess(unitType) - } - } +func (org *Organization) CanReadUnit(ctx *Context, unitType unit.Type) bool { + return org.Organization.UnitPermission(ctx, ctx.Doer, unitType) >= perm.AccessModeRead +} - if org.Organization.Visibility == structs.VisibleTypePublic { - return perm.AccessModeRead - } +func GetOrganizationByParams(ctx *Context) { + orgName := ctx.Params(":org") + + var err error - return perm.AccessModeNone + ctx.Org.Organization, err = organization.GetOrgByName(ctx, orgName) + if err != nil { + if organization.IsErrOrgNotExist(err) { + redirectUserID, err := user_model.LookupUserRedirect(orgName) + if err == nil { + RedirectToUser(ctx, orgName, redirectUserID) + } else if user_model.IsErrUserRedirectNotExist(err) { + ctx.NotFound("GetUserByName", err) + } else { + ctx.ServerError("LookupUserRedirect", err) + } + } else { + ctx.ServerError("GetUserByName", err) + } + return + } } // HandleOrgAssignment handles organization assignment @@ -77,25 +81,26 @@ func HandleOrgAssignment(ctx *Context, args ...bool) { requireTeamAdmin = args[3] } - orgName := ctx.Params(":org") - var err error - ctx.Org.Organization, err = organization.GetOrgByName(ctx, orgName) - if err != nil { - if organization.IsErrOrgNotExist(err) { - redirectUserID, err := user_model.LookupUserRedirect(orgName) - if err == nil { - RedirectToUser(ctx, orgName, redirectUserID) - } else if user_model.IsErrUserRedirectNotExist(err) { - ctx.NotFound("GetUserByName", err) - } else { - ctx.ServerError("LookupUserRedirect", err) + + if ctx.ContextUser == nil { + // if Organization is not defined, get it from params + if ctx.Org.Organization == nil { + GetOrganizationByParams(ctx) + if ctx.Written() { + return } - } else { - ctx.ServerError("GetUserByName", err) } + } else if ctx.ContextUser.IsOrganization() { + if ctx.Org == nil { + ctx.Org = &Organization{} + } + ctx.Org.Organization = (*organization.Organization)(ctx.ContextUser) + } else { + // ContextUser is an individual User return } + org := ctx.Org.Organization // Handle Visibility @@ -156,6 +161,7 @@ func HandleOrgAssignment(ctx *Context, args ...bool) { } ctx.Data["IsOrganizationOwner"] = ctx.Org.IsOwner ctx.Data["IsOrganizationMember"] = ctx.Org.IsMember + ctx.Data["IsProjectEnabled"] = true ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled ctx.Data["IsPublicMember"] = func(uid int64) bool { @@ -231,6 +237,10 @@ func HandleOrgAssignment(ctx *Context, args ...bool) { return } } + + ctx.Data["CanReadProjects"] = ctx.Org.CanReadUnit(ctx, unit.TypeProjects) + ctx.Data["CanReadPackages"] = ctx.Org.CanReadUnit(ctx, unit.TypePackages) + ctx.Data["CanReadCode"] = ctx.Org.CanReadUnit(ctx, unit.TypeCode) } // OrgAssignment returns a middleware to handle organization assignment diff --git a/routers/web/org/home.go b/routers/web/org/home.go index 4cc364acd3a0..8c9cc8a9d86b 100644 --- a/routers/web/org/home.go +++ b/routers/web/org/home.go @@ -156,6 +156,7 @@ func Home(ctx *context.Context) { pager.SetDefaultParams(ctx) pager.AddParam(ctx, "language", "Language") ctx.Data["Page"] = pager + ctx.Data["ContextUser"] = ctx.ContextUser ctx.HTML(http.StatusOK, tplOrgHome) } diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go index 30a58081f0ab..8db42689d852 100644 --- a/routers/web/org/projects.go +++ b/routers/web/org/projects.go @@ -123,6 +123,7 @@ func NewProject(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("repo.projects.new") ctx.Data["BoardTypes"] = project_model.GetBoardConfig() ctx.Data["CanWriteProjects"] = canWriteProjects(ctx) + ctx.Data["PageIsViewProjects"] = true ctx.Data["HomeLink"] = ctx.ContextUser.HomeLink() shared_user.RenderUserHeader(ctx) ctx.HTML(http.StatusOK, tplProjectsNew) diff --git a/routers/web/shared/user/header.go b/routers/web/shared/user/header.go index 94e59e2a490f..05e45f999eed 100644 --- a/routers/web/shared/user/header.go +++ b/routers/web/shared/user/header.go @@ -9,6 +9,8 @@ import ( ) func RenderUserHeader(ctx *context.Context) { + ctx.Data["IsProjectEnabled"] = true + ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled ctx.Data["ContextUser"] = ctx.ContextUser } diff --git a/routers/web/user/code.go b/routers/web/user/code.go index 81e3e65b4b67..b3adbcb8d3a8 100644 --- a/routers/web/user/code.go +++ b/routers/web/user/code.go @@ -24,6 +24,7 @@ func CodeSearch(ctx *context.Context) { return } + ctx.Data["IsProjectEnabled"] = true ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled ctx.Data["Title"] = ctx.Tr("explore.code") diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go index 4f0a816569bb..0a215e920344 100644 --- a/routers/web/user/profile.go +++ b/routers/web/user/profile.go @@ -288,6 +288,7 @@ func Profile(ctx *context.Context) { pager.AddParam(ctx, "language", "Language") } ctx.Data["Page"] = pager + ctx.Data["IsProjectEnabled"] = true ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled diff --git a/routers/web/web.go b/routers/web/web.go index 88e27ad67899..843d7b36b8d6 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -690,6 +690,21 @@ func RegisterRoutes(m *web.Route) { } } + reqUnitAccess := func(unitType unit.Type, accessMode perm.AccessMode) func(ctx *context.Context) { + return func(ctx *context.Context) { + if ctx.ContextUser == nil { + ctx.NotFound(unitType.String(), nil) + return + } + if ctx.ContextUser.IsOrganization() { + if ctx.Org.Organization.UnitPermission(ctx, ctx.Doer, unitType) < accessMode { + ctx.NotFound(unitType.String(), nil) + return + } + } + } + } + // ***** START: Organization ***** m.Group("/org", func() { m.Group("/{org}", func() { @@ -869,8 +884,10 @@ func RegisterRoutes(m *web.Route) { } m.Group("/projects", func() { - m.Get("", org.Projects) - m.Get("/{id}", org.ViewProject) + m.Group("", func() { + m.Get("", org.Projects) + m.Get("/{id}", org.ViewProject) + }, reqUnitAccess(unit.TypeProjects, perm.AccessModeRead)) m.Group("", func() { //nolint:dupl m.Get("/new", org.NewProject) m.Post("/new", web.Bind(forms.CreateProjectForm{}), org.NewProjectPost) @@ -890,25 +907,18 @@ func RegisterRoutes(m *web.Route) { m.Post("/move", org.MoveIssues) }) }) - }, reqSignIn, func(ctx *context.Context) { - if ctx.ContextUser == nil { - ctx.NotFound("NewProject", nil) - return - } - if ctx.ContextUser.IsOrganization() { - if !ctx.Org.CanWriteUnit(ctx, unit.TypeProjects) { - ctx.NotFound("NewProject", nil) - return - } - } else if ctx.ContextUser.ID != ctx.Doer.ID { + }, reqSignIn, reqUnitAccess(unit.TypeProjects, perm.AccessModeWrite), func(ctx *context.Context) { + if ctx.ContextUser.IsIndividual() && ctx.ContextUser.ID != ctx.Doer.ID { ctx.NotFound("NewProject", nil) return } }) }, repo.MustEnableProjects) - m.Get("/code", user.CodeSearch) - }, context_service.UserAssignmentWeb()) + m.Group("", func() { + m.Get("/code", user.CodeSearch) + }, reqUnitAccess(unit.TypeCode, perm.AccessModeRead)) + }, context_service.UserAssignmentWeb(), context.OrgAssignment()) // ***** Release Attachment Download without Signin m.Get("/{username}/{reponame}/releases/download/{vTag}/{fileName}", ignSignIn, context.RepoAssignment, repo.MustBeNotEmpty, repo.RedirectDownload) diff --git a/services/context/user.go b/services/context/user.go index 7642cba4e1f0..9dc84c3ac15e 100644 --- a/services/context/user.go +++ b/services/context/user.go @@ -8,7 +8,6 @@ import ( "net/http" "strings" - org_model "code.gitea.io/gitea/models/organization" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/context" ) @@ -57,14 +56,6 @@ func userAssignment(ctx *context.Context, errCb func(int, string, interface{})) } else { errCb(http.StatusInternalServerError, "GetUserByName", err) } - } else { - if ctx.ContextUser.IsOrganization() { - if ctx.Org == nil { - ctx.Org = &context.Organization{} - } - ctx.Org.Organization = (*org_model.Organization)(ctx.ContextUser) - ctx.Data["Org"] = ctx.Org.Organization - } } } } diff --git a/templates/org/menu.tmpl b/templates/org/menu.tmpl index 25f459c09c56..2a359d811134 100644 --- a/templates/org/menu.tmpl +++ b/templates/org/menu.tmpl @@ -3,16 +3,18 @@ {{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}} + {{if and .IsProjectEnabled .CanReadProjects}} {{svg "octicon-project-symlink"}} {{.locale.Tr "user.projects"}} - {{if .IsPackageEnabled}} + {{end}} + {{if and .IsPackageEnabled .CanReadPackages}} {{svg "octicon-package"}} {{.locale.Tr "packages.title"}} {{end}} - {{if .IsRepoIndexerEnabled}} - + {{if and .IsRepoIndexerEnabled .CanReadCode}} + {{svg "octicon-code"}} {{$.locale.Tr "org.code"}} {{end}} diff --git a/templates/user/overview/header.tmpl b/templates/user/overview/header.tmpl index ce9ecb46adbc..b4f7d6f90091 100644 --- a/templates/user/overview/header.tmpl +++ b/templates/user/overview/header.tmpl @@ -22,15 +22,17 @@ {{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}} + {{if and .IsProjectEnabled (or .ContextUser.IsIndividual (and .ContextUser.IsOrganization .CanReadProjects))}} {{svg "octicon-project-symlink"}} {{.locale.Tr "user.projects"}} - {{if (not .UnitPackagesGlobalDisabled)}} + {{end}} + {{if and .IsPackageEnabled (or .ContextUser.IsIndividual (and .ContextUser.IsOrganization .CanReadPackages))}} {{svg "octicon-package"}} {{.locale.Tr "packages.title"}} {{end}} - {{if .IsRepoIndexerEnabled}} + {{if and .IsRepoIndexerEnabled (or .ContextUser.IsIndividual (and .ContextUser.IsOrganization .CanReadCode))}} {{svg "octicon-code"}} {{.locale.Tr "user.code"}} From b301cb17a355e6f44e480f04f8ce89a7e43c58eb Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 10 Mar 2023 12:41:04 -0500 Subject: [PATCH 077/340] Fix and move "Use this template" button (#23398) (#23408) Backport #23398 Before: Screenshot 2023-03-09 at 23 21 25 After: Screenshot 2023-03-09 at 23 24 34 Co-authored-by: silverwind Co-authored-by: techknowlogick --- templates/repo/home.tmpl | 16 ++++++---------- web_src/less/_repository.less | 2 +- web_src/less/helpers.less | 21 +++++++++++++++++++++ 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 2a79c51ddf94..73afbd663db3 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -63,7 +63,7 @@ {{end}} {{template "repo/sub_menu" .}}
    -
    +
    {{template "repo/branch_dropdown" dict "root" .}} {{$n := len .TreeNames}} {{$l := Subtract $n 1}} @@ -99,20 +99,16 @@ {{svg "octicon-triangle-down" 14 "dropdown icon"}} {{end}} + {{if and (eq $n 0) (.Repository.IsTemplate)}} + + {{.locale.Tr "repo.use_template"}} + + {{end}} {{if ne $n 0}} {{EllipsisString .Repository.Name 30}}{{range $i, $v := .TreeNames}}/{{if eq $i $l}}{{EllipsisString $v 30}}{{else}}{{$p := index $.Paths $i}}{{EllipsisString $v 30}}{{end}}{{end}} {{end}}
    - {{if eq $n 0}} - {{if .Repository.IsTemplate}} -
    - - {{.locale.Tr "repo.use_template"}} - -
    - {{end}} - {{end}} {{if eq $n 0}}
    diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 74079170a1b2..b5d9a1029f45 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -2869,7 +2869,7 @@ } .repo-button-row > * { - margin-top: 10px; + margin-top: 8px; } .wiki .repo-button-row { diff --git a/web_src/less/helpers.less b/web_src/less/helpers.less index baa5959946e8..08589fdaab9f 100644 --- a/web_src/less/helpers.less +++ b/web_src/less/helpers.less @@ -172,6 +172,27 @@ .gt-py-4 { padding-top: 1rem !important; padding-bottom: 1rem !important; } .gt-py-5 { padding-top: 2rem !important; padding-bottom: 2rem !important; } +.gt-gap-0 { gap: 0 !important; } +.gt-gap-1 { gap: .125rem !important; } +.gt-gap-2 { gap: .25rem !important; } +.gt-gap-3 { gap: .5rem !important; } +.gt-gap-4 { gap: 1rem !important; } +.gt-gap-5 { gap: 2rem !important; } + +.gt-gap-x-0 { column-gap: 0 !important; } +.gt-gap-x-1 { column-gap: .125rem !important; } +.gt-gap-x-2 { column-gap: .25rem !important; } +.gt-gap-x-3 { column-gap: .5rem !important; } +.gt-gap-x-4 { column-gap: 1rem !important; } +.gt-gap-x-5 { column-gap: 2rem !important; } + +.gt-gap-y-0 { row-gap: 0 !important; } +.gt-gap-y-1 { row-gap: .125rem !important; } +.gt-gap-y-2 { row-gap: .25rem !important; } +.gt-gap-y-3 { row-gap: .5rem !important; } +.gt-gap-y-4 { row-gap: 1rem !important; } +.gt-gap-y-5 { row-gap: 2rem !important; } + .gt-content-center { align-content: center !important; } @media @mediaSm { From e87f36e8855c4fc4ecb3519a24b6110693309ee6 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Sat, 11 Mar 2023 17:11:23 -0500 Subject: [PATCH 078/340] Use buildkit for docker builds (#23415) (#23424) --- .drone.yml | 101 +++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 83 insertions(+), 18 deletions(-) diff --git a/.drone.yml b/.drone.yml index cf0caf7612f6..b704a24465fd 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1016,7 +1016,7 @@ steps: - git fetch --tags --force - name: publish - image: techknowlogick/drone-docker:latest + image: plugins/docker:latest pull: always settings: auto_tag: true @@ -1028,13 +1028,17 @@ steps: from_secret: docker_password username: from_secret: docker_username + environment: + PLUGIN_MIRROR: + from_secret: plugin_mirror + DOCKER_BUILDKIT: 1 when: event: exclude: - pull_request - name: publish-rootless - image: techknowlogick/drone-docker:latest + image: plugins/docker:latest settings: dockerfile: Dockerfile.rootless auto_tag: true @@ -1046,6 +1050,10 @@ steps: from_secret: docker_password username: from_secret: docker_username + environment: + PLUGIN_MIRROR: + from_secret: plugin_mirror + DOCKER_BUILDKIT: 1 when: event: exclude: @@ -1080,7 +1088,7 @@ steps: - git fetch --tags --force - name: publish - image: techknowlogick/drone-docker:latest + image: plugins/docker:latest pull: always settings: tags: ${DRONE_TAG##v}-linux-amd64 @@ -1091,13 +1099,17 @@ steps: from_secret: docker_password username: from_secret: docker_username + environment: + PLUGIN_MIRROR: + from_secret: plugin_mirror + DOCKER_BUILDKIT: 1 when: event: exclude: - pull_request - name: publish-rootless - image: techknowlogick/drone-docker:latest + image: plugins/docker:latest settings: dockerfile: Dockerfile.rootless tags: ${DRONE_TAG##v}-linux-amd64-rootless @@ -1108,6 +1120,10 @@ steps: from_secret: docker_password username: from_secret: docker_username + environment: + PLUGIN_MIRROR: + from_secret: plugin_mirror + DOCKER_BUILDKIT: 1 when: event: exclude: @@ -1142,7 +1158,7 @@ steps: - git fetch --tags --force - name: publish - image: techknowlogick/drone-docker:latest + image: plugins/docker:latest pull: always settings: auto_tag: false @@ -1154,13 +1170,17 @@ steps: from_secret: docker_password username: from_secret: docker_username + environment: + PLUGIN_MIRROR: + from_secret: plugin_mirror + DOCKER_BUILDKIT: 1 when: event: exclude: - pull_request - name: publish-rootless - image: techknowlogick/drone-docker:latest + image: plugins/docker:latest settings: dockerfile: Dockerfile.rootless auto_tag: false @@ -1172,6 +1192,10 @@ steps: from_secret: docker_password username: from_secret: docker_username + environment: + PLUGIN_MIRROR: + from_secret: plugin_mirror + DOCKER_BUILDKIT: 1 when: event: exclude: @@ -1205,7 +1229,7 @@ steps: - git fetch --tags --force - name: publish - image: techknowlogick/drone-docker:latest + image: plugins/docker:latest pull: always settings: auto_tag: false @@ -1217,13 +1241,17 @@ steps: from_secret: docker_password username: from_secret: docker_username + environment: + PLUGIN_MIRROR: + from_secret: plugin_mirror + DOCKER_BUILDKIT: 1 when: event: exclude: - pull_request - name: publish-rootless - image: techknowlogick/drone-docker:latest + image: plugins/docker:latest settings: dockerfile: Dockerfile.rootless auto_tag: false @@ -1235,6 +1263,10 @@ steps: from_secret: docker_password username: from_secret: docker_username + environment: + PLUGIN_MIRROR: + from_secret: plugin_mirror + DOCKER_BUILDKIT: 1 when: event: exclude: @@ -1243,7 +1275,7 @@ steps: --- kind: pipeline type: docker -name: docker-linux-arm64-dry-run +name: docker-linux-amd64-dry-run platform: os: linux @@ -1261,7 +1293,7 @@ trigger: steps: - name: dryrun - image: techknowlogick/drone-docker:latest + image: plugins/docker:latest pull: always settings: dry_run: true @@ -1272,6 +1304,7 @@ steps: environment: PLUGIN_MIRROR: from_secret: plugin_mirror + DOCKER_BUILDKIT: 1 when: event: - pull_request @@ -1308,7 +1341,7 @@ steps: - git fetch --tags --force - name: publish - image: techknowlogick/drone-docker:latest + image: plugins/docker:latest pull: always settings: auto_tag: true @@ -1320,13 +1353,17 @@ steps: from_secret: docker_password username: from_secret: docker_username + environment: + PLUGIN_MIRROR: + from_secret: plugin_mirror + DOCKER_BUILDKIT: 1 when: event: exclude: - pull_request - name: publish-rootless - image: techknowlogick/drone-docker:latest + image: plugins/docker:latest settings: dockerfile: Dockerfile.rootless auto_tag: true @@ -1338,6 +1375,10 @@ steps: from_secret: docker_password username: from_secret: docker_username + environment: + PLUGIN_MIRROR: + from_secret: plugin_mirror + DOCKER_BUILDKIT: 1 when: event: exclude: @@ -1372,7 +1413,7 @@ steps: - git fetch --tags --force - name: publish - image: techknowlogick/drone-docker:latest + image: plugins/docker:latest pull: always settings: tags: ${DRONE_TAG##v}-linux-arm64 @@ -1383,13 +1424,17 @@ steps: from_secret: docker_password username: from_secret: docker_username + environment: + PLUGIN_MIRROR: + from_secret: plugin_mirror + DOCKER_BUILDKIT: 1 when: event: exclude: - pull_request - name: publish-rootless - image: techknowlogick/drone-docker:latest + image: plugins/docker:latest settings: dockerfile: Dockerfile.rootless tags: ${DRONE_TAG##v}-linux-arm64-rootless @@ -1400,6 +1445,10 @@ steps: from_secret: docker_password username: from_secret: docker_username + environment: + PLUGIN_MIRROR: + from_secret: plugin_mirror + DOCKER_BUILDKIT: 1 when: event: exclude: @@ -1434,7 +1483,7 @@ steps: - git fetch --tags --force - name: publish - image: techknowlogick/drone-docker:latest + image: plugins/docker:latest pull: always settings: auto_tag: false @@ -1446,13 +1495,17 @@ steps: from_secret: docker_password username: from_secret: docker_username + environment: + PLUGIN_MIRROR: + from_secret: plugin_mirror + DOCKER_BUILDKIT: 1 when: event: exclude: - pull_request - name: publish-rootless - image: techknowlogick/drone-docker:latest + image: plugins/docker:latest settings: dockerfile: Dockerfile.rootless auto_tag: false @@ -1464,6 +1517,10 @@ steps: from_secret: docker_password username: from_secret: docker_username + environment: + PLUGIN_MIRROR: + from_secret: plugin_mirror + DOCKER_BUILDKIT: 1 when: event: exclude: @@ -1497,7 +1554,7 @@ steps: - git fetch --tags --force - name: publish - image: techknowlogick/drone-docker:latest + image: plugins/docker:latest pull: always settings: auto_tag: false @@ -1509,13 +1566,17 @@ steps: from_secret: docker_password username: from_secret: docker_username + environment: + PLUGIN_MIRROR: + from_secret: plugin_mirror + DOCKER_BUILDKIT: 1 when: event: exclude: - pull_request - name: publish-rootless - image: techknowlogick/drone-docker:latest + image: plugins/docker:latest settings: dockerfile: Dockerfile.rootless auto_tag: false @@ -1527,6 +1588,10 @@ steps: from_secret: docker_password username: from_secret: docker_username + environment: + PLUGIN_MIRROR: + from_secret: plugin_mirror + DOCKER_BUILDKIT: 1 when: event: exclude: From 0d9b44c0e3b6347e4a9aee05fde97199f020fcfc Mon Sep 17 00:00:00 2001 From: Giteabot Date: Sun, 12 Mar 2023 07:45:39 -0400 Subject: [PATCH 079/340] Preserve file size when creating attachments (#23406) (#23426) Backport #23406 by @baez90 When creating attachments (issue, release, repo) the file size (being part of the multipart file header) is passed through the chain of creating an attachment to ensure the MinIO client can stream the file directly instead of having to read it to memory completely at first. Fixes #23393 Co-authored-by: Peter Co-authored-by: KN4CK3R Co-authored-by: techknowlogick --- routers/api/v1/repo/issue_attachment.go | 2 +- routers/api/v1/repo/issue_comment_attachment.go | 2 +- routers/api/v1/repo/release_attachment.go | 2 +- routers/web/repo/attachment.go | 2 +- services/attachment/attachment.go | 8 ++++---- services/attachment/attachment_test.go | 2 +- services/mailer/incoming/incoming_handler.go | 2 +- services/release/release_test.go | 7 +++++-- 8 files changed, 15 insertions(+), 12 deletions(-) diff --git a/routers/api/v1/repo/issue_attachment.go b/routers/api/v1/repo/issue_attachment.go index 8cbd2e11b699..92e11386882c 100644 --- a/routers/api/v1/repo/issue_attachment.go +++ b/routers/api/v1/repo/issue_attachment.go @@ -176,7 +176,7 @@ func CreateIssueAttachment(ctx *context.APIContext) { filename = query } - attachment, err := attachment.UploadAttachment(file, setting.Attachment.AllowedTypes, &repo_model.Attachment{ + attachment, err := attachment.UploadAttachment(file, setting.Attachment.AllowedTypes, header.Size, &repo_model.Attachment{ Name: filename, UploaderID: ctx.Doer.ID, RepoID: ctx.Repo.Repository.ID, diff --git a/routers/api/v1/repo/issue_comment_attachment.go b/routers/api/v1/repo/issue_comment_attachment.go index 4c8452380f03..6fe4dbc97715 100644 --- a/routers/api/v1/repo/issue_comment_attachment.go +++ b/routers/api/v1/repo/issue_comment_attachment.go @@ -180,7 +180,7 @@ func CreateIssueCommentAttachment(ctx *context.APIContext) { filename = query } - attachment, err := attachment.UploadAttachment(file, setting.Attachment.AllowedTypes, &repo_model.Attachment{ + attachment, err := attachment.UploadAttachment(file, setting.Attachment.AllowedTypes, header.Size, &repo_model.Attachment{ Name: filename, UploaderID: ctx.Doer.ID, RepoID: ctx.Repo.Repository.ID, diff --git a/routers/api/v1/repo/release_attachment.go b/routers/api/v1/repo/release_attachment.go index 597578aac578..305b2808df54 100644 --- a/routers/api/v1/repo/release_attachment.go +++ b/routers/api/v1/repo/release_attachment.go @@ -194,7 +194,7 @@ func CreateReleaseAttachment(ctx *context.APIContext) { } // Create a new attachment and save the file - attach, err := attachment.UploadAttachment(file, setting.Repository.Release.AllowedTypes, &repo_model.Attachment{ + attach, err := attachment.UploadAttachment(file, setting.Repository.Release.AllowedTypes, header.Size, &repo_model.Attachment{ Name: filename, UploaderID: ctx.Doer.ID, RepoID: release.RepoID, diff --git a/routers/web/repo/attachment.go b/routers/web/repo/attachment.go index 589632ad6e10..c6d8828fac60 100644 --- a/routers/web/repo/attachment.go +++ b/routers/web/repo/attachment.go @@ -44,7 +44,7 @@ func uploadAttachment(ctx *context.Context, repoID int64, allowedTypes string) { } defer file.Close() - attach, err := attachment.UploadAttachment(file, allowedTypes, &repo_model.Attachment{ + attach, err := attachment.UploadAttachment(file, allowedTypes, header.Size, &repo_model.Attachment{ Name: header.Filename, UploaderID: ctx.Doer.ID, RepoID: repoID, diff --git a/services/attachment/attachment.go b/services/attachment/attachment.go index 7fdacc6aae50..3e7df0cee0c0 100644 --- a/services/attachment/attachment.go +++ b/services/attachment/attachment.go @@ -19,14 +19,14 @@ import ( ) // NewAttachment creates a new attachment object, but do not verify. -func NewAttachment(attach *repo_model.Attachment, file io.Reader) (*repo_model.Attachment, error) { +func NewAttachment(attach *repo_model.Attachment, file io.Reader, size int64) (*repo_model.Attachment, error) { if attach.RepoID == 0 { return nil, fmt.Errorf("attachment %s should belong to a repository", attach.Name) } err := db.WithTx(db.DefaultContext, func(ctx context.Context) error { attach.UUID = uuid.New().String() - size, err := storage.Attachments.Save(attach.RelativePath(), file, -1) + size, err := storage.Attachments.Save(attach.RelativePath(), file, size) if err != nil { return fmt.Errorf("Create: %w", err) } @@ -39,7 +39,7 @@ func NewAttachment(attach *repo_model.Attachment, file io.Reader) (*repo_model.A } // UploadAttachment upload new attachment into storage and update database -func UploadAttachment(file io.Reader, allowedTypes string, opts *repo_model.Attachment) (*repo_model.Attachment, error) { +func UploadAttachment(file io.Reader, allowedTypes string, fileSize int64, opts *repo_model.Attachment) (*repo_model.Attachment, error) { buf := make([]byte, 1024) n, _ := util.ReadAtMost(file, buf) buf = buf[:n] @@ -48,5 +48,5 @@ func UploadAttachment(file io.Reader, allowedTypes string, opts *repo_model.Atta return nil, err } - return NewAttachment(opts, io.MultiReader(bytes.NewReader(buf), file)) + return NewAttachment(opts, io.MultiReader(bytes.NewReader(buf), file), fileSize) } diff --git a/services/attachment/attachment_test.go b/services/attachment/attachment_test.go index 72d1b2ab3a44..1b9af34427e5 100644 --- a/services/attachment/attachment_test.go +++ b/services/attachment/attachment_test.go @@ -36,7 +36,7 @@ func TestUploadAttachment(t *testing.T) { RepoID: 1, UploaderID: user.ID, Name: filepath.Base(fPath), - }, f) + }, f, -1) assert.NoError(t, err) attachment, err := repo_model.GetAttachmentByUUID(db.DefaultContext, attach.UUID) diff --git a/services/mailer/incoming/incoming_handler.go b/services/mailer/incoming/incoming_handler.go index d89a5eab3d1b..3872288f923c 100644 --- a/services/mailer/incoming/incoming_handler.go +++ b/services/mailer/incoming/incoming_handler.go @@ -87,7 +87,7 @@ func (h *ReplyHandler) Handle(ctx context.Context, content *MailContent, doer *u attachmentIDs := make([]string, 0, len(content.Attachments)) if setting.Attachment.Enabled { for _, attachment := range content.Attachments { - a, err := attachment_service.UploadAttachment(bytes.NewReader(attachment.Content), setting.Attachment.AllowedTypes, &repo_model.Attachment{ + a, err := attachment_service.UploadAttachment(bytes.NewReader(attachment.Content), setting.Attachment.AllowedTypes, int64(len(attachment.Content)), &repo_model.Attachment{ Name: attachment.Name, UploaderID: doer.ID, RepoID: issue.Repo.ID, diff --git a/services/release/release_test.go b/services/release/release_test.go index 9b8aaa364983..805269413d72 100644 --- a/services/release/release_test.go +++ b/services/release/release_test.go @@ -106,11 +106,13 @@ func TestRelease_Create(t *testing.T) { IsTag: false, }, nil, "")) + testPlayload := "testtest" + attach, err := attachment.NewAttachment(&repo_model.Attachment{ RepoID: repo.ID, UploaderID: user.ID, Name: "test.txt", - }, strings.NewReader("testtest")) + }, strings.NewReader(testPlayload), int64(len([]byte(testPlayload)))) assert.NoError(t, err) release := repo_model.Release{ @@ -239,11 +241,12 @@ func TestRelease_Update(t *testing.T) { assert.Equal(t, tagName, release.TagName) // Add new attachments + samplePayload := "testtest" attach, err := attachment.NewAttachment(&repo_model.Attachment{ RepoID: repo.ID, UploaderID: user.ID, Name: "test.txt", - }, strings.NewReader("testtest")) + }, strings.NewReader(samplePayload), int64(len([]byte(samplePayload)))) assert.NoError(t, err) assert.NoError(t, UpdateRelease(user, gitRepo, release, []string{attach.UUID}, nil, nil)) From 41655ee8781cad827e22ff0274c447cf82eda5da Mon Sep 17 00:00:00 2001 From: Giteabot Date: Sun, 12 Mar 2023 10:17:25 -0400 Subject: [PATCH 080/340] Show edit/close/delete button on organization wide repositories (#23388) (#23429) Backport #23388 by @yp05327 A part of https://github.com/go-gitea/gitea/pull/22865 Co-authored-by: yp05327 <576951401@qq.com> --- routers/web/repo/projects.go | 2 +- templates/projects/list.tmpl | 6 +++--- templates/projects/view.tmpl | 4 ++-- templates/repo/projects/list.tmpl | 12 ++++++------ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/routers/web/repo/projects.go b/routers/web/repo/projects.go index 967b81c60851..521256584a9c 100644 --- a/routers/web/repo/projects.go +++ b/routers/web/repo/projects.go @@ -113,7 +113,7 @@ func Projects(ctx *context.Context) { pager.AddParam(ctx, "state", "State") ctx.Data["Page"] = pager - ctx.Data["CanWriteProjects"] = true + ctx.Data["CanWriteProjects"] = ctx.Repo.Permission.CanWrite(unit.TypeProjects) ctx.Data["IsShowClosed"] = isShowClosed ctx.Data["IsProjectsPage"] = true ctx.Data["SortType"] = sortType diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index 489189ec45a1..4a21c0fd28ce 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -51,7 +51,7 @@ {{JsPrettyNumber .NumClosedIssues}} {{$.locale.Tr "repo.issues.closed_title"}}
    - {{if and (or $.CanWriteIssues $.CanWritePulls) (not $.Repository.IsArchived)}} + {{if and $.CanWriteProjects (not $.Repository.IsArchived)}}
    {{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}} {{if .IsClosed}} @@ -59,7 +59,7 @@ {{else}} {{svg "octicon-skip"}} {{$.locale.Tr "repo.projects.close"}} {{end}} - {{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}} + {{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}}
    {{end}} {{if .Description}} @@ -75,7 +75,7 @@
    -{{if or .CanWriteIssues .CanWritePulls}} +{{if $.CanWriteProjects}}
    {{svg "octicon-trash"}} diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index 4fdeb139e0ca..00e5c9038ca1 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -43,7 +43,7 @@

    {{$.Project.Title}}

    {{$.Project.RenderedContent|Str2html}}
    - {{if or $.CanWriteIssues $.CanWritePulls}} + {{if $.CanWriteProjects}}
    @@ -256,7 +256,7 @@
    -{{if or .CanWriteIssues .CanWritePulls}} +{{if .CanWriteProjects}}
    {{svg "octicon-trash"}} diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl index 929a1b4c6fb8..f066f84ea2e8 100644 --- a/templates/repo/projects/list.tmpl +++ b/templates/repo/projects/list.tmpl @@ -53,15 +53,15 @@ {{JsPrettyNumber .NumClosedIssues}} {{$.locale.Tr "repo.issues.closed_title"}}
    - {{if and (or $.CanWriteIssues $.CanWritePulls) (not $.Repository.IsArchived)}} + {{if and $.CanWriteProjects (not $.Repository.IsArchived)}}
    - {{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}} + {{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}} {{if .IsClosed}} - {{svg "octicon-check"}} {{$.locale.Tr "repo.projects.open"}} + {{svg "octicon-check"}} {{$.locale.Tr "repo.projects.open"}} {{else}} - {{svg "octicon-skip"}} {{$.locale.Tr "repo.projects.close"}} + {{svg "octicon-skip"}} {{$.locale.Tr "repo.projects.close"}} {{end}} - {{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}} + {{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}}
    {{end}} {{if .Description}} @@ -77,7 +77,7 @@
    -{{if or .CanWriteIssues .CanWritePulls}} +{{if .CanWriteProjects}}
    {{svg "octicon-trash"}} From b1162495af41e7d2da79e6c716936c2de7e5f44a Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 13 Mar 2023 03:09:00 -0400 Subject: [PATCH 081/340] Fix actions frontend bugs (pagination, long name alignment) and small simplify (#23370) (#23436) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Backport #23370 by @HesterG 1 Right now on actions page, the action list will not be aligned if commit message is long. In this PR, the changes are: - The branch tag is moved to bottom row - Width percentage is given to make them aligned - Show "..." if commit is longer than two lines. - Align the status icon with the commit message with baseline Before: 截屏2023-03-08 12 23 22 After: 截屏2023-03-08 13 34 28 2 Right now the actions list's pagination is not working properly because Param is not passed to pagination template, in this PR Param Strings are passed to the pager Before: 截屏2023-03-08 12 23 50 After: 截屏2023-03-08 13 11 54 3 A small simplify in `RepoActionView.vue` . Co-authored-by: Hester Gong Co-authored-by: wxiaoguang Co-authored-by: Lunny Xiao --- routers/web/repo/actions/actions.go | 2 ++ templates/repo/actions/runs_list.tmpl | 14 +++++++------- web_src/js/components/RepoActionView.vue | 3 +-- web_src/less/helpers.less | 1 + web_src/less/shared/issuelist.less | 16 ++++++++++++++++ 5 files changed, 27 insertions(+), 9 deletions(-) diff --git a/routers/web/repo/actions/actions.go b/routers/web/repo/actions/actions.go index e5496676a9dd..0e7a95ed073a 100644 --- a/routers/web/repo/actions/actions.go +++ b/routers/web/repo/actions/actions.go @@ -133,6 +133,8 @@ func List(ctx *context.Context) { pager := context.NewPagination(int(total), opts.PageSize, opts.Page, 5) pager.SetDefaultParams(ctx) + pager.AddParamString("workflow", workflow) + pager.AddParamString("state", ctx.FormString("state")) ctx.Data["Page"] = pager ctx.HTML(http.StatusOK, tplListActions) diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl index ffabe534c8bb..a28b9d71378b 100644 --- a/templates/repo/actions/runs_list.tmpl +++ b/templates/repo/actions/runs_list.tmpl @@ -1,14 +1,18 @@
    {{range .Runs}} -
  • +
  • {{template "repo/actions/status" .Status}}
    -
    +
    - + {{- .Title -}} +
    +
    + {{if not $.CurWorkflow}}{{.WorkflowID}} {{end}}#{{.Index}}: {{$.locale.Tr "actions.runs.commit"}} + {{ShortSha .CommitSHA}}{{$.locale.Tr "actions.runs.pushed_by"}} {{.TriggerUser.GetDisplayName}} {{if .RefLink}} {{.PrettyRef}} @@ -17,10 +21,6 @@ {{end}}
    -
    - {{if not $.CurWorkflow}}{{.WorkflowID}} {{end}}#{{.Index}}: {{$.locale.Tr "actions.runs.commit"}} - {{ShortSha .CommitSHA}}  {{$.locale.Tr "actions.runs.pushed_by"}} {{.TriggerUser.GetDisplayName | Escape}} -
    {{TimeSinceUnix .Updated $.locale}}
    diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index e0ec488933c8..6ccfdc649eb2 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -42,8 +42,7 @@
    - - + diff --git a/web_src/less/helpers.less b/web_src/less/helpers.less index 08589fdaab9f..91ea2268e28c 100644 --- a/web_src/less/helpers.less +++ b/web_src/less/helpers.less @@ -3,6 +3,7 @@ .gt-dif { display: inline-flex !important; } .gt-dib { display: inline-block !important; } .gt-ac { align-items: center !important; } +.gt-ab { align-items: baseline !important; } .gt-tc { text-align: center !important; } .gt-tl { text-align: left !important; } .gt-tdn { text-decoration: none !important; } diff --git a/web_src/less/shared/issuelist.less b/web_src/less/shared/issuelist.less index 8d4cfc46d491..9f69d6bb3a4c 100644 --- a/web_src/less/shared/issuelist.less +++ b/web_src/less/shared/issuelist.less @@ -23,6 +23,14 @@ .issue-item-main { width: 100%; } + + .action-item-main { + width: 80%; + } + + .issue-item-right { + width: 15%; + } .issue-item-top-row { max-width: 100%; @@ -30,6 +38,14 @@ font-size: 16px; min-width: 0; font-weight: 600; + a.index { + max-width: fit-content; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + overflow: hidden; + word-break:break-all; + } } .labels-list { From fa33919e24566fb0e83e1a54616d61b69bdf93cd Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 13 Mar 2023 08:20:10 -0400 Subject: [PATCH 082/340] Support reflogs (#22451) (#23438) Backport #22451 by @philip-peterson This PR adds support for reflogs on all repositories. It does this by adding a global configuration entry. Implements #14865 Signed-off-by: Philip Peterson Co-authored-by: Philip Peterson --- custom/conf/app.example.ini | 11 ++++++++ .../doc/advanced/config-cheat-sheet.en-us.md | 5 ++++ modules/git/git.go | 27 +++++++++++++++++++ modules/setting/git.go | 17 +++++++++--- options/locale/locale_en-US.ini | 2 ++ templates/admin/config.tmpl | 12 +++++++++ 6 files changed, 71 insertions(+), 3 deletions(-) diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index b7875c12dd8e..ca0565e49f07 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -2256,6 +2256,17 @@ ROUTER = console ;PULL = 300 ;GC = 60 + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Git Reflog timeout in days +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;[git.reflog] +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;ENABLED = true +;EXPIRATION = 90 + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;[mirror] diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/advanced/config-cheat-sheet.en-us.md index bd6e61a3ad43..45a312159cc6 100644 --- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md +++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md @@ -1087,6 +1087,11 @@ Default templates for project boards: - `DISABLE_CORE_PROTECT_NTFS`: **false** Set to true to forcibly set `core.protectNTFS` to false. - `DISABLE_PARTIAL_CLONE`: **false** Disable the usage of using partial clones for git. +## Git - Reflog settings (`git.reflog`) + +- `ENABLED`: **true** Set to true to enable Git to write changes to reflogs in each repo. +- `EXPIRATION`: **90** Reflog entry lifetime, in days. Entries are removed opportunistically by Git. + ## Git - Timeout settings (`git.timeout`) - `DEFAULT`: **360**: Git operations default timeout seconds. diff --git a/modules/git/git.go b/modules/git/git.go index 24cfea8c7fe1..a31afc077a5c 100644 --- a/modules/git/git.go +++ b/modules/git/git.go @@ -201,6 +201,23 @@ func InitFull(ctx context.Context) (err error) { return syncGitConfig() } +func enableReflogs() error { + if err := configSet("core.logAllRefUpdates", "true"); err != nil { + return err + } + err := configSet("gc.reflogExpire", fmt.Sprintf("%d", setting.Git.Reflog.Expiration)) + return err +} + +func disableReflogs() error { + if err := configUnsetAll("core.logAllRefUpdates", "true"); err != nil { + return err + } else if err := configUnsetAll("gc.reflogExpire", ""); err != nil { + return err + } + return nil +} + // syncGitConfig only modifies gitconfig, won't change global variables (otherwise there will be data-race problem) func syncGitConfig() (err error) { if err = os.MkdirAll(HomeDir(), os.ModePerm); err != nil { @@ -224,6 +241,16 @@ func syncGitConfig() (err error) { return err } + if setting.Git.Reflog.Enabled { + if err := enableReflogs(); err != nil { + return err + } + } else { + if err := disableReflogs(); err != nil { + return err + } + } + if CheckGitVersionAtLeast("2.10") == nil { if err := configSet("receive.advertisePushOptions", "true"); err != nil { return err diff --git a/modules/setting/git.go b/modules/setting/git.go index 457b35936e9f..b8e7bb9cf81f 100644 --- a/modules/setting/git.go +++ b/modules/setting/git.go @@ -12,9 +12,13 @@ import ( // Git settings var Git = struct { - Path string - HomePath string - DisableDiffHighlight bool + Path string + HomePath string + DisableDiffHighlight bool + Reflog struct { + Enabled bool + Expiration int + } `ini:"git.reflog"` MaxGitDiffLines int MaxGitDiffLineCharacters int MaxGitDiffFiles int @@ -37,6 +41,13 @@ var Git = struct { GC int `ini:"GC"` } `ini:"git.timeout"` }{ + Reflog: struct { + Enabled bool + Expiration int + }{ + Enabled: true, + Expiration: 90, + }, DisableDiffHighlight: false, MaxGitDiffLines: 1000, MaxGitDiffLineCharacters: 5000, diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index f0db595496db..8c281b213d71 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2928,6 +2928,8 @@ config.git_disable_diff_highlight = Disable Diff Syntax Highlight config.git_max_diff_lines = Max Diff Lines (for a single file) config.git_max_diff_line_characters = Max Diff Characters (for a single line) config.git_max_diff_files = Max Diff Files (to be shown) +config.git_enable_reflogs = Enable Reflogs +config.git_reflog_expiry_time = Expiry Time config.git_gc_args = GC Arguments config.git_migrate_timeout = Migration Timeout config.git_mirror_timeout = Mirror Update Timeout diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index 8f572c839612..cc0580cc19dc 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -331,7 +331,19 @@
    {{.Git.MaxGitDiffFiles}}
    {{.locale.Tr "admin.config.git_gc_args"}}
    {{.Git.GCArgs}}
    +
    + +
    {{.locale.Tr "admin.config.git_enable_reflogs"}}
    +
    {{if .Git.Reflog.Enabled}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
    + + {{if .Git.Reflog.Enabled}} +
    {{.locale.Tr "admin.config.git_reflog_expiry_time"}}
    +
    {{.locale.Tr "tool.days" .Git.Reflog.Expiration}}
    + {{end}} + +
    +
    {{.locale.Tr "admin.config.git_migrate_timeout"}}
    {{.Git.Timeout.Migrate}} {{.locale.Tr "tool.raw_seconds"}}
    {{.locale.Tr "admin.config.git_mirror_timeout"}}
    From c3c07104126fbf1be7e7d408d71099d16c962e56 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 13 Mar 2023 16:46:18 -0400 Subject: [PATCH 083/340] Purge API comment (#23451) (#23452) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Backport #23451 by @jolheiser This PR just adds the `purge` query parameter to the swagger docs for admin user delete. I considered using the same verbiage we have in the UI, but that seemed more verbose than descriptions we use elsewhere in swagger. I'm fine if that's preferred, though, just let me know. 🙂 Signed-off-by: jolheiser Co-authored-by: John Olheiser --- routers/api/v1/admin/user.go | 4 ++++ templates/swagger/v1_json.tmpl | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go index 1fbdab3e5598..4192d8654d7c 100644 --- a/routers/api/v1/admin/user.go +++ b/routers/api/v1/admin/user.go @@ -305,6 +305,10 @@ func DeleteUser(ctx *context.APIContext) { // description: username of user to delete // type: string // required: true + // - name: purge + // in: query + // description: purge the user from the system completely + // type: boolean // responses: // "204": // "$ref": "#/responses/empty" diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index de774deaed13..a8433c21d85e 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -493,6 +493,12 @@ "name": "username", "in": "path", "required": true + }, + { + "type": "boolean", + "description": "purge the user from the system completely", + "name": "purge", + "in": "query" } ], "responses": { From 1543ac9c8df4a5defa4c5c5678439d16cd9e5c1c Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 13 Mar 2023 20:11:31 -0400 Subject: [PATCH 084/340] Fix missing commit status in PR which from forked repo (#23351) (#23453) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Backport #23351 by @sillyguodong close: #23347 ### Reference and Inference According to Github REST API [doc](https://docs.github.com/en/rest/commits/statuses?apiVersion=2022-11-28#list-commit-statuses-for-a-reference): 1. The `Drone CI` that can create some commit status by [API](https://docs.github.com/en/rest/commits/statuses?apiVersion=2022-11-28#create-a-commit-status) is enabled in `go-gitea/gitea`. So I tried to call the API to get a commit status list of a PR which is commited to upstream repo(`go-gitea/gitea`). As a result, the API returned a array of commit status. ![image](https://user-images.githubusercontent.com/33891828/223913371-313d047a-5e2e-484c-b13e-dcd38748703e.png) 2. Then I tried to call the API to get commit status list of the reference which of the `SHA` is the same as step 1 in the repo which is forked from `go-gitea/gitea`. But I got a empty array. ![image](https://user-images.githubusercontent.com/33891828/223930827-17a64d3c-f466-4980-897c-77fe386c4d3b.png) So, I believe it that： 1. The commit status is not shared between upstream repo and forked repo. 2. The coomit status is bound to a repo that performs actions. (Gitea's logic is the same) ### Cause During debugging, I found it that commit status are not stored in the DB as expected. So, I located the following code: https://github.com/go-gitea/gitea/blob/8cadd51bf295e6ff36ac36efed68cc5de34c9382/services/actions/commit_status.go#L18-L26 When I create a PR, the type of `event` is `pull request`, not `push`. So the code return function directly. ### Screenshot ![image](https://user-images.githubusercontent.com/33891828/223939339-dadf539c-1fdd-40c4-96e9-2e4fa733f531.png) ![image](https://user-images.githubusercontent.com/33891828/223939519-edb02bf0-2478-4ea5-9366-be85468f02db.png) ![image](https://user-images.githubusercontent.com/33891828/223939557-ec6f1375-5536-400e-8987-fb7d2fd452fa.png) ### Other In this PR, I also fix the problem of missing icon which represents running in PRs list. ![image](https://user-images.githubusercontent.com/33891828/223939898-2a0339e4-713f-4c7b-9d99-2250a43f3457.png) ![image](https://user-images.githubusercontent.com/33891828/223939979-037a975f-5ced-480c-bac7-0ee00ebfff4b.png) Co-authored-by: sillyguodong <33891828+sillyguodong@users.noreply.github.com> --- models/actions/run.go | 11 +++++ services/actions/commit_status.go | 71 +++++++++++++++++++++---------- templates/repo/commit_status.tmpl | 3 ++ 3 files changed, 62 insertions(+), 23 deletions(-) diff --git a/models/actions/run.go b/models/actions/run.go index bf3db3cb23be..7d5b7a5d50b6 100644 --- a/models/actions/run.go +++ b/models/actions/run.go @@ -126,6 +126,17 @@ func (run *ActionRun) GetPushEventPayload() (*api.PushPayload, error) { return nil, fmt.Errorf("event %s is not a push event", run.Event) } +func (run *ActionRun) GetPullRequestEventPayload() (*api.PullRequestPayload, error) { + if run.Event == webhook_module.HookEventPullRequest { + var payload api.PullRequestPayload + if err := json.Unmarshal([]byte(run.EventPayload), &payload); err != nil { + return nil, err + } + return &payload, nil + } + return nil, fmt.Errorf("event %s is not a pull request event", run.Event) +} + func updateRepoRunsNumbers(ctx context.Context, repo *repo_model.Repository) error { _, err := db.GetEngine(ctx).ID(repo.ID). SetExpr("num_action_runs", diff --git a/services/actions/commit_status.go b/services/actions/commit_status.go index 4f313493523e..84de106eeca3 100644 --- a/services/actions/commit_status.go +++ b/services/actions/commit_status.go @@ -21,35 +21,60 @@ func CreateCommitStatus(ctx context.Context, job *actions_model.ActionRunJob) er } run := job.Run - if run.Event != webhook_module.HookEventPush { - return nil - } + var ( + sha string + creatorID int64 + ) - payload, err := run.GetPushEventPayload() - if err != nil { - return fmt.Errorf("GetPushEventPayload: %w", err) - } + switch run.Event { + case webhook_module.HookEventPush: + payload, err := run.GetPushEventPayload() + if err != nil { + return fmt.Errorf("GetPushEventPayload: %w", err) + } - // Since the payload comes from json data, we should check if it's broken, or it will cause panic - switch { - case payload.Repo == nil: - return fmt.Errorf("repo is missing in event payload") - case payload.Pusher == nil: - return fmt.Errorf("pusher is missing in event payload") - case payload.HeadCommit == nil: - return fmt.Errorf("head commit is missing in event payload") - } + // Since the payload comes from json data, we should check if it's broken, or it will cause panic + switch { + case payload.Repo == nil: + return fmt.Errorf("repo is missing in event payload") + case payload.Pusher == nil: + return fmt.Errorf("pusher is missing in event payload") + case payload.HeadCommit == nil: + return fmt.Errorf("head commit is missing in event payload") + } - creator, err := user_model.GetUserByID(ctx, payload.Pusher.ID) - if err != nil { - return fmt.Errorf("GetUserByID: %w", err) + sha = payload.HeadCommit.ID + creatorID = payload.Pusher.ID + case webhook_module.HookEventPullRequest: + payload, err := run.GetPullRequestEventPayload() + if err != nil { + return fmt.Errorf("GetPullRequestEventPayload: %w", err) + } + + switch { + case payload.PullRequest == nil: + return fmt.Errorf("pull request is missing in event payload") + case payload.PullRequest.Head == nil: + return fmt.Errorf("head of pull request is missing in event payload") + case payload.PullRequest.Head.Repository == nil: + return fmt.Errorf("head repository of pull request is missing in event payload") + case payload.PullRequest.Head.Repository.Owner == nil: + return fmt.Errorf("owner of head repository of pull request is missing in evnt payload") + } + + sha = payload.PullRequest.Head.Sha + creatorID = payload.PullRequest.Head.Repository.Owner.ID + default: + return nil } repo := run.Repo - sha := payload.HeadCommit.ID ctxname := job.Name state := toCommitStatus(job.Status) - + creator, err := user_model.GetUserByID(ctx, creatorID) + if err != nil { + return fmt.Errorf("GetUserByID: %w", err) + } if statuses, _, err := git_model.GetLatestCommitStatus(ctx, repo.ID, sha, db.ListOptions{}); err == nil { for _, v := range statuses { if v.Context == ctxname { @@ -65,14 +90,14 @@ func CreateCommitStatus(ctx context.Context, job *actions_model.ActionRunJob) er if err := git_model.NewCommitStatus(ctx, git_model.NewCommitStatusOptions{ Repo: repo, - SHA: payload.HeadCommit.ID, + SHA: sha, Creator: creator, CommitStatus: &git_model.CommitStatus{ SHA: sha, TargetURL: run.Link(), Description: "", Context: ctxname, - CreatorID: payload.Pusher.ID, + CreatorID: creatorID, State: state, }, }); err != nil { diff --git a/templates/repo/commit_status.tmpl b/templates/repo/commit_status.tmpl index fbf064527da4..470869b381c0 100644 --- a/templates/repo/commit_status.tmpl +++ b/templates/repo/commit_status.tmpl @@ -1,6 +1,9 @@ {{if eq .State "pending"}} {{svg "octicon-dot-fill" 18 "commit-status icon text yellow"}} {{end}} +{{if eq .State "running"}} + {{svg "octicon-dot-fill" 18 "commit-status icon text yellow"}} +{{end}} {{if eq .State "success"}} {{svg "octicon-check" 18 "commit-status icon text green"}} {{end}} From 0a0f46f2990ada3abf4661f89ffe4ed539690e29 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 14 Mar 2023 04:12:14 -0400 Subject: [PATCH 085/340] test_env: hardcode major go version in use (#23464) --- .drone.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.drone.yml b/.drone.yml index b704a24465fd..3df7512fd0aa 100644 --- a/.drone.yml +++ b/.drone.yml @@ -43,7 +43,7 @@ steps: depends_on: [deps-frontend] - name: lint-backend - image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env + image: gitea/test_env:linux-1.19-amd64 # https://gitea.com/gitea/test-env pull: always commands: - make lint-backend @@ -57,7 +57,7 @@ steps: path: /go - name: lint-backend-windows - image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env + image: gitea/test_env:linux-1.19-amd64 # https://gitea.com/gitea/test-env commands: - make golangci-lint-windows vet environment: @@ -72,7 +72,7 @@ steps: path: /go - name: lint-backend-gogit - image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env + image: gitea/test_env:linux-1.19-amd64 # https://gitea.com/gitea/test-env commands: - make lint-backend environment: @@ -264,13 +264,13 @@ steps: - git update-ref refs/heads/tag_test ${DRONE_COMMIT_SHA} - name: prepare-test-env - image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env + image: gitea/test_env:linux-1.19-amd64 # https://gitea.com/gitea/test-env pull: always commands: - ./build/test-env-prepare.sh - name: build - image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env + image: gitea/test_env:linux-1.19-amd64 # https://gitea.com/gitea/test-env user: gitea commands: - ./build/test-env-check.sh @@ -285,7 +285,7 @@ steps: path: /go - name: unit-test - image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env + image: gitea/test_env:linux-1.19-amd64 # https://gitea.com/gitea/test-env user: gitea commands: - make unit-test-coverage test-check @@ -301,7 +301,7 @@ steps: path: /go - name: unit-test-gogit - image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env + image: gitea/test_env:linux-1.19-amd64 # https://gitea.com/gitea/test-env user: gitea commands: - make unit-test-coverage test-check @@ -317,7 +317,7 @@ steps: path: /go - name: test-mysql - image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env + image: gitea/test_env:linux-1.19-amd64 # https://gitea.com/gitea/test-env user: gitea commands: - make test-mysql-migration integration-test-coverage @@ -334,7 +334,7 @@ steps: path: /go - name: test-mysql8 - image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env + image: gitea/test_env:linux-1.19-amd64 # https://gitea.com/gitea/test-env user: gitea commands: - timeout -s ABRT 50m make test-mysql8-migration test-mysql8 @@ -350,7 +350,7 @@ steps: path: /go - name: test-mssql - image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env + image: gitea/test_env:linux-1.19-amd64 # https://gitea.com/gitea/test-env user: gitea commands: - make test-mssql-migration test-mssql @@ -454,13 +454,13 @@ steps: path: /go - name: prepare-test-env - image: gitea/test_env:linux-arm64 # https://gitea.com/gitea/test-env + image: gitea/test_env:linux-1.19-arm64 # https://gitea.com/gitea/test-env pull: always commands: - ./build/test-env-prepare.sh - name: build - image: gitea/test_env:linux-arm64 # https://gitea.com/gitea/test-env + image: gitea/test_env:linux-1.19-arm64 # https://gitea.com/gitea/test-env user: gitea commands: - ./build/test-env-check.sh @@ -475,7 +475,7 @@ steps: path: /go - name: test-sqlite - image: gitea/test_env:linux-arm64 # https://gitea.com/gitea/test-env + image: gitea/test_env:linux-1.19-arm64 # https://gitea.com/gitea/test-env user: gitea commands: - timeout -s ABRT 50m make test-sqlite-migration test-sqlite @@ -491,7 +491,7 @@ steps: path: /go - name: test-pgsql - image: gitea/test_env:linux-arm64 # https://gitea.com/gitea/test-env + image: gitea/test_env:linux-1.19-arm64 # https://gitea.com/gitea/test-env user: gitea commands: - timeout -s ABRT 50m make test-pgsql-migration test-pgsql From 8536dc4b73a22be203659c0b64bba7537efa63d7 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Tue, 14 Mar 2023 08:51:14 -0400 Subject: [PATCH 086/340] Make branches list page operations remember current page (#23420) (#23460) Backport #23420 by @wxiaoguang Close #23411 Always pass "page" query parameter to backend, and make backend respect it. The `ctx.FormInt("limit")` is never used, so removed. Co-authored-by: wxiaoguang Co-authored-by: Jason Song Co-authored-by: Lunny Xiao --- modules/context/pagination.go | 7 ++++--- routers/web/repo/branch.go | 17 +++++++---------- templates/repo/branch/list.tmpl | 8 ++++---- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/modules/context/pagination.go b/modules/context/pagination.go index 3effd88f109c..5a88c92053aa 100644 --- a/modules/context/pagination.go +++ b/modules/context/pagination.go @@ -18,10 +18,11 @@ type Pagination struct { urlParams []string } -// NewPagination creates a new instance of the Pagination struct -func NewPagination(total, page, issueNum, numPages int) *Pagination { +// NewPagination creates a new instance of the Pagination struct. +// "pagingNum" is "page size" or "limit", "current" is "page" +func NewPagination(total, pagingNum, current, numPages int) *Pagination { p := &Pagination{} - p.Paginater = paginator.New(total, page, issueNum, numPages) + p.Paginater = paginator.New(total, pagingNum, current, numPages) return p } diff --git a/routers/web/repo/branch.go b/routers/web/repo/branch.go index b34ccf853855..6a0ba0803f93 100644 --- a/routers/web/repo/branch.go +++ b/routers/web/repo/branch.go @@ -8,6 +8,7 @@ import ( "errors" "fmt" "net/http" + "net/url" "strings" "code.gitea.io/gitea/models" @@ -65,21 +66,17 @@ func Branches(ctx *context.Context) { if page <= 1 { page = 1 } + pageSize := setting.Git.BranchesRangeSize - limit := ctx.FormInt("limit") - if limit <= 0 || limit > setting.Git.BranchesRangeSize { - limit = setting.Git.BranchesRangeSize - } - - skip := (page - 1) * limit - log.Debug("Branches: skip: %d limit: %d", skip, limit) - defaultBranchBranch, branches, branchesCount := loadBranches(ctx, skip, limit) + skip := (page - 1) * pageSize + log.Debug("Branches: skip: %d limit: %d", skip, pageSize) + defaultBranchBranch, branches, branchesCount := loadBranches(ctx, skip, pageSize) if ctx.Written() { return } ctx.Data["Branches"] = branches ctx.Data["DefaultBranchBranch"] = defaultBranchBranch - pager := context.NewPagination(branchesCount, setting.Git.BranchesRangeSize, page, 5) + pager := context.NewPagination(branchesCount, pageSize, page, 5) pager.SetDefaultParams(ctx) ctx.Data["Page"] = pager @@ -165,7 +162,7 @@ func RestoreBranchPost(ctx *context.Context) { func redirect(ctx *context.Context) { ctx.JSON(http.StatusOK, map[string]interface{}{ - "redirect": ctx.Repo.RepoLink + "/branches", + "redirect": ctx.Repo.RepoLink + "/branches?page=" + url.QueryEscape(ctx.FormString("page")), }) } diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index a093c19deb8c..548d328550ce 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -81,9 +81,9 @@
    • {{if not .LatestPullRequest}} {{if .IsIncluded}} - + {{svg "octicon-git-pull-request"}} {{$.locale.Tr "repo.branch.included"}} - + {{else if and (not .IsDeleted) $.AllowsPulls (gt .CommitsAhead 0)}} @@ -123,13 +123,13 @@ {{end}} {{if and $.IsWriter (not $.IsMirror) (not $.Repository.IsArchived) (not .IsProtected)}} {{if .IsDeleted}} - {{else}} - {{end}} From e5a51eca45ff6e6ef600081b4046f0eb73dd48da Mon Sep 17 00:00:00 2001 From: Giteabot Date: Tue, 14 Mar 2023 16:09:52 -0400 Subject: [PATCH 087/340] Remove wrongly added column on migration test fixtures (#23456) (#23470) Backport #23456 by @lunny Fix https://drone.gitea.io/go-gitea/gitea/69418/3/8 Migration fixtures are in `models/migrations/fixtures`, every folder will be used only by the test with the same name. For `Test_DeleteOrphanedIssueLabels`, the fixture should keep consistent as the database structure at that time. So the newly added `exclusive` is not right. Just revert the change in https://github.com/go-gitea/gitea/pull/22585/files#diff-f8db9cbbaa10bf7b27eb726884454db821a4b4f8cb9a0d50435555908761bbcb Co-authored-by: Lunny Xiao Co-authored-by: techknowlogick --- .../fixtures/Test_DeleteOrphanedIssueLabels/label.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/models/migrations/fixtures/Test_DeleteOrphanedIssueLabels/label.yml b/models/migrations/fixtures/Test_DeleteOrphanedIssueLabels/label.yml index 085b7f0882d5..d651c87d5b0d 100644 --- a/models/migrations/fixtures/Test_DeleteOrphanedIssueLabels/label.yml +++ b/models/migrations/fixtures/Test_DeleteOrphanedIssueLabels/label.yml @@ -4,7 +4,6 @@ org_id: 0 name: label1 color: '#abcdef' - exclusive: false num_issues: 2 num_closed_issues: 0 @@ -14,7 +13,6 @@ org_id: 0 name: label2 color: '#000000' - exclusive: false num_issues: 1 num_closed_issues: 1 - @@ -23,7 +21,6 @@ org_id: 3 name: orglabel3 color: '#abcdef' - exclusive: false num_issues: 0 num_closed_issues: 0 @@ -33,7 +30,6 @@ org_id: 3 name: orglabel4 color: '#000000' - exclusive: false num_issues: 1 num_closed_issues: 0 @@ -43,6 +39,5 @@ org_id: 0 name: pull-test-label color: '#000000' - exclusive: false num_issues: 0 num_closed_issues: 0 From c698a6fc5db489fa60784c6d498e810975056229 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Tue, 14 Mar 2023 19:58:38 -0400 Subject: [PATCH 088/340] Scoped label display and documentation tweaks (#23430) (#23433) Backport #23430 by @brechtvl * Fix scoped label left and right part breaking across lines. * Remove slanted divider in scoped label display, make it straight. After using this for a while, this feels more visually noisy than helpful. * Reduce contrast between scope and item to reduce probability of unreadable text on background. * Change documentation to remove mention of non-exclusive scoped labels. Co-authored-by: Brecht Van Lommel Co-authored-by: Lunny Xiao Co-authored-by: John Olheiser --- docs/content/doc/usage/labels.en-us.md | 8 +++----- modules/templates/helper.go | 4 +--- web_src/less/_repository.less | 15 ++------------- 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/docs/content/doc/usage/labels.en-us.md b/docs/content/doc/usage/labels.en-us.md index bf07c074edc6..8e5ff1cf8d9f 100644 --- a/docs/content/doc/usage/labels.en-us.md +++ b/docs/content/doc/usage/labels.en-us.md @@ -23,17 +23,15 @@ For repositories, labels can be created by going to `Issues` and clicking on `La For organizations, you can define organization-wide labels that are shared with all organization repositories, including both already-existing repositories as well as newly created ones. Organization-wide labels can be created in the organization `Settings`. -Labels have a mandatory name, a mandatory color, an optional description, and must either be exclusive or not (see `Scoped labels` below). +Labels have a mandatory name, a mandatory color, an optional description, and must either be exclusive or not (see `Scoped Labels` below). When you create a repository, you can ensure certain labels exist by using the `Issue Labels` option. This option lists a number of available label sets that are [configured globally on your instance](../customizing-gitea/#labels). Its contained labels will all be created as well while creating the repository. ## Scoped Labels -A scoped label is a label that contains `/` in its name (not at either end of the name). For example labels `kind/bug` and `kind/enhancement` both have scope `kind`. Such labels will display the scope with slightly darker color. +Scoped labels are used to ensure at most a single label with the same scope is assigned to an issue or pull request. For example, if labels `kind/bug` and `kind/enhancement` have the Exclusive option set, an issue can only be classified as a bug or an enhancement. -The scope of a label is determined based on the **last** `/`, so for example the scope of label `scope/subscope/item` is `scope/subscope`. - -Scoped labels can be marked as exclusive. This ensures at most a single label with the same scope is assigned to an issue or pull request. For example, if `kind/bug` and `kind/enhancement` are marked exclusive, an issue can only be classified as a bug or an enhancement. +A scoped label must contain `/` in its name (not at either end of the name). The scope of a label is determined based on the **last** `/`, so for example the scope of label `scope/subscope/item` is `scope/subscope`. ## Filtering by Label diff --git a/modules/templates/helper.go b/modules/templates/helper.go index 19893c7c9d4d..822bbbd9b17c 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -834,7 +834,7 @@ func RenderLabel(ctx context.Context, label *issues_model.Label) string { // Make scope and item background colors slightly darker and lighter respectively. // More contrast needed with higher luminance, empirically tweaked. luminance := (0.299*r + 0.587*g + 0.114*b) / 255 - contrast := 0.01 + luminance*0.06 + contrast := 0.01 + luminance*0.03 // Ensure we add the same amount of contrast also near 0 and 1. darken := contrast + math.Max(luminance+contrast-1.0, 0.0) lighten := contrast + math.Max(contrast-luminance, 0.0) @@ -859,12 +859,10 @@ func RenderLabel(ctx context.Context, label *issues_model.Label) string { return fmt.Sprintf(""+ "
    %s
    "+ - "
     
    "+ "
    %s
    "+ "    ", description, textColor, scopeColor, scopeText, - itemColor, scopeColor, textColor, itemColor, itemText) } diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index b5d9a1029f45..27e11e714e74 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -2831,11 +2831,11 @@ .labels-list .label { margin: 2px 0; - display: inline-block !important; + display: inline-flex !important; line-height: 1.3em; // there is a `font-size: 1.25em` for inside emoji, so here the line-height needs to be larger slightly } -// Scoped labels with different colors on left and right, and slanted divider in the middle +// Scoped labels with different colors on left and right .scope-parent { background: none !important; padding: 0 !important; @@ -2844,23 +2844,12 @@ .ui.label.scope-left { border-bottom-right-radius: 0; border-top-right-radius: 0; - padding-right: 0; - margin-right: 0; -} - -.ui.label.scope-middle { - width: 12px; - border-radius: 0; - padding-left: 0; - padding-right: 0; - margin-left: 0; margin-right: 0; } .ui.label.scope-right { border-bottom-left-radius: 0; border-top-left-radius: 0; - padding-left: 0; margin-left: 0; } From 28af02eea013135f29ca3b917b50dfa54afe3bdf Mon Sep 17 00:00:00 2001 From: Giteabot Date: Tue, 14 Mar 2023 21:40:43 -0400 Subject: [PATCH 089/340] Fix due date being wrong on issue list (#23475) (#23477) Backport #23475 by @yardenshoham Exactly like #22302 but in the issue list page Co-authored-by: Yarden Shoham Co-authored-by: Lunny Xiao --- templates/shared/issuelist.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index 16bb3c1ec7fe..ae9cb55d44df 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -108,7 +108,7 @@ {{svg "octicon-calendar" 14 "gt-mr-2"}} - + {{end}} From 31efbafbe3047cdaff8abe6ae6719e257556307c Mon Sep 17 00:00:00 2001 From: Giteabot Date: Tue, 14 Mar 2023 22:43:10 -0400 Subject: [PATCH 090/340] Convert GitHub event on actions and fix some pull_request events. (#23037) (#23471) Backport #23037 by @lunny Follow #22680 Partially Fix #22958, on pull_request, `opened`, `reopened`, `synchronize` supported, `edited` hasn't been supported yet because Gitea doesn't trigger that events. Co-authored-by: Lunny Xiao Co-authored-by: yp05327 <576951401@qq.com> --- modules/actions/github.go | 41 +++++ modules/actions/workflows.go | 285 +++++++++++++++++++++-------------- 2 files changed, 212 insertions(+), 114 deletions(-) create mode 100644 modules/actions/github.go diff --git a/modules/actions/github.go b/modules/actions/github.go new file mode 100644 index 000000000000..bcde9a0f552e --- /dev/null +++ b/modules/actions/github.go @@ -0,0 +1,41 @@ +// Copyright 2023 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package actions + +import ( + webhook_module "code.gitea.io/gitea/modules/webhook" + + "github.com/nektos/act/pkg/jobparser" +) + +const ( + githubEventPullRequest = "pull_request" + githubEventPullRequestTarget = "pull_request_target" + githubEventPullRequestReviewComment = "pull_request_review_comment" + githubEventPullRequestReview = "pull_request_review" + githubEventRegistryPackage = "registry_package" + githubEventCreate = "create" + githubEventDelete = "delete" + githubEventFork = "fork" + githubEventPush = "push" + githubEventIssues = "issues" + githubEventIssueComment = "issue_comment" + githubEventRelease = "release" + githubEventPullRequestComment = "pull_request_comment" +) + +func convertFromGithubEvent(evt *jobparser.Event) string { + switch evt.Name { + case githubEventPullRequest, githubEventPullRequestTarget, githubEventPullRequestReview, + githubEventPullRequestReviewComment: + return string(webhook_module.HookEventPullRequest) + case githubEventRegistryPackage: + return string(webhook_module.HookEventPackage) + case githubEventCreate, githubEventDelete, githubEventFork, githubEventPush, + githubEventIssues, githubEventIssueComment, githubEventRelease, githubEventPullRequestComment: + fallthrough + default: + return evt.Name + } +} diff --git a/modules/actions/workflows.go b/modules/actions/workflows.go index 7f0e6e456436..6f4d98d52d39 100644 --- a/modules/actions/workflows.go +++ b/modules/actions/workflows.go @@ -72,9 +72,7 @@ func DetectWorkflows(commit *git.Commit, triggedEvent webhook_module.HookEventTy continue } for _, evt := range events { - if evt.Name != triggedEvent.Event() { - continue - } + log.Trace("detect workflow %q for event %#v matching %q", entry.Name(), evt, triggedEvent) if detectMatched(commit, triggedEvent, payload, evt) { workflows[entry.Name()] = content } @@ -85,138 +83,197 @@ func DetectWorkflows(commit *git.Commit, triggedEvent webhook_module.HookEventTy } func detectMatched(commit *git.Commit, triggedEvent webhook_module.HookEventType, payload api.Payloader, evt *jobparser.Event) bool { - if len(evt.Acts) == 0 { - return true + if convertFromGithubEvent(evt) != string(triggedEvent) { + return false } switch triggedEvent { - case webhook_module.HookEventCreate: - fallthrough - case webhook_module.HookEventDelete: - fallthrough - case webhook_module.HookEventFork: - log.Warn("unsupported event %q", triggedEvent.Event()) - return false + case webhook_module.HookEventCreate, + webhook_module.HookEventDelete, + webhook_module.HookEventFork, + webhook_module.HookEventIssueAssign, + webhook_module.HookEventIssueLabel, + webhook_module.HookEventIssueMilestone, + webhook_module.HookEventPullRequestAssign, + webhook_module.HookEventPullRequestLabel, + webhook_module.HookEventPullRequestMilestone, + webhook_module.HookEventPullRequestComment, + webhook_module.HookEventPullRequestReviewApproved, + webhook_module.HookEventPullRequestReviewRejected, + webhook_module.HookEventPullRequestReviewComment, + webhook_module.HookEventWiki, + webhook_module.HookEventRepository, + webhook_module.HookEventRelease, + webhook_module.HookEventPackage: + if len(evt.Acts) != 0 { + log.Warn("Ignore unsupported %s event arguments %q", triggedEvent, evt.Acts) + } + // no special filter parameters for these events, just return true if name matched + return true + case webhook_module.HookEventPush: - pushPayload := payload.(*api.PushPayload) - matchTimes := 0 - // all acts conditions should be satisfied - for cond, vals := range evt.Acts { - switch cond { - case "branches", "tags": - refShortName := git.RefName(pushPayload.Ref).ShortName() + return matchPushEvent(commit, payload.(*api.PushPayload), evt) + + case webhook_module.HookEventIssues: + return matchIssuesEvent(commit, payload.(*api.IssuePayload), evt) + + case webhook_module.HookEventPullRequest, webhook_module.HookEventPullRequestSync: + return matchPullRequestEvent(commit, payload.(*api.PullRequestPayload), evt) + + case webhook_module.HookEventIssueComment: + return matchIssueCommentEvent(commit, payload.(*api.IssueCommentPayload), evt) + + default: + log.Warn("unsupported event %q", triggedEvent) + return false + } +} + +func matchPushEvent(commit *git.Commit, pushPayload *api.PushPayload, evt *jobparser.Event) bool { + // with no special filter parameters + if len(evt.Acts) == 0 { + return true + } + + matchTimes := 0 + // all acts conditions should be satisfied + for cond, vals := range evt.Acts { + switch cond { + case "branches", "tags": + refShortName := git.RefName(pushPayload.Ref).ShortName() + for _, val := range vals { + if glob.MustCompile(val, '/').Match(refShortName) { + matchTimes++ + break + } + } + case "paths": + filesChanged, err := commit.GetFilesChangedSinceCommit(pushPayload.Before) + if err != nil { + log.Error("GetFilesChangedSinceCommit [commit_sha1: %s]: %v", commit.ID.String(), err) + } else { for _, val := range vals { - if glob.MustCompile(val, '/').Match(refShortName) { + matched := false + for _, file := range filesChanged { + if glob.MustCompile(val, '/').Match(file) { + matched = true + break + } + } + if matched { matchTimes++ break } } - case "paths": - filesChanged, err := commit.GetFilesChangedSinceCommit(pushPayload.Before) - if err != nil { - log.Error("GetFilesChangedSinceCommit [commit_sha1: %s]: %v", commit.ID.String(), err) - } else { - for _, val := range vals { - matched := false - for _, file := range filesChanged { - if glob.MustCompile(val, '/').Match(file) { - matched = true - break - } - } - if matched { - matchTimes++ - break - } - } + } + default: + log.Warn("push event unsupported condition %q", cond) + } + } + return matchTimes == len(evt.Acts) +} + +func matchIssuesEvent(commit *git.Commit, issuePayload *api.IssuePayload, evt *jobparser.Event) bool { + // with no special filter parameters + if len(evt.Acts) == 0 { + return true + } + + matchTimes := 0 + // all acts conditions should be satisfied + for cond, vals := range evt.Acts { + switch cond { + case "types": + for _, val := range vals { + if glob.MustCompile(val, '/').Match(string(issuePayload.Action)) { + matchTimes++ + break } - default: - log.Warn("unsupported condition %q", cond) } + default: + log.Warn("issue event unsupported condition %q", cond) } - return matchTimes == len(evt.Acts) + } + return matchTimes == len(evt.Acts) +} - case webhook_module.HookEventIssues: - fallthrough - case webhook_module.HookEventIssueAssign: - fallthrough - case webhook_module.HookEventIssueLabel: - fallthrough - case webhook_module.HookEventIssueMilestone: - fallthrough - case webhook_module.HookEventIssueComment: - fallthrough - case webhook_module.HookEventPullRequest: - prPayload := payload.(*api.PullRequestPayload) - matchTimes := 0 - // all acts conditions should be satisfied - for cond, vals := range evt.Acts { - switch cond { - case "types": - for _, val := range vals { - if glob.MustCompile(val, '/').Match(string(prPayload.Action)) { - matchTimes++ - break - } +func matchPullRequestEvent(commit *git.Commit, prPayload *api.PullRequestPayload, evt *jobparser.Event) bool { + // with no special filter parameters + if len(evt.Acts) == 0 { + // defaultly, only pull request opened and synchronized will trigger workflow + return prPayload.Action == api.HookIssueSynchronized || prPayload.Action == api.HookIssueOpened + } + + matchTimes := 0 + // all acts conditions should be satisfied + for cond, vals := range evt.Acts { + switch cond { + case "types": + action := prPayload.Action + if prPayload.Action == api.HookIssueSynchronized { + action = "synchronize" + } + log.Trace("matching pull_request %s with %v", action, vals) + for _, val := range vals { + if glob.MustCompile(val, '/').Match(string(action)) { + matchTimes++ + break + } + } + case "branches": + refShortName := git.RefName(prPayload.PullRequest.Base.Ref).ShortName() + for _, val := range vals { + if glob.MustCompile(val, '/').Match(refShortName) { + matchTimes++ + break } - case "branches": - refShortName := git.RefName(prPayload.PullRequest.Base.Ref).ShortName() + } + case "paths": + filesChanged, err := commit.GetFilesChangedSinceCommit(prPayload.PullRequest.Base.Ref) + if err != nil { + log.Error("GetFilesChangedSinceCommit [commit_sha1: %s]: %v", commit.ID.String(), err) + } else { for _, val := range vals { - if glob.MustCompile(val, '/').Match(refShortName) { + matched := false + for _, file := range filesChanged { + if glob.MustCompile(val, '/').Match(file) { + matched = true + break + } + } + if matched { matchTimes++ break } } - case "paths": - filesChanged, err := commit.GetFilesChangedSinceCommit(prPayload.PullRequest.Base.Ref) - if err != nil { - log.Error("GetFilesChangedSinceCommit [commit_sha1: %s]: %v", commit.ID.String(), err) - } else { - for _, val := range vals { - matched := false - for _, file := range filesChanged { - if glob.MustCompile(val, '/').Match(file) { - matched = true - break - } - } - if matched { - matchTimes++ - break - } - } + } + default: + log.Warn("pull request event unsupported condition %q", cond) + } + } + return matchTimes == len(evt.Acts) +} + +func matchIssueCommentEvent(commit *git.Commit, issueCommentPayload *api.IssueCommentPayload, evt *jobparser.Event) bool { + // with no special filter parameters + if len(evt.Acts) == 0 { + return true + } + + matchTimes := 0 + // all acts conditions should be satisfied + for cond, vals := range evt.Acts { + switch cond { + case "types": + for _, val := range vals { + if glob.MustCompile(val, '/').Match(string(issueCommentPayload.Action)) { + matchTimes++ + break } - default: - log.Warn("unsupported condition %q", cond) } + default: + log.Warn("issue comment unsupported condition %q", cond) } - return matchTimes == len(evt.Acts) - case webhook_module.HookEventPullRequestAssign: - fallthrough - case webhook_module.HookEventPullRequestLabel: - fallthrough - case webhook_module.HookEventPullRequestMilestone: - fallthrough - case webhook_module.HookEventPullRequestComment: - fallthrough - case webhook_module.HookEventPullRequestReviewApproved: - fallthrough - case webhook_module.HookEventPullRequestReviewRejected: - fallthrough - case webhook_module.HookEventPullRequestReviewComment: - fallthrough - case webhook_module.HookEventPullRequestSync: - fallthrough - case webhook_module.HookEventWiki: - fallthrough - case webhook_module.HookEventRepository: - fallthrough - case webhook_module.HookEventRelease: - fallthrough - case webhook_module.HookEventPackage: - fallthrough - default: - log.Warn("unsupported event %q", triggedEvent.Event()) } - return false + return matchTimes == len(evt.Acts) } From 5feb31f2197c3672a2ea8efc2b4226e498ab7674 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Wed, 15 Mar 2023 02:21:59 -0400 Subject: [PATCH 091/340] Bump webpack from 5.75.0 to 5.76.0 (#23484) (#23487) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Backport #23484 by @dependabot[bot] Bumps [webpack](https://github.com/webpack/webpack) from 5.75.0 to 5.76.0.
    Release notes

    Sourced from webpack's releases.

    v5.76.0

    Bugfixes

    Features

    Security

    Repo Changes

    New Contributors

    Full Changelog: https://github.com/webpack/webpack/compare/v5.75.0...v5.76.0

    Commits
    • 97b1718 Merge pull request #16781 from askoufis/loader-context-target-type
    • b84efe6 Merge pull request #16759 from ryanwilsonperkin/real-content-hash-regex-perf
    • c98e9e0 Merge pull request #16493 from piwysocki/patch-1
    • 5f34acf feat: Add target to LoaderContext type
    • b7fc4d8 Merge pull request #16703 from ryanwilsonperkin/ryanwilsonperkin/fix-16160
    • 63ea82d Merge branch 'webpack:main' into patch-1
    • 4ba2252 Merge pull request #16446 from akhilgkrishnan/patch-1
    • 1acd635 Merge pull request #16613 from jakebailey/ts-logo
    • 302eb37 Merge pull request #16614 from jakebailey/html5-logo
    • cfdb1df Improve performance of hashRegExp lookup
    • Additional commits viewable in compare view
    Maintainer changes

    This version was pushed to npm by evilebottnawi, a new releaser for webpack since your current version.


    [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=webpack&package-manager=npm_and_yarn&previous-version=5.75.0&new-version=5.76.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
    Dependabot commands and options
    You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) - `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language - `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language - `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language - `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/go-gitea/gitea/network/alerts).
    Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7ec6d09d1996..e8dbdea8e9b6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -45,7 +45,7 @@ "vue-bar-graph": "2.0.0", "vue-loader": "17.0.1", "vue3-calendar-heatmap": "2.0.0", - "webpack": "5.75.0", + "webpack": "5.76.0", "webpack-cli": "5.0.1", "workbox-routing": "6.5.4", "workbox-strategies": "6.5.4", @@ -9413,9 +9413,9 @@ } }, "node_modules/webpack": { - "version": "5.75.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz", - "integrity": "sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==", + "version": "5.76.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.0.tgz", + "integrity": "sha512-l5sOdYBDunyf72HW8dF23rFtWq/7Zgvt/9ftMof71E/yUb1YLOBmTgA2K4vQthB3kotMrSj609txVE0dnr2fjA==", "dependencies": { "@types/eslint-scope": "^3.7.3", "@types/estree": "^0.0.51", @@ -16847,9 +16847,9 @@ "dev": true }, "webpack": { - "version": "5.75.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz", - "integrity": "sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==", + "version": "5.76.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.0.tgz", + "integrity": "sha512-l5sOdYBDunyf72HW8dF23rFtWq/7Zgvt/9ftMof71E/yUb1YLOBmTgA2K4vQthB3kotMrSj609txVE0dnr2fjA==", "requires": { "@types/eslint-scope": "^3.7.3", "@types/estree": "^0.0.51", diff --git a/package.json b/package.json index c4457fe9708f..9ced009da887 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "vue-bar-graph": "2.0.0", "vue-loader": "17.0.1", "vue3-calendar-heatmap": "2.0.0", - "webpack": "5.75.0", + "webpack": "5.76.0", "webpack-cli": "5.0.1", "workbox-routing": "6.5.4", "workbox-strategies": "6.5.4", From 527bbf67e85ea20a35269c4d700cdcb04c65aaab Mon Sep 17 00:00:00 2001 From: Giteabot Date: Wed, 15 Mar 2023 05:34:05 -0400 Subject: [PATCH 092/340] Fix 'View File' button in code search (#23478) (#23483) Backport #23478 by @silverwind - Right-align 'View File' button - Add 'role' attribute to button link Before: Screenshot 2023-03-14 at 22 02 16 After: Screenshot 2023-03-14 at 22 02 33 Co-authored-by: silverwind Co-authored-by: Lunny Xiao Co-authored-by: KN4CK3R --- templates/code/searchresults.tmpl | 6 +++--- templates/repo/search.tmpl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/code/searchresults.tmpl b/templates/code/searchresults.tmpl index 74721a5a674d..684e2860bff4 100644 --- a/templates/code/searchresults.tmpl +++ b/templates/code/searchresults.tmpl @@ -11,15 +11,15 @@ {{range $result := .SearchResults}} {{$repo := (index $.RepoMaps .RepoID)}}
    -

    - +

    + {{$repo.FullName}} {{if $repo.IsArchived}} {{$.locale.Tr "repo.desc.archived"}} {{end}} - {{.Filename}} - {{$.locale.Tr "repo.diff.view_file"}} + {{$.locale.Tr "repo.diff.view_file"}}

    diff --git a/templates/repo/search.tmpl b/templates/repo/search.tmpl index 21f758e4a902..ff4e218e2def 100644 --- a/templates/repo/search.tmpl +++ b/templates/repo/search.tmpl @@ -39,9 +39,9 @@
    {{range $result := .SearchResults}}
    -

    - {{.Filename}} - {{$.locale.Tr "repo.diff.view_file"}} +

    + {{.Filename}} + {{$.locale.Tr "repo.diff.view_file"}}

    From d73846f0b47874bb24053e445e7506b256ce7dcf Mon Sep 17 00:00:00 2001 From: Giteabot Date: Wed, 15 Mar 2023 06:20:51 -0400 Subject: [PATCH 093/340] Disable sending email after push a commit to a closed PR (#23462) (#23492) Backport #23462 by @sillyguodong Close #23440 Cause by #23189 In #23189, we should insert a comment record into db when pushing a commit to the PR, even if the PR is closed. But should skip sending any notification in this case. Co-authored-by: sillyguodong <33891828+sillyguodong@users.noreply.github.com> Co-authored-by: Lunny Xiao Co-authored-by: KN4CK3R --- services/pull/pull.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/pull/pull.go b/services/pull/pull.go index d8923d0d5725..a5541b84606b 100644 --- a/services/pull/pull.go +++ b/services/pull/pull.go @@ -274,9 +274,12 @@ func AddTestPullRequestTask(doer *user_model.User, repoID int64, branch string, continue } + // If the PR is closed, someone still push some commits to the PR, + // 1. We will insert comments of commits, but hidden until the PR is reopened. + // 2. We won't send any notification. AddToTaskQueue(pr) comment, err := CreatePushPullComment(ctx, doer, pr, oldCommitID, newCommitID) - if err == nil && comment != nil { + if err == nil && comment != nil && !pr.Issue.IsClosed { notification.NotifyPullRequestPushCommits(ctx, doer, pr, comment) } } From 70e31b4aa0f1137d423cbcaddfbe96a23ff23d1d Mon Sep 17 00:00:00 2001 From: Giteabot Date: Wed, 15 Mar 2023 17:04:27 -0400 Subject: [PATCH 094/340] Update path to docs theme file (#23502) (#23505) Backport #23502 by @techknowlogick The branch name for the theme was updated to main Co-authored-by: techknowlogick --- docs/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Makefile b/docs/Makefile index f47ad4de3ca6..0178cd3587d2 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -1,6 +1,6 @@ THEME := themes/gitea PUBLIC := public -ARCHIVE := https://dl.gitea.io/theme/master.tar.gz +ARCHIVE := https://dl.gitea.com/theme/main.tar.gz HUGO_PACKAGE := github.com/gohugoio/hugo@v0.82.0 From b7c2f48ebfd7ab2c834f08aaa24626d1109dd542 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Thu, 16 Mar 2023 22:33:11 +0800 Subject: [PATCH 095/340] Update act (#23512) (#23518) Backport #23512. Update replace: ```diff - replace github.com/nektos/act => gitea.com/gitea/act v0.234.2-0.20230131074955-e46ede1b1744 + replace github.com/nektos/act => gitea.com/gitea/act v0.243.1 ``` Update require: ```diff - github.com/nektos/act v0.0.0 + github.com/nektos/act v0.2.43 ``` Actually, `v0.2.43` doesn't work, it will be replaced by `gitea/act`, so it's OK to put any version here. But `gitea/act` is based on `nektos/act`, so keeping the right upstream version will make security dependabot help. BTW, the [security report](https://github.com/go-gitea/gitea/security/dependabot/20) is false positive, we don't use the artifact server in act, see #22738. --- assets/go-licenses.json | 5 ----- go.mod | 13 ++++++------- go.sum | 25 ++++++++++++------------- 3 files changed, 18 insertions(+), 25 deletions(-) diff --git a/assets/go-licenses.json b/assets/go-licenses.json index e78e7968ac06..3fcbf3e58ce4 100644 --- a/assets/go-licenses.json +++ b/assets/go-licenses.json @@ -414,11 +414,6 @@ "path": "github.com/go-git/go-git/v5/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 2018 Sourced Technologies, S.L.\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/go-ini/ini", - "path": "github.com/go-ini/ini/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 2014 Unknwon\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/go-ldap/ldap/v3", "path": "github.com/go-ldap/ldap/v3/LICENSE", diff --git a/go.mod b/go.mod index 343a70da25a0..53e8b45182c6 100644 --- a/go.mod +++ b/go.mod @@ -41,7 +41,7 @@ require ( github.com/go-chi/cors v1.2.1 github.com/go-enry/go-enry/v2 v2.8.3 github.com/go-fed/httpsig v1.1.1-0.20201223112313-55836744818e - github.com/go-git/go-billy/v5 v5.4.0 + github.com/go-git/go-billy/v5 v5.4.1 github.com/go-git/go-git/v5 v5.5.2 github.com/go-ldap/ldap/v3 v3.4.4 github.com/go-redis/redis/v8 v8.11.5 @@ -77,7 +77,7 @@ require ( github.com/microcosm-cc/bluemonday v1.0.21 github.com/minio/minio-go/v7 v7.0.46 github.com/msteinert/pam v1.1.0 - github.com/nektos/act v0.0.0 + github.com/nektos/act v0.2.43 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 github.com/niklasfasching/go-org v1.6.5 github.com/oliamb/cutter v0.2.2 @@ -105,7 +105,7 @@ require ( golang.org/x/crypto v0.4.0 golang.org/x/net v0.7.0 golang.org/x/oauth2 v0.3.0 - golang.org/x/sys v0.5.0 + golang.org/x/sys v0.6.0 golang.org/x/text v0.7.0 golang.org/x/tools v0.1.12 google.golang.org/grpc v1.47.0 @@ -172,7 +172,6 @@ require ( github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect github.com/go-enry/go-oniguruma v1.2.1 // indirect github.com/go-git/gcfg v1.5.0 // indirect - github.com/go-ini/ini v1.67.0 // indirect github.com/go-openapi/analysis v0.21.4 // indirect github.com/go-openapi/errors v0.20.3 // indirect github.com/go-openapi/inflect v0.19.0 // indirect @@ -239,7 +238,7 @@ require ( github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect - github.com/rhysd/actionlint v1.6.22 // indirect + github.com/rhysd/actionlint v1.6.23 // indirect github.com/rivo/uniseg v0.4.3 // indirect github.com/robfig/cron v1.2.0 // indirect github.com/rogpeppe/go-internal v1.9.0 // indirect @@ -271,7 +270,7 @@ require ( go.uber.org/multierr v1.9.0 // indirect go.uber.org/zap v1.24.0 // indirect golang.org/x/mod v0.7.0 // indirect - golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect + golang.org/x/sync v0.1.0 // indirect golang.org/x/time v0.3.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90 // indirect @@ -286,7 +285,7 @@ replace github.com/shurcooL/vfsgen => github.com/lunny/vfsgen v0.0.0-20220105142 replace github.com/blevesearch/zapx/v15 v15.3.6 => github.com/zeripath/zapx/v15 v15.3.6-alignment-fix -replace github.com/nektos/act => gitea.com/gitea/act v0.234.2-0.20230131074955-e46ede1b1744 +replace github.com/nektos/act => gitea.com/gitea/act v0.243.1 exclude github.com/gofrs/uuid v3.2.0+incompatible diff --git a/go.sum b/go.sum index 7eb420b02b03..31109683f877 100644 --- a/go.sum +++ b/go.sum @@ -70,8 +70,8 @@ codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570/go.mod h1:IIAjsi dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 h1:cliQ4HHsCo6xi2oWZYKWW4bly/Ory9FuTpFPRxj/mAg= git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078/go.mod h1:g/V2Hjas6Z1UHUp4yIx6bATpNzJ7DYtD0FG3+xARWxs= -gitea.com/gitea/act v0.234.2-0.20230131074955-e46ede1b1744 h1:cqzKmGlX0wynSXO04NILpL25eBGwogDrKpkkbwmIpj4= -gitea.com/gitea/act v0.234.2-0.20230131074955-e46ede1b1744/go.mod h1:2C/WbTalu1VPNgbVaZJaZDzlOtAKqkXJhdOClxkMy14= +gitea.com/gitea/act v0.243.1 h1:zIVlhGOLE4SHFPW++u3+5Y/jX5mub3QIhB13oNf6rtA= +gitea.com/gitea/act v0.243.1/go.mod h1:iLHCXqOPUElA2nSyHo4wtxSmvdkym3WU7CkP3AxF39Q= gitea.com/go-chi/binding v0.0.0-20221013104517-b29891619681 h1:MMSPgnVULVwV9kEBgvyEUhC9v/uviZ55hPJEMjpbNR4= gitea.com/go-chi/binding v0.0.0-20221013104517-b29891619681/go.mod h1:77TZu701zMXWJFvB8gvTbQ92zQ3DQq/H7l5wAEjQRKc= gitea.com/go-chi/cache v0.0.0-20210110083709-82c4c9ce2d5e/go.mod h1:k2V/gPDEtXGjjMGuBJiapffAXTv76H4snSmlJRLUhH0= @@ -402,8 +402,9 @@ github.com/go-fed/httpsig v1.1.1-0.20201223112313-55836744818e/go.mod h1:RCMrTZv github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4= github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E= github.com/go-git/go-billy/v5 v5.3.1/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= -github.com/go-git/go-billy/v5 v5.4.0 h1:Vaw7LaSTRJOUric7pe4vnzBSgyuf2KrLsu2Y4ZpQBDE= github.com/go-git/go-billy/v5 v5.4.0/go.mod h1:vjbugF6Fz7JIflbVpl1hJsGjSHNltrSw45YK/ukIvQg= +github.com/go-git/go-billy/v5 v5.4.1 h1:Uwp5tDRkPr+l/TnbHOQzp+tmJfLceOlbVucgpTz8ix4= +github.com/go-git/go-billy/v5 v5.4.1/go.mod h1:vjbugF6Fz7JIflbVpl1hJsGjSHNltrSw45YK/ukIvQg= github.com/go-git/go-git-fixtures/v4 v4.3.1 h1:y5z6dd3qi8Hl+stezc8p3JxDkoTRqMAlKnXHuzrfjTQ= github.com/go-git/go-git-fixtures/v4 v4.3.1/go.mod h1:8LHG1a3SRW71ettAD/jW13h8c6AqjVSeL11RAdgaqpo= github.com/go-git/go-git/v5 v5.5.2 h1:v8lgZa5k9ylUw+OR/roJHTxR4QItsNFI5nKtAXFuynw= @@ -411,8 +412,6 @@ github.com/go-git/go-git/v5 v5.5.2/go.mod h1:BE5hUJ5yaV2YMxhmaP4l6RBQ08kMxKSPD4B github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A= -github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= @@ -791,7 +790,7 @@ github.com/jhillyerd/enmime v0.10.1 h1:3VP8gFhK7R948YJBrna5bOgnTXEuPAoICo79kKkBK github.com/jhillyerd/enmime v0.10.1/go.mod h1:Qpe8EEemJMFAF8+NZoWdpXvK2Yb9dRF0k/z6mkcDHsA= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= -github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg= +github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= @@ -1099,8 +1098,8 @@ github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqn github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= -github.com/rhysd/actionlint v1.6.22 h1:cAEf2PGNwJXhdcTVF2xS/0ORqWS+ueUHwjQYsqFsGSk= -github.com/rhysd/actionlint v1.6.22/go.mod h1:gIKOdxtV40mBOcD0ZR8EBa8NqjEXToAZioroS3oedMg= +github.com/rhysd/actionlint v1.6.23 h1:041VOXgZddfvSJa9Il+WT3Iwuo/j0Nmu4bhpAScrds4= +github.com/rhysd/actionlint v1.6.23/go.mod h1:o5qc1K3I9taGMBhL7mVkpRd64hx3YqI+3t8ewGfYXfE= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw= @@ -1501,8 +1500,8 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde h1:ejfdSekXMDxDLbRrJMwUk6KnSLZ2McaUCVcIKM+N6jc= -golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1610,14 +1609,14 @@ golang.org/x/sys v0.0.0-20220825204002-c680a09ffe64/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= -golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= +golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= From 23a6fa9421cfcf67754ff962782dcf99e6491bb9 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Thu, 16 Mar 2023 17:23:11 -0400 Subject: [PATCH 096/340] Make time tooltips interactive (#23526) (#23527) Backport #23526 by @silverwind Fixes https://codeberg.org/forgejo/forgejo/issues/511 Screenshot 2023-03-16 at 20 23 10 Co-authored-by: silverwind --- modules/timeutil/since.go | 4 ++-- web_src/js/modules/tippy.js | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/timeutil/since.go b/modules/timeutil/since.go index 295ba7c10e72..53c22258c4f3 100644 --- a/modules/timeutil/since.go +++ b/modules/timeutil/since.go @@ -233,7 +233,7 @@ func TimeSince(then time.Time, lang translation.Locale) template.HTML { } func htmlTimeSince(then, now time.Time, lang translation.Locale) template.HTML { - return template.HTML(fmt.Sprintf(`%s`, + return template.HTML(fmt.Sprintf(`%s`, then.In(setting.DefaultUILocation).Format(GetTimeFormat(lang.Language())), timeSince(then, now, lang))) } @@ -244,7 +244,7 @@ func TimeSinceUnix(then TimeStamp, lang translation.Locale) template.HTML { } func htmlTimeSinceUnix(then, now TimeStamp, lang translation.Locale) template.HTML { - return template.HTML(fmt.Sprintf(`%s`, + return template.HTML(fmt.Sprintf(`%s`, then.FormatInLocation(GetTimeFormat(lang.Language()), setting.DefaultUILocation), timeSinceUnix(int64(then), int64(now), lang))) } diff --git a/web_src/js/modules/tippy.js b/web_src/js/modules/tippy.js index ce8f0369f11c..720f8ba53b9b 100644 --- a/web_src/js/modules/tippy.js +++ b/web_src/js/modules/tippy.js @@ -33,6 +33,7 @@ export function initTooltip(el, props = {}) { content, delay: 100, role: 'tooltip', + ...(el.getAttribute('data-tooltip-interactive') === 'true' ? {interactive: true} : {}), ...props, }); } From 8f8bd3c0cb19d30a4872000d1f8ab554a408f1e7 Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 17 Mar 2023 02:04:39 +0100 Subject: [PATCH 097/340] Replace Less with CSS (#23508) Backport https://github.com/go-gitea/gitea/pull/23481, https://github.com/go-gitea/gitea/pull/23504 and https://github.com/go-gitea/gitea/pull/23520 to 1.19, just so we have an easier time with future backports. Seems to work on a basic level. There was a merge conflict in `RepoActionView.vue`, otherwise it merged cleanly. --------- Co-authored-by: John Olheiser Co-authored-by: Lauris BH --- .stylelintrc.yaml | 2 - Makefile | 6 +- .../doc/advanced/customizing-gitea.en-us.md | 2 +- .../developers/guidelines-frontend.en-us.md | 4 +- package-lock.json | 186 +- package.json | 7 +- web_src/css/admin.css | 110 + .../animations.less => css/animations.css} | 0 web_src/{less/_base.less => css/base.css} | 1278 +++--- .../chroma/base.less => css/chroma/base.css} | 8 +- .../chroma/dark.less => css/chroma/dark.css} | 0 .../light.less => css/chroma/light.css} | 0 .../code/linebutton.css} | 0 .../base.less => css/codemirror/base.css} | 16 +- web_src/css/codemirror/dark.css | 106 + .../light.less => css/codemirror/light.css} | 0 .../console.less => css/console/console.css} | 2 +- web_src/css/dashboard.css | 203 + web_src/{less/_editor.less => css/editor.css} | 0 web_src/css/explore.css | 88 + .../features/codeeditor.css} | 0 .../features/dropzone.css} | 25 +- web_src/css/features/gitgraph.css | 317 ++ web_src/css/features/heatmap.css | 68 + web_src/css/features/imagediff.css | 107 + .../features/projects.css} | 62 +- web_src/css/font_i18n.css | 393 ++ web_src/css/form.css | 547 +++ .../{less/helpers.less => css/helpers.css} | 2 +- web_src/css/home.css | 53 + web_src/css/index.css | 40 + web_src/css/install.css | 65 + .../markup/asciicast.css} | 0 .../codecopy.less => css/markup/codecopy.css} | 5 +- web_src/css/markup/content.css | 559 +++ .../tippy.less => css/modules/tippy.css} | 4 +- web_src/css/organization.css | 250 ++ web_src/css/package.css | 7 + web_src/css/repository.css | 3629 +++++++++++++++++ web_src/css/review.css | 322 ++ web_src/css/runner.css | 54 + web_src/css/shared/issuelist.css | 166 + .../standalone/swagger.css} | 2 +- web_src/{less/_svg.less => css/svg.css} | 6 +- .../themes/theme-arc-green.css} | 6 +- web_src/css/themes/theme-auto.css | 1 + .../{less/_tribute.less => css/tribute.css} | 10 +- web_src/css/user.css | 173 + web_src/js/components/RepoActionView.vue | 262 +- web_src/less/_admin.less | 115 - web_src/less/_dashboard.less | 198 - web_src/less/_explore.less | 93 - web_src/less/_font_i18n.less | 130 - web_src/less/_form.less | 378 -- web_src/less/_home.less | 61 - web_src/less/_install.less | 72 - web_src/less/_organization.less | 200 - web_src/less/_package.less | 9 - web_src/less/_review.less | 324 -- web_src/less/_runner.less | 45 - web_src/less/_user.less | 183 - web_src/less/chroma/chroma-style-diff.go | 79 - web_src/less/codemirror/dark.less | 89 - web_src/less/features/gitgraph.less | 325 -- web_src/less/features/heatmap.less | 67 - web_src/less/features/imagediff.less | 105 - web_src/less/index.less | 42 - web_src/less/markup/content.less | 559 --- web_src/less/shared/issuelist.less | 167 - web_src/less/themes/theme-auto.less | 3 - web_src/less/variables.less | 14 - webpack.config.js | 31 +- 72 files changed, 8251 insertions(+), 4191 deletions(-) create mode 100644 web_src/css/admin.css rename web_src/{less/animations.less => css/animations.css} (100%) rename web_src/{less/_base.less => css/base.css} (77%) rename web_src/{less/chroma/base.less => css/chroma/base.css} (87%) rename web_src/{less/chroma/dark.less => css/chroma/dark.css} (100%) rename web_src/{less/chroma/light.less => css/chroma/light.css} (100%) rename web_src/{less/code/linebutton.less => css/code/linebutton.css} (100%) rename web_src/{less/codemirror/base.less => css/codemirror/base.css} (71%) create mode 100644 web_src/css/codemirror/dark.css rename web_src/{less/codemirror/light.less => css/codemirror/light.css} (100%) rename web_src/{less/console/console.less => css/console/console.css} (98%) create mode 100644 web_src/css/dashboard.css rename web_src/{less/_editor.less => css/editor.css} (100%) create mode 100644 web_src/css/explore.css rename web_src/{less/features/codeeditor.less => css/features/codeeditor.css} (100%) rename web_src/{less/features/dropzone.less => css/features/dropzone.css} (75%) create mode 100644 web_src/css/features/gitgraph.css create mode 100644 web_src/css/features/heatmap.css create mode 100644 web_src/css/features/imagediff.css rename web_src/{less/features/projects.less => css/features/projects.css} (67%) create mode 100644 web_src/css/font_i18n.css create mode 100644 web_src/css/form.css rename web_src/{less/helpers.less => css/helpers.css} (99%) create mode 100644 web_src/css/home.css create mode 100644 web_src/css/index.css create mode 100644 web_src/css/install.css rename web_src/{less/markup/asciicast.less => css/markup/asciicast.css} (100%) rename web_src/{less/markup/codecopy.less => css/markup/codecopy.css} (92%) create mode 100644 web_src/css/markup/content.css rename web_src/{less/modules/tippy.less => css/modules/tippy.css} (96%) create mode 100644 web_src/css/organization.css create mode 100644 web_src/css/package.css create mode 100644 web_src/css/repository.css create mode 100644 web_src/css/review.css create mode 100644 web_src/css/runner.css create mode 100644 web_src/css/shared/issuelist.css rename web_src/{less/standalone/swagger.less => css/standalone/swagger.css} (94%) rename web_src/{less/_svg.less => css/svg.css} (64%) rename web_src/{less/themes/theme-arc-green.less => css/themes/theme-arc-green.css} (98%) create mode 100644 web_src/css/themes/theme-auto.css rename web_src/{less/_tribute.less => css/tribute.css} (80%) create mode 100644 web_src/css/user.css delete mode 100644 web_src/less/_admin.less delete mode 100644 web_src/less/_dashboard.less delete mode 100644 web_src/less/_explore.less delete mode 100644 web_src/less/_font_i18n.less delete mode 100644 web_src/less/_form.less delete mode 100644 web_src/less/_home.less delete mode 100644 web_src/less/_install.less delete mode 100644 web_src/less/_organization.less delete mode 100644 web_src/less/_package.less delete mode 100644 web_src/less/_review.less delete mode 100644 web_src/less/_runner.less delete mode 100644 web_src/less/_user.less delete mode 100644 web_src/less/chroma/chroma-style-diff.go delete mode 100644 web_src/less/codemirror/dark.less delete mode 100644 web_src/less/features/gitgraph.less delete mode 100644 web_src/less/features/heatmap.less delete mode 100644 web_src/less/features/imagediff.less delete mode 100644 web_src/less/index.less delete mode 100644 web_src/less/markup/content.less delete mode 100644 web_src/less/shared/issuelist.less delete mode 100644 web_src/less/themes/theme-auto.less delete mode 100644 web_src/less/variables.less diff --git a/.stylelintrc.yaml b/.stylelintrc.yaml index c488d0677f18..62660fcf9440 100644 --- a/.stylelintrc.yaml +++ b/.stylelintrc.yaml @@ -5,8 +5,6 @@ ignoreFiles: - "**/*.go" overrides: - - files: ["**/*.less"] - customSyntax: postcss-less - files: ["**/chroma/*", "**/codemirror/*", "**/standalone/*", "**/console/*"] rules: scale-unlimited/declaration-strict-value: null diff --git a/Makefile b/Makefile index 8bfc7ddcaff8..a43f53e795e6 100644 --- a/Makefile +++ b/Makefile @@ -105,7 +105,7 @@ GO_TEST_PACKAGES ?= $(filter-out $(shell $(GO) list code.gitea.io/gitea/models/m FOMANTIC_WORK_DIR := web_src/fomantic -WEBPACK_SOURCES := $(shell find web_src/js web_src/less -type f) +WEBPACK_SOURCES := $(shell find web_src/js web_src/css -type f) WEBPACK_CONFIGS := webpack.config.js WEBPACK_DEST := public/js/index.js public/css/index.css WEBPACK_DEST_ENTRIES := public/js public/css public/fonts public/img/webpack public/serviceworker.js @@ -131,7 +131,7 @@ TEST_TAGS ?= sqlite sqlite_unlock_notify TAR_EXCLUDES := .git data indexers queues log node_modules $(EXECUTABLE) $(FOMANTIC_WORK_DIR)/node_modules $(DIST) $(MAKE_EVIDENCE_DIR) $(AIR_TMP_DIR) $(GO_LICENSE_TMP_DIR) GO_DIRS := cmd tests models modules routers build services tools -WEB_DIRS := web_src/js web_src/less +WEB_DIRS := web_src/js web_src/css GO_SOURCES := $(wildcard *.go) GO_SOURCES += $(shell find $(GO_DIRS) -type f -name "*.go" -not -path modules/options/bindata.go -not -path modules/public/bindata.go -not -path modules/templates/bindata.go) @@ -341,7 +341,7 @@ lint: lint-frontend lint-backend .PHONY: lint-frontend lint-frontend: node_modules npx eslint --color --max-warnings=0 --ext js,vue web_src/js build *.config.js docs/assets/js tests/e2e - npx stylelint --color --max-warnings=0 web_src/less + npx stylelint --color --max-warnings=0 web_src/css npx spectral lint -q -F hint $(SWAGGER_SPEC) npx markdownlint docs *.md diff --git a/docs/content/doc/advanced/customizing-gitea.en-us.md b/docs/content/doc/advanced/customizing-gitea.en-us.md index bad6342aad44..4c0235c04aca 100644 --- a/docs/content/doc/advanced/customizing-gitea.en-us.md +++ b/docs/content/doc/advanced/customizing-gitea.en-us.md @@ -354,7 +354,7 @@ To make a custom theme available to all users: Community themes are listed in [gitea/awesome-gitea#themes](https://gitea.com/gitea/awesome-gitea#themes). -The `arc-green` theme source can be found [here](https://github.com/go-gitea/gitea/blob/main/web_src/less/themes/theme-arc-green.less). +The `arc-green` theme source can be found [here](https://github.com/go-gitea/gitea/blob/main/web_src/css/themes/theme-arc-green.css). If your custom theme is considered a dark theme, set the global css variable `--is-dark-theme` to `true`. This allows Gitea to adjust the Monaco code editor's theme accordingly. diff --git a/docs/content/doc/developers/guidelines-frontend.en-us.md b/docs/content/doc/developers/guidelines-frontend.en-us.md index 7f4d87d9011e..e801ee4c4bf3 100644 --- a/docs/content/doc/developers/guidelines-frontend.en-us.md +++ b/docs/content/doc/developers/guidelines-frontend.en-us.md @@ -21,13 +21,13 @@ menu: ## Background -Gitea uses [Less CSS](https://lesscss.org), [Fomantic-UI](https://fomantic-ui.com/introduction/getting-started.html) (based on [jQuery](https://api.jquery.com)) and [Vue3](https://vuejs.org/) for its frontend. +Gitea uses [Fomantic-UI](https://fomantic-ui.com/introduction/getting-started.html) (based on [jQuery](https://api.jquery.com)) and [Vue3](https://vuejs.org/) for its frontend. The HTML pages are rendered by [Go HTML Template](https://pkg.go.dev/html/template). The source files can be found in the following directories: -* **Less styles:** `web_src/less/` +* **CSS styles:** `web_src/css/` * **JavaScript files:** `web_src/js/` * **Vue components:** `web_src/js/components/` * **Go HTML templates:** `templates/` diff --git a/package-lock.json b/package-lock.json index e8dbdea8e9b6..29335dade1a5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,11 +28,9 @@ "jquery": "3.6.3", "jquery.are-you-sure": "1.9.0", "katex": "0.16.4", - "less": "4.1.3", - "less-loader": "11.1.0", "license-checker-webpack-plugin": "0.2.1", "mermaid": "10.0.2", - "mini-css-extract-plugin": "2.7.2", + "mini-css-extract-plugin": "2.7.4", "monaco-editor": "0.34.1", "monaco-editor-webpack-plugin": "7.0.1", "pretty-ms": "8.0.0", @@ -45,7 +43,7 @@ "vue-bar-graph": "2.0.0", "vue-loader": "17.0.1", "vue3-calendar-heatmap": "2.0.0", - "webpack": "5.76.0", + "webpack": "5.76.2", "webpack-cli": "5.0.1", "workbox-routing": "6.5.4", "workbox-strategies": "6.5.4", @@ -64,7 +62,6 @@ "eslint-plugin-vue": "9.9.0", "jsdom": "21.0.0", "markdownlint-cli": "0.33.0", - "postcss-less": "6.0.0", "stylelint": "15.2.0", "stylelint-declaration-strict-value": "1.9.2", "svgo": "3.0.2", @@ -2667,6 +2664,9 @@ "version": "2.0.6", "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz", "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==", + "dev": true, + "optional": true, + "peer": true, "dependencies": { "is-what": "^3.14.1" }, @@ -3813,7 +3813,9 @@ "version": "0.1.8", "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz", "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==", + "dev": true, "optional": true, + "peer": true, "dependencies": { "prr": "~1.0.1" }, @@ -5240,7 +5242,9 @@ "version": "0.5.5", "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz", "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==", + "dev": true, "optional": true, + "peer": true, "bin": { "image-size": "bin/image-size.js" }, @@ -5675,7 +5679,10 @@ "node_modules/is-what": { "version": "3.14.1", "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz", - "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==" + "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==", + "dev": true, + "optional": true, + "peer": true }, "node_modules/isarray": { "version": "0.0.1", @@ -5933,14 +5940,6 @@ "node": ">=0.10.0" } }, - "node_modules/klona": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz", - "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==", - "engines": { - "node": ">= 8" - } - }, "node_modules/known-css-properties": { "version": "0.26.0", "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.26.0.tgz", @@ -5956,6 +5955,9 @@ "version": "4.1.3", "resolved": "https://registry.npmjs.org/less/-/less-4.1.3.tgz", "integrity": "sha512-w16Xk/Ta9Hhyei0Gpz9m7VS8F28nieJaL/VyShID7cYvP6IL5oHeL6p4TXSDJqZE/lNv0oJ2pGVjJsRkfwm5FA==", + "dev": true, + "optional": true, + "peer": true, "dependencies": { "copy-anything": "^2.0.1", "parse-node-version": "^1.0.1", @@ -5977,25 +5979,6 @@ "source-map": "~0.6.0" } }, - "node_modules/less-loader": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-11.1.0.tgz", - "integrity": "sha512-C+uDBV7kS7W5fJlUjq5mPBeBVhYpTIm5gB09APT9o3n/ILeaXVsiSFTbZpTJCJwQ/Crczfn3DmfQFwxYusWFug==", - "dependencies": { - "klona": "^2.0.4" - }, - "engines": { - "node": ">= 14.15.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "less": "^3.5.0 || ^4.0.0", - "webpack": "^5.0.0" - } - }, "node_modules/leven": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", @@ -6201,7 +6184,9 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", + "dev": true, "optional": true, + "peer": true, "dependencies": { "pify": "^4.0.1", "semver": "^5.6.0" @@ -6214,7 +6199,9 @@ "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true, "optional": true, + "peer": true, "bin": { "semver": "bin/semver" } @@ -6505,7 +6492,9 @@ "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "dev": true, "optional": true, + "peer": true, "bin": { "mime": "cli.js" }, @@ -6542,9 +6531,9 @@ } }, "node_modules/mini-css-extract-plugin": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.2.tgz", - "integrity": "sha512-EdlUizq13o0Pd+uCp+WO/JpkLvHRVGt97RqfeGhXqAcorYo1ypJSpkV+WDT0vY/kmh/p7wRdJNJtuyK540PXDw==", + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.4.tgz", + "integrity": "sha512-V5zkjajQx9gnedglDap7ZjD1mNFNISzyllzrc+9+R4iwPRUAR0St20ADflQbWkVUQ2u/QU55t8mKaxUek8Cciw==", "dependencies": { "schema-utils": "^4.0.0" }, @@ -6637,7 +6626,7 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "devOptional": true + "dev": true }, "node_modules/nanoid": { "version": "3.3.4", @@ -6660,7 +6649,9 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/needle/-/needle-3.2.0.tgz", "integrity": "sha512-oUvzXnyLiVyVGoianLijF9O/RecZUf7TkBfimjGrLM4eQhXyeJwM6GeAWccwfQ9aa4gMCZKqhAOuLaMIcQxajQ==", + "dev": true, "optional": true, + "peer": true, "dependencies": { "debug": "^3.2.6", "iconv-lite": "^0.6.3", @@ -6677,7 +6668,9 @@ "version": "3.2.7", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, "optional": true, + "peer": true, "dependencies": { "ms": "^2.1.1" } @@ -7047,6 +7040,9 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz", "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==", + "dev": true, + "optional": true, + "peer": true, "engines": { "node": ">= 0.10" } @@ -7148,7 +7144,9 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "dev": true, "optional": true, + "peer": true, "engines": { "node": ">=6" } @@ -7288,18 +7286,6 @@ "node": "^10 || ^12 || >=14" } }, - "node_modules/postcss-less": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-6.0.0.tgz", - "integrity": "sha512-FPX16mQLyEjLzEuuJtxA8X3ejDLNGGEG503d2YGZR5Ask1SpDN8KmZUMpzCvyalWRywAn1n1VOA5dcqfCLo5rg==", - "dev": true, - "engines": { - "node": ">=12" - }, - "peerDependencies": { - "postcss": "^8.3.5" - } - }, "node_modules/postcss-media-query-parser": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz", @@ -7481,7 +7467,9 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==", - "optional": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/psl": { "version": "1.9.0", @@ -7987,7 +7975,9 @@ "version": "1.2.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", - "optional": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/saxes": { "version": "6.0.0", @@ -8917,7 +8907,8 @@ "node_modules/tslib": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", - "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" + "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==", + "dev": true }, "node_modules/type-check": { "version": "0.4.0", @@ -9413,9 +9404,9 @@ } }, "node_modules/webpack": { - "version": "5.76.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.0.tgz", - "integrity": "sha512-l5sOdYBDunyf72HW8dF23rFtWq/7Zgvt/9ftMof71E/yUb1YLOBmTgA2K4vQthB3kotMrSj609txVE0dnr2fjA==", + "version": "5.76.2", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.2.tgz", + "integrity": "sha512-Th05ggRm23rVzEOlX8y67NkYCHa9nTNcwHPBhdg+lKG+mtiW7XgggjAeeLnADAe7mLjJ6LUNfgHAuRRh+Z6J7w==", "dependencies": { "@types/eslint-scope": "^3.7.3", "@types/estree": "^0.0.51", @@ -11852,6 +11843,9 @@ "version": "2.0.6", "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz", "integrity": "sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==", + "dev": true, + "optional": true, + "peer": true, "requires": { "is-what": "^3.14.1" } @@ -12710,7 +12704,9 @@ "version": "0.1.8", "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz", "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==", + "dev": true, "optional": true, + "peer": true, "requires": { "prr": "~1.0.1" } @@ -13783,7 +13779,9 @@ "version": "0.5.5", "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz", "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==", - "optional": true + "dev": true, + "optional": true, + "peer": true }, "immer": { "version": "9.0.18", @@ -14076,7 +14074,10 @@ "is-what": { "version": "3.14.1", "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz", - "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==" + "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==", + "dev": true, + "optional": true, + "peer": true }, "isarray": { "version": "0.0.1", @@ -14269,11 +14270,6 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" }, - "klona": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz", - "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==" - }, "known-css-properties": { "version": "0.26.0", "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.26.0.tgz", @@ -14289,6 +14285,9 @@ "version": "4.1.3", "resolved": "https://registry.npmjs.org/less/-/less-4.1.3.tgz", "integrity": "sha512-w16Xk/Ta9Hhyei0Gpz9m7VS8F28nieJaL/VyShID7cYvP6IL5oHeL6p4TXSDJqZE/lNv0oJ2pGVjJsRkfwm5FA==", + "dev": true, + "optional": true, + "peer": true, "requires": { "copy-anything": "^2.0.1", "errno": "^0.1.1", @@ -14302,14 +14301,6 @@ "tslib": "^2.3.0" } }, - "less-loader": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-11.1.0.tgz", - "integrity": "sha512-C+uDBV7kS7W5fJlUjq5mPBeBVhYpTIm5gB09APT9o3n/ILeaXVsiSFTbZpTJCJwQ/Crczfn3DmfQFwxYusWFug==", - "requires": { - "klona": "^2.0.4" - } - }, "leven": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", @@ -14484,7 +14475,9 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", + "dev": true, "optional": true, + "peer": true, "requires": { "pify": "^4.0.1", "semver": "^5.6.0" @@ -14494,7 +14487,9 @@ "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "optional": true + "dev": true, + "optional": true, + "peer": true } } }, @@ -14721,7 +14716,9 @@ "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "optional": true + "dev": true, + "optional": true, + "peer": true }, "mime-db": { "version": "1.52.0", @@ -14743,9 +14740,9 @@ "dev": true }, "mini-css-extract-plugin": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.2.tgz", - "integrity": "sha512-EdlUizq13o0Pd+uCp+WO/JpkLvHRVGt97RqfeGhXqAcorYo1ypJSpkV+WDT0vY/kmh/p7wRdJNJtuyK540PXDw==", + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.4.tgz", + "integrity": "sha512-V5zkjajQx9gnedglDap7ZjD1mNFNISzyllzrc+9+R4iwPRUAR0St20ADflQbWkVUQ2u/QU55t8mKaxUek8Cciw==", "requires": { "schema-utils": "^4.0.0" } @@ -14817,7 +14814,7 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "devOptional": true + "dev": true }, "nanoid": { "version": "3.3.4", @@ -14834,7 +14831,9 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/needle/-/needle-3.2.0.tgz", "integrity": "sha512-oUvzXnyLiVyVGoianLijF9O/RecZUf7TkBfimjGrLM4eQhXyeJwM6GeAWccwfQ9aa4gMCZKqhAOuLaMIcQxajQ==", + "dev": true, "optional": true, + "peer": true, "requires": { "debug": "^3.2.6", "iconv-lite": "^0.6.3", @@ -14845,7 +14844,9 @@ "version": "3.2.7", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, "optional": true, + "peer": true, "requires": { "ms": "^2.1.1" } @@ -15127,7 +15128,10 @@ "parse-node-version": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz", - "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==" + "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==", + "dev": true, + "optional": true, + "peer": true }, "parse5": { "version": "7.1.2", @@ -15198,7 +15202,9 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "optional": true + "dev": true, + "optional": true, + "peer": true }, "pkg-dir": { "version": "4.2.0", @@ -15296,13 +15302,6 @@ "source-map-js": "^1.0.2" } }, - "postcss-less": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-6.0.0.tgz", - "integrity": "sha512-FPX16mQLyEjLzEuuJtxA8X3ejDLNGGEG503d2YGZR5Ask1SpDN8KmZUMpzCvyalWRywAn1n1VOA5dcqfCLo5rg==", - "dev": true, - "requires": {} - }, "postcss-media-query-parser": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz", @@ -15433,7 +15432,9 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==", - "optional": true + "dev": true, + "optional": true, + "peer": true }, "psl": { "version": "1.9.0", @@ -15792,7 +15793,9 @@ "version": "1.2.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", - "optional": true + "dev": true, + "optional": true, + "peer": true }, "saxes": { "version": "6.0.0", @@ -16527,7 +16530,8 @@ "tslib": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", - "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" + "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==", + "dev": true }, "type-check": { "version": "0.4.0", @@ -16847,9 +16851,9 @@ "dev": true }, "webpack": { - "version": "5.76.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.0.tgz", - "integrity": "sha512-l5sOdYBDunyf72HW8dF23rFtWq/7Zgvt/9ftMof71E/yUb1YLOBmTgA2K4vQthB3kotMrSj609txVE0dnr2fjA==", + "version": "5.76.2", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.2.tgz", + "integrity": "sha512-Th05ggRm23rVzEOlX8y67NkYCHa9nTNcwHPBhdg+lKG+mtiW7XgggjAeeLnADAe7mLjJ6LUNfgHAuRRh+Z6J7w==", "requires": { "@types/eslint-scope": "^3.7.3", "@types/estree": "^0.0.51", diff --git a/package.json b/package.json index 9ced009da887..afc7752257ab 100644 --- a/package.json +++ b/package.json @@ -28,11 +28,9 @@ "jquery": "3.6.3", "jquery.are-you-sure": "1.9.0", "katex": "0.16.4", - "less": "4.1.3", - "less-loader": "11.1.0", "license-checker-webpack-plugin": "0.2.1", "mermaid": "10.0.2", - "mini-css-extract-plugin": "2.7.2", + "mini-css-extract-plugin": "2.7.4", "monaco-editor": "0.34.1", "monaco-editor-webpack-plugin": "7.0.1", "pretty-ms": "8.0.0", @@ -45,7 +43,7 @@ "vue-bar-graph": "2.0.0", "vue-loader": "17.0.1", "vue3-calendar-heatmap": "2.0.0", - "webpack": "5.76.0", + "webpack": "5.76.2", "webpack-cli": "5.0.1", "workbox-routing": "6.5.4", "workbox-strategies": "6.5.4", @@ -64,7 +62,6 @@ "eslint-plugin-vue": "9.9.0", "jsdom": "21.0.0", "markdownlint-cli": "0.33.0", - "postcss-less": "6.0.0", "stylelint": "15.2.0", "stylelint-declaration-strict-value": "1.9.2", "svgo": "3.0.2", diff --git a/web_src/css/admin.css b/web_src/css/admin.css new file mode 100644 index 000000000000..00ed675e2d57 --- /dev/null +++ b/web_src/css/admin.css @@ -0,0 +1,110 @@ +.admin.hooks .list > .item:not(:first-child) { + border-top: 1px solid var(--color-secondary); + padding: 0.25rem 1rem; + margin: 12px -1rem -1rem; +} + +.admin .table.segment { + padding: 0; + font-size: 13px; + overflow-x: auto; +} + +.admin .table.segment:not(.striped) thead th:last-child { + padding-right: 5px !important; +} + +.admin .table.segment th { + padding-top: 5px; + padding-bottom: 5px; +} + +.admin .table.segment:not(.select) th:first-of-type, +.admin .table.segment:not(.select) td:first-of-type { + padding-left: 15px !important; +} + +.admin .table.segment form tbody button[type="submit"] { + padding: 5px 8px; +} + +.admin .settings .button.adopt, +.admin .settings .button.delete { + margin-top: -15px; + margin-bottom: -15px; +} + +.admin .settings .button.adopt .label, +.admin .settings .button.delete .label { + vertical-align: middle; +} + +.admin.user .email { + max-width: 200px; +} + +.admin dl.admin-dl-horizontal { + padding: 20px; + margin: 0; +} + +.admin dl.admin-dl-horizontal dd { + margin-left: 275px; +} + +@media (max-width: 767px) { + .admin dl.admin-dl-horizontal dd { + margin-left: 5%; + } +} + +.admin dl.admin-dl-horizontal dt { + font-weight: 600; + float: left; + width: 285px; + clear: left; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +@media (max-width: 767px) { + .admin dl.admin-dl-horizontal dt { + width: auto; + margin-right: 0.5em; + } +} + +.admin.config #test-mail-btn { + margin-left: 5px; +} + +.admin code, +.admin pre { + white-space: pre-wrap; + word-wrap: break-word; +} + +@media (max-width: 767px) { + .admin #notice-table .notice-description { + max-width: 80vw; + } +} + +@media (min-width: 768px) and (max-width: 991px) { + .admin #notice-table .notice-description { + max-width: 360px; + } +} + +@media (min-width: 992px) and (max-width: 1200px) { + .admin #notice-table .notice-description { + max-width: 510px; + } +} + +@media (min-width: 1201px) { + .admin #notice-table .notice-description { + max-width: 640px; + } +} diff --git a/web_src/less/animations.less b/web_src/css/animations.css similarity index 100% rename from web_src/less/animations.less rename to web_src/css/animations.css diff --git a/web_src/less/_base.less b/web_src/css/base.css similarity index 77% rename from web_src/less/_base.less rename to web_src/css/base.css index 1cf65e784cd4..2e6281391fd8 100644 --- a/web_src/less/_base.less +++ b/web_src/css/base.css @@ -7,8 +7,8 @@ --checkbox-mask-checked: url('data:image/svg+xml;utf8,'); --checkbox-mask-indeterminate: url('data:image/svg+xml;utf8,'); /* non-color variables */ - --border-radius: .28571429rem; - --opacity-disabled: .55; + --border-radius: 0.28571429rem; + --opacity-disabled: 0.55; --height-loading: 12rem; /* base colors */ --color-primary: #4183c4; @@ -183,7 +183,6 @@ --color-accent: var(--color-primary-light-1); --color-small-accent: var(--color-primary-light-6); --color-active-line: #fffbdd; - accent-color: var(--color-accent); color-scheme: light; } @@ -200,7 +199,7 @@ pre, code, kbd, samp { - font-size: .9em; /* compensate for monospace fonts being usually slightly larger */ + font-size: 0.9em; /* compensate for monospace fonts being usually slightly larger */ font-family: var(--fonts-monospace); } @@ -226,7 +225,7 @@ body { @supports (overflow: overlay) { body { - overflow: overlay; // stylelint-disable-line + overflow: overlay; /* stylelint-disable-line */ scrollbar-gutter: stable; } } @@ -253,12 +252,15 @@ progress { border: none; overflow: hidden; } + progress::-webkit-progress-bar { background: var(--color-secondary-dark-1); } + progress::-webkit-progress-value { background-color: var(--color-accent); } + progress::-moz-progress-bar { background-color: var(--color-accent); } @@ -272,17 +274,21 @@ progress::-moz-progress-bar { width: 10px; height: 10px; } + ::-webkit-scrollbar-thumb { box-shadow: inset 0 0 0 6px var(--color-primary); border: 2px solid transparent; border-radius: 5px !important; } + ::-webkit-scrollbar-thumb:window-inactive { box-shadow: inset 0 0 0 6px var(--color-primary); } + ::-webkit-scrollbar-thumb:hover { box-shadow: inset 0 0 0 6px var(--color-primary-dark-2); } + ::-webkit-scrollbar-corner { background: transparent; } @@ -293,6 +299,7 @@ progress::-moz-progress-bar { background: var(--color-light); border-radius: var(--border-radius); } + ::file-selector-button:hover { color: var(--color-text); background: var(--color-hover); @@ -310,6 +317,17 @@ progress::-moz-progress-bar { opacity: 1 !important; } +.unselectable, +.button, +.lines-num, +.lines-commit, +.lines-commit .blame-info, +.ellipsis-button { + -webkit-touch-callout: none; + -webkit-user-select: none; + user-select: none; +} + a, .ui.breadcrumb a { color: var(--color-primary); @@ -350,15 +368,18 @@ a.label, .ui.red.buttons .button { background: var(--color-red); } + .ui.red.button:hover, .ui.red.buttons .button:hover { background: var(--color-red-light); } + .ui.basic.red.buttons .button, .ui.basic.red.button { color: var(--color-red); border-color: var(--color-red); } + .ui.basic.red.buttons .button:hover, .ui.basic.red.button:hover { color: var(--color-red-light); @@ -371,15 +392,18 @@ a.label, .ui.orange.buttons .button { background: var(--color-orange); } + .ui.orange.button:hover, .ui.orange.buttons .button:hover { background: var(--color-orange-light); } + .ui.basic.orange.buttons .button, .ui.basic.orange.button { color: var(--color-orange); border-color: var(--color-orange); } + .ui.basic.orange.buttons .button:hover, .ui.basic.orange.button:hover { color: var(--color-orange-light); @@ -392,15 +416,18 @@ a.label, .ui.yellow.buttons .button { background: var(--color-yellow); } + .ui.yellow.button:hover, .ui.yellow.buttons .button:hover { background: var(--color-yellow-light); } + .ui.basic.yellow.buttons .button, .ui.basic.yellow.button { color: var(--color-yellow); border-color: var(--color-yellow); } + .ui.basic.yellow.buttons .button:hover, .ui.basic.yellow.button:hover { color: var(--color-yellow-light); @@ -413,15 +440,18 @@ a.label, .ui.olive.buttons .button { background: var(--color-olive); } + .ui.olive.button:hover, .ui.olive.buttons .button:hover { background: var(--color-olive-light); } + .ui.basic.olive.buttons .button, .ui.basic.olive.button { color: var(--color-olive); border-color: var(--color-olive); } + .ui.basic.olive.buttons .button:hover, .ui.basic.olive.button:hover { color: var(--color-olive-light); @@ -434,15 +464,18 @@ a.label, .ui.green.buttons .button { background: var(--color-green); } + .ui.green.button:hover, .ui.green.buttons .button:hover { background: var(--color-green-light); } + .ui.basic.green.buttons .button, .ui.basic.green.button { color: var(--color-green); border-color: var(--color-green); } + .ui.basic.green.buttons .button:hover, .ui.basic.green.button:hover { color: var(--color-green-light); @@ -455,15 +488,18 @@ a.label, .ui.teal.buttons .button { background: var(--color-teal); } + .ui.teal.button:hover, .ui.teal.buttons .button:hover { background: var(--color-teal-light); } + .ui.basic.teal.buttons .button, .ui.basic.teal.button { color: var(--color-teal); border-color: var(--color-teal); } + .ui.basic.teal.buttons .button:hover, .ui.basic.teal.button:hover { color: var(--color-teal-light); @@ -476,15 +512,18 @@ a.label, .ui.blue.buttons .button { background: var(--color-blue); } + .ui.blue.button:hover, .ui.blue.buttons .button:hover { background: var(--color-blue-light); } + .ui.basic.blue.buttons .button, .ui.basic.blue.button { color: var(--color-blue); border-color: var(--color-blue); } + .ui.basic.blue.buttons .button:hover, .ui.basic.blue.button:hover { color: var(--color-blue-light); @@ -497,15 +536,18 @@ a.label, .ui.violet.buttons .button { background: var(--color-violet); } + .ui.violet.button:hover, .ui.violet.buttons .button:hover { background: var(--color-violet-light); } + .ui.basic.violet.buttons .button, .ui.basic.violet.button { color: var(--color-violet); border-color: var(--color-violet); } + .ui.basic.violet.buttons .button:hover, .ui.basic.violet.button:hover { color: var(--color-violet-light); @@ -518,15 +560,18 @@ a.label, .ui.purple.buttons .button { background: var(--color-purple); } + .ui.purple.button:hover, .ui.purple.buttons .button:hover { background: var(--color-purple-light); } + .ui.basic.purple.buttons .button, .ui.basic.purple.button { color: var(--color-purple); border-color: var(--color-purple); } + .ui.basic.purple.buttons .button:hover, .ui.basic.purple.button:hover { color: var(--color-purple-light); @@ -539,15 +584,18 @@ a.label, .ui.pink.buttons .button { background: var(--color-pink); } + .ui.pink.button:hover, .ui.pink.buttons .button:hover { background: var(--color-pink-light); } + .ui.basic.pink.buttons .button, .ui.basic.pink.button { color: var(--color-pink); border-color: var(--color-pink); } + .ui.basic.pink.buttons .button:hover, .ui.basic.pink.button:hover { color: var(--color-pink-light); @@ -560,15 +608,18 @@ a.label, .ui.brown.buttons .button { background: var(--color-brown); } + .ui.brown.button:hover, .ui.brown.buttons .button:hover { background: var(--color-brown-light); } + .ui.basic.brown.buttons .button, .ui.basic.brown.button { color: var(--color-brown); border-color: var(--color-brown); } + .ui.basic.brown.buttons .button:hover, .ui.basic.brown.button:hover { color: var(--color-brown-light); @@ -581,15 +632,18 @@ a.label, .ui.grey.buttons .button { background: var(--color-grey); } + .ui.grey.button:hover, .ui.grey.buttons .button:hover { background: var(--color-grey-light); } + .ui.basic.grey.buttons .button, .ui.basic.grey.button { color: var(--color-grey); border-color: var(--color-grey); } + .ui.basic.grey.buttons .button:hover, .ui.basic.grey.button:hover { color: var(--color-grey-light); @@ -602,15 +656,18 @@ a.label, .ui.black.buttons .button { background: var(--color-black); } + .ui.black.button:hover, .ui.black.buttons .button:hover { background: var(--color-black-light); } + .ui.basic.black.buttons .button, .ui.basic.black.button { color: var(--color-black); border-color: var(--color-black); } + .ui.basic.black.buttons .button:hover, .ui.basic.black.button:hover { color: var(--color-black-light); @@ -664,21 +721,12 @@ a.label, background: var(--color-hover); } -.unselectable { - -webkit-touch-callout: none; - -webkit-user-select: none; - user-select: none; -} - -.button { - &:extend(.unselectable); -} - .issue-title code { padding: 2px 4px; border-radius: 6px; background-color: var(--color-markup-code-block); } + /* try to match button with no icons in height */ .icon-button { padding-top: 7.42px !important; @@ -720,10 +768,10 @@ a.label, /* currently used for search bar dropdowns in repo search and explore code */ .ui.action.input:not([class*="left action"]) > .ui.dropdown.selection { min-width: 10em; +} - &:not(:focus,:hover) { - border-right-color: transparent; - } +.ui.action.input:not([class*="left action"]) > .ui.dropdown.selection:not(:focus,:hover) { + border-right-color: transparent; } .ui.action.input:not([class*="left action"]) > input:focus { @@ -738,10 +786,11 @@ a.label, .ui.menu .item { color: var(--color-text); + user-select: auto; +} - > .svg { - margin-right: .35em; - } +.ui.menu .item > .svg { + margin-right: 0.35em; } .ui.menu .item > .label { @@ -812,11 +861,12 @@ a.label, /* fix misaligned images in webhook dropdown */ .ui.dropdown .menu > .item > img { - margin-top: -.25rem; - margin-bottom: -.25rem; + margin-top: -0.25rem; + margin-bottom: -0.25rem; } + .ui.dropdown .menu > .item > svg.img { - margin-right: .78571429rem; + margin-right: 0.78571429rem; } .ui.selection.dropdown .menu > .item { @@ -871,8 +921,8 @@ a.label, } .ui.secondary.menu.tight .item { - padding-left: .85714286em; - padding-right: .85714286em; + padding-left: 0.85714286em; + padding-right: 0.85714286em; } .ui.menu .dropdown.item .menu { @@ -1179,7 +1229,7 @@ a.ui.card:hover, } /* enable fluid page widths for medium size viewports */ -@media @mediaMdAndUp and @mediaLgAndDown { +@media (min-width: 768px) and (max-width: 1200px) { .ui.ui.ui.container:not(.fluid) { width: calc(100vw - 3em); } @@ -1189,83 +1239,79 @@ a.ui.card:hover, z-index: 900; left: 0; margin: 0 !important; +} - &.light { - background: var(--color-header-bar); - border-bottom: 1px solid var(--color-secondary); - } +.following.bar.light { + background: var(--color-header-bar); + border-bottom: 1px solid var(--color-secondary); +} - .column .menu { - margin-top: 0; - } +.following.bar .column .menu { + margin-top: 0; +} - .top.menu a.item.brand { - padding-left: 0; - } +.following.bar .top.menu a.item.brand { + padding-left: 0; +} - .top.menu a.item:hover, - .top.menu .dropdown.item:hover, - .top.menu .dropdown.item.active { - background-color: transparent; - } +.following.bar .top.menu a.item:hover, +.following.bar .top.menu .dropdown.item:hover, +.following.bar .top.menu .dropdown.item.active { + background-color: transparent; +} - .top.menu a.item:hover { - color: rgba(0, 0, 0, .45); - } +.following.bar .top.menu a.item:hover { + color: rgba(0, 0, 0, 0.45); +} - .top.menu .menu { - z-index: 900; - } +.following.bar .top.menu .menu { + z-index: 900; +} - .fitted .svg { - margin-right: 0; - vertical-align: middle; - } +.following.bar .fitted .svg { + margin-right: 0; + vertical-align: middle; +} - .searchbox { - background-color: var(--color-input-background) !important; - } +.following.bar .searchbox { + background-color: var(--color-input-background) !important; +} - .text .svg { - width: 16px; - text-align: center; - } +.following.bar .text .svg { + width: 16px; + text-align: center; +} - #navbar { - width: 100vw; - min-height: 52px; - padding: 0 .5rem; - } +.following.bar #navbar { + width: 100vw; + min-height: 52px; + padding: 0 0.5rem; +} - #navbar .brand { - margin: 0; - } +.following.bar #navbar .brand { + margin: 0; +} - #navbar .dropdown .avatar { - margin-right: 0 !important; - } +.following.bar #navbar .dropdown .avatar { + margin-right: 0 !important; +} - @media @mediaSm { - #navbar:not(.shown) > *:not(:first-child) { - display: none; - } +@media (max-width: 767px) { + .following.bar #navbar:not(.shown) > *:not(:first-child) { + display: none; } } .right.stackable.menu { - // responsive fix: this makes sure that the right menu when the page - // is on mobile view will have elements stacked on top of each other. - // no, stackable won't work on right menus. + /* responsive fix: this makes sure that the right menu when the page */ + /* is on mobile view will have elements stacked on top of each other. */ + /* no, stackable won't work on right menus. */ margin-left: auto; display: flex; align-items: inherit; flex-direction: inherit; } -.ui.dropdown .menu { - border-color: var(--color-secondary); -} - .ui.pagination.menu .active.item { color: var(--color-text); background: var(--color-active); @@ -1282,7 +1328,7 @@ a.ui.card:hover, .ui.loading.form > *, .ui.loading.segment > * { - opacity: .35; + opacity: 0.35; } .ui.form .fields.error .field textarea, @@ -1358,8 +1404,8 @@ a.ui.card:hover, border-color: var(--color-error-border) !important; } -// A fix for text visibility issue in Chrome autofill in dark mode. -// It's a problem from Formatic UI, and this rule overrides it. +/* A fix for text visibility issue in Chrome autofill in dark mode. */ +/* It's a problem from Formatic UI, and this rule overrides it. */ .ui.form .field.field input:-webkit-autofill { -webkit-text-fill-color: var(--color-black) !important; } @@ -1372,372 +1418,384 @@ a.ui.card:hover, visibility: hidden; } -.text.primary { color: var(--color-primary) !important; } -.text.red { color: var(--color-red) !important; } -.text.orange { color: var(--color-orange) !important; } -.text.yellow { color: var(--color-yellow) !important; } -.text.olive { color: var(--color-olive) !important; } -.text.green { color: var(--color-green) !important; } -.text.teal { color: var(--color-teal) !important; } -.text.blue { color: var(--color-blue) !important; } -.text.violet { color: var(--color-violet) !important; } -.text.purple { color: var(--color-purple) !important; } -.text.pink { color: var(--color-pink) !important; } -.text.brown { color: var(--color-brown) !important; } -.text.black { color: var(--color-text) !important; } -.text.grey { color: var(--color-text-light) !important; } -.text.light.grey { color: var(--color-grey-light) !important; } -.text.gold { color: var(--color-gold) !important; } - -.ui { - &.left:not(.action) { - float: left; - } +.text.primary { + color: var(--color-primary) !important; +} - &.right:not(.action) { - float: right; - } +.text.red { + color: var(--color-red) !important; +} - &.menu .item { - user-select: auto; - } +.text.orange { + color: var(--color-orange) !important; +} - &.container { - &.fluid { - &.padded { - padding: 0 10px; - } - } - } +.text.yellow { + color: var(--color-yellow) !important; +} - &.form { - .ui.button { - font-weight: normal; - } - } +.text.olive { + color: var(--color-olive) !important; +} - &.floating.label { - z-index: 10; - } +.text.green { + color: var(--color-green) !important; +} - &.transparent.label { - background-color: transparent; - } +.text.teal { + color: var(--color-teal) !important; +} - &.menu, - &.vertical.menu, - &.segment { - box-shadow: none; - } +.text.blue { + color: var(--color-blue) !important; +} - /* Override semantic selector '.ui.menu:not(.vertical) .item > .button' */ - /* This fixes the commit graph button on the commits page */ +.text.violet { + color: var(--color-violet) !important; +} - .menu:not(.vertical) .item > .button.compact { - padding: .58928571em 1.125em; - } +.text.purple { + color: var(--color-purple) !important; +} - .menu:not(.vertical) .item > .button.small { - font-size: .92857143rem; - } +.text.pink { + color: var(--color-pink) !important; +} - &.menu .ui.dropdown.item .menu .item { - width: 100%; - } +.text.brown { + color: var(--color-brown) !important; +} - &.dropdown .menu > .item > .floating.label { - z-index: 11; - } +.text.black { + color: var(--color-text) !important; +} - &.dropdown .menu .menu > .item > .floating.label { - z-index: 21; - } +.text.grey { + color: var(--color-text-light) !important; +} - &.dropdown .menu > .header { - font-size: .8em; - } +.text.light.grey { + color: var(--color-grey-light) !important; +} - .text { - &.left { - text-align: left !important; - } - - &.right { - text-align: right !important; - } - - &.small { - font-size: .75em; - } - - &.normal { - font-weight: normal; - } - - &.italic { - font-style: italic; - } - - &.truncate { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - display: inline-block; - } - - &.thin { - font-weight: normal; - } - - &.middle { - vertical-align: middle; - } - } +.text.gold { + color: var(--color-gold) !important; +} - .message { - text-align: center; - } +.ui.left:not(.action) { + float: left; +} - .message > ul { - margin-left: auto; - margin-right: auto; - display: table; - text-align: left; - } +.ui.right:not(.action) { + float: right; +} - .header > i + .content { - padding-left: .75rem; - vertical-align: middle; - } +.ui.container.fluid.padded { + padding: 0 10px; +} - .info { - &.segment { - &.top { - h3, - h4 { - margin-top: 0; - } - - h3:last-child { - margin-top: 4px; - } - - > :last-child { - margin-bottom: 0; - } - } - } - } +.ui.form .ui.button { + font-weight: normal; +} - .normal.header { - font-weight: normal; - } +.ui.floating.label { + z-index: 10; +} - .form { - .autofill-dummy { - position: absolute; - width: 1px; - height: 1px; - overflow: hidden; - z-index: -10000; - } - .sub.field { - margin-left: 25px; - } - } +.ui.transparent.label { + background-color: transparent; +} - .sha.label { - font-family: var(--fonts-monospace); - font-size: 13px; - padding: 6px 10px 4px; - font-weight: normal; - margin: 0 6px; - } +.ui.menu, +.ui.vertical.menu, +.ui.segment { + box-shadow: none; +} - .button.copy-commit-sha { - border: 1px solid var(--color-light-border); - margin-right: 3px; - padding: 6px 6px 4px; - background: var(--color-light); - } +/* Override semantic selector '.ui.menu:not(.vertical) .item > .button' */ +/* This fixes the commit graph button on the commits page */ +/* modal svg icons, copied from fomantic except width and height */ +/* center text in fomantic modal dialogs */ +.ui .menu:not(.vertical) .item > .button.compact { + padding: 0.58928571em 1.125em; +} - .button.truncate { - display: inline-block; - max-width: 100%; - overflow: hidden; - text-overflow: ellipsis; - vertical-align: top; - white-space: nowrap; - margin-right: 6px; - } +.ui .menu:not(.vertical) .item > .button.small { + font-size: 0.92857143rem; +} - &.status.buttons { - .svg { - margin-right: 4px; - } - } +.ui.menu .ui.dropdown.item .menu .item { + width: 100%; +} - &.inline.delete-button { - padding: 8px 15px; - font-weight: normal; - } +.ui.dropdown .menu > .item > .floating.label { + z-index: 11; +} - .background { - &.red { - background-color: var(--color-red) !important; - } +.ui.dropdown .menu .menu > .item > .floating.label { + z-index: 21; +} - &.blue { - background-color: var(--color-blue) !important; - } +.ui.dropdown .menu > .header { + font-size: 0.8em; +} - &.black { - background-color: var(--color-black) !important; - } +.ui .text.left { + text-align: left !important; +} - &.grey { - background-color: var(--color-grey) !important; - } +.ui .text.right { + text-align: right !important; +} - &.light.grey { - background-color: var(--color-grey) !important; - } +.ui .text.small { + font-size: 0.75em; +} - &.green { - background-color: var(--color-green) !important; - } +.ui .text.normal { + font-weight: normal; +} - &.purple { - background-color: var(--color-purple) !important; - } +.ui .text.italic { + font-style: italic; +} - &.yellow { - background-color: var(--color-yellow) !important; - } +.ui .text.truncate { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + display: inline-block; +} - &.orange { - background-color: var(--color-orange) !important; - } +.ui .text.thin { + font-weight: normal; +} - &.gold { - background-color: var(--color-gold) !important; - } - } +.ui .text.middle { + vertical-align: middle; +} - .migrate { - color: var(--color-text-light-2) !important; +.ui .message { + text-align: center; +} - a { - color: var(--color-text-light) !important; +.ui .message > ul { + margin-left: auto; + margin-right: auto; + display: table; + text-align: left; +} - &:hover { - color: var(--color-text) !important; - } - } - } +.ui .header > i + .content { + padding-left: 0.75rem; + vertical-align: middle; +} - .border { - border: 1px solid; - &.red { - border-color: var(--color-red) !important; - } +.ui .info.segment.top h3, +.ui .info.segment.top h4 { + margin-top: 0; +} - &.blue { - border-color: var(--color-blue) !important; - } +.ui .info.segment.top h3:last-child { + margin-top: 4px; +} - &.black { - border-color: var(--color-black) !important; - } +.ui .info.segment.top > :last-child { + margin-bottom: 0; +} - &.grey { - border-color: var(--color-grey) !important; - } +.ui .normal.header { + font-weight: normal; +} - &.light.grey { - border-color: var(--color-grey) !important; - } +.ui .form .autofill-dummy { + position: absolute; + width: 1px; + height: 1px; + overflow: hidden; + z-index: -10000; +} - &.green { - border-color: var(--color-green) !important; - } +.ui .form .sub.field { + margin-left: 25px; +} - &.purple { - border-color: var(--color-purple) !important; - } +.ui .sha.label { + font-family: var(--fonts-monospace); + font-size: 13px; + padding: 6px 10px 4px; + font-weight: normal; + margin: 0 6px; +} - &.yellow { - border-color: var(--color-yellow) !important; - } +.ui .button.copy-commit-sha { + border: 1px solid var(--color-light-border); + margin-right: 3px; + padding: 6px 6px 4px; + background: var(--color-light); +} - &.orange { - border-color: var(--color-orange) !important; - } +.ui .button.truncate { + display: inline-block; + max-width: 100%; + overflow: hidden; + text-overflow: ellipsis; + vertical-align: top; + white-space: nowrap; + margin-right: 6px; +} - &.gold { - border-color: var(--color-gold) !important; - } - } +.ui.status.buttons .svg { + margin-right: 4px; +} - .branch-tag-choice { - line-height: 20px; - } +.ui.inline.delete-button { + padding: 8px 15px; + font-weight: normal; +} - &.pagination.menu { - @media @mediaSm { - .item:not(.active,.navigation), - .item.navigation span.navigation_label { - display: none; - } - } - &.narrow .item { - padding-left: 8px; - padding-right: 8px; - min-width: 1em; - text-align: center; - .icon { - margin-right: 0; - } - } - } +.ui .background.red { + background-color: var(--color-red) !important; +} - /* modal svg icons, copied from fomantic except width and height */ - &.icon.header svg { - width: 3em; - height: 3em; - float: none; - display: block; - line-height: 1; - padding: 0; - margin: 0 auto .5rem; - opacity: 1; - } +.ui .background.blue { + background-color: var(--color-blue) !important; +} - /* center text in fomantic modal dialogs */ - &.modal > .content { - text-align: center; - } +.ui .background.black { + background-color: var(--color-black) !important; +} + +.ui .background.grey { + background-color: var(--color-grey) !important; +} + +.ui .background.light.grey { + background-color: var(--color-grey) !important; +} + +.ui .background.green { + background-color: var(--color-green) !important; +} + +.ui .background.purple { + background-color: var(--color-purple) !important; +} + +.ui .background.yellow { + background-color: var(--color-yellow) !important; +} + +.ui .background.orange { + background-color: var(--color-orange) !important; +} + +.ui .background.gold { + background-color: var(--color-gold) !important; +} + +.ui .migrate { + color: var(--color-text-light-2) !important; +} + +.ui .migrate a { + color: var(--color-text-light) !important; +} + +.ui .migrate a:hover { + color: var(--color-text) !important; +} + +.ui .border { + border: 1px solid; +} + +.ui .border.red { + border-color: var(--color-red) !important; +} + +.ui .border.blue { + border-color: var(--color-blue) !important; +} + +.ui .border.black { + border-color: var(--color-black) !important; +} + +.ui .border.grey { + border-color: var(--color-grey) !important; +} + +.ui .border.light.grey { + border-color: var(--color-grey) !important; } -.ui.floating.dropdown { - .overflow.menu { - .scrolling.menu.items { - border-radius: 0 !important; - box-shadow: none !important; - border-bottom: 1px solid var(--color-secondary); - } +.ui .border.green { + border-color: var(--color-green) !important; +} + +.ui .border.purple { + border-color: var(--color-purple) !important; +} + +.ui .border.yellow { + border-color: var(--color-yellow) !important; +} + +.ui .border.orange { + border-color: var(--color-orange) !important; +} + +.ui .border.gold { + border-color: var(--color-gold) !important; +} + +.ui .branch-tag-choice { + line-height: 20px; +} + +@media (max-width: 767px) { + .ui.pagination.menu .item:not(.active,.navigation), + .ui.pagination.menu .item.navigation span.navigation_label { + display: none; } } +.ui.pagination.menu.narrow .item { + padding-left: 8px; + padding-right: 8px; + min-width: 1em; + text-align: center; +} + +.ui.pagination.menu.narrow .item .icon { + margin-right: 0; +} + +.ui.icon.header svg { + width: 3em; + height: 3em; + float: none; + display: block; + line-height: 1; + padding: 0; + margin: 0 auto 0.5rem; + opacity: 1; +} + +.ui.floating.dropdown .overflow.menu .scrolling.menu.items { + border-radius: 0 !important; + box-shadow: none !important; + border-bottom: 1px solid var(--color-secondary); +} + .user-menu > .item { width: 100%; border-radius: 0 !important; } -.scrolling.menu { - .item.selected { - font-weight: 600 !important; - } +.scrolling.menu .item.selected { + font-weight: 600 !important; } .ui.dropdown .scrolling.menu { @@ -1746,10 +1804,10 @@ a.ui.card:hover, .color-preview { display: inline-block; - margin-left: .4em; - height: .67em; - width: .67em; - border-radius: .15em; + margin-left: 0.4em; + height: 0.67em; + width: 0.67em; + border-radius: 0.15em; } .attention-icon { @@ -1772,70 +1830,73 @@ footer { width: 100%; flex-basis: 40px; color: var(--color-text-light); +} - .container { - width: 100vw !important; - padding: 0 .5rem; - max-width: calc(100vw - 1rem) !important; +footer .container { + width: 100vw !important; + padding: 0 0.5rem; + max-width: calc(100vw - 1rem) !important; +} - .links > * { - border-left: 1px solid var(--color-secondary-dark-1); - padding-left: 8px; - margin-left: 5px; +footer .container .links > * { + border-left: 1px solid var(--color-secondary-dark-1); + padding-left: 8px; + margin-left: 5px; +} - &:first-child { - border-left: 0; - } - } - } +footer .container .links > *:first-child { + border-left: 0; +} - .ui.language { - .menu { - max-height: 500px; - overflow-y: auto; - margin-bottom: 7px; - } - - .svg { - margin-right: .15em; - vertical-align: top; - margin-top: calc(2em - 16px); - } - } +footer .ui.language .menu { + max-height: 500px; + overflow-y: auto; + margin-bottom: 7px; +} - .ui { - &.left, - &.right { - line-height: 39px; // there is a border-top on the footer, so make the line-height 1px less - } - } +footer .ui.language .svg { + margin-right: 0.15em; + vertical-align: top; + margin-top: calc(2em - 16px); +} + +footer .ui.left, +footer .ui.right { + line-height: 39px; /* there is a border-top on the footer, so make the line-height 1px less */ } .center:not(.popup) { text-align: center; } -// Conditional display -@media @mediaMdAndUp { +/* Conditional display */ +@media (min-width: 768px) { .mobile-only, .ui.button.mobile-only { display: none !important; } - // has the same behaviour of sr-only, hiding the content for - // non-screenreaders, but is shown on mobile devices. + /* has the same behaviour of sr-only, hiding the content for */ + /* non-screenreaders, but is shown on mobile devices. */ .sr-mobile-only { - .sr-only(); + position: absolute; + width: 1px; + height: 1px; + padding: 0; + margin: -1px; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; } } -@media @mediaSm { +@media (max-width: 767px) { .not-mobile { display: none !important; } } -// Accessibility +/* Accessibility for screen readers */ .sr-only { position: absolute; width: 1px; @@ -1857,7 +1918,7 @@ footer { clip: auto; } -@media @mediaMd { +@media (min-width: 768px) and (max-width: 991px) { .ui.container { width: 95%; } @@ -1897,7 +1958,7 @@ footer { margin: 0 !important; } -@media @mediaSm { +@media (max-width: 767px) { .ui.menu.new-menu .item { width: auto !important; } @@ -1937,7 +1998,6 @@ footer { border-bottom-width: 0 !important; margin-bottom: 2px !important; justify-content: space-evenly; - } .ui.secondary.pointing.menu.repos-filter .item { @@ -1952,19 +2012,19 @@ footer { flex: 1; word-break: break-all; color: var(--color-text-light); +} - .avatar { - width: 32px !important; - height: 32px !important; - } +.repo-title .avatar { + width: 32px !important; + height: 32px !important; +} - .labels { - margin-left: .5rem; +.repo-title .labels { + margin-left: 0.5rem; +} - > * + * { - margin-left: .5rem; - } - } +.repo-title .labels > * + * { + margin-left: 0.5rem; } .repo-icon { @@ -1992,16 +2052,16 @@ footer { .inline-grouped-list { display: inline-block; vertical-align: top; +} - > .ui { - display: block; - margin-top: 5px; - margin-bottom: 10px; +.inline-grouped-list > .ui { + display: block; + margin-top: 5px; + margin-bottom: 10px; +} - &:first-child { - margin-top: 1px; - } - } +.inline-grouped-list > .ui:first-child { + margin-top: 1px; } i.icons .icon:first-child { @@ -2013,7 +2073,7 @@ i.icon.centerlock { } .ui.label { - padding: .3em .5em; + padding: 0.3em 0.5em; background: var(--color-light); color: var(--color-text-light); } @@ -2026,7 +2086,7 @@ a.ui.label:hover { } .ui.label > .detail .icons { - margin-right: .25em; + margin-right: 0.25em; } .ui.label > .detail .icons .icon { @@ -2042,29 +2102,24 @@ a.ui.label:hover { } .lines-num { - &:extend(.unselectable); padding-left: 10px; padding-right: 10px; text-align: right !important; color: var(--color-text-light-1); width: 1%; font-family: var(--fonts-monospace); +} - span { - &.bottom-line { - &::after { - border-bottom: 1px solid var(--color-secondary); - } - } - - &::after { - content: attr(data-line-number); - line-height: 20px !important; - padding: 0 10px; - cursor: pointer; - display: block; - } - } +.lines-num span.bottom-line::after { + border-bottom: 1px solid var(--color-secondary); +} + +.lines-num span::after { + content: attr(data-line-number); + line-height: 20px !important; + padding: 0 10px; + cursor: pointer; + display: block; } .lines-type-marker { @@ -2079,19 +2134,24 @@ a.ui.label:hover { padding-top: 0; padding-bottom: 0; vertical-align: top; +} - pre, - ol { - background-color: inherit; - margin: 0; - padding: 0 !important; - - li { - display: block; - width: calc(100% - 1ch); - padding-left: 1ch; - } - } +.lines-num pre, +.lines-code pre, +.lines-num ol, +.lines-code ol { + background-color: inherit; + margin: 0; + padding: 0 !important; +} + +.lines-num pre li, +.lines-code pre li, +.lines-num ol li, +.lines-code ol li { + display: block; + width: calc(100% - 1ch); + padding-left: 1ch; } .lines-escape { @@ -2131,64 +2191,61 @@ a.ui.label:hover { } .lines-commit { - &:extend(.unselectable); vertical-align: top; color: var(--color-grey); padding: 0 !important; background: var(--color-code-sidebar-bg); width: 1%; +} - .blame-info { - &:extend(.unselectable); - width: 350px; - max-width: 350px; - display: block; - padding: 0 0 0 10px; - line-height: 20px; - box-sizing: content-box; - - .blame-data { - display: flex; - font-family: var(--fonts-regular); - - .blame-message { - flex-grow: 2; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - } - - .blame-time, - .blame-avatar { - flex-shrink: 0; - } - } - } +.lines-commit .blame-info { + width: 350px; + max-width: 350px; + display: block; + padding: 0 0 0 10px; + line-height: 20px; + box-sizing: content-box; +} - .ui.avatar { - height: 18px; - width: 18px; - display: block; - margin-top: 1px; - } +.lines-commit .blame-info .blame-data { + display: flex; + font-family: var(--fonts-regular); +} + +.lines-commit .blame-info .blame-data .blame-message { + flex-grow: 2; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} + +.lines-commit .blame-info .blame-data .blame-time, +.lines-commit .blame-info .blame-data .blame-avatar { + flex-shrink: 0; +} + +.lines-commit .ui.avatar { + height: 18px; + width: 18px; + display: block; + margin-top: 1px; } .top-line-blame { border-top: 1px solid var(--color-secondary); } -.lines-code, -.lines-commit { - .bottom-line { - border-bottom: 1px solid var(--color-secondary); - } +.lines-code .bottom-line, +.lines-commit .bottom-line { + border-bottom: 1px solid var(--color-secondary); } + .code-view table { width: 100%; } .octicon-tiny { - font-size: .85714286rem; + font-size: 0.85714286rem; } .ui.button { @@ -2362,16 +2419,16 @@ a.ui.basic.label:hover { height: 2.1666em !important; } -.svg { - span.green & { - color: var(--color-green); - } - span.red & { - color: var(--color-red); - } - span.purple & { - color: var(--color-purple); - } +span.green .svg { + color: var(--color-green); +} + +span.red .svg { + color: var(--color-red); +} + +span.purple .svg { + color: var(--color-purple); } .migrate .svg.gitea-git { @@ -2414,17 +2471,17 @@ a.ui.basic.label:hover { position: relative; background: var(--color-box-header); border-color: var(--color-secondary); +} - .right .button { - padding: 8px 10px; - font-weight: normal; - } +.ui.attached.header .right .button { + padding: 8px 10px; + font-weight: normal; } /* fix misaligned right buttons on box headers */ .ui.attached.header .right:not(.dropdown) { position: absolute; - right: .78571429rem; + right: 0.78571429rem; top: 0; bottom: 0; height: 30px; @@ -2461,25 +2518,25 @@ a.ui.basic.label:hover { border-radius: 1em; font-size: 10px; font-weight: 700; - line-height: .7; + line-height: 0.7; } -table th[data-sortt-asc], -table th[data-sortt-desc] { - &:hover { - background: rgba(0, 0, 0, .1) !important; - cursor: pointer !important; - } - .svg { - margin-left: .25rem; - } +table th[data-sortt-asc]:hover, +table th[data-sortt-desc]:hover { + background: rgba(0, 0, 0, 0.1) !important; + cursor: pointer !important; +} + +table th[data-sortt-asc] .svg, +table th[data-sortt-desc] .svg { + margin-left: 0.25rem; } .ui.dropdown .svg.dropdown.icon, .svg.dropdown.icon { - margin-top: 0 !important; // reset the "ui.selection.dropdown > .dropdown.icon {margin-top}", for the Issue Dependencies dropdown - margin-right: -.5rem !important; // fix up SVG dropdown triangles because Fomantic thinks they are icon fonts - height: auto; // reset the ".ui.dropdown > .dropdown.icon {height}", otherwise the icon would be too small + margin-top: 0 !important; /* reset the "ui.selection.dropdown > .dropdown.icon {margin-top}", for the Issue Dependencies dropdown */ + margin-right: -0.5rem !important; /* fix up SVG dropdown triangles because Fomantic thinks they are icon fonts */ + height: auto; /* reset the ".ui.dropdown > .dropdown.icon {height}", otherwise the icon would be too small */ } .ui.selection.dropdown > .search.icon, @@ -2487,6 +2544,7 @@ table th[data-sortt-desc] { .ui.selection.dropdown > .dropdown.icon { top: 0 !important; } + .ui.dropdown.no-text > .dropdown.icon { margin-left: 0 !important; margin-right: 0 !important; @@ -2515,17 +2573,19 @@ table th[data-sortt-desc] { line-height: 1; font-style: normal !important; font-weight: normal !important; - vertical-align: -.075em; - - @supports (-webkit-hyphens:none) { - body:not(.safari-above125) & { - font-size: inherit; - vertical-align: inherit; - img { - font-size: 1.25em; - vertical-align: -.225em !important; - } - } + vertical-align: -0.075em; +} + +@supports (-webkit-hyphens:none) { + body:not(.safari-above125) .emoji, + body:not(.safari-above125) .reaction { + font-size: inherit; + vertical-align: inherit; + } + body:not(.safari-above125) .emoji img, + body:not(.safari-above125) .reaction img { + font-size: 1.25em; + vertical-align: -0.225em !important; } } @@ -2535,7 +2595,7 @@ table th[data-sortt-desc] { margin: 0 !important; width: 1em !important; height: 1em !important; - vertical-align: -.15em; + vertical-align: -0.15em; } .minicolors-panel { @@ -2545,38 +2605,38 @@ table th[data-sortt-desc] { .labelspage { list-style: none; padding-top: 0; +} - .item { - margin-top: 0; - margin-right: -14px; - margin-left: -14px; - padding: 10px; - border-bottom: 1px solid var(--color-secondary); - border-top: none; - - a { - font-size: 12px; - padding-right: 10px; - color: var(--color-text-light); - - &:hover { - color: var(--color-primary-light-2); - } - - &.open-issues { - margin-right: 30px; - } - } - } +.labelspage .item { + margin-top: 0; + margin-right: -14px; + margin-left: -14px; + padding: 10px; + border-bottom: 1px solid var(--color-secondary); + border-top: none; +} - .item:last-child { - border-bottom: none; - padding-bottom: 0; - } +.labelspage .item a { + font-size: 12px; + padding-right: 10px; + color: var(--color-text-light); +} - .orglabel { - opacity: .7; - } +.labelspage .item a:hover { + color: var(--color-primary-light-2); +} + +.labelspage .item a.open-issues { + margin-right: 30px; +} + +.labelspage .item:last-child { + border-bottom: none; + padding-bottom: 0; +} + +.labelspage .orglabel { + opacity: 0.7; } /* https://github.com/go-gitea/gitea/pull/11486 */ @@ -2631,7 +2691,7 @@ table th[data-sortt-desc] { } .ui.header .ui.label { - margin-left: .25rem; + margin-left: 0.25rem; } .ui.header > .ui.label.compact { @@ -2654,7 +2714,6 @@ table th[data-sortt-desc] { } .ellipsis-button { - &:extend(.unselectable); padding: 0 5px 8px !important; display: inline-block !important; font-weight: 600 !important; @@ -2667,8 +2726,8 @@ table th[data-sortt-desc] { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; - margin-top: -.5em; - margin-bottom: -.5em; + margin-top: -0.5em; + margin-bottom: -0.5em; } .precolors { @@ -2676,32 +2735,29 @@ table th[data-sortt-desc] { padding-right: 0 !important; margin: 3px 10px auto !important; width: 120px !important; +} - .color { - float: left; - width: 15px; - height: 15px; - } +.precolors .color { + float: left; + width: 15px; + height: 15px; } -@media @mediaSm { +@media (max-width: 767px) { .ui.stackable.menu:not(.no-vertical-tabs) { overflow-y: hidden; overflow-x: auto; flex-direction: row; flex-wrap: nowrap !important; - - .item { - width: initial !important; - } - - > .dropdown.item { - position: initial; - } - - .menu { - flex-direction: row; - } + } + .ui.stackable.menu:not(.no-vertical-tabs) .item { + width: initial !important; + } + .ui.stackable.menu:not(.no-vertical-tabs) > .dropdown.item { + position: initial; + } + .ui.stackable.menu:not(.no-vertical-tabs) .menu { + flex-direction: row; } } diff --git a/web_src/less/chroma/base.less b/web_src/css/chroma/base.css similarity index 87% rename from web_src/less/chroma/base.less rename to web_src/css/chroma/base.css index 597ee2a72d05..bfd49db7a433 100644 --- a/web_src/less/chroma/base.less +++ b/web_src/css/chroma/base.css @@ -29,14 +29,14 @@ /* LineNumbersTable */ .chroma .lnt { - margin-right: .4em; - padding: 0 .4em; + margin-right: 0.4em; + padding: 0 0.4em; } /* LineNumbers */ .chroma .ln { - margin-right: .4em; - padding: 0 .4em; + margin-right: 0.4em; + padding: 0 0.4em; } /* GenericStrong */ diff --git a/web_src/less/chroma/dark.less b/web_src/css/chroma/dark.css similarity index 100% rename from web_src/less/chroma/dark.less rename to web_src/css/chroma/dark.css diff --git a/web_src/less/chroma/light.less b/web_src/css/chroma/light.css similarity index 100% rename from web_src/less/chroma/light.less rename to web_src/css/chroma/light.css diff --git a/web_src/less/code/linebutton.less b/web_src/css/code/linebutton.css similarity index 100% rename from web_src/less/code/linebutton.less rename to web_src/css/code/linebutton.css diff --git a/web_src/less/codemirror/base.less b/web_src/css/codemirror/base.css similarity index 71% rename from web_src/less/codemirror/base.less rename to web_src/css/codemirror/base.css index db0a93f4c74a..b435fb1342c0 100644 --- a/web_src/less/codemirror/base.less +++ b/web_src/css/codemirror/base.css @@ -1,5 +1,5 @@ .ui .field:not(:last-child) .EasyMDEContainer .editor-statusbar { - margin-bottom: -1em; // when there is a statusbar, the "margin-bottom: 1em" of the "field" is not needed, because the statusbar is likely a blank line + margin-bottom: -1em; /* when there is a statusbar, the "margin-bottom: 1em" of the "field" is not needed, because the statusbar is likely a blank line */ } .EasyMDEContainer .CodeMirror { @@ -7,15 +7,15 @@ background-color: var(--color-input-background); border-color: var(--color-secondary); font: 14px var(--fonts-monospace); +} - &.cm-s-default { - border-radius: var(--border-radius); - padding: 0 !important; - } +.EasyMDEContainer .CodeMirror.cm-s-default { + border-radius: var(--border-radius); + padding: 0 !important; +} - &.CodeMirror-fullscreen.CodeMirror-focused { - border-right: 1px solid var(--color-primary) !important; - } +.EasyMDEContainer .CodeMirror.CodeMirror-fullscreen.CodeMirror-focused { + border-right: 1px solid var(--color-primary) !important; } .CodeMirror-cursor { diff --git a/web_src/css/codemirror/dark.css b/web_src/css/codemirror/dark.css new file mode 100644 index 000000000000..8a20d1c00433 --- /dev/null +++ b/web_src/css/codemirror/dark.css @@ -0,0 +1,106 @@ +.CodeMirror.cm-s-default .cm-property, +.CodeMirror.cm-s-paper .cm-property { + color: #a0cc75; +} + +.CodeMirror.cm-s-default .cm-header, +.CodeMirror.cm-s-paper .cm-header { + color: #9daccc; +} + +.CodeMirror.cm-s-default .cm-quote, +.CodeMirror.cm-s-paper .cm-quote { + color: #009900; +} + +.CodeMirror.cm-s-default .cm-keyword, +.CodeMirror.cm-s-paper .cm-keyword { + color: #cc8a61; +} + +.CodeMirror.cm-s-default .cm-atom, +.CodeMirror.cm-s-paper .cm-atom { + color: #ef5e77; +} + +.CodeMirror.cm-s-default .cm-number, +.CodeMirror.cm-s-paper .cm-number { + color: #ff5656; +} + +.CodeMirror.cm-s-default .cm-def, +.CodeMirror.cm-s-paper .cm-def { + color: #e4e4e4; +} + +.CodeMirror.cm-s-default .cm-variable-2, +.CodeMirror.cm-s-paper .cm-variable-2 { + color: #00bdbf; +} + +.CodeMirror.cm-s-default .cm-variable-3, +.CodeMirror.cm-s-paper .cm-variable-3 { + color: #008855; +} + +.CodeMirror.cm-s-default .cm-comment, +.CodeMirror.cm-s-paper .cm-comment { + color: #8e9ab3; +} + +.CodeMirror.cm-s-default .cm-string, +.CodeMirror.cm-s-paper .cm-string { + color: #a77272; +} + +.CodeMirror.cm-s-default .cm-string-2, +.CodeMirror.cm-s-paper .cm-string-2 { + color: #ff5500; +} + +.CodeMirror.cm-s-default .cm-meta, +.CodeMirror.cm-s-paper .cm-meta, +.CodeMirror.cm-s-default .cm-qualifier, +.CodeMirror.cm-s-paper .cm-qualifier { + color: #ffb176; +} + +.CodeMirror.cm-s-default .cm-builtin, +.CodeMirror.cm-s-paper .cm-builtin { + color: #b7c951; +} + +.CodeMirror.cm-s-default .cm-bracket, +.CodeMirror.cm-s-paper .cm-bracket { + color: #999977; +} + +.CodeMirror.cm-s-default .cm-tag, +.CodeMirror.cm-s-paper .cm-tag { + color: #f1d273; +} + +.CodeMirror.cm-s-default .cm-attribute, +.CodeMirror.cm-s-paper .cm-attribute { + color: #bfcc70; +} + +.CodeMirror.cm-s-default .cm-hr, +.CodeMirror.cm-s-paper .cm-hr { + color: #999999; +} + +.CodeMirror.cm-s-default .cm-url, +.CodeMirror.cm-s-paper .cm-url { + color: #c5cfd0; +} + +.CodeMirror.cm-s-default .cm-link, +.CodeMirror.cm-s-paper .cm-link { + color: #d8c792; +} + +.CodeMirror.cm-s-default .cm-error, +.CodeMirror.cm-s-paper .cm-error { + color: #dbdbeb; +} diff --git a/web_src/less/codemirror/light.less b/web_src/css/codemirror/light.css similarity index 100% rename from web_src/less/codemirror/light.less rename to web_src/css/codemirror/light.css diff --git a/web_src/less/console/console.less b/web_src/css/console/console.css similarity index 98% rename from web_src/less/console/console.less rename to web_src/css/console/console.css index db25a35bacc8..b2d8439f8cae 100644 --- a/web_src/less/console/console.less +++ b/web_src/css/console/console.css @@ -1,4 +1,4 @@ -// Based on https://github.com/buildkite/terminal-to-html/blob/697ff23bd8dc48b9d23f11f259f5256dae2455f0/assets/terminal.css +/* Based on https://github.com/buildkite/terminal-to-html/blob/697ff23bd8dc48b9d23f11f259f5256dae2455f0/assets/terminal.css */ .console { background: var(--color-console-bg); diff --git a/web_src/css/dashboard.css b/web_src/css/dashboard.css new file mode 100644 index 000000000000..ced8b3a164aa --- /dev/null +++ b/web_src/css/dashboard.css @@ -0,0 +1,203 @@ +.dashboard.feeds .context.user.menu, +.dashboard.issues .context.user.menu { + z-index: 101; + min-width: 200px; +} + +.dashboard.feeds .context.user.menu .ui.header, +.dashboard.issues .context.user.menu .ui.header { + font-size: 1rem; + text-transform: none; +} + +.dashboard.feeds .filter.menu, +.dashboard.issues .filter.menu { + width: initial; +} + +.dashboard.feeds .filter.menu .item, +.dashboard.issues .filter.menu .item { + text-align: left; + display: flex; + align-items: center; + justify-content: space-between; +} + +.dashboard.feeds .filter.menu .item .text, +.dashboard.issues .filter.menu .item .text { + height: 16px; + vertical-align: middle; +} + +.dashboard.feeds .filter.menu .item .text.truncate, +.dashboard.issues .filter.menu .item .text.truncate { + width: 75%; +} + +.dashboard.feeds .filter.menu .item .floating.label, +.dashboard.issues .filter.menu .item .floating.label { + top: 7px; + left: 90%; + width: 15%; +} + +@media (max-width: 767px) { + .dashboard.feeds .filter.menu .item .floating.label, + .dashboard.issues .filter.menu .item .floating.label { + top: 10px; + left: auto; + width: auto; + right: 13px; + } +} + +/* Sort */ +.dashboard.feeds .filter.menu .jump.item, +.dashboard.issues .filter.menu .jump.item { + margin: 1px; + padding-right: 0; +} + +.dashboard.feeds .filter.menu .menu, +.dashboard.issues .filter.menu .menu { + max-height: 300px; + overflow-x: auto; + right: 0 !important; + left: auto !important; +} + +@media (max-width: 767px) { + .dashboard.feeds .filter.menu, + .dashboard.issues .filter.menu { + width: 100%; + } +} + +.dashboard.feeds .right.stackable.menu > .item.active, +.dashboard.issues .right.stackable.menu > .item.active { + color: var(--color-red); +} + +.dashboard .dashboard-repos, +.dashboard .dashboard-orgs { + margin: 0 1px; /* Accommodate for Semantic's 1px hacks on .attached elements */ +} + +.dashboard .dashboard-navbar { + width: 100vw; + padding-left: 0.5rem; + padding-right: 0.5rem; +} + +.dashboard .dashboard-navbar .org-visibility .label { + margin-left: 5px; +} + +.dashboard .dashboard-navbar .ui.dropdown { + max-width: 100%; +} + +@media (max-width: 767px) { + .dashboard .dashboard-navbar .ui.dropdown > .menu { + position: static; + } +} + +.feeds .news li { + display: flex; + align-items: baseline; + margin-top: 0.5rem; + margin-bottom: 0.5rem; +} + +.feeds .news li img { + align-self: flex-start; +} + +.feeds .news li > * + * { + margin-left: 0.35rem; +} + +.feeds .news > .ui.grid { + margin-left: auto; + margin-right: auto; +} + +.feeds .news .left .ui.avatar { + margin-top: 13px; +} + +.feeds .news .time-since { + font-size: 13px; +} + +.feeds .news .issue.title { + width: 80%; + margin: 0 0 1em; +} + +.feeds .news .push.news .content ul { + line-height: 18px; + font-size: 13px; + list-style: none; + padding-left: 10px; +} + +.feeds .news .push.news .content ul .text.truncate { + width: 80%; +} + +.feeds .news .commit-id { + font-family: var(--fonts-monospace); +} + +.feeds .news code { + padding: 2px 4px; + border-radius: 3px; + background-color: var(--color-markup-code-block); + word-break: break-all; +} + +.feeds .news:last-of-type .divider { + display: none !important; +} + +.feeds .list ul { + list-style: none; + margin: 0; + padding-left: 0; +} + +.feeds .list ul li:not(:last-child) { + border-bottom: 1px solid var(--color-secondary); +} + +.feeds .list ul li.private { + background-color: var(--color-box-body-highlight); +} + +.feeds .list ul li .repo-list-link { + padding: 6px 1em; + display: block; +} + +.feeds .list ul li .repo-list-link .svg { + color: var(--color-text-light-2); +} + +.feeds .list ul li .repo-list-link .star-num { + font-size: 12px; +} + +.feeds .list #privateFilterCheckbox .svg { + color: var(--color-grey); + margin-right: 0.25rem; +} + +.feeds .list .repo-owner-name-list .item-name { + min-width: 0; +} + +.feeds .list .repo-owner-name-list .item-name svg { + min-width: 16px; +} diff --git a/web_src/less/_editor.less b/web_src/css/editor.css similarity index 100% rename from web_src/less/_editor.less rename to web_src/css/editor.css diff --git a/web_src/css/explore.css b/web_src/css/explore.css new file mode 100644 index 000000000000..854370225247 --- /dev/null +++ b/web_src/css/explore.css @@ -0,0 +1,88 @@ +.explore .navbar { + justify-content: center; + margin-bottom: 15px !important; + background-color: var(--color-navbar) !important; + border-width: 1px !important; +} + +.explore .navbar .svg { + width: 16px; + text-align: center; + margin-right: 5px; +} + +.ui.repository.list .item { + padding-bottom: 1.5rem; +} + +.ui.repository.list .item:not(:first-child) { + border-top: 1px solid var(--color-secondary); + padding-top: 1.5rem; +} + +.ui.repository.list .item .ui.header { + font-size: 1.5rem; + margin-bottom: 0.5rem; +} + +.ui.repository.list .item .ui.header .name { + word-break: break-all; +} + +.ui.repository.list .item .ui.header .metas { + font-size: 14px; +} + +.ui.repository.list .item .time { + font-size: 12px; +} + +.ui.repository.list .item .ui.tags { + margin-bottom: 0.5rem; +} + +.ui.repository.branches .info { + font-size: 12px; + color: var(--color-text-light); + display: flex; + white-space: pre; +} + +.ui.repository.branches .info .commit-message { + max-width: 72em; + overflow: hidden; + text-overflow: ellipsis; +} + +.ui.repository.branches .overflow-visible { + overflow: visible; +} + +/* fix alignment of PR popup in branches table */ +.ui.repository.branches table .ui.popup { + text-align: left; +} + +.ui.user.list .item { + padding-bottom: 25px; + display: flex; +} + +.ui.user.list .item:not(:first-child) { + border-top: 1px solid var(--color-secondary); + padding-top: 25px; +} + +.ui.user.list .item img.ui.avatar { + width: 40px; + height: 40px; + margin-right: 10px; +} + +.ui.user.list .item .description { + margin-top: 5px; +} + +.ui.user.list .item .description .svg:not(:first-child) { + margin-left: 5px; +} diff --git a/web_src/less/features/codeeditor.less b/web_src/css/features/codeeditor.css similarity index 100% rename from web_src/less/features/codeeditor.less rename to web_src/css/features/codeeditor.css diff --git a/web_src/less/features/dropzone.less b/web_src/css/features/dropzone.css similarity index 75% rename from web_src/less/features/dropzone.less rename to web_src/css/features/dropzone.css index ee7a5f1b65d4..0ce067ef30ec 100644 --- a/web_src/less/features/dropzone.less +++ b/web_src/css/features/dropzone.css @@ -1,15 +1,14 @@ -.ui .field { - .dropzone { - border: 2px dashed var(--color-secondary); - background: none; - box-shadow: none; - padding: 0; - border-radius: 4px; - min-height: 0; - .dz-message { - margin: 10px 0; - } - } +.ui .field .dropzone { + border: 2px dashed var(--color-secondary); + background: none; + box-shadow: none; + padding: 0; + border-radius: 4px; + min-height: 0; +} + +.ui .field .dropzone .dz-message { + margin: 10px 0; } .dropzone .dz-button { @@ -50,5 +49,5 @@ } .dropzone .dz-preview:hover .dz-image img { - filter: opacity(.5) !important; + filter: opacity(0.5) !important; } diff --git a/web_src/css/features/gitgraph.css b/web_src/css/features/gitgraph.css new file mode 100644 index 000000000000..f7477997fe0f --- /dev/null +++ b/web_src/css/features/gitgraph.css @@ -0,0 +1,317 @@ +#git-graph-container { + overflow-x: auto; + width: 100%; + min-height: 350px; +} + +#git-graph-container > .ui.segment.loading { + border: 0; + z-index: 1; + min-height: 246px; +} + +#git-graph-container h2 { + display: flex; + justify-content: space-between; + align-items: center; +} + +#git-graph-container .color-buttons { + margin-right: 0; +} + +#git-graph-container .ui.header.dividing { + padding-bottom: 10px; +} + +#git-graph-container #flow-select-refs-dropdown { + border-top-right-radius: 0; + border-bottom-right-radius: 0; + min-width: 250px; + border-right: none; +} + +#git-graph-container #flow-select-refs-dropdown .ui.label { + max-width: 180px; + display: inline-flex !important; + align-items: center; +} + +#git-graph-container #flow-select-refs-dropdown .ui.label .truncate { + display: inline-block; + max-width: 140px; + overflow: hidden; + text-overflow: ellipsis; + vertical-align: top; + white-space: nowrap; +} + +#git-graph-container #flow-select-refs-dropdown .dropdown.icon { + display: none; +} + +#git-graph-container #flow-select-refs-dropdown .default.text { + padding-top: 4px; + padding-bottom: 4px; +} + +#git-graph-container #flow-select-refs-dropdown input.search { + position: relative; + top: 1px; +} + +#git-graph-container li { + list-style-type: none; + height: 24px; + line-height: 24px; + white-space: nowrap; + display: flex; + align-items: center; +} + +#git-graph-container li .node-relation { + font-family: var(--fonts-monospace); +} + +#git-graph-container li .author { + color: var(--color-text-light); +} + +#git-graph-container li .time { + color: var(--color-text-light-3); + font-size: 80%; +} + +#git-graph-container li a:not(.ui):hover { + text-decoration: underline; +} + +#git-graph-container li a em { + color: var(--color-red); + border-bottom: 1px dotted var(--color-secondary); + text-decoration: none; + font-style: normal; +} + +#git-graph-container #rel-container { + max-width: 30%; + overflow-x: auto; + float: left; +} + +#git-graph-container #rev-container { + width: 100%; +} + +#git-graph-container #rev-list { + margin: 0; + padding: 0; + width: 100%; +} + +#git-graph-container #rev-list li.highlight.hover { + background-color: var(--color-secondary-alpha-30); +} + +#git-graph-container #rev-list .tags a.button { + padding: 2px 4px; +} + +#git-graph-container #rev-list .sha.label { + padding-top: 5px; + padding-bottom: 3px; +} + +#git-graph-container #rev-list .sha.label .shortsha { + padding-top: 0; +} + +#git-graph-container #rev-list .sha.label .shortsha-pad { + padding-right: 10px; +} + +#git-graph-container #rev-list .sha.label .ui.detail.icon.button { + padding-top: 3px; + margin-top: -5px; + padding-bottom: 1px; +} + +#git-graph-container #rev-list .author img.ui.avatar { + width: auto; + height: 18px; + max-width: none; +} + +#git-graph-container #graph-raw-list { + margin: 0; +} + +#git-graph-container.monochrome #rel-container .flow-group { + stroke: var(--color-secondary-dark-5); + fill: var(--color-secondary-dark-5); +} + +#git-graph-container.monochrome #rel-container .flow-group.highlight { + stroke: var(--color-secondary-dark-12); + fill: var(--color-secondary-dark-12); +} + +#git-graph-container:not(.monochrome) #rel-container .flow-group.flow-color-16-1 { + stroke: #499a37; + fill: #499a37; +} + +#git-graph-container:not(.monochrome) #rel-container .flow-group.flow-color-16-2 { + stroke: #ce4751; + fill: #ce4751; +} + +#git-graph-container:not(.monochrome) #rel-container .flow-group.flow-color-16-3 { + stroke: #8f9121; + fill: #8f9121; +} + +#git-graph-container:not(.monochrome) #rel-container .flow-group.flow-color-16-4 { + stroke: #ac32a6; + fill: #ac32a6; +} + +#git-graph-container:not(.monochrome) #rel-container .flow-group.flow-color-16-5 { + stroke: #7445e9; + fill: #7445e9; +} + +#git-graph-container:not(.monochrome) #rel-container .flow-group.flow-color-16-6 { + stroke: #c67d28; + fill: #c67d28; +} + +#git-graph-container:not(.monochrome) #rel-container .flow-group.flow-color-16-7 { + stroke: #4db392; + fill: #4db392; +} + +#git-graph-container:not(.monochrome) #rel-container .flow-group.flow-color-16-8 { + stroke: #aa4d30; + fill: #aa4d30; +} + +#git-graph-container:not(.monochrome) #rel-container .flow-group.flow-color-16-9 { + stroke: #2a6f84; + fill: #2a6f84; +} + +#git-graph-container:not(.monochrome) #rel-container .flow-group.flow-color-16-10 { + stroke: #c45327; + fill: #c45327; +} + +#git-graph-container:not(.monochrome) #rel-container .flow-group.flow-color-16-11 { + stroke: #3d965c; + fill: #3d965c; +} + +#git-graph-container:not(.monochrome) #rel-container .flow-group.flow-color-16-12 { + stroke: #792a93; + fill: #792a93; +} + +#git-graph-container:not(.monochrome) #rel-container .flow-group.flow-color-16-13 { + stroke: #439d73; + fill: #439d73; +} + +#git-graph-container:not(.monochrome) #rel-container .flow-group.flow-color-16-14 { + stroke: #103aad; + fill: #103aad; +} + +#git-graph-container:not(.monochrome) #rel-container .flow-group.flow-color-16-15 { + stroke: #982e85; + fill: #982e85; +} + +#git-graph-container:not(.monochrome) #rel-container .flow-group.flow-color-16-0 { + stroke: #7db233; + fill: #7db233; +} + +#git-graph-container:not(.monochrome) #rel-container .flow-group.highlight.flow-color-16-1 { + stroke: #5ac144; + fill: #5ac144; +} + +#git-graph-container:not(.monochrome) #rel-container .flow-group.highlight.flow-color-16-2 { + stroke: #ed5a8b; + fill: #ed5a8b; +} + +#git-graph-container:not(.monochrome) #rel-container .flow-group.highlight.flow-color-16-3 { + stroke: #ced049; + fill: #ced048; +} + +#git-graph-container:not(.monochrome) #rel-container .flow-group.highlight.flow-color-16-4 { + stroke: #db61d7; + fill: #db62d6; +} + +#git-graph-container:not(.monochrome) #rel-container .flow-group.highlight.flow-color-16-5 { + stroke: #8455f9; + fill: #8455f9; +} + +#git-graph-container:not(.monochrome) #rel-container .flow-group.highlight.flow-color-16-6 { + stroke: #e6a151; + fill: #e6a151; +} + +#git-graph-container:not(.monochrome) #rel-container .flow-group.highlight.flow-color-16-7 { + stroke: #44daaa; + fill: #44daaa; +} + +#git-graph-container:not(.monochrome) #rel-container .flow-group.highlight.flow-color-16-8 { + stroke: #dd7a5c; + fill: #dd7a5c; +} + +#git-graph-container:not(.monochrome) #rel-container .flow-group.highlight.flow-color-16-9 { + stroke: #38859c; + fill: #38859c; +} + +#git-graph-container:not(.monochrome) #rel-container .flow-group.highlight.flow-color-16-10 { + stroke: #d95520; + fill: #d95520; +} + +#git-graph-container:not(.monochrome) #rel-container .flow-group.highlight.flow-color-16-11 { + stroke: #42ae68; + fill: #42ae68; +} + +#git-graph-container:not(.monochrome) #rel-container .flow-group.highlight.flow-color-16-12 { + stroke: #9126b5; + fill: #9126b5; +} + +#git-graph-container:not(.monochrome) #rel-container .flow-group.highlight.flow-color-16-13 { + stroke: #4ab080; + fill: #4ab080; +} + +#git-graph-container:not(.monochrome) #rel-container .flow-group.highlight.flow-color-16-14 { + stroke: #284fb8; + fill: #284fb8; +} + +#git-graph-container:not(.monochrome) #rel-container .flow-group.highlight.flow-color-16-15 { + stroke: #971c80; + fill: #971c80; +} + +#git-graph-container:not(.monochrome) #rel-container .flow-group.highlight.flow-color-16-0 { + stroke: #87ca28; + fill: #87ca28; +} diff --git a/web_src/css/features/heatmap.css b/web_src/css/features/heatmap.css new file mode 100644 index 000000000000..d0cd2b5734a5 --- /dev/null +++ b/web_src/css/features/heatmap.css @@ -0,0 +1,68 @@ +#user-heatmap { + width: 100%; + font-size: 9px; + position: relative; + min-height: 125px; +} + +#user-heatmap text { + fill: currentcolor !important; +} + +/* for the "Less" and "More" legend */ +#user-heatmap .vch__legend .vch__legend { + display: flex; + font-size: 11px; + align-items: center; + justify-content: right; +} + +#user-heatmap .vch__legend .vch__legend div:first-child, +#user-heatmap .vch__legend .vch__legend div:last-child { + display: inline-block; + padding: 0 5px; +} + +/* move the "? contributions in the last ? months" text from top to bottom */ +#user-heatmap .total-contributions { + font-size: 11px; + position: absolute; + bottom: 0; + left: 25px; +} + +@media (max-width: 1200px) { + #user-heatmap { + min-height: 105px; + } + #user-heatmap .total-contributions { + left: 21px; + } +} + +@media (max-width: 1000px) { + #user-heatmap { + min-height: 80px; + } + #user-heatmap .total-contributions { + font-size: 10px; + left: 17px; + bottom: -4px; + } +} + +.user.profile #user-heatmap { + min-height: 135px; +} + +@media (max-width: 1200px) { + .user.profile #user-heatmap { + min-height: 115px; + } +} + +@media (max-width: 1000px) { + .user.profile #user-heatmap { + min-height: 90px; + } +} diff --git a/web_src/css/features/imagediff.css b/web_src/css/features/imagediff.css new file mode 100644 index 000000000000..f796bc19aea2 --- /dev/null +++ b/web_src/css/features/imagediff.css @@ -0,0 +1,107 @@ +.image-diff-container { + text-align: center; + padding: 1em 0; +} + +.image-diff-container img { + border: 1px solid var(--color-primary-light-7); + background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAG0lEQVQYlWN4+vTpf3SMDTAMBYXYBLFpHgoKAeiOf0SGE9kbAAAAAElFTkSuQmCC") right bottom var(--color-primary-light-7); +} + +.image-diff-container .before-container { + border: 1px solid var(--color-red); + display: block; +} + +.image-diff-container .after-container { + border: 1px solid var(--color-green); + display: block; +} + +.image-diff-container .diff-side-by-side .side { + display: inline-block; + line-height: 0; + vertical-align: top; + margin: 0 1em; +} + +.image-diff-container .diff-side-by-side .side .side-header { + font-weight: bold; +} + +.image-diff-container .diff-swipe { + margin: auto; +} + +.image-diff-container .diff-swipe .swipe-frame { + position: absolute; +} + +.image-diff-container .diff-swipe .swipe-frame .before-container { + position: absolute; +} + +.image-diff-container .diff-swipe .swipe-frame .swipe-container { + position: absolute; + right: 0; + display: block; + border-left: 2px solid var(--color-secondary-dark-8); + height: 100%; + overflow: hidden; +} + +.image-diff-container + .diff-swipe + .swipe-frame + .swipe-container + .after-container { + position: absolute; + right: 0; +} + +.image-diff-container .diff-swipe .swipe-frame .swipe-bar { + position: absolute; + height: 100%; + top: 0; + left: 0; +} + +.image-diff-container .diff-swipe .swipe-frame .swipe-bar .handle { + background: var(--color-secondary-dark-8); + left: -5px; + height: 12px; + width: 12px; + position: absolute; + transform: rotate(45deg); + box-sizing: border-box; + display: flex; + justify-content: center; + align-items: center; + cursor: pointer; +} + +.image-diff-container .diff-swipe .swipe-frame .swipe-bar .top-handle { + top: -12px; +} + +.image-diff-container .diff-swipe .swipe-frame .swipe-bar .bottom-handle { + bottom: -14px; +} + +.image-diff-container .diff-overlay { + margin: 0 auto; +} + +.image-diff-container .diff-overlay .overlay-frame { + margin: 0 auto; + position: relative; +} + +.image-diff-container .diff-overlay .before-container, +.image-diff-container .diff-overlay .after-container { + position: absolute; +} + +.image-diff-container .diff-overlay input { + max-width: 300px; +} diff --git a/web_src/less/features/projects.less b/web_src/css/features/projects.css similarity index 67% rename from web_src/less/features/projects.less rename to web_src/css/features/projects.css index cbdb1a3c9f75..2bc68ccf0dc1 100644 --- a/web_src/less/features/projects.less +++ b/web_src/css/features/projects.css @@ -3,14 +3,14 @@ flex-direction: row; flex-wrap: nowrap; overflow-x: auto; - margin: 0 .5em; + margin: 0 0.5em; } .board-column { background-color: var(--color-project-board-bg) !important; border: 1px solid var(--color-secondary) !important; - margin: 0 .5rem !important; - padding: .5rem !important; + margin: 0 0.5rem !important; + padding: 0.5rem !important; width: 320px; height: calc(100vh - 450px); min-height: 60vh; @@ -24,21 +24,22 @@ .board-column-header { display: flex; justify-content: space-between; +} - &.dark-label { - color: var(--color-project-board-dark-label) !important; +.board-column-header.dark-label { + color: var(--color-project-board-dark-label) !important; +} - .board-label { - color: var(--color-project-board-dark-label) !important; - } - } - &.light-label { - color: var(--color-project-board-light-label) !important; +.board-column-header.dark-label .board-label { + color: var(--color-project-board-dark-label) !important; +} + +.board-column-header.light-label { + color: var(--color-project-board-light-label) !important; +} - .board-label { - color: var(--color-project-board-light-label) !important; - } - } +.board-column-header.light-label .board-label { + color: var(--color-project-board-light-label) !important; } .board-label { @@ -81,7 +82,7 @@ border-radius: 5px !important; cursor: move; width: calc(100% - 4px) !important; - padding: .5rem !important; + padding: 0.5rem !important; min-height: auto !important; } @@ -124,24 +125,23 @@ .color-field .minicolors.minicolors-theme-default { display: block; +} - .minicolors-input { - height: 38px; - padding-left: 2rem; - } +.color-field .minicolors.minicolors-theme-default .minicolors-input { + height: 38px; + padding-left: 2rem; +} - .minicolors-swatch { - top: 10px; - } +.color-field .minicolors.minicolors-theme-default .minicolors-swatch { + top: 10px; } -.edit-project-board, -.new-board-modal { - .color.picker.column { - display: flex; +.edit-project-board .color.picker.column, +.new-board-modal .color.picker.column { + display: flex; +} - .minicolors { - flex: 1; - } - } +.edit-project-board .color.picker.column .minicolors, +.new-board-modal .color.picker.column .minicolors { + flex: 1; } diff --git a/web_src/css/font_i18n.css b/web_src/css/font_i18n.css new file mode 100644 index 000000000000..e3de90653202 --- /dev/null +++ b/web_src/css/font_i18n.css @@ -0,0 +1,393 @@ +:root :lang(ja) { + --fonts-override: var(--fonts-default-override-ja); +} + +:root :lang(zh-CN) { + --fonts-override: var(--fonts-default-override-zh-cn); +} + +:root :lang(zh-TW) { + --fonts-override: var(--fonts-default-override-zh-tw); +} + +:root :lang(zh-HK) { + --fonts-override: var(--fonts-default-override-zh-hk); +} + +:root :lang(ko) { + --fonts-override: var(--fonts-default-override-ko); +} + +[lang] { + font-family: var(--fonts-regular); +} + +:root { + --fonts-default-override-ja: system-ui-ja, var(--fonts-proportional); + --fonts-default-override-zh-cn: system-ui-zh-cn, var(--fonts-proportional); + --fonts-default-override-zh-tw: system-ui-zh-tw, var(--fonts-proportional); + --fonts-default-override-zh-hk: system-ui-zh-hk, var(--fonts-proportional); + --fonts-default-override-ko: system-ui-ko, var(--fonts-proportional); +} + +/* Special handling for Firefox on Windows/Linux */ +@supports (-moz-appearance: none) { + :root { + --fonts-default-override-ja: var(--fonts-proportional), system-ui-ja; + --fonts-default-override-zh-cn: var(--fonts-proportional), system-ui-zh-cn; + --fonts-default-override-zh-tw: var(--fonts-proportional), system-ui-zh-tw; + --fonts-default-override-zh-hk: var(--fonts-proportional), system-ui-zh-hk; + --fonts-default-override-ko: var(--fonts-proportional), system-ui-ko; + } +} + +@font-face { + font-family: system-ui-ja; + src: local("HiraKakuProN-W3"), local("Hiragino Kaku Gothic ProN W3"), + local("HiraginoSans-W2"), local("Source Han Sans JP Light"), + local("SourceHanSansJP-Light"), local("Source Han Sans J Light"), + local("SourceHanSansJ-Light"), local("Noto Sans CJK JP Light"), + local("NotoSansCJKJP-Light"), local("Source Han Sans Light"), + local("SourceHanSans-Light"), local("Yu Gothic Regular"), + local("YuGothic Regular"), local("Droid Sans Japanese"), local("Meiryo"), + local("MS PGothic"); + font-weight: 300; + unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, + U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; +} + +@font-face { + font-family: system-ui-ja; + src: local("HiraKakuProN-W3"), local("Hiragino Kaku Gothic ProN W3"), + local("HiraginoSans-W4"), local("Source Han Sans JP Regular"), + local("SourceHanSansJP-Regular"), local("Source Han Sans J Regular"), + local("SourceHanSansJ-Regular"), local("Noto Sans CJK JP Regular"), + local("NotoSansCJKJP-Regular"), local("Source Han Sans Regular"), + local("SourceHanSans-Regular"), local("Yu Gothic Medium"), + local("YuGothic Medium"), local("Droid Sans Japanese"), local("Meiryo"), + local("MS PGothic"); + font-weight: 400; + unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, + U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; +} + +@font-face { + font-family: system-ui-ja; + src: local("HiraKakuProN-W3"), local("Hiragino Kaku Gothic ProN W3"), + local("HiraginoSans-W5"), local("Source Han Sans JP Medium"), + local("SourceHanSansJP-Medium"), local("Source Han Sans J Medium"), + local("SourceHanSansJ-Medium"), local("Noto Sans CJK JP Medium"), + local("NotoSansCJKJP-Medium"), local("Source Han Sans Medium"), + local("SourceHanSans-Medium"), local("Yu Gothic Medium"), + local("YuGothic Medium"), local("Droid Sans Japanese"), local("Meiryo"), + local("MS PGothic"); + font-weight: 500; + unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, + U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; +} + +@font-face { + font-family: system-ui-ja; + src: local("HiraKakuProN-W6"), local("Hiragino Kaku Gothic ProN W6"), + local("HiraginoSans-W6"), local("Source Han Sans JP Bold"), + local("SourceHanSansJP-Bold"), local("Source Han Sans J Bold"), + local("SourceHanSansJ-Bold"), local("Noto Sans CJK JP Bold"), + local("NotoSansCJKJP-Bold"), local("Source Han Sans Bold"), + local("SourceHanSans-Bold"), local("Yu Gothic Bold"), local("YuGothic Bold"), + local("Droid Sans Japanese"), local("Meiryo Bold"), local("MS PGothic"); + font-weight: 700; + unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, + U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; +} + +/* Safari on macOS/iOS */ +@font-face { + font-family: system-ui-ja; + src: local("HelveticaNeue"); + unicode-range: U+A0; +} + +/* Other browsers on macOS/iOS */ +@supports not (-webkit-hyphens: none) { + @font-face { + font-family: system-ui-ja; + src: local("HelveticaNeue"); + unicode-range: U+20; + } +} + +@font-face { + font-family: system-ui-zh-cn; + src: local("PingFangSC-Light"), local("Source Han Sans CN Light"), + local("SourceHanSansCN-Light"), local("Source Han Sans SC Light"), + local("SourceHanSansSC-Light"), local("Noto Sans CJK SC Light"), + local("NotoSansCJKSC-Light"), local("HiraginoSansGB-W3"), + local("Hiragino Sans GB W3"), local("Microsoft YaHei Light"), + local("Heiti SC Light"), local("SimHei"); + font-weight: 300; + unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, + U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; +} + +@font-face { + font-family: system-ui-zh-cn; + src: local("PingFangSC-Regular"), local("Source Han Sans CN Regular"), + local("SourceHanSansCN-Regular"), local("Source Han Sans SC Regular"), + local("SourceHanSansSC-Regular"), local("Noto Sans CJK SC Regular"), + local("NotoSansCJKSC-Regular"), local("HiraginoSansGB-W3"), + local("Hiragino Sans GB W3"), local("Microsoft YaHei"), + local("Heiti SC Light"), local("SimHei"); + font-weight: 400; + unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, + U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; +} + +@font-face { + font-family: system-ui-zh-cn; + src: local("PingFangSC-Medium"), local("Source Han Sans CN Medium"), + local("SourceHanSansCN-Medium"), local("Source Han Sans SC Medium"), + local("SourceHanSansSC-Medium"), local("Noto Sans CJK SC Medium"), + local("NotoSansCJKSC-Medium"), local("HiraginoSansGB-W3"), + local("Hiragino Sans GB W3"), local("Microsoft YaHei"), + local("Heiti SC Light"), local("SimHei"); + font-weight: 500; + unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, + U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; +} + +@font-face { + font-family: system-ui-zh-cn; + src: local("PingFangSC-Semibold"), local("Source Han Sans CN Bold"), + local("SourceHanSansCN-Bold"), local("Source Han Sans SC Bold"), + local("SourceHanSansSC-Bold"), local("Noto Sans CJK SC Bold"), + local("NotoSansCJKSC-Bold"), local("HiraginoSansGB-W6"), + local("Hiragino Sans GB W6"), local("Microsoft YaHei Bold"), + local("Heiti SC Medium"), local("SimHei"); + font-weight: 700; + unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, + U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; +} + +/* Safari on macOS/iOS */ +@font-face { + font-family: system-ui-zh-cn; + src: local("HelveticaNeue"); + unicode-range: U+A0; +} + +/* Other browsers on macOS/iOS */ +@supports not (-webkit-hyphens: none) { + @font-face { + font-family: system-ui-zh-cn; + src: local("HelveticaNeue"); + unicode-range: U+20; + } +} + +@font-face { + font-family: system-ui-zh-tw; + src: local("PingFangTC-Light"), local("Source Han Sans TW Light"), + local("SourceHanSansTW-Light"), local("Source Han Sans TC Light"), + local("SourceHanSansTC-Light"), local("Noto Sans CJK TC Light"), + local("NotoSansCJKTC-Light"), local("HiraginoSansTC-W3"), + local("Hiragino Sans TC W3"), local("Microsoft JhengHei Light"), + local("Heiti TC Light"), local("PMingLiU"); + font-weight: 300; + unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, + U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; +} + +@font-face { + font-family: system-ui-zh-tw; + src: local("PingFangTC-Regular"), local("Source Han Sans TW Regular"), + local("SourceHanSansTW-Regular"), local("Source Han Sans TC Regular"), + local("SourceHanSansTC-Regular"), local("Noto Sans CJK TC Regular"), + local("NotoSansCJKTC-Regular"), local("HiraginoSansTC-W3"), + local("Hiragino Sans TC W3"), local("Microsoft JhengHei"), + local("Heiti TC Light"), local("PMingLiU"); + font-weight: 400; + unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, + U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; +} + +@font-face { + font-family: system-ui-zh-tw; + src: local("PingFangTC-Medium"), local("Source Han Sans TW Medium"), + local("SourceHanSansTW-Medium"), local("Source Han Sans TC Medium"), + local("SourceHanSansTC-Medium"), local("Noto Sans CJK TC Medium"), + local("NotoSansCJKTC-Medium"), local("HiraginoSansTC-W3"), + local("Hiragino Sans TC W3"), local("Microsoft JhengHei"), + local("Heiti TC Light"), local("PMingLiU"); + font-weight: 500; + unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, + U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; +} + +@font-face { + font-family: system-ui-zh-tw; + src: local("PingFangTC-Semibold"), local("Source Han Sans TW Bold"), + local("SourceHanSansTW-Bold"), local("Source Han Sans TC Bold"), + local("SourceHanSansTC-Bold"), local("Noto Sans CJK TC Bold"), + local("NotoSansCJKTC-Bold"), local("HiraginoSansTC-W6"), + local("Hiragino Sans TC W6"), local("Microsoft JhengHei Bold"), + local("Heiti TC Medium"), local("PMingLiU"); + font-weight: 700; + unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, + U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; +} + +/* Safari on macOS/iOS */ +@font-face { + font-family: system-ui-zh-tw; + src: local("HelveticaNeue"); + unicode-range: U+A0; +} + +/* Other browsers on macOS/iOS */ +@supports not (-webkit-hyphens: none) { + @font-face { + font-family: system-ui-zh-tw; + src: local("HelveticaNeue"); + unicode-range: U+20; + } +} + +@font-face { + font-family: system-ui-zh-hk; + src: local("PingFangHK-Light"), local("Source Han Sans HK Light"), + local("SourceHanSansHK-Light"), local("Source Han Sans HC Light"), + local("SourceHanSansHC-Light"), local("Noto Sans CJK HK Light"), + local("NotoSansCJKHK-Light"), local("Source Han Sans TC Light"), + local("SourceHanSansTC-Light"), local("Noto Sans CJK TC Light"), + local("NotoSansCJKTC-Light"), local("HiraginoSansTC-W3"), + local("Hiragino Sans TC W3"), local("Microsoft JhengHei Light"), + local("Heiti TC Light"), local("PMingLiU_HKSCS"), local("PMingLiU"); + font-weight: 300; + unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, + U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; +} + +@font-face { + font-family: system-ui-zh-hk; + src: local("PingFangHK-Regular"), local("Source Han Sans HK Regular"), + local("SourceHanSansHK-Regular"), local("Source Han Sans HC Regular"), + local("SourceHanSansHC-Regular"), local("Noto Sans CJK HK Regular"), + local("NotoSansCJKHK-Regular"), local("Source Han Sans TC Regular"), + local("SourceHanSansTC-Regular"), local("Noto Sans CJK TC Regular"), + local("NotoSansCJKTC-Regular"), local("HiraginoSansTC-W3"), + local("Hiragino Sans TC W3"), local("Microsoft JhengHei"), + local("Heiti TC Light"), local("PMingLiU_HKSCS"), local("PMingLiU"); + font-weight: 400; + unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, + U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; +} + +@font-face { + font-family: system-ui-zh-hk; + src: local("PingFangHK-Medium"), local("Source Han Sans HK Medium"), + local("SourceHanSansHK-Medium"), local("Source Han Sans HC Medium"), + local("SourceHanSansHC-Medium"), local("Noto Sans CJK HK Medium"), + local("NotoSansCJKHK-Medium"), local("Source Han Sans TC Medium"), + local("SourceHanSansTC-Medium"), local("Noto Sans CJK TC Medium"), + local("NotoSansCJKTC-Medium"), local("HiraginoSansTC-W3"), + local("Hiragino Sans TC W3"), local("Microsoft JhengHei"), + local("Heiti TC Light"), local("PMingLiU_HKSCS"), local("PMingLiU"); + font-weight: 500; + unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, + U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; +} + +@font-face { + font-family: system-ui-zh-hk; + src: local("PingFangHK-Semibold"), local("Source Han Sans HK Bold"), + local("SourceHanSansHK-Bold"), local("Source Han Sans HC Bold"), + local("SourceHanSansHC-Bold"), local("Noto Sans CJK HK Bold"), + local("NotoSansCJKHK-Bold"), local("Source Han Sans TC Bold"), + local("SourceHanSansTC-Bold"), local("Noto Sans CJK TC Bold"), + local("NotoSansCJKTC-Bold"), local("HiraginoSansTC-W6"), + local("Hiragino Sans TC W6"), local("Microsoft JhengHei Bold"), + local("Heiti TC Medium"), local("PMingLiU_HKSCS"), local("PMingLiU"); + font-weight: 700; + unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, + U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; +} + +/* Safari on macOS/iOS */ +@font-face { + font-family: system-ui-zh-hk; + src: local("HelveticaNeue"); + unicode-range: U+A0; +} + +/* Other browsers on macOS/iOS */ +@supports not (-webkit-hyphens: none) { + @font-face { + font-family: system-ui-zh-hk; + src: local("HelveticaNeue"); + unicode-range: U+20; + } +} + +@font-face { + font-family: system-ui-ko; + src: local("AppleSDGothicNeo-Light"), local("Source Han Sans KR Light"), + local("SourceHanSansKR-Light"), local("Source Han Sans K Light"), + local("SourceHanSansK-Light"), local("Noto Sans CJK KR Light"), + local("NotoSansCJKKR-Light"), local("NanumBarunGothic Light"), + local("Malgun Gothic Semilight"), local("Nanum Gothic"), local("Dotum"); + font-weight: 300; + unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, + U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; +} + +@font-face { + font-family: system-ui-ko; + src: local("AppleSDGothicNeo-Regular"), local("Source Han Sans KR Regular"), + local("SourceHanSansKR-Regular"), local("Source Han Sans K Regular"), + local("SourceHanSansK-Regular"), local("Noto Sans CJK KR Regular"), + local("NotoSansCJKKR-Regular"), local("NanumBarunGothic"), + local("Malgun Gothic"), local("Nanum Gothic"), local("Dotum"); + font-weight: 400; + unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, + U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; +} + +@font-face { + font-family: system-ui-ko; + src: local("AppleSDGothicNeo-Medium"), local("Source Han Sans KR Medium"), + local("SourceHanSansKR-Medium"), local("Source Han Sans K Medium"), + local("SourceHanSansK-Medium"), local("Noto Sans CJK KR Medium"), + local("NotoSansCJKKR-Medium"), local("NanumBarunGothic"), + local("Malgun Gothic"), local("Nanum Gothic"), local("Dotum"); + font-weight: 500; + unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, + U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; +} + +@font-face { + font-family: system-ui-ko; + src: local("AppleSDGothicNeo-SemiBold"), local("Source Han Sans KR Bold"), + local("SourceHanSansKR-Bold"), local("Source Han Sans K Bold"), + local("SourceHanSansK-Bold"), local("Noto Sans CJK KR Bold"), + local("NotoSansCJKKR-Bold"), local("NanumBarunGothic Bold"), + local("Malgun Gothic Bold"), local("Nanum Gothic Bold"), local("Dotum"); + font-weight: 700; + unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, + U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; +} + +/* Safari on macOS/iOS */ +@font-face { + font-family: system-ui-ko; + src: local("HelveticaNeue"); + unicode-range: U+A0; +} + +/* Other browsers on macOS/iOS */ +@supports not (-webkit-hyphens: none) { + @font-face { + font-family: system-ui-ko; + src: local("HelveticaNeue"); + unicode-range: U+20; + } +} diff --git a/web_src/css/form.css b/web_src/css/form.css new file mode 100644 index 000000000000..e325a377f8d8 --- /dev/null +++ b/web_src/css/form.css @@ -0,0 +1,547 @@ +input, +textarea, +.ui.input > input, +.ui.form input:not([type]), +.ui.form select, +.ui.form textarea, +.ui.form input[type="date"], +.ui.form input[type="datetime-local"], +.ui.form input[type="email"], +.ui.form input[type="file"], +.ui.form input[type="number"], +.ui.form input[type="password"], +.ui.form input[type="search"], +.ui.form input[type="tel"], +.ui.form input[type="text"], +.ui.form input[type="time"], +.ui.form input[type="url"], +.ui.selection.dropdown, +.ui.checkbox label::before, +.ui.checkbox input:checked ~ label::before, +.ui.checkbox input:not([type="radio"]):indeterminate ~ label::before { + background: var(--color-input-background); + border-color: var(--color-input-border); + color: var(--color-input-text); +} + +input:hover, +textarea:hover, +.ui.input input:hover, +.ui.form input:not([type]):hover, +.ui.form select:hover, +.ui.form textarea:hover, +.ui.form input[type="date"]:hover, +.ui.form input[type="datetime-local"]:hover, +.ui.form input[type="email"]:hover, +.ui.form input[type="file"]:hover, +.ui.form input[type="number"]:hover, +.ui.form input[type="password"]:hover, +.ui.form input[type="search"]:hover, +.ui.form input[type="tel"]:hover, +.ui.form input[type="text"]:hover, +.ui.form input[type="time"]:hover, +.ui.form input[type="url"]:hover, +.ui.selection.dropdown:hover, +.ui.checkbox label:hover::before, +.ui.checkbox label:active::before, +.ui.radio.checkbox label::after, +.ui.radio.checkbox input:focus ~ label::before, +.ui.radio.checkbox input:checked ~ label::before { + background: var(--color-input-background); + border-color: var(--color-input-border-hover); + color: var(--color-input-text); +} + +input:focus, +textarea:focus, +.ui.input input:focus, +.ui.form input:not([type]):focus, +.ui.form select:focus, +.ui.form textarea:focus, +.ui.form input[type="date"]:focus, +.ui.form input[type="datetime-local"]:focus, +.ui.form input[type="email"]:focus, +.ui.form input[type="file"]:focus, +.ui.form input[type="number"]:focus, +.ui.form input[type="password"]:focus, +.ui.form input[type="search"]:focus, +.ui.form input[type="tel"]:focus, +.ui.form input[type="text"]:focus, +.ui.form input[type="time"]:focus, +.ui.form input[type="url"]:focus, +.ui.selection.dropdown:focus, +.ui.checkbox input:focus ~ label::before, +.ui.checkbox input:not([type="radio"]):indeterminate:focus ~ label::before, +.ui.checkbox input:checked:focus ~ label::before, +.ui.radio.checkbox input:focus:checked ~ label::before { + background: var(--color-input-background); + border-color: var(--color-primary); + color: var(--color-input-text); +} + +.ui.form .field > label, +.ui.form .inline.fields > label, +.ui.form .inline.fields .field > label, +.ui.form .inline.fields .field > p, +.ui.form .inline.field > label, +.ui.form .inline.field > p, +.ui.checkbox label, +.ui.checkbox + label, +.ui.checkbox label:hover, +.ui.checkbox + label:hover, +.ui.checkbox input:focus ~ label, +.ui.checkbox input:active ~ label { + color: var(--color-text); +} + +.ui.input, +.ui.checkbox input:focus ~ label::after, +.ui.checkbox input:checked ~ label::after, +.ui.checkbox label:active::after, +.ui.checkbox input:not([type="radio"]):indeterminate ~ label::after, +.ui.checkbox input:not([type="radio"]):indeterminate:focus ~ label::after, +.ui.checkbox input:checked:focus ~ label::after, +.ui.disabled.checkbox label, +.ui.checkbox input[disabled] ~ label { + color: var(--color-input-text); +} + +.ui.radio.checkbox input:focus ~ label::after, +.ui.radio.checkbox input:checked ~ label::after, +.ui.radio.checkbox input:focus:checked ~ label::after { + background: var(--color-input-text); +} + +.ui.toggle.checkbox label::before { + background: var(--color-input-toggle-background); +} + +.ui.toggle.checkbox label, +.ui.toggle.checkbox input:checked ~ label, +.ui.toggle.checkbox input:focus:checked ~ label { + color: var(--color-text) !important; +} + +.ui.toggle.checkbox input:checked ~ label::before, +.ui.toggle.checkbox input:focus:checked ~ label::before { + background: var(--color-primary) !important; +} + +/* match */ +.ui.form select { + padding: 0.67857143em 1em; +} + +.form .help { + color: var(--color-secondary-dark-5); + padding-bottom: 0.6em; + display: inline-block; +} + +#create-page-form form { + margin: auto; +} + +#create-page-form form .ui.message { + text-align: center; +} + +@media (min-width: 768px) { + #create-page-form form { + width: 800px !important; + } + #create-page-form form .header { + padding-left: 280px !important; + } + #create-page-form form .inline.field > label, + #create-page-form form .inline.field.captcha-field > span { + text-align: right; + width: 250px !important; + word-wrap: break-word; + } + #create-page-form form .help { + margin-left: 265px !important; + } + #create-page-form form .optional .title { + margin-left: 250px !important; + } + #create-page-form form .inline.field > input, + #create-page-form form .inline.field > textarea { + width: 50%; + } +} + +@media (max-width: 767px) { + #create-page-form form .optional .title { + margin-left: 15px; + } + #create-page-form form .inline.field > label { + display: block; + } +} + +.signin .oauth2 div { + display: inline-block; +} + +.signin .oauth2 div p { + margin: 10px 5px 0 0; + float: left; +} + +.signin .oauth2 a { + margin-right: 3px; +} + +.signin .oauth2 a:last-child { + margin-right: 0; +} + +.signin .oauth2 img { + width: 32px; + height: 32px; +} + +.signin .oauth2 img.openidConnect { + width: auto; +} + +@media (min-width: 768px) { + .g-recaptcha-style, + .h-captcha-style { + margin: 0 auto !important; + width: 304px; + padding-left: 30px; + } + .g-recaptcha-style iframe, + .h-captcha-style iframe { + border-radius: 5px !important; + width: 302px !important; + height: 76px !important; + } +} + +@media (max-height: 575px) { + #rc-imageselect, + .g-recaptcha-style, + .h-captcha-style { + transform: scale(0.77); + transform-origin: 0 0; + } +} + +.user.activate form, +.user.forgot.password form, +.user.reset.password form, +.user.link-account form, +.user.signin form, +.user.signup form { + margin: auto; + width: 700px !important; +} + +.user.activate form .ui.message, +.user.forgot.password form .ui.message, +.user.reset.password form .ui.message, +.user.link-account form .ui.message, +.user.signin form .ui.message, +.user.signup form .ui.message { + text-align: center; +} + +@media (min-width: 768px) { + .user.activate form, + .user.forgot.password form, + .user.reset.password form, + .user.link-account form, + .user.signin form, + .user.signup form { + width: 800px !important; + } + .user.activate form .header, + .user.forgot.password form .header, + .user.reset.password form .header, + .user.link-account form .header, + .user.signin form .header, + .user.signup form .header { + padding-left: 280px !important; + } + .user.activate form .inline.field > label, + .user.forgot.password form .inline.field > label, + .user.reset.password form .inline.field > label, + .user.link-account form .inline.field > label, + .user.signin form .inline.field > label, + .user.signup form .inline.field > label, + .user.activate form .inline.field.captcha-field > span, + .user.forgot.password form .inline.field.captcha-field > span, + .user.reset.password form .inline.field.captcha-field > span, + .user.link-account form .inline.field.captcha-field > span, + .user.signin form .inline.field.captcha-field > span, + .user.signup form .inline.field.captcha-field > span { + text-align: right; + width: 250px !important; + word-wrap: break-word; + } + .user.activate form .help, + .user.forgot.password form .help, + .user.reset.password form .help, + .user.link-account form .help, + .user.signin form .help, + .user.signup form .help { + margin-left: 265px !important; + } + .user.activate form .optional .title, + .user.forgot.password form .optional .title, + .user.reset.password form .optional .title, + .user.link-account form .optional .title, + .user.signin form .optional .title, + .user.signup form .optional .title { + margin-left: 250px !important; + } + .user.activate form .inline.field > input, + .user.forgot.password form .inline.field > input, + .user.reset.password form .inline.field > input, + .user.link-account form .inline.field > input, + .user.signin form .inline.field > input, + .user.signup form .inline.field > input, + .user.activate form .inline.field > textarea, + .user.forgot.password form .inline.field > textarea, + .user.reset.password form .inline.field > textarea, + .user.link-account form .inline.field > textarea, + .user.signin form .inline.field > textarea, + .user.signup form .inline.field > textarea { + width: 50%; + } +} + +@media (max-width: 767px) { + .user.activate form .optional .title, + .user.forgot.password form .optional .title, + .user.reset.password form .optional .title, + .user.link-account form .optional .title, + .user.signin form .optional .title, + .user.signup form .optional .title { + margin-left: 15px; + } + .user.activate form .inline.field > label, + .user.forgot.password form .inline.field > label, + .user.reset.password form .inline.field > label, + .user.link-account form .inline.field > label, + .user.signin form .inline.field > label, + .user.signup form .inline.field > label { + display: block; + } +} + +.user.activate form .header, +.user.forgot.password form .header, +.user.reset.password form .header, +.user.link-account form .header, +.user.signin form .header, +.user.signup form .header { + padding-left: 0 !important; + text-align: center; +} + +.user.activate form .inline.field > label, +.user.forgot.password form .inline.field > label, +.user.reset.password form .inline.field > label, +.user.link-account form .inline.field > label, +.user.signin form .inline.field > label, +.user.signup form .inline.field > label { + width: 200px; +} + +@media (max-width: 767px) { + .user.activate form .inline.field > label, + .user.forgot.password form .inline.field > label, + .user.reset.password form .inline.field > label, + .user.link-account form .inline.field > label, + .user.signin form .inline.field > label, + .user.signup form .inline.field > label, + .user.activate form input, + .user.forgot.password form input, + .user.reset.password form input, + .user.link-account form input, + .user.signin form input, + .user.signup form input { + width: 100% !important; + } +} + +.user.activate form input[type="number"], +.user.forgot.password form input[type="number"], +.user.reset.password form input[type="number"], +.user.link-account form input[type="number"], +.user.signin form input[type="number"], +.user.signup form input[type="number"] { + -moz-appearance: textfield; +} + +.user.activate form input::-webkit-outer-spin-button, +.user.forgot.password form input::-webkit-outer-spin-button, +.user.reset.password form input::-webkit-outer-spin-button, +.user.link-account form input::-webkit-outer-spin-button, +.user.signin form input::-webkit-outer-spin-button, +.user.signup form input::-webkit-outer-spin-button, +.user.activate form input::-webkit-inner-spin-button, +.user.forgot.password form input::-webkit-inner-spin-button, +.user.reset.password form input::-webkit-inner-spin-button, +.user.link-account form input::-webkit-inner-spin-button, +.user.signin form input::-webkit-inner-spin-button, +.user.signup form input::-webkit-inner-spin-button { + -webkit-appearance: none; + margin: 0; +} + +.user.signin.webauthn-prompt { + margin-top: 15px; +} + +.repository.new.repo form, +.repository.new.migrate form, +.repository.new.fork form { + margin: auto; +} + +.repository.new.repo form .ui.message, +.repository.new.migrate form .ui.message, +.repository.new.fork form .ui.message { + text-align: center; +} + +@media (min-width: 768px) { + .repository.new.repo form, + .repository.new.migrate form, + .repository.new.fork form { + width: 800px !important; + } + .repository.new.repo form .header, + .repository.new.migrate form .header, + .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, + .repository.new.repo form .inline.field.captcha-field > span, + .repository.new.migrate form .inline.field.captcha-field > span, + .repository.new.fork form .inline.field.captcha-field > span { + 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; + } + .repository.new.repo form .optional .title, + .repository.new.migrate form .optional .title, + .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%; + } +} + +@media (max-width: 767px) { + .repository.new.repo form .optional .title, + .repository.new.migrate form .optional .title, + .repository.new.fork form .optional .title { + margin-left: 15px; + } + .repository.new.repo form .inline.field > label, + .repository.new.migrate form .inline.field > label, + .repository.new.fork form .inline.field > label { + display: block; + } +} + +.repository.new.repo form .dropdown .text, +.repository.new.migrate form .dropdown .text, +.repository.new.fork form .dropdown .text { + margin-right: 0 !important; +} + +.repository.new.repo form .header, +.repository.new.migrate form .header, +.repository.new.fork form .header { + padding-left: 0 !important; + text-align: center; +} + +.repository.new.repo form .selection.dropdown, +.repository.new.migrate form .selection.dropdown, +.repository.new.fork form .selection.dropdown { + vertical-align: middle; + width: 50% !important; +} + +@media (max-width: 767px) { + .repository.new.repo form label, + .repository.new.migrate form label, + .repository.new.fork form label, + .repository.new.repo form input, + .repository.new.migrate form input, + .repository.new.fork form input, + .repository.new.repo form .selection.dropdown, + .repository.new.migrate form .selection.dropdown, + .repository.new.fork form .selection.dropdown { + width: 100% !important; + } + .repository.new.repo form .field button, + .repository.new.migrate form .field button, + .repository.new.fork form .field button, + .repository.new.repo form .field a, + .repository.new.migrate form .field a, + .repository.new.fork form .field a { + margin-bottom: 1em; + width: 100%; + } +} + +@media (min-width: 768px) { + .repository.new.repo .ui.form #auto-init { + margin-left: 265px !important; + } +} + +.repository.new.repo .ui.form .selection.dropdown:not(.owner) { + width: 50% !important; +} + +@media (max-width: 767px) { + .repository.new.repo .ui.form .selection.dropdown:not(.owner) { + width: 100% !important; + } +} + +.new.webhook form .help { + margin-left: 25px; +} + +.new.webhook .events.fields .column { + padding-left: 40px; +} + +.githook textarea { + font-family: var(--fonts-monospace); +} + +@media (max-width: 767px) { + .new.org .ui.form .field button, + .new.org .ui.form .field a { + margin-bottom: 1em; + width: 100%; + } + .new.org .ui.form .field input { + width: 100% !important; + } +} diff --git a/web_src/less/helpers.less b/web_src/css/helpers.css similarity index 99% rename from web_src/less/helpers.less rename to web_src/css/helpers.css index 91ea2268e28c..9e974b9ea1b0 100644 --- a/web_src/less/helpers.less +++ b/web_src/css/helpers.css @@ -196,7 +196,7 @@ .gt-content-center { align-content: center !important; } -@media @mediaSm { +@media (max-width: 767px) { .gt-db-small { display: block !important; } .gt-w-100-small { width: 100% !important; } .gt-js-small { justify-content: flex-start !important; } diff --git a/web_src/css/home.css b/web_src/css/home.css new file mode 100644 index 000000000000..5d36da594cc9 --- /dev/null +++ b/web_src/css/home.css @@ -0,0 +1,53 @@ +.home .logo { + max-width: 220px; +} + +@media (max-width: 767px) { + .home .hero h1 { + font-size: 3.5em; + } + .home .hero h2 { + font-size: 2em; + } +} + +@media (min-width: 768px) { + .home .hero h1 { + font-size: 5.5em; + } + .home .hero h2 { + font-size: 3em; + } +} + +.home .hero .svg { + color: var(--color-green); + height: 40px; + width: 50px; + vertical-align: bottom; +} + +.home .hero.header { + font-size: 20px; +} + +.home p.large { + font-size: 16px; +} + +.home .stackable { + padding-top: 30px; +} + +.home a { + color: var(--color-green); +} + +@media (max-width: 880px) { + footer .ui.container .left, + footer .ui.container .right { + display: block; + text-align: center; + float: none; + } +} diff --git a/web_src/css/index.css b/web_src/css/index.css new file mode 100644 index 000000000000..dd5f73937926 --- /dev/null +++ b/web_src/css/index.css @@ -0,0 +1,40 @@ +@import "font-awesome/css/font-awesome.css"; + +@import "./animations.css"; +@import "./shared/issuelist.css"; +@import "./features/dropzone.css"; +@import "./features/gitgraph.css"; +@import "./features/heatmap.css"; +@import "./features/imagediff.css"; +@import "./features/codeeditor.css"; +@import "./features/projects.css"; +@import "./modules/tippy.css"; +@import "./code/linebutton.css"; +@import "./markup/content.css"; +@import "./markup/codecopy.css"; +@import "./markup/asciicast.css"; + +@import "./chroma/base.css"; +@import "./chroma/light.css"; +@import "./codemirror/base.css"; +@import "./codemirror/light.css"; +@import "./console/console.css"; + +@import "./svg.css"; +@import "./tribute.css"; +@import "./font_i18n.css"; +@import "./base.css"; +@import "./home.css"; +@import "./install.css"; +@import "./form.css"; +@import "./repository.css"; +@import "./editor.css"; +@import "./organization.css"; +@import "./user.css"; +@import "./dashboard.css"; +@import "./admin.css"; +@import "./explore.css"; +@import "./review.css"; +@import "./package.css"; +@import "./runner.css"; +@import "./helpers.css"; diff --git a/web_src/css/install.css b/web_src/css/install.css new file mode 100644 index 000000000000..b936ba66fd64 --- /dev/null +++ b/web_src/css/install.css @@ -0,0 +1,65 @@ +.page-content.install { + padding-top: 45px; +} + +.page-content.install form.ui.form .inline.field > label { + text-align: right; + width: 30%; + padding-right: 10px; + margin-right: 0; +} + +.page-content.install form.ui.form .inline.field > .ui.checkbox:first-child { + margin-left: 30%; + padding-left: 5px; +} + +.page-content.install form.ui.form .inline.field > .ui.checkbox:first-child label { + width: auto; +} + +.page-content.install form.ui.form .title { + margin-left: 30%; + padding-left: 5px; +} + +.page-content.install form.ui.form input { + width: 60%; +} + +.page-content.install form.ui.form details.optional.field[open] { + border-bottom: 1px solid var(--color-secondary); + padding-bottom: 10px; +} + +.page-content.install form.ui.form details.optional.field[open] summary { + margin-bottom: 10px; +} + +.page-content.install form.ui.form details.optional.field * { + box-sizing: border-box; +} + +.page-content.install form.ui.form .field { + text-align: left; +} + +.page-content.install form.ui.form .field .help { + margin-left: 30%; + padding-left: 5px; + width: 60%; +} + +.page-content.install .ui .reinstall-message { + width: 70%; + margin: 20px auto; + color: var(--color-red); + text-align: left; + font-weight: bold; +} + +.page-content.install .ui .reinstall-confirm { + width: 70%; + text-align: left; + margin: 10px auto; +} diff --git a/web_src/less/markup/asciicast.less b/web_src/css/markup/asciicast.css similarity index 100% rename from web_src/less/markup/asciicast.less rename to web_src/css/markup/asciicast.css diff --git a/web_src/less/markup/codecopy.less b/web_src/css/markup/codecopy.css similarity index 92% rename from web_src/less/markup/codecopy.less rename to web_src/css/markup/codecopy.css index f6f9894fc14b..e3017ae962ec 100644 --- a/web_src/less/markup/codecopy.less +++ b/web_src/css/markup/codecopy.css @@ -9,7 +9,7 @@ right: 6px; padding: 9px; visibility: hidden; - animation: fadeout .2s both; + animation: fadeout 0.2s both; } /* adjustments for comment content having only 14px font size */ @@ -23,6 +23,7 @@ .markup .code-copy:hover { background: var(--color-secondary) !important; } + .markup .code-copy:active { background: var(--color-secondary-dark-1) !important; } @@ -30,5 +31,5 @@ .markup .code-block:hover .code-copy, .markup .mermaid-block:hover .code-copy { visibility: visible; - animation: fadein .2s both; + animation: fadein 0.2s both; } diff --git a/web_src/css/markup/content.css b/web_src/css/markup/content.css new file mode 100644 index 000000000000..00283dd0a254 --- /dev/null +++ b/web_src/css/markup/content.css @@ -0,0 +1,559 @@ +.markup { + overflow: hidden; + font-size: 16px; + line-height: 1.5 !important; + word-wrap: break-word; +} + +.markup.ui.segment { + padding: 3em; +} + +.markup.file-view { + padding: 2em !important; +} + +.markup > *:first-child { + margin-top: 0 !important; +} + +.markup > *:last-child { + margin-bottom: 0 !important; +} + +.markup a:not([href]) { + color: inherit; + text-decoration: none; +} + +.markup .absent { + color: var(--color-red); +} + +.markup .anchor { + padding-right: 4px; + margin-left: -20px; + line-height: 1; + color: inherit; +} + +.markup .anchor .svg { + vertical-align: middle; +} + +.markup .anchor:focus { + outline: none; +} + +.markup h1 .anchor .svg, +.markup h2 .anchor .svg, +.markup h3 .anchor .svg, +.markup h4 .anchor .svg, +.markup h5 .anchor .svg, +.markup h6 .anchor .svg { + visibility: hidden; +} + +.markup h1:hover .anchor .svg, +.markup h2:hover .anchor .svg, +.markup h3:hover .anchor .svg, +.markup h4:hover .anchor .svg, +.markup h5:hover .anchor .svg, +.markup h6:hover .anchor .svg { + visibility: visible; +} + +.markup h2 .anchor .svg, +.markup h3 .anchor .svg, +.markup h4 .anchor .svg { + position: relative; + top: -2px; +} + +.markup h1, +.markup h2, +.markup h3, +.markup h4, +.markup h5, +.markup h6 { + margin-top: 24px; + margin-bottom: 16px; + font-weight: 600; + line-height: 1.25; +} + +.markup h1 tt, +.markup h1 code, +.markup h2 tt, +.markup h2 code, +.markup h3 tt, +.markup h3 code, +.markup h4 tt, +.markup h4 code, +.markup h5 tt, +.markup h5 code, +.markup h6 tt, +.markup h6 code { + font-size: inherit; +} + +.markup h1 { + padding-bottom: 0.3em; + font-size: 2em; + border-bottom: 1px solid var(--color-secondary); +} + +.markup h2 { + padding-bottom: 0.3em; + font-size: 1.5em; + border-bottom: 1px solid var(--color-secondary); +} + +.markup h3 { + font-size: 1.25em; +} + +.markup h4 { + font-size: 1em; +} + +.markup h5 { + font-size: 0.875em; +} + +.markup h6 { + font-size: 0.85em; + color: var(--color-text-light-2); +} + +.markup p, +.markup blockquote, +.markup details, +.markup ul, +.markup ol, +.markup dl, +.markup table, +.markup pre { + margin-top: 0; + margin-bottom: 16px; +} + +.markup hr { + height: 4px; + padding: 0; + margin: 16px 0; + background-color: var(--color-secondary); + border: 0; +} + +.markup ul, +.markup ol { + padding-left: 2em; +} + +.markup ul.no-list, +.markup ol.no-list { + padding: 0; + list-style-type: none; +} + +.markup .task-list-item { + list-style-type: none; + position: relative; + line-height: 1.5rem; + min-height: 1.5rem; /* // to render a checkbox list without content `- [ ]`, we need this min-height to make sure the
  • can be visible */ +} + +.markup .task-list-item input[type="checkbox"] { + position: absolute; + top: 0.25em; + left: -1.6em; +} + +.markup .task-list-item p { + line-height: 1.5rem; +} + +.markup .task-list-item + .task-list-item { + margin-top: 3px; +} + +.markup input[type="checkbox"] { + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + position: relative; + border: 1px solid var(--color-secondary); + border-radius: 2px; + background: var(--color-input-background); + height: 14px; + width: 14px; + opacity: 1 !important; /* override fomantic on edit preview */ + pointer-events: auto !important; /* override fomantic on edit preview */ + vertical-align: middle !important; /* override fomantic on edit preview */ + -webkit-print-color-adjust: exact; + color-adjust: exact; +} + +.markup input[type="checkbox"]:not([disabled]):hover, +.markup input[type="checkbox"]:not([disabled]):active { + border-color: var(--color-primary); +} + +.markup input[type="checkbox"]::after { + position: absolute; + left: 0; + top: 0; + bottom: 0; + right: 0; + pointer-events: none; + background: var(--color-text); + mask-size: cover; + -webkit-mask-size: cover; +} + +.markup input[type="checkbox"]:checked::after { + content: ""; + mask-image: var(--checkbox-mask-checked); + -webkit-mask-image: var(--checkbox-mask-checked); + -webkit-print-color-adjust: exact; + color-adjust: exact; +} + +.markup input[type="checkbox"]:indeterminate::after { + content: ""; + mask-image: var(--checkbox-mask-indeterminate); + -webkit-mask-image: var(--checkbox-mask-indeterminate); +} + +.markup ul ul, +.markup ul ol, +.markup ol ol, +.markup ol ul { + margin-top: 0; + margin-bottom: 0; +} + +.markup ol ol, +.markup ul ol { + list-style-type: lower-roman; +} + +.markup li > p { + margin-top: 16px; +} + +.markup li + li { + margin-top: 0.25em; +} + +.markup dl { + padding: 0; +} + +.markup dl dt { + padding: 0; + margin-top: 16px; + font-size: 1em; + font-style: italic; + font-weight: 600; +} + +.markup dl dd { + padding: 0 16px; + margin-bottom: 16px; +} + +.markup blockquote { + margin-left: 0; + padding: 0 15px; + color: var(--color-text-light-2); + border-left: 4px solid var(--color-secondary); +} + +.markup blockquote > :first-child { + margin-top: 0; +} + +.markup blockquote > :last-child { + margin-bottom: 0; +} + +.markup table { + display: block; + width: 100%; + width: max-content; + max-width: 100%; + overflow: auto; +} + +.markup table th { + font-weight: 600; +} + +.markup table th, +.markup table td { + padding: 6px 13px !important; + border: 1px solid var(--color-secondary) !important; +} + +.markup table tr { + border-top: 1px solid var(--color-secondary); +} + +.markup table tr:nth-child(2n) { + background-color: var(--color-markup-table-row); +} + +.markup img { + max-width: 100%; + box-sizing: initial; +} + +.markup img[align="right"] { + padding-left: 20px; +} + +.markup img[align="left"] { + padding-right: 20px; +} + +.markup .emoji { + max-width: none; + vertical-align: text-top; +} + +.markup span.frame { + display: block; + overflow: hidden; +} + +.markup span.frame > span { + display: block; + float: left; + width: auto; + padding: 7px; + margin: 13px 0 0; + overflow: hidden; + border: 1px solid var(--color-secondary); +} + +.markup span.frame span img { + display: block; + float: left; +} + +.markup span.frame span span { + display: block; + padding: 5px 0 0; + clear: both; + color: var(--color-text); +} + +.markup span.align-center { + display: block; + overflow: hidden; + clear: both; +} + +.markup span.align-center > span { + display: block; + margin: 13px auto 0; + overflow: hidden; + text-align: center; +} + +.markup span.align-center span img { + margin: 0 auto; + text-align: center; +} + +.markup span.align-right { + display: block; + overflow: hidden; + clear: both; +} + +.markup span.align-right > span { + display: block; + margin: 13px 0 0; + overflow: hidden; + text-align: right; +} + +.markup span.align-right span img { + margin: 0; + text-align: right; +} + +.markup span.float-left { + display: block; + float: left; + margin-right: 13px; + overflow: hidden; +} + +.markup span.float-left span { + margin: 13px 0 0; +} + +.markup span.float-right { + display: block; + float: right; + margin-left: 13px; + overflow: hidden; +} + +.markup span.float-right > span { + display: block; + margin: 13px auto 0; + overflow: hidden; + text-align: right; +} + +.markup code, +.markup tt { + padding: 0.2em 0.4em; + margin: 0; + font-size: 85%; + white-space: break-spaces; + background-color: var(--color-markup-code-block); + border-radius: 4px; +} + +.markup code br, +.markup tt br { + display: none; +} + +.markup del code { + text-decoration: inherit; +} + +.markup pre > code { + padding: 0; + margin: 0; + font-size: 100%; + white-space: pre-wrap; + word-break: break-all; + overflow-wrap: break-word; + background: transparent; + border: 0; +} + +.markup .highlight { + margin-bottom: 16px; +} + +.markup .highlight pre, +.markup pre { + padding: 16px; + font-size: 85%; + line-height: 1.45; + background-color: var(--color-markup-code-block); + border-radius: 4px; +} + +.markup .highlight pre { + margin-bottom: 0; + word-break: normal; +} + +.markup pre { + word-wrap: normal; +} + +.markup pre code, +.markup pre tt { + display: inline; + max-width: initial; + padding: 0; + margin: 0; + overflow: initial; + line-height: inherit; + word-wrap: normal; + background-color: transparent; + border: 0; +} + +.markup pre code::before, +.markup pre code::after, +.markup pre tt::before, +.markup pre tt::after { + content: normal; +} + +.markup kbd { + display: inline-block; + padding: 3px 5px; + font-size: 11px; + line-height: 10px; + color: var(--color-text-light); + vertical-align: middle; + background-color: var(--color-markup-code-block); + border: 1px solid var(--color-secondary); + border-radius: 3px; + box-shadow: inset 0 -1px 0 var(--color-secondary); +} + +.markup .ui.list .list, +.markup ol.ui.list ol, +.markup ul.ui.list ul { + padding-left: 2em; +} + +.repository.wiki.revisions .ui.container > .ui.stackable.grid { + -ms-flex-direction: row-reverse; + flex-direction: row-reverse; +} + +.repository.wiki.revisions .ui.container > .ui.stackable.grid > .header { + margin-top: 0; +} + +.repository.wiki.revisions .ui.container > .ui.stackable.grid > .header .sub.header { + padding-left: 52px; + word-break: break-word; +} + +.file-revisions-btn { + display: block; + float: left; + margin-bottom: 2px !important; + padding: 11px !important; + margin-right: 10px !important; +} + +.file-revisions-btn i { + -webkit-touch-callout: none; + -webkit-user-select: none; + user-select: none; +} + +.markup-render { + display: block; + border: none; + width: 100%; + height: var(--height-loading); /* actual height is set in JS after loading */ + overflow: hidden; + color-scheme: normal; /* match the value inside the iframe to allow it to become transparent */ +} + +.markup-block-error { + border: 1px solid var(--color-error-border) !important; + margin-bottom: 0 !important; + border-bottom-left-radius: 0 !important; + border-bottom-right-radius: 0 !important; + box-shadow: none !important; + font-size: 85% !important; + white-space: pre-wrap !important; + padding: 0.5rem 1rem !important; + text-align: left !important; +} + +.markup-block-error + pre { + border-top: none !important; + margin-top: 0 !important; + border-top-left-radius: 0 !important; + border-top-right-radius: 0 !important; +} diff --git a/web_src/less/modules/tippy.less b/web_src/css/modules/tippy.css similarity index 96% rename from web_src/less/modules/tippy.less rename to web_src/css/modules/tippy.css index 68d6eb7fa3a8..a026f9c6b633 100644 --- a/web_src/less/modules/tippy.less +++ b/web_src/css/modules/tippy.css @@ -1,6 +1,6 @@ /* styles are based on node_modules/tippy.js/dist/tippy.css */ -// class to hide tippy target elements on page load +/* class to hide tippy target elements on page load */ .tippy-target { display: none !important; } @@ -40,7 +40,7 @@ } .tippy-box[data-theme="tooltip"] .tippy-content { - padding: .5rem 1rem; + padding: 0.5rem 1rem; } .tippy-box[data-theme="menu"] .tippy-content { diff --git a/web_src/css/organization.css b/web_src/css/organization.css new file mode 100644 index 000000000000..0a7cd26513db --- /dev/null +++ b/web_src/css/organization.css @@ -0,0 +1,250 @@ +#create-page-form form { + margin: auto; +} + +#create-page-form form .ui.message { + text-align: center; +} + +@media (min-width: 768px) { + #create-page-form form { + width: 800px !important; + } + #create-page-form form .header { + padding-left: 280px !important; + } + #create-page-form form .inline.field > label, + #create-page-form form .inline.field.captcha-field > span { + text-align: right; + width: 250px !important; + word-wrap: break-word; + } + #create-page-form form .help { + margin-left: 265px !important; + } + #create-page-form form .optional .title { + margin-left: 250px !important; + } + #create-page-form form .inline.field > input, + #create-page-form form .inline.field > textarea { + width: 50%; + } +} + +@media (max-width: 767px) { + #create-page-form form .optional .title { + margin-left: 15px; + } + #create-page-form form .inline.field > label { + display: block; + } +} + +.organization .head .ui.header .text { + vertical-align: middle; + font-size: 1.6rem; + margin-left: 15px; +} + +.organization .head .ui.header .org-visibility .label { + margin-left: 5px; + margin-top: 5px; +} + +.organization .head .ui.header .ui.right { + margin-top: 5px; +} + +.organization .ui.secondary.stackable.pointing.menu { + flex-wrap: wrap; + margin-top: 5px; + margin-bottom: 10px; +} + +.organization.new.org form { + margin: auto; +} + +.organization.new.org form .ui.message { + text-align: center; +} + +@media (min-width: 768px) { + .organization.new.org form { + width: 800px !important; + } + .organization.new.org form .header { + padding-left: 280px !important; + } + .organization.new.org form .inline.field > label, + .organization.new.org form .inline.field.captcha-field > span { + text-align: right; + width: 250px !important; + word-wrap: break-word; + } + .organization.new.org form .help { + margin-left: 265px !important; + } + .organization.new.org form .optional .title { + margin-left: 250px !important; + } + .organization.new.org form .inline.field > input, + .organization.new.org form .inline.field > textarea { + width: 50%; + } +} + +@media (max-width: 767px) { + .organization.new.org form .optional .title { + margin-left: 15px; + } + .organization.new.org form .inline.field > label { + display: block; + } +} + +.organization.new.org form .header { + padding-left: 0 !important; + text-align: center; +} + +.organization.options input { + min-width: 300px; +} + +.organization.profile .org-avatar { + width: 100px; + height: 100px; + margin-right: 15px; +} + +.organization.profile #org-info { + overflow-wrap: anywhere; +} + +.organization.profile #org-info .ui.header { + display: flex; + align-items: center; + font-size: 36px; + margin-bottom: 0; +} + +.organization.profile #org-info .ui.header .org-visibility .label { + margin-left: 5px; + margin-top: 2px; +} + +.organization.profile #org-info .desc { + font-size: 16px; + margin-bottom: 10px; +} + +.organization.profile #org-info .meta .item { + display: inline-block; + margin-right: 10px; +} + +.organization.profile #org-info .meta .item .icon { + margin-right: 5px; +} + +.organization.profile .ui.top.header .ui.right { + margin-top: 0; +} + +.organization.profile .teams .item { + padding: 10px 15px; +} + +.organization.teams .members a:hover, +.organization.profile .members a:hover { + text-decoration: none; +} + +.organization.teams .members .ui.avatar, +.organization.profile .members .ui.avatar { + width: 48px; + height: 48px; + margin-right: 5px; + margin-bottom: 5px; +} + +.organization.invite #invite-box { + margin: 50px auto auto; + width: 500px !important; +} + +.organization.invite #invite-box #search-user-box input { + margin-left: 0; + width: 300px; +} + +.organization.invite #invite-box .ui.button { + margin-left: 5px; + margin-top: -3px; +} + +.organization.invite .ui.avatar { + width: 100%; + height: 100%; +} + +.organization.members .list .item { + margin-left: 0; + margin-right: 0; + border-bottom: 1px solid var(--color-secondary); +} + +.organization.members .list .item .ui.avatar { + width: 48px; + height: auto; + margin-right: 1rem; + align-self: flex-start; +} + +.organization.members .list .item .meta { + line-height: 24px; + word-break: break-word; + min-width: 2em; +} + +.organization.teams .detail .item { + padding: 10px 15px; +} + +.organization.teams .detail .item:not(:last-child) { + border-bottom: 1px solid var(--color-secondary); +} + +.organization.teams .repositories .item, +.organization.teams .members .item { + padding: 10px 20px; + line-height: 32px; +} + +.organization.teams .repositories .item:not(:last-child), +.organization.teams .members .item:not(:last-child) { + border-bottom: 1px solid var(--color-secondary); +} + +.organization.teams .repositories .item .button, +.organization.teams .members .item .button { + padding: 9px 10px; +} + +.organization.teams #add-repo-form input, +.organization.teams #repo-multiple-form input, +.organization.teams #add-member-form input { + margin-left: 0; +} + +.organization.teams #add-repo-form .ui.button, +.organization.teams #repo-multiple-form .ui.button, +.organization.teams #add-member-form .ui.button { + margin-left: 5px; + margin-top: -3px; +} + +.organization.teams #repo-top-segment { + height: 60px; +} diff --git a/web_src/css/package.css b/web_src/css/package.css new file mode 100644 index 000000000000..c229e176f520 --- /dev/null +++ b/web_src/css/package.css @@ -0,0 +1,7 @@ +.container-labels td:nth-child(1) { + vertical-align: top; +} + +.container-labels td:nth-child(2) { + overflow-wrap: anywhere; +} diff --git a/web_src/css/repository.css b/web_src/css/repository.css new file mode 100644 index 000000000000..ad2ac49b9984 --- /dev/null +++ b/web_src/css/repository.css @@ -0,0 +1,3629 @@ +.repository .data-table .line-num, +.repository .diff-file-box .file-body.file-code .lines-num, +.repository .diff-file-box .code-diff tbody tr .lines-type-marker, +.repository .repository-summary .segment.language-stats { + -webkit-touch-callout: none; + -webkit-user-select: none; + user-select: none; +} + +.repository .repo-header .ui.compact.menu { + margin-left: 1rem; +} + +.repository .repo-header .ui.header { + margin-top: 0; +} + +.repository .repo-header .fork-flag { + font-size: 12px; + margin-top: 2px; +} + +.repository .repo-header .repo-buttons .svg { + margin: 0 0.42857143em 0 -0.21428571em; +} + +.repository .repo-header .button { + margin-top: 2px; + margin-bottom: 2px; +} + +.repository .tabs .navbar { + justify-content: initial; +} + +.repository .navbar { + display: flex; + justify-content: space-between; +} + +.repository .navbar .ui.label { + margin-left: 7px; + padding: 3px 5px; +} + +.repository .owner.dropdown { + min-width: 40% !important; +} + +.repository .unicode-escaped .escaped-code-point[data-escaped]::before { + visibility: visible; + content: attr(data-escaped); + font-family: var(--fonts-monospace); + color: var(--color-red); +} + +.repository .unicode-escaped .escaped-code-point .char { + display: none; +} + +.repository .broken-code-point { + font-family: var(--fonts-monospace); + color: var(--color-blue); +} + +.repository .unicode-escaped .ambiguous-code-point { + border: 1px var(--color-yellow) solid; +} + +.repository .metas .menu { + overflow-x: auto; + max-height: 500px; +} + +.repository .metas .ui.list.assignees .icon { + line-height: 2em; +} + +.repository .metas .ui.list.assignees .teamavatar { + margin-top: 0.125rem; + margin-left: 6.75px; + margin-right: 8.75px; +} + +.repository .metas .ui.list .dependency { + padding: 0; + white-space: nowrap; +} + +.repository .metas .ui.list .title { + max-width: 200px; + overflow: hidden; + text-overflow: ellipsis; +} + +@media (max-width: 1200px) { + .repository .metas .ui.list .title { + max-width: 150px; + } +} + +@media (max-width: 1000px) { + .repository .metas .ui.list .title { + max-width: 100px; + } +} + +.repository .metas #deadlineForm input { + width: 12.8rem; + border-radius: 4px 0 0 4px; + border-right: 0; + white-space: nowrap; +} + +.repository .header-wrapper { + background-color: var(--color-navbar); +} + +.repository .header-wrapper .ui.tabs.divider { + border-bottom: 0; +} + +.repository .header-wrapper .ui.tabular .svg { + margin-right: 5px; +} + +.repository .filter.menu.labels .label-filter .menu .info { + display: inline-block; + padding: 0.5rem 0.25rem; + border-bottom: 1px solid var(--color-secondary); + font-size: 12px; + width: 100%; + white-space: nowrap; + text-align: center; +} + +.repository .filter.menu.labels .label-filter .menu .info code { + border: 1px solid var(--color-secondary); + border-radius: 3px; + padding: 1px 2px; + font-size: 11px; +} + +.repository .filter.menu .menu { + max-height: 500px; + overflow-x: auto; + right: 0 !important; + left: auto !important; +} + +.repository .select-label .desc { + padding-left: 23px; +} + +.repository .ui.tabs.container { + margin-top: 14px; + margin-bottom: 0; +} + +.repository .ui.tabs.container .ui.menu { + border-bottom: 0; +} + +.repository .ui.tabs.divider { + margin-top: 0; + margin-bottom: 20px; +} + +.repository #clone-panel #repo-clone-url { + width: 320px; +} + +@media (min-width: 768px) and (max-width: 991px) { + .repository #clone-panel #repo-clone-url { + width: 200px; + } +} + +@media (max-width: 767px) { + .repository #clone-panel #repo-clone-url { + width: 200px; + } +} + +.repository #clone-panel #repo-clone-https, +.repository #clone-panel #repo-clone-ssh { + border-right: none; +} + +.repository #clone-panel #more-btn { + border-left: none; +} + +.repository #clone-panel button:first-of-type { + border-radius: var(--border-radius) 0 0 var(--border-radius) !important; +} + +.repository #clone-panel button:last-of-type { + border-radius: 0 var(--border-radius) var(--border-radius) 0 !important; +} + +.repository #clone-panel .dropdown .menu { + right: 0 !important; + left: auto !important; +} + +.repository.file.list .repo-description { + display: flex; + justify-content: space-between; + align-items: center; +} + +.repository.file.list #repo-desc { + font-size: 1.2em; +} + +.repository.file.list .repo-path .section, +.repository.file.list .repo-path .divider { + display: inline; +} + +.repository.file.list #repo-files-table { + table-layout: fixed; +} + +.repository.file.list #repo-files-table thead th { + padding-top: 8px; + padding-bottom: 5px; + font-weight: normal; +} + +.repository.file.list #repo-files-table thead .ui.avatar { + margin-bottom: 5px; +} + +.repository.file.list #repo-files-table tbody .svg { + margin-left: 3px; + margin-right: 5px; +} + +.repository.file.list #repo-files-table tbody .svg.octicon-reply { + margin-right: 10px; +} + +.repository.file.list #repo-files-table tbody .svg.octicon-file-directory-fill, +.repository.file.list #repo-files-table tbody .svg.octicon-file-submodule { + color: var(--color-primary); +} + +.repository.file.list #repo-files-table tbody .svg.octicon-file, +.repository.file.list #repo-files-table tbody .svg.octicon-file-symlink-file { + color: var(--color-secondary-dark-7); +} + +.repository.file.list #repo-files-table td { + padding-top: 0; + padding-bottom: 0; + overflow: initial; +} + +.repository.file.list #repo-files-table td.name { + width: 33%; + max-width: calc(100vw - 140px); +} + +@media (min-width: 1201px) { + .repository.file.list #repo-files-table td.name { + max-width: 150px; + } +} + +@media (min-width: 992px) and (max-width: 1200px) { + .repository.file.list #repo-files-table td.name { + max-width: 200px; + } +} + +@media (min-width: 768px) and (max-width: 991px) { + .repository.file.list #repo-files-table td.name { + max-width: 300px; + } +} + +.repository.file.list #repo-files-table td.message { + color: var(--color-text-light-1); + width: 66%; +} + +@media (min-width: 1201px) { + .repository.file.list #repo-files-table td.message { + max-width: 400px; + } +} + +@media (min-width: 992px) and (max-width: 1200px) { + .repository.file.list #repo-files-table td.message { + max-width: 350px; + } +} + +@media (min-width: 768px) and (max-width: 991px) { + .repository.file.list #repo-files-table td.message { + max-width: 250px; + } +} + +.repository.file.list #repo-files-table td.age { + width: 120px; + color: var(--color-text-light-1); +} + +.repository.file.list #repo-files-table td .truncate { + display: inline-block; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + width: 100%; + padding-top: 8px; + padding-bottom: 8px; +} + +.repository.file.list #repo-files-table td a { + padding-top: 8px; + padding-bottom: 8px; +} + +.repository.file.list #repo-files-table td .at { + margin-left: 3px; + margin-right: 3px; +} + +.repository.file.list #repo-files-table td > * { + vertical-align: middle; +} + +.repository.file.list #repo-files-table td.message .isSigned { + cursor: default; +} + +.repository.file.list #repo-files-table tr:last-of-type td:first-child { + border-bottom-left-radius: var(--border-radius); +} + +.repository.file.list #repo-files-table tr:last-of-type td:last-child { + border-bottom-right-radius: var(--border-radius); +} + +.repository.file.list #repo-files-table tr:hover { + background-color: var(--color-hover); +} + +.repository.file.list #repo-files-table tr.has-parent a { + display: inline-block; + padding-top: 8px; + padding-bottom: 8px; + width: calc(100% - 1.25rem); +} + +.repository.file.list .non-diff-file-content .header .icon { + font-size: 1em; +} + +.repository.file.list .non-diff-file-content .header .small.icon { + font-size: 0.75em; +} + +.repository.file.list .non-diff-file-content .header .tiny.icon { + font-size: 0.5em; +} + +.repository.file.list .non-diff-file-content .header .file-actions .btn-octicon { + line-height: 1; + padding: 10px 8px; + vertical-align: middle; + color: var(--color-text); +} + +.repository.file.list .non-diff-file-content .header .file-actions .btn-octicon:hover { + color: var(--color-primary); +} + +.repository.file.list .non-diff-file-content .header .file-actions .btn-octicon-danger:hover { + color: var(--color-red); +} + +.repository.file.list .non-diff-file-content .header .file-actions .btn-octicon.disabled { + color: inherit; + opacity: var(--opacity-disabled); + cursor: default; +} + +.repository.file.list .non-diff-file-content .view-raw { + padding: 5px; +} + +.repository.file.list .non-diff-file-content .view-raw > * { + max-width: 100%; + border: 1px solid var(--color-secondary); +} + +.repository.file.list .non-diff-file-content .view-raw img { + margin: 1rem 0; + border-radius: 0; + object-fit: contain; +} + +.repository.file.list .non-diff-file-content .view-raw img[src$=".svg" i] { + max-height: 600px !important; + max-width: 600px !important; +} + +.repository.file.list .non-diff-file-content .plain-text { + padding: 1em 2em; +} + +.repository.file.list .non-diff-file-content .plain-text pre { + word-break: break-word; + white-space: pre-wrap; +} + +.repository.file.list .non-diff-file-content .csv { + overflow-x: auto; + padding: 0 !important; +} + +.repository.file.list .non-diff-file-content pre { + overflow: auto; +} + +.repository.file.list .non-diff-file-content .asciicast { + padding: 5px !important; +} + +.repository.file.list .sidebar { + padding-left: 0; +} + +.repository.file.list .sidebar .svg { + width: 16px; +} + +.repository.file.editor .treepath { + width: 100%; +} + +.repository.file.editor .treepath input { + vertical-align: middle; + box-shadow: rgba(0, 0, 0, 0.0745098) 0 1px 2px inset; + width: inherit; + padding: 7px 8px; + margin-right: 5px; +} + +.repository.file.editor .tabular.menu .svg { + margin-right: 5px; +} + +.repository.file.editor .commit-form-wrapper { + padding-left: 64px; +} + +.repository.file.editor .commit-form-wrapper .commit-avatar { + float: left; + margin-left: -64px; + width: 3em; + height: auto; +} + +.repository.file.editor .commit-form-wrapper .commit-form { + position: relative; + padding: 15px; + margin-bottom: 10px; + border: 1px solid var(--color-secondary); + background: var(--color-box-body); + border-radius: 3px; +} + +.repository.file.editor .commit-form-wrapper .commit-form::before, +.repository.file.editor .commit-form-wrapper .commit-form::after { + right: 100%; + top: 20px; + border: solid transparent; + content: " "; + height: 0; + width: 0; + position: absolute; + pointer-events: none; +} + +.repository.file.editor .commit-form-wrapper .commit-form::before { + border-right-color: var(--color-secondary); + border-width: 9px; + margin-top: -9px; +} + +.repository.file.editor .commit-form-wrapper .commit-form::after { + border-right-color: var(--color-box-body); + border-width: 8px; + margin-top: -8px; +} + +.repository.file.editor .commit-form-wrapper .commit-form .quick-pull-choice .branch-name { + display: inline-block; + padding: 2px 4px; + font: 12px var(--fonts-monospace); + color: var(--color-text); + background: var(--color-secondary); + border-radius: 3px; + margin: 0 2px; +} + +.repository.file.editor .commit-form-wrapper .commit-form .quick-pull-choice .new-branch-name-input { + position: relative; + margin-left: 25px; +} + +.repository.file.editor .commit-form-wrapper .commit-form .quick-pull-choice .new-branch-name-input input { + width: 240px !important; + padding-left: 26px !important; +} + +.repository.file.editor .commit-form-wrapper .commit-form .quick-pull-choice .octicon-git-branch { + position: absolute; + top: 9px; + left: 10px; + color: var(--color-grey); +} + +.repository.options #interval { + width: 100px !important; + min-width: 100px; +} + +.repository.options .danger .item { + padding: 20px 15px; +} + +.repository.options .danger .ui.divider { + margin: 0; +} + +.repository .comment textarea { + max-height: none !important; +} + +.repository.new.issue .comment.form .comment .avatar { + width: 3em; +} + +.repository.new.issue .comment.form .content { + margin-left: 4em; +} + +.repository.new.issue .comment.form .content::before, +.repository.new.issue .comment.form .content::after { + right: 100%; + top: 20px; + border: solid transparent; + content: " "; + height: 0; + width: 0; + position: absolute; + pointer-events: none; +} + +.repository.new.issue .comment.form .content::before { + border-right-color: var(--color-secondary); + border-width: 9px; + margin-top: -9px; +} + +.repository.new.issue .comment.form .content::after { + border-right-color: var(--color-box-body); + border-width: 8px; + margin-top: -8px; +} + +.repository.new.issue .comment.form .content .markup { + font-size: 14px; +} + +.repository.new.issue .comment.form .metas { + min-width: 220px; +} + +.repository.new.issue .comment.form .metas .filter.menu { + max-height: 500px; + overflow-x: auto; +} + +.repository.view.issue .instruct-toggle { + display: inline-block; +} + +.repository.view.issue .title { + padding-bottom: 0 !important; +} + +.repository.view.issue .title .issue-title { + margin-bottom: 0.5rem; +} + +.repository.view.issue .title .issue-title.edit-active { + display: flex; + align-items: center; +} + +.repository.view.issue .title .issue-title.edit-active h1 { + display: flex; + width: 100%; +} + +@media (max-width: 767px) { + .repository.view.issue .title .issue-title.edit-active { + flex-direction: column; + } + .repository.view.issue .title .issue-title.edit-active h1 { + margin-right: 0; + margin-bottom: 1rem; + padding-right: 0; + } + .repository.view.issue .title .issue-title.edit-active h1 .ui.input input { + width: calc(100% - 2rem); + } + .repository.view.issue .title .issue-title.edit-active .edit-buttons { + padding-bottom: 1rem; + width: 100%; + } + .repository.view.issue .title .issue-title.edit-active .edit-buttons .button { + width: 100%; + margin-right: 0.5rem; + } + .repository.view.issue .title .issue-title.edit-active .edit-buttons .button:last-child { + margin-right: 0; + } +} + +.repository.view.issue .title .issue-title h1 { + font-weight: 300; + font-size: 2.3rem; + margin: 0; + padding-right: 0.5rem; +} + +.repository.view.issue .title .issue-title h1 .ui.input { + font-size: 0.5em; + width: 100%; +} + +.repository.view.issue .title .issue-title h1 .ui.input input { + font-size: 1.5em; + padding: 6px 1rem; +} + +.repository.view.issue .title .issue-title .edit-button { + float: right; + padding-left: 1rem; +} + +.repository.view.issue .title .issue-title .edit-buttons { + display: flex; +} + +.repository.view.issue .title .issue-title .index { + color: var(--color-text-light-2); +} + +.repository.view.issue .title .issue-title .label { + margin-right: 10px; +} + +.repository.view.issue .title .issue-title .edit-zone { + margin-top: 10px; +} + +.repository.view.issue .pull-desc code { + color: var(--color-primary); +} + +.repository.view.issue .pull-desc a[data-clipboard-text] { + cursor: pointer; +} + +.repository.view.issue .pull-desc a[data-clipboard-text] svg { + vertical-align: middle; + position: relative; + top: -2px; + right: 1px; +} + +.repository.view.issue .pull.tabular.menu { + margin-bottom: 1rem; +} + +.repository.view.issue .pull.tabular.menu .svg { + margin-right: 5px; +} + +.repository.view.issue .pull .merge.box .avatar { + margin-left: 10px; + margin-top: 10px; +} + +.repository.view.issue .pull .merge.box .branch-update.grid .row { + padding-bottom: 1rem; +} + +.repository.view.issue .pull .merge.box .branch-update.grid .row .icon { + margin-top: 1.1rem; +} + +.repository.view.issue .pull .review-item { + display: flex; + justify-content: space-between; + align-items: center; +} + +.repository.view.issue .pull .review-item .review-item-left, +.repository.view.issue .pull .review-item .review-item-right { + display: flex; + align-items: center; +} + +.repository.view.issue .pull .review-item .text { + margin: 0.3em 0 0.5em 0.5em; +} + +.repository.view.issue .pull .review-item .type-icon { + align-self: flex-start; + margin-right: 1em; +} + +.repository.view.issue .pull .review-item .type-icon i { + line-height: 1.8em; +} + +.repository.view.issue .pull .review-item .divider { + margin: 0.5rem 0; +} + +.repository.view.issue .pull .review-item .review-content { + padding: 1em 0 1em 3.8em; +} + +.repository.view.issue .comment-list:not(.prevent-before-timeline)::before { + display: block; + content: ""; + position: absolute; + margin-top: 12px; + margin-bottom: 14px; + top: 0; + bottom: 0; + left: 96px; + width: 2px; + background-color: var(--color-timeline); + z-index: -1; +} + +.repository.view.issue .comment-list .timeline { + position: relative; + display: block; + margin-left: 40px; + padding-left: 16px; +} + +.repository.view.issue .comment-list .timeline::before { /* ciara */ + display: block; + content: ""; + position: absolute; + margin-top: 12px; + margin-bottom: 14px; + top: 0; + bottom: 0; + left: 30px; + width: 2px; + background-color: var(--color-timeline); + z-index: -1; +} + +.repository.view.issue .comment-list .timeline-item, +.repository.view.issue .comment-list .timeline-item-group { + padding: 12px 0; +} + +.repository.view.issue .comment-list .timeline-item-group .timeline-item { + padding-top: 8px; + padding-bottom: 8px; +} + +.repository.view.issue .comment-list .timeline-item { + margin-left: 16px; + position: relative; +} + +.repository.view.issue .comment-list .timeline-item .timeline-avatar { + position: absolute; + left: -68px; +} + +.repository.view.issue .comment-list .timeline-item .timeline-avatar img { + width: 40px !important; + height: 40px !important; +} + +/* Don't show the mobile oriented avatar ".inline-timeline-avatar" on desktop. Desktop uses the avatar with class ".timeline-avatar" */ +.repository.view.issue .comment-list .timeline-item .inline-timeline-avatar { + display: none; +} + +.repository.view.issue .comment-list .timeline-item img.avatar, +.repository.view.issue .comment-list .timeline-item .avatar img { + width: 20px; + height: 20px; + vertical-align: middle; +} + +.repository.view.issue .comment-list .timeline-item:first-child:not(.commit) { + padding-top: 0 !important; +} + +.repository.view.issue .comment-list .timeline-item:last-child:not(.commit) { + padding-bottom: 0 !important; +} + +.repository.view.issue .comment-list .timeline-item .badge.badge-commit { + border-color: transparent; + background: radial-gradient(var(--color-body) 40%, transparent 40%) no-repeat; +} + +.repository.view.issue .comment-list .timeline-item .badge { + width: 34px; + height: 34px; + background-color: var(--color-timeline); + border-radius: 50%; + display: flex; + float: left; + margin-left: -33px; + margin-right: 8px; + color: var(--color-text); + align-items: center; + justify-content: center; +} + +.repository.view.issue .comment-list .timeline-item .badge .svg { + width: 22px; + height: 22px; + padding: 3px; +} + +.repository.view.issue .comment-list .timeline-item .badge .svg.octicon-comment { + margin-top: 2px; +} + +.repository.view.issue .comment-list .timeline-item.comment > .content { + margin-left: -16px; +} + +.repository.view.issue .comment-list .timeline-item.event > .text { + line-height: 32px; + vertical-align: middle; +} + +.repository.view.issue .comment-list .timeline-item.commits-list { + padding-left: 15px; + padding-top: 0; +} + +.repository.view.issue .comment-list .timeline-item.commits-list .singular-commit { + line-height: 34px; /* this must be same as .badge height, to avoid overflow */ + clear: both; /* reset the "float right shabox", in the future, use flexbox instead */ +} + +.repository.view.issue .comment-list .timeline-item.commits-list .singular-commit > img.avatar, +.repository.view.issue .comment-list .timeline-item.commits-list .singular-commit > .avatar img { + position: relative; + top: -2px; +} + +.repository.view.issue .comment-list .timeline-item.commits-list .singular-commit .shabox .sha.label { + margin: 0; + border: 1px solid var(--color-light-border); +} + +.repository.view.issue .comment-list .timeline-item.commits-list .singular-commit .shabox .sha.label.isSigned.isWarning { + border: 1px solid var(--color-red-badge); + background: var(--color-red-badge-bg); +} + +.repository.view.issue .comment-list .timeline-item.commits-list .singular-commit .shabox .sha.label.isSigned.isWarning .shortsha { + display: inline-block; + padding-top: 1px; +} + +.repository.view.issue .comment-list .timeline-item.commits-list .singular-commit .shabox .sha.label.isSigned.isWarning:hover { + background: var(--color-red-badge-hover-bg) !important; +} + +.repository.view.issue .comment-list .timeline-item.commits-list .singular-commit .shabox .sha.label.isSigned.isVerified { + border: 1px solid var(--color-green-badge); + background: var(--color-green-badge-bg); +} + +.repository.view.issue .comment-list .timeline-item.commits-list .singular-commit .shabox .sha.label.isSigned.isVerified .shortsha { + display: inline-block; + padding-top: 1px; +} + +.repository.view.issue .comment-list .timeline-item.commits-list .singular-commit .shabox .sha.label.isSigned.isVerified:hover { + background: var(--color-green-badge-hover-bg) !important; +} + +.repository.view.issue .comment-list .timeline-item.commits-list .singular-commit .shabox .sha.label.isSigned.isVerifiedUntrusted { + border: 1px solid var(--color-yellow-badge); + background: var(--color-yellow-badge-bg); +} + +.repository.view.issue .comment-list .timeline-item.commits-list .singular-commit .shabox .sha.label.isSigned.isVerifiedUntrusted .shortsha { + display: inline-block; + padding-top: 1px; +} + +.repository.view.issue .comment-list .timeline-item.commits-list .singular-commit .shabox .sha.label.isSigned.isVerifiedUntrusted:hover { + background: var(--color-yellow-badge-hover-bg) !important; +} + +.repository.view.issue .comment-list .timeline-item.commits-list .singular-commit .shabox .sha.label.isSigned.isVerifiedUnmatched { + border: 1px solid var(--color-orange-badge); + background: var(--color-orange-badge-bg); +} + +.repository.view.issue .comment-list .timeline-item.commits-list .singular-commit .shabox .sha.label.isSigned.isVerifiedUnmatched .shortsha { + display: inline-block; + padding-top: 1px; +} + +.repository.view.issue .comment-list .timeline-item.commits-list .singular-commit .shabox .sha.label.isSigned.isVerifiedUnmatched:hover { + background: var(--color-orange-badge-hover-bg) !important; +} + +.repository.view.issue .comment-list .timeline-item.event > .commit-status-link { + float: right; + margin-right: 8px; + margin-top: 4px; +} + +.repository.view.issue .comment-list .timeline-item .comparebox { + line-height: 32px; + vertical-align: middle; +} + +.repository.view.issue .comment-list .timeline-item .comparebox .compare.label { + font-size: 1rem; + margin: 0; + border: 1px solid var(--color-light-border); +} + +@media (max-width: 767px) { + .repository.view.issue .comment-list .timeline-item .ui.segments { + margin-left: -2rem; + } +} + +.repository.view.issue .comment-list .ui.comments { + max-width: 100%; +} + +.repository.view.issue .comment-list .ui.comments .avatar { + margin-right: 0.5rem; +} + +.repository.view.issue .comment-list .comment > .content > div:first-child { + border-top-left-radius: 4px; + border-top-right-radius: 4px; +} + +.repository.view.issue .comment-list .comment > .content > div:last-child { + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; +} + +.repository.view.issue .comment-list .comment .comment-container { + border: 1px solid var(--color-secondary); + border-radius: var(--border-radius); +} + +@media (max-width: 767px) { + .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); +} + +.repository.view.issue .comment-list .comment .merge-section .item-section { + display: flex; + align-items: center; + justify-content: space-between; + padding: 0; + margin-top: -0.25rem; + margin-bottom: -0.25rem; +} + +@media (max-width: 767px) { + .repository.view.issue .comment-list .comment .merge-section .item-section { + align-items: flex-start; + flex-direction: column; + } +} + +.repository.view.issue .comment-list .comment .merge-section .divider { + margin-left: -1rem; + margin-right: -1rem; +} + +.repository.view.issue .comment-list .comment .merge-section.no-header::before, +.repository.view.issue .comment-list .comment .merge-section.no-header::after { + right: 100%; + top: 20px; + border: solid transparent; + content: " "; + height: 0; + width: 0; + position: absolute; + pointer-events: none; +} + +.repository.view.issue .comment-list .comment .merge-section.no-header::before { + border-right-color: var(--color-secondary); + border-width: 9px; + margin-top: -9px; +} + +.repository.view.issue .comment-list .comment .merge-section.no-header::after { + border-right-color: var(--color-box-body); + border-width: 8px; + margin-top: -8px; +} + +.repository.view.issue .comment-list .comment .markup { + font-size: 14px; +} + +.repository.view.issue .comment-list .comment .no-content { + color: var(--color-text-light-2); + font-style: italic; +} + +.repository.view.issue .comment-list .comment .ui.form .field:first-child { + clear: none; +} + +.repository.view.issue .comment-list .comment .ui.form .field.footer { + overflow: hidden; +} + +.repository.view.issue .comment-list .comment .ui.form .field .tab.markup { + min-height: 5rem; +} + +.repository.view.issue .comment-list .comment .ui.form textarea { + height: 200px; + font-family: var(--fonts-monospace); +} + +.repository.view.issue .comment-list .comment .edit.buttons { + margin-top: 10px; +} + +.repository.view.issue .comment-list .code-comment { + border: 1px solid transparent; + padding: 0.25rem 0.5rem; + margin: 0; +} + +.repository.view.issue .comment-list .code-comment .content { + border: none !important; +} + +.repository.view.issue .comment-list .code-comment .comment-header { + background: transparent; + border-bottom: 0 !important; + padding: 0 !important; +} + +.repository.view.issue .comment-list .code-comment .comment-header::after, +.repository.view.issue .comment-list .code-comment .comment-header::before { + display: none; +} + +.repository.view.issue .comment-list .code-comment .comment-content { + margin-left: 36px; +} + +.repository.view.issue .comment-list .code-comment img.avatar, +.repository.view.issue .comment-list .comment img.avatar { + width: 28px; + height: 28px; +} + +.repository.view.issue .comment-list .comment-code-cloud .segment.reactions { + margin-top: 16px !important; + margin-bottom: -8px !important; + border-top: none !important; +} + +.repository.view.issue .comment-list .comment-code-cloud .segment.reactions .ui.label { + border: 1px solid; + padding: 6px 10px !important; + margin: 0 2px; + border-radius: var(--border-radius); + border-color: var(--color-secondary-dark-1) !important; +} + +.repository.view.issue .comment-list .comment-code-cloud .segment.reactions .ui.label.basic.primary { + background-color: var(--color-reaction-active-bg) !important; + border-color: var(--color-primary-alpha-80) !important; +} + +.repository.view.issue .comment-list .comment-code-cloud button.comment-form-reply { + margin: 0; +} + +.repository.view.issue .comment-list .event { + padding-left: 15px; +} + +.repository.view.issue .comment-list .event .detail { + margin-top: 4px; + margin-left: 14px; +} + +.repository.view.issue .comment-list .event .detail .svg { + margin-right: 2px; +} + +.repository.view.issue .comment-list .event .segments { + box-shadow: none; +} + +@media (max-width: 767px) { + .repository.view.issue .comment-list { + padding: 1rem 0 !important; /* Important is required here to override existing fomantic styles. */ + } +} + +.repository.view.issue .ui.depending .item.is-closed .title { + text-decoration: line-through; +} + +.repository .comment.form .ui.comments { + margin-top: -12px; + max-width: 100%; +} + +.repository .comment.form .content .field:first-child { + clear: none; +} + +.repository .comment.form .content .form::before, +.repository .comment.form .content .form::after { + right: 100%; + top: 20px; + border: solid transparent; + content: " "; + height: 0; + width: 0; + position: absolute; + pointer-events: none; +} + +.repository .comment.form .content .form::before { + border-right-color: var(--color-secondary); + border-width: 9px; + margin-top: -9px; +} + +.repository .comment.form .content .form::after { + border-right-color: var(--color-box-body); + border-width: 8px; + margin-top: -8px; +} + +.repository .comment.form .content textarea { + height: 200px; + font-family: var(--fonts-monospace); +} + +.repository .comment.form .content .CodeMirror-scroll { + max-height: 85vh; +} + +.repository .milestone.list { + list-style: none; + padding-top: 15px; +} + +.repository .milestone.list > .item { + padding-top: 10px; + padding-bottom: 10px; + border-bottom: 1px dashed var(--color-secondary); +} + +.repository .milestone.list > .item progress { + width: 200px; + height: 16px; +} + +.repository .milestone.list > .item .meta { + color: var(--color-text-light-2); + padding-top: 5px; +} + +.repository .milestone.list > .item .meta .issue-stats .svg { + padding-left: 5px; +} + +.repository .milestone.list > .item .meta .overdue { + color: var(--color-red); +} + +.repository .milestone.list > .item .operate { + margin-top: -15px; +} + +.repository .milestone.list > .item .operate > a { + font-size: 15px; + padding-top: 5px; + padding-right: 10px; + color: var(--color-text-light-2); +} + +.repository .milestone.list > .item .operate > a:hover { + color: var(--color-text); +} + +.repository .milestone.list > .item .content { + padding-top: 10px; +} + +.repository.new.milestone textarea { + height: 200px; +} + +.repository.compare.pull .show-form-container { + text-align: left; +} + +.repository.compare.pull .choose.branch .svg { + margin-right: 10px; +} + +.repository.compare.pull .comment.form .content::before, +.repository.compare.pull .comment.form .content::after { + right: 100%; + top: 20px; + border: solid transparent; + content: " "; + height: 0; + width: 0; + position: absolute; + pointer-events: none; +} + +.repository.compare.pull .comment.form .content::before { + border-right-color: var(--color-secondary); + border-width: 9px; + margin-top: -9px; +} + +.repository.compare.pull .comment.form .content::after { + border-right-color: var(--color-box-body); + border-width: 8px; + margin-top: -8px; +} + +.repository.compare.pull .pullrequest-form { + margin-bottom: 1.5rem; +} + +.repository.compare.pull .markup { + font-size: 14px; +} + +.repository.compare.pull .title .issue-title { + margin-bottom: 0.5rem; +} + +.repository.compare.pull .title .issue-title .index { + color: var(--color-text-light-2); +} + +.repository .filter.dropdown .menu { + margin-top: 1px !important; +} + +.repository.branches .commit-divergence .bar-group { + position: relative; + float: left; + padding-bottom: 6px; + width: 50%; + max-width: 90px; +} + +.repository.branches .commit-divergence .bar-group:last-child { + border-left: 1px solid var(--color-secondary-dark-2); +} + +.repository.branches .commit-divergence .count { + margin: 0 3px; +} + +.repository.branches .commit-divergence .count.count-ahead { + text-align: left; +} + +.repository.branches .commit-divergence .count.count-behind { + text-align: right; +} + +.repository.branches .commit-divergence .bar { + height: 4px; + position: absolute; + background-color: var(--color-secondary-dark-2); +} + +.repository.branches .commit-divergence .bar.bar-behind { + right: 0; +} + +.repository.branches .commit-divergence .bar.bar-ahead { + left: 0; +} + +.repository.commits .header .search input { + font-weight: normal; + padding: 5px 10px; +} + +.repository #commits-table thead th:first-of-type { + padding-left: 15px; +} + +.repository #commits-table thead .sha { + width: 200px; +} + +.repository #commits-table thead .shatd { + text-align: center; +} + +.repository #commits-table td.sha .sha.label { + margin: 0; +} + +.repository #commits-table td.message { + text-overflow: unset; +} + +.repository #commits-table.ui.basic.striped.table tbody tr:nth-child(2n) { + background-color: rgba(0, 0, 0, 0.02) !important; +} + +.repository #commits-table td.sha .sha.label, +.repository #repo-files-table .sha.label, +.repository #rev-list .sha.label, +.repository .timeline-item.commits-list .singular-commit .sha.label { + border: 1px solid var(--color-light-border); +} + +.repository #commits-table td.sha .sha.label .ui.signature.avatar, +.repository #repo-files-table .sha.label .ui.signature.avatar, +.repository #rev-list .sha.label .ui.signature.avatar, +.repository .timeline-item.commits-list .singular-commit .sha.label .ui.signature.avatar { + height: 16px; + margin-bottom: 0; + width: 16px; +} + +.repository #commits-table td.sha .sha.label .detail.icon, +.repository #repo-files-table .sha.label .detail.icon, +.repository #rev-list .sha.label .detail.icon, +.repository .timeline-item.commits-list .singular-commit .sha.label .detail.icon { + background: var(--color-light); + margin: -6px -10px -4px 0; + padding: 5px 4px 5px 6px; + border-left: 1px solid var(--color-light-border); + border-top: 0; + border-right: 0; + border-bottom: 0; + border-top-left-radius: 0; + border-bottom-left-radius: 0; +} + +.repository #commits-table td.sha .sha.label .detail.icon img, +.repository #repo-files-table .sha.label .detail.icon img, +.repository #rev-list .sha.label .detail.icon img, +.repository .timeline-item.commits-list .singular-commit .sha.label .detail.icon img { + margin-right: 0; +} + +.repository #commits-table td.sha .sha.label .detail.icon .svg, +.repository #repo-files-table .sha.label .detail.icon .svg, +.repository #rev-list .sha.label .detail.icon .svg, +.repository .timeline-item.commits-list .singular-commit .sha.label .detail.icon .svg { + margin: 0 0.25em 0 0; +} + +.repository #commits-table td.sha .sha.label .detail.icon > div, +.repository #repo-files-table .sha.label .detail.icon > div, +.repository #rev-list .sha.label .detail.icon > div, +.repository .timeline-item.commits-list .singular-commit .sha.label .detail.icon > div { + display: flex; + align-items: center; +} + +.repository #commits-table td.sha .sha.label.isSigned.isWarning, +.repository #repo-files-table .sha.label.isSigned.isWarning, +.repository #rev-list .sha.label.isSigned.isWarning, +.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isWarning { + border: 1px solid var(--color-red-badge); + background: var(--color-red-badge-bg); +} + +.repository #commits-table td.sha .sha.label.isSigned.isWarning .shortsha, +.repository #repo-files-table .sha.label.isSigned.isWarning .shortsha, +.repository #rev-list .sha.label.isSigned.isWarning .shortsha, +.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isWarning .shortsha { + display: inline-block; + padding-top: 1px; +} + +.repository #commits-table td.sha .sha.label.isSigned.isWarning .detail.icon, +.repository #repo-files-table .sha.label.isSigned.isWarning .detail.icon, +.repository #rev-list .sha.label.isSigned.isWarning .detail.icon, +.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isWarning .detail.icon { + border-left: 1px solid var(--color-red-badge); + color: var(--color-red-badge); +} + +.repository #commits-table td.sha .sha.label.isSigned.isWarning:hover, +.repository #repo-files-table .sha.label.isSigned.isWarning:hover, +.repository #rev-list .sha.label.isSigned.isWarning:hover, +.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isWarning:hover { + background: var(--color-red-badge-hover-bg) !important; +} + +.repository #commits-table td.sha .sha.label.isSigned.isVerified, +.repository #repo-files-table .sha.label.isSigned.isVerified, +.repository #rev-list .sha.label.isSigned.isVerified, +.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isVerified { + border: 1px solid var(--color-green-badge); + background: var(--color-green-badge-bg); +} + +.repository #commits-table td.sha .sha.label.isSigned.isVerified .shortsha, +.repository #repo-files-table .sha.label.isSigned.isVerified .shortsha, +.repository #rev-list .sha.label.isSigned.isVerified .shortsha, +.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isVerified .shortsha { + display: inline-block; + padding-top: 1px; +} + +.repository #commits-table td.sha .sha.label.isSigned.isVerified .detail.icon, +.repository #repo-files-table .sha.label.isSigned.isVerified .detail.icon, +.repository #rev-list .sha.label.isSigned.isVerified .detail.icon, +.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isVerified .detail.icon { + border-left: 1px solid var(--color-green-badge); + color: var(--color-green-badge); +} + +.repository #commits-table td.sha .sha.label.isSigned.isVerified:hover, +.repository #repo-files-table .sha.label.isSigned.isVerified:hover, +.repository #rev-list .sha.label.isSigned.isVerified:hover, +.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isVerified:hover { + background: var(--color-green-badge-hover-bg) !important; +} + +.repository #commits-table td.sha .sha.label.isSigned.isVerifiedUntrusted, +.repository #repo-files-table .sha.label.isSigned.isVerifiedUntrusted, +.repository #rev-list .sha.label.isSigned.isVerifiedUntrusted, +.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isVerifiedUntrusted { + border: 1px solid var(--color-yellow-badge); + background: var(--color-yellow-badge-bg); +} + +.repository #commits-table td.sha .sha.label.isSigned.isVerifiedUntrusted .shortsha, +.repository #repo-files-table .sha.label.isSigned.isVerifiedUntrusted .shortsha, +.repository #rev-list .sha.label.isSigned.isVerifiedUntrusted .shortsha, +.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isVerifiedUntrusted .shortsha { + display: inline-block; + padding-top: 1px; +} + +.repository #commits-table td.sha .sha.label.isSigned.isVerifiedUntrusted .detail.icon, +.repository #repo-files-table .sha.label.isSigned.isVerifiedUntrusted .detail.icon, +.repository #rev-list .sha.label.isSigned.isVerifiedUntrusted .detail.icon, +.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isVerifiedUntrusted .detail.icon { + border-left: 1px solid var(--color-yellow-badge); + color: var(--color-yellow-badge); +} + +.repository #commits-table td.sha .sha.label.isSigned.isVerifiedUntrusted:hover, +.repository #repo-files-table .sha.label.isSigned.isVerifiedUntrusted:hover, +.repository #rev-list .sha.label.isSigned.isVerifiedUntrusted:hover, +.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isVerifiedUntrusted:hover { + background: var(--color-yellow-badge-hover-bg) !important; +} + +.repository #commits-table td.sha .sha.label.isSigned.isVerifiedUnmatched, +.repository #repo-files-table .sha.label.isSigned.isVerifiedUnmatched, +.repository #rev-list .sha.label.isSigned.isVerifiedUnmatched, +.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isVerifiedUnmatched { + border: 1px solid var(--color-orange-badge); + background: var(--color-orange-badge-bg); +} + +.repository #commits-table td.sha .sha.label.isSigned.isVerifiedUnmatched .shortsha, +.repository #repo-files-table .sha.label.isSigned.isVerifiedUnmatched .shortsha, +.repository #rev-list .sha.label.isSigned.isVerifiedUnmatched .shortsha, +.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isVerifiedUnmatched .shortsha { + display: inline-block; + padding-top: 1px; +} + +.repository #commits-table td.sha .sha.label.isSigned.isVerifiedUnmatched .detail.icon, +.repository #repo-files-table .sha.label.isSigned.isVerifiedUnmatched .detail.icon, +.repository #rev-list .sha.label.isSigned.isVerifiedUnmatched .detail.icon, +.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isVerifiedUnmatched .detail.icon { + border-left: 1px solid var(--color-orange-badge); + color: var(--color-orange-badge); +} + +.repository #commits-table td.sha .sha.label.isSigned.isVerifiedUnmatched:hover, +.repository #repo-files-table .sha.label.isSigned.isVerifiedUnmatched:hover, +.repository #rev-list .sha.label.isSigned.isVerifiedUnmatched:hover, +.repository .timeline-item.commits-list .singular-commit .sha.label.isSigned.isVerifiedUnmatched:hover { + background: var(--color-orange-badge-hover-bg) !important; +} + +.repository .data-table { + width: 100%; +} + +.repository .data-table tr { + border-top: 0; +} + +.repository .data-table td, +.repository .data-table th { + padding: 5px !important; + overflow: hidden; + font-size: 12px; + text-align: left; + white-space: nowrap; + border: 1px solid var(--color-secondary); +} + +.repository .data-table td { + white-space: pre-line; +} + +.repository .data-table th { + font-weight: 600; + background: var(--color-box-header); + border-top: 0; +} + +.repository .data-table td.added, +.repository .data-table th.added, +.repository .data-table tr.added { + background-color: var(--color-diff-added-row-bg) !important; +} + +.repository .data-table td.removed, +.repository .data-table th.removed, +.repository .data-table tr.removed { + background-color: var(--color-diff-removed-row-bg) !important; +} + +.repository .data-table td.moved, +.repository .data-table th.moved, +.repository .data-table tr.moved { + background-color: var(--color-diff-moved-row-bg) !important; +} + +.repository .data-table tbody.section { + border-top: 2px solid var(--color-secondary); +} + +.repository .data-table .line-num { + width: 1%; + min-width: 50px; + font-family: monospace; + line-height: 20px; + color: var(--color-secondary-dark-2); + white-space: nowrap; + vertical-align: top; + cursor: pointer; + text-align: right; + background: var(--color-body); + border: 0; +} + +.repository .diff-detail-box { + padding: 7px 0; + background: var(--color-body); + line-height: 30px; +} + +@media (max-width: 991px) { + .repository .diff-detail-box { + flex-direction: column; + align-items: flex-start; + } +} + +@media (max-width: 480px) { + .repository .diff-detail-box { + flex-wrap: wrap; + } +} + +.repository .diff-detail-box.sticky { + position: sticky; + top: 0; + z-index: 8; + border-bottom: 1px solid var(--color-secondary); + padding-left: 2px; + padding-right: 2px; + margin-left: -1px; + margin-right: -1px; +} + +.repository .diff-detail-box > div::after { + clear: both; + content: ""; + display: block; +} + +.repository .diff-detail-box .diff-detail-stats strong { + margin-left: 0.25rem; + margin-right: 0.25rem; +} + +/* Because the translations contain the we need to style with nth-of-type */ + +.repository .diff-detail-box .diff-detail-stats strong:nth-of-type(1) { + color: var(--color-yellow); +} + +.repository .diff-detail-box .diff-detail-stats strong:nth-of-type(2) { + color: var(--color-green); +} + +.repository .diff-detail-box .diff-detail-stats strong:nth-of-type(3) { + color: var(--color-red); +} + +@media (max-width: 480px) { + .repository .diff-detail-box .diff-detail-stats { + font-size: 0; + line-height: 1.6rem; + } + .repository .diff-detail-box .diff-detail-stats strong { + font-size: 1rem; + } +} + +.repository .diff-detail-box .diff-detail-actions > * { + margin-right: 0; +} + +.repository .diff-detail-box .diff-detail-actions > * + * { + margin-left: 0.25rem; +} + +@media (max-width: 480px) { + .repository .diff-detail-box .diff-detail-actions { + padding-top: 0.25rem; + } + .repository .diff-detail-box .diff-detail-actions .ui.button:not(.btn-submit) { + padding-left: 0.5rem; + padding-right: 0.5rem; + display: flex; + flex-wrap: wrap; + justify-content: center; + text-align: center; + } +} + +.repository .diff-detail-box span.status { + display: inline-block; + width: 12px; + height: 12px; + margin-right: 8px; + vertical-align: middle; +} + +.repository .diff-detail-box span.status.modify { + background-color: var(--color-yellow); +} + +.repository .diff-detail-box span.status.add { + background-color: var(--color-green); +} + +.repository .diff-detail-box span.status.del { + background-color: var(--color-red); +} + +.repository .diff-detail-box span.status.rename { + background-color: var(--color-teal); +} + +.repository .diff-detail-box .button { + padding: 8px 12px; +} + +.repository .diff-box .header:not(.resolved-placeholder) { + display: flex; + align-items: center; +} + +.repository .diff-box .header:not(.resolved-placeholder) .file { + min-width: 0; +} + +.repository .diff-box .header:not(.resolved-placeholder) .file .file-link { + max-width: fit-content; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + overflow: hidden; +} + +.repository .diff-box .header:not(.resolved-placeholder) .button { + padding: 8px 12px; + flex: 0 0 auto; + margin-top: -8px; + margin-bottom: -8px; + margin-right: 0; +} + +.repository .diff-box .resolved-placeholder { + display: flex; + align-items: center; +} + +.repository .diff-box .resolved-placeholder .button { + padding: 8px 12px; +} + +.repository .diff-file-box .header { + background-color: var(--color-box-header); +} + +.repository .diff-file-box .file-body.file-code { + background: var(--color-code-bg); +} + +.repository .diff-file-box .file-body.file-code .lines-num { + text-align: right; + color: var(--color-text-light); + width: 1%; + min-width: 50px; +} + +.repository .diff-file-box .file-body.file-code .lines-num span.fold { + display: block; + text-align: center; +} + +.repository .diff-file-box .code-diff { + font-size: 12px; +} + +.repository .diff-file-box .code-diff td { + padding: 0 0 0 10px !important; + border-top: 0; +} + +.repository .diff-file-box .code-diff .lines-num { + padding: 0 5px !important; +} + +.repository .diff-file-box .code-diff .tag-code .lines-num, +.repository .diff-file-box .code-diff .tag-code td { + padding: 0 !important; +} + +.repository .diff-file-box .code-diff tbody tr td.halfwidth { + width: 49%; /* halfwidth is used in split view - and in that case, 1% of each */ +} + +.repository .diff-file-box .code-diff tbody tr td.center { + text-align: center; +} + +.repository .diff-file-box .code-diff tbody tr [data-line-num]::before { + content: attr(data-line-num); + text-align: right; +} + +.repository .diff-file-box .code-diff tbody tr .lines-type-marker { + width: 10px; + min-width: 10px; +} + +.repository .diff-file-box .code-diff tbody tr [data-type-marker]::before { + content: attr(data-type-marker); + text-align: right; + display: inline-block; +} + +.repository .diff-file-box .code-diff-split .tag-code .lines-code code.code-inner { + padding-left: 10px !important; +} + +.repository .diff-file-box .code-diff-split table, +.repository .diff-file-box .code-diff-split tbody { + width: 100%; +} + +.repository .diff-file-box.file-content { + clear: right; +} + +.repository .diff-file-box.file-content img { + max-width: 100%; + padding: 0; + border-radius: 0; +} + +.repository .diff-file-box.file-content img.emoji { + padding: 0; +} + +.repository .diff-file-box .ui.bottom.attached.table.segment { + padding-top: 5px; + padding-bottom: 5px; +} + +.repository .diff-stats { + clear: both; + margin-bottom: 5px; + max-height: 400px; + 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; +} + +.repository .repo-search-result .lines-num a { + color: inherit; +} + +.repository.quickstart .guide .item { + padding: 1em; +} + +.repository.quickstart .guide .item small { + font-weight: normal; +} + +.repository.quickstart .guide .clone.button:first-child { + border-radius: var(--border-radius) 0 0 var(--border-radius); +} + +.repository.quickstart .guide .ui.action.small.input { + width: 100%; +} + +.repository.quickstart .guide #repo-clone-url { + border-radius: 0; + padding: 5px 10px; + font-size: 1.2em; + line-height: 1.4; +} + +.repository.release #release-list { + border-top: 1px solid var(--color-secondary); + margin-top: 20px; + padding-top: 15px; + padding-left: 0; +} + +.repository.release #release-list .release-list-title { + font-size: 2rem; + font-weight: normal; + margin-top: -4px; + margin-bottom: 0; +} + +.repository.release #release-list > li { + list-style: none; +} + +.repository.release #release-list > li .meta, +.repository.release #release-list > li .detail { + padding-top: 30px; + padding-bottom: 40px; +} + +.repository.release #release-list > li .meta { + text-align: right; + position: relative; +} + +.repository.release #release-list > li .meta .label { + margin-right: 0; +} + +.repository.release #release-list > li .meta .commit { + display: block; + margin-top: 10px; +} + +.repository.release #release-list > li .meta .choose { + margin-top: 15px; +} + +.repository.release #release-list > li .meta .choose .button { + margin-right: 0; +} + +.repository.release #release-list > li .detail { + border-left: 2px solid var(--color-secondary); +} + +.repository.release #release-list > li .detail .author img { + margin-bottom: 3px; +} + +.repository.release #release-list > li .detail .download > a .svg { + margin-left: 5px; + margin-right: 5px; +} + +.repository.release #release-list > li .detail .download .list { + padding-left: 0; +} + +.repository.release #release-list > li .detail .download .list li { + list-style: none; + display: block; + padding: 8px; + border: 1px solid var(--color-secondary); + background: var(--color-light); +} + +.repository.release #release-list > li .detail .download .list li a > .text.right { + margin-right: 5px; +} + +.repository.release #release-list > li .detail .download .list li + li { + border-top: 0; +} + +.repository.release #release-list > li .detail .download .list li:first-of-type { + border-radius: var(--border-radius) 0 0 var(--border-radius); +} + +.repository.release #release-list > li .detail .download .list li:last-of-type { + border-radius: 0 var(--border-radius) var(--border-radius) 0; +} + +.repository.release #release-list > li .detail .dot { + width: 10px; + height: 10px; + background-color: var(--color-secondary-dark-3); + z-index: 9; + position: absolute; + display: block; + left: -6px; + top: 40px; + border-radius: 100%; + border: 2.5px solid var(--color-body); +} + +.repository.release #tags-table .tag { + padding: 8px 12px; +} + +.repository.release #tags-table .release-tag-name { + font-size: 18px; + font-weight: normal; +} + +.repository.new.release .target { + min-width: 500px; +} + +.repository.new.release .target #tag-name { + margin-top: -4px; +} + +.repository.new.release .target .at { + margin-left: -5px; + margin-right: 5px; +} + +.repository.new.release .target .selection.dropdown { + padding-top: 10px; + padding-bottom: 10px; +} + +.repository.new.release .prerelease.field { + margin-bottom: 0; +} + +@media (max-width: 438px) { + .repository.new.release .field button, + .repository.new.release .field input { + width: 100%; + } +} + +@media (max-width: 767px) { + .repository.new.release .field button { + margin-bottom: 1em; + } +} + +.repository.new.release .field .wrap_remove { + height: 38px; +} + +.repository.new.release .field .attachment_edit { + width: 450px !important; +} + +.repository.forks .list { + margin-top: 0; +} + +.repository.forks .list .item { + padding-top: 10px; + padding-bottom: 10px; + border-bottom: 1px solid var(--color-secondary); +} + +.repository.forks .list .item .ui.avatar { + float: left; + margin-right: 5px; +} + +.repository.forks .list .item .link { + padding-top: 5px; +} + +.repository.packages .empty { + padding-top: 70px; + padding-bottom: 100px; +} + +.repository.packages .empty .svg { + height: 48px; +} + +.repository.packages .file-size { + white-space: nowrap; +} + +.repository.wiki.start .ui.segment { + padding-top: 70px; + padding-bottom: 100px; +} + +.repository.wiki.start .ui.segment .svg { + height: 48px; +} + +.repository.wiki.new .ui.attached.tabular.menu.previewtabs { + margin-bottom: 15px; +} + +.repository.wiki.view > .markup { + padding: 15px 30px; +} + +.repository.wiki.view > .markup h1:first-of-type, +.repository.wiki.view > .markup h2:first-of-type, +.repository.wiki.view > .markup h3:first-of-type, +.repository.wiki.view > .markup h4:first-of-type, +.repository.wiki.view > .markup h5:first-of-type, +.repository.wiki.view > .markup h6:first-of-type { + margin-top: 0; +} + +.repository.wiki .form .CodeMirror-scroll { + max-height: 85vh; +} + +@media (max-width: 767px) { + .repository.wiki .dividing.header .stackable.grid .button { + margin-top: 2px; + margin-bottom: 2px; + } +} + +@media (max-width: 767px) { + .repository.wiki #clone-panel #repo-clone-url { + width: 160px; + } +} + +.repository.settings.collaboration .collaborator.list { + padding: 0; +} + +.repository.settings.collaboration .collaborator.list > .item { + margin: 0; + line-height: 2em; +} + +.repository.settings.collaboration .collaborator.list > .item:not(:last-child) { + border-bottom: 1px solid var(--color-secondary); +} + +.repository.settings.collaboration #repo-collab-form #search-user-box .results { + left: 7px; +} + +.repository.settings.collaboration #repo-collab-form .ui.button { + margin-left: 5px; + margin-top: -3px; +} + +.repository.settings.collaboration #repo-collab-team-form #search-team-box .results { + left: 7px; +} + +.repository.settings.collaboration #repo-collab-team-form .ui.button { + margin-left: 5px; + margin-top: -3px; +} + +.repository.settings.branches .protected-branches .selection.dropdown { + width: 300px; +} + +.repository.settings.branches .protected-branches .item { + border: 1px solid var(--color-secondary); + padding: 10px 15px; +} + +.repository.settings.branches .protected-branches .item:not(:last-child) { + border-bottom: 0; +} + +.repository.settings.branches .branch-protection .help { + margin-left: 26px; + padding-top: 0; +} + +.repository.settings.branches .branch-protection .fields { + margin-left: 20px; + display: block; +} + +.repository.settings.branches .branch-protection .whitelist { + margin-left: 26px; +} + +.repository.settings.branches .branch-protection .whitelist .dropdown img { + display: inline-block; +} + +.repository.settings.webhook .events .column { + padding-bottom: 0; +} + +.repository.settings.webhook .events .help { + font-size: 13px; + margin-left: 26px; + padding-top: 0; +} + +.repository .ui.attached.isSigned.isWarning { + border-left: 1px solid var(--color-error-border); + border-right: 1px solid var(--color-error-border); +} + +.repository .ui.attached.isSigned.isWarning.top, +.repository .ui.attached.isSigned.isWarning.message { + border-top: 1px solid var(--color-error-border); +} + +.repository .ui.attached.isSigned.isWarning.message { + box-shadow: none; + background-color: var(--color-error-bg); + color: var(--color-error-text); +} + +.repository .ui.attached.isSigned.isWarning.message .ui.text { + color: var(--color-error-text); +} + +.repository .ui.attached.isSigned.isWarning:last-child, +.repository .ui.attached.isSigned.isWarning.bottom { + border-bottom: 1px solid var(--color-error-border); +} + +.repository .ui.attached.isSigned.isVerified { + border-left: 1px solid var(--color-success-border); + border-right: 1px solid var(--color-success-border); +} + +.repository .ui.attached.isSigned.isVerified.top, +.repository .ui.attached.isSigned.isVerified.message { + border-top: 1px solid var(--color-success-border); +} + +.repository .ui.attached.isSigned.isVerified.message { + box-shadow: none; + background-color: var(--color-success-bg); + 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); +} + +.repository .ui.attached.isSigned.isVerified:last-child, +.repository .ui.attached.isSigned.isVerified.bottom { + border-bottom: 1px solid var(--color-success-border); +} + +.repository .ui.attached.isSigned.isVerifiedUntrusted, +.repository .ui.attached.isSigned.isVerifiedUnmatched { + border-left: 1px solid var(--color-warning-border); + border-right: 1px solid var(--color-warning-border); +} + +.repository .ui.attached.isSigned.isVerifiedUntrusted.top, +.repository .ui.attached.isSigned.isVerifiedUnmatched.top, +.repository .ui.attached.isSigned.isVerifiedUntrusted.message, +.repository .ui.attached.isSigned.isVerifiedUnmatched.message { + border-top: 1px solid var(--color-warning-border); +} + +.repository .ui.attached.isSigned.isVerifiedUntrusted.message, +.repository .ui.attached.isSigned.isVerifiedUnmatched.message { + box-shadow: none; + background-color: var(--color-warning-bg); + color: var(--color-warning-text); +} + +.repository .ui.attached.isSigned.isVerifiedUntrusted.message .ui.text, +.repository .ui.attached.isSigned.isVerifiedUnmatched.message .ui.text { + color: var(--color-warning-text); +} + +.repository .ui.attached.isSigned.isVerifiedUntrusted:last-child, +.repository .ui.attached.isSigned.isVerifiedUnmatched:last-child, +.repository .ui.attached.isSigned.isVerifiedUntrusted.bottom, +.repository .ui.attached.isSigned.isVerifiedUnmatched.bottom { + border-bottom: 1px solid var(--color-warning-border); +} + +.repository .ui.segment.sub-menu { + padding: 7px; + line-height: 0; +} + +.repository .ui.segment.sub-menu .list { + width: 100%; + display: flex; + align-items: center; +} + +.repository .ui.segment.sub-menu .list .item { + width: 100%; + color: var(--color-text); +} + +.repository .ui.segment.sub-menu .list .item:first-of-type { + border-radius: var(--border-radius) 0 0 var(--border-radius); + padding-left: 0.25rem; +} + +.repository .ui.segment.sub-menu .list .item:last-of-type { + border-radius: 0 var(--border-radius) var(--border-radius) 0; + padding-right: 0.25rem; +} + +.repository .ui.segment.sub-menu .list .item a { + color: var(--color-text); +} + +.repository .ui.segment.sub-menu .list .item a:hover { + color: var(--color-primary-light-2); +} + +.repository .ui.segment.sub-menu .list .item.active { + background: var(--color-secondary); +} + +.repository .segment.reactions.dropdown .menu, +.repository .select-reaction.dropdown .menu { + right: 0 !important; + left: auto !important; + min-width: 15em; +} + +.repository .segment.reactions.dropdown .menu > .header, +.repository .select-reaction.dropdown .menu > .header { + margin: 0.75rem 0 0.5rem; +} + +.repository .segment.reactions.dropdown .menu > .item, +.repository .select-reaction.dropdown .menu > .item { + float: left; + padding: 0.25rem !important; + margin: 0.25rem; + font-size: 1.5em; + width: 39px; + left: 13px; + border-radius: 6px; + display: flex; + justify-content: center; + align-items: center; +} + +.repository .segment.reactions.dropdown .menu > .item img.emoji, +.repository .select-reaction.dropdown .menu > .item img.emoji { + margin-right: 0; +} + +.repository .segment.reactions.dropdown .menu > .item:hover, +.repository .select-reaction.dropdown .menu > .item:hover { + background: var(--color-primary); +} + +.repository .segment.reactions { + padding: 0; + display: flex; + border: none !important; + border-top: 1px solid var(--color-secondary) !important; + width: 100% !important; + max-width: 100% !important; + margin: 0 !important; +} + +.repository .segment.reactions .ui.label { + max-height: 40px; + padding: 10px 18px !important; + display: flex !important; + align-items: center; + border: 0; + border-right: 1px solid; + border-radius: 0; + margin: 0; + font-size: 14px; + font-weight: normal; + border-color: var(--color-secondary) !important; + background: var(--color-reaction-bg); +} + +.repository .segment.reactions .ui.label.disabled { + cursor: default; + opacity: 1; +} + +.repository .segment.reactions .ui.label.basic { + color: var(--color-primary) !important; +} + +.repository .segment.reactions .ui.label.basic.primary { + background-color: var(--color-reaction-active-bg) !important; + border-color: var(--color-secondary) !important; +} + +.repository .segment.reactions .reaction-count { + margin-left: 0.5rem; +} + +.repository .segment.reactions .select-reaction { + display: flex; + align-items: center; + padding: 0 14px; +} + +.repository .segment.reactions .select-reaction:not(.active) a { + display: none; +} + +.repository .segment.reactions:hover .select-reaction a { + display: block; +} + +.repository .ui.fluid.action.input .ui.search.action.input { + flex: auto; +} + +.repository .repository-summary { + box-shadow: none !important; +} + +.repository .repository-summary .segment.language-stats-details, +.repository .repository-summary .segment.repository-summary { + border-top: none; + background: none; +} + +.repository .repository-summary .segment.language-stats-details .item { + white-space: nowrap; +} + +.repository .repository-summary .segment.language-stats { + padding: 0; + height: 11px; + display: flex; + white-space: nowrap; + width: 100%; + border-radius: 0; +} + +@media (max-width: 767px) { + .repository .repository-summary .segment.language-stats { + display: none; + } +} + +.repository .repository-summary .segment.language-stats .bar { + white-space: nowrap; + border: 0; + padding: 0; + margin: 0; + height: 100%; +} + +.repository .repository-menu { + padding: 0 !important; +} + +.repository .repository-menu .item { + padding-top: 9px !important; + padding-bottom: 9px !important; +} + +#cite-repo-modal #citation-panel { + width: 500px; +} + +@media (max-width: 767px) { + #cite-repo-modal #citation-panel { + width: 100%; + } +} + +#cite-repo-modal #citation-panel input { + border-radius: 0; + padding: 5px 10px; + width: 50%; + line-height: 1.4; +} + +#cite-repo-modal #citation-panel .citation.button { + font-size: 13px; + padding: 7.5px 5px; +} + +#cite-repo-modal #citation-panel #citation-copy-content { + border-radius: 0; + padding: 5px 10px; + font-size: 1.2em; + line-height: 1.4; +} + +#cite-repo-modal #citation-panel #citation-copy-apa, +#cite-repo-modal #citation-panel #citation-copy-bibtex { + border-right: none; +} + +#cite-repo-modal #citation-panel #goto-citation-btn { + border-left: none; +} + +#cite-repo-modal #citation-panel > :first-child { + border-radius: var(--border-radius) 0 0 var(--border-radius) !important; +} + +#cite-repo-modal #citation-panel > :last-child { + border-radius: 0 var(--border-radius) var(--border-radius) 0 !important; +} + +#cite-repo-modal #citation-panel .icon.button { + padding: 0 10px; +} + +.user-cards .list { + padding: 0; + display: flex; + flex-wrap: wrap; +} + +.user-cards .list .item { + list-style: none; + width: 32%; + margin: 10px 10px 10px 0; + padding-bottom: 14px; + float: left; +} + +.user-cards .list .item .avatar { + width: 48px; + height: 48px; + float: left; + display: block; + margin-right: 10px; +} + +.user-cards .list .item .name { + margin-top: 0; + margin-bottom: 0; + font-weight: normal; +} + +.user-cards .list .item .meta { + margin-top: 5px; +} + +#search-repo-box .results .result img, +#search-user-box .results .result img { + float: left; + margin-right: 8px; + width: 2em; + height: 2em; +} + +#search-repo-box .results .result .content, +#search-user-box .results .result .content { + margin: 6px 0; +} + +#search-team-box .results .result .content { + margin: 6px 0; +} + +#issue-actions { + margin-top: -1rem !important; /* counteract padding from Semantic */ +} + +.ui.menu .item > img:not(.ui) { + width: auto; +} + +.page.buttons { + padding-top: 15px; +} + +.commit-header-row { + min-height: 50px !important; + padding-top: 0 !important; + padding-bottom: 0 !important; +} + +.settings .content > .header, +.settings .content .segment { + box-shadow: 0 1px 2px 0 var(--color-box-header); +} + +.settings.webhooks .list > .item:not(:first-child), +.settings.githooks .list > .item:not(:first-child), +.settings.runners .list > .item:not(:first-child) { + padding: 0.25rem 1rem; + margin: 12px -1rem -1rem; +} + +.settings .list > .item:not(:first-child) { + border-top: 1px solid var(--color-secondary); + padding: 1rem; + margin: 16px -1rem -1rem; +} + +.settings .list > .item > .svg { + display: table-cell; +} + +.settings .list > .item > .svg + .content { + display: table-cell; + padding: 0 0 0 0.5em; + vertical-align: top; +} + +.settings .list > .item .info { + margin-top: 10px; +} + +.settings .list > .item .info .tab.segment { + border: 0; + padding: 10px 0 0; +} + +.settings .list.key .meta { + padding-top: 5px; + color: var(--color-text-light-2); +} + +.settings .list.email > .item:not(:first-child) { + min-height: 60px; +} + +.settings .list.collaborator > .item { + padding: 0; +} + +.ui.vertical.menu .header.item { + font-size: 1.1em; + background: var(--color-box-header); +} + +.comment:target .comment-container { + border-color: var(--color-primary) !important; + box-shadow: 0 0 0 3px var(--color-primary-alpha-30) !important; +} + +.comment:target .header::before { + border-right-color: var(--color-primary) !important; + filter: drop-shadow(-3px 0 0 var(--color-primary-alpha-30)) !important; +} + +.code-comment:target { + border-color: var(--color-primary) !important; + border-radius: var(--border-radius) !important; + box-shadow: 0 0 0 3px var(--color-primary-alpha-30) !important; +} + +.code-comment:target .content { + box-shadow: none !important; +} + +.comment-header { + border: none !important; + background: var(--color-box-header); + border-bottom: 1px solid var(--color-secondary) !important; + font-weight: normal !important; + padding: 0.5rem 1rem; + margin: 0 !important; + position: relative; + color: var(--color-text-light-2); + min-height: 41px; + background-color: var(--color-box-header); + display: flex; + justify-content: space-between; + align-items: center; +} + +.comment-header::before, +.comment-header::after { + right: 100%; + top: 20px; + border: solid transparent; + content: " "; + height: 0; + width: 0; + position: absolute; + pointer-events: none; +} + +.comment-header::before { + border-right-color: var(--color-secondary); + border-width: 9px; + margin-top: -9px; +} + +.comment-header::after { + border-right-color: var(--color-box-header); + border-width: 8px; + margin-top: -8px; +} + +.comment-header.arrow-top::before, +.comment-header.arrow-top::after { + transform: rotate(90deg); +} + +.comment-header.arrow-top::before { + top: -9px; + left: 6px; +} + +.comment-header.arrow-top::after { + top: -8px; + left: 7px; +} + +.comment-header a { + color: var(--color-text); +} + +.comment-header a:hover { + color: var(--color-primary); +} + +.comment-header .actions a { + margin-right: 0 !important; + padding: 0.5rem !important; +} + +.comment-header-left > * + *, +.comment-header-right > * + * { + margin-left: 0.25rem; +} + +.comment-body { + background: var(--color-box-body); + border: none !important; + width: 100% !important; + max-width: 100% !important; + margin: 0 !important; +} + +.edit-label.modal .form .column, +.new-label.modal .form .column { + padding-right: 0; +} + +.edit-label.modal .form .buttons, +.new-label.modal .form .buttons { + margin-left: auto; + padding-top: 15px; +} + +.edit-label.modal .form .color.picker.column, +.new-label.modal .form .color.picker.column { + display: flex; +} + +.edit-label.modal .form .color.picker.column .minicolors, +.new-label.modal .form .color.picker.column .minicolors { + flex: 1; +} + +.edit-label.modal .form .minicolors-swatch.minicolors-sprite, +.new-label.modal .form .minicolors-swatch.minicolors-sprite { + top: 10px; + left: 10px; + width: 15px; + height: 15px; +} + +#avatar-arrow::before, +#avatar-arrow::after { + right: 100%; + top: 20px; + border: solid transparent; + content: " "; + height: 0; + width: 0; + position: absolute; + pointer-events: none; +} + +#avatar-arrow::before { + border-right-color: var(--color-secondary); + border-width: 9px; + margin-top: -9px; +} + +#avatar-arrow::after { + border-right-color: var(--color-box-header); + border-width: 8px; + margin-top: -8px; +} + +#transfer-repo-modal .ui.message, +#delete-repo-modal .ui.message, +#delete-wiki-modal .ui.message, +#convert-fork-repo-modal .ui.message, +#convert-mirror-repo-modal .ui.message, +#fork-repo-modal .ui.message { + width: 100% !important; +} + +.tab-size-1 { + tab-size: 1 !important; + -moz-tab-size: 1 !important; +} + +.tab-size-2 { + tab-size: 2 !important; + -moz-tab-size: 2 !important; +} + +.tab-size-3 { + tab-size: 3 !important; + -moz-tab-size: 3 !important; +} + +.tab-size-4 { + tab-size: 4 !important; + -moz-tab-size: 4 !important; +} + +.tab-size-5 { + tab-size: 5 !important; + -moz-tab-size: 5 !important; +} + +.tab-size-6 { + tab-size: 6 !important; + -moz-tab-size: 6 !important; +} + +.tab-size-7 { + tab-size: 7 !important; + -moz-tab-size: 7 !important; +} + +.tab-size-8 { + tab-size: 8 !important; + -moz-tab-size: 8 !important; +} + +.tab-size-9 { + tab-size: 9 !important; + -moz-tab-size: 9 !important; +} + +.tab-size-10 { + tab-size: 10 !important; + -moz-tab-size: 10 !important; +} + +.tab-size-11 { + tab-size: 11 !important; + -moz-tab-size: 11 !important; +} + +.tab-size-12 { + tab-size: 12 !important; + -moz-tab-size: 12 !important; +} + +.tab-size-13 { + tab-size: 13 !important; + -moz-tab-size: 13 !important; +} + +.tab-size-14 { + tab-size: 14 !important; + -moz-tab-size: 14 !important; +} + +.tab-size-15 { + tab-size: 15 !important; + -moz-tab-size: 15 !important; +} + +.tab-size-16 { + tab-size: 16 !important; + -moz-tab-size: 16 !important; +} + +.stats-table { + display: table; + width: 100%; +} + +.stats-table .table-cell { + display: table-cell; +} + +.stats-table .table-cell.tiny { + height: 0.5em; +} + +.labels-list .label { + margin: 2px 0; + display: inline-flex !important; + line-height: 1.3em; /* there is a `font-size: 1.25em` for inside emoji, so here the line-height needs to be larger slightly */ +} + +/* Scoped labels with different colors on left and right */ +.scope-parent { + background: none !important; + padding: 0 !important; +} + +.ui.label.scope-left { + border-bottom-right-radius: 0; + border-top-right-radius: 0; + margin-right: 0; +} + +.ui.label.scope-right { + border-bottom-left-radius: 0; + border-top-left-radius: 0; + margin-left: 0; +} + +.repo-button-row { + margin-bottom: 10px; +} + +.repo-button-row > * { + margin-top: 8px; +} + +.wiki .repo-button-row { + margin-bottom: 0; +} + +.wiki .repo-button-row > * { + margin-top: 0; +} + +.repo-button-row .button { + padding: 6px 10px !important; + height: 30px; +} + +.repo-button-row input { + height: 30px; +} + +tbody.commit-list { + vertical-align: baseline; +} + +.message-wrapper, +.author-wrapper { + overflow: hidden; + text-overflow: ellipsis; + max-width: calc(100% - 50px); + display: inline-block; + vertical-align: middle; +} + +.author-wrapper { + max-width: 180px; +} + +/* in the commit list, messages can wrap so we can use inline */ +.commit-list .message-wrapper { + display: inline; +} + +/* but in the repo-files-table we cannot */ +#repo-files-table .commit-list .message-wrapper { + display: inline-block; +} + +@media (max-width: 767px) { + tr.commit-list { + width: 100%; + } + th .message-wrapper { + display: block; + max-width: calc(100vw - 70px); + } + .author-wrapper { + max-width: 80px; + } +} + +@media (min-width: 768px) and (max-width: 991px) { + tr.commit-list { + width: 723px; + } + th .message-wrapper { + max-width: 120px; + } +} + +@media (min-width: 992px) and (max-width: 1200px) { + tr.commit-list { + width: 933px; + } + th .message-wrapper { + max-width: 350px; + } +} + +@media (min-width: 1201px) { + tr.commit-list { + width: 1127px; + } + th .message-wrapper { + max-width: 525px; + } +} + +.commit-list .commit-status-link { + display: inline-block; + vertical-align: middle; +} + +.commit-body { + white-space: pre-wrap; + line-height: initial; +} + +/* commit history list */ +.repository:not(.diff) .commit-body { + margin: 0; +} + +/* PR-comment */ +.repository:not(.diff) .timeline-item .commit-body { + margin-left: 40px; +} + +.git-notes.top { + text-align: left; +} + +.comment-diff-data { + background: var(--color-code-bg); + max-height: calc(100vh - 10.5rem); + overflow-y: auto; +} + +.comment-diff-data pre { + line-height: 18px; + white-space: pre-wrap; + word-break: break-all; + overflow-wrap: break-word; +} + +.content-history-detail-dialog .header .avatar { + position: relative; + top: -2px; +} + +#topic_edit { + margin-top: 5px; +} + +#repo-topics { + margin-top: 5px; + display: flex; + align-items: center; + flex-wrap: wrap; +} + +.repo-topic { + font-weight: normal !important; + cursor: pointer; + margin: 2px !important; +} + +#new-dependency-drop-list.ui.selection.dropdown { + min-width: 0; + width: 100%; + border-radius: 4px 0 0 4px; + border-right: 0; + white-space: nowrap; +} + +#new-dependency-drop-list .text { + width: 100%; + overflow: hidden; +} + +#manage_topic { + font-size: 12px; +} + +.label + #manage_topic { + margin-left: 5px; +} + +.ui.small.label.topic { + margin-bottom: 4px; +} + +.repo-header { + display: flex; + align-items: center; + justify-content: space-between; + flex-wrap: wrap; + word-break: break-word; +} + +@media (max-width: 767px) { + .repo-header + .container { + margin-top: 7px; + } +} + +.repo-buttons { + align-items: center; + display: flex; + flex-direction: row; + flex-wrap: wrap; + word-break: keep-all; +} + +@media (max-width: 767px) { + .repo-buttons { + margin-top: 1em; + } +} + +.repo-buttons .ui.labeled.button > .label:hover { + color: var(--color-primary-light-2); + background: var(--color-light); +} + +.repo-buttons button[disabled] ~ .label { + opacity: var(--opacity-disabled); + color: var(--color-text-dark); + background: var(--color-light-mimic-enabled) !important; +} + +.repo-buttons button[disabled] ~ .label:hover { + color: var(--color-primary-dark-1); +} + +.repo-buttons .ui.labeled.button { + cursor: initial; +} + +.repo-buttons .ui.labeled.button > .label { + border-left: 0 !important; + margin: 0 !important; +} + +.repo-buttons .ui.labeled.button.disabled { + pointer-events: inherit !important; +} + +.repo-buttons .ui.labeled.button.disabled > .label { + color: var(--color-text-dark); + background: var(--color-light-mimic-enabled) !important; +} + +.repo-buttons .ui.labeled.button.disabled > .label:hover { + color: var(--color-primary-dark-1); +} + +.repo-buttons .ui.labeled.button.disabled > .button { + pointer-events: none !important; +} + +@media (max-width: 767px) { + .repo-buttons .ui.labeled.button .svg { + display: none; + } +} + +.tag-code { + height: 28px; +} + +.tag-code, +.tag-code td, +.tag-code .blob-excerpt { + background-color: var(--color-box-body-highlight); + vertical-align: middle; +} + +.resolved-placeholder { + font-weight: normal !important; + border: 1px solid var(--color-secondary) !important; + border-radius: var(--border-radius) !important; + margin: 4px !important; +} + +.resolved-placeholder + .comment-code-cloud { + padding-top: 0 !important; +} + +td.blob-excerpt { + background-color: var(--color-secondary-alpha-30); +} + +.issue-keyword { + border-bottom: 1px dotted var(--color-text-light-3) !important; +} + +.issue-keyword:hover { + border-bottom: none !important; +} + +.file-header { + align-items: center; + display: flex; + justify-content: space-between; + overflow-x: auto; + padding: 6px 12px !important; + font-size: 13px !important; +} + +.file-info { + display: flex; + align-items: center; +} + +.file-info-entry { + display: flex; + align-items: center; + width: max-content; +} + +.file-info-entry + .file-info-entry { + border-left: 1px solid currentcolor; + margin-left: 8px; + padding-left: 8px; +} + +#diff-container { + display: flex; +} + +#diff-file-boxes { + flex: 1; + max-width: 100%; +} + +#diff-file-tree { + width: 20%; + max-width: 380px; + line-height: inherit; + position: sticky; + padding-top: 0; + top: 47px; + max-height: calc(100vh - 50px); + height: 100%; + overflow-y: auto; +} + +@media (max-width: 991px) { + #diff-file-tree { + display: none !important; + } + .diff-toggle-file-tree-button { + display: none !important; + } +} + +.ui.message.unicode-escape-prompt { + margin-bottom: 0; + border-radius: 0; + display: flex; + flex-direction: column; +} + +.wiki-content-sidebar .ui.message.unicode-escape-prompt p, +.wiki-content-footer .ui.message.unicode-escape-prompt p { + display: none; +} + +.wiki-content-toc > ul > li { + margin-bottom: 4px; +} + +.wiki-content-toc ul { + margin: 0; + list-style: none; + padding-left: 1em; +} + +/* fomantic's last-child selector does not work with hidden last child */ +.ui.buttons .unescape-button { + border-top-right-radius: 0.28571429rem; + border-bottom-right-radius: 0.28571429rem; +} + +.webhook-info { + padding: 7px 12px; + margin: 10px 0; + background-color: var(--color-markup-code-block); + border: 1px solid var(--color-secondary); + border-radius: 3px; + font-size: 13px; + line-height: 1.5; + overflow: auto; +} + +.title_wip_desc { + margin-top: 1em; +} + +.sidebar-item-link { + align-items: center; + word-break: break-all; +} + +.diff-file-box[data-folded="true"] .diff-file-body { + display: none; +} + +.diff-file-box[data-folded="true"] .diff-file-header { + border-radius: var(--border-radius) !important; +} + +.diff-file-header-actions > * + * { + margin-left: 0.5rem !important; +} + +.ui.attached.header.diff-file-header.sticky-2nd-row { + position: sticky; + top: 77px; + z-index: 7; +} + +@media (max-width: 480px) { + .ui.attached.header.diff-file-header.sticky-2nd-row { + position: static; + } +} + +.ui.attached.header.diff-file-header .diff-file-header-actions { + flex-shrink: 0; +} + +.ui.attached.header.diff-file-header .diff-file-name { + flex: auto; + min-width: 100px; +} + +.diff-file-body { + overflow-x: scroll; +} + +.diff-stats-bar { + display: inline-block; + background-color: var(--color-red); + height: 12px; + width: 40px; +} + +.diff-stats-bar .diff-stats-add-bar { + background-color: var(--color-green); + height: 100%; +} + +/* prevent page shaking on language bar click */ +.repository-summary-language-stats { + height: 48px; + overflow: hidden; +} + +@media (max-width: 767px) { + .repository-summary-language-stats { + height: auto; + } +} + +.ui.form .right .ui.button { + margin-left: 0.25em; + margin-right: 0; +} + +.removed-code { + background: var(--color-diff-removed-word-bg); +} + +.added-code { + background: var(--color-diff-added-word-bg); +} + +.code-diff-unified .del-code, +.code-diff-unified .del-code td, +.code-diff-split .del-code .lines-num-old, +.code-diff-split .del-code .lines-escape-old, +.code-diff-split .del-code .lines-type-marker-old, +.code-diff-split .del-code .lines-code-old { + background: var(--color-diff-removed-row-bg); + border-color: var(--color-diff-removed-row-border); +} + +.code-diff-unified .add-code, +.code-diff-unified .add-code td, +.code-diff-split .add-code .lines-num-new, +.code-diff-split .add-code .lines-type-marker-new, +.code-diff-split .add-code .lines-escape-new, +.code-diff-split .add-code .lines-code-new, +.code-diff-split .del-code .add-code.lines-num-new, +.code-diff-split .del-code .add-code.lines-type-marker-new, +.code-diff-split .del-code .add-code.lines-escape-new, +.code-diff-split .del-code .add-code.lines-code-new { + background: var(--color-diff-added-row-bg); + border-color: var(--color-diff-added-row-border); +} + +.code-diff-split .del-code .lines-num-new, +.code-diff-split .del-code .lines-type-marker-new, +.code-diff-split .del-code .lines-code-new, +.code-diff-split .del-code .lines-escape-new, +.code-diff-split .add-code .lines-num-old, +.code-diff-split .add-code .lines-escape-old, +.code-diff-split .add-code .lines-type-marker-old, +.code-diff-split .add-code .lines-code-old { + background: var(--color-diff-inactive); +} + +.code-diff-split tbody tr td:nth-child(5), +.code-diff-split tbody tr td.add-comment-right { + border-left: 1px solid var(--color-secondary); +} + +.repository .ui.menu.new-menu { + background: none !important; +} + +@media (max-width: 1200px) { + .repository .ui.menu.new-menu::after { + background: none !important; + } +} + +.repository.migrate .card { + transition: all 0.1s ease-in-out; + box-shadow: none !important; + border: 1px solid var(--color-secondary); + color: var(--color-text); +} + +.repository.migrate .card:hover { + transform: scale(105%); + box-shadow: 0 0.5rem 1rem var(--color-shadow) !important; +} + +@media (max-width: 767px) { + .repository.file.list #repo-files-table .entry, + .repository.file.list #repo-files-table .commit-list { + align-items: center; + display: flex !important; + padding-top: 4px; + padding-bottom: 4px; + } + .repository.file.list #repo-files-table .entry td.age, + .repository.file.list #repo-files-table .commit-list td.age, + .repository.file.list #repo-files-table .entry th.age, + .repository.file.list #repo-files-table .commit-list th.age { + margin-left: auto; + } + .repository.file.list #repo-files-table .entry td.message, + .repository.file.list #repo-files-table .commit-list td.message, + .repository.file.list #repo-files-table .entry span.commit-summary, + .repository.file.list #repo-files-table .commit-list span.commit-summary { + display: none !important; + } + .issue-list-headers.ui[class].grid > div:nth-child(1) { + order: 1; + width: 50%; + } + .issue-list-headers.ui[class].grid > div:nth-child(2) { + order: 3; + width: 100%; + } + .issue-list-headers.ui[class].grid > div.column:not(.row):nth-child(3) { + order: 2; + width: 50%; + } + .repository.view.issue .comment-list .timeline, + .repository.view.issue .comment-list .timeline-item { + margin-left: 0; + } + .repository.view.issue .comment-list .timeline::before { + left: 14px; + } + .repository.view.issue .comment-list .timeline .inline-timeline-avatar { + display: flex; + margin-bottom: auto; + } + .repository.view.issue .comment-list .timeline .inline-timeline-avatar img.avatar { + height: 24px; + width: 24px; + } + .repository.view.issue .comment-list .timeline .comment-header { + padding-left: 4px; + } + .repository.view.issue .comment-list .timeline .comment-header::before, + .repository.view.issue .comment-list .timeline .comment-header::after { + content: unset; + } + /* Don't show the general avatar, we show the inline avatar on mobile. + * And don't show the role labels, there's no place for that. */ + .repository.view.issue .comment-list .timeline .timeline-avatar, + .repository.view.issue .comment-list .timeline .comment-header-right .role-label { + display: none; + } + .commit-header-row .ui.horizontal.list { + width: 100%; + overflow-x: auto; + margin-top: 2px; + } + .commit-header-row .ui.horizontal.list .item { + align-items: center; + display: flex; + } + .commit-header-row .author { + padding: 3px 0; + } + .commit-header h3 { + flex-basis: auto !important; + margin-bottom: 0.5rem !important; + } + .commits-table { + flex-direction: column; + } + .commits-table .commits-table-left { + align-items: initial !important; + margin-bottom: 6px; + } + .commits-table .commits-table-right form { + display: flex; + flex-wrap: wrap; + } + .commits-table .commits-table-right form > div:nth-child(1) { + order: 1; + } + .commits-table .commits-table-right form > div:nth-child(2) { + order: 3; + margin-left: 0.5rem; + margin-top: 0.5rem; + } + .commits-table .commits-table-right form > button:nth-child(3) { + order: 2; + margin-left: 0.25rem; + } + .commit-table { + overflow-x: auto; + } + .commit-table td.sha, + .commit-table th.sha { + display: none !important; + } + .commit-table .commit-list span.message-wrapper { + max-width: none; + } + .commit-table .commit-list tr td:last-child { + display: block; + width: max-content; + } + .commit-table .commit-list td.author { + display: block; + width: calc(100% + 0.5rem); + } + .commit-table .commit-list .copy-commit-sha { + display: none !important; + } + .comment-header { + flex-wrap: wrap; + } + .comment-header .comment-header-left { + flex-wrap: wrap; + } + .comment-header .comment-header-right { + margin-left: auto; + } +} + +.branch-dropdown-button { + max-width: 340px; + vertical-align: bottom !important; +} + +@media (min-width: 768px) and (max-width: 991px) { + .branch-dropdown-button { + max-width: 185px; + } +} + +@media (max-width: 767px) { + .branch-dropdown-button { + max-width: 165px; + } +} + +.pr-status { + padding: 0 !important; /* To clear fomantic's padding on .ui.segment elements */ + display: flex; + align-items: center; +} + +.pr-status .commit-status { + margin: 1em; + flex-shrink: 0; +} + +.pr-status .status-context { + display: flex; + justify-content: space-between; + width: 100%; +} + +.pr-status .status-context > span { + padding: 1em 0; +} + +.pr-status .status-details { + display: flex; + padding-right: 0.5em; + align-items: center; + justify-content: flex-end; +} + +@media (max-width: 767px) { + .pr-status .status-details { + flex-direction: column; + align-items: flex-end; + justify-content: center; + } +} + +.pr-status .status-details > span { + padding-right: 0.5em; /* To match the alignment with the "required" label */ +} diff --git a/web_src/css/review.css b/web_src/css/review.css new file mode 100644 index 000000000000..b58cc5a196a8 --- /dev/null +++ b/web_src/css/review.css @@ -0,0 +1,322 @@ +.show-outdated, +.hide-outdated { + -webkit-touch-callout: none; + -webkit-user-select: none; + user-select: none; +} + +.ui.button.add-code-comment { + padding: 2px; + position: absolute; + margin-left: -22px; + z-index: 5; + opacity: 0; + transition: transform 0.1s ease-in-out; + transform: scale(1); + box-shadow: none !important; + border: none !important; +} + +.ui.button.add-code-comment:hover { + transform: scale(1.1); +} + +.lines-escape a.toggle-escape-button::before { + visibility: visible; + content: "⚠️"; + font-family: var(--fonts-emoji); + color: var(--color-red); +} + +.repository .diff-file-box .code-diff td.lines-escape { + padding-left: 0 !important; +} + +.diff-file-box .lines-code:hover .ui.button.add-code-comment { + opacity: 1; +} + +.repository .diff-file-box .code-diff .add-comment-left, +.repository .diff-file-box .code-diff .add-comment-right, +.repository .diff-file-box .code-diff .add-code-comment .add-comment-left, +.repository .diff-file-box .code-diff .add-code-comment .add-comment-right, +.repository .diff-file-box .code-diff .add-code-comment .lines-type-marker { + padding-left: 0 !important; + padding-right: 0 !important; +} + +.add-comment-left.add-comment-right .ui.attached.header { + border: 1px solid var(--color-secondary); +} + +.add-comment-left.add-comment-right .ui.attached.header:not(.top) { + margin-bottom: 0.5em; +} + +.add-comment .lines-num, +.add-comment .lines-escape, +.add-comment .lines-type-marker { + display: none; +} + +.show-outdated:hover, +.hide-outdated:hover { + text-decoration: underline; +} + +.comment-code-cloud { + padding: 0.5rem 1rem !important; + position: relative; + margin: 0 auto; + max-width: 1000px; +} + +@media (max-width: 767px) { + .comment-code-cloud { + 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 { + padding: 0; +} + +@media (max-width: 767px) { + .comment-code-cloud .comments .comment { + display: flex; + } + .comment-code-cloud + .comments + .comment + .comment-header-right.actions + .ui.basic.label { + display: none; + } + .comment-code-cloud .comments .comment .avatar { + width: auto; + float: none; + margin: 0 0.5rem 0 0; + flex-shrink: 0; + } + .comment-code-cloud .comments .comment .avatar ~ .content { + margin-left: 1em; + } + .comment-code-cloud .comments .comment img.avatar { + margin: 0 !important; + } + .comment-code-cloud .comments .comment .comment-content { + margin-left: 0 !important; + } + .comment-code-cloud .comments .comment .comment-container { + width: 100%; + } + .comment-code-cloud .comments .comment.code-comment { + padding: 0 0 0.5rem !important; + } +} + +.comment-code-cloud .attached.tab { + border: 0; + padding: 0; + margin: 0; +} + +.comment-code-cloud .attached.header { + padding: 0.1rem 1rem; +} + +.comment-code-cloud .attached.header .text { + margin: 0; +} + +.comment-code-cloud .right.menu.options .item { + padding: 0.85714286em 0.442857em; + cursor: pointer; +} + +.comment-code-cloud .ui.active.tab { + padding: 0.5em; +} + +.comment-code-cloud .ui.active.tab.markup { + padding: 1em; + min-height: 168px; +} + +.comment-code-cloud .ui.tabular.menu { + margin: 0.5em; +} + +.comment-code-cloud .footer { + border-top: 1px solid var(--color-secondary); + padding: 10px 0; +} + +.comment-code-cloud .footer .markup-info { + display: inline-block; + margin: 5px 0; + font-size: 12px; + color: var(--color-text-light); +} + +.comment-code-cloud .footer .ui.right.floated { + padding-top: 6px; +} + +.comment-code-cloud .footer::after { + clear: both; + content: ""; + display: block; +} + +@media (max-width: 767px) { + .comment-code-cloud .button { + width: 100%; + margin: 0 !important; + margin-bottom: 0.75rem !important; + } +} + +.diff-file-body .comment-form { + margin: 0 0 0 3em; +} + +.file-comment { + color: var(--color-text); +} + +a.blob-excerpt { + color: var(--color-text-light); + height: 28px; + display: flex; + justify-content: center; + align-items: center; + width: 100%; + background: var(--color-expand-button); +} + +a.blob-excerpt:hover { + background: var(--color-primary); + color: var(--color-primary-contrast); +} + +/* See the comment of createCommentEasyMDE() for the review editor */ +/* EasyMDE's options can not handle minHeight & maxHeight together correctly, we have to set minHeight in JS code */ +.review-box-panel .CodeMirror-scroll { + min-height: 80px; + max-height: calc(100vh - 360px); +} + +@media (max-width: 767px) { + .review-box-panel .CodeMirror-scroll { + max-width: calc(100vw - 70px); + } +} + +@media (min-width: 768px) and (max-width: 991px) { + .review-box-panel .CodeMirror-scroll { + max-width: 700px; + } +} + +@media (min-width: 992px) and (max-width: 1200px) { + .review-box-panel .CodeMirror-scroll { + max-width: 800px; + } +} + +@media (min-width: 1201px) { + .review-box-panel .CodeMirror-scroll { + max-width: 900px; + } +} + +#review-box { + position: relative; +} + +.review-box-panel { + position: absolute; + min-width: max-content; + top: 45px; + right: -5px; + z-index: 2; +} + +#review-box .review-comments-counter { + background-color: var(--color-primary-light-4); + color: var(--color-primary-contrast); +} + +#review-box:hover .review-comments-counter { + background-color: var(--color-primary-light-5); +} + +#review-box .review-comments-counter[data-pending-comment-number="0"] { + display: none; +} + +.pull.files.diff [id] { + scroll-margin-top: 99px; +} + +@media (max-width: 991px) { + .pull.files.diff [id] { + scroll-margin-top: 130px; + } +} + +.changed-since-last-review { + border: 1px var(--color-accent) solid; + background-color: var(--color-small-accent); + border-radius: 15px; + padding: 4px 8px; + margin: -8px 0; /* just like other buttons in the diff box header */ + font-size: 0.857rem; /* just like .ui.tiny.button */ +} + +.viewed-file-form { + display: flex; + align-items: center; + border: 1px solid transparent; + padding: 4px 8px; + margin: -8px 0; /* just like other buttons in the diff box header */ + border-radius: 0.285rem; /* just like .ui.tiny.button */ + font-size: 0.857rem; /* just like .ui.tiny.button */ +} + +.viewed-file-form input { + margin-right: 4px; +} + +.viewed-file-checked-form { + background-color: var(--color-small-accent); + border-color: var(--color-accent); +} + +#viewed-files-summary { + width: 72px; + height: 10px; +} + +.diff-file-box { + border-radius: 0.285rem; /* Just like ui.top.attached.header */ +} + +.diff-file-box:target { + box-shadow: 0 0 0 3px var(--color-accent); +} diff --git a/web_src/css/runner.css b/web_src/css/runner.css new file mode 100644 index 000000000000..d0ea5252e516 --- /dev/null +++ b/web_src/css/runner.css @@ -0,0 +1,54 @@ +.runner-container { + padding-bottom: 30px; +} + +.runner-container .runner-ops > a { + margin-left: 0.5em; +} + +.runner-container .runner-ops-delete { + color: var(--color-red-light); +} + +.runner-container .runner-basic-info .gt-dib { + margin-right: 1em; +} + +.runner-container .runner-status-online { + padding: 0.3em 0.5em; + background-color: var(--color-green); + color: var(--color-white); +} + +.runner-container .runner-new-text { + color: var(--color-white); +} + +.runner-container #runner-new:hover .runner-new-text { + color: var(--color-white) !important; +} + +.runner-container .runner-new-menu { + width: 300px; +} + +.runner-container .task-status-success { + background-color: var(--color-green); + color: var(--color-white); +} + +.runner-container .task-status-failure { + background-color: var(--color-red-light); + color: var(--color-white); +} + +.runner-container .task-status-running { + background-color: var(--color-blue); + color: var(--color-white); +} + +.runner-container .task-status-cancelled, +.runner-container .task-status-blocked { + background-color: var(--color-yellow); + color: var(--color-white); +} diff --git a/web_src/css/shared/issuelist.css b/web_src/css/shared/issuelist.css new file mode 100644 index 000000000000..6e2cc737e7d9 --- /dev/null +++ b/web_src/css/shared/issuelist.css @@ -0,0 +1,166 @@ +.issue.list { + list-style: none; + margin-top: 1rem; +} + +.issue.list a:not(.label):hover { + color: var(--color-primary) !important; +} + +.issue.list > .item .issue-checkbox { + margin-top: 1px; +} + +.issue.list > .item .issue-item-icon svg { + margin-right: 0.75rem; + margin-top: 1px; +} + +.issue.list > .item .issue-item-icons-right > * + * { + margin-left: 0.5rem; +} + +.issue.list > .item .issue-item-main { + width: 100%; +} + +.issue.list > .item .action-item-main { + width: 80%; +} + +.issue.list > .item .issue-item-right { + width: 15%; +} + +.issue.list > .item .issue-item-top-row { + max-width: 100%; + color: var(--color-text); + font-size: 16px; + min-width: 0; + font-weight: 600; +} + +.issue.list > .item .issue-item-top-row a.index { + max-width: fit-content; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + overflow: hidden; + word-break: break-all; +} + +.issue.list > .item .labels-list { + position: relative; + top: -1.5px; +} + +.issue.list > .item .issue-item-bottom-row { + font-size: 13px; +} + +.issue.list > .item .title { + color: var(--color-text); + word-break: break-word; +} + +.issue.list > .item .issue-item-icon-right { + min-width: 2rem; +} + +.issue.list > .item .assignee { + position: relative; + top: -2px; +} + +.issue.list > .item .assignee img { + width: 20px; + height: 20px; + margin-right: 2px; +} + +.issue.list > .item .desc { + color: var(--color-text-light-2); +} + +.issue.list > .item .desc a { + color: inherit; +} + +.issue.list > .item .desc .time-since, +.issue.list > .item .desc a { + margin-left: 0.25rem; + margin-right: 0.25rem; +} + +.issue.list > .item .desc .waiting, +.issue.list > .item .desc .approvals, +.issue.list > .item .desc .rejects { + padding-left: 5px; +} + +.issue.list > .item .desc .checklist { + padding-left: 5px; +} + +.issue.list > .item .desc .checklist progress { + margin-left: 2px; + width: 80px; + height: 6px; + display: inline-block; + border-radius: 3px; + vertical-align: 2px !important; +} + +.issue.list > .item .desc .checklist progress::-webkit-progress-value { + background-color: var(--color-secondary-dark-4); +} + +.issue.list > .item .desc .checklist progress::-moz-progress-bar { + background-color: var(--color-secondary-dark-4); +} + +.issue.list > .item .desc .conflicting { + padding-left: 5px; +} + +.issue.list > .item .desc .due-date { + padding-left: 5px; +} + +.issue.list > .item .desc a.milestone, +.issue.list > .item .desc a.project { + margin-left: 5px; +} + +.issue.list > .item .desc a.ref { + margin-left: 8px; +} + +.issue.list > .item .desc a.ref span { + margin-right: -4px; +} + +.issue.list > .item .desc .overdue { + color: var(--color-red); +} + +.issue.list .branches { + display: inline-flex; + padding: 0 4px; +} + +.issue.list .branches .branch { + background-color: var(--color-secondary); + border-radius: 3px; +} + +.issue.list .branches .truncated-name { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + max-width: 10em; +} + +.issue.list > .item + .item { + border-top: 1px solid var(--color-secondary); +} diff --git a/web_src/less/standalone/swagger.less b/web_src/css/standalone/swagger.css similarity index 94% rename from web_src/less/standalone/swagger.less rename to web_src/css/standalone/swagger.css index 3b902483d829..5c1902f11f79 100644 --- a/web_src/less/standalone/swagger.less +++ b/web_src/css/standalone/swagger.css @@ -27,5 +27,5 @@ body { .swagger-back-link svg { color: inherit; fill: currentcolor; - margin-right: .5rem; + margin-right: 0.5rem; } diff --git a/web_src/less/_svg.less b/web_src/css/svg.css similarity index 64% rename from web_src/less/_svg.less rename to web_src/css/svg.css index a2ea64c4380b..b63445eb4e20 100644 --- a/web_src/less/_svg.less +++ b/web_src/css/svg.css @@ -2,8 +2,8 @@ display: inline-block; vertical-align: text-top; fill: currentcolor; +} - .middle & { - vertical-align: middle; - } +.middle .svg { + vertical-align: middle; } diff --git a/web_src/less/themes/theme-arc-green.less b/web_src/css/themes/theme-arc-green.css similarity index 98% rename from web_src/less/themes/theme-arc-green.less rename to web_src/css/themes/theme-arc-green.css index 17b8f9bae034..e2216085a907 100644 --- a/web_src/less/themes/theme-arc-green.less +++ b/web_src/css/themes/theme-arc-green.css @@ -1,6 +1,6 @@ -@import "../chroma/base.less"; -@import "../chroma/dark.less"; -@import "../codemirror/dark.less"; +@import "../chroma/base.css"; +@import "../chroma/dark.css"; +@import "../codemirror/dark.css"; :root { --is-dark-theme: true; diff --git a/web_src/css/themes/theme-auto.css b/web_src/css/themes/theme-auto.css new file mode 100644 index 000000000000..e0d31e2cfbb7 --- /dev/null +++ b/web_src/css/themes/theme-auto.css @@ -0,0 +1 @@ +@import "./theme-arc-green.css" (prefers-color-scheme: dark); diff --git a/web_src/less/_tribute.less b/web_src/css/tribute.css similarity index 80% rename from web_src/less/_tribute.less rename to web_src/css/tribute.css index 9adf155ffaf4..b7b0a255092c 100644 --- a/web_src/less/_tribute.less +++ b/web_src/css/tribute.css @@ -1,8 +1,8 @@ @import "tributejs/dist/tribute.css"; .tribute-container { - box-shadow: 0 .25rem .5rem rgba(0, 0, 0, .25); - border-radius: .25rem; + box-shadow: 0 0.25rem 0.5rem rgba(0, 0, 0, 0.25); + border-radius: 0.25rem; } .tribute-container ul { @@ -11,12 +11,12 @@ } .tribute-container li { - padding: 3px .5rem !important; + padding: 3px 0.5rem !important; } .tribute-container li span.fullname { font-weight: normal; - font-size: .8rem; + font-size: 0.8rem; margin-left: 3px; } @@ -33,7 +33,7 @@ .tribute-item .emoji, .tribute-item img[src*="/avatar/"] { - margin-right: .5rem; + margin-right: 0.5rem; } .tribute-container img { diff --git a/web_src/css/user.css b/web_src/css/user.css new file mode 100644 index 000000000000..adf865496be3 --- /dev/null +++ b/web_src/css/user.css @@ -0,0 +1,173 @@ +.user.profile .ui.card .header { + display: block; + font-weight: 600; + font-size: 1.3rem; + margin-top: -0.2rem; + line-height: 1.3rem; +} + +.user.profile .ui.card .profile-avatar-name { + border-top: none; + text-align: center; +} + +.user.profile .ui.card .extra.content { + padding: 0; +} + +.user.profile .ui.card .extra.content ul { + margin: 0; + padding: 0; +} + +.user.profile .ui.card .extra.content ul li { + padding: 10px; + list-style: none; +} + +.user.profile .ui.card .extra.content ul li:not(:last-child) { + border-bottom: 1px solid var(--color-secondary); +} + +.user.profile .ui.card .extra.content ul li .svg { + margin-left: 1px; + margin-right: 5px; +} + +.user.profile .ui.card .extra.content ul li.follow .ui.button { + width: 100%; +} + +.user.profile .ui.card #profile-avatar { + background: none; + padding: 1rem 1rem 0.25rem; + justify-content: center; +} + +.user.profile .ui.card #profile-avatar img { + width: 100%; + height: auto; + object-fit: contain; + margin: 0; +} + +@media (max-width: 767px) { + .user.profile .ui.card #profile-avatar img { + width: 30vw; + } +} + +@media (max-width: 767px) { + .user.profile .ui.card { + width: 100%; + } +} + +.user.profile .ui.repository.list { + margin-top: 25px; +} + +.user.profile #loading-heatmap { + margin-bottom: 1em; +} + +.user.profile .ui.secondary.stackable.pointing.menu { + flex-wrap: wrap; +} + +.user.followers .header.name { + font-size: 20px; + line-height: 24px; + vertical-align: middle; +} + +.user.followers .follow .ui.button { + padding: 8px 15px; +} + +.user.notification .svg { + float: left; + font-size: 2em; +} + +.user.notification .svg.green { + color: var(--color-green); +} + +.user.notification .svg.red { + color: var(--color-red); +} + +.user.notification .svg.purple { + color: var(--color-purple); +} + +.user.notification .svg.blue { + color: var(--color-blue); +} + +.user.notification .content { + float: left; + margin-left: 7px; +} + +.user.notification table form { + display: inline-block; +} + +.user.notification table button { + padding: 3px 3px 3px 5px; +} + +.user.notification table tr { + cursor: pointer; +} + +.user .button.adopt, +.user .button.delete { + margin-top: -15px; + margin-bottom: -15px; +} + +.user .button.adopt .label, +.user .button.delete .label { + vertical-align: middle; +} + +.user.link-account:not(.icon) { + padding-top: 15px; + padding-bottom: 5px; +} + +.user.settings .iconFloat { + float: left; +} + +.user-orgs { + display: flex; + flex-flow: row wrap; + padding: 0; + margin: -3px !important; +} + +.user-orgs li { + display: flex; + border-bottom: 0 !important; + padding: 3px !important; + width: 20%; + max-width: 60px; +} + +.user-badges { + display: grid; + grid-template-columns: repeat(auto-fill, 64px); + gap: 2px; +} + +.user-badges img { + object-fit: contain; +} + +#notification_div .tab.segment { + overflow-x: auto; +} diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index 6ccfdc649eb2..371e549e4e90 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -282,39 +282,59 @@ export function initRepositoryActionView() { - - + diff --git a/web_src/less/_admin.less b/web_src/less/_admin.less deleted file mode 100644 index 26417d42eed6..000000000000 --- a/web_src/less/_admin.less +++ /dev/null @@ -1,115 +0,0 @@ -.admin { - &.hooks .list { - > .item { - &:not(:first-child) { - border-top: 1px solid var(--color-secondary); - padding: .25rem 1rem; - margin: 12px -1rem -1rem; - } - } - } - - .table.segment { - padding: 0; - font-size: 13px; - overflow-x: auto; - - &:not(.striped) { - thead { - th:last-child { - padding-right: 5px !important; - } - } - } - - th { - padding-top: 5px; - padding-bottom: 5px; - } - - &:not(.select) { - th, - td { - &:first-of-type { - padding-left: 15px !important; - } - } - } - - form tbody button[type='submit'] { - padding: 5px 8px; - } - - } - - .settings .button.adopt, - .settings .button.delete { - margin-top: -15px; - margin-bottom: -15px; - .label { - vertical-align: middle; - } - } - - &.user { - .email { - max-width: 200px; - } - } - - dl.admin-dl-horizontal { - padding: 20px; - margin: 0; - - dd { - margin-left: 275px; - @media @mediaSm { - margin-left: 5%; - } - } - - dt { - font-weight: 600; - float: left; - width: 285px; - clear: left; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - - @media @mediaSm { - width: auto; - margin-right: .5em; - } - } - } - - &.config { - #test-mail-btn { - margin-left: 5px; - } - } - - code, - pre { - white-space: pre-wrap; - word-wrap: break-word; - } - - #notice-table { - .notice-description { - @media @mediaSm { - max-width: 80vw; - } - @media @mediaMd { - max-width: 360px; - } - @media @mediaLg { - max-width: 510px; - } - @media @mediaXl { - max-width: 640px; - } - } - } -} diff --git a/web_src/less/_dashboard.less b/web_src/less/_dashboard.less deleted file mode 100644 index 4af55f2d2dee..000000000000 --- a/web_src/less/_dashboard.less +++ /dev/null @@ -1,198 +0,0 @@ -.dashboard { - &.feeds, - &.issues { - .context.user.menu { - z-index: 101; - min-width: 200px; - - .ui.header { - font-size: 1rem; - text-transform: none; - } - } - - .filter.menu { - width: initial; - - .item { - text-align: left; - display: flex; - align-items: center; - justify-content: space-between; - - .text { - height: 16px; - vertical-align: middle; - - &.truncate { - width: 75%; - } - } - - .floating.label { - top: 7px; - left: 90%; - width: 15%; - - @media @mediaSm { - top: 10px; - left: auto; - width: auto; - right: 13px; - } - } - } - - // Sort - .jump.item { - margin: 1px; - padding-right: 0; - } - - .menu { - max-height: 300px; - overflow-x: auto; - right: 0 !important; - left: auto !important; - } - - @media @mediaSm { - width: 100%; - } - } - - .right.stackable.menu > .item.active { - color: var(--color-red); - } - } - - .dashboard-repos, - .dashboard-orgs { - margin: 0 1px; /* Accommodate for Semantic's 1px hacks on .attached elements */ - } - - .dashboard-navbar { - width: 100vw; - padding-left: .5rem; - padding-right: .5rem; - .org-visibility .label { - margin-left: 5px; - } - - .ui.dropdown { - max-width: 100%; - - @media @mediaSm { - > .menu { - position: static; - } - } - } - } -} - -&.feeds { - .news { - li { - display: flex; - align-items: baseline; - margin-top: .5rem; - margin-bottom: .5rem; - - img { - align-self: flex-start; - } - } - li > * + * { - margin-left: .35rem; - } - - > .ui.grid { - margin-left: auto; - margin-right: auto; - } - - .left .ui.avatar { - margin-top: 13px; - } - - .time-since { - font-size: 13px; - } - - .issue.title { - width: 80%; - margin: 0 0 1em; - } - - .push.news .content ul { - line-height: 18px; - font-size: 13px; - list-style: none; - padding-left: 10px; - - .text.truncate { - width: 80%; - } - } - - .commit-id { - font-family: var(--fonts-monospace); - } - - code { - padding: 2px 4px; - border-radius: 3px; - background-color: var(--color-markup-code-block); - word-break: break-all; - } - - &:last-of-type .divider { - display: none !important; - } - } - - .list { - ul { - list-style: none; - margin: 0; - padding-left: 0; - - li { - &:not(:last-child) { - border-bottom: 1px solid var(--color-secondary); - } - - &.private { - background-color: var(--color-box-body-highlight); - } - - .repo-list-link { - padding: 6px 1em; - display: block; - - .svg { - color: var(--color-text-light-2); - } - - .star-num { - font-size: 12px; - } - } - } - } - - #privateFilterCheckbox .svg { - color: var(--color-grey); - margin-right: .25rem; - } - - .repo-owner-name-list .item-name { - min-width: 0; - } - - .repo-owner-name-list .item-name svg { - min-width: 16px; - } - } -} diff --git a/web_src/less/_explore.less b/web_src/less/_explore.less deleted file mode 100644 index 5caf21d417d2..000000000000 --- a/web_src/less/_explore.less +++ /dev/null @@ -1,93 +0,0 @@ -.explore { - .navbar { - justify-content: center; - margin-bottom: 15px !important; - background-color: var(--color-navbar) !important; - border-width: 1px !important; - - .svg { - width: 16px; - text-align: center; - margin-right: 5px; - } - } -} - -.ui.repository.list { - .item { - padding-bottom: 1.5rem; - - &:not(:first-child) { - border-top: 1px solid var(--color-secondary); - padding-top: 1.5rem; - } - - .ui.header { - font-size: 1.5rem; - margin-bottom: .5rem; - - .name { - word-break: break-all; - } - - .metas { - font-size: 14px; - } - } - - .time { - font-size: 12px; - } - - .ui.tags { - margin-bottom: .5rem; - } - } -} - -.ui.repository.branches { - .info { - font-size: 12px; - color: var(--color-text-light); - display: flex; - white-space: pre; - .commit-message { - max-width: 72em; - overflow: hidden; - text-overflow: ellipsis; - } - } - .overflow-visible { - overflow: visible; - } - /* fix alignment of PR popup in branches table */ - table .ui.popup { - text-align: left; - } -} - -.ui.user.list { - .item { - padding-bottom: 25px; - display: flex; - - &:not(:first-child) { - border-top: 1px solid var(--color-secondary); - padding-top: 25px; - } - - img.ui.avatar { - width: 40px; - height: 40px; - margin-right: 10px; - } - - .description { - margin-top: 5px; - - .svg:not(:first-child) { - margin-left: 5px; - } - } - } -} diff --git a/web_src/less/_font_i18n.less b/web_src/less/_font_i18n.less deleted file mode 100644 index 5dae8f2aa588..000000000000 --- a/web_src/less/_font_i18n.less +++ /dev/null @@ -1,130 +0,0 @@ -/* font i18n */ -:root { - /* customizable localized variables */ - :lang(ja) { - --fonts-override: var(--fonts-default-override-ja); - } - :lang(zh-CN) { - --fonts-override: var(--fonts-default-override-zh-cn); - } - :lang(zh-TW) { - --fonts-override: var(--fonts-default-override-zh-tw); - } - :lang(zh-HK) { - --fonts-override: var(--fonts-default-override-zh-hk); - } - :lang(ko) { - --fonts-override: var(--fonts-default-override-ko); - } -} - -[lang] { - font-family: var(--fonts-regular); -} - -each(@fonts, { - @weights: .gen-weights-all(@value); - @locale: replace(@key, "@", "-"); - .font-face-cjk(~"system-ui@{locale}", @weights[@light], 300); - .font-face-cjk(~"system-ui@{locale}", @weights[@regular], 400); - .font-face-cjk(~"system-ui@{locale}", @weights[@medium], 500); - .font-face-cjk(~"system-ui@{locale}", @weights[@bold], 700); - /* Safari on macOS/iOS */ - @font-face { - font-family: ~"system-ui@{locale}"; - src: local("HelveticaNeue"); - unicode-range: U+A0; - } - /* Other browsers on macOS/iOS */ - @supports not (-webkit-hyphens:none) { - @font-face { - font-family: ~"system-ui@{locale}"; - src: local("HelveticaNeue"); - unicode-range: U+20; - } - } - :root { - /* Special handling for Firefox on Windows/Linux */ - @supports (-moz-appearance:none) { - --fonts-default-override@{locale}: ~"var(--fonts-proportional), system-ui@{locale}"; - } - --fonts-default-override@{locale}: ~"system-ui@{locale}, var(--fonts-proportional)"; - } -}); - -@fonts: { - @ja: - "HiraKakuProN-:{W3,W6}", "Hiragino Kaku Gothic ProN :{W3,W6}", "HiraginoSans-:{W2,W4,W5,W6}", - .shs("JP")[], .shs("J")[], .noto("JP")[], .shs("")[], - /* https://acetaminophen.hatenablog.com/entry/2016/02/15/225009 */ - "Yu Gothic :{Regular,Medium,Bold}", "YuGothic :{Regular,Medium,Bold}", - "Droid Sans Japanese:{}", "Meiryo:{, Bold}", "MS PGothic:{}"; - @zh-cn: - .pingfang("SC")[], - .shs("CN")[], .shs("SC")[], .noto("SC")[], - "HiraginoSansGB-:{W3,W6}", "Hiragino Sans GB :{W3,W6}", - "Microsoft YaHei:{ Light,, Bold}", "Heiti SC :{Light,Medium}", "SimHei:{}"; - @zh-tw: - .pingfang("TC")[], - .shs("TW")[], .shs("TC")[], .noto("TC")[], - "HiraginoSansTC-:{W3,W6}", "Hiragino Sans TC :{W3,W6}", - "Microsoft JhengHei:{ Light,, Bold}", "Heiti TC :{Light,Medium}", "PMingLiU:{}"; - @zh-hk: - .pingfang("HK")[], - .shs("HK")[], .shs("HC")[], .noto("HK")[], .shs("TC")[], .noto("TC")[], - "HiraginoSansTC-:{W3,W6}", "Hiragino Sans TC :{W3,W6}", - "Microsoft JhengHei:{ Light,, Bold}", "Heiti TC :{Light,Medium}", "PMingLiU_HKSCS:{}", "PMingLiU:{}"; - @ko: - "AppleSDGothicNeo-:{Light,Regular,Medium,SemiBold}", - .shs("KR")[], .shs("K")[], .noto("KR")[], - "NanumBarunGothic:{ Light,, Bold}", - "Malgun Gothic:{ Semilight,, Bold}", "Nanum Gothic:{, Bold}", "Dotum:{}"; -} - -.noto(@suffix) { @value: "Noto Sans CJK @{suffix} ", "NotoSansCJK@{suffix}-"; } -.shs(@suffix) { @value: replace("Source Han Sans @{suffix} ", " ", " "), "SourceHanSans@{suffix}-"; } -.pingfang(@suffix) { @value: "PingFang@{suffix}-:{Light,Regular,Medium,Semibold}"; } -.font-face-cjk(@family, @src, @weight) { - @font-face { - font-family: @family; - src: @src; - font-weight: @weight; - unicode-range: U+11??, U+2E80-4DBF, U+4E00-9FFF, U+A960-A97F, U+AC00-D7FF, U+F900-FAFF, U+FE00-FE6F, U+FF00-FFEF, U+1F2??, U+2????; - } -} - -.gen-weights(@family) when (isstring(@family)) { - @family-str: replace(@family, ":\{.*\}$", ""); - // apply standard style names if none is given - // should the font have no styles, use :{}, as in "SimHei:{}" - @weights-str: if(@family = @family-str, "Light,Regular,Medium,Bold", replace(@family, ".*:\{(.*)\}$", "$1")); - @lightest: replace(@weights-str, ",.*", ""); - @boldest: replace(@weights-str, ".*,", ""); - @2ndboldest: replace(@weights-str, "(?:.*,|)([^,]*),.*$", "$1"); - @2ndlightest: if(@2ndboldest = @lightest, @lightest, replace(@weights-str, "^.*?,([^,]*).*", "$1")); - - @light: local("@{family-str}@{lightest}"); - @regular: local("@{family-str}@{2ndlightest}"); - @medium: local("@{family-str}@{2ndboldest}"); - @bold: local("@{family-str}@{boldest}"); -} -.gen-weights(@family) when not (isstring(@family)) { - .gen-weights-all(@family); -} -.gen-weights(@family, @last) { - @this: .gen-weights(@family); - - @light: @last[@light], @this[@light]; - @regular: @last[@regular], @this[@regular]; - @medium: @last[@medium], @this[@medium]; - @bold: @last[@bold], @this[@bold]; -} -.gen-weights-all(@family) when not (isstring(@family)) { - .gen-weights-all(@family, length(@family)); -} -.gen-weights-all(@family, 1) when not (isstring(@family)) { - .gen-weights(extract(@family, 1)); -} -.gen-weights-all(@family, @ctr) when not (isstring(@family)) and (@ctr > 1) and (@ctr <= length(@family)) { - .gen-weights(extract(@family, @ctr), .gen-weights-all(@family, @ctr - 1)); -} diff --git a/web_src/less/_form.less b/web_src/less/_form.less deleted file mode 100644 index 1a1c1678f8b3..000000000000 --- a/web_src/less/_form.less +++ /dev/null @@ -1,378 +0,0 @@ -input, -textarea, -.ui.input > input, -.ui.form input:not([type]), -.ui.form select, -.ui.form textarea, -.ui.form input[type="date"], -.ui.form input[type="datetime-local"], -.ui.form input[type="email"], -.ui.form input[type="file"], -.ui.form input[type="number"], -.ui.form input[type="password"], -.ui.form input[type="search"], -.ui.form input[type="tel"], -.ui.form input[type="text"], -.ui.form input[type="time"], -.ui.form input[type="url"], -.ui.selection.dropdown, -.ui.checkbox label::before, -.ui.checkbox input:checked ~ label::before, -.ui.checkbox input:not([type="radio"]):indeterminate ~ label::before { - background: var(--color-input-background); - border-color: var(--color-input-border); - color: var(--color-input-text); -} - -input:hover, -textarea:hover, -.ui.input input:hover, -.ui.form input:not([type]):hover, -.ui.form select:hover, -.ui.form textarea:hover, -.ui.form input[type="date"]:hover, -.ui.form input[type="datetime-local"]:hover, -.ui.form input[type="email"]:hover, -.ui.form input[type="file"]:hover, -.ui.form input[type="number"]:hover, -.ui.form input[type="password"]:hover, -.ui.form input[type="search"]:hover, -.ui.form input[type="tel"]:hover, -.ui.form input[type="text"]:hover, -.ui.form input[type="time"]:hover, -.ui.form input[type="url"]:hover, -.ui.selection.dropdown:hover, -.ui.checkbox label:hover::before, -.ui.checkbox label:active::before, -.ui.radio.checkbox label::after, -.ui.radio.checkbox input:focus ~ label::before, -.ui.radio.checkbox input:checked ~ label::before { - background: var(--color-input-background); - border-color: var(--color-input-border-hover); - color: var(--color-input-text); -} - -input:focus, -textarea:focus, -.ui.input input:focus, -.ui.form input:not([type]):focus, -.ui.form select:focus, -.ui.form textarea:focus, -.ui.form input[type="date"]:focus, -.ui.form input[type="datetime-local"]:focus, -.ui.form input[type="email"]:focus, -.ui.form input[type="file"]:focus, -.ui.form input[type="number"]:focus, -.ui.form input[type="password"]:focus, -.ui.form input[type="search"]:focus, -.ui.form input[type="tel"]:focus, -.ui.form input[type="text"]:focus, -.ui.form input[type="time"]:focus, -.ui.form input[type="url"]:focus, -.ui.selection.dropdown:focus, -.ui.checkbox input:focus ~ label::before, -.ui.checkbox input:not([type="radio"]):indeterminate:focus ~ label::before, -.ui.checkbox input:checked:focus ~ label::before, -.ui.radio.checkbox input:focus:checked ~ label::before { - background: var(--color-input-background); - border-color: var(--color-primary); - color: var(--color-input-text); -} - -.ui.form .field > label, -.ui.form .inline.fields > label, -.ui.form .inline.fields .field > label, -.ui.form .inline.fields .field > p, -.ui.form .inline.field > label, -.ui.form .inline.field > p, -.ui.checkbox label, -.ui.checkbox + label, -.ui.checkbox label:hover, -.ui.checkbox + label:hover, -.ui.checkbox input:focus ~ label, -.ui.checkbox input:active ~ label { - color: var(--color-text); -} - -.ui.input, -.ui.checkbox input:focus ~ label::after, -.ui.checkbox input:checked ~ label::after, -.ui.checkbox label:active::after, -.ui.checkbox input:not([type="radio"]):indeterminate ~ label::after, -.ui.checkbox input:not([type="radio"]):indeterminate:focus ~ label::after, -.ui.checkbox input:checked:focus ~ label::after, -.ui.disabled.checkbox label, -.ui.checkbox input[disabled] ~ label { - color: var(--color-input-text); -} - -.ui.radio.checkbox input:focus ~ label::after, -.ui.radio.checkbox input:checked ~ label::after, -.ui.radio.checkbox input:focus:checked ~ label::after { - background: var(--color-input-text); -} - -.ui.toggle.checkbox label::before { - background: var(--color-input-toggle-background); -} - -.ui.toggle.checkbox label, -.ui.toggle.checkbox input:checked ~ label, -.ui.toggle.checkbox input:focus:checked ~ label { - color: var(--color-text) !important; -} - -.ui.toggle.checkbox input:checked ~ label::before, -.ui.toggle.checkbox input:focus:checked ~ label::before { - background: var(--color-primary) !important; -} - -/* match */ -.ui.form select { - padding: .67857143em 1em; -} - -.form { - .help { - color: var(--color-secondary-dark-5); - padding-bottom: .6em; - display: inline-block; - } -} - -@create-page-form-input-padding: 250px !important; -#create-page-form { - form { - margin: auto; - - .ui.message { - text-align: center; - } - - @media @mediaMdAndUp { - width: 800px !important; - - .header { - padding-left: @create-page-form-input-padding+30px; - } - - .inline.field > label, - .inline.field.captcha-field > span { - text-align: right; - width: @create-page-form-input-padding; - word-wrap: break-word; - } - - .help { - margin-left: @create-page-form-input-padding+15px; - } - - .optional .title { - margin-left: @create-page-form-input-padding; - } - - .inline.field > input, - .inline.field > textarea { - width: 50%; - } - } - - @media @mediaSm { - .optional .title { - margin-left: 15px; - } - - .inline.field > label { - display: block; - } - } - } -} - -.signin { - .oauth2 { - div { - display: inline-block; - - p { - margin: 10px 5px 0 0; - float: left; - } - } - - a { - margin-right: 3px; - - &:last-child { - margin-right: 0; - } - } - - img { - width: 32px; - height: 32px; - - &.openidConnect { - width: auto; - } - } - } -} - -@media @mediaMdAndUp { - .g-recaptcha-style, - .h-captcha-style { - margin: 0 auto !important; - width: 304px; - padding-left: 30px; - - iframe { - border-radius: 5px !important; - width: 302px !important; - height: 76px !important; - } - } -} - -@media (max-height: 575px) { - #rc-imageselect, - .g-recaptcha-style, - .h-captcha-style { - transform: scale(.77); - transform-origin: 0 0; - } -} - -.user.activate, -.user.forgot.password, -.user.reset.password, -.user.link-account, -.user.signin, -.user.signup { - @input-padding: 200px; - #create-page-form(); - - form { - width: 700px !important; - - .header { - padding-left: 0 !important; - text-align: center; - } - - .inline.field > label { - width: @input-padding; - } - - .inline.field > label, - input { - @media @mediaSm { - width: 100% !important; - } - } - - input[type="number"] { - -moz-appearance: textfield; - } - - input::-webkit-outer-spin-button, - input::-webkit-inner-spin-button { - -webkit-appearance: none; - margin: 0; - } - } -} - -.user.signin.webauthn-prompt { - margin-top: 15px; -} - -.repository { - &.new.repo, - &.new.migrate, - &.new.fork { - #create-page-form(); - - form { - .dropdown .text { - margin-right: 0 !important; - } - - .header { - padding-left: 0 !important; - text-align: center; - } - - .selection.dropdown { - vertical-align: middle; - width: 50% !important; - } - - @media @mediaSm { - label, - input, - .selection.dropdown { - width: 100% !important; - } - - .field button, - .field a { - margin-bottom: 1em; - width: 100%; - } - } - } - } - - &.new.repo { - .ui.form { - @media @mediaMdAndUp { - #auto-init { - margin-left: @create-page-form-input-padding+15px; - } - } - - .selection.dropdown:not(.owner) { - width: 50% !important; - - @media @mediaSm { - width: 100% !important; - } - } - } - } -} - -.new.webhook { - form { - .help { - margin-left: 25px; - } - } - - .events.fields { - .column { - padding-left: 40px; - } - } -} - -.githook { - textarea { - font-family: var(--fonts-monospace); - } -} - -.new.org .ui.form { - @media @mediaSm { - .field button, - .field a { - margin-bottom: 1em; - width: 100%; - } - - .field input { - width: 100% !important; - } - } -} diff --git a/web_src/less/_home.less b/web_src/less/_home.less deleted file mode 100644 index fb31bedfa9fd..000000000000 --- a/web_src/less/_home.less +++ /dev/null @@ -1,61 +0,0 @@ -.home { - .logo { - max-width: 220px; - } - - .hero { - @media @mediaSm { - h1 { - font-size: 3.5em; - } - - h2 { - font-size: 2em; - } - } - - @media @mediaMdAndUp { - h1 { - font-size: 5.5em; - } - - h2 { - font-size: 3em; - } - } - - .svg { - color: var(--color-green); - height: 40px; - width: 50px; - vertical-align: bottom; - } - - &.header { - font-size: 20px; - } - } - - p.large { - font-size: 16px; - } - - .stackable { - padding-top: 30px; - } - - a { - color: var(--color-green); - } -} - -footer { - .ui.container .left, - .ui.container .right { - @media (max-width: 880px) { - display: block; - text-align: center; - float: none; - } - } -} diff --git a/web_src/less/_install.less b/web_src/less/_install.less deleted file mode 100644 index 026a76fbbad4..000000000000 --- a/web_src/less/_install.less +++ /dev/null @@ -1,72 +0,0 @@ -.page-content.install { - padding-top: 45px; - - form.ui.form { - @input-padding: 30%; - - .inline.field > label { - text-align: right; - width: @input-padding; - padding-right: 10px; - margin-right: 0; - } - - .inline.field > .ui.checkbox:first-child { - margin-left: @input-padding; - padding-left: 5px; - label { - width: auto; - } - } - - .title { - margin-left: @input-padding; - padding-left: 5px; - } - - input { - width: 60%; - } - - details.optional.field { - &[open] { - border-bottom: 1px solid var(--color-secondary); - padding-bottom: 10px; - - summary { - margin-bottom: 10px; - } - } - - * { - box-sizing: border-box; - } - } - - .field { - text-align: left; - - .help { - margin-left: @input-padding; - padding-left: 5px; - width: 60%; - } - - } - } - - .ui { - .reinstall-message { - width: 70%; - margin: 20px auto; - color: var(--color-red); - text-align: left; - font-weight: bold; - } - .reinstall-confirm { - width: 70%; - text-align: left; - margin: 10px auto; - } - } -} diff --git a/web_src/less/_organization.less b/web_src/less/_organization.less deleted file mode 100644 index ae406f021a29..000000000000 --- a/web_src/less/_organization.less +++ /dev/null @@ -1,200 +0,0 @@ -.organization { - .head { - .ui.header { - .text { - vertical-align: middle; - font-size: 1.6rem; - margin-left: 15px; - } - .org-visibility .label { - margin-left: 5px; - margin-top: 5px; - } - .ui.right { - margin-top: 5px; - } - } - } - - .ui.secondary.stackable.pointing.menu { - flex-wrap: wrap; - margin-top: 5px; - margin-bottom: 10px; - } - - &.new.org { - #create-page-form(); - - form { - .header { - padding-left: 0 !important; - text-align: center; - } - } - } - - &.options { - input { - min-width: 300px; - } - } - - &.profile { - .org-avatar { - width: 100px; - height: 100px; - margin-right: 15px; - } - - #org-info { - overflow-wrap: anywhere; - - .ui.header { - display: flex; - align-items: center; - font-size: 36px; - margin-bottom: 0; - .org-visibility .label { - margin-left: 5px; - margin-top: 2px; - } - } - - .desc { - font-size: 16px; - margin-bottom: 10px; - } - - .meta { - .item { - display: inline-block; - margin-right: 10px; - - .icon { - margin-right: 5px; - } - } - } - } - - .ui.top.header { - .ui.right { - margin-top: 0; - } - } - - .teams { - .item { - padding: 10px 15px; - } - } - } - - &.teams, - &.profile { - .members { - a:hover { - text-decoration: none; - } - - .ui.avatar { - width: 48px; - height: 48px; - margin-right: 5px; - margin-bottom: 5px; - } - } - } - - &.invite { - #invite-box { - margin: 50px auto auto; - width: 500px !important; - - #search-user-box { - input { - margin-left: 0; - width: 300px; - } - } - - .ui.button { - margin-left: 5px; - margin-top: -3px; - } - } - - .ui.avatar { - width: 100%; - height: 100%; - } - } - - &.members { - .list { - .item { - margin-left: 0; - margin-right: 0; - border-bottom: 1px solid var(--color-secondary); - - .ui.avatar { - width: 48px; - height: auto; - margin-right: 1rem; - align-self: flex-start; - } - - .meta { - line-height: 24px; - word-break: break-word; - min-width: 2em; - } - } - } - } - - &.teams { - .detail { - .item { - padding: 10px 15px; - - &:not(:last-child) { - border-bottom: 1px solid var(--color-secondary); - } - } - } - - .repositories, - .members { - .item { - padding: 10px 20px; - line-height: 32px; - - &:not(:last-child) { - border-bottom: 1px solid var(--color-secondary); - } - - .button { - padding: 9px 10px; - } - } - } - - #add-repo-form, - #repo-multiple-form, - #add-member-form { - input { - margin-left: 0; - } - - .ui.button { - margin-left: 5px; - margin-top: -3px; - } - } - - #repo-top-segment { - height: 60px; - } - } -} diff --git a/web_src/less/_package.less b/web_src/less/_package.less deleted file mode 100644 index f4a07a188996..000000000000 --- a/web_src/less/_package.less +++ /dev/null @@ -1,9 +0,0 @@ -.container-labels { - td:nth-child(1) { - vertical-align: top; - } - - td:nth-child(2) { - overflow-wrap: anywhere; - } -} diff --git a/web_src/less/_review.less b/web_src/less/_review.less deleted file mode 100644 index bf2be1f166ce..000000000000 --- a/web_src/less/_review.less +++ /dev/null @@ -1,324 +0,0 @@ -@import "variables.less"; - -.ui.button.add-code-comment { - padding: 2px; - position: absolute; - margin-left: -22px; - z-index: 5; - opacity: 0; - transition: transform .1s ease-in-out; - transform: scale(1); - box-shadow: none !important; - border: none !important; - - &:hover { - transform: scale(1.1); - } -} - -.lines-escape a.toggle-escape-button::before { - visibility: visible; - content: '⚠️'; - font-family: var(--fonts-emoji); - color: var(--color-red); -} - -.repository .diff-file-box .code-diff td.lines-escape { - padding-left: 0 !important; -} - -.diff-file-box .lines-code:hover .ui.button.add-code-comment { - opacity: 1; -} - -.repository .diff-file-box .code-diff .add-comment-left, -.repository .diff-file-box .code-diff .add-comment-right, -.repository .diff-file-box .code-diff .add-code-comment .add-comment-left, -.repository .diff-file-box .code-diff .add-code-comment .add-comment-right, -.repository .diff-file-box .code-diff .add-code-comment .lines-type-marker { - padding-left: 0 !important; - padding-right: 0 !important; -} - -.add-comment-left.add-comment-right .ui.attached.header { - border: 1px solid var(--color-secondary); - - &:not(.top) { - margin-bottom: .5em; - } -} - -.add-comment .lines-num, -.add-comment .lines-escape, -.add-comment .lines-type-marker { - display: none; -} - -.show-outdated, -.hide-outdated { - &:extend(.unselectable); - - &:hover { - text-decoration: underline; - } -} - -.comment-code-cloud { - padding: .5rem 1rem !important; - position: relative; - margin: 0 auto; - max-width: 1000px; - - @media @mediaSm { - max-width: none; - padding: .75rem !important; - - .code-comment-buttons { - margin: .5rem 0 .25rem !important; - - .code-comment-buttons-buttons { - width: 100%; - } - } - - .ui.buttons { - width: 100%; - margin: 0 !important; - - .button { - flex: 1; - } - } - } - - .comments .comment { - padding: 0; - - @media @mediaSm { - display: flex; - - .comment-header-right.actions .ui.basic.label { - display: none; - } - - .avatar { - width: auto; - float: none; - margin: 0 .5rem 0 0; - flex-shrink: 0; - - ~ .content { - margin-left: 1em; - } - } - - img.avatar { - margin: 0 !important; - } - - .comment-content { - margin-left: 0 !important; - } - - .comment-container { - width: 100%; - } - - &.code-comment { - padding: 0 0 .5rem !important; - } - } - } - - .attached { - &.tab { - border: 0; - padding: 0; - margin: 0; - } - - &.header { - padding: .1rem 1rem; - - .text { - margin: 0; - } - } - } - - .right.menu.options .item { - padding: .85714286em .442857em; - cursor: pointer; - } - - .ui.active.tab { - padding: .5em; - - &.markup { - padding: 1em; - min-height: 168px; - } - } - - .ui.tabular.menu { - margin: .5em; - } - - .footer { - border-top: 1px solid var(--color-secondary); - padding: 10px 0; - - .markup-info { - display: inline-block; - margin: 5px 0; - font-size: 12px; - color: var(--color-text-light); - } - - .ui.right.floated { - padding-top: 6px; - } - - &::after { - clear: both; - content: ""; - display: block; - } - } - - @media @mediaSm { - .button { - width: 100%; - margin: 0 !important; - margin-bottom: .75rem !important; - } - } -} - -.diff-file-body .comment-form { - margin: 0 0 0 3em; -} - -.file-comment { - color: var(--color-text); -} - -a.blob-excerpt { - color: var(--color-text-light); - height: 28px; - display: flex; - justify-content: center; - align-items: center; - width: 100%; - background: var(--color-expand-button); -} - -a.blob-excerpt:hover { - background: var(--color-primary); - color: var(--color-primary-contrast); -} - -// See the comment of createCommentEasyMDE() for the review editor -// EasyMDE's options can not handle minHeight & maxHeight together correctly, we have to set minHeight in JS code -.review-box-panel .CodeMirror-scroll { - min-height: 80px; - max-height: calc(100vh - 360px); -} - -@media @mediaSm { - .review-box-panel .CodeMirror-scroll { - max-width: calc(100vw - 70px); - } -} - -@media @mediaMd { - .review-box-panel .CodeMirror-scroll { - max-width: 700px; - } -} - -@media @mediaLg { - .review-box-panel .CodeMirror-scroll { - max-width: 800px; - } -} - -@media @mediaXl { - .review-box-panel .CodeMirror-scroll { - max-width: 900px; - } -} - -#review-box { - position: relative; -} - -.review-box-panel { - position: absolute; - min-width: max-content; - top: 45px; - right: -5px; - z-index: 2; -} - -#review-box .review-comments-counter { - background-color: var(--color-primary-light-4); - color: var(--color-primary-contrast); -} - -#review-box:hover .review-comments-counter { - background-color: var(--color-primary-light-5); -} - -#review-box .review-comments-counter[data-pending-comment-number="0"] { - display: none; -} - -.pull.files.diff [id] { - scroll-margin-top: 99px; - - @media @mediaMdAndDown { - scroll-margin-top: 130px; - } -} - -.changed-since-last-review { - border: 1px var(--color-accent) solid; - background-color: var(--color-small-accent); - border-radius: 15px; - padding: 4px 8px; - margin: -8px 0; // just like other buttons in the diff box header - font-size: .857rem; // just like .ui.tiny.button -} - -.viewed-file-form { - display: flex; - align-items: center; - border: 1px solid transparent; - padding: 4px 8px; - margin: -8px 0; // just like other buttons in the diff box header - border-radius: .285rem; // just like .ui.tiny.button - font-size: .857rem; // just like .ui.tiny.button -} - -.viewed-file-form input { - margin-right: 4px; -} - -.viewed-file-checked-form { - background-color: var(--color-small-accent); - border-color: var(--color-accent); -} - -#viewed-files-summary { - width: 72px; - height: 10px; -} - -.diff-file-box { - border-radius: .285rem; // Just like ui.top.attached.header -} - -.diff-file-box:target { - box-shadow: 0 0 0 3px var(--color-accent); -} diff --git a/web_src/less/_runner.less b/web_src/less/_runner.less deleted file mode 100644 index cebe345b0cfc..000000000000 --- a/web_src/less/_runner.less +++ /dev/null @@ -1,45 +0,0 @@ -@import "variables.less"; - -.runner-container { - padding-bottom: 30px; - .runner-ops > a { - margin-left: .5em; - } - .runner-ops-delete { - color: var(--color-red-light); - } - .runner-basic-info .gt-dib { - margin-right: 1em; - } - .runner-status-online { - .ui.label; - background-color: var(--color-green); - color: var(--color-white); - } - .runner-new-text { - color: var(--color-white); - } - #runner-new:hover .runner-new-text { - color: var(--color-white) !important; - } - .runner-new-menu { - width: 300px; - } - .task-status-success { - background-color: var(--color-green); - color: var(--color-white); - } - .task-status-failure { - background-color: var(--color-red-light); - color: var(--color-white); - } - .task-status-running { - background-color: var(--color-blue); - color: var(--color-white); - } - .task-status-cancelled, - .task-status-blocked { - background-color: var(--color-yellow); - color: var(--color-white); - } -} diff --git a/web_src/less/_user.less b/web_src/less/_user.less deleted file mode 100644 index eb9e791d86e8..000000000000 --- a/web_src/less/_user.less +++ /dev/null @@ -1,183 +0,0 @@ -@import "variables.less"; - -.user { - &.profile { - .ui.card { - .header { - display: block; - font-weight: 600; - font-size: 1.3rem; - margin-top: -.2rem; - line-height: 1.3rem; - } - - .profile-avatar-name { - border-top: none; - text-align: center; - } - - .extra.content { - padding: 0; - - ul { - margin: 0; - padding: 0; - - li { - padding: 10px; - list-style: none; - - &:not(:last-child) { - border-bottom: 1px solid var(--color-secondary); - } - - .svg { - margin-left: 1px; - margin-right: 5px; - } - - &.follow { - .ui.button { - width: 100%; - } - } - } - } - } - #profile-avatar { - background: none; - padding: 1rem 1rem .25rem; - justify-content: center; - img { - width: 100%; - height: auto; - object-fit: contain; - margin: 0; - @media @mediaSm { - width: 30vw; - } - } - - } - - @media @mediaSm { - width: 100%; - } - } - - .ui.repository.list { - margin-top: 25px; - } - - #loading-heatmap { - margin-bottom: 1em; - } - .ui.secondary.stackable.pointing.menu { - flex-wrap: wrap; - } - } - - &.followers { - .header.name { - font-size: 20px; - line-height: 24px; - vertical-align: middle; - } - - .follow { - .ui.button { - padding: 8px 15px; - } - } - } - - &.notification { - .svg { - float: left; - font-size: 2em; - - &.green { - color: var(--color-green); - } - - &.red { - color: var(--color-red); - } - - &.purple { - color: var(--color-purple); - } - - &.blue { - color: var(--color-blue); - } - } - - .content { - float: left; - margin-left: 7px; - } - - table { - form { - display: inline-block; - } - - button { - padding: 3px 3px 3px 5px; - } - - tr { - cursor: pointer; - } - } - } - - .button.adopt, - .button.delete { - margin-top: -15px; - margin-bottom: -15px; - .label { - vertical-align: middle; - } - } - - &.link-account:not(.icon) { - padding-top: 15px; - padding-bottom: 5px; - } - - &.settings { - .iconFloat { - float: left; - } - } -} - -.user-orgs { - display: flex; - flex-flow: row wrap; - padding: 0; - margin: -3px !important; - - li { - display: flex; - border-bottom: 0 !important; - padding: 3px !important; - width: 20%; - max-width: 60px; - } -} - -.user-badges { - display: grid; - grid-template-columns: repeat(auto-fill, 64px); - gap: 2px; -} - -.user-badges img { - object-fit: contain; -} -#notification_div .tab.segment { - overflow-x: auto; -} diff --git a/web_src/less/chroma/chroma-style-diff.go b/web_src/less/chroma/chroma-style-diff.go deleted file mode 100644 index 424325968955..000000000000 --- a/web_src/less/chroma/chroma-style-diff.go +++ /dev/null @@ -1,79 +0,0 @@ -// Copyright 2023 The Gitea Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -//go:build ignore - -/* -This tool is used to compare the CSS names in a chroma builtin styles with the Gitea theme CSS names. - -It outputs the difference between the two sets of CSS names, eg: - -``` -CSS names not in builtin: -.chroma .ln ----- -Builtin CSS names not in file: -.chroma .vm -``` - -Developers could use this tool to re-sync the CSS names in the Gitea theme. -*/ - -package main - -import ( - "os" - "regexp" - "strings" - - "github.com/alecthomas/chroma/v2" -) - -func main() { - if len(os.Args) != 2 { - println("Usage: chroma-style-diff css-or-less-file") - os.Exit(1) - } - - data, err := os.ReadFile(os.Args[1]) - if err != nil { - println(err.Error()) - os.Exit(1) - } - - content := string(data) - - // a simple CSS parser to collect CSS names - content = regexp.MustCompile("//.*\r?\n").ReplaceAllString(content, "\n") - content = regexp.MustCompile("/\\*.*?\\*/").ReplaceAllString(content, "") - matches := regexp.MustCompile("\\s*([-.#:\\w\\s]+)\\s*\\{[^}]*}").FindAllStringSubmatch(content, -1) - - cssNames := map[string]bool{} - for _, matchGroup := range matches { - cssName := strings.TrimSpace(matchGroup[1]) - cssNames[cssName] = true - } - - // collect Chroma builtin CSS names - builtin := map[string]bool{} - for tokenType, cssName := range chroma.StandardTypes { - if tokenType > 0 && cssName != "" { - builtin[".chroma ."+cssName] = true - } - } - - // show the diff - println("CSS names not in builtin:") - for cssName := range cssNames { - if !builtin[cssName] { - println(cssName) - } - } - println("----") - println("Builtin CSS names not in file:") - for cssName := range builtin { - if !cssNames[cssName] { - println(cssName) - } - } -} diff --git a/web_src/less/codemirror/dark.less b/web_src/less/codemirror/dark.less deleted file mode 100644 index d0e954df5854..000000000000 --- a/web_src/less/codemirror/dark.less +++ /dev/null @@ -1,89 +0,0 @@ -.CodeMirror { - &.cm-s-default, - &.cm-s-paper { - .cm-property { - color: #a0cc75; - } - - .cm-header { - color: #9daccc; - } - - .cm-quote { - color: #009900; - } - - .cm-keyword { - color: #cc8a61; - } - - .cm-atom { - color: #ef5e77; - } - - .cm-number { - color: #ff5656; - } - - .cm-def { - color: #e4e4e4; - } - - .cm-variable-2 { - color: #00bdbf; - } - - .cm-variable-3 { - color: #008855; - } - - .cm-comment { - color: #8e9ab3; - } - - .cm-string { - color: #a77272; - } - - .cm-string-2 { - color: #ff5500; - } - - .cm-meta, - .cm-qualifier { - color: #ffb176; - } - - .cm-builtin { - color: #b7c951; - } - - .cm-bracket { - color: #999977; - } - - .cm-tag { - color: #f1d273; - } - - .cm-attribute { - color: #bfcc70; - } - - .cm-hr { - color: #999999; - } - - .cm-url { - color: #c5cfd0; - } - - .cm-link { - color: #d8c792; - } - - .cm-error { - color: #dbdbeb; - } - } -} diff --git a/web_src/less/features/gitgraph.less b/web_src/less/features/gitgraph.less deleted file mode 100644 index f6b1be5ba6b9..000000000000 --- a/web_src/less/features/gitgraph.less +++ /dev/null @@ -1,325 +0,0 @@ -#git-graph-container { - overflow-x: auto; - width: 100%; - min-height: 350px; - - > .ui.segment.loading { - border: 0; - z-index: 1; - min-height: 246px; - } - - h2 { - display: flex; - justify-content: space-between; - align-items: center; - } - - .color-buttons { - margin-right: 0; - } - - .ui.header.dividing { - padding-bottom: 10px; - } - - #flow-select-refs-dropdown { - border-top-right-radius: 0; - border-bottom-right-radius: 0; - min-width: 250px; - border-right: none; - - .ui.label { - max-width: 180px; - display: inline-flex !important; - align-items: center; - - .truncate { - display: inline-block; - max-width: 140px; - overflow: hidden; - text-overflow: ellipsis; - vertical-align: top; - white-space: nowrap; - } - } - - .dropdown.icon { - display: none; - } - - .default.text { - padding-top: 4px; - padding-bottom: 4px; - } - - input.search { - position: relative; - top: 1px; - } - } - - li { - list-style-type: none; - height: 24px; - line-height: 24px; - white-space: nowrap; - display: flex; - align-items: center; - - .node-relation { - font-family: var(--fonts-monospace); - } - - .author { - color: var(--color-text-light); - } - - .time { - color: var(--color-text-light-3); - font-size: 80%; - } - - a:not(.ui):hover { - text-decoration: underline; - } - - a em { - color: var(--color-red); - border-bottom: 1px dotted var(--color-secondary); - text-decoration: none; - font-style: normal; - } - } - - #rel-container { - max-width: 30%; - overflow-x: auto; - float: left; - } - - #rev-container { - width: 100%; - } - - #rev-list { - margin: 0; - padding: 0; - width: 100%; - - li.highlight.hover { - background-color: var(--color-secondary-alpha-30); - } - - .tags a.button { - padding: 2px 4px; - } - - .sha.label { - padding-top: 5px; - padding-bottom: 3px; - } - - .sha.label .shortsha { - padding-top: 0; - } - - .sha.label .shortsha-pad { - padding-right: 10px; - } - - .sha.label .ui.detail.icon.button { - padding-top: 3px; - margin-top: -5px; - padding-bottom: 1px; - } - - .author img.ui.avatar { - width: auto; - height: 18px; - max-width: none; - } - } - - #graph-raw-list { - margin: 0; - } - - &.monochrome #rel-container { - .flow-group { - stroke: var(--color-secondary-dark-5); - fill: var(--color-secondary-dark-5); - } - - .flow-group.highlight { - stroke: var(--color-secondary-dark-12); - fill: var(--color-secondary-dark-12); - } - } - - &:not(.monochrome) #rel-container { - .flow-group { - &.flow-color-16-1 { - stroke: #499a37; - fill: #499a37; - } - - &.flow-color-16-2 { - stroke: #ce4751; - fill: #ce4751; - } - - &.flow-color-16-3 { - stroke: #8f9121; - fill: #8f9121; - } - - &.flow-color-16-4 { - stroke: #ac32a6; - fill: #ac32a6; - } - - &.flow-color-16-5 { - stroke: #7445e9; - fill: #7445e9; - } - - &.flow-color-16-6 { - stroke: #c67d28; - fill: #c67d28; - } - - &.flow-color-16-7 { - stroke: #4db392; - fill: #4db392; - } - - &.flow-color-16-8 { - stroke: #aa4d30; - fill: #aa4d30; - } - - &.flow-color-16-9 { - stroke: #2a6f84; - fill: #2a6f84; - } - - &.flow-color-16-10 { - stroke: #c45327; - fill: #c45327; - } - - &.flow-color-16-11 { - stroke: #3d965c; - fill: #3d965c; - } - - &.flow-color-16-12 { - stroke: #792a93; - fill: #792a93; - } - - &.flow-color-16-13 { - stroke: #439d73; - fill: #439d73; - } - - &.flow-color-16-14 { - stroke: #103aad; - fill: #103aad; - } - - &.flow-color-16-15 { - stroke: #982e85; - fill: #982e85; - } - - &.flow-color-16-0 { - stroke: #7db233; - fill: #7db233; - } - } - - .flow-group.highlight { - &.flow-color-16-1 { - stroke: #5ac144; - fill: #5ac144; - } - - &.flow-color-16-2 { - stroke: #ed5a8b; - fill: #ed5a8b; - } - - &.flow-color-16-3 { - stroke: #ced049; - fill: #ced048; - } - - &.flow-color-16-4 { - stroke: #db61d7; - fill: #db62d6; - } - - &.flow-color-16-5 { - stroke: #8455f9; - fill: #8455f9; - } - - &.flow-color-16-6 { - stroke: #e6a151; - fill: #e6a151; - } - - &.flow-color-16-7 { - stroke: #44daaa; - fill: #44daaa; - } - - &.flow-color-16-8 { - stroke: #dd7a5c; - fill: #dd7a5c; - } - - &.flow-color-16-9 { - stroke: #38859c; - fill: #38859c; - } - - &.flow-color-16-10 { - stroke: #d95520; - fill: #d95520; - } - - &.flow-color-16-11 { - stroke: #42ae68; - fill: #42ae68; - } - - &.flow-color-16-12 { - stroke: #9126b5; - fill: #9126b5; - } - - &.flow-color-16-13 { - stroke: #4ab080; - fill: #4ab080; - } - - &.flow-color-16-14 { - stroke: #284fb8; - fill: #284fb8; - } - - &.flow-color-16-15 { - stroke: #971c80; - fill: #971c80; - } - - &.flow-color-16-0 { - stroke: #87ca28; - fill: #87ca28; - } - } - } -} diff --git a/web_src/less/features/heatmap.less b/web_src/less/features/heatmap.less deleted file mode 100644 index a6280e8b5142..000000000000 --- a/web_src/less/features/heatmap.less +++ /dev/null @@ -1,67 +0,0 @@ -#user-heatmap { - width: 100%; - font-size: 9px; - position: relative; - min-height: 125px; - - text { - fill: currentcolor !important; - } - - // for the "Less" and "More" legend - .vch__legend .vch__legend { - display: flex; - font-size: 11px; - align-items: center; - justify-content: right; - } - .vch__legend .vch__legend div:first-child, - .vch__legend .vch__legend div:last-child { - display: inline-block; - padding: 0 5px; - } - - // move the "? contributions in the last ? months" text from top to bottom - .total-contributions { - font-size: 11px; - position: absolute; - bottom: 0; - left: 25px; - } - - @media @mediaLgAndDown { - & { - min-height: 105px; - } - .total-contributions { - left: 21px; - } - } - - @media (max-width: 1000px) { - & { - min-height: 80px; - } - .total-contributions { - font-size: 10px; - left: 17px; - bottom: -4px; - } - } -} - -.user.profile #user-heatmap { - min-height: 135px; -} - -@media @mediaLgAndDown { - .user.profile #user-heatmap { - min-height: 115px; - } -} - -@media (max-width: 1000px) { - .user.profile #user-heatmap { - min-height: 90px; - } -} diff --git a/web_src/less/features/imagediff.less b/web_src/less/features/imagediff.less deleted file mode 100644 index 07763c15e126..000000000000 --- a/web_src/less/features/imagediff.less +++ /dev/null @@ -1,105 +0,0 @@ -.image-diff-container { - text-align: center; - padding: 1em 0; - - img { - border: 1px solid var(--color-primary-light-7); - background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAG0lEQVQYlWN4+vTpf3SMDTAMBYXYBLFpHgoKAeiOf0SGE9kbAAAAAElFTkSuQmCC") right bottom var(--color-primary-light-7); - } - - .before-container { - border: 1px solid var(--color-red); - display: block; - } - - .after-container { - border: 1px solid var(--color-green); - display: block; - } - - .diff-side-by-side { - .side { - display: inline-block; - line-height: 0; - vertical-align: top; - margin: 0 1em; - - .side-header { - font-weight: bold; - } - } - } - - .diff-swipe { - margin: auto; - - .swipe-frame { - position: absolute; - - .before-container { - position: absolute; - } - - .swipe-container { - position: absolute; - right: 0; - display: block; - border-left: 2px solid var(--color-secondary-dark-8); - height: 100%; - overflow: hidden; - - .after-container { - position: absolute; - right: 0; - } - } - - .swipe-bar { - position: absolute; - height: 100%; - top: 0; - left: 0; - - .handle { - background: var(--color-secondary-dark-8); - left: -5px; - height: 12px; - width: 12px; - position: absolute; - transform: rotate(45deg); - box-sizing: border-box; - display: flex; - justify-content: center; - align-items: center; - cursor: pointer; - } - - .top-handle { - top: -12px; - } - - .bottom-handle { - bottom: -14px; - } - } - } - } - - .diff-overlay { - margin: 0 auto; - - .overlay-frame { - margin: 0 auto; - position: relative; - } - - .before-container, - .after-container { - position: absolute; - } - - input { - max-width: 300px; - } - } -} diff --git a/web_src/less/index.less b/web_src/less/index.less deleted file mode 100644 index 5d55b9291f6c..000000000000 --- a/web_src/less/index.less +++ /dev/null @@ -1,42 +0,0 @@ -@import "font-awesome/css/font-awesome.css"; - -@import "./variables.less"; -@import "./animations.less"; -@import "./shared/issuelist.less"; -@import "./features/dropzone.less"; -@import "./features/gitgraph.less"; -@import "./features/heatmap.less"; -@import "./features/imagediff.less"; -@import "./features/codeeditor.less"; -@import "./features/projects.less"; -@import "./modules/tippy.less"; -@import "./markup/content.less"; -@import "./markup/codecopy.less"; -@import "./code/linebutton.less"; -@import "./markup/asciicast.less"; - -@import "./chroma/base.less"; -@import "./chroma/light.less"; -@import "./codemirror/base.less"; -@import "./codemirror/light.less"; -@import "./console/console.less"; - -@import "_svg"; -@import "_tribute"; -@import "_font_i18n"; -@import "_base"; -@import "_home"; -@import "_install"; -@import "_form"; -@import "_repository"; -@import "_editor"; -@import "_organization"; -@import "_user"; -@import "_dashboard"; -@import "_admin"; -@import "_explore"; -@import "_review"; -@import "_package"; -@import "_runner"; - -@import "./helpers.less"; diff --git a/web_src/less/markup/content.less b/web_src/less/markup/content.less deleted file mode 100644 index 725a3d9886f5..000000000000 --- a/web_src/less/markup/content.less +++ /dev/null @@ -1,559 +0,0 @@ -.markup { - overflow: hidden; - font-size: 16px; - line-height: 1.5 !important; - word-wrap: break-word; - - &.ui.segment { - padding: 3em; - } - - &.file-view { - padding: 2em !important; - } - - > *:first-child { - margin-top: 0 !important; - } - - > *:last-child { - margin-bottom: 0 !important; - } - - a:not([href]) { - color: inherit; - text-decoration: none; - } - - .absent { - color: var(--color-red); - } - - .anchor { - padding-right: 4px; - margin-left: -20px; - line-height: 1; - color: inherit; - } - - .anchor .svg { - vertical-align: middle; - } - - .anchor:focus { - outline: none; - } - - h1 .anchor .svg, - h2 .anchor .svg, - h3 .anchor .svg, - h4 .anchor .svg, - h5 .anchor .svg, - h6 .anchor .svg { - visibility: hidden; - } - - h1:hover .anchor .svg, - h2:hover .anchor .svg, - h3:hover .anchor .svg, - h4:hover .anchor .svg, - h5:hover .anchor .svg, - h6:hover .anchor .svg { - visibility: visible; - } - - h2 .anchor .svg, - h3 .anchor .svg, - h4 .anchor .svg { - position: relative; - top: -2px; - } - - h1, - h2, - h3, - h4, - h5, - h6 { - margin-top: 24px; - margin-bottom: 16px; - font-weight: 600; - line-height: 1.25; - } - - h1 tt, - h1 code, - h2 tt, - h2 code, - h3 tt, - h3 code, - h4 tt, - h4 code, - h5 tt, - h5 code, - h6 tt, - h6 code { - font-size: inherit; - } - - h1 { - padding-bottom: .3em; - font-size: 2em; - border-bottom: 1px solid var(--color-secondary); - } - - h2 { - padding-bottom: .3em; - font-size: 1.5em; - border-bottom: 1px solid var(--color-secondary); - } - - h3 { - font-size: 1.25em; - } - - h4 { - font-size: 1em; - } - - h5 { - font-size: .875em; - } - - h6 { - font-size: .85em; - color: var(--color-text-light-2); - } - - p, - blockquote, - details, - ul, - ol, - dl, - table, - pre { - margin-top: 0; - margin-bottom: 16px; - } - - hr { - height: 4px; - padding: 0; - margin: 16px 0; - background-color: var(--color-secondary); - border: 0; - } - - ul, - ol { - padding-left: 2em; - } - - ul.no-list, - ol.no-list { - padding: 0; - list-style-type: none; - } - - .task-list-item { - list-style-type: none; - position: relative; - line-height: 1.5rem; - min-height: 1.5rem; // to render a checkbox list without content `- [ ]`, we need this min-height to make sure the
  • can be visible - - input[type="checkbox"] { - position: absolute; - top: .25em; - left: -1.6em; - } - - p { - line-height: 1.5rem; - } - } - - .task-list-item + .task-list-item { - margin-top: 3px; - } - - input[type="checkbox"] { - -webkit-appearance: none; - -moz-appearance: none; - appearance: none; - position: relative; - border: 1px solid var(--color-secondary); - border-radius: 2px; - background: var(--color-input-background); - height: 14px; - width: 14px; - opacity: 1 !important; // override fomantic on edit preview - pointer-events: auto !important; // override fomantic on edit preview - vertical-align: middle !important; // override fomantic on edit preview - -webkit-print-color-adjust: exact; - color-adjust: exact; - } - - input[type="checkbox"]:not([disabled]):hover, - input[type="checkbox"]:not([disabled]):active { - border-color: var(--color-primary); - } - - input[type="checkbox"]::after { - position: absolute; - left: 0; - top: 0; - bottom: 0; - right: 0; - pointer-events: none; - background: var(--color-text); - mask-size: cover; - -webkit-mask-size: cover; - } - - input[type="checkbox"]:checked::after { - content: ""; - mask-image: var(--checkbox-mask-checked); - -webkit-mask-image: var(--checkbox-mask-checked); - -webkit-print-color-adjust: exact; - color-adjust: exact; - } - - input[type="checkbox"]:indeterminate::after { - content: ""; - mask-image: var(--checkbox-mask-indeterminate); - -webkit-mask-image: var(--checkbox-mask-indeterminate); - } - - ul ul, - ul ol, - ol ol, - ol ul { - margin-top: 0; - margin-bottom: 0; - } - - ol ol, - ul ol { - list-style-type: lower-roman; - } - - li > p { - margin-top: 16px; - } - - li + li { - margin-top: .25em; - } - - dl { - padding: 0; - } - - dl dt { - padding: 0; - margin-top: 16px; - font-size: 1em; - font-style: italic; - font-weight: 600; - } - - dl dd { - padding: 0 16px; - margin-bottom: 16px; - } - - blockquote { - margin-left: 0; - padding: 0 15px; - color: var(--color-text-light-2); - border-left: 4px solid var(--color-secondary); - } - - blockquote > :first-child { - margin-top: 0; - } - - blockquote > :last-child { - margin-bottom: 0; - } - - table { - display: block; - width: 100%; - width: max-content; - max-width: 100%; - overflow: auto; - } - - table th { - font-weight: 600; - } - - table th, - table td { - padding: 6px 13px !important; - border: 1px solid var(--color-secondary) !important; - } - - table tr { - border-top: 1px solid var(--color-secondary); - } - - table tr:nth-child(2n) { - background-color: var(--color-markup-table-row); - } - - img { - max-width: 100%; - box-sizing: initial; - } - - img[align="right"] { - padding-left: 20px; - } - - img[align="left"] { - padding-right: 20px; - } - - .emoji { - max-width: none; - vertical-align: text-top; - } - - span.frame { - display: block; - overflow: hidden; - } - - span.frame > span { - display: block; - float: left; - width: auto; - padding: 7px; - margin: 13px 0 0; - overflow: hidden; - border: 1px solid var(--color-secondary); - } - - span.frame span img { - display: block; - float: left; - } - - span.frame span span { - display: block; - padding: 5px 0 0; - clear: both; - color: var(--color-text); - } - - span.align-center { - display: block; - overflow: hidden; - clear: both; - } - - span.align-center > span { - display: block; - margin: 13px auto 0; - overflow: hidden; - text-align: center; - } - - span.align-center span img { - margin: 0 auto; - text-align: center; - } - - span.align-right { - display: block; - overflow: hidden; - clear: both; - } - - span.align-right > span { - display: block; - margin: 13px 0 0; - overflow: hidden; - text-align: right; - } - - span.align-right span img { - margin: 0; - text-align: right; - } - - span.float-left { - display: block; - float: left; - margin-right: 13px; - overflow: hidden; - } - - span.float-left span { - margin: 13px 0 0; - } - - span.float-right { - display: block; - float: right; - margin-left: 13px; - overflow: hidden; - } - - span.float-right > span { - display: block; - margin: 13px auto 0; - overflow: hidden; - text-align: right; - } - - code, - tt { - padding: .2em .4em; - margin: 0; - font-size: 85%; - white-space: break-spaces; - background-color: var(--color-markup-code-block); - border-radius: 4px; - } - - code br, - tt br { - display: none; - } - - del code { - text-decoration: inherit; - } - - pre > code { - padding: 0; - margin: 0; - font-size: 100%; - white-space: pre-wrap; - word-break: break-all; - overflow-wrap: break-word; - background: transparent; - border: 0; - } - - .highlight { - margin-bottom: 16px; - } - - .highlight pre, - pre { - padding: 16px; - font-size: 85%; - line-height: 1.45; - background-color: var(--color-markup-code-block); - border-radius: 4px; - } - - .highlight pre { - margin-bottom: 0; - word-break: normal; - } - - pre { - word-wrap: normal; - } - - pre code, - pre tt { - display: inline; - max-width: initial; - padding: 0; - margin: 0; - overflow: initial; - line-height: inherit; - word-wrap: normal; - background-color: transparent; - border: 0; - } - - pre code::before, - pre code::after, - pre tt::before, - pre tt::after { - content: normal; - } - - kbd { - display: inline-block; - padding: 3px 5px; - font-size: 11px; - line-height: 10px; - color: var(--color-text-light); - vertical-align: middle; - background-color: var(--color-markup-code-block); - border: 1px solid var(--color-secondary); - border-radius: 3px; - box-shadow: inset 0 -1px 0 var(--color-secondary); - } - - .ui.list .list, - ol.ui.list ol, - ul.ui.list ul { - padding-left: 2em; - } -} - -.repository.wiki.revisions { - .ui.container > .ui.stackable.grid { - -ms-flex-direction: row-reverse; - flex-direction: row-reverse; - - > .header { - margin-top: 0; - - .sub.header { - padding-left: 52px; - word-break: break-word; - } - } - } -} - -.file-revisions-btn { - display: block; - float: left; - margin-bottom: 2px !important; - padding: 11px !important; - margin-right: 10px !important; - - i { - &:extend(.unselectable); - } -} - -.markup-render { - display: block; - border: none; - width: 100%; - height: var(--height-loading); // actual height is set in JS after loading - overflow: hidden; - color-scheme: normal; // match the value inside the iframe to allow it to become transparent -} - -.markup-block-error { - border: 1px solid var(--color-error-border) !important; - margin-bottom: 0 !important; - border-bottom-left-radius: 0 !important; - border-bottom-right-radius: 0 !important; - box-shadow: none !important; - font-size: 85% !important; - white-space: pre-wrap !important; - padding: .5rem 1rem !important; - text-align: left !important; -} - -.markup-block-error + pre { - border-top: none !important; - margin-top: 0 !important; - border-top-left-radius: 0 !important; - border-top-right-radius: 0 !important; -} diff --git a/web_src/less/shared/issuelist.less b/web_src/less/shared/issuelist.less deleted file mode 100644 index 9f69d6bb3a4c..000000000000 --- a/web_src/less/shared/issuelist.less +++ /dev/null @@ -1,167 +0,0 @@ -.issue.list { - list-style: none; - margin-top: 1rem; - - a:not(.label):hover { - color: var(--color-primary) !important; - } - - > .item { - .issue-checkbox { - margin-top: 1px; - } - - .issue-item-icon svg { - margin-right: .75rem; - margin-top: 1px; - } - - .issue-item-icons-right > * + * { - margin-left: .5rem; - } - - .issue-item-main { - width: 100%; - } - - .action-item-main { - width: 80%; - } - - .issue-item-right { - width: 15%; - } - - .issue-item-top-row { - max-width: 100%; - color: var(--color-text); - font-size: 16px; - min-width: 0; - font-weight: 600; - a.index { - max-width: fit-content; - display: -webkit-box; - -webkit-box-orient: vertical; - -webkit-line-clamp: 2; - overflow: hidden; - word-break:break-all; - } - } - - .labels-list { - position: relative; - top: -1.5px; - } - - .issue-item-bottom-row { - font-size: 13px; - } - - .title { - color: var(--color-text); - word-break: break-word; - } - - .issue-item-icon-right { - min-width: 2rem; - } - - .assignee { - position: relative; - top: -2px; - } - - .assignee img { - width: 20px; - height: 20px; - margin-right: 2px; - } - - .desc { - color: var(--color-text-light-2); - - a { - color: inherit; - } - - .time-since, - a { - margin-left: .25rem; - margin-right: .25rem; - } - - .waiting, - .approvals, - .rejects { - padding-left: 5px; - } - - .checklist { - padding-left: 5px; - - progress { - margin-left: 2px; - width: 80px; - height: 6px; - display: inline-block; - border-radius: 3px; - vertical-align: 2px !important; - } - - progress::-webkit-progress-value { - background-color: var(--color-secondary-dark-4); - } - - progress::-moz-progress-bar { - background-color: var(--color-secondary-dark-4); - } - } - - .conflicting { - padding-left: 5px; - } - - .due-date { - padding-left: 5px; - } - - a.milestone, - a.project { - margin-left: 5px; - } - - a.ref { - margin-left: 8px; - - span { - margin-right: -4px; - } - } - - .overdue { - color: var(--color-red); - } - } - } - - .branches { - display: inline-flex; - padding: 0 4px; - - .branch { - background-color: var(--color-secondary); - border-radius: 3px; - } - - .truncated-name { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - max-width: 10em; - } - } - - > .item + .item { - border-top: 1px solid var(--color-secondary); - } -} diff --git a/web_src/less/themes/theme-auto.less b/web_src/less/themes/theme-auto.less deleted file mode 100644 index f49e194e1d64..000000000000 --- a/web_src/less/themes/theme-auto.less +++ /dev/null @@ -1,3 +0,0 @@ -@media (prefers-color-scheme: dark) { - @import "theme-arc-green.less"; -} diff --git a/web_src/less/variables.less b/web_src/less/variables.less deleted file mode 100644 index 23f6ac6de9e0..000000000000 --- a/web_src/less/variables.less +++ /dev/null @@ -1,14 +0,0 @@ -// here a standard set of media queries is defined, that is compatible with the -// responsive grid used in fomantic css. As there only is a precompiled build -// of fomantic checked in (since 946bbbe), we can't use their less variables -// here, but these breakpoints shouldn't change in the foreseeable future. - -@mediaMdAndUp: ~"(min-width: 768px)"; -@mediaMdAndDown: ~"(max-width: 991px)"; -@mediaLgAndUp: ~"(min-width: 992px)"; -@mediaLgAndDown: ~"(max-width: 1200px)"; - -@mediaSm: ~"(max-width: 767px)"; -@mediaMd: @mediaMdAndUp and @mediaMdAndDown; -@mediaLg: @mediaLgAndUp and @mediaLgAndDown; -@mediaXl: ~"(min-width: 1201px)"; diff --git a/webpack.config.js b/webpack.config.js index 245791e7ea6e..f6f2ee58b4cf 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -21,7 +21,7 @@ const glob = (pattern) => fastGlob.sync(pattern, { }); const themes = {}; -for (const path of glob('web_src/less/themes/*.less')) { +for (const path of glob('web_src/css/themes/*.css')) { themes[parse(path).name] = [path]; } @@ -57,14 +57,14 @@ export default { fileURLToPath(new URL('web_src/js/index.js', import.meta.url)), fileURLToPath(new URL('node_modules/easymde/dist/easymde.min.css', import.meta.url)), fileURLToPath(new URL('web_src/fomantic/build/semantic.css', import.meta.url)), - fileURLToPath(new URL('web_src/less/index.less', import.meta.url)), + fileURLToPath(new URL('web_src/css/index.css', import.meta.url)), ], webcomponents: [ fileURLToPath(new URL('web_src/js/webcomponents/GiteaOriginUrl.js', import.meta.url)), ], swagger: [ fileURLToPath(new URL('web_src/js/standalone/swagger.js', import.meta.url)), - fileURLToPath(new URL('web_src/less/standalone/swagger.less', import.meta.url)), + fileURLToPath(new URL('web_src/css/standalone/swagger.css', import.meta.url)), ], serviceworker: [ fileURLToPath(new URL('web_src/js/serviceworker.js', import.meta.url)), @@ -136,7 +136,7 @@ export default { ], }, { - test: /.css$/i, + test: /\.css$/i, use: [ { loader: MiniCssExtractPlugin.loader, @@ -151,29 +151,6 @@ export default { }, ], }, - { - test: /.less$/i, - use: [ - { - loader: MiniCssExtractPlugin.loader, - }, - { - loader: 'css-loader', - options: { - sourceMap: true, - importLoaders: 1, - url: {filter: filterCssImport}, - import: {filter: filterCssImport}, - }, - }, - { - loader: 'less-loader', - options: { - sourceMap: true, - }, - }, - ], - }, { test: /\.svg$/, include: fileURLToPath(new URL('public/img/svg', import.meta.url)), From 301de3ab6b505bccdc3ee94c216e4d44bf508ff2 Mon Sep 17 00:00:00 2001 From: Zettat123 Date: Fri, 17 Mar 2023 09:04:52 +0800 Subject: [PATCH 098/340] Handle missing `README` in create repos API (#23387) (#23510) Backport #23387 Close #22934 In `/user/repos` API (and other APIs related to creating repos), user can specify a readme template for auto init. At present, if the specified template does not exist, a `500` will be returned . This PR improved the logic and will return a `400` instead of `500`. Co-authored-by: techknowlogick --- routers/api/v1/admin/repo.go | 2 ++ routers/api/v1/repo/repo.go | 11 +++++++++++ templates/swagger/v1_json.tmpl | 9 +++++++++ 3 files changed, 22 insertions(+) diff --git a/routers/api/v1/admin/repo.go b/routers/api/v1/admin/repo.go index 83ed06e49bce..a4895f260bec 100644 --- a/routers/api/v1/admin/repo.go +++ b/routers/api/v1/admin/repo.go @@ -32,6 +32,8 @@ func CreateRepo(ctx *context.APIContext) { // responses: // "201": // "$ref": "#/responses/Repository" + // "400": + // "$ref": "#/responses/error" // "403": // "$ref": "#/responses/forbidden" // "404": diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go index 8490eb99f93e..11d5f007777a 100644 --- a/routers/api/v1/repo/repo.go +++ b/routers/api/v1/repo/repo.go @@ -231,6 +231,13 @@ func CreateUserRepo(ctx *context.APIContext, owner *user_model.User, opt api.Cre if opt.AutoInit && opt.Readme == "" { opt.Readme = "Default" } + + // If the readme template does not exist, a 400 will be returned. + if opt.AutoInit && len(opt.Readme) > 0 && !util.SliceContains(repo_module.Readmes, opt.Readme) { + ctx.Error(http.StatusBadRequest, "", fmt.Errorf("readme template does not exist, available templates: %v", repo_module.Readmes)) + return + } + repo, err := repo_service.CreateRepository(ctx.Doer, owner, repo_module.CreateRepoOptions{ Name: opt.Name, Description: opt.Description, @@ -283,6 +290,8 @@ func Create(ctx *context.APIContext) { // responses: // "201": // "$ref": "#/responses/Repository" + // "400": + // "$ref": "#/responses/error" // "409": // description: The repository with the same name already exists. // "422": @@ -464,6 +473,8 @@ func CreateOrgRepo(ctx *context.APIContext) { // responses: // "201": // "$ref": "#/responses/Repository" + // "400": + // "$ref": "#/responses/error" // "404": // "$ref": "#/responses/notFound" // "403": diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index a8433c21d85e..9bab4ced8065 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -713,6 +713,9 @@ "201": { "$ref": "#/responses/Repository" }, + "400": { + "$ref": "#/responses/error" + }, "403": { "$ref": "#/responses/forbidden" }, @@ -1926,6 +1929,9 @@ "201": { "$ref": "#/responses/Repository" }, + "400": { + "$ref": "#/responses/error" + }, "403": { "$ref": "#/responses/forbidden" }, @@ -13229,6 +13235,9 @@ "201": { "$ref": "#/responses/Repository" }, + "400": { + "$ref": "#/responses/error" + }, "409": { "description": "The repository with the same name already exists." }, From 68c9f1abd80b3e7f60ffc43d3a102ec2a7692d1f Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 17 Mar 2023 01:28:17 -0400 Subject: [PATCH 099/340] Use `
    • +
    {{end}} -
    + From cab704477251d0940d91462e4f93e4563532c9f3 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 17 Mar 2023 09:01:47 -0400 Subject: [PATCH 100/340] Increase horizontal page padding (#23507) (#23537) Backport #23507 by @silverwind Add a bit more empty space on left and right side of page content for a more pleasant viewing experience. Also tweaked the mobile navbar to match. Before: Screenshot 2023-03-16 at 00 58 23 After: Screenshot 2023-03-16 at 00 58 37 Mobile Navbar: Screenshot 2023-03-16 at 01 05 12 Co-authored-by: silverwind --- web_src/css/base.css | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/web_src/css/base.css b/web_src/css/base.css index 2e6281391fd8..275cd1cce448 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -1231,7 +1231,7 @@ a.ui.card:hover, /* enable fluid page widths for medium size viewports */ @media (min-width: 768px) and (max-width: 1200px) { .ui.ui.ui.container:not(.fluid) { - width: calc(100vw - 3em); + width: calc(100vw - 64px); } } @@ -1285,7 +1285,14 @@ a.ui.card:hover, .following.bar #navbar { width: 100vw; min-height: 52px; - padding: 0 0.5rem; + padding: 0 16px; +} + +@media (max-width: 767px) { + .following.bar #navbar { + padding-left: 4px; + padding-right: 0; + } } .following.bar #navbar .brand { @@ -1491,7 +1498,7 @@ a.ui.card:hover, } .ui.container.fluid.padded { - padding: 0 10px; + padding: 0 32px; } .ui.form .ui.button { From bd1a915bdbaf464266ed00221f539187d233bfbc Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 17 Mar 2023 11:39:31 -0400 Subject: [PATCH 101/340] Use octicon-verified for gpg signatures (#23529) (#23536) Backport #23529 by @silverwind Before: Screenshot 2023-03-16 at 23 40 47 Screenshot 2023-03-16 at 23 51 05 After: Screenshot 2023-03-16 at 23 40 37 image Co-authored-by: silverwind Co-authored-by: KN4CK3R Co-authored-by: Lunny Xiao --- templates/repo/commit_page.tmpl | 10 +++++----- templates/user/settings/keys_gpg.tmpl | 2 +- templates/user/settings/keys_ssh.tmpl | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index 028fdc7e5148..ac2dde419242 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -216,7 +216,7 @@
    {{if .Verification.Verified}} {{if ne .Verification.SigningUser.ID 0}} - {{svg "octicon-shield-check" 16 "gt-mr-3"}} + {{svg "octicon-verified" 16 "gt-mr-3"}} {{if .Verification.SigningSSHKey}} {{.locale.Tr "repo.commits.ssh_key_fingerprint"}}: {{.Verification.SigningSSHKey.Fingerprint}} @@ -225,7 +225,7 @@ {{.Verification.SigningKey.PaddedKeyID}} {{end}} {{else}} - {{svg "octicon-shield-lock" 16 "gt-mr-3"}} + {{svg "octicon-unverified" 16 "gt-mr-3"}} {{if .Verification.SigningSSHKey}} {{.locale.Tr "repo.commits.ssh_key_fingerprint"}}: {{.Verification.SigningSSHKey.Fingerprint}} @@ -235,7 +235,7 @@ {{end}} {{end}} {{else if .Verification.Warning}} - {{svg "octicon-shield" 16 "gt-mr-3"}} + {{svg "octicon-unverified" 16 "gt-mr-3"}} {{if .Verification.SigningSSHKey}} {{.locale.Tr "repo.commits.ssh_key_fingerprint"}}: {{.Verification.SigningSSHKey.Fingerprint}} @@ -246,14 +246,14 @@ {{else}} {{if .Verification.SigningKey}} {{if ne .Verification.SigningKey.KeyID ""}} - {{svg "octicon-shield" 16 "gt-mr-3"}} + {{svg "octicon-verified" 16 "gt-mr-3"}} {{.locale.Tr "repo.commits.gpg_key_id"}}: {{.Verification.SigningKey.PaddedKeyID}} {{end}} {{end}} {{if .Verification.SigningSSHKey}} {{if ne .Verification.SigningSSHKey.Fingerprint ""}} - {{svg "octicon-shield" 16 "gt-mr-3"}} + {{svg "octicon-verified" 16 "gt-mr-3"}} {{.locale.Tr "repo.commits.ssh_key_fingerprint"}}: {{.Verification.SigningSSHKey.Fingerprint}} {{end}} diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl index c80890940a44..2374b2a01e9e 100644 --- a/templates/user/settings/keys_gpg.tmpl +++ b/templates/user/settings/keys_gpg.tmpl @@ -58,7 +58,7 @@
    {{if .Verified}} - {{svg "octicon-shield-check"}} {{$.locale.Tr "settings.gpg_key_verified"}} + {{svg "octicon-verified"}} {{$.locale.Tr "settings.gpg_key_verified"}} {{end}} {{if gt (len .Emails) 0}} {{svg "octicon-mail"}} {{$.locale.Tr "settings.gpg_key_matched_identities"}} {{range .Emails}}{{.Email}} {{end}} diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl index 891959d35145..691d288b057e 100644 --- a/templates/user/settings/keys_ssh.tmpl +++ b/templates/user/settings/keys_ssh.tmpl @@ -51,7 +51,7 @@
    {{if .Verified}} - {{svg "octicon-shield-check"}} {{$.locale.Tr "settings.ssh_key_verified"}} + {{svg "octicon-verified"}} {{$.locale.Tr "settings.ssh_key_verified"}} {{end}} {{.Name}}
    From 09824025f700aae11fee77c5742e65e96d15a085 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sat, 18 Mar 2023 00:16:22 +0800 Subject: [PATCH 102/340] Refactor merge/update git command calls (#23366) (#23544) Backport #23366 * Remove unnecessary ToTrustedCmdArgs calls * The `signArg` couldn't be empty, it's either `-S{keyID}` or `--no-gpg-sign`. --- modules/git/command.go | 2 +- services/pull/merge.go | 9 ++++++-- services/pull/merge_prepare.go | 19 +++++------------ services/pull/merge_squash.go | 38 ++++++++++++++-------------------- 4 files changed, 29 insertions(+), 39 deletions(-) diff --git a/modules/git/command.go b/modules/git/command.go index 0bc8103116a0..9a65279a8cb5 100644 --- a/modules/git/command.go +++ b/modules/git/command.go @@ -179,7 +179,7 @@ func (c *Command) AddDashesAndList(list ...string) *Command { } // ToTrustedCmdArgs converts a list of strings (trusted as argument) to TrustedCmdArgs -// In most cases, it shouldn't be used. Use AddXxx function instead +// In most cases, it shouldn't be used. Use NewCommand().AddXxx() function instead func ToTrustedCmdArgs(args []string) TrustedCmdArgs { ret := make(TrustedCmdArgs, len(args)) for i, arg := range args { diff --git a/services/pull/merge.go b/services/pull/merge.go index afa924fc109a..12e01e8ce74a 100644 --- a/services/pull/merge.go +++ b/services/pull/merge.go @@ -332,8 +332,13 @@ func doMergeAndPush(ctx context.Context, pr *issues_model.PullRequest, doer *use } func commitAndSignNoAuthor(ctx *mergeContext, message string) error { - if err := git.NewCommand(ctx, "commit").AddArguments(ctx.signArg...).AddOptionFormat("--message=%s", message). - Run(ctx.RunOpts()); err != nil { + cmdCommit := git.NewCommand(ctx, "commit").AddOptionFormat("--message=%s", message) + if ctx.signKeyID == "" { + cmdCommit.AddArguments("--no-gpg-sign") + } else { + cmdCommit.AddOptionFormat("-S%s", ctx.signKeyID) + } + if err := cmdCommit.Run(ctx.RunOpts()); err != nil { log.Error("git commit %-v: %v\n%s\n%s", ctx.pr, err, ctx.outbuf.String(), ctx.errbuf.String()) return fmt.Errorf("git commit %v: %w\n%s\n%s", ctx.pr, err, ctx.outbuf.String(), ctx.errbuf.String()) } diff --git a/services/pull/merge_prepare.go b/services/pull/merge_prepare.go index 2ba821961a2b..88f6c037ebc9 100644 --- a/services/pull/merge_prepare.go +++ b/services/pull/merge_prepare.go @@ -28,7 +28,7 @@ type mergeContext struct { doer *user_model.User sig *git.Signature committer *git.Signature - signArg git.TrustedCmdArgs + signKeyID string // empty for no-sign, non-empty to sign env []string } @@ -85,12 +85,10 @@ func createTemporaryRepoForMerge(ctx context.Context, pr *issues_model.PullReque // Determine if we should sign sign, keyID, signer, _ := asymkey_service.SignMerge(ctx, mergeCtx.pr, mergeCtx.doer, mergeCtx.tmpBasePath, "HEAD", trackingBranch) if sign { - mergeCtx.signArg = git.ToTrustedCmdArgs([]string{"-S" + keyID}) + mergeCtx.signKeyID = keyID if pr.BaseRepo.GetTrustModel() == repo_model.CommitterTrustModel || pr.BaseRepo.GetTrustModel() == repo_model.CollaboratorCommitterTrustModel { mergeCtx.committer = signer } - } else { - mergeCtx.signArg = git.ToTrustedCmdArgs([]string{"--no-gpg-sign"}) } commitTimeStr := time.Now().Format(time.RFC3339) @@ -136,18 +134,11 @@ func prepareTemporaryRepoForMerge(ctx *mergeContext) error { return fmt.Errorf("Unable to close .git/info/sparse-checkout file in tmpBasePath: %w", err) } - gitConfigCommand := func() *git.Command { - return git.NewCommand(ctx, "config", "--local") - } - setConfig := func(key, value string) error { - if err := gitConfigCommand().AddArguments(git.ToTrustedCmdArgs([]string{key, value})...). + if err := git.NewCommand(ctx, "config", "--local").AddDynamicArguments(key, value). Run(ctx.RunOpts()); err != nil { - if value == "" { - value = "<>" - } - log.Error("git config [%s -> %s ]: %v\n%s\n%s", key, value, err, ctx.outbuf.String(), ctx.errbuf.String()) - return fmt.Errorf("git config [%s -> %s ]: %w\n%s\n%s", key, value, err, ctx.outbuf.String(), ctx.errbuf.String()) + log.Error("git config [%s -> %q]: %v\n%s\n%s", key, value, err, ctx.outbuf.String(), ctx.errbuf.String()) + return fmt.Errorf("git config [%s -> %q]: %w\n%s\n%s", key, value, err, ctx.outbuf.String(), ctx.errbuf.String()) } ctx.outbuf.Reset() ctx.errbuf.Reset() diff --git a/services/pull/merge_squash.go b/services/pull/merge_squash.go index 0a8cc0167e40..d6e7314988d3 100644 --- a/services/pull/merge_squash.go +++ b/services/pull/merge_squash.go @@ -14,8 +14,8 @@ import ( // doMergeStyleSquash squashes the tracking branch on the current HEAD (=base) func doMergeStyleSquash(ctx *mergeContext, message string) error { - cmd := git.NewCommand(ctx, "merge", "--squash").AddDynamicArguments(trackingBranch) - if err := runMergeCommand(ctx, repo_model.MergeStyleSquash, cmd); err != nil { + cmdMerge := git.NewCommand(ctx, "merge", "--squash").AddDynamicArguments(trackingBranch) + if err := runMergeCommand(ctx, repo_model.MergeStyleSquash, cmdMerge); err != nil { log.Error("%-v Unable to merge --squash tracking into base: %v", ctx.pr, err) return err } @@ -25,27 +25,21 @@ func doMergeStyleSquash(ctx *mergeContext, message string) error { return fmt.Errorf("LoadPoster: %w", err) } sig := ctx.pr.Issue.Poster.NewGitSig() - if len(ctx.signArg) == 0 { - if err := git.NewCommand(ctx, "commit"). - AddOptionFormat("--author='%s <%s>'", sig.Name, sig.Email). - AddOptionFormat("--message=%s", message). - Run(ctx.RunOpts()); err != nil { - log.Error("git commit %-v: %v\n%s\n%s", ctx.pr, err, ctx.outbuf.String(), ctx.errbuf.String()) - return fmt.Errorf("git commit [%s:%s -> %s:%s]: %w\n%s\n%s", ctx.pr.HeadRepo.FullName(), ctx.pr.HeadBranch, ctx.pr.BaseRepo.FullName(), ctx.pr.BaseBranch, err, ctx.outbuf.String(), ctx.errbuf.String()) - } + if setting.Repository.PullRequest.AddCoCommitterTrailers && ctx.committer.String() != sig.String() { + // add trailer + message += fmt.Sprintf("\nCo-authored-by: %s\nCo-committed-by: %s\n", sig.String(), sig.String()) + } + cmdCommit := git.NewCommand(ctx, "commit"). + AddOptionFormat("--author='%s <%s>'", sig.Name, sig.Email). + AddOptionFormat("--message=%s", message) + if ctx.signKeyID == "" { + cmdCommit.AddArguments("--no-gpg-sign") } else { - if setting.Repository.PullRequest.AddCoCommitterTrailers && ctx.committer.String() != sig.String() { - // add trailer - message += fmt.Sprintf("\nCo-authored-by: %s\nCo-committed-by: %s\n", sig.String(), sig.String()) - } - if err := git.NewCommand(ctx, "commit"). - AddArguments(ctx.signArg...). - AddOptionFormat("--author='%s <%s>'", sig.Name, sig.Email). - AddOptionFormat("--message=%s", message). - Run(ctx.RunOpts()); err != nil { - log.Error("git commit %-v: %v\n%s\n%s", ctx.pr, err, ctx.outbuf.String(), ctx.errbuf.String()) - return fmt.Errorf("git commit [%s:%s -> %s:%s]: %w\n%s\n%s", ctx.pr.HeadRepo.FullName(), ctx.pr.HeadBranch, ctx.pr.BaseRepo.FullName(), ctx.pr.BaseBranch, err, ctx.outbuf.String(), ctx.errbuf.String()) - } + cmdCommit.AddOptionFormat("-S%s", ctx.signKeyID) + } + if err := cmdCommit.Run(ctx.RunOpts()); err != nil { + log.Error("git commit %-v: %v\n%s\n%s", ctx.pr, err, ctx.outbuf.String(), ctx.errbuf.String()) + return fmt.Errorf("git commit [%s:%s -> %s:%s]: %w\n%s\n%s", ctx.pr.HeadRepo.FullName(), ctx.pr.HeadBranch, ctx.pr.BaseRepo.FullName(), ctx.pr.BaseBranch, err, ctx.outbuf.String(), ctx.errbuf.String()) } ctx.outbuf.Reset() ctx.errbuf.Reset() From 1254fc668a8253ac4e4f7ce5193f49a02b1340ad Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sat, 18 Mar 2023 02:00:17 +0800 Subject: [PATCH 103/340] Fix review comment context menu clipped bug (#23523) (#23543) Backport #23523, Close #23517 There is no "dropdown menu" for image/csv view, so we could only add the "overflow-x: scroll" to the image/csv view. Co-authored-by: KN4CK3R Co-authored-by: techknowlogick --- templates/repo/diff/box.tmpl | 3 ++- web_src/css/helpers.css | 1 + web_src/css/repository.css | 4 ---- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index afd471368fa8..38c18b6566c5 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -161,7 +161,8 @@ {{end}}
    {{if $showFileViewToggle}} -
    + {{/* for image or CSV, it can have a horizontal scroll bar, there won't be review comment context menu (position absolute) which would be clipped by "overflow" */}} +
    {{if $isImage}} {{template "repo/diff/image_diff" dict "file" . "root" $ "blobBase" $blobBase "blobHead" $blobHead}} diff --git a/web_src/css/helpers.css b/web_src/css/helpers.css index 9e974b9ea1b0..1c02de2d7a0b 100644 --- a/web_src/css/helpers.css +++ b/web_src/css/helpers.css @@ -22,6 +22,7 @@ /* below class names match Tailwind CSS */ .gt-pointer-events-none { pointer-events: none !important; } .gt-relative { position: relative !important; } +.gt-overflow-x-scroll { overflow-x: scroll !important; } .gt-mono { font-family: var(--fonts-monospace) !important; diff --git a/web_src/css/repository.css b/web_src/css/repository.css index ad2ac49b9984..8e3788b80495 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -3337,10 +3337,6 @@ td.blob-excerpt { min-width: 100px; } -.diff-file-body { - overflow-x: scroll; -} - .diff-stats-bar { display: inline-block; background-color: var(--color-red); From 4b763d8d37628f49c610760fd694540cab3b2ceb Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 17 Mar 2023 14:52:04 -0400 Subject: [PATCH 104/340] Fix diff detail buttons wrapping, use tippy for review box (#23271) (#23546) Backport #23271 by @silverwind Fix visual regression introduced by https://github.com/go-gitea/gitea/pull/22986. Before: image image After: image image Co-authored-by: silverwind --- templates/repo/diff/box.tmpl | 2 +- templates/repo/diff/new_review.tmpl | 2 +- web_src/css/review.css | 12 ++++-------- web_src/js/features/repo-issue.js | 23 +++++++++++++++++------ 4 files changed, 23 insertions(+), 16 deletions(-) diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 38c18b6566c5..297b62edd96c 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -24,7 +24,7 @@ {{svg "octicon-diff" 16 "gt-mr-2"}}{{.locale.Tr "repo.diff.stats_desc" .Diff.NumFiles .Diff.TotalAddition .Diff.TotalDeletion | Str2html}} -
    +
    {{if and .PageIsPullFiles $.SignedUserID (not .IsArchived)}}
    - diff --git a/web_src/css/user.css b/web_src/css/user.css index adf865496be3..c2e08a26857d 100644 --- a/web_src/css/user.css +++ b/web_src/css/user.css @@ -85,27 +85,6 @@ padding: 8px 15px; } -.user.notification .svg { - float: left; - font-size: 2em; -} - -.user.notification .svg.green { - color: var(--color-green); -} - -.user.notification .svg.red { - color: var(--color-red); -} - -.user.notification .svg.purple { - color: var(--color-purple); -} - -.user.notification .svg.blue { - color: var(--color-blue); -} - .user.notification .content { float: left; margin-left: 7px; @@ -170,4 +149,13 @@ #notification_div .tab.segment { overflow-x: auto; + padding: 0; +} + +#notification_div .menu .active.item { + background: var(--color-box-body); +} + +#notification_table { + border: none; } From 774b37b9f8a0d08d2cbd279b4067479fb177fb39 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 22 Mar 2023 19:56:20 +0800 Subject: [PATCH 120/340] Introduce path Clean/Join helper functions, partially backport&refactor (#23495) (#23607) Backport #23495, partially backport&refactor The `modules/options` files are just copied from 1.20 to 1.19 --- modules/options/base.go | 95 +++++++++++++++++++++++++++++++++ modules/options/dynamic.go | 104 ++----------------------------------- modules/options/static.go | 75 ++++---------------------- modules/util/path.go | 92 +++++++++++++++++++++++++++++--- modules/util/path_test.go | 74 ++++++++++++++++++++++++++ 5 files changed, 269 insertions(+), 171 deletions(-) diff --git a/modules/options/base.go b/modules/options/base.go index 039e934b3a4d..7882ed008159 100644 --- a/modules/options/base.go +++ b/modules/options/base.go @@ -9,9 +9,52 @@ import ( "os" "path/filepath" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" ) +var directories = make(directorySet) + +// Locale reads the content of a specific locale from static/bindata or custom path. +func Locale(name string) ([]byte, error) { + return fileFromOptionsDir("locale", name) +} + +// Readme reads the content of a specific readme from static/bindata or custom path. +func Readme(name string) ([]byte, error) { + return fileFromOptionsDir("readme", name) +} + +// Gitignore reads the content of a gitignore locale from static/bindata or custom path. +func Gitignore(name string) ([]byte, error) { + return fileFromOptionsDir("gitignore", name) +} + +// License reads the content of a specific license from static/bindata or custom path. +func License(name string) ([]byte, error) { + return fileFromOptionsDir("license", name) +} + +// Labels reads the content of a specific labels from static/bindata or custom path. +func Labels(name string) ([]byte, error) { + return fileFromOptionsDir("label", name) +} + +// WalkLocales reads the content of a specific locale +func WalkLocales(callback func(path, name string, d fs.DirEntry, err error) error) error { + if IsDynamic() { + if err := walkAssetDir(filepath.Join(setting.StaticRootPath, "options", "locale"), callback); err != nil && !os.IsNotExist(err) { + return fmt.Errorf("failed to walk locales. Error: %w", err) + } + } + + if err := walkAssetDir(filepath.Join(setting.CustomPath, "options", "locale"), callback); err != nil && !os.IsNotExist(err) { + return fmt.Errorf("failed to walk locales. Error: %w", err) + } + return nil +} + func walkAssetDir(root string, callback func(path, name string, d fs.DirEntry, err error) error) error { if err := filepath.WalkDir(root, func(path string, d fs.DirEntry, err error) error { // name is the path relative to the root @@ -37,3 +80,55 @@ func walkAssetDir(root string, callback func(path, name string, d fs.DirEntry, e } return nil } + +// mustLocalPathAbs coverts a path to absolute path +// FIXME: the old behavior (StaticRootPath might not be absolute), not ideal, just keep the same as before +func mustLocalPathAbs(s string) string { + abs, err := filepath.Abs(s) + if err != nil { + // This should never happen in a real system. If it happens, the user must have already been in trouble: the system is not able to resolve its own paths. + log.Fatal("Unable to get absolute path for %q: %v", s, err) + } + return abs +} + +func joinLocalPaths(baseDirs []string, subDir string, elems ...string) (paths []string) { + abs := make([]string, len(elems)+2) + abs[1] = subDir + copy(abs[2:], elems) + for _, baseDir := range baseDirs { + abs[0] = mustLocalPathAbs(baseDir) + paths = append(paths, util.FilePathJoinAbs(abs...)) + } + return paths +} + +func listLocalDirIfExist(baseDirs []string, subDir string, elems ...string) (files []string, err error) { + for _, localPath := range joinLocalPaths(baseDirs, subDir, elems...) { + isDir, err := util.IsDir(localPath) + if err != nil { + return nil, fmt.Errorf("unable to check if path %q is a directory. %w", localPath, err) + } else if !isDir { + continue + } + + dirFiles, err := util.StatDir(localPath, true) + if err != nil { + return nil, fmt.Errorf("unable to read directory %q. %w", localPath, err) + } + files = append(files, dirFiles...) + } + return files, nil +} + +func readLocalFile(baseDirs []string, subDir string, elems ...string) ([]byte, error) { + for _, localPath := range joinLocalPaths(baseDirs, subDir, elems...) { + data, err := os.ReadFile(localPath) + if err == nil { + return data, nil + } else if !os.IsNotExist(err) { + log.Error("Unable to read file %q. Error: %v", localPath, err) + } + } + return nil, os.ErrNotExist +} diff --git a/modules/options/dynamic.go b/modules/options/dynamic.go index a20253676e67..3d6261983f2d 100644 --- a/modules/options/dynamic.go +++ b/modules/options/dynamic.go @@ -6,120 +6,26 @@ package options import ( - "fmt" - "io/fs" - "os" - "path" - "path/filepath" - - "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" - "code.gitea.io/gitea/modules/util" ) -var directories = make(directorySet) - // Dir returns all files from static or custom directory. func Dir(name string) ([]string, error) { if directories.Filled(name) { return directories.Get(name), nil } - var result []string - - customDir := path.Join(setting.CustomPath, "options", name) - - isDir, err := util.IsDir(customDir) - if err != nil { - return []string{}, fmt.Errorf("Unabe to check if custom directory %s is a directory. %w", customDir, err) - } - if isDir { - files, err := util.StatDir(customDir, true) - if err != nil { - return []string{}, fmt.Errorf("Failed to read custom directory. %w", err) - } - - result = append(result, files...) - } - - staticDir := path.Join(setting.StaticRootPath, "options", name) - - isDir, err = util.IsDir(staticDir) + result, err := listLocalDirIfExist([]string{setting.CustomPath, setting.StaticRootPath}, "options", name) if err != nil { - return []string{}, fmt.Errorf("unable to check if static directory %s is a directory. %w", staticDir, err) - } - if isDir { - files, err := util.StatDir(staticDir, true) - if err != nil { - return []string{}, fmt.Errorf("Failed to read static directory. %w", err) - } - - result = append(result, files...) + return nil, err } return directories.AddAndGet(name, result), nil } -// Locale reads the content of a specific locale from static or custom path. -func Locale(name string) ([]byte, error) { - return fileFromDir(path.Join("locale", name)) -} - -// WalkLocales reads the content of a specific locale from static or custom path. -func WalkLocales(callback func(path, name string, d fs.DirEntry, err error) error) error { - if err := walkAssetDir(filepath.Join(setting.StaticRootPath, "options", "locale"), callback); err != nil && !os.IsNotExist(err) { - return fmt.Errorf("failed to walk locales. Error: %w", err) - } - - if err := walkAssetDir(filepath.Join(setting.CustomPath, "options", "locale"), callback); err != nil && !os.IsNotExist(err) { - return fmt.Errorf("failed to walk locales. Error: %w", err) - } - return nil -} - -// Readme reads the content of a specific readme from static or custom path. -func Readme(name string) ([]byte, error) { - return fileFromDir(path.Join("readme", name)) -} - -// Gitignore reads the content of a specific gitignore from static or custom path. -func Gitignore(name string) ([]byte, error) { - return fileFromDir(path.Join("gitignore", name)) -} - -// License reads the content of a specific license from static or custom path. -func License(name string) ([]byte, error) { - return fileFromDir(path.Join("license", name)) -} - -// Labels reads the content of a specific labels from static or custom path. -func Labels(name string) ([]byte, error) { - return fileFromDir(path.Join("label", name)) -} - -// fileFromDir is a helper to read files from static or custom path. -func fileFromDir(name string) ([]byte, error) { - customPath := path.Join(setting.CustomPath, "options", name) - - isFile, err := util.IsFile(customPath) - if err != nil { - log.Error("Unable to check if %s is a file. Error: %v", customPath, err) - } - if isFile { - return os.ReadFile(customPath) - } - - staticPath := path.Join(setting.StaticRootPath, "options", name) - - isFile, err = util.IsFile(staticPath) - if err != nil { - log.Error("Unable to check if %s is a file. Error: %v", staticPath, err) - } - if isFile { - return os.ReadFile(staticPath) - } - - return []byte{}, fmt.Errorf("Asset file does not exist: %s", name) +// fileFromOptionsDir is a helper to read files from custom or static path. +func fileFromOptionsDir(elems ...string) ([]byte, error) { + return readLocalFile([]string{setting.CustomPath, setting.StaticRootPath}, "options", elems...) } // IsDynamic will return false when using embedded data (-tags bindata) diff --git a/modules/options/static.go b/modules/options/static.go index ff3c86d3f84f..0482dea6817c 100644 --- a/modules/options/static.go +++ b/modules/options/static.go @@ -8,38 +8,20 @@ package options import ( "fmt" "io" - "io/fs" - "os" - "path" - "path/filepath" - "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" ) -var directories = make(directorySet) - -// Dir returns all files from bindata or custom directory. +// Dir returns all files from custom directory or bindata. func Dir(name string) ([]string, error) { if directories.Filled(name) { return directories.Get(name), nil } - var result []string - - customDir := path.Join(setting.CustomPath, "options", name) - isDir, err := util.IsDir(customDir) + result, err := listLocalDirIfExist([]string{setting.CustomPath}, "options", name) if err != nil { - return []string{}, fmt.Errorf("unable to check if custom directory %q is a directory. %w", customDir, err) - } - if isDir { - files, err := util.StatDir(customDir, true) - if err != nil { - return []string{}, fmt.Errorf("unable to read custom directory %q. %w", customDir, err) - } - - result = append(result, files...) + return nil, err } files, err := AssetDir(name) @@ -69,57 +51,18 @@ func AssetDir(dirName string) ([]string, error) { return results, nil } -// Locale reads the content of a specific locale from bindata or custom path. -func Locale(name string) ([]byte, error) { - return fileFromDir(path.Join("locale", name)) -} - -// WalkLocales reads the content of a specific locale from static or custom path. -func WalkLocales(callback func(path, name string, d fs.DirEntry, err error) error) error { - if err := walkAssetDir(filepath.Join(setting.CustomPath, "options", "locale"), callback); err != nil && !os.IsNotExist(err) { - return fmt.Errorf("failed to walk locales. Error: %w", err) +// fileFromOptionsDir is a helper to read files from custom path or bindata. +func fileFromOptionsDir(elems ...string) ([]byte, error) { + // only try custom dir, no static dir + if data, err := readLocalFile([]string{setting.CustomPath}, "options", elems...); err == nil { + return data, nil } - return nil -} -// Readme reads the content of a specific readme from bindata or custom path. -func Readme(name string) ([]byte, error) { - return fileFromDir(path.Join("readme", name)) -} - -// Gitignore reads the content of a gitignore locale from bindata or custom path. -func Gitignore(name string) ([]byte, error) { - return fileFromDir(path.Join("gitignore", name)) -} - -// License reads the content of a specific license from bindata or custom path. -func License(name string) ([]byte, error) { - return fileFromDir(path.Join("license", name)) -} - -// Labels reads the content of a specific labels from static or custom path. -func Labels(name string) ([]byte, error) { - return fileFromDir(path.Join("label", name)) -} - -// fileFromDir is a helper to read files from bindata or custom path. -func fileFromDir(name string) ([]byte, error) { - customPath := path.Join(setting.CustomPath, "options", name) - - isFile, err := util.IsFile(customPath) - if err != nil { - log.Error("Unable to check if %s is a file. Error: %v", customPath, err) - } - if isFile { - return os.ReadFile(customPath) - } - - f, err := Assets.Open(name) + f, err := Assets.Open(util.PathJoinRelX(elems...)) if err != nil { return nil, err } defer f.Close() - return io.ReadAll(f) } diff --git a/modules/util/path.go b/modules/util/path.go index 74acb7a85fd8..37d06e9813e0 100644 --- a/modules/util/path.go +++ b/modules/util/path.go @@ -5,6 +5,7 @@ package util import ( "errors" + "fmt" "net/url" "os" "path" @@ -14,13 +15,92 @@ import ( "strings" ) -// EnsureAbsolutePath ensure that a path is absolute, making it -// relative to absoluteBase if necessary -func EnsureAbsolutePath(path, absoluteBase string) string { - if filepath.IsAbs(path) { - return path +// PathJoinRel joins the path elements into a single path, each element is cleaned by path.Clean separately. +// It only returns the following values (like path.Join), any redundant part (empty, relative dots, slashes) is removed. +// It's caller's duty to make every element not bypass its own directly level, to avoid security issues. +// +// empty => `` +// `` => `` +// `..` => `.` +// `dir` => `dir` +// `/dir/` => `dir` +// `foo\..\bar` => `foo\..\bar` +// {`foo`, ``, `bar`} => `foo/bar` +// {`foo`, `..`, `bar`} => `foo/bar` +func PathJoinRel(elem ...string) string { + elems := make([]string, len(elem)) + for i, e := range elem { + if e == "" { + continue + } + elems[i] = path.Clean("/" + e) + } + p := path.Join(elems...) + if p == "" { + return "" + } else if p == "/" { + return "." + } else { + return p[1:] + } +} + +// PathJoinRelX joins the path elements into a single path like PathJoinRel, +// and covert all backslashes to slashes. (X means "extended", also means the combination of `\` and `/`). +// It's caller's duty to make every element not bypass its own directly level, to avoid security issues. +// It returns similar results as PathJoinRel except: +// +// `foo\..\bar` => `bar` (because it's processed as `foo/../bar`) +// +// All backslashes are handled as slashes, the result only contains slashes. +func PathJoinRelX(elem ...string) string { + elems := make([]string, len(elem)) + for i, e := range elem { + if e == "" { + continue + } + elems[i] = path.Clean("/" + strings.ReplaceAll(e, "\\", "/")) + } + return PathJoinRel(elems...) +} + +const pathSeparator = string(os.PathSeparator) + +// FilePathJoinAbs joins the path elements into a single file path, each element is cleaned by filepath.Clean separately. +// All slashes/backslashes are converted to path separators before cleaning, the result only contains path separators. +// The first element must be an absolute path, caller should prepare the base path. +// It's caller's duty to make every element not bypass its own directly level, to avoid security issues. +// Like PathJoinRel, any redundant part (empty, relative dots, slashes) is removed. +// +// {`/foo`, ``, `bar`} => `/foo/bar` +// {`/foo`, `..`, `bar`} => `/foo/bar` +func FilePathJoinAbs(elem ...string) string { + elems := make([]string, len(elem)) + + // POISX filesystem can have `\` in file names. Windows: `\` and `/` are both used for path separators + // to keep the behavior consistent, we do not allow `\` in file names, replace all `\` with `/` + if isOSWindows() { + elems[0] = filepath.Clean(elem[0]) + } else { + elems[0] = filepath.Clean(strings.ReplaceAll(elem[0], "\\", pathSeparator)) + } + if !filepath.IsAbs(elems[0]) { + // This shouldn't happen. If there is really necessary to pass in relative path, return the full path with filepath.Abs() instead + panic(fmt.Sprintf("FilePathJoinAbs: %q (for path %v) is not absolute, do not guess a relative path based on current working directory", elems[0], elems)) + } + + for i := 1; i < len(elem); i++ { + if elem[i] == "" { + continue + } + if isOSWindows() { + elems[i] = filepath.Clean(pathSeparator + elem[i]) + } else { + elems[i] = filepath.Clean(pathSeparator + strings.ReplaceAll(elem[i], "\\", pathSeparator)) + } } - return filepath.Join(absoluteBase, path) + // the elems[0] must be an absolute path, just join them together + return filepath.Join(elems...) } // IsDir returns true if given path is a directory, diff --git a/modules/util/path_test.go b/modules/util/path_test.go index 93f4f67cf648..1d27c9bf0c0f 100644 --- a/modules/util/path_test.go +++ b/modules/util/path_test.go @@ -136,3 +136,77 @@ func TestMisc_IsReadmeFileName(t *testing.T) { assert.Equal(t, testCase.idx, idx) } } + +func TestCleanPath(t *testing.T) { + cases := []struct { + elems []string + expected string + }{ + {[]string{}, ``}, + {[]string{``}, ``}, + {[]string{`..`}, `.`}, + {[]string{`a`}, `a`}, + {[]string{`/a/`}, `a`}, + {[]string{`../a/`, `../b`, `c/..`, `d`}, `a/b/d`}, + {[]string{`a\..\b`}, `a\..\b`}, + {[]string{`a`, ``, `b`}, `a/b`}, + {[]string{`a`, `..`, `b`}, `a/b`}, + {[]string{`lfs`, `repo/..`, `user/../path`}, `lfs/path`}, + } + for _, c := range cases { + assert.Equal(t, c.expected, PathJoinRel(c.elems...), "case: %v", c.elems) + } + + cases = []struct { + elems []string + expected string + }{ + {[]string{}, ``}, + {[]string{``}, ``}, + {[]string{`..`}, `.`}, + {[]string{`a`}, `a`}, + {[]string{`/a/`}, `a`}, + {[]string{`../a/`, `../b`, `c/..`, `d`}, `a/b/d`}, + {[]string{`a\..\b`}, `b`}, + {[]string{`a`, ``, `b`}, `a/b`}, + {[]string{`a`, `..`, `b`}, `a/b`}, + {[]string{`lfs`, `repo/..`, `user/../path`}, `lfs/path`}, + } + for _, c := range cases { + assert.Equal(t, c.expected, PathJoinRelX(c.elems...), "case: %v", c.elems) + } + + // for POSIX only, but the result is similar on Windows, because the first element must be an absolute path + if isOSWindows() { + cases = []struct { + elems []string + expected string + }{ + {[]string{`C:\..`}, `C:\`}, + {[]string{`C:\a`}, `C:\a`}, + {[]string{`C:\a/`}, `C:\a`}, + {[]string{`C:\..\a\`, `../b`, `c\..`, `d`}, `C:\a\b\d`}, + {[]string{`C:\a/..\b`}, `C:\b`}, + {[]string{`C:\a`, ``, `b`}, `C:\a\b`}, + {[]string{`C:\a`, `..`, `b`}, `C:\a\b`}, + {[]string{`C:\lfs`, `repo/..`, `user/../path`}, `C:\lfs\path`}, + } + } else { + cases = []struct { + elems []string + expected string + }{ + {[]string{`/..`}, `/`}, + {[]string{`/a`}, `/a`}, + {[]string{`/a/`}, `/a`}, + {[]string{`/../a/`, `../b`, `c/..`, `d`}, `/a/b/d`}, + {[]string{`/a\..\b`}, `/b`}, + {[]string{`/a`, ``, `b`}, `/a/b`}, + {[]string{`/a`, `..`, `b`}, `/a/b`}, + {[]string{`/lfs`, `repo/..`, `user/../path`}, `/lfs/path`}, + } + } + for _, c := range cases { + assert.Equal(t, c.expected, FilePathJoinAbs(c.elems...), "case: %v", c.elems) + } +} From 622d21691cc21a42b727937b50cef74cf775b8ce Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 22 Mar 2023 21:32:27 +0100 Subject: [PATCH 121/340] Fix diff tree height and adjust target file style (#23616) Extract from https://github.com/go-gitea/gitea/pull/23553, just the parts that fix the diff tree height and the change to the file `:target` style. Fixes: https://github.com/go-gitea/gitea/issues/23593 --- web_src/css/repository.css | 32 ++++++++++++++++++++++++++------ web_src/css/review.css | 8 -------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/web_src/css/repository.css b/web_src/css/repository.css index b71d552a1fb3..e84e80b679a3 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -1611,14 +1611,12 @@ padding: 7px 0; background: var(--color-body); line-height: 30px; - height: 47px; /* match .ui.attached.header.diff-file-header.sticky-2nd-row */ } @media (max-width: 991px) { .repository .diff-detail-box { flex-direction: column; align-items: flex-start; - height: 77px; /* match .ui.attached.header.diff-file-header.sticky-2nd-row */ } } @@ -1674,6 +1672,13 @@ } } +.diff-detail-actions { + /* prevent font-size from increasing element height so that .diff-detail-box comes + out with height of 47px (one line) and 77px (two lines), which is important for + position: sticky */ + height: 33px; +} + .repository .diff-detail-box .diff-detail-actions > * { margin-right: 0; } @@ -1848,10 +1853,24 @@ padding-bottom: 5px; } +.diff-file-box { + border: 1px solid transparent; + border-radius: var(--border-radius); +} + +/* TODO: this can potentially be made "global" by removing the class prefix */ +.diff-file-box .ui.attached.header, +.diff-file-box .ui.attached.table { + margin: 0; /* remove fomantic negative margins */; + width: initial; /* remove fomantic over 100% width */; + max-width: initial; /* remove fomantic over 100% width */; +} + .repository .diff-stats { clear: both; margin-bottom: 5px; - max-height: 400px; + max-height: 200px; + height: fit-content; overflow: auto; padding-left: 0; } @@ -2647,7 +2666,8 @@ filter: drop-shadow(-3px 0 0 var(--color-primary-alpha-30)) !important; } -.code-comment:target { +.code-comment:target, +.diff-file-box:target { border-color: var(--color-primary) !important; border-radius: var(--border-radius) !important; box-shadow: 0 0 0 3px var(--color-primary-alpha-30) !important; @@ -3238,13 +3258,13 @@ td.blob-excerpt { } #diff-file-tree { - width: 20%; + flex: 0 0 20%; max-width: 380px; line-height: inherit; position: sticky; padding-top: 0; top: 47px; - max-height: calc(100vh - 50px); + max-height: calc(100vh - 47px); height: 100%; overflow-y: auto; } diff --git a/web_src/css/review.css b/web_src/css/review.css index 42267b4d2a33..e181d0109b54 100644 --- a/web_src/css/review.css +++ b/web_src/css/review.css @@ -308,11 +308,3 @@ a.blob-excerpt:hover { width: 72px; height: 10px; } - -.diff-file-box { - border-radius: 0.285rem; /* Just like ui.top.attached.header */ -} - -.diff-file-box:target { - box-shadow: 0 0 0 3px var(--color-accent); -} From e7a5429d7a63307bc20ed19592d5d82dd213e5f7 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Thu, 23 Mar 2023 04:34:05 -0400 Subject: [PATCH 122/340] Improve workflow event triggers (#23613) (#23648) --- modules/actions/github.go | 53 ++++++++++++---- modules/actions/github_test.go | 113 +++++++++++++++++++++++++++++++++ modules/actions/workflows.go | 2 +- 3 files changed, 155 insertions(+), 13 deletions(-) create mode 100644 modules/actions/github_test.go diff --git a/modules/actions/github.go b/modules/actions/github.go index bcde9a0f552e..1148554139cd 100644 --- a/modules/actions/github.go +++ b/modules/actions/github.go @@ -5,8 +5,6 @@ package actions import ( webhook_module "code.gitea.io/gitea/modules/webhook" - - "github.com/nektos/act/pkg/jobparser" ) const ( @@ -25,17 +23,48 @@ const ( githubEventPullRequestComment = "pull_request_comment" ) -func convertFromGithubEvent(evt *jobparser.Event) string { - switch evt.Name { - case githubEventPullRequest, githubEventPullRequestTarget, githubEventPullRequestReview, - githubEventPullRequestReviewComment: - return string(webhook_module.HookEventPullRequest) +// canGithubEventMatch check if the input Github event can match any Gitea event. +func canGithubEventMatch(eventName string, triggedEvent webhook_module.HookEventType) bool { + switch eventName { case githubEventRegistryPackage: - return string(webhook_module.HookEventPackage) - case githubEventCreate, githubEventDelete, githubEventFork, githubEventPush, - githubEventIssues, githubEventIssueComment, githubEventRelease, githubEventPullRequestComment: - fallthrough + return triggedEvent == webhook_module.HookEventPackage + + case githubEventIssues: + switch triggedEvent { + case webhook_module.HookEventIssues, + webhook_module.HookEventIssueAssign, + webhook_module.HookEventIssueLabel, + webhook_module.HookEventIssueMilestone: + return true + + default: + return false + } + + case githubEventPullRequest, githubEventPullRequestTarget: + switch triggedEvent { + case webhook_module.HookEventPullRequest, + webhook_module.HookEventPullRequestSync, + webhook_module.HookEventPullRequestAssign, + webhook_module.HookEventPullRequestLabel: + return true + + default: + return false + } + + case githubEventPullRequestReview: + switch triggedEvent { + case webhook_module.HookEventPullRequestReviewApproved, + webhook_module.HookEventPullRequestReviewComment, + webhook_module.HookEventPullRequestReviewRejected: + return true + + default: + return false + } + default: - return evt.Name + return eventName == string(triggedEvent) } } diff --git a/modules/actions/github_test.go b/modules/actions/github_test.go new file mode 100644 index 000000000000..e7f4158ae2d1 --- /dev/null +++ b/modules/actions/github_test.go @@ -0,0 +1,113 @@ +// Copyright 2023 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package actions + +import ( + "testing" + + webhook_module "code.gitea.io/gitea/modules/webhook" + + "github.com/stretchr/testify/assert" +) + +func TestCanGithubEventMatch(t *testing.T) { + testCases := []struct { + desc string + eventName string + triggeredEvent webhook_module.HookEventType + expected bool + }{ + // registry_package event + { + "registry_package matches", + githubEventRegistryPackage, + webhook_module.HookEventPackage, + true, + }, + { + "registry_package cannot match", + githubEventRegistryPackage, + webhook_module.HookEventPush, + false, + }, + // issues event + { + "issue matches", + githubEventIssues, + webhook_module.HookEventIssueLabel, + true, + }, + { + "issue cannot match", + githubEventIssues, + webhook_module.HookEventIssueComment, + false, + }, + // issue_comment event + { + "issue_comment matches", + githubEventIssueComment, + webhook_module.HookEventIssueComment, + true, + }, + { + "issue_comment cannot match", + githubEventIssueComment, + webhook_module.HookEventIssues, + false, + }, + // pull_request event + { + "pull_request matches", + githubEventPullRequest, + webhook_module.HookEventPullRequestSync, + true, + }, + { + "pull_request cannot match", + githubEventPullRequest, + webhook_module.HookEventPullRequestComment, + false, + }, + // pull_request_target event + { + "pull_request_target matches", + githubEventPullRequest, + webhook_module.HookEventPullRequest, + true, + }, + { + "pull_request_target cannot match", + githubEventPullRequest, + webhook_module.HookEventPullRequestComment, + false, + }, + // pull_request_review event + { + "pull_request_review matches", + githubEventPullRequestReview, + webhook_module.HookEventPullRequestReviewComment, + true, + }, + { + "pull_request_review cannot match", + githubEventPullRequestReview, + webhook_module.HookEventPullRequestComment, + false, + }, + // other events + { + "create event", + githubEventCreate, + webhook_module.HookEventCreate, + true, + }, + } + + for _, tc := range testCases { + t.Run(tc.desc, func(t *testing.T) { + assert.Equalf(t, tc.expected, canGithubEventMatch(tc.eventName, tc.triggeredEvent), "canGithubEventMatch(%v, %v)", tc.eventName, tc.triggeredEvent) + }) + } +} diff --git a/modules/actions/workflows.go b/modules/actions/workflows.go index 6f4d98d52d39..7ce05582ea04 100644 --- a/modules/actions/workflows.go +++ b/modules/actions/workflows.go @@ -83,7 +83,7 @@ func DetectWorkflows(commit *git.Commit, triggedEvent webhook_module.HookEventTy } func detectMatched(commit *git.Commit, triggedEvent webhook_module.HookEventType, payload api.Payloader, evt *jobparser.Event) bool { - if convertFromGithubEvent(evt) != string(triggedEvent) { + if !canGithubEventMatch(evt.Name, triggedEvent) { return false } From 162f2841d09a7cfb84458d99cc88b8a0cfc36cf2 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 24 Mar 2023 04:44:09 +0800 Subject: [PATCH 123/340] Rename develop -> development, contribute -> contributing, administer -> administration (#23662) backport #23629 To make versioned documentation less surprising, 1.19 should have the same technology. --- Makefile | 3 +- docs/Makefile | 2 +- docs/config.yaml | 5 ++++ docs/content/doc/administration.en-us.md | 14 +++++++++ ...anced.fr-fr.md => administration.fr-fr.md} | 6 ++-- docs/content/doc/administration.zh-cn.md | 13 ++++++++ docs/content/doc/administration.zh-tw.md | 13 ++++++++ .../adding-legal-pages.en-us.md | 4 +-- .../backup-and-restore.en-us.md | 2 +- .../backup-and-restore.zh-cn.md | 2 +- .../backup-and-restore.zh-tw.md | 2 +- .../cmd-embedded.en-us.md | 8 ++--- .../command-line.en-us.md | 4 +-- .../config-cheat-sheet.en-us.md | 6 ++-- .../config-cheat-sheet.zh-cn.md | 4 +-- .../customizing-gitea.en-us.md | 6 ++-- .../customizing-gitea.zh-cn.md | 4 +-- .../email-setup.en-us.md | 4 +-- .../environment-variables.en-us.md | 4 +-- .../environment-variables.zh-cn.md | 4 +-- .../external-renderers.en-us.md | 4 +-- .../fail2ban-setup.en-us.md | 2 +- .../fail2ban-setup.zh-cn.md | 2 +- .../git-lfs-support.en-us.md | 2 +- .../https-support.en-us.md | 4 +-- .../logging-documentation.en-us.md | 4 +-- .../mail-templates.en-us.md | 2 +- .../repo-indexer.en-us.md | 2 +- .../reverse-proxies.en-us.md | 4 +-- .../reverse-proxies.zh-cn.md | 4 +-- .../search-engines-indexation.en-us.md | 4 +-- .../signing.en-us.md | 4 +-- docs/content/doc/advanced.zh-tw.md | 13 -------- ...slation.en-us.md => contributing.en-us.md} | 8 ++--- ...slation.de-de.md => contributing.fr-fr.md} | 4 +-- ...slation.zh-tw.md => contributing.zh-tw.md} | 8 ++--- .../guidelines-backend.en-us.md | 2 +- .../guidelines-frontend.en-us.md | 2 +- .../guidelines-refactoring.en-us.md | 2 +- .../localization.en-us.md | 2 +- .../localization.zh-cn.md | 2 +- .../localization.zh-tw.md | 2 +- .../translation.de-de.md} | 2 +- .../translation.en-us.md} | 2 +- docs/content/doc/developers.en-us.md | 13 -------- docs/content/doc/developers.zh-cn.md | 13 -------- docs/content/doc/developers.zh-tw.md | 13 -------- docs/content/doc/development.en-us.md | 13 ++++++++ ...advanced.en-us.md => development.zh-cn.md} | 10 +++---- ...advanced.zh-cn.md => development.zh-tw.md} | 10 +++---- .../api-usage.en-us.md | 2 +- .../api-usage.zh-cn.md | 2 +- .../hacking-on-gitea.en-us.md | 8 ++--- .../hacking-on-gitea.zh-cn.md | 6 ++-- .../integrations.en-us.md | 2 +- .../integrations.zh-tw.md | 2 +- .../migrations.en-us.md | 2 +- .../migrations.zh-tw.md | 2 +- .../oauth2-provider.en-us.md | 2 +- .../oauth2-provider.zh-tw.md | 2 +- docs/content/doc/features.en-us.md | 13 -------- docs/content/doc/features.zh-cn.md | 13 -------- docs/content/doc/features.zh-tw.md | 13 -------- docs/content/doc/help.en-us.md | 2 +- docs/content/doc/help.fr-fr.md | 2 +- docs/content/doc/help.zh-cn.md | 2 +- docs/content/doc/help.zh-tw.md | 2 +- docs/content/doc/help/faq.en-us.md | 30 +++++++++---------- .../comparison.en-us.md | 2 +- .../comparison.zh-cn.md | 2 +- .../comparison.zh-tw.md | 2 +- .../database-preparation.en-us.md | 2 +- .../doc/installation/from-binary.en-us.md | 6 ++-- .../doc/installation/from-binary.zh-cn.md | 4 +-- .../doc/installation/from-source.en-us.md | 4 +-- .../upgrade-from-gitea.en-us.md} | 8 ++--- .../upgrade-from-gogs.en-us.md} | 6 ++-- .../upgrade-from-gogs.fr-fr.md} | 4 +-- .../upgrade-from-gogs.zh-cn.md} | 4 +-- .../upgrade-from-gogs.zh-tw.md} | 6 ++-- .../with-docker-rootless.en-us.md | 2 +- .../doc/installation/with-docker.en-us.md | 2 +- .../doc/installation/with-docker.fr-fr.md | 2 +- .../doc/installation/with-docker.zh-cn.md | 2 +- .../doc/installation/with-docker.zh-tw.md | 2 +- docs/content/doc/packages.en-us.md | 9 +++--- docs/content/doc/packages/cargo.en-us.md | 4 +-- docs/content/doc/packages/chef.en-us.md | 2 +- docs/content/doc/packages/composer.en-us.md | 4 +-- docs/content/doc/packages/conan.en-us.md | 4 +-- docs/content/doc/packages/conda.en-us.md | 2 +- docs/content/doc/packages/container.en-us.md | 4 +-- docs/content/doc/packages/generic.en-us.md | 6 ++-- docs/content/doc/packages/helm.en-us.md | 4 +-- docs/content/doc/packages/maven.en-us.md | 4 +-- docs/content/doc/packages/npm.en-us.md | 4 +-- docs/content/doc/packages/nuget.en-us.md | 6 ++-- docs/content/doc/packages/overview.en-us.md | 2 +- docs/content/doc/packages/pub.en-us.md | 4 +-- docs/content/doc/packages/pypi.en-us.md | 4 +-- docs/content/doc/packages/rubygems.en-us.md | 4 +-- docs/content/doc/packages/storage.en-us.md | 6 ++-- docs/content/doc/packages/vagrant.en-us.md | 4 +-- docs/content/doc/upgrade.en-us.md | 13 -------- docs/content/doc/upgrade.fr-fr.md | 13 -------- docs/content/doc/upgrade.zh-cn.md | 13 -------- docs/content/doc/upgrade.zh-tw.md | 13 -------- docs/content/doc/usage.en-us.md | 2 +- docs/content/doc/usage.zh-cn.md | 2 +- docs/content/doc/usage.zh-tw.md | 2 +- .../authentication.en-us.md | 2 +- .../authentication.zh-cn.md | 2 +- .../authentication.zh-tw.md | 2 +- .../{advanced => usage}/clone-filter.en-us.md | 2 +- .../doc/usage/linked-references.en-us.md | 2 +- .../protected-tags.en-us.md | 2 +- .../{advanced => usage}/repo-mirror.en-us.md | 2 +- .../secrets.en-us.md} | 8 ++--- .../doc/{features => usage}/webhooks.en-us.md | 2 +- .../doc/{features => usage}/webhooks.zh-cn.md | 2 +- .../doc/{features => usage}/webhooks.zh-tw.md | 2 +- 121 files changed, 257 insertions(+), 342 deletions(-) create mode 100644 docs/content/doc/administration.en-us.md rename docs/content/doc/{advanced.fr-fr.md => administration.fr-fr.md} (64%) create mode 100644 docs/content/doc/administration.zh-cn.md create mode 100644 docs/content/doc/administration.zh-tw.md rename docs/content/doc/{advanced => administration}/adding-legal-pages.en-us.md (96%) rename docs/content/doc/{usage => administration}/backup-and-restore.en-us.md (99%) rename docs/content/doc/{usage => administration}/backup-and-restore.zh-cn.md (98%) rename docs/content/doc/{usage => administration}/backup-and-restore.zh-tw.md (98%) rename docs/content/doc/{advanced => administration}/cmd-embedded.en-us.md (96%) rename docs/content/doc/{usage => administration}/command-line.en-us.md (99%) rename docs/content/doc/{advanced => administration}/config-cheat-sheet.en-us.md (99%) rename docs/content/doc/{advanced => administration}/config-cheat-sheet.zh-cn.md (99%) rename docs/content/doc/{advanced => administration}/customizing-gitea.en-us.md (97%) rename docs/content/doc/{advanced => administration}/customizing-gitea.zh-cn.md (99%) rename docs/content/doc/{usage => administration}/email-setup.en-us.md (97%) rename docs/content/doc/{advanced => administration}/environment-variables.en-us.md (97%) rename docs/content/doc/{advanced => administration}/environment-variables.zh-cn.md (97%) rename docs/content/doc/{advanced => administration}/external-renderers.en-us.md (99%) rename docs/content/doc/{usage => administration}/fail2ban-setup.en-us.md (99%) rename docs/content/doc/{usage => administration}/fail2ban-setup.zh-cn.md (99%) rename docs/content/doc/{usage => administration}/git-lfs-support.en-us.md (95%) rename docs/content/doc/{usage => administration}/https-support.en-us.md (97%) rename docs/content/doc/{advanced => administration}/logging-documentation.en-us.md (99%) rename docs/content/doc/{advanced => administration}/mail-templates.en-us.md (99%) rename docs/content/doc/{advanced => administration}/repo-indexer.en-us.md (98%) rename docs/content/doc/{usage => administration}/reverse-proxies.en-us.md (99%) rename docs/content/doc/{usage => administration}/reverse-proxies.zh-cn.md (98%) rename docs/content/doc/{advanced => administration}/search-engines-indexation.en-us.md (90%) rename docs/content/doc/{advanced => administration}/signing.en-us.md (99%) delete mode 100644 docs/content/doc/advanced.zh-tw.md rename docs/content/doc/{translation.en-us.md => contributing.en-us.md} (52%) rename docs/content/doc/{translation.de-de.md => contributing.fr-fr.md} (75%) rename docs/content/doc/{translation.zh-tw.md => contributing.zh-tw.md} (55%) rename docs/content/doc/{developers => contributing}/guidelines-backend.en-us.md (99%) rename docs/content/doc/{developers => contributing}/guidelines-frontend.en-us.md (99%) rename docs/content/doc/{developers => contributing}/guidelines-refactoring.en-us.md (98%) rename docs/content/doc/{features => contributing}/localization.en-us.md (97%) rename docs/content/doc/{features => contributing}/localization.zh-cn.md (89%) rename docs/content/doc/{features => contributing}/localization.zh-tw.md (97%) rename docs/content/doc/{translation/guidelines.de-de.md => contributing/translation.de-de.md} (98%) rename docs/content/doc/{translation/guidelines.en-us.md => contributing/translation.en-us.md} (93%) delete mode 100644 docs/content/doc/developers.en-us.md delete mode 100644 docs/content/doc/developers.zh-cn.md delete mode 100644 docs/content/doc/developers.zh-tw.md create mode 100644 docs/content/doc/development.en-us.md rename docs/content/doc/{advanced.en-us.md => development.zh-cn.md} (50%) rename docs/content/doc/{advanced.zh-cn.md => development.zh-tw.md} (50%) rename docs/content/doc/{developers => development}/api-usage.en-us.md (99%) rename docs/content/doc/{developers => development}/api-usage.zh-cn.md (99%) rename docs/content/doc/{developers => development}/hacking-on-gitea.en-us.md (98%) rename docs/content/doc/{developers => development}/hacking-on-gitea.zh-cn.md (98%) rename docs/content/doc/{developers => development}/integrations.en-us.md (97%) rename docs/content/doc/{developers => development}/integrations.zh-tw.md (96%) rename docs/content/doc/{developers => development}/migrations.en-us.md (98%) rename docs/content/doc/{developers => development}/migrations.zh-tw.md (98%) rename docs/content/doc/{developers => development}/oauth2-provider.en-us.md (99%) rename docs/content/doc/{developers => development}/oauth2-provider.zh-tw.md (99%) delete mode 100644 docs/content/doc/features.en-us.md delete mode 100644 docs/content/doc/features.zh-cn.md delete mode 100644 docs/content/doc/features.zh-tw.md rename docs/content/doc/{features => installation}/comparison.en-us.md (99%) rename docs/content/doc/{features => installation}/comparison.zh-cn.md (99%) rename docs/content/doc/{features => installation}/comparison.zh-tw.md (99%) rename docs/content/doc/{upgrade/from-gitea.en-us.md => installation/upgrade-from-gitea.en-us.md} (97%) rename docs/content/doc/{upgrade/from-gogs.en-us.md => installation/upgrade-from-gogs.en-us.md} (98%) rename docs/content/doc/{upgrade/from-gogs.fr-fr.md => installation/upgrade-from-gogs.fr-fr.md} (98%) rename docs/content/doc/{upgrade/from-gogs.zh-cn.md => installation/upgrade-from-gogs.zh-cn.md} (95%) rename docs/content/doc/{upgrade/from-gogs.zh-tw.md => installation/upgrade-from-gogs.zh-tw.md} (98%) delete mode 100644 docs/content/doc/upgrade.en-us.md delete mode 100644 docs/content/doc/upgrade.fr-fr.md delete mode 100644 docs/content/doc/upgrade.zh-cn.md delete mode 100644 docs/content/doc/upgrade.zh-tw.md rename docs/content/doc/{features => usage}/authentication.en-us.md (99%) rename docs/content/doc/{features => usage}/authentication.zh-cn.md (98%) rename docs/content/doc/{features => usage}/authentication.zh-tw.md (90%) rename docs/content/doc/{advanced => usage}/clone-filter.en-us.md (98%) rename docs/content/doc/{advanced => usage}/protected-tags.en-us.md (99%) rename docs/content/doc/{advanced => usage}/repo-mirror.en-us.md (99%) rename docs/content/doc/{secrets/overview.en-us.md => usage/secrets.en-us.md} (91%) rename docs/content/doc/{features => usage}/webhooks.en-us.md (99%) rename docs/content/doc/{features => usage}/webhooks.zh-cn.md (96%) rename docs/content/doc/{features => usage}/webhooks.zh-tw.md (99%) diff --git a/Makefile b/Makefile index a43f53e795e6..cc3b0377a25c 100644 --- a/Makefile +++ b/Makefile @@ -77,6 +77,7 @@ ifeq ($(RACE_ENABLED),true) endif STORED_VERSION_FILE := VERSION +HUGO_VERSION ?= 0.111.3 ifneq ($(DRONE_TAG),) VERSION ?= $(subst v,,$(DRONE_TAG)) @@ -816,7 +817,7 @@ release-docs: | $(DIST_DIRS) docs .PHONY: docs docs: @hash hugo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ - curl -sL https://github.com/gohugoio/hugo/releases/download/v0.74.3/hugo_0.74.3_Linux-64bit.tar.gz | tar zxf - -C /tmp && mv /tmp/hugo /usr/bin/hugo && chmod +x /usr/bin/hugo; \ + curl -sL https://github.com/gohugoio/hugo/releases/download/v$(HUGO_VERSION)/hugo_$(HUGO_VERSION)_Linux-64bit.tar.gz | tar zxf - -C /tmp && mv /tmp/hugo /usr/bin/hugo && chmod +x /usr/bin/hugo; \ fi cd docs; make trans-copy clean build-offline; diff --git a/docs/Makefile b/docs/Makefile index 0178cd3587d2..6a5a374845d3 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -2,7 +2,7 @@ THEME := themes/gitea PUBLIC := public ARCHIVE := https://dl.gitea.com/theme/main.tar.gz -HUGO_PACKAGE := github.com/gohugoio/hugo@v0.82.0 +HUGO_PACKAGE := github.com/gohugoio/hugo@v0.111.3 .PHONY: all all: build diff --git a/docs/config.yaml b/docs/config.yaml index 26f096b1cf3c..fbc4bc9a98e2 100644 --- a/docs/config.yaml +++ b/docs/config.yaml @@ -26,6 +26,11 @@ params: repo: "https://github.com/go-gitea/gitea" docContentPath: "docs/content" +markup: + tableOfContents: + startLevel: 1 + endLevel: 9 + outputs: home: - HTML diff --git a/docs/content/doc/administration.en-us.md b/docs/content/doc/administration.en-us.md new file mode 100644 index 000000000000..5d3ba385d951 --- /dev/null +++ b/docs/content/doc/administration.en-us.md @@ -0,0 +1,14 @@ +--- +date: "2016-12-01T16:00:00+02:00" +title: "Administration" +slug: "administration" +weight: 30 +toc: false +draft: false +menu: + sidebar: + name: "Administration" + weight: 20 + collapse: true + identifier: "administration" +--- diff --git a/docs/content/doc/advanced.fr-fr.md b/docs/content/doc/administration.fr-fr.md similarity index 64% rename from docs/content/doc/advanced.fr-fr.md rename to docs/content/doc/administration.fr-fr.md index 04734a8f81f5..957ff7b1942c 100644 --- a/docs/content/doc/advanced.fr-fr.md +++ b/docs/content/doc/administration.fr-fr.md @@ -1,13 +1,13 @@ --- date: "2017-08-23T09:00:00+02:00" title: "Avancé" -slug: "advanced" +slug: "administration" weight: 30 toc: false draft: false menu: sidebar: name: "Avancé" - weight: 40 - identifier: "advanced" + weight: 20 + identifier: "administration" --- diff --git a/docs/content/doc/administration.zh-cn.md b/docs/content/doc/administration.zh-cn.md new file mode 100644 index 000000000000..6e032d326656 --- /dev/null +++ b/docs/content/doc/administration.zh-cn.md @@ -0,0 +1,13 @@ +--- +date: "2016-12-01T16:00:00+02:00" +title: "运维" +slug: "administration" +weight: 30 +toc: false +draft: false +menu: + sidebar: + name: "运维" + weight: 20 + identifier: "administration" +--- diff --git a/docs/content/doc/administration.zh-tw.md b/docs/content/doc/administration.zh-tw.md new file mode 100644 index 000000000000..daf8e3f1052a --- /dev/null +++ b/docs/content/doc/administration.zh-tw.md @@ -0,0 +1,13 @@ +--- +date: "2016-12-01T16:00:00+02:00" +title: "運維" +slug: "administration" +weight: 30 +toc: false +draft: false +menu: + sidebar: + name: "運維" + weight: 20 + identifier: "administration" +--- diff --git a/docs/content/doc/advanced/adding-legal-pages.en-us.md b/docs/content/doc/administration/adding-legal-pages.en-us.md similarity index 96% rename from docs/content/doc/advanced/adding-legal-pages.en-us.md rename to docs/content/doc/administration/adding-legal-pages.en-us.md index 5816fdbf3fab..9ba8c4fd81c6 100644 --- a/docs/content/doc/advanced/adding-legal-pages.en-us.md +++ b/docs/content/doc/administration/adding-legal-pages.en-us.md @@ -7,10 +7,10 @@ toc: false draft: false menu: sidebar: - parent: "advanced" + parent: "administration" name: "Adding Legal Pages" identifier: "adding-legal-pages" - weight: 9 + weight: 110 --- Some jurisdictions (such as EU), requires certain legal pages (e.g. Privacy Policy) to be added to website. Follow these steps to add them to your Gitea instance. diff --git a/docs/content/doc/usage/backup-and-restore.en-us.md b/docs/content/doc/administration/backup-and-restore.en-us.md similarity index 99% rename from docs/content/doc/usage/backup-and-restore.en-us.md rename to docs/content/doc/administration/backup-and-restore.en-us.md index cae097082e1e..16e8654b74c5 100644 --- a/docs/content/doc/usage/backup-and-restore.en-us.md +++ b/docs/content/doc/administration/backup-and-restore.en-us.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "usage" + parent: "administration" name: "Backup and Restore" weight: 11 identifier: "backup-and-restore" diff --git a/docs/content/doc/usage/backup-and-restore.zh-cn.md b/docs/content/doc/administration/backup-and-restore.zh-cn.md similarity index 98% rename from docs/content/doc/usage/backup-and-restore.zh-cn.md rename to docs/content/doc/administration/backup-and-restore.zh-cn.md index 43ad108d9559..602657f4194c 100644 --- a/docs/content/doc/usage/backup-and-restore.zh-cn.md +++ b/docs/content/doc/administration/backup-and-restore.zh-cn.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "usage" + parent: "administration" name: "备份与恢复" weight: 11 identifier: "backup-and-restore" diff --git a/docs/content/doc/usage/backup-and-restore.zh-tw.md b/docs/content/doc/administration/backup-and-restore.zh-tw.md similarity index 98% rename from docs/content/doc/usage/backup-and-restore.zh-tw.md rename to docs/content/doc/administration/backup-and-restore.zh-tw.md index 18e244b19c69..cab95217a38b 100644 --- a/docs/content/doc/usage/backup-and-restore.zh-tw.md +++ b/docs/content/doc/administration/backup-and-restore.zh-tw.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "usage" + parent: "administration" name: "備份與還原" weight: 11 identifier: "backup-and-restore" diff --git a/docs/content/doc/advanced/cmd-embedded.en-us.md b/docs/content/doc/administration/cmd-embedded.en-us.md similarity index 96% rename from docs/content/doc/advanced/cmd-embedded.en-us.md rename to docs/content/doc/administration/cmd-embedded.en-us.md index 63ab83bd36b2..cad0de9787fe 100644 --- a/docs/content/doc/advanced/cmd-embedded.en-us.md +++ b/docs/content/doc/administration/cmd-embedded.en-us.md @@ -7,9 +7,9 @@ toc: false draft: false menu: sidebar: - parent: "advanced" + parent: "administration" name: "Embedded data extraction tool" - weight: 40 + weight: 20 identifier: "cmd-embedded" --- @@ -21,7 +21,7 @@ menu: Gitea's executable contains all the resources required to run: templates, images, style-sheets and translations. Any of them can be overridden by placing a replacement in a matching path -inside the `custom` directory (see [Customizing Gitea]({{< relref "doc/advanced/customizing-gitea.en-us.md" >}})). +inside the `custom` directory (see [Customizing Gitea]({{< relref "doc/administration/customizing-gitea.en-us.md" >}})). To obtain a copy of the embedded resources ready for editing, the `embedded` command from the CLI can be used from the OS shell interface. @@ -85,7 +85,7 @@ The default is the current directory. The `--custom` flag tells Gitea to extract the files directly into the `custom` directory. For this to work, the command needs to know the location of the `app.ini` configuration file (`--config`) and, depending of the configuration, be ran from the directory where -Gitea normally starts. See [Customizing Gitea]({{< relref "doc/advanced/customizing-gitea.en-us.md" >}}) for details. +Gitea normally starts. See [Customizing Gitea]({{< relref "doc/administration/customizing-gitea.en-us.md" >}}) for details. The `--overwrite` flag allows any existing files in the destination directory to be overwritten. diff --git a/docs/content/doc/usage/command-line.en-us.md b/docs/content/doc/administration/command-line.en-us.md similarity index 99% rename from docs/content/doc/usage/command-line.en-us.md rename to docs/content/doc/administration/command-line.en-us.md index 70efebd20361..3dfad62f3d88 100644 --- a/docs/content/doc/usage/command-line.en-us.md +++ b/docs/content/doc/administration/command-line.en-us.md @@ -7,9 +7,9 @@ toc: false draft: false menu: sidebar: - parent: "usage" + parent: "administration" name: "Command Line" - weight: 10 + weight: 1 identifier: "command-line" --- diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/administration/config-cheat-sheet.en-us.md similarity index 99% rename from docs/content/doc/advanced/config-cheat-sheet.en-us.md rename to docs/content/doc/administration/config-cheat-sheet.en-us.md index 8cf003a330d3..6737fe23c19f 100644 --- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md +++ b/docs/content/doc/administration/config-cheat-sheet.en-us.md @@ -7,9 +7,9 @@ toc: false draft: false menu: sidebar: - parent: "advanced" + parent: "administration" name: "Config Cheat Sheet" - weight: 20 + weight: 30 identifier: "config-cheat-sheet" --- @@ -753,7 +753,7 @@ and - `FORCE_TRUST_SERVER_CERT`: **false**: If set to `true`, completely ignores server certificate validation errors. This option is unsafe. Consider adding the certificate to the system trust store instead. - `USER`: **\**: Username of mailing user (usually the sender's e-mail address). - `PASSWD`: **\**: Password of mailing user. Use \`your password\` for quoting if you use special characters in the password. - - Please note: authentication is only supported when the SMTP server communication is encrypted with TLS (this can be via `STARTTLS`) or SMTP host is localhost. See [Email Setup]({{< relref "doc/usage/email-setup.en-us.md" >}}) for more information. + - Please note: authentication is only supported when the SMTP server communication is encrypted with TLS (this can be via `STARTTLS`) or SMTP host is localhost. See [Email Setup]({{< relref "doc/administration/email-setup.en-us.md" >}}) for more information. - `ENABLE_HELO`: **true**: Enable HELO operation. - `HELO_HOSTNAME`: **(retrieved from system)**: HELO hostname. - `FROM`: **\**: Mail from address, RFC 5322. This can be just an email address, or the "Name" \ format. diff --git a/docs/content/doc/advanced/config-cheat-sheet.zh-cn.md b/docs/content/doc/administration/config-cheat-sheet.zh-cn.md similarity index 99% rename from docs/content/doc/advanced/config-cheat-sheet.zh-cn.md rename to docs/content/doc/administration/config-cheat-sheet.zh-cn.md index aae64d97bac1..2fc5a149ae4f 100644 --- a/docs/content/doc/advanced/config-cheat-sheet.zh-cn.md +++ b/docs/content/doc/administration/config-cheat-sheet.zh-cn.md @@ -7,9 +7,9 @@ toc: false draft: false menu: sidebar: - parent: "advanced" + parent: "administration" name: "配置说明" - weight: 20 + weight: 30 identifier: "config-cheat-sheet" --- diff --git a/docs/content/doc/advanced/customizing-gitea.en-us.md b/docs/content/doc/administration/customizing-gitea.en-us.md similarity index 97% rename from docs/content/doc/advanced/customizing-gitea.en-us.md rename to docs/content/doc/administration/customizing-gitea.en-us.md index 4c0235c04aca..9a4c5639a3c3 100644 --- a/docs/content/doc/advanced/customizing-gitea.en-us.md +++ b/docs/content/doc/administration/customizing-gitea.en-us.md @@ -7,10 +7,10 @@ toc: false draft: false menu: sidebar: - parent: "advanced" + parent: "administration" name: "Customizing Gitea" identifier: "customizing-gitea" - weight: 9 + weight: 100 --- # Customizing Gitea @@ -84,7 +84,7 @@ directory at the top of this document). Every single page of Gitea can be changed. Dynamic content is generated using [go templates](https://golang.org/pkg/html/template/), which can be modified by placing replacements below the `$GITEA_CUSTOM/templates` directory. -To obtain any embedded file (including templates), the [`gitea embedded` tool]({{< relref "doc/advanced/cmd-embedded.en-us.md" >}}) can be used. Alternatively, they can be found in the [`templates`](https://github.com/go-gitea/gitea/tree/main/templates) directory of Gitea source (Note: the example link is from the `main` branch. Make sure to use templates compatible with the release you are using). +To obtain any embedded file (including templates), the [`gitea embedded` tool]({{< relref "doc/administration/cmd-embedded.en-us.md" >}}) can be used. Alternatively, they can be found in the [`templates`](https://github.com/go-gitea/gitea/tree/main/templates) directory of Gitea source (Note: the example link is from the `main` branch. Make sure to use templates compatible with the release you are using). Be aware that any statement contained inside `{{` and `}}` are Gitea's template syntax and shouldn't be touched without fully understanding these components. diff --git a/docs/content/doc/advanced/customizing-gitea.zh-cn.md b/docs/content/doc/administration/customizing-gitea.zh-cn.md similarity index 99% rename from docs/content/doc/advanced/customizing-gitea.zh-cn.md rename to docs/content/doc/administration/customizing-gitea.zh-cn.md index bb55f35e178f..200f958245ce 100644 --- a/docs/content/doc/advanced/customizing-gitea.zh-cn.md +++ b/docs/content/doc/administration/customizing-gitea.zh-cn.md @@ -7,9 +7,9 @@ toc: false draft: false menu: sidebar: - parent: "advanced" + parent: "administration" name: "自定义 Gitea 配置" - weight: 9 + weight: 100 identifier: "customizing-gitea" --- diff --git a/docs/content/doc/usage/email-setup.en-us.md b/docs/content/doc/administration/email-setup.en-us.md similarity index 97% rename from docs/content/doc/usage/email-setup.en-us.md rename to docs/content/doc/administration/email-setup.en-us.md index 6d6b18786ccb..27ecb0d2f2ed 100644 --- a/docs/content/doc/usage/email-setup.en-us.md +++ b/docs/content/doc/administration/email-setup.en-us.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "usage" + parent: "administration" name: "Email setup" weight: 12 identifier: "email-setup" @@ -58,7 +58,7 @@ Restart Gitea for the configuration changes to take effect. To send a test email to validate the settings, go to Gitea > Site Administration > Configuration > SMTP Mailer Configuration. -For the full list of options check the [Config Cheat Sheet]({{< relref "doc/advanced/config-cheat-sheet.en-us.md" >}}) +For the full list of options check the [Config Cheat Sheet]({{< relref "doc/administration/config-cheat-sheet.en-us.md" >}}) Please note: authentication is only supported when the SMTP server communication is encrypted with TLS or `HOST=localhost`. TLS encryption can be through: diff --git a/docs/content/doc/advanced/environment-variables.en-us.md b/docs/content/doc/administration/environment-variables.en-us.md similarity index 97% rename from docs/content/doc/advanced/environment-variables.en-us.md rename to docs/content/doc/administration/environment-variables.en-us.md index 288358f69dbe..17a02501644e 100644 --- a/docs/content/doc/advanced/environment-variables.en-us.md +++ b/docs/content/doc/administration/environment-variables.en-us.md @@ -7,9 +7,9 @@ toc: false draft: false menu: sidebar: - parent: "advanced" + parent: "administration" name: "Environment variables" - weight: 20 + weight: 10 identifier: "environment-variables" --- diff --git a/docs/content/doc/advanced/environment-variables.zh-cn.md b/docs/content/doc/administration/environment-variables.zh-cn.md similarity index 97% rename from docs/content/doc/advanced/environment-variables.zh-cn.md rename to docs/content/doc/administration/environment-variables.zh-cn.md index 3de8dcfbc741..c8a8fcba7188 100644 --- a/docs/content/doc/advanced/environment-variables.zh-cn.md +++ b/docs/content/doc/administration/environment-variables.zh-cn.md @@ -7,9 +7,9 @@ toc: false draft: false menu: sidebar: - parent: "advanced" + parent: "administration" name: "环境变量清单" - weight: 20 + weight: 10 identifier: "environment-variables" --- diff --git a/docs/content/doc/advanced/external-renderers.en-us.md b/docs/content/doc/administration/external-renderers.en-us.md similarity index 99% rename from docs/content/doc/advanced/external-renderers.en-us.md rename to docs/content/doc/administration/external-renderers.en-us.md index 244fcd7c8398..da2f493c71a6 100644 --- a/docs/content/doc/advanced/external-renderers.en-us.md +++ b/docs/content/doc/administration/external-renderers.en-us.md @@ -7,9 +7,9 @@ toc: false draft: false menu: sidebar: - parent: "advanced" + parent: "administration" name: "External renderers" - weight: 40 + weight: 60 identifier: "external-renderers" --- diff --git a/docs/content/doc/usage/fail2ban-setup.en-us.md b/docs/content/doc/administration/fail2ban-setup.en-us.md similarity index 99% rename from docs/content/doc/usage/fail2ban-setup.en-us.md rename to docs/content/doc/administration/fail2ban-setup.en-us.md index f00551e3efa9..746222420a92 100644 --- a/docs/content/doc/usage/fail2ban-setup.en-us.md +++ b/docs/content/doc/administration/fail2ban-setup.en-us.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "usage" + parent: "administration" name: "Fail2ban setup" weight: 16 identifier: "fail2ban-setup" diff --git a/docs/content/doc/usage/fail2ban-setup.zh-cn.md b/docs/content/doc/administration/fail2ban-setup.zh-cn.md similarity index 99% rename from docs/content/doc/usage/fail2ban-setup.zh-cn.md rename to docs/content/doc/administration/fail2ban-setup.zh-cn.md index 446d192aa619..37a0838b24ae 100644 --- a/docs/content/doc/usage/fail2ban-setup.zh-cn.md +++ b/docs/content/doc/administration/fail2ban-setup.zh-cn.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "usage" + parent: "administration" name: "设置 Fail2ban" weight: 16 identifier: "fail2ban-setup" diff --git a/docs/content/doc/usage/git-lfs-support.en-us.md b/docs/content/doc/administration/git-lfs-support.en-us.md similarity index 95% rename from docs/content/doc/usage/git-lfs-support.en-us.md rename to docs/content/doc/administration/git-lfs-support.en-us.md index 8b2c997bf969..86cc3a502892 100644 --- a/docs/content/doc/usage/git-lfs-support.en-us.md +++ b/docs/content/doc/administration/git-lfs-support.en-us.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "usage" + parent: "administration" name: "Git LFS setup" weight: 12 identifier: "git-lfs-setup" diff --git a/docs/content/doc/usage/https-support.en-us.md b/docs/content/doc/administration/https-support.en-us.md similarity index 97% rename from docs/content/doc/usage/https-support.en-us.md rename to docs/content/doc/administration/https-support.en-us.md index 7c9024743d96..fd7badc64aa0 100644 --- a/docs/content/doc/usage/https-support.en-us.md +++ b/docs/content/doc/administration/https-support.en-us.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "usage" + parent: "administration" name: "HTTPS setup" weight: 12 identifier: "https-setup" @@ -24,7 +24,7 @@ menu: Before you enable HTTPS, make sure that you have valid SSL/TLS certificates. You could use self-generated certificates for evaluation and testing. Please run `gitea cert --host [HOST]` to generate a self signed certificate. -If you are using Apache or nginx on the server, it's recommended to check the [reverse proxy guide]({{< relref "doc/usage/reverse-proxies.en-us.md" >}}). +If you are using Apache or nginx on the server, it's recommended to check the [reverse proxy guide]({{< relref "doc/administration/reverse-proxies.en-us.md" >}}). To use Gitea's built-in HTTPS support, you must change your `app.ini` file: diff --git a/docs/content/doc/advanced/logging-documentation.en-us.md b/docs/content/doc/administration/logging-documentation.en-us.md similarity index 99% rename from docs/content/doc/advanced/logging-documentation.en-us.md rename to docs/content/doc/administration/logging-documentation.en-us.md index 145c8c320c78..8d49ff3f14ef 100644 --- a/docs/content/doc/advanced/logging-documentation.en-us.md +++ b/docs/content/doc/administration/logging-documentation.en-us.md @@ -7,9 +7,9 @@ toc: false draft: false menu: sidebar: - parent: "advanced" + parent: "administration" name: "Logging Configuration" - weight: 55 + weight: 40 identifier: "logging-configuration" --- diff --git a/docs/content/doc/advanced/mail-templates.en-us.md b/docs/content/doc/administration/mail-templates.en-us.md similarity index 99% rename from docs/content/doc/advanced/mail-templates.en-us.md rename to docs/content/doc/administration/mail-templates.en-us.md index bd419a617b85..a4dc7453eea3 100644 --- a/docs/content/doc/advanced/mail-templates.en-us.md +++ b/docs/content/doc/administration/mail-templates.en-us.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "advanced" + parent: "administration" name: "Mail templates" weight: 45 identifier: "mail-templates" diff --git a/docs/content/doc/advanced/repo-indexer.en-us.md b/docs/content/doc/administration/repo-indexer.en-us.md similarity index 98% rename from docs/content/doc/advanced/repo-indexer.en-us.md rename to docs/content/doc/administration/repo-indexer.en-us.md index 4b81bd27e988..11ce547a0d7a 100644 --- a/docs/content/doc/advanced/repo-indexer.en-us.md +++ b/docs/content/doc/administration/repo-indexer.en-us.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "advanced" + parent: "administration" name: "Repository indexer" weight: 45 identifier: "repo-indexer" diff --git a/docs/content/doc/usage/reverse-proxies.en-us.md b/docs/content/doc/administration/reverse-proxies.en-us.md similarity index 99% rename from docs/content/doc/usage/reverse-proxies.en-us.md rename to docs/content/doc/administration/reverse-proxies.en-us.md index 5797d8e5eb8f..10d93a7a4ec3 100644 --- a/docs/content/doc/usage/reverse-proxies.en-us.md +++ b/docs/content/doc/administration/reverse-proxies.en-us.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "usage" + parent: "administration" name: "Reverse Proxies" weight: 16 identifier: "reverse-proxies" @@ -48,7 +48,7 @@ server { server_name git.example.com; # Note: Trailing slash - location /git/ { + location /git/ { # Note: Trailing slash proxy_pass http://localhost:3000/; proxy_set_header Host $host; diff --git a/docs/content/doc/usage/reverse-proxies.zh-cn.md b/docs/content/doc/administration/reverse-proxies.zh-cn.md similarity index 98% rename from docs/content/doc/usage/reverse-proxies.zh-cn.md rename to docs/content/doc/administration/reverse-proxies.zh-cn.md index f6d92e2a610e..1355d09e8a6f 100644 --- a/docs/content/doc/usage/reverse-proxies.zh-cn.md +++ b/docs/content/doc/administration/reverse-proxies.zh-cn.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "usage" + parent: "administration" name: "反向代理" weight: 16 identifier: "reverse-proxies" @@ -48,7 +48,7 @@ server { server_name git.example.com; # 注意: /git/ 最后需要有一个路径符号 - location /git/ { + location /git/ { # 注意: 反向代理后端 URL 的最后需要有一个路径符号 proxy_pass http://localhost:3000/; proxy_set_header Host $host; diff --git a/docs/content/doc/advanced/search-engines-indexation.en-us.md b/docs/content/doc/administration/search-engines-indexation.en-us.md similarity index 90% rename from docs/content/doc/advanced/search-engines-indexation.en-us.md rename to docs/content/doc/administration/search-engines-indexation.en-us.md index ec367b74deac..cabedb3a5d4f 100644 --- a/docs/content/doc/advanced/search-engines-indexation.en-us.md +++ b/docs/content/doc/administration/search-engines-indexation.en-us.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "advanced" + parent: "administration" name: "Search Engines Indexation" weight: 60 identifier: "search-engines-indexation" @@ -21,7 +21,7 @@ If you don't want your repository to be visible for search engines read further. ## Block search engines indexation using robots.txt To make Gitea serve a custom `robots.txt` (default: empty 404) for top level installations, -create a file called `robots.txt` in the [`custom` folder or `CustomPath`]({{< relref "doc/advanced/customizing-gitea.en-us.md" >}}) +create a file called `robots.txt` in the [`custom` folder or `CustomPath`]({{< relref "doc/administration/customizing-gitea.en-us.md" >}}) Examples on how to configure the `robots.txt` can be found at [https://moz.com/learn/seo/robotstxt](https://moz.com/learn/seo/robotstxt). diff --git a/docs/content/doc/advanced/signing.en-us.md b/docs/content/doc/administration/signing.en-us.md similarity index 99% rename from docs/content/doc/advanced/signing.en-us.md rename to docs/content/doc/administration/signing.en-us.md index 83a8b386b9a2..8dd4ffdfb709 100644 --- a/docs/content/doc/advanced/signing.en-us.md +++ b/docs/content/doc/administration/signing.en-us.md @@ -7,9 +7,9 @@ toc: false draft: false menu: sidebar: - parent: "advanced" + parent: "administration" name: "GPG Commit Signatures" - weight: 20 + weight: 50 identifier: "signing" --- diff --git a/docs/content/doc/advanced.zh-tw.md b/docs/content/doc/advanced.zh-tw.md deleted file mode 100644 index ebfe519780f5..000000000000 --- a/docs/content/doc/advanced.zh-tw.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -date: "2016-12-01T16:00:00+02:00" -title: "進階" -slug: "advanced" -weight: 30 -toc: false -draft: false -menu: - sidebar: - name: "進階" - weight: 40 - identifier: "advanced" ---- diff --git a/docs/content/doc/translation.en-us.md b/docs/content/doc/contributing.en-us.md similarity index 52% rename from docs/content/doc/translation.en-us.md rename to docs/content/doc/contributing.en-us.md index c281088503ae..6cc96d91b29d 100644 --- a/docs/content/doc/translation.en-us.md +++ b/docs/content/doc/contributing.en-us.md @@ -1,13 +1,13 @@ --- date: "2021-01-22T00:00:00+02:00" -title: "Translation" -slug: "translation" +title: "Contributing" +slug: "contributing" weight: 35 toc: false draft: false menu: sidebar: - name: "Translation" + name: "Contributing" weight: 50 - identifier: "translation" + identifier: "contributing" --- diff --git a/docs/content/doc/translation.de-de.md b/docs/content/doc/contributing.fr-fr.md similarity index 75% rename from docs/content/doc/translation.de-de.md rename to docs/content/doc/contributing.fr-fr.md index 3470faa59b4c..317566832933 100644 --- a/docs/content/doc/translation.de-de.md +++ b/docs/content/doc/contributing.fr-fr.md @@ -1,7 +1,7 @@ --- date: "2021-01-22T00:00:00+02:00" title: "Übersetzung" -slug: "translation" +slug: "contributing" weight: 35 toc: false draft: false @@ -9,5 +9,5 @@ menu: sidebar: name: "Übersetzung" weight: 50 - identifier: "translation" + identifier: "contributing" --- diff --git a/docs/content/doc/translation.zh-tw.md b/docs/content/doc/contributing.zh-tw.md similarity index 55% rename from docs/content/doc/translation.zh-tw.md rename to docs/content/doc/contributing.zh-tw.md index 5374e87e891c..73a3f94a7c94 100644 --- a/docs/content/doc/translation.zh-tw.md +++ b/docs/content/doc/contributing.zh-tw.md @@ -1,13 +1,13 @@ --- date: "2021-01-22T00:00:00+02:00" -title: "翻譯" -slug: "translation" +title: "貢獻" +slug: "contributing" weight: 35 toc: false draft: false menu: sidebar: - name: "翻譯" + name: "貢獻" weight: 50 - identifier: "translation" + identifier: "contributing" --- diff --git a/docs/content/doc/developers/guidelines-backend.en-us.md b/docs/content/doc/contributing/guidelines-backend.en-us.md similarity index 99% rename from docs/content/doc/developers/guidelines-backend.en-us.md rename to docs/content/doc/contributing/guidelines-backend.en-us.md index f35111522fa6..6ae0ba517d32 100644 --- a/docs/content/doc/developers/guidelines-backend.en-us.md +++ b/docs/content/doc/contributing/guidelines-backend.en-us.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "developers" + parent: "contributing" name: "Guidelines for Backend" weight: 20 identifier: "guidelines-backend" diff --git a/docs/content/doc/developers/guidelines-frontend.en-us.md b/docs/content/doc/contributing/guidelines-frontend.en-us.md similarity index 99% rename from docs/content/doc/developers/guidelines-frontend.en-us.md rename to docs/content/doc/contributing/guidelines-frontend.en-us.md index e801ee4c4bf3..f0234f942d19 100644 --- a/docs/content/doc/developers/guidelines-frontend.en-us.md +++ b/docs/content/doc/contributing/guidelines-frontend.en-us.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "developers" + parent: "contributing" name: "Guidelines for Frontend" weight: 20 identifier: "guidelines-frontend" diff --git a/docs/content/doc/developers/guidelines-refactoring.en-us.md b/docs/content/doc/contributing/guidelines-refactoring.en-us.md similarity index 98% rename from docs/content/doc/developers/guidelines-refactoring.en-us.md rename to docs/content/doc/contributing/guidelines-refactoring.en-us.md index 29025f25f752..913ce8d9bb50 100644 --- a/docs/content/doc/developers/guidelines-refactoring.en-us.md +++ b/docs/content/doc/contributing/guidelines-refactoring.en-us.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "developers" + parent: "contributing" name: "Guidelines for Refactoring" weight: 20 identifier: "guidelines-refactoring" diff --git a/docs/content/doc/features/localization.en-us.md b/docs/content/doc/contributing/localization.en-us.md similarity index 97% rename from docs/content/doc/features/localization.en-us.md rename to docs/content/doc/contributing/localization.en-us.md index e57233a62255..3006ca599b50 100644 --- a/docs/content/doc/features/localization.en-us.md +++ b/docs/content/doc/contributing/localization.en-us.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "features" + parent: "contributing" name: "Localization" weight: 20 identifier: "localization" diff --git a/docs/content/doc/features/localization.zh-cn.md b/docs/content/doc/contributing/localization.zh-cn.md similarity index 89% rename from docs/content/doc/features/localization.zh-cn.md rename to docs/content/doc/contributing/localization.zh-cn.md index 6a6f63732665..3ce518e1a403 100644 --- a/docs/content/doc/features/localization.zh-cn.md +++ b/docs/content/doc/contributing/localization.zh-cn.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "features" + parent: "contributing" name: "本地化" weight: 20 identifier: "localization" diff --git a/docs/content/doc/features/localization.zh-tw.md b/docs/content/doc/contributing/localization.zh-tw.md similarity index 97% rename from docs/content/doc/features/localization.zh-tw.md rename to docs/content/doc/contributing/localization.zh-tw.md index 7bb3a6e6a2dd..562aa4ecaf1e 100644 --- a/docs/content/doc/features/localization.zh-tw.md +++ b/docs/content/doc/contributing/localization.zh-tw.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "features" + parent: "contributing" name: "在地化" weight: 20 identifier: "localization" diff --git a/docs/content/doc/translation/guidelines.de-de.md b/docs/content/doc/contributing/translation.de-de.md similarity index 98% rename from docs/content/doc/translation/guidelines.de-de.md rename to docs/content/doc/contributing/translation.de-de.md index 3fa7185562fb..16cb2679311c 100644 --- a/docs/content/doc/translation/guidelines.de-de.md +++ b/docs/content/doc/contributing/translation.de-de.md @@ -6,7 +6,7 @@ toc: true draft: false menu: sidebar: - parent: "translation" + parent: "contributing" name: "Übersetzungsrichtlinien" weight: 70 identifier: "translation-guidelines" diff --git a/docs/content/doc/translation/guidelines.en-us.md b/docs/content/doc/contributing/translation.en-us.md similarity index 93% rename from docs/content/doc/translation/guidelines.en-us.md rename to docs/content/doc/contributing/translation.en-us.md index f995743627db..23ff18a5b21a 100644 --- a/docs/content/doc/translation/guidelines.en-us.md +++ b/docs/content/doc/contributing/translation.en-us.md @@ -6,7 +6,7 @@ toc: true draft: false menu: sidebar: - parent: "translation" + parent: "contributing" name: "Translation Guidelines" weight: 70 identifier: "translation-guidelines" diff --git a/docs/content/doc/developers.en-us.md b/docs/content/doc/developers.en-us.md deleted file mode 100644 index 917049e5dfa1..000000000000 --- a/docs/content/doc/developers.en-us.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -date: "2016-12-01T16:00:00+02:00" -title: "Developers" -slug: "developers" -weight: 40 -toc: false -draft: false -menu: - sidebar: - name: "Developers" - weight: 55 - identifier: "developers" ---- diff --git a/docs/content/doc/developers.zh-cn.md b/docs/content/doc/developers.zh-cn.md deleted file mode 100644 index 97fb3a97826f..000000000000 --- a/docs/content/doc/developers.zh-cn.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -date: "2016-12-01T16:00:00+02:00" -title: "开发者" -slug: "developers" -weight: 40 -toc: false -draft: false -menu: - sidebar: - name: "开发者" - weight: 55 - identifier: "developers" ---- diff --git a/docs/content/doc/developers.zh-tw.md b/docs/content/doc/developers.zh-tw.md deleted file mode 100644 index c9ce6634ada8..000000000000 --- a/docs/content/doc/developers.zh-tw.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -date: "2016-12-01T16:00:00+02:00" -title: "開發人員" -slug: "developers" -weight: 40 -toc: false -draft: false -menu: - sidebar: - name: "開發人員" - weight: 55 - identifier: "developers" ---- diff --git a/docs/content/doc/development.en-us.md b/docs/content/doc/development.en-us.md new file mode 100644 index 000000000000..e9e8b9c8167b --- /dev/null +++ b/docs/content/doc/development.en-us.md @@ -0,0 +1,13 @@ +--- +date: "2016-12-01T16:00:00+02:00" +title: "Development" +slug: "development" +weight: 40 +toc: false +draft: false +menu: + sidebar: + name: "Development" + weight: 40 + identifier: "development" +--- diff --git a/docs/content/doc/advanced.en-us.md b/docs/content/doc/development.zh-cn.md similarity index 50% rename from docs/content/doc/advanced.en-us.md rename to docs/content/doc/development.zh-cn.md index de2bfeed6f2d..bbdaec4d1d38 100644 --- a/docs/content/doc/advanced.en-us.md +++ b/docs/content/doc/development.zh-cn.md @@ -1,13 +1,13 @@ --- date: "2016-12-01T16:00:00+02:00" -title: "Advanced" -slug: "advanced" -weight: 30 +title: "开发" +slug: "development" +weight: 40 toc: false draft: false menu: sidebar: - name: "Advanced" + name: "开发" weight: 40 - identifier: "advanced" + identifier: "development" --- diff --git a/docs/content/doc/advanced.zh-cn.md b/docs/content/doc/development.zh-tw.md similarity index 50% rename from docs/content/doc/advanced.zh-cn.md rename to docs/content/doc/development.zh-tw.md index 1f7ebf81e723..a0fbbf219f7a 100644 --- a/docs/content/doc/advanced.zh-cn.md +++ b/docs/content/doc/development.zh-tw.md @@ -1,13 +1,13 @@ --- date: "2016-12-01T16:00:00+02:00" -title: "进阶" -slug: "advanced" -weight: 30 +title: "開發" +slug: "development" +weight: 40 toc: false draft: false menu: sidebar: - name: "进阶" + name: "開發" weight: 40 - identifier: "advanced" + identifier: "development" --- diff --git a/docs/content/doc/developers/api-usage.en-us.md b/docs/content/doc/development/api-usage.en-us.md similarity index 99% rename from docs/content/doc/developers/api-usage.en-us.md rename to docs/content/doc/development/api-usage.en-us.md index a7b87f8f084b..641012607bf3 100644 --- a/docs/content/doc/developers/api-usage.en-us.md +++ b/docs/content/doc/development/api-usage.en-us.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "developers" + parent: "development" name: "API Usage" weight: 40 identifier: "api-usage" diff --git a/docs/content/doc/developers/api-usage.zh-cn.md b/docs/content/doc/development/api-usage.zh-cn.md similarity index 99% rename from docs/content/doc/developers/api-usage.zh-cn.md rename to docs/content/doc/development/api-usage.zh-cn.md index c998361115de..b0821039ffd1 100644 --- a/docs/content/doc/developers/api-usage.zh-cn.md +++ b/docs/content/doc/development/api-usage.zh-cn.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "developers" + parent: "development" name: "API 使用指南" weight: 40 identifier: "api-usage" diff --git a/docs/content/doc/developers/hacking-on-gitea.en-us.md b/docs/content/doc/development/hacking-on-gitea.en-us.md similarity index 98% rename from docs/content/doc/developers/hacking-on-gitea.en-us.md rename to docs/content/doc/development/hacking-on-gitea.en-us.md index 3283240c980e..da38d238ac8e 100644 --- a/docs/content/doc/developers/hacking-on-gitea.en-us.md +++ b/docs/content/doc/development/hacking-on-gitea.en-us.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "developers" + parent: "development" name: "Hacking on Gitea" weight: 10 identifier: "hacking-on-gitea" @@ -177,7 +177,7 @@ server as mentioned above. ### Working on JS and CSS -Frontend development should follow [Guidelines for Frontend Development]({{< relref "doc/developers/guidelines-frontend.en-us.md" >}}) +Frontend development should follow [Guidelines for Frontend Development]({{< relref "doc/contributing/guidelines-frontend.en-us.md" >}}) To build with frontend resources, either use the `watch-frontend` target mentioned above or just build once: @@ -264,8 +264,8 @@ OpenAPI 3 documentation. When creating new configuration options, it is not enough to add them to the `modules/setting` files. You should add information to `custom/conf/app.ini` and to the -configuration cheat sheet -found in `docs/content/doc/advanced/config-cheat-sheet.en-us.md` +configuration cheat sheet +found in `docs/content/doc/administer/config-cheat-sheet.en-us.md` ### Changing the logo diff --git a/docs/content/doc/developers/hacking-on-gitea.zh-cn.md b/docs/content/doc/development/hacking-on-gitea.zh-cn.md similarity index 98% rename from docs/content/doc/developers/hacking-on-gitea.zh-cn.md rename to docs/content/doc/development/hacking-on-gitea.zh-cn.md index 9c9141bf50cd..c63d0c4685d8 100644 --- a/docs/content/doc/developers/hacking-on-gitea.zh-cn.md +++ b/docs/content/doc/development/hacking-on-gitea.zh-cn.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "developers" + parent: "development" name: "玩转 Gitea" weight: 10 identifier: "hacking-on-gitea" @@ -166,7 +166,7 @@ make lint-backend ### 处理 JS 和 CSS -前端开发应遵循 [Guidelines for Frontend Development]({{ < 相关参考 "doc/developers/guidelines-frontend.en-us.md" > }}) +前端开发应遵循 [Guidelines for Frontend Development]({{ < 相关参考 "doc/development/guidelines-frontend.en-us.md" > }}) 要使用前端资源构建，请使用上面提到的“watch-frontend”目标或只构建一次： @@ -247,7 +247,7 @@ make swagger-check ### 创建新的配置选项 创建新的配置选项时，将它们添加到 `modules/setting` 的对应文件。您应该将信息添加到 `custom/conf/app.ini` -并到 配置备忘单 +并到 配置备忘单 在 `docs/content/doc/advanced/config-cheat-sheet.en-us.md` 中找到 ### 更改Logo diff --git a/docs/content/doc/developers/integrations.en-us.md b/docs/content/doc/development/integrations.en-us.md similarity index 97% rename from docs/content/doc/developers/integrations.en-us.md rename to docs/content/doc/development/integrations.en-us.md index 15d5e7e59e39..c6321e2d07da 100644 --- a/docs/content/doc/developers/integrations.en-us.md +++ b/docs/content/doc/development/integrations.en-us.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "developers" + parent: "development" name: "Integrations" weight: 65 identifier: "integrations" diff --git a/docs/content/doc/developers/integrations.zh-tw.md b/docs/content/doc/development/integrations.zh-tw.md similarity index 96% rename from docs/content/doc/developers/integrations.zh-tw.md rename to docs/content/doc/development/integrations.zh-tw.md index 6991ec4ae886..eb828592b41a 100644 --- a/docs/content/doc/developers/integrations.zh-tw.md +++ b/docs/content/doc/development/integrations.zh-tw.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "developers" + parent: "development" name: "整合" weight: 65 identifier: "integrations" diff --git a/docs/content/doc/developers/migrations.en-us.md b/docs/content/doc/development/migrations.en-us.md similarity index 98% rename from docs/content/doc/developers/migrations.en-us.md rename to docs/content/doc/development/migrations.en-us.md index 168af1f7fa00..8647bdbc4bce 100644 --- a/docs/content/doc/developers/migrations.en-us.md +++ b/docs/content/doc/development/migrations.en-us.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "developers" + parent: "development" name: "Migrations Interfaces" weight: 55 identifier: "migrations-interfaces" diff --git a/docs/content/doc/developers/migrations.zh-tw.md b/docs/content/doc/development/migrations.zh-tw.md similarity index 98% rename from docs/content/doc/developers/migrations.zh-tw.md rename to docs/content/doc/development/migrations.zh-tw.md index 173c01a464cd..09af350d3527 100644 --- a/docs/content/doc/developers/migrations.zh-tw.md +++ b/docs/content/doc/development/migrations.zh-tw.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "developers" + parent: "development" name: "遷移介面" weight: 55 identifier: "migrations-interfaces" diff --git a/docs/content/doc/developers/oauth2-provider.en-us.md b/docs/content/doc/development/oauth2-provider.en-us.md similarity index 99% rename from docs/content/doc/developers/oauth2-provider.en-us.md rename to docs/content/doc/development/oauth2-provider.en-us.md index 17c12d22f242..5059a94254e2 100644 --- a/docs/content/doc/developers/oauth2-provider.en-us.md +++ b/docs/content/doc/development/oauth2-provider.en-us.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "developers" + parent: "development" name: "OAuth2 Provider" weight: 41 identifier: "oauth2-provider" diff --git a/docs/content/doc/developers/oauth2-provider.zh-tw.md b/docs/content/doc/development/oauth2-provider.zh-tw.md similarity index 99% rename from docs/content/doc/developers/oauth2-provider.zh-tw.md rename to docs/content/doc/development/oauth2-provider.zh-tw.md index 179c6342cdd6..b28e48d61e8d 100644 --- a/docs/content/doc/developers/oauth2-provider.zh-tw.md +++ b/docs/content/doc/development/oauth2-provider.zh-tw.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "developers" + parent: "development" name: "OAuth2 提供者" weight: 41 identifier: "oauth2-provider" diff --git a/docs/content/doc/features.en-us.md b/docs/content/doc/features.en-us.md deleted file mode 100644 index 9cc90b46a0d1..000000000000 --- a/docs/content/doc/features.en-us.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -date: "2016-12-01T16:00:00+02:00" -title: "Features" -slug: "features" -weight: 20 -toc: false -draft: false -menu: - sidebar: - name: "Features" - weight: 30 - identifier: "features" ---- diff --git a/docs/content/doc/features.zh-cn.md b/docs/content/doc/features.zh-cn.md deleted file mode 100644 index 68d2f71b11f6..000000000000 --- a/docs/content/doc/features.zh-cn.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -date: "2016-12-01T16:00:00+02:00" -title: "特性" -slug: "features" -weight: 20 -toc: false -draft: false -menu: - sidebar: - name: "特性" - weight: 30 - identifier: "features" ---- diff --git a/docs/content/doc/features.zh-tw.md b/docs/content/doc/features.zh-tw.md deleted file mode 100644 index 889e0df88213..000000000000 --- a/docs/content/doc/features.zh-tw.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -date: "2016-12-01T16:00:00+02:00" -title: "功能" -slug: "features" -weight: 20 -toc: false -draft: false -menu: - sidebar: - name: "功能" - weight: 30 - identifier: "features" ---- diff --git a/docs/content/doc/help.en-us.md b/docs/content/doc/help.en-us.md index 635cb8931e34..03c9a27818d9 100644 --- a/docs/content/doc/help.en-us.md +++ b/docs/content/doc/help.en-us.md @@ -8,6 +8,6 @@ draft: false menu: sidebar: name: "Help" - weight: 5 + weight: 100 identifier: "help" --- diff --git a/docs/content/doc/help.fr-fr.md b/docs/content/doc/help.fr-fr.md index ab0cedccfc35..42e01009ce82 100644 --- a/docs/content/doc/help.fr-fr.md +++ b/docs/content/doc/help.fr-fr.md @@ -8,6 +8,6 @@ draft: false menu: sidebar: name: "Aide" - weight: 5 + weight: 100 identifier: "help" --- diff --git a/docs/content/doc/help.zh-cn.md b/docs/content/doc/help.zh-cn.md index 9465cd5464ce..e8c0bd260b30 100644 --- a/docs/content/doc/help.zh-cn.md +++ b/docs/content/doc/help.zh-cn.md @@ -8,6 +8,6 @@ draft: false menu: sidebar: name: "帮助" - weight: 5 + weight: 100 identifier: "help" --- diff --git a/docs/content/doc/help.zh-tw.md b/docs/content/doc/help.zh-tw.md index a9c3cea9e53e..270a4ed8a749 100644 --- a/docs/content/doc/help.zh-tw.md +++ b/docs/content/doc/help.zh-tw.md @@ -8,6 +8,6 @@ draft: false menu: sidebar: name: "幫助" - weight: 5 + weight: 100 identifier: "help" --- diff --git a/docs/content/doc/help/faq.en-us.md b/docs/content/doc/help/faq.en-us.md index c8327de7fe57..60e11d4459f2 100644 --- a/docs/content/doc/help/faq.en-us.md +++ b/docs/content/doc/help/faq.en-us.md @@ -43,7 +43,7 @@ On the other hand, 1.x.x downloads should never change. To migrate from Gogs to Gitea: -- [Gogs version 0.9.146 or less]({{< relref "doc/upgrade/from-gogs.en-us.md" >}}) +- [Gogs version 0.9.146 or less]({{< relref "doc/installation/upgrade-from-gogs.en-us.md" >}}) - [Gogs version 0.11.46.0418](https://github.com/go-gitea/gitea/issues/4286) To migrate from GitHub to Gitea, you can use Gitea's built-in migration form. @@ -90,7 +90,7 @@ https://github.com/loganinak/MigrateGitlabToGogs There are a few places that could make this show incorrectly. -1. If using a reverse proxy, make sure you have followed the correction directions in the [reverse proxy guide]({{< relref "doc/usage/reverse-proxies.en-us.md" >}}) +1. If using a reverse proxy, make sure you have followed the correction directions in the [reverse proxy guide]({{< relref "doc/administration/reverse-proxies.en-us.md" >}}) 2. Make sure you have correctly set `ROOT_URL` in the `server` section of your `app.ini` If certain clone options aren't showing up (HTTP/S or SSH), the following options can be checked in your `app.ini` @@ -103,7 +103,7 @@ If certain clone options aren't showing up (HTTP/S or SSH), the following option This error occurs when the reverse proxy limits the file upload size. -See the [reverse proxy guide]({{< relref "doc/usage/reverse-proxies.en-us.md" >}}) for a solution with nginx. +See the [reverse proxy guide]({{< relref "doc/administration/reverse-proxies.en-us.md" >}}) for a solution with nginx. ## Custom Templates not loading or working incorrectly @@ -116,7 +116,7 @@ The correct path for the template(s) will be relative to the `CustomPath` If that doesn't exist, you can try `echo $GITEA_CUSTOM` 2. If you are still unable to find a path, the default can be [calculated above](#where-does-gitea-store-what-file) -3. Once you have figured out the correct custom path, you can refer to the [customizing Gitea]({{< relref "doc/advanced/customizing-gitea.en-us.md" >}}) page to add your template to the correct location. +3. Once you have figured out the correct custom path, you can refer to the [customizing Gitea]({{< relref "doc/administration/customizing-gitea.en-us.md" >}}) page to add your template to the correct location. ## Active user vs login prohibited user @@ -126,7 +126,7 @@ A "login prohibited" user is a user that is not allowed to log in to Gitea anymo ## Setting up logging -- [Official Docs]({{< relref "doc/advanced/logging-documentation.en-us.md" >}}) +- [Official Docs]({{< relref "doc/administration/logging-documentation.en-us.md" >}}) ## What is Swagger? @@ -134,7 +134,7 @@ A "login prohibited" user is a user that is not allowed to log in to Gitea anymo All Gitea instances have the built-in API and there is no way to disable it completely. You can, however, disable showing its documentation by setting `ENABLE_SWAGGER` to `false` in the `api` section of your `app.ini`. -For more information, refer to Gitea's [API docs]({{< relref "doc/developers/api-usage.en-us.md" >}}). +For more information, refer to Gitea's [API docs]({{< relref "doc/development/api-usage.en-us.md" >}}). You can see the latest API (for example) on . @@ -149,7 +149,7 @@ There are multiple things you can combine to prevent spammers. 1. By whitelisting or blocklisting certain email domains 2. By only whitelisting certain domains with OpenID (see below) 3. Setting `ENABLE_CAPTCHA` to `true` in your `app.ini` and properly configuring `RECAPTCHA_SECRET` and `RECAPTCHA_SITEKEY` -4. Settings `DISABLE_REGISTRATION` to `true` and creating new users via the [CLI]({{< relref "doc/usage/command-line.en-us.md" >}}), [API]({{< relref "doc/developers/api-usage.en-us.md" >}}), or Gitea's Admin UI +4. Settings `DISABLE_REGISTRATION` to `true` and creating new users via the [CLI]({{< relref "doc/administration/command-line.en-us.md" >}}), [API]({{< relref "doc/development/api-usage.en-us.md" >}}), or Gitea's Admin UI ### Only allow/block certain email domains @@ -175,7 +175,7 @@ At some point, a customer or third party needs access to a specific repo and onl ### Enable Fail2ban -Use [Fail2Ban]({{< relref "doc/usage/fail2ban-setup.en-us.md" >}}) to monitor and stop automated login attempts or other malicious behavior based on log patterns +Use [Fail2Ban]({{< relref "doc/administration/fail2ban-setup.en-us.md" >}}) to monitor and stop automated login attempts or other malicious behavior based on log patterns ## How to add/use custom themes @@ -328,24 +328,24 @@ You may want to set this value to `60m` or `120m`. ## How can I create users before starting Gitea -Gitea provides a sub-command `gitea migrate` to initialize the database, after which you can use the [admin CLI commands]({{< relref "doc/usage/command-line.en-us.md#admin" >}}) to add users like normal. +Gitea provides a sub-command `gitea migrate` to initialize the database, after which you can use the [admin CLI commands]({{< relref "doc/administration/command-line.en-us.md#admin" >}}) to add users like normal. ## How can I enable password reset -There is no setting for password resets. It is enabled when a [mail service]({{< relref "doc/usage/email-setup.en-us.md" >}}) is configured, and disabled otherwise. +There is no setting for password resets. It is enabled when a [mail service]({{< relref "doc/administration/email-setup.en-us.md" >}}) is configured, and disabled otherwise. ## How can a user's password be changed - As an **admin**, you can change any user's password (and optionally force them to change it on next login)... - By navigating to your `Site Administration -> User Accounts` page and editing a user. - - By using the [admin CLI commands]({{< relref "doc/usage/command-line.en-us.md#admin" >}}). + - By using the [admin CLI commands]({{< relref "doc/administration/command-line.en-us.md#admin" >}}). - Keep in mind most commands will also need a [global flag]({{< relref "doc/usage/command-line.en-us.md#global-options" >}}) to point the CLI at the correct configuration. + Keep in mind most commands will also need a [global flag]({{< relref "doc/administration/command-line.en-us.md#global-options" >}}) to point the CLI at the correct configuration. - As a **user** you can change it... - In your account `Settings -> Account` page (this method **requires** you to know your current password). - By using the `Forgot Password` link. - If the `Forgot Password/Account Recovery` page is disabled, please contact your administrator to configure a [mail service]({{< relref "doc/usage/email-setup.en-us.md" >}}). + If the `Forgot Password/Account Recovery` page is disabled, please contact your administrator to configure a [mail service]({{< relref "doc/administration/email-setup.en-us.md" >}}). ## Why is my markdown broken @@ -457,6 +457,6 @@ If you are using Cloudflare, turn off the auto-minify option in the dashboard. - You can also check `/admin/config` for the repository root path. - Ensure that the user/org exists that you want to adopt repositories for. - As an admin, go to `/admin/repos/unadopted` and search. - - Users can also be given similar permissions via config [`ALLOW_ADOPTION_OF_UNADOPTED_REPOSITORIES`]({{< relref "doc/advanced/config-cheat-sheet.en-us.md#repository" >}}). + - Users can also be given similar permissions via config [`ALLOW_ADOPTION_OF_UNADOPTED_REPOSITORIES`]({{< relref "doc/administration/config-cheat-sheet.en-us.md#repository" >}}). - If the above steps are done correctly, you should be able to select repositories to adopt. - - If no repositories are found, enable [debug logging]({{< relref "doc/advanced/config-cheat-sheet.en-us.md#repository" >}}) to check for any specific errors. + - If no repositories are found, enable [debug logging]({{< relref "doc/administration/config-cheat-sheet.en-us.md#repository" >}}) to check for any specific errors. diff --git a/docs/content/doc/features/comparison.en-us.md b/docs/content/doc/installation/comparison.en-us.md similarity index 99% rename from docs/content/doc/features/comparison.en-us.md rename to docs/content/doc/installation/comparison.en-us.md index 9eaae36a69b7..36bef3841784 100644 --- a/docs/content/doc/features/comparison.en-us.md +++ b/docs/content/doc/installation/comparison.en-us.md @@ -7,9 +7,9 @@ toc: false draft: false menu: sidebar: - parent: "features" name: "Comparison" weight: 5 + parent: installation identifier: "comparison" --- diff --git a/docs/content/doc/features/comparison.zh-cn.md b/docs/content/doc/installation/comparison.zh-cn.md similarity index 99% rename from docs/content/doc/features/comparison.zh-cn.md rename to docs/content/doc/installation/comparison.zh-cn.md index 55014dab7bf5..b254cf749636 100644 --- a/docs/content/doc/features/comparison.zh-cn.md +++ b/docs/content/doc/installation/comparison.zh-cn.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "features" + parent: "installation" name: "横向对比" weight: 5 identifier: "comparison" diff --git a/docs/content/doc/features/comparison.zh-tw.md b/docs/content/doc/installation/comparison.zh-tw.md similarity index 99% rename from docs/content/doc/features/comparison.zh-tw.md rename to docs/content/doc/installation/comparison.zh-tw.md index bde17794412e..f918fbad7524 100644 --- a/docs/content/doc/features/comparison.zh-tw.md +++ b/docs/content/doc/installation/comparison.zh-tw.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "features" + parent: "installation" name: "比較" weight: 5 identifier: "comparison" diff --git a/docs/content/doc/installation/database-preparation.en-us.md b/docs/content/doc/installation/database-preparation.en-us.md index b8ad5d6859fb..e8ab02caa9ae 100644 --- a/docs/content/doc/installation/database-preparation.en-us.md +++ b/docs/content/doc/installation/database-preparation.en-us.md @@ -9,7 +9,7 @@ menu: sidebar: parent: "installation" name: "Database preparation" - weight: 20 + weight: 5 identifier: "database-prep" --- diff --git a/docs/content/doc/installation/from-binary.en-us.md b/docs/content/doc/installation/from-binary.en-us.md index 6f71b0b91e2a..fc17373ea5c8 100644 --- a/docs/content/doc/installation/from-binary.en-us.md +++ b/docs/content/doc/installation/from-binary.en-us.md @@ -64,7 +64,7 @@ despite warnings like `This key is not certified with a trusted signature!`. ## Recommended server configuration -**NOTE:** Many of the following directories can be configured using [Environment Variables]({{< relref "doc/advanced/environment-variables.en-us.md" >}}) as well! +**NOTE:** Many of the following directories can be configured using [Environment Variables]({{< relref "doc/administration/environment-variables.en-us.md" >}}) as well! Of note, configuring `GITEA_WORK_DIR` will tell Gitea where to base its working directory, as well as ease installation. ### Prepare environment @@ -113,7 +113,7 @@ If you don't want the web installer to be able to write to the config file, it i * Ensure that the `SECRET_KEY` and `INTERNAL_TOKEN` values are set. (You may want to use the `gitea generate secret` to generate these secret keys.) * Ensure that any other secret keys you need are set. -See the [command line documentation]({{< relref "doc/usage/command-line.en-us.md" >}}) for information on using `gitea generate secret`. +See the [command line documentation]({{< relref "doc/administration/command-line.en-us.md" >}}) for information on using `gitea generate secret`. ### Configure Gitea's working directory @@ -158,7 +158,7 @@ GITEA_WORK_DIR=/var/lib/gitea/ /usr/local/bin/gitea web -c /etc/gitea/app.ini You can update to a new version of Gitea by stopping Gitea, replacing the binary at `/usr/local/bin/gitea` and restarting the instance. The binary file name should not be changed during the update to avoid problems in existing repositories. -It is recommended that you make a [backup]({{< relref "doc/usage/backup-and-restore.en-us.md" >}}) before updating your installation. +It is recommended that you make a [backup]({{< relref "doc/administration/backup-and-restore.en-us.md" >}}) before updating your installation. If you have carried out the installation steps as described above, the binary should have the generic name `gitea`. Do not change this, i.e. to include the version number. diff --git a/docs/content/doc/installation/from-binary.zh-cn.md b/docs/content/doc/installation/from-binary.zh-cn.md index 5e28cf0f21d2..ad14c2d6251d 100644 --- a/docs/content/doc/installation/from-binary.zh-cn.md +++ b/docs/content/doc/installation/from-binary.zh-cn.md @@ -59,7 +59,7 @@ gpg --verify gitea-{{< version >}}-linux-amd64.asc gitea-{{< version >}}-linux-a ## 服务器设置 -**提示：** `GITEA_WORK_DIR` 表示 Gitea 工作的路径。以下路径可以通过 [环境变量]({{< relref "doc/advanced/environment-variables.zh-cn.md" >}}) 初始化。 +**提示：** `GITEA_WORK_DIR` 表示 Gitea 工作的路径。以下路径可以通过 [环境变量]({{< relref "doc/administration/environment-variables.zh-cn.md" >}}) 初始化。 ### 准备环境 @@ -141,7 +141,7 @@ GITEA_WORK_DIR=/var/lib/gitea/ /usr/local/bin/gitea web -c /etc/gitea/app.ini 您可以通过停止程序，替换 `/usr/local/bin/gitea` 并重启来更新到新版本。直接替换可执行程序时不要更改或使用新的文件名称，以避免数据出错。 -建议您在更新之前进行[备份]({{< relref "doc/usage/backup-and-restore.zh-cn.md" >}})。 +建议您在更新之前进行[备份]({{< relref "doc/administration/backup-and-restore.zh-cn.md" >}})。 ### 1. 使用 systemd 重新启动 Gitea（推荐） diff --git a/docs/content/doc/installation/from-source.en-us.md b/docs/content/doc/installation/from-source.en-us.md index ae3ddc5c4186..acea3e38a92c 100644 --- a/docs/content/doc/installation/from-source.en-us.md +++ b/docs/content/doc/installation/from-source.en-us.md @@ -33,7 +33,7 @@ executable path, you will have to manage this yourself. **Note 2**: Go version {{< min-go-version >}} or higher is required. However, it is recommended to obtain the same version as our continuous integration, see the advice given in -Hacking on +Hacking on Gitea **Table of Contents** @@ -87,7 +87,7 @@ To build from source, the following programs must be present on the system: - `go` {{< min-go-version >}} or higher, see [here](https://golang.org/dl/) - `node` {{< min-node-version >}} or higher with `npm`, see [here](https://nodejs.org/en/download/) -- `make`, see [here]({{< relref "doc/developers/hacking-on-gitea.en-us.md" >}}#installing-make) +- `make`, see [here]({{< relref "doc/development/hacking-on-gitea.en-us.md" >}}#installing-make) Various [make tasks](https://github.com/go-gitea/gitea/blob/main/Makefile) are provided to keep the build process as simple as possible. diff --git a/docs/content/doc/upgrade/from-gitea.en-us.md b/docs/content/doc/installation/upgrade-from-gitea.en-us.md similarity index 97% rename from docs/content/doc/upgrade/from-gitea.en-us.md rename to docs/content/doc/installation/upgrade-from-gitea.en-us.md index 4dc47b05a4c3..5f958876c345 100644 --- a/docs/content/doc/upgrade/from-gitea.en-us.md +++ b/docs/content/doc/installation/upgrade-from-gitea.en-us.md @@ -1,17 +1,15 @@ --- date: "2021-09-02T16:00:00+08:00" title: "Upgrade from an old Gitea" -aliases: - - /en-us/upgrade/ slug: "upgrade-from-gitea" weight: 10 toc: false draft: false menu: sidebar: - parent: "upgrade" - name: "From Gitea" - weight: 10 + parent: "installation" + name: "Upgrade From Old Gitea" + weight: 100 identifier: "upgrade-from-gitea" --- diff --git a/docs/content/doc/upgrade/from-gogs.en-us.md b/docs/content/doc/installation/upgrade-from-gogs.en-us.md similarity index 98% rename from docs/content/doc/upgrade/from-gogs.en-us.md rename to docs/content/doc/installation/upgrade-from-gogs.en-us.md index f0bfe96050ef..7ac83367ccdb 100644 --- a/docs/content/doc/upgrade/from-gogs.en-us.md +++ b/docs/content/doc/installation/upgrade-from-gogs.en-us.md @@ -7,9 +7,9 @@ toc: false draft: false menu: sidebar: - parent: "upgrade" - name: "From Gogs" - weight: 10 + parent: "installation" + name: "Upgrade From Gogs" + weight: 101 identifier: "upgrade-from-gogs" --- diff --git a/docs/content/doc/upgrade/from-gogs.fr-fr.md b/docs/content/doc/installation/upgrade-from-gogs.fr-fr.md similarity index 98% rename from docs/content/doc/upgrade/from-gogs.fr-fr.md rename to docs/content/doc/installation/upgrade-from-gogs.fr-fr.md index 98a8edc1a340..066002bcc152 100644 --- a/docs/content/doc/upgrade/from-gogs.fr-fr.md +++ b/docs/content/doc/installation/upgrade-from-gogs.fr-fr.md @@ -7,9 +7,9 @@ toc: false draft: false menu: sidebar: - parent: "upgrade" + parent: "installation" name: "Depuis Gogs" - weight: 10 + weight: 101 identifier: "upgrade-from-gogs" --- diff --git a/docs/content/doc/upgrade/from-gogs.zh-cn.md b/docs/content/doc/installation/upgrade-from-gogs.zh-cn.md similarity index 95% rename from docs/content/doc/upgrade/from-gogs.zh-cn.md rename to docs/content/doc/installation/upgrade-from-gogs.zh-cn.md index 7d391ae822b0..eac4f24f533b 100644 --- a/docs/content/doc/upgrade/from-gogs.zh-cn.md +++ b/docs/content/doc/installation/upgrade-from-gogs.zh-cn.md @@ -7,9 +7,9 @@ toc: false draft: false menu: sidebar: - parent: "upgrade" + parent: "installation" name: "从 Gogs 升级" - weight: 10 + weight: 101 identifier: "upgrade-from-gogs" --- diff --git a/docs/content/doc/upgrade/from-gogs.zh-tw.md b/docs/content/doc/installation/upgrade-from-gogs.zh-tw.md similarity index 98% rename from docs/content/doc/upgrade/from-gogs.zh-tw.md rename to docs/content/doc/installation/upgrade-from-gogs.zh-tw.md index 793d74df88e0..3b98b5f8f04d 100644 --- a/docs/content/doc/upgrade/from-gogs.zh-tw.md +++ b/docs/content/doc/installation/upgrade-from-gogs.zh-tw.md @@ -7,9 +7,9 @@ toc: false draft: false menu: sidebar: - parent: "upgrade" - name: "從 Gogs" - weight: 10 + parent: "installation" + name: "從 Gogs 升級" + weight: 101 identifier: "upgrade-from-gogs" --- diff --git a/docs/content/doc/installation/with-docker-rootless.en-us.md b/docs/content/doc/installation/with-docker-rootless.en-us.md index 7e1a0e6fe061..36ecf6277a97 100644 --- a/docs/content/doc/installation/with-docker-rootless.en-us.md +++ b/docs/content/doc/installation/with-docker-rootless.en-us.md @@ -9,7 +9,7 @@ menu: sidebar: parent: "installation" name: "With Docker Rootless" - weight: 10 + weight: 48 identifier: "install-with-docker-rootless" --- diff --git a/docs/content/doc/installation/with-docker.en-us.md b/docs/content/doc/installation/with-docker.en-us.md index 90c6e7b5f3ea..396bc67bd39b 100644 --- a/docs/content/doc/installation/with-docker.en-us.md +++ b/docs/content/doc/installation/with-docker.en-us.md @@ -9,7 +9,7 @@ menu: sidebar: parent: "installation" name: "With Docker" - weight: 10 + weight: 49 identifier: "install-with-docker" --- diff --git a/docs/content/doc/installation/with-docker.fr-fr.md b/docs/content/doc/installation/with-docker.fr-fr.md index 176abf7a129d..4db26405b173 100644 --- a/docs/content/doc/installation/with-docker.fr-fr.md +++ b/docs/content/doc/installation/with-docker.fr-fr.md @@ -9,7 +9,7 @@ menu: sidebar: parent: "installation" name: "Docker" - weight: 10 + weight: 49 identifier: "install-with-docker" --- diff --git a/docs/content/doc/installation/with-docker.zh-cn.md b/docs/content/doc/installation/with-docker.zh-cn.md index cae28c70b866..e89fb762bbf0 100644 --- a/docs/content/doc/installation/with-docker.zh-cn.md +++ b/docs/content/doc/installation/with-docker.zh-cn.md @@ -9,7 +9,7 @@ menu: sidebar: parent: "installation" name: "使用 Docker 安装" - weight: 10 + weight: 49 identifier: "install-with-docker" --- diff --git a/docs/content/doc/installation/with-docker.zh-tw.md b/docs/content/doc/installation/with-docker.zh-tw.md index 0fd8626149f6..f432957d87e9 100644 --- a/docs/content/doc/installation/with-docker.zh-tw.md +++ b/docs/content/doc/installation/with-docker.zh-tw.md @@ -9,7 +9,7 @@ menu: sidebar: parent: "installation" name: "Docker 安裝" - weight: 10 + weight: 49 identifier: "install-with-docker" --- diff --git a/docs/content/doc/packages.en-us.md b/docs/content/doc/packages.en-us.md index e613b6b250e2..e4a87bdebf62 100644 --- a/docs/content/doc/packages.en-us.md +++ b/docs/content/doc/packages.en-us.md @@ -1,12 +1,13 @@ --- -date: "2021-07-20T00:00:00+00:00" -title: "Package Registry" +date: "2016-12-27T16:00:00+02:00" +title: "Packages" slug: "packages" +weight: 35 toc: false draft: false menu: sidebar: - name: "Package Registry" - weight: 45 + name: "Usage - Packages" + weight: 30 identifier: "packages" --- diff --git a/docs/content/doc/packages/cargo.en-us.md b/docs/content/doc/packages/cargo.en-us.md index 1f90d939d1f7..62c8c41aaed8 100644 --- a/docs/content/doc/packages/cargo.en-us.md +++ b/docs/content/doc/packages/cargo.en-us.md @@ -1,7 +1,7 @@ --- date: "2022-11-20T00:00:00+00:00" title: "Cargo Packages Repository" -slug: "packages/cargo" +slug: "usage/packages/cargo" draft: false toc: false menu: @@ -73,7 +73,7 @@ token = "Bearer {token}" | Parameter | Description | | --------- | ----------- | -| `token` | Your [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}) | +| `token` | Your [personal access token]({{< relref "doc/development/api-usage.en-us.md#authentication" >}}) | ## Publish a package diff --git a/docs/content/doc/packages/chef.en-us.md b/docs/content/doc/packages/chef.en-us.md index ecc774d7928b..67322fdbf2d6 100644 --- a/docs/content/doc/packages/chef.en-us.md +++ b/docs/content/doc/packages/chef.en-us.md @@ -1,7 +1,7 @@ --- date: "2023-01-20T00:00:00+00:00" title: "Chef Packages Repository" -slug: "packages/chef" +slug: "usage/packages/chef" draft: false toc: false menu: diff --git a/docs/content/doc/packages/composer.en-us.md b/docs/content/doc/packages/composer.en-us.md index 47b03781f06e..dba3f31364d5 100644 --- a/docs/content/doc/packages/composer.en-us.md +++ b/docs/content/doc/packages/composer.en-us.md @@ -1,7 +1,7 @@ --- date: "2021-07-20T00:00:00+00:00" title: "Composer Packages Repository" -slug: "packages/composer" +slug: "usage/packages/composer" draft: false toc: false menu: @@ -60,7 +60,7 @@ curl --user your_username:your_password_or_token \ https://gitea.example.com/api/packages/testuser/composer?version=1.0.3 ``` -If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}) instead of the password. +If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/development/api-usage.en-us.md#authentication" >}}) instead of the password. The server responds with the following HTTP Status codes. diff --git a/docs/content/doc/packages/conan.en-us.md b/docs/content/doc/packages/conan.en-us.md index fb104f34f43b..c40bb583e673 100644 --- a/docs/content/doc/packages/conan.en-us.md +++ b/docs/content/doc/packages/conan.en-us.md @@ -1,7 +1,7 @@ --- date: "2021-07-20T00:00:00+00:00" title: "Conan Packages Repository" -slug: "packages/conan" +slug: "usage/packages/conan" draft: false toc: false menu: @@ -37,7 +37,7 @@ conan user --remote {remote} --password {password} {username} | -----------| ----------- | | `remote` | The remote name. | | `username` | Your Gitea username. | -| `password` | Your Gitea password. If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}) instead of the password. | +| `password` | Your Gitea password. If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/development/api-usage.en-us.md#authentication" >}}) instead of the password. | | `owner` | The owner of the package. | For example: diff --git a/docs/content/doc/packages/conda.en-us.md b/docs/content/doc/packages/conda.en-us.md index 8b828475904e..5fca9997de10 100644 --- a/docs/content/doc/packages/conda.en-us.md +++ b/docs/content/doc/packages/conda.en-us.md @@ -1,7 +1,7 @@ --- date: "2022-12-28T00:00:00+00:00" title: "Conda Packages Repository" -slug: "packages/conda" +slug: "usage/packages/conda" draft: false toc: false menu: diff --git a/docs/content/doc/packages/container.en-us.md b/docs/content/doc/packages/container.en-us.md index 77dbbafd02cb..732249529db9 100644 --- a/docs/content/doc/packages/container.en-us.md +++ b/docs/content/doc/packages/container.en-us.md @@ -1,7 +1,7 @@ --- date: "2021-07-20T00:00:00+00:00" title: "Container Registry" -slug: "packages/container" +slug: "usage/packages/container" draft: false toc: false menu: @@ -34,7 +34,7 @@ To push an image or if the image is in a private registry, you have to authentic docker login gitea.example.com ``` -If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}) instead of the password. +If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/development/api-usage.en-us.md#authentication" >}}) instead of the password. ## Image naming convention diff --git a/docs/content/doc/packages/generic.en-us.md b/docs/content/doc/packages/generic.en-us.md index dd0f5653fff8..ce6661a87c19 100644 --- a/docs/content/doc/packages/generic.en-us.md +++ b/docs/content/doc/packages/generic.en-us.md @@ -1,7 +1,7 @@ --- date: "2021-07-20T00:00:00+00:00" title: "Generic Packages Repository" -slug: "packages/generic" +slug: "usage/packages/generic" draft: false toc: false menu: @@ -22,7 +22,7 @@ Publish generic files, like release binaries or other output, for your user or o ## Authenticate to the package registry -To authenticate to the Package Registry, you need to provide [custom HTTP headers or use HTTP Basic authentication]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}). +To authenticate to the Package Registry, you need to provide [custom HTTP headers or use HTTP Basic authentication]({{< relref "doc/development/api-usage.en-us.md#authentication" >}}). ## Publish a package @@ -48,7 +48,7 @@ curl --user your_username:your_password_or_token \ https://gitea.example.com/api/packages/testuser/generic/test_package/1.0.0/file.bin ``` -If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}) instead of the password. +If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/development/api-usage.en-us.md#authentication" >}}) instead of the password. The server reponds with the following HTTP Status codes. diff --git a/docs/content/doc/packages/helm.en-us.md b/docs/content/doc/packages/helm.en-us.md index 89b929f9bc84..01352237668a 100644 --- a/docs/content/doc/packages/helm.en-us.md +++ b/docs/content/doc/packages/helm.en-us.md @@ -1,7 +1,7 @@ --- date: "2022-04-14T00:00:00+00:00" title: "Helm Chart Registry" -slug: "packages/helm" +slug: "usage/packages/helm" draft: false toc: false menu: @@ -42,7 +42,7 @@ helm cm-push ./{chart_file}.tgz {repo} | Parameter | Description | | ------------ | ----------- | | `username` | Your Gitea username. | -| `password` | Your Gitea password. If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}) instead of the password. | +| `password` | Your Gitea password. If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/development/api-usage.en-us.md#authentication" >}}) instead of the password. | | `repo` | The name for the repository. | | `chart_file` | The Helm Chart archive. | | `owner` | The owner of the package. | diff --git a/docs/content/doc/packages/maven.en-us.md b/docs/content/doc/packages/maven.en-us.md index 22da3c16d294..e44768dc191e 100644 --- a/docs/content/doc/packages/maven.en-us.md +++ b/docs/content/doc/packages/maven.en-us.md @@ -1,7 +1,7 @@ --- date: "2021-07-20T00:00:00+00:00" title: "Maven Packages Repository" -slug: "packages/maven" +slug: "usage/packages/maven" draft: false toc: false menu: @@ -70,7 +70,7 @@ Afterwards add the following sections to your project `pom.xml` file: | Parameter | Description | | -------------- | ----------- | -| `access_token` | Your [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}). | +| `access_token` | Your [personal access token]({{< relref "doc/development/api-usage.en-us.md#authentication" >}}). | | `owner` | The owner of the package. | ## Publish a package diff --git a/docs/content/doc/packages/npm.en-us.md b/docs/content/doc/packages/npm.en-us.md index decb3f743c41..f6ca9fb93f17 100644 --- a/docs/content/doc/packages/npm.en-us.md +++ b/docs/content/doc/packages/npm.en-us.md @@ -1,7 +1,7 @@ --- date: "2021-07-20T00:00:00+00:00" title: "npm Packages Repository" -slug: "packages/npm" +slug: "usage/packages/npm" draft: false toc: false menu: @@ -41,7 +41,7 @@ npm config set -- '//gitea.example.com/api/packages/{owner}/npm/:_authToken' "{t | ------------ | ----------- | | `scope` | The scope of the packages. | | `owner` | The owner of the package. | -| `token` | Your [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}). | +| `token` | Your [personal access token]({{< relref "doc/development/api-usage.en-us.md#authentication" >}}). | For example: diff --git a/docs/content/doc/packages/nuget.en-us.md b/docs/content/doc/packages/nuget.en-us.md index 670abca7fd59..c40461cf8c92 100644 --- a/docs/content/doc/packages/nuget.en-us.md +++ b/docs/content/doc/packages/nuget.en-us.md @@ -1,7 +1,7 @@ --- date: "2021-07-20T00:00:00+00:00" title: "NuGet Packages Repository" -slug: "packages/nuget" +slug: "usage/packages/nuget" draft: false toc: false menu: @@ -38,7 +38,7 @@ dotnet nuget add source --name {source_name} --username {username} --password {p | ------------- | ----------- | | `source_name` | The desired source name. | | `username` | Your Gitea username. | -| `password` | Your Gitea password. If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}) instead of the password. | +| `password` | Your Gitea password. If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/development/api-usage.en-us.md#authentication" >}}) instead of the password. | | `owner` | The owner of the package. | For example: @@ -47,7 +47,7 @@ For example: dotnet nuget add source --name gitea --username testuser --password password123 https://gitea.example.com/api/packages/testuser/nuget/index.json ``` -You can add the source without credentials and use the [`--api-key`](https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-nuget-push) parameter when publishing packages. In this case you need to provide a [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}). +You can add the source without credentials and use the [`--api-key`](https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-nuget-push) parameter when publishing packages. In this case you need to provide a [personal access token]({{< relref "doc/development/api-usage.en-us.md#authentication" >}}). ## Publish a package diff --git a/docs/content/doc/packages/overview.en-us.md b/docs/content/doc/packages/overview.en-us.md index f93fec639349..8c20ecd41e5e 100644 --- a/docs/content/doc/packages/overview.en-us.md +++ b/docs/content/doc/packages/overview.en-us.md @@ -1,7 +1,7 @@ --- date: "2021-07-20T00:00:00+00:00" title: "Package Registry" -slug: "packages/overview" +slug: "usage/packages/overview" draft: false toc: false menu: diff --git a/docs/content/doc/packages/pub.en-us.md b/docs/content/doc/packages/pub.en-us.md index 4d3766220833..ef7be1be5927 100644 --- a/docs/content/doc/packages/pub.en-us.md +++ b/docs/content/doc/packages/pub.en-us.md @@ -1,7 +1,7 @@ --- date: "2022-07-31T00:00:00+00:00" title: "Pub Packages Repository" -slug: "packages/pub" +slug: "usage/packages/pub" draft: false toc: false menu: @@ -38,7 +38,7 @@ dart pub token add https://gitea.example.com/api/packages/{owner}/pub | ------------ | ----------- | | `owner` | The owner of the package. | -You need to provide your [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}). +You need to provide your [personal access token]({{< relref "doc/development/api-usage.en-us.md#authentication" >}}). ## Publish a package diff --git a/docs/content/doc/packages/pypi.en-us.md b/docs/content/doc/packages/pypi.en-us.md index ec2475aea346..f99dfb5acc28 100644 --- a/docs/content/doc/packages/pypi.en-us.md +++ b/docs/content/doc/packages/pypi.en-us.md @@ -1,7 +1,7 @@ --- date: "2021-07-20T00:00:00+00:00" title: "PyPI Packages Repository" -slug: "packages/pypi" +slug: "usage/packages/pypi" draft: false toc: false menu: @@ -42,7 +42,7 @@ password = {password} | ------------ | ----------- | | `owner` | The owner of the package. | | `username` | Your Gitea username. | -| `password` | Your Gitea password. If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}) instead of the password. | +| `password` | Your Gitea password. If you are using 2FA or OAuth use a [personal access token]({{< relref "doc/development/api-usage.en-us.md#authentication" >}}) instead of the password. | ## Publish a package diff --git a/docs/content/doc/packages/rubygems.en-us.md b/docs/content/doc/packages/rubygems.en-us.md index d4ae30bbcecc..a7aa36aef474 100644 --- a/docs/content/doc/packages/rubygems.en-us.md +++ b/docs/content/doc/packages/rubygems.en-us.md @@ -1,7 +1,7 @@ --- date: "2021-07-20T00:00:00+00:00" title: "RubyGems Packages Repository" -slug: "packages/rubygems" +slug: "usage/packages/rubygems" draft: false toc: false menu: @@ -36,7 +36,7 @@ https://gitea.example.com/api/packages/{owner}/rubygems: Bearer {token} | Parameter | Description | | ------------- | ----------- | | `owner` | The owner of the package. | -| `token` | Your [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}). | +| `token` | Your [personal access token]({{< relref "doc/development/api-usage.en-us.md#authentication" >}}). | For example: diff --git a/docs/content/doc/packages/storage.en-us.md b/docs/content/doc/packages/storage.en-us.md index 8b05b8a45fb4..000752b774ab 100644 --- a/docs/content/doc/packages/storage.en-us.md +++ b/docs/content/doc/packages/storage.en-us.md @@ -1,7 +1,7 @@ --- date: "2022-11-01T00:00:00+00:00" title: "Storage" -slug: "packages/storage" +slug: "usage/packages/storage" draft: false toc: false menu: @@ -31,7 +31,7 @@ Whenever a package gets deleted only the references to the underlaying blobs are The blobs get not removed at this moment, so they still require space on the filesystem. When a new package gets uploaded the existing blobs may get referenced again. -These unreferenced blobs get deleted by a [clean up job]({{< relref "doc/advanced/config-cheat-sheet.en-us.md#cron---cleanup-expired-packages-croncleanup_packages" >}}). +These unreferenced blobs get deleted by a [clean up job]({{< relref "doc/administration/config-cheat-sheet.en-us.md#cron---cleanup-expired-packages-croncleanup_packages" >}}). The config setting `OLDER_THAN` configures how long unreferenced blobs are kept before they get deleted. ## Cleanup Rules @@ -71,7 +71,7 @@ The patterns are case-insensitive which matches the behaviour of the package reg ### How the cleanup rules work -The cleanup rules are part of the [clean up job]({{< relref "doc/advanced/config-cheat-sheet.en-us.md#cron---cleanup-expired-packages-croncleanup_packages" >}}) and run periodically. +The cleanup rules are part of the [clean up job]({{< relref "doc/administration/config-cheat-sheet.en-us.md#cron---cleanup-expired-packages-croncleanup_packages" >}}) and run periodically. The cleanup rule: diff --git a/docs/content/doc/packages/vagrant.en-us.md b/docs/content/doc/packages/vagrant.en-us.md index 1e6d7a772147..4cd066feca73 100644 --- a/docs/content/doc/packages/vagrant.en-us.md +++ b/docs/content/doc/packages/vagrant.en-us.md @@ -1,7 +1,7 @@ --- date: "2022-08-23T00:00:00+00:00" title: "Vagrant Packages Repository" -slug: "packages/vagrant" +slug: "usage/packages/vagrant" draft: false toc: false menu: @@ -69,7 +69,7 @@ vagrant box add "https://gitea.example.com/api/packages/testuser/vagrant/test_sy ``` This will install the latest version of the package. To add a specific version, use the `--box-version` parameter. -If the registry is private you can pass your [personal access token]({{< relref "doc/developers/api-usage.en-us.md#authentication" >}}) in the `VAGRANT_CLOUD_TOKEN` environment variable. +If the registry is private you can pass your [personal access token]({{< relref "doc/development/api-usage.en-us.md#authentication" >}}) in the `VAGRANT_CLOUD_TOKEN` environment variable. ## Supported commands diff --git a/docs/content/doc/upgrade.en-us.md b/docs/content/doc/upgrade.en-us.md deleted file mode 100644 index 9623ff9f1eaf..000000000000 --- a/docs/content/doc/upgrade.en-us.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -date: "2016-12-01T16:00:00+02:00" -title: "Upgrade" -slug: "upgrade" -weight: 10 -toc: false -draft: false -menu: - sidebar: - name: "Upgrade" - weight: 20 - identifier: "upgrade" ---- diff --git a/docs/content/doc/upgrade.fr-fr.md b/docs/content/doc/upgrade.fr-fr.md deleted file mode 100644 index ca08daf9c096..000000000000 --- a/docs/content/doc/upgrade.fr-fr.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -date: "2017-08-23T09:00:00+02:00" -title: "Mise à jour" -slug: "upgrade" -weight: 10 -toc: false -draft: false -menu: - sidebar: - name: "Mise à jour" - weight: 20 - identifier: "upgrade" ---- diff --git a/docs/content/doc/upgrade.zh-cn.md b/docs/content/doc/upgrade.zh-cn.md deleted file mode 100644 index d12e150b9cbc..000000000000 --- a/docs/content/doc/upgrade.zh-cn.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -date: "2016-12-01T16:00:00+02:00" -title: "升级" -slug: "upgrade" -weight: 10 -toc: false -draft: false -menu: - sidebar: - name: "升级" - weight: 20 - identifier: "upgrade" ---- diff --git a/docs/content/doc/upgrade.zh-tw.md b/docs/content/doc/upgrade.zh-tw.md deleted file mode 100644 index b57fccbdd578..000000000000 --- a/docs/content/doc/upgrade.zh-tw.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -date: "2016-12-01T16:00:00+02:00" -title: "升級" -slug: "upgrade" -weight: 10 -toc: false -draft: false -menu: - sidebar: - name: "升級" - weight: 20 - identifier: "upgrade" ---- diff --git a/docs/content/doc/usage.en-us.md b/docs/content/doc/usage.en-us.md index 6be9769d6460..47a4fdc1d7d4 100644 --- a/docs/content/doc/usage.en-us.md +++ b/docs/content/doc/usage.en-us.md @@ -8,6 +8,6 @@ draft: false menu: sidebar: name: "Usage" - weight: 35 + weight: 30 identifier: "usage" --- diff --git a/docs/content/doc/usage.zh-cn.md b/docs/content/doc/usage.zh-cn.md index c533df662481..026bef86e991 100644 --- a/docs/content/doc/usage.zh-cn.md +++ b/docs/content/doc/usage.zh-cn.md @@ -8,6 +8,6 @@ draft: false menu: sidebar: name: "使用指南" - weight: 35 + weight: 30 identifier: "usage" --- diff --git a/docs/content/doc/usage.zh-tw.md b/docs/content/doc/usage.zh-tw.md index b74bfe0175e0..a95e973991ba 100644 --- a/docs/content/doc/usage.zh-tw.md +++ b/docs/content/doc/usage.zh-tw.md @@ -8,6 +8,6 @@ draft: false menu: sidebar: name: "使用" - weight: 35 + weight: 30 identifier: "usage" --- diff --git a/docs/content/doc/features/authentication.en-us.md b/docs/content/doc/usage/authentication.en-us.md similarity index 99% rename from docs/content/doc/features/authentication.en-us.md rename to docs/content/doc/usage/authentication.en-us.md index c27a09b00bf3..5478ee94f681 100644 --- a/docs/content/doc/features/authentication.en-us.md +++ b/docs/content/doc/usage/authentication.en-us.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "features" + parent: "usage" name: "Authentication" weight: 10 identifier: "authentication" diff --git a/docs/content/doc/features/authentication.zh-cn.md b/docs/content/doc/usage/authentication.zh-cn.md similarity index 98% rename from docs/content/doc/features/authentication.zh-cn.md rename to docs/content/doc/usage/authentication.zh-cn.md index aeb099f760b8..403c3f43ce17 100644 --- a/docs/content/doc/features/authentication.zh-cn.md +++ b/docs/content/doc/usage/authentication.zh-cn.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "features" + parent: "usage" name: "认证" weight: 10 identifier: "authentication" diff --git a/docs/content/doc/features/authentication.zh-tw.md b/docs/content/doc/usage/authentication.zh-tw.md similarity index 90% rename from docs/content/doc/features/authentication.zh-tw.md rename to docs/content/doc/usage/authentication.zh-tw.md index da257409a2ae..958c498fc6bb 100644 --- a/docs/content/doc/features/authentication.zh-tw.md +++ b/docs/content/doc/usage/authentication.zh-tw.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "features" + parent: "usage" name: "認證" weight: 10 identifier: "authentication" diff --git a/docs/content/doc/advanced/clone-filter.en-us.md b/docs/content/doc/usage/clone-filter.en-us.md similarity index 98% rename from docs/content/doc/advanced/clone-filter.en-us.md rename to docs/content/doc/usage/clone-filter.en-us.md index 58675d2e941d..7d4ba2d9a876 100644 --- a/docs/content/doc/advanced/clone-filter.en-us.md +++ b/docs/content/doc/usage/clone-filter.en-us.md @@ -7,7 +7,7 @@ draft: false toc: false menu: sidebar: - parent: "advanced" + parent: "usage" name: "Clone filters" weight: 25 identifier: "clone-filters" diff --git a/docs/content/doc/usage/linked-references.en-us.md b/docs/content/doc/usage/linked-references.en-us.md index df2813792868..721c2cf13e2a 100644 --- a/docs/content/doc/usage/linked-references.en-us.md +++ b/docs/content/doc/usage/linked-references.en-us.md @@ -96,7 +96,7 @@ Sometimes a commit or pull request may fix or bring back a problem documented in a particular issue. Gitea supports closing and reopening the referenced issues by preceding the reference with a particular _keyword_. Common keywords include "closes", "fixes", "reopens", etc. This list can be -[customized]({{< ref "/doc/advanced/config-cheat-sheet.en-us.md" >}}) by the +[customized]({{< ref "doc/administration/config-cheat-sheet.en-us.md" >}}) by the site administrator. Example: diff --git a/docs/content/doc/advanced/protected-tags.en-us.md b/docs/content/doc/usage/protected-tags.en-us.md similarity index 99% rename from docs/content/doc/advanced/protected-tags.en-us.md rename to docs/content/doc/usage/protected-tags.en-us.md index 8ed2afc41832..f7404d32cb0d 100644 --- a/docs/content/doc/advanced/protected-tags.en-us.md +++ b/docs/content/doc/usage/protected-tags.en-us.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "advanced" + parent: "usage" name: "Protected tags" weight: 45 identifier: "protected-tags" diff --git a/docs/content/doc/advanced/repo-mirror.en-us.md b/docs/content/doc/usage/repo-mirror.en-us.md similarity index 99% rename from docs/content/doc/advanced/repo-mirror.en-us.md rename to docs/content/doc/usage/repo-mirror.en-us.md index e95dfa0d6346..9a52282bb3c9 100644 --- a/docs/content/doc/advanced/repo-mirror.en-us.md +++ b/docs/content/doc/usage/repo-mirror.en-us.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "advanced" + parent: "usage" name: "Repository Mirror" weight: 45 identifier: "repo-mirror" diff --git a/docs/content/doc/secrets/overview.en-us.md b/docs/content/doc/usage/secrets.en-us.md similarity index 91% rename from docs/content/doc/secrets/overview.en-us.md rename to docs/content/doc/usage/secrets.en-us.md index 1b63d179d789..341ccbae1279 100644 --- a/docs/content/doc/secrets/overview.en-us.md +++ b/docs/content/doc/usage/secrets.en-us.md @@ -1,15 +1,15 @@ --- date: "2022-12-19T21:26:00+08:00" title: "Secrets" -slug: "secrets/overview" +slug: "usage/secrets" draft: false toc: false menu: sidebar: - parent: "secrets" - name: "Overview" + parent: "usage" + name: "Secrets" weight: 1 - identifier: "secrets-overview" + identifier: "usage-secrets" --- # Secrets diff --git a/docs/content/doc/features/webhooks.en-us.md b/docs/content/doc/usage/webhooks.en-us.md similarity index 99% rename from docs/content/doc/features/webhooks.en-us.md rename to docs/content/doc/usage/webhooks.en-us.md index ecbe13c3adb2..2cf60cc9cd1b 100644 --- a/docs/content/doc/features/webhooks.en-us.md +++ b/docs/content/doc/usage/webhooks.en-us.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "features" + parent: "usage" name: "Webhooks" weight: 30 identifier: "webhooks" diff --git a/docs/content/doc/features/webhooks.zh-cn.md b/docs/content/doc/usage/webhooks.zh-cn.md similarity index 96% rename from docs/content/doc/features/webhooks.zh-cn.md rename to docs/content/doc/usage/webhooks.zh-cn.md index 76139460c0a2..00ebd7aa9dd0 100644 --- a/docs/content/doc/features/webhooks.zh-cn.md +++ b/docs/content/doc/usage/webhooks.zh-cn.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "features" + parent: "usage" name: "Webhooks" weight: 30 identifier: "webhooks" diff --git a/docs/content/doc/features/webhooks.zh-tw.md b/docs/content/doc/usage/webhooks.zh-tw.md similarity index 99% rename from docs/content/doc/features/webhooks.zh-tw.md rename to docs/content/doc/usage/webhooks.zh-tw.md index 20fec3d62d87..9e918739a477 100644 --- a/docs/content/doc/features/webhooks.zh-tw.md +++ b/docs/content/doc/usage/webhooks.zh-tw.md @@ -7,7 +7,7 @@ toc: false draft: false menu: sidebar: - parent: "features" + parent: "usage" name: "Webhook" weight: 30 identifier: "webhooks" From a28863bff79b76f24cd4ebc8fee8c9ecf2ab4d8c Mon Sep 17 00:00:00 2001 From: Giteabot Date: Thu, 23 Mar 2023 16:50:56 -0400 Subject: [PATCH 124/340] Fix codeblocks in the cheat sheet (#23664) (#23669) Backport #23664 by @SuperSandro2000 Conflicts fixed by Andrew Thornton Co-authored-by: Sandro Co-authored-by: Andrew Thornton --- .../config-cheat-sheet.en-us.md | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/content/doc/administration/config-cheat-sheet.en-us.md b/docs/content/doc/administration/config-cheat-sheet.en-us.md index 6737fe23c19f..85c931651b59 100644 --- a/docs/content/doc/administration/config-cheat-sheet.en-us.md +++ b/docs/content/doc/administration/config-cheat-sheet.en-us.md @@ -988,7 +988,7 @@ Default templates for project boards: ### Extended cron tasks (not enabled by default) -#### Cron - Garbage collect all repositories ('cron.git_gc_repos') +#### Cron - Garbage collect all repositories (`cron.git_gc_repos`) - `ENABLED`: **false**: Enable service. - `RUN_AT_START`: **false**: Run tasks at start up time (if ENABLED). @@ -997,42 +997,42 @@ Default templates for project boards: - `NOTICE_ON_SUCCESS`: **false**: Set to true to switch on success notices. - `ARGS`: **\**: Arguments for command `git gc`, e.g. `--aggressive --auto`. The default value is same with [git] -> GC_ARGS -#### Cron - Update the '.ssh/authorized_keys' file with Gitea SSH keys ('cron.resync_all_sshkeys') +#### Cron - Update the '.ssh/authorized_keys' file with Gitea SSH keys (`cron.resync_all_sshkeys`) - `ENABLED`: **false**: Enable service. - `RUN_AT_START`: **false**: Run tasks at start up time (if ENABLED). - `NOTICE_ON_SUCCESS`: **false**: Set to true to switch on success notices. - `SCHEDULE`: **@every 72h**: Cron syntax for scheduling repository archive cleanup, e.g. `@every 1h`. -#### Cron - Resynchronize pre-receive, update and post-receive hooks of all repositories ('cron.resync_all_hooks') +#### Cron - Resynchronize pre-receive, update and post-receive hooks of all repositories (`cron.resync_all_hooks`) - `ENABLED`: **false**: Enable service. - `RUN_AT_START`: **false**: Run tasks at start up time (if ENABLED). - `NOTICE_ON_SUCCESS`: **false**: Set to true to switch on success notices. - `SCHEDULE`: **@every 72h**: Cron syntax for scheduling repository archive cleanup, e.g. `@every 1h`. -#### Cron - Reinitialize all missing Git repositories for which records exist ('cron.reinit_missing_repos') +#### Cron - Reinitialize all missing Git repositories for which records exist (`cron.reinit_missing_repos`) - `ENABLED`: **false**: Enable service. - `RUN_AT_START`: **false**: Run tasks at start up time (if ENABLED). - `NOTICE_ON_SUCCESS`: **false**: Set to true to switch on success notices. - `SCHEDULE`: **@every 72h**: Cron syntax for scheduling repository archive cleanup, e.g. `@every 1h`. -#### Cron - Delete all repositories missing their Git files ('cron.delete_missing_repos') +#### Cron - Delete all repositories missing their Git files (`cron.delete_missing_repos`) - `ENABLED`: **false**: Enable service. - `RUN_AT_START`: **false**: Run tasks at start up time (if ENABLED). - `NOTICE_ON_SUCCESS`: **false**: Set to true to switch on success notices. - `SCHEDULE`: **@every 72h**: Cron syntax for scheduling repository archive cleanup, e.g. `@every 1h`. -#### Cron - Delete generated repository avatars ('cron.delete_generated_repository_avatars') +#### Cron - Delete generated repository avatars (`cron.delete_generated_repository_avatars`) - `ENABLED`: **false**: Enable service. - `RUN_AT_START`: **false**: Run tasks at start up time (if ENABLED). - `NOTICE_ON_SUCCESS`: **false**: Set to true to switch on success notices. - `SCHEDULE`: **@every 72h**: Cron syntax for scheduling repository archive cleanup, e.g. `@every 1h`. -#### Cron - Delete all old actions from database ('cron.delete_old_actions') +#### Cron - Delete all old actions from database (`cron.delete_old_actions`) - `ENABLED`: **false**: Enable service. - `RUN_AT_START`: **false**: Run tasks at start up time (if ENABLED). @@ -1040,7 +1040,7 @@ Default templates for project boards: - `SCHEDULE`: **@every 168h**: Cron syntax to set how often to check. - `OLDER_THAN`: **@every 8760h**: any action older than this expression will be deleted from database, suggest using `8760h` (1 year) because that's the max length of heatmap. -#### Cron - Check for new Gitea versions ('cron.update_checker') +#### Cron - Check for new Gitea versions (`cron.update_checker`) - `ENABLED`: **true**: Enable service. - `RUN_AT_START`: **false**: Run tasks at start up time (if ENABLED). @@ -1048,7 +1048,7 @@ Default templates for project boards: - `SCHEDULE`: **@every 168h**: Cron syntax for scheduling a work, e.g. `@every 168h`. - `HTTP_ENDPOINT`: **https://dl.gitea.io/gitea/version.json**: the endpoint that Gitea will check for newer versions -#### Cron - Delete all old system notices from database ('cron.delete_old_system_notices') +#### Cron - Delete all old system notices from database (`cron.delete_old_system_notices`) - `ENABLED`: **false**: Enable service. - `RUN_AT_START`: **false**: Run tasks at start up time (if ENABLED). @@ -1056,7 +1056,7 @@ Default templates for project boards: - `SCHEDULE`: **@every 168h**: Cron syntax to set how often to check. - `OLDER_THAN`: **@every 8760h**: any system notice older than this expression will be deleted from database. -#### Cron - Garbage collect LFS pointers in repositories ('cron.gc_lfs') +#### Cron - Garbage collect LFS pointers in repositories (`cron.gc_lfs`) - `ENABLED`: **false**: Enable service. - `RUN_AT_START`: **false**: Run tasks at start up time (if ENABLED). From 2a70473af753e6a4948a53adcd66cb3d64f096b2 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Fri, 24 Mar 2023 12:17:30 +0800 Subject: [PATCH 125/340] Backport locales to 1.19 (#23634) Generated by #23633 --- options/locale/locale_cs-CZ.ini | 445 +++++++++++++------------ options/locale/locale_de-DE.ini | 334 ++++++++----------- options/locale/locale_el-GR.ini | 340 +++++++------------- options/locale/locale_es-ES.ini | 334 +++++++------------ options/locale/locale_fa-IR.ini | 333 +++++++------------ options/locale/locale_fi-FI.ini | 236 +++++--------- options/locale/locale_fr-FR.ini | 356 ++++++++------------ options/locale/locale_hu-HU.ini | 243 +++++--------- options/locale/locale_id-ID.ini | 278 +++++++--------- options/locale/locale_is-IS.ini | 202 ++++-------- options/locale/locale_it-IT.ini | 330 +++++++------------ options/locale/locale_ja-JP.ini | 506 ++++++++++++++++------------- options/locale/locale_ko-KR.ini | 251 ++++++--------- options/locale/locale_lv-LV.ini | 526 ++++++++++++++++++------------ options/locale/locale_nl-NL.ini | 295 ++++++----------- options/locale/locale_pl-PL.ini | 282 ++++++---------- options/locale/locale_pt-BR.ini | 525 +++++++++++++++++------------- options/locale/locale_pt-PT.ini | 496 +++++++++++++++------------- options/locale/locale_ru-RU.ini | 317 +++++++----------- options/locale/locale_si-LK.ini | 303 +++++++---------- options/locale/locale_sk-SK.ini | 213 ++++-------- options/locale/locale_sv-SE.ini | 275 ++++++---------- options/locale/locale_tr-TR.ini | 388 +++++++++------------- options/locale/locale_uk-UA.ini | 332 ++++++++----------- options/locale/locale_zh-CN.ini | 494 +++++++++++++++------------- options/locale/locale_zh-HK.ini | 248 +++++++------- options/locale/locale_zh-TW.ini | 553 ++++++++++++++++++-------------- 27 files changed, 4157 insertions(+), 5278 deletions(-) diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini index 709a71a13a46..c4c5edae9d99 100644 --- a/options/locale/locale_cs-CZ.ini +++ b/options/locale/locale_cs-CZ.ini @@ -23,7 +23,6 @@ enable_javascript=S JavaScriptem funguje tato webová stránka lépe. toc=Obsah licenses=Licence return_to_gitea=Vrátit se do Gitea - username=Uživatelské jméno email=E-mailová adresa password=Heslo @@ -33,7 +32,6 @@ captcha=CAPTCHA twofa=Dvoufaktorové ověřování twofa_scratch=Dvoufaktorový pomocný kód passcode=Přístupový kód - webauthn_insert_key=Vložte svůj bezpečnostní klíč webauthn_sign_in=Stiskněte tlačítko na svém bezpečnostním klíči. Pokud bezpečnostní klíč nemá žádné tlačítko, vložte jej znovu. webauthn_press_button=Stiskněte prosím tlačítko na zabezpečovacím klíči… @@ -47,7 +45,6 @@ webauthn_error_duplicated=Zabezpečovací klíč není pro tento požadavek povo webauthn_error_empty=Musíte nastavit název tohoto klíče. webauthn_error_timeout=Požadavek vypršel dříve, než se podařilo přečíst váš klíč. Znovu načtěte tuto stránku a akci opakujte. webauthn_reload=Znovu načíst - repository=Repozitář organization=Organizace mirror=Zrcadlo @@ -65,18 +62,15 @@ settings=Nastavení your_profile=Profil your_starred=Oblíbené your_settings=Nastavení - all=Vše sources=Zdrojové kódy mirrors=Zrcadla collaborative=Spolupráce forks=Rozštěpení - activities=Aktivity pull_requests=Požadavky na natažení issues=Úkoly milestones=Milníky - ok=OK cancel=Zrušit save=Uložit @@ -85,26 +79,24 @@ add_all=Přidat vše remove=Odstranit remove_all=Odstranit vše edit=Upravit - copy=Kopírovat copy_url=Kopírovat URL copy_branch=Kopírovat jméno větve copy_success=Zkopírováno! copy_error=Kopírování se nezdařilo - write=Zapsat preview=Náhled loading=Načítá se… - step1=Krok 1: step2=Krok 2: - error=Chyba error404=Stránka, kterou se snažíte zobrazit, buď neexistuje, nebo nemáte oprávnění ji zobrazit. - never=Nikdy - rss_feed=RSS kanál +enabled=Povolený +disabled=Zakázané +copy_content=Kopírovat obsah +copy_type_unsupported=Tento typ souboru nelze zkopírovat [filter] string.asc=A – Z @@ -159,7 +151,6 @@ err_empty_admin_email=Email administrátora nemůže být prázdný. err_admin_name_is_reserved=Uživatelské jméno administrátora není platné, uživatelské jméno je rezervované err_admin_name_pattern_not_allowed=Uživatelské jméno administrátora je neplatné, uživatelské jméno odpovídá vyhrazenému vzoru err_admin_name_is_invalid=Uživatelské jméno administrátora není platné - general_title=Obecná nastavení app_name=Název stránky app_name_helper=Zde můžete zadat název vaší společnosti. @@ -179,7 +170,6 @@ app_url=Základní URL Gitea app_url_helper=Základní adresa pro HTTP(S) URL adresy pro klonování a e-mailová oznámení. log_root_path=Adresář logů log_root_path_helper=Soubory protokolu budou zapsány do tohoto adresáře. - optional_title=Dodatečná nastavení email_title=Nastavení e-mailu smtp_addr=Server SMTP @@ -221,7 +211,7 @@ invalid_db_setting=Nastavení databáze je neplatné: %v invalid_db_table=Databázová tabulka „%s“ je neplatná: %v invalid_repo_path=Kořenový adresář repozitářů není správný: %v invalid_app_data_path=Cesta k datům aplikace je neplatná: %v -run_user_not_match="Run as" uživatelské jméno není aktuální uživatelské jméno: %s -> %s +run_user_not_match=`"Run as" uživatelské jméno není aktuální uživatelské jméno: %s -> %s` internal_token_failed=Nepodařilo se vytvořit interní token: %v secret_key_failed=Nepodařilo se vytvořit tajný klíč: %v save_config_failed=Uložení konfigurace se nezdařilo: %v @@ -237,7 +227,7 @@ default_enable_timetracking_popup=Povolí sledování času pro nové repozitá no_reply_address=Skrytá e-mailová doména no_reply_address_helper=Název domény pro uživatele se skrytou e-mailovou adresou. Příklad: Pokud je název skryté e-mailové domény nastaven na „noreply.example.org“, uživatelské jméno „joe“ bude zaznamenáno v Gitu jako „joe@noreply.example.org“. password_algorithm=Hash algoritmus hesla -password_algorithm_helper=Nastavte algoritmus hashování hesla. Algoritmy mají odlišné požadavky a sílu. `argon2` používá mnoho paměti a může být nevhodný pro malé systémy. +password_algorithm_helper="""Nastavte algoritmus hashování hesla. Algoritmy mají odlišné požadavky a sílu. `argon2` používá mnoho paměti a může být nevhodný pro malé systémy.""" enable_update_checker=Povolit kontrolu aktualizací enable_update_checker_helper=Kontroluje vydání nových verzí pravidelně připojením ke gitea.io. @@ -255,17 +245,14 @@ search_repos=Nalézt repozitář… filter=Ostatní filtry filter_by_team_repositories=Filtrovat podle repozitářů týmu feed_of=Kanál z „%s“ - show_archived=Archivováno show_both_archived_unarchived=Zobrazeny jak archivované tak nearchivované show_only_archived=Zobrazeny pouze archivované show_only_unarchived=Zobrazeny pouze nearchivované - -show_private=Soukromé +show_private=Soukromý show_both_private_public=Zobrazeny jak veřejné tak soukromé show_only_private=Zobrazeny pouze soukromé show_only_public=Zobrazeny pouze veřejné - issues.in_your_repos=Ve vašich repozitářích [explore] @@ -273,7 +260,7 @@ repos=Repozitáře users=Uživatelé organizations=Organizace search=Vyhledat -code=Zdrojový kód +code=Kód search.type.tooltip=Druh vyhledávání search.fuzzy=Fuzzy search.fuzzy.tooltip=Zahrnout výsledky, které také úzce odpovídají hledanému výrazu @@ -289,7 +276,6 @@ code_last_indexed_at=Naposledy indexováno %s relevant_repositories_tooltip=Repozitáře, které jsou rozštěpení nebo nemají žádné téma, ikonu a žádný popis jsou skryty. relevant_repositories=Zobrazují se pouze relevantní repositáře, zobrazit nefiltrované výsledky. - [auth] create_new_account=Registrovat účet register_helper_msg=Již máte účet? Přihlaste se! @@ -357,36 +343,30 @@ authorization_failed_desc=Autorizace selhala, protože jsme detekovali neplatný sspi_auth_failed=SSPI autentizace selhala password_pwned=Heslo, které jste zvolili, je na seznamu odcizených hesel, která byla dříve odhalena při narušení veřejných dat. Zkuste to prosím znovu s jiným heslem. password_pwned_err=Nelze dokončit požadavek na HaveIBeenPwned +invalid_password=Vaše heslo se neshoduje s heslem, které bylo použito k vytvoření účtu. [mail] view_it_on=Zobrazit na %s link_not_working_do_paste=Nefunguje? Zkuste jej zkopírovat a vložit do svého prohlížeče. hi_user_x=Ahoj %s, - activate_account=Prosíme, aktivujte si váš účet activate_account.title=%s, prosím aktivujte si váš účet activate_account.text_1=Ahoj %[1]s, děkujeme za registraci na %[2]! activate_account.text_2=Pro aktivaci vašeho účtu do %s klikněte na následující odkaz: - activate_email=Ověřte vaši e-mailovou adresu activate_email.title=%s, prosím ověřte vaši e-mailovou adresu activate_email.text=Pro aktivaci vašeho účtu do %s klikněte na následující odkaz: - register_notify=Vítejte v Gitea register_notify.title=%[1]s vítejte v %[2]s register_notify.text_1=toto je váš potvrzovací e-mail pro %s! register_notify.text_2=Nyní se můžete přihlásit přes uživatelské jméno: %s. register_notify.text_3=Pokud pro vás byl vytvořen tento účet, nejprve nastavte své heslo. - reset_password=Obnovit váš účet reset_password.title=%s, požádal jste o obnovení vašeho účtu reset_password.text=Klikněte prosím na následující odkaz pro obnovení vašeho účtu v rámci %s: - register_success=Registrace byla úspěšná - issue_assigned.pull=@%[1]s vás přiřadil/a k požadavku na natažení %[2]v repozitáři %[3]s. issue_assigned.issue=@%[1]s vás přiřadil/a k úkolu %[2]v repozitáři %[3]s. - issue.x_mentioned_you=@%s vás zmínil/a: issue.action.force_push=%[1]s vynutil/a nahrání %[2]s z %[3]s do %[4]s. issue.action.push_1=@%[1]s nahrál/a %[3]d commit do %[2]s @@ -401,7 +381,6 @@ issue.action.review_dismissed=@%[1]s odmítl/a poslední kontrolu z %[2]s issue.action.ready_for_review=@%[1]s označil/a tento požadavek na natažení jako připravený ke kontrole. issue.action.new=@%[1]s vytvořil/a #%[2]d. issue.in_tree_path=V %s: - release.new.subject=%s v %s vydáno release.new.text=@%[1]s vydal/a %[2]s v %[3]s release.title=Název: %s @@ -409,19 +388,17 @@ release.note=Poznámka: release.downloads=Soubory ke stažení: release.download.zip=Zdrojový kód (ZIP) release.download.targz=Zdrojový kód (TAR.GZ) - repo.transfer.subject_to=%s by chtěl převést „%s“ pro %s repo.transfer.subject_to_you=%s by Vám chtěl převést „%s“ repo.transfer.to_you=vám repo.transfer.body=Chcete-li ji přijmout nebo odmítnout, navštivte %s nebo ji prostě ignorujte. - repo.collaborator.added.subject=%s vás přidal do %s repo.collaborator.added.text=Byl jste přidán jako spolupracovník repozitáře: - team_invite.subject=%[1]s vás pozval/a, abyste se připojili k organizaci %[2]s team_invite.text_1=%[1]s vás pozval/a do týmu %[2]s v organizaci %[3]s. team_invite.text_2=Pro připojení k týmu klikněte na následující odkaz: team_invite.text_3=Poznámka: Tato pozvánka byla určena pro %[1]s. Pokud jste neočekávali tuto pozvánku, můžete tento e-mail ignorovat. +reply=nebo přímo odpovědět na tento e-mail [modal] yes=Ano @@ -440,34 +417,30 @@ PayloadUrl=URL nákladu TeamName=Název týmu AuthName=Název ověření AdminEmail=E-mailová adresa správce - NewBranchName=Název nové větve CommitSummary=Shrnutí commity CommitMessage=Zpráva commitu CommitChoice=Výběr commitu TreeName=Cesta k souboru Content=Obsah - SSPISeparatorReplacement=Oddělovač SSPIDefaultLanguage=Výchozí jazyk - -require_error=` nemůže být prázdný.` -alpha_dash_error=` by měl obsahovat pouze alfanumerické znaky, pomlčku („-“) a podtržítka („_“). ` -alpha_dash_dot_error=` by měl obsahovat pouze alfanumerické znaky, pomlčku („-“), podtržítka („_“) nebo tečku („.“). ` -git_ref_name_error=` musí být správný název odkazu Git.` -size_error=` musí být minimálně velikosti %s.` -min_size_error=` musí obsahovat nejméně %s znaků.` -max_size_error=` musí obsahovat maximálně %s znaků.` -email_error=` není správná e-mailová adresa.` -url_error=`„%s“ není platná adresa URL.` -include_error=` musí obsahovat řetězec „%s“.` -glob_pattern_error=`zástupný vzor je neplatný: %s.` -regex_pattern_error=` regex vzor je neplatný: %s.` +require_error=" nemůže být prázdný." +alpha_dash_error=" by měl obsahovat pouze alfanumerické znaky, pomlčku („-“) a podtržítka („_“). " +alpha_dash_dot_error=" by měl obsahovat pouze alfanumerické znaky, pomlčku („-“), podtržítka („_“) nebo tečku („.“). " +git_ref_name_error=" musí být správný název odkazu Git." +size_error=" musí být minimálně velikosti %s." +min_size_error=" musí obsahovat nejméně %s znaků." +max_size_error=" musí obsahovat maximálně %s znaků." +email_error=" není správná e-mailová adresa." +url_error=„%s“ není platná adresa URL. +include_error=" musí obsahovat řetězec „%s“." +glob_pattern_error=zástupný vzor je neplatný: %s. +regex_pattern_error=" regex vzor je neplatný: %s." unknown_error=Neznámá chyba: captcha_incorrect=CAPTCHA kód není správný. password_not_match=Zadaná hesla nesouhlasí. lang_select_error=Vyberte jazyk ze seznamu. - username_been_taken=Uživatelské jméno je již obsazeno. username_change_not_local_user=Uživatelé, kteří jsou ověřováni jinak než lokálně, si nemohou změnit uživatelské jméno. repo_name_been_taken=Název repozitáře je již použit. @@ -499,20 +472,20 @@ team_not_exist=Tento tým neexistuje. last_org_owner=Nemůžete odstranit posledního uživatele z týmu „vlastníci“. Musí existovat alespoň jeden vlastník pro organizaci. cannot_add_org_to_team=Organizace nemůže být přidána jako člen týmu. duplicate_invite_to_team=Uživatel byl již pozván jako člen týmu. - invalid_ssh_key=Nelze ověřit váš SSH klíč: %s invalid_gpg_key=Nelze ověřit váš GPG klíč: %s invalid_ssh_principal=Neplatný SSH Principal certifikát: %s unable_verify_ssh_key=Nelze ověřit váš SSH klíč; znovu zkontrolujte chyby. auth_failed=Ověření selhalo: %v - still_own_repo=Váš účet vlastní jeden nebo více repozitářů; smažte je nebo převeďte. still_has_org=Váš účet je člen jedné nebo více organizací; nejdříve je opusťte. still_own_packages=Váš účet vlastní jeden nebo více balíčků. Nejprve je musíte odstranit. org_still_own_repo=Organizace stále vlastní jeden nebo více repozitářů; smažte je nebo převeďte. org_still_own_packages=Organizace stále vlastní jeden nebo více balíčků; nejprve je smažte. - target_branch_not_exist=Cílová větev neexistuje. +invalid_group_team_map_error=" mapování je neplatné: %s" +organization_leave_success=Úspěšně jste opustili organizaci %s. +must_use_public_key=Zadaný klíč je soukromý klíč. Nenahrávejte svůj soukromý klíč nikde. Místo toho použijte váš veřejný klíč. [user] change_avatar=Změnit váš avatar… @@ -530,7 +503,6 @@ unfollow=Přestat sledovat heatmap.loading=Načítání teplotní mapy… user_bio=Životopis disabled_public_activity=Tento uživatel zakázal veřejnou viditelnost aktivity. - form.name_reserved=Uživatelské jméno „%s“ je rezervováno. form.name_pattern_not_allowed=Vzor „%s“ není povolen v uživatelském jméně. form.name_chars_not_allowed=Uživatelské jméno ‚%s‘ obsahuje neplatné znaky. @@ -553,7 +525,6 @@ account_link=Propojené účty organization=Organizace uid=UID webauthn=Bezpečnostní klíče - public_profile=Veřejný profil biography_placeholder=Řekněte nám něco o sobě profile_desc=Vaše e-mailová adresa bude použita pro oznámení a další operace. @@ -593,7 +564,6 @@ saved_successfully=Vaše nastavení bylo úspěšně uloženo. privacy=Soukromí keep_activity_private=Skrýt aktivitu z profilové stránky keep_activity_private_popup=Učinit aktivitu viditelnou pouze pro vás a administrátory - lookup_avatar_by_mail=Vyhledat avatar pomocí e-mailové adresy federated_avatar_lookup=Vyhledání avatarů ve veřejných zdrojích enable_custom_avatar=Použít vlastní avatar @@ -604,7 +574,6 @@ uploaded_avatar_not_a_image=Nahraný soubor není obrázek. uploaded_avatar_is_too_big=Nahraný soubor překročil maximální velikost. update_avatar_success=Vaše avatar byl aktualizován. update_user_avatar_success=Uživatelův avatar byl aktualizován. - change_password=Aktualizovat heslo old_password=Stávající heslo new_password=Nové heslo @@ -612,7 +581,6 @@ retype_new_password=Zadat znovu nové heslo password_incorrect=Zadané heslo není správné. change_password_success=Vaše heslo bylo aktualizováno. Od teď se přihlašujte novým heslem. password_change_disabled=Externě ověřovaní uživatelé nemohou aktualizovat své heslo prostřednictvím webového rozhraní Gitea. - emails=E-mailová adresa manage_emails=Správa e-mailových adres manage_themes=Vyberte výchozí motiv vzhledu @@ -645,7 +613,6 @@ add_openid_success=Nová OpenID adresa byla přidána. keep_email_private=Schovat e-mailovou adresu keep_email_private_popup=Vaše e-mailová adresa bude skryta před ostatními uživateli. openid_desc=OpenID vám umožní delegovat ověřování na externího poskytovatele. - manage_ssh_keys=Správa klíčů SSH manage_ssh_principals=Spravovat SSH Principal certifikáty manage_gpg_keys=Správa GPG klíčů @@ -724,7 +691,6 @@ manage_social=Správa propojených účtů sociálních sítí social_desc=Tyto účty sociálních síti jsou propojeny s vaším Gitea účtem. Ujistěte se, že je všechny znáte, protože mohou být použity k přihlášení do vašeho Gitea účtu. unbind=Odpojit unbind_success=Účet sociální sítě byl odpojen od vašeho Gitea účtu. - manage_access_token=Spravovat přístupové tokeny generate_new_token=Vygenerovat nový token tokens_desc=Tyto tokeny umožňují přístup k vašemu účtu pomocí Gitea API. @@ -739,7 +705,6 @@ access_token_deletion_cancel_action=Zrušit access_token_deletion_confirm_action=Smazat access_token_deletion_desc=Smazání tokenu zruší přístup k vašemu účtu pro aplikace, které jej používají. Tuto akci nelze vrátit. Pokračovat? delete_token_success=Token byl odstraněn. Aplikace, které jej používají již nemají přístup k vašemu účtu. - manage_oauth2_applications=Spravovat OAuth2 aplikace edit_oauth2_application=Upravit OAuth2 aplikaci oauth2_applications_desc=OAuth2 aplikace umožní aplikacím třetích stran bezpečně ověřit uživatele v této instanci Gitea. @@ -762,14 +727,12 @@ oauth2_client_secret_hint=Tajný klíč nebude na této stránce viditelný při oauth2_application_edit=Upravit oauth2_application_create_description=OAuth2 aplikace poskytuje přístup aplikacím třetích stran k uživatelským účtům na této instanci. oauth2_application_remove_description=Odebráním OAuth2 aplikace zabrání přístupu ověřeným uživatelům na této instanci. Pokračovat? - authorized_oauth2_applications=Autorizovat OAuth2 aplikaci authorized_oauth2_applications_description=Úspěšně jste povolili přístup k vašemu osobnímu účtu této aplikaci třetí strany. Zrušte prosím přístup aplikacím, které již nadále nepotřebujete. revoke_key=Zrušit revoke_oauth2_grant=Zrušit přístup revoke_oauth2_grant_description=Zrušením přístupu této aplikaci třetí strany ji zabráníte v přístupu k vašim datům. Jste si jisti? revoke_oauth2_grant_success=Úspěšně jste zrušili přístup. - twofa_desc=Dvoufaktorový způsob ověřování zvýší zabezpečení vašeho účtu. twofa_is_enrolled=Váš účet aktuálně používá dvoufaktorové ověřování. twofa_not_enrolled=Váš účet aktuálně nepoužívá dvoufaktorové ověřování. @@ -787,13 +750,11 @@ then_enter_passcode=A zadejte přístupový kód zobrazený ve vaší aplikaci: passcode_invalid=Přístupový kód není platný. Zkuste to znovu. twofa_enrolled=Ve vašem účtu bylo povoleno dvoufaktorové ověřování. Uložte si pomocný token (%s) na bezpečném místě, protože bude zobrazen pouze jednou! twofa_failed_get_secret=Nepodařilo se získat tajemství. - webauthn_desc=Bezpečnostní klíče jsou hardwarová zařízení obsahující kryptografické klíče. Mohou být použity pro dvoufaktorové ověřování. Bezpečnostní klíče musí podporovat WebAuthn Authenticator standard. webauthn_register_key=Přidat bezpečnostní klíč webauthn_nickname=Přezdívka webauthn_delete_key=Odstranit bezpečnostní klíč webauthn_delete_key_desc=Pokud odstraníte bezpečnostní klíč, již se s ním nebudete moci přihlásit. Pokračovat? - manage_account_links=Správa propojených účtů manage_account_links_desc=Tyto externí účty jsou propojeny s vaším Gitea účtem. account_links_not_available=K vašemu Gitea účtu nejsou aktuálně připojené žádné externí účty. @@ -801,23 +762,19 @@ link_account=Propojit účet remove_account_link=Odstranit propojený účet remove_account_link_desc=Odstraněním propojeného účtu zrušíte jeho přístup k vašemu Gitea účtu. Pokračovat? remove_account_link_success=Propojený účet byl odstraněn. - orgs_none=Nejste členem žádné organizace. repos_none=Nevlastníte žádné repozitáře - delete_account=Smazat váš účet delete_prompt=Tato operace natrvalo odstraní váš uživatelský účet. NELZE ji vrátit zpět. delete_with_all_comments=Váš účet je mladší než %s. Aby se zabránilo fantomovým komentářům, všechny komentáře k úkolům/požadavkům na natažení budou smazány. confirm_delete_account=Potvrdit smazání delete_account_title=Smazat uživatelský účet delete_account_desc=Jste si jisti, že chcete trvale smazat tento účet? - email_notifications.enable=Povolit e-mailová oznámení email_notifications.onmention=E-mail pouze při zmínce email_notifications.disable=Zakázat e-mailová oznámení email_notifications.submit=Nastavit předvolby e-mailu email_notifications.andyourown=A Vaše vlastní upozornění - visibility=Viditelnost uživatele visibility.public=Veřejný visibility.public_tooltip=Viditelné pro všechny uživatele @@ -911,14 +868,12 @@ delete_preexisting=Odstranit již existující soubory delete_preexisting_content=Odstranit soubory v %s delete_preexisting_success=Smazány nepřijaté soubory v %s blame_prior=Zobrazit blame před touto změnou - transfer.accept=Přijmout převod transfer.accept_desc=Převést do „%s“ transfer.reject=Odmítnout převod transfer.reject_desc=Zrušit převod do „%s“ transfer.no_permission_to_accept=Nemáte oprávnění k přijetí transfer.no_permission_to_reject=Nemáte oprávnění k odmítnutí - desc.private=Soukromý desc.public=Veřejný desc.private_template=Soukromá šablona @@ -926,7 +881,6 @@ desc.public_template=Šablona desc.internal=Interní desc.internal_template=Interní šablona desc.archived=Archivováno - template.items=Položky šablony template.git_content=Obsah gitu (výchozí větev) template.git_hooks=Háčky Gitu @@ -937,16 +891,13 @@ template.avatar=Avatar template.issue_labels=Štítky úkolů template.one_item=Musíte vybrat alespoň jednu položku šablony template.invalid=Musíte vybrat repositář šablony - archive.title=Tento repozitář je archivovaný. Můžete prohlížet soubory, klonovat, ale nemůžete nahrávat a vytvářet nové úkoly a požadavky na natažení. archive.issue.nocomment=Tento repozitář je archivovaný. Nemůžete komentovat úkoly. archive.pull.nocomment=Tento repozitář je archivovaný. Nemůžete komentovat požadavky na natažení. - form.reach_limit_of_creation_1=Již jste dosáhli svůj limit %d repozitář. form.reach_limit_of_creation_n=Již jste dosáhli svůj limit %d repozitářů. form.name_reserved=Jméno repozitáře „%s“ je rezervované. form.name_pattern_not_allowed=Vzor „%s“ není povolený v názvu repozitáře. - need_auth=Ověření migrate_options=Možnosti migrace migrate_service=Migrační služba @@ -997,7 +948,6 @@ migrate.migrating_labels=Migrování štítků migrate.migrating_releases=Migrování vydání migrate.migrating_issues=Migrování úkolů migrate.migrating_pulls=Migrování požadavků na natažení - mirror_from=zrcadlo forked_from=rozštěpen z generated_from=generováno z @@ -1011,7 +961,6 @@ unstar=Odoblíbit star=Oblíbit fork=Rozštěpit download_archive=Stáhnout repozitář - no_desc=Bez popisu quick_guide=Krátká příručka clone_this_repo=Naklonovat tento repozitář @@ -1019,12 +968,11 @@ create_new_repo_command=Vytvořit nový repozitář na příkazové řádce push_exist_repo=Nahrání existujícího repozitáře z příkazové řádky empty_message=Tento repozitář nemá žádný obsah. broken_message=Data gitu, která jsou základem tohoto repozitáře, nelze číst. Kontaktujte správce této instance nebo smažte tento repositář. - code=Zdrojový kód code.desc=Přístup ke zdrojovým kódům, souborům, commitům a větvím. branch=Větev tree=Strom -clear_ref=`Vymazat aktuální referenci" +clear_ref=Vymazat aktuální referenci filter_branch_and_tag=Filtr pro větev nebo značku find_tag=Najít značku branches=Větve @@ -1036,7 +984,6 @@ packages=Balíčky labels=Štítky org_labels_desc=Štítky na úrovni organizace, které mohou být použity se všemi repozitáři v rámci této organizace org_labels_desc_manage=spravovat - milestones=Milníky commits=Commity commit=Commit @@ -1059,7 +1006,6 @@ ambiguous_runes_description=`Tento soubor obsahuje nejednoznačné znaky Unicode invisible_runes_line=`Tento řádek má neviditelné znaky Unicode` ambiguous_runes_line=`Tento řádek má nejednoznačné znaky Unicode` ambiguous_character=`%[1]c [U+%04[1]X] je zaměnitelný s %[2]c [U+%04[2]X]` - escape_control_characters=Escape sekvence unescape_control_characters=Bez escape sekvencí file_copy_permalink=Kopírovat trvalý odkaz @@ -1078,7 +1024,6 @@ download_file=Stáhnout soubor normal_view=Normální zobrazení line=řádek lines=řádky - editor.add_file=Přidat soubor editor.new_file=Nový soubor editor.upload_file=Nahrát soubor @@ -1144,7 +1089,6 @@ editor.user_no_push_to_branch=Uživatel nemůže nahrávat do větve editor.require_signed_commit=Větev vyžaduje podepsaný commit editor.cherry_pick=Cherry-pick %s na: editor.revert=Vrátit %s na: - commits.desc=Procházet historii změn zdrojového kódu. commits.commits=Commity commits.no_commits=Žádné společné commity. '%s' a '%s' mají zcela odlišnou historii. @@ -1163,7 +1107,6 @@ commits.signed_by_untrusted_user=Podepsáno nedůvěryhodným uživatelem commits.signed_by_untrusted_user_unmatched=Podepsáno nedůvěryhodným uživatelem, který nesouhlasí s přispěvatelem commits.gpg_key_id=ID GPG klíče commits.ssh_key_fingerprint=Otisk klíče SSH - commit.actions=Akce commit.revert=Vrátit commit.revert-header=Vrátit: %s @@ -1171,10 +1114,8 @@ commit.revert-content=Vyberte větev pro návrat na: commit.cherry-pick=Cherry-pick commit.cherry-pick-header=Cherry-pick: %s commit.cherry-pick-content=Vyberte větev pro Cherry-pick na: - ext_issues=Přístup k externím úkolům ext_issues.desc=Odkaz na externí systém úkolů. - projects=Projekty projects.desc=Spravovat úkoly a požadavky na natažení na projektových nástěnkách. projects.description=Popis (volitelné) @@ -1210,7 +1151,6 @@ projects.board.color=Barva projects.open=Otevřít projects.close=Zavřít projects.board.assigned_to=Přiřazeno k - issues.desc=Organizování hlášení chyb, úkolů a milníků. issues.filter_assignees=Filtrovat zpracovatele issues.filter_milestones=Filtrovat milník @@ -1263,25 +1203,25 @@ issues.add_labels=přidal/a %s štítky %s issues.remove_label=odstranil/a %s štítek %s issues.remove_labels=odstranil/a %s štítky %s issues.add_remove_labels=přidáno %s a odebráno %s štítků %s -issues.add_milestone_at=`přidal/a toto do milníku %s %s` -issues.add_project_at=`přidal/a toto do projektu %s %s` -issues.change_milestone_at=`upravil/a milník z %s na %s %s` -issues.change_project_at=`upravil/a projekt z %s na %s %s` -issues.remove_milestone_at=`odstranil/a toto z milníku %s %s` -issues.remove_project_at=`odstranil/a toto z projektu %s %s` -issues.deleted_milestone=`(odstraněno)` -issues.deleted_project=`(odstraněno)` -issues.self_assign_at=`přiřadil/a sobě toto %s` -issues.add_assignee_at=`byl přiřazen %s %s` -issues.remove_assignee_at=`byl odstraněn z přiřazení %s %s` -issues.remove_self_assignment=`odstranil/a jejich přiřazení %s` -issues.change_title_at=`změnil/a název z %s na %s %s` -issues.change_ref_at=`změnil/a referenci z %s na %s %s` -issues.remove_ref_at=`odstranil/a referenci %s %s` -issues.add_ref_at=`přidal/a referenci %s %s` -issues.delete_branch_at=`odstranil/a větev %s %s` +issues.add_milestone_at=přidal/a toto do milníku %s %s +issues.add_project_at=přidal/a toto do projektu %s %s +issues.change_milestone_at=upravil/a milník z %s na %s %s +issues.change_project_at=upravil/a projekt z %s na %s %s +issues.remove_milestone_at=odstranil/a toto z milníku %s %s +issues.remove_project_at=odstranil/a toto z projektu %s %s +issues.deleted_milestone=(odstraněno) +issues.deleted_project=(odstraněno) +issues.self_assign_at=přiřadil/a sobě toto %s +issues.add_assignee_at=byl přiřazen %s %s +issues.remove_assignee_at=byl odstraněn z přiřazení %s %s +issues.remove_self_assignment=odstranil/a jejich přiřazení %s +issues.change_title_at=změnil/a název z %s na %s %s +issues.change_ref_at=změnil/a referenci z %s na %s %s +issues.remove_ref_at=odstranil/a referenci %s %s +issues.add_ref_at=přidal/a referenci %s %s +issues.delete_branch_at=odstranil/a větev %s %s issues.filter_label=Štítek -issues.filter_label_exclude=`Chcete-li vyloučit štítky, použijte alt + click/enter` +issues.filter_label_exclude=Chcete-li vyloučit štítky, použijte alt + click/enter issues.filter_label_no_select=Všechny štítky issues.filter_milestone=Milník issues.filter_milestone_no_select=Všechny milníky @@ -1328,7 +1268,7 @@ issues.open_title=otevřený issues.closed_title=zavřený issues.draft_title=Koncept issues.num_comments=%d komentářů -issues.commented_at=`okomentoval %s` +issues.commented_at=okomentoval %s issues.delete_comment_confirm=Jste si jist, že chcete smazat tento komentář? issues.context.copy_link=Kopírovat odkaz issues.context.quote_reply=Citovat odpověď @@ -1337,22 +1277,22 @@ issues.context.edit=Upravit issues.context.delete=Smazat issues.no_content=Není zde žádný obsah. issues.close_issue=Zavřít -issues.pull_merged_at=`sloučil/a commit %[2]s do %[3]s %[4]s` -issues.manually_pull_merged_at=`sloučil/a commit %[2]s do %[3]s ručně %[4]s` +issues.pull_merged_at=sloučil/a commit %[2]s do %[3]s %[4]s +issues.manually_pull_merged_at=sloučil/a commit %[2]s do %[3]s ručně %[4]s issues.close_comment_issue=Okomentovat a zavřít issues.reopen_issue=Znovuotevřít issues.reopen_comment_issue=Okomentovat a znovuotevřít issues.create_comment=Okomentovat -issues.closed_at=`uzavřel/a tento úkol %[2]s` -issues.reopened_at=`znovuotevřel/a tento úkol %[2]s` -issues.commit_ref_at=`odkázal na tento úkol z commitu %[2]s` -issues.ref_issue_from=`odkazoval/a na tento úkol %[4]s %[2]s` -issues.ref_pull_from=`odkazoval/a na tento požadavek na natažení %[4]s %[2]s` -issues.ref_closing_from=`odkazoval/a na požadavek na natažení %[4]s, který uzavře tento úkol %[2]s` -issues.ref_reopening_from=`odkazoval/a na požadavek na natažení %[4]s, který znovu otevře tento úkol %[2]s` -issues.ref_closed_from=`uzavřel/a tento úkol %[4]s %[2]s` -issues.ref_reopened_from=`znovu otevřel/a tento úkol %[4]s %[2]s` -issues.ref_from=`z %[1]s` +issues.closed_at=uzavřel/a tento úkol %[2]s +issues.reopened_at=znovuotevřel/a tento úkol %[2]s +issues.commit_ref_at=odkázal na tento úkol z commitu %[2]s +issues.ref_issue_from=odkazoval/a na tento úkol %[4]s %[2]s +issues.ref_pull_from=odkazoval/a na tento požadavek na natažení %[4]s %[2]s +issues.ref_closing_from=odkazoval/a na požadavek na natažení %[4]s, který uzavře tento úkol %[2]s +issues.ref_reopening_from=odkazoval/a na požadavek na natažení %[4]s, který znovu otevře tento úkol %[2]s +issues.ref_closed_from=uzavřel/a tento úkol %[4]s %[2]s +issues.ref_reopened_from=znovu otevřel/a tento úkol %[4]s %[2]s +issues.ref_from=z %[1]s issues.poster=Autor issues.collaborator=Spolupracovník issues.owner=Vlastník @@ -1382,8 +1322,8 @@ issues.label.filter_sort.reverse_alphabetically=Od konce abecedy issues.label.filter_sort.by_size=Nejmenší velikost issues.label.filter_sort.reverse_by_size=Největší velikost issues.num_participants=%d účastníků -issues.attachment.open_tab=`Klikněte pro zobrazení „%s“ v nové záložce` -issues.attachment.download=`Klikněte pro stažení „%s“` +issues.attachment.open_tab=Klikněte pro zobrazení „%s“ v nové záložce +issues.attachment.download=Klikněte pro stažení „%s“ issues.subscribe=Odebírat issues.unsubscribe=Zrušit odběr issues.lock=Uzamknout konverzaci @@ -1411,31 +1351,31 @@ issues.delete.text=Opravdu chcete tento úkol smazat? (Tím se trvale odstraní issues.tracker=Sledování času issues.start_tracking_short=Spustit časovač issues.start_tracking=Spustit sledování času -issues.start_tracking_history=`započal/a práci %s` +issues.start_tracking_history=započal/a práci %s issues.tracker_auto_close=Časovač se automaticky zastaví po zavření tohoto úkolu -issues.tracking_already_started=`Již jste spustili sledování času na jiném úkolu!` +issues.tracking_already_started=Již jste spustili sledování času na jiném úkolu! issues.stop_tracking=Zastavit časovač -issues.stop_tracking_history=`ukončil/a práci %s` +issues.stop_tracking_history=ukončil/a práci %s issues.cancel_tracking=Zahodit -issues.cancel_tracking_history=`zrušil/a sledování času %s` +issues.cancel_tracking_history=zrušil/a sledování času %s issues.add_time=Přidat čas ručně issues.del_time=Odstranit tento časový záznam issues.add_time_short=Přidat čas issues.add_time_cancel=Zrušit -issues.add_time_history=`přidal/a strávený čas %s` -issues.del_time_history=`odstranil/a strávený čas %s` +issues.add_time_history=přidal/a strávený čas %s +issues.del_time_history=odstranil/a strávený čas %s issues.add_time_hours=Hodiny issues.add_time_minutes=Minuty issues.add_time_sum_to_small=Čas nebyl zadán. issues.time_spent_total=Celkový strávený čas -issues.time_spent_from_all_authors=`Celkový strávený čas: %s` +issues.time_spent_from_all_authors=Celkový strávený čas: %s issues.due_date=Termín dokončení issues.invalid_due_date_format=Termín dokončení musí být ve formátu 'rrrr-mm-dd'. issues.error_modifying_due_date=Změna termínu dokončení selhala. issues.error_removing_due_date=Odstranění termínu dokončení selhalo. issues.push_commit_1=přidal/a %d commit %s issues.push_commits_n=přidal/a %d commity %s -issues.force_push_codes=`vynucené nahrání %[1]s od %[2]s do %[4]s %[6]s` +issues.force_push_codes=vynucené nahrání %[1]s od %[2]s do %[4]s %[6]s issues.due_date_form=rrrr-mm-dd issues.due_date_form_add=Přidat termín dokončení issues.due_date_form_edit=Upravit @@ -1454,8 +1394,8 @@ issues.dependency.add=Přidat závislost… issues.dependency.cancel=Zrušit issues.dependency.remove=Odstranit issues.dependency.remove_info=Odstranit tuto závislost -issues.dependency.added_dependency=`přidal/a novou závislost %s` -issues.dependency.removed_dependency=`odstranil/a závislost %s` +issues.dependency.added_dependency=přidal/a novou závislost %s +issues.dependency.removed_dependency=odstranil/a závislost %s issues.dependency.pr_closing_blockedby=Uzavření tohoto požadavku na natažení je blokováno následujícími úkoly issues.dependency.issue_closing_blockedby=Uzavření tohoto úkolu je blokováno následujícími úkoly issues.dependency.issue_close_blocks=Tento úkol blokuje uzavření následujících úkolů @@ -1508,10 +1448,8 @@ issues.content_history.delete_from_history=Smazat z historie issues.content_history.delete_from_history_confirm=Smazat z historie? issues.content_history.options=Možnosti issues.reference_link=Reference: %s - compare.compare_base=základní compare.compare_head=porovnat - pulls.desc=Povolit požadavky na natažení a posuzování kódu. pulls.new=Nový požadavek na natažení pulls.view=Zobrazit požadavek na natažení @@ -1531,11 +1469,11 @@ pulls.filter_branch=Filtrovat větev pulls.no_results=Nebyly nalezeny žádné výsledky. pulls.nothing_to_compare=Tyto větve jsou stejné. Není potřeba vytvářet požadavek na natažení. pulls.nothing_to_compare_and_allow_empty_pr=Tyto větve jsou stejné. Tento požadavek na natažení bude prázdný. -pulls.has_pull_request=`Požadavek na natažení mezi těmito větvemi již existuje: %[2]s#%[3]d` +pulls.has_pull_request=Požadavek na natažení mezi těmito větvemi již existuje: %[2]s#%[3]d pulls.create=Vytvořit požadavek na natažení pulls.title_desc=chce sloučit %[1]d commity z větve %[2]s do %[3]s pulls.merged_title_desc=sloučil %[1]d commity z větve %[2]s do větve %[3]s před %[4]s -pulls.change_target_branch_at=`změnil/a cílovou větev z %s na %s %s` +pulls.change_target_branch_at=změnil/a cílovou větev z %s na %s %s pulls.tab_conversation=Konverzace pulls.tab_commits=Commity pulls.tab_files=Změněné soubory @@ -1547,7 +1485,7 @@ pulls.manually_merged=Sloučeno ručně pulls.manually_merged_as=Požadavek na natažení byl ručně sloučen jako %[2]s. pulls.is_closed=Požadavek na natažení byl uzavřen. pulls.has_merged=Požadavek na natažení byl sloučen. -pulls.title_wip_desc=`Začněte název s %s a zamezíte tak nechtěnému sloučení požadavku na natažení.` +pulls.title_wip_desc=Začněte název s %s a zamezíte tak nechtěnému sloučení požadavku na natažení. pulls.cannot_merge_work_in_progress=Tento požadavek na natažení je označen jako probíhající práce. pulls.still_in_progress=Stále probíhá? pulls.add_prefix=Přidat prefix %s @@ -1578,7 +1516,6 @@ pulls.reject_count_n=%d žádosti o změnu pulls.waiting_count_1=%d čekající posouzení pulls.waiting_count_n=%d čekající posouzení pulls.wrong_commit_id=ID commitu musí být ID commitu v cílové větvi - pulls.no_merge_desc=Tento požadavek na natažení nemůže být sloučen, protože všechny možnosti repozitáře na sloučení jsou zakázány. pulls.no_merge_helper=Povolte možnosti sloučení v nastavení repozitáře nebo proveďte sloučení požadavku na natažení ručně. pulls.no_merge_wip=Požadavek na natažení nemůže být sloučen protože je označen jako nedokončený. @@ -1591,7 +1528,6 @@ pulls.squash_merge_pull_request=Vytvořit squash commit pulls.merge_manually=Sloučeno ručně pulls.merge_commit_id=ID slučovacího commitu pulls.require_signed_wont_sign=Větev vyžaduje podepsané commity, ale toto sloučení nebude podepsáno - pulls.invalid_merge_option=Nemůžete použít tuto možnost sloučení pro tento požadavek na natažení. pulls.merge_conflict=Sloučení selhalo: Došlo ke konfliktu při sloučení. Tip: Zkuste jinou strategii pulls.merge_conflict_summary=Chybové hlášení @@ -1604,7 +1540,7 @@ pulls.head_out_of_date=Sloučení selhalo: Hlavní revize byla aktualizován př pulls.push_rejected=Sloučení selhalo: Nahrání bylo zamítnuto. Zkontrolujte háčky Gitu pro tento repozitář. pulls.push_rejected_summary=Úplná zpráva o odmítnutí pulls.push_rejected_no_message=Sloučení se nezdařilo: Nahrání bylo odmítnuto, ale nebyla nalezena žádná vzdálená zpráva.
    Zkontrolujte háčky gitu pro tento repozitář -pulls.open_unmerged_pull_exists=`Nemůžete provést operaci znovuotevření protože je tu čekající požadavek na natažení (#%d) s identickými vlastnostmi.` +pulls.open_unmerged_pull_exists=Nemůžete provést operaci znovuotevření protože je tu čekající požadavek na natažení (#%d) s identickými vlastnostmi. pulls.status_checking=Některé kontroly jsou nedořešeny pulls.status_checks_success=Všechny kontroly byly úspěšné pulls.status_checks_warning=Některé kontroly nahlásily varování @@ -1617,27 +1553,22 @@ pulls.update_branch_rebase=Aktualizovat větev pomocí rebase pulls.update_branch_success=Aktualizace větve byla úspěšná pulls.update_not_allowed=Nemáte oprávnění aktualizovat větev pulls.outdated_with_base_branch=Tato větev je zastaralá oproti základní větvi -pulls.closed_at=`uzavřel/a tento požadavek na natažení %[2]s` -pulls.reopened_at=`znovuotevřel/a tento požadavek na natažení %[2]s` -pulls.merge_instruction_hint=`Můžete také zobrazit instrukce příkazové řádky.` +pulls.closed_at=uzavřel/a tento požadavek na natažení %[2]s +pulls.reopened_at=znovuotevřel/a tento požadavek na natažení %[2]s +pulls.merge_instruction_hint=Můžete také zobrazit instrukce příkazové řádky. pulls.merge_instruction_step1_desc=Z vašeho repositáře projektu se podívejte na novou větev a vyzkoušejte změny. pulls.merge_instruction_step2_desc=Slučte změny a aktualizujte je na Gitea. - pulls.auto_merge_button_when_succeed=(Když kontroly uspějí) pulls.auto_merge_when_succeed=Automaticky sloučit, když všechny kontroly uspějí pulls.auto_merge_newly_scheduled=Požadavek na natažení byl naplánován na sloučení, jakmile všechny kontroly uspějí. pulls.auto_merge_has_pending_schedule=%[1]s naplánoval/a tento požadavek na natažení pro automatické sloučení, když všechny kontroly uspějí v %[2]s. - pulls.auto_merge_cancel_schedule=Zrušit automatické sloučení pulls.auto_merge_not_scheduled=Tento požadavek na natažení není naplánován na automatické sloučení. pulls.auto_merge_canceled_schedule=Automatické sloučení bylo zrušeno pro tento požadavek na natažení. - -pulls.auto_merge_newly_scheduled_comment=`požadavek na automatické sloučení tohoto požadavku na natažení je naplánován, když všechny kontroly uspějí %[1]s` -pulls.auto_merge_canceled_schedule_comment=`zrušil/a automatické sloučení tohoto požadavku na natažení, když všechny kontroly uspějí %[1]s` - +pulls.auto_merge_newly_scheduled_comment=požadavek na automatické sloučení tohoto požadavku na natažení je naplánován, když všechny kontroly uspějí %[1]s +pulls.auto_merge_canceled_schedule_comment=zrušil/a automatické sloučení tohoto požadavku na natažení, když všechny kontroly uspějí %[1]s pulls.delete.title=Odstranit tento požadavek na natažení? pulls.delete.text=Opravdu chcete tento požadavek na natažení smazat? (Tím se trvale odstraní veškerý obsah. Pokud jej hodláte archivovat, zvažte raději jeho uzavření.) - milestones.new=Nový milník milestones.closed=Zavřen dne %s milestones.update_ago=Aktualizováno před %s @@ -1667,7 +1598,6 @@ milestones.filter_sort.least_complete=Nejméně dokončené milestones.filter_sort.most_complete=Nejvíce dokončené milestones.filter_sort.most_issues=Nejvíce úkolů milestones.filter_sort.least_issues=Nejméně úkolů - signing.will_sign=Tento commit bude podepsána klíčem '%s' signing.wont_sign.error=Došlo k chybě při kontrole, zda může být commit podepsán signing.wont_sign.nokey=K podpisu tohoto commitu není k dispozici žádný klíč @@ -1681,10 +1611,8 @@ signing.wont_sign.headsigned=Sloučení nebude podepsáno, protože hlavní revi signing.wont_sign.commitssigned=Sloučení nebude podepsáno, protože všechny přidružené revize nejsou podepsány signing.wont_sign.approved=Sloučení nebude podepsáno, protože požadavek na natažení není schválen signing.wont_sign.not_signed_in=Nejste přihlášeni - ext_wiki=Přístup k externí Wiki ext_wiki.desc=Odkaz do externí Wiki. - wiki=Wiki wiki.welcome=Vítejte ve Wiki. wiki.welcome_desc=Wiki vám umožní psát a sdílet dokumentaci se spolupracovníky. @@ -1708,7 +1636,6 @@ wiki.reserved_page=Jméno Wiki stránky „%s“ je rezervováno. wiki.pages=Stránky wiki.last_updated=Naposledy aktualizováno: %s wiki.page_name_desc=Zadejte název této Wiki stránky. Některé speciální názvy jsou: „Home“, „_Sidebar“ a „_Footer“. - activity=Aktivita activity.period.filter_label=Období: activity.period.daily=1 den @@ -1774,7 +1701,6 @@ activity.git_stats_addition_n=%d přidání activity.git_stats_and_deletions=a activity.git_stats_deletion_1=%d odebrání activity.git_stats_deletion_n=%d odebrání - search=Vyhledat search.search_repo=Hledat repozitář search.type.tooltip=Druh vyhledávání @@ -1785,7 +1711,6 @@ search.match.tooltip=Zahrnout pouze výsledky, které odpovídají přesnému hl search.results=Výsledky hledání „%s“ v %s search.code_no_results=Nebyl nalezen žádný zdrojový kód odpovídající hledanému výrazu. search.code_search_unavailable=V současné době není vyhledávání kódu dostupné. Obraťte se na správce webu. - settings=Nastavení settings.desc=Nastavení je místo, kde můžete měnit nastavení repozitáře settings.options=Repozitář @@ -2090,10 +2015,10 @@ settings.dismiss_stale_approvals=Odmítnout nekvalitní schválení settings.dismiss_stale_approvals_desc=Pokud budou do větve nahrány nové revize, které mění obsah tohoto požadavku na natažení, všechna stará schválení budou zamítnuta. settings.require_signed_commits=Vyžadovat podepsané revize settings.require_signed_commits_desc=Odmítnout nahrání do této větve pokud nejsou podepsaná nebo jsou neověřitelná. -settings.protect_protected_file_patterns=Chráněné vzory souborů (oddělené středníkem „\;“): -settings.protect_protected_file_patterns_desc=Chráněné soubory, které nemají povoleno být měněny přímo, i když uživatel má právo přidávat, upravovat nebo mazat soubory v této větvi. Více vzorů lze oddělit pomocí středníku („\;“). Podívejte se na github.com/gobwas/glob dokumentaci pro syntaxi vzoru. Příklady: .drone.yml, /docs/**/*.txt. -settings.protect_unprotected_file_patterns=Nechráněné vzory souborů (oddělené středníkem „\;“): -settings.protect_unprotected_file_patterns_desc=Nechráněné soubory, které je možné měnit přímo, pokud má uživatel právo zápisu, čímž se obejde omezení push. Více vzorů lze oddělit pomocí středníku ('\;'). Podívejte se na github.com/gobwas/glob dokumentaci pro syntaxi vzoru. Příklady: .drone.yml, /docs/**/*.txt. +settings.protect_protected_file_patterns=Chráněné vzory souborů (oddělené středníkem „;“): +settings.protect_protected_file_patterns_desc=Chráněné soubory, které nemají povoleno být měněny přímo, i když uživatel má právo přidávat, upravovat nebo mazat soubory v této větvi. Více vzorů lze oddělit pomocí středníku („;“). Podívejte se na github.com/gobwas/glob dokumentaci pro syntaxi vzoru. Příklady: .drone.yml, /docs/**/*.txt. +settings.protect_unprotected_file_patterns=Nechráněné vzory souborů (oddělené středníkem „;“): +settings.protect_unprotected_file_patterns_desc=Nechráněné soubory, které je možné měnit přímo, pokud má uživatel právo zápisu, čímž se obejde omezení push. Více vzorů lze oddělit pomocí středníku (';'). Podívejte se na github.com/gobwas/glob dokumentaci pro syntaxi vzoru. Příklady: .drone.yml, /docs/**/*.txt. settings.add_protected_branch=Zapnout ochranu settings.delete_protected_branch=Vypnout ochranu settings.update_protect_branch_success=Ochrana větví pro větev „%s“ byla aktualizována. @@ -2173,7 +2098,6 @@ settings.rename_branch_success=Větev %s byla úspěšně přejmenována na %s. settings.rename_branch_from=starý název větve settings.rename_branch_to=nový název větve settings.rename_branch=Přejmenovat větev - diff.browse_source=Procházet zdrojové kódy diff.parent=rodič diff.commit=revize @@ -2225,7 +2149,6 @@ diff.image.side_by_side=Vedle sebe diff.image.swipe=Posunout diff.image.overlay=Překrytí diff.has_escaped=Tento řádek má skryté znaky Unicode - releases.desc=Sledování verzí projektu a souborů ke stažení. release.releases=Vydání release.detail=Podrobnosti vydání @@ -2267,7 +2190,6 @@ release.downloads=Soubory ke stažení release.download_count=Stažení: %s release.add_tag_msg=Použít název a obsah vydání jako zprávu značky. release.add_tag=Vytvořit pouze značku - branch.name=Jméno větve branch.search=Hledat větve branch.already_exists=Větev pojmenovaná „%s“ již existuje. @@ -2299,25 +2221,59 @@ branch.create_branch_operation=Vytvořit větev branch.new_branch=Vytvořit novou větev branch.new_branch_from=Vytvořit novou větev z „%s“ branch.renamed=Větev %s byla přejmenována na %s. - tag.create_tag=Vytvořit značku %s tag.create_tag_operation=Vytvořit značku tag.confirm_create_tag=Vytvořit značku tag.create_tag_from=Vytvořit novou značku z „%s“ - tag.create_success=Značka „%s“ byla vytvořena. - topic.manage_topics=Spravovat témata topic.done=Hotovo topic.count_prompt=Nelze vybrat více než 25 témat topic.format_prompt=Téma musí začínat písmenem nebo číslem, může obsahovat pomlčky („-“) a může být dlouhé až 35 znaků. - find_file.go_to_file=Přejít na soubor find_file.no_matching=Nebyl nalezen žádný odpovídající soubor - error.csv.too_large=Tento soubor nelze vykreslit, protože je příliš velký. error.csv.unexpected=Tento soubor nelze vykreslit, protože obsahuje neočekávaný znak na řádku %d ve sloupci %d. error.csv.invalid_field_count=Soubor nelze vykreslit, protože má nesprávný počet polí na řádku %d. +filter_branch_and_tag=Filtr pro větev nebo značku +find_tag=Najít značku +branches=Větve +tags=Značky +issues=Úkoly +pulls=Požadavky na natažení +project_board=Projekty +packages=Balíčky +labels=Štítky +org_labels_desc=Štítky na úrovni organizace, které mohou být použity se všemi repozitáři v rámci této organizace +org_labels_desc_manage=spravovat +milestones=Milníky +commits=Commity +commit=Commit +release=Vydání +releases=Vydání +tag=Značka +released_this=vydal/a toto +file.title=%s v %s +file_raw=Surový +file_history=Historie +file_view_source=Zobrazit zdroj +file_view_rendered=Zobrazit vykreslené +file_view_raw=Zobrazit v surovém stavu +file_permalink=Trvalý odkaz +file_too_large=Soubor je příliš velký pro zobrazení. +invisible_runes_header=Tento soubor obsahuje neviditelné znaky Unicode! +commit.operations=Operace +projects.card_type.images_and_text=Obrázky a text +projects.card_type.text_only=Pouze text +issues.filter_project=Projekt +issues.filter_project_all=Všechny projekty +issues.filter_project_none=Žádný projekt +issues.label_exclusive=Exkluzivní +settings.branches.add_new_rule=Přidat nové pravidlo +settings.authorization_header=Autorizační hlavička +settings.authorization_header_desc=Pokud vyplněno, bude připojeno k požadavkům jako autorizační hlavička. Příklady: %s. +settings.protected_branch.save_rule=Uložit pravidlo +settings.protected_branch.delete_rule=Odstranit pravidlo [org] org_name_holder=Název organizace @@ -2341,11 +2297,9 @@ team_access_desc=Přístup k repozitáři team_permission_desc=Oprávnění team_unit_desc=Povolit přístup do částí repozitáře team_unit_disabled=(zakázaná) - form.name_reserved=Název organizace „%s“ je rezervován. form.name_pattern_not_allowed=Vzor „%s“ není povolený v názvu organizace. form.create_org_not_allowed=Nemáte oprávnění vytvářet nové organizace. - settings=Nastavení settings.options=Organizace settings.full_name=Celé jméno @@ -2359,7 +2313,6 @@ settings.visibility.limited=Omezená (viditelné jen pro přihlášené uživate settings.visibility.limited_shortname=Omezený settings.visibility.private=Soukromá (viditelné jen členům organizace) settings.visibility.private_shortname=Soukromý - settings.update_settings=Upravit nastavení settings.update_setting_success=Nastavení organizace bylo upraveno. settings.change_orgname_prompt=Poznámka: změna názvu organizace změní i její URL. @@ -2372,9 +2325,7 @@ settings.confirm_delete_account=Potvrdit smazání settings.delete_org_title=Smazat organizaci settings.delete_org_desc=Tato organizace bude trvale smazána. Pokračovat? settings.hooks_desc=Přidat webové háčky, které budou spouštěny pro všechny repozitáře v této organizaci. - settings.labels_desc=Přidejte štítky, které mohou být použity pro úkoly všech repositářů v rámci této organizace. - members.membership_visibility=Viditelnost členství: members.public=Viditelný members.public_helper=skrýt @@ -2389,7 +2340,6 @@ members.leave=Opustit members.leave.detail=Opustit %s? members.invite_desc=Přidat nového člena do %s: members.invite_now=Pozvat teď - teams.join=Připojit teams.leave=Opustit teams.leave.detail=Opustit %s? @@ -2441,6 +2391,7 @@ teams.all_repositories_admin_permission_desc=Tomuto týmu je udělen Adm teams.invite.title=Byli jste pozváni do týmu %s v organizaci %s. teams.invite.by=Pozvání od %s teams.invite.description=Pro připojení k týmu klikněte na tlačítko níže. +members=Členové [admin] dashboard=Přehled @@ -2456,7 +2407,6 @@ monitor=Sledování first_page=První last_page=Poslední total=Celkem: %d - dashboard.new_version_hint=Gitea %s je nyní k dispozici, používáte %s. Pro více informací si přečtěte blog. dashboard.statistic=Souhrn dashboard.operations=Operace údržby @@ -2534,7 +2484,6 @@ dashboard.delete_old_actions=Odstranit všechny staré akce z databáze dashboard.delete_old_actions.started=Začalo odstraňování všech starých akcí z databáze. dashboard.update_checker=Kontrola aktualizací dashboard.delete_old_system_notices=Odstranit všechna stará systémová upozornění z databáze - users.user_manage_panel=Správa uživatelských účtů users.new_account=Vytvořit uživatelský účet users.name=Uživatelské jméno @@ -2588,7 +2537,6 @@ users.list_status_filter.is_prohibit_login=Zakázat přihlášení users.list_status_filter.not_prohibit_login=Povolit přihlášení users.list_status_filter.is_2fa_enabled=2FA povoleno users.list_status_filter.not_2fa_enabled=2FA zakázáno - emails.email_manage_panel=Správa e-mailů uživatele emails.primary=Hlavní emails.activated=Aktivován @@ -2601,13 +2549,11 @@ emails.not_updated=Aktualizace požadované e-mailové adresy se nezdařila: %v emails.duplicate_active=Tato e-mailová adresa je již aktivní pro jiného uživatele. emails.change_email_header=Aktualizovat vlastnosti e-mailu emails.change_email_text=Opravdu chcete aktualizovat tuto e-mailovou adresu? - orgs.org_manage_panel=Správa organizací orgs.name=Název orgs.teams=Týmy orgs.members=Členové orgs.new_orga=Nová organizace - repos.repo_manage_panel=Správa repozitáře repos.unadopted=Nepřijaté repozitáře repos.unadopted.no_more=Nebyly nalezeny žádné další nepřijaté repositáře @@ -2619,7 +2565,6 @@ repos.stars=Oblíbení repos.forks=Rozštěpení repos.issues=Úkoly repos.size=Velikost - packages.package_manage_panel=Správa balíčků packages.total_size=Celková velikost: %s packages.owner=Vlastník @@ -2630,17 +2575,14 @@ packages.type=Typ packages.repository=Repozitář packages.size=Velikost packages.published=Publikováno - defaulthooks=Výchozí webové háčky defaulthooks.desc=Webové háčky automaticky vytvářejí HTTP POST dotazy na server při určitých Gitea událostech. Webové háčky definované zde jsou výchozí a budou zkopírovány do všech nových repozitářů. Přečtěte si více v průvodci webovými háčky. defaulthooks.add_webhook=Přidat výchozí webový háček defaulthooks.update_webhook=Aktualizovat výchozí webový háček - systemhooks=Systémové webové háčky systemhooks.desc=Webové háčky automaticky vytvářejí HTTP POST dotazy na server při určitých Gitea událostech. Webové háčky definované zde budou vykonány na všech repozitářích systému, proto prosím zvažte jakékoli důsledky, které to může mít na výkon. Přečtěte si více v průvodci webovými háčky. systemhooks.add_webhook=Přidat systémový webový háček systemhooks.update_webhook=Aktualizovat systémový webový háček - auths.auth_manage_panel=Správa zdroje ověřování auths.new=Přidat zdroj ověřování auths.name=Název @@ -2755,7 +2697,6 @@ auths.still_in_used=Zdroj ověřování je stále používán. Nejprve převeďt auths.deletion_success=Zdroj ověřování byl smazán. auths.login_source_exist=Zdroj ověřování '%s' již existuje. auths.login_source_of_type_exist=Zdroj ověřování tohoto typu již existuje. - config.server_config=Nastavení serveru config.app_name=Název stránky config.app_ver=Verze Gitea @@ -2774,7 +2715,6 @@ config.static_file_root_path=Kořenový adresář statického souboru config.log_file_root_path=Adresář logů config.script_type=Typ skriptu config.reverse_auth_user=Uživatel obráceného ověření - config.ssh_config=Nastavení SSH config.ssh_enabled=Zapnutý config.ssh_start_builtin_server=Použít vestavěný server @@ -2786,12 +2726,10 @@ config.ssh_key_test_path=Cesta testu klíčů config.ssh_keygen_path=Cesta ke generátoru klíčů ('ssh-keygen') config.ssh_minimum_key_size_check=Kontrola minimální velikosti klíčů config.ssh_minimum_key_sizes=Minimální velikost klíčů - config.lfs_config=Nastavení LFS config.lfs_enabled=Povoleno config.lfs_content_path=Cesta k obsahu LFS config.lfs_http_auth_expiry=Vypršení autorizace LFS HTTPS - config.db_config=Nastavení databáze config.db_type=Typ config.db_host=Server @@ -2800,7 +2738,6 @@ config.db_user=Uživatelské jméno config.db_schema=Schéma config.db_ssl_mode=SSL config.db_path=Cesta - config.service_config=Nastavení služby config.register_email_confirm=Pro registraci vyžadovat potvrzení e-mailu config.disable_register=Vypnout možnost uživatelské registrace @@ -2823,12 +2760,10 @@ config.default_allow_only_contributors_to_track_time=Povolit sledování času p config.no_reply_address=Skrytá e-mailová doména config.default_visibility_organization=Výchozí viditelnost pro nové organizace config.default_enable_dependencies=Povolit závislosti úkolů ve výchozím stavu - config.webhook_config=Nastavení webových háčků config.queue_length=Délka fronty config.deliver_timeout=Časový limit doručení config.skip_tls_verify=Přeskočit verifikaci TLS - config.mailer_config=Nastavení odesílání e-mailů config.mailer_enabled=Zapnutý config.mailer_enable_helo=Povolit HELO @@ -2846,16 +2781,13 @@ config.test_email_placeholder=E-mail (např.: test@example.com) config.send_test_mail=Odeslat zkušební e-mail config.test_mail_failed=Odeslání testovacího e-mailu na „%s“ selhalo: %v config.test_mail_sent=Zkušební e-mail byl odeslán na „%s“. - config.oauth_config=Nastavení ověření OAuth config.oauth_enabled=Zapnutý - config.cache_config=Nastavení mezipaměti config.cache_adapter=Adaptér mezipaměti config.cache_interval=Interval mezipaměti config.cache_conn=Připojení mezipaměti config.cache_item_ttl=Čas vypršení položky v mezipaměti - config.session_config=Nastavení relace config.session_provider=Poskytovatel relace config.provider_config=Nastavení poskytovatele @@ -2864,12 +2796,10 @@ config.gc_interval_time=Čas intervalu GC config.session_life_time=Doba trvání relace config.https_only=Pouze protokol HTTPS config.cookie_life_time=Doba života souboru cookie - config.picture_config=Nastavení obrázku a avataru config.picture_service=Služba ikon uživatelů config.disable_gravatar=Zakázat službu Gravatar config.enable_federated_avatar=Povolit avatary z veřejných zdrojů - config.git_config=Konfigurace Gitu config.git_disable_diff_highlight=Zakázat zvýraznění syntaxe v rozdílovém zobrazení config.git_max_diff_lines=Maximální počet rozdílových řádků jednoho souboru @@ -2881,7 +2811,6 @@ config.git_mirror_timeout=Časový limit aktualizace zrcadla config.git_clone_timeout=Časový limit operace naklonování config.git_pull_timeout=Časový limit operace stažení config.git_gc_timeout=Časový limit operace GC - config.log_config=Nastavení logů config.log_mode=Způsob logování config.own_named_logger=Pojmenovaný logger @@ -2893,10 +2822,8 @@ config.access_log_mode=Režim logování přístupu config.access_log_template=Šablona config.xorm_log_mode=Režim logování XORM config.xorm_log_sql=Logovat SQL - config.get_setting_failed=Získání nastavení %s se nezdařilo config.set_setting_failed=Nastavení %s se nezdařilo - monitor.cron=Naplánované úlohy monitor.name=Název monitor.schedule=Rozvrh @@ -2948,7 +2875,6 @@ monitor.queue.pool.pause.submit=Pozastavit frontu monitor.queue.pool.resume.title=Pokračovat ve frontě monitor.queue.pool.resume.desc=Nastavte tuto frontu pro pokračování práce monitor.queue.pool.resume.submit=Pokračovat ve frontě - monitor.queue.settings.title=Nastavení fondu monitor.queue.settings.desc=Fondy dynamicky rostou se zesílením v závislosti na blokování jejich pracovní fronty. Tyto změny neovlivní aktuální pracovní skupiny. monitor.queue.settings.timeout=Časový limit posílení @@ -2964,7 +2890,6 @@ monitor.queue.settings.submit=Aktualizovat nastavení monitor.queue.settings.changed=Nastavení aktualizováno monitor.queue.settings.blocktimeout=Aktuální časový limit blokování monitor.queue.settings.blocktimeout.value=%[1]v - monitor.queue.pool.none=Tato fronta nemá fond monitor.queue.pool.added=Přidána skupina workerů monitor.queue.pool.max_changed=Maximální počet workerů se změnil @@ -2974,7 +2899,6 @@ monitor.queue.pool.cancel=Vypnout skupinu workerů monitor.queue.pool.cancelling=Skupina workerů se vypíná monitor.queue.pool.cancel_notices=Vypnout tuto skupinu %s workerů? monitor.queue.pool.cancel_desc=Opustit frontu bez skupin workerů může způsobit zablokování požadavků na neurčito. - notices.system_notice_list=Systémová oznámení notices.view_detail_header=Zobrazit detaily oznámení notices.actions=Akce @@ -2989,20 +2913,25 @@ notices.type_2=Úloha notices.desc=Popis notices.op=Akce notices.delete_success=Systémové upozornění bylo smazáno. +dashboard.stop_zombie_tasks=Zastavit zombie úkoly +dashboard.stop_endless_tasks=Zastavit nekonečné úkoly +dashboard.cancel_abandoned_jobs=Zrušit opuštěné úlohy +auths.oauth2_map_group_to_team_removal=Odebrat uživatele z synchronizovaných týmů, pokud uživatel nepatří do odpovídající skupiny. +notices.operations=Operace [action] create_repo=vytvořil/a repozitář %s rename_repo=přejmenoval/a repozitář z %[1]s na %[3]s commit_repo=nahrál/a do %[3]s v %[4]s -create_issue=`otevřel/a úkol %[3]s#%[2]s` -close_issue=`uzavřel/a úkol %[3]s#%[2]s` -reopen_issue=`znovuotevřel/a úkol %[3]s#%[2]s` -create_pull_request=`vytvořil/a požadavek na natažení %[3]s#%[2]s` -close_pull_request=`uzavřel/a požadavek na natažení %[3]s#%[2]s` -reopen_pull_request=`znovuotevřel/a požadavek na natažení %[3]s#%[2]s` -comment_issue=`okomentoval/a problém %[3]s#%[2]s` -comment_pull=`okomentoval/a požadavek na natažení %[3]s#%[2]s` -merge_pull_request=`sloučil/a požadavek na natažení %[3]s#%[2]s` +create_issue=otevřel/a úkol %[3]s#%[2]s +close_issue=uzavřel/a úkol %[3]s#%[2]s +reopen_issue=znovuotevřel/a úkol %[3]s#%[2]s +create_pull_request=vytvořil/a požadavek na natažení %[3]s#%[2]s +close_pull_request=uzavřel/a požadavek na natažení %[3]s#%[2]s +reopen_pull_request=znovuotevřel/a požadavek na natažení %[3]s#%[2]s +comment_issue=okomentoval/a problém %[3]s#%[2]s +comment_pull=okomentoval/a požadavek na natažení %[3]s#%[2]s +merge_pull_request=sloučil/a požadavek na natažení %[3]s#%[2]s transfer_repo=předal/a repozitář %s uživateli/organizaci %s push_tag=nahrál/a značku %[3]s do %[4]s delete_tag=smazal/a značku %[2]s z %[3]s @@ -3013,14 +2942,15 @@ compare_commits_general=Porovnat revize mirror_sync_push=synchronizoval/a commity do %[3]s v %[4]s ze zrcadla mirror_sync_create=synchronizoval/a novou referenci %[3]s do %[4]s ze zrcadla mirror_sync_delete=synchronizoval/a a smazal/a referenci %[2]s v %[3]s ze zrcadla -approve_pull_request=`schválil/a %[3]s#%[2]s` -reject_pull_request=`navrhl/a změny pro %[3]s#%[2]s` -publish_release=`vydal/a "%[4]s" v %[3]s` -review_dismissed=`zamítl/a posouzení z %[4]s pro %[3]s#%[2]s` +approve_pull_request=schválil/a %[3]s#%[2]s +reject_pull_request=navrhl/a změny pro %[3]s#%[2]s +publish_release=vydal/a "%[4]s" v %[3]s +review_dismissed=zamítl/a posouzení z %[4]s pro %[3]s#%[2]s review_dismissed_reason=Důvod: create_branch=vytvořil/a větev %[3]s v %[4]s starred_repo=si oblíbil/a %[2]s watched_repo=začal/a sledovat %[2]s +auto_merge_pull_request=automaticky sloučen požadavek na natažení %[3]s#%[2]s [tool] ago=před %s @@ -3104,7 +3034,7 @@ details.project_site=Stránka projektu details.license=Licence assets=Prostředky versions=Verze -versions.on= +versions.on= versions.view_all=Zobrazit všechny dependency.id=ID dependency.version=Verze @@ -3179,4 +3109,93 @@ settings.delete.description=Smazání balíčku je trvalé a nelze ho vrátit zp settings.delete.notice=Chystáte se odstranit %s (%s). Tato operace je nevratná, jste si jisti? settings.delete.success=Balíček byl odstraněn. settings.delete.error=Nepodařilo se odstranit balíček. - +details.repository_site=Stránka repositáře +details.documentation_site=Stránka dokumentace +cargo.install=Chcete-li nainstalovat balíček pomocí Cargo, spusťte následující příkaz: +cargo.documentation=Další informace o registru Cargo naleznete v dokumentaci. +cargo.details.repository_site=Stránka repositáře +cargo.details.documentation_site=Stránka dokumentace +chef.registry=Nastavit tento registr v souboru ~/.chef/config.rb: +chef.install=Pro instalaci balíčku spusťte následující příkaz: +chef.documentation=Další informace o registru Chef naleznete v dokumentaci. +conda.registry=Nastavte tento registr jako Conda repozitář ve vašem .condarc: +conda.install=Pro instalaci balíčku pomocí Conda spusťte následující příkaz: +conda.documentation=Další informace o registru Conda naleznete v dokumentaci. +conda.details.repository_site=Stránka repositáře +conda.details.documentation_site=Stránka dokumentace +owner.settings.cargo.initialize=Inicializovat index +owner.settings.cargo.initialize.description=K použití registru Cargo je zapotřebí speciální indexový repozitář git. Zde jej můžete (znovu) vytvořit s požadovanou konfigurací. +owner.settings.cargo.initialize.error=Nepodařilo se inicializovat Cargo index: %v +owner.settings.cargo.initialize.success=Index Cargo byl úspěšně vytvořen. +owner.settings.cargo.rebuild=Znovu vytvořit Index +owner.settings.cargo.rebuild.description=Pokud index není synchronizován s uloženými balíčky Cargo, můžete jej zde obnovit. +owner.settings.cargo.rebuild.error=Obnovení Cargo indexu se nezdařilo: %v +owner.settings.cargo.rebuild.success=Cargo Index byl úspěšně obnoven. +owner.settings.cleanuprules.title=Spravovat pravidla pro čištění +owner.settings.cleanuprules.add=Přidat pravidlo pro čištění +owner.settings.cleanuprules.edit=Upravit pravidlo pro čištění +owner.settings.cleanuprules.none=Nejsou k dispozici žádná pravidla čištění. Přečtěte si dokumentaci a dozvíte se více. +owner.settings.cleanuprules.preview=Náhled pravidla pro čištění +owner.settings.cleanuprules.preview.overview=%d balíčků má být odstraněno. +owner.settings.cleanuprules.preview.none=Pravidlo čištění neodpovídá žádným balíčkům. +owner.settings.cleanuprules.enabled=Povolený +owner.settings.cleanuprules.pattern_full_match=Použít vzor na úplný název balíčku +owner.settings.cleanuprules.keep.title=Verze, které odpovídají těmto pravidlům, jsou zachovány, i když odpovídají níže uvedenému pravidlu pro odstranění. +owner.settings.cleanuprules.keep.count=Zachovat nejnovější +owner.settings.cleanuprules.keep.count.1=1 verze na balíček +owner.settings.cleanuprules.keep.count.n=%d verzí na balíček +owner.settings.cleanuprules.keep.pattern=Ponechat odpovídající verze +owner.settings.cleanuprules.keep.pattern.container=U balíčků Container je vždy zachována nejnovější verze. +owner.settings.cleanuprules.remove.title=Verze, které odpovídají těmto pravidlům, jsou odstraněny, pokud výše uvedené pravidlo neukládá jejich zachování. +owner.settings.cleanuprules.remove.days=Odstranit verze starší než +owner.settings.cleanuprules.remove.pattern=Odstranit odpovídající verze +owner.settings.cleanuprules.success.update=Pravidlo pro čištění bylo aktualizováno. +owner.settings.cleanuprules.success.delete=Pravidlo pro čištění bylo odstraněno. +owner.settings.chef.keypair=Generovat pár klíčů + +[aria] +navbar=Navigační lišta +footer=Patička +footer.software=O softwaru +footer.links=Odkazy + +[secrets] +secrets=Tajné klíče +value=Hodnota +name=Název + +[actions] +actions=Akce +unit.desc=Spravovat akce +status.unknown=Neznámý +status.waiting=Čekání +status.running=Probíhá +status.success=Úspěch +status.failure=Chyba +status.cancelled=Zrušeno +status.skipped=Přeskočeno +status.blocked=Blokováno +runners.status=Status +runners.id=ID +runners.name=Název +runners.owner_type=Typ +runners.description=Popis +runners.labels=Štítky +runners.last_online=Poslední čas online +runners.agent_labels=Štítky agenta +runners.custom_labels=Vlastní štítky +runners.custom_labels_helper=Vlastní štítky jsou štítky, které správce přidává ručně. Štítky se oddělují čárkou, bílé znaky na začátku a na konci každého štítku se ignorují. +runners.task_list.run=Spustit +runners.task_list.status=Status +runners.task_list.repository=Repozitář +runners.task_list.commit=Commit +runners.task_list.done_at=Dokončeno v +runners.update_runner=Aktualizovat změny +runners.status.unspecified=Neznámý +runners.status.idle=Nečinný +runners.status.active=Aktivní +runners.status.offline=Offline +runs.all_workflows=Všechny pracovní postupy +runs.open_tab=%d otevřeno +runs.closed_tab=%d uzavřeno +runs.commit=Commit diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini index d8874fd5fa82..6d93ba40b885 100644 --- a/options/locale/locale_de-DE.ini +++ b/options/locale/locale_de-DE.ini @@ -23,7 +23,6 @@ enable_javascript=Diese Webseite funktioniert besser mit JavaScript. toc=Inhaltsverzeichnis licenses=Lizenzen return_to_gitea=Zurück zu Gitea - username=Benutzername email=E-Mail-Adresse password=Passwort @@ -33,7 +32,6 @@ captcha=CAPTCHA twofa=Zwei-Faktor-Authentifizierung twofa_scratch=Zwei-Faktor-Einmalpasswort passcode=PIN - webauthn_insert_key=Hardware-Sicherheitsschlüssel einstecken webauthn_sign_in=Drücke den Knopf auf deinem Sicherheitsschlüssel. Wenn dein Sicherheitsschlüssel keinen Knopf hat, stecke ihn erneut ein. webauthn_press_button=Drücke den Knopf auf deinem Sicherheitsschlüssel… @@ -47,7 +45,6 @@ webauthn_error_duplicated=Für diese Anfrage ist der Sicherheitsschlüssel nicht webauthn_error_empty=Du musst einen Namen für diesen Schlüssel festlegen. webauthn_error_timeout=Das Zeitlimit wurde erreicht, bevor dein Schlüssel gelesen werden konnte. Bitte lade die Seite erneut. webauthn_reload=Neu laden - repository=Repository organization=Organisation mirror=Mirror @@ -65,18 +62,15 @@ settings=Einstellungen your_profile=Profil your_starred=Favoriten your_settings=Einstellungen - all=Alle sources=Quellen mirrors=Mirrors collaborative=Kollaborativ forks=Forks - activities=Aktivitäten pull_requests=Pull-Requests issues=Issues milestones=Meilensteine - ok=OK cancel=Abbrechen save=Speichern @@ -85,26 +79,22 @@ add_all=Alle hinzufügen remove=Löschen remove_all=Alle entfernen edit=Bearbeiten - copy=Kopieren copy_url=URL kopieren copy_branch=Branchenname kopieren copy_success=Kopiert! copy_error=Kopieren fehlgeschlagen - write=Verfassen preview=Vorschau loading=Laden… - step1=Schritt 1: step2=Schritt 2: - error=Fehler error404=Die Seite, die du gerade versuchst aufzurufen, existiert entweder nicht oder du bist nicht berechtigt, diese anzusehen. - never=Niemals - rss_feed=RSS Feed +enabled=Aktiviert +disabled=Deaktiviert [filter] @@ -157,7 +147,6 @@ err_empty_admin_email=Die Administrator-E-Mail darf nicht leer sein. err_admin_name_is_reserved=Administratornutzername ist ungültig, der Nutzername ist reserviert err_admin_name_pattern_not_allowed=Administrator-Benutzername ist ungültig, der Benutzername entspricht einem reservierten Muster err_admin_name_is_invalid=Administratornutzername ist ungültig - general_title=Allgemeine Einstellungen app_name=Seitentitel app_name_helper=Du kannst hier den Namen deines Unternehmens eingeben. @@ -177,7 +166,6 @@ app_url=Gitea-Basis-URL app_url_helper=Adresse für HTTP(S)-Klon-URLs und E-Mail-Benachrichtigungen. log_root_path=Logdateipfad log_root_path_helper=Log-Dateien werden in diesem Verzeichnis gespeichert. - optional_title=Optionale Einstellungen email_title=E-Mail-Einstellungen smtp_from=E-Mail senden als @@ -234,6 +222,8 @@ no_reply_address=Versteckte E-Mail-Domain no_reply_address_helper=Domain-Name für Benutzer mit einer versteckten Emailadresse. Zum Beispiel wird der Benutzername „Joe“ in Git als „joe@noreply.example.org“ protokolliert, wenn die versteckte E-Mail-Domain „noreply.example.org“ festgelegt ist. password_algorithm=Passwort Hashing Algorithmus password_algorithm_helper=Lege den Passwort Hashing Algorithmus fest. Unterschiedliche Algorithmen haben unterschiedliche Voraussetzungen und Stärken. "Argon2" ist zwar sehr sicher, aber auch sehr speicherhungrig, und somit nicht für schwache Systeme geeignet. +smtp_addr=SMTP-Host +smtp_port=SMTP-Port [home] uname_holder=E-Mail-Adresse oder Benutzername @@ -249,17 +239,14 @@ search_repos=Finde ein Repository… filter=Andere Filter filter_by_team_repositories=Nach Team-Repositorys filtern feed_of=Feed von "%s" - show_archived=Archiviert show_both_archived_unarchived=Archivierte und nicht archivierte anzeigen show_only_archived=Nur archivierte anzeigen show_only_unarchived=Nur nicht archivierte anzeigen - show_private=Privat show_both_private_public=Öffentliche und private anzeigen show_only_private=Nur private anzeigen show_only_public=Nur öffentliche anzeigen - issues.in_your_repos=Eigene Repositorys [explore] @@ -280,7 +267,6 @@ code_last_indexed_at=Zuletzt indexiert %s relevant_repositories_tooltip=Repositorys, die Forks sind oder die kein Thema, kein Symbol und keine Beschreibung haben, werden ausgeblendet. relevant_repositories=Es werden nur relevante Repositorys angezeigt, zeigt ungefilterte Ergebnisse an. - [auth] create_new_account=Konto anlegen register_helper_msg=Hast du bereits ein Konto? Jetzt anmelden! @@ -342,42 +328,35 @@ authorize_application=Anwendung autorisieren authorize_redirect_notice=Du wirst zu %s weitergeleitet, wenn du diese Anwendung autorisierst. authorize_application_created_by=Diese Anwendung wurde von %s erstellt. authorize_application_description=Wenn du diese Anwendung autorisierst, wird sie die Berechtigung erhalten, alle Informationen zu deinem Account zu bearbeiten oder zu lesen. Dies beinhaltet auch private Repositorys und Organisationen. -authorize_title="%s" den Zugriff auf deinen Account gestatten? +authorize_title=`"%s" den Zugriff auf deinen Account gestatten?` authorization_failed=Autorisierung fehlgeschlagen authorization_failed_desc=Die Autorisierung ist fehlgeschlagen, da wir eine ungültige Anfrage festgestellt haben. Bitte kontaktiere den Betreiber der Anwendung, die du gerade autorisieren wolltest. sspi_auth_failed=SSPI Authentifizierung fehlgeschlagen -password_pwned=Das von dir gewählte Passwort ist auf einer Liste von gestohlenen Passwörtern die zuvor bei öffentlichen Datenschutzverletzungen aufgedeckt wurden. Bitte versuche es erneut mit einem anderen Passwort. +password_pwned=Das von dir gewählte Passwort ist auf einer dein Passwort setzen. - reset_password=Stelle dein Konto wieder her reset_password.title=%s, du hast um Wiederherstellung deines Kontos gebeten reset_password.text=Bitte klicke innerhalb von %s auf folgenden Link, um dein Konto wiederherzustellen: - register_success=Registrierung erfolgreich - issue_assigned.pull=@%[1]s hat dich im Repository %[3]s dem Pull Request %[2]s zugewiesen. issue_assigned.issue=@%[1]s hat dich im Repository %[3]s dem Issue %[2]s zugewiesen. - issue.x_mentioned_you=@%s hat dich erwähnt: issue.action.force_push=%[1]s hat %[3]s mit %[4]s auf %[2]s überschrieben. issue.action.push_1=@%[1]s hat einen Commit auf %[2]s gepusht @@ -392,7 +371,6 @@ issue.action.review_dismissed=@%[1]s hat das letzte Review von %[2]s für issue.action.ready_for_review=@%[1]s hat diesen Pull Request zum Review freigegeben. issue.action.new=@%[1]s hat #%[2]d geöffnet. issue.in_tree_path=In %s: - release.new.subject=Release %s in %s erschienen release.new.text=@%[1]s hat %[2]s in %[3]s released release.title=Titel: %s @@ -400,16 +378,13 @@ release.note=Anmerkung: release.downloads=Downloads: release.download.zip=Quellcode (ZIP Datei) release.download.targz=Quellcode (TAR.GZ Datei) - repo.transfer.subject_to=%s möchte "%s" an %s übertragen repo.transfer.subject_to_you=%s möchte dir "%s" übertragen repo.transfer.to_you=dir repo.transfer.body=Um es anzunehmen oder abzulehnen, öffne %s, oder ignoriere es einfach. - repo.collaborator.added.subject=%s hat dich zu %s hinzugefügt repo.collaborator.added.text=Du wurdest als Mitarbeiter für folgendes Repository hinzugefügt: - [modal] yes=Ja no=Abbrechen @@ -427,34 +402,30 @@ PayloadUrl=Payload-URL TeamName=Teamname AuthName=Name der Autorisierung AdminEmail=Administrator-E-Mail - NewBranchName=Neuer Branchname CommitSummary=Commit-Zusammenfassung CommitMessage=Commit-Nachricht CommitChoice=Commit-Auswahl TreeName=Dateipfad Content=Inhalt - SSPISeparatorReplacement=Trennzeichen SSPIDefaultLanguage=Standardsprache - -require_error=` darf nicht leer sein.` -alpha_dash_error=` sollte nur Buchstaben, Zahlen, Bindestriche („-“) und Unterstriche („_“) enthalten.` -alpha_dash_dot_error=` sollte nur Buchstaben, Zahlen, Bindestriche („-“), Unterstriche („_“) und Punkte („.“) enthalten.` -git_ref_name_error=` muss ein wohlgeformter Git-Referenzname sein.` -size_error=` muss die Größe %s haben.` -min_size_error=` muss mindestens %s Zeichen enthalten.` -max_size_error=` darf höchstens %s Zeichen enthalten.` -email_error=` ist keine gültige E-Mail-Adresse.` -url_error=`'%s' ist keine valide URL.` -include_error=` muss den Text „%s“ enthalten.` -glob_pattern_error=` Der Glob Pattern ist ungültig: %s.` -regex_pattern_error=` regex ist ungültig: %s.` +require_error=" darf nicht leer sein." +alpha_dash_error=" sollte nur Buchstaben, Zahlen, Bindestriche („-“) und Unterstriche („_“) enthalten." +alpha_dash_dot_error=" sollte nur Buchstaben, Zahlen, Bindestriche („-“), Unterstriche („_“) und Punkte („.“) enthalten." +git_ref_name_error=" muss ein wohlgeformter Git-Referenzname sein." +size_error=" muss die Größe %s haben." +min_size_error=" muss mindestens %s Zeichen enthalten." +max_size_error=" darf höchstens %s Zeichen enthalten." +email_error=" ist keine gültige E-Mail-Adresse." +url_error='%s' ist keine valide URL. +include_error=" muss den Text „%s“ enthalten." +glob_pattern_error=" Der Glob Pattern ist ungültig: %s." +regex_pattern_error=" regex ist ungültig: %s." unknown_error=Unbekannter Fehler: captcha_incorrect=Der eingegebene CAPTCHA-Code ist falsch. password_not_match=Die Passwörter stimmen nicht überein. lang_select_error=Wähle eine Sprache aus der Liste aus. - username_been_taken=Der Benutzername ist bereits vergeben. username_change_not_local_user=Nicht-lokale Benutzer dürfen ihren Nutzernamen nicht ändern. repo_name_been_taken=Der Repository-Name wird schon verwendet. @@ -485,19 +456,16 @@ user_not_exist=Dieser Benutzer ist nicht vorhanden. team_not_exist=Dieses Team existiert nicht. last_org_owner=Du kannst den letzten Benutzer nicht aus dem 'Besitzer'-Team entfernen. Es muss mindestens einen Besitzer in einer Organisation geben. cannot_add_org_to_team=Eine Organisation kann nicht als Teammitglied hinzugefügt werden. - invalid_ssh_key=Dein SSH-Key kann nicht überprüft werden: %s invalid_gpg_key=Dein GPG-Key kann nicht überprüft werden: %s invalid_ssh_principal=Ungültige Identität: %s unable_verify_ssh_key=Dein SSH-Key kann nicht überprüft werden, probiere es erneut. auth_failed=Authentifizierung fehlgeschlagen: %v - still_own_repo=Dein Konto besitzt ein oder mehrere Repositorys. Diese müssen zuerst gelöscht oder übertragen werden. still_has_org=Dein Account ist Mitglied in mindestens einer Organisation. Bitte verlasse diese zuerst. still_own_packages=Ihr Konto besitzt ein oder mehrere Pakete; löschen Sie diese zuerst. org_still_own_repo=Diese Organisation besitzt noch mindestens ein Repository. Bitte lösche oder übertrage diese zuerst. org_still_own_packages=Diese Organisation besitzt noch ein oder mehrere Pakete; lösche diese bitte zuerst. - target_branch_not_exist=Der Ziel-Branch existiert nicht. [user] @@ -515,10 +483,10 @@ unfollow=Nicht mehr folgen heatmap.loading=Heatmap wird geladen… user_bio=Biografie disabled_public_activity=Dieser Benutzer hat die öffentliche Sichtbarkeit der Aktivität deaktiviert. - form.name_reserved=Der Benutzername „%s“ ist reserviert. form.name_pattern_not_allowed=Das Muster „%s“ ist nicht in einem Benutzernamen erlaubt. form.name_chars_not_allowed=Benutzername "%s" enthält ungültige Zeichen. +code=Quelltext [settings] profile=Profil @@ -538,7 +506,6 @@ account_link=Verknüpfte Benutzerkonten organization=Organisationen uid=Uid webauthn=Hardware-Sicherheitsschlüssel - public_profile=Öffentliches Profil biography_placeholder=Erzähle uns noch ein bisschen über dich profile_desc=Deine E-Mail-Adresse wird für Benachrichtigungen und anderes verwendet. @@ -578,7 +545,6 @@ saved_successfully=Die Einstellungen wurden erfolgreich gespeichert. privacy=Datenschutz keep_activity_private=Aktivität auf der Profilseite ausblenden keep_activity_private_popup=Macht die Aktivität nur für dich und die Administratoren sichtbar - lookup_avatar_by_mail=Profilbild anhand der E-Mail-Addresse suchen federated_avatar_lookup=Suche nach föderierten Profilbildern enable_custom_avatar=Benutzerdefiniertes Profilbild benutzen @@ -589,7 +555,6 @@ uploaded_avatar_not_a_image=Die hochgeladene Datei ist kein Bild. uploaded_avatar_is_too_big=Die hochgeladene Datei hat die maximale Größe überschritten. update_avatar_success=Dein Profilbild wurde geändert. update_user_avatar_success=Der Avatar des Benutzers wurde aktualisiert. - change_password=Passwort aktualisieren old_password=Aktuelles Passwort new_password=Neues Passwort @@ -597,7 +562,6 @@ retype_new_password=Neues Passwort erneut eingeben password_incorrect=Das aktuelle Passwort ist falsch. change_password_success=Dein Passwort wurde aktualisiert. Bitte verwende dieses beim nächsten Einloggen. password_change_disabled=Benutzer, die nicht von Gitea verwaltet werden, können ihr Passwort im Web-Interface nicht ändern. - emails=E-Mail-Adressen manage_emails=E-Mail-Adressen verwalten manage_themes=Standard-Theme auswählen @@ -630,7 +594,6 @@ add_openid_success=Die neue OpenID-Adresse wurde hinzugefügt. keep_email_private=E-Mail-Adresse verbergen keep_email_private_popup=Deine E-Mail-Adresse wird für andere Benutzer ausgeblendet. openid_desc=Mit OpenID kannst du dich über einen Drittanbieter authentifizieren. - manage_ssh_keys=SSH-Schlüssel verwalten manage_ssh_principals=SSH-Zertifikat's Identitäten verwalten manage_gpg_keys=GPG-Schlüssel verwalten @@ -709,7 +672,6 @@ manage_social=Verknüpfte soziale Konten verwalten social_desc=Diese Accounts sind mit deinem Gitea-Konto verbunden. Schau dir alle Accounts an, um sicherzustellen dass du alle legitimiert hast, da man sich darüber in deinem Gitea-Konto anmelden kann. unbind=Trennen unbind_success=Das Konto wurde von deinem Gitea-Konto getrennt. - manage_access_token=Zugriffstokens verwalten generate_new_token=Neuen Token erzeugen tokens_desc=Diese Tokens gewähren vollen Zugriff auf dein Konto via die Gitea-API. @@ -724,7 +686,6 @@ access_token_deletion_cancel_action=Abbrechen access_token_deletion_confirm_action=Löschen access_token_deletion_desc=Wenn du ein Token löschst, haben die Anwendungen, die es nutzen, keinen Zugriff mehr auf deinen Account. Dies kann nicht rückgängig gemacht werden. Fortfahren? delete_token_success=Der Zugriffstoken wurde gelöscht. Anwendungen die diesen Token genutzt haben, haben nun keinen Zugriff mehr auf deinen Account. - manage_oauth2_applications=OAuth2 Anwendungen verwalten edit_oauth2_application=OAuth2 Anwendung bearbeiten oauth2_applications_desc=OAuth2-Anwendungen ermöglichen die sichere Authentifizierung von Benutzern dieser Gitea-Instanz für deine Drittanwendung. @@ -746,14 +707,12 @@ oauth2_client_secret_hint=Das Secret wird nicht mehr sichtbar sein, wenn du dies oauth2_application_edit=Bearbeiten oauth2_application_create_description=OAuth2 Anwendungen geben deiner Drittanwendung Zugriff auf Benutzeraccounts dieser Gitea-Instanz. oauth2_application_remove_description=Das Entfernen einer OAuth2-Anwendung hat zur Folge, dass diese nicht mehr auf authorisierte Benutzeraccounts auf dieser Instanz zugreifen kann. Möchtest du fortfahren? - authorized_oauth2_applications=Autorisierte OAuth2-Anwendungen authorized_oauth2_applications_description=Die folgenden Drittanbieteranwendungen haben Zugriff auf deinen Gitea Account. Bitte widerrufe die Autorisierung, wenn du eine Anwendung nicht mehr nutzt. revoke_key=Widerrufen revoke_oauth2_grant=Autorisierung widerrufen revoke_oauth2_grant_description=Wenn du die Autorisierung widerrufst, kann die Anwendung nicht mehr auf deine Daten zugreifen. Bist du dir sicher? revoke_oauth2_grant_success=Die Autorisierung wurde erfolgreich widerrufen. - twofa_desc=Zwei-Faktor-Authentifizierung trägt zu einer höheren Accountsicherheit bei. twofa_is_enrolled=Für dein Konto ist die Zwei-Faktor-Authentifizierung eingeschaltet. twofa_not_enrolled=Für dein Konto ist die Zwei-Faktor-Authentifizierung momentan nicht eingeschaltet. @@ -771,13 +730,11 @@ then_enter_passcode=Und gebe dann die angezeigte PIN der Anwendung ein: passcode_invalid=Die PIN ist falsch. Probiere es erneut. twofa_enrolled=Die Zwei-Faktor-Authentifizierung wurde für dein Konto aktiviert. Bewahre dein Einmalpasswort (%s) an einem sicheren Ort auf, da es nicht wieder angezeigt werden wird. twofa_failed_get_secret=Fehler beim Abrufen des Secrets. - webauthn_desc=Sicherheitsschlüssel sind Geräte, die kryptografische Schlüssel beeinhalten. Diese können für die Zwei-Faktor-Authentifizierung verwendet werden. Der Sicherheitsschlüssel muss den Standard „WebAuthn“ unterstützen. webauthn_register_key=Sicherheitsschlüssel hinzufügen webauthn_nickname=Nickname webauthn_delete_key=Sicherheitsschlüssel entfernen webauthn_delete_key_desc=Wenn du einen Sicherheitsschlüssel entfernst, kannst du dich nicht mehr mit ihm anmelden. Fortfahren? - manage_account_links=Verknüpfte Accounts verwalten manage_account_links_desc=Diese externen Accounts sind mit deinem Gitea-Account verknüpft. account_links_not_available=Es sind keine externen Accounts mit diesem Gitea-Account verknüpft. @@ -785,23 +742,19 @@ link_account=Account verbinden remove_account_link=Verknüpften Account entfernen remove_account_link_desc=Wenn du den verknüpften Account entfernst, wirst du darüber nicht mehr auf deinen Gitea-Account zugreifen können. Fortfahren? remove_account_link_success=Der verknüpfte Account wurde entfernt. - orgs_none=Du bist kein Mitglied in einer Organisation. repos_none=Du besitzt keine Repositories - delete_account=Konto löschen delete_prompt=Wenn du fortfährst, wird dein Account permanent gelöscht. Dies KANN NICHT rückgängig gemacht werden. delete_with_all_comments=Dein Account existiert seit weniger als %s Tagen. Um Geisterkommentare zu vermeiden, werden alle deine Issue/PR-Kommentare gelöscht. confirm_delete_account=Löschen bestätigen delete_account_title=Benutzerkonto löschen delete_account_desc=Bist du sicher, dass du diesen Account dauerhaft löschen möchtest? - email_notifications.enable=E-Mail Benachrichtigungen aktivieren email_notifications.onmention=Nur E-Mail bei Erwähnung email_notifications.disable=E-Mail Benachrichtigungen deaktivieren email_notifications.submit=E-Mail-Einstellungen festlegen email_notifications.andyourown=Und deine Eigenen Benachrichtigungen - visibility=Nutzer Sichtbarkeit visibility.public=Öffentlich visibility.public_tooltip=Für alle Nutzer sichtbar @@ -893,14 +846,12 @@ delete_preexisting=Vorhandene Dateien löschen delete_preexisting_content=Dateien in %s löschen delete_preexisting_success=Nicht übernommene Dateien in %s gelöscht blame_prior=Blame vor dieser Änderung anzeigen - transfer.accept=Übertragung Akzeptieren transfer.accept_desc=Übertragung nach "%s" transfer.reject=Übertragung Ablehnen transfer.reject_desc=Übertragung nach "%s " abbrechen transfer.no_permission_to_accept=Du hast nicht die Berechtigung die Übertragung zu akzeptieren transfer.no_permission_to_reject=Du hast nicht die Berechtigung die Übertragung abzubrechen - desc.private=Privat desc.public=Öffentlich desc.private_template=Private Vorlage @@ -908,7 +859,6 @@ desc.public_template=Vorlage desc.internal=Intern desc.internal_template=Interne Vorlage desc.archived=Archiviert - template.items=Template-Elemente template.git_content=Git Inhalt (Standardbranch) template.git_hooks=Git-Hooks @@ -919,16 +869,13 @@ template.avatar=Profilbild template.issue_labels=Issue Label template.one_item=Es muss mindestens ein Template ausgewählt werden template.invalid=Es muss ein Template-Repository ausgewählt werden - archive.title=Dieses Repo ist archiviert. Du kannst Dateien sehen und es klonen, kannst aber nicht pushen oder Issues/Pull-Requests öffnen. archive.issue.nocomment=Dieses Repo ist archiviert. Du kannst Issues nicht kommentieren. archive.pull.nocomment=Dieses Repo ist archiviert. Du kannst Pull-Requests nicht kommentieren. - form.reach_limit_of_creation_1=Du hast bereits dein Limit von %d Repository erreicht. form.reach_limit_of_creation_n=Du hast bereits dein Limit von %d Repositories erreicht. form.name_reserved=Der Repository-Name „%s“ ist reserviert. form.name_pattern_not_allowed='%s' ist nicht erlaubt für Repository-Namen. - need_auth=Authentifizierung migrate_options=Migrationsoptionen migrate_service=Migrationsdienst @@ -979,7 +926,6 @@ migrate.migrating_labels=Labels werden migriert migrate.migrating_releases=Releases werden migriert migrate.migrating_issues=Issues werden migriert migrate.migrating_pulls=Pull Requests werden migriert - mirror_from=Mirror von forked_from=geforkt von generated_from=erzeugt von @@ -993,7 +939,6 @@ unstar=Favorit entfernen star=Favorisieren fork=Fork download_archive=Repository herunterladen - no_desc=Keine Beschreibung quick_guide=Kurzanleitung clone_this_repo=Dieses Repository klonen @@ -1001,12 +946,11 @@ create_new_repo_command=Erstelle ein neues Repository von der Kommandozeile aus push_exist_repo=Bestehendes Repository via Kommandozeile pushen empty_message=Dieses Repository hat keinen Inhalt. broken_message=Die Git-Daten, die diesem Repository zugrunde liegen, können nicht gelesen werden. Kontaktiere den Administrator deiner Instanz oder lösche dieses Repository. - code=Code code.desc=Zugriff auf Quellcode, Dateien, Commits und Branches. branch=Branch tree=Struktur -clear_ref=`Aktuelle Referenz löschen` +clear_ref=Aktuelle Referenz löschen filter_branch_and_tag=Branch oder Tag filtern find_tag=Tag finden branches=Branches @@ -1018,7 +962,6 @@ packages=Pakete labels=Label org_labels_desc=Labels der Organisationsebene, die mit allen Repositories in dieser Organisation verwendet werden können org_labels_desc_manage=verwalten - milestones=Meilensteine commits=Commits commit=Commit @@ -1034,8 +977,7 @@ file_view_rendered=Ansicht rendern file_view_raw=Originalformat anzeigen file_permalink=Permalink file_too_large=Die Datei ist zu groß zum Anzeigen. -ambiguous_character=`%[1]c [U+%04[1]X] kann mit %[2]c [U+%04[2]X] verwechselt werden` - +ambiguous_character=%[1]c [U+%04[1]X] kann mit %[2]c [U+%04[2]X] verwechselt werden escape_control_characters=Escapen unescape_control_characters=Unescapen file_copy_permalink=Permalink kopieren @@ -1054,7 +996,6 @@ download_file=Datei herunterladen normal_view=Normale Ansicht line=zeile lines=Zeilen - editor.add_file=Datei hinzufügen editor.new_file=Neue Datei editor.upload_file=Datei hochladen @@ -1120,7 +1061,6 @@ editor.user_no_push_to_branch=Benutzer kann nicht in die Branch pushen editor.require_signed_commit=Branch erfordert einen signierten Commit editor.cherry_pick=Cherry-Picke %s von: editor.revert=%s zurücksetzen auf: - commits.desc=Durchsuche die Quellcode-Änderungshistorie. commits.commits=Commits commits.no_commits=Keine gemeinsamen Commits. '%s' and '%s' haben vollständig unterschiedliche Historien. @@ -1139,7 +1079,6 @@ commits.signed_by_untrusted_user=Signiert von nicht vertrauenswürdigen Benutzer commits.signed_by_untrusted_user_unmatched=Signiert von nicht vertrauenswürdigen Benutzern, der nicht mit dem Committer übereinstimmt commits.gpg_key_id=GPG-Schlüssel-ID commits.ssh_key_fingerprint=SSH-Key-Fingerabdruck - commit.actions=Aktionen commit.revert=Zurücksetzen commit.revert-header=Setze zurück: %s @@ -1147,10 +1086,8 @@ commit.revert-content=Branch auswählen, der zurückgesetzt werden soll: commit.cherry-pick=Cherry-Pick commit.cherry-pick-header=Cherry-Picke: %s commit.cherry-pick-content=Branch auswählen, auf dem Cherry-Picked werden soll: - ext_issues=Zugriff auf Externe Issues ext_issues.desc=Link zu externem Issuetracker. - projects=Projekte projects.desc=Verwalte Issues und Pull-Requests in Projektboards. projects.description=Beschreibung (optional) @@ -1186,7 +1123,6 @@ projects.board.color=Farbe projects.open=Öffnen projects.close=Schließen projects.board.assigned_to=Zugewiesen an - issues.desc=Verwalte Bug-Reports, Aufgaben und Meilensteine. issues.filter_assignees=Filter issues.filter_milestones=Meilenstein filtern @@ -1237,23 +1173,23 @@ issues.add_labels=hat die Labels %s %s hinzugefügt issues.remove_label=hat das Label %s %s entfernt issues.remove_labels=hat die Labels %s %s entfernt issues.add_remove_labels=hat %s hinzugefügt, und %s %s enternt -issues.add_milestone_at=`hat diesen Issue %[2]s zum %[1]s Meilenstein hinzugefügt` -issues.add_project_at=`hat dieses zum %s projekt %s hinzugefügt` -issues.change_milestone_at=`hat den Meilenstein %[3]s von %[1]s zu %[2]s geändert` -issues.change_project_at=`hat das Projekt %[3]s von %[1]s zu %[2]s geändert` -issues.remove_milestone_at=`hat dieses Issue %[2]s vom %[1]s Meilenstein entfernt` -issues.remove_project_at=`hat dieses vom %s Projekt %s entfernt` -issues.deleted_milestone=`(gelöscht)` -issues.deleted_project=`(gelöscht)` -issues.self_assign_at=`hat sich das Issue %s selbst zugewiesen` -issues.add_assignee_at=`wurde von %s %s zugewiesen` -issues.remove_assignee_at=`wurde von %s %s nicht zugewiesen` -issues.remove_self_assignment=`hat seine Zuweisung %s entfernt` -issues.change_title_at=`hat den Titel von %s zu %s %s geändert` -issues.change_ref_at=`hat die Referenz von %s zu %s %s geändert` -issues.remove_ref_at=`hat die Referenz %s entfernt %s` -issues.add_ref_at=`hat die Referenz %s hinzugefügt %s` -issues.delete_branch_at=`löschte die Branch %s %s` +issues.add_milestone_at=hat diesen Issue %[2]s zum %[1]s Meilenstein hinzugefügt +issues.add_project_at=hat dieses zum %s projekt %s hinzugefügt +issues.change_milestone_at=hat den Meilenstein %[3]s von %[1]s zu %[2]s geändert +issues.change_project_at=hat das Projekt %[3]s von %[1]s zu %[2]s geändert +issues.remove_milestone_at=hat dieses Issue %[2]s vom %[1]s Meilenstein entfernt +issues.remove_project_at=hat dieses vom %s Projekt %s entfernt +issues.deleted_milestone=(gelöscht) +issues.deleted_project=(gelöscht) +issues.self_assign_at=hat sich das Issue %s selbst zugewiesen +issues.add_assignee_at=wurde von %s %s zugewiesen +issues.remove_assignee_at=wurde von %s %s nicht zugewiesen +issues.remove_self_assignment=hat seine Zuweisung %s entfernt +issues.change_title_at=hat den Titel von %s zu %s %s geändert +issues.change_ref_at=hat die Referenz von %s zu %s %s geändert +issues.remove_ref_at=hat die Referenz %s entfernt %s +issues.add_ref_at=hat die Referenz %s hinzugefügt %s +issues.delete_branch_at=löschte die Branch %s %s issues.filter_label=Label issues.filter_label_exclude=„Alt + Klick/Enter verwenden, um Label auszuschließen” issues.filter_label_no_select=Alle Label @@ -1302,7 +1238,7 @@ issues.open_title=Offen issues.closed_title=Geschlossen issues.draft_title=Entwurf issues.num_comments=%d Kommentare -issues.commented_at=`hat %s kommentiert` +issues.commented_at=hat %s kommentiert issues.delete_comment_confirm=Bist du sicher dass du diesen Kommentar löschen möchtest? issues.context.copy_link=Link kopieren issues.context.quote_reply=Antwort zitieren @@ -1311,22 +1247,22 @@ issues.context.edit=Bearbeiten issues.context.delete=Löschen issues.no_content=Hier gibt es bis jetzt noch keinen Inhalt. issues.close_issue=Schließen -issues.pull_merged_at=`mergte den Commit %[2]s %[4]s in %[3]s` -issues.manually_pull_merged_at=`mergte den Commit %[2]s %[4]s manuell in %[3]s` +issues.pull_merged_at=mergte den Commit %[2]s %[4]s in %[3]s +issues.manually_pull_merged_at=mergte den Commit %[2]s %[4]s manuell in %[3]s issues.close_comment_issue=Kommentieren und schließen issues.reopen_issue=Wieder öffnen issues.reopen_comment_issue=Kommentieren und wieder öffnen issues.create_comment=Kommentieren -issues.closed_at=`hat diesen Issue %[2]s geschlossen` -issues.reopened_at=`hat diesen Issue %[2]s wieder geöffnet` -issues.commit_ref_at=`hat dieses Issue %[2]s aus einem Commit referenziert` -issues.ref_issue_from=`hat %[2]s auf dieses Issue verwiesen %[4]s` -issues.ref_pull_from=`hat %[2]s auf diesen Pull Request verwiesen %[4]s` -issues.ref_closing_from=`hat %[2]s auf einen Pull Request %[4]s verwiesen, welcher das Issue schließen wird` -issues.ref_reopening_from=`hat auf einen Pull Request %[4]s verwiesen, welcher das Issue %[2]s erneut öffnen wird` -issues.ref_closed_from=`hat dieses Issue %[4]s geschlossen %[2]s` -issues.ref_reopened_from=`hat dieses Issue %[4]s %[2]s wieder geöffnet` -issues.ref_from=`von %[1]s` +issues.closed_at=hat diesen Issue %[2]s geschlossen +issues.reopened_at=hat diesen Issue %[2]s wieder geöffnet +issues.commit_ref_at=hat dieses Issue %[2]s aus einem Commit referenziert +issues.ref_issue_from=hat %[2]s auf dieses Issue verwiesen %[4]s +issues.ref_pull_from=hat %[2]s auf diesen Pull Request verwiesen %[4]s +issues.ref_closing_from=hat %[2]s auf einen Pull Request %[4]s verwiesen, welcher das Issue schließen wird +issues.ref_reopening_from=hat auf einen Pull Request %[4]s verwiesen, welcher das Issue %[2]s erneut öffnen wird +issues.ref_closed_from=hat dieses Issue %[4]s geschlossen %[2]s +issues.ref_reopened_from=hat dieses Issue %[4]s %[2]s wieder geöffnet +issues.ref_from=von %[1]s issues.poster=Ersteller issues.collaborator=Mitarbeiter issues.owner=Besitzer @@ -1356,8 +1292,8 @@ issues.label.filter_sort.reverse_alphabetically=Umgekehrt alphabetisch issues.label.filter_sort.by_size=Kleinste Größe issues.label.filter_sort.reverse_by_size=Größte Größe issues.num_participants=%d Beteiligte -issues.attachment.open_tab=`Klicken, um „%s“ in einem neuen Tab zu öffnen` -issues.attachment.download=`Klicken, um „%s“ herunterzuladen` +issues.attachment.open_tab=Klicken, um „%s“ in einem neuen Tab zu öffnen +issues.attachment.download=Klicken, um „%s“ herunterzuladen issues.subscribe=Abonnieren issues.unsubscribe=Abbestellen issues.lock=Diskussion sperren @@ -1387,7 +1323,7 @@ issues.start_tracking_short=Zeiterfassung starten issues.start_tracking=Zeiterfassung starten issues.start_tracking_history=hat die Zeiterfassung %s gestartet issues.tracker_auto_close=Der Timer wird automatisch gestoppt, wenn dieser Issue geschlossen wird -issues.tracking_already_started=`Du hast die Zeiterfassung bereits in diesem Issue gestartet!` +issues.tracking_already_started=Du hast die Zeiterfassung bereits in diesem Issue gestartet! issues.stop_tracking=Zeiterfassung stoppen issues.stop_tracking_history=hat die Zeiterfassung %s angehalten issues.cancel_tracking=Verwerfen @@ -1396,20 +1332,20 @@ issues.add_time=Zeit manuell hinzufügen issues.del_time=Diese Zeiterfassung löschen issues.add_time_short=Zeit hinzufügen issues.add_time_cancel=Abbrechen -issues.add_time_history=`hat %s gearbeitete Zeit hinzugefügt` -issues.del_time_history=`hat %s gearbeitete Zeit gelöscht` +issues.add_time_history=hat %s gearbeitete Zeit hinzugefügt +issues.del_time_history=hat %s gearbeitete Zeit gelöscht issues.add_time_hours=Stunden issues.add_time_minutes=Minuten issues.add_time_sum_to_small=Es wurde keine Zeit eingegeben. issues.time_spent_total=Zeitaufwand insgesamt -issues.time_spent_from_all_authors=`Aufgewendete Zeit: %s` +issues.time_spent_from_all_authors=Aufgewendete Zeit: %s issues.due_date=Fällig am issues.invalid_due_date_format=Das Fälligkeitsdatum muss das Format „JJJJ-MM-TT“ haben. issues.error_modifying_due_date=Fehler beim Ändern des Fälligkeitsdatums. issues.error_removing_due_date=Fehler beim Entfernen des Fälligkeitsdatums. issues.push_commit_1=hat %d Commit %s hinzugefügt issues.push_commits_n=hat %d Commits %s hinzugefügt -issues.force_push_codes=`hat %[6]s %[1]s von %[2]s zu %[4]s force-gepusht` +issues.force_push_codes=hat %[6]s %[1]s von %[2]s zu %[4]s force-gepusht issues.due_date_form=JJJJ-MM-TT issues.due_date_form_add=Fälligkeitsdatum hinzufügen issues.due_date_form_edit=Bearbeiten @@ -1428,8 +1364,8 @@ issues.dependency.add=Abhängigkeit hinzufügen… issues.dependency.cancel=Abbrechen issues.dependency.remove=Entfernen issues.dependency.remove_info=Abhängigkeit löschen -issues.dependency.added_dependency=`hat eine neue Abhängigkeit %s hinzugefügt` -issues.dependency.removed_dependency=`hat eine Abhängigkeit %s entfernt` +issues.dependency.added_dependency=hat eine neue Abhängigkeit %s hinzugefügt +issues.dependency.removed_dependency=hat eine Abhängigkeit %s entfernt issues.dependency.pr_closing_blockedby=Das Schließen dieses Pull-Requests wird von den folgenden Issues blockiert issues.dependency.issue_closing_blockedby=Das Schließen dieses Issues wird von den folgenden Issues blockiert issues.dependency.issue_close_blocks=Dieses Issue blockiert die Schließung der folgenden Issues @@ -1482,10 +1418,8 @@ issues.content_history.delete_from_history=Aus dem Verlauf entfernen issues.content_history.delete_from_history_confirm=Aus dem Verlauf löschen? issues.content_history.options=Optionen issues.reference_link=Referenz: %s - compare.compare_base=Basis compare.compare_head=vergleichen - pulls.desc=Pull-Requests und Code-Reviews aktivieren. pulls.new=Neuer Pull-Request pulls.view=Pull-Request ansehen @@ -1505,11 +1439,11 @@ pulls.filter_branch=Branch filtern pulls.no_results=Keine Ergebnisse verfügbar. pulls.nothing_to_compare=Diese Branches sind identisch. Es muss kein Pull-Request erstellt werden. pulls.nothing_to_compare_and_allow_empty_pr=Diese Branches sind gleich. Der Pull-Request wird leer sein. -pulls.has_pull_request=`Es existiert bereits ein Pull-Request zwischen diesen beiden Branches: %[2]s#%[3]d` +pulls.has_pull_request=Es existiert bereits ein Pull-Request zwischen diesen beiden Branches: %[2]s#%[3]d pulls.create=Pull-Request erstellen pulls.title_desc=möchte %[1]d Commits von %[2]s nach %[3]s mergen pulls.merged_title_desc=hat %[1]d Commits von %[2]s nach %[3]s %[4]s zusammengeführt -pulls.change_target_branch_at=`hat den Zielbranch von %s nach %s %s geändert` +pulls.change_target_branch_at=hat den Zielbranch von %s nach %s %s geändert pulls.tab_conversation=Diskussion pulls.tab_commits=Commits pulls.tab_files=Geänderte Dateien @@ -1521,7 +1455,7 @@ pulls.manually_merged=Manuell gemergt pulls.manually_merged_as=Dieser Pull Request wurde manuell als %[2]s gemergt. pulls.is_closed=Der Pull-Request wurde geschlossen. pulls.has_merged=Der Pull-Request wurde gemergt. -pulls.title_wip_desc=`Beginne den Titel mit %s um zu verhindern, dass der Pull Request versehentlich gemergt wird.` +pulls.title_wip_desc=Beginne den Titel mit %s um zu verhindern, dass der Pull Request versehentlich gemergt wird. pulls.cannot_merge_work_in_progress=Dieser Pull Request ist als Work in Progress markiert. pulls.still_in_progress=Noch in Bearbeitung? pulls.add_prefix=%s Präfix hinzufügen @@ -1551,7 +1485,6 @@ pulls.reject_count_n=%d Änderungsanfragen pulls.waiting_count_1=%d wartendes Review pulls.waiting_count_n=%d wartende Reviews pulls.wrong_commit_id=die Commit ID muss eine Commit ID auf dem Zielbranch sein - pulls.no_merge_desc=Dieser Pull-Request kann nicht gemerged werden, da keine Mergeoptionen aktiviert sind. pulls.no_merge_helper=Aktiviere Mergeoptionen in den Repositoryeinstellungen oder merge den Pull-Request manuell. pulls.no_merge_wip=Dieser Pull Request kann nicht gemergt werden, da er als Work In Progress gekennzeichnet ist. @@ -1564,7 +1497,6 @@ pulls.squash_merge_pull_request=Squash Commit erstellen pulls.merge_manually=Manuell mergen pulls.merge_commit_id=Der Mergecommit ID pulls.require_signed_wont_sign=Der Branch erfordert einen signierten Commit, aber dieser Merge wird nicht signiert - pulls.invalid_merge_option=Du kannst diese Mergeoption auf diesen Pull-Request nicht anwenden. pulls.merge_conflict=Zusammenführen fehlgeschlagen: Beim Zusammenführen gab es einen Konflikt. Hinweis: Probiere eine andere Strategie pulls.merge_conflict_summary=Fehlermeldung @@ -1577,7 +1509,7 @@ pulls.head_out_of_date=Mergen fehlgeschlagen: Der Head wurde aktualisiert währe pulls.push_rejected=Mergen fehlgeschlagen: Der Push wurde abgelehnt. Überprüfe die Git Hooks für dieses Repository. pulls.push_rejected_summary=Vollständige Ablehnungsmeldung pulls.push_rejected_no_message=Mergen fehlgeschlagen: Der Push wurde abgelehnt, aber es gab keine Fehlermeldung.
    Überprüfe die Git Hooks für dieses Repository -pulls.open_unmerged_pull_exists=`Du kannst diesen Pull-Request nicht erneut öffnen, da noch ein anderer (#%d) mit identischen Eigenschaften offen ist.` +pulls.open_unmerged_pull_exists=Du kannst diesen Pull-Request nicht erneut öffnen, da noch ein anderer (#%d) mit identischen Eigenschaften offen ist. pulls.status_checking=Einige Prüfungen sind noch ausstehend pulls.status_checks_success=Alle Prüfungen waren erfolgreich pulls.status_checks_warning=Einige Prüfungen meldeten Warnungen @@ -1590,27 +1522,22 @@ pulls.update_branch_rebase=Branch durch Rebase aktualisieren pulls.update_branch_success=Branch-Aktualisierung erfolgreich pulls.update_not_allowed=Du hast keine Berechtigung, die Branch zu Updaten pulls.outdated_with_base_branch=Dieser Branch enthält nicht die neusten Commits der Basis-Branch -pulls.closed_at=`hat diesen Pull-Request %[2]s geschlossen` -pulls.reopened_at=`hat diesen Pull-Request %[2]s wieder geöffnet` -pulls.merge_instruction_hint=`Siehe auch die Anleitung für die Kommandozeile.` +pulls.closed_at=hat diesen Pull-Request %[2]s geschlossen +pulls.reopened_at=hat diesen Pull-Request %[2]s wieder geöffnet +pulls.merge_instruction_hint=Siehe auch die Anleitung für die Kommandozeile. pulls.merge_instruction_step1_desc=Wechsle auf einen neuen Branch in deinem lokalen Repository und teste die Änderungen. pulls.merge_instruction_step2_desc=Führe die Änderungen zusammen und aktualisiere den Stand online auf Gitea. - pulls.auto_merge_button_when_succeed=(Wenn die Checks erfolgreich sind) pulls.auto_merge_when_succeed=Automergen, sobald alle Checks erfüllt sind pulls.auto_merge_newly_scheduled=Der Pull-Request wird automatisch gemergt, wenn alle Checks erfolgreich sind. pulls.auto_merge_has_pending_schedule=%[1]s hat einen Automerge für diesen Pull-Request %[2]s geplant. - pulls.auto_merge_cancel_schedule=Automerge abbrechen pulls.auto_merge_not_scheduled=Dieser Pull Request hat keinen geplanten Automerge. pulls.auto_merge_canceled_schedule=Der Automerge dieses Pull-Requests wurde abgebrochen. - -pulls.auto_merge_newly_scheduled_comment=`hat einen Automerge für diesen Pull-Request %[1]s geplant` -pulls.auto_merge_canceled_schedule_comment=`hat den Automerge für diesen Pull-Request %[1]s abgebrochen` - +pulls.auto_merge_newly_scheduled_comment=hat einen Automerge für diesen Pull-Request %[1]s geplant +pulls.auto_merge_canceled_schedule_comment=hat den Automerge für diesen Pull-Request %[1]s abgebrochen pulls.delete.title=Diesen Pull-Request löschen? pulls.delete.text=Willst du diesen Pull-Request wirklich löschen? (Dies wird den Inhalt unwiderruflich löschen. Überlege, ob du ihn nicht lieber schließen willst, um ihn zu archivieren) - milestones.new=Neuer Meilenstein milestones.closed=Geschlossen %s milestones.update_ago=Vor %s aktualisiert @@ -1640,7 +1567,6 @@ milestones.filter_sort.least_complete=Am wenigsten vollständig milestones.filter_sort.most_complete=Vollständigste milestones.filter_sort.most_issues=Meiste Issues milestones.filter_sort.least_issues=Wenigste Issues - signing.will_sign=Dieser Commit wird mit dem Schlüssel '%s' signiert signing.wont_sign.error=Es gab einen Fehler bei der Prüfung, ob der Commit signiert werden kann signing.wont_sign.nokey=Es ist kein Schlüssel zum Signieren dieses Commits verfügbar @@ -1654,10 +1580,8 @@ signing.wont_sign.headsigned=Der Merge Commit wird nicht signiert werden, da der signing.wont_sign.commitssigned=Der Merge Commit wird nicht signiert werden, da alle zugehörigen Commits nicht signiert sind signing.wont_sign.approved=Der Merge Commit wird nicht signiert werden, da der Pull Request nicht genehmigt wurde signing.wont_sign.not_signed_in=Du bist nicht eingeloggt - ext_wiki=Zugriff auf externes Wiki ext_wiki.desc=Verweis auf externes Wiki. - wiki=Wiki wiki.welcome=Willkommen im Wiki. wiki.welcome_desc=Im Wiki kannst du Dokumentation schreiben und sie mit Mitarbeitern teilen. @@ -1681,7 +1605,6 @@ wiki.reserved_page=Der Wiki-Seitenname „%s“ ist reserviert. wiki.pages=Seiten wiki.last_updated=Zuletzt aktualisiert %s wiki.page_name_desc=Geben Sie einen Namen für diese Wiki-Seite ein. Spezielle Namen sind: 'Home', '_Sidebar' und '_Footer'. - activity=Aktivität activity.period.filter_label=Zeitraum: activity.period.daily=1 Tag @@ -1747,7 +1670,6 @@ activity.git_stats_addition_n=%d Einfügungen activity.git_stats_and_deletions=und activity.git_stats_deletion_1=%d Löschung activity.git_stats_deletion_n=%d Löschungen - search=Suchen search.search_repo=Repository durchsuchen search.fuzzy=Ähnlich @@ -1755,7 +1677,6 @@ search.match=Genau search.results=Suchergebnisse für „%s“ in %s search.code_no_results=Es konnte kein passender Code für deinen Suchbegriff gefunden werden. search.code_search_unavailable=Derzeit ist die Code-Suche nicht verfügbar. Bitte wende dich an den Website-Administrator. - settings=Einstellungen settings.desc=In den Einstellungen kannst du die Einstellungen des Repositorys anpassen settings.options=Repository @@ -2057,10 +1978,10 @@ settings.dismiss_stale_approvals=Entferne alte Genehmigungen settings.dismiss_stale_approvals_desc=Wenn neue Commits gepusht werden, die den Inhalt des Pull-Requests ändern, werden alte Genehmigungen entfernt. settings.require_signed_commits=Signierte Commits erforderlich settings.require_signed_commits_desc=Pushes auf diesen Branch ablehnen, wenn Commits nicht signiert oder nicht überprüfbar sind. -settings.protect_protected_file_patterns=Geschützte Dateimuster (durch Semikolon getrennt '\;'): +settings.protect_protected_file_patterns=Geschützte Dateimuster (durch Semikolon getrennt ';'): settings.protect_protected_file_patterns_desc=Geschützte Dateien, die nicht einmal geändert werden können, wenn der Benutzer die Rechte hat, Dateien in diesem Branch hinzuzufügen, zu bearbeiten, oder zu löschen. Verschiedene Pattern können per Semicolon (';') getrennt werden. Siehe die github.com/gobwas/glob Dokumentation für die Pattern Syntax (Englisch). Beispiele: .drone.yml, /docs/**/*.txt. -settings.protect_unprotected_file_patterns=Ungeschützte Dateimuster (durch Semikolon '\;' getrennt): -settings.protect_unprotected_file_patterns_desc=Ungeschützte Dateien können ohne Push-Beschränkung geändert werden, falls der Benutzer Schreibzugriff hat. Mehrere Muster können mit Semikolon getrennt werden ('\;'). Siehe die github.com/gobwas/glob Dokumentation für Mustersyntax. Beispiele: .drone.yml, /docs/**/*.txt. +settings.protect_unprotected_file_patterns=Ungeschützte Dateimuster (durch Semikolon ';' getrennt): +settings.protect_unprotected_file_patterns_desc=Ungeschützte Dateien können ohne Push-Beschränkung geändert werden, falls der Benutzer Schreibzugriff hat. Mehrere Muster können mit Semikolon getrennt werden (';'). Siehe die github.com/gobwas/glob Dokumentation für Mustersyntax. Beispiele: .drone.yml, /docs/**/*.txt. settings.add_protected_branch=Schutz aktivieren settings.delete_protected_branch=Schutz deaktivieren settings.update_protect_branch_success=Branch-Schutz für den Branch „%s“ wurde geändert. @@ -2140,7 +2061,6 @@ settings.rename_branch_success=Branch %s wurde erfolgreich in %s umbenannt. settings.rename_branch_from=alter Branchname settings.rename_branch_to=neuer Branchname settings.rename_branch=Branch umbennen - diff.browse_source=Quellcode durchsuchen diff.parent=Ursprung diff.commit=Commit @@ -2192,7 +2112,6 @@ diff.image.side_by_side=Nebeneinander diff.image.swipe=Wischen diff.image.overlay=Überlagert diff.has_escaped=Diese Zeile enthält versteckte Unicode-Zeichen - releases.desc=Behalte den Überblick über Versionen und Downloads. release.releases=Releases release.detail=Release-Details @@ -2234,7 +2153,6 @@ release.downloads=Downloads release.download_count=Downloads: %s release.add_tag_msg=Titel und Beschreibung des Releases als Tag Nachricht verwenden. release.add_tag=Nur Tag erstellen - branch.name=Branchname branch.search=Branches durchsuchen branch.already_exists=Ein Branch mit dem Namen „%s“ existiert bereits. @@ -2266,25 +2184,24 @@ branch.create_branch_operation=Branch erstellen branch.new_branch=Neue Branch erstellen branch.new_branch_from=Neue Branch von '%s' erstellen branch.renamed=Branch %s wurde in %s umbenannt. - tag.create_tag=Tag %s erstellen tag.create_tag_operation=Tag erstellen tag.confirm_create_tag=Tag erstellen tag.create_tag_from=Neuen Tag von '%s' erstellen - tag.create_success=Tag "%s" wurde erstellt. - topic.manage_topics=Themen verwalten topic.done=Fertig topic.count_prompt=Du kannst nicht mehr als 25 Themen auswählen topic.format_prompt=Themen müssen entweder mit einem Buchstaben oder einer Ziffer beginnen. Sie können Bindestriche („-“) enthalten und bis zu 35 Zeichen lang sein. - find_file.go_to_file=Datei suchen find_file.no_matching=Keine passende Datei gefunden - error.csv.too_large=Diese Datei kann nicht gerendert werden, da sie zu groß ist. error.csv.unexpected=Diese Datei kann nicht gerendert werden, da sie ein unerwartetes Zeichen in Zeile %d und Spalte %d enthält. error.csv.invalid_field_count=Diese Datei kann nicht gerendert werden, da sie eine falsche Anzahl an Feldern in Zeile %d hat. +issues.filter_project=Projekt +issues.filter_project_none=Kein Projekt +settings.event_wiki=Wiki +settings.authorization_header=Authorization-Header [org] org_name_holder=Name der Organisation @@ -2307,11 +2224,9 @@ team_access_desc=Zugriff auf das Repository team_permission_desc=Berechtigungen team_unit_desc=Zugriff auf Repositorybereiche erlauben team_unit_disabled=(Deaktiviert) - form.name_reserved=Der Organisationsname „%s“ ist reserviert. form.name_pattern_not_allowed=Das Muster „%s“ ist in Organisationsnamen nicht erlaubt. form.create_org_not_allowed=Du bist nicht berechtigt, eine Organisation zu erstellen. - settings=Einstellungen settings.options=Organisation settings.full_name=Vollständiger Name @@ -2325,7 +2240,6 @@ settings.visibility.limited=Eingeschränkt (nur für angemeldete Nutzer sichtbar settings.visibility.limited_shortname=Begrenzt settings.visibility.private=Privat (nur für Organisationsmitglieder sichtbar) settings.visibility.private_shortname=Privat - settings.update_settings=Einstellungen speichern settings.update_setting_success=Organisationseinstellungen wurden aktualisiert. settings.change_orgname_prompt=Hinweis: Die Änderung des Organisationsnamens ändert auch ihre URL. @@ -2338,9 +2252,7 @@ settings.confirm_delete_account=Löschen bestätigen settings.delete_org_title=Organisation löschen settings.delete_org_desc=Diese Organisation wird dauerhaft gelöscht. Fortfahren? settings.hooks_desc=Webhooks hinzufügen, die für alle Repositorys dieser Organisation ausgelöst werden. - settings.labels_desc=Labels hinzufügen, die für alle Repositories dieser Organisation genutzt werden können. - members.membership_visibility=Sichtbarkeit der Mitgliedschaft: members.public=Sichtbar members.public_helper=verstecken @@ -2355,7 +2267,6 @@ members.leave=Verlassen members.leave.detail=%s verlassen? members.invite_desc=Neues Mitglied zu %s hinzufügen: members.invite_now=Jetzt einladen - teams.join=Beitreten teams.leave=Verlassen teams.leave.detail=%s verlassen? @@ -2402,6 +2313,13 @@ teams.all_repositories_helper=Team hat Zugriff auf alle Repositorys. Wenn dies a teams.all_repositories_read_permission_desc=Dieses Team gewährt Lese-Zugriff auf Repositories: Mitglieder können Repositories ansehen und klonen. teams.all_repositories_write_permission_desc=Dieses Team gewährt Schreib-Zugriff auf alle Repositories: Mitglieder können Repositories lesen und auf sie pushen. teams.all_repositories_admin_permission_desc=Dieses Team gewährt Administrator-Zugriff auf alle Repositories : Mitglieder können Repositories lesen, auf sie pushen und Mitwirkende zu Repositories hinzufügen. +members=Mitglieder +code=Quelltext +teams.invite_team_member=Zu %s einladen +teams.invite_team_member.list=Ausstehende Einladungen +teams.invite.title=Du wurdest eingeladen, dem Team %s in der Organisation %s beizutreten. +teams.invite.by=Von %s eingeladen +teams.invite.description=Bitte klicke auf die folgende Schaltfläche, um dem Team beizutreten. [admin] dashboard=Dashboard @@ -2417,7 +2335,6 @@ monitor=Monitoring first_page=Erste last_page=Letzte total=Gesamt: %d - dashboard.new_version_hint=Gitea %s ist jetzt verfügbar, die derzeitige Version ist %s. Weitere Details findest du im Blog. dashboard.statistic=Übersicht dashboard.operations=Wartungsoperationen @@ -2495,7 +2412,6 @@ dashboard.delete_old_actions=Alle alten Aktionen aus der Datenbank löschen dashboard.delete_old_actions.started=Löschen aller alten Aktionen in der Datenbank gestartet. dashboard.update_checker=Update-Checker dashboard.delete_old_system_notices=Alle alten Systemmeldungen aus der Datenbank löschen - users.user_manage_panel=Benutzerkontenverwaltung users.new_account=Benutzerkonto erstellen users.name=Benutzername @@ -2548,7 +2464,6 @@ users.list_status_filter.is_prohibit_login=Login verbieten users.list_status_filter.not_prohibit_login=Login erlaubt users.list_status_filter.is_2fa_enabled=2FA aktiviert users.list_status_filter.not_2fa_enabled=2FA deaktiviert - emails.email_manage_panel=Benutzer-E-Mail-Verwaltung emails.primary=Primär emails.activated=Aktiviert @@ -2561,13 +2476,11 @@ emails.not_updated=Fehler beim Aktualisieren der angeforderten E-Mail-Adresse: % emails.duplicate_active=Diese E-Mail-Adresse wird bereits von einem Nutzer verwendet. emails.change_email_header=E-Mail-Eigenschaften aktualisieren emails.change_email_text=Bist du dir sicher, diese E-Mail-Adresse zu aktualisieren? - orgs.org_manage_panel=Organisationsverwaltung orgs.name=Name orgs.teams=Teams orgs.members=Mitglieder orgs.new_orga=Neue Organisation - repos.repo_manage_panel=Repositoryverwaltung repos.unadopted=Nicht übernommene Repositories repos.unadopted.no_more=Keine weiteren unübernommenen Repositories gefunden @@ -2579,7 +2492,6 @@ repos.stars=Favoriten repos.forks=Forks repos.issues=Issues repos.size=Größe - packages.package_manage_panel=Paketverwaltung packages.total_size=Gesamtgröße: %s packages.owner=Besitzer @@ -2590,17 +2502,14 @@ packages.type=Typ packages.repository=Repository packages.size=Größe packages.published=Veröffentlicht - defaulthooks=Standard-Webhooks defaulthooks.desc=Webhooks senden automatisch eine HTTP POST Anfrage an einen Server, wenn bestimmte Gitea Events ausgelöst werden. Hier definierte Webhooks sind die Standardwerte, die in alle neuen Repositories kopiert werden. Mehr Infos findest du in der Webhooks Anleitung (auf englisch). defaulthooks.add_webhook=Standard-Webhook hinzufügen defaulthooks.update_webhook=Standard-Webhook aktualisieren - systemhooks=System-Webhooks systemhooks.desc=Webhooks senden automatisch HTTP-POST Anfragen an einen Server, wenn bestimmte Gitea Events getriggered werden. Hier definierte Webhooks werden auf alle Repositories des Systems übertragen, beachte daher mögliche Performance-Einbrüche. Mehr Infos findest du in der Webhooks Anleitung (auf englisch). systemhooks.add_webhook=System-Webhook hinzufügen systemhooks.update_webhook=System-Webhook aktualisieren - auths.auth_manage_panel=Authentifikationsquellen verwalten auths.new=Authentifizierungsquelle hinzufügen auths.name=Name @@ -2715,7 +2624,6 @@ auths.still_in_used=Diese Authentifizierungsquelle wird noch verwendet. Bearbeit auths.deletion_success=Die Authentifizierungsquelle „%s“ wurde gelöscht. auths.login_source_exist=Die Authentifizierungsquelle „%s“ existiert bereits. auths.login_source_of_type_exist=Eine Authentifizierungart dieses Typs existiert bereits. - config.server_config=Serverkonfiguration config.app_name=Seitentitel config.app_ver=Gitea-Version @@ -2734,7 +2642,6 @@ config.static_file_root_path=Verzeichnis für statische Dateien config.log_file_root_path=Logdateipfad config.script_type=Skript-Typ config.reverse_auth_user=Nutzer bei Reverse-Authentifizierung - config.ssh_config=SSH-Konfiguration config.ssh_enabled=Aktiviert config.ssh_start_builtin_server=Eingebauten Server verwenden @@ -2746,12 +2653,10 @@ config.ssh_key_test_path=Schlüssel-Test-Pfad config.ssh_keygen_path=Keygen-Pfad („ssh-keygen“) config.ssh_minimum_key_size_check=Prüfung der Mindestschlüssellänge config.ssh_minimum_key_sizes=Mindestschlüssellängen - config.lfs_config=LFS-Konfiguration config.lfs_enabled=Aktiviert config.lfs_content_path=LFS Content-Pfad config.lfs_http_auth_expiry=Ablauf der LFS HTTP Authentifizierung - config.db_config=Datenbankkonfiguration config.db_type=Typ config.db_host=Host @@ -2760,7 +2665,6 @@ config.db_user=Benutzername config.db_schema=Schema config.db_ssl_mode=SSL config.db_path=Verzeichnis - config.service_config=Service-Konfiguration config.register_email_confirm=E-Mail-Bestätigung benötigt zum Registrieren config.disable_register=Selbstregistrierung deaktivieren @@ -2783,12 +2687,10 @@ config.default_allow_only_contributors_to_track_time=Nur Mitarbeitern erlauben, config.no_reply_address=Versteckte E-Mail-Domain config.default_visibility_organization=Standard-Sichtbarkeit für neue Organisationen config.default_enable_dependencies=Issue-Abhängigkeiten standardmäßig aktivieren - config.webhook_config=Webhook-Konfiguration config.queue_length=Warteschlangenlänge config.deliver_timeout=Zeitlimit für Zustellung config.skip_tls_verify=TLS-Verifikation überspringen - config.mailer_enabled=Aktiviert config.mailer_enable_helo=HELO aktivieren config.mailer_name=Name @@ -2802,16 +2704,13 @@ config.test_email_placeholder=E-Mail (z.B. test@example.com) config.send_test_mail=Test-E-Mail senden config.test_mail_failed=Das Senden der Test-E-Mail an „%s“ ist fehlgeschlagen: %v config.test_mail_sent=Eine Test-E-Mail wurde an „%s“ gesendet. - config.oauth_config=OAuth-Konfiguration config.oauth_enabled=Aktiviert - config.cache_config=Cache-Konfiguration config.cache_adapter=Cache-Adapter config.cache_interval=Cache-Intervall config.cache_conn=Cache-Anbindung config.cache_item_ttl=Cache Item-TTL - config.session_config=Session-Konfiguration config.session_provider=Session-Provider config.provider_config=Provider-Einstellungen @@ -2820,12 +2719,10 @@ config.gc_interval_time=GC-Intervall config.session_life_time=Session-Lebensdauer config.https_only=Nur HTTPS config.cookie_life_time=Cookie-Lebensdauer - config.picture_config=Bild-und-Profilbild-Konfiguration config.picture_service=Bilderservice config.disable_gravatar=Gravatar deaktivieren config.enable_federated_avatar=Föderierte Profilbilder einschalten - config.git_config=Git-Konfiguration config.git_disable_diff_highlight=Diff-Syntaxhervorhebung ausschalten config.git_max_diff_lines=Max. Diff-Zeilen (in einer Datei) @@ -2837,7 +2734,6 @@ config.git_mirror_timeout=Zeitlimit für Mirror-Aktualisierung config.git_clone_timeout=Zeitlimit für Clone config.git_pull_timeout=Zeitlimit für Pull config.git_gc_timeout=Zeitlimit für GC - config.log_config=Konfiguration des Loggings config.log_mode=Log-Modus config.own_named_logger=Benannte Logger @@ -2849,8 +2745,6 @@ config.access_log_mode=Access-Log-Modus config.access_log_template=Vorlage config.xorm_log_mode=XORM Log-Modus config.xorm_log_sql=SQL protokollieren - - monitor.cron=Cron-Aufgaben monitor.name=Name monitor.schedule=Zeitplan @@ -2901,7 +2795,6 @@ monitor.queue.pool.pause.submit=Warteschlange pausieren monitor.queue.pool.resume.title=Warteschlange fortsetzen monitor.queue.pool.resume.desc=Diese Warteschlange wieder starten monitor.queue.pool.resume.submit=Warteschlange fortsetzen - monitor.queue.settings.title=Pool-Einstellungen monitor.queue.settings.desc=Pools wachsen dynamisch mit einem Boost als Reaktion auf die Blockierung ihrer Workerwarteschlangen. Diese Änderungen wirken sich nicht auf die aktuellen Worker Gruppen aus. monitor.queue.settings.timeout=Timeout verlängern @@ -2917,7 +2810,6 @@ monitor.queue.settings.submit=Einstellungen aktualisieren monitor.queue.settings.changed=Einstellungen aktualisiert monitor.queue.settings.blocktimeout=Aktuelle Block-Timeout monitor.queue.settings.blocktimeout.value=%[1]v - monitor.queue.pool.none=Diese Warteschlange hat keinen Pool monitor.queue.pool.added=Workergruppe hinzugefügt monitor.queue.pool.max_changed=Maximale Anzahl von Workern geändert @@ -2927,7 +2819,6 @@ monitor.queue.pool.cancel=Workergruppen herunterfahren monitor.queue.pool.cancelling=Workergruppe fährt herunter monitor.queue.pool.cancel_notices=Diese Gruppe von %s Workern herunterfahren? monitor.queue.pool.cancel_desc=Eine Warteschlange ohne Workergruppen kann dazu führen, dass Anfragen auf unbestimmte Zeit blockiert werden. - notices.system_notice_list=Systemmitteilungen notices.view_detail_header=Meldungsdetails ansehen notices.actions=Aktionen @@ -2942,20 +2833,25 @@ notices.type_2=Aufgabe notices.desc=Beschreibung notices.op=Aktion notices.delete_success=Diese Systemmeldung wurde gelöscht. +users.purge=Benutzer löschen +config.mailer_smtp_addr=SMTP-Adresse +config.mailer_smtp_port=SMTP-Port +config.get_setting_failed=Holen der Einstellung %s fehlgeschlagen +monitor.queue.flush=Aufräumhelfer [action] create_repo=hat das Repository %s erstellt rename_repo=hat das Repository von %[1]s zu %[3]s umbenannt commit_repo=hat %[3]s auf %[4]s gepusht -create_issue=`hat Ticket %[3]s#%[2]s geöffnet` -close_issue=`Ticket %[3]s#%[2]s geschlossen` -reopen_issue=`Ticket %[3]s#%[2]s wiedereröffnet` -create_pull_request=`hat den Pull-Request %[3]s#%[2]s erstellt` -close_pull_request=`Pull-Request %[3]s#%[2]s wurde geschlossen` -reopen_pull_request=`Pull-Request %[3]s#%[2]s wurde wiedereröffnet` -comment_issue=`Ticket %[3]s#%[2]s wurde kommentiert` -comment_pull=`Pull-Request %[3]s#%[2]s wurde kommentiert` -merge_pull_request=`Pull-Request %[3]s#%[2]s wurde zusammengeführt` +create_issue=hat Ticket %[3]s#%[2]s geöffnet +close_issue=Ticket %[3]s#%[2]s geschlossen +reopen_issue=Ticket %[3]s#%[2]s wiedereröffnet +create_pull_request=hat den Pull-Request %[3]s#%[2]s erstellt +close_pull_request=Pull-Request %[3]s#%[2]s wurde geschlossen +reopen_pull_request=Pull-Request %[3]s#%[2]s wurde wiedereröffnet +comment_issue=Ticket %[3]s#%[2]s wurde kommentiert +comment_pull=Pull-Request %[3]s#%[2]s wurde kommentiert +merge_pull_request=Pull-Request %[3]s#%[2]s wurde zusammengeführt transfer_repo=hat Repository %s transferiert an %s push_tag=Tag %[3]s nach %[4]s wurde gepusht delete_tag=hat Tag %[2]s in %[3]s gelöscht @@ -2966,14 +2862,15 @@ compare_commits_general=Commits vergleichen mirror_sync_push=Commits zu %[3]s bei %[4]s wurden von einem Spiegel synchronisiert mirror_sync_create=neue Referenz %[3]s bei %[4]s wurde von einem Spiegel synchronisiert mirror_sync_delete=hat die Referenz des Mirrors %[2]s in %[3]s synchronisiert und gelöscht -approve_pull_request=`hat %[3]s#%[2]s approved` -reject_pull_request=`schlug Änderungen für %[3]s#%[2]s vor` -publish_release=`veröffentlichte Release "%[4]s" in %[3]s` -review_dismissed=`verwarf das Review von %[4]s in %[3]s#%[2]s` +approve_pull_request=hat %[3]s#%[2]s approved +reject_pull_request=schlug Änderungen für %[3]s#%[2]s vor +publish_release=veröffentlichte Release "%[4]s" in %[3]s +review_dismissed=verwarf das Review von %[4]s in %[3]s#%[2]s review_dismissed_reason=Grund: create_branch=legte den Branch %[3]s in %[4]s an starred_repo=markiert %[2]s watched_repo=beobachtet %[2]s +auto_merge_pull_request=Pull-Request %[3]s#%[2]s wurde automatisch zusammengeführt [tool] ago=vor %s @@ -3013,6 +2910,8 @@ pin=Benachrichtigung pinnen mark_as_read=Als gelesen markieren mark_as_unread=Als ungelesen markieren mark_all_as_read=Alle als gelesen markieren +subscriptions=Abonnements +no_subscriptions=Keine Abonnements [gpg] default_key=Mit Standardschlüssel signiert @@ -3122,4 +3021,27 @@ settings.delete.description=Das Löschen eines Pakets ist dauerhaft und kann nic settings.delete.notice=Du bist dabei, %s (%s) zu löschen. Dieser Vorgang ist unwiderruflich. Bist du sicher? settings.delete.success=Das Paket wurde gelöscht. settings.delete.error=Löschen des Pakets fehlgeschlagen. - +empty.repo=Hast du ein Paket hochgeladen, das hier nicht angezeigt wird? Gehe zu den Paketeinstellungen und verlinke es mit diesem Repo. +chef.install=Nutze folgenden Befehl, um das Paket zu installieren: +pub.documentation=Weitere Informationen zur pub-Paketverwaltung findest du in der Dokumentation. +vagrant.install=Um eine Vagrant-Box hinzuzufügen, führen Sie folgenden Befehl aus: +vagrant.documentation=Für weitere Informationen zur Vagrant-Registry, siehe Dokumentation. +owner.settings.cleanuprules.enabled=Aktiviert + +[aria] + +[secrets] +value=Wert +name=Name + +[actions] +runners.id=ID +runners.name=Name +runners.owner_type=Typ +runners.description=Beschreibung +runners.labels=Labels +runners.task_list.run=Ausführen +runners.task_list.repository=Repository +runners.task_list.commit=Commit +runners.status.active=Aktiv +runs.commit=Commit diff --git a/options/locale/locale_el-GR.ini b/options/locale/locale_el-GR.ini index 200dabaf893f..ceb1ba6e7f81 100644 --- a/options/locale/locale_el-GR.ini +++ b/options/locale/locale_el-GR.ini @@ -23,7 +23,6 @@ enable_javascript=Αυτή η ιστοσελίδα λειτουργεί καλύ toc=Πίνακας Περιεχομένων licenses=Άδειες return_to_gitea=Επιστροφή στο Gitea - username=Όνομα Χρήστη email=Διεύθυνση Email password=Κωδικός πρόσβασης @@ -33,7 +32,6 @@ captcha=CAPTCHA twofa=Έλεγχος Ταυτότητας Δύο Παραγόντων twofa_scratch=Κωδικός Μίας Χρήσης Δύο Παραγόντων passcode=Κωδικός - webauthn_insert_key=Εισάγετε το κλειδί ασφαλείας σας webauthn_sign_in=Πατήστε το κουμπί στο κλειδί ασφαλείας. Αν το κλειδί ασφαλείας σας δεν έχει κουμπί, τοποθετήστε το ξανά. webauthn_press_button=Παρακαλώ πατήστε το κουμπί στο κλειδί ασφαλείας… @@ -47,7 +45,6 @@ webauthn_error_duplicated=Το κλειδί ασφαλείας δεν επιτρ webauthn_error_empty=Πρέπει να ορίσετε ένα όνομα για αυτό το κλειδί. webauthn_error_timeout=Το χρονικό όριο έφτασε πριν το κλειδί να διαβαστεί. Παρακαλώ ανανεώστε τη σελίδα και προσπαθήστε ξανά. webauthn_reload=Ανανέωση - repository=Αποθετήριο organization=Οργανισμός mirror=Αντίγραφο @@ -65,18 +62,15 @@ settings=Ρυθμίσεις your_profile=Προφίλ your_starred=Με αστέρι your_settings=Ρυθμίσεις - all=Όλα sources=Πηγές mirrors=Είδωλα collaborative=Συνεργατικά forks=Forks - activities=Δραστηριότητες pull_requests=Pull Requests issues=Ζητήματα milestones=Ορόσημα - ok=OK cancel=Ακύρωση save=Αποθήκευση @@ -85,26 +79,22 @@ add_all=Προσθήκη Όλων remove=Αφαίρεση remove_all=Αφαίρεση Όλων edit=Επεξεργασία - copy=Αντιγραφή copy_url=Αντιγραφή URL copy_branch=Αντιγραφή ονόματος κλάδου copy_success=Αντιγράφηκε! copy_error=Η αντιγραφή απέτυχε - write=Σύνταξη preview=Προεπισκόπηση loading=Φόρτωση… - step1=Βήμα 1: step2=Βήμα 2: - error=Σφάλμα error404=Η σελίδα που προσπαθείτε να φτάσετε είτε δεν υπάρχει είτε δεν είστε εξουσιοδοτημένοι για να την δείτε. - never=Ποτέ - rss_feed=Ροή RSS +enabled=Ενεργοποιημένο +disabled=Απενεργοποιημένο [filter] string.asc=A - Z @@ -159,7 +149,6 @@ err_empty_admin_email=Το email του διαχειριστή δεν μπορε err_admin_name_is_reserved=Το Όνομα χρήστη του Διαχειριστή δεν είναι έγκυρο, είναι δεσμευμένο err_admin_name_pattern_not_allowed=Το Όνομα χρήστη του Διαχειριστή δεν είναι έγκυρο, ταιριάζει σε μια δεσμευμένη μορφή err_admin_name_is_invalid=Το Όνομα Χρήστη του Διαχειριστή δεν είναι έγκυρο - general_title=Γενικές Ρυθμίσεις app_name=Τίτλος Ιστοτόπου app_name_helper=Μπορείτε να εισάγετε το όνομα της εταιρείας σας εδώ. @@ -179,7 +168,6 @@ app_url=Βασικό URL του Gitea app_url_helper=Βασική Διεύθυνση για τα URL κλωνοποίησης μέσω HTTP(S) και για τις ειδοποιήσεις μέσω email. log_root_path=Διαδρομή Αρχείων Καταγραφής log_root_path_helper=Τα αρχεία καταγραφής θα γράφονται σε αυτόν τον κατάλογο. - optional_title=Προαιρετικές Ρυθμίσεις email_title=Ρυθμίσεις Email smtp_addr=Διακομιστής SMTP @@ -237,7 +225,7 @@ default_enable_timetracking_popup=Ενεργοποίηση καταγραφής no_reply_address=Κρυφό Όνομα Τομέα Email no_reply_address_helper=Όνομα τομέα για χρήστες με μια κρυφή διεύθυνση email. Για παράδειγμα, το όνομα χρήστη 'nikos' θα συνδεθεί στο Git ως 'nikos@noreply.example.org' αν ο κρυφός τομέας email έχει οριστεί ως 'noreply.example.org'. password_algorithm=Αλγόριθμος Hash Κωδικού Πρόσβασης -password_algorithm_helper=Ορίστε τον αλγόριθμο hash του κωδικού πρόσβασης. Οι αλγόριθμοι έχουν διαφορετικές απαιτήσεις και αντοχή. Ο `argon2` ενώ έχει καλά χαρακτηριστικά χρησιμοποιεί πολλή μνήμη και μπορεί να είναι ακατάλληλός για μικρά συστήματα. +password_algorithm_helper="""Ορίστε τον αλγόριθμο hash του κωδικού πρόσβασης. Οι αλγόριθμοι έχουν διαφορετικές απαιτήσεις και αντοχή. Ο `argon2` ενώ έχει καλά χαρακτηριστικά χρησιμοποιεί πολλή μνήμη και μπορεί να είναι ακατάλληλός για μικρά συστήματα.""" [home] uname_holder=Όνομα Χρήστη ή Διεύθυνση Email @@ -253,17 +241,14 @@ search_repos=Βρείτε ένα αποθετήριο… filter=Άλλα Φίλτρα filter_by_team_repositories=Φιλτράρισμα ανά αποθετήρια ομάδας feed_of=Τροφοδοσία του "%s" - show_archived=Αρχειοθετήθηκε show_both_archived_unarchived=Εμφάνιση και αρχειοθετημένων και μη αρχειοθετημένων show_only_archived=Εμφάνιση μόνο αρχειοθετημένων show_only_unarchived=Εμφάνιση μόνο μη αρχειοθετημένων - show_private=Ιδιωτικό show_both_private_public=Εμφάνιση και δημόσιων και ιδιωτικών show_only_private=Εμφανίζονται μόνο ιδιωτικά show_only_public=Εμφανίζονται μόνο δημόσια - issues.in_your_repos=Στα αποθετήρια σας [explore] @@ -287,7 +272,6 @@ code_last_indexed_at=Τελευταίο δημιουργία ευρετηρίο relevant_repositories_tooltip=Τα αποθετήρια που είναι forks ή που δεν έχουν θέμα, εικονίδιο και περιγραφή είναι κρυμμένα. relevant_repositories=Εμφανίζονται μόνο τα σχετικά αποθετήρια, εμφάνιση χωρίς φίλτρο. - [auth] create_new_account=Εγγραφή Λογαριασμού register_helper_msg=Έχετε ήδη λογαριασμό? Συνδεθείτε τώρα! @@ -360,31 +344,24 @@ password_pwned_err=Δεν ήταν δυνατή η ολοκλήρωση του view_it_on=Δείτε το στο %s link_not_working_do_paste=Δεν λειτουργεί; Δοκιμάστε να κάνετε αντιγραφή και επικόλληση στο πρόγραμμα περιήγησης. hi_user_x=Γειά σου %s, - activate_account=Παρακαλώ ενεργοποιήστε το λογαριασμό σας activate_account.title=%s, παρακαλώ ενεργοποιήστε το λογαριασμό σας activate_account.text_1=Γεια σας %[1]s, ευχαριστούμε για την εγγραφή στο %[2]! activate_account.text_2=Παρακαλούμε κάντε κλικ στον παρακάτω σύνδεσμο για να ενεργοποιήσετε το λογαριασμό σας μέσα σε %s: - activate_email=Επιβεβαιώστε τη διεύθυνση email σας activate_email.title=%s, παρακαλώ επαληθεύστε τη διεύθυνση email σας activate_email.text=Παρακαλώ κάντε κλικ στον παρακάτω σύνδεσμο για να επαληθεύσετε τη διεύθυνση email σας στο %s: - register_notify=Καλώς ήλθατε στο Gitea register_notify.title=%[1]s, καλώς ήρθατε στο %[2]s register_notify.text_1=αυτό είναι το email επιβεβαίωσης εγγραφής για το %s! register_notify.text_2=Τώρα μπορείτε να συνδεθείτε μέσω του ονόματος χρήστη: %s. register_notify.text_3=Εάν αυτός ο λογαριασμός έχει δημιουργηθεί για εσάς, παρακαλώ ορίστε πρώτα τον κωδικό πρόσβασής σας. - reset_password=Ανάκτηση του λογαριασμού σας reset_password.title=%s, ζητήσατε να ανακτήσετε το λογαριασμό σας reset_password.text=Κάντε κλικ στον παρακάτω σύνδεσμο για να ανακτήσετε το λογαριασμό σας εντός %s: - register_success=Επιτυχής εγγραφή - issue_assigned.pull=@%[1]s σας έχει αναθέσει στο pull request %[2]s στο αποθετήριο %[3]s. issue_assigned.issue=@%[1]s σας ανέθεσε το ζήτημα %[2]s στο αποθετήριο %[3]s. - issue.x_mentioned_you=@%s σας ανέφερε: issue.action.force_push=%[1]s έκανε force-push το %[2]s από %[3]s σε %[4]s. issue.action.push_1=@%[1]s έκανε push την υποβολή %[3]d στο %[2]s @@ -399,7 +376,6 @@ issue.action.review_dismissed=@%[1]s απέρριψε την τελευτ issue.action.ready_for_review=@%[1]s σημείωσε αυτό το pull request σαν έτοιμο για αναθεώρηση. issue.action.new=@%[1]s δημιούργησε το #%[2]d. issue.in_tree_path=Σε %s: - release.new.subject=%s σε %s κυκλοφόρησε release.new.text=@%[1]s κυκλοφόρησε το %[2]s στο %[3]s release.title=Τίτλος: %s @@ -407,15 +383,12 @@ release.note=Σημείωση: 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.to_you=εσάς repo.transfer.body=Για να το αποδεχτείτε ή να το απορρίψετε, επισκεφθείτε το %s ή απλά αγνοήστε το. - repo.collaborator.added.subject=%s σας πρόσθεσε στο %s repo.collaborator.added.text=Έχετε προστεθεί ως συνεργάτης του αποθετηρίου: - team_invite.subject=%[1]s σας προσκάλεσε να συμμετέχετε στον οργανισμό %[2]s team_invite.text_1=%[1]s σας προσκάλεσε να συμμετέχετε στην ομάδα %[2]s στον οργανισμός %[3]. team_invite.text_2=Παρακαλώ κάντε κλικ στον παρακάτω σύνδεσμο για να συμμετάσχετε στην ομάδα: @@ -438,34 +411,30 @@ PayloadUrl=Payload URL TeamName=Όνομα ομάδας AuthName=Όνομα εξουσιοδότησης AdminEmail=Email διαχειριστή - NewBranchName=Όνομα νέου κλάδου CommitSummary=Περίληψη υποβολών CommitMessage=Μήνυμα υποβολής CommitChoice=Επιλογή υποβολής TreeName=Διαδρομή αρχείου Content=Περιεχόμενο - SSPISeparatorReplacement=Διαχωριστικό SSPIDefaultLanguage=Προεπιλεγμένη Γλώσσα - -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=` δεν είναι έγκυρη διεύθυνση email.` -url_error=`'%s' δεν είναι έγκυρο URL.` -include_error=` πρέπει να περιέχει τη σειρά χαρακτήρων '%s'.` -glob_pattern_error=` το μοτίβο ταιριάσματος (glob) δεν είναι έγκυρο: %s.` -regex_pattern_error=` το μοτίβο regex δεν είναι έγκυρο: %s.` +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=" δεν είναι έγκυρη διεύθυνση email." +url_error='%s' δεν είναι έγκυρο URL. +include_error=" πρέπει να περιέχει τη σειρά χαρακτήρων '%s'." +glob_pattern_error=" το μοτίβο ταιριάσματος (glob) δεν είναι έγκυρο: %s." +regex_pattern_error=" το μοτίβο regex δεν είναι έγκυρο: %s." unknown_error=Άγνωστο σφάλμα: captcha_incorrect=Ο κωδικός CAPTCHA είναι λάθος. password_not_match=Οι κωδικοί πρόσβασης δεν ταιριάζουν. lang_select_error=Επιλέξτε μια γλώσσα από τη λίστα. - username_been_taken=Το όνομα χρήστη χρησιμοποιείται ήδη. username_change_not_local_user=Δεν επιτρέπεται στους μη τοπικούς χρήστες να αλλάξουν το όνομα χρήστη τους. repo_name_been_taken=Το όνομα του αποθετηρίου χρησιμοποιείται ήδη. @@ -497,19 +466,16 @@ team_not_exist=Δεν υπάρχει η ομάδα. last_org_owner=Δεν μπορείτε να καταργήσετε τον τελευταίο χρήστη από την ομάδα 'ιδιοκτήτών'. Πρέπει να υπάρχει τουλάχιστον ένας ιδιοκτήτης για έναν οργανισμό. cannot_add_org_to_team=Ένας οργανισμός δεν μπορεί να προστεθεί ως μέλος ομάδας. duplicate_invite_to_team=Ο χρήστης είχε ήδη προσκληθεί ως μέλος της ομάδας. - invalid_ssh_key=Δεν είναι δυνατή η επαλήθευση του SSH κλειδιού σας: %s invalid_gpg_key=Δεν είναι δυνατή η επαλήθευση του GPG κλειδιού σας: %s invalid_ssh_principal=Μη έγκυρος ssh principal: %s unable_verify_ssh_key=Αδυναμία επαλήθευσης του κλειδιού SSH, ελέγξτε ξανά για λάθη. auth_failed=Αποτυχία ταυτοποίησης: %v - still_own_repo=Ο λογαριασμός σας διαθέτει ένα ή περισσότερα αποθετήρια, διαγράψτε ή μεταφέρετε τα πρώτα. still_has_org=Ο λογαριασμός σας είναι μέλος ενός ή περισσοτέρων οργανισμών, αποχωρήστε απο αυτούς πρώτα. still_own_packages=Ο λογαριασμός σας κατέχει ένα ή περισσότερα πακέτα, διαγράψτε τα πρώτα. org_still_own_repo=Αυτός ο οργανισμός εξακολουθεί να κατέχει έναν ή περισσότερα αποθετήρια, διαγράψτε ή μεταφέρετε τα πρώτα. org_still_own_packages=Αυτός ο οργανισμός εξακολουθεί να κατέχει ένα ή περισσότερα πακέτα, διαγράψτε τα πρώτα. - target_branch_not_exist=Ο κλάδος προορισμού δεν υπάρχει. [user] @@ -527,10 +493,10 @@ unfollow=Να μην ακολουθώ heatmap.loading=Φόρτωση heatmap… user_bio=Βιογραφικό disabled_public_activity=Αυτός ο χρήστης έχει απενεργοποιήσει τη δημόσια προβολή της δραστηριότητας. - form.name_reserved=Το όνομα χρήστη '%s' είναι δεσμευμένο. form.name_pattern_not_allowed=Το μοτίβο '%s' δεν επιτρέπεται μέσα σε όνομα χρήστη. form.name_chars_not_allowed=Το όνομα χρήστη '%s' περιέχει μη έγκυρους χαρακτήρες. +code=Κώδικας [settings] profile=Προφίλ @@ -550,7 +516,6 @@ account_link=Συνδεδεμένοι Λογαριασμοί organization=Οργανισμοί uid=Uid webauthn=Κλειδιά Ασφαλείας - public_profile=Δημόσιο Προφίλ biography_placeholder=Πείτε μας λίγο για τον εαυτό σας profile_desc=Η διεύθυνση email σας θα χρησιμοποιηθεί για ειδοποιήσεις και άλλες λειτουργίες. @@ -590,7 +555,6 @@ saved_successfully=Οι ρυθμίσεις σας αποθηκεύτηκαν ε privacy=Απόρρητο keep_activity_private=Απόκρυψη της δραστηριότητας σας από τη σελίδα προφίλ keep_activity_private_popup=Με αυτή την επιλογή η δραστηριότητα σας είναι ορατή μόνο σε εσάς και τους διαχειριστές - lookup_avatar_by_mail=Αναζήτηση ενός Avatar με διεύθυνση email federated_avatar_lookup=Συνενωμένη Αναζήτηση Avatar enable_custom_avatar=Χρήση Προσαρμοσμένης Εικόνας @@ -601,7 +565,6 @@ uploaded_avatar_not_a_image=Το αρχείο που ανεβάσατε δεν uploaded_avatar_is_too_big=Το αρχείο έχει υπερβεί το μέγιστο μέγεθος. update_avatar_success=Η εικόνα σας έχει ενημερωθεί. update_user_avatar_success=Το avatar του χρήστη ενημερώθηκε. - change_password=Ενημέρωση Κωδικού Πρόσβασης old_password=Τρέχων Κωδικός Πρόσβασης new_password=Νέος Κωδικός Πρόσβασης @@ -609,7 +572,6 @@ retype_new_password=Επανεισάγετε το Νέο Κωδικό Πρόσβ password_incorrect=Ο τρέχων κωδικός πρόσβασης είναι λάθος. change_password_success=Ο κωδικός πρόσβασής σας έχει ενημερωθεί. Από εδώ και τώρα συνδέεστε χρησιμοποιώντας τον νέο κωδικό πρόσβασής σας. password_change_disabled=Οι μη τοπικοί χρήστες δεν μπορούν να ενημερώσουν τον κωδικό πρόσβασής τους μέσω του διεπαφής web του Gitea. - emails=Διευθύνσεις Email manage_emails=Διαχείριση Διευθύνσεων Email manage_themes=Επιλέξτε προεπιλεγμένο θέμα διεπαφής @@ -642,7 +604,6 @@ add_openid_success=Προστέθηκε η νέα διεύθυνση OpenID. keep_email_private=Απόκρυψη Διεύθυνσης Email keep_email_private_popup=Η διεύθυνση email σας θα είναι κρυφή στους άλλους χρήστες. openid_desc=Το OpenID σας επιτρέπει να αναθέσετε τον έλεγχο ταυτότητας σε έναν εξωτερικό πάροχο. - manage_ssh_keys=Διαχείριση SSH Κλειδιών manage_ssh_principals=Διαχείριση Των Αρχών Πιστοποιητικού SSH manage_gpg_keys=Διαχείριση Κλειδιών GPG @@ -721,7 +682,6 @@ manage_social=Διαχείριση Συσχετιζόμενων Λογαριασ social_desc=Αυτοί οι λογαριασμοί κοινωνικών δικτύων συνδέονται με το λογαριασμό Gitea. Βεβαιωθείτε ότι τους αναγνωρίζετε, καθώς μπορούν να χρησιμοποιηθούν για να συνδεθείτε στο λογαριασμό σας Gitea. unbind=Αποσύνδεση unbind_success=Ο λογαριασμός κοινωνικού δικτύου έχει αποσυνδεθεί από το λογαριασμό σας στο Gitea. - manage_access_token=Διαχείριση Διακριτικών Πρόσβασης generate_new_token=Δημιουργία Νέου Διακριτικού tokens_desc=Αυτά τα διακριτικά (tokens) παρέχουν πρόσβαση στο λογαριασμό σας μέσω του API του Gitea. @@ -736,7 +696,6 @@ access_token_deletion_cancel_action=Άκυρο access_token_deletion_confirm_action=Διαγραφή access_token_deletion_desc=Η διαγραφή ενός διακριτικού θα ανακαλέσει οριστικά την πρόσβαση στο λογαριασμό σας για εφαρμογές που το χρησιμοποιούν. Συνέχεια; delete_token_success=Το διακριτικό έχει διαγραφεί. Οι εφαρμογές που το χρησιμοποιούν δεν έχουν πλέον πρόσβαση στο λογαριασμό σας. - manage_oauth2_applications=Διαχείριση Εφαρμογών Oauth2 edit_oauth2_application=Επεξεργασία Εφαρμογής Oauth2 oauth2_applications_desc=Οι εφαρμογές OAuth2 επιτρέπουν στην εξωτερική εφαρμογή σας την ασφαλή ταυτοποίηση των χρηστών σε αυτό το Gitea. @@ -759,14 +718,12 @@ oauth2_client_secret_hint=Το μυστικό δεν θα είναι ορατό oauth2_application_edit=Επεξεργασία oauth2_application_create_description=Οι εφαρμογές OAuth2 δίνει πρόσβαση στην εξωτερική εφαρμογή σας σε λογαριασμούς χρηστών σε αυτή την υπηρεσία. oauth2_application_remove_description=Αφαιρώντας μια εφαρμογή OAuth2, θα αποτρέψει την πρόσβαση σε εξουσιοδοτημένους λογαριασμούς χρηστών σε αυτή την υπηρεσία. Συνέχεια; - authorized_oauth2_applications=Εξουσιοδοτημένες Εφαρμογές OAuth2 authorized_oauth2_applications_description=Έχετε δώσει πρόσβαση στον προσωπικό σας λογαριασμό Gitea σε αυτές τις εξωτερικές εφαρμογές. Ανακαλέστε την πρόσβαση για εφαρμογές που δεν χρειάζονται πλέον. revoke_key=Ανάκληση revoke_oauth2_grant=Ανάκληση Πρόσβασης revoke_oauth2_grant_description=Η ανάκληση πρόσβασης για αυτή την εξωτερική εφαρμογή θα αποτρέψει αυτή την εφαρμογή από την πρόσβαση στα δεδομένα σας. Σίγουρα; revoke_oauth2_grant_success=Έχετε ανακαλέσει την πρόσβαση με επιτυχία. - twofa_desc=Ο έλεγχος ταυτότητας δύο παραγόντων ενισχύει την ασφάλεια του λογαριασμού σας. twofa_is_enrolled=Ο λογαριασμός σας είναι εγγεγραμμένος σε έλεγχο ταυτότητας δύο παραγόντων. twofa_not_enrolled=Ο λογαριασμός σας δεν είναι εγγεγραμμένος σε έλεγχο ταυτότητας δύο παραγόντων. @@ -784,13 +741,11 @@ then_enter_passcode=Και εισάγετε τον κωδικό που εμφα passcode_invalid=Ο κωδικός είναι λάθος. Δοκιμάστε ξανά. twofa_enrolled=Ο λογαριασμός σας έχει εγγραφεί σε ταυτοποίηση δύο παραγόντων. Αποθηκεύστε το διακριτικό μιας χρήσης (%s) σε ασφαλές μέρος καθώς εμφανίζεται μόνο μία φορά! twofa_failed_get_secret=Αποτυχία λήψης μυστικού. - webauthn_desc=Τα κλειδιά ασφαλείας είναι συσκευές που περιέχουν κρυπτογραφικά κλειδιά. Μπορούν να χρησιμοποιηθούν για έλεγχο ταυτότητας δύο παραγόντων. Τα κλειδιά ασφαλείας πρέπει να υποστηρίζουν το πρότυπο WebAuthn Authn Authenticator. webauthn_register_key=Προσθήκη Κλειδιού Ασφαλείας webauthn_nickname=Ψευδώνυμο webauthn_delete_key=Αφαίρεση Κλειδιού Ασφαλείας webauthn_delete_key_desc=Αν αφαιρέσετε ένα κλειδί ασφαλείας δεν μπορείτε πλέον να συνδεθείτε με αυτό. Συνέχεια; - manage_account_links=Διαχείριση Συνδεδεμένων Λογαριασμών manage_account_links_desc=Αυτοί οι εξωτερικοί λογαριασμοί είναι συνδεδεμένοι στον Gitea λογαριασμό σας. account_links_not_available=Προς το παρόν δεν υπάρχουν εξωτερικοί λογαριασμοί συνδεδεμένοι με τον λογαριασμό σας στο Gitea. @@ -798,23 +753,19 @@ link_account=Σύνδεση Λογαριασμού remove_account_link=Αφαίρεση Συνδεδεμένου Λογαριασμού remove_account_link_desc=Η κατάργηση ενός συνδεδεμένου λογαριασμού θα ανακαλέσει την πρόσβασή του στο λογαριασμό σας στο Gitea. Συνέχεια; remove_account_link_success=Ο συνδεδεμένος λογαριασμός έχει αφαιρεθεί. - orgs_none=Δεν είστε μέλος σε κάποιο οργανισμό. repos_none=Δεν έχετε κανένα αποθετήριο - delete_account=Διαγραφή Του Λογαριασμού Σας delete_prompt=Αυτή η ενέργεια θα διαγράψει μόνιμα το λογαριασμό σας. ΔΕΝ ΘΑ ΜΠΟΡΕΙ να επανέλθει. delete_with_all_comments=Ο λογαριασμός σας είναι νεότερος από %s. Για να αποφύγετε τα σχόλια φαντάσματα, όλα τα σχόλια σε ζητήματα/PR θα διαγραφούν από αυτόν. 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.andyourown=Και Τις Δικές Σας Ειδοποιήσεις - visibility=Ορατότητα χρήστη visibility.public=Δημόσια visibility.public_tooltip=Ορατός σε όλους τους χρήστες @@ -908,14 +859,12 @@ delete_preexisting=Διαγραφή αρχείων που προϋπήρχαν delete_preexisting_content=Διαγραφή αρχείων στο %s delete_preexisting_success=Διαγράφηκαν τα μη υιοθετημένα αρχεία στο %s blame_prior=Προβολή ευθύνης πριν από αυτή την αλλαγή - transfer.accept=Αποδοχή Μεταφοράς transfer.accept_desc=Μεταφορά στο "%s" transfer.reject=Απόρριψη Μεταφοράς transfer.reject_desc=Ακύρωση μεταφοράς σε "%s" transfer.no_permission_to_accept=Δεν έχετε άδεια για να Αποδεχτείτε transfer.no_permission_to_reject=Δεν έχετε δικαιώματα να κάνετε Απόρριψη - desc.private=Ιδιωτικό desc.public=Δημόσιο desc.private_template=Ιδιωτικό πρότυπο @@ -923,7 +872,6 @@ desc.public_template=Πρότυπο desc.internal=Εσωτερικό desc.internal_template=Εσωτερικό πρότυπο desc.archived=Αρχειοθετημένο - template.items=Αντικείμενα Προτύπου template.git_content=Περιεχόμενο Git (Προεπιλεγμένος Κλάδος) template.git_hooks=Git Hooks @@ -934,16 +882,13 @@ template.avatar=Εικόνα template.issue_labels=Σήματα Ζητήματος template.one_item=Πρέπει να επιλέξετε τουλάχιστον ένα αντικείμενο στο πρότυπο template.invalid=Πρέπει να επιλέξετε ένα πρότυπο αποθετήριο - archive.title=Αυτό το αποθετήριο αρχειοθετήθηκε. Μπορείτε να δείτε αρχεία και να το κλωνοποιήσετε, αλλά δεν μπορείτε να γράψετε ή να ανοίξετε ζητήματα/pull-requests. archive.issue.nocomment=Αυτό το αποθετήριο αρχειοθετήθηκε. Δεν μπορείτε να σχολιάσετε σε ζητήματα. archive.pull.nocomment=Αυτό το repo αρχειοθετήθηκε. Δεν μπορείτε να σχολιάσετε στα pull requests. - form.reach_limit_of_creation_1=Έχετε ήδη συμπληρώσει το όριο του %d αποθετηρίου. form.reach_limit_of_creation_n=Έχετε ήδη συμπληρώσει το όριο των %d αποθετηρίων. form.name_reserved=Το όνομα του αποθετηρίου '%s' είναι δεσμευμένο. form.name_pattern_not_allowed=Το μοτίβο '%s' δεν επιτρέπεται σε ένα όνομα αποθετηρίου. - need_auth=Εξουσιοδότηση migrate_options=Επιλογές Μεταφοράς migrate_service=Υπηρεσία Μεταφοράς @@ -994,7 +939,6 @@ migrate.migrating_labels=Μεταφορά Σημάτων migrate.migrating_releases=Μεταφορά Κυκλοφοριών migrate.migrating_issues=Μετανάστευση Θεμάτων migrate.migrating_pulls=Μεταφορά Pull Requests - mirror_from=είδωλο του forked_from=forked από generated_from=παράγονται από @@ -1008,7 +952,6 @@ unstar=Όχι Αστέρι star=Αστέρι fork=Fork download_archive=Λήψη Αποθετηρίου - no_desc=Χωρίς Περιγραφή quick_guide=Γρήγορος Οδηγός clone_this_repo=Κλωνοποίηση αυτού του αποθετηρίου @@ -1016,12 +959,11 @@ create_new_repo_command=Δημιουργία νέου αποθετηρίου σ push_exist_repo=Προώθηση ενός υπάρχοντος αποθετηρίου από τη γραμμή εντολών empty_message=Αυτό το αποθετήριο δεν περιέχει τίποτα. broken_message=Τα δεδομένα Git που διέπουν αυτό το αποθετήριο δεν μπορούν να διαβαστούν. Επικοινωνήστε με το διαχειριστή ή διαγράψτε αυτό το αποθετήριο. - code=Κώδικας code.desc=Πρόσβαση στον πηγαίο κώδικα, αρχεία, υποβολές και κλάδους. branch=Κλάδος tree=Δέντρο -clear_ref=`Καθαρισμός τρέχουσας αναφοράς` +clear_ref=Καθαρισμός τρέχουσας αναφοράς filter_branch_and_tag=Φίλτρο κλάδου ή ετικέτας find_tag=Εύρεση ετικέτας branches=Κλάδοι @@ -1033,7 +975,6 @@ packages=Πακέτα labels=Σήματα org_labels_desc=Τα σήματα στο επίπεδο οργανισμού, που μπορούν να χρησιμοποιηθούν με όλα τα αποθετήρια κάτω από αυτόν τον οργανισμό org_labels_desc_manage=διαχείριση - milestones=Ορόσημα commits=Υποβολές commit=Υποβολή @@ -1049,14 +990,13 @@ file_view_rendered=Προβολή Απόδοσης file_view_raw=Προβολή Ακατέργαστου file_permalink=Permalink file_too_large=Το αρχείο είναι πολύ μεγάλο για να εμφανιστεί. -invisible_runes_header=`Αυτό το αρχείο περιέχει αόρατους χαρακτήρες Unicode!` -invisible_runes_description=`Αυτό το αρχείο περιέχει αόρατους χαρακτήρες Unicode που μπορεί να επεξεργάζονται διαφορετικά από ό, τι εμφανίζονται παρακάτω. Αν η περίπτωση χρήσης σας είναι σκόπιμη και νόμιμη, μπορείτε να αγνοήσετε με ασφάλεια αυτή την προειδοποίηση. Χρησιμοποιήστε το κουμπί Escape για να αποκαλύψετε κρυμμένους χαρακτήρες.` -ambiguous_runes_header=`Αυτό το αρχείο περιέχει ασαφείς χαρακτήρες Unicode!` -ambiguous_runes_description=`Αυτό το αρχείο περιέχει ασαφείς χαρακτήρες Unicode που μπορεί να συγχέονται με άλλους στην τοπική σας γλώσσα. Αν η περίπτωση χρήσης σας είναι σκόπιμη και νόμιμη, μπορείτε να αγνοήσετε με ασφάλεια αυτή την προειδοποίηση. Χρησιμοποιήστε το κουμπί Escape για να επισημάνετε αυτούς τους χαρακτήρες.` -invisible_runes_line=`Αυτή η γραμμή έχει αόρατους χαρακτήρες unicode ` -ambiguous_runes_line=`Αυτή η γραμμή έχει ασαφείς χαρακτήρες unicode ` -ambiguous_character=`ο %[1]c [U+%04[1]X] μπορεί να μπερδευτεί με τον %[2]c [U+%04[2]X]` - +invisible_runes_header=Αυτό το αρχείο περιέχει αόρατους χαρακτήρες Unicode! +invisible_runes_description=Αυτό το αρχείο περιέχει αόρατους χαρακτήρες Unicode που μπορεί να επεξεργάζονται διαφορετικά από ό, τι εμφανίζονται παρακάτω. Αν η περίπτωση χρήσης σας είναι σκόπιμη και νόμιμη, μπορείτε να αγνοήσετε με ασφάλεια αυτή την προειδοποίηση. Χρησιμοποιήστε το κουμπί Escape για να αποκαλύψετε κρυμμένους χαρακτήρες. +ambiguous_runes_header=Αυτό το αρχείο περιέχει ασαφείς χαρακτήρες Unicode! +ambiguous_runes_description=Αυτό το αρχείο περιέχει ασαφείς χαρακτήρες Unicode που μπορεί να συγχέονται με άλλους στην τοπική σας γλώσσα. Αν η περίπτωση χρήσης σας είναι σκόπιμη και νόμιμη, μπορείτε να αγνοήσετε με ασφάλεια αυτή την προειδοποίηση. Χρησιμοποιήστε το κουμπί Escape για να επισημάνετε αυτούς τους χαρακτήρες. +invisible_runes_line="Αυτή η γραμμή έχει αόρατους χαρακτήρες unicode " +ambiguous_runes_line="Αυτή η γραμμή έχει ασαφείς χαρακτήρες unicode " +ambiguous_character=ο %[1]c [U+%04[1]X] μπορεί να μπερδευτεί με τον %[2]c [U+%04[2]X] escape_control_characters=Escape unescape_control_characters=Unescape file_copy_permalink=Αντιγραφή Permalink @@ -1075,7 +1015,6 @@ download_file=Λήψη αρχείου normal_view=Κανονική Προβολή line=γραμμή lines=γραμμές - editor.add_file=Προσθήκη Αρχείου editor.new_file=Νέο Αρχείο editor.upload_file=Ανέβασμα Αρχείου @@ -1141,7 +1080,6 @@ editor.user_no_push_to_branch=Ο χρήστης δεν μπορεί να κάν editor.require_signed_commit=Ο κλάδος απαιτεί υπογεγραμμένη υποβολή editor.cherry_pick=Ανθολόγηση (cherry-pic) του %s στο: editor.revert=Απόσυρση του %s στο: - commits.desc=Δείτε το ιστορικό αλλαγών του πηγαίου κώδικα. commits.commits=Υποβολές commits.no_commits=Δεν υπάρχουν κοινές υποβολές. Τα '%s' και '%s' έχουν εντελώς διαφορετικό ιστορικό. @@ -1160,7 +1098,6 @@ commits.signed_by_untrusted_user=Υπογράφηκε από μη έμπιστο commits.signed_by_untrusted_user_unmatched=Υπογράφηκε από ένα μη έμπιστο χρήστη ο οποίος δεν ταιριάζει με τον υποβολέα commits.gpg_key_id=ID Κλειδιού GPG commits.ssh_key_fingerprint=Αποτύπωμα Κλειδιού SSH - commit.actions=Δράσεις commit.revert=Απόσυρση commit.revert-header=Απόσυρση: %s @@ -1168,10 +1105,8 @@ commit.revert-content=Επιλέξτε κλάδο για απόσυρση σε commit.cherry-pick=Cherry-pick commit.cherry-pick-header=Ανθολόγηση: %s commit.cherry-pick-content=Επιλέξτε κλάδο για να κάνετε ανθολόγηση σε αυτό: - ext_issues=Πρόσβαση στα Εξωτερικά Ζητήματα ext_issues.desc=Σύνδεση σε εξωτερικό εφαρμογή ζητημάτων. - projects=Έργα projects.desc=Διαχείριση ζητημάτων και pulls στους πίνακες των έργων. projects.description=Περιγραφή (προαιρετικό) @@ -1207,7 +1142,6 @@ projects.board.color=Χρώμα projects.open=Άνοιγμα projects.close=Κλείσιμο projects.board.assigned_to=Ανατέθηκε σε - issues.desc=Οργανώστε αναφορές σφαλμάτων, εργασίες και ορόσημα. issues.filter_assignees=Φίλτρο Αποδέκτη issues.filter_milestones=Φίλτρο Ορόσημου @@ -1260,25 +1194,25 @@ issues.add_labels=πρόσθεσε τα σήματα %s %s issues.remove_label=αφαίρεσε το σήμα %s %s issues.remove_labels=αφαίρεσε τα %s σήματα %s issues.add_remove_labels=πρόσθεσε τα %s και αφαίρεσε τα %s σήματα %s -issues.add_milestone_at=`το πρόσθεσε στο %s ορόσημο %s` -issues.add_project_at=`το πρόσθεσε στο έργο %s %s` -issues.change_milestone_at=`τροποποίησε το ορόσημο από %s σε %s %s` -issues.change_project_at=`τροποποίησε το έργο από %s σε %s %s` -issues.remove_milestone_at=`το αφαίρεσε από το %s ορόσημο %s` -issues.remove_project_at=`το αφαίρεσε από το %s έργο %s` -issues.deleted_milestone=`(διαγράφηκε)` -issues.deleted_project=`(διαγράφηκε)` -issues.self_assign_at=`ανέθεσε στον εαυτό του το %s` -issues.add_assignee_at=`ανατέθηκε από %s %s` -issues.remove_assignee_at=`αφαιρέθηκε η ανάθεση από %s %s` -issues.remove_self_assignment=`αφαίρεσαν την ανάθεση τους %s` -issues.change_title_at=`άλλαξε το τίτλο από %s σε %s %s` -issues.change_ref_at=`άλλαξε την αναφορά από %s σε %s %s` -issues.remove_ref_at=`αφαίρεση την αναφορά %s %s` -issues.add_ref_at=`πρόσθεσε την αναφορά %s %s` -issues.delete_branch_at=`διέγραψε το κλάδο %s %s` +issues.add_milestone_at=το πρόσθεσε στο %s ορόσημο %s +issues.add_project_at=το πρόσθεσε στο έργο %s %s +issues.change_milestone_at=τροποποίησε το ορόσημο από %s σε %s %s +issues.change_project_at=τροποποίησε το έργο από %s σε %s %s +issues.remove_milestone_at=το αφαίρεσε από το %s ορόσημο %s +issues.remove_project_at=το αφαίρεσε από το %s έργο %s +issues.deleted_milestone=(διαγράφηκε) +issues.deleted_project=(διαγράφηκε) +issues.self_assign_at=ανέθεσε στον εαυτό του το %s +issues.add_assignee_at=ανατέθηκε από %s %s +issues.remove_assignee_at=αφαιρέθηκε η ανάθεση από %s %s +issues.remove_self_assignment=αφαίρεσαν την ανάθεση τους %s +issues.change_title_at=άλλαξε το τίτλο από %s σε %s %s +issues.change_ref_at=άλλαξε την αναφορά από %s σε %s %s +issues.remove_ref_at=αφαίρεση την αναφορά %s %s +issues.add_ref_at=πρόσθεσε την αναφορά %s %s +issues.delete_branch_at=διέγραψε το κλάδο %s %s issues.filter_label=Σήμα -issues.filter_label_exclude=`Χρησιμοποιήστε alt + κάντε κλικ/Enter για να εξαιρέσετε τις σημάνσεις` +issues.filter_label_exclude=Χρησιμοποιήστε alt + κάντε κλικ/Enter για να εξαιρέσετε τις σημάνσεις issues.filter_label_no_select=Όλα τα σήματα issues.filter_milestone=Ορόσημο issues.filter_milestone_no_select=Όλα τα ορόσημα @@ -1321,11 +1255,11 @@ issues.opened_by_fake=άνοιξε το %[1]s από %[2]s issues.closed_by_fake=από %[2]s έκλεισαν %[1]s issues.previous=Προηγούμενο issues.next=Επόμενο -issues.open_title=Ανοιχτό -issues.closed_title=Κλειστό +issues.open_title=Ανοιχτά +issues.closed_title=Κλειστά issues.draft_title=Προσχέδιο issues.num_comments=%d σχόλια -issues.commented_at=`σχολίασε %s` +issues.commented_at=σχολίασε %s issues.delete_comment_confirm=Θέλετε σίγουρα να διαγράψετε αυτό το σχόλιο; issues.context.copy_link=Αντιγραφή Συνδέσμου issues.context.quote_reply=Παράθεση Απάντησης @@ -1334,22 +1268,22 @@ issues.context.edit=Επεξεργασία issues.context.delete=Διαγραφή issues.no_content=Δεν υπάρχει ακόμα περιεχόμενο. issues.close_issue=Κλείσιμο -issues.pull_merged_at=`συγχώνευσε την υποβολή %[2]s σε %[3]s %[4]s` -issues.manually_pull_merged_at=`συγχώνευσε την υποβολή %[2]s σε %[3]s %[4]s` +issues.pull_merged_at=συγχώνευσε την υποβολή %[2]s σε %[3]s %[4]s +issues.manually_pull_merged_at=συγχώνευσε την υποβολή %[2]s σε %[3]s %[4]s issues.close_comment_issue=Σχόλιο και κλείσιμο issues.reopen_issue=Ανοίξτε ξανά issues.reopen_comment_issue=Σχόλιο και Άνοιγμα ξανά issues.create_comment=Προσθήκη Σχολίου -issues.closed_at=`αυτό το ζήτημα έκλεισε %[2]s` -issues.reopened_at=`ξανά άνοιξε αυτό το ζήτημα %[2]s` -issues.commit_ref_at=`αναφορά σε αυτό το ζήτημα από την παραπομπή %[2]s` -issues.ref_issue_from=`αναφέρθηκε σε αυτό το ζήτημα %[4]s %[2]s` -issues.ref_pull_from=`αναφέρθηκε σε αυτό το pull request %[4]s %[2]s` -issues.ref_closing_from=`αναφέρθηκε σε ένα pull request %[4]s που θα κλείσει αυτό το ζήτημα %[2]s` -issues.ref_reopening_from=`αναφέρθηκε σε ένα pull request %[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.closed_at=αυτό το ζήτημα έκλεισε %[2]s +issues.reopened_at=ξανά άνοιξε αυτό το ζήτημα %[2]s +issues.commit_ref_at=αναφορά σε αυτό το ζήτημα από την παραπομπή %[2]s +issues.ref_issue_from=αναφέρθηκε σε αυτό το ζήτημα %[4]s %[2]s +issues.ref_pull_from=αναφέρθηκε σε αυτό το pull request %[4]s %[2]s +issues.ref_closing_from=αναφέρθηκε σε ένα pull request %[4]s που θα κλείσει αυτό το ζήτημα %[2]s +issues.ref_reopening_from=αναφέρθηκε σε ένα pull request %[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.poster=Συντάκτης issues.collaborator=Συνεργάτης issues.owner=Ιδιοκτήτης @@ -1379,8 +1313,8 @@ issues.label.filter_sort.reverse_alphabetically=Αντίστροφα αλφαβ issues.label.filter_sort.by_size=Μικρότερο μέγεθος issues.label.filter_sort.reverse_by_size=Μεγαλύτερο μέγεθος issues.num_participants=%d Συμμετέχοντες -issues.attachment.open_tab=`Κάντε κλικ για να δείτε το "%s" σε μια νέα καρτέλα` -issues.attachment.download=`Κάντε κλικ για να λάβετε το "%s"` +issues.attachment.open_tab=Κάντε κλικ για να δείτε το "%s" σε μια νέα καρτέλα +issues.attachment.download=Κάντε κλικ για να λάβετε το "%s" issues.subscribe=Εγγραφή issues.unsubscribe=Διαγραφή issues.lock=Κλείδωμα συνομιλίας @@ -1408,31 +1342,31 @@ issues.delete.text=Θέλετε πραγματικά να διαγράψετε issues.tracker=Καταγραφή Χρόνου issues.start_tracking_short=Εκκίνηση Χρονομέτρου issues.start_tracking=Εκκίνηση Καταγραφής Χρόνου -issues.start_tracking_history=`ξεκίνησε να εργάζεται %s` +issues.start_tracking_history=ξεκίνησε να εργάζεται %s issues.tracker_auto_close=Το χρονόμετρο θα σταματήσει αυτόματα όταν κλείσει αυτό το ζήτημα -issues.tracking_already_started=`Έχετε ήδη ξεκινήσει την καταγραφή του χρόνου σε ένα άλλο ζήτημα!` +issues.tracking_already_started=Έχετε ήδη ξεκινήσει την καταγραφή του χρόνου σε ένα άλλο ζήτημα! issues.stop_tracking=Διακοπή Χρονομέτρου -issues.stop_tracking_history=`σταμάτησε να εργάζεται %s` +issues.stop_tracking_history=σταμάτησε να εργάζεται %s issues.cancel_tracking=Απόρριψη -issues.cancel_tracking_history=`ακυρώθηκε η καταγραφή χρόνου %s` +issues.cancel_tracking_history=ακυρώθηκε η καταγραφή χρόνου %s issues.add_time=Χειροκίνητη Προσθήκη Ώρας issues.del_time=Διαγραφή αυτού του αρχείου χρόνου issues.add_time_short=Προσθήκη Χρόνου issues.add_time_cancel=Ακύρωση -issues.add_time_history=`πρόσθεσε χρόνο που δαπανήθηκε %s` -issues.del_time_history=`διέγραψε το χρόνο που δαπανήθηκε %s` +issues.add_time_history=πρόσθεσε χρόνο που δαπανήθηκε %s +issues.del_time_history=διέγραψε το χρόνο που δαπανήθηκε %s issues.add_time_hours=Ώρες issues.add_time_minutes=Λεπτά issues.add_time_sum_to_small=Δεν εισήχθη χρόνος. issues.time_spent_total=Συνολική Δαπάνη Χρόνου -issues.time_spent_from_all_authors=`Συνολική Δαπάνη Χρόνου: %s` +issues.time_spent_from_all_authors=Συνολική Δαπάνη Χρόνου: %s issues.due_date=Ημερομηνία Παράδοσης issues.invalid_due_date_format=Η μορφή της ημερομηνίας παράδοσης πρέπει να είναι 'yyyy-mm-dd'. 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=`force-pushed %[1]s από το %[2]s στο %[4]s %[6]s` +issues.force_push_codes=force-pushed %[1]s από το %[2]s στο %[4]s %[6]s issues.due_date_form=εεεε-μμ-ηη issues.due_date_form_add=Προσθήκη ημερομηνίας παράδοσης issues.due_date_form_edit=Επεξεργασία @@ -1451,8 +1385,8 @@ issues.dependency.add=Προσθήκη εξάρτησης… issues.dependency.cancel=Ακύρωση issues.dependency.remove=Διαγραφή issues.dependency.remove_info=Αφαίρεση αυτής της εξάρτησης -issues.dependency.added_dependency=`πρόσθεσε μια νέα εξάρτηση %s` -issues.dependency.removed_dependency=`αφαίρεσε μια εξάρτηση %s` +issues.dependency.added_dependency=πρόσθεσε μια νέα εξάρτηση %s +issues.dependency.removed_dependency=αφαίρεσε μια εξάρτηση %s issues.dependency.pr_closing_blockedby=Το κλείσιμο αυτού pull request εμποδίζεται από τα ακόλουθα ζητήματα issues.dependency.issue_closing_blockedby=Το κλείσιμο αυτού του ζητήματος εμποδίζεται από τα ακόλουθα ζητήματα issues.dependency.issue_close_blocks=Αυτό το ζήτημα εμποδίζει το κλείσιμο των ακόλουθων ζητημάτων @@ -1505,10 +1439,8 @@ issues.content_history.delete_from_history=Διαγραφή από το ιστο issues.content_history.delete_from_history_confirm=Διαγραφή από το ιστορικό; issues.content_history.options=Επιλογές issues.reference_link=Αναφορά: %s - compare.compare_base=βάση compare.compare_head=σύγκριση - pulls.desc=Ενεργοποίηση των pull requests και της αξιολόγησης κώδικα. pulls.new=Νέο Pull Request pulls.view=Προβολή Pull Request @@ -1528,11 +1460,11 @@ pulls.filter_branch=Φιλτράρισμα κλάδου pulls.no_results=Δεν βρέθηκαν αποτελέσματα. pulls.nothing_to_compare=Αυτοί οι κλάδοι είναι όμοιοι. Δεν υπάρχει ανάγκη να δημιουργήσετε ένα pull request. pulls.nothing_to_compare_and_allow_empty_pr=Αυτοί οι κλάδοι είναι ίσοι. Αυτό το PR θα είναι κενό. -pulls.has_pull_request=`Υπάρχει ήδη pull request μεταξύ αυτών των κλάδων: %[2]s#%[3]d` +pulls.has_pull_request=Υπάρχει ήδη pull request μεταξύ αυτών των κλάδων: %[2]s#%[3]d pulls.create=Δημιουργία Pull Request pulls.title_desc=θέλει να συγχωνεύσει %[1]d υποβολές από %[2]s σε %[3]s pulls.merged_title_desc=συγχώνευσε %[1]d υποβολές από %[2]s σε %[3]s %[4]s -pulls.change_target_branch_at=`άλλαξε τον κλάδο στόχο από %s σε %s %s` +pulls.change_target_branch_at=άλλαξε τον κλάδο στόχο από %s σε %s %s pulls.tab_conversation=Συζήτηση pulls.tab_commits=Υποβολές pulls.tab_files=Αρχεία Άλλαξαν @@ -1544,7 +1476,7 @@ pulls.manually_merged=Συγχωνεύτηκαν χειροκίνητα pulls.manually_merged_as=Το pull request έχει συγχωνευθεί χειροκίνητα ως %[2]s. pulls.is_closed=Το pull request έχει κλείσει. pulls.has_merged=Το pull request έχει συγχωνευθεί. -pulls.title_wip_desc=`Ξεκινήστε τον τίτλο με %s για να αποτρέψετε την τυχαία συγχώνευση του pull request.` +pulls.title_wip_desc=Ξεκινήστε τον τίτλο με %s για να αποτρέψετε την τυχαία συγχώνευση του pull request. pulls.cannot_merge_work_in_progress=Αυτό το pull request επισημαίνεται ως μια εργασία σε εξέλιξη. pulls.still_in_progress=Ακόμα είναι σε εξέλιξη; pulls.add_prefix=Προσθήκη %s προθέματος @@ -1575,7 +1507,6 @@ pulls.reject_count_n=%d αιτήματα αλλαγής pulls.waiting_count_1=%d αναμονή αναθεώρησης pulls.waiting_count_n=%d αναμονή αναθεωρήσεων pulls.wrong_commit_id=Το id υποβολής πρέπει να είναι ένα id υποβολής στον κλάδο προορισμού - pulls.no_merge_desc=Αυτό το pull request δεν μπορεί να συγχωνευθεί επειδή όλες οι επιλογές συγχώνευσης αποθετηρίων είναι απενεργοποιημένες. pulls.no_merge_helper=Ενεργοποιήστε τις επιλογές συγχώνευσης στις ρυθμίσεις αποθετηρίου ή συγχωνεύστε το pull request χειροκίνητα. pulls.no_merge_wip=Αυτό το pull request δεν μπορεί να συγχωνευθεί, επειδή έχει επισημανθεί ως μια εργασία σε εξέλιξη. @@ -1588,7 +1519,6 @@ pulls.squash_merge_pull_request=Δημιουργία υποβολής squash pulls.merge_manually=Συγχωνεύτηκαν χειροκίνητα pulls.merge_commit_id=Το ID της υποβολής συγχώνευσης pulls.require_signed_wont_sign=Ο κλάδος απαιτεί υπογεγραμμένες υποβολές αλλά αυτή η συγχώνευση δεν θα υπογραφεί - pulls.invalid_merge_option=Δεν μπορείτε να χρησιμοποιήσετε αυτήν την επιλογή συγχώνευσης για αυτό το pull request. pulls.merge_conflict=Η Συγχώνευση Απέτυχε: Υπήρξε μια διένεξη κατά τη συγχώνευση. Υπόδειξη: Δοκιμάστε μια διαφορετική στρατηγική pulls.merge_conflict_summary=Μήνυμα Σφάλματος @@ -1601,7 +1531,7 @@ pulls.head_out_of_date=Η συγχώνευση απέτυχε: Κατά τη δ pulls.push_rejected=Η συγχώνευση απέτυχε: Η ώθηση απορρίφθηκε. Ελέγξτε τα Άγκιστρα Git για αυτό το αποθετήριο. pulls.push_rejected_summary=Μήνυμα Πλήρους Απόρριψης pulls.push_rejected_no_message=H Συγχώνευση Aπέτυχε: Η ώθηση απορρίφθηκε, αλλά δεν υπήρχε απομακρυσμένο μήνυμα.
    Ελέγξτε τα Άγκιστρα Git για αυτό το αποθετήριο -pulls.open_unmerged_pull_exists=`Δεν μπορείτε να ανοίξετε εκ νέου, επειδή υπάρχει ένα εκκρεμές pull request (#%d) με πανομοιότυπες ιδιότητες.` +pulls.open_unmerged_pull_exists=Δεν μπορείτε να ανοίξετε εκ νέου, επειδή υπάρχει ένα εκκρεμές pull request (#%d) με πανομοιότυπες ιδιότητες. pulls.status_checking=Μερικοί έλεγχοι εκκρεμούν pulls.status_checks_success=Όλοι οι έλεγχοι ήταν επιτυχείς pulls.status_checks_warning=Ορισμένοι έλεγχοι ανέφεραν προειδοποιήσεις @@ -1614,27 +1544,22 @@ pulls.update_branch_rebase=Ενημέρωση κλάδου με rebase pulls.update_branch_success=Η ενημέρωση του κλάδου ήταν επιτυχής pulls.update_not_allowed=Δεν επιτρέπεται να ενημερώσετε τον κλάδο pulls.outdated_with_base_branch=Αυτός ο κλάδος δεν είναι ενημερωμένος με τον βασικό κλάδο -pulls.closed_at=`έκλεισε αυτό το pull request %[2]s` -pulls.reopened_at=`άνοιξε ξανά αυτό το pull request %[2]s` -pulls.merge_instruction_hint=`Μπορείτε επίσης να δείτε τις οδηγίες της γραμμής εντολών.` +pulls.closed_at=έκλεισε αυτό το pull request %[2]s +pulls.reopened_at=άνοιξε ξανά αυτό το pull request %[2]s +pulls.merge_instruction_hint=Μπορείτε επίσης να δείτε τις οδηγίες της γραμμής εντολών. pulls.merge_instruction_step1_desc=Από το αποθετήριο του έργου σας, ελέγξτε έναν νέο κλάδο και τεστάρετε τις αλλαγές. pulls.merge_instruction_step2_desc=Συγχώνευσε τις αλλαγές και ενημέρωσε στο Gitea. - pulls.auto_merge_button_when_succeed=(Όταν οι έλεγχοι πετύχουν) pulls.auto_merge_when_succeed=Αυτόματη συγχώνευση όταν όλοι οι έλεγχοι πετύχουν pulls.auto_merge_newly_scheduled=Το pull request προγραμματίστηκε για συγχώνευση όταν όλοι οι έλεγχοι πετύχουν. pulls.auto_merge_has_pending_schedule=%[1]s προγραμμάτισε αυτό το pull request για αυτόματη συγχώνευση όταν όλοι οι έλεγχοι πετύχουν %[2]s. - pulls.auto_merge_cancel_schedule=Ακύρωση αυτόματης συγχώνευσης pulls.auto_merge_not_scheduled=Αυτό το pull request δεν έχει προγραμματιστεί να συγχωνευτεί αυτόματα. pulls.auto_merge_canceled_schedule=Η αυτόματη συγχώνευση ακυρώθηκε για αυτό το pull request. - -pulls.auto_merge_newly_scheduled_comment=`προγραμμάτισε αυτό το PR να συγχωνευτεί αυτόματα όταν όλοι οι έλεγχοι πετύχουν %[1]s` -pulls.auto_merge_canceled_schedule_comment=`ακύρωσε την αυτόματη συγχώνευση αυτού του pull request όταν όλοι οι έλεγχοι πετύχουν %[1]s` - +pulls.auto_merge_newly_scheduled_comment=προγραμμάτισε αυτό το PR να συγχωνευτεί αυτόματα όταν όλοι οι έλεγχοι πετύχουν %[1]s +pulls.auto_merge_canceled_schedule_comment=ακύρωσε την αυτόματη συγχώνευση αυτού του pull request όταν όλοι οι έλεγχοι πετύχουν %[1]s pulls.delete.title=Διαγραφή αυτού του pull request; pulls.delete.text=Θέλετε πραγματικά να διαγράψετε αυτό το pull request; (Αυτό θα αφαιρέσει μόνιμα όλο το περιεχόμενο. Κλείστε το, αν σκοπεύετε να το κρατήσετε αρχειοθετημένο) - milestones.new=Νέο Ορόσημο milestones.closed=Έκλεισε %s milestones.update_ago=Ενημερώθηκε πριν από %s @@ -1664,7 +1589,6 @@ milestones.filter_sort.least_complete=Λιγότερο πλήρη milestones.filter_sort.most_complete=Περισσότερο πλήρη milestones.filter_sort.most_issues=Περισσότερα ζητήματα milestones.filter_sort.least_issues=Λιγότερα ζητήματα - signing.will_sign=Αυτή η υποβολή θα υπογραφεί με το κλειδί '%s' signing.wont_sign.error=Παρουσιάστηκε σφάλμα κατά τον έλεγχο αν μπορεί να υπογραφεί η υποβολή signing.wont_sign.nokey=Δεν υπάρχει διαθέσιμο κλειδί για υπογραφή αυτής της υποβολής @@ -1678,10 +1602,8 @@ signing.wont_sign.headsigned=Η συγχώνευση δεν θα υπογραφ signing.wont_sign.commitssigned=Η συγχώνευση δεν θα υπογραφεί καθώς όλες οι σχετικές υποβολές δεν έχουν υπογραφεί signing.wont_sign.approved=Η συγχώνευση δεν θα υπογραφεί καθώς το PR δεν εγκρίνεται signing.wont_sign.not_signed_in=Δεν είστε συνδεδεμένοι - ext_wiki=Πρόσβαση στο Εξωτερικό Wiki ext_wiki.desc=Σύνδεση σε ένα εξωτερικό wiki. - wiki=Wiki wiki.welcome=Καλώς ήρθατε στο Wiki. wiki.welcome_desc=Το wiki σας επιτρέπει να γράψετε και να μοιραστείτε τεκμηρίωση με συνεργάτες. @@ -1705,7 +1627,6 @@ wiki.reserved_page=Το όνομα σελίδας wiki '%s' είναι δεσμ wiki.pages=Σελίδες wiki.last_updated=Τελευταία ενημέρωση %s wiki.page_name_desc=Εισάγετε ένα όνομα για αυτή τη σελίδα Wiki. Μερικά ειδικά ονόματα είναι: 'Home', '_Sidebar' και '_Footer'. - activity=Δραστηριότητα activity.period.filter_label=Περίοδος: activity.period.daily=1 ημέρα @@ -1771,7 +1692,6 @@ activity.git_stats_addition_n=%d προσθήκες activity.git_stats_and_deletions=και activity.git_stats_deletion_1=%d διαγραφή activity.git_stats_deletion_n=%d διαγραφές - search=Αναζήτηση search.search_repo=Αναζήτηση αποθετηρίου search.type.tooltip=Τύπος αναζήτησης @@ -1782,7 +1702,6 @@ search.match.tooltip=Συμπερίληψη μόνο των αποτελεσμά search.results=Αποτελέσματα αναζήτησης για "%s" σε %s search.code_no_results=Δεν βρέθηκε πηγαίος κώδικας που να ταιριάζει με τον όρο αναζήτησης. search.code_search_unavailable=Η αναζήτηση κώδικα δεν είναι διαθέσιμη αυτή τη στιγμή. Παρακαλώ επικοινωνήστε με το διαχειριστή. - settings=Ρυθμίσεις settings.desc=Στις Ρυθμίσεις μπορείτε να διαχειριστείτε τις ρυθμίσεις για το αποθετήριο settings.options=Αποθετήριο @@ -2087,10 +2006,10 @@ settings.dismiss_stale_approvals=Παράβλεψη καθυστερημένων settings.dismiss_stale_approvals_desc=Όταν οι νέες υποβολές που αλλάζουν το περιεχόμενο του pull request γίνονται push στο κλάδο, οι παλιές εγκρίσεις απορρίπτονται. settings.require_signed_commits=Απαιτούνται Υπογεγραμμένες Υποβολές settings.require_signed_commits_desc=Απόρριψη νέων υποβολών σε αυτόν τον κλάδο εάν είναι μη υπογεγραμμένες ή μη επαληθεύσιμες. -settings.protect_protected_file_patterns=Προστατευμένα μοτίβα αρχείων (διαχωρισμένα με χαρακτήρα semicolon '\;'): -settings.protect_protected_file_patterns_desc=Προστατευμένα αρχεία που δεν επιτρέπεται να αλλάξουν άμεσα, ακόμη και αν ο χρήστης έχει δικαίωμα να προσθέσει, να επεξεργαστεί ή να διαγράψει αρχεία σε αυτόν τον κλάδο. Πολλαπλά μοτίβα μπορούν να διαχορίζονται με χαρακτήρα semicolon ('\;'). Δείτε την τεκμηρίωση github.com/gobwas/glob για τη σύνταξη των μοτίβων. Παραδείγματα: .drone.yml, /docs/**/*.txt. -settings.protect_unprotected_file_patterns=Μη προστατευμένα μοτίβα αρχείων (διαχωρισμένα με ερωτηματικό '\;'): -settings.protect_unprotected_file_patterns_desc=Μη προστατευμένα αρχεία που επιτρέπεται να αλλάξουν απευθείας εάν ο χρήστης έχει πρόσβαση εγγραφής, παρακάμπτοντας τον περιορισμό για push. Πολλαπλά μοτίβα μπορούν να διαχωριστούν με ερωτηματικό ('\;'). Δείτε την τεκμηρίωση github.com/gobwas/glob για τη σύνταξη του μοτίβου. Παραδείγματα: .drone.yml, /docs/**/*.txt. +settings.protect_protected_file_patterns=Προστατευμένα μοτίβα αρχείων (διαχωρισμένα με χαρακτήρα semicolon ';'): +settings.protect_protected_file_patterns_desc=Προστατευμένα αρχεία που δεν επιτρέπεται να αλλάξουν άμεσα, ακόμη και αν ο χρήστης έχει δικαίωμα να προσθέσει, να επεξεργαστεί ή να διαγράψει αρχεία σε αυτόν τον κλάδο. Πολλαπλά μοτίβα μπορούν να διαχορίζονται με χαρακτήρα semicolon (';'). Δείτε την τεκμηρίωση github.com/gobwas/glob για τη σύνταξη των μοτίβων. Παραδείγματα: .drone.yml, /docs/**/*.txt. +settings.protect_unprotected_file_patterns=Μη προστατευμένα μοτίβα αρχείων (διαχωρισμένα με ερωτηματικό ';'): +settings.protect_unprotected_file_patterns_desc=Μη προστατευμένα αρχεία που επιτρέπεται να αλλάξουν απευθείας εάν ο χρήστης έχει πρόσβαση εγγραφής, παρακάμπτοντας τον περιορισμό για push. Πολλαπλά μοτίβα μπορούν να διαχωριστούν με ερωτηματικό (';'). Δείτε την τεκμηρίωση github.com/gobwas/glob για τη σύνταξη του μοτίβου. Παραδείγματα: .drone.yml, /docs/**/*.txt. settings.add_protected_branch=Ενεργοποίηση προστασίας settings.delete_protected_branch=Απενεργοποίηση προστασίας settings.update_protect_branch_success=Η προστασία κλάδου για τον κλάδο '%s' έχει ενημερωθεί. @@ -2170,7 +2089,6 @@ settings.rename_branch_success=Ο κλάδος %s μετονομάστηκε μ settings.rename_branch_from=παλιό όνομα κλάδου settings.rename_branch_to=νέο όνομα κλάδου settings.rename_branch=Μετονομασία κλάδου - diff.browse_source=Περιήγηση Στο Πηγαίο diff.parent=γονέας diff.commit=υποβολή @@ -2222,7 +2140,6 @@ diff.image.side_by_side=Δίπλα Δίπλα diff.image.swipe=Σύρσιμο diff.image.overlay=Επικάλυψη diff.has_escaped=Αυτή η γραμμή έχει κρυφούς χαρακτήρες Unicode - releases.desc=Παρακολούθηση εκδόσεων έργου και λήψεων. release.releases=Κυκλοφορίες release.detail=Λεπτομέρειες κυκλοφορίας @@ -2264,7 +2181,6 @@ release.downloads=Λήψεις release.download_count=Λήψεις: %s release.add_tag_msg=Χρησιμοποιήστε τον τίτλο και το περιεχόμενο της έκδοσης ως μήνυμα ετικέτας. release.add_tag=Δημιουργία Ετικέτας Μόνο - branch.name=Όνομα Κλάδου branch.search=Αναζήτηση κλάδων branch.already_exists=Ένας κλάδος με όνομα '%s' υπάρχει ήδη. @@ -2296,25 +2212,24 @@ branch.create_branch_operation=Δημιουργία κλάδου branch.new_branch=Δημιουργία νέου κλάδου branch.new_branch_from=Δημιουργία νέου κλάδου από '%s' branch.renamed=Ο κλάδος %s μετονομάστηκε σε %s. - tag.create_tag=Δημιουργία ετικέτας %s tag.create_tag_operation=Δημιουργία ετικέτας tag.confirm_create_tag=Δημιουργία ετικέτας tag.create_tag_from=Δημιουργία νέας ετικέτας από '%s' - tag.create_success=Η ετικέτα '%s' έχει δημιουργηθεί. - topic.manage_topics=Διαχείριση Θεμάτων topic.done=Ολοκληρώθηκε topic.count_prompt=Δεν μπορείτε να επιλέξετε περισσότερα από 25 θέματα topic.format_prompt=Τα θέματα πρέπει να ξεκινούν με γράμμα ή αριθμό, μπορούν να περιλαμβάνουν παύλες ('-') και μπορεί να είναι έως 35 χαρακτήρες. - find_file.go_to_file=Μετάβαση στο αρχείο find_file.no_matching=Δεν ταιριάζει κανένα αρχείο - error.csv.too_large=Δεν είναι δυνατή η απόδοση αυτού του αρχείου επειδή είναι πολύ μεγάλο. error.csv.unexpected=Δεν είναι δυνατή η απόδοση αυτού του αρχείου, επειδή περιέχει έναν μη αναμενόμενο χαρακτήρα στη γραμμή %d και στη στήλη %d. error.csv.invalid_field_count=Δεν είναι δυνατή η απόδοση αυτού του αρχείου, επειδή έχει λάθος αριθμό πεδίων στη γραμμή %d. +issues.filter_project=Έργο +issues.filter_project_none=Χωρίς έργα +settings.authorization_header=Κεφαλίδα Authorization +settings.authorization_header_desc=Αν υπάρχει, θα προστίθεται ως κεφαλίδα authorization στις αιτήσεις HTTP. Παραδείγματα: %s. [org] org_name_holder=Όνομα Οργανισμού @@ -2337,11 +2252,9 @@ team_access_desc=Πρόσβαση αποθετηρίου team_permission_desc=Δικαίωμα team_unit_desc=Να επιτρέπεται η Πρόσβαση σε Τμήματα του Αποθετηρίου team_unit_disabled=(Απενεργοποιημένο) - form.name_reserved=Το όνομα οργανισμού '%s' είναι δεσμευμένο. form.name_pattern_not_allowed=Το μοτίβο '%s' δεν επιτρέπεται σε ένα όνομα οργανισμού. form.create_org_not_allowed=Δεν επιτρέπεται να δημιουργήσετε έναν οργανισμό. - settings=Ρυθμίσεις settings.options=Οργανισμός settings.full_name=Πλήρες Όνομα @@ -2355,7 +2268,6 @@ settings.visibility.limited=Περιορισμένος (ορατός μόνο γ settings.visibility.limited_shortname=Περιορισμένος settings.visibility.private=Ιδιωτικός (ορατός μόνο στα μέλη του οργανισμού) settings.visibility.private_shortname=Ιδιωτικός - settings.update_settings=Ενημέρωση Ρυθμίσεων settings.update_setting_success=Οι ρυθμίσεις του οργανισμού έχουν ενημερωθεί. settings.change_orgname_prompt=Σημείωση: η αλλαγή του ονόματος του οργανισμού αλλάζει επίσης τη διεύθυνση URL του οργανισμού. @@ -2368,9 +2280,7 @@ settings.confirm_delete_account=Επιβεβαίωση Διαγραφής settings.delete_org_title=Διαγραφή Οργανισμού settings.delete_org_desc=Αυτός ο οργανισμός θα διαγραφεί οριστικά. Συνέχεια; settings.hooks_desc=Προσθήκη webhooks που θα ενεργοποιούνται για όλα τα αποθετήρια κάτω από αυτό τον οργανισμό. - settings.labels_desc=Προσθήκη σημάτων που μπορούν να χρησιμοποιηθούν σε ζητήματα για όλα τα αποθετήρια κάτω από αυτό τον οργανισμό. - members.membership_visibility=Ορατότητα Μέλους: members.public=Ορατό members.public_helper=κάνε το κρυφό @@ -2385,7 +2295,6 @@ members.leave=Αποχώρηση members.leave.detail=Αποχώρηση από %s; members.invite_desc=Προσθέστε ένα νέο μέλος στο %s: members.invite_now=Πρόσκληση Τώρα - teams.join=Συμμετοχή teams.leave=Αποχώρηση teams.leave.detail=Αποχώρηση από %s; @@ -2437,6 +2346,8 @@ teams.all_repositories_admin_permission_desc=Αυτή η ομάδα παρέχε teams.invite.title=Έχετε προσκληθεί να συμμετέχετε στην ομάδα %s στον οργανισμό %s. teams.invite.by=Προσκλήθηκε από %s teams.invite.description=Παρακαλώ κάντε κλικ στον παρακάτω σύνδεσμο για συμμετοχή στην ομάδα. +members=Μέλη +code=Κώδικας [admin] dashboard=Πίνακας Ελέγχου @@ -2452,7 +2363,6 @@ monitor=Παρακολούθηση first_page=Πρώτο last_page=Τελευταίο total=Σύνολο: %d - dashboard.new_version_hint=Το Gitea %s είναι διαθέσιμο, τώρα εκτελείτε το %s. Ελέγξτε το blog για περισσότερες λεπτομέρειες. dashboard.statistic=Περίληψη dashboard.operations=Λειτουργίες Συντήρησης @@ -2530,7 +2440,6 @@ dashboard.delete_old_actions=Διαγραφή όλων των παλαιών ε dashboard.delete_old_actions.started=Η διαγραφή όλων των παλιών ενεργειών από τη βάση δεδομένων ξεκίνησε. dashboard.update_checker=Ελεγκτής ενημερώσεων dashboard.delete_old_system_notices=Διαγραφή όλων των παλιών ειδοποιήσεων συστήματος από τη βάση δεδομένων - users.user_manage_panel=Διαχείριση Λογαριασμών Χρηστών users.new_account=Δημιουργία Λογαριασμού Χρήστη users.name=Όνομα Χρήστη @@ -2584,7 +2493,6 @@ 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 Απενεργοποιημένο - emails.email_manage_panel=Διαχείριση Email Χρήστη emails.primary=Κύριο emails.activated=Ενεργοποιήθηκε @@ -2597,13 +2505,11 @@ emails.not_updated=Αποτυχία ενημέρωσης της ζητούμεν emails.duplicate_active=Αυτή η διεύθυνση email είναι ήδη ενεργή σε διαφορετικό χρήστη. emails.change_email_header=Ενημέρωση Ιδιοτήτων Email emails.change_email_text=Είστε βέβαιοι ότι θέλετε να ενημερώσετε αυτή τη διεύθυνση email; - orgs.org_manage_panel=Διαχείριση Οργανισμού orgs.name=Όνομα orgs.teams=Ομάδες orgs.members=Μέλη orgs.new_orga=Νέος Οργανισμός - repos.repo_manage_panel=Διαχείριση Αποθετηρίου repos.unadopted=Μη Υιοθετημένα Αποθετήρια repos.unadopted.no_more=Δεν βρέθηκαν μη υιοθετημένα αποθετήρια @@ -2615,7 +2521,6 @@ repos.stars=Αστέρια repos.forks=Forks repos.issues=Ζητήματα repos.size=Μέγεθος - packages.package_manage_panel=Διαχείριση Πακέτων packages.total_size=Συνολικό Μέγεθος: %s packages.owner=Ιδιοκτήτης @@ -2626,17 +2531,14 @@ packages.type=Τύπος packages.repository=Αποθετήριο packages.size=Μέγεθος packages.published=Δημοσιευμένα - defaulthooks=Προεπιλεγμένα Webhooks defaulthooks.desc=Τα Webhooks κάνουν αυτόματα αιτήσεις HTTP POST σε ένα διακομιστή όταν συμβαίνουν ορισμένα γεγονότα στο Gitea. Τα Webhooks που ορίζονται εδώ είναι προεπιλογή και θα αντιγραφούν σε όλα τα νέα αποθετήρια. Διαβάστε περισσότερα στον οδηγό webhooks. defaulthooks.add_webhook=Προσθήκη Προεπιλεγμένου Webhook defaulthooks.update_webhook=Ενημέρωση Προεπιλεγμένου Webhook - systemhooks=Webhooks Συστήματος systemhooks.desc=Τα Webhooks κάνουν αυτόματα αιτήσεις HTTP POST σε ένα διακομιστή όταν συμβαίνουν ορισμένα γεγονότα στο Gitea. Τα Webhooks που ορίζονται εδώ θα ενεργούν σε όλα τα αποθετήρια του συστήματος, γι 'αυτό παρακαλώ εξετάστε τυχόν επιπτώσεις απόδοσης που μπορεί να υπάρξουν. Διαβάστε περισσότερα στον οδηγό webhooks. systemhooks.add_webhook=Προσθήκη Webhook Συστήματος systemhooks.update_webhook=Ενημέρωση Webhook Συστήματος - auths.auth_manage_panel=Διαχείριση ΠηγήςΤαυτοποίησης auths.new=Προσθήκη Πηγής Ταυτοποίησης auths.name=Όνομα @@ -2751,7 +2653,6 @@ auths.still_in_used=Η πηγή ταυτοποίησης είναι ακόμα auths.deletion_success=Η πηγή ταυτοποίησης έχει διαγραφεί. auths.login_source_exist=Η πηγή ταυτοποίησης '%s' υπάρχει ήδη. auths.login_source_of_type_exist=Υπάρχει ήδη πηγή ταυτοποίησης αυτού του τύπου. - config.server_config=Ρυθμίσεις Διακομιστή config.app_name=Τίτλος Ιστοτόπου config.app_ver=Έκδοση Gitea @@ -2770,7 +2671,6 @@ config.static_file_root_path=Ριζική Διαδρομή Στατικών Αρ config.log_file_root_path=Διαδρομή Καταγραφών config.script_type=Τύπος Σεναρίου config.reverse_auth_user=Χρήστης ΑντίστροφηςΠιστοποίησης - config.ssh_config=Ρύθμιση SSH config.ssh_enabled=Ενεργοποιημένο config.ssh_start_builtin_server=Χρήση Ενσωματωμένου Διακομιστή @@ -2782,12 +2682,10 @@ config.ssh_key_test_path=Διαδρομή Δοκιμής Κλειδιού config.ssh_keygen_path=Διαδρομή Keygen ('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.db_config=Ρύθμιση Βάσης Δεδομένων config.db_type=Τύπος config.db_host=Διακομιστής @@ -2796,7 +2694,6 @@ config.db_user=Όνομα Χρήστη config.db_schema=Σχήμα config.db_ssl_mode=SSL config.db_path=Διαδρομή - config.service_config=Ρυθμίσεις Υπηρεσίας config.register_email_confirm=Απαιτείται Επιβεβαίωση του Email για Εγγραφή config.disable_register=Απενεργοποίηση Αυτοεγγραφής @@ -2819,12 +2716,10 @@ config.default_allow_only_contributors_to_track_time=Επιτρέπονται Μ config.no_reply_address=Κρυφό Email Domain config.default_visibility_organization=Προεπιλεγμένη ορατότητα για νέους οργανισμούς config.default_enable_dependencies=Ενεργοποίηση Εξαρτήσεων Ζητημάτων από Προεπιλογή - config.webhook_config=Ρύθμιση Webhook config.queue_length=Μέγεθος Ουράς config.deliver_timeout=Χρονικό Όριο Παράδοσης config.skip_tls_verify=Παράλειψη Επαλήθευσης TLS - config.mailer_config=Ρυθμίσεις Αλληλογραφίας config.mailer_enabled=Ενεργοποιημένο config.mailer_enable_helo=Ενεργοποίηση HELO @@ -2842,16 +2737,13 @@ config.test_email_placeholder=Email (π.χ. test@example.com) config.send_test_mail=Αποστολή Δοκιμαστικού Email config.test_mail_failed=Αποτυχία αποστολής δοκιμαστικού email στο'%s': %v config.test_mail_sent=Ένα δοκιμαστικό email έχει σταλεί στον'%s'. - config.oauth_config=Ρύθμιση Oauth config.oauth_enabled=Ενεργό - config.cache_config=Ρύθμιση Προσωρινής Αποθήκευσης config.cache_adapter=Προσαρμογέας Προσωρινής Αποθήκευσης config.cache_interval=Διάστημα Προσωρινής Αποθήκευσης config.cache_conn=Σύνδεση Προσωρινής Αποθήκευσης config.cache_item_ttl=TTL Στοιχείων Προσωρινής Αποθήκευσης - config.session_config=Ρύθμιση Συνεδρίας config.session_provider=Πάροχος Συνεδρίας config.provider_config=Ρυθμίσεις Πάροχου @@ -2860,12 +2752,10 @@ config.gc_interval_time=Χρόνος Διαστήματος GC config.session_life_time=Χρόνος Ζωής Συνεδρίας config.https_only=Μόνο HTTPS config.cookie_life_time=Χρόνος Ζωής Cookie - config.picture_config=Ρύθμιση Εικόνας και Avatar config.picture_service=Υπηρεσία Εικόνας config.disable_gravatar=Απενεργοποίηση Gravatar config.enable_federated_avatar=Ενεργοποίηση Ομόσπονδων Avatars - config.git_config=Ρύθμιση Git config.git_disable_diff_highlight=Απενεργοποίηση Επισήμανσης Σύνταξης Diff config.git_max_diff_lines=Μέγιστες γραμμές Diff (για ένα μόνο αρχείο) @@ -2877,7 +2767,6 @@ config.git_mirror_timeout=Χρονικό Όριο Ενημέρωσης Ειδώ config.git_clone_timeout=Χρονικό Όριο Κλωνοποίησης config.git_pull_timeout=Χρονικό Όριο Pull config.git_gc_timeout=Χρονικό Όριο Λειτουργίας GC - config.log_config=Ρύθμιση Καταγραφών config.log_mode=Λειτουργία Καταγραφής config.own_named_logger=Καταγραφέας Με Όνομα @@ -2889,10 +2778,8 @@ config.access_log_mode=Λειτουργία Καταγραφών Πρόσβασ config.access_log_template=Πρότυπο config.xorm_log_mode=Λειτουργία Καταγραφών XORM config.xorm_log_sql=Καταγραφή SQL - config.get_setting_failed=Αποτυχία λήψης ρύθμισης %s config.set_setting_failed=Αποτυχία ορισμού της ρύθμισης %s - monitor.cron=Προγραμματισμένες Εργασίες monitor.name=Όνομα monitor.schedule=Πρόγραμμα @@ -2944,7 +2831,6 @@ monitor.queue.pool.pause.submit=Παύση Ουράς monitor.queue.pool.resume.title=Συνέχιση Ουράς monitor.queue.pool.resume.desc=Συνεχίζει τις εργασίες στην ουρά monitor.queue.pool.resume.submit=Συνέχιση Ουράς - monitor.queue.settings.title=Ρυθμίσεις Δεξαμενής monitor.queue.settings.desc=Οι δεξαμενές αυξάνονται δυναμικά με μια ενίσχυση σαν απάντηση σε ένα μπλοκάρισμα της ουράς των εργατών τους. Αυτές οι αλλαγές δεν θα επηρεάσουν τις τρέχουσες ομάδες εργατών. monitor.queue.settings.timeout=Χρονικό Όριο Ενίσχυσης @@ -2960,7 +2846,6 @@ monitor.queue.settings.submit=Ενημέρωση Ρυθμίσεων monitor.queue.settings.changed=Οι Ρυθμίσεις Ενημερώθηκαν monitor.queue.settings.blocktimeout=Χρονικό Όριο Τρέχουσας Φραγής monitor.queue.settings.blocktimeout.value=%[1]v - monitor.queue.pool.none=Αυτή η ουρά δεν έχει Δεξαμενή monitor.queue.pool.added=Προστέθηκε Ομάδα Εργατών monitor.queue.pool.max_changed=Μέγιστος αριθμός εργατών άλλαξε @@ -2970,7 +2855,6 @@ monitor.queue.pool.cancel=Τερματισμός Ομάδας Εργατών monitor.queue.pool.cancelling=Τερματισμός Ομάδας Εργατών monitor.queue.pool.cancel_notices=Τερματισμός αυτής της ομάδας των %s εργατών; monitor.queue.pool.cancel_desc=Αφήνοντας μια ουρά χωρίς καμία ομάδα εργατών μπορεί να προκληθεί μπλοκάρισμα των αιτημάτων επ 'αόριστον. - notices.system_notice_list=Ειδοποιήσεις Συστήματος notices.view_detail_header=Προβολή Λεπτομερειών Ειδοποίησης notices.actions=Ενέργειες @@ -2990,15 +2874,15 @@ notices.delete_success=Οι ειδοποιήσεις του συστήματος create_repo=δημιούργησε το αποθετήριο %s rename_repo=μετονόμασε το αποθετήριο από %[1]s σε %[3]s commit_repo=έκανε push στο %[3]s σε %[4]s -create_issue=`άνοιξε το ζήτημα %[3]s#%[2]s` -close_issue=`έκλεισε το ζήτημα %[3]s#%[2]s` -reopen_issue=`άνοιξε ξανά το ζήτημα %[3]s#%[2]s` -create_pull_request=`δημιούργησε το pull request %[3]s#%[2]s` -close_pull_request=`έκλεισε pull request %[3]s#%[2]s` -reopen_pull_request=`άνοιξε ξανά το pull request %[3]s#%[2]s` -comment_issue=`σχολίασε το ζήτημα %[3]s#%[2]s` -comment_pull=`σχολίασε στο pull request %[3]s#%[2]s` -merge_pull_request=`συγχώνευσε το pull request %[3]s#%[2]s` +create_issue=άνοιξε το ζήτημα %[3]s#%[2]s +close_issue=έκλεισε το ζήτημα %[3]s#%[2]s +reopen_issue=άνοιξε ξανά το ζήτημα %[3]s#%[2]s +create_pull_request=δημιούργησε το pull request %[3]s#%[2]s +close_pull_request=έκλεισε pull request %[3]s#%[2]s +reopen_pull_request=άνοιξε ξανά το pull request %[3]s#%[2]s +comment_issue=σχολίασε το ζήτημα %[3]s#%[2]s +comment_pull=σχολίασε στο pull request %[3]s#%[2]s +merge_pull_request=συγχώνευσε το pull request %[3]s#%[2]s transfer_repo=μετέφερε το αποθετήριο %s σε %s push_tag=ώθησε την ετικέτα %[3]s σε %[4]s delete_tag=διέγραψε την ετικέτα %[2]s από %[3]s @@ -3009,14 +2893,15 @@ 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` -reject_pull_request=`πρότεινε αλλαγές για το %[3]s#%[2]s` -publish_release=`έκδωσε τη "%[4]s" στο %[3]s` -review_dismissed=`ακύρωσε την εξέταση από %[4]s for %[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 for %[3]s#%[2]s review_dismissed_reason=Αιτία: create_branch=δημιούργησε το κλαδο %[3]s στο %[4]s starred_repo=έδωσε αστέρι στο %[2]s watched_repo=άρχισε να παρακολουθεί το %[2]s +auto_merge_pull_request=αυτόματη συγχώνευση του pull request %[3]s#%[2]s [tool] ago=%s πριν @@ -3175,4 +3060,23 @@ settings.delete.description=Η διαγραφή ενός πακέτου είνα settings.delete.notice=Πρόκειται να διαγράψετε %s (%s). Αυτή η λειτουργία είναι μη αναστρέψιμη, είστε σίγουροι; settings.delete.success=Το πακέτο έχει διαγραφεί. settings.delete.error=Αποτυχία διαγραφής του πακέτου. - +chef.install=Για να εγκαταστήσετε το πακέτο, εκτελέστε την ακόλουθη εντολή: +owner.settings.cleanuprules.enabled=Ενεργοποιημένο + +[aria] + +[secrets] +value=Τιμή +name=Όνομα + +[actions] +runners.id=ID +runners.name=Όνομα +runners.owner_type=Τύπος +runners.description=Περιγραφή +runners.labels=Ετικέτες +runners.task_list.run=Εκτέλεση +runners.task_list.repository=Αποθετήριο +runners.task_list.commit=Υποβολή +runners.status.active=Ενεργό +runs.commit=Υποβολή diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini index 3a16819c3dff..ff89aedc9650 100644 --- a/options/locale/locale_es-ES.ini +++ b/options/locale/locale_es-ES.ini @@ -23,7 +23,6 @@ enable_javascript=Este sitio web funciona mejor con JavaScript. toc=Tabla de contenidos licenses=Licencias return_to_gitea=Volver a Gitea - username=Nombre de usuario email=Correo electrónico password=Contraseña @@ -33,7 +32,6 @@ captcha=CAPTCHA twofa=Autenticación de doble factor twofa_scratch=Código de respaldo passcode=Código de acceso - webauthn_insert_key=Introduzca su clave de seguridad webauthn_sign_in=Presione el botón en su clave de seguridad. Si su clave de seguridad no tiene ningún botón, vuelva a insertarla. webauthn_press_button=Por favor, presione el botón de su llave de seguridad… @@ -47,7 +45,6 @@ webauthn_error_duplicated=La clave de seguridad no está permitida para esta sol webauthn_error_empty=Debe establecer un nombre para esta clave. webauthn_error_timeout=Tiempo de espera máximo alcanzado antes de que su clave pudiese ser leída. Por favor, cargue la página y vuelva a intentarlo. webauthn_reload=Recargar - repository=Repositorio organization=Organización mirror=Réplica @@ -65,18 +62,15 @@ settings=Configuración your_profile=Perfil your_starred=Destacado your_settings=Configuración - all=Todos sources=Propios mirrors=Réplica collaborative=Colaborativo forks=Forks - activities=Actividades pull_requests=Pull Requests issues=Incidencias milestones=Hitos - ok=OK cancel=Cancelar save=Guardar @@ -85,26 +79,22 @@ add_all=Añadir todo remove=Eliminar remove_all=Eliminar todos edit=Editar - copy=Copiar copy_url=Copiar URL copy_branch=Copiar nombre de rama copy_success=¡Copiado! copy_error=Copiar falló - write=Escribir preview=Vista previa loading=Cargando… - step1=Paso 1: step2=Paso 2: - error=Error error404=La página a la que está intentando acceder o no existe o no está autorizado para verla. - never=Nunca - rss_feed=Fuentes RSS +enabled=Activo +disabled=Desactivado [filter] string.asc=A - Z @@ -159,7 +149,6 @@ err_empty_admin_email=El correo electrónico del administrador no puede estar va err_admin_name_is_reserved=Nombre de usuario del administrador no es válido, el nombre de usuario está reservado err_admin_name_pattern_not_allowed=El nombre de usuario del administrador no es válido, el nombre de usuario coincide con un patrón reservado err_admin_name_is_invalid=Nombre de usuario del administrador no es válido - general_title=Configuración general app_name=Título del sitio app_name_helper=Puede colocar aquí el nombre de su empresa. @@ -179,7 +168,6 @@ app_url=URL base de Gitea app_url_helper=Dirección base para URLs de clonación HTTP(S) y notificaciones de correo electrónico. log_root_path=Ruta del registro log_root_path_helper=Archivos de registro se escribirán en este directorio. - optional_title=Configuración opcional email_title=Configuración de Correo smtp_addr=Servidor SMTP @@ -237,7 +225,7 @@ default_enable_timetracking_popup=Activar el seguimiento de tiempo para nuevos r no_reply_address=Dominio de correos electrónicos ocultos no_reply_address_helper=Nombre de dominio para usuarios con dirección de correo electrónico oculta. Por ejemplo, el usuario 'joe' quedará registrado en Git como 'joe@noreply.example.org' si el dominio de correo electrónico oculto se establece a 'noreply.example.org'. password_algorithm=Algoritmo Hash de Contraseña -password_algorithm_helper=Establece el algoritmo de hashing de contraseña. Los algoritmos tienen diferentes requisitos y fuerza. `argon2` mientras tiene buenas características usa mucha memoria y puede ser inapropiado para sistemas pequeños. +password_algorithm_helper="""Establece el algoritmo de hashing de contraseña. Los algoritmos tienen diferentes requisitos y fuerza. `argon2` mientras tiene buenas características usa mucha memoria y puede ser inapropiado para sistemas pequeños.""" [home] uname_holder=Nombre de usuario o correo electrónico @@ -253,17 +241,14 @@ search_repos=Buscar un repositorio… filter=Otros filtros filter_by_team_repositories=Filtrar por repositorios de equipo feed_of=Suministro de noticias de "%s" - show_archived=Archivado show_both_archived_unarchived=Mostrar respositorios archivados y desarchivados show_only_archived=Mostrar sólo repositorios archivados show_only_unarchived=Mostrar sólo repositorios desarchivados - show_private=Privado show_both_private_public=Mostrar repositorios públicos y privados show_only_private=Mostrar sólo repositorios privados show_only_public=Mostrar sólo repositorios públicos - issues.in_your_repos=En tus repositorios [explore] @@ -287,7 +272,6 @@ code_last_indexed_at=Indexado por última vez %s relevant_repositories_tooltip=Repositorios que son bifurcaciones o que no tienen ningún tema, ningún icono, y ninguna descripción están ocultos. relevant_repositories=Solo se muestran repositorios relevantes, mostrar resultados sin filtrar. - [auth] create_new_account=Registrar una cuenta register_helper_msg=¿Ya tienes una cuenta? ¡Inicia sesión! @@ -360,31 +344,24 @@ password_pwned_err=No se pudo completar la solicitud a HaveIBeenPwned view_it_on=Ver en %s link_not_working_do_paste=¿No funciona? Intenta copiarlo y pegarlo en tu navegador. hi_user_x=Hola %s, - activate_account=Por favor, active su cuenta activate_account.title=%s, por favor activa tu cuenta activate_account.text_1=¡Hola %[1]s, gracias por registrarse en %[2]s! activate_account.text_2=Por favor, haga clic en el siguiente enlace para activar su cuenta dentro de %s: - activate_email=Verifique su correo electrónico activate_email.title=%s, por favor verifica tu dirección de correo electrónico activate_email.text=Por favor, haga clic en el siguiente enlace para verificar su dirección de correo electrónico dentro de %s: - register_notify=¡Bienvenido a Gitea register_notify.title=%[1]s, bienvenido a %[2]s register_notify.text_1=este es tu correo de confirmación de registro para %s! register_notify.text_2=Ahora puede iniciar sesión vía nombre de usuario: %s. register_notify.text_3=Si esta cuenta ha sido creada para usted, por favor establezca su contraseña primero. - reset_password=Recupere su cuenta reset_password.title=%s, has solicitado recuperar tu cuenta reset_password.text=Haga clic en el siguiente enlace para recuperar su cuenta dentro de %s: - register_success=Registro completado - issue_assigned.pull=@%[1]s le asignó al pull request %[2]s en el repositorio %[3]s. issue_assigned.issue=@%[1]s le asignó a la incidencia %[2]s en el repositorio %[3]s. - issue.x_mentioned_you=@%s te mencionó: issue.action.force_push=%[1]s empujó a la fuerza el %[2]s de %[3]s a %[4]s. issue.action.push_1=@%[1]s hizo %[3]d commit al %[2]s @@ -399,7 +376,6 @@ issue.action.review_dismissed=@%[1]s descartó la última revisión de %[ issue.action.ready_for_review=@%[1]s marcó este pull request listo para ser revisado. issue.action.new=@%[1]s creó #%[2]d. issue.in_tree_path=En %s: - release.new.subject=%s en %s publicado release.new.text=@%[1]s lanzó %[2]s en %[3]s release.title=Título: %s @@ -407,15 +383,12 @@ release.note=Nota: release.downloads=Descargas: release.download.zip=Código fuente (ZIP) release.download.targz=Código fuente (TAR.GZ) - repo.transfer.subject_to=%s desea transferir "%s" a %s repo.transfer.subject_to_you=%s desea transferir "%s" a usted repo.transfer.to_you=usted repo.transfer.body=Para aceptarlo o rechazarlo, visita %s o simplemente ignórelo. - repo.collaborator.added.subject=%s le añadió en %s repo.collaborator.added.text=Has sido añadido como colaborador del repositorio: - team_invite.subject=%[1]s le ha invitado a unirse a la organización de %[2]s team_invite.text_1=%[1]s le ha invitado a unirse al equipo %[2]s en la organización %[3]s. team_invite.text_2=Por favor, haz clic en el siguiente enlace para unirte al equipo: @@ -438,34 +411,30 @@ PayloadUrl=URL de carga TeamName=Nombre del equipo AuthName=Nombre de autorización AdminEmail=Correo electrónico del administrador - NewBranchName=Nuevo nombre de rama CommitSummary=Resumen del commit CommitMessage=Mensaje de commit CommitChoice=Hacer commit de la elección TreeName=Ruta del archivo Content=Contenido - SSPISeparatorReplacement=Separador SSPIDefaultLanguage=Idioma predeterminado - -require_error=` no puede estar vacío.` -alpha_dash_error=` solo debe contener caracteres alfanuméricos, guiones medios ('-') y guiones bajos ('_').` -alpha_dash_dot_error=` solo debe contener caracteres alfanuméricos, guiones, ('-'), subrayados ('_'), y puntos ('.').` -git_ref_name_error=` debe ser un nombre de referencia de Git bien formado.` -size_error=` debe ser de tamaño %s.` -min_size_error=` debe contener al menos %s caracteres.` -max_size_error=` debe contener como máximo %s caracteres.` -email_error=` no es una dirección de correo válida.` -url_error=`'%s' no es un URL válido.` -include_error=` debe contener la subcadena '%s'.` -glob_pattern_error=` el patrón globo no es válido: %s.` -regex_pattern_error=` el patrón de regex no es válido: %s.` +require_error=" no puede estar vacío." +alpha_dash_error=" solo debe contener caracteres alfanuméricos, guiones medios ('-') y guiones bajos ('_')." +alpha_dash_dot_error=" solo debe contener caracteres alfanuméricos, guiones, ('-'), subrayados ('_'), y puntos ('.')." +git_ref_name_error=" debe ser un nombre de referencia de Git bien formado." +size_error=" debe ser de tamaño %s." +min_size_error=" debe contener al menos %s caracteres." +max_size_error=" debe contener como máximo %s caracteres." +email_error=" no es una dirección de correo válida." +url_error='%s' no es un URL válido. +include_error=" debe contener la subcadena '%s'." +glob_pattern_error=" el patrón globo no es válido: %s." +regex_pattern_error=" el patrón de regex no es válido: %s." unknown_error=Error desconocido: captcha_incorrect=El código CAPTCHA no es correcto. password_not_match=Las contraseñas no coinciden. lang_select_error=Seleccione un idioma de la lista. - username_been_taken=El nombre de usuario ya está en uso. username_change_not_local_user=Los usuarios que no son locales no tienen permitido cambiar su nombre de usuario. repo_name_been_taken=El nombre del repositorio ya está usado. @@ -497,19 +466,16 @@ team_not_exist=Este equipo no existe. last_org_owner=No puedes eliminar al último usuario del equipo de 'propietarios'. Todas las organizaciones deben tener al menos un propietario. cannot_add_org_to_team=Una organización no puede ser añadida como miembro de un equipo. duplicate_invite_to_team=El usuario ya fue invitado como miembro del equipo. - invalid_ssh_key=No se puede verificar su clave SSH: %s invalid_gpg_key=No se puede verificar su clave GPG: %s invalid_ssh_principal=Principal no válido: %s unable_verify_ssh_key=No se puede verificar su clave SSH: compruebe si contiene errores. auth_failed=Autenticación fallo: %v - still_own_repo=Su cuenta posee uno o más repositorios; elimine o transfiera primero. still_has_org=Su cuenta es miembro de una o más organizaciones; déjalas primero. still_own_packages=Su cuenta posee uno o más repositorios; elimine o transfiera primero. org_still_own_repo=Esta organización todavía es dueña de uno o más repositorios; elimínelos o transfiéralos primero. org_still_own_packages=Esta organización todavía es dueña de uno o más repositorios; elimínelos o transfiéralos primero. - target_branch_not_exist=La rama de destino no existe [user] @@ -528,7 +494,6 @@ unfollow=Dejar de seguir heatmap.loading=Cargando mapa de calor… user_bio=Biografía disabled_public_activity=Este usuario ha desactivado la visibilidad pública de la actividad. - form.name_reserved=El usuario '%s' está reservado. form.name_pattern_not_allowed=El patrón '%s' no está permitido en un nombre de usuario. form.name_chars_not_allowed=El nombre de usuario '%s' tiene caracteres inválidos. @@ -551,7 +516,6 @@ account_link=Cuentas vinculadas organization=Organizaciones uid=UUID webauthn=Llaves de Seguridad - public_profile=Perfil público biography_placeholder=Cuéntenos un poco más sobre usted profile_desc=Su dirección de correo se utilizará para las notificaciones y otras operaciones. @@ -591,7 +555,6 @@ saved_successfully=Tus ajustes se han guardado correctamente. privacy=Privacidad keep_activity_private=Ocultar la actividad de la página del perfil keep_activity_private_popup=Hace la actividad visible sólo para ti y los administradores - lookup_avatar_by_mail=Buscar avatar por dirección de correo electrónico federated_avatar_lookup=Búsqueda de Avatar Federado enable_custom_avatar=Activar avatar personalizado @@ -602,7 +565,6 @@ uploaded_avatar_not_a_image=El archivo subido no es una imagen. uploaded_avatar_is_too_big=El archivo subido ha excedido el tamaño máximo. update_avatar_success=Su avatar ha sido actualizado. update_user_avatar_success=El avatar del usuario se ha actualizado. - change_password=Actualizar contraseña old_password=Contraseña actual new_password=Nueva contraseña @@ -610,7 +572,6 @@ retype_new_password=Confirmar nueva contraseña password_incorrect=Contraseña actual incorrecta. change_password_success=Su contraseña ha sido modificada. Utilice su nueva contraseña la próxima vez que acceda a la cuenta. password_change_disabled=Los usuarios no locales no pueden actualizar su contraseña a través de la interfaz web de Gitea. - emails=Direcciones de correo electrónico manage_emails=Administrar direcciones de correo electrónico manage_themes=Selecciona el tema por defecto @@ -643,7 +604,6 @@ add_openid_success=La nueva dirección OpenID ha sido añadida. keep_email_private=Ocultar dirección de correo electrónico keep_email_private_popup=Su dirección de correo electrónico será ocultada de otros usuarios. openid_desc=OpenID le permite delegar la autenticación a un proveedor externo. - manage_ssh_keys=Gestionar Claves SSH manage_ssh_principals=Administrar Principales de Certificado SSH manage_gpg_keys=Administrar claves GPG @@ -722,7 +682,6 @@ manage_social=Gestionar Redes Sociales asociadas social_desc=Estas cuentas sociales están vinculadas a su cuenta de Gitea. Asegúrese de que las reconoce todas, ya que pueden ser usadas para iniciar sesión en su cuenta de Gitea. unbind=Desvincular unbind_success=La cuenta social ha sido desvinculada de su cuenta Gitea. - manage_access_token=Administrar Tokens de Acceso generate_new_token=Generar nuevo Token tokens_desc=Estos tokens otorgan acceso a su cuenta usando la API de Gitea. @@ -737,7 +696,6 @@ access_token_deletion_cancel_action=Cancelar access_token_deletion_confirm_action=Eliminar access_token_deletion_desc=Eliminar un token revocará el acceso a su cuenta para las aplicaciones que lo usen. Esto no se puede deshacer. ¿Continuar? delete_token_success=El token ha sido eliminado. Las aplicaciones que lo usen ya no tienen acceso a su cuenta. - manage_oauth2_applications=Administrar aplicaciones OAuth2 edit_oauth2_application=Modificar aplicaciones OAuth2 oauth2_applications_desc=Las aplicaciones OAuth2 permiten a su aplicación de terceros autenticar de forma segura a los usuarios en esta instancia de Gitea. @@ -759,14 +717,12 @@ oauth2_client_secret_hint=El secreto no será visible si revisa esta página. Po oauth2_application_edit=Editar oauth2_application_create_description=Las aplicaciones OAuth2 le dan acceso a su aplicación de terceros a cuentas de usuario en esta instancia. oauth2_application_remove_description=Eliminar una aplicación OAuth2 impedirá que acceda a cuentas de usuario autorizadas en esta instancia. ¿Continuar? - authorized_oauth2_applications=Aplicaciones OAuth2 autorizadas authorized_oauth2_applications_description=Ha concedido acceso a su cuenta personal de Gitea a estas aplicaciones de terceros. Por favor, revoque el acceso a los aplicaciones que ya no son necesarias. revoke_key=Revocar revoke_oauth2_grant=Revocar acceso revoke_oauth2_grant_description=Revocar el acceso a esta aplicación impedirá que esta aplicación acceda a sus datos. ¿Está seguro? revoke_oauth2_grant_success=Ha revocado el acceso con éxito. - twofa_desc=La autenticación de doble factor mejora la seguridad de su cuenta. twofa_is_enrolled=Su cuenta actualmente está registrada en la autenticación de doble factor. twofa_not_enrolled=Tu cuenta no está actualmente inscrita en la autenticación de doble factor. @@ -784,13 +740,11 @@ then_enter_passcode=E introduzca el código de acceso mostrado en la aplicación passcode_invalid=El código de acceso es incorrecto. Vuelva a intentarlo. twofa_enrolled=Su cuenta ha sido inscrita en la autenticación de doble factor. ¡Guarde su código de respaldo (%s) en un lugar seguro, ya que sólo se muestra una vez! twofa_failed_get_secret=No se pudo obtener el secreto. - webauthn_desc=Las claves de seguridad son dispositivos hardware que contienen claves criptográficas. Pueden ser usados para la autenticación de doble factor. Las claves de seguridad deben soportar el estándar WebAuthn Authenticator. webauthn_register_key=Añadir clave de seguridad webauthn_nickname=Apodo webauthn_delete_key=Eliminar clave de seguridad webauthn_delete_key_desc=Si elimina una llave de seguridad ya no podrá utilizarla para iniciar sesión con ella. ¿Continuar? - manage_account_links=Administrar cuentas vinculadas manage_account_links_desc=Estas cuentas externas están vinculadas a su cuenta de Gitea. account_links_not_available=Actualmente no hay cuentas externas vinculadas a su cuenta de Gitea. @@ -798,23 +752,19 @@ link_account=Enlazar cuenta remove_account_link=Eliminar cuenta vinculada remove_account_link_desc=Eliminar una cuenta vinculada revocará su acceso a su cuenta de Gitea. ¿Continuar? remove_account_link_success=La cuenta vinculada ha sido eliminada. - orgs_none=No eres miembro de ninguna organización. repos_none=No posees ningún repositorio - delete_account=Elimina tu cuenta delete_prompt=Esta operación eliminará permanentemente su cuenta de usuario. NO podrá deshacerse. delete_with_all_comments=Tu cuenta es menor de %s. Para evitar comentarios fantasma, todos los comentarios/PR serán eliminados con ella. confirm_delete_account=Confirmar Eliminación delete_account_title=Eliminar cuenta de usuario delete_account_desc=¿Está seguro que desea eliminar permanentemente esta cuenta de usuario? - email_notifications.enable=Habilitar notificaciones por correo electrónico email_notifications.onmention=Enviar correo sólo al ser mencionado email_notifications.disable=Deshabilitar las notificaciones por correo electrónico email_notifications.submit=Establecer preferencias de correo electrónico email_notifications.andyourown=Y sus propias notificaciones - visibility=Visibilidad del usuario visibility.public=Público visibility.public_tooltip=Visible para todos los usuarios @@ -908,14 +858,12 @@ delete_preexisting=Eliminar archivos preexistentes delete_preexisting_content=Eliminar archivos en %s delete_preexisting_success=Eliminó archivos no adoptados en %s blame_prior=Ver la culpa antes de este cambio - transfer.accept=Aceptar transferencia transfer.accept_desc=Transferir a "%s" transfer.reject=Rechazar transferencia transfer.reject_desc=Cancelar transferencia a "%s" transfer.no_permission_to_accept=No tiene permiso para aceptar transfer.no_permission_to_reject=No tienes permiso para rechazar - desc.private=Privado desc.public=Público desc.private_template=Plantilla privada @@ -923,7 +871,6 @@ desc.public_template=Plantilla desc.internal=Interno desc.internal_template=Plantilla interna desc.archived=Archivado - template.items=Elementos de plantilla template.git_content=Contenido Git (rama predeterminada) template.git_hooks=Git Hooks @@ -934,16 +881,13 @@ template.avatar=Avatar template.issue_labels=Etiquetas de incidencia template.one_item=Debe seleccionar al menos un elemento de plantilla template.invalid=Debe seleccionar una plantilla de repositorio - archive.title=Este repositorio está archivado. Puede ver los archivos y clonarlo, pero no puede subir cambios o reportar incidencias ni pedir Pull Requests. archive.issue.nocomment=Este repositorio está archivado. No se puede comentar en las incidencias. archive.pull.nocomment=Este repositorio está archivado. No se puede comentar en los pull requests. - form.reach_limit_of_creation_1=Ya han alcanzado su límite de %d repositorios. form.reach_limit_of_creation_n=Ya han alcanzado su límite de repositorios de %d. form.name_reserved=El nombre de repositorio '%s' está reservado. form.name_pattern_not_allowed=El patrón '%s' no está permitido en un nombre de repositorio. - need_auth=Autorización migrate_options=Opciones de migración migrate_service=Servicio de Migración @@ -994,7 +938,6 @@ migrate.migrating_labels=Migrando etiquetas migrate.migrating_releases=Migrando Lanzamientos migrate.migrating_issues=Migrando incidencias migrate.migrating_pulls=Migrando Pull Requests - mirror_from=réplica de forked_from=forkeado de generated_from=generado desde @@ -1008,7 +951,6 @@ unstar=Eliminar de favoritos star=Destacar fork=Fork download_archive=Descargar repositorio - no_desc=Sin descripción quick_guide=Guía rápida clone_this_repo=Clonar este repositorio @@ -1016,12 +958,11 @@ create_new_repo_command=Crear un nuevo repositorio desde línea de comandos push_exist_repo=Hacer push de un repositorio existente desde línea de comandos empty_message=Este repositorio no contiene ningún contenido. broken_message=Los datos de Git subyacentes a este repositorio no pueden ser leídos. Contacte con el administrador de esta instancia o elimine este repositorio. - code=Código code.desc=Acceder código fuente, archivos, commits, y ramas. branch=Rama tree=Árbol -clear_ref=`Borrar referencia actual` +clear_ref=Borrar referencia actual filter_branch_and_tag=Filtrar por rama o etiqueta find_tag=Buscar etiqueta branches=Ramas @@ -1033,7 +974,6 @@ packages=Paquetes labels=Etiquetas org_labels_desc=Etiquetas de nivel de la organización que pueden ser utilizadas con todos los repositorios bajo esta organización org_labels_desc_manage=gestionar - milestones=Hitos commits=Commits commit=Commit @@ -1049,14 +989,13 @@ file_view_rendered=Ver procesado file_view_raw=Ver original file_permalink=Enlace permanente file_too_large=El archivo es demasiado grande para ser mostrado. -invisible_runes_header=`¡Este archivo contiene caracteres Unicode invisibles!` -invisible_runes_description=`Este archivo contiene caracteres Unicode invisibles que pueden ser procesados de forma diferente a lo que aparece a continuación. Si su caso de uso es intencional y legítimo, puede ignorar esta advertencia. Use el botón de Escape para revelar caracteres ocultos.` -ambiguous_runes_header=`¡Este archivo contiene caracteres Unicode ambiguos!` -ambiguous_runes_description=`Este archivo contiene caracteres Unicode ambiguos que pueden confundirse con otros en tu idioma actual. Si tu caso de uso es intencional y legítimo, puedes ignorar esta advertencia. Usa el botón de Escape para resaltar estos caracteres.` -invisible_runes_line=`Esta línea tiene caracteres unicode invisibles` -ambiguous_runes_line=`Esta línea tiene caracteres unicode ambiguos` -ambiguous_character=`%[1]c [U+%04[1]X] es confusable con %[2]c [U+%04[2]X]` - +invisible_runes_header=¡Este archivo contiene caracteres Unicode invisibles! +invisible_runes_description=Este archivo contiene caracteres Unicode invisibles que pueden ser procesados de forma diferente a lo que aparece a continuación. Si su caso de uso es intencional y legítimo, puede ignorar esta advertencia. Use el botón de Escape para revelar caracteres ocultos. +ambiguous_runes_header=¡Este archivo contiene caracteres Unicode ambiguos! +ambiguous_runes_description=Este archivo contiene caracteres Unicode ambiguos que pueden confundirse con otros en tu idioma actual. Si tu caso de uso es intencional y legítimo, puedes ignorar esta advertencia. Usa el botón de Escape para resaltar estos caracteres. +invisible_runes_line=Esta línea tiene caracteres unicode invisibles +ambiguous_runes_line=Esta línea tiene caracteres unicode ambiguos +ambiguous_character=%[1]c [U+%04[1]X] es confusable con %[2]c [U+%04[2]X] escape_control_characters=Escapar unescape_control_characters=No Escapar file_copy_permalink=Copiar Permalink @@ -1075,7 +1014,6 @@ download_file=Descargar archivo normal_view=Vista normal line=línea lines=líneas - editor.add_file=Añadir archivo editor.new_file=Nuevo Archivo editor.upload_file=Subir archivo @@ -1141,7 +1079,6 @@ editor.user_no_push_to_branch=El usuario no puede hacer push a la rama editor.require_signed_commit=Esta rama requiere un commit firmado editor.cherry_pick=Hacer Cherry-pick %s en: editor.revert=Revertir %s en: - commits.desc=Ver el historial de cambios de código fuente. commits.commits=Commits commits.no_commits=No hay commits en común. '%s' y '%s' tienen historias completamente diferentes. @@ -1160,7 +1097,6 @@ commits.signed_by_untrusted_user=Firmado por usuario no fiable commits.signed_by_untrusted_user_unmatched=Firmado por un usuario no fiable que no coincide con el colaborador commits.gpg_key_id=ID de clave GPG commits.ssh_key_fingerprint=Huella clave SSH - commit.actions=Acciones commit.revert=Revertir commit.revert-header=Revertir: %s @@ -1168,10 +1104,8 @@ commit.revert-content=Seleccionar rama en la que revertir: commit.cherry-pick=Hacer Cherry-pick commit.cherry-pick-header=Hacer Cherry-pick: %s commit.cherry-pick-content=Seleccionar rama en la que hacer cherry-pick: - ext_issues=Acceso a incidencias externas ext_issues.desc=Enlace a un gestor de incidencias externo. - projects=Proyectos projects.desc=Gestionar problemas y pulls en los tablones del proyecto. projects.description=Descripción (opcional) @@ -1207,7 +1141,6 @@ projects.board.color=Color projects.open=Abrir projects.close=Cerrar projects.board.assigned_to=Asignado a - issues.desc=Organizar los informes de fallos, tareas e hitos. issues.filter_assignees=Filtrar asignado issues.filter_milestones=Filtrar hito @@ -1260,25 +1193,25 @@ issues.add_labels=añadió las etiquetas %s %s issues.remove_label=eliminó la etiqueta %s %s issues.remove_labels=eliminó las etiquetas %s %s issues.add_remove_labels=ha añadido %s y eliminado %s etiquetas %s -issues.add_milestone_at=`ha añadido esto al hito %s %s` -issues.add_project_at=`añadió esto al proyecto %s %s` -issues.change_milestone_at=`modificó el hito de %s a %s %s` -issues.change_project_at=`modificó el proyecto de %s a %s %s` -issues.remove_milestone_at=`ha eliminado esto del hito %s %s ` -issues.remove_project_at=`removió esto del proyecto %s %s` -issues.deleted_milestone=`(eliminado)` -issues.deleted_project=`(eliminado)` -issues.self_assign_at=`auto asignado este %s` -issues.add_assignee_at='fue asignado por %s %s' -issues.remove_assignee_at=`fue desasignado por %s %s` -issues.remove_self_assignment=`eliminado su asignación %s` -issues.change_title_at=`cambió el título de %s a %s %s` -issues.change_ref_at=`cambió referencia de %s a %s %s` -issues.remove_ref_at=`eliminó la referencia %s %s` -issues.add_ref_at=`añadió la referencia %s %s` -issues.delete_branch_at=`rama eliminada %s %s` +issues.add_milestone_at=ha añadido esto al hito %s %s +issues.add_project_at=añadió esto al proyecto %s %s +issues.change_milestone_at=modificó el hito de %s a %s %s +issues.change_project_at=modificó el proyecto de %s a %s %s +issues.remove_milestone_at="ha eliminado esto del hito %s %s " +issues.remove_project_at=removió esto del proyecto %s %s +issues.deleted_milestone=(eliminado) +issues.deleted_project=(eliminado) +issues.self_assign_at=auto asignado este %s +issues.add_assignee_at=fue asignado por %s %s +issues.remove_assignee_at=fue desasignado por %s %s +issues.remove_self_assignment=eliminado su asignación %s +issues.change_title_at=cambió el título de %s a %s %s +issues.change_ref_at=cambió referencia de %s a %s %s +issues.remove_ref_at=eliminó la referencia %s %s +issues.add_ref_at=añadió la referencia %s %s +issues.delete_branch_at=rama eliminada %s %s issues.filter_label=Etiqueta -issues.filter_label_exclude=`Usa alt + clic/enter para excluir etiquetas` +issues.filter_label_exclude=Usa alt + clic/enter para excluir etiquetas issues.filter_label_no_select=Todas las etiquetas issues.filter_milestone=Milestone issues.filter_milestone_no_select=Todos los hitos @@ -1325,7 +1258,7 @@ issues.open_title=Abierta issues.closed_title=Cerrada issues.draft_title=Borrador issues.num_comments=%d comentarios -issues.commented_at=`comentado %s` +issues.commented_at=comentado %s issues.delete_comment_confirm=¿Seguro que deseas eliminar este comentario? issues.context.copy_link=Copiar enlace issues.context.quote_reply=Citar respuesta @@ -1334,22 +1267,22 @@ issues.context.edit=Editar issues.context.delete=Eliminar issues.no_content=Aún no existe contenido. issues.close_issue=Cerrar -issues.pull_merged_at=`fusionado commit %[2]s en %[3]s %[4]s` -issues.manually_pull_merged_at=`fusionado manualmente commit %[2]s en %[3]s %[4]s` +issues.pull_merged_at=fusionado commit %[2]s en %[3]s %[4]s +issues.manually_pull_merged_at=fusionado manualmente commit %[2]s en %[3]s %[4]s issues.close_comment_issue=Comentar y cerrar issues.reopen_issue=Reabrir issues.reopen_comment_issue=Comentar y reabrir issues.create_comment=Comentar -issues.closed_at=`cerró esta incidencia %[2]s` -issues.reopened_at=`reabrió esta incidencia %[2]s` -issues.commit_ref_at=`referenció esta incidencia en un commit %[2]s` -issues.ref_issue_from=`referenció esta incidencia %[4]s %[2]s` -issues.ref_pull_from=`referenció este pull request %[4]s %[2]s` -issues.ref_closing_from=`referenció un pull request %[4]s que cerrará esta incidencia %[2]s` -issues.ref_reopening_from=`referenció un pull request %[4]s que reabrirá esta incidencia %[2]s` -issues.ref_closed_from=`cerró esta incidencia %[4]s %[2]s` -issues.ref_reopened_from=`reabrió esta incidencia %[4]s %[2]s` -issues.ref_from=`de %[1]s` +issues.closed_at=cerró esta incidencia %[2]s +issues.reopened_at=reabrió esta incidencia %[2]s +issues.commit_ref_at=referenció esta incidencia en un commit %[2]s +issues.ref_issue_from=referenció esta incidencia %[4]s %[2]s +issues.ref_pull_from=referenció este pull request %[4]s %[2]s +issues.ref_closing_from=referenció un pull request %[4]s que cerrará esta incidencia %[2]s +issues.ref_reopening_from=referenció un pull request %[4]s que reabrirá esta incidencia %[2]s +issues.ref_closed_from=cerró esta incidencia %[4]s %[2]s +issues.ref_reopened_from=reabrió esta incidencia %[4]s %[2]s +issues.ref_from=de %[1]s issues.poster=Autor issues.collaborator=Colaborador issues.owner=Propietario @@ -1379,8 +1312,8 @@ issues.label.filter_sort.reverse_alphabetically=Invertir alfabéticamente issues.label.filter_sort.by_size=Tamaño más pequeño issues.label.filter_sort.reverse_by_size=Tamaño más grande issues.num_participants=%d participantes -issues.attachment.open_tab='Haga clic para ver "%s" en una pestaña nueva' -issues.attachment.download=`Haga clic para descargar "%s"` +issues.attachment.open_tab=Haga clic para ver "%s" en una pestaña nueva +issues.attachment.download=Haga clic para descargar "%s" issues.subscribe=Suscribir issues.unsubscribe=Desuscribirse issues.lock=Bloquear conversación @@ -1408,31 +1341,31 @@ issues.delete.text=¿Realmente quieres eliminar esta incidencia? (Esto eliminar issues.tracker=Gestor de tiempo issues.start_tracking_short=Iniciar temporizador issues.start_tracking=Inicio de seguimiento de tiempo -issues.start_tracking_history=`ha empezado a trabajar %s` +issues.start_tracking_history=ha empezado a trabajar %s issues.tracker_auto_close=El temporizador se detendrá automáticamente cuando se cierre este problema -issues.tracking_already_started=`¡Ya has iniciado el seguimiento de tiempo en otro problema!` +issues.tracking_already_started=¡Ya has iniciado el seguimiento de tiempo en otro problema! issues.stop_tracking=Detener temporizador -issues.stop_tracking_history=`dejó de trabajar %s` +issues.stop_tracking_history=dejó de trabajar %s issues.cancel_tracking=Descartar -issues.cancel_tracking_history=`canceló el seguimiento de tiempo %s` +issues.cancel_tracking_history=canceló el seguimiento de tiempo %s issues.add_time=Añadir tiempo gastado manualmente issues.del_time=Eliminar este registro de tiempo issues.add_time_short=Añadir tiempo gastado issues.add_time_cancel=Cancelar -issues.add_time_history=`añadió tiempo gastado %s` -issues.del_time_history=`eliminado el tiempo gastado %s` +issues.add_time_history=añadió tiempo gastado %s +issues.del_time_history=eliminado el tiempo gastado %s issues.add_time_hours=Horas issues.add_time_minutes=Minutos issues.add_time_sum_to_small=No se ha entrado tiempo. issues.time_spent_total=Tiempo total gastado -issues.time_spent_from_all_authors=`Tiempo total gastado: %s` +issues.time_spent_from_all_authors=Tiempo total gastado: %s issues.due_date=Fecha de vencimiento issues.invalid_due_date_format=El formato de la fecha de vencimiento debe ser 'aaaa-mm-dd'. issues.error_modifying_due_date=Fallo al modificar la fecha de vencimiento. issues.error_removing_due_date=Fallo al eliminar la fecha de vencimiento. issues.push_commit_1=añadido %d commit %s issues.push_commits_n=añadido %d commits %s -issues.force_push_codes=`hizo push forzado %[1]s de %[2]s a %[4]s %[6]s` +issues.force_push_codes=hizo push forzado %[1]s de %[2]s a %[4]s %[6]s issues.due_date_form=aaaa-mm-dd issues.due_date_form_add=Añadir fecha de vencimiento issues.due_date_form_edit=Editar @@ -1451,8 +1384,8 @@ issues.dependency.add=Añadir dependencia… issues.dependency.cancel=Cancelar issues.dependency.remove=Eliminar issues.dependency.remove_info=Eliminar esta dependencia -issues.dependency.added_dependency=`añadida una nueva dependencia %s` -issues.dependency.removed_dependency=`eliminada una dependencia %s` +issues.dependency.added_dependency=añadida una nueva dependencia %s +issues.dependency.removed_dependency=eliminada una dependencia %s issues.dependency.pr_closing_blockedby=Cerrando este pull request es bloqueado por las siguientes incidencias issues.dependency.issue_closing_blockedby=Cerrando esta incidencia esta bloqueado por las siguientes incidencias issues.dependency.issue_close_blocks=Esta incidencia bloquea el cierre de las siguientes incidencias @@ -1505,10 +1438,8 @@ issues.content_history.delete_from_history=Eliminar del historial issues.content_history.delete_from_history_confirm=¿Eliminar del historial? issues.content_history.options=Opciones issues.reference_link=Referencia: %s - compare.compare_base=base compare.compare_head=comparar - pulls.desc=Activar Pull Requests y revisiones de código. pulls.new=Nuevo Pull Request pulls.view=Ver Pull Request @@ -1528,11 +1459,11 @@ pulls.filter_branch=Filtrar rama pulls.no_results=Sin resultados. pulls.nothing_to_compare=Estas ramas son iguales. No hay necesidad para crear un pull request. pulls.nothing_to_compare_and_allow_empty_pr=Estas ramas son iguales. Este PR estará vacío. -pulls.has_pull_request=`Ya existe un pull request entre estas ramas: %[2]s#%[3]d` +pulls.has_pull_request=Ya existe un pull request entre estas ramas: %[2]s#%[3]d pulls.create=Crear Pull Request pulls.title_desc=desea fusionar %[1]d commits de %[2]s en %[3]s pulls.merged_title_desc=fusionados %[1]d commits de %[2]s en %[3]s %[4]s -pulls.change_target_branch_at=`cambió la rama objetivo de %s a %s %s` +pulls.change_target_branch_at=cambió la rama objetivo de %s a %s %s pulls.tab_conversation=Conversación pulls.tab_commits=Commits pulls.tab_files=Archivos modificados @@ -1544,7 +1475,7 @@ pulls.manually_merged=Fusionado manualmente pulls.manually_merged_as=El Pull Request se ha fusionado manualmente como %[2]s. pulls.is_closed=El pull request ha sido cerrado. pulls.has_merged=El pull request ha sido fusionado. -pulls.title_wip_desc=`Comience el título con %s para prevenir que el pull request se fusione accidentalmente.` +pulls.title_wip_desc=Comience el título con %s para prevenir que el pull request se fusione accidentalmente. pulls.cannot_merge_work_in_progress=Este pull request está marcado como un trabajo en curso. pulls.still_in_progress=¿Aún en curso? pulls.add_prefix=Añadir prefijo %s @@ -1575,7 +1506,6 @@ pulls.reject_count_n=%d solicitudes de cambio pulls.waiting_count_1=%d esperando revisión pulls.waiting_count_n=%d esperando revisiónes pulls.wrong_commit_id=la identificación de commit debe ser para un commit en la rama de destino - pulls.no_merge_desc=Este pull request no se puede combinar porque todas las opciones de combinación del repositorio están deshabilitadas. pulls.no_merge_helper=Habilite las opciones de combinación en la configuración del repositorio o fusione el pull request manualmente. pulls.no_merge_wip=Este pull request no se puede combinar porque está marcada como un trabajo en progreso. @@ -1588,7 +1518,6 @@ pulls.squash_merge_pull_request=Crear commit squash pulls.merge_manually=Fusionado manualmente pulls.merge_commit_id=La identificación del commit fusionado pulls.require_signed_wont_sign=Esta rama requiere commits firmados pero esta fusión no será firmada - pulls.invalid_merge_option=No puede utilizar esta opción de combinación para esta solicitud de extracción. pulls.merge_conflict=Fusión fallida: Hubo un conflicto mientras se fusionaba. Pista: Pruebe una estrategia diferente pulls.merge_conflict_summary=Mensaje de error @@ -1601,7 +1530,7 @@ pulls.head_out_of_date=Fusión fallida: Mientras se generaba la fusión, la cabe pulls.push_rejected=Fusión fallida: El push fue rechazado. Revise los Git Hooks para este repositorio. pulls.push_rejected_summary=Mensaje completo de rechazo pulls.push_rejected_no_message=Fusión fallida: El push fue rechazado pero no hubo mensaje remoto.
    Revise los Git Hooks para este repositorio -pulls.open_unmerged_pull_exists=`No puede realizar la reapertura porque hay un pull request pendiente (#%d) con propiedades idénticas.` +pulls.open_unmerged_pull_exists=No puede realizar la reapertura porque hay un pull request pendiente (#%d) con propiedades idénticas. pulls.status_checking=Algunas comprobaciones están pendientes pulls.status_checks_success=Todas las comprobaciones han sido exitosas pulls.status_checks_warning=Algunas comprobaciones han reportado advertencias @@ -1614,27 +1543,22 @@ pulls.update_branch_rebase=Actualizar rama por cambio de base pulls.update_branch_success=La actualización de la rama ha finalizado correctamente pulls.update_not_allowed=No tiene permisos para actualizar esta rama pulls.outdated_with_base_branch=Esta rama está desactualizada con la rama base -pulls.closed_at=`cerró este pull request %[2]s` -pulls.reopened_at=`reabrió este pull request %[2]s` -pulls.merge_instruction_hint=`También puede ver instrucciones de línea de comandos.` +pulls.closed_at=cerró este pull request %[2]s +pulls.reopened_at=reabrió este pull request %[2]s +pulls.merge_instruction_hint=También puede ver instrucciones de línea de comandos. pulls.merge_instruction_step1_desc=Desde el repositorio de su proyecto, revisa una nueva rama y prueba los cambios. pulls.merge_instruction_step2_desc=Combine los cambios y actualice en Gitea. - pulls.auto_merge_button_when_succeed=(cuando las comprobaciones tengan éxito) pulls.auto_merge_when_succeed=Fusionar automática cuando todas las comprobaciones tengan éxito pulls.auto_merge_newly_scheduled=El Pull Request se programó para fusionarse cuando todas las comprobaciones tengan éxito. pulls.auto_merge_has_pending_schedule=%[1]s programó este Pull Request para fusionar automática cuando todas las comprobaciones tengan éxito %[2]s. - pulls.auto_merge_cancel_schedule=Cancelar fusión automática pulls.auto_merge_not_scheduled=Este Pull Request no está programado para fusionar automática. pulls.auto_merge_canceled_schedule=Fusión automaticá estaba cancellada para este Pull Request. - -pulls.auto_merge_newly_scheduled_comment=`programó este Pull Request para fusionar automática cuando todas las comprobaciones tengan éxito %[1]s` -pulls.auto_merge_canceled_schedule_comment=`canceló la fusión automática de este Pull Request %[1]s` - +pulls.auto_merge_newly_scheduled_comment=programó este Pull Request para fusionar automática cuando todas las comprobaciones tengan éxito %[1]s +pulls.auto_merge_canceled_schedule_comment=canceló la fusión automática de este Pull Request %[1]s pulls.delete.title=¿Borrar este pull request? pulls.delete.text=¿Realmente quieres eliminar esta pull request? (Esto eliminará permanentemente todo el contenido. Considera cerrarlo si simplemente deseas archivarlo) - milestones.new=Nuevo hito milestones.closed=Cerrada %s milestones.update_ago=Actualizado hace %s @@ -1664,7 +1588,6 @@ milestones.filter_sort.least_complete=Menos completa milestones.filter_sort.most_complete=Más completa milestones.filter_sort.most_issues=Mayoría de los problemas milestones.filter_sort.least_issues=Menos problemas - signing.will_sign=Este commit se firmará con la clave '%s' signing.wont_sign.error=Se ha producido un error al comprobar si se puede firmar el commit signing.wont_sign.nokey=No hay ninguna clave disponible para firmar este commit @@ -1678,10 +1601,8 @@ signing.wont_sign.headsigned=Esta fusión no se firmará ya que head commit no e signing.wont_sign.commitssigned=Esta fusión no se firmará ya que todos sus commits asociados no están firmados signing.wont_sign.approved=Esta fusión no se firmará ya que el PR no está aprobado signing.wont_sign.not_signed_in=No has iniciado sesión - ext_wiki=Acceso a la wiki externa ext_wiki.desc=Enlace a una wiki externa. - wiki=Wiki wiki.welcome=¡Bienvenidos a la Wiki! wiki.welcome_desc=Esta wiki le permite escribir y compartir documentación con otros colaboradores. @@ -1705,7 +1626,6 @@ wiki.reserved_page=El nombre de la página wiki '%s' ya está reservado. wiki.pages=Páginas wiki.last_updated=Última actualización %s wiki.page_name_desc=Introduzca un nombre para esta página de Wiki. Algunos nombres especiales son: 'Home', '_Sidebar' y '_Footer'. - activity=Actividad activity.period.filter_label=Periodo: activity.period.daily=1 día @@ -1771,7 +1691,6 @@ activity.git_stats_addition_n=%d adiciones activity.git_stats_and_deletions=y activity.git_stats_deletion_1=%d eliminación activity.git_stats_deletion_n=%d eliminaciones - search=Buscar search.search_repo=Buscar repositorio search.type.tooltip=Tipo de búsqueda @@ -1782,7 +1701,6 @@ search.match.tooltip=Incluye sólo los resultados que coincidan con el término search.results=Resultados de la búsqueda para "%s" en %s search.code_no_results=No se ha encontrado código de fuente que coincida con su término de búsqueda. search.code_search_unavailable=Actualmente la búsqueda de código no está disponible. Póngase en contacto con el administrador de su sitio. - settings=Configuración settings.desc=La configuración es donde puede administrar la configuración del repositorio settings.options=Repositorio @@ -2087,10 +2005,10 @@ settings.dismiss_stale_approvals=Descartar aprobaciones obsoletas settings.dismiss_stale_approvals_desc=Cuando los nuevos commits que cambien el contenido de la pull request sean empujados a la rama, se descartarán las aprobaciones antiguas. settings.require_signed_commits=Requiere commits firmados settings.require_signed_commits_desc=Rechazar push en esta rama si los commits no están firmados o no son verificables. -settings.protect_protected_file_patterns=Patrones de archivos protegidos (separados con punto y coma '\;'): -settings.protect_protected_file_patterns_desc=Archivos protegidos que no están permitidos a ser cambiados directamente incluso si el usuario tiene permiso para agregar, editar o borrar archivos en esta rama. Múltiples patrones pueden separarse usando punto y coma ('\;'). Vea la documentación de github.com/gobwas/glob para la sintaxis de patrones. Ejemplos: .drone.yml, /docs/**/*.txt. -settings.protect_unprotected_file_patterns=Patrones de archivos sin protección (separados con punto y coma '\;'): -settings.protect_unprotected_file_patterns_desc=Archivos sin protección que se pueden cambiar directamente si el usuario tiene acceso de escritura, evitando la restricción push. Múltiples patrones pueden separarse usando punto y coma ('\;'). Vea la documentación de github.com/gobwas/glob para la sintaxis de patrones. Ejemplos: .drone.yml, /docs/**/*.txt. +settings.protect_protected_file_patterns=Patrones de archivos protegidos (separados con punto y coma ';'): +settings.protect_protected_file_patterns_desc=Archivos protegidos que no están permitidos a ser cambiados directamente incluso si el usuario tiene permiso para agregar, editar o borrar archivos en esta rama. Múltiples patrones pueden separarse usando punto y coma (';'). Vea la documentación de github.com/gobwas/glob para la sintaxis de patrones. Ejemplos: .drone.yml, /docs/**/*.txt. +settings.protect_unprotected_file_patterns=Patrones de archivos sin protección (separados con punto y coma ';'): +settings.protect_unprotected_file_patterns_desc=Archivos sin protección que se pueden cambiar directamente si el usuario tiene acceso de escritura, evitando la restricción push. Múltiples patrones pueden separarse usando punto y coma (';'). Vea la documentación de github.com/gobwas/glob para la sintaxis de patrones. Ejemplos: .drone.yml, /docs/**/*.txt. settings.add_protected_branch=Activar protección settings.delete_protected_branch=Desactivar protección settings.update_protect_branch_success=La protección de la rama '%s' ha sido actualizada. @@ -2170,7 +2088,6 @@ settings.rename_branch_success=La rama %s se renombró correctamente a %s. settings.rename_branch_from=nombre de la rama vieja settings.rename_branch_to=nombre de la rama nueva settings.rename_branch=Renombrar rama - diff.browse_source=Explorar el Código diff.parent=padre diff.commit=commit @@ -2222,7 +2139,6 @@ diff.image.side_by_side=Lado a lado diff.image.swipe=Deslizar diff.image.overlay=Superposición diff.has_escaped=Esta línea tiene caracteres Unicode ocultos - releases.desc=Seguir las versiones y descargas del proyecto. release.releases=Lanzamientos release.detail=Detalles de lanzamiento @@ -2264,7 +2180,6 @@ release.downloads=Descargas release.download_count=Descargas: %s release.add_tag_msg=Utilice el título y el contenido de la liberación como mensaje de etiqueta. release.add_tag=Crear solo etiqueta - branch.name=Nombre de la rama branch.search=Buscar ramas branch.already_exists=Ya existe una rama con el nombre %s. @@ -2296,25 +2211,24 @@ branch.create_branch_operation=Crear rama branch.new_branch=Crear nueva rama branch.new_branch_from=Crear nueva rama desde '%s' branch.renamed=La rama %s fue renombrada a %s. - tag.create_tag=Crear etiqueta %s tag.create_tag_operation=Crear etiqueta tag.confirm_create_tag=Crear etiqueta tag.create_tag_from=Crear etiqueta nueva a partir de «%s» - tag.create_success=La etiqueta '%s' ha sido creada. - topic.manage_topics=Administrar temas topic.done=Hecho topic.count_prompt=No puede seleccionar más de 25 temas topic.format_prompt=Los temas deben comenzar con una letra o número, pueden incluir guiones ('-') y pueden tener hasta 35 caracteres de largo. - find_file.go_to_file=Ir al archivo find_file.no_matching=No se encontró ningún archivo que coincidiese - error.csv.too_large=No se puede renderizar este archivo porque es demasiado grande. error.csv.unexpected=No se puede procesar este archivo porque contiene un carácter inesperado en la línea %d y la columna %d. error.csv.invalid_field_count=No se puede procesar este archivo porque tiene un número incorrecto de campos en la línea %d. +issues.filter_project=Proyecto +issues.filter_project_none=Ningún proyecto +settings.authorization_header=Encabezado de autorización +settings.authorization_header_desc=Se incluirá como encabezado de autorización para solicitudes cuando esté presente. Ejemplo: %s. [org] org_name_holder=Nombre de la organización @@ -2338,11 +2252,9 @@ team_access_desc=Acceso al repositorio team_permission_desc=Permiso team_unit_desc=Permitir acceso a las secciones del repositorio team_unit_disabled=(Deshabilitado) - form.name_reserved=El nombre de la organización '%s' está reservado. form.name_pattern_not_allowed=El patrón '%s' no está permitido en el nombre de una organización. form.create_org_not_allowed=No tiene permisos para crear organizaciones. - settings=Configuración settings.options=Organización settings.full_name=Nombre completo @@ -2356,7 +2268,6 @@ settings.visibility.limited=Limitado (Visible sólo para los usuarios registrado settings.visibility.limited_shortname=Limitado settings.visibility.private=Privado (Visible sólo para miembros de la organización) settings.visibility.private_shortname=Privado - settings.update_settings=Actualizar configuración settings.update_setting_success=Configuración de la organización se han actualizado. settings.change_orgname_prompt=Nota: cambiar el nombre de la organización también cambia la URL de la organización. @@ -2369,9 +2280,7 @@ settings.confirm_delete_account=Confirmar eliminación settings.delete_org_title=Eliminar organización settings.delete_org_desc=Esta organización se eliminará permanentemente. ¿Continuar? settings.hooks_desc=Añadir webhooks que serán ejecutados para todos los repositorios de esta organización. - settings.labels_desc=Añadir etiquetas que pueden ser utilizadas en problemas para todos los repositorios bajo esta organización. - members.membership_visibility=Visibilidad de Membresía: members.public=Público members.public_helper=hacer oculto @@ -2386,7 +2295,6 @@ members.leave=Abandonar members.leave.detail=¿Irse de %s? members.invite_desc=Añadir un miembro nuevo a %s: members.invite_now=Invitar - teams.join=Unirse teams.leave=Abandonar teams.leave.detail=¿Irse de %s? @@ -2438,6 +2346,7 @@ teams.all_repositories_admin_permission_desc=Este equipo concede a Admin teams.invite.title=Has sido invitado a unirte al equipo %s en la organización %s. teams.invite.by=Invitado por %s teams.invite.description=Por favor, haga clic en el botón de abajo para unirse al equipo. +members=Miembros [admin] dashboard=Panel de control @@ -2453,7 +2362,6 @@ monitor=Monitorización first_page=Primera last_page=Última total=Total: %d - dashboard.new_version_hint=Gitea %s ya está disponible; en este momento ejecuta la versión %s. Consulte el blog para conocer más. dashboard.statistic=Resumen dashboard.operations=Operaciones de mantenimiento @@ -2531,7 +2439,6 @@ dashboard.delete_old_actions=Eliminar todas las acciones antiguas de la base de dashboard.delete_old_actions.started=Eliminar todas las acciones antiguas de la base de datos inicializada. dashboard.update_checker=Buscador de actualizaciones dashboard.delete_old_system_notices=Borrar todos los avisos antiguos del sistema de la base de datos - users.user_manage_panel=Gestión de cuentas de usuario users.new_account=Crear Cuenta de Usuario users.name=Nombre de usuario @@ -2585,7 +2492,6 @@ users.list_status_filter.is_prohibit_login=Prohibido el inicio de sesión users.list_status_filter.not_prohibit_login=Permitir el inicio de sesión users.list_status_filter.is_2fa_enabled=2FA habilitado users.list_status_filter.not_2fa_enabled=2FA deshabilitado - emails.email_manage_panel=Gestion de Correo del Usuario emails.primary=Principal emails.activated=Activado @@ -2598,13 +2504,11 @@ emails.not_updated=Error al actualizar la dirección de correo electrónico soli emails.duplicate_active=Esta dirección de correo está asignada a un usuario diferente. emails.change_email_header=Actualizar Propiedades de Correo emails.change_email_text=¿Realmente quiere actualizar esta dirección de correo electrónico? - orgs.org_manage_panel=Gestión de organizaciones orgs.name=Nombre orgs.teams=Equipos orgs.members=Miembros orgs.new_orga=Nueva organización - repos.repo_manage_panel=Gestión de repositorios repos.unadopted=Repositorios no adoptados repos.unadopted.no_more=No se encontraron más repositorios no adoptados @@ -2616,7 +2520,6 @@ repos.stars=Estrellas repos.forks=Forks repos.issues=Incidencias repos.size=Tamaño - packages.package_manage_panel=Gestión de paquetes packages.total_size=Tamaño total: %s packages.owner=Propietario @@ -2627,17 +2530,14 @@ packages.type=Tipo packages.repository=Repositorio packages.size=Tamaño packages.published=Publicado - defaulthooks=Webhooks por defecto defaulthooks.desc=Los Webhooks automáticamente hacen peticiones HTTP POST a un servidor cuando ciertos eventos de Gitea se activan. Los ganchos definidos aquí son predeterminados y serán copiados en todos los nuevos repositorios. Leer más en la guía webhooks. defaulthooks.add_webhook=Añadir Webhook por defecto defaulthooks.update_webhook=Actualizar Webhook por defecto - systemhooks=Webhooks del sistema systemhooks.desc=Los webhooks automáticamente hacen peticiones HTTP POST a un servidor cuando ciertos eventos de Gitea se activan. Los webhooks definidos actuarán en todos los repositorios del sistema, así que por favor considere las implicaciones de rendimiento que esto pueda tener. Lea más en la guía de webhooks. systemhooks.add_webhook=Añadir Webhook del Sistema systemhooks.update_webhook=Actualizar Webhook del Sistema - auths.auth_manage_panel=Gestión de origen de autenticación auths.new=Añadir origen de autenticación auths.name=Nombre @@ -2752,7 +2652,6 @@ auths.still_in_used=El orígen de autenticación todavía está en uso. Conviert auths.deletion_success=El origen de autenticación ha sido eliminado. auths.login_source_exist=El origen de autenticación '%s' ya existe. auths.login_source_of_type_exist=Ya existe un origen de autenticación de este tipo. - config.server_config=Configuración del servidor config.app_name=Título del sitio config.app_ver=Versión de Gitea @@ -2771,7 +2670,6 @@ config.static_file_root_path=Ruta de los Ficheros Estáticos config.log_file_root_path=Ruta de ficheros de registro config.script_type=Tipo de Script config.reverse_auth_user=Autenticación Inversa de Usuario - config.ssh_config=Configuración SSH config.ssh_enabled=Habilitado config.ssh_start_builtin_server=Utilizar servidor integrado @@ -2783,12 +2681,10 @@ config.ssh_key_test_path=Ruta de la clave de prueba config.ssh_keygen_path=Ruta del generador de claves ('ssh-keygen') config.ssh_minimum_key_size_check=Tamaño mínimo de la clave de verificación config.ssh_minimum_key_sizes=Tamaños de clave mínimos - config.lfs_config=Configuración LFS config.lfs_enabled=Habilitado config.lfs_content_path=Ruta de contenido LFS config.lfs_http_auth_expiry=Caducidad de la autentificación HTTP LFS - config.db_config=Configuración de la Base de Datos config.db_type=Tipo config.db_host=Host @@ -2797,7 +2693,6 @@ config.db_user=Nombre de usuario config.db_schema=Esquema config.db_ssl_mode=SSL config.db_path=Ruta - config.service_config=Configuración del servicio config.register_email_confirm=Requerir confirmación de correo electrónico para registrarse config.disable_register=Deshabilitar auto-registro @@ -2820,12 +2715,10 @@ config.default_allow_only_contributors_to_track_time=Deje que solo los colaborad config.no_reply_address=Dominio de correos electrónicos ocultos config.default_visibility_organization=Visibilidad por defecto para nuevas organizaciones config.default_enable_dependencies=Habilitar dependencias de incidencias por defecto - config.webhook_config=Configuración de Webhooks config.queue_length=Tamaño de Cola de Envío config.deliver_timeout=Timeout de Entrega config.skip_tls_verify=Saltar verificación TLS - config.mailer_config=Configuración del servidor de correo config.mailer_enabled=Activado config.mailer_enable_helo=Habilitar HELO @@ -2843,16 +2736,13 @@ config.test_email_placeholder=Correo electrónico (ej. test@ejemplo.com) config.send_test_mail=Enviar prueba de correo config.test_mail_failed=Fallo al enviar correo electrónico de prueba a '%s': %v config.test_mail_sent=Se ha enviado un correo electrónico de prueba a '%s'. - config.oauth_config=Configuración OAuth config.oauth_enabled=Activado - config.cache_config=Configuración de la Caché config.cache_adapter=Adaptador de la Caché config.cache_interval=Intervalo de la Caché config.cache_conn=Conexión de la Caché config.cache_item_ttl=Período de vida para elementos de caché - config.session_config=Configuración de la Sesión config.session_provider=Proveedor de la Sesión config.provider_config=Configuración del Proveedor @@ -2861,12 +2751,10 @@ config.gc_interval_time=Intervalo de tiempo del GC config.session_life_time=Tiempo de Vida de la Sesión config.https_only=Sólo HTTPS config.cookie_life_time=Tiempo de Vida de la Cookie - config.picture_config=Configuración de imagen y avatar config.picture_service=Servicio de Imágen config.disable_gravatar=Desactivar Gravatar config.enable_federated_avatar=Habilitar Avatares Federados - config.git_config=Configuración de Git config.git_disable_diff_highlight=Desactivar resaltado de sintaxis del Diff config.git_max_diff_lines=Líneas de Diff máximas (por un solo archivo) @@ -2878,7 +2766,6 @@ config.git_mirror_timeout=Tiempo de espera de actualización de réplicas config.git_clone_timeout=Tiempo de espera de operación de clones config.git_pull_timeout=Tiempo de espera de operación de pull config.git_gc_timeout=Tiempo de espera de operación de GC - config.log_config=Configuración del Log config.log_mode=Modo del Log config.own_named_logger=Registro Nombrado @@ -2890,10 +2777,8 @@ config.access_log_mode=Modo de registro del Acceso config.access_log_template=Plantilla config.xorm_log_mode=Modo de registro XORM config.xorm_log_sql=Registrar SQL - config.get_setting_failed=Error al obtener la configuración %s config.set_setting_failed=Error al configurar %s - monitor.cron=Tareas de Cron monitor.name=Nombre monitor.schedule=Agenda @@ -2945,7 +2830,6 @@ monitor.queue.pool.pause.submit=Pausar cola monitor.queue.pool.resume.title=Reanudar cola monitor.queue.pool.resume.desc=Establecer esta cola para reanudar el trabajo monitor.queue.pool.resume.submit=Reanudar cola - monitor.queue.settings.title=Ajustes del grupo monitor.queue.settings.desc=Los grupos de trabajadores se crean dinámicamente como un impulso en respuesta al bloqueo de la cola de sus trabajadores. Estos cambios no afectarán a los grupos de trabajadores actuales. monitor.queue.settings.timeout=Aumentar tiempo de espera @@ -2961,7 +2845,6 @@ monitor.queue.settings.submit=Actualizar ajustes monitor.queue.settings.changed=Ajustes actualizados monitor.queue.settings.blocktimeout=Tiempo de espera actual monitor.queue.settings.blocktimeout.value=%[1]v - monitor.queue.pool.none=Esta cola no tiene ningún grupo monitor.queue.pool.added=Añadido de grupo de trabajadores monitor.queue.pool.max_changed=El número máximo de trabajadores ha cambiado @@ -2971,7 +2854,6 @@ monitor.queue.pool.cancel=Apagar grupo de trabajadores monitor.queue.pool.cancelling=Apagando grupo de trabajadores monitor.queue.pool.cancel_notices=¿Apagar este grupo de %s trabajadores? monitor.queue.pool.cancel_desc=Dejar una cola sin ningún grupo de trabajadores puede provocar que las solicitudes se bloqueen indefinidamente. - notices.system_notice_list=Notificaciones del Sistema notices.view_detail_header=Ver detalles de notificación notices.actions=Acciones @@ -2991,15 +2873,15 @@ notices.delete_success=Los avisos del sistema se han eliminado. create_repo=creó el repositorio %s rename_repo=repositorio renombrado de %[1]s a %[3]s commit_repo=hizo push a %[3]s en %[4]s -create_issue=`abrió la incidencia %[3]s#%[2]s` -close_issue=`cerró la incidencia %[3]s#%[2]s` -reopen_issue=`reabrió la incidencia %[3]s#%[2]s` -create_pull_request=`creó el pull request %[3]s#%[2]s` -close_pull_request=`cerró el pull request %[3]s#%[2]s` -reopen_pull_request=`reabrió el pull request %[3]s#%[2]s` -comment_issue=`comentó en la incidencia %[3]s#%[2]s` -comment_pull=`comentó en el pull request %[3]s#%[2]s` -merge_pull_request=`fusionó el pull request %[3]s#%[2]s` +create_issue=abrió la incidencia %[3]s#%[2]s +close_issue=cerró la incidencia %[3]s#%[2]s +reopen_issue=reabrió la incidencia %[3]s#%[2]s +create_pull_request=creó el pull request %[3]s#%[2]s +close_pull_request=cerró el pull request %[3]s#%[2]s +reopen_pull_request=reabrió el pull request %[3]s#%[2]s +comment_issue=comentó en la incidencia %[3]s#%[2]s +comment_pull=comentó en el pull request %[3]s#%[2]s +merge_pull_request=fusionó el pull request %[3]s#%[2]s transfer_repo=transfirió el repositorio %s a %s push_tag=hizó push la etiqueta %[3]s a %[4]s delete_tag=etiqueta eliminada %[2]s de %[3]s @@ -3010,14 +2892,15 @@ compare_commits_general=Comparar commits mirror_sync_push=sincronizó cambios a %[3]s en %[4]s desde réplica mirror_sync_create=sincronizó la nueva referencia %[3]s a %[4]s de réplica mirror_sync_delete=sincronizada y eliminada referencia %[2]s en %[3]s desde réplica -approve_pull_request=`aprobó %[3]s#%[2]s` -reject_pull_request=`sugirió cambios para %[3]s#%[2]s` -publish_release=`se lanzó "%[4]s" en %[3]s` -review_dismissed=`descartó la revisión de %[4]s para %[3]s#%[2]s` +approve_pull_request=aprobó %[3]s#%[2]s +reject_pull_request=sugirió cambios para %[3]s#%[2]s +publish_release=se lanzó "%[4]s" en %[3]s +review_dismissed=descartó la revisión de %[4]s para %[3]s#%[2]s review_dismissed_reason=Motivo: create_branch=creó rama %[3]s en %[4]s starred_repo=destacó %[2]s watched_repo=comenzó a seguir %[2]s +auto_merge_pull_request=fusionado automáticamente pull request %[3]s#%[2]s [tool] ago=hace %s @@ -3176,4 +3059,23 @@ settings.delete.description=La eliminación de un paquete es permanente y no se settings.delete.notice=Está a punto de eliminar %s (%s). Esta operación es irreversible, ¿está seguro? settings.delete.success=Se ha eliminado el paquete. settings.delete.error=No se pudo eliminar el paquete. - +chef.install=Para instalar el paquete, ejecute el siguiente comando: +owner.settings.cleanuprules.enabled=Activo + +[aria] + +[secrets] +value=Valor +name=Nombre + +[actions] +runners.id=Id. +runners.name=Nombre +runners.owner_type=Tipo +runners.description=Descripción +runners.labels=Etiquetas +runners.task_list.run=Ejecutar +runners.task_list.repository=Repositorio +runners.task_list.commit=Commit +runners.status.active=Activo +runs.commit=Commit diff --git a/options/locale/locale_fa-IR.ini b/options/locale/locale_fa-IR.ini index a1e20b61dc9e..ef4e1e0e01b3 100644 --- a/options/locale/locale_fa-IR.ini +++ b/options/locale/locale_fa-IR.ini @@ -22,7 +22,6 @@ enable_javascript=این وب‌سایت با جاوا اسکریپت بهتر toc=فهرست محتویات licenses=گواهینامه ها return_to_gitea=بازگشت به Gitea - username=نام کاربری email=آدرس ایمیل password=رمز عبور @@ -32,8 +31,6 @@ captcha=کپچا twofa=احراز هویت دوگانه twofa_scratch=کد احراز هویت passcode=رمز عبور - - repository=مخزن organization=سازمان mirror=قرینه @@ -51,18 +48,15 @@ settings=تنظيمات your_profile=نمایه your_starred=ستاره‌دار your_settings=تنظيمات - all=همه sources=منابع mirrors=قرینه‌ها collaborative=همکاری forks=انشعاب‌ها - activities=فعالیت‌ها pull_requests=درخواست ادغام issues=مسائل milestones=نقاط عطف - ok=باشه cancel=انصراف save=ذخیره @@ -71,25 +65,21 @@ add_all=افزودن همه remove=حذف remove_all=حذف همه edit=ویرایش - copy=کپی copy_url=کپی URL copy_branch=کپی نام شاخه copy_success=کپی شد! copy_error=کپی ناموفق - write=نوشتن preview=پیش نمایش loading=بارگذاری… - step1=مرحله ۱: step2=مرحله ۲: - error=خطا error404=صفحه موردنظر شما یا وجود ندارد یا شما دسترسی کافی برای مشاهده آن را ندارید. - never=هرگز - +enabled=فعال شده +disabled=غیرفعال شده [filter] @@ -136,7 +126,6 @@ err_empty_admin_email=رایانامه (ایمیل) مدیر نمی تواند err_admin_name_is_reserved=نام کاربری مدیر اشتباه است. نام کاربری قبلا استفاده شده است err_admin_name_pattern_not_allowed=نام کاربری مدیر اشتباه است. نام کاربری قبلا استفاده شده است err_admin_name_is_invalid=نام کابری مدیر اشتباه است - general_title=تنظیمات عمومی app_name=عنوان سایت app_name_helper=شما می توانید نام شرکت خود را در اینجا وارد کنید. @@ -156,7 +145,6 @@ app_url=آدرس پایه گیتی app_url_helper=آدرس پایه برای URLهای اجماع HTTP(S) و هشدار های رایانامه (ایمیل). log_root_path=مسیر گزارش‌ها log_root_path_helper=فایل‌های گزارش روی این مسیر ذخیره خواهند شد. - optional_title=تنظیمات اختیاری email_title=تنظیمات ایمیل smtp_from=ارسال ایمیل به عنوان @@ -212,7 +200,9 @@ default_enable_timetracking_popup=فعالسازی پیگیری زمان برا no_reply_address=مخفی کردن دامنه ایمیل no_reply_address_helper=نام دامنه برای کاربران دارای آدرس ایمیل پنهان است. به عنوان مثال ، اگر نام دامنه ایمیل مخفی روی "noreply.example.org" تنظیم شده باشد ، نام کاربری "joe" در Git به عنوان "joe@noreply.example.org" وارد می شود password_algorithm=الگوریتم درهم‌ساز گذرواژه -password_algorithm_helper=تعیین الگوریتم درهم‌ساز گذرواژه. الگوریتم‌های مختلف نیازمندی‌های و قوت‌های متفاوتی دارند. `argon2` علی‌رغم خصوصیات خوبی که دارد مصرف حافظه بالایی دارد و ممکن است مناسب سیستم‌های کوچک نباشد. +password_algorithm_helper="""تعیین الگوریتم درهم‌ساز گذرواژه. الگوریتم‌های مختلف نیازمندی‌های و قوت‌های متفاوتی دارند. `argon2` علی‌رغم خصوصیات خوبی که دارد مصرف حافظه بالایی دارد و ممکن است مناسب سیستم‌های کوچک نباشد.""" +smtp_addr=میزبان SMTP +smtp_port=گذرگاه(پورت) SMTP [home] uname_holder=نام کاربری یا نشانی ایمیل @@ -228,17 +218,14 @@ search_repos=یافتن مخزن… filter=فیلترهای دیگر filter_by_team_repositories=فیلتر کردن با مخازن تیم‌ها feed_of=خوراک از "%s" - show_archived=بایگانی شده show_both_archived_unarchived=نمایش دادن موارد بایگانی شده و غیر بایگانی نشده show_only_archived=نمایش دادن موارد بایگانی شده show_only_unarchived=نمایش دادن موارد بایگانی نشده - show_private=خصوصی show_both_private_public=نماش دادن موارد عمومی و خصوصی show_only_private=نماش دادن موارد خصوصی show_only_public=نمایش دادن موارد عمومی - issues.in_your_repos=در مخازن شما [explore] @@ -256,7 +243,6 @@ code_no_results=کد منبعی مطابق با جستجوی شما یافت ن code_search_results=نتایج جستجو برای '%s ' code_last_indexed_at=آخرین به روزرسانی در %s - [auth] create_new_account=نام‌نویسی حساب کاربری register_helper_msg=قبلا ثبت نام کردید؟ از اینجا وارد شوید! @@ -325,31 +311,24 @@ password_pwned_err=برقراری ارتباط با HaveIBeenPwend ممکن نی view_it_on=در %s مشاهده کنید link_not_working_do_paste=کار نمی‌کنی؟ کپی کردن و چسباندن در مرورگرتان را امتحان کنید. hi_user_x=سلام %s - activate_account=لطفا حساب خود را فعال کنید activate_account.title=%s، لطفاً حساب خود را فعال کنید activate_account.text_1=سلام %[1]s، ممنون به‌خاطر عضویت در %[2]s! activate_account.text_2=لطفاً روی پیوند زیر کلیک کنید تا حساب خود را در %s فعال کنید: - activate_email=نشانی ایمیل خود را تایید کنید activate_email.title=%s، لطفاً رایانامه‌ی خود را تأیید کنید activate_email.text=لطفاً روی پیوند زیر کلیک کنید تا رایانامه‌ی خود را در %s تأیید کنید: - register_notify=به گیتی یا گیت‌گو خوش آمدید register_notify.title=%[1]s، به %[2]s خوش‌آمدید register_notify.text_1=این رایانامه‌ی تأیید عضویت شما در %s است! register_notify.text_2=حالا شما می‌توانید با نام کاربری وارد شوید: %s. register_notify.text_3=اگر این حساب برای شما ایجاد شده، لطفاً ابتدا گذرواژه‌ی خود را تنظیم کنید. - reset_password=حساب خود را دوباره فعال کنید reset_password.title=%s، شما برای بازیابی حسابتان درخواست کرده‌اید reset_password.text=لطفاً روی پیوند زیر کلیک کنید تا حساب خود را در %s بازیابی کنید: - register_success=ثبت‌نام با موفقیت انجام شد - issue_assigned.pull=@%[1] به شما برای درخواست pull %[2] در ریپازیتوری %[3] محول شده. issue_assigned.issue=@%[1]s به شما واگذار شده است برای صدور %[2]s در انبار %[3]s. - issue.x_mentioned_you=@%s به شما اشاره کرد: issue.action.force_push=%[1]s مجبور به پوش شدن %[2]s از %[3]s به %[4]s. issue.action.push_1=@%[1]s پوش شده %[3]d سپرده شد به %[2]s @@ -364,7 +343,6 @@ issue.action.review_dismissed=@%[1]s آخرین بررسی را رد کر issue.action.ready_for_review=@%[1]s این درخواست pull علامت زده شد برای بازنگری. issue.action.new=@%[1]s ساخته شد #%[2]d. issue.in_tree_path=در %s: - release.new.subject=%s در %s منتشر شده است release.new.text=@%[1]s منتشر شد %[2]s در %[3]s release.title=عنوان: %s @@ -372,16 +350,13 @@ release.note=توجه: 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.to_you=شما repo.transfer.body=برای تایید یا رد آن %s را ببینید یا فقط بیخیالش شوید. - repo.collaborator.added.subject=%s شما را به پروژه %s اضافه کرد repo.collaborator.added.text=شما به عنوان مشارکت‌کننده در این مخزن اضافه شدید: - [modal] yes=بله no=خیر @@ -399,33 +374,29 @@ PayloadUrl=نشانی Payload TeamName=نام تیم AuthName=نام احراز هویت AdminEmail=ایمیل مدیر - NewBranchName=نام شاخه‌ی جدید CommitSummary=خلاصه ی کامیت CommitMessage=پیام کامیت CommitChoice=انتخاب کامیت TreeName=مسیر پرونده Content=محتوا - SSPISeparatorReplacement=جدا کننده SSPIDefaultLanguage=زبان پیش فرض - -require_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=` ساختار نشانی ایمیل صحیح نیست.` -include_error=` باید شامل '%s' باشد.` -glob_pattern_error=`الگوی قطره‌ای (glob) نامعتبر است: %s.` +size_error=" باید به اندازه %s باشد." +min_size_error=" حداقل باید شامل %s کاراکتر باشد." +max_size_error=" حداکثر باید شامل %s کاراکتر باشد." +email_error=" ساختار نشانی ایمیل صحیح نیست." +include_error=" باید شامل '%s' باشد." +glob_pattern_error=الگوی قطره‌ای (glob) نامعتبر است: %s. regex_pattern_error=الگو عبارت باقاعده نامعتبر است: %s unknown_error=خطای ناشناخته: captcha_incorrect=کد امنیتی اشتباه است. password_not_match=گذرواژه‌ها باید یکسان باشند. lang_select_error=انتخاب یک زبان از فهرست. - username_been_taken=این نام کاربری قبلا ثبت شده است. username_change_not_local_user=کاربران غیر بومی مجاز به تغییر نام‌کاربری نیستند. repo_name_been_taken=نام مخزن قبلا ثبت شده است. @@ -455,17 +426,14 @@ user_not_exist=کاربر وجود ندارد. team_not_exist=تیم وجود ندارد. last_org_owner=شما نمی‌توانید تنها کاربر را از تیم "صاحبان" حذف کنید. حداقل یک صاحب باید در یک سازمان وجود داشته باشد. cannot_add_org_to_team=یک سازمان را نمی توان به عنوان عضو تیم اضافه کرد. - invalid_ssh_key=کلید SSH شما تأیید نشد: %s invalid_gpg_key=کلید GPG شما تأیید نشد: %s invalid_ssh_principal=تطبیق نامعتبر: %s unable_verify_ssh_key=کلید SSH شما تأیید نشد. مجددا بررسی کنید. auth_failed=تشخیص هویت ناموفق: %v - still_own_repo=حساب شما یک یا چند مخزن دارد، ابتدا آنها را حذف یا انتقال دهید. still_has_org=حساب شما عضو یک یا چند سازمان است. ابتدا آنها ترک کنید. org_still_own_repo=این سازمان در حال حاضر مالک برخی مخازن است، شما ابتدا باید آن ها را حذف یا منتقل کنید. - target_branch_not_exist=شاخه مورد نظر وجود ندارد. [user] @@ -483,7 +451,6 @@ unfollow=عدم دنبال کردن heatmap.loading=بارگذاری Heatmap… user_bio=زندگی‌نامه disabled_public_activity=این کاربر نمایش عمومی فعالیت های خود را غیرفعال کرده است. - form.name_reserved=نام کاربری "%s" استفاده شده است. form.name_pattern_not_allowed=الگوی %s در نام کاربری مجاز نیست. form.name_chars_not_allowed=نام کاربری %s حاوی کاراکترهای نامعتبر است. @@ -505,7 +472,6 @@ twofa=احراز هویت دوگانه account_link=حساب‌های مرتبط organization=سازمان ها uid=Uid - public_profile=نمایه عمومی biography_placeholder=یک توضیح کوتاه درباره خودتان بنویسید profile_desc=نشانی ایمیل شما برای آگاه سازی و دیگر عملیات مورد استفاده قرار می‌گیرد. @@ -529,7 +495,6 @@ ui=پوسته privacy=حریم خصوصی keep_activity_private=مخفی ساختن فعالیت ها از صفحه پروفایل keep_activity_private_popup=نمایان ساختن فعالیت ها برای شما و مدیران - lookup_avatar_by_mail=جست و جو آواتار توسط نشانی ایمیل federated_avatar_lookup=جستجو برای آواتار مشترک enable_custom_avatar=استفاده از آواتار دلخواه @@ -540,7 +505,6 @@ uploaded_avatar_not_a_image=فایل بار‌گذاری شده تصویر نم uploaded_avatar_is_too_big=حجم فایل بارگزاری بیش از حد مجاز است. update_avatar_success=آواتار شما تغییر کرد. update_user_avatar_success=آواتار کاربر بروز رسانی شده است. - change_password=تغییر گذرواژه old_password=گذارواژه فعلی new_password=گذرواژه جدید @@ -548,7 +512,6 @@ retype_new_password=گذرواژه جدید را دوباره وارد کنید password_incorrect=گذرواژه فعلی شما اشتباه است. change_password_success=گذرواژه شما تغییر کرد. از این پس با گذرواژه جدید خود وارد شوید. password_change_disabled=کاربران غیر محلی نمیتوانند گذرواژه خود را از طریق واسط وب گیتی به روز کنند. - emails=نشانی‌های ایمیل manage_emails=مدیریت نشانی‌های ایمیل manage_themes=تم پیش فرض را انتخاب کنید @@ -581,7 +544,6 @@ add_openid_success=نشانی OpenID اضافه شد. keep_email_private=مخفی کردن نشانی ایمیل keep_email_private_popup=نشانی ایمیل شما به کاربران دیگر نمایش داده نمی‌شود. openid_desc=OpenID به شما امکان می دهد احراز هویت را به یک ارائه دهنده خارجی واگذار کنید. - manage_ssh_keys=مدیریت کلیدهای اس‌اس‌اچ manage_ssh_principals=گواهی‌های SSH اصلی را مدیریت کنید manage_gpg_keys=مدیریت کلید GPG @@ -590,8 +552,6 @@ ssh_desc=این کلیدهای عمومی SSH با حساب شما در ارتب principal_desc=این گواهی‌های SSH اصلی برای حساب کاربری شما تعریف شده و به مخزن‌های‌تان دسترسی کامل دارد. gpg_desc=این کلید های عمومی GPG به حساب کاربری شما مرتبط مرتبط است. کلید خصوصی خود را محرمانه نگهدارید لذا با آن امکان ارسال commit تایید شده است. ssh_helper="آیا نمی دانید چگونه؟ - راهنمایی Github را برای ساخت کلید SSH برای خود ببینید -یا ممکن است با راه حل استفاده از SSH در مشکلات متداول مواجه شوید." gpg_helper=به کمک نیاز دارید؟ نگاهی به در GitHub را راهنمای مورد GPG است. add_new_key=اضافه کردن کلید SSH add_new_gpg_key=اضافه کردن کلید GPG @@ -651,7 +611,6 @@ manage_social=مدیریت حساب های اجتماعی مرتبط social_desc=تمامی شبکه های اجتماعی که به حساب کاربری شما متصل است. مطمئن شوید که با تمامی آنها می‎توانید به صورت ایمن وارد شوید. unbind=لغو ارتباط unbind_success=حساب کاربری اجتماعی از حساب کابری شما جدا شد. - manage_access_token=مدیریت توکن های دسترسی generate_new_token=تولید توکن جدید tokens_desc=این token قابلیت دسترسی به اکانت شما را توسط API میدهد. @@ -663,11 +622,10 @@ generate_token_name_duplicate=%s قبلا بعنوان نام delete_token=حذف access_token_deletion=حذف توکن delete_token_success=token مورد نظر حذف شد. برنامه هایی که از آن استفاده می‎کنند به زودی دسترسی به حساب کاربری شما را از دست می‎دهند. - -manage_oauth2_applications=مدیریت برنامه‎های OAuth2 -edit_oauth2_application=ویرایش برنامه OAuth2 +manage_oauth2_applications=مدیریت برنامه‎های OAuth2 +edit_oauth2_application=ویرایش برنامه OAuth2 oauth2_applications_desc=برنامه‎های OAuth2 احراز هویت برنامه های شخص ثالث را با بستری امن میسر می‎کند. -remove_oauth2_application=حذف برنامه OAuth2 +remove_oauth2_application=حذف برنامه OAuth2 remove_oauth2_application_desc=حذف برنامه OAuth2 دسترسی تمام برنامه های متصل با آن را از بین می‎برد. آیا ادامه می‎دهید؟ remove_oauth2_application_success=برنامه حذف شده است. create_oauth2_application=ساختن یک برنامه OAuth2 جدید @@ -685,15 +643,12 @@ oauth2_client_secret_hint=اگر این صفحه را مشاهده کنید کل oauth2_application_edit=ويرايش oauth2_application_create_description=برنامه‎های OAuth2 این امکان را به برنامه‎های شخص ثالث می‎دهد یک نمونه از دسترسی به حساب کاربری شما داشته باشد. oauth2_application_remove_description=حذف برنامه OAuth2 دسترسی حساب هایی که با آن فعال است را مختل می‎کند. آیا ادامه می‎دهید؟ - authorized_oauth2_applications=برنامه OAuth2 تایید شد authorized_oauth2_applications_description=این به برنامه های شخص ثالث به حساب Gitea شخصی خود دسترسی پیدا کرده. لطفاً دسترسی به برنامه های دیگر مورد نیاز را لغو کنید. revoke_key=ابطال revoke_oauth2_grant=ابطال دسترسی revoke_oauth2_grant_description=لغو دسترسی برای این برنامه شخص ثالث از دسترسی این برنامه به داده های شما جلوگیری می کند. شما مطمئن هستید؟ - revoke_oauth2_grant_success=شما اجازه دسترسی را لغو کردید. - twofa_desc=احراز هویت دو مرحله ای امنیت حساب شما را افزایش میدهد. twofa_is_enrolled=احراز هویت دو مرحله ای برای حساب شما اجرامیشود. twofa_not_enrolled=حساب کاربری شما اکنون احراز هویت دو مرحله ای ندارد. @@ -711,30 +666,24 @@ then_enter_passcode=و کد ورود نمایش داده شده در درخوا passcode_invalid=کد ورود نامعتبر است. مجددا تلاش نمایید. twofa_enrolled=ورود به حسابت کاربری دو مرحله ای فعال شد. لطفا token خود را (%s) نگهداری کنید. لذا فقط یک بار نمایش داده می‌شود! twofa_failed_get_secret=خطا در دریافت رمز. - - manage_account_links=مدیریت حساب های مرتبط شده manage_account_links_desc=این حساب های خارجی به حساب Gitea ارتباط دارد. account_links_not_available=اکنون دیگر هیچ پیوند حساب‌های کاربری خارجی به حساب کاربری شما وجود ندارد. remove_account_link=حذف حساب پیوند خرده remove_account_link_desc=با حذف پیوند خارجی حساب کاربری دسترسی شما به حساب کابریتان توسط آن از بین میرود. آیا ادامه می‌دهید؟ remove_account_link_success=پیوند حساب کاربری از حذف شد. - orgs_none=شما عضو هیچ سازمانی نیستید. repos_none=شما مالک هیچ مخزنی نیستید - delete_account=حذف حساب کاربری delete_prompt=این عملیات به‎طور کامل حساب کاربری شما و محتوای آن را حذف می‎کند و غیرقابل‎بازگشت می‎باشد. delete_with_all_comments=حساب جوانتر از %s است. برای پیشگیری از یادداشت روح همه کامنت‌های مسأله‌ها و PRها، همراهش حذف خواهد شد. confirm_delete_account=تاییدیه حذف delete_account_title=حذف حساب کاربری delete_account_desc=آیا شما مطمئن هستید که می‎خواهیدحساب کاربری خود را حذف کنید؟ - email_notifications.enable=فعال‌سازی اعلان‌های ایمیل email_notifications.onmention=فقط یادآوری توسط ایمیل email_notifications.disable=غیرفعال‌ کردن اعلان‌های ایمیل email_notifications.submit=ثبت اولویت ایمیل - visibility=پدیداری کاربر visibility.public=عمومی visibility.public_tooltip=پدیدار برای همه‌ی کاربران @@ -742,6 +691,15 @@ visibility.limited=محدود شده visibility.limited_tooltip=پدیدار فقط برای کاربران وارد شده visibility.private=خصوصی visibility.private_tooltip=پیدیدار فقط برای کابران عضو سازمان +comment_type_group_title=عنوان +ssh_key_verified=کلید تأیید شده +ssh_key_verify=تایید‌کنید +ssh_token_required=باید یک امضا برای ژتون زیر ارائه کنید +ssh_token=توکن +ssh_token_help=با این میتوانید یک امضاء بسازید: +access_token_deletion_cancel_action=انصراف +access_token_deletion_confirm_action=حذف +link_account=پیوند به حساب [repo] new_repo_helper=یک مخزن شامل تمام فایل های پروژه، از جمله سابقه بازبینی است. قبلا جای دیگه‌ای داری؟ انتقال مخزن @@ -824,14 +782,12 @@ delete_preexisting=حذف فایلهایی که قبلا موجود بود delete_preexisting_content=حذف فایلهای موجود در %s delete_preexisting_success=فایل های تصویب نشده پاک شده در %s blame_prior=قبل از این تغییر، سرزنش را مشاهده کنید - transfer.accept=تایید انتقال transfer.accept_desc=انتقال به %s transfer.reject=رد انتقال transfer.reject_desc=رد انتقال به %s transfer.no_permission_to_accept=شما اجازه «قبول کردن» ندارید transfer.no_permission_to_reject=شما اجازه «رد کردن» ندارید - desc.private=خصوصی desc.public=عمومی desc.private_template=قالب خصوصی @@ -839,7 +795,6 @@ desc.public_template=قالب desc.internal=داخلی desc.internal_template=قالب داخلی desc.archived=بایگانی شده - template.items=موارد الگو template.git_content=محتوای گیت (شاخه پیش فرض) template.git_hooks=قلاب های گیت @@ -849,16 +804,13 @@ template.avatar=آواتار template.issue_labels=برچسب‌های مسئله template.one_item=شما بایستی حداقل یک الگو را انتخاب کنید template.invalid=شما بایستی یک الگو مخزن را انتخاب کنید - archive.title=این مخزن بایگانی شد. شما می توانید فایل های آن را مشاهده کنید یا از رونوشت تهیه کنید. اما دیگر نمی‌توانید آن را به‌روزسانی کنید و یا برای آن مسئله یا تقاضای واکشی ایجاد کنید. archive.issue.nocomment=این مخزن بایگانی شده است. شما نمی‎توانید در مورد مسائل اظهار نظر کنید. archive.pull.nocomment=این مخزن بایگانی شده. شما نمی توانید دیدگاهی بر روی این تقاضای واکشی ارسال کنید. - form.reach_limit_of_creation_1=شما قبلاً به بیشینه مخزن - %d - رسیده‎‌اید. form.reach_limit_of_creation_n=شما قبلا به بیشینه مخزن‌ها - %d - رسیده‌اید. form.name_reserved=یک مخزن با نام '%s' از قبل وجود دارد. form.name_pattern_not_allowed=الگوی %s در نام مخزن مجاز نیست. - need_auth=دسترسی migrate_options=تنظیمات مهاجرت migrate_service=سرویس مهاجرت @@ -882,7 +834,7 @@ migrate.clone_local_path=یا مسیر سرویس دهنده محلی migrate.permission_denied=شما مجاز به واردات مخازن محلی نیستید. migrate.permission_denied_blocked=نمی‌توانید از میزبان‌های غیرمجاز وارد کنید، لطفاً از سرپرست بخواهید تنظیمات ALLOWED_DOMAINS / ALLOW_LOCALNETWORKS / BLOCKED_DOMAINS را بررسی کند. migrate.invalid_local_path=مسیر محلی نامعتبر است. وجود ندارد یا یک پوشه نیست. -migrate.invalid_lfs_endpoint=نقطه پایانی LFS معتبر نیست +migrate.invalid_lfs_endpoint=نقطه پایانی LFS معتبر نیست migrate.failed=انتقال انجام نشد: %v migrate.migrate_items_options=نشانی دسترسی برای مهاجرت موارد اضافی مورد نیاز است migrated_from=مهاجرت از %[2]s @@ -898,7 +850,7 @@ migrate.gitea.description=مهاجرت داده از gitea.com یا پیاده migrate.gogs.description=مهاجرت داده از notabug.com یا پیاده‌سازی‌های دیگر Gogs. migrate.onedev.description=مهاجرت داده از code.onedev.io یا پیاده‌سازی‌های دیگر OneDev. migrate.codebase.description=مهاجر داده ها از codebasehq.com. -migrate.gitbucket.description=مهاجرت داده از نمونه های GitBucket +migrate.gitbucket.description=مهاجرت داده از نمونه های GitBucket migrate.migrating_git=انتقال داده های Git migrate.migrating_topics=موضوعات مهاجرت migrate.migrating_milestones=نقاط عطف مهاجرت @@ -906,7 +858,6 @@ migrate.migrating_labels=برچسب های مهاجرت migrate.migrating_releases=انتشارات مهاجرت migrate.migrating_issues=مشکلات مهاجرت migrate.migrating_pulls=مهاجرت درخواست های pull - mirror_from=قرینه از forked_from=انشعاب شده از generated_from=ساخته شده از @@ -920,19 +871,17 @@ unstar=برداشتن ستاره star=ستاره دار کن fork=انشعاب download_archive=دانلود مخزن - no_desc=بدون توضیح quick_guide=راهنمای سریع clone_this_repo=همسان‌سازی این مخزن create_new_repo_command=ایجاد یک مخزن جدید در خط فرمان push_exist_repo=درج تغییرات مخزن موجود از خط فرمان empty_message=این مخزن هنوز هیچ محتوایی ندارد. - code=کد code.desc=دسترسی به کدهای منبع، فایل‎ها، کامیت های و شاخه ها. branch=شاخه tree=درخت -clear_ref=`حذف مرجع فعلی` +clear_ref=حذف مرجع فعلی filter_branch_and_tag=صافی شاخه یا برچسب find_tag=جستجوی تگ branches=شاخه‎ها @@ -943,7 +892,6 @@ project_board=پروژه‌ها labels=برچسب‌ها org_labels_desc=برچسب های سطح سازمان که می توانند برای تمامی مخازن ذیل این سازمان استفاده شوند org_labels_desc_manage=مدیریت - milestones=نقاط عطف commits=کامیت‌ها commit=کامیت @@ -951,7 +899,7 @@ release=نسخه منتشر شده releases=انتشارها tag=برچسب released_this=منتشر کرده است -file.title= %s در %s +file.title=%s در %s file_raw=خام file_history=تاریخچه file_view_source=نمایش منبع @@ -959,7 +907,6 @@ file_view_rendered=View ارائه شده file_view_raw=مشاهده خام file_permalink=پیوند همیشگی file_too_large=حجم این پرونده بیشتر از آن است که قابل نمایش باشد. - file_copy_permalink=پرمالینک را کپی کنید video_not_supported_in_browser=مرورگر شما از تگ video که در HTML5 تعریف شده است، پشتیبانی نمی کند. audio_not_supported_in_browser=مرورگر شما از تگ audio که در HTML5 تعریف شده است، پشتیبانی نمی کند. @@ -975,7 +922,6 @@ download_file=دانلود فایل normal_view=نمایش عادی line=خط lines=خطوط - editor.new_file=پرونده جدید editor.upload_file=بارگذاری پرونده editor.edit_file=ویرایش پرونده @@ -1032,7 +978,6 @@ editor.cannot_commit_to_protected_branch=شما نمی‌توانید برای editor.no_commit_to_branch=نمی‌توان به طور مستقیم درمورد شاخه نطر داد زیرا: editor.user_no_push_to_branch=کاربر نمیتواند به شاخه ارسال کند editor.require_signed_commit=شاخه یک کامیت امضا شده لازم دارد - commits.desc=تاریخچه تغییرات کد منبع را مرور کنید. commits.commits=کامیت‌ها commits.no_commits=هیچ کامیت مشترکی وجود ندارد. '%s' و '%s' دارای تاریجچه متفاوت هستند. @@ -1050,10 +995,7 @@ commits.signed_by=امضا شده توسط commits.signed_by_untrusted_user=امضا شده توسط یک کاربر غیرقابل اعتماد commits.signed_by_untrusted_user_unmatched=امضا شده توسط یک کاربر غیرقابل اعتماد که با اعمال کننده تغییرات مطابقت ندارد commits.gpg_key_id=شناسه کلید GPG - - ext_issues.desc=پیوند به ردیاب خارجی برای موضوع. - projects=پروژه‌ها projects.desc=مدیریت مشکلات و درخواست‌های درج در بورد پروژه. projects.description=توضیحات (دلخواه) @@ -1088,7 +1030,6 @@ projects.board.deletion_desc=حذف کردن تابلوی یک پروژه تما projects.board.color=رنگ projects.open=باز‌کردن projects.close=بستن - issues.desc=سازمان دهی گزارش باگ ها و وظایف و.... issues.filter_assignees=عامل فیلتر issues.filter_milestones=نقطه عطف فیلتر @@ -1139,25 +1080,23 @@ issues.add_labels=اضافه شده %s labels %s issues.remove_label=حذف شده %s labels %s issues.remove_labels=حذف شده %s labels %s issues.add_remove_labels=اضافه شد%s وبرداشته شد%s برچسب%s -issues.add_milestone_at=` %s را به نقطه عطف %s اضافه کرد ` -issues.add_project_at=` %s را به پروژه %s اضافه کرد ` -issues.change_milestone_at=`عنوان نقطه عطف از %s به %s %s تغییر کرد` -issues.change_project_at=`پروژه از %s به %s %s تغییر کرد` -issues.remove_milestone_at=` %s را از نقطه عطف %s حذف شد` -issues.remove_project_at=` %s را از پروژه %s حذف شد` -issues.deleted_milestone=`(حذف شده)` -issues.deleted_project=`(حذف شده)` -issues.self_assign_at=`این %s را خود اختصاص دهید -issues.add_assignee_at=`اختصاص داده شده توسط %s %s` -issues.remove_assignee_at=`جدا شده توسط %s %s` -issues.remove_self_assignment=`اینان جدا شدند: %s` +issues.add_milestone_at=" %s را به نقطه عطف %s اضافه کرد " +issues.add_project_at=" %s را به پروژه %s اضافه کرد " +issues.change_milestone_at=عنوان نقطه عطف از %s به %s %s تغییر کرد +issues.change_project_at=پروژه از %s به %s %s تغییر کرد +issues.remove_milestone_at=" %s را از نقطه عطف %s حذف شد" +issues.remove_project_at=" %s را از پروژه %s حذف شد" +issues.deleted_milestone=(حذف شده) +issues.deleted_project=(حذف شده) +issues.self_assign_at=این %s را خود اختصاص دهید +issues.remove_self_assignment=اینان جدا شدند: %s issues.change_title_at=تغییر عنوان از %s به %s%s -issues.change_ref_at=`تغییر مرجع از % s به % s % s` -issues.remove_ref_at=`مرجع حذف % s % s` -issues.add_ref_at=`مرجع اضافه شده % s % s` -issues.delete_branch_at=`حذف شاخه %s %s` +issues.change_ref_at=تغییر مرجع از % s به % s % s +issues.remove_ref_at=مرجع حذف % s % s +issues.add_ref_at=مرجع اضافه شده % s % s +issues.delete_branch_at=حذف شاخه %s %s issues.filter_label=برچسب -issues.filter_label_exclude=`ازalt + click/enter برای رد کردن برچسب‌ها استفاده کنید ` +issues.filter_label_exclude="ازalt + click/enter برای رد کردن برچسب‌ها استفاده کنید " issues.filter_label_no_select=تمامی برچسب‎ها issues.filter_milestone=نقطه عطف issues.filter_milestone_no_select=تمام نقاط عطف @@ -1196,7 +1135,7 @@ issues.next=بعدی issues.open_title=باز issues.closed_title=بسته شده issues.num_comments=%d دیدگاه -issues.commented_at=`دیدگاه ارسال شده %s` +issues.commented_at=دیدگاه ارسال شده %s issues.delete_comment_confirm=آیا مطمئن هستید که می خواهید این دیدگاه را حذف کنید؟ issues.context.copy_link=رونوشت پیوند issues.context.quote_reply=پاسخ نقل و قول @@ -1205,22 +1144,22 @@ issues.context.edit=ویرایش issues.context.delete=حذف issues.no_content=هنوز محتوایی ایجاد نشده. issues.close_issue=ببند -issues.pull_merged_at=`ادغام شده commit %[2]s در %[3]s %[4]s` -issues.manually_pull_merged_at=`ادغام شده commit %[2]s در %[3]s بصورت دستی %[4]s` +issues.pull_merged_at=ادغام شده commit %[2]s در %[3]s %[4]s +issues.manually_pull_merged_at=ادغام شده commit %[2]s در %[3]s بصورت دستی %[4]s issues.close_comment_issue=ثبت دیدگاه و بستن issues.reopen_issue=بازگشایی issues.reopen_comment_issue=ثبت دیدگاه و بازگشایی issues.create_comment=دیدگاه -issues.closed_at=`%[2]s این موضوع را بست` -issues.reopened_at=`%[2]s این موضوع را دوباره باز کرد` -issues.commit_ref_at=`ارجاع این مسئله به کامیت %[2]s` -issues.ref_issue_from=` ارجاعات این مسائله %[4] %[2]s` -issues.ref_pull_from=` ارجاعات این تقاضای ادغام %[4] %[2]s` -issues.ref_closing_from=` ارجاعات این تقاضای واکشی %[4] %[2]s` -issues.ref_reopening_from=` تقاضای واکشی ارجاع شده %[4] که مسائله بازگشایی خواهد کرد %[2] ` -issues.ref_closed_from=` بسته شده این مسائله %[4] %[2]s` -issues.ref_reopened_from=` بازگشایی این مسائله %[4] %[2]s` -issues.ref_from=`از %[1]` +issues.closed_at=%[2]s این موضوع را بست +issues.reopened_at=%[2]s این موضوع را دوباره باز کرد +issues.commit_ref_at=ارجاع این مسئله به کامیت %[2]s +issues.ref_issue_from= ارجاعات این مسائله %[4] %[2]s +issues.ref_pull_from= ارجاعات این تقاضای ادغام %[4] %[2]s +issues.ref_closing_from= ارجاعات این تقاضای واکشی %[4] %[2]s +issues.ref_reopening_from= تقاضای واکشی ارجاع شده %[4] که مسائله بازگشایی خواهد کرد %[2] +issues.ref_closed_from= بسته شده این مسائله %[4] %[2]s +issues.ref_reopened_from= بازگشایی این مسائله %[4] %[2]s +issues.ref_from=از %[1] issues.poster=نویسنده issues.collaborator=همكار issues.owner=مالک @@ -1251,7 +1190,7 @@ issues.label.filter_sort.by_size=کوچکترین اندازه issues.label.filter_sort.reverse_by_size=بزرگترین اندازه issues.num_participants=%d مشارکت کننده issues.attachment.open_tab=برای مشاهده "%s" در زبانه جدید، کلیک کنید -issues.attachment.download=`برای دریافت "%s" کلیک کنید` +issues.attachment.download=برای دریافت "%s" کلیک کنید issues.subscribe=مشترک شدن issues.unsubscribe=لغو اشتراک issues.lock=قفل کردن مکالمه @@ -1276,31 +1215,31 @@ issues.comment_on_locked=شما نمی‌توانید در مسئله قفل ش issues.tracker=پیگیری زمان issues.start_tracking_short=تایمز شروع issues.start_tracking=شروع به پیگیری زمان -issues.start_tracking_history=`شروع به کار %s` +issues.start_tracking_history=شروع به کار %s issues.tracker_auto_close=زمان‌سنج به صورت خودکار متوقف میشود زمانی که مسئله بسته شود -issues.tracking_already_started=`شما قبلا رهگیری زمان را روی این مسئله آغاز کرده‌اید!` +issues.tracking_already_started=شما قبلا رهگیری زمان را روی این مسئله آغاز کرده‌اید! issues.stop_tracking=تایمز ایست -issues.stop_tracking_history=`توقف کار در %s` +issues.stop_tracking_history=توقف کار در %s issues.cancel_tracking=ول کردن -issues.cancel_tracking_history=`انصراف از پیگیری زمان %s` +issues.cancel_tracking_history=انصراف از پیگیری زمان %s issues.add_time=زمان را به صورت دستی وارد کنید issues.del_time=این لاگ را حذف کنید issues.add_time_short=افزودن زمان issues.add_time_cancel=انصراف -issues.add_time_history=`زمان صرف شده اضافه شد %s` -issues.del_time_history=`زمان صرف شده حذف شد %s` +issues.add_time_history=زمان صرف شده اضافه شد %s +issues.del_time_history=زمان صرف شده حذف شد %s issues.add_time_hours=ساعت issues.add_time_minutes=دقیقه issues.add_time_sum_to_small=هیچ زمانی وارد نشده. issues.time_spent_total=کل زمان صرف شده -issues.time_spent_from_all_authors=`زمان صرف شده: %s` +issues.time_spent_from_all_authors=زمان صرف شده: %s issues.due_date=موعد مقرر issues.invalid_due_date_format=موعد مقرر، باید به سبک 'yyyy-mm-dd' باشد. 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.due_date_form=yyyy-mm-dd issues.due_date_form_add=افزودن موعد مقرر issues.due_date_form_edit=ویرایش @@ -1316,8 +1255,8 @@ issues.dependency.add=اضافه کردن وابستگی… issues.dependency.cancel=انصراف issues.dependency.remove=حذف/ساقط کردن issues.dependency.remove_info=حذف این وابستگی -issues.dependency.added_dependency=`%s یک مخزن جدید اضافه کرد` -issues.dependency.removed_dependency=`%s یک وابستگی را حذف کرد` +issues.dependency.added_dependency=%s یک مخزن جدید اضافه کرد +issues.dependency.removed_dependency=%s یک وابستگی را حذف کرد issues.dependency.pr_closing_blockedby=بستن این درخواست کشش با موارد زیر مسدود می شود issues.dependency.issue_closing_blockedby=بستن این مورد توسط موارد زیر مسدود شده است issues.dependency.issue_close_blocks=این مسئله با توجه به موضوعات مطرح شده مسدود شده است @@ -1368,10 +1307,8 @@ issues.content_history.created=ساخته شده issues.content_history.delete_from_history=حذف از تاریخچه issues.content_history.delete_from_history_confirm=آیا از تاریخچه حذف شود؟ issues.content_history.options=گزینه‌‌‌‌‌‌ها - compare.compare_base=پایه compare.compare_head=مقایسه - pulls.desc=نمایش تقاضای واکشی ها و بازبینی های کد. pulls.new=ایجاد تقاضای واکشی pulls.compare_changes=تقاضای واکشی جدید @@ -1384,11 +1321,11 @@ pulls.filter_branch=صافی شاخه pulls.no_results=هیچ نتیجه‌ای یافت نشد. pulls.nothing_to_compare=این شاخه‎ها یکی هستند. نیازی به تقاضای واکشی نیست. pulls.nothing_to_compare_and_allow_empty_pr=این شاخه ها برابر هستند. این PR خالی خواهد بود. -pulls.has_pull_request=`A درخواست pull بین این شاخه ها از قبل وجود دارد: %[2]s#%[3]d` +pulls.has_pull_request=A درخواست pull بین این شاخه ها از قبل وجود دارد: %[2]s#%[3]d pulls.create=ایجاد تقاضای واکشی pulls.title_desc=قصد ادغام %[1]d تغییر را از %[2]s به %[3]s دارد pulls.merged_title_desc=%[1]d کامیت ادغام شده از %[2]s به %[3]s %[4]s -pulls.change_target_branch_at=`هدف شاخه از %s به %s %s تغییر کرد` +pulls.change_target_branch_at=هدف شاخه از %s به %s %s تغییر کرد pulls.tab_conversation=گفتگو pulls.tab_commits=کامیت‌ها pulls.tab_files=پرونده تغییر کرده @@ -1400,7 +1337,7 @@ pulls.manually_merged=بصورت دستی ادغام شد pulls.manually_merged_as=درخواست pull به صورت دستی به عنوان %[2]s ادغام شده است. pulls.is_closed=این تقاضای واکشی بسته شد. pulls.has_merged=این تقاضای واکشی ادغام شد. -pulls.title_wip_desc=` شروع شذع با عنوان %s برای جلو گیری کردن از تقاضای واکشی که موقع ادغام دچار تصادم میشود.` +pulls.title_wip_desc= شروع شذع با عنوان %s برای جلو گیری کردن از تقاضای واکشی که موقع ادغام دچار تصادم میشود. pulls.cannot_merge_work_in_progress=این درخواست کشش به عنوان کار در حال انجام مشخص شده است. pulls.still_in_progress=هنوز در حال انجام؟ pulls.add_prefix=اضافه کردن پیشوند %s @@ -1429,7 +1366,6 @@ pulls.reject_count_n=%d درخواست تغییر pulls.waiting_count_1=%d منتظر بازبینی pulls.waiting_count_n=%d منتظر بازبینی pulls.wrong_commit_id=commit id باید یک شناسه commit در شاخه هدف باشد - pulls.no_merge_desc=این تقاضای واکشی قابل ادغام نیست لذا تمامی گزینه های ادغام مخزن غیر فعال هستند. pulls.no_merge_helper=گزینه های ادغام را در تنظیمات مخزن فعال کنید یا از تقاضای واکشی به صورت دستی ادغام نمایید. pulls.no_merge_wip=این تقاضای واکشی قابل ادغام نیست لذا اکنون به این مخزن درحال پردازش علامت گذاری شده است. @@ -1442,7 +1378,6 @@ pulls.squash_merge_pull_request=ایجاد commit اسکواش pulls.merge_manually=بصورت دستی ادغام شد pulls.merge_commit_id=شماره کامیت ادغام pulls.require_signed_wont_sign=انشعاب نیازمند تغییرات امضا شده است اما این ادغام امضا نخواهد شد - pulls.invalid_merge_option=شما نمی‌توانید از این گزینه برای تقاضای واکشی استفاده کنید. pulls.merge_conflict=ادغام ناموفق بود: در حین ادغام مغایرت وجود داشت. نکته: استراتژی متفاوتی را امتحان کنید pulls.merge_conflict_summary=پیغام خطا @@ -1452,7 +1387,7 @@ pulls.rebase_conflict_summary=پیام خطا pulls.unrelated_histories=ادغام ناموفق: سر و پایه ادغام یک تاریخ مشترک ندارند. نکته: یک استراتژی متفاوت را امتحان کنید pulls.merge_out_of_date=ادغام ناموفق: در حالی که ادغام را ایجاد می کند ، پایگاه به روز شد. نکته: دوباره امتحان کنید. pulls.push_rejected_summary=پیام رد کامل -pulls.open_unmerged_pull_exists=`شما نمی‌توانید یک عملیات را انجام داده یا بازگشایی نمایید لذا (#%d) مورد تقاضای واکشی با ویژگی منحصر به فرد هنوز رسیدگی نشده (معلق) است. ` +pulls.open_unmerged_pull_exists="شما نمی‌توانید یک عملیات را انجام داده یا بازگشایی نمایید لذا (#%d) مورد تقاضای واکشی با ویژگی منحصر به فرد هنوز رسیدگی نشده (معلق) است. " pulls.status_checking=برخی از بررسی‎ها در حال تعلیق هستند pulls.status_checks_success=تمامی بررسی‎ها موفق بودند pulls.status_checks_warning=برخی از چک ها هشدارهایی را گزارش کردند @@ -1465,16 +1400,11 @@ pulls.update_branch_rebase=بروزآوری شاخه با بازسازی مجد pulls.update_branch_success=شاخه به موفقیت بروز شد pulls.update_not_allowed=شما اجازه بروزرسانی شاخه را ندارید pulls.outdated_with_base_branch=این شاخه با شاخه پایه منسوخ شده است -pulls.closed_at=`این درخواست pull بسته شده %[2]s` -pulls.reopened_at=`این درخواست pull را بازگشایی کرد %[2]s` -pulls.merge_instruction_hint=`همچنین می‌توانید دستورالعمل‌های خط فرمان را مشاهده کنید.` +pulls.closed_at=این درخواست pull بسته شده %[2]s +pulls.reopened_at=این درخواست pull را بازگشایی کرد %[2]s +pulls.merge_instruction_hint=همچنین می‌توانید دستورالعمل‌های خط فرمان را مشاهده کنید. pulls.merge_instruction_step1_desc=از انبار پروژه خود، یک شاخه جدید را بگیرید و تغییرات را آزمایش کنید. pulls.merge_instruction_step2_desc=تغییرات را ادغام کنید و در Gitea به روز کنید. - - - - - milestones.new=نقطه عطف جدید milestones.closed=%s بسته شد milestones.update_ago=آخرین بروز رسانی %s قبل @@ -1504,7 +1434,6 @@ milestones.filter_sort.least_complete=حداقل کامل شده milestones.filter_sort.most_complete=بیشترین کامل شده milestones.filter_sort.most_issues=بیشترین مسائل milestones.filter_sort.least_issues=کمترین مسائل - signing.will_sign=این commit با کلید '%s' امضا خواهد شد signing.wont_sign.error=هنگام بررسی اینکه آیا commit می تواند امضا شود، خطایی روی داد signing.wont_sign.nokey=کلیدی برای امضای این commit وجود ندارد @@ -1518,9 +1447,7 @@ signing.wont_sign.headsigned=زمانیکه آخرین تغییرات (head) ا signing.wont_sign.commitssigned=زمانیکه تمامی تغییرات مرتبط امضا نشده باشند، ادغام نیز امضا نخواهد شد signing.wont_sign.approved=تا زمانیکه درخواست دریافت تایید نشده است ادغام امضا نخواهد شد signing.wont_sign.not_signed_in=شما وارد سیستم نشده اید - ext_wiki.desc=پیوند به یک دانشنامه خارجی. - wiki=دانشنامه wiki.welcome=به دانشنامه خوش آمدید. wiki.welcome_desc=به دانشنامه خوش آمدید! @@ -1544,7 +1471,6 @@ wiki.reserved_page=دانشنامه ای با این نام پیش از این " wiki.pages=صفحات wiki.last_updated=واپسین روزرسانی در %s wiki.page_name_desc=یک نام برای این صفحه ویکی وارد کنید. برخی از نام‌های خاص عبارتند از: 'Home'، '_Sidebar' و '_Footer'. - activity=فعالیت activity.period.filter_label=دوره: activity.period.daily=۱ روز @@ -1610,13 +1536,11 @@ activity.git_stats_addition_n=علاوه بر این %d activity.git_stats_and_deletions=و activity.git_stats_deletion_1=%d مذحوف activity.git_stats_deletion_n=%d مذحوف - search=جستجو search.search_repo=جستجوی مخزن search.fuzzy=درهم search.match=مطابق search.results=نتیجه جستجو برای "%s" در %s - settings=تنظيمات settings.desc=تنظیمات جایی است که شما می‌توانید تنظیمات مخزن خود را مدیریت کنید settings.options=مخزن @@ -1885,10 +1809,10 @@ settings.dismiss_stale_approvals=تاییدیه های قدیمی را رد کن settings.dismiss_stale_approvals_desc=وقتی commit های جدیدی که محتوای درخواست pull را تغییر می‌دهند به شاخه ارسال می‌شوند، تأییدیه‌های قدیمی رد می‌شوند. settings.require_signed_commits=نیاز به commit های امضا شده settings.require_signed_commits_desc=در صورتی که push ها به این شاخه بدون امضا یا غیرقابل تأیید باشند، رد شوند. -settings.protect_protected_file_patterns=الگوهای فایل محافظت شده (با استفاده از نقطه ویرگول '\;' از هم جدا شده اند): -settings.protect_protected_file_patterns_desc=فایل‌های محافظت‌شده که حتی اگر کاربر حق اضافه کردن، ویرایش یا حذف فایل‌ها را در این شاخه داشته باشد، اجازه تغییر مستقیم ندارند. الگوهای چندگانه را می توان با استفاده از نقطه ویرگول ('\;') از هم جدا کرد. برای syntax الگو به اسناد github.com/gobwas/glob مراجعه کنید. مثال‌ها: .drone.yml، /docs/**/*.txt. -settings.protect_unprotected_file_patterns=الگوهای فایل محافظت نشده (با استفاده از نقطه ویرگول '\;' از هم جدا شده اند): -settings.protect_unprotected_file_patterns_desc=فایل‌های محافظت‌نشده که در صورت دسترسی کاربر به نوشتن، با عبور از محدودیت push، مجاز به تغییر مستقیم هستند. الگوهای چندگانه را می توان با استفاده از نقطه ویرگول ('\;') از هم جدا کرد. برای نحو الگو به اسناد github.com/gobwas/glob مراجعه کنید. مثال‌ها: .drone.yml، /docs/**/*.txt. +settings.protect_protected_file_patterns=الگوهای فایل محافظت شده (با استفاده از نقطه ویرگول ';' از هم جدا شده اند): +settings.protect_protected_file_patterns_desc=فایل‌های محافظت‌شده که حتی اگر کاربر حق اضافه کردن، ویرایش یا حذف فایل‌ها را در این شاخه داشته باشد، اجازه تغییر مستقیم ندارند. الگوهای چندگانه را می توان با استفاده از نقطه ویرگول (';') از هم جدا کرد. برای syntax الگو به اسناد github.com/gobwas/glob مراجعه کنید. مثال‌ها: .drone.yml، /docs/**/*.txt. +settings.protect_unprotected_file_patterns=الگوهای فایل محافظت نشده (با استفاده از نقطه ویرگول ';' از هم جدا شده اند): +settings.protect_unprotected_file_patterns_desc=فایل‌های محافظت‌نشده که در صورت دسترسی کاربر به نوشتن، با عبور از محدودیت push، مجاز به تغییر مستقیم هستند. الگوهای چندگانه را می توان با استفاده از نقطه ویرگول (';') از هم جدا کرد. برای نحو الگو به اسناد github.com/gobwas/glob مراجعه کنید. مثال‌ها: .drone.yml، /docs/**/*.txt. settings.add_protected_branch=فعال‌سازی محافظ settings.delete_protected_branch=غیر فعال‌سازی محافظ settings.update_protect_branch_success=محافظ شاخه برای شاخه‌ی «%s» به‌روز شد. @@ -1968,7 +1892,6 @@ settings.rename_branch_success=نام شاخه %s با موفقیت به %s تغ settings.rename_branch_from=نام شاخه‌ی قدیمی settings.rename_branch_to=نام شاخه‌ی جدید settings.rename_branch=تغییر نام شاخه - diff.browse_source=فهرست منبع diff.parent=والد diff.commit=کامیت @@ -2019,7 +1942,6 @@ diff.protected=حفاظت شده diff.image.side_by_side=کنار هم diff.image.swipe=با خط کشش diff.image.overlay=پوشش - releases.desc=پیگیری نسخ و دریافت‌های پروژه. release.releases=انتشارها release.detail=جزئیات انتشار @@ -2061,7 +1983,6 @@ release.downloads=بارگیری‌ها release.download_count=دانلودها: %s release.add_tag_msg=از عنوان و محتوای انتشار به عنوان پیام تگ استفاده کنید. release.add_tag=فقط تگ ایجاد کنید - branch.name=نام شاخه branch.search=جستجوی شاخه ها branch.already_exists=نام شاخه «%s» از پیش وجود داشته است. @@ -2092,20 +2013,21 @@ branch.confirm_create_branch=ایجاد شاخه branch.new_branch=شاخه جدید ایجاد کنید branch.new_branch_from=ایجاد شاخه جدید از '%s' branch.renamed=شاخه %s قبلا به %s تغییر کرده است. - tag.create_tag=تگ %s ایجاد کنید - tag.create_success=تگ '%s' ایجاد شده است. - topic.manage_topics=مدیریت موضوعات topic.done=انجام شد topic.count_prompt=شما نمی توانید بیش از 25 موضوع انتخاب کنید topic.format_prompt=موضوع می‌بایستی با حروف یا شماره ها شروع شود. و می‌تواند شامل دَش ('-') باشد و طول آن تا 35 کارکتر نیز امکانپذیر است. - - error.csv.too_large=نمی توان این فایل را رندر کرد زیرا بسیار بزرگ است. error.csv.unexpected=نمی توان این فایل را رندر کرد زیرا حاوی یک کاراکتر غیرمنتظره در خط %d و ستون %d است. error.csv.invalid_field_count=نمی توان این فایل را رندر کرد زیرا تعداد فیلدهای آن در خط %d اشتباه است. +issues.filter_project_none=هیچ پروژه ثبت نشده +issues.draft_title=پیش‌نویس +issues.delete=حذف +search.code_no_results=کد منبعی مطابق با جستجوی شما یافت نشد. +settings.event_wiki=دانشنامه +branch.create_branch_operation=ایجاد شاخه [org] org_name_holder=نام سازمان @@ -2128,11 +2050,9 @@ team_access_desc=دسترسی مخزن team_permission_desc=مجوز team_unit_desc=اجازه به دسترسی به قسمت های این مخزن team_unit_disabled=(خاموش) - form.name_reserved=نام سازمان %s رزرو شده است. form.name_pattern_not_allowed=الگوی %s در نام سازمان مجاز نیست. form.create_org_not_allowed=شما اجازه ایجاد سازمان را ندارید. - settings=تنظيمات settings.options=سازمان settings.full_name=نام کامل @@ -2146,7 +2066,6 @@ settings.visibility.limited=محدود شده (پدیدار برای کاربر settings.visibility.limited_shortname=محدودیت دار settings.visibility.private=خصوصی (پدیدار برای کاربران عضو سازمان) settings.visibility.private_shortname=پوشیده - settings.update_settings=به‌ روزرسانی تنظیمات settings.update_setting_success=تنظیمات این سازمان به‌روز شد. settings.change_orgname_prompt=نکته: به‌یاد داشته باشید تغییر نام سازمان موجب تعییر نشانی‌ها آن نیز می‌شود. @@ -2159,9 +2078,7 @@ settings.confirm_delete_account=تاییدیه حذف settings.delete_org_title=حذف سازمان settings.delete_org_desc=سازمان برای همیشه حذف خواهد شد. آیا همچنان ادامه می‌دهید؟ settings.hooks_desc=افزودن webhook های که برای تمام مخازن این سازمان اجرا میشود. - settings.labels_desc=تگ هایی را اضافه کنید که می‌توانند برای مشکلات همه مخازن تحت این سازمان استفاده شوند. - members.membership_visibility=قابل مشاهده بودن عضویت: members.public=نمایان members.public_helper=مخفی کردن @@ -2176,7 +2093,6 @@ members.leave=ترک‌کردن members.leave.detail=ترک %s؟ members.invite_desc=افزودن عضو جدید به %s: members.invite_now=دعوت کن - teams.join=پیوستن teams.leave=ترک‌کردن teams.leave.detail=ترک %s؟ @@ -2217,6 +2133,8 @@ teams.all_repositories_helper=تیم به کلیه مخازن دسترسی دا teams.all_repositories_read_permission_desc=این تیم دسترسی خواندن مخازن همه را می بخشد: اعضا می توانند مخازن را مشاهده و همزاد سازی کنند. teams.all_repositories_write_permission_desc=این تیم دسترسی نوشتن مخازن همه را می بخشد: اعضا می توانند مخازن را مشاهده و درج کنند. teams.all_repositories_admin_permission_desc=این تیم دسترسی مدیر به مخازن همه را می بخشد: اعضا می توانند مخازن را بخواند، همکار و مخزن اضافه کنند. +members=اعضاء +teams.read_access=خواندن [admin] dashboard=پیشخوان @@ -2232,7 +2150,6 @@ monitor=نظارت first_page=نخستین last_page=واپسین total=مجموع: %d - dashboard.statistic=چکیده dashboard.operations=عملیات‌های نگهداری dashboard.system_status=وضعیت سامانه @@ -2305,7 +2222,6 @@ dashboard.last_gc_pause=واپسین مکث در GC dashboard.gc_times=زمان های GC dashboard.delete_old_actions=تمام اقدامات قدیمی را از پایگاه داده حذف کنید dashboard.delete_old_actions.started=حذف تمام اقدامات قدیمی از پایگاه داده شروع شده است. - users.user_manage_panel=مدیریت حساب کاربری users.new_account=ایجاد حساب کاربری users.name=نام‎کاربری @@ -2355,7 +2271,6 @@ 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 غیرفعال است - emails.email_manage_panel=مدیریت ایمیل کاربر emails.primary=اولیه emails.activated=فعال شده @@ -2368,13 +2283,11 @@ emails.not_updated=آدرس ایمیل درخواستی به‌روزرسانی emails.duplicate_active=این آدرس ایمیل از قبل برای کاربر دیگری فعال است. emails.change_email_header=به روز رسانی ویژگی های ایمیل emails.change_email_text=آیا مطمئن هستید که می خواهید این آدرس ایمیل را به روز کنید؟ - orgs.org_manage_panel=مدیریت سازمان orgs.name=نام orgs.teams=تیم‌ها orgs.members=اعضاء orgs.new_orga=سازمان جدید - repos.repo_manage_panel=مدیریت مخزن repos.unadopted=مخازن تصویب نشده repos.unadopted.no_more=هیچ مخزن تایید نشده دیگری یافت نشد @@ -2386,18 +2299,14 @@ repos.stars=ستاره ها repos.forks=انشعاب‌ها repos.issues=مسائل repos.size=اندازه - - defaulthooks=وب هوک های پیش فرض defaulthooks.desc=هنگامی که برخی رویدادهای Gitea فعال می شوند، Webhook ها به طور خودکار درخواست های HTTP POST را به سرور ارسال می کنند. هوک های تعریف شده در اینجا پیش فرض هستند و در تمام مخازن جدید کپی می شوند. در راهنمای هوک‌های وب بیشتر بخوانید. defaulthooks.add_webhook=اضافه کردن Webhook پیش فرض defaulthooks.update_webhook=Webhook پیش فرض را به روز کنید - systemhooks=وب هوک های سیستم systemhooks.desc=هنگامی که برخی رویدادهای Gitea فعال می شوند، Webhook ها به طور خودکار درخواست های HTTP POST را به سرور ارسال می کنند. وب هوک های تعریف شده در اینجا بر روی تمام انبارها سیستم عمل می کنند، بنابراین لطفاً هر گونه پیامدهای عملکردی که ممکن است داشته باشد را در نظر بگیرید. در راهنمای هوک‌های وب بیشتر بخوانید. systemhooks.add_webhook=System Webhook را اضافه کنید systemhooks.update_webhook=به روز رسانی Webhook سیستم - auths.auth_manage_panel=مدیریت منابع احراز هویت auths.new=افزودن منبع احراز هویت auths.name=نام @@ -2496,12 +2405,10 @@ auths.update=به‌روزکردن منبع احراز هویت auths.delete=حذف منبع احراز هویت auths.delete_auth_title=حذف منبع احراز هویت auths.delete_auth_desc=حذف یک منبع احراز هویت، از ورود کاربران به سیستم جلوگیری می کند. آیا ادامه می‌دهید؟ - auths.still_in_used=منبع احراز هویت همچنان در حال استفاده است. ابتدا با استفاده از این منبع احراز کاربرانی را تبدیل یا حذف کنید. auths.deletion_success=احراز هویت منبع حذف شد. auths.login_source_exist=منبع احراز هویت '%s' پیش از این وجود داشته است. auths.login_source_of_type_exist=منبع احراز هویت '%s' پیش از این وجود داشته است. - config.server_config=پیکربندی سرور config.app_name=عنوان سایت config.app_ver=نسخه‌ی GitGo @@ -2520,7 +2427,6 @@ config.static_file_root_path=مسیر ریشه فایل استاتیک config.log_file_root_path=مسیر گزارش‌ها config.script_type=نوع اسکریپت config.reverse_auth_user=شیوه ی احرازهویت معکوس - config.ssh_config=پیکربندی SSH config.ssh_enabled=فعال شده config.ssh_start_builtin_server=استفاده از ساخته سرور @@ -2532,12 +2438,10 @@ config.ssh_key_test_path=مسیر کلید آزمایش 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.db_config=تنظیمات پایگاه داده config.db_type=نوع config.db_host=میزبان @@ -2546,7 +2450,6 @@ config.db_user=نام‎کاربری config.db_schema=شماتیک config.db_ssl_mode=SSL config.db_path=مسیر - config.service_config=پیکربندی سرویس config.register_email_confirm=نیاز به تایید ایمیل (رایانامه) ثبت نام config.disable_register=غیرفعال‌کردن خود ثبت نامی @@ -2569,12 +2472,10 @@ config.default_allow_only_contributors_to_track_time=اجاز پگیری زما config.no_reply_address=مخفی کردن دامنه ایمیل config.default_visibility_organization=وضعیت پیشفرض پدیداری برای سازمان جدید config.default_enable_dependencies=فعال کردن وابستگی پیشفرض برای مسئله - config.webhook_config=پیکربندی هوک تحت وب config.queue_length=طول صف config.deliver_timeout=مهلت تحویل config.skip_tls_verify=صرف نظر از اعتبارسنجی TLS - config.mailer_enabled=فعال شده config.mailer_name=نام config.mailer_user=کاربر @@ -2586,16 +2487,13 @@ config.test_email_placeholder=ایمیل (نمونه test@example.com) config.send_test_mail=ارسال ایمیل آزمایشی config.test_mail_failed=ارسال رایانامه یا ایمیل آزمایشی ناموفق بود '%s': %v config.test_mail_sent=یک رایانامه (ایمیل) آزمایشی به "%s" ارسال شده است. - config.oauth_config=پیکربندی OAuth config.oauth_enabled=فعال شده - config.cache_config=پیکربندی حافظه پنهان config.cache_adapter=وفق دهنده حافظه پنهان config.cache_interval=وقفه حافظه نهان config.cache_conn=اتصال حافظه نهان config.cache_item_ttl=مولفه TTL حافظه نهان - config.session_config=پیکربندی نشست ها config.session_provider=تامین کننده نشست config.provider_config=پیکربندی تامین کننده @@ -2604,12 +2502,10 @@ config.gc_interval_time=فاصله زمانی GC config.session_life_time=طول عمر نشست config.https_only=فقط HTTPS config.cookie_life_time=طول عمر کوکی - config.picture_config=پیکربندی عکس و آواتار config.picture_service=سرویس تصویر config.disable_gravatar=غیر فعال کردن Gravatar config.enable_federated_avatar=فعال سازی آواتار مشترک - config.git_config=پیکربندی Git config.git_disable_diff_highlight=غیرفعال کردن برجسته سازی در Diff config.git_max_diff_lines=حداکثر خط برای Diff (برای یک فایل) @@ -2621,7 +2517,6 @@ config.git_mirror_timeout=زمان آستانه در به روز رسانی قر config.git_clone_timeout=زمان آستانه ی عملیات Clone config.git_pull_timeout=زمان آستانه ی عملیات واکشی config.git_gc_timeout=زمان آستانه ی عملیات GC - config.log_config=پیکربندی ثبت رخداد config.log_mode=شیوه ثبت رخداد config.own_named_logger=نام ثبت کننده رخداد @@ -2633,8 +2528,6 @@ config.access_log_mode=شیوه ثبت رخداد دسترسی config.access_log_template=الگو config.xorm_log_mode=شیوه ثبت رخداد XORM config.xorm_log_sql=ثبت رخداد SQL - - monitor.cron=وظایف Cron monitor.name=نام monitor.schedule=زمان بندی @@ -2675,7 +2568,6 @@ monitor.queue.pool.flush.title=فلاش کردن صف monitor.queue.pool.flush.desc=Flush یک کارگر اضافه می‌کند که پس از خالی شدن صف، یا اتمام زمان آن پایان می‌یابد. monitor.queue.pool.flush.submit=Flush Worker را اضافه کنید monitor.queue.pool.flush.added=Flush Worker برای %[1]s اضافه شد - monitor.queue.settings.title=تنظیمات استخر monitor.queue.settings.desc=استخرها به طور پویا با افزایش در پاسخ به مسدود شدن صف کارگران خود رشد می کنند. این تغییرات بر گروه های کارگری فعلی تأثیری نخواهد گذاشت. monitor.queue.settings.timeout=Boost Timeout @@ -2691,7 +2583,6 @@ monitor.queue.settings.submit=بالا بردن ساماندهی monitor.queue.settings.changed=تنظیمات تازه شد monitor.queue.settings.blocktimeout=تایم اوت بلوک فعلی monitor.queue.settings.blocktimeout.value=%[1]v - monitor.queue.pool.none=این صف استخر ندارد monitor.queue.pool.added=گروه کارگری اضافه شد monitor.queue.pool.max_changed=حداکثر تعداد کارگران تغییر کرد @@ -2701,7 +2592,6 @@ monitor.queue.pool.cancel=گروه کارگری خاموشی monitor.queue.pool.cancelling=بسته شدن گروه کارگری monitor.queue.pool.cancel_notices=این گروه از کارگران %s خاموش شود؟ monitor.queue.pool.cancel_desc=ترک یک صف بدون هیچ گروه کارگری ممکن است باعث مسدود شدن نامحدود درخواست ها شود. - notices.system_notice_list=هشدارهای سامانه notices.view_detail_header=مشاهده جزئیات اخطار notices.actions=اقدامات @@ -2716,20 +2606,26 @@ notices.type_2=تسک notices.desc=توضیحات notices.op=عملیات. notices.delete_success=گزارش سیستم حذف شده است. +packages.owner=مالک +packages.name=نام +packages.type=نوع +packages.repository=مخزن +packages.size=اندازه +config.mailer_smtp_port=گذرگاه(پورت) SMTP [action] create_repo=مخزن ایجاد شده %s rename_repo=مخزن تغییر نام داد از %[1]s به %[3]s commit_repo=به %[3]s در %[4]s push شد -create_issue=`مشکل باز %[3]s#%[2]s` -close_issue=`"مشکل بسته %[3]s#%[2]s` -reopen_issue=`مشکل دوباره باز شد %[3]s#%[2]s` -create_pull_request=`درخواست pull ایجاد شده %[3]s#%[2]s` -close_pull_request=`درخواست pull بسته %[3]s#%[2]s` -reopen_pull_request=`درخواست pull دوباره باز شد %[3]s#%[2]s` -comment_issue=`درباره مشکل %[3]s#%[2]s نظر داد` -comment_pull=`در مورد درخواست کشش نظر داد %[3]s#%[2]s` -merge_pull_request='درخواست کشش ادغام شده %[3]s#%[2]s' +create_issue=مشکل باز %[3]s#%[2]s +close_issue="مشکل بسته %[3]s#%[2]s +reopen_issue=مشکل دوباره باز شد %[3]s#%[2]s +create_pull_request=درخواست pull ایجاد شده %[3]s#%[2]s +close_pull_request=درخواست pull بسته %[3]s#%[2]s +reopen_pull_request=درخواست pull دوباره باز شد %[3]s#%[2]s +comment_issue=درباره مشکل %[3]s#%[2]s نظر داد +comment_pull=در مورد درخواست کشش نظر داد %[3]s#%[2]s +merge_pull_request=درخواست کشش ادغام شده %[3]s#%[2]s transfer_repo=مخزن از %s به %sمنتقل شده است push_tag=تگ %[3]s به %[4]s push شد delete_tag=برچسب %[2] از %[3] حذف شدند @@ -2740,10 +2636,10 @@ compare_commits_general=مقایسه کامیت‌‌ها mirror_sync_push=commit ها همگام‌سازی‌شدند به %[3]s در %[4]s از میرور می‌شود mirror_sync_create=مرجع جدید %[3]s با %[4]s از mirror همگام‌سازی شد mirror_sync_delete=از مرجع %[2]s در%[3]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 رد شد` +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 رد شد review_dismissed_reason=دلیل: create_branch=شاخه %[3]s در %[4]s ایجاد کرد starred_repo=ستاره دار %[2]s @@ -2804,4 +2700,21 @@ error.no_unit_allowed_repo=شما اجازه دسترسی به هیچ قسمت error.unit_not_allowed=شما اجازه دسترسی به این قسمت مخزن را ندارید. [packages] - +filter.type=نوع +conan.details.repository=مخزن +owner.settings.cleanuprules.enabled=فعال شده + +[aria] + +[secrets] +name=نام + +[actions] +runners.name=نام +runners.owner_type=نوع +runners.description=شرح +runners.task_list.run=اجرا +runners.task_list.repository=مخزن +runners.task_list.commit=کامیت +runners.status.active=فعال +runs.commit=کامیت diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini index 3fd2f1800698..4679c3c1e4e7 100644 --- a/options/locale/locale_fi-FI.ini +++ b/options/locale/locale_fi-FI.ini @@ -22,7 +22,6 @@ enable_javascript=Tämä sivusto toimii paremmin JavaScriptillä. toc=Sisällysluettelo licenses=Lisenssit return_to_gitea=Palaa Giteaan - username=Käyttäjätunnus email=Sähköpostiosoite password=Salasana @@ -32,7 +31,6 @@ captcha=CAPTCHA twofa=Kaksivaiheinen todennus twofa_scratch=Kaksivaiheinen kertakäyttöinen koodi passcode=Tunnuskoodi - webauthn_insert_key=Aseta turva-avaimesi webauthn_sign_in=Paina turva-avaimesi painiketta. Jos turva-avaimessasi ei ole painiketta, irroita se ja aseta uudelleen. webauthn_press_button=Paina turva-avaimesi painiketta… @@ -46,7 +44,6 @@ webauthn_error_duplicated=Turva-avainta ei ole sallittu tässä pyynnössä. Var webauthn_error_empty=Sinun täytyy asettaa nimi tälle avaimelle. webauthn_error_timeout=Aikakatkaisu saavutettu ennenkuin avaintasi on voitu lukea. Lataa tämä sivu uudelleen ja yritä uudelleen. webauthn_reload=Päivitä - repository=Repo organization=Organisaatio mirror=Peili @@ -63,18 +60,15 @@ settings=Asetukset your_profile=Profiili your_starred=Tähdelliset your_settings=Asetukset - all=Kaikki sources=Lähteet mirrors=Peilit collaborative=Yhteistyössä forks=Haarat - activities=Toimet pull_requests=Pull requestit issues=Ongelmat milestones=Merkkipaalut - ok=OK cancel=Peruuta save=Tallenna @@ -83,26 +77,22 @@ add_all=Lisää kaikki remove=Poista remove_all=Poista kaikki edit=Muokkaa - copy=Kopioi copy_url=Kopioi osoite copy_branch=Kopioi haaran nimi copy_success=Kopioitu! copy_error=Kopiointi epäonnistui - write=Kirjoita preview=Esikatselu loading=Ladataan… - step1=Vaihe 1: step2=Vaihe 2: - error=Virhe error404=Sivu, jota yrität nähdä, joko ei löydy tai et ole oikeutettu katsomaan sitä. - never=Ei koskaan - rss_feed=RSS-syöte +enabled=Käytössä +disabled=Pois käytöstä [filter] @@ -153,7 +143,6 @@ err_empty_admin_password=Ylläpitäjän salasana ei voi olla tyhjä. err_empty_admin_email=Ylläpitäjän sähköpostiosoite ei voi olla tyhjä. err_admin_name_is_reserved=Ylläpitäjän käyttäjätunnus on virheellinen: käyttäjätunnus on varattu err_admin_name_is_invalid=Ylläpitäjän käyttäjätunnus on virheellinen - general_title=Yleiset asetukset app_name=Sivuston otsikko app_name_helper=Voit syöttää yrityksesi nimen tähän. @@ -172,7 +161,6 @@ app_url=Gitean juuriosoite app_url_helper=Juuriosoite HTTP(S)-klooniosoitteille ja sähköpostimuistutuksille. log_root_path=Lokin polku log_root_path_helper=Lokitiedostot kirjoitetaan tähän kansioon. - optional_title=Valinnaiset asetukset email_title=Sähköpostiasetukset smtp_from=Lähetä sähköpostit osoitteella @@ -221,7 +209,9 @@ default_enable_timetracking_popup=Ota käyttöön uusien repojen aikaseuranta ol no_reply_address=Piilotettu sähköpostin verkkotunnus no_reply_address_helper=Verkkotunnuksen nimi käyttäjille, joilla on piilotettu sähköpostiosoite. Esimerkiksi käyttäjätunnus 'joe' kirjataan Git nimellä 'joe@noreply.example.org' jos piilotettu sähköpostiosoite on asetettu 'noreply.example.org'. password_algorithm=Salasanan hajautusalgoritmi -password_algorithm_helper=Aseta salasanan hajautusalgoritmi. Algoritmeillä on eri vaatimukset ja vahvuudet. `argon2`, vaikka sillä on hyvät ominaisuudet, käyttää paljon muistia ja voi olla sopimaton pienille järjestelmille. +password_algorithm_helper="""Aseta salasanan hajautusalgoritmi. Algoritmeillä on eri vaatimukset ja vahvuudet. `argon2`, vaikka sillä on hyvät ominaisuudet, käyttää paljon muistia ja voi olla sopimaton pienille järjestelmille.""" +smtp_addr=SMTP isäntä +smtp_port=SMTP portti [home] uname_holder=Käyttäjätunnus tai sähköpostiosoite @@ -237,17 +227,14 @@ search_repos=Etsi repo… filter=Muut suodattimet filter_by_team_repositories=Suodata tiimin repojen mukaan feed_of=Syöte "%s" - show_archived=Arkistoidut show_both_archived_unarchived=Näytetään arkistoidut ja arkistoimattomat show_only_archived=Näytetään vain arkistoidut show_only_unarchived=Näytetään vain arkistoimattomat - show_private=Yksityinen show_both_private_public=Näytetään sekä julkiset että yksityiset show_only_private=Näytetään vain yksityiset show_only_public=Näytetään vain julkiset - issues.in_your_repos=Repoissasi [explore] @@ -264,7 +251,6 @@ code_no_results=Hakuehtoasi vastaavaa lähdekoodia ei löytynyt. code_search_results=Hakutulokset: '%s ' code_last_indexed_at=Viimeksi indeksoitu %s - [auth] create_new_account=Rekisteröi tili register_helper_msg=On jo tili? Kirjaudu sisään nyt! @@ -331,36 +317,25 @@ password_pwned=Valitsemasi salasana on käyttää kaksivaiheista vahvistusta. twofa_not_enrolled=Tilisi ei tällä hetkellä käytä kaksivaiheista vahvistusta. @@ -635,31 +593,27 @@ twofa_disabled=Kaksivaiheinen todennus on otettu pois käytöstä. scan_this_image=Skannaa tämä kuva tunnistautumissovelluksellasi: or_enter_secret=Tai kirjoita salainen avain: %s twofa_enrolled=Tiliisi on otettu käyttöön kaksivaiheinen vahvistus. Ota palautustunnus (%s) talteen turvalliseen paikkaan, sillä se näytetään vain kerran! - webauthn_nickname=Nimimerkki - manage_account_links=Hallitse linkitettyjä tilejä manage_account_links_desc=Nämä ulkoiset tilit on linkitetty Gitea tiliisi. remove_account_link=Poista linkitetty tili remove_account_link_desc=Linkitetyn tilin poistaminen peruuttaa pääsyn Gitea-tiliisi linkitetyn tili kautta. Jatketaanko? remove_account_link_success=Linkitetty tili on poistettu. - orgs_none=Et ole minkään organisaation jäsen. repos_none=Sinulla ei ole repoja - delete_account=Poista tilisi delete_prompt=Tämä toiminto poistaa käyttäjätilisi pysyvästi. Toimintoa EI VOI kumota. confirm_delete_account=Varmista poisto delete_account_title=Poista käyttäjätili - email_notifications.enable=Ota käyttöön sähköposti-ilmoitukset - visibility=Käyttäjän näkyvyys visibility.public=Julkinen visibility.public_tooltip=Näkyvissä kaikille käyttäjille visibility.limited=Rajattu visibility.private=Yksityinen visibility.private_tooltip=Näkyy vain organisaation jäsenille +password_change_disabled=Ei-lokaalit käyttäjät eivät voi päivittää salasanojaan Gitean web-käyttöliittymän kautta. +link_account=Yhdistä tili [repo] new_repo_helper=Repo sisältää kaikki projektitiedostot, mukaan lukien revisiohistorian. Onko sinulla repo jo muualla? Voit siirtää repon. @@ -698,22 +652,16 @@ stargazers=Tähtiharrastajat forks=Haarat pick_reaction=Valitse reaktiosi delete_preexisting_label=Poista - - desc.private=Yksityinen desc.public=Julkinen desc.private_template=Yksityinen malli desc.public_template=Malli desc.internal=Sisäinen - template.git_hooks=Git-koukut template.webhooks=Webkoukut template.topics=Aiheet template.avatar=Profiilikuva template.issue_labels=Ongelmien tunnisteet - - - migrate_items=Siirrettävät asiat migrate_items_wiki=Wiki migrate_items_milestones=Merkkipaalut @@ -731,7 +679,6 @@ migrate.migrating=Tuodaan kohteesta %s ... migrate.migrating_failed=Tuonti kohteesta %s epäonnistui. migrate.migrating_failed.error=Virhe: %s migrate.migrating_git=Tuodaan Git-tietoja - mirror_from=peilaus alkaen forked_from=forkattu lähteestä unwatch=Lopeta tarkkailu @@ -739,11 +686,9 @@ watch=Tarkkaile unstar=Poista tähti star=Tähti download_archive=Lataa repo - no_desc=Ei kuvausta quick_guide=Pikaopas clone_this_repo=Kloonaa tämä repo - code=Koodi code.desc=Pääsy lähdekoodiin, tiedostoihin, committeihin ja haaroihin. branch=Haara @@ -754,7 +699,6 @@ tags=Tagit issues=Ongelmat pulls=Pull-pyynnöt labels=Tunnisteet - milestones=Merkkipaalut commits=Commitit commit=Commit @@ -765,7 +709,6 @@ file_raw=Raaka file_history=Historia file_view_raw=Näytä raaka file_permalink=Pysyvä linkki - video_not_supported_in_browser=Selaimesi ei tue HTML5 video-tagia. audio_not_supported_in_browser=Selaimesi ei tue HTML5 audio-tagia. blame=Selitys @@ -773,7 +716,6 @@ download_file=Lataa tiedosto normal_view=Normaali näkymä line=rivi lines=rivejä - editor.new_file=Uusi tiedosto editor.upload_file=Lähetä tiedosto editor.edit_file=Muokkaa tiedostoa @@ -804,7 +746,6 @@ editor.add_subdir=Lisää hakemisto… editor.unable_to_upload_files=Tiedostojen lataaminen kohteeseen '%s' epäonnistui virheellä: %v editor.upload_files_to_dir=Lataa tiedostot kohteeseen '%s' editor.require_signed_commit=Haara vaatii vahvistetun commitin - commits.commits=Commitit commits.nothing_to_compare=Nämä haarat vastaavat toisiaan. commits.find=Haku @@ -817,9 +758,6 @@ commits.newer=Uudemmat commits.signed_by=Allekirjoittanut commits.gpg_key_id=GPG avaimen ID commits.ssh_key_fingerprint=SSH avaimen sormenjälki - - - projects=Projektit projects.description_placeholder=Kuvaus projects.create=Luo projekti @@ -841,7 +779,6 @@ projects.board.delete=Poista taulu projects.board.color=Väri projects.open=Avaa projects.close=Sulje - issues.desc=Ongelmien, tehtävien ja merkkipaalujen hallinta. issues.filter_assignees=Suodata käyttäjiä issues.filter_milestones=Suodata merkkipaalu @@ -869,16 +806,16 @@ issues.new_label_placeholder=Tunnisteen nimi issues.new_label_desc_placeholder=Kuvaus issues.create_label=Luo tunniste issues.label_templates.helper=Valitse tunnistejoukko -issues.add_milestone_at=`lisäsi tämän merkkipaaluun %s %s` -issues.change_milestone_at=`vaihtoi merkkipaalun %s merkkipaaluun %s %s` -issues.remove_milestone_at=`poisti tämän %s merkkipaalusta %s` -issues.remove_project_at=`poisti tämän %s projektista %s` -issues.deleted_milestone=`(poistettu)` -issues.self_assign_at=`itse otti tämän käsittelyyn %s` -issues.change_title_at=`muutti otsikon %s otsikoksi %s %s` -issues.delete_branch_at=`poisti haaran %s %s` +issues.add_milestone_at=lisäsi tämän merkkipaaluun %s %s +issues.change_milestone_at=vaihtoi merkkipaalun %s merkkipaaluun %s %s +issues.remove_milestone_at=poisti tämän %s merkkipaalusta %s +issues.remove_project_at=poisti tämän %s projektista %s +issues.deleted_milestone=(poistettu) +issues.self_assign_at=itse otti tämän käsittelyyn %s +issues.change_title_at=muutti otsikon %s otsikoksi %s %s +issues.delete_branch_at=poisti haaran %s %s issues.filter_label=Tunniste -issues.filter_label_exclude=`Käytä alt + klikkaus/rivinvaihto poissulkeaksesi tunnisteita` +issues.filter_label_exclude=Käytä alt + klikkaus/rivinvaihto poissulkeaksesi tunnisteita issues.filter_label_no_select=Kaikki tunnisteet issues.filter_milestone=Merkkipaalu issues.filter_milestone_no_select=Kaikki merkkipaalut @@ -913,7 +850,7 @@ issues.next=Seuraava issues.open_title=Avoinna issues.closed_title=Suljettu issues.num_comments=%d kommenttia -issues.commented_at=`kommentoi %s` +issues.commented_at=kommentoi %s issues.delete_comment_confirm=Haluatko varmasti poistaa tämän kommentin? issues.context.copy_link=Kopioi linkki issues.context.quote_reply=Vastaa lainaamalla @@ -926,9 +863,9 @@ issues.close_comment_issue=Kommentoi ja sulje issues.reopen_issue=Avaa uudelleen issues.reopen_comment_issue=Kommentoi ja avaa uudelleen issues.create_comment=Kommentoi -issues.closed_at=`sulki tämän ongelman %[2]s` -issues.reopened_at=`uudelleenavasi tämän ongelman %[2]s` -issues.commit_ref_at=`viittasi tähän ongelmaan commitissa %[2]s` +issues.closed_at=sulki tämän ongelman %[2]s +issues.reopened_at=uudelleenavasi tämän ongelman %[2]s +issues.commit_ref_at=viittasi tähän ongelmaan commitissa %[2]s issues.poster=Tekijä issues.collaborator=Yhteistyökumppani issues.owner=Omistaja @@ -964,18 +901,18 @@ issues.unlock.title=Avaa keskustelu tästä ongelmasta. issues.tracker=Ajan seuranta issues.start_tracking_short=Aloita ajanotto issues.start_tracking=Aloita ajan seuranta -issues.start_tracking_history=`aloitti työskentelyn %s` +issues.start_tracking_history=aloitti työskentelyn %s issues.tracker_auto_close=Ajan seuranta pysähtyy automaattisesti kun tämä ongelma on suljettu issues.stop_tracking=Pysäytä ajanotto -issues.stop_tracking_history=`lopetti työskentelyn %s` +issues.stop_tracking_history=lopetti työskentelyn %s issues.add_time=Lisää aika käsin issues.add_time_short=Lisää aika issues.add_time_cancel=Peruuta -issues.add_time_history=`lisäsi käytetyn ajan %s` +issues.add_time_history=lisäsi käytetyn ajan %s issues.add_time_hours=Tuntia issues.add_time_minutes=Minuuttia issues.add_time_sum_to_small=Aikaa ei syötetty. -issues.time_spent_from_all_authors=`Käytetty kokonaisaika: %s` +issues.time_spent_from_all_authors=Käytetty kokonaisaika: %s issues.due_date=Määräpäivä issues.push_commit_1=lisäsi %d commitin %s issues.push_commits_n=lisäsi %d committia %s @@ -1003,8 +940,6 @@ issues.reference_issue.body=Kuvaus issues.content_history.deleted=poistettu issues.content_history.edited=muokattu issues.content_history.created=luotu - - pulls.new=Uusi vetopyyntö pulls.compare_changes=Uusi vetopyyntö pulls.has_viewed_file=Katsottu @@ -1014,7 +949,7 @@ pulls.filter_branch=Suodata branch pulls.no_results=Tuloksia ei löytynyt. pulls.nothing_to_compare=Nämä haarat vastaavat toisiaan. Ei ole tarvetta luoda vetopyyntöä. pulls.nothing_to_compare_and_allow_empty_pr=Nämä haarat vastaavat toisiaan. Vetopyyntö tulee olemaan tyhjä. -pulls.has_pull_request=`Vetopyyntö haarojen välillä on jo olemassa: %[2]s#%[3]d` +pulls.has_pull_request=Vetopyyntö haarojen välillä on jo olemassa: %[2]s#%[3]d pulls.create=Luo Pull-pyyntö pulls.title_desc=haluaa yhdistää %[1]d committia lähteestä %[2]s kohteeseen %[3]s pulls.merged_title_desc=yhdistetty %[1]d committia lähteestä %[2]s kohteeseen %[3]s %[4]s @@ -1023,18 +958,11 @@ pulls.tab_commits=Commitit pulls.tab_files=Muuttuneet tiedostot pulls.merged=Yhdistetty pulls.has_merged=Vetopyyntö on yhdistetty. -pulls.title_wip_desc=`Aloita otsikko sanalla %s estääksesi vetopyynnön yhdistämisen vahingossa.` +pulls.title_wip_desc=Aloita otsikko sanalla %s estääksesi vetopyynnön yhdistämisen vahingossa. pulls.add_prefix=Lisää %s etuliite pulls.remove_prefix=Poista %s etuliite pulls.can_auto_merge_desc=Tämä pull-pyyntö voidaan yhdistää automaattisesti. - - ; %[2]s
    %[3]s     - - - - - milestones.new=Uusi merkkipaalu milestones.closed=Suljettu %s milestones.no_due_date=Ei määräpäivää @@ -1052,10 +980,7 @@ milestones.modify=Päivitä merkkipaalu milestones.edit_success=Merkkipaalu '%s' on päivitetty. milestones.filter_sort.most_issues=Eniten ongelmia milestones.filter_sort.least_issues=Vähiten ongelmia - signing.wont_sign.always=Commitit ovat aina allekirjoitettuja - - wiki=Wiki wiki.welcome=Tervetuloa Wikiin. wiki.welcome_desc=Wikissä voit kirjoittaa ja jakaa dokumentaatiota käyttäjien kesken. @@ -1072,7 +997,6 @@ wiki.delete_page_button=Poista sivu wiki.page_already_exists=Wiki-sivu, jolla on sama nimi on jo olemassa. wiki.pages=Sivut wiki.last_updated=Viimeksi päivitetty: %s - activity=Toiminta activity.period.filter_label=Aikajakso: activity.period.daily=1 päivä @@ -1104,9 +1028,7 @@ activity.git_stats_addition_n=%d lisäystä activity.git_stats_and_deletions=ja activity.git_stats_deletion_1=%d poisto activity.git_stats_deletion_n=%d poistoa - search=Haku - settings=Asetukset settings.options=Repo settings.collaboration.admin=Ylläpitäjä @@ -1231,8 +1153,8 @@ settings.protect_merge_whitelist_committers_desc=Salli vain listaan merkittyjen settings.protect_merge_whitelist_users=Lista käyttäjistä joilla yhdistämis-oikeus: settings.protect_required_approvals=Vaadittavat hyväksynnät: settings.protect_approvals_whitelist_users=Sallittujen tarkastajien lista: -settings.protect_protected_file_patterns_desc=Suojatut tiedostot, joita ei voi muuttaa suoraan, vaikka käyttäjällä olisi oikeudet lisätä, muokata tai poistaa tiedostoja tässä haarassa. Useita malleja voidaan erottaa puolipisteellä ('\;'). Katso github.com/gobwas/glob dokumentaatio mallisyntaksille. Esimerkkejä: .drone.yml, /docs/**/*.txt. -settings.protect_unprotected_file_patterns_desc=Suojaamattomat tiedostot, joita voidaan muuttaa suoraan, jos käyttäjällä on kirjoitusoikeudet, ohittaen push-rajoituksen. Useita kuvioita voidaan erottaa puolipisteellä ('\;'). Katso github.com/gobwas/glob dokumentaatio kuviosyntaksille. Esimerkkejä: .drone.yml, /docs/**/*.txt. +settings.protect_protected_file_patterns_desc=Suojatut tiedostot, joita ei voi muuttaa suoraan, vaikka käyttäjällä olisi oikeudet lisätä, muokata tai poistaa tiedostoja tässä haarassa. Useita malleja voidaan erottaa puolipisteellä (';'). Katso github.com/gobwas/glob dokumentaatio mallisyntaksille. Esimerkkejä: .drone.yml, /docs/**/*.txt. +settings.protect_unprotected_file_patterns_desc=Suojaamattomat tiedostot, joita voidaan muuttaa suoraan, jos käyttäjällä on kirjoitusoikeudet, ohittaen push-rajoituksen. Useita kuvioita voidaan erottaa puolipisteellä (';'). Katso github.com/gobwas/glob dokumentaatio kuviosyntaksille. Esimerkkejä: .drone.yml, /docs/**/*.txt. settings.update_protect_branch_success=Haaran '%s' suojaus on päivitetty. settings.remove_protected_branch_success=Haaran '%s' suojaus on poistettu käytöstä. settings.choose_branch=Valitse haara… @@ -1278,7 +1200,6 @@ settings.lfs_pointers.oid=OID settings.lfs_pointers.inRepo=Repossa settings.lfs_pointers.exists=Löytyy varastosta settings.lfs_pointers.accessible=Saatavilla käyttäjälle - diff.browse_source=Selaa lähdekoodia diff.parent=vanhempi diff.commit=commit @@ -1306,7 +1227,6 @@ diff.review.header=Lähetä arvio diff.review.comment=Kommentoi diff.review.approve=Hyväksy diff.review.reject=Pyydä muutoksia - release.releases=Julkaisut release.tags=Tagit release.new_release=Uusi julkaisu @@ -1334,18 +1254,33 @@ release.deletion_tag_desc=Poistetaanko tämä tagi reposta? Repon sisältö ja h release.deletion_tag_success=Tagi on poistettu. release.tag_name_invalid=Tagin nimi ei ole kelvollinen. release.downloads=Lataukset - branch.name=Haaran nimi branch.delete_head=Poista branch.delete=Poista haara '%s' branch.create_branch=Luo haara %s - - - topic.manage_topics=Hallitse aiheita topic.done=Valmis - - +desc.archived=Arkistoidut +project_board=Projektit +packages=Paketit +projects.template.desc=Malli +issues.new.projects=Projektit +issues.deleted_project=(poistettu) +issues.filter_project=Projekti +issues.filter_poster=Tekijä +issues.action_assignee=Osoitettu henkilölle +issues.draft_title=Työversio +issues.label_description=Kuvaus +issues.delete=Poista +activity.merged_prs_label=Yhdistetty +search.match=Osuma +search.code_no_results=Hakuehtoasi vastaavaa lähdekoodia ei löytynyt. +settings.trust_model.collaborator=Yhteistyökumppani +settings.webhook_deletion=Poista webkoukku +settings.event_wiki=Wiki +settings.event_issues=Ongelmat +diff.review.placeholder=Tarkistuksen kommentti +release.deletion=Poista julkaisu [org] org_name_holder=Organisaatio @@ -1366,9 +1301,7 @@ team_name_helper=Tiimin nimen tulisi olla lyhyt ja mieleenpainuva. team_desc_helper=Kuvaile tiimin tarkoitusta tai roolia. team_permission_desc=Käyttöoikeus team_unit_desc=Salli pääsy repon osioihin - form.name_reserved=Organisaation nimi '%s' on varattu. - settings=Asetukset settings.options=Organisaatio settings.full_name=Kokonimi @@ -1381,15 +1314,12 @@ settings.visibility.limited=Rajoitettu (näkyvä vain kirjautuneille käyttäjil settings.visibility.limited_shortname=Rajattu settings.visibility.private=Yksityinen (näkyvä vain organisaation jäsenille) settings.visibility.private_shortname=Yksityinen - settings.update_settings=Päivitä asetukset settings.delete=Poista organisaatio settings.delete_account=Poista tämä organisaatio settings.delete_prompt=Organisaatio poistetaan pysyvästi, ja tätä EI VOI peruuttaa myöhemmin! settings.confirm_delete_account=Vahvista poisto settings.hooks_desc=Lisää webkoukkuja, jotka suoritetaan kaikissa repoissa tässä organisaatiossa. - - members.membership_visibility=Jäsenyyden näkyvyys: members.public=Näkyvä members.public_helper=tee piilotettu @@ -1402,7 +1332,6 @@ members.remove=Poista members.leave=Poistu members.invite_desc=Lisää uusi jäsen %s: members.invite_now=Kutsu nyt - teams.join=Liity teams.leave=Poistu teams.read_access_helper=Tiimin jäsenet voivat katsella ja kloonata tiimin varastoja. @@ -1426,6 +1355,10 @@ teams.repositories=Tiimin repot teams.add_nonexistent_repo=Repo jota yrität lisätä ei ole vielä olemassa, ole hyvä ja luo se ensin. teams.members.none=Ei jäseniä tässä tiimissä. teams.all_repositories=Kaikki repot +members=Jäsenet +settings.repoadminchangeteam=Repon ylläpitäjä voi lisätä ja poistaa pääsyn tiimeihin +settings.delete_org_title=Poista organisaatio +teams.read_access=Luettu [admin] dashboard=Kojelauta @@ -1440,7 +1373,6 @@ monitor=Valvonta first_page=Ensimmäinen last_page=Viimeisin total=Yhteensä: %d - dashboard.statistic=Yhteenveto dashboard.operations=Huoltotoimet dashboard.system_status=Järjestelmän tila @@ -1476,7 +1408,6 @@ dashboard.total_gc_time=Yhteensä GC tauko dashboard.total_gc_pause=Yhteensä GC tauko dashboard.last_gc_pause=Viime GC tauko dashboard.gc_times=GC aikoja - users.user_manage_panel=Tilien hallinta users.new_account=Luo käyttäjätili users.name=Käyttäjätunnus @@ -1516,7 +1447,6 @@ users.list_status_filter.is_prohibit_login=Kirjautuminen estetty users.list_status_filter.not_prohibit_login=Kirjautuminen sallittu users.list_status_filter.is_2fa_enabled=2FA käytössä users.list_status_filter.not_2fa_enabled=2FA ei käytössä - emails.email_manage_panel=Käyttäjien sähköpostien hallinta emails.primary=Ensisijainen emails.activated=Aktivoitu @@ -1525,13 +1455,11 @@ emails.filter_sort.email_reverse=Sähköposti (käänteinen) emails.filter_sort.name=Käyttäjänimi emails.filter_sort.name_reverse=Käyttäjänimi (käänteinen) emails.duplicate_active=Tämä sähköpostiosoite on jo käytössä toisella käyttäjällä. - orgs.org_manage_panel=Organisaatioiden hallinta orgs.name=Nimi orgs.teams=Tiimit orgs.members=Jäsenet orgs.new_orga=Uusi organisaatio - repos.repo_manage_panel=Repojen hallinta repos.owner=Omistaja repos.name=Nimi @@ -1541,11 +1469,7 @@ repos.stars=Tähdet repos.forks=Haarat repos.issues=Ongelmat repos.size=Koko - packages.owner=Omistaja - - - auths.new=Lisää todennuslähde auths.name=Nimi auths.type=Tyyppi @@ -1584,7 +1508,6 @@ auths.delete_auth_title=Todennuslähteen poisto auths.delete_auth_desc=Todennuslähteen poisto estää käyttäjiä käyttämästä sitä kirjautumiseen. Jatketaanko? auths.deletion_success=Todennuslähde on poistettu. auths.login_source_exist=Todennuslähde '%s' on jo olemassa. - config.server_config=Palvelin asetukset config.app_name=Sivuston otsikko config.app_ver=Gitea versio @@ -1595,7 +1518,6 @@ config.repo_root_path=Repon juuren polku config.static_file_root_path=Staattisen tiedoston juuren polku config.script_type=Komentosarjan tyyppi config.reverse_auth_user=Käänteinen todennus käyttäjä - config.ssh_config=SSH asetukset config.ssh_enabled=Käytössä config.ssh_port=Portti @@ -1605,9 +1527,7 @@ config.ssh_key_test_path=Polku jossa avaimet testataan config.ssh_keygen_path=Keygen ('ssh-keygen') polku config.ssh_minimum_key_size_check=Avaimen vähimmäiskoko tarkistus config.ssh_minimum_key_sizes=Avaimen vähimmäiskoot - config.lfs_enabled=Käytössä - config.db_config=Tietokannan asetukset config.db_type=Tyyppi config.db_host=Isäntä @@ -1615,7 +1535,6 @@ config.db_name=Nimi config.db_user=Käyttäjätunnus config.db_ssl_mode=SSL config.db_path=Polku - config.service_config=Palvelu asetukset config.show_registration_button=Näytä rekisteröidy painike config.disable_key_size_check=Poista käytöstä avaimen vähimmäiskoko tarkistus @@ -1623,23 +1542,18 @@ config.enable_captcha=Ota CAPTCHA käyttöön config.active_code_lives=Aktiivinen koodi elämät ennen vanhenemista config.default_keep_email_private=Piilota sähköpostiosoitteet oletuksena config.default_visibility_organization=Uuden organisaation oletusnäkyvyys - config.webhook_config=Webkoukku asetukset config.queue_length=Jonon pituus config.deliver_timeout=Toimitus aikakatkaisu - config.mailer_enabled=Käytössä config.mailer_name=Nimi config.mailer_user=Käyttäjä - config.oauth_config=OAuth asetukset config.oauth_enabled=Käytössä - config.cache_config=Välimuistin asetukset config.cache_adapter=Välimuistin sovitin config.cache_interval=Välimuistin aikaväli config.cache_conn=Välimuistin yhteys merkkijono - config.session_config=Istunnon asetukset config.session_provider=Istunnon toimittaja config.provider_config=Toimittajan asetukset @@ -1648,22 +1562,17 @@ config.gc_interval_time=GC aikaväli aika config.session_life_time=Istunnon elinikä config.https_only=Vain HTTPS config.cookie_life_time=Evästeen elinikä - config.picture_service=Kuva palvelu config.disable_gravatar=Poista käytöstä Gravatar - config.git_gc_args=Roskienkeruun parametrit config.git_migrate_timeout=Migraatio aikakatkaistiin config.git_mirror_timeout=Peilauspäivitys aikakatkaistiin config.git_clone_timeout=Kloonaus aikakatkaistiin config.git_gc_timeout=Roskienkeruu aikakatkaistiin - config.log_config=Loki asetukset config.log_mode=Loki tila config.disabled_logger=Pois käytöstä config.access_log_template=Malli - - monitor.cron=Cron tehtävät monitor.name=Nimi monitor.schedule=Aikataulu @@ -1678,9 +1587,6 @@ monitor.queue=Jono: %s monitor.queue.name=Nimi monitor.queue.type=Tyyppi monitor.queue.pool.addworkers.desc=Lisää käsittelijöitä tähän pooliin aikakatkaisulla tai ilman. Jos asetat aikakatkaisun, nämä käsittelijät poistetaan poolista kun aikakatkaisu on päättynyt. - - - notices.system_notice_list=Järjestelmän ilmoitukset notices.actions=Toiminnot notices.select_all=Valitse kaikki @@ -1692,6 +1598,13 @@ notices.type=Tyyppi notices.type_1=Repo notices.desc=Kuvaus notices.op=Toiminta +packages.name=Nimi +packages.type=Tyyppi +packages.repository=Repo +packages.size=Koko +config.mailer_smtp_addr=SMTP osoite +config.mailer_smtp_port=SMTP portti +monitor.queue.settings.submit=Päivitä asetukset [action] create_repo=luotu repo %s @@ -1765,4 +1678,19 @@ nuget.documentation=Lisätietoa NuGet-rekisteristä löydät dokumentaatiosta. pypi.documentation=Lisätietoa PyPI-rekisteristä löydät dokumentaatiosta. rubygems.documentation=Lisätietoa RubyGems-rekisteristä löydät dokumentaatiosta. - +conan.details.repository=Repo +owner.settings.cleanuprules.enabled=Käytössä + +[aria] + +[secrets] +name=Nimi + +[actions] +runners.name=Nimi +runners.owner_type=Tyyppi +runners.description=Kuvaus +runners.task_list.run=Suorita +runners.task_list.repository=Repo +runners.task_list.commit=Commit +runs.commit=Commit diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini index c5c140404a5c..a8bff5562e32 100644 --- a/options/locale/locale_fr-FR.ini +++ b/options/locale/locale_fr-FR.ini @@ -23,7 +23,6 @@ enable_javascript=Ce site fonctionne mieux avec JavaScript. toc=Sommaire licenses=Licences return_to_gitea=Revenir à Gitea - username=Nom d'utilisateur email=Adresse e-mail password=Mot de passe @@ -33,7 +32,6 @@ captcha=CAPTCHA twofa=Authentification à deux facteurs twofa_scratch=Code de secours pour l'authentification à deux facteurs passcode=Code d'accès - webauthn_insert_key=Insérez votre clé de sécurité webauthn_sign_in=Appuyez sur le bouton de votre clé de sécurité. Si votre clé de sécurité n'a pas de bouton, réinsérez-la. webauthn_press_button=Veuillez appuyer sur le bouton de votre clé de sécurité… @@ -47,7 +45,6 @@ webauthn_error_duplicated=La clé de sécurité n'est pas autorisée pour cette webauthn_error_empty=Vous devez définir un nom pour cette clé. webauthn_error_timeout=Le délai d'attente imparti a été atteint avant que votre clé ne puisse être lue. Veuillez recharger la page pour réessayer. webauthn_reload=Recharger - repository=Dépôt organization=Organisation mirror=Miroir @@ -65,18 +62,15 @@ settings=Paramètres your_profile=Profil your_starred=Favoris your_settings=Configuration - all=Tous sources=Sources mirrors=Miroirs collaborative=Collaboratif forks=Bifurcations - activities=Activités pull_requests=Demandes d'ajout issues=Tickets milestones=Jalons - ok=OK cancel=Annuler save=Enregistrer @@ -85,26 +79,22 @@ add_all=Tout Ajouter remove=Retirer remove_all=Tout Retirer edit=Éditer - copy=Copier copy_url=Copier l'URL copy_branch=Copier le nom de la branche copy_success=Copié ! copy_error=Échec de la copie - write=Écrire preview=Aperçu loading=Chargement… - step1=Étape 1: step2=Étape 2: - error=Erreur error404=La page que vous essayez d'atteindre n'existe pas ou vous n'êtes pas autorisé à la voir. - never=Jamais - rss_feed=Flux RSS +enabled=Activé +disabled=Désactivé [filter] @@ -157,7 +147,6 @@ err_empty_admin_email=L'adresse e-mail de l'administrateur ne peut pas être vid err_admin_name_is_reserved=Le nom d'utilisateur de l'administrateur est invalide, le nom d'utilisateur est réservé err_admin_name_pattern_not_allowed=Le nom d'utilisateur de l'administrateur est invalide, le nom d'utilisateur est réservé err_admin_name_is_invalid=Le nom d'utilisateur de l'administrateur est invalide - general_title=Configuration générale app_name=Titre du site app_name_helper=Entrez ici le nom de votre société. @@ -177,7 +166,6 @@ app_url=URL de base de Gitea app_url_helper=Adresse HTTP(S) de base pour les clones git et les notifications par e-mail. log_root_path=Chemin des journaux log_root_path_helper=Les fichiers de journalisation seront écrits dans ce répertoire. - optional_title=Paramètres facultatifs email_title=Paramètres E-mail smtp_addr=Hôte SMTP @@ -235,7 +223,7 @@ default_enable_timetracking_popup=Activer le suivi du temps pour les nouveaux d no_reply_address=Domaine pour les e-mails cachés no_reply_address_helper=Nom de domaine pour les utilisateurs possédant une adresse email cachée. Par exemple, le nom d’utilisateur « joe » sera enregistré dans Git comme « joe@noreply.example.org » si le domaine pour les e-mails cachés a la valeur « noreply.example.org ». password_algorithm=Algorithme de hachage du mot de passe -password_algorithm_helper=Définissez l'algorithme de hachage du mot de passe. Les algorithmes ont des exigences matérielles et une force différentes. `argon2` a de bonnes caractéristiques mais utilise beaucoup de mémoire et peut être inapproprié pour les systèmes limités en ressources. +password_algorithm_helper="""Définissez l'algorithme de hachage du mot de passe. Les algorithmes ont des exigences matérielles et une force différentes. `argon2` a de bonnes caractéristiques mais utilise beaucoup de mémoire et peut être inapproprié pour les systèmes limités en ressources.""" [home] uname_holder=Nom d'utilisateur ou adresse e-mail @@ -251,17 +239,14 @@ search_repos=Trouver un dépôt … filter=Autres filtres filter_by_team_repositories=Dépôts filtrés par équipe feed_of=Flux de « %s » - show_archived=Archivé show_both_archived_unarchived=Afficher à la fois archivé et non archivé show_only_archived=Afficher uniquement les archivés show_only_unarchived=Afficher uniquement les non archivés - show_private=Privé show_both_private_public=Afficher les publics et privés show_only_private=Afficher uniquement les privés show_only_public=Afficher uniquement les publics - issues.in_your_repos=Dans vos dépôts [explore] @@ -285,7 +270,6 @@ code_last_indexed_at=Dernière indexation %s relevant_repositories_tooltip=Les dépôts qui sont des forks ou qui n'ont aucun sujet, aucune icône et aucune description sont cachés. relevant_repositories=Seuls les dépôts pertinents sont affichés, afficher les résultats non filtrés. - [auth] create_new_account=Créer un compte register_helper_msg=Déjà enregistré ? Connectez-vous ! @@ -358,31 +342,24 @@ password_pwned_err=Impossible d'envoyer la demande à HaveIBeenPwned view_it_on=Voir sur %s link_not_working_do_paste=Le lien ne fonctionne pas ? Essayez de le copier-coller dans votre navigateur. hi_user_x=Bonjour %s, - activate_account=Veuillez activer votre compte activate_account.title=%s, veuillez activer votre compte activate_account.text_1=Bonjour %[1]s, merci de votre inscription chez %[2]s! activate_account.text_2=Veuillez cliquer sur ce lien pour activer votre compte chez %s: - activate_email=Veuillez vérifier votre adresse e-mail activate_email.title=%s, veuillez vérifier votre adresse de courriel activate_email.text=Veuillez cliquer sur le lien suivant pour vérifier votre adresse de courriel dans %s: - register_notify=Bienvenue sur Gitea register_notify.title=%[1]s, bienvenue à %[2]s register_notify.text_1=ceci est votre courriel de confirmation d'inscription pour %s! register_notify.text_2=Vous pouvez maintenant vous connecter avec le nom d'utilisateur : %s. register_notify.text_3=Si ce compte a été créé pour vous, veuillez définir votre mot de passe d'abord. - reset_password=Récupérer votre compte reset_password.title=%s, vous avez demandé à récupérer votre compte reset_password.text=Veuillez cliquer sur le lien suivant pour récupérer votre compte dans %s: - register_success=Inscription réussie - issue_assigned.pull=@%[1]s vous a assigné à la demande d’ajout %[2]s dans le dépôt %[3]s. issue_assigned.issue=@%[1]s vous a assigné le ticket %[2]s dans le dépôt %[3]s. - issue.x_mentioned_you=@%s vous a mentionné: issue.action.force_push=%[1]s a forcé la mise à jour de %[2]s depuis %[3]s vers %[4]s. issue.action.push_1=@%[1]s a mis à jour le commit %[3]d vers %[2]s @@ -397,7 +374,6 @@ issue.action.review_dismissed=@%[1]s a rejeté la dernière révision de issue.action.ready_for_review=@%[1]s a marqué cette demande d'ajout prête à être revue. issue.action.new=@%[1]s a créé #%[2]d. issue.in_tree_path=Dans %s: - release.new.subject=%s publiée dans %s release.new.text=@%[1]s a publié [2]s dans %[3]s release.title=Titre: %s @@ -405,16 +381,13 @@ release.note=Remarque : release.downloads=Téléchargements : release.download.zip=Code source (ZIP) release.download.targz=Code source (TAR.GZ) - repo.transfer.subject_to=%s aimerait transférer "%s" à %s repo.transfer.subject_to_you=%s aimerait vous transférer "%s" repo.transfer.to_you=vous repo.transfer.body=Pour l'accepter ou le rejeter, visitez %s ou ignorez-le. - repo.collaborator.added.subject=%s vous a ajouté à %s repo.collaborator.added.text=Vous avez été ajouté en tant que collaborateur du dépôt : - [modal] yes=Oui no=Non @@ -432,34 +405,30 @@ PayloadUrl=URL des données utiles TeamName=Nom de l'équipe AuthName=Nom d'autorisation AdminEmail=E-mail de l'administrateur - NewBranchName=Nouveau nom de la branche CommitSummary=Résumé de la révision CommitMessage=Message de révision CommitChoice=Choix de révision TreeName=Chemin du fichier Content=Contenu - SSPISeparatorReplacement=Séparateur SSPIDefaultLanguage=Langue par défaut - -require_error=` ne peut pas être vide.` -alpha_dash_error=` ne doit contenir que des caractères alphanumériques, des tirets ("-") et des tirets bas (" _ ").` -alpha_dash_dot_error=` ne doit contenir que des caractères alphanumériques, des tirets ("-"), des tirets bas ("_"), et des points. (".").` -git_ref_name_error=` doit être un nom de référence Git bien formé.` -size_error=` doit être à la taille de %s.` -min_size_error=` %s caractères minimum ` -max_size_error=` %s caractères maximum ` -email_error=` adresse e-mail invalide ` -url_error=`'%s' n'est pas une URL valide.` -include_error=`doit contenir la sous-chaîne '%s'.` -glob_pattern_error=` le motif de développement est invalide : %s.` -regex_pattern_error=` le motif regex est invalide : %s.` +require_error=" ne peut pas être vide." +alpha_dash_error=" ne doit contenir que des caractères alphanumériques, des tirets ("-") et des tirets bas (" _ ")." +alpha_dash_dot_error=" ne doit contenir que des caractères alphanumériques, des tirets ("-"), des tirets bas ("_"), et des points. (".")." +git_ref_name_error=" doit être un nom de référence Git bien formé." +size_error=" doit être à la taille de %s." +min_size_error=" %s caractères minimum " +max_size_error=" %s caractères maximum " +email_error=" adresse e-mail invalide " +url_error='%s' n'est pas une URL valide. +include_error=doit contenir la sous-chaîne '%s'. +glob_pattern_error=" le motif de développement est invalide : %s." +regex_pattern_error=" le motif regex est invalide : %s." unknown_error=Erreur inconnue : captcha_incorrect=Le code CAPTCHA est incorrect. password_not_match=Les mots de passe ne correspondent pas. lang_select_error=Sélectionnez une langue dans la liste. - username_been_taken=Le nom d'utilisateur est déjà pris. username_change_not_local_user=Les utilisateurs non-locaux n'ont pas le droit de modifier leur nom d'utilisateur. repo_name_been_taken=Ce nom de dépôt est déjà utilisé. @@ -490,19 +459,16 @@ user_not_exist=Cet utilisateur n'existe pas. team_not_exist=L'équipe n'existe pas. last_org_owner=Vous ne pouvez pas retirer le dernier utilisateur de l’équipe « propriétaires ». Il doit y avoir au moins un propriétaire dans chaque organisation. cannot_add_org_to_team=Une organisation ne peut être ajoutée comme membre d'une équipe. - invalid_ssh_key=Impossible de vérifier votre clé SSH : %s invalid_gpg_key=Impossible de vérifier votre clé GPG : %s invalid_ssh_principal=Principal invalide : %s unable_verify_ssh_key=Impossible de vérifier la clé SSH ; veuillez vérifier que vous n'avez pas fait d'erreur. auth_failed=Échec d'authentification : %v - still_own_repo=Ce compte possède toujours un ou plusieurs dépôts, vous devez d'abord les supprimer ou les transférer. still_has_org=Votre compte est un membre d’une ou plusieurs organisations, veuillez d'abord les quitter. still_own_packages=Votre compte possède toujours un ou plusieurs paquets, vous devez d'abord les supprimer ou les transférer. org_still_own_repo=Cette organisation possède encore un ou plusieurs dépôts. Vous devez d'abord les supprimer ou les transférer. org_still_own_packages=Cette organisation possède encore un ou plusieurs paquets. Vous devez d'abord les supprimer. - target_branch_not_exist=La branche cible n'existe pas. [user] @@ -521,9 +487,8 @@ unfollow=Ne plus suivre heatmap.loading=Chargement de la Heatmap… user_bio=Biographie disabled_public_activity=Cet utilisateur a désactivé la visibilité publique de l'activité. - form.name_reserved=Le nom d’utilisateur "%s" est réservé. -form.name_pattern_not_allowed="%s" n'est pas autorisé dans un nom d'utilisateur. +form.name_pattern_not_allowed=`"%s" n'est pas autorisé dans un nom d'utilisateur.` form.name_chars_not_allowed=Le nom d'utilisateur '%s' contient des caractères non valides. [settings] @@ -544,12 +509,11 @@ account_link=Comptes associés organization=Organisations uid=ID d'Utilisateur webauthn=Clés de sécurité - public_profile=Profil public biography_placeholder=Parlez-nous un peu de vous profile_desc=Votre adresse e-mail sera utilisée pour les notifications et d'autres opérations. password_username_disabled=Les utilisateurs externes ne peuvent pas modifier leur nom d'utilisateur. Merci de contacter l'administrateur de votre site pour plus d'informations. -full_name=Nom complet +full_name=Non Complet website=Site Web location=Localisation update_theme=Mise à jour du thème @@ -563,7 +527,7 @@ change_username_prompt=Remarque : changer votre nom d'utilisateur change égalem change_username_redirect_prompt=L'ancien nom d'utilisateur sera redirigé jusqu'à ce qu'il soit réclamé. continue=Continuer cancel=Annuler -language=Langues +language=Langue ui=Thème hidden_comment_types=Texte de commentaires caché comment_type_group_reference=Référence @@ -584,7 +548,6 @@ saved_successfully=Vos paramètres ont été enregistrés avec succès. privacy=Confidentialité keep_activity_private=Masquer l'activité de la page de profil keep_activity_private_popup=Rend l'activité visible uniquement pour vous et les administrateurs - lookup_avatar_by_mail=Rechercher un avatar par adresse e-mail federated_avatar_lookup=Recherche d'avatars unifiés enable_custom_avatar=Activer l'avatar personnalisé @@ -595,7 +558,6 @@ uploaded_avatar_not_a_image=Le fichier téléversé n'est pas une image. uploaded_avatar_is_too_big=Le fichier téléversé dépasse la taille maximale. update_avatar_success=Votre avatar a été mis à jour. update_user_avatar_success=L'avatar de l'utilisateur a été mis à jour. - change_password=Modifier le mot de passe old_password=Mot de passe actuel new_password=Nouveau mot de passe @@ -603,7 +565,6 @@ retype_new_password=Retapez le nouveau mot de passe password_incorrect=Le mot de passe actuel est incorrect. change_password_success=Votre mot de passe a été mis à jour. Désormais, connectez-vous avec votre nouveau mot de passe. password_change_disabled=Les mots de passes des comptes utilisateurs externes ne peuvent pas être modifiées depuis l'interface web Gitea. - emails=Adresses e-mail manage_emails=Gérer les adresses de courriel manage_themes=Sélectionner le thème par défaut @@ -616,7 +577,7 @@ requires_activation=Nécessite une activation primary_email=Faire de cette adresse votre adresse principale activate_email=Envoyer l'activation activations_pending=Activations en attente -delete_email=Supprimer +delete_email=Exclure email_deletion=Supprimer l'adresse e-mail email_deletion_desc=L'adresse e-mail et les informations connexes seront retirées de votre compte. Les révisions Git effectués par cette adresse resteront inchangées. Continuer ? email_deletion_success=L'adresse e-mail a été supprimée. @@ -636,7 +597,6 @@ add_openid_success=La nouvelle adresse OpenID a été ajoutée. keep_email_private=Cacher l'adresse e-mail keep_email_private_popup=Votre adresse e-mail sera cachée aux autres utilisateurs. openid_desc=OpenID vous permet de confier l'authentification à une tierce partie. - manage_ssh_keys=Gérer les clés SSH manage_ssh_principals=Gérer les principaux certificats SSH manage_gpg_keys=Gérer les clés GPG @@ -644,7 +604,7 @@ add_key=Ajouter une clé ssh_desc=Ces clefs SSH publiques sont associées à votre compte. Les clefs privées correspondantes permettent l'accès complet à vos dépôts. principal_desc=Ces principaux certificats SSH sont associés à votre compte et permettent un accès complet à vos dépôts. gpg_desc=Ces clefs GPG sont associées avec votre compte. Conservez-les en lieu sûr car elles permettent la vérification de vos révisions. -ssh_helper=Besoin d'aide ? Consultez le guide Github pour générer votre clé SSH ou résoudre les problèmes courants que vous pouvez rencontrer en utilisant SSH. +ssh_helper=Besoin d'aide ? Consultez le guide Github pour GPG. add_new_key=Ajouter une clé SSH add_new_gpg_key=Ajouter une clé GPG @@ -687,7 +647,7 @@ principal_content=Contenu add_key_success=La clef SSH "%s" a été ajoutée. add_gpg_key_success=La clef GPG "%s" a été ajoutée. add_principal_success=Le certificat SSH principal '%s' a été ajouté. -delete_key=Supprimer +delete_key=Exclure ssh_key_deletion=Supprimer la clé SSH gpg_key_deletion=Supprimer la clé GPG ssh_principal_deletion=Supprimer le certificat SSH principal @@ -702,7 +662,7 @@ valid_until=Valide jusqu’à valid_forever=Valide pour toujours last_used=Dernière utilisation le no_activity=Aucune activité récente -can_read_info=Lecture +can_read_info=Lue(s) can_write_info=Écriture key_state_desc=Cette clé a été utilisée durant les 7 derniers jours token_state_desc=Ce jeton a été utilisé durant les 7 derniers jours @@ -715,7 +675,6 @@ manage_social=Gérer les réseaux sociaux associés social_desc=Ces réseaux sociaux sont liés à votre compte Gitea. Veuillez vous assurer que vous les reconnaissez tous car ils peuvent être utilisés pour se connecter à votre compte Gitea. unbind=Dissocier unbind_success=Le réseau social a été dissocié de votre compte Gitea. - manage_access_token=Gérer les jetons d'accès generate_new_token=Générer le nouveau jeton tokens_desc=Ces jetons permettent l'accès à votre compte à travers l'API Gitea. @@ -730,7 +689,6 @@ access_token_deletion_cancel_action=Annuler access_token_deletion_confirm_action=Supprimer access_token_deletion_desc=Supprimer un jeton révoquera l'accès à votre compte pour toutes les applications l'utilisant. Cette action est irréversible. Continuer ? delete_token_success=Ce jeton a été supprimé. Les applications l'utilisant n'ont plus accès à votre compte. - manage_oauth2_applications=Gérer les applications OAuth2 edit_oauth2_application=Modifier l'application OAuth2 oauth2_applications_desc=Les applications OAuth2 permettent à votre application tiers d'authentifier en toute sécurité les utilisateurs de cette instance Gitea. @@ -745,21 +703,19 @@ oauth2_application_name=Nom de l'Application oauth2_redirect_uri=URL de redirection save_application=Enregistrer oauth2_client_id=ID du client -oauth2_client_secret=Secret du Client +oauth2_client_secret=Secret du client oauth2_regenerate_secret=Régénérer le Secret oauth2_regenerate_secret_hint=Vous avez perdu votre secret ? oauth2_client_secret_hint=Le secret ne sera pas visible si vous revisitez cette page. Veuillez sauvegarder votre secret. -oauth2_application_edit=Modifier +oauth2_application_edit=Éditer oauth2_application_create_description=Les applications OAuth2 donnent à votre application tierce un accès aux comptes utilisateurs sur cette instance. oauth2_application_remove_description=Supprimer une application OAuth2 l'empêchera d'accéder aux comptes utilisateurs autorisés dans cette instance. Continuer ? - authorized_oauth2_applications=Applications OAuth2 autorisées authorized_oauth2_applications_description=Vous avez autorisé l'accès à votre compte Gitea à ces applications tierces. Veuillez révoquer l'accès aux applications qui ne sont plus nécessaires. revoke_key=Révoquer revoke_oauth2_grant=Révoquer l'accès revoke_oauth2_grant_description=Révoquer l'accès à cette application tierce empêchera cette application d'accéder à vos données. Êtes-vous sûr ? revoke_oauth2_grant_success=Vous avez révoqué l'accès avec succès. - twofa_desc=L'authentification à deux facteurs améliore la sécurité de votre compte. twofa_is_enrolled=Votre compte est inscrit à l'authentification à deux facteurs. twofa_not_enrolled=Votre compte n'est pas inscrit à l'authentification à deux facteurs. @@ -777,13 +733,11 @@ then_enter_passcode=Et entrez le mot de passe s'affichant dans l'application : passcode_invalid=Le mot de passe est invalide. Réessayez. twofa_enrolled=L'authentification à deux facteurs a été activée pour votre compte. Gardez votre jeton de secours (%s) en lieu sûr car il ne vous sera montré qu'une seule fois ! twofa_failed_get_secret=Impossible d'obtenir le secret. - webauthn_desc=Les clefs de sécurité sont des dispositifs matériels contenant des clefs cryptographiques. Elles peuvent être utilisées pour l'authentification à deux facteurs. La clef de sécurité doit supporter le standard WebAuthn Authenticator. webauthn_register_key=Ajouter une clé de sécurité webauthn_nickname=Pseudonyme webauthn_delete_key=Supprimer la clé de sécurité webauthn_delete_key_desc=Si vous retirez une clé de sécurité vous ne pourrez plus l'utiliser pour vous connecter. Continuer ? - manage_account_links=Gérer les comptes liés manage_account_links_desc=Ces comptes externes sont liés à votre compte Gitea. account_links_not_available=Il n'y a pour l'instant pas de compte externe connecté à votre compte Gitea. @@ -791,29 +745,25 @@ link_account=Lier un Compte remove_account_link=Supprimer un compte lié remove_account_link_desc=Supprimer un compte lié révoquera son accès à votre compte Gitea. Continuer ? remove_account_link_success=Le compte lié a été supprimé. - orgs_none=Vous n'êtes membre d'aucune organisation. repos_none=Vous ne possédez aucun dépôt - delete_account=Supprimer votre compte delete_prompt=Cette opération supprimera votre compte. Ceci NE PEUT PAS être annulé. delete_with_all_comments=Votre compte est plus jeune que %s. Pour éviter les commentaires fantôme, tous les commentaires de ticket/PR seront supprimés avec lui. -confirm_delete_account=Confirmer la suppression -delete_account_title=Supprimer un compte +confirm_delete_account=Confirmez la suppression +delete_account_title=Supprimer cet utilisateur delete_account_desc=Êtes-vous sûr de vouloir supprimer définitivement ce compte ? - email_notifications.enable=Activer les notifications par e-mail email_notifications.onmention=N'envoyer un e-mail que si vous êtes mentionné email_notifications.disable=Désactiver les notifications par email email_notifications.submit=Définir la préférence e-mail email_notifications.andyourown=Et vos propres notifications - visibility=Visibilité de l'utilisateur -visibility.public=Publique +visibility.public=Public visibility.public_tooltip=Visible par tous les utilisateurs -visibility.limited=Limitée +visibility.limited=Limité visibility.limited_tooltip=Visible uniquement par les utilisateurs connectés -visibility.private=Privée +visibility.private=Privé visibility.private_tooltip=Visible uniquement par les membres de l'organisation [repo] @@ -901,14 +851,12 @@ delete_preexisting=Supprimer les fichiers préexistants delete_preexisting_content=Supprimer les fichiers dans %s delete_preexisting_success=Supprimer les fichiers non adoptés dans %s blame_prior=Voir le blame avant cette modification - transfer.accept=Accepter le transfert transfer.accept_desc=Transférer à "%s" transfer.reject=Refuser le transfert transfer.reject_desc=Annuler le transfert à "%s" transfer.no_permission_to_accept=Vous n’avez pas la permission pour accepter transfer.no_permission_to_reject=Vous n'avez pas la permission pour rejeter - desc.private=Privé desc.public=Publique desc.private_template=Modèle privé @@ -916,7 +864,6 @@ desc.public_template=Modèle desc.internal=Interne desc.internal_template=Modèle interne desc.archived=Archivé - template.items=Élément du modèle template.git_content=Contenu Git (branche par défaut) template.git_hooks=Déclencheurs Git @@ -927,23 +874,20 @@ template.avatar=Avatar template.issue_labels=Étiquettes de ticket template.one_item=Vous devez sélectionner au moins un élément du modèle template.invalid=Vous devez sélectionner un modèle de dépôt - archive.title=Ce dépôt est archivé. Vous pouvez voir les fichiers et le cloner, mais vous ne pouvez pas pousser ni ouvrir de ticket/demande d'ajout. archive.issue.nocomment=Ce dépôt est archivé. Vous ne pouvez pas commenter de tickets. archive.pull.nocomment=Ce dépôt est archivé. Vous ne pouvez pas commenter de demande d'ajout. - form.reach_limit_of_creation_1=Vous avez déjà atteint la limite d'%d dépôt. form.reach_limit_of_creation_n=Vous avez déjà atteint la limite de %d dépôts. form.name_reserved=Le dépôt "%s" a un nom réservé. -form.name_pattern_not_allowed="%s" n'est pas autorisé dans un nom de dépôt. - +form.name_pattern_not_allowed=`"%s" n'est pas autorisé dans un nom de dépôt.` need_auth=Autorisation migrate_options=Options de migration migrate_service=Service de migration migrate_options_mirror_helper=Ce dépôt sera un miroir migrate_options_lfs=Migrer les fichiers LFS migrate_options_lfs_endpoint.label=Point d'accès LFS -migrate_options_lfs_endpoint.description=La migration va tenter d'utiliser votre dépôt Git distant pour déterminer le serveur LFS. Vous pouvez également spécifier un point d'accès personnalisé si les données LFS du dépôt sont stockées ailleurs. +migrate_options_lfs_endpoint.description=La migration va tenter d'utiliser votre dépôt Git distant pour %s` +issues.commented_at=a commenté %s issues.delete_comment_confirm=Êtes-vous certain de vouloir supprimer ce commentaire? issues.context.copy_link=Copier le lien issues.context.quote_reply=Citer et répondre @@ -1312,22 +1245,22 @@ issues.context.edit=Éditer issues.context.delete=Supprimer issues.no_content=Il n'existe pas encore de contenu. issues.close_issue=Fermer -issues.pull_merged_at=`révision fusionnée %[2]s dans %[3]s %[4]s` -issues.manually_pull_merged_at=`révision fusionnée %[2]s dans %[3]s manuellement %[4]s` +issues.pull_merged_at=révision fusionnée %[2]s dans %[3]s %[4]s +issues.manually_pull_merged_at=révision fusionnée %[2]s dans %[3]s manuellement %[4]s issues.close_comment_issue=Commenter et Fermer issues.reopen_issue=Réouvrir issues.reopen_comment_issue=Commenter et Réouvrir issues.create_comment=Créer un commentaire -issues.closed_at=`a fermé ce ticket %[2]s` -issues.reopened_at=`a réouvert ce ticket %[2]s` -issues.commit_ref_at=`a référencé ce ticket depuis une révision %[2]s` -issues.ref_issue_from=`a référencé ce ticket %[4]s %[2]s` -issues.ref_pull_from=`a référencé cette pull request %[4]s %[2]s` -issues.ref_closing_from=`a référence une pull request %[4]s qui va fermer ce ticket %[2]s` -issues.ref_reopening_from=`a référencé une pull request %[4]s qui va réouvrir ce ticket %[2]s` -issues.ref_closed_from=`a fermé ce ticket %[4]s %[2]s` -issues.ref_reopened_from=`a réouvert ce ticket %[4]s %[2]s` -issues.ref_from=`de %[1]s` +issues.closed_at=a fermé ce ticket %[2]s +issues.reopened_at=a réouvert ce ticket %[2]s +issues.commit_ref_at=a référencé ce ticket depuis une révision %[2]s +issues.ref_issue_from=a référencé ce ticket %[4]s %[2]s +issues.ref_pull_from=a référencé cette pull request %[4]s %[2]s +issues.ref_closing_from=a référence une pull request %[4]s qui va fermer ce ticket %[2]s +issues.ref_reopening_from=a référencé une pull request %[4]s qui va réouvrir ce ticket %[2]s +issues.ref_closed_from=a fermé ce ticket %[4]s %[2]s +issues.ref_reopened_from=a réouvert ce ticket %[4]s %[2]s +issues.ref_from=de %[1]s issues.poster=Éditeur issues.collaborator=Collaborateur issues.owner=Propriétaire @@ -1357,8 +1290,8 @@ issues.label.filter_sort.reverse_alphabetically=Par ordre alphabétique inversé issues.label.filter_sort.by_size=Plus petite taille issues.label.filter_sort.reverse_by_size=Plus grande taille issues.num_participants=%d participants -issues.attachment.open_tab=`Cliquez ici pour voir '%s' dans un nouvel onglet` -issues.attachment.download=`Cliquez pour télécharger "%s"` +issues.attachment.open_tab=Cliquez ici pour voir '%s' dans un nouvel onglet +issues.attachment.download=Cliquez pour télécharger "%s" issues.subscribe=S’abonner issues.unsubscribe=Se désabonner issues.lock=Verrouiller la conversation @@ -1383,31 +1316,31 @@ issues.comment_on_locked=Vous ne pouvez pas commenter un ticket verrouillé. issues.tracker=Suivi du temps issues.start_tracking_short=Démarrer le suivi de temps issues.start_tracking=Démarrer le suivi du temps -issues.start_tracking_history=`a démarré il y a %s` +issues.start_tracking_history=a démarré il y a %s issues.tracker_auto_close=Le suivi de temps sera automatiquement arrêté quand le ticket sera fermé -issues.tracking_already_started=`Vous avez déjà commencé à suivre le temps sur un autre ticket!` +issues.tracking_already_started=Vous avez déjà commencé à suivre le temps sur un autre ticket! issues.stop_tracking=Arrêter le suivi de temps -issues.stop_tracking_history=`a fini de travaillé pour %s` +issues.stop_tracking_history=a fini de travaillé pour %s issues.cancel_tracking=Annuler -issues.cancel_tracking_history=`a annulé le suivi de temps pour %s` +issues.cancel_tracking_history=a annulé le suivi de temps pour %s issues.add_time=Ajouter un minuteur manuellement issues.del_time=Supprimer ce journal des temps issues.add_time_short=Ajouter un minuteur issues.add_time_cancel=Annuler -issues.add_time_history=` temps passé ajouté %s` -issues.del_time_history=`a supprimé le temps passé %s` +issues.add_time_history=" temps passé ajouté %s" +issues.del_time_history=a supprimé le temps passé %s issues.add_time_hours=Heures issues.add_time_minutes=Minutes issues.add_time_sum_to_small=Aucun minuteur n'a été saisi. issues.time_spent_total=Temps passé total -issues.time_spent_from_all_authors=`Temps passé total : %s` +issues.time_spent_from_all_authors=Temps passé total : %s issues.due_date=Échéance issues.invalid_due_date_format=Le format de la date d'échéance est invalide, il doit être comme suit 'aaaa-mm-jj'. issues.error_modifying_due_date=Impossible de modifier l'échéance. issues.error_removing_due_date=Impossible de supprimer l'échéance. issues.push_commit_1=a ajouté %d révision %s issues.push_commits_n=a ajouté %d révisions %s -issues.force_push_codes=`a forcé la poussée %[1]s de %[2]s vers %[4]s %[6]s` +issues.force_push_codes=a forcé la poussée %[1]s de %[2]s vers %[4]s %[6]s issues.due_date_form=aaaa-mm-jj issues.due_date_form_add=Ajouter une échéance issues.due_date_form_edit=Éditer @@ -1423,8 +1356,8 @@ issues.dependency.add=Ajouter une dépendance… issues.dependency.cancel=Annuler issues.dependency.remove=Supprimer issues.dependency.remove_info=Supprimer cette dépendance -issues.dependency.added_dependency=`a ajouté une nouvelle dépendance %s` -issues.dependency.removed_dependency=`a supprimé une dépendance %s` +issues.dependency.added_dependency=a ajouté une nouvelle dépendance %s +issues.dependency.removed_dependency=a supprimé une dépendance %s issues.dependency.pr_closing_blockedby=La fermeture de cette demande d’ajout est bloquée par les tickets suivants issues.dependency.issue_closing_blockedby=La fermeture de ce ticket est bloquée par les tickets suivants issues.dependency.issue_close_blocks=Cette demande d'ajout empêche la clôture des tickets suivants @@ -1474,10 +1407,8 @@ issues.content_history.created=créé issues.content_history.delete_from_history=Supprimé de l’historique issues.content_history.delete_from_history_confirm=Supprimer de l’historique ? issues.content_history.options=Options - compare.compare_base=base compare.compare_head=comparer - pulls.desc=Activer les demandes de fusion et la revue de code. pulls.new=Nouvelle demande d'ajout pulls.view=Voir la demande d'ajout @@ -1494,7 +1425,7 @@ pulls.has_pull_request='Il existe déjà une demande d'ajout entre ces deux bran pulls.create=Créer une demande d'ajout pulls.title_desc=veut fusionner %[1]d révision(s) depuis %[2]s vers %[3]s pulls.merged_title_desc=a fusionné %[1]d révision(s) à partir de %[2]s vers %[3]s %[4]s -pulls.change_target_branch_at=`a changé la branche cible de %s à %s %s` +pulls.change_target_branch_at=a changé la branche cible de %s à %s %s pulls.tab_conversation=Discussion pulls.tab_commits=Révisions pulls.tab_files=Fichiers Modifiés @@ -1506,7 +1437,7 @@ pulls.manually_merged=Fusionné manuellement pulls.manually_merged_as=La demande d'ajout a été fusionnée manuellement en tant que %[2]s. pulls.is_closed=La demande de fusion a été fermée. pulls.has_merged=La pull request a été fusionnée. -pulls.title_wip_desc=`Préfixer le titre par %s pour empêcher cette demande d'ajout d'être fusionnée par erreur.` +pulls.title_wip_desc=Préfixer le titre par %s pour empêcher cette demande d'ajout d'être fusionnée par erreur. pulls.cannot_merge_work_in_progress=Cette demande d'ajout est marquée comme en cours de chantier. pulls.still_in_progress=Toujours en cours ? pulls.add_prefix=Ajouter le préfixe %s @@ -1535,7 +1466,6 @@ pulls.reject_count_n=%d changements requis pulls.waiting_count_1=%d en attente de revue pulls.waiting_count_n=%d en attente de revues pulls.wrong_commit_id=l'ID de la révision doit être un ID de révision sur la branche cible - pulls.no_merge_desc=Cette demande de fusion ne peut être appliquée directement car toutes les options de fusion du dépôt sont désactivées. pulls.no_merge_helper=Activez des options de fusion dans les paramètres du dépôt ou fusionnez la demande manuellement. pulls.no_merge_wip=Cette demande d'ajout ne peut pas être fusionnée car elle est marquée comme en cours de chantier. @@ -1548,7 +1478,6 @@ pulls.squash_merge_pull_request=Créer une révision de concaténation pulls.merge_manually=Fusionné manuellement pulls.merge_commit_id=L'ID de la révision de fusion pulls.require_signed_wont_sign=La branche nécessite des révisions signées mais cette fusion ne sera pas signée - pulls.invalid_merge_option=Vous ne pouvez pas utiliser cette option de fusion pour cette demande. pulls.merge_conflict=Échec de la fusion : il y a eu un conflit lors de la fusion. Indice : Essayez une autre stratégie pulls.merge_conflict_summary=Message d'erreur @@ -1559,7 +1488,7 @@ pulls.unrelated_histories=Échec de la fusion: La tête de fusion et la base ne pulls.merge_out_of_date=Échec de la fusion: La base a été mise à jour en cours de fusion. Indice : Réessayez. pulls.push_rejected_summary=Message de rejet complet pulls.push_rejected_no_message=Échec de la fusion : La poussée a été rejetée mais il n'y avait pas de message distant.
    Revoyez les Git Hooks pour ce dépot -pulls.open_unmerged_pull_exists=`Vous ne pouvez pas ré-ouvrir cette demande de fusion car il y a une demande de fusion (#%d) en attente avec des propriétés identiques.` +pulls.open_unmerged_pull_exists=Vous ne pouvez pas ré-ouvrir cette demande de fusion car il y a une demande de fusion (#%d) en attente avec des propriétés identiques. pulls.status_checking=Certains contrôles sont en attente pulls.status_checks_success=Tous les contrôles ont réussi pulls.status_checks_warning=Quelques vérifications ont signalé des avertissements @@ -1570,24 +1499,19 @@ pulls.status_checks_details=Détails pulls.update_branch_success=La mise à jour de la branche a réussi pulls.update_not_allowed=Vous n'êtes pas autorisé à mettre à jour la branche pulls.outdated_with_base_branch=Cette branche est désynchronisée avec la branche de base -pulls.closed_at=`a fermé cette pull request %[2]s` -pulls.reopened_at=`a réouvert cette pull request %[2]s` -pulls.merge_instruction_hint=`Vous pouvez également voir les instructions en ligne de commande.` +pulls.closed_at=a fermé cette pull request %[2]s +pulls.reopened_at=a réouvert cette pull request %[2]s +pulls.merge_instruction_hint=Vous pouvez également voir les instructions en ligne de commande. pulls.merge_instruction_step1_desc=Depuis le dépôt de votre projet, sélectionnez une nouvelle branche et testez les modifications. pulls.merge_instruction_step2_desc=Fusionner les modifications et mettre à jour sur Gitea. - pulls.auto_merge_newly_scheduled=La demande d'ajout était programmée pour fusionner lorsque toutes les vérifications aurait réussi. pulls.auto_merge_has_pending_schedule=%[1]s Ont planifié cette demande d'ajout pour fusionner automatiquement lorsque toutes les vérifications réussissent %[2]s. - pulls.auto_merge_not_scheduled=Cette demande d'ajout n'est pas planifiée pour fusionner automatiquement. pulls.auto_merge_canceled_schedule=La fusion automatique a été annulée pour cette demande d'ajout. - -pulls.auto_merge_newly_scheduled_comment=`a programmé cette demande de fusion automatique lorsque toutes les vérifications réussissent %[1]s` -pulls.auto_merge_canceled_schedule_comment=`a annulé la fusion automatique de cette demande d'ajout lorsque toutes les vérifications réussissent %[1]s` - +pulls.auto_merge_newly_scheduled_comment=a programmé cette demande de fusion automatique lorsque toutes les vérifications réussissent %[1]s +pulls.auto_merge_canceled_schedule_comment=a annulé la fusion automatique de cette demande d'ajout lorsque toutes les vérifications réussissent %[1]s pulls.delete.title=Supprimer cette demande d'ajout ? pulls.delete.text=Voulez-vous vraiment supprimer cet demande d'ajout ? (Cela supprimera définitivement tout le contenu. Envisagez de le fermer à la place, si vous avez l'intention de le garder archivé) - milestones.new=Nouveau jalon milestones.closed=%s fermé milestones.update_ago=Mis à jour il y a %s @@ -1617,7 +1541,6 @@ milestones.filter_sort.least_complete=Le moins complété milestones.filter_sort.most_complete=Le plus complété milestones.filter_sort.most_issues=Le plus de tickets milestones.filter_sort.least_issues=Le moins de tickets - signing.will_sign=Cette révision sera signée avec la clé '%s' signing.wont_sign.error=Une erreur s'est produite lors de la vérification de la signature de la révision signing.wont_sign.nokey=Il n'y a aucune clé disponible pour signer cette révision @@ -1631,9 +1554,7 @@ signing.wont_sign.headsigned=La fusion ne sera pas signée car la révision sour signing.wont_sign.commitssigned=La fusion ne sera pas signée car toutes les révisions associées ne sont pas signées signing.wont_sign.approved=La fusion ne sera pas signée car la PR n'a pas approuvée signing.wont_sign.not_signed_in=Vous n'êtes pas authentifié - ext_wiki.desc=Lier un wiki externe. - wiki=Wiki wiki.welcome=Bienvenue sur le Wiki. wiki.welcome_desc=Le wiki vous permet d'écrire ou de partager de la documentation avec vos collaborateurs. @@ -1656,7 +1577,6 @@ wiki.page_already_exists=Une page de wiki avec le même nom existe déjà. wiki.reserved_page=Le nom de page de wiki "%s" est réservé. wiki.pages=Pages wiki.last_updated=Dernière mise à jour: %s - activity=Activité activity.period.filter_label=Période: activity.period.daily=1 jour @@ -1722,13 +1642,11 @@ activity.git_stats_addition_n=%d ajouts activity.git_stats_and_deletions=et activity.git_stats_deletion_1=%d suppression activity.git_stats_deletion_n=%d suppressions - search=Chercher search.search_repo=Rechercher dans le dépôt search.fuzzy=Approximative search.match=Exacte search.results=Résultats de la recherche « %s » dans %s - settings=Paramètres settings.desc=Les paramètres sont l'endroit où gérer les options du dépôt settings.options=Dépôt @@ -1992,7 +1910,7 @@ settings.dismiss_stale_approvals=Rejeter les approbations obsolètes settings.dismiss_stale_approvals_desc=Quand de nouvelles révisions qui changent le contenu de la demande d'ajout sont poussées vers la branche, les anciennes approbations seront rejetées. settings.require_signed_commits=Exiger des révisions signées settings.require_signed_commits_desc=Rejeter les pushs vers cette branche s’ils ne sont pas signés ou vérifiables. -settings.protect_protected_file_patterns=Motifs des fichiers protégés (séparés par un point-virgule '\;') : +settings.protect_protected_file_patterns=Motifs des fichiers protégés (séparés par un point-virgule ';') : settings.add_protected_branch=Activer la protection settings.delete_protected_branch=Désactiver la protection settings.update_protect_branch_success=La protection de branche à été mise à jour pour la branche "%s". @@ -2055,7 +1973,6 @@ settings.lfs_pointers.inRepo=Dans le dépôt settings.lfs_pointers.exists=Existe en magasin settings.lfs_pointers.accessible=Accessible à l'utilisateur settings.lfs_pointers.associateAccessible=Associer %d OID accessibles - diff.browse_source=Parcourir la source diff.parent=Parent diff.commit=révision @@ -2101,7 +2018,6 @@ diff.protected=Protégé diff.image.side_by_side=Côte à côte diff.image.swipe=Glisser diff.image.overlay=Superposition - releases.desc=Suivi des versions et des téléchargements. release.releases=Versions release.detail=Détails de la version @@ -2137,7 +2053,6 @@ release.tag_name_invalid=Le nom de l'étiquette est invalide. release.tag_already_exist=Ce nom d'étiquette existe déjà. release.downloads=Téléchargements release.download_count=Télécharger: %s - branch.name=Nom de la branche branch.search=Rechercher des branches branch.already_exists=Une branche nommée %s existe déjà. @@ -2167,15 +2082,22 @@ branch.create_new_branch=Créer une branche à partir de la branche : branch.confirm_create_branch=Créer une branche branch.new_branch=Créer une nouvelle branche branch.new_branch_from=Créer une nouvelle branche à partir de '%s' - - - topic.manage_topics=Gérer les sujets topic.done=Terminé topic.count_prompt=Vous ne pouvez pas sélectionner plus de 25 sujets topic.format_prompt=Les noms de sujets doivent commencer par une lettre ou un nombre, peuvent contenir des tirets ('-') et peuvent comporter jusqu'à 35 caractères. - - +issues.filter_project_none=Pas de projet +issues.draft_title=Brouillon +issues.delete=Supprimer +search.type.tooltip=Type de recherche +search.fuzzy.tooltip=Inclure également les résultats proches de la recherche +search.match.tooltip=Inclure uniquement les résultats exacts +search.code_no_results=Aucun code source correspondant à votre terme de recherche n'a été trouvé. +search.code_search_unavailable=Actuellement, la recherche de code n'est pas disponible. Veuillez contacter l'administrateur de votre site. +settings.slack_color=Couleur +settings.event_wiki=Wiki +settings.tags=Tags +branch.create_branch_operation=Créer une branche [org] org_name_holder=Nom de l'organisation @@ -2198,11 +2120,9 @@ team_access_desc=Accès au dépôt team_permission_desc=Autorisation team_unit_desc=Permettre l’accès aux Sections du dépôt team_unit_disabled=(Désactivé) - form.name_reserved=Le nom d'organisation "%s" est réservé. -form.name_pattern_not_allowed="%s" n'est pas autorisé dans un nom d'organisation. +form.name_pattern_not_allowed=`"%s" n'est pas autorisé dans un nom d'organisation.` form.create_org_not_allowed=Vous n'êtes pas autorisé à créer une organisation. - settings=Paramètres settings.options=Organisation settings.full_name=Non Complet @@ -2216,7 +2136,6 @@ settings.visibility.limited=Limité (Visible uniquement aux utilisateurs connect settings.visibility.limited_shortname=Limité settings.visibility.private=Privé (Visible uniquement aux membres de l’organisation) settings.visibility.private_shortname=Privé - settings.update_settings=Valider settings.update_setting_success=Les paramètres de l'organisation ont été mis à jour. settings.change_orgname_prompt=NB: changer le nom de l'organisation changera aussi son URL. @@ -2229,9 +2148,7 @@ settings.confirm_delete_account=Confirmez la suppression settings.delete_org_title=Supprimer l'organisation settings.delete_org_desc=Cette organisation sera supprimée définitivement. Voulez-vous continuer ? settings.hooks_desc=Vous pouvez ajouter des webhooks qui seront activés pour tous les dépôts de cette organisation. - settings.labels_desc=Ajouter des étiquettes qui peuvent être utilisées sur les tickets pour tous les dépôts dans cette organisation. - members.membership_visibility=Visibilité des membres: members.public=Public members.public_helper=rendre caché @@ -2246,7 +2163,6 @@ members.leave=Quitter members.leave.detail=Quitter %s? members.invite_desc=Ajouter un nouveau membre à %s : members.invite_now=Envoyer une invitation - teams.join=Rejoindre teams.leave=Quitter teams.leave.detail=Quitter %s? @@ -2287,6 +2203,7 @@ teams.all_repositories_helper=L'équipe a accès à tous les dépôts. Sélectio teams.all_repositories_read_permission_desc=Cette équipe accorde l'accès en lecture à tous les dépôts : les membres peuvent voir et cloner les dépôts. teams.all_repositories_write_permission_desc=Cette équipe accorde l'accès en écriture à tous les dépôts : les membres peuvent lire et écrire dans les dépôts. teams.all_repositories_admin_permission_desc=Cette équipe accorde l'accès administrateur à tous les dépôts : les membres peuvent lire, écrire dans et ajouter des collaborateurs aux dépôts. +members=Membres [admin] dashboard=Tableau de bord @@ -2301,7 +2218,6 @@ monitor=Surveillance first_page=Première last_page=Dernière total=Total : %d - dashboard.statistic=Résumé dashboard.operations=Opérations de maintenance dashboard.system_status=État du système @@ -2369,7 +2285,6 @@ dashboard.total_gc_pause=Pause GC dashboard.last_gc_pause=Dernière Pause GC dashboard.gc_times=Nombres de GC dashboard.delete_old_actions=Supprimer toutes les anciennes actions de la base de données - users.user_manage_panel=Gestion du compte utilisateur users.new_account=Créer un compte users.name=Nom d'utilisateur @@ -2406,7 +2321,6 @@ users.still_own_repo=Cet utilisateur possède un ou plusieurs dépôts. Veuillez users.still_has_org=Cet utilisateur est membre d'une organisation. Veuillez le retirer de toutes les organisations dont il est membre au préalable. users.deletion_success=Le compte a été supprimé. users.reset_2fa=Réinitialiser l'authentification à deux facteurs - emails.email_manage_panel=Gestion des courriels des utilisateurs emails.primary=Principale emails.activated=Activée @@ -2419,13 +2333,11 @@ emails.not_updated=Impossible de mettre à jour l'adresse courriel demandée : % emails.duplicate_active=Cette adresse courriel est déjà active pour un autre utilisateur. emails.change_email_header=Mettre à jour les propriétés du courriel emails.change_email_text=Êtes-vous sûr de vouloir mettre à jour cette adresse courriel ? - orgs.org_manage_panel=Gestion des organisations orgs.name=Nom orgs.teams=Équipes orgs.members=Membres orgs.new_orga=Nouvelle organisation - repos.repo_manage_panel=Gestion des dépôts repos.unadopted=Dépôts non adoptés repos.owner=Propriétaire @@ -2436,15 +2348,11 @@ repos.stars=Votes repos.forks=Bifurcations repos.issues=Tickets repos.size=Taille - packages.published=Publiés - - systemhooks=Rappels système systemhooks.desc=Les Webhooks font automatiquement des requêtes HTTP POST à un serveur lorsque certains événements Gitea se déclenchent. Les Webhooks définis ici agiront sur tous les dépots du système, donc veuillez prendre en compte les implications en termes de performances que cela peut avoir. Lire la suite dans le guide des Webhooks. systemhooks.add_webhook=Ajouter un rappel système systemhooks.update_webhook=Mettre à jour un rappel système - auths.auth_manage_panel=Gestion des sources d'authentification auths.new=Ajouter une source d'authentification auths.name=Nom @@ -2535,7 +2443,6 @@ auths.still_in_used=Cette source d'authentification est utilisée par un ou plus auths.deletion_success=La source d'authentification a été supprimée. auths.login_source_exist=La source d'authentification "%s" existe déjà. auths.login_source_of_type_exist=Une source d'authentification de ce type existe déjà. - config.server_config=Configuration du serveur config.app_name=Titre du site config.app_ver=Version de Gitea @@ -2553,7 +2460,6 @@ config.static_file_root_path=Chemin statique des fichiers racines config.log_file_root_path=Chemin des fichiers logs config.script_type=Type de Script config.reverse_auth_user=Annuler l'Authentification de l'Utilisateur - config.ssh_config=Configuration SSH config.ssh_enabled=Activé config.ssh_start_builtin_server=Utiliser le serveur incorporé @@ -2564,12 +2470,10 @@ config.ssh_key_test_path=Chemin de test des clés config.ssh_keygen_path=Chemin vers le générateur de clefs ("ssh-keygen") config.ssh_minimum_key_size_check=Vérification de la longueur de clé minimale config.ssh_minimum_key_sizes=Tailles de clé minimales - config.lfs_config=Configuration LFS config.lfs_enabled=Activé config.lfs_content_path=Chemin de contenu LFS config.lfs_http_auth_expiry=Expiration de l'authentification HTTP LFS - config.db_config=Configuration de la base de données config.db_type=Type config.db_host=Hôte @@ -2578,7 +2482,6 @@ config.db_user=Nom d'utilisateur config.db_schema=Schéma config.db_ssl_mode=SSL config.db_path=Emplacement - config.service_config=Configuration du service config.register_email_confirm=Exiger la confirmation de l'e-mail lors de l'inscription config.disable_register=Désactiver le formulaire d'inscription @@ -2601,12 +2504,10 @@ config.default_allow_only_contributors_to_track_time=Restreindre le suivi de tem config.no_reply_address=Domaine pour les e-mails cachés config.default_visibility_organization=Visibilité par défaut des nouvelles organisations config.default_enable_dependencies=Activer les dépendances pour les tickets par défaut - config.webhook_config=Configuration Webhook config.queue_length=Longueur de la file d'attente config.deliver_timeout=Expiration d'Envoi config.skip_tls_verify=Passer la vérification TLS - config.mailer_enabled=Activé config.mailer_name=Nom config.mailer_user=Utilisateur @@ -2618,16 +2519,13 @@ config.test_email_placeholder=E-mail (ex: test@example.com) config.send_test_mail=Envoyer un e-mail de test config.test_mail_failed=Impossible d'envoyer un e-mail de test à '%s' : %v config.test_mail_sent=Un e-mail de test à été envoyé à '%s'. - config.oauth_config=Configuration OAuth config.oauth_enabled=Activé - config.cache_config=Configuration du cache config.cache_adapter=Adaptateur du Cache config.cache_interval=Intervales du Cache config.cache_conn=Liaison du Cache config.cache_item_ttl=Durée de vie des éléments dans le cache - config.session_config=Configuration de session config.session_provider=Fournisseur de session config.provider_config=Configuration du fournisseur @@ -2636,12 +2534,10 @@ config.gc_interval_time=Intervals GC config.session_life_time=Durée des sessions config.https_only=HTTPS uniquement config.cookie_life_time=Expiration du cookie - config.picture_config=Configuration de l'avatar config.picture_service=Service d'Imagerie config.disable_gravatar=Désactiver Gravatar config.enable_federated_avatar=Activer les avatars unifiés - config.git_config=Configuration de Git config.git_disable_diff_highlight=Désactiver la surbrillance syntaxique de Diff config.git_max_diff_lines=Lignes de Diff Max (pour un seul fichier) @@ -2653,7 +2549,6 @@ config.git_mirror_timeout=Délai imparti pour mettre à jour le miroir config.git_clone_timeout=Délai imparti pour l'opération "Clone" config.git_pull_timeout=Délai imparti pour l'opération "Pull" config.git_gc_timeout=Délai imparti pour l'opération "GC" - config.log_config=Configuration du journal config.log_mode=Mode du journal config.own_named_logger=Logger nommé @@ -2665,8 +2560,6 @@ config.access_log_mode=Mode de journalisation d'accès config.access_log_template=Modèle config.xorm_log_mode=Mode de journalisation de XORM config.xorm_log_sql=Activer la journalisation SQL - - monitor.cron=Tâches récurrentes monitor.name=Nom monitor.schedule=Planification @@ -2706,7 +2599,6 @@ monitor.queue.pool.flush.title=Vider la file d'attente monitor.queue.pool.flush.desc=Vider va ajouter un processus qui se terminera une fois que la file d'attente est vide, ou qu'elle est en délai d'attente dépassé. monitor.queue.pool.flush.submit=Ajouter un processus de vidage monitor.queue.pool.flush.added=Processus de vidage ajouté pour %[1]s - monitor.queue.settings.title=Paramètres du réservoir monitor.queue.settings.desc=Les pools se développent dynamiquement en réponse au blocage de la file d'attente des processus. Ces changements n'affecteront pas les groupes de processus actuels. monitor.queue.settings.timeout=Délai d'attente du Boost @@ -2722,7 +2614,6 @@ monitor.queue.settings.submit=Mettre à jour la configuration monitor.queue.settings.changed=Paramètres mis à jour monitor.queue.settings.blocktimeout=Délai de blocage actuel monitor.queue.settings.blocktimeout.value=%[1]v - monitor.queue.pool.none=Cette file d'attente n'a pas de réservoir monitor.queue.pool.added=Groupe de processus ajouté monitor.queue.pool.max_changed=Nombre maximum de processus modifiés @@ -2732,7 +2623,6 @@ monitor.queue.pool.cancel=Éteindre le groupe de processus monitor.queue.pool.cancelling=Fermeture du groupe de processus monitor.queue.pool.cancel_notices=Arrêter ce groupe de processus %s ? monitor.queue.pool.cancel_desc=Quitter une file d'attente sans aucun groupe de processus peut entraîner un blocage des requêtes indéfiniment. - notices.system_notice_list=Informations notices.view_detail_header=Voir les détails de l'information système notices.actions=Actions @@ -2747,15 +2637,24 @@ notices.type_2=Tâche notices.desc=Description notices.op=Opération notices.delete_success=Les informations systèmes ont été supprimées. +users.list_status_filter.is_active=Actif +users.list_status_filter.is_admin=Administrateur +users.list_status_filter.is_restricted=Restreint +packages.owner=Propriétaire +packages.name=Nom +packages.type=Type +packages.repository=Dépôt +packages.size=Taille +config.mailer_smtp_port=Port SMTP [action] create_repo=a créé le dépôt %s rename_repo=a rebaptisé le dépôt de %[1]s vers %[3]s -create_pull_request=`a créé la demande d'ajout %[3]s#%[2]s` -close_pull_request=`a fermé la demande d'ajout %[3]s#%[2]s` -reopen_pull_request=`a réouvert la demande d'ajout %[3]s#%[2]s` -comment_pull=`a commenté la demande d'ajout %[3]s#%[2]s` -merge_pull_request=`a fusionné la demande d'ajout %[3]s#%[2]s` +create_pull_request=a créé la demande d'ajout %[3]s#%[2]s +close_pull_request=a fermé la demande d'ajout %[3]s#%[2]s +reopen_pull_request=a réouvert la demande d'ajout %[3]s#%[2]s +comment_pull=a commenté la demande d'ajout %[3]s#%[2]s +merge_pull_request=a fusionné la demande d'ajout %[3]s#%[2]s transfer_repo=a transféré le dépôt %s à %s delete_tag=étiquette supprimée %[2]s de %[3]s delete_branch=branche %[2]s supprimée de %[3]s @@ -2763,9 +2662,9 @@ compare_branch=Comparer compare_commits=Comparer %d révisions compare_commits_general=Comparer les révisions mirror_sync_delete=a synchronisé puis supprimé la nouvelle référence %[2]s vers %[3]s depuis le miroir -approve_pull_request=`a approuvé %[3]s#%[2]s` -reject_pull_request=`a suggérés des changements pour %[3]s#%[2]s` -publish_release=`a publié "%[4]s" à %[3]s` +approve_pull_request=a approuvé %[3]s#%[2]s +reject_pull_request=a suggérés des changements pour %[3]s#%[2]s +publish_release=a publié "%[4]s" à %[3]s review_dismissed_reason=Raison : [tool] @@ -2827,4 +2726,21 @@ empty.repo=Avez-vous téléchargé un paquet, mais il n'est pas affiché ici? Al published_by_in=%[1]s publié par %[3]s en %[5]s rubygems.required.ruby=Nécessite la version de Ruby rubygems.required.rubygems=Nécessite la version de RubyGem - +filter.type=Type +conan.details.repository=Dépôt +owner.settings.cleanuprules.enabled=Activé + +[aria] + +[secrets] +name=Nom + +[actions] +runners.name=Nom +runners.owner_type=Type +runners.description=Description +runners.task_list.run=Exécuter +runners.task_list.repository=Dépôt +runners.task_list.commit=Commit +runners.status.active=Actif +runs.commit=Commit diff --git a/options/locale/locale_hu-HU.ini b/options/locale/locale_hu-HU.ini index 1edb42932ef2..cf714c8d88ee 100644 --- a/options/locale/locale_hu-HU.ini +++ b/options/locale/locale_hu-HU.ini @@ -21,7 +21,6 @@ enable_javascript=Ez az oldal jobban működik JavaScript-tel. toc=Tartalomjegyzék licenses=Licencek return_to_gitea=Vissza a Gitea-hoz - username=Felhasználónév email=E-mail cím password=Jelszó @@ -30,8 +29,6 @@ captcha=CAPTCHA twofa=Kétlépcsős hitelesítés twofa_scratch=Kétlépcsős bejelentkezés egyszer használatos kódja passcode=Jelkód - - repository=Tároló organization=Szervezet mirror=Tükör @@ -49,36 +46,30 @@ settings=Beállítások your_profile=Profil your_starred=Csillagozott your_settings=Beállítások - all=Összes sources=Saját mirrors=Tükör collaborative=Közreműködő forks=Másolat - activities=Tevékenységek pull_requests=Egyesítési Kérések issues=Hibajegyek milestones=Mérföldkövek - cancel=Mégse save=Mentés add=Hozzáadás add_all=Összes hozzáadása remove=Eltávolítás remove_all=Összes eltávolítása - - write=Írás preview=Előnézet loading=Betöltés… - step1=1. lépés: step2=2. lépés: - error404=Az elérni kívánt oldal vagy nem létezik, vagy nincs jogosultsága a megtekintéséhez. - - +edit=Szerkesztés +enabled=Engedélyezett +disabled=Letiltva [filter] @@ -115,7 +106,6 @@ err_empty_admin_password=A rendszergazdai jelszó nem lehet üres. err_empty_admin_email=A rendszergazdai jelszó nem lehet üres. err_admin_name_is_reserved=Az rendszergazda felhasználóneve helytelen, vagy foglalt err_admin_name_is_invalid=Az rendszergazda felhasználói neve helytelen - general_title=Általános beállítások app_name=Webhely címe app_name_helper=Itt megadhatja a vállalata nevét. @@ -133,7 +123,6 @@ app_url=Az oldal alapértelmezett címe app_url_helper=Alapcím HTTP(S) klón címekhez és e-mail értesítésekhez. log_root_path=Naplófájl elérési útja log_root_path_helper=A naplófájlok ebbe a mappába fognak íródni. - optional_title=További beállítások email_title=E-mail beállítások smtp_from=E-mail küldése mint @@ -183,6 +172,8 @@ default_enable_timetracking=Időmérés bekapcsolása alapértelmezetten default_enable_timetracking_popup=Időmérés bekapcsolása az új tárolókra alapértelmezetten. no_reply_address=Rejtett e-mail tartomány no_reply_address_helper=Domain név a rejtett email címmel rendelkező felhasználók számára.Például: Ha a felhasználóneve "jani" akkor bejelentkezhet a "jani@noreply.example.org" email címmel,ha a rejtett email domain "noreply.example.org"-ra van állítva. +smtp_addr=SMTP kiszolgáló +smtp_port=SMTP port [home] uname_holder=Felhasználónév vagy e-mail cím @@ -195,14 +186,11 @@ my_orgs=Szervezeteim my_mirrors=Tükreim view_home=Nézet %s search_repos=Tároló keresés… - show_archived=Archivált - show_private=Privát show_both_private_public=Publikus és privát mutatása show_only_private=Csak privát mutatása show_only_public=Csak publikus mutatása - issues.in_your_repos=A tárolóidban [explore] @@ -218,7 +206,6 @@ code_no_results=Nincs találat a keresési kifejezésedre. code_search_results=Keresési találatok "%s" code_last_indexed_at=Utoljára indexelve: %s - [auth] create_new_account=Regisztráció register_helper_msg=Van már felhasználói fiókja? Jelentkezzen be! @@ -277,23 +264,12 @@ authorization_failed=Az engedélyezés nem sikerült sspi_auth_failed=SSPI hitelesítés sikertelen [mail] - activate_account=Kérjük aktiválja a fiókját - activate_email=E-mail cím megerősítése - register_notify=A Gitea üdvözli - reset_password=Fiókjának visszaállítása - register_success=Sikeres regisztráció - - - - - - [modal] yes=Igen no=Nem @@ -311,31 +287,27 @@ PayloadUrl=Tartalom URL-címe TeamName=Csoport neve AuthName=Engedélyezési név AdminEmail=Rendszergazdai e-mail - NewBranchName=Új ág neve CommitSummary=Commit áttekintő CommitMessage=Commit üzenet CommitChoice=Commit választás TreeName=Elérési útvonal Content=Tartalom - SSPISeparatorReplacement=Elválasztó SSPIDefaultLanguage=Alapértelmezett nyelv - -require_error=` nem lehet üres` -alpha_dash_error=` csak alfanumerikus, kötőjel("-") és alsóvonal("_") karaktert használhat.` -alpha_dash_dot_error=` csak alfanumerikus, kötőjel("-") malsóvonal("_") és pont(".") karaktert tartalmazhat.` -git_ref_name_error=` egy jól formált git referenciának kell lennie.` -size_error=` %s méretűnek kell lennie.` -min_size_error=` legalább %s karaktert kell tartalmaznia.` -max_size_error=` legfeljebb %s karaktert tartalmazhat.` -email_error=` nem valódi e-mail cím.` -include_error=` tartalmaznia kell a '%s' karakterláncot.` +require_error=" nem lehet üres" +alpha_dash_error=" csak alfanumerikus, kötőjel("-") és alsóvonal("_") karaktert használhat." +alpha_dash_dot_error=" csak alfanumerikus, kötőjel("-") malsóvonal("_") és pont(".") karaktert tartalmazhat." +git_ref_name_error=" egy jól formált git referenciának kell lennie." +size_error=" %s méretűnek kell lennie." +min_size_error=" legalább %s karaktert kell tartalmaznia." +max_size_error=" legfeljebb %s karaktert tartalmazhat." +email_error=" nem valódi e-mail cím." +include_error=" tartalmaznia kell a '%s' karakterláncot." unknown_error=Ismeretlen hiba: captcha_incorrect=Helytelen kódot adtál meg. password_not_match=A jelszavak nem egyeznek. lang_select_error=Nyelv kiválasztása a listából. - username_been_taken=A felhasználói név már foglalt. repo_name_been_taken=A tároló neve már használatban van. org_name_been_taken=Sajnáljuk, ezt a szervezetnevet már más használja. @@ -355,16 +327,13 @@ enterred_invalid_password=A megadott jelszó érvénytelen. user_not_exist=A fiók nem létezik. team_not_exist=Ez a csapat nem létezik. cannot_add_org_to_team=Egy szervezet nem adható hozzá egy csoporthoz tagként. - invalid_ssh_key=Nem tudtuk ellenőrizni az SSH kulcsodat: %s invalid_gpg_key=Nem tudtuk ellenőrizni a GPG kulcsodat: %s unable_verify_ssh_key=Az ssh kulcsot nem tudtuk ellenőrizni, kérjük nézze át még egyszer. auth_failed=A hitelesítés sikertelen: %v - still_own_repo=Ennek a felhasználónak egy vagy több tárolója van még, ezeket le kell törölnie, vagy át kell adnia valakinek. still_has_org=A fiókod takja legalább egy szervezetnek; előbb léjen ki belőlük. org_still_own_repo=Ennek a szervezetnek egy vagy több tárolója van még, ezeket le kell törölnie, vagy át kell adnia valakinek. - target_branch_not_exist=Cél ág nem létezik. [user] @@ -380,7 +349,6 @@ follow=Követés unfollow=Követés törlése heatmap.loading=Hőtérkép betöltése… user_bio=Életrajz - form.name_reserved=A(z) '%s' felhasználónév a rendszernek van fenntartva, kérlek válassz másikat. form.name_pattern_not_allowed=A "%s" minta nem engedélyezett a felhasználónevekben. form.name_chars_not_allowed='%s' felhasználónév érvénytelen karaktereket tartalmaz. @@ -401,7 +369,6 @@ twofa=Kétlépcsős hitelesítés account_link=Kapcsolt fiókok organization=Szervezetek uid=UID - public_profile=Nyilvános profil profile_desc=Az e-mail címedet használjuk értesítésekre és más műveletekhez. password_username_disabled=A nem helyi felhasználóknak nem engedélyezett, hogy megváltoztassák a felhasználói nevüket. Kérjük lépjen kapcsolatba a helyi rendszergazdájával további információkért. @@ -418,7 +385,6 @@ cancel=Mégsem language=Nyelv ui=Téma privacy=Adatvédelem - lookup_avatar_by_mail=Avatar mutatása email cím alapján federated_avatar_lookup=Összevont profilkép keresés enable_custom_avatar=Egyéni profilkép használata @@ -428,7 +394,6 @@ delete_current_avatar=Jelenlegi profilkép törlése uploaded_avatar_not_a_image=A feltöltött fájl nem kép. uploaded_avatar_is_too_big=A feltöltött file mérete meghaladta a maximumot. update_avatar_success=A profilképe frissítve lett. - change_password=Jelszó frissítése old_password=Jelenlegi jelszó new_password=Új jelszó @@ -436,7 +401,6 @@ retype_new_password=Írja be újra az új jelszót password_incorrect=A megadott jelenlegi jelszó helytelen. change_password_success=A jelszava frissítve lett. Mostantól ezzel jelentkezhet be. password_change_disabled=A nem helyi felhasználók nem frissíthetik jelszavukat a webes felületen keresztül. - emails=E-mail címek manage_emails=E-mail címek kezelése manage_themes=Válassza ki az alapértelmezett témát @@ -466,7 +430,6 @@ add_email_success=Új email cím hozzáadva. add_openid_success=Új OpenID cím hozzáadva. keep_email_private=E-mail cím elrejtése keep_email_private_popup=Az email címed rejtve lesz a többi felhasználó elől. - manage_ssh_keys=SSH kulcsok kezelése manage_gpg_keys=GPG kulcsok kezelése add_key=Kulcs hozzáadása @@ -504,7 +467,6 @@ hide_openid=Elrejtés a profilról ssh_disabled=SSH kikapcsolva manage_social=Kapcsolódó fiókok kezelése unbind=Szétválasztás - manage_access_token=Hozzáférési Token kezelése generate_new_token=Új token generálása tokens_desc=Ezek a tokenek hozzáférést nyújtanak a fiókodhoz a Gitea API használatával. @@ -516,7 +478,6 @@ generate_token_name_duplicate=A %s nevet már használja egy al delete_token=Törlés access_token_deletion=Hozzáférési Token Törlése delete_token_success=A token törölve lett. Az ezt használó alkalmazásoknak többé nincs hozzáférése a fiókodhoz. - manage_oauth2_applications=OAuth2 alkalmazások kezelése edit_oauth2_application=OAuth2 alkalmazások szerkesztése remove_oauth2_application=OAuth2 alkalmazások etávolítása @@ -534,13 +495,11 @@ oauth2_regenerate_secret=Titok újragenerálása oauth2_regenerate_secret_hint=Elvesztette a titkát? oauth2_client_secret_hint=A titok nem lesz látható ha újra neglátogatja ezt az oldalt. Kérjük mentse le a titkát. oauth2_application_edit=Szerkesztés - authorized_oauth2_applications=Engedélyezett OAuth2 alkalmazások authorized_oauth2_applications_description=Ön hozzáférést adott személyes Gitea-fiókjához ezeknek a harmadik féltől származó alkalmazásoknak. Kérjük, vonja vissza a hozzáférést olyan alkalmazásoktól, amelyekre már nincs szükség. revoke_key=Visszavonás revoke_oauth2_grant=Hozzáférés megvonása revoke_oauth2_grant_success=Hozzáférés sikeresen visszavonva. - twofa_desc=A kétlépcsős hitelesítés növeli a fiók biztonságát. twofa_is_enrolled=A fiókja jelenleg használ kétlépcsős hitelesítést. twofa_not_enrolled=A fiókja jelenleg nem használ kétlépcsős hitelesítést. @@ -553,27 +512,31 @@ twofa_disabled=Kétlépcsős hitelesítés letiltva. scan_this_image=Olvassa be ezt a hitelesítő alkalmazásával: or_enter_secret=Vagy adja meg a titkot: %s passcode_invalid=A jelszava helytelen. Próbálja újra. - - manage_account_links=Kapcsolt fiókok kezelése remove_account_link=Csatolt fiók eltávolítása remove_account_link_desc=Egy kapcsolt fiók törlésével visszavonja a hozzáférését a fiókjához. Folytatja? remove_account_link_success=A kapcsolt fiók törölve lett. - orgs_none=Nem tagja egy szervezetnek sem. repos_none=Nincsen egyetlen saját tárolója sem - delete_account=Fiókod törlése delete_prompt=Ezzel véglegesen törli a fiókját. Ezt NEM LEHET visszacsinálni. confirm_delete_account=Törlés megerősítése delete_account_title=Fiók törlése delete_account_desc=Biztosan véglegesen törölni szeretné ezt a fiókot? - email_notifications.enable=Email értesítés engedélyezése email_notifications.onmention=Email küldése csak megjelölés esetén email_notifications.disable=Email értesítés kikapcsolása email_notifications.submit=E-mail beállítások megadása - +comment_type_group_title=Cím +gpg_key_verify=Ellenőrzés +gpg_token=Token +ssh_key_verify=Ellenőrzés +ssh_token=Token +access_token_deletion_cancel_action=Mégse +access_token_deletion_confirm_action=Törlés +link_account=Fiók kapcsolása +visibility.public=Nyilvános +visibility.private=Privát [repo] owner=Tulajdonos @@ -617,15 +580,12 @@ forks=Másolások pick_reaction=Válasszon reakciót reactions_more=és további %d language_other=Egyéb - - desc.private=Privát desc.public=Nyilvános desc.private_template=Privát sablon desc.public_template=Sablon desc.internal=Belső desc.archived=Archivált - template.items=Sablon elemek template.git_content=Git tartalom (alapértelmezett branch) template.git_hooks=Git Hook-ok @@ -635,14 +595,11 @@ template.avatar=Avatar template.issue_labels=Hibajegy címkék template.one_item=Legalább egy sablonelemet ki kell választani template.invalid=Ki kell választani egy sablon tárolót - archive.title=Ez a tároló archíválva van. A fájl megtekinthetőek és másolhatóak, de a feltöltés és a hibajegyek/egyesítési kérések nem indíthatóak. archive.issue.nocomment=Ez a tároló archiválva van. Nem szólhat hozzá ehhez a problémához. archive.pull.nocomment=Ez a tároló archíválva van. Nem szólhat hozzá ehhez az egyesítési kéréshez. - form.name_reserved=A tárolónév ('%s') a rendszernek van fenntartva. form.name_pattern_not_allowed='%s' minta nem engedélyezett tárolónévben. - migrate_items_wiki=Wiki migrate_items_milestones=Mérföldkövek migrate_items_labels=Címkék @@ -658,7 +615,6 @@ migrate.invalid_local_path=A helyi elérési út érvénytelen; nem létezik vag migrate.failed=A migráció sikertelen: %v migrated_from=Migrálva innen: %[2]s migrated_from_fake=Migrálva innen: %[1]s - mirror_from=tükörképe a: forked_from=tükrözve innen: fork_from_self=Nem tükrözhet önmaga által birtokolt tárolót. @@ -669,14 +625,12 @@ unstar=Csillag törlése star=Csillagozás fork=Tükrözés download_archive=Tároló letöltése - no_desc=Nincs leírás quick_guide=Gyors útmutató clone_this_repo=Tároló klónozása create_new_repo_command=Egy új tároló létrehozása a parancssorból push_exist_repo=Meglévő tároló feltöltése parancssorból empty_message=A tároló nem tartalmaz semmit. - code=Kód branch=Ág tree=Fa @@ -687,7 +641,6 @@ issues=Hibajegyek pulls=Egyesítési kérések labels=Címkék org_labels_desc_manage=kezelés - milestones=Mérföldkövek commits=Commit-ok commit=Commit @@ -699,7 +652,6 @@ file_history=Előzmények file_view_raw=Nyers fájl megtekintése file_permalink=Állandó hivatkozás file_too_large=Ez a fájl túl nagy ahhoz, hogy megjelenítsük. - video_not_supported_in_browser=A böngésző nem támogatja a HTML5 video tag-et. audio_not_supported_in_browser=A böngésző nem támogatja a HTML5 audio tag-et. stored_lfs=Git LFS-el eltárolva @@ -709,7 +661,6 @@ commit_graph.hide_pr_refs=Pull request-ek elrejtése normal_view=Normál nézet line=sor lines=sor - editor.new_file=Új fájl editor.upload_file=Fájl feltöltése editor.edit_file=Fájl szerkesztése @@ -750,7 +701,6 @@ editor.unable_to_upload_files=Nem sikerült feltölteni a fájlokat a "%s" hiba: editor.upload_file_is_locked='%s' fájlt %s zárolta. editor.upload_files_to_dir=Fájlok feltöltése a következőre: '%s' editor.cannot_commit_to_protected_branch=Nem lehet a következő védett ágra commit-olni: '%s'. - commits.commits=Commit-ok commits.search=Commit-ok keresése… commits.find=Keresés @@ -762,11 +712,7 @@ commits.older=Régebbi commits.newer=Újabb commits.signed_by=Aláírta commits.gpg_key_id=GPG kulcs azonosító - - ext_issues.desc=Külső hibakövető csatlakoztatás. - - issues.desc=Hibajelentések, feladatok és mérföldkövek elrendezése. issues.filter_milestones=Mérföldkövek szűrése issues.filter_labels=Címkék szűrése @@ -799,15 +745,15 @@ issues.label_templates.info=Még nincsenek címkék. Új címke létrehozható a issues.label_templates.helper=Címkekészlet választása issues.label_templates.use=Címke készlet használata issues.label_templates.fail_to_load_file=Nem sikerült betölteni a cimkekészlet sablon fájlt "%s": %v -issues.add_milestone_at=`A hibajegy hozzá lett adva a %s mérföldkőhöz %s` -issues.change_milestone_at=`módosítva lett a mérföldkő %s-ról/ről %s-ra/re %s` -issues.remove_milestone_at=`eltávolítva a %s mérföldkőből %s` -issues.deleted_milestone=`(törölt)` -issues.self_assign_at=`önmagához rendelte %s` -issues.add_assignee_at=`hozzárendelve %s által %s` -issues.remove_assignee_at=`hozzárendelés törlése %s által %s` -issues.remove_self_assignment=`eltávolította a hozzárendelést %s` -issues.delete_branch_at=`letörölte a(z) %s ágat %s` +issues.add_milestone_at=A hibajegy hozzá lett adva a %s mérföldkőhöz %s +issues.change_milestone_at=módosítva lett a mérföldkő %s-ról/ről %s-ra/re %s +issues.remove_milestone_at=eltávolítva a %s mérföldkőből %s +issues.deleted_milestone=(törölt) +issues.self_assign_at=önmagához rendelte %s +issues.add_assignee_at=hozzárendelve %s által %s +issues.remove_assignee_at=hozzárendelés törlése %s által %s +issues.remove_self_assignment=eltávolította a hozzárendelést %s +issues.delete_branch_at=letörölte a(z) %s ágat %s issues.filter_label=Címke issues.filter_label_no_select=Minden címke issues.filter_milestone=Mérföldkő @@ -845,7 +791,7 @@ issues.next=Következő issues.open_title=Nyitott issues.closed_title=Lezárt issues.num_comments=%d hozzászólás -issues.commented_at=`hozzászólt %s` +issues.commented_at=hozzászólt %s issues.delete_comment_confirm=Biztos vagy benne, hogy törölni akarod ezt a hozzászólást? issues.context.copy_link=Hivatkozás másolása issues.context.quote_reply=Válasz idézettel @@ -857,7 +803,7 @@ issues.close_comment_issue=Hozzászólás és lezárás issues.reopen_issue=Újranyitás issues.reopen_comment_issue=Hozzászólás és újranyitás issues.create_comment=Hozzászólás -issues.commit_ref_at=`hivatkozott erre a hibajegyre egy commit-ból %[2]s` +issues.commit_ref_at=hivatkozott erre a hibajegyre egy commit-ból %[2]s issues.poster=Posztoló issues.collaborator=Közreműködő issues.owner=Tulajdonos @@ -882,8 +828,8 @@ issues.label.filter_sort.reverse_alphabetically=Fordított betűrendben issues.label.filter_sort.by_size=Legkisebb méret issues.label.filter_sort.reverse_by_size=Legnagyobb méret issues.num_participants=%d Résztvevő -issues.attachment.open_tab=`A(z) "%s" megnyitása új fülön` -issues.attachment.download=`Kattintson a(z) "%s" letöltéséhez` +issues.attachment.open_tab=A(z) "%s" megnyitása új fülön +issues.attachment.download=Kattintson a(z) "%s" letöltéséhez issues.subscribe=Feliratkozás issues.unsubscribe=Leiratkozás issues.lock=Beszélgetés lezárása @@ -900,18 +846,18 @@ issues.unlock.title=Hibajegy újranyitása. issues.comment_on_locked=Egy zárolt hibajegyhez nem lehet hozzászólni. issues.tracker=Időzítő issues.start_tracking=Időmérés elkezdése -issues.start_tracking_history=`elkezdett dolgozni %s` -issues.stop_tracking_history=`abbahagyta a %s` -issues.cancel_tracking_history=`törölte az időzítőt %s` +issues.start_tracking_history=elkezdett dolgozni %s +issues.stop_tracking_history=abbahagyta a %s +issues.cancel_tracking_history=törölte az időzítőt %s issues.add_time=Idő kézi hozzáadása issues.add_time_short=Idő hozzáadása issues.add_time_cancel=Megszakítva -issues.add_time_history=`hozzáadta %s` +issues.add_time_history=hozzáadta %s issues.add_time_hours=Óra issues.add_time_minutes=Perc issues.add_time_sum_to_small=Nem volt idő megadva. issues.time_spent_total=Teljes ráfordított idő -issues.time_spent_from_all_authors=`Teljes ráfordított idő: %s` +issues.time_spent_from_all_authors=Teljes ráfordított idő: %s issues.due_date=Határidő issues.invalid_due_date_format=A határidőt 'éééé-hh-nn' formátumban kell megadni. issues.error_modifying_due_date=Határidő módosítása sikertelen. @@ -946,8 +892,6 @@ issues.review.reviewers=Véleményezők issues.review.show_outdated=Elavultak mutatása issues.review.hide_outdated=Elavultak elrejtése issues.assignee.error=Nem minden megbízott lett hozzáadva egy nem várt hiba miatt. - - pulls.new=Egyesítési kérés pulls.compare_changes=Új egyesítési kérés pulls.compare_base=egyesítés ide @@ -965,16 +909,9 @@ pulls.reopen_to_merge=Kérjük, nyissa újra az egyesítési kérést. pulls.cant_reopen_deleted_branch=Ez a pull request nem nyitható meg újra, mivel az ág törölve lett. pulls.merged=Egyesítve pulls.can_auto_merge_desc=Ez az egyesítési kérés automatikusan végrehajtható. - - ; %[2]s
    %[3]s     pulls.status_checking=Néhány ellenőrzés függőben van pulls.status_checks_success=Minden ellenőrzés sikeres volt - - - - - milestones.new=Új mérföldkő milestones.closed=Lezárva: %s milestones.no_due_date=Nincs határidő @@ -1003,10 +940,7 @@ milestones.filter_sort.least_complete=Legkevésbé befejezve milestones.filter_sort.most_complete=Leginkább befejezve milestones.filter_sort.most_issues=Legtöbb hibajegy milestones.filter_sort.least_issues=Legkevesebb hibajegy - - ext_wiki.desc=Külső wiki csatolása. - wiki=Wiki wiki.welcome=Üdvözöljük a Wiki-ben. wiki.welcome_desc=A wiki lehetővé teszi, hogy dokumentációt írjon és osszon meg a közreműködőkkel. @@ -1029,7 +963,6 @@ wiki.page_already_exists=Már létezik azonos nevű Wiki oldal. wiki.reserved_page='%s' wiki oldalnév fenntartott. wiki.pages=Oldalak wiki.last_updated=Utoljára módosítva: %s - activity=Tevékenység activity.period.filter_label=Időtartam: activity.period.daily=1 nappal @@ -1083,11 +1016,9 @@ activity.git_stats_addition_n=%d kiegészítés activity.git_stats_and_deletions=és activity.git_stats_deletion_1=%d törlés activity.git_stats_deletion_n=%d törlés - search=Keresés search.search_repo=Tároló keresés -search.results="%s" találatok keresése itt: %s - +search.results=`"%s" találatok keresése itt: %s` settings=Beállítások settings.desc=A beállítások menüpontban állítható a tároló paraméterei settings.options=Tároló @@ -1245,7 +1176,6 @@ settings.lfs_lock=Zárolás settings.lfs_locks_no_locks=Nincsenek zárolások settings.lfs_force_unlock=Kényszerített zárolás settings.lfs_pointers.oid=OID - diff.browse_source=Forráskód böngészése diff.parent=szülő diff.commit=commit @@ -1264,7 +1194,6 @@ diff.comment.markdown_info=Támogatja a markdown formázást. diff.comment.add_single_comment=Egyszerű hozzászólás hozzáadása diff.comment.reply=Válasz diff.review.comment=Hozzászólás - release.releases=Kiadások release.new_release=Új kiadás release.draft=Piszkozat @@ -1284,7 +1213,6 @@ release.deletion_tag_success=A cimke törölve lett. release.tag_name_invalid=Ez a címkenév érvénytelen. release.downloads=Letöltések release.download_count=Letöltések: %s - branch.search=Ág keresése branch.delete_head=Törlés branch.delete_html=Ág törlése @@ -1292,13 +1220,19 @@ branch.create_branch=Ág %s létrehozása branch.create_from='%s'-ból/ből branch.branch_already_exists=A(z) '%s' ág már létezik a tárolóban. branch.deleted_by=Törölve %s által - - - topic.manage_topics=Témák kezelése topic.done=Kész - - +delete_preexisting_label=Törlés +project_board=Projektek +projects=Projektek +projects.description_placeholder=Leírás +projects.title=Cím +projects.new=Új projekt +projects.template.desc=Sablon +issues.new.projects=Projektek +issues.deleted_project=(törölt) +issues.draft_title=Piszkozat +issues.delete=Törlés [org] org_name_holder=Szervezet neve @@ -1320,10 +1254,8 @@ team_desc_helper=A csapat céljának vagy szerepkörének leírása. team_access_desc=Tároló hozzáférés team_permission_desc=Engedély team_unit_disabled=(Letiltva) - form.name_reserved='%s' szervezetnév foglalt. form.name_pattern_not_allowed='%s' minta nem engedélyezett szervezet nevében. - settings=Beállítások settings.options=Szervezet settings.full_name=Teljes név @@ -1334,7 +1266,6 @@ settings.visibility=Láthatóság settings.visibility.public=Nyilvános settings.visibility.limited=Korlátozott (csak a bejelentkezett felhasználók láthatják) settings.visibility.private=Privát (csak a szervezet tagjai láthatják) - settings.update_settings=Beállítások frissítése settings.update_setting_success=A szervezet beállításai frissültek. settings.change_orgname_prompt=Megjegyzés: a szervezet nevének megváltoztatása a szervezet URL-jét is módosítja. @@ -1346,8 +1277,6 @@ settings.confirm_delete_account=Törlés megerősítése settings.delete_org_title=Szervezet törlése settings.delete_org_desc=Ez a szervezet véglegesen törölve lesz. Folytatható? settings.hooks_desc=Webhook hozzáadása a szervezet összes tárolójához. - - members.membership_visibility=Tagság láthatósága: members.public=Látható members.private=Rejtett @@ -1358,7 +1287,6 @@ members.remove=Eltávolítás members.leave=Távozás members.invite_desc=Tag hozzáadása a(z) %s szervezethez: members.invite_now=Meghívás most - teams.join=Csatlakozás teams.leave=Távozás teams.can_create_org_repo=Tárolók létrehozása @@ -1388,6 +1316,9 @@ teams.repos.none=Ez a csapat nem férhet hozzá tárolókhoz. teams.members.none=Ennek a csapatnak nincsenek tagjai. teams.specific_repositories=Meghatározott tárolók teams.all_repositories=Minden tároló +members=Tagok +settings.visibility.private_shortname=Privát +teams.read_access=Olvasott [admin] dashboard=Műszerfal @@ -1401,7 +1332,6 @@ monitor=Figyelés first_page=Első last_page=Utolsó total=Összesen: %d - dashboard.statistic=Összefoglaló dashboard.operations=Karbantartási műveletek dashboard.system_status=Rendszer Állapota @@ -1441,7 +1371,6 @@ dashboard.total_gc_time=Teljes GC szünet dashboard.total_gc_pause=Teljes GC szünet dashboard.last_gc_pause=Utolsó GC szünet dashboard.gc_times=GC Idők - users.new_account=Felhasználó létrehozása users.name=Felhasználónév users.full_name=Teljes név @@ -1463,18 +1392,15 @@ users.allow_create_organization=Létrehozhat szervezeteket users.update_profile=Fiók frissítése users.delete_account=Fiók törlése users.still_has_org=Ez a felhasználó tagja egy szervezetnek. Először el kell távolítani a felhasználót az összes szervezetből. - emails.primary=Elsődleges emails.activated=Aktivált emails.filter_sort.email=Email emails.filter_sort.name=Felhasználónév - orgs.org_manage_panel=Szervezetek Kezelése orgs.name=Név orgs.teams=Csoportok orgs.members=Tagok orgs.new_orga=Új szervezet - repos.repo_manage_panel=Tárolók Kezelése repos.owner=Tulajdonos repos.name=Név @@ -1483,10 +1409,6 @@ repos.watches=Figyelők repos.stars=Csillagok repos.issues=Hibajegyek repos.size=Méret - - - - auths.new=Hitelesítési forrás hozzáadása auths.name=Név auths.type=Típus @@ -1542,8 +1464,8 @@ auths.tip.gitlab=Vegyen fel új alkalmazást itt: https://gitlab.com/profile/app auths.tip.google_plus=Szerezzen OAuth2 kliens hitelesítési adatokat a Google API konzolban (https://console.developers.google.com/) auths.tip.openid_connect=Használja az OpenID kapcsolódás felfedező URL-t (/.well-known/openid-configuration) a végpontok beállításához auths.tip.twitter=Menyjen ide: https://dev.twitter.com/apps, hozzon létre egy alkalmazást és győződjön meg róla, hogy az “Allow this application to be used to Sign in with Twitter” opció be van kapcsolva -auths.tip.discord=Vegyen fel új alkalmazást itt: -https://discordapp.com/developers/applications/me +auths.tip.discord=Vegyen fel új alkalmazást itt: +https=//discordapp.com/developers/applications/me auths.tip.gitea=Regisztráljon új OAuth2 alkalmazást. Útmutató erről itt található: https://docs.gitea.io/en-us/oauth2-provider auths.edit=Hitelesítési forrás szerkesztése auths.activated=A hitelesítési forrás aktiválva lett @@ -1556,7 +1478,6 @@ auths.delete_auth_desc=Egy hitelesítési forrás törlésével letiltja az ezze auths.still_in_used=A hitelesítési forrás még használatban van. Álítsa át vagy törölje azokat a fiókokat, amik ezt használják. auths.deletion_success=A hitelesítési forrás törölve lett. auths.login_source_exist=A "%s" hitelesítési forrás már létezik. - config.server_config=Szerver Konfiguráció config.app_name=Webhely címe config.app_ver=Gitea Verzió @@ -1574,7 +1495,6 @@ config.static_file_root_path=Statikus fájlok gyökérútvonala config.log_file_root_path=Naplófájl elérési útja config.script_type=Szkript Típus config.reverse_auth_user=Visszafelé hitelesítés felhasználója - config.ssh_config=SSH Konfiguráció config.ssh_enabled=Engedélyezett config.ssh_start_builtin_server=Beépített szerver használata @@ -1585,11 +1505,9 @@ config.ssh_key_test_path=Kulcs ellenőrzés útvonala config.ssh_keygen_path=Kulcsgeneráló ('ssh-keygen') elérési útja config.ssh_minimum_key_size_check=Kulcsok minimum méretének ellenőrzése config.ssh_minimum_key_sizes=Minimális kulcsok méretek - config.lfs_config=LFS Beállítások config.lfs_enabled=Engedélyezve config.lfs_content_path=LFS tartalom útvonala - config.db_config=Adatbázis Konfiguráció config.db_type=Típus config.db_host=Kiszolgáló @@ -1598,7 +1516,6 @@ config.db_user=Felhasználónév config.db_schema=Séma config.db_ssl_mode=SSL config.db_path=Elérési út - config.service_config=Szolgáltatás konfiguráció config.register_email_confirm=A regisztrációhoz e-mail visszaigazolás szükséges config.disable_register=Ön-regisztráció kikapcsolása @@ -1618,12 +1535,10 @@ config.enable_timetracking=Időmérés bekapcsolása config.default_enable_timetracking=Időmérés bekapcsolása alapértelmezetten config.no_reply_address=Rejtett e-mail tartomány config.default_visibility_organization=Alapértelmezett láthatóság új szervezeteknek - config.webhook_config=Webhook Beállítása config.queue_length=Várakozási Sor Hossza config.deliver_timeout=Kézbesítési Időtúllépés config.skip_tls_verify=A TLS Hitelesítés Kihagyása - config.mailer_enabled=Engedélyezett config.mailer_name=Név config.mailer_user=Felhasználó @@ -1631,15 +1546,12 @@ config.mailer_use_sendmail=Sendmail Használata config.mailer_sendmail_path=Sendmail Elérési Útja config.mailer_sendmail_args=Extra Sendmail argumentumok config.send_test_mail=Teszt e-mail küldése - config.oauth_config=OAuth Konfiguráció config.oauth_enabled=Engedélyezett - config.cache_config=Gyorsítótár Beállítások config.cache_adapter=Gyorsítótár Adapter config.cache_interval=Gyorsítótár Intervallum config.cache_conn=Gyorsítótár Kapcsolat - config.session_config=Munkamenet Beállítások config.session_provider=Munkamenet Szolgáltató config.provider_config=Szolgáltató Beállítás @@ -1648,12 +1560,10 @@ config.gc_interval_time=GC Intervallum Idő config.session_life_time=Munkamenet Élettartama config.https_only=Csak HTTPS config.cookie_life_time=Süti Élettartam - config.picture_config=Kép és Avatár Konfiguráció config.picture_service=Kép Szolgáltatás config.disable_gravatar=Gravatar Kikapcsolása config.enable_federated_avatar=Összevont profilkép lekérés engedélyezése - config.git_config=Git Beállítás config.git_disable_diff_highlight=Különbségi nézetben a szintakszis kiemelés kikapcsolása config.git_max_diff_lines=Maximális sorok száma különbségi nézetben (egy fájl esetén) @@ -1665,14 +1575,11 @@ config.git_mirror_timeout=Tükör Frissítési Időtúllépés config.git_clone_timeout=Klónozási időtúllépés config.git_pull_timeout=Frissítési Időtúllépés config.git_gc_timeout=Szemétgyűjtési (GC) Időtúllépés - config.log_config=Naplózási Beállítások config.log_mode=Naplózási Módja config.disabled_logger=Letiltva config.access_log_template=Sablon config.xorm_log_sql=SQL naplózása - - monitor.cron=Ütemezett Feladatok monitor.name=Név monitor.schedule=Ütemezés @@ -1689,9 +1596,6 @@ monitor.process.cancel_notices=Megszakítás: %s? monitor.queue.name=Név monitor.queue.type=Típus monitor.queue.pool.timeout=Időtúllépés - - - notices.system_notice_list=Rendszer Értesítések notices.view_detail_header=Értesítés Részletei notices.actions=Műveletek @@ -1706,6 +1610,16 @@ notices.type_2=Feladat notices.desc=Leírás notices.op=Op. notices.delete_success=A rendszer-értesítések törölve lettek. +users.list_status_filter.is_active=Aktív +users.list_status_filter.is_admin=Rendszergazda +users.list_status_filter.is_restricted=Korlátozott +packages.owner=Tulajdonos +packages.name=Név +packages.type=Típus +packages.repository=Tároló +packages.size=Méret +config.mailer_smtp_port=SMTP port +monitor.queue.settings.submit=Beállítások frissítése [action] create_repo=létrehozott tárolót: %s @@ -1763,4 +1677,21 @@ error.not_signed_commit=Nem aláírt commit [units] [packages] - +filter.type=Típus +conan.details.repository=Tároló +owner.settings.cleanuprules.enabled=Engedélyezett + +[aria] + +[secrets] +name=Név + +[actions] +runners.name=Név +runners.owner_type=Típus +runners.description=Leírás +runners.task_list.run=Futtatás +runners.task_list.repository=Tároló +runners.task_list.commit=Commit +runners.status.active=Aktív +runs.commit=Commit diff --git a/options/locale/locale_id-ID.ini b/options/locale/locale_id-ID.ini index e75fae5dec54..0f0eb08ababf 100644 --- a/options/locale/locale_id-ID.ini +++ b/options/locale/locale_id-ID.ini @@ -19,7 +19,6 @@ user_profile_and_more=Profil dan Pengaturan… signed_in_as=Masuk sebagai enable_javascript=Situs web ini bekerja lebih baik dengan JavaScript. toc=Daftar Isi - username=Nama Pengguna email=Alamat Email password=Kata Sandi @@ -28,8 +27,6 @@ captcha=CAPTCHA twofa=Otentikasi Dua Faktor twofa_scratch=Kode Awal Dua Faktor passcode=Kode Akses - - repository=Repositori organization=Organisasi mirror=Duplikat @@ -45,33 +42,27 @@ settings=Pengaturan your_profile=Profil your_starred=Dibintangi your_settings=Pengaturan - all=Semua sources=Sumber mirrors=Duplikat collaborative=Kolaboratif forks=Garpu - activities=Aktivitas pull_requests=Tarik Permintaan issues=Masalah milestones=Tonggak - cancel=Batal save=Simpan add=Tambah add_all=Tambah Semua remove=Buang remove_all=Buang Semua - - write=Tulis preview=Pratinjau loading=Memuat… - - - - +edit=Edit +enabled=Aktif +disabled=Nonaktif [filter] @@ -85,12 +76,12 @@ platform_desc=Gitea bisa digunakan di mana code.gitea.io/gitea! Mari bergabung dengan berkontribusi untuk membuat proyek ini lebih baik. Jangan malu untuk menjadi kontributor! +license_desc=`Go get" (Dapatkan kode sumber dari) code.gitea.io/gitea! Mari bergabung dengan berkontribusi untuk membuat proyek ini lebih baik. Jangan malu untuk menjadi kontributor!` [install] install=Pemasangan title=Konfigurasi Awal -docker_helper=Jika Anda menjalankan Gitea di dalam Docker, baca dokumentasi sebelum mengubah pengaturan. +docker_helper=Jika Anda menjalankan Gitea di dalam Docker, baca . mailer_user=Nama Pengguna SMTP mailer_password=Sandi SMTP -register_confirm=Memerlukan Konfirmasi Surel Untuk Mendaftar -mail_notify=Aktifkan Pemberitahuan Surel +register_confirm=Perlu Konfirmasi Email Saat Pendaftaran +mail_notify=Aktifkan Notifikasi Email server_service_title=Server dan Pengaturan Layanan Pihak Ketiga offline_mode=Aktifkan Mode Lokal offline_mode_popup=Non-aktifkan jaringan pengiriman konten dari pihak ketiga dan layani semua sumber daya secara lokal. -disable_gravatar=Non-aktifkan Gravatar +disable_gravatar=Menonaktifkan Gravatar disable_gravatar_popup=Matikan Gravatar dan sumber avatar pihak ketiga lainnya. Avatar standar akan digunakan kecuali pengguna mengunggah avatar sendiri. -federated_avatar_lookup=Aktifkan Avatar Terfederasi +federated_avatar_lookup=Aktifkan pencarian avatar federated_avatar_lookup_popup=Mengaktifkan pencarian avatar federasi menggunakan Libravatar. disable_registration=Matikan Swa-pendaftaran disable_registration_popup=Nonaktifkan pendaftaran oleh pengguna. Hanya admin yang dapat membuat akun pengguna baru. @@ -153,14 +142,14 @@ openid_signin_popup=Aktifkan masuk pengguna lewat OpenID. openid_signup=Aktifkan Pendaftaran OpenID openid_signup_popup=Aktifkan pendaftaran berdasarkan OpenID. enable_captcha_popup=Membutukan CAPTCHA untuk pendaftaran. -require_sign_in_view=Anda Harus Login untuk Melihat Halaman +require_sign_in_view=Harus Login Untuk Melihat Halaman require_sign_in_view_popup=Batasi akses halaman hanya pada pengguna yang masuk. Pengunjung hanya dapat melihat halaman masuk dan pendaftaran. admin_setting_desc=Akun administrator tidak wajib dibuat. Pengguna yang pertama kali mendaftar akan secara otomatis menjadi administrator. admin_title=Pengaturan Akun Admin admin_name=Nama Pengguna Admin -admin_password=Kata sandi +admin_password=Kata Sandi confirm_password=Konfirmasi Kata Sandi -admin_email=Alamat Surel +admin_email=Alamat Email install_btn_confirm=Memasang Gitea test_git_failed=Tidak dapat menguji perintah 'git': %v sqlite3_not_available=Gitea versi ini tidak mendukung SQLite3, Silahkan untuh versi biner resmi dari %s (bukan versi 'gobuild'). @@ -179,6 +168,8 @@ default_enable_timetracking=Aktifkan Pelacakan Waktu secara Asali default_enable_timetracking_popup=Gunakan pelacakan waktu untuk repositori baru. no_reply_address=Nama Email Tersembunyi no_reply_address_helper=Nama domain untuk pengguna yang menyembunyikan alamat emailnya. Misal untuk pengguna dengan nama gabri, akan ditampilkan sebagai 'gabri@contoh.id' jika nama domain diisi 'contoh.id'. +smtp_addr=Host SMTP +smtp_port=Port SMTP [home] uname_holder=Nama Pengguna atau Alamat Surel @@ -191,10 +182,8 @@ my_orgs=Organisasi Saya my_mirrors=Duplikat Saya view_home=Lihat %s search_repos=Cari repositori… - - - issues.in_your_repos=Dalam repositori anda +show_private=Pribadi [explore] repos=Repositori @@ -208,7 +197,6 @@ org_no_results=Tidak ada organisasi yang cocok ditemukan. code_no_results=Tidak ada kode sumber yang cocok dengan istilah yang anda cari. code_search_results=Hasil pencarian untuk '%s' - [auth] create_new_account=Daftar Akun register_helper_msg=Sudah memiliki akun? Masuk sekarang! @@ -268,23 +256,12 @@ authorization_failed_desc=Otorisasi gagal oleh karena kami mendeteksi permintaan sspi_auth_failed=Autentikasi SSPI gagal [mail] - activate_account=Silakan aktifkan akun anda - activate_email=Verifikasi alamat surel anda - register_notify=Selamat Datang di Gitea - reset_password=Pulihkan akun Anda - register_success=Pendaftaran berhasil - - - - - - [modal] yes=Ya no=Tidak @@ -302,32 +279,28 @@ PayloadUrl=Muatan URL TeamName=Nama tim AuthName=Nama otorisasi AdminEmail=Surel admin - NewBranchName=Nama cabang baru CommitSummary=Ringkasan Commit CommitMessage=Pesan Commit CommitChoice=Pilihan Commit TreeName=Jalur berkas Content=Konten - SSPISeparatorReplacement=Pemisah SSPIDefaultLanguage=Bahasa Utama - -require_error=` tidak boleh kosong.` -alpha_dash_error=` seharusnya hanya mengandung karakter alfanumerik, tanda pisah ('-'), dan tanda garis bawah ('_').` -alpha_dash_dot_error=` seharusnya hanya mengandung karakter alfanumerik, tanda pisah ('-'), tanda garis bawah ('_'), dan titik ('.')` -git_ref_name_error=` harus berupa nama referensi Git yang baik dan benar.` -size_error=` harus berukuran %s.` -min_size_error=` harus berisi karakter %s setidaknya.` -max_size_error=` harus mengandung paling banyak %s karakter.` -email_error=` bukan alamat surel yang valid. ` -include_error=` harus mengandung substring '%s'.` -glob_pattern_error=` pola glob salah: %s.` +require_error=" tidak boleh kosong." +alpha_dash_error=" seharusnya hanya mengandung karakter alfanumerik, tanda pisah ('-'), dan tanda garis bawah ('_')." +alpha_dash_dot_error=" seharusnya hanya mengandung karakter alfanumerik, tanda pisah ('-'), tanda garis bawah ('_'), dan titik ('.')" +git_ref_name_error=" harus berupa nama referensi Git yang baik dan benar." +size_error=" harus berukuran %s." +min_size_error=" harus berisi karakter %s setidaknya." +max_size_error=" harus mengandung paling banyak %s karakter." +email_error=" bukan alamat surel yang valid. " +include_error=" harus mengandung substring '%s'." +glob_pattern_error=" pola glob salah: %s." unknown_error=Kesalahan yang tidak diketahui: captcha_incorrect=Kode CAPTCHA salah. password_not_match=Kata sandi tidak cocok. lang_select_error=Pilih bahasa dari daftar. - username_been_taken=Nama pengguna sudah terambil. repo_name_been_taken=Nama repositori sudah digunakan. visit_rate_limit=Kunjungan remot mengatasi batasan laju. @@ -349,16 +322,13 @@ enterred_invalid_password=Kata sandi yang Anda masukkan salah. user_not_exist=Pengguna tidak ada. team_not_exist=Tim tidak ada. cannot_add_org_to_team=Sebuah organisasi tidak dapat ditambahkan sebagai anggota tim. - invalid_ssh_key=Tidak dapat memverifikasi kunci SSH Anda: %s invalid_gpg_key=Tidak dapat memverifikasi kunci GPG Anda: %s unable_verify_ssh_key=Tidak dapat memverifikasi kunci SSH; periksa kembali bila ada kesalahan. auth_failed=Otentikasi gagal: %v - still_own_repo=Akun anda memiliki satu atau lebih repositori, pindahkan atau transfer terlebih dahulu. still_has_org=Akun Anda adalah anggota dari satu atau lebih organisasi, tinggalkan terlebih dahulu. org_still_own_repo=Organisasi ini masih memiliki satu atau lebih repositori; hapus atau transfer terlebih dahulu. - target_branch_not_exist=Target cabang tidak ada. [user] @@ -373,7 +343,6 @@ follow=Ikuti unfollow=Berhenti Mengikuti heatmap.loading=Memuat Peta Panas… user_bio=Biografi - form.name_reserved=Nama pengguna '%s' dicadangkan. form.name_pattern_not_allowed=Pola '%s' tidak diperbolehkan dalam nama pengguna. @@ -393,7 +362,6 @@ twofa=Otentikasi Dua-Faktor account_link=Akun Tertaut organization=Organisasi uid=Uid - public_profile=Profil Publik profile_desc=Alamat email Anda akan digunakan untuk notifikasi dan operasi lainnya. password_username_disabled=Pengguna non-lokal tidak diizinkan untuk mengubah nama pengguna mereka. Silakan hubungi administrator sistem anda untuk lebih lanjut. @@ -409,7 +377,6 @@ continue=Lanjutkan cancel=Batalkan language=Bahasa ui=Tema - lookup_avatar_by_mail=Cari Avatar melalui Alamat Email federated_avatar_lookup=Aktifkan Pencarian Avatar Representasi enable_custom_avatar=Gunakan Avatar Pilihan @@ -419,7 +386,6 @@ delete_current_avatar=Hapus Avatar Saat Ini uploaded_avatar_not_a_image=Berkas yang diunggah bukanlah gambar. uploaded_avatar_is_too_big=Berkas yang diunggah melebihi ukuran maksimum. update_avatar_success=Avatar Anda telah diperbarui. - change_password=Perbarui kata sandi old_password=Kata Sandi Saat Ini new_password=Kata Sandi Baru @@ -427,7 +393,6 @@ retype_new_password=Ketik Ulang Kata Sandi Baru password_incorrect=Kata sandi saat ini salah. change_password_success=Sandi Anda telah diperbarui. Mulai dari sekarang gunakan kata sandi yang baru. password_change_disabled=Pengguna non-lokal tidak dapat mengganti kata sandi mereka melalui antarmuka web Gitea. - emails=Alamat Surel manage_emails=Kelola Alamat Surel manage_themes=Pilih tema default @@ -455,7 +420,6 @@ add_openid_success=Alamat OpenID telah ditambahkan. keep_email_private=Sembunyikan Alamat Surel keep_email_private_popup=Alamat email Anda akan disembunyikan dari pengguna lain. openid_desc=OpenID memungkinkan anda melimpahkan autentikasi kepada penyedia eksternal. - manage_ssh_keys=Mengelola Kunci SSH manage_gpg_keys=Mengelola Kunci GPG add_key=Tambahkan Kunci @@ -496,7 +460,6 @@ manage_social=Kelola Akun Sosial Yang Terhubung social_desc=Akun sosial berikut tertaut dengan akun Gitea Anda. Pastikan Anda mengenali semuanya oleh karena hal tersebut bisa digunakan untuk masuk ke akun Gitea Anda. unbind=Putuskan unbind_success=Akun sosial telah diputus dari akun Gitea Anda. - manage_access_token=Kelola Token Akses generate_new_token=Hasilkan Token Baru tokens_desc=Token berikut akan memberikan akses ke Akun Anda menggunakan API Gitea. @@ -507,7 +470,6 @@ generate_token_success=Token baru Anda telah dibuat. Salin sekarang oleh karena delete_token=Hapus access_token_deletion=Hapus Token Akses delete_token_success=Token telah dihapus. Aplikasi yang menggunakannya tidak lagi memiliki akses ke akun Anda. - manage_oauth2_applications=Kelola Aplikasi OAuth2 edit_oauth2_application=Sunting Aplikasi OAuth2 oauth2_applications_desc=Aplikasi OAuth2 memungkinkan aplikasi pihak ketiga Anda untuk autentikasi pengguna pada instans Gitea ini dengan aman. @@ -529,14 +491,12 @@ oauth2_client_secret_hint=Rahasia tidak akan terlihat jika mengunjungi ulang hal oauth2_application_edit=Sunting oauth2_application_create_description=Aplikasi OAuth2 memberikan aplikasi pihak ketiga Anda akses akun pengguna pada instans ini. oauth2_application_remove_description=Menghapus aplikasi OAuth2 akan mencegah mengakses akun pengguna terotorisasi pada instans ini. Lanjutkan? - authorized_oauth2_applications=Aplikasi OAuth2 Terotorisasi authorized_oauth2_applications_description=Anda memberikan akses akun Gitea Anda pada aplikasi pihak ketiga berikut. Mohon cabut akses untuk aplikasi yang sudah tidak dibutuhkan. revoke_key=Cabut revoke_oauth2_grant=Cabut Akses revoke_oauth2_grant_description=Mencabut akses untuk aplikasi pihak ketiga ini akan mencegahnya mengakses data Anda. Lanjutkan? revoke_oauth2_grant_success=Akses berhasil dicabut. - twofa_desc=Autentikasi dua faktor menambah keamanan akun Anda. twofa_is_enrolled=Akun anda saat ini terdaftar dalam otentikasi dua-faktor. twofa_not_enrolled=Akun anda saat ini tidak terdaftar dalam otentikasi dua-faktor. @@ -551,28 +511,33 @@ twofa_disabled=Otentikasi dua-faktor telah dinonaktifkan. scan_this_image=Pindai gambar ini dengan aplikasi otentikasi: or_enter_secret=Atau masukkan rahasia: %s passcode_invalid=Kode sandi salah. Coba lagi. - - manage_account_links=Kelola akun tertaut manage_account_links_desc=Semua akun eksternal ini sementara tertaut dengan akun Gitea Anda. account_links_not_available=Saat ini tidak ada akun eksternal yang tertaut ke akun Gitea ini. remove_account_link=Hapus Akun Tertaut remove_account_link_desc=Menghapus akun tertaut akan membuat akun itu tidak bisa mengakses akun Gitea Anda. Lanjutkan? remove_account_link_success=Akun tertaut sudah dihapus. - orgs_none=Anda bukan anggota dari organisasi apapun. repos_none=Anda tidak memiliki repositori apapun - delete_account=Hapus Akun Anda delete_prompt=Langkah ini akan menghapus akun Anda secara permanen. Anda yakin?. confirm_delete_account=Konfirmasi Penghapusan delete_account_title=Hapus Akun Pengguna delete_account_desc=Apakah Anda yakin ingin menghapus secara permanen akun pengguna ini? - email_notifications.enable=Aktifkan Pemberitahuan Surel email_notifications.disable=Nonaktifkan Email Notifikasi email_notifications.submit=Pasang Pengaturan Email - +comment_type_group_title=Judul +activated=Diaktifkan +gpg_key_verify=Verifikasi +gpg_token=Token +ssh_key_verify=Verifikasi +ssh_token=Token +principal_content=Konten +access_token_deletion_cancel_action=Membatalkan +access_token_deletion_confirm_action=Hapus +link_account=Tautan Akun +visibility.private=Pribadi [repo] owner=Pemilik @@ -611,20 +576,14 @@ forks=Garpu pick_reaction=Pilih reaksimu reactions_more=dan %d lainnya unit_disabled=Administrator web menonaktifkan bagian repositori ini. - - - template.webhooks=Webhooks template.topics=Topik template.avatar=Avatar - archive.title=Repositori ini diarsipkan. Anda bisa melihat berkas dan mengkloningnya, tapi tidak dapat mendorong atau membuka masalah/permintaan tarik. archive.issue.nocomment=Repositori ini diarsipkan. Anda tidak dapat mengomentari masalah. archive.pull.nocomment=Repositori ini diarsipkan. Anda tidak dapat mengomentari permintaan tarik. - form.name_reserved=Nama repositori '%s' dicadangkan. form.name_pattern_not_allowed=Pola '%s' tidak diperbolehkan dalam nama repositori. - migrate_items=Ihwal Migrasi migrate_items_wiki=Wiki migrate_repo=Migrasi Repositori @@ -635,7 +594,6 @@ migrated_from=Termigrasi dari %[2]s migrated_from_fake=Termigrasi Dari %[1]s migrate.migrating=Memigrasi dari %s ... migrate.migrating_failed=Migrasi dari %s gagal. - mirror_from=duplikat dari forked_from=fork dari generated_from=terbangkit dari @@ -647,13 +605,11 @@ unstar=Hapus Bintang star=Bintang fork=Garpu download_archive=Unduh Repositori - no_desc=Tidak ada Deskripsi quick_guide=Panduan Cepat clone_this_repo=Klon repositori ini create_new_repo_command=Membuat repositori baru pada baris perintah push_exist_repo=Mendorong sebuah repositori yang ada di baris perintah - code=Kode branch=Cabang tree=Pohon @@ -663,7 +619,6 @@ tags=Tag issues=Masalah pulls=Tarik Permintaan labels=Label - milestones=Tonggak commits=Melakukan commit=Memperbuat @@ -673,14 +628,12 @@ file_history=Riwayat file_view_raw=Lihat Mentah file_permalink=Permalink file_too_large=Berkas terlalu besar untuk ditampilkan. - stored_lfs=Tersimpan dengan GIT LFS commit_graph=Grafik Komit blame=Salahkan normal_view=Pandangan Normal line=baris lines=baris - editor.new_file=Berkas Baru editor.upload_file=Unggah Berkas editor.edit_file=Sunting Berkas @@ -715,7 +668,6 @@ editor.file_is_a_symlink='%s' adalah tautan simbolik, yang tidak dapat disunting editor.no_changes_to_show=Tidak ada perubahan untuk ditampilkan. editor.unable_to_upload_files=Gagal untuk mengunggah berkas ke '%s' dengan kesalahan: %v editor.upload_files_to_dir=Unggah berkas ke '%s' - commits.commits=Melakukan commits.find=Telusuri commits.author=Penulis @@ -724,10 +676,6 @@ commits.date=Tanggal commits.older=Lebih lama commits.newer=Terbaru commits.signed_by=Ditandai oleh - - - - issues.new=Masalah Baru issues.new.labels=Label issues.new.no_label=Tidak ada Label @@ -744,13 +692,13 @@ issues.create_label=Buat Label issues.label_templates.title=Muat sebuah label yang telah ditentukan issues.label_templates.helper=Pilih set label issues.label_templates.fail_to_load_file=Gagal untuk memuat berkas contoh label '%s': %v -issues.add_milestone_at=`telah menambahkan ini ke %s milestone %s` -issues.change_milestone_at=`telah mengubah milestone dari %s ke %s %s` -issues.remove_milestone_at=`telah menghapus ini dari %s milestone %s` -issues.deleted_milestone=`(dihapus)` -issues.self_assign_at=`menugaskan diri %s` -issues.add_assignee_at=`telah ditugaskan oleh %s %s` -issues.delete_branch_at=`telah dihapus cabang %s %s` +issues.add_milestone_at=telah menambahkan ini ke %s milestone %s +issues.change_milestone_at=telah mengubah milestone dari %s ke %s %s +issues.remove_milestone_at=telah menghapus ini dari %s milestone %s +issues.deleted_milestone=(dihapus) +issues.self_assign_at=menugaskan diri %s +issues.add_assignee_at=telah ditugaskan oleh %s %s +issues.delete_branch_at=telah dihapus cabang %s %s issues.filter_label=Label issues.filter_milestone=Tonggak issues.filter_assignee=Menerima @@ -779,7 +727,7 @@ issues.next=Selanjutnya issues.open_title=Buka issues.closed_title=Tertutup issues.num_comments=%d komentar -issues.commented_at=`komentar %s` +issues.commented_at=komentar %s issues.delete_comment_confirm=Apakah anda yakin anda ingin menghapus komentar ini? issues.context.copy_link=Salin tautan issues.context.quote_reply=Kutip Balasan @@ -791,7 +739,7 @@ issues.close_comment_issue=Komentar dan Tutup issues.reopen_issue=Buka kembali issues.reopen_comment_issue=Komentar dan Buka Kembali issues.create_comment=Komentar -issues.commit_ref_at=`merujuk masalah dari komit %[2]s` +issues.commit_ref_at=merujuk masalah dari komit %[2]s issues.poster=Poster issues.collaborator=Kalaborator issues.owner=Pemilik @@ -809,19 +757,17 @@ issues.label_delete=Hapus issues.label.filter_sort.alphabetically=Urutan abjad issues.label.filter_sort.reverse_alphabetically=Membalikkan menurut abjad issues.num_participants=%d peserta -issues.attachment.open_tab=`Klik untuk melihat "%s" di tab baru` -issues.attachment.download=`Klik untuk mengunduh "%s"` +issues.attachment.open_tab=Klik untuk melihat "%s" di tab baru +issues.attachment.download=Klik untuk mengunduh "%s" issues.subscribe=Berlangganan issues.unsubscribe=Berhenti berlangganan -issues.start_tracking_history=`mulai bekerja %s` -issues.stop_tracking_history=`berhenti bekerja %s` -issues.cancel_tracking_history=`batalkan pelacakan waktu %s` +issues.start_tracking_history=mulai bekerja %s +issues.stop_tracking_history=berhenti bekerja %s +issues.cancel_tracking_history=batalkan pelacakan waktu %s issues.add_time_cancel=Batalkan -issues.add_time_history=`tambah menghabiskan waktu %s` +issues.add_time_history=tambah menghabiskan waktu %s issues.add_time_hours=Jam issues.add_time_minutes=Menit - - pulls.new=Permintaan Tarik Baru pulls.filter_branch=Penyaringan cabang pulls.no_results=Hasil tidak ditemukan. @@ -833,14 +779,7 @@ pulls.tab_commits=Melakukan pulls.reopen_to_merge=Tolong buka kembali permintaan tarik ini untuk melaksanakan penggabungan. pulls.merged=Menggabungkan pulls.can_auto_merge_desc=Permintaan tarik ini dapat digabung secara otomatis. - - ; %[2]s
    %[3]s     - - - - - milestones.new=Milestone Baru milestones.closed=Tertutup %s milestones.no_due_date=Tidak ada jatuh tempo @@ -859,9 +798,6 @@ milestones.filter_sort.least_complete=Paling tidak lengkap milestones.filter_sort.most_complete=Paling lengkap milestones.filter_sort.most_issues=Paling banyak masalah milestones.filter_sort.least_issues=Paling sedikit masalah - - - wiki=Wiki wiki.page=Halaman wiki.filter_page=Halaman Penyaring @@ -874,7 +810,6 @@ wiki.delete_page_button=Hapus Halaman wiki.page_already_exists=Halaman wiki dengan nama yang sama telah ada. wiki.pages=Halaman wiki.last_updated=Pembaruan terakhir %s - activity=Kegiatan activity.period.filter_label=Periode: activity.period.daily=1 hari @@ -912,11 +847,9 @@ activity.title.releases_1=%d Rilis activity.title.releases_n=%d Rilis activity.title.releases_published_by=%s dikeluarkan oleh %s activity.published_release_label=Dikeluarkan - search=Cari search.search_repo=Cari repositori search.results=Cari hasil untuk "%s" dalam %s - settings=Pengaturan settings.desc=Pengaturan dimana anda dapat mengelola pengaturan untuk repositori settings.collaboration.write=Tulis @@ -977,7 +910,6 @@ settings.protected_branch_can_push_no=Anda tidak dapat mendorong settings.add_protected_branch=Aktifkan perlindungan settings.delete_protected_branch=Nonaktifkan perlindungan settings.choose_branch=Pilih branch… - diff.browse_source=Telusuri Sumber diff.parent=orang tua diff.commit=melakukan @@ -988,7 +920,6 @@ diff.stats_desc= %d mengubah file dengan %d tambahan%s branch.create_from=dari '%s' branch.branch_already_exists=Cabang '%s' sudah ada di repositori ini. branch.deleted_by=Dihapus oleh %s - - - - - +delete_preexisting_label=Hapus +desc.private=Pribadi +template.issue_labels=Label Masalah +migrate_items_milestones=Tonggak +migrate_items_issues=Masalah +migrate_items_pullrequests=Tarik Permintaan +migrate_items_releases=Rilis +projects.description_placeholder=Deskripsi +projects.title=Judul +issues.new_label_desc_placeholder=Deskripsi +issues.deleted_project=(dihapus) +issues.draft_title=Rancangan +issues.delete=Hapus +issues.due_date_form_edit=Edit +issues.due_date_form_remove=Menghapus +issues.dependency.cancel=Membatalkan +issues.dependency.remove=Menghapus +pulls.compare_changes=Permintaan Tarik Baru +wiki.new_page=Halaman +activity.period.yearly=1 tahun +search.code_no_results=Tidak ada kode sumber yang cocok dengan istilah yang anda cari. +settings.options=Repositori +settings.collaboration.owner=Pemilik +settings.site=Situs web +settings.trust_model.collaborator=Kalaborator +settings.delete_collaborator=Menghapus +settings.teams=Tim +settings.webhook.payload=Konten +settings.event_delete=Hapus +settings.event_fork=Garpu +settings.event_wiki=Wiki +settings.event_issues=Masalah +settings.edit_protected_branch=Edit +diff.file_byte_size=Ukuran [org] org_name_holder=Nama Organisasi @@ -1033,21 +992,16 @@ create_team=Buat Tim Baru org_desc=Deskripsi team_name=Nama tim team_desc=Deskripsi - - settings=Pengaturan settings.full_name=Nama Lengkap settings.website=Situs web settings.location=Lokasi - settings.update_settings=Perbarui Setelan settings.update_setting_success=Pengaturan organisasi telah diperbarui. settings.delete=Menghapus Organisasi settings.delete_account=Menghapus Organisasi Ini settings.confirm_delete_account=Konfirmasi Penghapusan settings.hooks_desc=Tambahkan webhooks yang akan dipicu untuk semua repositori di bawah organisasi ini. - - members.membership_visibility=Visibilitas Keanggotaan: members.member_role=Peran Anggota: members.owner=Pemilik @@ -1056,7 +1010,6 @@ members.remove=Menghapus members.leave=Meninggalkan members.invite_desc=Tambahkan anggota baru ke %s: members.invite_now=Mengundang Sekarang - teams.join=Ikut teams.leave=Meninggalkan teams.no_desc=Tim ini tidak memiliki keterangan @@ -1068,6 +1021,10 @@ teams.delete_team_success=Tim sudah di hapus. teams.repositories=Tim repositori teams.search_repo_placeholder=Cari repositori… teams.add_nonexistent_repo=Repositori yang ingin Anda tambahkan tidak ada; Silahkan buat terlebih dahulu. +members=Anggota +settings.visibility.private_shortname=Pribadi +settings.delete_org_title=Menghapus Organisasi +teams.read_access=Dibaca [admin] dashboard=Dasbor @@ -1079,7 +1036,6 @@ monitor=Memantau first_page=Pertama last_page=Terakhir total=Total: %d - dashboard.operation_name=Nama operasi dashboard.operation_switch=Beralih dashboard.operation_run=Lari @@ -1114,7 +1070,6 @@ dashboard.total_gc_time=Total GC di jeda dashboard.total_gc_pause=Total GC di jeda dashboard.last_gc_pause=GC di jeda terakhir dashboard.gc_times=Waktu GC - users.activated=Diaktifkan users.admin=Pengelola users.repos=Repo @@ -1122,13 +1077,10 @@ users.created=Dibuat users.edit=Edit users.auth_source=Sumber Otentikasi users.local=Lokal - - orgs.org_manage_panel=Manajemen Organisasi orgs.name=Nama orgs.teams=Tim orgs.members=Anggota - repos.repo_manage_panel=Manajemen Repositori repos.owner=Pemilik repos.name=Nama @@ -1137,10 +1089,6 @@ repos.watches=Jam tangan repos.stars=Bintang repos.issues=Masalah repos.size=Ukuran - - - - auths.name=Nama auths.type=Jenis auths.enabled=Aktif @@ -1184,7 +1132,6 @@ auths.tip.gitlab=Mendaftar aplikasi baru di https://gitlab.com/profile/applicati auths.tip.openid_connect=Gunakan membuka ID yang terhubung ke jelajah URL (/.well-known/openid-configuration) untuk menentukan titik akhir auths.new_success=Otentikasi '%s' telah ditambahkan. auths.delete_auth_title=Menghapus Otentikasi Sumber - config.server_config=Pengaturan Server config.app_ver=Versi Gitea config.custom_conf=Jalur berkas konfigurasi @@ -1196,7 +1143,6 @@ config.lfs_root_path=Path Root LFS config.static_file_root_path=Jalur akar berkas statis config.script_type=Jenis skrip config.reverse_auth_user=Mengembalikan pengguna otentikasi - config.ssh_config=Konfigurasi SSH config.ssh_enabled=Aktif config.ssh_port=Port @@ -1206,10 +1152,8 @@ config.ssh_key_test_path=Path Key Test config.ssh_keygen_path=Path Keygen ('ssh-keygen') config.ssh_minimum_key_size_check=Periksa ukuran kunci minimum config.ssh_minimum_key_sizes=Ukuran kunci minimum - config.lfs_config=Konfigurasi LFS config.lfs_enabled=Aktif - config.db_config=Konfigurasi basis data config.db_type=Tipe config.db_host=Host @@ -1218,7 +1162,6 @@ config.db_user=Nama pengguna config.db_schema=Schema config.db_ssl_mode=SSL config.db_path=Jalur - config.service_config=Konfigurasi layanan config.register_email_confirm=Perlu Konfirmasi Email Saat Pendaftaran config.enable_openid_signin=Aktifkan Login OpenID @@ -1228,12 +1171,10 @@ config.mail_notify=Aktifkan Notifikasi Email config.disable_key_size_check=Menonaktifkan memeriksa ukuran kunci minimum config.enable_captcha=Aktifkan CAPTCHA config.active_code_lives=Kode aktif hidup - config.webhook_config=Konfigurasi Webhook config.queue_length=Panjang antrian config.deliver_timeout=Berikan waktu habis config.skip_tls_verify=Melewatkan verifikasi TLS - config.mailer_enabled=Diaktifkan config.mailer_name=Nama config.mailer_user=Pengguna @@ -1243,15 +1184,12 @@ config.mailer_sendmail_args=Argumen tambahan untuk Sendmail config.send_test_mail=Kirim Email Percobaan config.test_mail_failed=Gagal untuk mengirimkan email percobaan ke '%s': %v config.test_mail_sent=Email percobaan telah dikirim ke '%s'. - config.oauth_config=Konfigurasi OAuth config.oauth_enabled=Diaktifkan - config.cache_config=Konfigurasi cache config.cache_adapter=Adaptor cache config.cache_interval=Interval cache config.cache_conn=Koneksi cache - config.session_config=Sesi konfigurasi config.session_provider=Sesi penyedia config.provider_config=Konfigurasi penyedia @@ -1260,12 +1198,10 @@ config.gc_interval_time=Waktu interval GC config.session_life_time=Sesi jangka waktu config.https_only=Hanya HTTPS config.cookie_life_time=Jangka waktu cookie - config.picture_config=Pengaturan Foto dan Avatar config.picture_service=Gambar layanan config.disable_gravatar=Menonaktifkan Gravatar config.enable_federated_avatar=Aktifkan pencarian avatar - config.git_config=Konfigurasi Git config.git_disable_diff_highlight=Menonaktifkan Diff Syntax utama config.git_max_diff_lines=Garis Max Diff (untuk berkas tunggal) @@ -1277,13 +1213,10 @@ config.git_mirror_timeout=Waktu habis untuk memperbarui cermin config.git_clone_timeout=Waktu habis operasi klon config.git_pull_timeout=Waktu habis tarik operasi config.git_gc_timeout=Waktu habis operasi GC - config.log_config=Catat konfigurasi config.log_mode=Mode catat config.disabled_logger=Nonaktif config.xorm_log_sql=Catatan SQL - - monitor.cron=Tugas Cron monitor.name=Nama monitor.schedule=Jadwal @@ -1314,15 +1247,12 @@ monitor.queue.pool.addworkers.numberworkers.placeholder=Jumlah Worker monitor.queue.pool.addworkers.timeout.placeholder=Taruh 0 untuk tanpa ada waktu tunggu monitor.queue.pool.addworkers.mustnumbergreaterzero=Jumlah Worker yang akan ditambahkan harus lebih dari 0 monitor.queue.pool.addworkers.musttimeoutduration=Waktu tunggu haruslah sebuah durasi golang. Contoh, 5m atau 0 - monitor.queue.settings.title=Pengaturan Kelompok monitor.queue.settings.timeout.error=Waktu tunggu haruslah sebuah durasi golang. Contoh, 5m atau 0 monitor.queue.settings.maxnumberworkers=Jumlah Maks. Worker monitor.queue.settings.maxnumberworkers.error=Jumlah maks. worker haruslah sebuah angka monitor.queue.settings.submit=Perbarui Pengaturan monitor.queue.settings.changed=Pengaturan diperbarui - - notices.system_notice_list=Pemberitahuan sistem notices.view_detail_header=Lihat rincian pemberitahuan notices.actions=Tindakan @@ -1336,6 +1266,16 @@ notices.type_1=Repositori notices.desc=Deskripsi notices.op=Op. notices.delete_success=Laporan sistem telah dihapus. +users.full_name=Nama Lengkap +users.list_status_filter.is_admin=Pengelola +emails.activated=Diaktifkan +packages.owner=Pemilik +packages.name=Nama +packages.type=Jenis +packages.repository=Repositori +packages.size=Ukuran +auths.delete=Menghapus Otentikasi Sumber +config.mailer_smtp_port=Port SMTP [action] create_repo=repositori dibuat %s @@ -1393,4 +1333,20 @@ error.no_unit_allowed_repo=Anda tidak diijinkan untuk melihat semua unit dari re error.unit_not_allowed=Anda tidak diizinkan untuk mengunjungi unit repositori ini. [packages] - +filter.type=Jenis +conan.details.repository=Repositori +owner.settings.cleanuprules.enabled=Aktif + +[aria] + +[secrets] +name=Nama + +[actions] +runners.name=Nama +runners.owner_type=Jenis +runners.description=Deskripsi +runners.task_list.run=Lari +runners.task_list.repository=Repositori +runners.task_list.commit=Memperbuat +runs.commit=Memperbuat diff --git a/options/locale/locale_is-IS.ini b/options/locale/locale_is-IS.ini index 3b5155840c4d..0aebbe3edab2 100644 --- a/options/locale/locale_is-IS.ini +++ b/options/locale/locale_is-IS.ini @@ -22,7 +22,6 @@ enable_javascript=Þessi vefsíða virkar betur með JavaScript virkt. toc=Efnisyfirlit licenses=Hugbúnaðarleyfi return_to_gitea=Til baka að Gitea - username=Notandanafn email=Netfang password=Lykilorð @@ -32,7 +31,6 @@ captcha=CAPTCHA twofa=Tvíþætt Auðkenning twofa_scratch=Tveggja-Þátta Skrapkóði passcode=Aðgangstala - webauthn_insert_key=Settu öryggislykilinn þinn inn webauthn_sign_in=Ýttu á hnappinn á öryggislyklinum þínum. Ef öryggislykillinn þinn hefur engan hnapp skaltu setja hann aftur inn. webauthn_press_button=Vinsamlegast ýttu á hnappinn á öryggislyklinum þínum… @@ -46,7 +44,6 @@ webauthn_error_duplicated=Öryggislykillinn er ekki leyfður fyrir þessa beiðn webauthn_error_empty=Þú verður að setja nafn fyrir þennan lykil. webauthn_error_timeout=Tímamörk náð áður en hægt var að lesa lykilinn þinn. Vinsamlegast endurhlaðið þessa síðu og reyndu aftur. webauthn_reload=Endurhlaða - repository=Hugbúnaðarsafn organization=Stofnun mirror=Speglun @@ -64,18 +61,15 @@ settings=Stillingar your_profile=Notandasíða your_starred=Eftirlæti your_settings=Stillingar - all=Allt sources=Eigin mirrors=Speglanir collaborative=Samstörf forks=Skiptingar - activities=Virkni pull_requests=Sameiningarbeiðnir issues=Vandamál milestones=Tímamót - ok=Í lagi cancel=Hætta við save=Vista @@ -84,26 +78,20 @@ add_all=Bæta Öllu Við remove=Fjarlægja remove_all=Fjarlægja Allt edit=Breyta - copy=Afrita copy_url=Afrita vefslóð copy_branch=Afritaðu heiti greinar copy_success=Afritað! copy_error=Afritun mistókst - write=Skrifa preview=Forskoða loading=Hleður… - step1=Skref 1: step2=Skref 2: - error=Villa error404=Síðan sem þú ert að reyna að fá annað hvort er ekki til eða þú hefur ekki heimild til að skoða hana. - never=Aldrei - [filter] [error] @@ -155,7 +143,6 @@ err_empty_admin_email=Netfang stjórnanda má ekki vera tómt. err_admin_name_is_reserved=Notandanafn stjórnanda er ógilt. Notandanafnið er frátekið err_admin_name_pattern_not_allowed=Notandanafn stjórnanda er ógilt. Notandanafnið passar við frátekið mynstur err_admin_name_is_invalid=Notandanafn Stjórnanda er ógilt - general_title=Almennar Stillingar app_name=Heiti vefsvæðis app_name_helper=Þú getur slegið inn nafn fyrirtækis þíns hér. @@ -175,7 +162,6 @@ app_url=Grunnvefslóð Gitea app_url_helper=Grunnvistfang fyrir HTTP(S) afrit slóð og tölvupósttilkynningar. log_root_path=Slóð Annáls log_root_path_helper=Annálaskrár verða skrifaðar í þessa möppu. - optional_title=Valfrjálsar Stillingar email_title=Tölvupóstsstillingar smtp_from=Senda Tölvupóst Sem @@ -206,6 +192,8 @@ invalid_repo_path=Grunnsslóð hugbúnaðarsafns er ógild: %v invalid_log_root_path=Slóð annáls er ógild: %v default_keep_email_private_popup=Fela sjálfgefið netföng nýrra notendareikninga. no_reply_address_helper=Lén fyrir notendur með falið netfang. Til dæmis notandanafnið „joe“ verður skráð í Git sem „joe@noreply.example.org“ ef falið tölvupóstlén er stillt á „noreply.example.org“. +smtp_addr=SMTP Hýsill +smtp_port=SMTP Gátt [home] uname_holder=Notandanafn eða Netfang @@ -217,13 +205,10 @@ my_mirrors=Speglanir Mínar view_home=Skoða %s search_repos=Finna hugbúnaðarsafn… filter=Aðrar Síur - show_archived=Safnvistað - show_private=Einka show_only_private=Að sýna aðeins einka show_only_public=Að sýna aðeins opinber - issues.in_your_repos=Í hugbúnaðarsöfnum þínum [explore] @@ -240,7 +225,6 @@ org_no_results=Engar samsvarandi stofnanir fundust. code_no_results=Enginn samsvarandi frumkóði fannst eftur þínum leitarorðum. code_search_results=Leitarniðurstöður fyrir „%s“ - [auth] create_new_account=Skrá Notanda register_helper_msg=Ertu nú þegar með notanda? Skráðu þig inn núna! @@ -288,31 +272,24 @@ password_pwned_err=Gat ekki klárað beiðni til HaveIBeenPwned view_it_on=Skoða þetta á %s link_not_working_do_paste=Virkar ekki? Prófaðu að afrita og líma slóðina í vafrann þinn. hi_user_x=Halló, %s, - activate_account=Vinsamlegast virkjaðu aðganginn þinn activate_account.title=%s, vinsamlegast virkjaðu aðganginn þinn activate_account.text_1=Halló, %[1]s, takk fyrir að nýskrá á %[2]s! activate_account.text_2=Vinsamlegast smelltu á eftirfarandi tengil til að virkja reikninginn þinn innan %s: - activate_email=Staðfestu netfangið þitt activate_email.title=%s, vinsamlegast staðfestu netfangið þitt activate_email.text=Vinsamlegast smelltu á eftirfarandi tengil til að staðfesta netfangið þitt innan %s: - register_notify=Velkomin(n) í Gitea register_notify.title=%[1]s, velkomin(n) í %[2]s register_notify.text_1=þetta er staðfestingarpóstur þinn fyrir skráningu á %s! register_notify.text_2=Þú getur nú skráð þig inn með notandanafni: %s. register_notify.text_3=Ef þessi reikningur hefur verið búinn til fyrir þig, vinsamlegast stilltu lykilorðið þitt fyrst. - reset_password=Endurheimta reikning þinn reset_password.title=%s, þú hefur beðið um að endurheimta reikninginn þinn reset_password.text=Vinsamlegast smelltu á eftirfarandi tengil til að endurheimta reikninginn þinn innan %s: - register_success=Nýskráning tókst - issue_assigned.pull=@%[1]s úthlutaði þér að sameiningarbeiðni %[2]s í hugbúnaðarsafni %[3]s. issue_assigned.issue=@%[1]s úthlutaði þér að vandamáli %[2]s í hugbúnaðarsafni %[3]s. - issue.x_mentioned_you=@%s minntist á þig: issue.action.push_1=@%[1]s bætti við %[3]d framlag í %[2]s issue.action.push_n=@%[1]s bætti við %[3]d framlög í %[2]s @@ -324,7 +301,6 @@ issue.action.reject=@%[1]s óskaði eftir breytingum á þessa sameininga issue.action.review=@%[1]s gerði ummæli á þessa sameiningarbeiðni. issue.action.new=@%[1]s skapaði #%[2]d. issue.in_tree_path=Í %s: - release.new.subject=%s í %s útgefið release.new.text=@%[1]s gaf út %[2]s í %[3]s release.title=Heiti: %s @@ -332,16 +308,13 @@ release.note=Athugasemd: release.downloads=Niðurhöl: release.download.zip=Frumkóði (ZIP) release.download.targz=Frumkóði (TAR.GZ) - repo.transfer.subject_to=%s langar að flytja „%s“ til %s repo.transfer.subject_to_you=%s langar að flytja „%s“ til þín repo.transfer.to_you=þig repo.transfer.body=Til að samþykkja eða hafna því skaltu fara á %s eða hunsa það bara. - repo.collaborator.added.subject=%s bætti þér við í %s repo.collaborator.added.text=Þér hefur verið bætt við sem aðila hugbúnaðarsafns: - [modal] yes=Já no=Nei @@ -356,26 +329,22 @@ Retype=Endurtaktu Lykilorðið HttpsUrl=HTTPS vefslóð TeamName=Liðsheiti AdminEmail=Netfang stjórnanda - NewBranchName=Heiti nýjar greinar CommitSummary=Framlagsútdráttur CommitMessage=Framlagsskilaboð CommitChoice=Framlagsval TreeName=Skráarslóð Content=Innihald - SSPISeparatorReplacement=Aðgreinir SSPIDefaultLanguage=Sjálfgefið Tungumál - -require_error=` Getur ekki verið tómt.` -alpha_dash_dot_error=` ætti aðeins að innihalda tölustafi, strik ('-'), undirstrik ('_') og punkta ('.').` -size_error=` þarf að vera stærð %s.` -email_error=` er ekki gilt netfang.` +require_error=" Getur ekki verið tómt." +alpha_dash_dot_error=" ætti aðeins að innihalda tölustafi, strik ('-'), undirstrik ('_') og punkta ('.')." +size_error=" þarf að vera stærð %s." +email_error=" er ekki gilt netfang." unknown_error=Óþekkt villa: captcha_incorrect=CAPTCHA kóðinn er rangur. password_not_match=Lykilorðin passa ekki saman. lang_select_error=Veldu tungumál af listanum. - username_been_taken=Notandanafnið er þegar í notkun. username_change_not_local_user=Notendum utan staðarins er ekki heimilt að breyta notendanafni sínu. repo_name_been_taken=Hugbúnaðarsafnsheiti er þegar notað. @@ -394,11 +363,8 @@ enterred_invalid_repo_name=Hugbúnaðarsafnsheitið sem þú slóst inn er rangt enterred_invalid_org_name=Stofnunarinnarheitið sem þú slóst inn er rangt. user_not_exist=Notandinn er ekki til. team_not_exist=Liðið er ekki til. - - org_still_own_repo=Þessi stofnun á enn eina eða fleiri hugbúnaðarsöfn; eyddu þeim eða flyttu þær fyrst. - [user] change_avatar=Breyttu notandamyndinni þinni… join_on=Gerðist meðlimi @@ -414,7 +380,6 @@ unfollow=Affylgja heatmap.loading=Hleð Hitakorti… user_bio=Lífssaga disabled_public_activity=Þessi notandi hefur slökkt á opinberum sýnileika virkninnar. - form.name_reserved=Notandanafnið „%s“ er frátekið. form.name_pattern_not_allowed=Mynstrið „%s“ er ekki leyft í notandanafni. form.name_chars_not_allowed=Notandanafnið „%s“ inniheldur ógilda stafi. @@ -437,7 +402,6 @@ account_link=Tengdir Reikningar organization=Stofnanir uid=Notandaauðkenni webauthn=Öryggislyklar - public_profile=Opinber Notandasíða biography_placeholder=Segðu okkur svolítið um þig profile_desc=Netfangið þitt verður notað fyrir tilkynningar og aðrar aðgerðir. @@ -470,7 +434,6 @@ comment_type_group_pull_request_push=Bætti við framlögum comment_type_group_project=Verkefni privacy=Friðhelgi keep_activity_private=Fela virkni frá notandasíðu - lookup_avatar_by_mail=Leita Efitr Notandamynd Með Netfangi enable_custom_avatar=Nota Sérsniða Notandamynd choose_new_avatar=Veldu nýja notandamynd @@ -480,13 +443,11 @@ uploaded_avatar_not_a_image=Skráin sem hlaðin var upp er ekki mynd. uploaded_avatar_is_too_big=Skráin sem hlaðin var upp er yfir hámarksstærð. update_avatar_success=Notandamynd þín hefur verið uppfærð. update_user_avatar_success=Notandamynd þessara notanda hefur verið uppfærð. - change_password=Uppfæra Lykilorð old_password=Núverandi Lykilorð new_password=Nýtt Lykilorð retype_new_password=Endurtaktu Nýja Lykilorðið password_incorrect=Núverandi lykilorðið er rangt. - emails=Netföng manage_emails=Stjórna Netföngum email_desc=Aðal netfangið þitt verður notað fyrir tilkynningar og aðrar aðgerðir. @@ -509,7 +470,6 @@ add_email_success=Nýja netfangið hefur verið bætt við. email_preference_set_success=Val á tölvupósti uppfært. keep_email_private=Fela Netfang keep_email_private_popup=Netfangið þitt verður falið öðrum notendum. - manage_ssh_keys=Stjórna SSH Lyklum manage_gpg_keys=Stjórna GPG Lyklum add_key=Bæta við lykli @@ -544,12 +504,10 @@ show_openid=Sýna á notandasíðu hide_openid=Fela frá notandasíðu ssh_disabled=SSH Óvirkt unbind=Aftengja - token_name=Táknlykills Heiti generate_token=Mynda Táknlykil delete_token=Eyða access_token_deletion=Eyða Aðgangslykli - create_oauth2_application_button=Skapa Forrit update_oauth2_application_success=Þú hefur uppfært OAuth2 forritið. oauth2_application_name=Forritsheiti @@ -558,28 +516,23 @@ save_application=Vista oauth2_client_id=Auðkenni Notanda oauth2_client_secret=Leyndarmál Notanda oauth2_application_edit=Breyta - authorized_oauth2_applications_description=Þú hefur veitt þessum forritum aðgang að þínum Gitea reikningi. Vinsamlegast afturkallaðu aðgang fyrir forrit sem ekki er lengur þörf á. revoke_key=Afturkalla revoke_oauth2_grant=Afturkalla Aðgang - twofa_disable=Óvirkja Tveggja-Þátta Auðkenningu twofa_scratch_token_regenerate=Endurgera Skrapkóða or_enter_secret=Eða sláðu inn leyndarmálið: %s - webauthn_nickname=Gælunafn - - - - email_notifications.enable=Virkja Tölvupósttilkynningar email_notifications.onmention=Aðeins Tölvupóst Þegar Minnst Er á Mig email_notifications.disable=Óvirkja Tölvupósttilkynningar email_notifications.submit=Stilla Val á Tölvupósti - visibility=Sýnileiki notanda visibility.public=Opinbert visibility.private=Einka +access_token_deletion_cancel_action=Hætta við +access_token_deletion_confirm_action=Eyða +link_account=Tengja Notanda [repo] new_repo_helper=Hugbúnaðarsafn inniheldur allar verkefnaskrár, þar á meðal útgáfuferil. Ertu nú þegar með það annars staðar? Flytja hugbúnaðarsafn @@ -622,8 +575,6 @@ reactions_more=og %d fleiri language_other=Annað delete_preexisting_label=Eyða delete_preexisting_content=Eyða skrám í %s - - desc.private=Einka desc.public=Opinbert desc.private_template=Einka sniðmát @@ -631,16 +582,12 @@ desc.public_template=Sniðmát desc.internal=Innra desc.internal_template=Innra sniðmát desc.archived=Safnvistað - template.git_content=Git Innihald (Sjálfgefin Grein) template.git_hooks=Git krókar template.webhooks=Vefkrókar template.topics=Viðfangsefni template.avatar=Auðkennismynd template.issue_labels=Vandamálslýsingar - - - migrate_options_lfs=Flytja LFS skrár migrate_options_lfs_endpoint.label=LFS Endapunktur migrate_items_wiki=Handbók @@ -655,7 +602,6 @@ migrate.migrate=Flytja Frá %s migrate.migrating_failed.error=Villa: %s migrate.git.description=Flytja hugbúnaðarsafn aðeins frá Git þjónustu. migrate.migrating_labels=Að færa Lýsingar - mirror_from=speglun af forked_from=tvískipt frá generated_from=myndað frá @@ -665,13 +611,11 @@ unstar=Fjarlægja eftirlæti star=Bæta við eftirlæti fork=Tvískipta download_archive=Hlaða Miður Geymslu - no_desc=Engin Lýsing quick_guide=Stuttar Leiðbeiningar clone_this_repo=Afrita þetta hugbúnaðarsafn create_new_repo_command=Að búa til nýja geymslu með skipanalínu push_exist_repo=Að senda inn núverandi geymslu með skipanalínu - code=Kóði branch=Grein tree=Tré @@ -682,7 +626,6 @@ issues=Vandamál pulls=Sameiningarbeiðnir project_board=Verkefni labels=Skýringar - milestones=Tímamót commits=Framlög commit=Framlag @@ -694,7 +637,6 @@ file_raw=Hrátt file_history=Saga file_view_source=Skoða Frumkóða file_view_rendered=Skoða Unnið - file_copy_permalink=Afrita Varanlega Slóð stored_lfs=Geymt með Git LFS commit_graph.hide_pr_refs=Fela Sameiningarbeiðnir @@ -704,7 +646,6 @@ blame=Ásaka download_file=Sækja skrá line=lína lines=línur - editor.new_file=Ný Skrá editor.upload_file=Uppfæra Skrá editor.edit_file=Breyta Skrá @@ -725,7 +666,6 @@ editor.new_branch_name_desc=Heiti nýjar greinar… editor.cancel=Hætta við editor.fail_to_update_file=Skrá „%s“ mistókst að skapa eða uppfæra. editor.fail_to_update_file_summary=Villuskilaboð: - commits.commits=Framlög commits.find=Leita commits.author=Höfundur @@ -733,9 +673,6 @@ commits.message=Skilaboð commits.date=Dagsetning commits.older=Eldri commits.newer=Nýrri - - - projects=Verkefni projects.description=Lýsing (valfrjálst) projects.description_placeholder=Lýsing @@ -754,7 +691,6 @@ projects.board.color=Litur projects.open=Opna projects.close=Loka projects.board.assigned_to=Úthlutað til - issues.filter_projects=Sía Verkefni issues.filter_labels=Sía Lýsingar issues.new=Nýtt Vandamál @@ -806,18 +742,18 @@ issues.next=Áfram issues.open_title=Opið issues.closed_title=Lokað issues.num_comments=%d ummæli -issues.commented_at=`gerði ummæli %s` +issues.commented_at=gerði ummæli %s issues.context.edit=Breyta issues.context.delete=Eyða issues.close_issue=Loka -issues.manually_pull_merged_at=`sameinaði framlag %[2]s inni í %[3]s handvirkt %[4]s` +issues.manually_pull_merged_at=sameinaði framlag %[2]s inni í %[3]s handvirkt %[4]s issues.close_comment_issue=Senda ummæli og Loka issues.reopen_issue=Enduropna issues.reopen_comment_issue=Senda ummæli og Enduropna issues.create_comment=Senda Ummæli -issues.closed_at=`lokaði þessu vandamáli %[2]s` -issues.reopened_at=`enduropnaði þetta vandamál %[2]s` -issues.ref_reopened_from=`enduropnaði þetta vandamál %[4]s %[2]s` +issues.closed_at=lokaði þessu vandamáli %[2]s +issues.reopened_at=enduropnaði þetta vandamál %[2]s +issues.ref_reopened_from=enduropnaði þetta vandamál %[4]s %[2]s issues.owner=Eigandi issues.edit=Breyta issues.cancel=Hætta við @@ -848,13 +784,13 @@ issues.start_tracking_short=Ræsa Tímamælir issues.add_time=Bæta Bið Tíma Handvirkt issues.add_time_short=Bæta Bið Tíma issues.add_time_cancel=Hætta við -issues.add_time_history=`bætti við eyddum tíma %s` -issues.del_time_history=`fjarlægði eyddum tíma %s` +issues.add_time_history=bætti við eyddum tíma %s +issues.del_time_history=fjarlægði eyddum tíma %s issues.add_time_hours=Klukkutímar issues.add_time_minutes=Mínútur issues.add_time_sum_to_small=Enginn tími var sleginn inn. issues.time_spent_total=Heildartíma Eytt -issues.time_spent_from_all_authors=`Heildartíma Eytt: %s` +issues.time_spent_from_all_authors=Heildartíma Eytt: %s issues.due_date=Eindagi issues.push_commit_1=bætti við %d framlag %s issues.push_commits_n=bætti við %d framlög %s @@ -873,8 +809,8 @@ issues.dependency.add=Bæta við kröfu… issues.dependency.cancel=Hætta við issues.dependency.remove=Fjarlægja issues.dependency.remove_info=Fjarlægja þessa kröfu -issues.dependency.added_dependency=`bætti við nýja kröfu %s` -issues.dependency.removed_dependency=`fjarlægði kröfu %s` +issues.dependency.added_dependency=bætti við nýja kröfu %s +issues.dependency.removed_dependency=fjarlægði kröfu %s issues.dependency.blocked_by_short=Krefur issues.dependency.remove_header=Fjarlægja Kröfu issues.dependency.add_error_dep_not_exist=Krafa er ekki til. @@ -894,10 +830,8 @@ issues.content_history.created=skapað issues.content_history.delete_from_history=Eyða úr ferlinum issues.content_history.delete_from_history_confirm=Eyða úr ferlinum? issues.content_history.options=Valkostir - compare.compare_base=grunnur compare.compare_head=bera saman - pulls.new=Ný Sameiningarbeiðni pulls.view=Skoða Sameiningarbeiðni pulls.compare_changes=Ný Sameiningarbeiðni @@ -918,17 +852,10 @@ pulls.reject_count_1=%d breytingarbeiðni pulls.reject_count_n=%d breytingarbeiðnir pulls.waiting_count_1=%d bíður endurskoðunar pulls.waiting_count_n=%d bíða endurskoðunar - pulls.merge_manually=Sameinað handvirkt - ; %[2]s
    %[3]s     pulls.status_checks_requested=Nauðsynlegt pulls.status_checks_details=Nánar - - - - - milestones.new=Nýtt tímamót milestones.closed=Lokaði %s milestones.update_ago=Uppfært fyrir %s @@ -942,9 +869,6 @@ milestones.clear=Hreinsa milestones.cancel=Hætta við milestones.filter_sort.most_issues=Flest vandamál milestones.filter_sort.least_issues=Fæst vandamál - - - wiki=Handbók wiki.welcome=Velkomin(n) í handbókina. wiki.create_first_page=Skapa Fyrstu Síðu @@ -960,7 +884,6 @@ wiki.page_already_exists=Handbókssíða með sömu nafni er þegar til. wiki.reserved_page=Handbókssíðuheiti „%s“ er frátekið. wiki.pages=Síður wiki.last_updated=Síðast uppfært: %s - activity=Virkni activity.period.filter_label=Tímabil: activity.period.daily=1 dagur @@ -1005,10 +928,8 @@ activity.git_stats_addition_n=%d viðbætur activity.git_stats_and_deletions=og activity.git_stats_deletion_1=%d eyðing activity.git_stats_deletion_n=%d eyðingar - search=Leita search.code_no_results=Enginn samsvarandi frumkóði fannst eftur þínum leitarorðum. - settings=Stillingar settings.options=Hugbúnaðarsafn settings.collaboration.write=Skrifa @@ -1084,7 +1005,6 @@ settings.lfs=LFS settings.lfs_locks=Lásar settings.lfs_lock=Læsa settings.lfs_pointers.oid=OID - diff.commit=framlag diff.git-notes=Athugasemd diff.whitespace_button=Hvítbil @@ -1102,7 +1022,6 @@ diff.comment.add_review_comment=Leggja inn ummæli diff.comment.reply=Svara diff.review.comment=Senda Ummæli diff.image.overlay=Yfirleggja - release.releases=Útgáfur release.tags=Merki release.draft=Uppkast @@ -1114,17 +1033,23 @@ release.content=Innihald release.cancel=Hætta við release.delete_tag=Eyða Merki release.downloads=Niðurhöl - branch.delete_head=Eyða branch.tag_collision=Ekki er hægt að skapa grein »%s“ þar sem merki með sama nafni er þegar til í hugbúnaðarsafninu. - tag.create_tag_operation=Skapa merki tag.confirm_create_tag=Skapa merki - - topic.done=Í lagi - - +packages=Pakkar +issues.filter_project=Verkefni +issues.filter_project_none=Ekkert verkefni +issues.filter_assignee=Úthlutað að +issues.filter_poster=Höfundur +issues.action_assignee=Úthlutað að +issues.draft_title=Uppkast +search.fuzzy=Óljóst +search.code_search_unavailable=Sem stendur er kóðaleit ekki í boði. Vinsamlegast hafðu samband við síðustjórann þinn. +settings.webhook.payload=Innihald +settings.event_wiki=Handbók +settings.event_push=Push [org] repo_updated=Uppfært @@ -1136,8 +1061,6 @@ create_new_team=Nýtt Lið org_desc=Lýsing team_name=Liðsheiti team_desc=Lýsing - - settings=Stillingar settings.full_name=Fullt nafn settings.website=Vefsíða @@ -1145,10 +1068,7 @@ settings.location=Staðsetning settings.visibility=Sýnileiki settings.visibility.public=Opinbert settings.visibility.private_shortname=Einka - settings.update_settings=Uppfæra Stillingar - - members.private=Faldir members.owner=Eigandi members.member=Meðlimur @@ -1157,7 +1077,6 @@ members.leave=Yfirgefa members.leave.detail=Viltu yfirgefa %s? members.invite_desc=Bæta nýjum meðlimi við í %s: members.invite_now=Bjóða Núna - teams.join=Gerast meðlimur teams.leave=Yfirgefa teams.leave.detail=Viltu yfirgefa %s? @@ -1168,6 +1087,7 @@ teams.write_access=Skrifa teams.settings=Stillingar teams.update_settings=Uppfæra Stillingar teams.all_repositories=Öll hugbúnaðarsöfn +members=Meðlimar [admin] repositories=Hugbúnaðarsöfn @@ -1175,7 +1095,6 @@ config=Stilling first_page=Byrjun last_page=Síðasta total=Samtals: %d - dashboard.new_version_hint=Gitea %s er nú í boði en þú ert að keyra %s. Athugaðu bloggsíðuna fyrir frekari upplýsingar. dashboard.statistic=Yfirlit dashboard.operation_switch=Skipta @@ -1183,7 +1102,6 @@ dashboard.operation_run=Keyra dashboard.update_mirrors=Uppfæra Speglanir dashboard.server_uptime=Uppitími Netþjóns dashboard.total_memory_allocated=Heildarminni úthlutað - users.name=Notandanafn users.full_name=Fullt Nafn users.admin=Stjórnandi @@ -1197,16 +1115,13 @@ users.list_status_filter.reset=Endurstilla users.list_status_filter.is_prohibit_login=Stöðva Innskráningu users.list_status_filter.not_prohibit_login=Leyfa Innskráningu users.list_status_filter.not_2fa_enabled=Tvíþætt Auðkenning Óvirk - emails.primary=Aðal emails.filter_sort.email=Tölvupóstur emails.filter_sort.name=Notandanafn emails.updated=Netfang uppfært - orgs.name=Heiti orgs.teams=Lið orgs.members=Meðlimar - repos.owner=Eigandi repos.name=Heiti repos.watches=Fylgist með @@ -1214,17 +1129,13 @@ repos.stars=Eftirlæti repos.forks=Skiptingar repos.issues=Vandamál repos.size=Stærð - packages.total_size=Heildarstærð: %s packages.name=Heiti packages.version=Útgáfa packages.type=Tegund packages.repository=Hugbúnaðarsafn packages.size=Stærð - defaulthooks.desc=Vefkrókar senda sjálfkrafa HTTP POST beiðnir til netþjóns þegar ákveðnir Gitea atburðir koma af stað. Vefkrókar sem eru skilgreindir hér eru sjálfgefnir og verða afritaðir í allar nýjar geymslur. Frekari upplýsingar eru í handbókini. - - auths.name=Heiti auths.type=Tegund auths.updated=Uppfært @@ -1239,20 +1150,16 @@ auths.oauth2_profileURL=Notandasíðuslóð auths.tips=Ábendingar auths.tip.dropbox=Búðu til nýtt forrit á https://www.dropbox.com/developers/apps auths.tip.yandex=Búðu til nýja umsókn á https://oauth.yandex.com/client/new. Veldu eftirfarandi heimildir úr „Yandex.Passport API“ kaflanum: "Aðgangur að netfangi", "Aðgangur að notandamynd" og "Aðgangur að notendanafni, fornafni og eftirnafni, kyni" - config.app_name=Heiti Vefsvæðis config.app_ver=Útgáfu Gitea config.git_version=Útgáfa Git config.repo_root_path=Grunnsslóð Hugbúnaðarsafns config.lfs_root_path=LFS Grunnsslóð config.log_file_root_path=Slóð Annáls - config.ssh_port=Gátt config.ssh_listen_port=Hlustunargátt config.ssh_root_path=Grunnsslóð - config.lfs_enabled=Virkt - config.db_type=Tegund config.db_host=Hýsill config.db_name=Heiti @@ -1260,20 +1167,9 @@ config.db_user=Notandanafn config.db_schema=Uppdráttur config.db_ssl_mode=SSL config.db_path=Slóð - - - config.mailer_name=Heiti config.mailer_user=Notandi - - - config.https_only=Aðeins HTTPS - - - - - monitor.name=Heiti monitor.goroutines=%d Górútínur monitor.desc=Lýsing @@ -1281,23 +1177,24 @@ monitor.process.children=Börn monitor.queues=Raðir monitor.queue.name=Heiti monitor.queue.type=Tegund - monitor.queue.settings.submit=Uppfæra Stillingar monitor.queue.settings.changed=Stillingar Uppfærðar monitor.queue.settings.blocktimeout.value=%[1]v - - notices.type=Tegund notices.type_1=Hugbúnaðarsafn notices.type_2=Verkefni notices.desc=Lýsing +users.list_status_filter.is_active=Virkt +users.list_status_filter.is_admin=Stjórnandi +packages.owner=Eigandi +config.mailer_smtp_port=SMTP Gátt [action] -create_issue=`opnaði vandamál %[3]s#%[2]s` -reopen_issue=`enduropnaði vandamál %[3]s#%[2]s` -reopen_pull_request=`enduropnaði sameiningarbeiðni %[3]s#%[2]s` -comment_issue=`gerði ummæli á vandamál %[3]s#%[2]s` -comment_pull=`gerði ummæli á sameiningarbeiðni %[3]s#%[2]s` +create_issue=opnaði vandamál %[3]s#%[2]s +reopen_issue=enduropnaði vandamál %[3]s#%[2]s +reopen_pull_request=enduropnaði sameiningarbeiðni %[3]s#%[2]s +comment_issue=gerði ummæli á vandamál %[3]s#%[2]s +comment_pull=gerði ummæli á sameiningarbeiðni %[3]s#%[2]s review_dismissed_reason=Ástæða: [tool] @@ -1364,3 +1261,20 @@ pypi.requires=Þarfnast Python pypi.documentation=Frekari upplýsingar um PyPI skrána er hægt að finna hér. rubygems.documentation=Frekari upplýsingar um RubyGems skrána er hægt að finna hér. +[aria] + +[secrets] +value=Gildi +name=Heiti + +[actions] +runners.id=Auðkenni +runners.name=Heiti +runners.owner_type=Tegund +runners.description=Lýsing +runners.labels=Lýsingar +runners.task_list.run=Keyra +runners.task_list.repository=Hugbúnaðarsafn +runners.task_list.commit=Framlag +runners.status.active=Virkt +runs.commit=Framlag diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini index 2c859a93e4db..61c69bc27ccd 100644 --- a/options/locale/locale_it-IT.ini +++ b/options/locale/locale_it-IT.ini @@ -23,7 +23,6 @@ enable_javascript=Il sito funziona meglio con JavaScript. toc=Indice dei contenuti licenses=Licenze return_to_gitea=Ritorna a Gitea - username=Nome utente email=Indirizzo Email password=Password @@ -33,7 +32,6 @@ captcha=CAPTCHA twofa=Verifica in due passaggi twofa_scratch=Codice di recupero per la verifica in due passaggi passcode=Codice di sicurezza - webauthn_insert_key=Inserisci la tua chiave di sicurezza webauthn_sign_in=Premere il pulsante sul tasto di sicurezza. Se il tasto di sicurezza non ha pulsante, reinseriscilo. webauthn_press_button=Si prega di premere il pulsante sul tasto di sicurezza… @@ -47,7 +45,6 @@ webauthn_error_duplicated=La chiave di sicurezza non è consentita per questa ri webauthn_error_empty=Devi impostare un nome per questa chiave. webauthn_error_timeout=Timeout raggiunto prima che la tua chiave possa essere letta. Ricarica la pagina e riprova. webauthn_reload=Ricarica - repository=Repository organization=Organizzazione mirror=Mirror @@ -65,18 +62,15 @@ settings=Impostazioni your_profile=Profilo your_starred=Repository votate your_settings=Impostazioni - all=Tutti sources=Sorgenti mirrors=Mirror collaborative=Condivisi forks=Fork - activities=Attivitá pull_requests=Pull Request issues=Problemi milestones=Milestones - ok=OK cancel=Annulla save=Salva @@ -85,26 +79,22 @@ add_all=Aggiungi tutti remove=Rimuovi remove_all=Rimuovi tutti edit=Modifica - copy=Copia copy_url=Copia URL copy_branch=Copia nome del ramo copy_success=Copiato! copy_error=Copia fallita - write=Scrivi preview=Anteprima loading=Caricamento… - step1=Passo 1: step2=Passo 2: - error=Errore error404=La pagina che stai cercando di raggiungere non esiste oppure non sei autorizzato a visualizzarla. - never=Mai - rss_feed=Feed RSS +enabled=Attivo +disabled=Disabilitato [filter] @@ -157,7 +147,6 @@ err_empty_admin_email=L'email dell'amministratore non può essere vuota. err_admin_name_is_reserved=Nome utente Administrator non valido, nome utente riservato err_admin_name_pattern_not_allowed=Nome utente dell'amministratore non valido. Il nome utente fornito corrisponde ad un pattern riservato err_admin_name_is_invalid=Il nome utente Administrator non è valido - general_title=Impostazioni Generali app_name=Titolo del Sito app_name_helper=Qui puoi inserire il nome della tua società. @@ -177,7 +166,6 @@ app_url=URL di base di Gitea app_url_helper=URL di base per gli HTTP(S) clone URLs e notifiche email. log_root_path=Percorso dei log log_root_path_helper=I file di log saranno scritti in questa directory. - optional_title=Impostazioni Facoltative email_title=Impostazioni Email smtp_addr=Host SMTP @@ -235,7 +223,7 @@ default_enable_timetracking_popup=Attiva il cronografo per le nuove repositories no_reply_address=Dominio email nascosto no_reply_address_helper=Nome dominio per utenti con un indirizzo email nascosto. Ad esempio, il nome utente 'joe' accederà a Git come 'joe@noreply.example.org' se il dominio email nascosto è impostato a 'noreply.example.org'. password_algorithm=Algoritmo Password Hash -password_algorithm_helper=Imposta l'algoritmo di hashing della password. Gli algoritmi hanno requisiti e forza diversi. `argon2` pur avendo buone caratteristiche utilizza un sacco di memoria e può essere inappropriato per piccoli sistemi. +password_algorithm_helper="""Imposta l'algoritmo di hashing della password. Gli algoritmi hanno requisiti e forza diversi. `argon2` pur avendo buone caratteristiche utilizza un sacco di memoria e può essere inappropriato per piccoli sistemi.""" [home] uname_holder=Nome utente o Indirizzo Email @@ -251,17 +239,14 @@ search_repos=Trova un repository… filter=Altro filtri filter_by_team_repositories=Filtra per repository del team feed_of=Feed di "%s" - show_archived=Archiviato show_both_archived_unarchived=Mostra sia gli archiviati che i non archiviati show_only_archived=Visualizzazione solo archiviati show_only_unarchived=Visualizzazione solo non archiviati - show_private=Privato show_both_private_public=Mostrando sia pubblico che privato show_only_private=Visualizzazione solo privati show_only_public=Mostrando solo pubblici - issues.in_your_repos=Nei tuoi repository [explore] @@ -280,7 +265,6 @@ code_no_results=Nessun codice sorgente corrispondente ai termini di ricerca. code_search_results=Risultati di ricerca per '%s' code_last_indexed_at=Ultimo indicizzato %s - [auth] create_new_account=Registra un account register_helper_msg=Hai già un account? Accedi ora! @@ -353,31 +337,24 @@ password_pwned_err=Impossibile completare la richiesta a HaveIBeenPwned view_it_on=Visualizza su %s link_not_working_do_paste=Non funziona? Prova a copiare e incollare sul tuo browser. hi_user_x=Ciao %s, - activate_account=Per favore attiva il tuo account activate_account.title=%s, si prega di attivare il tuo account activate_account.text_1=Ciao %[1]s, grazie per essersi registrato al %[2]s! activate_account.text_2=Clicca sul seguente link per attivare il tuo account entro %s: - activate_email=Verifica il tuo indirizzo e-mail activate_email.title=%s, verifica il tuo indirizzo e-mail activate_email.text=Clicca sul seguente link per verificare il tuo indirizzo email entro %s: - register_notify=Benvenuto su Gitea register_notify.title=%[1]s, benvenuto in %[2]s register_notify.text_1=questa è la tua email di conferma di registrazione per %s! register_notify.text_2=Ora è possibile accedere tramite nome utente: %s. register_notify.text_3=Se questo account è stato creato per te, per favore imposta prima la tua password. - reset_password=Recupera il tuo account reset_password.title=%s, hai richiesto di recuperare il tuo account reset_password.text=Clicca sul seguente link per recuperare il tuo account entro %s: - register_success=Registrazione completata con successo - issue_assigned.pull=@%[1]s ti ha assegnato il Problema %[2]s nel repository %[3]s. issue_assigned.issue=@%[1]s ti ha assegnato il Problema %[2]s nel repository %[3]s. - issue.x_mentioned_you=@%s ti ha menzionato: issue.action.force_push=%[1]s force-pushed il %[2]s da %[3]s a %[4]s. issue.action.push_1=@%[1]s ha spinto %[3]d commit a %[2]s @@ -392,7 +369,6 @@ issue.action.review_dismissed=@%[1]s ha respinto l'ultima recensione da % issue.action.ready_for_review=@%[1]s ha contrassegnato questa pull request pronta per la revisione. issue.action.new=@%[1]s creato #%[2]d. issue.in_tree_path=In %s: - release.new.subject=%s in %s rilasciato release.new.text=@%[1]s rilasciato %[2]s in %[3]s release.title=Titolo: %s @@ -400,16 +376,13 @@ release.note=Nota: release.downloads=Scaricamenti: release.download.zip=Codice Sorgente (Zip) release.download.targz=Codice Sorgente (Tar.Gz) - repo.transfer.subject_to=%s vorrebbe trasferire "%s" a %s repo.transfer.subject_to_you=%s vorrebbe trasferire "%s" a te repo.transfer.to_you=tu repo.transfer.body=Per accettare o respingerla visita %s o semplicemente ignorarla. - repo.collaborator.added.subject=%s ti ha aggiunto a %s repo.collaborator.added.text=Sei stato aggiunto come collaboratore del repository: - [modal] yes=Sì no=No @@ -427,34 +400,30 @@ PayloadUrl=URL Payload TeamName=Nome Team AuthName=Nome autorizzazione AdminEmail=Email dell'Admin - NewBranchName=Nuovo nome del branch CommitSummary=Riepilogo dei commit CommitMessage=Messaggio di commit CommitChoice=Scelta di commit TreeName=Percorso del file Content=Contenuto - SSPISeparatorReplacement=Separatore SSPIDefaultLanguage=Lingua predefinita - -require_error=` non può essere vuoto.` -alpha_dash_error=` può contenere solo caratteri alfanumerici, dash ('-') e underscore ('_').` -alpha_dash_dot_error=` può contenere solo caratteri alfanumerici, dash ('-'), underscore ('_') e dot ('.').` -git_ref_name_error=` deve essere un Git reference name ben formato.` -size_error='deve essere %s.' -min_size_error=` deve contenere almeno %s caratteri.` -max_size_error=` deve contenere massimo %s caratteri.` -email_error=` non è un indirizzo e-mail valido.` +require_error=" non può essere vuoto." +alpha_dash_error=" può contenere solo caratteri alfanumerici, dash ('-') e underscore ('_')." +alpha_dash_dot_error=" può contenere solo caratteri alfanumerici, dash ('-'), underscore ('_') e dot ('.')." +git_ref_name_error=" deve essere un Git reference name ben formato." +size_error=deve essere %s. +min_size_error=" deve contenere almeno %s caratteri." +max_size_error=" deve contenere massimo %s caratteri." +email_error=" non è un indirizzo e-mail valido." url_error=%s" non è un URL valido. -include_error=` deve contenere la stringa '%s'.` -glob_pattern_error=` il pattern glob non è valido: %s.` -regex_pattern_error=` modello regex non valido: %s.` +include_error=" deve contenere la stringa '%s'." +glob_pattern_error=" il pattern glob non è valido: %s." +regex_pattern_error=" modello regex non valido: %s." unknown_error=Errore sconosciuto: captcha_incorrect=Il codice CAPTCHA non è corretto. password_not_match=Le password non corrispondono. lang_select_error=Selezionare una lingua dall'elenco. - username_been_taken=Il Nome utente esiste già. username_change_not_local_user=Gli utenti non locali non sono autorizzati a modificare il proprio nome utente. repo_name_been_taken=Il nome del repository esiste già. @@ -485,19 +454,16 @@ user_not_exist=L'utente non esiste. team_not_exist=Questo team non esiste. last_org_owner=Non è possibile rimuovere l'ultimo utente dal team 'proprietari'. Ci deve essere almeno un proprietario per un'organizzazione. cannot_add_org_to_team=Un'organizzazione non può essere aggiunto come membro del team. - invalid_ssh_key=Impossibile verificare la tua chiave SSH: %s invalid_gpg_key=Impossibile verificare la tua chiave GPG: %s invalid_ssh_principal=Principal non valido: %s unable_verify_ssh_key=Impossibile verificare la tua chiave SSH; si prega di ricontrollarla per verificare eventuali errori. auth_failed=Autenticazione non riuscita: %v - still_own_repo=Il tuo account possiede una o più repositories; rimuovile o trasferiscile per proseguire. still_has_org=Il tuo account è un membro di una o più organizzazioni; abbandonali prima di proseguire. still_own_packages=Il tuo account possiede uno o più pacchetti; eliminali prima. org_still_own_repo=Questa organizzazione possiede ancora una o più repositories, rimuoverle o trasferirle per continuare. org_still_own_packages=Questa organizzazione possiede ancora uno o più pacchetti; eliminarli prima. - target_branch_not_exist=Il ramo (branch) di destinazione non esiste. [user] @@ -515,7 +481,6 @@ unfollow=Non seguire più heatmap.loading=Caricamento della Heatmap… user_bio=Biografia disabled_public_activity=L'utente ha disabilitato la vista pubblica dell'attività. - form.name_reserved=L'username '%s' è riservato. form.name_pattern_not_allowed=Il modello '%s' non è consentito come nome di un utente. form.name_chars_not_allowed=Il nome utente '%s' contiene caratteri non validi. @@ -538,7 +503,6 @@ account_link=Account collegati organization=Organizzazioni uid=Uid webauthn=Chiavi Di Sicurezza - public_profile=Profilo pubblico biography_placeholder=Raccontaci un po' di te profile_desc=Il tuo indirizzo email sarà utilizzato per le notifiche e altre operazioni. @@ -578,7 +542,6 @@ saved_successfully=Le impostazioni sono state salvate correttamente. privacy=Privacy keep_activity_private=Nascondi l'attività dal profilo keep_activity_private_popup=Rendi l'attività visibile solo da te e dagli amministratori - lookup_avatar_by_mail=Cerca Avatar per indirizzo Email federated_avatar_lookup=Ricerca per avatar federata enable_custom_avatar=Abilita avatar personalizzato @@ -589,7 +552,6 @@ uploaded_avatar_not_a_image=Il file caricato non è un'immagine. uploaded_avatar_is_too_big=Il file inviato eccede le dimensioni massime. update_avatar_success=Il tuo avatar è stato aggiornato. update_user_avatar_success=L'avatar dell'utente è stato aggiornato. - change_password=Aggiorna Password old_password=Password attuale new_password=Nuova Password @@ -597,7 +559,6 @@ retype_new_password=Digitare nuovamente la nuova Password password_incorrect=La password attuale non è corretta. change_password_success=La password è stata aggiornata. Utilizza la nuova password la prossima volta che effettui il login. password_change_disabled=Gli utenti non locali non possono cambiare la loro password attraverso l'interfaccia web. - emails=Indirizzi e-mail manage_emails=Gestisci indirizzi email manage_themes=Seleziona il tema predefinito @@ -630,7 +591,6 @@ add_openid_success=Il nuovo indirizzo OpenID è stato aggiunto. keep_email_private=Nascondi indirizzo email keep_email_private_popup=Il tuo indirizzo email sarà nascosto agli altri utenti. openid_desc=OpenID consente di delegare l'autenticazione ad un provider esterno. - manage_ssh_keys=Gestisci chiavi SSH manage_ssh_principals=Gestisci i Certificati SSH manage_gpg_keys=Gestisci Chiavi GPG @@ -709,7 +669,6 @@ manage_social=Gestisci gli Account Sociali Associati social_desc=Questi account sociali sono collegati al tuo account Gitea. Assicurati di riconoscerli tutti in quanto possono essere usati per effettuare il login con il tuo account Gitea. unbind=Rimuovi il collegamento unbind_success=L'account sociale è stato scollegato dal tuo account Gitea. - manage_access_token=Gestisci i tokens di accesso generate_new_token=Genera Nuovo Token tokens_desc=Questi tokens garantiscono l'accesso al tuo account utilizzando l'API di Gitea. @@ -724,7 +683,6 @@ access_token_deletion_cancel_action=Annulla access_token_deletion_confirm_action=Elimina access_token_deletion_desc=L'eliminazione di un token annullerà l'accesso al tuo account per le applicazioni che lo utilizzano. Questo non può essere annullato. Continuare? delete_token_success=Il token è stato eliminato. Le applicazioni che lo utilizzavano non hanno più accesso al tuo account. - manage_oauth2_applications=Gestisci applicazioni OAuth2 edit_oauth2_application=Modifica applicazione OAuth2 oauth2_applications_desc=OAuth2 consente alle applicazione di terze parti di autenticarsi in sicurezza a questa istanza di Gitea. @@ -746,14 +704,12 @@ oauth2_client_secret_hint=Questo codice segreto non verrà visualizzato di nuovo oauth2_application_edit=Modifica oauth2_application_create_description=OAuth2 da l'accesso al tuo account di questa istanza ad applicazioni di terze parti. oauth2_application_remove_description=La rimozione di OAuth2 impedirà di accedere agli account utente autorizzati su questa istanza. Continuare? - authorized_oauth2_applications=Applicazioni OAuth2 autorizzate authorized_oauth2_applications_description=Hai concesso l'accesso al tuo account Gitea personale a queste applicazioni di terze parti. Si prega di revocare l'accesso per le applicazioni non più necessarie. revoke_key=Revoca revoke_oauth2_grant=Revoca accesso revoke_oauth2_grant_description=Revocando l'accesso a questa applicazione di terze parti impedirá l'accesso ai tuoi dati. Sei sicuro? revoke_oauth2_grant_success=Hai revocato l'accesso correttamente. - twofa_desc=L'autenticazione a due fattori migliora la sicurezza del tuo account. twofa_is_enrolled=La verifica in due passaggi è attualmente abilitata sul tuo account. twofa_not_enrolled=La verifica in due passaggi al momento non è abilitata sul tuo account. @@ -771,13 +727,11 @@ then_enter_passcode=E immetti il codice di accesso indicato nell'applicazione: passcode_invalid=Il codice di accesso non è corretto. Riprova. twofa_enrolled=Il tuo account è stato registrato alla verifica in due passaggi. Conserva il token di sicurezza (%s) in un luogo sicuro in quanto viene visualizzato sono una volta! twofa_failed_get_secret=Impossibile ottenere il segreto. - webauthn_desc=Le chiavi di sicurezza sono dispositivi hardware contenenti chiavi crittografiche. Possono essere utilizzate per l'autenticazione a due fattori. Le chiavi di sicurezza devono supportare lo standard WebAuthenticator di WebAuthn. webauthn_register_key=Aggiungi Chiave Di Sicurezza webauthn_nickname=Soprannome webauthn_delete_key=Rimuovi Chiave Di Sicurezza webauthn_delete_key_desc=Se si rimuove una chiave di sicurezza non è più possibile accedere con esso. Continuare? - manage_account_links=Gestisci gli account collegati manage_account_links_desc=Questi account esterni sono collegati al tuo account Gitea. account_links_not_available=Attualmente non è collegato alcun account esterno al tuo account Gitea. @@ -785,23 +739,19 @@ link_account=Collega Account remove_account_link=Rimuovi account collegato remove_account_link_desc=Rimuovere un account collegato ne revoca l'accesso al tuo account Gitea. Continuare? remove_account_link_success=L'account collegato è stato rimosso. - orgs_none=Non sei membro di alcuna organizzazione. repos_none=Non possiedi alcun repository - delete_account=Elimina Account delete_prompt=Questa operazione eliminerà permanentemente il tuo account utente. NON PUÒ essere annullata. delete_with_all_comments=Il tuo account è più recente di %s giorni. Per evitare commenti fantasma, tutti i commenti relativi a issue/PR verranno eliminati con esso. confirm_delete_account=Conferma Eliminazione delete_account_title=Elimina account utente delete_account_desc=Sei sicuro di voler rimuovere questo account utente permanentemente? - email_notifications.enable=Abilita Notifiche Email email_notifications.onmention=Solo email su Menzione email_notifications.disable=Disabilita notifiche email email_notifications.submit=Imposta Preferenze Email email_notifications.andyourown=E Le Tue Notifiche - visibility=Visibilità utente visibility.public=Pubblico visibility.public_tooltip=Visibile a tutti gli utenti @@ -895,14 +845,12 @@ delete_preexisting=Elimina file preesistenti delete_preexisting_content=Elimina file in %s delete_preexisting_success=Eliminato file non adottati in %s blame_prior=Visualizza la colpa prima di questa modifica - transfer.accept=Accetta trasferimento transfer.accept_desc=Trasferisci a "%s" transfer.reject=Rifiuta trasferimento transfer.reject_desc=Annulla il trasferimento a "%s" transfer.no_permission_to_accept=Non hai i permessi per accettare transfer.no_permission_to_reject=Non hai i permessi per rifiutare - desc.private=Privato desc.public=Pubblico desc.private_template=Modello privato @@ -910,7 +858,6 @@ desc.public_template=Modello desc.internal=Interno desc.internal_template=Template interno desc.archived=Archiviato - template.items=Elementi del modello template.git_content=Contenuto di Git (Ramo predefinito) template.git_hooks=Git Hooks @@ -921,16 +868,13 @@ template.avatar=Avatar template.issue_labels=Etichette Issue template.one_item=Deve selezionare almeno un elemento del modello template.invalid=Devi selezionare un modello di repository - archive.title=Questo repository è archiviato. Puoi vedere i file e clonarli, ma non puoi effettuare richieste di pushj o aprire problemi/richieste di pull. archive.issue.nocomment=Questo repository è archiviato. Non puoi commentare i problemi. archive.pull.nocomment=Questo repository è archiviato. Non puoi commentare le richieste di pull. - form.reach_limit_of_creation_1=Hai già raggiunto il tuo limite di %d repository. form.reach_limit_of_creation_n=Hai già raggiunto il tuo limite di %d repository. form.name_reserved=Il nome repository '%s' è riservato. form.name_pattern_not_allowed=Il modello '%s' non è consentito come nome di un repository. - need_auth=Autorizzazione migrate_options=Opzioni di migrazione migrate_service=Servizio migrazione @@ -981,7 +925,6 @@ migrate.migrating_labels=Migrazione delle etichette migrate.migrating_releases=Migrazione delle uscite migrate.migrating_issues=Migrazione dei problemi migrate.migrating_pulls=Migrazione delle Pull Request - mirror_from=mirror da forked_from=forkato da generated_from=generato da @@ -995,7 +938,6 @@ unstar=Togli il voto star=Vota fork=Forka download_archive=Scarica Repository - no_desc=Nessuna descrizione quick_guide=Guida rapida clone_this_repo=Clona questo repository @@ -1003,12 +945,11 @@ create_new_repo_command=Creazione di un nuovo repository da riga di comando push_exist_repo=Push di un repository esistente da riga di comando empty_message=Questo repository non contiene alcun contenuto. broken_message=I dati Git sottostanti a questo repository non possono essere letti. Contattare l'amministratore di questa istanza o eliminare questo repository. - code=Codice code.desc=Accedi al codice sorgente, file, commits e branches. branch=Ramo (Branch) tree=Albero (Tree) -clear_ref=`Cancella il riferimento corrente` +clear_ref=Cancella il riferimento corrente filter_branch_and_tag=Filtra per branch o tag find_tag=Trova etichetta branches=Rami (Branch) @@ -1020,7 +961,6 @@ packages=Pacchetti labels=Etichette org_labels_desc=Etichette a livello di organizzazione che possono essere utilizzate con tutti i repository sotto questa organizzazione org_labels_desc_manage=gestisci - milestones=Traguardi commits=Commit commit=Commit @@ -1036,14 +976,13 @@ file_view_rendered=Visualizza Renderizzato file_view_raw=Vedi originale file_permalink=Permalink file_too_large=Il file è troppo grande per essere visualizzato. -invisible_runes_header=`Questo file contiene caratteri Unicode invisibili!` -invisible_runes_description=`Questo file contiene caratteri Unicode invisibili che possono essere elaborati in modo diverso da quello che appare di seguito. Se il tuo caso di utilizzo è intenzionale e legittimo, puoi tranquillamente ignorare questo avviso. Usa il pulsante Escape per rivelare caratteri nascosti.` -ambiguous_runes_header=`Questo file contiene caratteri Unicode ambigui!` -ambiguous_runes_description=`Questo file contiene caratteri Unicode ambigui che possono essere confusi con altri nella tua localizzazione attuale. Se il tuo caso di utilizzo è intenzionale e legittimo, puoi tranquillamente ignorare questo avviso. Usa il pulsante Escape per evidenziare questi caratteri.` -invisible_runes_line=`Questa riga ha caratteri unicode invisibili` -ambiguous_runes_line=`Questa riga ha caratteri unicode ambigui` -ambiguous_character=`%[1]c [U+%04[1]X] è confondibile con %[2]c [U+%04[2]X]` - +invisible_runes_header=Questo file contiene caratteri Unicode invisibili! +invisible_runes_description=Questo file contiene caratteri Unicode invisibili che possono essere elaborati in modo diverso da quello che appare di seguito. Se il tuo caso di utilizzo è intenzionale e legittimo, puoi tranquillamente ignorare questo avviso. Usa il pulsante Escape per rivelare caratteri nascosti. +ambiguous_runes_header=Questo file contiene caratteri Unicode ambigui! +ambiguous_runes_description=Questo file contiene caratteri Unicode ambigui che possono essere confusi con altri nella tua localizzazione attuale. Se il tuo caso di utilizzo è intenzionale e legittimo, puoi tranquillamente ignorare questo avviso. Usa il pulsante Escape per evidenziare questi caratteri. +invisible_runes_line=Questa riga ha caratteri unicode invisibili +ambiguous_runes_line=Questa riga ha caratteri unicode ambigui +ambiguous_character=%[1]c [U+%04[1]X] è confondibile con %[2]c [U+%04[2]X] escape_control_characters=Fuga unescape_control_characters=Unescape file_copy_permalink=Copia Permalink @@ -1062,7 +1001,6 @@ download_file=Scarica file normal_view=Vista normale line=riga lines=righe - editor.add_file=Aggiungi file editor.new_file=Nuovo file editor.upload_file=Carica File @@ -1128,7 +1066,6 @@ editor.user_no_push_to_branch=L'utente non può effettuare il push sul branch editor.require_signed_commit=Il branch richiede un commit firmato editor.cherry_pick=Cherry-pick %s suto: editor.revert=Ripristina %s su: - commits.desc=Sfoglia la cronologia di modifiche del codice rogente. commits.commits=Commit commits.no_commits=Nessun commit in comune. '%s' e '%s' hanno storie completamente diverse. @@ -1147,7 +1084,6 @@ commits.signed_by_untrusted_user=Firmato da un utente non attendibile commits.signed_by_untrusted_user_unmatched=Firmato da un utente non attendibile che non corrisponde al committer commits.gpg_key_id=ID Chiave GPG commits.ssh_key_fingerprint=Impronta Digitale Chiave SSH - commit.actions=Azioni commit.revert=Ripristina commit.revert-header=Ripristina: %s @@ -1155,10 +1091,8 @@ commit.revert-content=Selezionare il ramo su cui ripristinare: commit.cherry-pick=Cherry-pick commit.cherry-pick-header=Cherry-pick: %s commit.cherry-pick-content=Seleziona il ramo su cui scegliere: - ext_issues=Accesso ai Problemi Esterni ext_issues.desc=Collegamento al puntatore di una issue esterna. - projects=Progetti projects.desc=Gestisci problemi e pull nelle schede di progetto. projects.description=Descrizione (opzionale) @@ -1194,7 +1128,6 @@ projects.board.color=Colore projects.open=Apri projects.close=Chiudi projects.board.assigned_to=Assegnato a - issues.desc=Organizza le segnalazioni di bug, attività e pietre miliari. issues.filter_assignees=Filtra assegnatario issues.filter_milestones=Filtra traguardo @@ -1245,25 +1178,25 @@ issues.add_labels=ha aggiunto le %s etichette %s issues.remove_label=rimosso l'etichetta %s %s issues.remove_labels=rimosso le %s etichette %s issues.add_remove_labels=aggiunto %s e rimosso %s etichette %s -issues.add_milestone_at=`aggiunta alle pietre miliari %s %s` -issues.add_project_at=`aggiunto questo al progetto %s %s` -issues.change_milestone_at=`pietra miliare modificata da %s a %s %s` -issues.change_project_at=`ha modificato il progetto da %s a %s %s` -issues.remove_milestone_at=`rimossa dalle pietre miliari %s %s` -issues.remove_project_at=`rimosso questo dal progetto %s %s` -issues.deleted_milestone='(rimosso)' -issues.deleted_project=`(eliminato)` -issues.self_assign_at=`%s auto-assegnato` -issues.add_assignee_at=`è stato assegnato da %s %s` -issues.remove_assignee_at=`è stato rimosso da %s %s` -issues.remove_self_assignment=`Rimosso il loro incarico %s` -issues.change_title_at=`Titolo modificato da %s a %s %s` -issues.change_ref_at=`ha cambiato il riferimento da %s a %s %s` -issues.remove_ref_at=`riferimento rimosso %s %s` -issues.add_ref_at=`aggiunto riferimento %s %s` -issues.delete_branch_at=`branch %s eliminato %s` +issues.add_milestone_at=aggiunta alle pietre miliari %s %s +issues.add_project_at=aggiunto questo al progetto %s %s +issues.change_milestone_at=pietra miliare modificata da %s a %s %s +issues.change_project_at=ha modificato il progetto da %s a %s %s +issues.remove_milestone_at=rimossa dalle pietre miliari %s %s +issues.remove_project_at=rimosso questo dal progetto %s %s +issues.deleted_milestone=(rimosso) +issues.deleted_project=(eliminato) +issues.self_assign_at=%s auto-assegnato +issues.add_assignee_at=è stato assegnato da %s %s +issues.remove_assignee_at=è stato rimosso da %s %s +issues.remove_self_assignment=Rimosso il loro incarico %s +issues.change_title_at=Titolo modificato da %s a %s %s +issues.change_ref_at=ha cambiato il riferimento da %s a %s %s +issues.remove_ref_at=riferimento rimosso %s %s +issues.add_ref_at=aggiunto riferimento %s %s +issues.delete_branch_at=branch %s eliminato %s issues.filter_label=Etichetta -issues.filter_label_exclude=`Usa alt + click/enter per escludere le etichette` +issues.filter_label_exclude=Usa alt + click/enter per escludere le etichette issues.filter_label_no_select=Tutte le etichette issues.filter_milestone=Traguardo issues.filter_milestone_no_select=Tutte le pietre miliari @@ -1310,7 +1243,7 @@ issues.open_title=Aperto issues.closed_title=Chiuso issues.draft_title=Bozza issues.num_comments=%d commenti -issues.commented_at=`%s ha commentato` +issues.commented_at=%s ha commentato issues.delete_comment_confirm=Sei sicuro/a di voler eliminare questo commento? issues.context.copy_link=Copia link issues.context.quote_reply=Quota risposta @@ -1319,22 +1252,22 @@ issues.context.edit=Modifica issues.context.delete=Elimina issues.no_content=Non ci sono ancora contenuti. issues.close_issue=Chiudi -issues.pull_merged_at=`merged commit %[2]s in %[3]s %[4]s` -issues.manually_pull_merged_at=`merged commit %[2]s in %[3]s manualmente %[4]s` +issues.pull_merged_at=merged commit %[2]s in %[3]s %[4]s +issues.manually_pull_merged_at=merged commit %[2]s in %[3]s manualmente %[4]s issues.close_comment_issue=Commenta e Chiudi issues.reopen_issue=Riapri issues.reopen_comment_issue=Commenta e Riapri issues.create_comment=Commento -issues.closed_at=`chiuso questo probleam %[2]s` -issues.reopened_at=`riaperto questo problema %[2]s` -issues.commit_ref_at=`ha fatto riferimento a questa issue dal commit %[2]s` -issues.ref_issue_from=`ha fatto riferimento a questo problema %[4]s %[2]s` -issues.ref_pull_from=`ha fatto riferimento a questa pull request %[4]s %[2]s` -issues.ref_closing_from=`ha fatto riferimento ad una pull request %[4]s che chiuderà questo problema %[2]s` -issues.ref_reopening_from=`ha fatto riferimento ad una pull request %[4]s che riaprirà questo problema %[2]s` -issues.ref_closed_from=`chiuso questo problema %[4]s %[2]s` -issues.ref_reopened_from=`riaperto questo problema %[4]s %[2]s` -issues.ref_from=`da %[1]s` +issues.closed_at=chiuso questo probleam %[2]s +issues.reopened_at=riaperto questo problema %[2]s +issues.commit_ref_at=ha fatto riferimento a questa issue dal commit %[2]s +issues.ref_issue_from=ha fatto riferimento a questo problema %[4]s %[2]s +issues.ref_pull_from=ha fatto riferimento a questa pull request %[4]s %[2]s +issues.ref_closing_from=ha fatto riferimento ad una pull request %[4]s che chiuderà questo problema %[2]s +issues.ref_reopening_from=ha fatto riferimento ad una pull request %[4]s che riaprirà questo problema %[2]s +issues.ref_closed_from=chiuso questo problema %[4]s %[2]s +issues.ref_reopened_from=riaperto questo problema %[4]s %[2]s +issues.ref_from=da %[1]s issues.poster=Autore issues.collaborator=Collaboratori issues.owner=Proprietario @@ -1364,8 +1297,8 @@ issues.label.filter_sort.reverse_alphabetically=In ordine alfabetico inverso issues.label.filter_sort.by_size=Dimensione più piccola issues.label.filter_sort.reverse_by_size=Dimensione più grande issues.num_participants=%d Partecipanti -issues.attachment.open_tab=`Clicca per vedere "%s" in una nuova scheda` -issues.attachment.download=`Clicca qui per scaricare "%s"` +issues.attachment.open_tab=Clicca per vedere "%s" in una nuova scheda +issues.attachment.download=Clicca qui per scaricare "%s" issues.subscribe=Iscriviti issues.unsubscribe=Annulla iscrizione issues.lock=Blocca conversazione @@ -1393,31 +1326,31 @@ issues.delete.text=Vuoi davvero eliminare questo problema? (Questo rimuoverà pe issues.tracker=Cronografo issues.start_tracking_short=Avvia timer issues.start_tracking=Avvia cronografo -issues.start_tracking_history='ha iniziato a lavorare %s` +issues.start_tracking_history="""'ha iniziato a lavorare %s`""" issues.tracker_auto_close=Il timer verrà interrotto automaticamente una volta che il problema verrá chiuso -issues.tracking_already_started=`Hai già avviato il monitoraggio del tempo su un altro problema!` +issues.tracking_already_started=Hai già avviato il monitoraggio del tempo su un altro problema! issues.stop_tracking=Ferma timer -issues.stop_tracking_history=`ha smesso di funzionare %s` +issues.stop_tracking_history=ha smesso di funzionare %s issues.cancel_tracking=Scarta -issues.cancel_tracking_history=`ha cancellato il cronografo %s` +issues.cancel_tracking_history=ha cancellato il cronografo %s issues.add_time=Aggiungi Tempo manualmente issues.del_time=Elimina questo registro di tempo issues.add_time_short=Aggiungi tempo issues.add_time_cancel=Annulla -issues.add_time_history=`aggiunto tempo trascorso %s` -issues.del_time_history=`tempo trascorso eliminato %s` +issues.add_time_history=aggiunto tempo trascorso %s +issues.del_time_history=tempo trascorso eliminato %s issues.add_time_hours=Ore issues.add_time_minutes=Minuti issues.add_time_sum_to_small=Non è stato inserito alcun tempo. issues.time_spent_total=Tempo totale trascorso -issues.time_spent_from_all_authors=`Totale tempo trascorso: %s` +issues.time_spent_from_all_authors=Totale tempo trascorso: %s issues.due_date=Data di scadenza issues.invalid_due_date_format=Il formato della data di scadenza deve essere 'yyyy-mm-dd'. issues.error_modifying_due_date=Impossibile modificare la data di scadenza. issues.error_removing_due_date=Impossibile rimuovere la data di scadenza. issues.push_commit_1=aggiunto %d commit %s issues.push_commits_n=aggiunto %d commit %s -issues.force_push_codes=`force-pushed %[1]s from %[2]s to %[4]s %[6]s` +issues.force_push_codes=force-pushed %[1]s from %[2]s to %[4]s %[6]s issues.due_date_form=yyyy-mm-dd issues.due_date_form_add=Aggiungi data di scadenza issues.due_date_form_edit=Modifica @@ -1436,8 +1369,8 @@ issues.dependency.add=Aggiungi dipendenza… issues.dependency.cancel=Annulla issues.dependency.remove=Rimuovi issues.dependency.remove_info=Rimuovi questa dipendenza -issues.dependency.added_dependency=`ha aggiunto una nuova dipendenza %s` -issues.dependency.removed_dependency=`ha rimosso una dipendenza %s` +issues.dependency.added_dependency=ha aggiunto una nuova dipendenza %s +issues.dependency.removed_dependency=ha rimosso una dipendenza %s issues.dependency.pr_closing_blockedby=La chiusura di questa pull request è bloccata dai seguenti problemi issues.dependency.issue_closing_blockedby=La chiusura di questo problema è bloccata dai seguenti problemi issues.dependency.issue_close_blocks=Questo problema impedisce la chiusura dei seguenti problemi @@ -1490,10 +1423,8 @@ issues.content_history.delete_from_history=Elimina dalla cronologia issues.content_history.delete_from_history_confirm=Eliminare dalla cronologia? issues.content_history.options=Opzioni issues.reference_link=Riferimento: %s - compare.compare_base=base compare.compare_head=confronta - pulls.desc=Attiva pull request e revisioni di codice. pulls.new=Nuova Pull Request pulls.view=Visualizza Pull Request @@ -1513,11 +1444,11 @@ pulls.filter_branch=Filtra branch pulls.no_results=Nessun risultato trovato. pulls.nothing_to_compare=Questi rami sono uguali. Non c'è alcuna necessità di creare una pull request. pulls.nothing_to_compare_and_allow_empty_pr=Questi rami sono uguali. Questa PR sarà vuota. -pulls.has_pull_request=`Una pull request tra questi rami esiste già: %[2]s#%[3]d` +pulls.has_pull_request=Una pull request tra questi rami esiste già: %[2]s#%[3]d pulls.create=Crea Pull Request pulls.title_desc=vorrebbe unire %[1]d commit da %[2]s a %[3]s pulls.merged_title_desc=ha unito %[1]d commit da %[2]s a %[3]s %[4]s -pulls.change_target_branch_at=`cambiato il branch di destinazione da %s a %s %s` +pulls.change_target_branch_at=cambiato il branch di destinazione da %s a %s %s pulls.tab_conversation=Conversazione pulls.tab_commits=Commit pulls.tab_files=File modificati @@ -1529,7 +1460,7 @@ pulls.manually_merged=Unito manualmente pulls.manually_merged_as=La pull request è stata unita manualmente come %[2]s. pulls.is_closed=La pull request è stata chiusa. pulls.has_merged=La pull request è stata unita. -pulls.title_wip_desc=`Inizia il titolo con %s per evitare che la pull request venga unita accidentalmente.` +pulls.title_wip_desc=Inizia il titolo con %s per evitare che la pull request venga unita accidentalmente. pulls.cannot_merge_work_in_progress=Questa pull request è contrassegnata come un lavoro in corso. pulls.still_in_progress=Ancora in corso? pulls.add_prefix=Aggiungi prefisso %s @@ -1560,7 +1491,6 @@ pulls.reject_count_n=%d richieste di cambiamento pulls.waiting_count_1=%d in attesa di revisione pulls.waiting_count_n=%d in attesa di revisione pulls.wrong_commit_id=l'id del commit deve essere un id del commit nel branch di destinazione - pulls.no_merge_desc=Questa pull request non può essere unita perché tutte le opzioni di merge del repository sono disattivate. pulls.no_merge_helper=Attiva le opzioni di merge nelle impostazioni del repository o unisci la pull request manualmente. pulls.no_merge_wip=Questa pull request non può essere unita perché è contrassegnata come un lavoro in corso. @@ -1573,7 +1503,6 @@ pulls.squash_merge_pull_request=Crea commit mescolato pulls.merge_manually=Unito manualmente pulls.merge_commit_id=L'ID del commit di merge pulls.require_signed_wont_sign=Il branch richiede commit firmati ma questo merge non verrà firmato - pulls.invalid_merge_option=Non puoi utilizzare questa opzione di merge per questa pull request. pulls.merge_conflict=Unione non riuscita: C'è stato un conflitto durante l'operazione. Suggerimento: Prova una strategia diversa pulls.merge_conflict_summary=Messaggio d'errore @@ -1586,7 +1515,7 @@ pulls.head_out_of_date=Unione non riuscita: durante la generazione della fusione pulls.push_rejected=Unisci non riuscito: il push è stato rifiutato. Rivedi gli Hooks Git per questo repository. pulls.push_rejected_summary=Messaggio Di Rifiuto Completo pulls.push_rejected_no_message=Unione non riuscita: il push è stato rifiutato ma non c'è stato un messaggio remoto.
    Controlla gli Hooks di Git per questo repository -pulls.open_unmerged_pull_exists=`Non è possibile riaprire questa pull request perché ne esiste un'altra (#%d) con proprietà identiche.` +pulls.open_unmerged_pull_exists=Non è possibile riaprire questa pull request perché ne esiste un'altra (#%d) con proprietà identiche. pulls.status_checking=Alcuni controlli sono in sospeso pulls.status_checks_success=Tutti i controlli sono stati effettuati con successo pulls.status_checks_warning=Alcuni controlli hanno segnalato avvertimenti @@ -1599,27 +1528,22 @@ pulls.update_branch_rebase=Aggiorna il ramo per cambio base pulls.update_branch_success=Brench aggiornato con successo pulls.update_not_allowed=Non sei abilitato ad aggiornare il branch pulls.outdated_with_base_branch=Questo brench non è aggiornato con il branch di base -pulls.closed_at=`chiusa questa pull request %[2]s` -pulls.reopened_at=`riaperta questa pull request %[2]s` -pulls.merge_instruction_hint=`Puoi anche visualizzare le istruzioni da riga di comando.` +pulls.closed_at=chiusa questa pull request %[2]s +pulls.reopened_at=riaperta questa pull request %[2]s +pulls.merge_instruction_hint=Puoi anche visualizzare le istruzioni da riga di comando. pulls.merge_instruction_step1_desc=Dal repository del tuo progetto, fai il check out di un nuovo branch e verifica le modifiche. pulls.merge_instruction_step2_desc=Fai il merge delle modifiche e aggiorna su Gitea. - pulls.auto_merge_button_when_succeed=(Quando i controlli sono superati) pulls.auto_merge_when_succeed=Unione automatica quando tutti i controlli sono superati pulls.auto_merge_newly_scheduled=La pull request era programmata per unire quando tutti i controlli sono superati. pulls.auto_merge_has_pending_schedule=%[1]s ha programmato questa pull request per unire automaticamente quando tutti i controlli hanno successo %[2]s. - pulls.auto_merge_cancel_schedule=Annulla fusione automatica pulls.auto_merge_not_scheduled=Questa pull request non è programmata per la fusione automarica. pulls.auto_merge_canceled_schedule=L'unione automatica è stata annullata per questa richiesta di pull. - -pulls.auto_merge_newly_scheduled_comment=`ha programmato questa pull request per unire automaticamente quando tutti i controlli sono superati %[1]s` -pulls.auto_merge_canceled_schedule_comment=`cancella l'auto-merging di questa pull request quando tutti i testi sono superati %[1]s` - +pulls.auto_merge_newly_scheduled_comment=ha programmato questa pull request per unire automaticamente quando tutti i controlli sono superati %[1]s +pulls.auto_merge_canceled_schedule_comment=cancella l'auto-merging di questa pull request quando tutti i testi sono superati %[1]s pulls.delete.title=Eliminare questa pull request? pulls.delete.text=Vuoi davvero eliminare questo problema? (Questo rimuoverà permanentemente tutti i contenuti. Considera invece di chiuderlo, se vuoi tenerlo archiviato) - milestones.new=Nuova Milestone milestones.closed=Chiuso %s milestones.update_ago=Aggiornato %s fa @@ -1649,7 +1573,6 @@ milestones.filter_sort.least_complete=Meno completato milestones.filter_sort.most_complete=Più completato milestones.filter_sort.most_issues=Più problemi milestones.filter_sort.least_issues=Meno problemi - signing.will_sign=Il commit sarà firmato con la chiave '%s' signing.wont_sign.error=Si è verificato un errore durante la verifica della possibilità di firmare il commit signing.wont_sign.nokey=Non ci sono chiavi disponibili per firmare questo commit @@ -1663,10 +1586,8 @@ signing.wont_sign.headsigned=Questo merge non sarà firmato poiché il commit he signing.wont_sign.commitssigned=Questo merge non sarà firmato poiché i commit associati non non sono firmati signing.wont_sign.approved=Il merge non sarà firmato poiché il PR non è approvato signing.wont_sign.not_signed_in=Non hai effettuato l'accesso - ext_wiki=Accesso al Wiki esterno ext_wiki.desc=Collegamento a una wiki esterna. - wiki=Wiki wiki.welcome=Benvenuti nella Wiki. wiki.welcome_desc=La wiki ti permette di scrivere e condividere documentazione con i collaboratori. @@ -1690,7 +1611,6 @@ wiki.reserved_page=Il nome della pagina wiki '%s' è riservato. wiki.pages=Pagine wiki.last_updated=Ultimo aggiornamento: %s wiki.page_name_desc=Inserisci un nome per questa pagina Wiki. Alcuni nomi speciali sono: 'Home', '_Sidebar' e '_Footer'. - activity=Attività activity.period.filter_label=Periodo: activity.period.daily=1 giorno @@ -1756,7 +1676,6 @@ activity.git_stats_addition_n=%d aggiunte activity.git_stats_and_deletions=e activity.git_stats_deletion_1=%d cancellazione activity.git_stats_deletion_n=%d cancellazioni - search=Ricerca search.search_repo=Ricerca repository search.fuzzy=Fuzzy @@ -1764,7 +1683,6 @@ search.match=Corrispondenze search.results=Risultati della ricerca per "%s" in %s search.code_no_results=Nessun codice sorgente corrispondente al termine di ricerca trovato. search.code_search_unavailable=Attualmente la ricerca di codice non è disponibile. Contatta l'amministratore del sito. - settings=Impostazioni settings.desc=Impostazioni ti permette di gestire le impostazioni del repository settings.options=Repository @@ -2066,10 +1984,10 @@ settings.dismiss_stale_approvals=Ignora impostazione vecchie settings.dismiss_stale_approvals_desc=Quando i nuovi commit che cambiano il contenuto della pull request vengono pushati nel branch, le vecchie approvazioni verranno eliminate. settings.require_signed_commits=Richiede commit firmati settings.require_signed_commits_desc=Rifiuta i push a questo ramo se non sono firmati o verificabili. -settings.protect_protected_file_patterns=Modelli di file protetti (separati da punto e virgola '\;'): -settings.protect_protected_file_patterns_desc=File protetti che non possono essere modificati direttamente anche se l'utente ha i diritti di aggiungere, modificare o eliminare file in questo ramo. I modelli multipli possono essere separati usando il punto e virgola ('\;'). Vedi la documentazione github.com/gobwas/glob per la sintassi del modello. Esempi: .drone.yml, /docs/**/*.txt. -settings.protect_unprotected_file_patterns=Modelli di file non protetti (separati da punto e virgola '\;'): -settings.protect_unprotected_file_patterns_desc=File non protetti che possono essere modificati direttamente se l'utente ha accesso in scrittura, bypassando la restrizione push. Più modelli possono essere separati usando il punto e virgola ('\;'). Vedi la documentazione github.com/gobwas/glob per la sintassi del modello. Esempi: .drone.yml, /docs/**/*.txt. +settings.protect_protected_file_patterns=Modelli di file protetti (separati da punto e virgola ';'): +settings.protect_protected_file_patterns_desc=File protetti che non possono essere modificati direttamente anche se l'utente ha i diritti di aggiungere, modificare o eliminare file in questo ramo. I modelli multipli possono essere separati usando il punto e virgola (';'). Vedi la documentazione github.com/gobwas/glob per la sintassi del modello. Esempi: .drone.yml, /docs/**/*.txt. +settings.protect_unprotected_file_patterns=Modelli di file non protetti (separati da punto e virgola ';'): +settings.protect_unprotected_file_patterns_desc=File non protetti che possono essere modificati direttamente se l'utente ha accesso in scrittura, bypassando la restrizione push. Più modelli possono essere separati usando il punto e virgola (';'). Vedi la documentazione github.com/gobwas/glob per la sintassi del modello. Esempi: .drone.yml, /docs/**/*.txt. settings.add_protected_branch=Attiva protezione settings.delete_protected_branch=Disattiva protezione settings.update_protect_branch_success=La protezione branch per il branch '%s' è stata aggiornata. @@ -2149,7 +2067,6 @@ settings.rename_branch_success=Il ramo %s è stato rinominato con successo in %s settings.rename_branch_from=vecchio nome del ramo settings.rename_branch_to=nuovo nome del ramo settings.rename_branch=Rinomina ramo - diff.browse_source=Sfoglia il codice sorgente diff.parent=parent diff.commit=commit @@ -2201,7 +2118,6 @@ diff.image.side_by_side=A fianco diff.image.swipe=Scorri diff.image.overlay=Sovrapposta diff.has_escaped=Questa riga ha caratteri Unicode nascosti - releases.desc=Tenere traccia di versioni e download del progetto. release.releases=Rilasci release.detail=Dettagli rilascio @@ -2243,7 +2159,6 @@ release.downloads=Download release.download_count=Scarica: %s release.add_tag_msg=Utilizzare il titolo e il contenuto del rilascio come messaggio di tag. release.add_tag=Crea Solo Branch - branch.name=Nome branch branch.search=Cerca branch branch.already_exists=Un branch di nome '%s' esiste già. @@ -2275,25 +2190,23 @@ branch.create_branch_operation=Crea ramo branch.new_branch=Crea nuovo ramo branch.new_branch_from=Crea un nuovo ramo da '%s' branch.renamed=Il ramo %s è stato rinominato in %s. - tag.create_tag=Crea branch %s tag.create_tag_operation=Crea etichetta tag.confirm_create_tag=Crea etichetta tag.create_tag_from=Crea un nuovo tag da '%s' - tag.create_success=Il branch '%s' è stato creato. - topic.manage_topics=Gestisci argomenti topic.done=Fatto topic.count_prompt=Non puoi selezionare più di 25 argomenti topic.format_prompt=Gli argomenti devono iniziare con una lettera o un numero, possono includere trattini ('-') e possono essere lunghi fino a 35 caratteri. - find_file.go_to_file=Vai al file find_file.no_matching=Nessun file corrispondente trovato - error.csv.too_large=Impossibile visualizzare questo file perché è troppo grande. error.csv.unexpected=Impossibile visualizzare questo file perché contiene un carattere inatteso alla riga %d e alla colonna %d. error.csv.invalid_field_count=Impossibile visualizzare questo file perché ha un numero errato di campi alla riga %d. +issues.filter_project=Progetto +issues.filter_project_none=Nessun progetto +settings.event_wiki=Wiki [org] org_name_holder=Nome dell'Organizzazione @@ -2316,11 +2229,9 @@ team_access_desc=Accesso al repository team_permission_desc=Autorizzazione team_unit_desc=Consentire l'accesso a sezioni di Repository team_unit_disabled=(Disabilitato) - form.name_reserved=Il nome dell'organizzazione '%s' è riservato. form.name_pattern_not_allowed=Il modello '%s' non è consentito come nome di una organizzazione. form.create_org_not_allowed=Non disponi dell'autorizzazione per creare un organizzazione. - settings=Impostazioni settings.options=Organizzazione settings.full_name=Nome Completo @@ -2334,7 +2245,6 @@ settings.visibility.limited=Limitato (Visibile solo agli utenti registrati) settings.visibility.limited_shortname=Limitato settings.visibility.private=Privato (Visibile solo ai membri dell'organizzazione) settings.visibility.private_shortname=Privato - settings.update_settings=Aggiorna Impostazioni settings.update_setting_success=Le impostazioni dell'organizzazione sono state aggiornate. settings.change_orgname_prompt=Nota: cambiare il nome dell'organizzazione cambia anche il relativo URL. @@ -2347,9 +2257,7 @@ settings.confirm_delete_account=Conferma Eliminazione settings.delete_org_title=Elimina organizzazione settings.delete_org_desc=Questa organizzazione verrà eliminata definitivamente. Continuare? settings.hooks_desc=Aggiungi i webhooks che verranno attivati per tutti i repository sotto questa organizzazione. - settings.labels_desc=Aggiungi i webhooks che verranno attivati per tutti i repository sotto questa organizzazione. - members.membership_visibility=Visibilità appartenenza: members.public=Visibile members.public_helper=nascondi @@ -2364,7 +2272,6 @@ members.leave=Abbandona members.leave.detail=Lasciare %s? members.invite_desc=Aggiungi un nuovo membro a %s: members.invite_now=Invita ora - teams.join=Iscriviti teams.leave=Abbandona teams.leave.detail=Lasciare %s? @@ -2411,6 +2318,7 @@ teams.all_repositories_helper=Il team ha accesso a tutti i repository. Seleziona teams.all_repositories_read_permission_desc=Questo team concede permessi lettura l'accesso a tutte le repository: i membri possono visualizzare e clonare i repository. teams.all_repositories_write_permission_desc=Questo team concede permessi di scrittura accesso a tutte le repository: i membri possono leggere e pushare le repository. teams.all_repositories_admin_permission_desc=Questo team concede a Amministratore l'accesso a tutte le repository: i membri possono leggere, pushare e aggiungere collaboratori alle repository. +members=Membri [admin] dashboard=Pannello di Controllo @@ -2426,7 +2334,6 @@ monitor=Monitoraggio first_page=Prima last_page=Ultima total=Totale: %d - dashboard.new_version_hint=Gitea %s è ora disponibile, stai eseguendo %s. Controlla il blog per maggiori dettagli. dashboard.statistic=Riepilogo dashboard.operations=Operazioni di manutenzione @@ -2504,7 +2411,6 @@ dashboard.delete_old_actions=Elimina tutte le vecchie azioni dal database dashboard.delete_old_actions.started=Elimina tutte le vecchie azioni dal database iniziate. dashboard.update_checker=Controllore dell'aggiornamento dashboard.delete_old_system_notices=Elimina tutte le vecchie notifiche di sistema dal database - users.user_manage_panel=Gestione account utente users.new_account=Crea account utente users.name=Nome utente @@ -2558,7 +2464,6 @@ users.list_status_filter.is_prohibit_login=Divieto Di Login users.list_status_filter.not_prohibit_login=Consenti Login users.list_status_filter.is_2fa_enabled=2FA Abilitato users.list_status_filter.not_2fa_enabled=2FA Disabilitato - emails.email_manage_panel=Gestione delle Email Utente emails.primary=Primario emails.activated=Attivato @@ -2571,13 +2476,11 @@ emails.not_updated=Impossibile aggiornare l'indirizzo email richiesto: %v emails.duplicate_active=Questo indirizzo email risulta già attivo per un altro utente. emails.change_email_header=Aggiorna proprietà email emails.change_email_text=Sei sicuro di voler aggiornare questo indirizzo email? - orgs.org_manage_panel=Gestione Organizzazione orgs.name=Nome orgs.teams=Team orgs.members=Membri orgs.new_orga=Nuova Organizzazione - repos.repo_manage_panel=Gestione Repository repos.unadopted=Depositi Non Adottati repos.unadopted.no_more=Nessun repository non adottato trovato @@ -2589,7 +2492,6 @@ repos.stars=Voti repos.forks=Fork repos.issues=Problemi repos.size=Dimensione - packages.package_manage_panel=Gestione Pacchetti packages.total_size=Dimensione totale: %s packages.owner=Proprietario @@ -2600,17 +2502,14 @@ packages.type=Tipo packages.repository=Repository packages.size=Dimensione packages.published=Pubblicata - defaulthooks=Webhook predefiniti defaulthooks.desc=I Webhooks effettuano automaticamente richieste HTTP POST ad un server quando si verificano determinati eventi Gitea. I Webhooks definiti qui sono predefiniti e verranno copiati in tutti i nuovi repository. Per saperne di più leggi la guida ai webhooks. defaulthooks.add_webhook=Aggiungi Webhook predefinito defaulthooks.update_webhook=Aggiorna Webhook predefinito - systemhooks=Webhooks di Sistema systemhooks.desc=I Webhooks effettuano automaticamente richieste HTTP POST ad un server quando si verificano determinati eventi Gitea. I Webhooks definiti qui agiranno su tutti i repository del sistema, quindi considera le eventuali implicazioni sulle performance che potrebbero avere. Per saperne di più leggi la guida ai webhooks. systemhooks.add_webhook=Aggiungi Webhook di Sistema systemhooks.update_webhook=Aggiorna Webhook di Sistema - auths.auth_manage_panel=Gestione fonti di autenticazione auths.new=Aggiungi fonte di autenticazione auths.name=Nome @@ -2725,7 +2624,6 @@ auths.still_in_used=La fonte di autenticazione è ancora in uso. Convertire o el auths.deletion_success=La fonte d'autenticazione è stata eliminata. auths.login_source_exist=La fonte di autenticazione '%s' esiste già. auths.login_source_of_type_exist=Esiste già una fonte di autenticazione di questo tipo. - config.server_config=Configurazione Server config.app_name=Titolo del Sito config.app_ver=Versione Gitea @@ -2744,7 +2642,6 @@ config.static_file_root_path=Percorso Root del File Statico config.log_file_root_path=Percorso dei log config.script_type=Tipo di Script config.reverse_auth_user=Autenticazione Utente Inversa - config.ssh_config=Configurazione SSH config.ssh_enabled=Attivo config.ssh_start_builtin_server=Usa il server integrato @@ -2756,12 +2653,10 @@ config.ssh_key_test_path=Percorso chiave di test config.ssh_keygen_path=Percorso Keygen ('ssh-keygen') config.ssh_minimum_key_size_check=Verifica delle dimensioni minime della chiave config.ssh_minimum_key_sizes=Dimensioni minime della chiave - config.lfs_config=Configurazione LFS config.lfs_enabled=Abilitato config.lfs_content_path=Percorso del contenuto LFS config.lfs_http_auth_expiry=Scadenza autenticazione LFS HTTP - config.db_config=Configurazione Database config.db_type=Tipo config.db_host=Host @@ -2770,7 +2665,6 @@ config.db_user=Nome utente config.db_schema=Schema config.db_ssl_mode=SSL config.db_path=Percorso - config.service_config=Configurazione Servizio config.register_email_confirm=Richiedere la conferma Email per registrarsi config.disable_register=Disattiva Self-Registration @@ -2793,12 +2687,10 @@ config.default_allow_only_contributors_to_track_time=Consenti soltanto ai contri config.no_reply_address=Dominio email nascosto config.default_visibility_organization=Visibilità predefinita per le nuove organizzazioni config.default_enable_dependencies=Abilita i problemi delle dipendenze di default - config.webhook_config=Configurazione Webhook config.queue_length=Lunghezza della coda config.deliver_timeout=Tempo Limite di Consegna config.skip_tls_verify=Salta autenticazione TLS - config.mailer_config=Configurazione Mailer config.mailer_enabled=Attivo config.mailer_enable_helo=Abilita HELO @@ -2816,16 +2708,13 @@ config.test_email_placeholder=Email (es. test@example.com) config.send_test_mail=Invia email di prova config.test_mail_failed=Impossibile inviare mail di prova a '%s': %v config.test_mail_sent=Una mail di prova è stata inviata a '%s'. - config.oauth_config=Configurazione OAuth config.oauth_enabled=Attivo - config.cache_config=Configurazione Cache config.cache_adapter=Adattatore Cache config.cache_interval=Intervallo Cache config.cache_conn=Connessione Cache config.cache_item_ttl=Cache degli elementi TTL - config.session_config=Configurazione Sessione config.session_provider=Fornitore Sessione config.provider_config=Impostazioni Provider @@ -2834,12 +2723,10 @@ config.gc_interval_time=Intervallo di tempo della GC config.session_life_time=Durata Sessione config.https_only=Solo HTTPS config.cookie_life_time=Durata Cookie - config.picture_config=Configurazione Immagine profilo e Avatar config.picture_service=Servizio foto config.disable_gravatar=Disabilita Gravatar config.enable_federated_avatar=Attiva i Federated Avatar - config.git_config=Configurazione Git config.git_disable_diff_highlight=Disattiva evidenziatore Diff Syntax config.git_max_diff_lines=Numero massimo di righe di diff (per singolo file) @@ -2851,7 +2738,6 @@ config.git_mirror_timeout=Timeout per l'aggiornamento del mirror config.git_clone_timeout=Tempo limite operazione di clone config.git_pull_timeout=Tempo limite operazione di pull config.git_gc_timeout=Timeout operazione GC - config.log_config=Configurazione Log config.log_mode=Modalità Log config.own_named_logger=Logger con nome @@ -2863,8 +2749,6 @@ config.access_log_mode=Modalità log di accesso config.access_log_template=Template config.xorm_log_mode=Modalità log XORM config.xorm_log_sql=Log SQL - - monitor.cron=Incarichi Cron monitor.name=Nome monitor.schedule=Agenda @@ -2916,7 +2800,6 @@ monitor.queue.pool.pause.submit=Coda Di Pausa monitor.queue.pool.resume.title=Riprendi Coda monitor.queue.pool.resume.desc=Imposta questa coda per riprendere il lavoro monitor.queue.pool.resume.submit=Riprendi Coda - monitor.queue.settings.title=Impostazioni pool monitor.queue.settings.desc=I gruppi crescono dinamicamente con un boost in risposta al loro blocco delle code dei worker. Queste modifiche non influenzeranno i gruppi di worker attuali. monitor.queue.settings.timeout=Boost Timeout @@ -2932,7 +2815,6 @@ monitor.queue.settings.submit=Aggiorna Impostazioni monitor.queue.settings.changed=Impostazioni Aggiornate monitor.queue.settings.blocktimeout=Timeout Blocco Corrente monitor.queue.settings.blocktimeout.value=%[1]v - monitor.queue.pool.none=Questa coda non ha un Pool monitor.queue.pool.added=Gruppo di Worker aggiunti monitor.queue.pool.max_changed=Numero massimo di lavoratori modificato @@ -2942,7 +2824,6 @@ monitor.queue.pool.cancel=Spegni gruppo worker monitor.queue.pool.cancelling=Arresto gruppo di Worker monitor.queue.pool.cancel_notices=Spegnere questo gruppo di %s workers? monitor.queue.pool.cancel_desc=Lasciare una coda senza alcun gruppo di worker può causare il blocco delle richieste all'infinito. - notices.system_notice_list=Avvisi di Sistema notices.view_detail_header=Visualizza dettagli dell'avviso notices.actions=Azioni @@ -2962,15 +2843,15 @@ notices.delete_success=Gli avvisi di sistema sono stati eliminati. create_repo=ha creato il repository %s rename_repo=repository rinominato da %[1]s a [3]s commit_repo=a inviato a %[3]s di %[4]s -create_issue=`ha aperto il problema %[3]s#%[2]s` -close_issue=`ha chiuso il problema %[3]s#%[2]s` -reopen_issue=`ha riaperto il problema %[3]s#%[2]s` -create_pull_request=`ha creato la pull request %[3]s#%[2]s` -close_pull_request=`ha chiuso la pull request %[3]s#%[2]s` -reopen_pull_request=`ha riaperto la pull request %[3]s#%[2]s` -comment_issue=`ha commentato sul problema %[3]s#%[2]s` -comment_pull=`ha commentato su pull request %[3]s#%[2]s` -merge_pull_request=`ha unito il pull request %[3]s#%[2]s` +create_issue=ha aperto il problema %[3]s#%[2]s +close_issue=ha chiuso il problema %[3]s#%[2]s +reopen_issue=ha riaperto il problema %[3]s#%[2]s +create_pull_request=ha creato la pull request %[3]s#%[2]s +close_pull_request=ha chiuso la pull request %[3]s#%[2]s +reopen_pull_request=ha riaperto la pull request %[3]s#%[2]s +comment_issue=ha commentato sul problema %[3]s#%[2]s +comment_pull=ha commentato su pull request %[3]s#%[2]s +merge_pull_request=ha unito il pull request %[3]s#%[2]s transfer_repo=repository %s trasferito in %s push_tag=ha inviato il tag %[3]s su %[4]s delete_tag=tag eliminato %[2]s da %[3]s @@ -2981,10 +2862,10 @@ compare_commits_general=Confronta commit mirror_sync_push=ha sincronizzato i commit a %[3]s di %[4]s dal mirror mirror_sync_create=ha sincronizzato un nuovo riferimento %[3]s su %[4]s dal mirror mirror_sync_delete=riferimento sincronizzato ed eliminato %[2]s a %[3]s dal mirror -approve_pull_request=`ha approvato %[3]s#%[2]s` -reject_pull_request=`ha suggerito modifiche per %[3]s#%[2]s` -publish_release=`ha rilasciato "%[4]s" su %[3]s` -review_dismissed=`respinta la recensione da %[4]s per %[3]s#%[2]s` +approve_pull_request=ha approvato %[3]s#%[2]s +reject_pull_request=ha suggerito modifiche per %[3]s#%[2]s +publish_release=ha rilasciato "%[4]s" su %[3]s +review_dismissed=respinta la recensione da %[4]s per %[3]s#%[2]s review_dismissed_reason=Motivo: create_branch=ha creato il ramo %[3]s in %[4]s starred_repo=ha salvato come preferito %[2]s @@ -3140,4 +3021,23 @@ settings.delete.description=L'eliminazione di un pacchetto è permanente e non p settings.delete.notice=Stai per eliminare %s (%s). Questa operazione è irreversibile, sei sicuro? settings.delete.success=Il pacchetto è stato eliminato. settings.delete.error=Impossibile eliminare il pacchetto. - +chef.install=Per installare il pacchetto, eseguire il seguente comando: +owner.settings.cleanuprules.enabled=Attivo + +[aria] + +[secrets] +value=Valore +name=Nome + +[actions] +runners.id=ID +runners.name=Nome +runners.owner_type=Tipo +runners.description=Descrizione +runners.labels=Etichette +runners.task_list.run=Esegui +runners.task_list.repository=Repository +runners.task_list.commit=Commit +runners.status.active=Attivo +runs.commit=Commit diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini index abb58a4f2576..76df73c6a71a 100644 --- a/options/locale/locale_ja-JP.ini +++ b/options/locale/locale_ja-JP.ini @@ -23,7 +23,6 @@ enable_javascript=このサイトはJavaScriptを使用しています toc=目次 licenses=ライセンス return_to_gitea=Giteaに戻る - username=ユーザー名 email=メールアドレス password=パスワード @@ -33,7 +32,6 @@ captcha=CAPTCHA twofa=2要素認証 twofa_scratch=2要素認証スクラッチコード passcode=パスコード - webauthn_insert_key=セキュリティキーを挿入 webauthn_sign_in=セキュリティキーのボタンを押してください。セキュリティキーにボタンが無い場合は、挿入しなおしてください。 webauthn_press_button=セキュリティキーのボタンを押してください... @@ -47,7 +45,6 @@ webauthn_error_duplicated=このリクエストに対しては、許可されて webauthn_error_empty=このキーに名前を設定する必要があります。 webauthn_error_timeout=キーを読み取る前にタイムアウトになりました。 このページをリロードしてもう一度やり直してください。 webauthn_reload=リロード - repository=リポジトリ organization=組織 mirror=ミラー @@ -65,18 +62,15 @@ settings=設定 your_profile=プロフィール your_starred=スター your_settings=設定 - all=すべて sources=ソース mirrors=ミラー collaborative=共同編集 forks=フォーク - activities=アクティビティ pull_requests=プルリクエスト issues=イシュー milestones=マイルストーン - ok=OK cancel=キャンセル save=保存 @@ -85,26 +79,24 @@ add_all=すべて追加 remove=除去 remove_all=すべて除去 edit=編集 - copy=コピー copy_url=URLをコピー copy_branch=ブランチ名をコピー copy_success=コピーされました！ copy_error=コピーに失敗しました - write=書き込み preview=プレビュー loading=読み込み中… - step1=ステップ 1: step2=ステップ 2: - error=エラー error404=アクセスしようとしたページは存在しないか、閲覧が許可されていません。 - never=無し - rss_feed=RSSフィード +enabled=有効 +disabled=無効 +copy_content=内容をコピー +copy_type_unsupported=このファイルタイプはコピーできません [filter] string.asc=A - Z @@ -159,7 +151,6 @@ err_empty_admin_email=管理者のメールアドレスは空にできません err_admin_name_is_reserved=管理者のユーザー名が不正です。予約済みのユーザー名です。 err_admin_name_pattern_not_allowed=管理者のユーザー名が不正です。 予約済みのパターンにマッチしています err_admin_name_is_invalid=管理者のユーザー名が不正です - general_title=基本設定 app_name=サイトタイトル app_name_helper=企業名をここに入れることができます。 @@ -179,7 +170,6 @@ app_url=GiteaのベースURL app_url_helper=HTTP(S)のクローンURLとメール通知で使うベースアドレス。 log_root_path=ログの保存先パス log_root_path_helper=ログファイルがこのディレクトリに書き込まれます。 - optional_title=オプション設定 email_title=メール設定 smtp_addr=SMTPホスト @@ -237,7 +227,10 @@ default_enable_timetracking_popup=新しいリポジトリのタイムトラッ no_reply_address=メールを隠すときのドメイン no_reply_address_helper=メールアドレスを隠しているユーザーに使用するドメイン名。 例えば 'noreply.example.org' と設定した場合、ユーザー名 'joe' はGitに 'joe@noreply.example.org' としてログインすることになります。 password_algorithm=パスワードハッシュアルゴリズム -password_algorithm_helper=パスワードハッシュアルゴリズムを設定します。 アルゴリズムにより動作要件と強度が異なります。 `argon2`は良い特性を備えていますが、多くのメモリを使用するため小さなシステムには適さない場合があります。 +password_algorithm_helper="""パスワードハッシュアルゴリズムを設定します。 アルゴリズムにより動作要件と強度が異なります。 `argon2`は良い特性を備えていますが、多くのメモリを使用するため小さなシステムには適さない場合があります。""" +invalid_password_algorithm=無効なパスワードハッシュアルゴリズム +enable_update_checker=アップデートチェッカーを有効にする +enable_update_checker_helper=gitea.ioに接続して定期的に新しいバージョンのリリースを確認します。 [home] uname_holder=ユーザー名またはメールアドレス @@ -253,17 +246,14 @@ search_repos=リポジトリを探す… filter=その他のフィルター filter_by_team_repositories=チームリポジトリで絞り込み feed_of="%s" のフィード - show_archived=アーカイブ show_both_archived_unarchived=アーカイブと非アーカイブの両方を表示 show_only_archived=アーカイブのみ表示 show_only_unarchived=非アーカイブのみ表示 - show_private=プライベート show_both_private_public=公開とプライベートの両方を表示 show_only_private=プライベートのみ表示 show_only_public=公開のみ表示 - issues.in_your_repos=あなたのリポジトリ [explore] @@ -287,7 +277,6 @@ code_last_indexed_at=最終取得 %s relevant_repositories_tooltip=フォークリポジトリや、トピック、アイコン、説明のいずれも無いリポジトリは表示されません。 relevant_repositories=妥当と思われるリポジトリのみを表示しています。 フィルタリングしない結果を表示。 - [auth] create_new_account=アカウントを登録 register_helper_msg=既にアカウントをお持ちですか？ 今すぐサインインしましょう！ @@ -355,36 +344,30 @@ authorization_failed_desc=不正なリクエストであったため認可が失 sspi_auth_failed=SSPI認証に失敗しました password_pwned=あなたが選択したパスワードは、過去の情報漏洩事件で流出した盗まれたパスワードのリストに含まれています。 別のパスワードでもう一度試してください。 password_pwned_err=HaveIBeenPwnedへのリクエストを完了できませんでした +invalid_password=アカウントの作成に使用されたパスワードと一致しません。 [mail] view_it_on=%s で見る link_not_working_do_paste=開かないですか？ コピーしてブラウザーに貼り付けてみてください。 hi_user_x=こんにちは、%s さん。 - activate_account=あなたのアカウントをアクティベートしてください。 activate_account.title=%s さん、アカウントをアクティベートしてください activate_account.text_1=こんにちは、%[1]s さん。 %[2]s へのご登録ありがとうございます！ activate_account.text_2=あなたのアカウントを有効化するため、%s以内に次のリンクをクリックしてください: - activate_email=メール アドレスを確認します activate_email.title=%s さん、メールアドレス確認をお願いします activate_email.text=あなたのメールアドレスを確認するため、%s以内に次のリンクをクリックしてください: - register_notify=Giteaへようこそ register_notify.title=%[1]s さん、%[2]s にようこそ register_notify.text_1=これは %s への登録確認メールです！ register_notify.text_2=あなたはユーザー名 %s でログインできるようになりました。 register_notify.text_3=このアカウントがあなたに作成されたものであれば、最初にパスワードを設定してください。 - reset_password=アカウントを回復 reset_password.title=%s さん、あなたのアカウントの回復がリクエストされました reset_password.text=あなたのアカウントを回復するには、%s以内に次のリンクをクリックしてください: - register_success=登録が完了しました - issue_assigned.pull=リポジトリ %[3]s で @%[1]s さんが、あなたをプルリクエスト %[2]s の担当者にしました。 issue_assigned.issue=リポジトリ %[3]s で @%[1]s さんが、あなたをイシュー %[2]s の担当者にしました。 - issue.x_mentioned_you=@%s さんが、あなたにメンションしました: issue.action.force_push=%[1]s さんが %[2]s に強制プッシュしました。(%[3]s から %[4]s へ) issue.action.push_1=@%[1]s さんが %[2]s にコミット%[3]d件をプッシュしました。 @@ -399,7 +382,6 @@ issue.action.review_dismissed=@%[1]s さんが、プルリクエストに issue.action.ready_for_review=@%[1]s さんが、プルリクエストをレビュー可能な状態にしました。 issue.action.new=@%[1]s さんが #%[2]d を作成しました。 issue.in_tree_path=%s: - release.new.subject=%[2]s の %[1]s がリリースされました release.new.text=@%[1]s さんが %[3]s で %[2]s をリリースしました release.title=タイトル: %s @@ -407,19 +389,17 @@ release.note=リリースノート: 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.to_you=あなた repo.transfer.body=承認または拒否するには %s を開きます。 もしくは単に無視してもかまいません。 - repo.collaborator.added.subject=%s が %s にあなたを追加しました repo.collaborator.added.text=あなたは次のリポジトリの共同作業者に追加されました: - team_invite.subject=%[1]s さんが %[2]s への参加にあなたを招待しました team_invite.text_1=%[1]s さんが、組織 %[3]s 内のチーム %[2]s への参加に、あなたを招待しました。 team_invite.text_2=下のリンクをクリックしてチームに参加してください。 team_invite.text_3=注: この招待は %[1]s 宛です。 招待に心当たりがなければ、このメールを無視してかまいません。 +reply=またはこのメールに直接返信してください [modal] yes=はい @@ -438,34 +418,30 @@ PayloadUrl=ペイロードのURL TeamName=チーム名 AuthName=承認名 AdminEmail=管理者のメール - NewBranchName=新しいブランチ名 CommitSummary=コミットの概要 CommitMessage=コミットメッセージ CommitChoice=コミットを選択 TreeName=ファイルパス Content=内容 - SSPISeparatorReplacement=セパレーター SSPIDefaultLanguage=デフォルトの言語 - -require_error=`は空にできません。` -alpha_dash_error=`は、英数字、ダッシュ('-')、アンダースコア('_')だけを含めることができます。` -alpha_dash_dot_error=`は、英数字、ダッシュ('-')、アンダースコア('_')、ドット('.')だけを含めることができます。` -git_ref_name_error=`は有効なGit Ref名である必要があります。` +require_error=は空にできません。 +alpha_dash_error=は、英数字、ダッシュ('-')、アンダースコア('_')だけを含めることができます。 +alpha_dash_dot_error=は、英数字、ダッシュ('-')、アンダースコア('_')、ドット('.')だけを含めることができます。 +git_ref_name_error=は有効なGit Ref名である必要があります。 size_error=は%s文字である必要があります。 -min_size_error=`は%s文字以上である必要があります。` -max_size_error=`は%s文字以下である必要があります。` -email_error=`は有効なメールアドレスではありません。` -url_error=`'%s' は有効なURLではありません。` -include_error=`は文字列 '%s' を含んでいる必要があります。` -glob_pattern_error=`のglobパターンが不正です: %s.` -regex_pattern_error=`の正規表現パターンが不正です: %s.` +min_size_error=は%s文字以上である必要があります。 +max_size_error=は%s文字以下である必要があります。 +email_error=は有効なメールアドレスではありません。 +url_error='%s' は有効なURLではありません。 +include_error=は文字列 '%s' を含んでいる必要があります。 +glob_pattern_error=のglobパターンが不正です: %s. +regex_pattern_error=の正規表現パターンが不正です: %s. unknown_error=不明なエラー: captcha_incorrect=CAPTCHAコードが正しくありません。 password_not_match=パスワードが一致しません。 lang_select_error=言語をリストから選択してください。 - username_been_taken=ユーザー名が既に使用されています。 username_change_not_local_user=非ローカルユーザーのユーザー名は変更できません。 repo_name_been_taken=リポジトリ名が既に使用されています。 @@ -497,20 +473,21 @@ team_not_exist=チームが存在していません。 last_org_owner='Owners'チームから最後のユーザーを削除することはできません。ひとつの組織には少なくとも一人のオーナーが必要です。 cannot_add_org_to_team=組織はチームメンバーとして追加できません。 duplicate_invite_to_team=指定したユーザーはすでにチームメンバーに招待されています。 - invalid_ssh_key=SSHキーが確認できません: %s invalid_gpg_key=GPGキーが確認できません: %s invalid_ssh_principal=無効なプリンシパル: %s unable_verify_ssh_key=SSHキーが確認できません。間違いが無いか、よく確認してください。 auth_failed=認証に失敗しました: %v - still_own_repo=あなたのアカウントは1つ以上のリポジトリを所有しています。 先にそれらを削除するか移転してください。 still_has_org=あなたのアカウントは1つ以上の組織に参加しています。 先にそれらから脱退してください。 still_own_packages=あなたのアカウントは1つ以上のパッケージを所有しています。 先にそれらを削除してください。 org_still_own_repo=組織はまだ1つ以上のリポジトリを所有しています。 先にそれらを削除するか移転してください。 org_still_own_packages=組織はまだ1つ以上のパッケージを所有しています。 先にそれらを削除してください。 - target_branch_not_exist=ターゲットのブランチが存在していません。 +username_error=は、英数字('0-9','a-z','A-Z')、ダッシュ('-')、アンダースコア('_')、ドット('.')だけを含めることができます。 先頭と末尾は英数字以外の文字にはできません。 また、連続した英数字以外の文字も許されません。 +invalid_group_team_map_error=のマッピングが無効です: %s +organization_leave_success=あなたは組織 %s から脱退しました。 +must_use_public_key=あなたが提供したキーは秘密鍵です。秘密鍵をどこにもアップロードしないでください。代わりに公開鍵を使用してください。 [user] change_avatar=アバターを変更… @@ -528,7 +505,6 @@ unfollow=フォロー解除 heatmap.loading=ヒートマップを読み込み中… user_bio=経歴 disabled_public_activity=このユーザーはアクティビティ表示を公開していません。 - form.name_reserved=ユーザー名 '%s' は予約されています。 form.name_pattern_not_allowed='%s' の形式はユーザー名に使用できません。 form.name_chars_not_allowed=ユーザー名 '%s' には無効な文字が含まれています。 @@ -551,7 +527,6 @@ account_link=連携アカウント organization=組織 uid=Uid webauthn=セキュリティキー - public_profile=公開プロフィール biography_placeholder=自己紹介を少しだけ profile_desc=メールアドレスは、通知やその他の操作で使用されます。 @@ -591,7 +566,6 @@ saved_successfully=設定は正常に保存されました。 privacy=プライバシー keep_activity_private=プロフィールページのアクティビティ表示を隠す keep_activity_private_popup=アクティビティを、あなたと管理者にのみ表示します - lookup_avatar_by_mail=メールアドレスでアバターを見つける federated_avatar_lookup=フェデレーテッド・アバター検索 enable_custom_avatar=カスタムアバターを有効にする @@ -602,7 +576,6 @@ uploaded_avatar_not_a_image=アップロードしたファイルは画像ファ uploaded_avatar_is_too_big=アップロードしたファイルは最大サイズを超えています。 update_avatar_success=アバターを更新しました。 update_user_avatar_success=ユーザーのアバターを更新しました。 - change_password=パスワードを更新 old_password=現在のパスワード new_password=新しいパスワード @@ -610,7 +583,6 @@ retype_new_password=新しいパスワードを再入力 password_incorrect=現在のパスワードが正しくありません。 change_password_success=パスワードを更新しました。 今後は新しいパスワードを使ってサインインしてください。 password_change_disabled=ローカルユーザーでない場合は、GiteaのWebインターフェースからパスワードを変更することはできません。 - emails=メールアドレス manage_emails=メールアドレスの管理 manage_themes=デフォルトのテーマを選択 @@ -643,7 +615,6 @@ add_openid_success=新しいOpenIDアドレスを追加しました。 keep_email_private=メールアドレスを隠す keep_email_private_popup=あなたのメールアドレスは他のユーザーから隠されます。 openid_desc=OpenIDを使うと外部プロバイダーに認証を委任することができます。 - manage_ssh_keys=SSHキーの管理 manage_ssh_principals=SSH証明書プリンシパルの管理 manage_gpg_keys=GPGキーの管理 @@ -722,7 +693,6 @@ manage_social=関連付けられているソーシャルアカウントを管理 social_desc=これらのソーシャルアカウントがGiteaアカウントと連携されています。 これらすべてが、あなたのGiteaアカウントのサインインに使用してよいものであることを、十分確認してください。 unbind=連携の解除 unbind_success=Giteaアカウントのソーシャルアカウントとの連携を解除しました。 - manage_access_token=アクセストークンの管理 generate_new_token=新しいトークンを生成 tokens_desc=これらのトークンは、Gitea APIによるアカウントへのアクセスを許可します。 @@ -737,7 +707,6 @@ access_token_deletion_cancel_action=キャンセル access_token_deletion_confirm_action=削除 access_token_deletion_desc=トークンを削除すると、それを使用しているアプリケーションは、アカウントへのアクセスができなくなります。これは元に戻せません。続行しますか？ delete_token_success=トークンを削除しました。 削除したトークンを使用しているアプリケーションは、今後あなたのアカウントにアクセスできません。 - manage_oauth2_applications=OAuth2アプリケーションの管理 edit_oauth2_application=OAuth2アプリケーションの編集 oauth2_applications_desc=OAuth2はGiteaインスタンスでのサードパーティアプリケーションによる安全な認証を可能にします。 @@ -760,14 +729,12 @@ oauth2_client_secret_hint=次にこのページを開いたときには、シー oauth2_application_edit=編集 oauth2_application_create_description=OAuth2アプリケーションで、サードパーティアプリケーションがこのインスタンス上のユーザーアカウントにアクセスできるようになります。 oauth2_application_remove_description=OAuth2アプリケーションを削除すると、このインスタンス上で許可されていたユーザーアカウントへのアクセスが禁止されます。 続行しますか？ - authorized_oauth2_applications=許可済みOAuth2アプリケーション authorized_oauth2_applications_description=これらのサードパーティ アプリケーションに、あなたのGiteaアカウントへのアクセスを許可しています。 不要になったアプリケーションはアクセス権を取り消すようにしてください。 revoke_key=取り消し revoke_oauth2_grant=アクセス権の取り消し revoke_oauth2_grant_description=このサードパーティ アプリケーションのアクセス権を取り消し、アプリケーションがあなたのデータへアクセスすることを防ぎます。 続行しますか？ revoke_oauth2_grant_success=アクセス権を取り消しました。 - twofa_desc=2要素認証はアカウントのセキュリティを強化します。 twofa_is_enrolled=このアカウントは2要素認証が有効になっています。 twofa_not_enrolled=このアカウントは2要素認証が設定されていません。 @@ -785,13 +752,11 @@ then_enter_passcode=次に、アプリケーションに表示されているパ passcode_invalid=パスコードが間違っています。 再度お試しください。 twofa_enrolled=あなたのアカウントに2要素認証が設定されました。 スクラッチトークン (%s) は一度しか表示しませんので安全な場所に保存してください！ twofa_failed_get_secret=シークレットが取得できません。 - webauthn_desc=セキュリティキーは暗号化キーを内蔵するハードウェア ・ デバイスです。 2要素認証に使用できます。 セキュリティキーはWebAuthn Authenticator規格をサポートしている必要があります。 webauthn_register_key=セキュリティキーを追加 webauthn_nickname=ニックネーム webauthn_delete_key=セキュリティキーの登録解除 webauthn_delete_key_desc=セキュリティキーの登録を解除すると、今後そのセキュリティキーでサインインすることはできなくなります。 続行しますか？ - manage_account_links=連携アカウントの管理 manage_account_links_desc=これらの外部アカウントがGiteaアカウントと連携されています。 account_links_not_available=現在このGiteaアカウントが連携している外部アカウントはありません。 @@ -799,23 +764,19 @@ link_account=アカウントをリンク remove_account_link=連携アカウントの削除 remove_account_link_desc=連携アカウントを削除し、Giteaアカウントへのアクセス権を取り消します。 続行しますか？ remove_account_link_success=連携アカウントを削除しました。 - orgs_none=あなたはどの組織のメンバーでもありません。 repos_none=あなたはリポジトリを所有していません。 - delete_account=アカウントを削除 delete_prompt=この操作により、あなたのユーザーアカウントは恒久的に抹消されます。 取り消すことはできません。 delete_with_all_comments=あなたのアカウントは作成からまだ %s 経過していません。 幽霊コメント回避のため、イシューやPRのすべてのコメントは一緒に削除されます。 confirm_delete_account=削除の続行 delete_account_title=ユーザーアカウントの削除 delete_account_desc=このユーザーアカウントを恒久的に削除してもよろしいですか？ - email_notifications.enable=メール通知有効 email_notifications.onmention=メンションのみメール通知 email_notifications.disable=メール通知無効 email_notifications.submit=メール設定を保存 email_notifications.andyourown=自分に関する通知も含める - visibility=ユーザーの公開範囲 visibility.public=パブリック visibility.public_tooltip=すべてのユーザーに表示します @@ -823,6 +784,8 @@ visibility.limited=限定 visibility.limited_tooltip=ログインしているユーザーにのみ表示します visibility.private=プライベート visibility.private_tooltip=組織のメンバーにのみ表示します +select_scopes=スコープを選択 +scopes_list=スコープ: [repo] new_repo_helper=リポジトリには、プロジェクトのすべてのファイルとリビジョン履歴が入ります。 すでにほかの場所にありますか？ リポジトリを移行 もどうぞ。 @@ -909,14 +872,12 @@ delete_preexisting=既存のファイルを削除 delete_preexisting_content=%s のファイルを削除します delete_preexisting_success=%s の未登録ファイルを削除しました blame_prior=この変更より前のBlameを表示 - transfer.accept=転送を承認 transfer.accept_desc="%s" に転送 transfer.reject=転送を拒否 transfer.reject_desc="%s" への転送をキャンセル transfer.no_permission_to_accept=承認を行う権限がありません transfer.no_permission_to_reject=拒否を行う権限がありません - desc.private=プライベート desc.public=公開 desc.private_template=プライベートテンプレート @@ -924,7 +885,6 @@ desc.public_template=テンプレート desc.internal=組織内 desc.internal_template=組織内テンプレート desc.archived=アーカイブ - template.items=テンプレート項目 template.git_content=Gitコンテンツ (デフォルトブランチ) template.git_hooks=Gitフック @@ -935,16 +895,13 @@ template.avatar=アバター template.issue_labels=イシューラベル template.one_item=最低一つはテンプレート項目を選択する必要があります template.invalid=テンプレートリポジトリを選択する必要があります - archive.title=このリポジトリはアーカイブされています。 ファイルの閲覧とクローンは可能ですが、プッシュや、イシュー・プルリクエストのオープンはできません。 archive.issue.nocomment=このリポジトリはアーカイブされています。 イシューにコメントを追加することはできません。 archive.pull.nocomment=このリポジトリはアーカイブされています。 プルリクエストにコメントを追加することはできません。 - form.reach_limit_of_creation_1=すでにあなたが作成できるリポジトリ数の上限 %d 個に達しています。 form.reach_limit_of_creation_n=すでにあなたが作成できるリポジトリ数の上限 %d 個に達しています。 form.name_reserved=リポジトリ名 '%s' は予約されています。 form.name_pattern_not_allowed='%s' の形式はリポジトリ名に使用できません。 - need_auth=認証 migrate_options=移行オプション migrate_service=移行するサービス @@ -995,7 +952,6 @@ migrate.migrating_labels=ラベル移行中 migrate.migrating_releases=リリース移行中 migrate.migrating_issues=イシュー移行中 migrate.migrating_pulls=プルリクエスト移行中 - mirror_from=ミラー元 forked_from=フォーク元 generated_from=generated from @@ -1009,7 +965,6 @@ unstar=スター取消 star=スター fork=フォーク download_archive=リポジトリをダウンロード - no_desc=説明なし quick_guide=クイック ガイド clone_this_repo=このリポジトリのクローンを作成 @@ -1017,12 +972,11 @@ create_new_repo_command=コマンドラインから新しいリポジトリを push_exist_repo=コマンドラインから既存のリポジトリをプッシュ empty_message=このリポジトリの中には何もありません。 broken_message=このリポジトリの基礎となる Git のデータを読み取れません。このインスタンスの管理者に相談するか、このリポジトリを削除してください。 - code=コード code.desc=ソースコード、ファイル、コミット、ブランチにアクセス。 branch=ブランチ tree=ツリー -clear_ref=`現在の参照をクリア` +clear_ref=現在の参照をクリア filter_branch_and_tag=ブランチまたはタグを絞り込み find_tag=タグを検索 branches=ブランチ @@ -1034,7 +988,6 @@ packages=パッケージ labels=ラベル org_labels_desc=組織で定義されているラベル (組織のすべてのリポジトリで使用可能なもの) org_labels_desc_manage=編集 - milestones=マイルストーン commits=コミット commit=コミット @@ -1050,14 +1003,13 @@ file_view_rendered=レンダリング表示 file_view_raw=Rawデータを見る file_permalink=パーマリンク file_too_large=このファイルは大きすぎるため、表示できません。 -invisible_runes_header=`このファイルには不可視のUnicode文字が含まれています！` -invisible_runes_description=`このファイルには不可視Unicode文字が含まれており、下に見えているものとは異なる処理が行われる可能性があります。 あなたのユースケースが意図的かつ正当な場合はこの警告を無視して構いません。 不可視文字を表示するにはエスケープボタンを使用します。` -ambiguous_runes_header=`このファイルには曖昧(ambiguous)なUnicode文字が含まれています！` -ambiguous_runes_description=`このファイルには曖昧(ambiguous)なUnicode文字が含まれており、あなたが使用しているロケールにおいて他の文字と混同する可能性があります。 あなたのユースケースが意図的かつ正当な場合はこの警告を無視して構いません。 それらの文字をハイライトするにはエスケープボタンを使用します。` -invisible_runes_line=`この行には不可視のUnicode文字があります` -ambiguous_runes_line=`この行には曖昧(ambiguous)なUnicode文字があります` -ambiguous_character=`%[1]c [U+%04[1]X] は %[2]c [U+%04[2]X] と混同するおそれがあります` - +invisible_runes_header=このファイルには不可視のUnicode文字が含まれています！ +invisible_runes_description=このファイルには不可視Unicode文字が含まれており、下に見えているものとは異なる処理が行われる可能性があります。 あなたのユースケースが意図的かつ正当な場合はこの警告を無視して構いません。 不可視文字を表示するにはエスケープボタンを使用します。 +ambiguous_runes_header=このファイルには曖昧(ambiguous)なUnicode文字が含まれています！ +ambiguous_runes_description=このファイルには曖昧(ambiguous)なUnicode文字が含まれており、あなたが使用しているロケールにおいて他の文字と混同する可能性があります。 あなたのユースケースが意図的かつ正当な場合はこの警告を無視して構いません。 それらの文字をハイライトするにはエスケープボタンを使用します。 +invisible_runes_line=この行には不可視のUnicode文字があります +ambiguous_runes_line=この行には曖昧(ambiguous)なUnicode文字があります +ambiguous_character=%[1]c [U+%04[1]X] は %[2]c [U+%04[2]X] と混同するおそれがあります escape_control_characters=エスケープ unescape_control_characters=エスケープ解除 file_copy_permalink=パーマリンクをコピー @@ -1076,7 +1028,6 @@ download_file=ファイルをダウンロード normal_view=通常表示 line=行 lines=行 - editor.add_file=ファイル追加 editor.new_file=新規ファイル editor.upload_file=ファイルをアップロード @@ -1142,7 +1093,6 @@ editor.user_no_push_to_branch=ユーザーはブランチにプッシュでき editor.require_signed_commit=ブランチでは署名されたコミットが必須です editor.cherry_pick=チェリーピック %s: editor.revert=リバート %s: - commits.desc=ソースコードの変更履歴を参照します。 commits.commits=コミット commits.no_commits=共通のコミットはありません。 '%s' と '%s' の履歴はすべて異なっています。 @@ -1161,7 +1111,6 @@ commits.signed_by_untrusted_user=信頼できないユーザーによる署名 commits.signed_by_untrusted_user_unmatched=コミッターと一致しない信頼できないユーザーによる署名 commits.gpg_key_id=GPGキーID commits.ssh_key_fingerprint=SSH鍵のフィンガープリント - commit.actions=アクション commit.revert=リバート commit.revert-header=リバート: %s @@ -1169,10 +1118,8 @@ commit.revert-content=リバートするブランチを選択: commit.cherry-pick=チェリーピック commit.cherry-pick-header=チェリーピック: %s commit.cherry-pick-content=チェリーピック先のブランチを選択: - ext_issues=外部イシューへのアクセス ext_issues.desc=外部のイシュートラッカーへのリンク。 - projects=プロジェクト projects.desc=プロジェクトボードでイシューとプルを管理します。 projects.description=説明 (オプション) @@ -1187,12 +1134,12 @@ projects.deletion_desc=プロジェクトを削除し、関連するすべての projects.deletion_success=プロジェクトを削除しました。 projects.edit=プロジェクトの編集 projects.edit_subheader=プロジェクトはイシューをまとめ、進捗を管理します。 -projects.modify=プロジェクトを更新 +projects.modify=プロジェクトを編集 projects.edit_success=プロジェクト '%s' を更新しました。 projects.type.none=なし projects.type.basic_kanban=基本的なカンバン projects.type.bug_triage=バグ トリアージ -projects.template.desc=プロジェクト テンプレート +projects.template.desc=テンプレート projects.template.desc_helper=開始するプロジェクトテンプレートを選択 projects.type.uncategorized=未分類 projects.board.edit=ボードを編集 @@ -1208,7 +1155,6 @@ projects.board.color=色 projects.open=オープン projects.close=クローズ projects.board.assigned_to=担当 - issues.desc=バグ報告、タスク、マイルストーンの作成。 issues.filter_assignees=候補者の絞り込み issues.filter_milestones=マイルストーンの絞り込み @@ -1261,25 +1207,25 @@ issues.add_labels=がラベル %s を追加 %s issues.remove_label=がラベル %s を除去 %s issues.remove_labels=がラベル %s を除去 %s issues.add_remove_labels=がラベル %s を追加、 %s を除去 %s -issues.add_milestone_at=`がマイルストーン %[1]s に追加 %[2]s` -issues.add_project_at=`がプロジェクト %s に追加 %s` -issues.change_milestone_at=`がマイルストーンを %[1]s から %[2]s へ変更 %[3]s` -issues.change_project_at=`がプロジェクトを %s から %s へ変更 %s` -issues.remove_milestone_at=`がマイルストーン %[1]s から除去 %[2]s` -issues.remove_project_at=`がプロジェクト %s から除去 %s` -issues.deleted_milestone=`(削除済)` -issues.deleted_project=`(削除済)` -issues.self_assign_at=`が自身を担当者に設定 %s` -issues.add_assignee_at=`を %[1]s が担当者に指名 %[2]s` -issues.remove_assignee_at=`を %[1]s が担当から解除 %[2]s` -issues.remove_self_assignment=`が自身を担当から解除 %s` -issues.change_title_at=`がタイトルを %[1]s から %[2]s に変更 %[3]s` -issues.change_ref_at=`が参照を %s から %s に変更 %s` -issues.remove_ref_at=`が参照 %s を削除 %s` -issues.add_ref_at=`が参照 %s を追加 %s` -issues.delete_branch_at=`がブランチ %[1]s を削除 %[2]s` +issues.add_milestone_at=がマイルストーン %[1]s に追加 %[2]s +issues.add_project_at=がプロジェクト %s に追加 %s +issues.change_milestone_at=がマイルストーンを %[1]s から %[2]s へ変更 %[3]s +issues.change_project_at=がプロジェクトを %s から %s へ変更 %s +issues.remove_milestone_at=がマイルストーン %[1]s から除去 %[2]s +issues.remove_project_at=がプロジェクト %s から除去 %s +issues.deleted_milestone=(削除済) +issues.deleted_project=(削除済) +issues.self_assign_at=が自身を担当者に設定 %s +issues.add_assignee_at=を %[1]s が担当者に指名 %[2]s +issues.remove_assignee_at=を %[1]s が担当から解除 %[2]s +issues.remove_self_assignment=が自身を担当から解除 %s +issues.change_title_at=がタイトルを %[1]s から %[2]s に変更 %[3]s +issues.change_ref_at=が参照を %s から %s に変更 %s +issues.remove_ref_at=が参照 %s を削除 %s +issues.add_ref_at=が参照 %s を追加 %s +issues.delete_branch_at=がブランチ %[1]s を削除 %[2]s issues.filter_label=ラベル -issues.filter_label_exclude=`ラベルで除外するには alt + click/enter` +issues.filter_label_exclude=ラベルで除外するには alt + click/enter issues.filter_label_no_select=すべてのラベル issues.filter_milestone=マイルストーン issues.filter_milestone_no_select=すべてのマイルストーン @@ -1326,7 +1272,7 @@ issues.open_title=オープン issues.closed_title=クローズ issues.draft_title=ドラフト issues.num_comments=%d件のコメント -issues.commented_at=`が %s にコメント` +issues.commented_at=が %s にコメント issues.delete_comment_confirm=このコメントを削除してよろしいですか？ issues.context.copy_link=リンクをコピー issues.context.quote_reply=引用して返信 @@ -1335,22 +1281,22 @@ issues.context.edit=編集 issues.context.delete=削除 issues.no_content=まだ内容がありません issues.close_issue=クローズする -issues.pull_merged_at=`がコミット %[2]s を %[3]s にマージ %[4]s` -issues.manually_pull_merged_at=`がコミット %[2]s を %[3]s に手動マージ %[4]s` +issues.pull_merged_at=がコミット %[2]s を %[3]s にマージ %[4]s +issues.manually_pull_merged_at=がコミット %[2]s を %[3]s に手動マージ %[4]s issues.close_comment_issue=コメントしてクローズ issues.reopen_issue=再オープンする issues.reopen_comment_issue=コメントして再オープン issues.create_comment=コメントする -issues.closed_at=`がイシューをクローズ %[2]s` -issues.reopened_at=`がイシューを再オープン %[2]s` -issues.commit_ref_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_from=` %[1]s にて` +issues.closed_at=がイシューをクローズ %[2]s +issues.reopened_at=がイシューを再オープン %[2]s +issues.commit_ref_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_from=" %[1]s にて" issues.poster=投稿者 issues.collaborator=共同作業者 issues.owner=オーナー @@ -1364,9 +1310,9 @@ issues.sign_in_require_desc=サインインしてこの会話 issues.edit=編集 issues.cancel=キャンセル issues.save=保存 -issues.label_title=ラベル名 -issues.label_description=ラベルの説明 -issues.label_color=ラベルの色 +issues.label_title=名前 +issues.label_description=説明 +issues.label_color=カラー issues.label_count=ラベル %d件 issues.label_open_issues=オープン中のイシュー %d件 issues.label_edit=編集 @@ -1380,8 +1326,8 @@ issues.label.filter_sort.reverse_alphabetically=逆アルファベット順 issues.label.filter_sort.by_size=サイズの小さい順 issues.label.filter_sort.reverse_by_size=サイズの大きい順 issues.num_participants=%d 人の参加者 -issues.attachment.open_tab=`クリックして新しいタブで "%s" を見る` -issues.attachment.download=`クリックして "%s" をダウンロード` +issues.attachment.open_tab=クリックして新しいタブで "%s" を見る +issues.attachment.download=クリックして "%s" をダウンロード issues.subscribe=購読する issues.unsubscribe=購読を解除 issues.lock=会話をロック @@ -1409,31 +1355,31 @@ issues.delete.text=本当にこのイシューを削除しますか? (これは issues.tracker=タイムトラッカー issues.start_tracking_short=タイマー 開始 issues.start_tracking=タイムトラッキングを開始 -issues.start_tracking_history=`が作業を開始 %s` +issues.start_tracking_history=が作業を開始 %s issues.tracker_auto_close=タイマーは、このイシューがクローズされると自動的に終了します -issues.tracking_already_started=`別のイシューで既にタイムトラッキングを開始しています！` +issues.tracking_already_started=別のイシューで既にタイムトラッキングを開始しています！ issues.stop_tracking=タイマー 終了 -issues.stop_tracking_history=`が作業を終了 %s` +issues.stop_tracking_history=が作業を終了 %s issues.cancel_tracking=中止 -issues.cancel_tracking_history=`がタイムトラッキングを中止 %s` +issues.cancel_tracking_history=がタイムトラッキングを中止 %s issues.add_time=手で時間を入力 issues.del_time=このタイムログを削除 issues.add_time_short=時間入力 issues.add_time_cancel=キャンセル -issues.add_time_history=`が作業時間を追加 %s` -issues.del_time_history=`が作業時間を削除 %s` +issues.add_time_history=が作業時間を追加 %s +issues.del_time_history=が作業時間を削除 %s issues.add_time_hours=時間 issues.add_time_minutes=分 issues.add_time_sum_to_small=時間が入力されていません。 issues.time_spent_total=かかった時間の合計 -issues.time_spent_from_all_authors=`かかった時間の合計: %s` +issues.time_spent_from_all_authors=かかった時間の合計: %s issues.due_date=期日 issues.invalid_due_date_format=期日は 'yyyy-mm-dd' の形式で入力してください。 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.due_date_form=yyyy-mm-dd issues.due_date_form_add=期日の追加 issues.due_date_form_edit=変更 @@ -1452,8 +1398,8 @@ issues.dependency.add=依存関係を追加... issues.dependency.cancel=キャンセル issues.dependency.remove=削除 issues.dependency.remove_info=この依存関係を削除 -issues.dependency.added_dependency=`が新しい依存関係を追加 %s` -issues.dependency.removed_dependency=`が依存関係を削除 %s` +issues.dependency.added_dependency=が新しい依存関係を追加 %s +issues.dependency.removed_dependency=が依存関係を削除 %s issues.dependency.pr_closing_blockedby=このプルリクエストのクローズは、これらのイシューによりブロックされています issues.dependency.issue_closing_blockedby=このイシューのクローズは、これらのイシューによりブロックされています issues.dependency.issue_close_blocks=このイシューは、これらのイシューのクローズをブロックしています @@ -1506,10 +1452,8 @@ issues.content_history.delete_from_history=履歴から削除 issues.content_history.delete_from_history_confirm=履歴から削除しますか? issues.content_history.options=オプション issues.reference_link=リファレンス: %s - compare.compare_base=基準 compare.compare_head=比較 - pulls.desc=プルリクエストとコードレビューの有効化。 pulls.new=新しいプルリクエスト pulls.view=プルリクエストを表示 @@ -1529,11 +1473,11 @@ pulls.filter_branch=ブランチの絞り込み pulls.no_results=結果が見つかりませんでした。 pulls.nothing_to_compare=同じブランチ同士のため、 プルリクエストを作成する必要がありません。 pulls.nothing_to_compare_and_allow_empty_pr=これらのブランチは内容が同じです。 空のプルリクエストになります。 -pulls.has_pull_request=`同じブランチのプルリクエストはすでに存在します: %[2]s#%[3]d` +pulls.has_pull_request=同じブランチのプルリクエストはすでに存在します: %[2]s#%[3]d pulls.create=プルリクエストを作成 pulls.title_desc=が %[2]s から %[3]s への %[1]d コミットのマージを希望しています pulls.merged_title_desc=が %[1]d 個のコミットを %[2]s から %[3]s へマージ %[4]s -pulls.change_target_branch_at=`がターゲットブランチを %s から %s に変更 %s` +pulls.change_target_branch_at=がターゲットブランチを %s から %s に変更 %s pulls.tab_conversation=会話 pulls.tab_commits=コミット pulls.tab_files=変更されたファイル @@ -1545,7 +1489,7 @@ pulls.manually_merged=手動マージ済み pulls.manually_merged_as=プルリクエストは %[2]s で手動マージされています。 pulls.is_closed=プルリクエストはクローズされています。 pulls.has_merged=プルリクエストはマージされています。 -pulls.title_wip_desc=`誤ってマージされないようにするには、タイトルの頭に %s を付けます。` +pulls.title_wip_desc=誤ってマージされないようにするには、タイトルの頭に %s を付けます。 pulls.cannot_merge_work_in_progress=このプルリクエストは作業中(WIP)としてマーキングされています。 pulls.still_in_progress=まだ作業中？ pulls.add_prefix=先頭に %s を追加 @@ -1576,7 +1520,6 @@ pulls.reject_count_n=変更要請 %d pulls.waiting_count_1=レビュー待ち %d pulls.waiting_count_n=レビュー待ち %d pulls.wrong_commit_id=コミットIDはターゲットブランチ上のコミットIDを指定してください - pulls.no_merge_desc=リポジトリのマージオプションがすべて無効になっているため、このプルリクエストをマージすることはできせん。 pulls.no_merge_helper=リポジトリ設定でマージを有効にするか、手動でマージしてください。 pulls.no_merge_wip=このプルリクエストはWork In Progressとマークされているため、マージすることはできません。 @@ -1589,7 +1532,6 @@ pulls.squash_merge_pull_request=スカッシュコミットを作成 pulls.merge_manually=手動マージ済みにする pulls.merge_commit_id=マージコミットID pulls.require_signed_wont_sign=ブランチでは署名されたコミットが必須ですが、このマージでは署名がされません - pulls.invalid_merge_option=このプルリクエストでは、指定したマージ方法は使えません。 pulls.merge_conflict=マージ失敗: マージ中にコンフリクトがありました。 ヒント: 別のストラテジーを試してみてください pulls.merge_conflict_summary=エラーメッセージ @@ -1602,7 +1544,7 @@ pulls.head_out_of_date=マージ失敗: マージの生成中に head が更新 pulls.push_rejected=マージ失敗: プッシュは拒否されました。 このリポジトリのGitフックを見直してください。 pulls.push_rejected_summary=拒否メッセージ全体: pulls.push_rejected_no_message=マージ失敗: プッシュは拒否され、リモートからのメッセージはありません。
    このリポジトリのGitフックを見直してください -pulls.open_unmerged_pull_exists=`同じ条件のプルリクエスト (#%d) が未処理のため、再オープンはできません。` +pulls.open_unmerged_pull_exists=同じ条件のプルリクエスト (#%d) が未処理のため、再オープンはできません。 pulls.status_checking=いくつかのステータスチェックが待機中です pulls.status_checks_success=ステータスチェックはすべて成功しました pulls.status_checks_warning=ステータスチェックにより警告が出ています @@ -1615,27 +1557,22 @@ pulls.update_branch_rebase=リベースでブランチを更新 pulls.update_branch_success=ブランチの更新が成功しました pulls.update_not_allowed=ブランチを更新する権限がありません pulls.outdated_with_base_branch=このブランチはベースブランチに対して最新ではありません -pulls.closed_at=`がプルリクエストをクローズ %[2]s` -pulls.reopened_at=`がプルリクエストを再オープン %[2]s` -pulls.merge_instruction_hint=`コマンドラインの手順も確認できます。` +pulls.closed_at=がプルリクエストをクローズ %[2]s +pulls.reopened_at=がプルリクエストを再オープン %[2]s +pulls.merge_instruction_hint=コマンドラインの手順も確認できます。 pulls.merge_instruction_step1_desc=あなたのプロジェクトリポジトリで新しいブランチをチェックアウトし、変更内容をテストします。 pulls.merge_instruction_step2_desc=変更内容をマージして、Giteaに反映します。 - pulls.auto_merge_button_when_succeed=(チェックがすべて成功した場合) pulls.auto_merge_when_succeed=すべてのチェックが成功したら自動マージ pulls.auto_merge_newly_scheduled=このプルリクエストは、すべてのチェックが成功したときにマージされるようにスケジュールされました。 pulls.auto_merge_has_pending_schedule=すべてのチェックが成功したら自動マージを行うよう、%[1]s が%[2]sこのプルリクエストを設定しました。 - pulls.auto_merge_cancel_schedule=自動マージをキャンセル pulls.auto_merge_not_scheduled=このプルリクエストは自動マージがスケジュールされていません。 pulls.auto_merge_canceled_schedule=このプルリクエストの自動マージはキャンセルされました。 - -pulls.auto_merge_newly_scheduled_comment=`が、すべてのチェックが成功すると自動マージを行うよう、このプルリクエストをスケジュール %[1]s` -pulls.auto_merge_canceled_schedule_comment=`が、すべてのチェックが成功したときのプルリクエストの自動マージをキャンセル %[1]s` - +pulls.auto_merge_newly_scheduled_comment=が、すべてのチェックが成功すると自動マージを行うよう、このプルリクエストをスケジュール %[1]s +pulls.auto_merge_canceled_schedule_comment=が、すべてのチェックが成功したときのプルリクエストの自動マージをキャンセル %[1]s pulls.delete.title=このプルリクエストを削除しますか？ pulls.delete.text=本当にこのプルリクエストを削除しますか? (これはすべてのコンテンツを完全に削除します。 保存しておきたい場合は、代わりにクローズすることを検討してください) - milestones.new=新しいマイルストーン milestones.closed=%s にクローズ milestones.update_ago=%s 前に更新 @@ -1665,7 +1602,6 @@ milestones.filter_sort.least_complete=消化率の低い順 milestones.filter_sort.most_complete=消化率の高い順 milestones.filter_sort.most_issues=イシューの多い順 milestones.filter_sort.least_issues=イシューの少ない順 - signing.will_sign=このコミットは鍵 '%s' で署名されます signing.wont_sign.error=コミットの署名可否を確認中にエラーが発生しました signing.wont_sign.nokey=このコミットに署名する鍵がありません @@ -1679,10 +1615,8 @@ signing.wont_sign.headsigned=HEADコミットが署名されていないため signing.wont_sign.commitssigned=関連するコミットに署名されていないものがあるため、マージは署名されません signing.wont_sign.approved=PRが未承認のため、マージは署名されません signing.wont_sign.not_signed_in=あなたはサインインしていません - ext_wiki=外部Wikiへのアクセス ext_wiki.desc=外部Wikiへのリンク。 - wiki=Wiki wiki.welcome=Wikiへようこそ。 wiki.welcome_desc=Wikiを使って共同作業者とドキュメンテーションの作成と共有ができます。 @@ -1706,7 +1640,6 @@ wiki.reserved_page=Wikiページ名 '%s' は予約されています。 wiki.pages=ページ wiki.last_updated=最終更新 %s wiki.page_name_desc=この Wiki ページの名前を入力してください。いくつかの特別な名前として 'Home', '_Sidebar' と '_Footer' があります。 - activity=アクティビティ activity.period.filter_label=期間: activity.period.daily=1日 @@ -1772,7 +1705,6 @@ activity.git_stats_addition_n=%d行追加 activity.git_stats_and_deletions=、 activity.git_stats_deletion_1=%d行削除 activity.git_stats_deletion_n=%d行削除 - search=検索 search.search_repo=リポジトリを検索 search.type.tooltip=検索タイプ @@ -1783,7 +1715,6 @@ search.match.tooltip=検索ワードに一致する結果だけを含めます search.results=%[3]s 内での "%[1]s" の検索結果 search.code_no_results=検索ワードに一致するソースコードが見つかりません。 search.code_search_unavailable=現在コード検索は利用できません。 サイト管理者にお問い合わせください。 - settings=設定 settings.desc=設定では、リポジトリの設定を管理することができます。 settings.options=リポジトリ @@ -2088,15 +2019,15 @@ settings.dismiss_stale_approvals=古くなった承認を取り消す settings.dismiss_stale_approvals_desc=プルリクエストの内容を変える新たなコミットがブランチにプッシュされた場合、以前の承認を取り消します。 settings.require_signed_commits=コミット署名必須 settings.require_signed_commits_desc=署名されていない場合、または署名が検証できなかった場合は、このブランチへのプッシュを拒否します。 -settings.protect_protected_file_patterns=保護されるファイルのパターン (セミコロン'\;'で区切る): -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=保護しないファイルは、ユーザーに書き込み権限があればプッシュ制限をバイパスして直接変更できます。 セミコロン('\;')で区切って複数のパターンを指定できます。 パターンの文法については github.com/gobwas/glob を参照してください。 例: .drone.yml, /docs/**/*.txt +settings.protect_protected_file_patterns=保護されるファイルのパターン (セミコロン';'で区切る): +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=保護しないファイルは、ユーザーに書き込み権限があればプッシュ制限をバイパスして直接変更できます。 セミコロン(';')で区切って複数のパターンを指定できます。 パターンの文法については github.com/gobwas/glob を参照してください。 例: .drone.yml, /docs/**/*.txt settings.add_protected_branch=保護を有効にする settings.delete_protected_branch=保護を無効にする -settings.update_protect_branch_success=ブランチ '%s' の保護を更新しました。 -settings.remove_protected_branch_success=ブランチ '%s' の保護を無効にしました。 -settings.protected_branch_deletion=ブランチ保護の無効化 +settings.update_protect_branch_success=ルール '%s' に対するブランチ保護を更新しました。 +settings.remove_protected_branch_success=ルール '%s' に対するブランチ保護を削除しました。 +settings.protected_branch_deletion=ブランチ保護の削除 settings.protected_branch_deletion_desc=ブランチ保護を無効にすると、書き込み権限を持つユーザーにブランチへのプッシュを許可することになります。 続行しますか？ settings.block_rejected_reviews=不承認レビューでマージをブロック settings.block_rejected_reviews_desc=公式レビューアが変更を要請しているときは、承認数を満たしていてもマージできないようにします。 @@ -2105,7 +2036,7 @@ settings.block_on_official_review_requests_desc=公式レビュー依頼があ settings.block_outdated_branch=遅れているプルリクエストのマージをブロック settings.block_outdated_branch_desc=baseブランチがheadブランチより進んでいる場合、マージできないようにします。 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=編集 @@ -2171,7 +2102,6 @@ settings.rename_branch_success=ブランチ %s の名前を %s に変更しま settings.rename_branch_from=以前のブランチ名 settings.rename_branch_to=新しいブランチ名 settings.rename_branch=ブランチ名を変更 - diff.browse_source=ソースを参照 diff.parent=親 diff.commit=コミット @@ -2223,7 +2153,6 @@ diff.image.side_by_side=並べて表示 diff.image.swipe=スワイプ diff.image.overlay=オーバーレイ diff.has_escaped=この行には不可視Unicode文字があります - releases.desc=プロジェクトバージョンとダウンロードの追跡。 release.releases=リリース release.detail=リリースの詳細 @@ -2265,7 +2194,6 @@ release.downloads=ダウンロード release.download_count=ダウンロード数: %s release.add_tag_msg=リリースのタイトルと内容をタグのメッセージにする release.add_tag=タグのみ作成 - branch.name=ブランチ名 branch.search=ブランチを検索 branch.already_exists=ブランチ '%s' は既に存在します。 @@ -2297,25 +2225,52 @@ branch.create_branch_operation=ブランチを作成 branch.new_branch=新しいブランチの作成 branch.new_branch_from='%s' から新しいブランチを作成 branch.renamed=ブランチ %s は %s にリネームされました。 - tag.create_tag=タグ %s を作成 tag.create_tag_operation=タグの作成 tag.confirm_create_tag=タグを作成 tag.create_tag_from='%s' から新しいタグを作成 - tag.create_success=タグ '%s' が作成されました。 - topic.manage_topics=トピックの管理 topic.done=完了 topic.count_prompt=選択できるのは25トピックまでです。 topic.format_prompt=トピックは、先頭が英数字で、英数字とダッシュ('-')を使用した35文字以内のものにしてください。 - find_file.go_to_file=ファイルへ移動 find_file.no_matching=一致するファイルが見つかりません - error.csv.too_large=このファイルは大きすぎるため表示できません。 error.csv.unexpected=このファイルは %d 行目の %d 文字目に予期しない文字が含まれているため表示できません。 error.csv.invalid_field_count=このファイルは %d 行目のフィールドの数が正しくないため表示できません。 +more_operations=その他の操作 +cite_this_repo=このリポジトリを引用 +editor.new_branch_name=このコミットの新しいブランチに名前を付けます +commit.operations=操作 +projects.card_type.desc=カードプレビュー +projects.card_type.images_and_text=画像とテキスト +projects.card_type.text_only=テキストのみ +issues.filter_project=プロジェクト +issues.filter_project_all=すべてのプロジェクト +issues.filter_project_none=プロジェクトなし +issues.action_check=チェックを設定/解除します +issues.action_check_all=すべての項目のチェックを設定/解除します +issues.label_exclusive=排他 +issues.label_exclusive_desc=ラベル名を スコープ/アイテム の形にすることで、他の スコープ/ ラベルと排他的になります。 +issues.label_exclusive_warning=イシューやプルリクエストのラベル編集では、競合するスコープ付きラベルは解除されます。 +pulls.clear_merge_message=マージメッセージをクリア +pulls.clear_merge_message_hint=マージメッセージのクリアは、コミットメッセージの除去だけを行います。 生成されたGitトレーラー("Co-Authored-By …" 等)はそのまま残ります。 +settings.branches.add_new_rule=新しいルールを追加 +settings.pulls.default_allow_edits_from_maintainers=デフォルトでメンテナからの編集を許可する +settings.releases_desc=リリースを有効にする +settings.actions_desc=Actionsを有効にする +settings.authorization_header=Authorizationヘッダー +settings.authorization_header_desc=入力した場合、リクエストにAuthorizationヘッダーとして付加します。 例: %s +settings.protected_branch.save_rule=ルールを保存 +settings.protected_branch.delete_rule=ルールを削除 +settings.protect_branch_name_pattern=保護ブランチ名のパターン +settings.remove_protected_branch_failed=ブランチ保護ルール '%s' を削除できませんでした。 +settings.merge_style_desc=マージ スタイル +settings.protected_branch_required_rule_name=ルール名は必須です +settings.protected_branch_duplicate_rule_name=ルール名が重複しています +release.releases_for=%s のリリース +release.tags_for=%s のタグ [org] org_name_holder=組織名 @@ -2339,11 +2294,9 @@ team_access_desc=リポジトリアクセス team_permission_desc=権限 team_unit_desc=リポジトリのセクションへのアクセスを許可 team_unit_disabled=(無効) - form.name_reserved=組織名 '%s' は予約されています。 form.name_pattern_not_allowed='%s' の形式は組織名に使用できません。 form.create_org_not_allowed=組織を作成する権限がありません。 - settings=設定 settings.options=組織 settings.full_name=フルネーム @@ -2357,7 +2310,6 @@ settings.visibility.limited=限定 (ログインしているユーザーにの settings.visibility.limited_shortname=限定 settings.visibility.private=プライベート (組織メンバーにのみ表示) settings.visibility.private_shortname=プライベート - settings.update_settings=設定の更新 settings.update_setting_success=組織の設定を更新しました。 settings.change_orgname_prompt=注: 組織の名称を変更すると、組織のURLも変わります。 @@ -2369,10 +2321,8 @@ settings.delete_prompt=組織は恒久的に削除され、元に戻すことは settings.confirm_delete_account=削除を確認 settings.delete_org_title=組織の削除 settings.delete_org_desc=組織を恒久的に削除します。 続行しますか？ -settings.hooks_desc=この組織のすべてのリポジトリに対して発行されるWebhookを追加します。 - +settings.hooks_desc=この組織のすべてのリポジトリでトリガーされるWebhookを追加します。 settings.labels_desc=この組織のすべてのリポジトリで使用可能なイシューラベルを追加します。 - members.membership_visibility=所属の公開/非公開: members.public=公開 members.public_helper=非公開にする @@ -2387,7 +2337,6 @@ members.leave=脱退 members.leave.detail=%s から脱退しますか？ members.invite_desc=%s に新しいメンバーを追加 members.invite_now=今すぐ招待 - teams.join=参加 teams.leave=脱退 teams.leave.detail=%s から脱退しますか？ @@ -2439,6 +2388,7 @@ teams.all_repositories_admin_permission_desc=このチームはすべて teams.invite.title=あなたは組織 %[2]s 内のチーム %[1]s への参加に招待されました。 teams.invite.by=%s からの招待 teams.invite.description=下のボタンをクリックしてチームに参加してください。 +members=メンバー [admin] dashboard=ダッシュボード @@ -2454,7 +2404,6 @@ monitor=モニタリング first_page=最初 last_page=最後 total=合計: %d - dashboard.new_version_hint=Gitea %s が入手可能になりました。 現在実行しているのは %s です。 詳細は ブログ を確認してください。 dashboard.statistic=サマリー dashboard.operations=メンテナンス操作 @@ -2532,7 +2481,6 @@ dashboard.delete_old_actions=データベースから古い操作履歴をすべ dashboard.delete_old_actions.started=データベースからの古い操作履歴の削除を開始しました。 dashboard.update_checker=更新チェック dashboard.delete_old_system_notices=データベースから古いシステム通知をすべて削除 - users.user_manage_panel=ユーザーアカウント管理 users.new_account=ユーザーアカウントを作成 users.name=ユーザー名 @@ -2586,7 +2534,6 @@ users.list_status_filter.is_prohibit_login=ログインを禁止 users.list_status_filter.not_prohibit_login=ログインを許可 users.list_status_filter.is_2fa_enabled=2要素認証有効 users.list_status_filter.not_2fa_enabled=2要素認証無効 - emails.email_manage_panel=ユーザーメールアドレスの管理 emails.primary=プライマリー emails.activated=アクティベート済み @@ -2599,13 +2546,11 @@ emails.not_updated=メール設定の更新に失敗しました: %v emails.duplicate_active=メールアドレスは別のユーザーが既に使用中です。 emails.change_email_header=メール設定の更新 emails.change_email_text=このメールアドレスを設定してよろしいですか？ - orgs.org_manage_panel=組織の管理 orgs.name=名称 orgs.teams=チーム orgs.members=メンバー orgs.new_orga=新しい組織 - repos.repo_manage_panel=リポジトリの管理 repos.unadopted=未登録リポジトリ repos.unadopted.no_more=未登録のリポジトリはありません @@ -2617,7 +2562,6 @@ repos.stars=スター repos.forks=フォーク repos.issues=イシュー repos.size=サイズ - packages.package_manage_panel=パッケージ管理 packages.total_size=合計サイズ: %s packages.owner=オーナー @@ -2628,17 +2572,14 @@ packages.type=タイプ packages.repository=リポジトリ packages.size=サイズ packages.published=配布 - defaulthooks=デフォルトWebhook defaulthooks.desc=Webhookは、特定のGiteaイベントトリガーが発生した際に、自動的にHTTP POSTリクエストをサーバーへ送信するものです。 ここで定義されたWebhookはデフォルトとなり、全ての新規リポジトリにコピーされます。 詳しくはwebhooks guideをご覧下さい。 defaulthooks.add_webhook=デフォルトWebhookの追加 defaulthooks.update_webhook=デフォルトWebhookの更新 - systemhooks=システムWebhook systemhooks.desc=Webhookは、特定のGiteaイベントトリガーが発生した際に、自動的にHTTP POSTリクエストをサーバーへ送信するものです。 ここで定義したWebhookはシステム内のすべてのリポジトリで呼び出されます。 そのため、パフォーマンスに及ぼす影響を考慮したうえで設定してください。 詳しくはwebhooks guideをご覧下さい。 systemhooks.add_webhook=システムWebhookを追加 systemhooks.update_webhook=システムWebhookを更新 - auths.auth_manage_panel=認証ソースの管理 auths.new=認証ソースを追加 auths.name=名称 @@ -2753,7 +2694,6 @@ auths.still_in_used=この認証ソースはまだ使用中です。 先に、 auths.deletion_success=認証ソースを削除しました。 auths.login_source_exist=認証ソース '%s' は既に存在します。 auths.login_source_of_type_exist=このタイプの認証ソースは既に存在します。 - config.server_config=サーバー設定 config.app_name=サイトのタイトル config.app_ver=Giteaのバージョン @@ -2772,7 +2712,6 @@ config.static_file_root_path=静的ファイルのルートパス config.log_file_root_path=ログの保存先パス config.script_type=スクリプトの種類 config.reverse_auth_user=リバース認証ユーザー - config.ssh_config=SSH設定 config.ssh_enabled=有効 config.ssh_start_builtin_server=ビルトインサーバーを使用 @@ -2784,12 +2723,10 @@ config.ssh_key_test_path=キーテストパス 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.db_config=データベース設定 config.db_type=タイプ config.db_host=ホスト @@ -2798,7 +2735,6 @@ config.db_user=ユーザー名 config.db_schema=スキーマ config.db_ssl_mode=SSL config.db_path=パス - config.service_config=サービス設定 config.register_email_confirm=登録にはメールによる確認が必要 config.disable_register=セルフ登録無効 @@ -2821,12 +2757,10 @@ config.default_allow_only_contributors_to_track_time=コントリビューター config.no_reply_address=メールを隠すときのドメイン config.default_visibility_organization=新しい組織のデフォルトの表示設定 config.default_enable_dependencies=デフォルトでイシューの依存関係有効 - config.webhook_config=Webhook設定 config.queue_length=キューの長さ config.deliver_timeout=送信タイムアウト config.skip_tls_verify=TLS検証を省略 - config.mailer_config=メーラー設定 config.mailer_enabled=有効 config.mailer_enable_helo=HELO有効 @@ -2844,16 +2778,13 @@ config.test_email_placeholder=Email (例 test@example.com) config.send_test_mail=テストメールを送信 config.test_mail_failed='%s' へのテストメール送信に失敗しました: %v config.test_mail_sent=テストメールを '%s' へ送信しました。 - config.oauth_config=OAuth設定 config.oauth_enabled=有効 - config.cache_config=キャッシュ設定 config.cache_adapter=キャッシュ アダプター config.cache_interval=キャッシュ間隔 config.cache_conn=キャッシュ接続 config.cache_item_ttl=キャッシュアイテムのTTL - config.session_config=セッション設定 config.session_provider=セッション プロバイダー config.provider_config=プロバイダーの設定 @@ -2862,12 +2793,10 @@ config.gc_interval_time=GCの間隔 config.session_life_time=セッションの有効期間 config.https_only=HTTPSのみ config.cookie_life_time=Cookieの有効期間 - config.picture_config=画像とアバターの設定 config.picture_service=画像サービス config.disable_gravatar=Gravatarが無効 config.enable_federated_avatar=フェデレーテッド・アバター有効 - config.git_config=Git設定 config.git_disable_diff_highlight=Diffのシンタックスハイライトが無効 config.git_max_diff_lines=最大の差分行数(1ファイルあたり) @@ -2879,7 +2808,6 @@ config.git_mirror_timeout=ミラー更新タイムアウト config.git_clone_timeout=クローン操作のタイムアウト config.git_pull_timeout=プル操作のタイムアウト config.git_gc_timeout=GC操作のタイムアウト - config.log_config=ログ設定 config.log_mode=ログモード config.own_named_logger=名前付きロガー @@ -2891,10 +2819,8 @@ config.access_log_mode=アクセスログのモード config.access_log_template=テンプレート config.xorm_log_mode=XORMログのモード config.xorm_log_sql=SQLのログ出力 - config.get_setting_failed=%s の取得に失敗しました config.set_setting_failed=%s の設定に失敗しました - monitor.cron=Cronタスク monitor.name=名称 monitor.schedule=スケジュール @@ -2946,7 +2872,6 @@ monitor.queue.pool.pause.submit=キューを一時停止 monitor.queue.pool.resume.title=キューの再開 monitor.queue.pool.resume.desc=キューに処理の再開を指示します monitor.queue.pool.resume.submit=キューを再開 - monitor.queue.settings.title=プール設定 monitor.queue.settings.desc=ワーカーへのキューのブロックが発生すると、それに応じてプール数がブースト分ずつ動的に増えます。 これらの変更は現在のワーカーグループには影響しません。 monitor.queue.settings.timeout=ブースト分のタイムアウト @@ -2962,7 +2887,6 @@ monitor.queue.settings.submit=設定を更新 monitor.queue.settings.changed=設定を更新しました monitor.queue.settings.blocktimeout=現在のブロックタイムアウト monitor.queue.settings.blocktimeout.value=%[1]v - monitor.queue.pool.none=このキューにはプールがありません monitor.queue.pool.added=ワーカーグループを追加しました monitor.queue.pool.max_changed=ワーカー数の上限を変更しました @@ -2972,7 +2896,6 @@ monitor.queue.pool.cancel=ワーカーグループのシャットダウン monitor.queue.pool.cancelling=ワーカーグループをシャットダウンしています monitor.queue.pool.cancel_notices=このワーカー数 %s のグループをシャットダウンしますか？ monitor.queue.pool.cancel_desc=キューをワーカーグループ無しのままにすると、リクエストがブロックし続ける原因となります。 - notices.system_notice_list=システム通知 notices.view_detail_header=通知の詳細を表示 notices.actions=アクション @@ -2987,20 +2910,32 @@ notices.type_2=タスク notices.desc=説明 notices.op=操作 notices.delete_success=システム通知を削除しました。 +dashboard.gc_lfs=LFSメタオブジェクトのガベージコレクション +dashboard.stop_zombie_tasks=ゾンビタスクを停止 +dashboard.stop_endless_tasks=終わらないタスクを停止 +dashboard.cancel_abandoned_jobs=放置されたままのジョブをキャンセル +packages.unreferenced_size=非参照サイズ: %s +auths.oauth2_map_group_to_team=見つかったグループを組織のチームにマップ (オプション - 上のClaim名が必要) +auths.oauth2_map_group_to_team_removal=対応するグループにユーザーが含まれない場合、同期しているチームからユーザーを削除する +auths.unable_to_initialize_openid=OpenID Connectプロバイダーを初期化できませんでした: %s +auths.invalid_openIdConnectAutoDiscoveryURL=無効な自動検出URLです（http://またはhttps://で始まる有効なURLでなければなりません） +config.git_enable_reflogs=Reflog有効 +config.git_reflog_expiry_time=有効期間 +notices.operations=操作 [action] create_repo=がリポジトリ %s を作成しました rename_repo=がリポジトリ名を %[1]s から [3]s へ変更しました commit_repo=が %[4]s の %[3]s にプッシュしました -create_issue=`がイシュー %[3]s#%[2]s をオープンしました` -close_issue=`がイシュー %[3]s#%[2]s をクローズしました` -reopen_issue=`がイシュー %[3]s#%[2]s を再オープンしました` -create_pull_request=`がプルリクエスト %[3]s#%[2]s を作成しました` -close_pull_request=`がプルリクエスト %[3]s#%[2]s をクローズしました` -reopen_pull_request=`がプルリクエスト %[3]s#%[2]s を再オープンしました` -comment_issue=`がイシュー %[3]s#%[2]s にコメントしました` -comment_pull=`がプルリクエスト %[3]s#%[2]s にコメントしました` -merge_pull_request=`がプルリクエスト %[3]s#%[2]s をマージしました` +create_issue=がイシュー %[3]s#%[2]s をオープンしました +close_issue=がイシュー %[3]s#%[2]s をクローズしました +reopen_issue=がイシュー %[3]s#%[2]s を再オープンしました +create_pull_request=がプルリクエスト %[3]s#%[2]s を作成しました +close_pull_request=がプルリクエスト %[3]s#%[2]s をクローズしました +reopen_pull_request=がプルリクエスト %[3]s#%[2]s を再オープンしました +comment_issue=がイシュー %[3]s#%[2]s にコメントしました +comment_pull=がプルリクエスト %[3]s#%[2]s にコメントしました +merge_pull_request=がプルリクエスト %[3]s#%[2]s をマージしました transfer_repo=がリポジトリ %s を %s へ移転しました push_tag=がタグ %[3]s を %[4]s にプッシュしました delete_tag=がタグ %[2]s を %[3]s から削除しました @@ -3011,14 +2946,15 @@ compare_commits_general=コミットを比較 mirror_sync_push=が %[4]s の %[3]s へのコミットをミラーから反映しました mirror_sync_create=が %[4]s の新しい参照 %[3]s をミラーから反映しました mirror_sync_delete=が %[3]s の参照 %[2]s をミラーから反映し、削除しました -approve_pull_request=`が %[3]s#%[2]s を承認しました` -reject_pull_request=`が %[3]s#%[2]sについて変更を提案しました` -publish_release=`が %[3]s の "%[4]s" をリリースしました` -review_dismissed=`が %[4]s の %[3]s#%[2]s へのレビューを棄却しました` +approve_pull_request=が %[3]s#%[2]s を承認しました +reject_pull_request=が %[3]s#%[2]sについて変更を提案しました +publish_release=が %[3]s の "%[4]s" をリリースしました +review_dismissed=が %[4]s の %[3]s#%[2]s へのレビューを棄却しました 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] ago=%s前 @@ -3177,4 +3113,124 @@ settings.delete.description=パッケージの削除は恒久的で元に戻す settings.delete.notice=%s (%s) を削除しようとしています。この操作は元に戻せません。よろしいですか？ settings.delete.success=パッケージを削除しました。 settings.delete.error=パッケージの削除に失敗しました。 - +details.repository_site=リポジトリサイト +details.documentation_site=ドキュメンテーションサイト +cargo.registry=Cargo 設定ファイルでこのレジストリをセットアップします。(例 ~/.cargo/config.toml): +cargo.install=Cargo を使用してパッケージをインストールするには、次のコマンドを実行します: +cargo.documentation=Cargoレジストリの詳細については、 ドキュメント を参照してください。 +cargo.details.repository_site=リポジトリサイト +cargo.details.documentation_site=ドキュメンテーションサイト +chef.registry=あなたの ~/.chef/config.rb ファイルに、このレジストリをセットアップします: +chef.install=パッケージをインストールするには、次のコマンドを実行します: +chef.documentation=Chefレジストリの詳細については、ドキュメント を参照してください。 +conda.registry=あなたの .condarc ファイルに、このレジストリを Conda リポジトリとしてセットアップします: +conda.install=Conda を使用してパッケージをインストールするには、次のコマンドを実行します: +conda.documentation=Condaレジストリの詳細については、 ドキュメント を参照してください。 +conda.details.repository_site=リポジトリサイト +conda.details.documentation_site=ドキュメンテーションサイト +owner.settings.cargo.title=Cargoレジストリ インデックス +owner.settings.cargo.initialize=インデックスを初期化 +owner.settings.cargo.initialize.description=Cargoレジストリを使用するには、インデックス用の特別なgitリポジトリが必要です。 ここでそのリポジトリを必要な構成で(再)作成します。 +owner.settings.cargo.initialize.error=Cargoインデックスの初期化に失敗しました: %v +owner.settings.cargo.initialize.success=Cargoインデックスは正常に作成されました。 +owner.settings.cargo.rebuild=インデックスを再構築 +owner.settings.cargo.rebuild.description=保存したCargoパッケージとインデックスが同期しない場合、ここでインデックスを再構築できます。 +owner.settings.cargo.rebuild.error=Cargoインデックスの再構築に失敗しました: %v +owner.settings.cargo.rebuild.success=Cargoインデックスは正常に再構築されました。 +owner.settings.cleanuprules.title=クリーンアップルールの管理 +owner.settings.cleanuprules.add=クリーンアップルールを追加 +owner.settings.cleanuprules.edit=クリーンアップルールを編集 +owner.settings.cleanuprules.none=クリーンアップルールはありません。詳細はドキュメントをご覧ください。 +owner.settings.cleanuprules.preview=クリーンアップルールをプレビュー +owner.settings.cleanuprules.preview.overview=%d パッケージが削除される予定です。 +owner.settings.cleanuprules.preview.none=クリーンアップルールと一致するパッケージがありません。 +owner.settings.cleanuprules.enabled=有効 +owner.settings.cleanuprules.pattern_full_match=フルパッケージ名にパターンを適用 +owner.settings.cleanuprules.keep.title=以下のルールにマッチするバージョンを残します。 (下にある削除ルールにマッチしていても残します) +owner.settings.cleanuprules.keep.count=最近のものを残す +owner.settings.cleanuprules.keep.count.1=1 パッケージにつき 1 バージョン +owner.settings.cleanuprules.keep.count.n=1 パッケージにつき %d バージョン +owner.settings.cleanuprules.keep.pattern=マッチするバージョンを残す +owner.settings.cleanuprules.keep.pattern.container=Containerパッケージの場合、最新バージョンは常に残します。 +owner.settings.cleanuprules.remove.title=以下のルールにマッチするバージョンを削除します。 (上にあるルールが残す対象としている場合を除きます) +owner.settings.cleanuprules.remove.days=これより古いバージョンを削除する +owner.settings.cleanuprules.remove.pattern=マッチするバージョンを削除する +owner.settings.cleanuprules.success.update=クリーンアップルールが更新されました。 +owner.settings.cleanuprules.success.delete=クリーンアップルールが削除されました。 +owner.settings.chef.title=Chefレジストリ +owner.settings.chef.keypair=キーペアを生成 +owner.settings.chef.keypair.description=Chefレジストリの認証に使用するキーペアを生成します。 それ以降は、以前のキーは使用できなくなります。 + +[aria] +navbar=ナビゲーションバー +footer=フッター +footer.software=ソフトウェアについて +footer.links=リンク + +[secrets] +secrets=シークレット +description=シークレットは特定のActionsに渡されます。 それ以外で読み出されることはありません。 +none=まだシークレットはありません。 +value=値 +name=名称 +creation=シークレットを追加 +creation.name_placeholder=大文字小文字の区別なし、英数字とアンダースコアのみ、GITEA_ や GITHUB_ で始まるものは不可 +creation.value_placeholder=内容を入力してください。前後の空白は除去されます。 +creation.success=シークレット '%s' を追加しました。 +creation.failed=シークレットの追加に失敗しました。 +deletion=シークレットの削除 +deletion.description=シークレットの削除は恒久的で元に戻すことはできません。 続行しますか？ +deletion.success=シークレットを削除しました。 +deletion.failed=シークレットの削除に失敗しました。 + +[actions] +actions=Actions +unit.desc=Actionsの管理 +status.unknown=不明 +status.waiting=待機中 +status.running=実行中 +status.success=成功 +status.failure=失敗 +status.cancelled=キャンセルされた +status.skipped=スキップ +status.blocked=ブロックされた +runners=ランナー +runners.runner_manage_panel=ランナーの管理 +runners.new=新しいランナーを作成 +runners.new_notice=ランナーの開始方法 +runners.status=ステータス +runners.id=ID +runners.name=名称 +runners.owner_type=タイプ +runners.description=説明 +runners.labels=ラベル +runners.last_online=最終オンライン時刻 +runners.agent_labels=エージェントのラベル +runners.custom_labels=カスタムラベル +runners.custom_labels_helper=カスタムラベルは管理者により手動で追加されたラベルです。 ラベルはカンマで区切り、各ラベルの前後の空白は無視されます。 +runners.runner_title=ランナー +runners.task_list=このランナーの最近のタスク +runners.task_list.run=実行 +runners.task_list.status=ステータス +runners.task_list.repository=リポジトリ +runners.task_list.commit=コミット +runners.task_list.done_at=終了時刻 +runners.edit_runner=ランナーの編集 +runners.update_runner=変更を保存 +runners.update_runner_success=ランナーを更新しました +runners.update_runner_failed=ランナーの更新に失敗しました +runners.delete_runner=このランナーを削除 +runners.delete_runner_success=ランナーを削除しました +runners.delete_runner_failed=ランナーの削除に失敗しました +runners.delete_runner_header=ランナー削除の確認 +runners.delete_runner_notice=このランナーでタスクが実行されている場合、タスクは停止され失敗扱いとなります。 それによりビルドワークフローが途中で終了することになるかもしれません。 +runners.none=利用可能なランナーはありません +runners.status.unspecified=不明 +runners.status.idle=アイドル +runners.status.active=稼働中 +runners.status.offline=オフライン +runs.all_workflows=すべてのワークフロー +runs.open_tab=%d オープン +runs.closed_tab=%d クローズ +runs.commit=コミット +runs.pushed_by=Pushed by diff --git a/options/locale/locale_ko-KR.ini b/options/locale/locale_ko-KR.ini index 46aec04754f0..1ae5446c4d40 100644 --- a/options/locale/locale_ko-KR.ini +++ b/options/locale/locale_ko-KR.ini @@ -18,7 +18,6 @@ create_new=생성하기 user_profile_and_more=프로파일 및 설정 signed_in_as=다음 사용자로 로그인됨 enable_javascript=이 웹사이트는 자바스크립트 활성화가 필요합니다. - username=사용자명 email=이메일 주소 password=비밀번호 @@ -27,8 +26,6 @@ captcha=보안 문자 twofa=2단계 인증 twofa_scratch=2단계 일회성 코드 passcode=인증코드 - - repository=저장소 organization=조직 mirror=미러 @@ -46,33 +43,26 @@ settings=설정 your_profile=프로필 your_starred=즐겨찾기 your_settings=설정 - all=전체 sources=소스 mirrors=미러 collaborative=협업 forks=포크 - activities=활동 pull_requests=풀 리퀘스트 issues=이슈들 milestones=마일스톤 - cancel=취소 save=저장 add=추가 add_all=모두 추가 remove=삭제 remove_all=모두 삭제 - - write=쓰기 preview=미리보기 loading=불러오는 중... - - - - +edit=수정하기 +enabled=활성화됨 [filter] @@ -106,7 +96,6 @@ err_empty_admin_password=관리자 비밀번호는 비어 있을 수 없습니 err_empty_admin_email=관리자 이메일은 비어 있을 수 없습니다. err_admin_name_is_reserved=관리자 사용자 이름이 올바르지 않습니다, 제한된 사용자 이름입니다 err_admin_name_is_invalid=관리자 사용자 이름이 올바르지 않습니다 - general_title=기본설정 app_name=사이트 제목 app_name_helper=회사이름을 넣으세요. @@ -124,7 +113,6 @@ app_url=Gitea 기본 URL app_url_helper=HTTP(S) clone URL 및 이메일 알림 기본 주소 log_root_path=로그 경로 log_root_path_helper=로그파일은 이 디렉토리에 저장됩니다. - optional_title=추가설정 email_title=이메일 설정 smtp_from=이메일 발신인 @@ -174,6 +162,8 @@ default_enable_timetracking=시간 추적 사용을 기본값으로 설정 default_enable_timetracking_popup=신규 레포지토리에 대한 시간 추적 사용을 기본값으로 설정합니다. no_reply_address=숨김처리된 이메일 도메인 no_reply_address_helper=숨겨진 이메일을 가진 사용자에게 적용될 이메일 도메인입니다. 예를 들어, 사용자 'joe'의 숨겨진 이메일 도메인이 'noreply.example.org'로 설정되어 있으면 'joe@noreply.example.org'로 로그인 됩니다. +smtp_addr=SMTP 호스트 +smtp_port=SMTP 포트 [home] uname_holder=사용자 이름 또는 이메일 주소 @@ -186,10 +176,8 @@ my_orgs=내 조직 my_mirrors=내 미러 저장소들 view_home=%s 보기 search_repos=저장소 찾기.. - - - issues.in_your_repos=당신의 저장소에 +show_private=비공개 [explore] repos=저장소 @@ -203,7 +191,6 @@ org_no_results=일치하는 조직이 없습니다. code_no_results=검색어와 일치하는 소스코드가 없습니다. code_search_results='%s'에 대한 검색결과 - [auth] create_new_account=계정 등록 register_helper_msg=이미 계정을 가지고 계신가요? 로그인하세요! @@ -259,23 +246,12 @@ authorization_failed=인증 실패 sspi_auth_failed=SSPI 인증 실패 [mail] - activate_account=계정을 활성화하세요 - activate_email=이메일 주소 확인 - register_notify=Gitea에 오신것을 환영합니다! - reset_password=계정 복구 - register_success=등록 완료 - - - - - - [modal] yes=예 no=아니오 @@ -293,31 +269,27 @@ PayloadUrl=페이로드 URL TeamName=팀 이름 AuthName=권한 이름 AdminEmail=관리자 이메일 - NewBranchName=새로운 브랜치명 CommitSummary=커밋 요약 CommitMessage=커밋 메시지 CommitChoice=커밋 선택 TreeName=파일 경로 Content=컨텐츠 - SSPISeparatorReplacement=구분자 SSPIDefaultLanguage=기본 언어 - -require_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=` 올바른 이메일 주소가 아닙니다.` -include_error=` 반드시 '%s'를 포함해야 합니다.` +git_ref_name_error=" 유효한 git 레퍼런스명이어야 합니다." +size_error=" %s 글자여야 합니다." +min_size_error=" 최소 %s 글자여야 합니다." +max_size_error=" %s 글자를 넘을 수 없습니다." +email_error=" 올바른 이메일 주소가 아닙니다." +include_error=" 반드시 '%s'를 포함해야 합니다." unknown_error=알 수 없는 오류: captcha_incorrect=CAPTCHA 코드가 올바르지 않습니다. password_not_match=비밀번호가 일치하지 않습니다. lang_select_error=목록에서 언어를 선택해주세요. - username_been_taken=이미 사용하고 있는 아이디입니다. repo_name_been_taken=이미 사용하고 있는 저장소 이름입니다. org_name_been_taken=이미 사용중인 조직 이름입니다. @@ -332,16 +304,13 @@ enterred_invalid_password=입력한 비밀번호는 올바르지 않습니다. user_not_exist=존재하지 않는 사용자입니다. team_not_exist=팀이 존재하지 않습니다. cannot_add_org_to_team=이 조직은 팀 구성원으로 추가할 수 없습니다. - invalid_ssh_key=확인되지 않은 SSH 키입니다: %s invalid_gpg_key=확인되지 않은 GPG 키입니다: %s unable_verify_ssh_key=SSH 키를 검증할 수 없습니다. 잘못 입력한 부분이 없는지 확인하여 주십시오. auth_failed=인증 실패: %v - still_own_repo=먼저 삭제하거나 전송해야할 저장소들이 하나 이상 존재합니다. still_has_org=먼저 탈퇴해야하는 조직이 하나 이상 존재합니다. org_still_own_repo=먼저 삭제하거나 전송해야할 저장소들이 하나 이상 존재합니다. - target_branch_not_exist=대상 브랜치가 존재하지 않습니다. [user] @@ -356,7 +325,6 @@ follow=추적하기 unfollow=추적해제 heatmap.loading=Heatmap 불러오는 중... user_bio=소개 - form.name_reserved=사용자 이름 '%s'는 예약되어 있습니다. form.name_pattern_not_allowed=%s 패턴은 사용자 이름에 사용할 수 없습니다. @@ -376,7 +344,6 @@ twofa=2단계 인증 account_link=연결된 계정 organization=조직 uid=Uid - public_profile=공개 프로필 profile_desc=이메일 주소는 알림 및 기타 작업에 사용 됩니다. password_username_disabled=로컬 사용자가 아닌 경우 사용자 이름 변경을 할 수 없습니다. 자세한 내용은 관리자에게 문의해주세요. @@ -392,7 +359,6 @@ continue=계속하기 cancel=취소 language=언어 ui=테마 - lookup_avatar_by_mail=이메일 주소로 아바타 찾기 federated_avatar_lookup=연합 아바타 조회 enable_custom_avatar=사용자정의 아바타를 사용 @@ -402,7 +368,6 @@ delete_current_avatar=현재 아바타 삭제 uploaded_avatar_not_a_image=업로드 된 파일은 이미지가 아닙니다. uploaded_avatar_is_too_big=업로드된 파일이 최대 크기를 넘습니다. update_avatar_success=아바타가 변경되었습니다. - change_password=비밀번호 변경 old_password=현재 비밀번호 new_password=새 비밀번호 @@ -410,7 +375,6 @@ retype_new_password=새 비밀번호 다시 입력 password_incorrect=현재 비밀번호가 올바르지 않습니다. change_password_success=비밀번호가 업데이트되었습니다. 다음 번 로그인하실 때는 새 비밀번호를 사용해 주십시오. password_change_disabled=로컬 유저가 아닌 경우 Gitea 웹 인터페이스를 통해 비밀번호를 변경할 수 없습니다. - emails=이메일 주소 manage_emails=이메일 주소 관리 manage_themes=기본 테마 선택 @@ -438,7 +402,6 @@ add_openid_success=새로운 OpenID 주소가 추가되었습니다. keep_email_private=이메일 주소 숨기기 keep_email_private_popup=당신의 이메일 주소가 다른 사람에게 숨겨질 것입니다. openid_desc=OpenID를 사용하면 외부 서비스 제공자에게 인증을 위임할 수 있습니다. - manage_ssh_keys=SSH 키 관리 manage_gpg_keys=GPG 키 관리 add_key=키 추가 @@ -478,7 +441,6 @@ manage_social=SNS계정 관리 social_desc=이러한 소셜 계정이 Gitea 계정과 연결되어 있습니다. 소셜 계정을 통해 당신의 Gitea 계정으로 로그인 할 수 있다는 점을 기억하십시오. unbind=연결 해제 unbind_success=소셜 계정이 Gitea 계정에서 연결해제 되었습니다. - manage_access_token=액세스 토큰 관리 generate_new_token=새 토큰을 생성 tokens_desc=이 토큰들은 당신의 계정을 이용하여 Gitea API를 사용할 수 있습니다. @@ -489,16 +451,13 @@ generate_token_success=새로운 토큰이 생성되었습니다. 이 토큰은 delete_token=삭제 access_token_deletion=액세스 토큰 삭제 delete_token_success=토큰이 삭제되었습니다. 해당 토큰을 사용하는 어플리케이션은 더 이상 이 계정으로 접근할 수 없습니다. - manage_oauth2_applications=OAuth2 애플리케이션 관리 save_application=저장하기 oauth2_client_id=클라이언트 ID oauth2_regenerate_secret=시크릿키 재발급 oauth2_application_edit=수정하기 - revoke_key=취소 revoke_oauth2_grant=접근 권한 제거 - twofa_desc=2단계 인증은 계정의 보안을 향상시킵니다. twofa_is_enrolled=귀하의 계정은 현재 2단계 인증에 등록되어 있습니다. twofa_not_enrolled=귀하의 계정은 현재 2단계 인증에 등록되어 있지 않습니다. @@ -515,26 +474,32 @@ or_enter_secret=또는 이 비밀키를 입력하세요: %s then_enter_passcode=어플리케이션에 표시된 인증코드를 입력하여 주십시오: passcode_invalid=인증코드가 올바르지 않습니다. 재시도해주십시오. twofa_enrolled=당신의 계정에 2단계 인증이 설정되었습니다. 스크래치 토큰 (%s) 은 한 번만 표시되므로 안전한 장소에 보관하십시오! - - manage_account_links=연결된 계정 관리 manage_account_links_desc=Gitea 계정에 연결된 외부 계정입니다. account_links_not_available=현재 Gitea 계정에 연결된 외부 계정이 없습니다. remove_account_link=연결된 계정 제거 remove_account_link_desc=해당 계정을 연결해제 하는 경우 Gitea 계정에 대한 접근 권한이 사라지게 됩니다. 계속하시겠습니까? remove_account_link_success=연결된 계정이 제거 되었습니다. - orgs_none=당신은 어떤 조직의 구성원도 아닙니다. repos_none=어떤 레포지터리도 존재하지 않습니다. - delete_account=계정 삭제 confirm_delete_account=삭제 승인 delete_account_title=사용자 계정 삭제 delete_account_desc=이 계정을 정말로 삭제하시겠습니까? - email_notifications.enable=이메일 알림 켜기 email_notifications.disable=이메일 알림 끄기 - +comment_type_group_title=제목 +activated=활성화됨 +gpg_key_verify=확인 +gpg_token=토큰 +ssh_key_verify=확인 +ssh_token=토큰 +principal_content=내용 +access_token_deletion_cancel_action=취소 +access_token_deletion_confirm_action=삭제 +oauth2_client_secret=클라이언트 시크릿 +link_account=계정 연결 +visibility.private=비공개 [repo] owner=소유자 @@ -574,15 +539,9 @@ forks=포크 pick_reaction=리액션 선택 reactions_more=그리고 %d 더 language_other=기타 - - - template.topics=토론 주제 - - form.name_reserved=저장소 이름 '%s'은 예약 되어 있습니다. form.name_pattern_not_allowed='%s' 패턴은 저장소명으로 허용되지 않습니다. - migrate_items_wiki=위키 migrate_items_issues=이슈 migrate_repo=저장소 마이그레이션 @@ -591,7 +550,6 @@ migrate.clone_local_path=또는 로컬 서버의 경로 migrate.permission_denied=로컬 저장소는 가져오기를 할 수 없습니다. migrate.invalid_local_path=로컬 경로가 올바르지 않습니다. 디렉토리가 아니거나 존재하지 않습니다. migrate.failed=마이그레이션 실패: %v - mirror_from=의 미러 forked_from=원본 프로젝트 : fork_from_self=자신의 저장소를 포크 할 수 없습니다. @@ -602,14 +560,12 @@ unstar=좋아요 취소 star=좋아요 fork=포크 download_archive=저장소 다운로드 - no_desc=설명 없음 quick_guide=퀵 가이드 clone_this_repo=이 저장소 복제 create_new_repo_command=커맨드 라인에서 새 레포리지터리 생성 push_exist_repo=커맨드라인에서 기존 레포지터리 푸시 empty_message=이 저장소는 아무런 내용을 가지고 있지 않습니다. - code=코드 code.desc=소스 코드 접근, 파일, 커밋 그리고 브랜치 branch=브렌치 @@ -620,7 +576,6 @@ tags=태그 issues=이슈 pulls=풀 리퀘스트 labels=레이블 - milestones=마일스톤 commits=커밋 commit=커밋 @@ -630,12 +585,10 @@ file_history=히스토리 file_view_raw=원본 보기 file_permalink=고유링크 file_too_large=보여주기에는 파일이 너무 큽니다. - video_not_supported_in_browser=당신의 브라우저가 HTML5 'video' 태그를 지원하지 않습니다. audio_not_supported_in_browser=당신의 브라우저가 HTML5 'audio' 태그를 지원하지 않습니다. stored_lfs=Git LFS에 저장되어 있습니다 commit_graph=커밋 그래프 - editor.new_file=새 파일 editor.upload_file=파일 업로드 editor.edit_file=파일 편집 @@ -664,7 +617,6 @@ editor.add_subdir=경로 추가... editor.unable_to_upload_files=파일 '%s'를 업로드하는데 실패하였습니다. 에러: %v editor.upload_files_to_dir=파일 업로드 '%s' editor.cannot_commit_to_protected_branch=보호된 '%s' 브랜치로 커밋할 수 없습니다. - commits.desc=소스 코드 변경 내역 탐색 commits.commits=커밋 commits.search=커밋 찾기... @@ -677,11 +629,7 @@ commits.older=이전 commits.newer=최신 commits.signed_by=로그인 계정 commits.gpg_key_id=GPG 키 ID - - ext_issues.desc=외부 이슈 트래커 연결. - - issues.new=새로운 이슈 issues.new.title_empty=제목은 비워둘 수 없습니다. issues.new.labels=레이블 @@ -706,15 +654,15 @@ issues.label_templates.info=아직 레이블이 없습니다. 레이블 'New Lab issues.label_templates.helper=라벨 세트 선택 issues.label_templates.use=레이블 세트 사용 issues.label_templates.fail_to_load_file=라벨 템플릿 파일 '%s'를 로드하는데 실패하였습니다.: %v -issues.add_milestone_at=`%s %s 마일스톤을 추가하였습니다.` -issues.change_milestone_at=`%s 에서 %s %s 마일스톤으로 변경되었습니다` -issues.remove_milestone_at=`%s %s 마일스톤이 삭제되었습니다.` -issues.deleted_milestone=`(삭제됨)` -issues.self_assign_at=`자체적으로 할당됨 %s` -issues.add_assignee_at=`다음으로부터 할당됨 %s %s` -issues.remove_assignee_at=`다음으로부터 할당취소됨 %s %s` -issues.remove_self_assignment=`%s 할당들이 삭제됨` -issues.delete_branch_at=`삭제된 브랜치 %s %s` +issues.add_milestone_at=%s %s 마일스톤을 추가하였습니다. +issues.change_milestone_at=%s 에서 %s %s 마일스톤으로 변경되었습니다 +issues.remove_milestone_at=%s %s 마일스톤이 삭제되었습니다. +issues.deleted_milestone=(삭제됨) +issues.self_assign_at=자체적으로 할당됨 %s +issues.add_assignee_at=다음으로부터 할당됨 %s %s +issues.remove_assignee_at=다음으로부터 할당취소됨 %s %s +issues.remove_self_assignment=%s 할당들이 삭제됨 +issues.delete_branch_at=삭제된 브랜치 %s %s issues.filter_label=레이블 issues.filter_label_no_select=모든 레이블 issues.filter_milestone=마일스톤 @@ -750,7 +698,7 @@ issues.next=다음 issues.open_title=오픈 issues.closed_title=닫힘 issues.num_comments=%d개의 코멘트 -issues.commented_at=`코멘트됨, %s` +issues.commented_at=코멘트됨, %s issues.delete_comment_confirm=이 댓글을 정말 삭제하시겠습니까? issues.no_content=아직 콘텐츠가 없습니다. issues.close_issue=닫기 @@ -758,7 +706,7 @@ issues.close_comment_issue=클로즈 및 코멘트 issues.reopen_issue=다시 열기 issues.reopen_comment_issue=다시 오픈 및 코멘트 issues.create_comment=코멘트 -issues.commit_ref_at=` 커밋 %[2]s에서 이 이슈 언급` +issues.commit_ref_at=" 커밋 %[2]s에서 이 이슈 언급" issues.poster=포스터 issues.collaborator=협업자 issues.owner=소유자 @@ -780,24 +728,24 @@ issues.label_deletion_success=라벨이 삭제되었습니다. issues.label.filter_sort.alphabetically=알파벳순 issues.label.filter_sort.reverse_alphabetically=이름 역순으로 정렬 issues.num_participants=참여자 %d명 -issues.attachment.open_tab=`클릭하여 "%s" 새탭으로 보기` -issues.attachment.download=' "%s"를 다운로드 하려면 클릭 하십시오 ' +issues.attachment.open_tab=클릭하여 "%s" 새탭으로 보기 +issues.attachment.download=" "%s"를 다운로드 하려면 클릭 하십시오 " issues.subscribe=구독하기 issues.unsubscribe=구독 취소 issues.tracker=타임 트래커 issues.start_tracking=타임 트래킹 시작 -issues.start_tracking_history=`%s가 작업 시작` -issues.stop_tracking_history=`작업 중단 %s` -issues.cancel_tracking_history=`%s 타임 트래킹이 취소되었습니다` +issues.start_tracking_history=%s가 작업 시작 +issues.stop_tracking_history=작업 중단 %s +issues.cancel_tracking_history=%s 타임 트래킹이 취소되었습니다 issues.add_time=수동으로 시간 입력 issues.add_time_short=시간 입력 issues.add_time_cancel=취소 -issues.add_time_history=`사용 시간이 추가됨 %s` +issues.add_time_history=사용 시간이 추가됨 %s issues.add_time_hours=시간 issues.add_time_minutes=분 issues.add_time_sum_to_small=시간이 입력되지 않았습니다. issues.time_spent_total=총 경과된 시간 -issues.time_spent_from_all_authors=`총 경과된 시간: %s` +issues.time_spent_from_all_authors=총 경과된 시간: %s issues.due_date=마감일 issues.invalid_due_date_format=마감일은 반드시 'yyyy-mm-dd' 형식이어야 합니다. issues.error_modifying_due_date=마감일 수정을 실패하였습니다. @@ -836,8 +784,6 @@ issues.review.review=검토 issues.review.reviewers=리뷰어 issues.review.show_outdated=오래된 내역 보기 issues.review.hide_outdated=오래된 내역 숨기기 - - pulls.new=새 풀 리퀘스트 pulls.compare_changes=새 풀 리퀘스트 pulls.compare_base=병합하기 @@ -855,16 +801,9 @@ pulls.merged=병합 pulls.has_merged=풀 리퀘스트가 머지 되었습니다. pulls.can_auto_merge_desc=이 풀리퀘스트는 자동적으로 머지될 수 있습니다. pulls.cannot_auto_merge_helper=충돌을 해결하려면 수동으로 머지하십시오. - pulls.no_merge_desc=모든 저장소 머지 옵션이 비활성화 되어있기 때문에 이 풀 리퀘스트를 머지할 수 없습니다. - pulls.invalid_merge_option=이 풀 리퀘스트에서 설정한 머지 옵션을 사용하실 수 없습니다. ; %[2]s
    %[3]s     - - - - - milestones.new=새로운 마일스톤 milestones.closed=닫힘 %s milestones.no_due_date=기한 없음 @@ -891,10 +830,7 @@ milestones.filter_sort.least_complete=완료율이 낮은 순 milestones.filter_sort.most_complete=완료율이 높은 순 milestones.filter_sort.most_issues=이슈 많은 순 milestones.filter_sort.least_issues=이슈 적은 순 - - ext_wiki.desc=외부 위키에 연결하기. - wiki=위키 wiki.welcome=위키에 오신것을 환영합니다! wiki.welcome_desc=Wiki를 사용하여 공동 작업자들과 문서를 작성 하고 공유 할 수 있습니다. @@ -914,7 +850,6 @@ wiki.page_already_exists=같은 이름의 위키 페이지가 이미 존재 합 wiki.reserved_page=Wiki 페이지 이름 '%s' 는 예약되어 있습니다. wiki.pages=페이지 wiki.last_updated=마지막 업데이트: %s - activity=활동 activity.period.filter_label=기간: activity.period.daily=1일 @@ -953,11 +888,9 @@ activity.title.releases_1=%d 개의 릴리즈 activity.title.releases_n=%d 개의 릴리즈 activity.title.releases_published_by=%s 가 %s 에 의하여 배포되었습니다. activity.published_release_label=배포됨 - search=검색 search.search_repo=저장소 검색 search.results=%s 에서 "%s" 에 대한 검색 결과 - settings=설정 settings.desc=설정은 저장소 설정을 관리할 수 있습니다. settings.options=저장소 @@ -1102,7 +1035,6 @@ settings.archive.button=아카이브 저장소 settings.archive.header=이 저장소를 아카이브 settings.archive.text=아카이빙하면 저장소 전체가 읽기 전용이 됩니다. 이 작업을 진행하면 대시보드에서 숨겨지며 커밋, 이슈 또는 풀 리퀘스트를 생성할 수 없게 됩니다. settings.archive.success=저장소가 성공적으로 아카이브 되었습니다. - diff.browse_source=소스 검색 diff.parent=부모 diff.commit=커밋 @@ -1125,7 +1057,6 @@ diff.review.header=리뷰 전송 diff.review.placeholder=댓글 검토 diff.review.comment=댓글 diff.review.approve=승인 - release.releases=릴리즈 release.new_release=새로운 릴리즈 release.draft=초안 @@ -1148,7 +1079,6 @@ release.deletion_success=릴리즈가 삭제되었습니다. release.tag_name_already_exist=이 태그명의 릴리즈가 이미 존재합니다. release.tag_name_invalid=태그명이 올바르지 않습니다. release.downloads=다운로드 - branch.name=브랜치명 branch.search=브랜치 검색 branch.already_exists='%s' 브랜치명은 이미 존재합니다. @@ -1164,14 +1094,32 @@ branch.deleted_by=%s 에 의해 삭제되었습니다. branch.restore_success='%s' 브랜치가 복구되었습니다. branch.restore_failed='%s' 브랜치를 복구하는데 실패하였습니다. branch.protected_deletion_failed='%s' 브랜치가 보호되었습니다. 삭제할 수 없습니다. - - - topic.manage_topics=토픽 관리 topic.done=완료 topic.count_prompt=25개 이상의 토픽을 선택하실 수 없습니다. - - +delete_preexisting_label=삭제 +desc.private=비공개 +template.avatar=아바타 +migrate_items_milestones=마일스톤 +migrate_items_pullrequests=풀 리퀘스트 +migrate_items_releases=릴리즈 +projects.description_placeholder=설명 +projects.title=제목 +projects.new=새 프로젝트 +issues.deleted_project=(삭제됨) +issues.draft_title=초안 +issues.context.edit=수정하기 +issues.context.delete=삭제 +issues.delete=삭제 +activity.period.yearly=1 년 +search.code_no_results=검색어와 일치하는 소스코드가 없습니다. +settings.collaboration.owner=소유자 +settings.convert_fork=일반 저장소로 변환 +settings.convert_fork_confirm=저장소 변환 +settings.trust_model.collaborator=협업자 +settings.teams=팀 +settings.event_wiki=위키 +diff.file_byte_size=크기 [org] org_name_holder=조직 이름 @@ -1188,14 +1136,11 @@ org_desc=설명 team_name=팀 이름 team_desc=설명 team_permission_desc=권한 - - settings=설정 settings.options=조직 settings.full_name=성명 settings.website=웹 사이트 settings.location=위치 - settings.update_settings=설정 업데이트 settings.update_setting_success=조직 설정이 변경되었습니다. settings.update_avatar_success=조직의 아바타가 갱신되었습니다. @@ -1204,8 +1149,6 @@ settings.delete_account=이 조직을 삭제합니다. settings.confirm_delete_account=삭제 승인 settings.delete_org_title=조직 삭제 settings.delete_org_desc=이 조직이 영구히 삭제됩니다. 계속 하시겠습니까? - - members.membership_visibility=회원 표시: members.public=보임 members.public_helper=숨기기 @@ -1218,7 +1161,6 @@ members.remove=제거 members.leave=나가기 members.invite_desc=새로운 맴버를 %s에 추가: members.invite_now=지금 초대하기 - teams.join=가입 teams.leave=탈퇴 teams.admin_access=관리자 액세스 @@ -1235,6 +1177,9 @@ teams.search_repo_placeholder=저장소 찾기... teams.add_nonexistent_repo=추가하려는 저장소를 존재하지 않습니다. 먼저 생성해주세요. teams.add_duplicate_users=사용자가 이미 팀 멤버입니다. teams.members.none=이 팀에 멤버가 없습니다. +members=멤버 +settings.visibility.private_shortname=비공개 +teams.read_access=읽음 [admin] dashboard=대시보드 @@ -1248,7 +1193,6 @@ monitor=모니터링 first_page=처음 last_page=마지막 total=총: %d - dashboard.statistic=요약 dashboard.system_status=시스템 상태 dashboard.operation_name=작업 명 @@ -1285,7 +1229,6 @@ dashboard.total_gc_time=모든 가비지 콜렉션 중지 dashboard.total_gc_pause=모든 가비지 콜렉션 중지 dashboard.last_gc_pause=마지막 가비지 콜렉션 중지 dashboard.gc_times=가비지 콜렉션 시간 - users.user_manage_panel=사용자 계정 관리 users.new_account=사용자 계정 생성 users.name=사용자명 @@ -1314,14 +1257,11 @@ users.allow_create_organization=조직 생성 허용 users.update_profile=사용자 계정 갱신 users.delete_account=사용자 계정 삭제 users.deletion_success=사용자 계정이 삭제되었습니다. - - orgs.org_manage_panel=조직 관리 orgs.name=이름 orgs.teams=팀 orgs.members=멤버 orgs.new_orga=새 조직 - repos.repo_manage_panel=저장소 관리 repos.owner=소유자 repos.name=이름 @@ -1331,10 +1271,6 @@ repos.stars=별 repos.forks=포크 repos.issues=이슈 repos.size=크기 - - - - auths.auth_manage_panel=인증 소스 관리 auths.new=인증 소스 추가 auths.name=이름 @@ -1389,7 +1325,6 @@ auths.delete=인증 소스 삭제 auths.delete_auth_title=인증 소스 삭제 auths.deletion_success=인증 소스가 삭제되었습니다. auths.login_source_exist='%s' 인증 소스가 이미 존재합니다. - config.server_config=서버 설정 config.app_name=사이트 제목 config.app_ver=Gitea 버전 @@ -1406,7 +1341,6 @@ config.static_file_root_path=정적 파일 최상위 경로 config.log_file_root_path=로그 경로 config.script_type=스크립트 유형 config.reverse_auth_user=역방향 사용자 인증 - config.ssh_config=SSH 설정 config.ssh_enabled=활성화됨 config.ssh_start_builtin_server=빌트-인 서버 사용 @@ -1417,8 +1351,6 @@ config.ssh_key_test_path=주 테스트 경로 config.ssh_keygen_path=키 생성 ('ssh-keygen') 경로 config.ssh_minimum_key_size_check=최소 키 사이즈 검사 config.ssh_minimum_key_sizes=최소 키 사이즈 - - config.db_config=데이터베이스 설정 config.db_type=유형 config.db_host=호스트 @@ -1426,7 +1358,6 @@ config.db_name=이름 config.db_user=사용자명 config.db_ssl_mode=SSL config.db_path=경로 - config.service_config=서비스 설정 config.register_email_confirm=가입시 이메일 확인 필수 config.disable_register=자체등록 사용안함 @@ -1446,12 +1377,10 @@ config.default_enable_timetracking=기본 타임 트래킹 활성화 config.default_allow_only_contributors_to_track_time=기여자 트랙 타임만 config.no_reply_address=답변 받지 않을 이메일 주소 config.default_enable_dependencies=기본적으로 이슈 종속성을 활성화 - config.webhook_config=웹훅 설정 config.queue_length=큐 길이 config.deliver_timeout=시간 제한 사용 config.skip_tls_verify=TLS 검증 건너뛰기 - config.mailer_enabled=활성화됨 config.mailer_name=이름 config.mailer_user=사용자 @@ -1461,15 +1390,12 @@ config.mailer_sendmail_args=Sendmail 추가 인수 config.send_test_mail=테스트 이메일 전송 config.test_mail_failed='%s'에게 테스트 이메일을 보내는데 실패하였습니다: %v config.test_mail_sent='%s'에게 테스트 이메일이 전송되었습니다. - config.oauth_config=OAuth 설정 config.oauth_enabled=활성화됨 - config.cache_config=캐시 설정 config.cache_adapter=캐시 어댑터 config.cache_interval=캐시 간격 config.cache_conn=캐시 연결 - config.session_config=세션 설정 config.session_provider=세션 공급자 config.provider_config=공급자 설정 @@ -1478,12 +1404,10 @@ config.gc_interval_time=GC 인터벌 시간 config.session_life_time=세션 수명 config.https_only=HTTPS만 config.cookie_life_time=쿠키 수명 - config.picture_config=사진과 아바타 설정 config.picture_service=이미지 서비스 config.disable_gravatar=Gravatar 사용안함 config.enable_federated_avatar=연합 아바타 사용 - config.git_config=깃 설정 config.git_disable_diff_highlight=변경 사항 구문 강조 비활성화 config.git_max_diff_lines=변경사항 최대 표시 줄 수 (단일 파일에 대해) @@ -1495,11 +1419,8 @@ config.git_mirror_timeout=미러 업데이트 시간 제한 config.git_clone_timeout=복제 작업 시간 제한 config.git_pull_timeout=끌어오기 작업 시간 제한 config.git_gc_timeout=가비지 콜렉션 작업 시간 제한 - config.log_config=로그 설정 config.log_mode=로그 모드 - - monitor.cron=Cron 작업 monitor.name=이름 monitor.schedule=스케줄 @@ -1511,9 +1432,6 @@ monitor.desc=설명 monitor.start=시작 시간 monitor.execute_time=실행 시간 monitor.queue.configuration=초기 설정 - - - notices.system_notice_list=시스템 공지 notices.view_detail_header=알림 세부정보 보기 notices.actions=동작 @@ -1527,6 +1445,20 @@ notices.type_1=저장소 notices.desc=설명 notices.op=일. notices.delete_success=시스템 알림이 삭제되었습니다. +users.full_name=성명 +users.list_status_filter.is_active=사용 +users.list_status_filter.is_admin=관리자 +emails.activated=활성화됨 +packages.owner=소유자 +packages.name=이름 +packages.type=유형 +packages.repository=저장소 +packages.size=크기 +config.lfs_enabled=활성화됨 +config.mailer_smtp_port=SMTP 포트 +monitor.queue.name=이름 +monitor.queue.type=유형 +monitor.queue.settings.submit=설정 업데이트 [action] create_repo=저장소를 만들었습니다. %s @@ -1582,4 +1514,21 @@ error.no_unit_allowed_repo=이 저장소의 어떤 섹션에도 접근할 수 error.unit_not_allowed=이 저장소 섹션에 접근할 수 없습니다. [packages] - +filter.type=유형 +conan.details.repository=저장소 +owner.settings.cleanuprules.enabled=활성화됨 + +[aria] + +[secrets] +name=이름 + +[actions] +runners.name=이름 +runners.owner_type=유형 +runners.description=설명 +runners.task_list.run=실행 +runners.task_list.repository=저장소 +runners.task_list.commit=커밋 +runners.status.active=사용 +runs.commit=커밋 diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini index 4f91e7e07618..7215971c46b7 100644 --- a/options/locale/locale_lv-LV.ini +++ b/options/locale/locale_lv-LV.ini @@ -23,7 +23,6 @@ enable_javascript=Šī lapa labāk darbojas, ja pārlūkam ir iespējots JavaScr toc=Satura rādītājs licenses=Licences return_to_gitea=Atgriezties Gitea - username=Lietotājvārds email=E-pasta adrese password=Parole @@ -33,7 +32,6 @@ captcha=Cilvēktests twofa=Divu faktoru autentifikācija twofa_scratch=Divu faktoru vienreizējais kods passcode=Kods - webauthn_insert_key=Ievietojiet Jūsu drošības atslēgu webauthn_sign_in=Nospiediet pogu uz drošības atslēgas. Ja tai nav pogas, izņemiet un ievietojiet to atkārtoti. webauthn_press_button=Nospiediet drošības atslēgas pogu… @@ -47,7 +45,6 @@ webauthn_error_duplicated=Drošības atslēga nav atļauta šim pieprasījumam. webauthn_error_empty=Norādiet atslēgas nosaukumu. webauthn_error_timeout=Iestājusies noildze, mēģinot, nolasīt atslēgu. Pārlādējiet lapu un mēģiniet vēlreiz. webauthn_reload=Pārlādēt - repository=Repozitorijs organization=Organizācija mirror=Spogulis @@ -65,18 +62,15 @@ settings=Iestatījumi your_profile=Profils your_starred=Atzīmēts ar zvaigznīti your_settings=Iestatījumi - all=Visi sources=Avoti mirrors=Spoguļi collaborative=Sadarbības forks=Atdalītie - activities=Aktivitāte pull_requests=Izmaiņu pieprasījumi issues=Problēmas milestones=Atskaites punkti - ok=Labi cancel=Atcelt save=Saglabāt @@ -85,28 +79,28 @@ add_all=Pievienot visus remove=Noņemt remove_all=Noņemt visus edit=Labot - copy=Kopēt copy_url=Kopēt saiti copy_branch=Kopēt atzara nosaukumu copy_success=Nokopēts! copy_error=Kopēšana neizdevās - write=Rakstīt preview=Priekšskatītījums loading=Notiek ielāde… - step1=Solis 1: step2=Solis 2: - error=Kļūda error404=Lapa, ko vēlaties atvērt, neeksistē vai arī Jums nav tiesības to aplūkot. - never=Nekad - rss_feed=RSS barotne +enabled=Iespējots +disabled=Atspējots +copy_content=Kopēt saturu +copy_type_unsupported=Šī veida failus nav iespējams nokopēt [filter] +string.asc=A - Z +string.desc=Z - A [error] occurred=Radusies kļūda @@ -157,7 +151,6 @@ err_empty_admin_email=Administratora e-pasta adrese nevar būt tukša. err_admin_name_is_reserved=Administratora lietotāja vārds nav korekts, šāds lietotāja vārds ir rezervēts err_admin_name_pattern_not_allowed=Administratora lietotāja vārds nav korekts, šāds lietotāja vārds ir rezervēts err_admin_name_is_invalid=Administratora lietotāja nav korekts - general_title=Vispārīgie iestatījumi app_name=Vietnes nosaukums app_name_helper=Šeit var ievadīt savas kompānijas nosaukumu. @@ -177,7 +170,6 @@ app_url=Gitea pamata URL app_url_helper=Pamata adrese HTTP(S) klonēšanas URL un e-pastu paziņojumiem. log_root_path=Žurnalizēšanas ceļš log_root_path_helper=Žurnalizēšanas faili tiks rakstīti šajā direktorijā. - optional_title=Neobligātie iestatījumi email_title=E-pastu iestatījumi smtp_addr=SMTP resursdators @@ -235,7 +227,10 @@ default_enable_timetracking_popup=Repozitorijiem pēc noklusējuma tiks iespējo no_reply_address=Neatbildēt e-pasta adreses domēns no_reply_address_helper=Domēns lietotāja e-pasta adresei git žurnālos, ja lietotājs izvēlas paturēt savu e-pasta adresi privātu. Piemēram, ja lietotājs ir 'janis' un domēns 'neatbildet.piemers.lv', tad e-pasta adrese būs 'janis@neatbildet.piemers.lv'. password_algorithm=Paroles jaucējsummas algoritms -password_algorithm_helper=Norādiet paroles jaucējkoda algoritmu. Alogritmiem ir dažādas prasības un stiprums. Lai arī `argon2` ir nodrošina labu drošība, tas patērē daudz operatīvās atmiņas un var nebūt piemērots sistēmām ar nelieliem resursiem. +password_algorithm_helper="""Norādiet paroles jaucējkoda algoritmu. Alogritmiem ir dažādas prasības un stiprums. Lai arī `argon2` ir nodrošina labu drošība, tas patērē daudz operatīvās atmiņas un var nebūt piemērots sistēmām ar nelieliem resursiem.""" +invalid_password_algorithm=Kļūdaina paroles jaucējfunkcija +enable_update_checker=Iespējot jaunu versiju paziņojumus +enable_update_checker_helper=Periodiski pārbaudīt jaunu version pieejamību, izgūstot datus no gitea.io. [home] uname_holder=Lietotājvārds vai e-pasts @@ -250,18 +245,15 @@ view_home=Skatīties %s search_repos=Meklēt repozitoriju… filter=Citi filtri filter_by_team_repositories=Filtrēt pēc komandas repozitorijiem -feed_of="%s" plūsma - +feed_of=`"%s" plūsma` show_archived=Arhivētie show_both_archived_unarchived=Attēlo gan arhivētie, gan nearhivētie show_only_archived=Attēlo tikai arhivētos show_only_unarchived=Attēlo tikai nearhivētos - show_private=Privātie show_both_private_public=Attēlo gan publiskos, gan privātos show_only_private=Attēlo tikai privātos show_only_public=Attēlo tikai publiskos - issues.in_your_repos=Jūsu repozitorijos [explore] @@ -279,12 +271,16 @@ org_no_results=Netika atrasta neviena organizācija, kas atbilstu kritērijiem. code_no_results=Netika atrasts pirmkods, kas atbilstu kritērijiem. code_search_results=Meklēšanas rezultāti '%s' code_last_indexed_at=Pēdējo reizi indeksēts %s - +search.type.tooltip=Meklēšanas veids +search.fuzzy.tooltip=Iekļaut meklēšanas rezultātos arī aptuvenas sakritības +search.match.tooltip=Iekļaut meklēšanas rezultātos tikai precīzas sakritības +relevant_repositories_tooltip=Repozitoriju, kas ir atdalīti vai kuriem nav tēmas, ikonas un apraksta ir paslēpti. +relevant_repositories=Tikai būtiskie repozitoriji tiek rādīti, pārādīt nefiltrētus rezultātus. [auth] create_new_account=Reģistrēt kontu register_helper_msg=Jau ir konts? Pieraksties tagad! -social_register_helper_msg=Jau ir konts? Pievienojies! +social_register_helper_msg=Jau ir konts? Piesaisti to! disable_register_prompt=Reģistrācija ir atspējota. Lūdzu, sazinieties ar vietnes administratoru. disable_register_mail=Reģistrācijas e-pasta apstiprināšana ir atspējota. manual_activation_only=Sazinieties ar lapas administratoru, lai pabeigtu konta aktivizāciju. @@ -325,7 +321,7 @@ oauth_signup_title=Pabeigt konta veidošanu oauth_signup_submit=Pabeigt reģistrāciju oauth_signin_tab=Savienot ar esošu kontu oauth_signin_title=Pierakstīties, lai autorizētu saistīto kontu -oauth_signin_submit=Savienot kontu +oauth_signin_submit=Saistītie konti oauth.signin.error=Radās kļūda apstrādājot autorizācijas pieprasījumu. Ja šī kļūda atkārtojas, sazinieties ar lapas administratoru. oauth.signin.error.access_denied=Autorizācijas pieprasījums tika noraidīts. oauth.signin.error.temporarily_unavailable=Autorizācija neizdevās, jo autentifikācijas serveris ir īslaicīgi nepieejams. Mēģiniet autorizēties vēlāk. @@ -348,36 +344,30 @@ authorization_failed_desc=Autorizācija neizdevās, jo tika veikts kļūdains pi sspi_auth_failed=SSPI autentifikācija neizdevās password_pwned=Ievadītā parole ir zagto paroļu sarakstā, kas ir kādā no publicētājām datu zādzībām. Mēģiniet vēlreiz citu paroli. password_pwned_err=Neizdevās pabeigt pieprasījumu uz HaveIBeenPwned +invalid_password=Jūsu parole neatbilst parolei, kas tika ievadīta veidojot so kontu. [mail] view_it_on=Aplūkot %s link_not_working_do_paste=Ja saite nestrādā, mēģiniet to nokopēt un atvērt pārlūkā. hi_user_x=Sveiki %s, - activate_account=Lūdzu, aktivizējiet savu kontu activate_account.title=%s, aktivizējiet savu kontu activate_account.text_1=Sveiki %[1]s, esat reģistrējies %[2]s! activate_account.text_2=Nospiediet uz saites, lai aktivizētu savu kontu lapā %s: - activate_email=Apstipriniet savu e-pasta adresi activate_email.title=%s, apstipriniet savu e-pasta adresi activate_email.text=Nospiediet uz saites, lai apstiprinātu savu e-pasta adresi lapā %s: - register_notify=Laipni lūdzam Gitea register_notify.title=%[1]s, esat reģistrējies %[2]s register_notify.text_1=šis ir reģistrācijas apstiprinājuma e-pasts lapai %s! register_notify.text_2=Tagad varat autorizēties ar lietotāja vārdu: %s. register_notify.text_3=Ja šis konts Jums tika izveidots, tad obligāti nomainiet citu paroli. - reset_password=Atgūt kontu reset_password.title=%s, esat pieprasījis atjaunot savu kontu reset_password.text=Nospiediet uz saites, lai atjaunotu savu kontu lapā %s: - register_success=Veiksmīga reģistrācija - issue_assigned.pull=@%[1]s piešķīra jums izmaiņu pieprasījumu %[2]s repozitorijā %[3]s. issue_assigned.issue=@%[1]s piešķīra jums problēmu %[2]s repozitorijā %[3]s. - issue.x_mentioned_you=@%s pieminēja Jūs: issue.action.force_push=%[1]s veica piespiedu izmaiņu iesūtīšanu atzarā %[2]s no revīzijas %[3]s uz %[4]s. issue.action.push_1=@%[1]s iesūtīja %[3]d revīziju atzarā %[2]s @@ -392,7 +382,6 @@ issue.action.review_dismissed=@%[1]s atmeta pēdējo %[2]s recenziju šim issue.action.ready_for_review=@%[1]s atzīmēja šo izmaiņu pieprasījumu, ka tas ir gatavs recenzēšanai. issue.action.new=@%[1]s izveidoja #%[2]d. issue.in_tree_path=Ceļā %s: - release.new.subject=Jauns laidiens %s repozitorijā %s release.new.text=@%[1]s izveidoja jaunu laidienu %[2]s repozitorijā %[3]s release.title=Nosaukums: %s @@ -400,15 +389,17 @@ release.note=Piezīmes: release.downloads=Lejupielādes: release.download.zip=Izejas kods (ZIP) release.download.targz=Izejas kods (TAR.GZ) - repo.transfer.subject_to=%s vēlas pārsūtīt repozitoriju "%s" organizācijai %s repo.transfer.subject_to_you=%s vēlas Jums pārsūtīt repozitoriju "%s" repo.transfer.to_you=Jums repo.transfer.body=Ja vēlaties to noraidīt vai apstiprināt, tad apmeklējiet saiti %s. - repo.collaborator.added.subject=%s pievienoja Jūs repozitorijam %s repo.collaborator.added.text=Jūs tikāt pievienots kā līdzstrādnieks repozitorijam: - +reply=vai atbildiet uz e-pastu +team_invite.subject=%[1]s uzaicināja Jūs pievienoties organizācijai %[2]s +team_invite.text_1=%[1]s uzaicināja Jūs pievienoties komandai %[2] organizācijā %[3]s. +team_invite.text_2=Uzspiediet uz šīs saites, lai pievienoties komandai: +team_invite.text_3=Piezīme: Šis uzaicinājums ir paredzēts %[1]s. Ja uzskatāt, ka tas nav domāts Jums, varat ignorēt šo e-pastu. [modal] yes=Jā @@ -427,34 +418,30 @@ PayloadUrl=Vērtuma URL TeamName=Komandas nosaukums AuthName=Autorizācijas nosaukums AdminEmail=Admin e-pasta adrese - NewBranchName=Jauna atzara nosaukums CommitSummary=Revīzijas kopsavilkums CommitMessage=Revīzijas ziņojums CommitChoice=Revīzijas izvēle TreeName=Faila ceļš Content=Saturs - SSPISeparatorReplacement=Atdalītājs SSPIDefaultLanguage=Noklusējuma valoda - -require_error=` nedrīkst būt tukšs.` -alpha_dash_error=` drīkst saturēt tikai latīņu alfabēta burtus, ciparus vai domuzīmes (-_).` -alpha_dash_dot_error=` drīkst saturēt tikai latīņu alfabēta burtus, ciparus, domuzīmes (-_) vai punktu.` -git_ref_name_error=` jābūt korektam git references nosaukumam.` -size_error=` jābūt %s simbolus garam.` -min_size_error=` jabūt vismaz %s simbolu garumā.` -max_size_error=` jabūt ne mazāk kā %s simbolu garumā.` -email_error=` nav derīga e-pasta adrese.` -url_error=`'%s' nav korekts URL.` -include_error=` ir jāsatur tekstu '%s'.` -glob_pattern_error=` glob šablons nav korekts: %s.` -regex_pattern_error=` regulārā izteiksme nav korekta: %s.` +require_error=" nedrīkst būt tukšs." +alpha_dash_error=" drīkst saturēt tikai latīņu alfabēta burtus, ciparus vai domuzīmes (-_)." +alpha_dash_dot_error=" drīkst saturēt tikai latīņu alfabēta burtus, ciparus, domuzīmes (-_) vai punktu." +git_ref_name_error=" jābūt korektam git references nosaukumam." +size_error=" jābūt %s simbolus garam." +min_size_error=" jabūt vismaz %s simbolu garumā." +max_size_error=" jabūt ne mazāk kā %s simbolu garumā." +email_error=" nav derīga e-pasta adrese." +url_error='%s' nav korekts URL. +include_error=" ir jāsatur tekstu '%s'." +glob_pattern_error=" glob šablons nav korekts: %s." +regex_pattern_error=" regulārā izteiksme nav korekta: %s." unknown_error=Nezināma kļūda: captcha_incorrect=Ievadīts nepareizs drošības kods. password_not_match=Izvēlētā parole nesakrīt ar atkārtoti ievadīto. lang_select_error=Izvēlieties valodu no saraksta. - username_been_taken=Lietotājvārds jau ir aizņemts. username_change_not_local_user=Ne-lokālie lietotāji nevar mainīt savus lietotājvārdus. repo_name_been_taken=Jau eksistē repozitorijs ar šādu nosaukumu. @@ -485,20 +472,22 @@ user_not_exist=Lietotājs neeksistē. team_not_exist=Komanda neeksistē. last_org_owner=Nevar noņemt pēdejo lietotāju no īpašnieku komandas. Organizācijai ir jābūt vismaz vienam īpašniekam. cannot_add_org_to_team=Organizāciju nevar pievienot kā komandas biedru. - invalid_ssh_key=Nav iespējams pārbaudīt SSH atslēgu: %s invalid_gpg_key=Nav iespējams pārbaudīt GPG atslēgu: %s invalid_ssh_principal=Kļūdaina identitāte: %s unable_verify_ssh_key=SSH atslēgu nav iespējams pārbaudīt, pārliecinieties, ka tajā nav kļūdu. auth_failed=Autentifikācija neizdevās: %v - still_own_repo=Šis konts ir vismaz viena repozitorija īpašnieks, tos sākumā ir nepieciešams izdzēst vai mainīt to īpašnieku. still_has_org=Jūsu konts ir piesaistīts vismaz vienai organizācijai, sākumā nepieciešams to pamest. still_own_packages=Jūsu kontam pieder viena vai vairākas pakotnes, tās nepieciešams izdzēst. org_still_own_repo=Organizācijai pieder repozitoriji, tos sākumā ir nepieciešams izdzēst vai mainīt to īpašnieku. org_still_own_packages=Šai organizācijai pieder viena vai vārākas pakotnes, tās nepieciešams izdzēst. - target_branch_not_exist=Mērķa atzars neeksistē +username_error=" drīkst saturēt tikai burtus un ciparus ('0-9','a-z','A-Z'), domuzīme ('-'), apakšsvītra ('_') un punkts ('.'). Nevar sākties vai beigties ar simbolu, kas nav burts vai skaitlis, kā arī nevar būt vairāki simboli pēc kārtas, kas nav burti vai skaitļi." +invalid_group_team_map_error=" sasaiste nav korekta: %s" +duplicate_invite_to_team=Lietotājs jau ir uzaicināts kā komandas biedrs. +organization_leave_success=Jūs esat pametis organizāciju %s. +must_use_public_key=Atslēga, ko norādījāt ir privātā atslēga. Nekad nenodotiet savu privātu atslēgu nevienam. Izmantojiet publisko atslēgu. [user] change_avatar=Mainīt profila attēlu… @@ -515,10 +504,10 @@ unfollow=Nesekot heatmap.loading=Ielādē intensitātes karti… user_bio=Biogrāfija disabled_public_activity=Šis lietotājs ir atslēdzies iespēju aplūkot tā aktivitāti. - form.name_reserved=Lietotājvārdu '%s' nedrīkst izmantot. form.name_pattern_not_allowed=Lietotājvārds '%s' nav atļauts. form.name_chars_not_allowed=Lietotāja vārds '%s' satur neatļautus simbolus. +code=Kods [settings] profile=Profils @@ -538,7 +527,6 @@ account_link=Saistītie konti organization=Organizācijas uid=Lietotāja ID webauthn=Drošības atslēgas - public_profile=Publiskais profils biography_placeholder=Pastāstiet nedaudz par sevi profile_desc=Konta e-pasta adrese ir publiska un tiks izmantota visiem ar kontu saistītiem paziņojumiem un no pārlūka veiktajām darbībām. @@ -578,7 +566,6 @@ saved_successfully=Iestatījumi tika veiksmīgi saglabati. privacy=Privātums keep_activity_private=Nerādīt manu aktivitāti profila lapā keep_activity_private_popup=Savu aktivitāti redzēsiet tikai Jūs un administratori - lookup_avatar_by_mail=Meklēt profila bildes pēc e-pasta federated_avatar_lookup=Apvienotais profila bilžu meklētājs enable_custom_avatar=Iespējot maināmu profila attēlu @@ -589,7 +576,6 @@ uploaded_avatar_not_a_image=Augšupielādētais fails nav attēls. uploaded_avatar_is_too_big=Augšupielādētais fails parsniedz maksimālo izmēru. update_avatar_success=Profila attēls tika saglabāts. update_user_avatar_success=Lietotāja profila attēls tika atjaunots. - change_password=Mainīt paroli old_password=Pašreizējā parole new_password=Jauna parole @@ -597,7 +583,6 @@ retype_new_password=Ievadīt paroli atkāroti password_incorrect=Ievadīta nepareiza pašreizējā parole. change_password_success=Parole tika veiksmīgi nomainīta. Tagad varat autorizēties ar jauno paroli. password_change_disabled=Ārējie konti nevar mainīt paroli, izmantojot, Gitea saskarni. - emails=E-pasta adreses manage_emails=Pārvaldīt e-pasta adreses manage_themes=Izvēlieties noklusējuma motīvu @@ -630,7 +615,6 @@ add_openid_success=Jūsu jaunā OpenID adrese tika veiksmīgi pievienota. keep_email_private=Paslēpt e-pasta adresi keep_email_private_popup=Jūsu e-pasta adrese nebūs redzama citiem lietotājiem. openid_desc=Jūsu OpenID adreses ļauj autorizēties, izmantojot, Jūsu izvēlēto pakalpojumu sniedzēju. - manage_ssh_keys=Pārvaldīt SSH atslēgas manage_ssh_principals=Pārvaldīt SSH sertifikātu identitātes manage_gpg_keys=Pārvaldīt GPG atslēgas @@ -709,7 +693,6 @@ manage_social=Pārvaldīt piesaistītos sociālos kontus social_desc=Šis ir saraksts ar Jūsu Gitea kontam piesaistītajiem sociālajiem kontiem. Drošības nolūkos, pārliecinieties, ka atpazīstat visus no tiem, jo tos var izmantot, lai pieslēgtos Jūsu Gitea kontam. unbind=Atsaistīt unbind_success=Sociālais konts tika atsaistīts no Jūsu Gitea konta. - manage_access_token=Pārvaldīt piekļuves talonus generate_new_token=Ģenerēt jaunu talonu tokens_desc=Ar šiem taloniem ir iespējams piekļūt Jūsu kontam, izmantojot, Gitea API. @@ -724,7 +707,6 @@ access_token_deletion_cancel_action=Atcelt access_token_deletion_confirm_action=Dzēst access_token_deletion_desc=Izdzēšot talonu, tam tiks liegta piekļuve šim kontam. Šī darbība ir neatgriezeniska. Vai turpināt? delete_token_success=Piekļuves talons tika noņemts. Neaizmirstiet atjaunot informāciju lietojumprogrammās, kas izmantoja šo talonu. - manage_oauth2_applications=Pārvaldīt OAuth2 lietotnes edit_oauth2_application=Labot OAuth2 lietotni oauth2_applications_desc=OAuth2 lietotnes ļauj trešo pušu lietotnēm droša veidā autentificēt lietotajus šajā Gitea instancē. @@ -746,14 +728,12 @@ oauth2_client_secret_hint=Atverot šo lapu atkārtoti, šis noslēpums vairs neb oauth2_application_edit=Labot oauth2_application_create_description=OAuth2 lietotnes ļauj trešas puses lietotnēm piekļūt lietotāja kontiem šajā instancē. oauth2_application_remove_description=Noņemot OAuth2 lietotni neļaus trešas puses lietotnēm piekļūt lietotāja kontiem šajā instancē. Vai turpināt? - authorized_oauth2_applications=Autorizētās OAuth2 lietotnes authorized_oauth2_applications_description=Jūs esat atļāvis piekļuvi savam Gitea kontam šādām trešo pušu lietotnēm. Atsauciet piekļuvi lietotnēm, kas vairs nav vajadzīgas. revoke_key=Atsaukt revoke_oauth2_grant=Atsaukt piekļuvi revoke_oauth2_grant_description=Atsaucot piekļuvi šai trešas puses lietotnei tiks liegta piekļuve Jūsu datiem. Vai turpināt? revoke_oauth2_grant_success=Piekļuve veiksmīgi atsaukta. - twofa_desc=Divu faktoru autentifikācija uzlabo Jūsu konta drošību. twofa_is_enrolled=Kontam ir ieslēgta divu faktoru autentifikācija. twofa_not_enrolled=Jūsu kontam nav ieslēgta divu faktoru autentifikācija. @@ -771,13 +751,11 @@ then_enter_passcode=Ievadiet piekļuves kodu no lietojumprogrammas: passcode_invalid=Nederīgs piekļuves kods. Mēģiniet ievadīt atkārtoti. twofa_enrolled=Kontam tagad ir ieslēgta divu faktoru autentifikācija. Saglabājiet savu vienreizējo kodu (%s), jo tas vairāk netiks parādīts! twofa_failed_get_secret=Neizdevās ielādēt noslēpumu. - webauthn_desc=Drošības atslēgas ir fiziskas ierīces, kas satur kriptogrāfiskas atslēgas. Tās var tikt izmantotas divu faktoru autentifikācijai. Drošības atslēgām ir jāatbalsta WebAuthn autentifikācijas standarts. webauthn_register_key=Pievienot drošības atslēgu webauthn_nickname=Segvārds webauthn_delete_key=Noņemt drošības atslēgu webauthn_delete_key_desc=Noņemot drošības atslēgu ar to vairs nebūs iespējams autorizēties. Turpināt? - manage_account_links=Pārvaldīt saistītos kontus manage_account_links_desc=Šādi ārējie konti ir piesaistīti Jūsu Gitea kontam. account_links_not_available=Pašlaik nav neviena ārējā konta piesaistīta šim kontam. @@ -785,23 +763,19 @@ link_account=Savienot kontu remove_account_link=Noņemt saistīto kontu remove_account_link_desc=Noņemot saistīto kontu, tam tiks liegta piekļuve Jūsu Gitea kontam. Vai turpināt? remove_account_link_success=Saistītais konts tika noņemts. - orgs_none=Jūs neesat nevienas organizācijas biedrs. repos_none=Jums nepieder neviens repozitorijs - delete_account=Dzēst savu kontu delete_prompt=Šī darbība pilnībā izdzēsīs Jūsu kontu, kā arī tā ir NEATGRIEZENISKA. delete_with_all_comments=Jūsu konts ir jaunāks par %s. Lai izveirotos no spoka komentāriem, visu problēmu un izmaiņu pieprasījumu komentāri tiks dzēsti līdz ar kontu. confirm_delete_account=Apstiprināt dzēšanu delete_account_title=Dzēst lietotāja kontu delete_account_desc=Vai tiešām vēlaties dzēst šo kontu? - email_notifications.enable=Iespējot e-pasta paziņojumus email_notifications.onmention=Tikai, ja esmu pieminēts email_notifications.disable=Nesūtīt paziņojumus email_notifications.submit=Saglabāt sūtīšanas iestatījumus email_notifications.andyourown=Iekļaut savus paziņojumus - visibility=Lietotāja redzamība visibility.public=Publisks visibility.public_tooltip=Redzams visiem lietotājiem @@ -809,6 +783,9 @@ visibility.limited=Ierobežota visibility.limited_tooltip=Redzams tikai autorizētajiem lietotājiem visibility.private=Privāts visibility.private_tooltip=Redzams tikai organizāciju dalībniekiem +select_scopes=Norādiet apgabalus +scopes_list=Apgabali: +oauth2_confidential_client=Konfidenciāls klients. Norādiet lietotēm, kas glabā noslēpumu slepenībā, piemēram, tīmekļa lietotnēm. Nenorādiet instalējamām lietotnēm, tai skaitā darbavirsmas vai mobilajām lietotnēm. [repo] new_repo_helper=Repozitorijs satur projekta visus failus, tai skaitā to izmaiņu vēsturi. Jau ir pieejams citur? Migrējiet repozitoriju. @@ -895,14 +872,12 @@ delete_preexisting=Dzēst jau eksistējošos failus delete_preexisting_content=Dzēst failus direktorijā %s delete_preexisting_success=Dzēst nepārņemtos failus direktorijā %s blame_prior=Aplūkot vainīgo par izmaiņām pirms šīs revīzijas - transfer.accept=Apstiprināt īpašnieka maiņu transfer.accept_desc=Mainīt īpašnieku uz "%s" transfer.reject=Noraidīt īpašnieka maiņu transfer.reject_desc=Atcelt īpašnieka maiņu uz "%s" transfer.no_permission_to_accept=Jums nav tiesību apstiprināt transfer.no_permission_to_reject=Jums nav tiesību noraidīt - desc.private=Privāts desc.public=Publisks desc.private_template=Privāta sagatave @@ -910,7 +885,6 @@ desc.public_template=Sagatave desc.internal=Iekšējs desc.internal_template=Iekšēja sagatave desc.archived=Arhivēts - template.items=Sagataves ieraksti template.git_content=Git saturs (noklusētais atzars) template.git_hooks=Git āķi @@ -921,16 +895,13 @@ template.avatar=Profila attēls template.issue_labels=Problēmu etiķetes template.one_item=Norādiet vismaz vienu sagataves vienību template.invalid=Norādiet sagataves repozitoriju - archive.title=Repozitorijs ir arhivēts. Tam var aplūkot failus un to var klonēt, bet nevar iesūtīt jaunas izmaiņas, kā arī atvērt jaunas problēmas/izmaiņu pieprasījumus. archive.issue.nocomment=Repozitorijs ir arhivēts. Problēmām nevar pievienot jaunus komentārus. archive.pull.nocomment=Repozitorijs ir arhivēts. Izmaiņu pieprasījumiem nevar pievienot jaunus komentārus. - form.reach_limit_of_creation_1=Sasniegts Jums noteiktais %d repozitorija ierobežojums. form.reach_limit_of_creation_n=Sasniegts Jums noteiktais %d repozitoriju ierobežojums. form.name_reserved=Repozitorija nosaukums '%s' ir jau rezervēts. form.name_pattern_not_allowed=Repozitorija nosaukums '%s' nav atļauts. - need_auth=Autorizācija migrate_options=Migrācijas opcijas migrate_service=Migrācijas serviss @@ -981,7 +952,6 @@ migrate.migrating_labels=Migrē etiķetes migrate.migrating_releases=Migrē laidienus migrate.migrating_issues=Migrācijas problēmas migrate.migrating_pulls=Migrē izmaiņu pieprasījumus - mirror_from=spogulis no forked_from=atdalīts no generated_from=ģenerēts no @@ -995,7 +965,6 @@ unstar=Noņemt zvaigznīti star=Pievienot zvaigznīti fork=Atdalīts download_archive=Lejupielādēt repozitoriju - no_desc=Nav apraksta quick_guide=Īsa pamācība clone_this_repo=Klonēt šo repozitoriju @@ -1003,12 +972,11 @@ create_new_repo_command=Izveidot jaunu repozitoriju komandrindā push_exist_repo=Nosūtīt izmaiņas no komandrindas eksistējošam repozitorijam empty_message=Repozitorijs ir tukšs. broken_message=Git repozitoriju nav iespējams nolasīt. Sazinieties ar šī servera administratoru vai izdzēsiet šo repozitoriju. - code=Kods code.desc=Piekļūt pirmkodam, failiem, revīzijām un atzariem. branch=Atzars tree=Koks -clear_ref=`Notīrīt pašreizējo atsauci` +clear_ref=Notīrīt pašreizējo atsauci filter_branch_and_tag=Filtrēt atzarus vai tagus find_tag=Atrast tagu branches=Atzari @@ -1020,7 +988,6 @@ packages=Pakotnes labels=Etiķetes org_labels_desc=Organizācijas līmeņa etiķetes var tikt izmantotas visiem repozitorijiem šajā organizācijā org_labels_desc_manage=pārvaldīt - milestones=Atskaites punkti commits=Revīzijas commit=Revīzija @@ -1036,7 +1003,6 @@ file_view_rendered=Skatīt rezultātu file_view_raw=Rādīt neapstrādātu file_permalink=Patstāvīgā saite file_too_large=Šis fails ir par lielu, lai to parādītu. - escape_control_characters=Kodēt unescape_control_characters=Atkodēt file_copy_permalink=Kopēt saiti @@ -1055,7 +1021,6 @@ download_file=Lejupielādēt failu normal_view=Parastais skats line=rinda lines=rindas - editor.add_file=Pievienot editor.new_file=Jauna datne editor.upload_file=Augšupielādēt failu @@ -1121,7 +1086,6 @@ editor.user_no_push_to_branch=Lietotājs nevar iesūtīt izmaiņas šajā atzar editor.require_signed_commit=Atzarā var iesūtīt tikai parakstītas revīzijas editor.cherry_pick=Izlasīt %s uz: editor.revert=Atgriezt %s uz: - commits.desc=Pārlūkot pirmkoda izmaiņu vēsturi. commits.commits=Revīzijas commits.no_commits=Nav kopīgu revīziju. Atzariem '%s' un '%s' ir pilnībā atšķirīga izmaiņu vēsture. @@ -1140,7 +1104,6 @@ commits.signed_by_untrusted_user=Parakstījis neuzticams lietotājs commits.signed_by_untrusted_user_unmatched=Parakstījis neuzticams lietotājs, kas neatbilst izmaiņu autoram commits.gpg_key_id=GPG atslēgas ID commits.ssh_key_fingerprint=SSH atslēgas identificējošā zīmju virkne - commit.actions=Darbības commit.revert=Atgriezt commit.revert-header=Atgriezt: %s @@ -1148,10 +1111,8 @@ commit.revert-content=Norādiet atzaru uz kuru atgriezt: commit.cherry-pick=Izlasīt commit.cherry-pick-header=Izlasīt: %s commit.cherry-pick-content=Norādiet atzaru uz kuru izlasīt: - ext_issues=Piekļuve ārējām problēmām ext_issues.desc=Saite uz ārējo problēmu sekotāju. - projects=Projekti projects.desc=Pārvaldīt problēmu un izmaiņu pieprasījumu projektu dēļus. projects.description=Apraksts (neobligāts) @@ -1187,7 +1148,6 @@ projects.board.color=Krāsa projects.open=Aktīvie projects.close=Pabeigtie projects.board.assigned_to=Piešķirts - issues.desc=Organizēt kļūdu ziņojumus, uzdevumus un atskaites punktus. issues.filter_assignees=Filtrēt pēc atbildīgajiem issues.filter_milestones=Filtrēt pēc atskaites punkta @@ -1238,25 +1198,25 @@ issues.add_labels=pievienoja %s etiķetes %s issues.remove_label=noņēma %s etiķeti %s issues.remove_labels=noņēma %s etiķetes %s issues.add_remove_labels=pievienoja %s un noņēma %s etiķetes %s -issues.add_milestone_at=`pievienoja atskaites punktu %s %s` -issues.add_project_at=`pievienoja šo problēmu %s projektam %s` -issues.change_milestone_at=`nomainīja atskaites punktu no %s uz %s %s` -issues.change_project_at=`pārvietoja šo problēmu no %s projekta uz %s %s` -issues.remove_milestone_at=`noņēma atskaites punktu %s %s` -issues.remove_project_at=`noņēma šo problēmu no %s projekta %s` -issues.deleted_milestone=`(dzēsts)` -issues.deleted_project=`(dzēsts)` -issues.self_assign_at=`piešķīra sev %s` -issues.add_assignee_at=`tika piešķirta problēma no %s %s` -issues.remove_assignee_at=`tika noņemta problēma no %s %s` -issues.remove_self_assignment=`noņēma sev problēmu %s` -issues.change_title_at=`nomainīts nosaukums no %s uz %s %s` -issues.change_ref_at=`nomainīta atsauce no %s uz %s %s` -issues.remove_ref_at=`noņēma atsauci no %s %s` -issues.add_ref_at=`pievienoja atsauci uz %s %s` -issues.delete_branch_at=`izdzēsa atzaru %s %s` +issues.add_milestone_at=pievienoja atskaites punktu %s %s +issues.add_project_at=pievienoja šo problēmu %s projektam %s +issues.change_milestone_at=nomainīja atskaites punktu no %s uz %s %s +issues.change_project_at=pārvietoja šo problēmu no %s projekta uz %s %s +issues.remove_milestone_at=noņēma atskaites punktu %s %s +issues.remove_project_at=noņēma šo problēmu no %s projekta %s +issues.deleted_milestone=(dzēsts) +issues.deleted_project=(dzēsts) +issues.self_assign_at=piešķīra sev %s +issues.add_assignee_at=tika piešķirta problēma no %s %s +issues.remove_assignee_at=tika noņemta problēma no %s %s +issues.remove_self_assignment=noņēma sev problēmu %s +issues.change_title_at=nomainīts nosaukums no %s uz %s %s +issues.change_ref_at=nomainīta atsauce no %s uz %s %s +issues.remove_ref_at=noņēma atsauci no %s %s +issues.add_ref_at=pievienoja atsauci uz %s %s +issues.delete_branch_at=izdzēsa atzaru %s %s issues.filter_label=Etiķete -issues.filter_label_exclude=`Izmantojiet alt + peles klikšķis vai enter, lai neiekļautu etiķeti` +issues.filter_label_exclude=Izmantojiet alt + peles klikšķis vai enter, lai neiekļautu etiķeti issues.filter_label_no_select=Visas etiķetes issues.filter_milestone=Atskaites punkts issues.filter_milestone_no_select=Visi atskaites punkti @@ -1301,7 +1261,7 @@ issues.open_title=Atvērta issues.closed_title=Slēgta issues.draft_title=Melnraksts issues.num_comments=%d komentāri -issues.commented_at=` komentēja %s` +issues.commented_at=" komentēja %s" issues.delete_comment_confirm=Vai patiešām vēlaties dzēst šo komentāru? issues.context.copy_link=Kopēt saiti issues.context.quote_reply=Atbildēt citējot @@ -1310,22 +1270,22 @@ issues.context.edit=Labot issues.context.delete=Dzēst issues.no_content=Vēl nav satura. issues.close_issue=Aizvērt -issues.pull_merged_at=`sapludināja revīziju %[2]s atzarā %[3]s %[4]s` -issues.manually_pull_merged_at=`manuāli sapludināja revīziju %[2]s atzarā %[3]s %[4]s` +issues.pull_merged_at=sapludināja revīziju %[2]s atzarā %[3]s %[4]s +issues.manually_pull_merged_at=manuāli sapludināja revīziju %[2]s atzarā %[3]s %[4]s issues.close_comment_issue=Komentēt un aizvērt issues.reopen_issue=Atvērt atkārtoti issues.reopen_comment_issue=Komentēt un atvērt atkārtoti issues.create_comment=Komentēt -issues.closed_at=`slēdza šo problēmu %[2]s` -issues.reopened_at=`atkārtoti atvēra šo problēmu %[2]s` -issues.commit_ref_at=`pieminēja šo problēmu revīzijā %[2]s` -issues.ref_issue_from=`atsaucās uz šo problēmu %[4]s %[2]s` -issues.ref_pull_from=`atsaucās uz šo izmaiņu pieprasījumu %[4]s %[2]s` -issues.ref_closing_from=`atsaucās uz izmaiņu pieprasījumu %[4]s, kas atrisinās šo problēmu %[2]s` -issues.ref_reopening_from=`atsaucās uz izmaiņu pieprasījumu %[4]s, kas atkārtoti atvērs šo problēmu %[2]s` -issues.ref_closed_from=`aizvēra problēmu %[4]s %[2]s` -issues.ref_reopened_from=`atkārtoti atvēra problēmu %[4]s %[2]s` -issues.ref_from=`no %[1]s` +issues.closed_at=slēdza šo problēmu %[2]s +issues.reopened_at=atkārtoti atvēra šo problēmu %[2]s +issues.commit_ref_at=pieminēja šo problēmu revīzijā %[2]s +issues.ref_issue_from=atsaucās uz šo problēmu %[4]s %[2]s +issues.ref_pull_from=atsaucās uz šo izmaiņu pieprasījumu %[4]s %[2]s +issues.ref_closing_from=atsaucās uz izmaiņu pieprasījumu %[4]s, kas atrisinās šo problēmu %[2]s +issues.ref_reopening_from=atsaucās uz izmaiņu pieprasījumu %[4]s, kas atkārtoti atvērs šo problēmu %[2]s +issues.ref_closed_from=aizvēra problēmu %[4]s %[2]s +issues.ref_reopened_from=atkārtoti atvēra problēmu %[4]s %[2]s +issues.ref_from=no %[1]s issues.poster=Autors issues.collaborator=Līdzstrādnieks issues.owner=Īpašnieks @@ -1355,8 +1315,8 @@ issues.label.filter_sort.reverse_alphabetically=Pretēji alfabētiski issues.label.filter_sort.by_size=Mazākais izmērs issues.label.filter_sort.reverse_by_size=Lielākais izmērs issues.num_participants=%d dalībnieki -issues.attachment.open_tab=`Noklikšķiniet, lai apskatītos "%s" jaunā logā` -issues.attachment.download=`Noklikšķiniet, lai lejupielādētu "%s"` +issues.attachment.open_tab=Noklikšķiniet, lai apskatītos "%s" jaunā logā +issues.attachment.download=Noklikšķiniet, lai lejupielādētu "%s" issues.subscribe=Abonēt issues.unsubscribe=Atrakstīties issues.lock=Slēgt komentēšanu @@ -1384,32 +1344,32 @@ issues.delete.text=Vai patiešām vēlaties dzēst šo problemu? (Neatgriezenisk issues.tracker=Laika uzskaite issues.start_tracking_short=Uzsākt taimeri issues.start_tracking=Uzsākt laika uzskaiti -issues.start_tracking_history=` uzsāka darbu %s` +issues.start_tracking_history=" uzsāka darbu %s" issues.tracker_auto_close=Taimeris tiks automātiski apturēts, kad šī problēma tiks aizvērta -issues.tracking_already_started=`Jau ir uzsākta laika uzskaite par citu problēmu!` +issues.tracking_already_started=Jau ir uzsākta laika uzskaite par citu problēmu! issues.stop_tracking=Apturēt taimeri -issues.stop_tracking_history=` beidza strādāt %s` +issues.stop_tracking_history=" beidza strādāt %s" issues.cancel_tracking=Atmest -issues.cancel_tracking_history=` atcēla laika uzskaiti %s` +issues.cancel_tracking_history=" atcēla laika uzskaiti %s" issues.add_time=Manuāli pievienot laiku issues.del_time=Dzēst šo laika žurnāla ierakstu issues.add_time_short=Pievienot laiku issues.add_time_cancel=Atcelt -issues.add_time_history=` pievienoja patērēto laiku %s` -issues.del_time_history=`dzēsts patērētais laiks %s` +issues.add_time_history=" pievienoja patērēto laiku %s" +issues.del_time_history=dzēsts patērētais laiks %s issues.add_time_hours=Stundas issues.add_time_minutes=Minūtes issues.add_time_sum_to_small=Nav norādīts laiks. issues.time_spent_total=Kopējais patērētais laiks -issues.time_spent_from_all_authors=`Kopējais patērētais laiks: %s` +issues.time_spent_from_all_authors=Kopējais patērētais laiks: %s issues.due_date=Izpildes termiņš issues.invalid_due_date_format=Izpildes termiņam ir jābūt formāta 'yyyy-mm-dd'. issues.error_modifying_due_date=Neizdevās izmainīt izpildes termiņu. issues.error_removing_due_date=Neizdevās noņemt izpildes termiņu. issues.push_commit_1=iesūtīja %d revīziju %s issues.push_commits_n=iesūtīja %d revīzijas %s -issues.force_push_codes=`veica piespiedu izmaiņu iesūtīšanu atzarā %[1]s no revīzijas %[2]s uz %[4]s %[6]s` -issues.due_date_form=yyyy-mm-dd +issues.force_push_codes=veica piespiedu izmaiņu iesūtīšanu atzarā %[1]s no revīzijas %[2]s uz %[4]s %[6]s +issues.due_date_form=dd.mm.yyyy issues.due_date_form_add=Pievienot izpildes termiņu issues.due_date_form_edit=Labot issues.due_date_form_remove=Noņemt @@ -1427,8 +1387,8 @@ issues.dependency.add=Pievienot atkarību… issues.dependency.cancel=Atcelt issues.dependency.remove=Noņemt issues.dependency.remove_info=Noņemt šo atkarību -issues.dependency.added_dependency=`pievienoja jaunu atkarību %s` -issues.dependency.removed_dependency=`noņema atkarību %s` +issues.dependency.added_dependency=pievienoja jaunu atkarību %s +issues.dependency.removed_dependency=noņema atkarību %s issues.dependency.pr_closing_blockedby=Šī izmaiņu pieprasījuma sapludināšanu bloķē sekojošas problēmas issues.dependency.issue_closing_blockedby=Šīs problēmas aizvēršanu bloķē sekojošas problēmas issues.dependency.issue_close_blocks=Šī problēma bloķē sekojošu problēmu aizvēršanu @@ -1481,10 +1441,8 @@ issues.content_history.delete_from_history=Dzēst no vēstures issues.content_history.delete_from_history_confirm=Vai dzēst no vēstures? issues.content_history.options=Iespējas issues.reference_link=Atsaucas uz: %s - compare.compare_base=pamata compare.compare_head=salīdzināt - pulls.desc=Iespējot izmaiņu pieprasījumus un koda recenzēšanu. pulls.new=Jauns izmaiņu pieprasījums pulls.view=Skatīties izmaiņu pieprasījumu @@ -1504,11 +1462,11 @@ pulls.filter_branch=Filtrēt atzarus pulls.no_results=Nekas netika atrasts. pulls.nothing_to_compare=Nav ko salīdzināt, jo bāzes un salīdzināmie atzari ir vienādi. pulls.nothing_to_compare_and_allow_empty_pr=Šie atzari ir vienādi. Izveidotais izmaiņu pieprasījums būs tukšs. -pulls.has_pull_request=`Izmaiņu pieprasījums starp šiem atzariem jau eksistē: %[2]s#%[3]d` +pulls.has_pull_request=Izmaiņu pieprasījums starp šiem atzariem jau eksistē: %[2]s#%[3]d pulls.create=Izveidot izmaiņu pieprasījumu pulls.title_desc=vēlas sapludināt %[1]d revīzijas no %[2]s uz %[3]s pulls.merged_title_desc=sapludināja %[1]d revīzijas no %[2]s uz %[3]s %[4]s -pulls.change_target_branch_at=`nomainīja mērķa atzaru no %s uz %s %s` +pulls.change_target_branch_at=nomainīja mērķa atzaru no %s uz %s %s pulls.tab_conversation=Saruna pulls.tab_commits=Revīzijas pulls.tab_files=Izmainītie faili @@ -1520,7 +1478,7 @@ pulls.manually_merged=Manuāli sapludināts pulls.manually_merged_as=Izmaiņu pieprasījums tika sapludināts manuāli ar revīziju %[2]s. pulls.is_closed=Izmaiņu pieprasījums tika aizvērts. pulls.has_merged=Šis izmaiņu pieprasījums tika veiksmīgi sapludināts. -pulls.title_wip_desc=`Sāciet virsrakstu ar %s, lai ierobežotu, ka izmaiņu pieprasījums netīšām tiktu sapludināts.` +pulls.title_wip_desc=Sāciet virsrakstu ar %s, lai ierobežotu, ka izmaiņu pieprasījums netīšām tiktu sapludināts. pulls.cannot_merge_work_in_progress=Šis izmaiņu pieprasījums ir atzīmēts, ka pie tā vēl notiek izstrāde. pulls.still_in_progress=Joprojām notiek izstrāde? pulls.add_prefix=Pievienot %s prefiksu @@ -1551,7 +1509,6 @@ pulls.reject_count_n=%d pieprasītas izmaiņas pulls.waiting_count_1=nepieciešama %d recenzija pulls.waiting_count_n=nepieciešamas %d recenzijas pulls.wrong_commit_id=revīzijas identifikātoram ir jābūt revīzijas identifikatoram no mērķa atzara - pulls.no_merge_desc=Šo izmaiņu pieprasījumu nav iespējams sapludināt, jo nav atļauts neviens sapludināšanas veids. pulls.no_merge_helper=Lai sapludinātu šo izmaiņu pieprasījumu, iespējojiet vismaz vienu sapludināšanas veidu repozitorija iestatījumos vai sapludiniet to manuāli. pulls.no_merge_wip=Šo izmaiņu pieprasījumu nav iespējams sapludināt, jo tas ir atzīmēts, ka darbs pie tā vēl nav pabeigts. @@ -1564,7 +1521,6 @@ pulls.squash_merge_pull_request=Izveidot saspiešanas revīziju pulls.merge_manually=Manuāli sapludināts pulls.merge_commit_id=Sapludināšanas revīzijas ID pulls.require_signed_wont_sign=Atzarā var iesūtīt tikai parakstītas revīzijas, bet sapludināšanas revīzijas netiks parakstīta - pulls.invalid_merge_option=Nav iespējams izmantot šādu sapludināšanas veidu šim izmaiņu pieprasījumam. pulls.merge_conflict=Sapludināšana neizdevās: Veicot sapludināšanu, radās konflikts. Mēģiniet izmantot citu sapludināšanas stratēģiju pulls.merge_conflict_summary=Kļūdas paziņojums @@ -1577,7 +1533,7 @@ pulls.head_out_of_date=Sapludināšana neizdevās: sapludināšanas laikā, bāz pulls.push_rejected=Sapludināšana neizdevās: iesūtīšana tika noraidīta. Pārbaudiet git āķus šim repozitorijam. pulls.push_rejected_summary=Pilns noraidīšanas ziņojums pulls.push_rejected_no_message=Sapludināšana neizdevās: Izmaiņu iesūtīšana tika noraidīta, bet serveris neatgrieza paziņojumu.
    Pārbaudiet git āķus šim repozitorijam -pulls.open_unmerged_pull_exists=`Jūs nevarat veikt atkārtotas atvēršanas darbību, jo jau eksistē izmaiņu pieprasījums (#%d) ar šādu sapludināšanas informāciju.` +pulls.open_unmerged_pull_exists=Jūs nevarat veikt atkārtotas atvēršanas darbību, jo jau eksistē izmaiņu pieprasījums (#%d) ar šādu sapludināšanas informāciju. pulls.status_checking=Dažas pārbaudes vēl tiek veiktas pulls.status_checks_success=Visas pārbaudes ir veiksmīgas pulls.status_checks_warning=Dažas pārbaudes ziņoja brīdinājumus @@ -1590,27 +1546,22 @@ pulls.update_branch_rebase=Atjaunot atzaru, izmantojot, pārbāzēšanu pulls.update_branch_success=Atzara atjaunināšana veiksmīgi pabeigta pulls.update_not_allowed=Jums nav tiesību veikt atzara atjaunošanu pulls.outdated_with_base_branch=Atzars ir novecojis salīdzinot ar bāzes atzaru -pulls.closed_at=`aizvēra šo izmaiņu pieprasījumu %[2]s` -pulls.reopened_at=`atkārtoti atvēra šo izmaiņu pieprasījumu %[2]s` -pulls.merge_instruction_hint=`Varat aplūkot arī komandrindas instrukcijas.` +pulls.closed_at=aizvēra šo izmaiņu pieprasījumu %[2]s +pulls.reopened_at=atkārtoti atvēra šo izmaiņu pieprasījumu %[2]s +pulls.merge_instruction_hint=Varat aplūkot arī komandrindas instrukcijas. pulls.merge_instruction_step1_desc=Projekta repozitorijā izveidojiet jaunu jaunu atzaru un pārbaudiet savas izmaiņas. pulls.merge_instruction_step2_desc=Sapludināt izmaiņas un atjaunot tās Gitea. - pulls.auto_merge_button_when_succeed=(Kad pārbaudes veiksmīgas) pulls.auto_merge_when_succeed=Automātiski sapludināt, kad visas pārbaudes veiksmīgas pulls.auto_merge_newly_scheduled=Šis izmaiņu pieprasījums tika ieplānots automātiskajai sapludināšanai, kas visas pārbaudes būs veiksmīgas. pulls.auto_merge_has_pending_schedule=%[1]s ieplānoja šī izmaiņu pieprasījuma automātisko sapludināšanu, kad visas pārbaudes tiks pabeigtas %[2]s. - pulls.auto_merge_cancel_schedule=Atcelt automātisko sapludināšanu pulls.auto_merge_not_scheduled=Šo izmaiņu pieprasījumu nav ieplānots automātiski sapludināt. pulls.auto_merge_canceled_schedule=Automātiskā sapludināšana šim izmaiņu pieprasījumam tika atcelta. - -pulls.auto_merge_newly_scheduled_comment=`ieplānoja automātisko sapludināšanu šim izmaiņu pieprasījumam, kad visas pārbaudes būs veiksmīgas %[1]s` -pulls.auto_merge_canceled_schedule_comment=`atcēla automātisko sapludināšanu šim izmaiņu pieprasījumam %[1]s` - +pulls.auto_merge_newly_scheduled_comment=ieplānoja automātisko sapludināšanu šim izmaiņu pieprasījumam, kad visas pārbaudes būs veiksmīgas %[1]s +pulls.auto_merge_canceled_schedule_comment=atcēla automātisko sapludināšanu šim izmaiņu pieprasījumam %[1]s pulls.delete.title=Dzēst šo izmaiņu pieprasījumu? pulls.delete.text=Vai patiešām vēlaties dzēst šo izmaiņu pieprasījumu? (Neatgriezeniski tiks izdzēsts viss saturs. Apsveriet iespēju to aizvērt, ja vēlaties informāciju saglabāt vēsturei) - milestones.new=Jauns atskaites punkts milestones.closed=Aizvērts %s milestones.update_ago=Atjaunots pirms %s @@ -1640,7 +1591,6 @@ milestones.filter_sort.least_complete=Vismazāk pabeigtais milestones.filter_sort.most_complete=Visvairāk pabeigtais milestones.filter_sort.most_issues=Visvairāk problēmu milestones.filter_sort.least_issues=Vismazāk problēmu - signing.will_sign=Šī revīzijas tiks parakstīta ar atslēgu '%s' signing.wont_sign.error=Notika kļūda pārbaudot vai revīzija var tikt parakstīta signing.wont_sign.nokey=Nav pieejama atslēga ar ko parakstīt šo revīziju @@ -1654,10 +1604,8 @@ signing.wont_sign.headsigned=Sapludināšanas revīzija netiks parakstīta, jo p signing.wont_sign.commitssigned=Sapludināšanas revīzija netiks parakstīta, jo visas saistītās revīzijas nav parakstītas signing.wont_sign.approved=Sapludināsanas revīzija netiks parakstīta, jo izmaiņu pieprasījums nav apstiprināts signing.wont_sign.not_signed_in=Jūs neesat autorizējies - ext_wiki=Piekļuve ārējai vikivietnei ext_wiki.desc=Ārējā vikivietne norāda uz ārējo vikivietnes adresi. - wiki=Vikivietne wiki.welcome=Laipni lūgti vikivietnē. wiki.welcome_desc=Vikivietne ļauj Jums un Jūsu līdzstrādniekiem viegli dokumentēt projektu. @@ -1681,7 +1629,6 @@ wiki.reserved_page=Vikivietnes lapas nosaukums '%s' ir rezervēts. wiki.pages=Lapas wiki.last_updated=Pēdējo reizi labota %s wiki.page_name_desc=Ievadiet vikivietnes lapas nosaukumu. Speciālie nosaukumi ir: 'Home', '_Sidebar' un '_Footer'. - activity=Aktivitāte activity.period.filter_label=Laika periods: activity.period.daily=1 diena @@ -1747,7 +1694,6 @@ activity.git_stats_addition_n=%d pievienošanas activity.git_stats_and_deletions=un activity.git_stats_deletion_1=%d dzēšana activity.git_stats_deletion_n=%d dzēšanas - search=Meklēt search.search_repo=Meklēšana repozitorijā search.fuzzy=Aptuveni @@ -1755,7 +1701,6 @@ search.match=Precīzi search.results=Meklēšanas rezultāti nosacījumam "%s" repozitorijā %s search.code_no_results=Netika atrasts pirmkods, kas atbilstu kritērijiem. search.code_search_unavailable=Pašlaik koda meklēšana nav pieejama. Sazinieties ar lapas administratoru. - settings=Iestatījumi settings.desc=Iestatījumi ir vieta, kur varat pārvaldīt repozitorija iestatījumus settings.options=Repozitorijs @@ -2057,10 +2002,10 @@ settings.dismiss_stale_approvals=Pieprasīt apstiprinājumus jaunākajām izmai settings.dismiss_stale_approvals_desc=Kad tiek iesūtītas jaunas revīzijas, kas izmaina izmaiņu pieprasījuma saturu, iepriekšējie apstiprinājumi tiks atzīmēti kā novecojuši un būs nepieciešams apstiprināt tos atkāroti. settings.require_signed_commits=Pieprasīt parakstītas revīzijas settings.require_signed_commits_desc=Noraidīt iesūtītās izmaiņas šim atzaram, ja tās nav parakstītas vai nav iespējams pārbaudīt. -settings.protect_protected_file_patterns=Aizsargāto failu šablons (vairākus var norādīt atdalot ar semikolu '\;'): -settings.protect_protected_file_patterns_desc=Aizsargātie faili, ko nevar mainīt, pat ja lietotājam ir tiesības veidot jaunus, labot vai dzēst failus šajā atzarā. Vairākus šablons ir iespējams norādīt atdalot tos ar semikolu ('\;'). Sīkāka informācija par šabloniem pieejama github.com/gobwas/glob dokumentācijā. Piemēram, .drone.yml, /docs/**/*.txt. -settings.protect_unprotected_file_patterns=Neaizsargāto failu šablons (vairākus var norādīt atdalot ar semikolu '\;'): -settings.protect_unprotected_file_patterns_desc=Neaizsargātie faili, ko iespējams mainīt apejot iesūtīšanas ierobežojumus, ja lietotājam ir tiesības iesūtīt izmaiņas šajā atzarā. Vairākus šablons ir iespējams norādīt atdalot tos ar semikolu ('\;'). Sīkāka informācija par šabloniem pieejama github.com/gobwas/glob dokumentācijā. Piemēram, .drone.yml, /docs/**/*.txt. +settings.protect_protected_file_patterns=Aizsargāto failu šablons (vairākus var norādīt atdalot ar semikolu ';'): +settings.protect_protected_file_patterns_desc=Aizsargātie faili, ko nevar mainīt, pat ja lietotājam ir tiesības veidot jaunus, labot vai dzēst failus šajā atzarā. Vairākus šablons ir iespējams norādīt atdalot tos ar semikolu (';'). Sīkāka informācija par šabloniem pieejama github.com/gobwas/glob dokumentācijā. Piemēram, .drone.yml, /docs/**/*.txt. +settings.protect_unprotected_file_patterns=Neaizsargāto failu šablons (vairākus var norādīt atdalot ar semikolu ';'): +settings.protect_unprotected_file_patterns_desc=Neaizsargātie faili, ko iespējams mainīt apejot iesūtīšanas ierobežojumus, ja lietotājam ir tiesības iesūtīt izmaiņas šajā atzarā. Vairākus šablons ir iespējams norādīt atdalot tos ar semikolu (';'). Sīkāka informācija par šabloniem pieejama github.com/gobwas/glob dokumentācijā. Piemēram, .drone.yml, /docs/**/*.txt. settings.add_protected_branch=Iespējot aizsargāšanu settings.delete_protected_branch=Atspējot aizsargāšanu settings.update_protect_branch_success=Atzara aizsardzība atzaram '%s' tika saglabāta. @@ -2140,7 +2085,6 @@ settings.rename_branch_success=Atzars %s tika veiksmīgi pārsaukts par %s. settings.rename_branch_from=no vecā atzara nosaukuma settings.rename_branch_to=jaunais atzara nosaukums settings.rename_branch=Pārsaukt atzaru - diff.browse_source=Pārlūkot izejas kodu diff.parent=vecāks diff.commit=revīzija @@ -2192,7 +2136,6 @@ diff.image.side_by_side=Blakus diff.image.swipe=Pārvelkot diff.image.overlay=Pārklājoši diff.has_escaped=Šajā līnijā ir paslēpti unikoda simboli - releases.desc=Pārvaldiet projekta versijas un lejupielādes. release.releases=Laidieni release.detail=Laidiena papildus informācija @@ -2234,7 +2177,6 @@ release.downloads=Lejupielādes release.download_count=Lejupielādes: %s release.add_tag_msg=Izmantot laidiena nosaukumu un saturu kā taga aprakstu. release.add_tag=Izveidot tikai tagu - branch.name=Atzara nosaukums branch.search=Meklēt atzarus branch.already_exists=Atzars ar nosaukumu '%s' jau eksistē. @@ -2266,25 +2208,69 @@ branch.create_branch_operation=Izveidot atzaru branch.new_branch=Izveidot jaunu atzaru branch.new_branch_from=Izveidot jaunu atzaru no '%s' branch.renamed=Atzars %s tika pārsaukts par %s. - tag.create_tag=Izveidot tagu %s tag.create_tag_operation=Izveidot tagu tag.confirm_create_tag=Izveidot tagu tag.create_tag_from=Izveidot tagu no '%s' - tag.create_success=Tags '%s' tika izveidots. - topic.manage_topics=Pārvaldīt tēmas topic.done=Gatavs topic.count_prompt=Nevar pievienot vairāk kā 25 tēmas topic.format_prompt=Tēmai ir jāsākas ar burtu vai ciparu, tā var saturēt domu zīmes ('-') un var būt līdz 35 simboliem gara. - find_file.go_to_file=Iet uz failu find_file.no_matching=Atbilstošs fails netika atrasts - error.csv.too_large=Nevar attēlot šo failu, jo tas ir pārāk liels. error.csv.unexpected=Nevar attēlot šo failu, jo tas satur neparedzētu simbolu %d. līnijas %d. kolonnā. error.csv.invalid_field_count=Nevar attēlot šo failu, jo tas satur nepareizu skaitu ar laukiem %d. līnijā. +more_operations=Vairāk darbību +cite_this_repo=Citēt šo repozitoriju +invisible_runes_header=Šis fails satur satur neredzamus unikoda simbolus! +invisible_runes_description=Šis fails satur neredzamus unikoda simbolus, kas var mainīt kā saturs tiek attēlots. Ja tie ir izmantoti ar pamatotu nodumu, tad varat ignorēt šo brīdinājumu. Izmantojiet Kodēt pogu, lai parādītu šos neredzamos simbolus. +ambiguous_runes_header=Šis fails satur neviennozīmīgus unikoda simbolus! +ambiguous_runes_description=Šis fails satur nevienozīmīgus unikoda simbolus, kas var būt mulsinoši un grūti atšķirami. Ja tie ir izmantoti ar pamatotu nodumu, tad varat ignorēt šo brīdinājumu. Izmantojiet Kodēt pogu, lai parādītu šos neredzamos simbolus. +invisible_runes_line=Šī līnija satur neredzamus unikoda simbolus +ambiguous_runes_line=Šī līnija satur neviennozīmīgus unikoda simbolus +ambiguous_character=%[1]c [U+%04[1]X] var tikt sajaukts ar %[2]c [U+%04[2]X] +editor.new_branch_name=Jaunā atzara nosaukums šai revīzijai +commit.operations=Darbības +projects.card_type.desc=Kartītes priekšskatījums +projects.card_type.images_and_text=Attēli un teksts +projects.card_type.text_only=Tikai teksts +issues.choose.ignore_invalid_templates=Kļūdainās sagataves tika izlaistas +issues.choose.invalid_templates=%v ķļūdaina sagatave(s) atrastas +issues.filter_project=Projektus +issues.filter_project_all=Visi projekti +issues.filter_project_none=Nav projektu +issues.filter_poster=Autors +issues.filter_poster_no_select=Visi autori +issues.action_check=Atzīmēt/Notīrīt +issues.action_check_all=Atzīmēt/Notīrīt visus ierakstus +issues.label_exclusive=Ekskluzīvs +issues.label_exclusive_desc=Nosauciet etiķeti grupa/nosaukums, lai grupētu etiķētes un varētu norādīt tās kā ekskluzīvas ar citām grupa/ etiķetēm. +issues.label_exclusive_warning=Jebkura konfliktējoša ekskluzīvas grupas etiķete tiks noņemta, labojot pieteikumu vai izmaiņu pietikumu etiķetes. +pulls.clear_merge_message=Notīrīt sapludināšanas ziņojumu +pulls.clear_merge_message_hint=Notīrot sapludināšanas ziņojumu tiks noņemts tikai pats ziņojums, bet tiks paturēti ģenerētie git ziņojumu, kā "Co-Authored-By …". +search.type.tooltip=Meklēšanas veids +search.fuzzy.tooltip=Iekļaut meklēšanas rezultātos arī aptuvenas sakritības +search.match.tooltip=Iekļaut meklēšanas rezultātos tikai precīzas sakritības +settings.branches.add_new_rule=Pievienot jaunu noteikumu +settings.pulls.default_allow_edits_from_maintainers=Atļaut uzturētājiem labot pēc noklusējuma +settings.releases_desc=Iespējot repozitorija laidienus +settings.actions_desc=Iespējot repozitorija darbības +settings.add_collaborator_owner=Nevar pievienot īpašnieku kā līdzstrādnieku. +settings.event_wiki=Vikivietni +settings.event_wiki_desc=Vikivietnes lapa izveidota, pārsaukta, labota vai dzēsta. +settings.authorization_header=Autorizācijas galvene +settings.authorization_header_desc=Tiks iekļauta kā autorizācijas galvenei pieprasījumiem, ja ir norādīta. Piemēram: %s. +settings.protected_branch.save_rule=Saglabāt noteikumu +settings.protected_branch.delete_rule=Dzēst noteikumu +settings.protect_branch_name_pattern=Aizsargātā zara šablons +settings.remove_protected_branch_failed=Neizdevās izdzēst atzara '%s' aizsardzību. +settings.merge_style_desc=Sapludināšanas veidi +settings.protected_branch_required_rule_name=Nav norādīts noteikuma nosaukums +settings.protected_branch_duplicate_rule_name=Dublējošs noteikuma nosaukumu +release.releases_for=Repozitorja %s laidieni +release.tags_for=Repozitorija %s tagi [org] org_name_holder=Organizācijas nosaukums @@ -2307,11 +2293,9 @@ team_access_desc=Piekļuve repozitorijiem team_permission_desc=Atļauja team_unit_desc=Atļaut piekļuvi repozitorija sadaļām team_unit_disabled=(Atspējots) - form.name_reserved=Organizācijas nosaukums '%s' ir rezervēts. form.name_pattern_not_allowed=Organizācijas nosaukums '%s' nav atļauts. form.create_org_not_allowed=Jums nav tiesību veidot jauno organizāciju. - settings=Iestatījumi settings.options=Organizācija settings.full_name=Pilns vārds, uzvārds @@ -2325,7 +2309,6 @@ settings.visibility.limited=Ierobežota (redzama tikai autorizētiem lietotājie settings.visibility.limited_shortname=Ierobežota settings.visibility.private=Privāta (redzama tikai organizācijas dalībniekiem) settings.visibility.private_shortname=Privāta - settings.update_settings=Mainīt iestatījumus settings.update_setting_success=Organizācijas iestatījumi tika saglabāti. settings.change_orgname_prompt=Ņemiet vērā: Mainot organizācijas nosaukumu tiks izmainītas šīs organizācijas saites. @@ -2338,9 +2321,7 @@ settings.confirm_delete_account=Apstiprināt dzēšanu settings.delete_org_title=Dzēst organizāciju settings.delete_org_desc=Organizācija tiks dzēsta neatgriezeniski. Vai turpināt? settings.hooks_desc=Pievienot tīmekļa āķus, kas nostrādās visiem repozitorijiem šajā organizācijā. - settings.labels_desc=Pievienojiet etiķetes, kas var tikt izmantotas visos šīs organizācijas repozitorijos. - members.membership_visibility=Dalībnieka redzamība: members.public=Redzams members.public_helper=padarīt slēptu @@ -2355,7 +2336,6 @@ members.leave=Atstāt members.leave.detail=Pamest organizāciju %s? members.invite_desc=Pievienot jaunu dalībnieku pie %s: members.invite_now=Uzaicināt tagad - teams.join=Pievienoties teams.leave=Atstāt teams.leave.detail=Pamest organizāciju %s? @@ -2402,6 +2382,13 @@ teams.all_repositories_helper=Šai komandai ir piekļuve visiem repozitorijiem. teams.all_repositories_read_permission_desc=Šī komanda piešķirt skatīšanās tiesības visiem repozitorijiem: komandas biedri var skatīties un klonēt visus organizācijas repozitorijus. teams.all_repositories_write_permission_desc=Šī komanda piešķirt labošanas tiesības visiem repozitorijiem: komandas biedri var skatīties un nosūtīt izmaiņas visiem organizācijas repozitorijiem. teams.all_repositories_admin_permission_desc=Šī komanda piešķirt administratora tiesības visiem repozitorijiem: komandas biedri var skatīties, nosūtīt izmaiņas un mainīt iestatījumus visiem organizācijas repozitorijiem. +members=Dalībnieki +code=Kods +teams.invite_team_member=Uzaicināt komandā "%s" +teams.invite_team_member.list=Neapstiprinātie uzaicinājumi +teams.invite.title=Jūs esat uzaicināts pievienoties komandai %s organizācijā %s. +teams.invite.by=Uzaicināja %s +teams.invite.description=Nospiediet pogu zemāk, lai pievienotos komandai. [admin] dashboard=Infopanelis @@ -2417,7 +2404,6 @@ monitor=Uzraudzība first_page=Pirmā last_page=Pēdējā total=Kopā: %d - dashboard.new_version_hint=Ir pieejama Gitea versija %s, pašreizējā versija %s. Papildus informācija par jauno versiju ir pieejama mājas lapā. dashboard.statistic=Kopsavilkums dashboard.operations=Uzturēšanas darbības @@ -2495,7 +2481,6 @@ dashboard.delete_old_actions=Dzēst visas darbības no datu bāzes dashboard.delete_old_actions.started=Uzsākta visu novecojušo darbību dzēšana no datu bāzes. dashboard.update_checker=Atjauninājumu pārbaudītājs dashboard.delete_old_system_notices=Dzēst vecos sistēmas paziņojumus no datubāzes - users.user_manage_panel=Lietotāju kontu pārvaldība users.new_account=Izveidot lietotāja kontu users.name=Lietotājvārds @@ -2549,7 +2534,6 @@ users.list_status_filter.is_prohibit_login=Nav atļauta autorizēšanās users.list_status_filter.not_prohibit_login=Atļaut autorizāciju users.list_status_filter.is_2fa_enabled=2FA iespējots users.list_status_filter.not_2fa_enabled=2FA nav iespējots - emails.email_manage_panel=Lietotāju e-pastu pārvaldība emails.primary=Primārais emails.activated=Aktivizēts @@ -2562,13 +2546,11 @@ emails.not_updated=Neizdevās atjaunot pieprasīto e-pasta adresi: %v emails.duplicate_active=E-pasta adrese jau ir aktīva citam lietotājam. emails.change_email_header=Atjaunot e-pasta rekvizītus emails.change_email_text=Vai patiešām vēlaties atjaunot šo e-pasta adresi? - orgs.org_manage_panel=Organizāciju pārvaldība orgs.name=Nosaukums orgs.teams=Komandas orgs.members=Dalībnieki orgs.new_orga=Jauna organizācija - repos.repo_manage_panel=Repozitoriju pārvaldība repos.unadopted=Nepārņemtie repozitoriji repos.unadopted.no_more=Netika atrasts neviens nepārņemtais repozitorijs @@ -2580,7 +2562,6 @@ repos.stars=Atzīmētās zvaigznītes repos.forks=Atdalītie repos.issues=Problēmas repos.size=Izmērs - packages.package_manage_panel=Pakotņu pārvaldība packages.total_size=Kopējais izmērs: %s packages.owner=Īpašnieks @@ -2591,17 +2572,14 @@ packages.type=Veids packages.repository=Repozitorijs packages.size=Izmērs packages.published=Publicēts - defaulthooks=Noklusētie tīmekļa āķi defaulthooks.desc=Tīmekļa āķi ļauj paziņot ārējiem servisiem par noteiktiem notikumiem, kas notiek Gitea. Kad iestāsies kāds notikums, katram ārējā servisa URL tiks nosūtīts POST pieprasījums. Šeit izveidotie tīmekļa āķi tiks pievienoti visiem jaunajajiem repozitorijiem. Lai uzzinātu sīkāk skatieties tīmekļa āķu rokasgrāmatā. defaulthooks.add_webhook=Pievienot noklusēto tīmekļa āķi defaulthooks.update_webhook=Mainīt noklusēto tīmekļa āķi - systemhooks=Sistēmas tīmekļa āķi systemhooks.desc=Tīmekļa āķi automātiski veic HTTP POST pieprasījumus uz serveri, kad notiek noteikti Gitea notikumi. Tīmekļa āķi izpildīsies uz visu servera repozitoriju notikumiem, tāpēc būtu jāņem vērā, ka tas var radīt ātrdarbības problēmas. Vairāk par tiem var uzzināt tīmekļa āķu dokumentācijā. systemhooks.add_webhook=Pievienot sistēmas tīmekļa āķi systemhooks.update_webhook=Mainīt sistēmas tīmekļa āķi - auths.auth_manage_panel=Autentifikācijas avotu pārvaldība auths.new=Pievienot autentifikācijas avotu auths.name=Nosaukums @@ -2716,7 +2694,6 @@ auths.still_in_used=Šo autentificēšanās avotu joprojām izmanto viens vai va auths.deletion_success=Autentifikācijas avots tika atjaunots. auths.login_source_exist=Autentifikācijas avots ar nosaukumu '%s' jau eksistē. auths.login_source_of_type_exist=Autentifikācijas avots ar šādu veidu jau eksistē. - config.server_config=Servera konfigurācija config.app_name=Vietnes nosaukums config.app_ver=Gitea versija @@ -2735,7 +2712,6 @@ config.static_file_root_path=Statisko failu atrašanās vieta config.log_file_root_path=Žurnalizēšanas ceļš config.script_type=Skripta veids config.reverse_auth_user=Reversā lietotāja autentifikācija - config.ssh_config=SSH konfigurācija config.ssh_enabled=Iespējots config.ssh_start_builtin_server=Izmantot iebūvēto serveri @@ -2747,12 +2723,10 @@ config.ssh_key_test_path=Atslēgu pārbaudes ceļš config.ssh_keygen_path=Keygen ('ssh-keygen') ceļš config.ssh_minimum_key_size_check=Minimālā atslēgas lieluma pārbaude config.ssh_minimum_key_sizes=Minimālais atslēgas lielums - config.lfs_config=LFS konfigurācija config.lfs_enabled=Iespējots config.lfs_content_path=LFS satura ceļš config.lfs_http_auth_expiry=LFS HTTP autorizācijas beigšanās - config.db_config=Datu bāzes konfigurācija config.db_type=Veids config.db_host=Resursdators @@ -2761,7 +2735,6 @@ config.db_user=Lietotājvārds config.db_schema=Shēma config.db_ssl_mode=SSL config.db_path=Ceļš - config.service_config=Pakalpojuma konfigurācija config.register_email_confirm=Reģistrējoties pieprasīt apstiprināt e-pasta adresi config.disable_register=Atspējot lietotāju reģistrāciju @@ -2784,12 +2757,10 @@ config.default_allow_only_contributors_to_track_time=Atļaut tikai dalībniekiem config.no_reply_address=Neatbildēt e-pasta adreses domēns config.default_visibility_organization=Noklusētā redzamība jaunām organizācijām config.default_enable_dependencies=Pēc noklusējuma iespējot problēmu atkarības - config.webhook_config=Tīkla āķu konfigurācija config.queue_length=Rindas garums config.deliver_timeout=Piegādes noildze config.skip_tls_verify=Izlaist TLS pārbaudi - config.mailer_config=Pasta sūtītāja konfigurācija config.mailer_enabled=Iespējota config.mailer_enable_helo=Iespējot HELO @@ -2807,16 +2778,13 @@ config.test_email_placeholder=E-pasts (piemēram, test@example.com) config.send_test_mail=Nosūtīt pārbaudes e-pastu config.test_mail_failed=Neizdevās nosūtīt pārbaudes e-pastu uz '%s': %v config.test_mail_sent=Pārbaudes e-pasts tika nosūtīts uz '%s'. - config.oauth_config=OAuth konfigurācija config.oauth_enabled=Iespējots - config.cache_config=Kešatmiņas konfigurācija config.cache_adapter=Kešatmiņas adapteris config.cache_interval=Kešatmiņas intervāls config.cache_conn=Kešatmiņas pieslēguma parametri config.cache_item_ttl=Kešatmiņas vienuma TTL - config.session_config=Sesijas konfigurācja config.session_provider=Sesijas nodrošinātājs config.provider_config=Pakalpojumu sniedzēja konfigurācija @@ -2825,12 +2793,10 @@ config.gc_interval_time=GC laika intervāls config.session_life_time=Sesijas ilgums config.https_only=Tikai HTTPS config.cookie_life_time=Sīkdatņu glabāšanas ilgums - config.picture_config=Attēlu un profila bilžu konfigurācija config.picture_service=Lokāli attēli config.disable_gravatar=Atspējot Gravatar config.enable_federated_avatar=Iespējot apvienotās profila bildes - config.git_config=Git konfigurācija config.git_disable_diff_highlight=Atspējot salīdzināšanas sintakses iekrāsošanu config.git_max_diff_lines=Maksimālais salīdzināmo rindu skaits vienam failam @@ -2842,7 +2808,6 @@ config.git_mirror_timeout=Spoguļa atjaunošanas noilgums config.git_clone_timeout=Klonēšanas darbības noilgums config.git_pull_timeout=Izmaiņu saņemšanas darbības noilgums config.git_gc_timeout=GC darbības noilgums - config.log_config=Žurnalizēšanas konfigurācija config.log_mode=Žurnalizēšanas veids config.own_named_logger=Pielāgots žurnalizētājs @@ -2854,8 +2819,6 @@ config.access_log_mode=Piekļuves žurnalizēšanas veids config.access_log_template=Šablons config.xorm_log_mode=XORM žurnalizēšanas veids config.xorm_log_sql=SQL žurnalizēšana - - monitor.cron=Cron uzdevumi monitor.name=Nosaukums monitor.schedule=Grafiks @@ -2906,7 +2869,6 @@ monitor.queue.pool.pause.submit=Apturēt rindu monitor.queue.pool.resume.title=Atsākt rindu monitor.queue.pool.resume.desc=Noteikt šai rindai atsākt darbu monitor.queue.pool.resume.submit=Atsākt rindu - monitor.queue.settings.title=Pūla iestatījumi monitor.queue.settings.desc=Pūli var dinamiski augt un paildzinātu atbildi uz strādņu rindas bloķēšanu. Šis izmaiņas ietekmēs pašreizējās strādņu grupas. monitor.queue.settings.timeout=Pagarināt noildzi @@ -2922,7 +2884,6 @@ monitor.queue.settings.submit=Saglabāt iestatījumus monitor.queue.settings.changed=Iestatījumi saglabāti monitor.queue.settings.blocktimeout=Pašreizējās grupas noildze monitor.queue.settings.blocktimeout.value=%[1]v - monitor.queue.pool.none=Rindai nav pūla monitor.queue.pool.added=Strādņu grupa pievienota monitor.queue.pool.max_changed=Maksimālais strādņu skaits mainīts @@ -2932,7 +2893,6 @@ monitor.queue.pool.cancel=Izslēgt strādņu grupu monitor.queue.pool.cancelling=Strādņu grupa tiek izslēgta monitor.queue.pool.cancel_notices=Izslēgt šo grupu ar %s strādņiem? monitor.queue.pool.cancel_desc=Atstājot rindu bez nevienas strādņu grupas, var radīt pieprasījumu bloķēšanos. - notices.system_notice_list=Sistēmas paziņojumi notices.view_detail_header=Skatīt paziņojuma detaļas notices.actions=Darbības @@ -2947,20 +2907,33 @@ notices.type_2=Uzdevums notices.desc=Apraksts notices.op=Op. notices.delete_success=Sistēmas paziņojumi ir dzēsti. +dashboard.gc_lfs=Veikt atkritumu uzkopšanas darbus LFS meta objektiem +dashboard.stop_zombie_tasks=Apturēt zombija uzdevumus +dashboard.stop_endless_tasks=Apturēt nepārtrauktus uzdevumus +dashboard.cancel_abandoned_jobs=Atcelt pamestus darbus +packages.unreferenced_size=Izmērs bez atsauces: %s +auths.oauth2_map_group_to_team=Sasaistīt prasības grupas ar organizācijas komandām. (Neobligāts - nepieciešams prasības nosaukums augstāk) +auths.oauth2_map_group_to_team_removal=Noņemt lietotājus no sinhronizētajām komandām, ja lietotājs nav piesaistīts attiecīgajai grupai. +auths.unable_to_initialize_openid=Nevarēja inicializēt OpenID Connect sliedzēju: %s +auths.invalid_openIdConnectAutoDiscoveryURL=Kļūdains automātiskās atklāšanas URL (jābūt korektam URL, kas sākas ar http:// vai https://) +config.get_setting_failed=Neizdevās izgūt iestatījumu "%s" +config.set_setting_failed=Neizdevās uzstādīt iestatījumu "%s" +monitor.queue.flush=Notīrīt strādnes +notices.operations=Darbības [action] create_repo=izveidoja repozitoriju %s rename_repo=pārsauca repozitoriju no %[1]s uz %[3]s commit_repo=iesūtīja izmaiņas %[3]s repozitorijā %[4]s -create_issue=`atvēra problēmu %[3]s#%[2]s` -close_issue=`aizvēra problēmu %[3]s#%[2]s` -reopen_issue=`atkārtoti atvēra problēmu %[3]s#%[2]s` -create_pull_request=`izveidoja izmaiņu pieprasījumu %[3]s#%[2]s` -close_pull_request=`aizvēra izmaiņu pieprasījumu %[3]s#%[2]s` -reopen_pull_request=`atkārtoti atvēra izmaiņu pieprasījumu %[3]s#%[2]s` -comment_issue=`pievienoja komentāru problēmai %[3]s#%[2]s` -comment_pull=`pievienoja komentāru izmaiņu pieprasījumam %[3]s#%[2]s` -merge_pull_request=`sapludināja izmaiņu pieprasījumu %[3]s#%[2]s` +create_issue=atvēra problēmu %[3]s#%[2]s +close_issue=aizvēra problēmu %[3]s#%[2]s +reopen_issue=atkārtoti atvēra problēmu %[3]s#%[2]s +create_pull_request=izveidoja izmaiņu pieprasījumu %[3]s#%[2]s +close_pull_request=aizvēra izmaiņu pieprasījumu %[3]s#%[2]s +reopen_pull_request=atkārtoti atvēra izmaiņu pieprasījumu %[3]s#%[2]s +comment_issue=pievienoja komentāru problēmai %[3]s#%[2]s +comment_pull=pievienoja komentāru izmaiņu pieprasījumam %[3]s#%[2]s +merge_pull_request=sapludināja izmaiņu pieprasījumu %[3]s#%[2]s transfer_repo=mainīja repozitorija %s īpašnieku uz %s push_tag=iesūtīja tagu %[3]s repozitorijā %[4]s delete_tag=izdzēsa tagu %[2]s no %[3]s @@ -2971,14 +2944,15 @@ compare_commits_general=Salīdzināt revīzijas mirror_sync_push=ar spoguli sinhronizētas revīzijas %[3]s uz repozitoriju %[4]s mirror_sync_create=ar spoguli sinhronizēta jauna atsauce %[3]s uz repozitoriju %[4]s mirror_sync_delete=ar spoguli sinhronizēta un izdzēsta atsauce %[2]s repozitorijam %[3]s -approve_pull_request=`apstiprināja izmaiņu pieprasījumu %[3]s#%[2]s` -reject_pull_request=`ieteica izmaiņas izmaiņu pieprasījumam %[3]s#%[2]s` -publish_release=`izveidoja versiju "%[4]s" repozitorijā %[3]s` -review_dismissed=`noraidīja lietotāja %[4]s recenziju izmaiņu pieprasījumam %[3]s#%[2]s` +approve_pull_request=apstiprināja izmaiņu pieprasījumu %[3]s#%[2]s +reject_pull_request=ieteica izmaiņas izmaiņu pieprasījumam %[3]s#%[2]s +publish_release=izveidoja versiju "%[4]s" repozitorijā %[3]s +review_dismissed=noraidīja lietotāja %[4]s recenziju izmaiņu pieprasījumam %[3]s#%[2]s review_dismissed_reason=Iemesls: create_branch=izveidoja atzaru %[3]s repozitorijā %[4]s starred_repo=atzīmēja ar zvaigznīti %[2]s watched_repo=sāka sekot %[2]s +auto_merge_pull_request=automātiski sapludināja izmaiņu pieprasījumu %[3]s#%[2]s [tool] ago=pirms %s @@ -3018,6 +2992,9 @@ pin=Piespraust paziņojumu mark_as_read=Atzīmēt kā izlasītu mark_as_unread=Atzīmēt kā nelasītu mark_all_as_read=Atzīmēt visus kā izlasītus +subscriptions=Abonementi +watching=Skatās +no_subscriptions=Nav abonementu [gpg] default_key=Parakstīts ar noklusēto atslēgu @@ -3131,4 +3108,127 @@ settings.delete.description=Pakotne tiks neatgriezeniski izdzēsta. settings.delete.notice=Tiks dzēsts %s (%s). Šī darbība ir neatgriezeniska. Vai vēlaties turpināt? settings.delete.success=Pakotne tika izdzēsta. settings.delete.error=Neizdevās izdzēst pakotni. - +details.repository_site=Repozitorija lapa +details.documentation_site=Dokumentācijas lapa +cargo.registry=Uzstādiet šo reģistru Cargo konfigurācijas failā, piemēram, ~/.cargo/config.toml: +cargo.install=Lai instalētu Cargo pakotni, izpildiet sekojošu komandu: +cargo.documentation=Papildus informācija par Cargo reģistru pieejama dokumentācijā. +cargo.details.repository_site=Repozitorija lapa +cargo.details.documentation_site=Dokumentācijas lapa +chef.registry=Uzstādiet šo reģistru failā ~/.chef/config.rb: +chef.install=Lai instalētu pakotni, nepieciešams izpildīt sekojošu komandu: +chef.documentation=Papildus informācija par Chef reģistru pieejama dokumentācijā. +conda.registry=Uzstādiet šo reģistru kā Conda repozitoriju failā .condarc: +conda.install=Lai instalētu Conda pakotni, izpildiet sekojošu komandu: +conda.documentation=Papildus informācija par Conda reģistru pieejama dokumentācijā. +conda.details.repository_site=Repozitorija lapa +conda.details.documentation_site=Dokumentācijas lapa +container.digest=Īssavilkums: +vagrant.install=Lai pievienotu Vagrant kasti, izpildiet sekojošu komandu: +vagrant.documentation=Papildus informācija par Vagrant reģistru pieejama dokumentācijā. +owner.settings.cargo.title=Cargo reģistra inkdess +owner.settings.cargo.initialize=Inicializēt indeksu +owner.settings.cargo.initialize.description=Lai izmantotu Cargo reģistru, nepieciešams speciāls indeksa git repozitorijs. Šeit to var izveidot ar nepieciešamo konfigurāciju. +owner.settings.cargo.initialize.error=Neizdevās inicializēt Cargo indeksu: %v +owner.settings.cargo.initialize.success=Cargo indekss tika veiksmīgi inicializēts. +owner.settings.cargo.rebuild=Pārbūvēt indeksu +owner.settings.cargo.rebuild.description=Ja indekss neatbilst tajā saglabātajām Cargo pakotnē, to var pārbūvēt šeit. +owner.settings.cargo.rebuild.error=Neizdevās pārbūvēt Cargo indeksu: %v +owner.settings.cargo.rebuild.success=Cargo indekss tika veiksmīgi pārbūvēts. +owner.settings.cleanuprules.title=Pārvaldīt notīrīšanas noteikumus +owner.settings.cleanuprules.add=Pievienot notīrīšanas noteikumu +owner.settings.cleanuprules.edit=Labot notīrīšanas noteikumu +owner.settings.cleanuprules.none=Nav pieejams neviens notīrīšanas noteikums. Sīkāka informācija ir pieejama dokumentācijā. +owner.settings.cleanuprules.preview=Notīrīšānas noteikuma priekšskatījums +owner.settings.cleanuprules.preview.overview=Ir ieplānota %d paku dzēšana. +owner.settings.cleanuprules.preview.none=Notīrīšanas noteikumam neatbilst neviena pakotne. +owner.settings.cleanuprules.enabled=Iespējots +owner.settings.cleanuprules.pattern_full_match=Piešķirt šablonu visam pakotnes nosaukumam +owner.settings.cleanuprules.keep.title=Versijas, kas atbilst šiem noteikumiem tiks saglabātas, pat ja tās atbilst noņemšanas noteikumiem zemāk. +owner.settings.cleanuprules.keep.count=Saglabāt jaunāko versiju +owner.settings.cleanuprules.keep.count.1=1 versija katrai pakotnei +owner.settings.cleanuprules.keep.count.n=%d versijas katrai pakotnei +owner.settings.cleanuprules.keep.pattern=Paturēt versijas, kas atbilst +owner.settings.cleanuprules.keep.pattern.container=Versija latest vienmēr tiks paturēta konteineru pakotnēm. +owner.settings.cleanuprules.remove.title=Versijas, kas atbilst šiem noteikumiem tiks noņemtas, ja vien neatbilst arī noteikumiem augstāk, lai tās paturētu. +owner.settings.cleanuprules.remove.days=Noņemt versijas vecākas kā +owner.settings.cleanuprules.remove.pattern=Noņemt versijas, kas atbilst +owner.settings.cleanuprules.success.update=Notīrīšanas noteikumi tika atjaunoti. +owner.settings.cleanuprules.success.delete=Notīrīšanas noteikumi tika izdzēsti. +owner.settings.chef.title=Chef reģistrs +owner.settings.chef.keypair=Ģenerēt atslēgu pāri +owner.settings.chef.keypair.description=Ģenerēt atslēgu pāri, ko izmantot, lai autentificētos pret Chef reģistru. Iepriekšējo atslēgu vairs nevarēs izmantot. + +[aria] +navbar=Navigācijas josla +footer=Kājene +footer.software=Par programmatūru +footer.links=Saites + +[secrets] +secrets=Noslēpumi +description=Noslēpumi tiks padoti atsevišķām darbībām un citādi nevar tikt nolasīti. +none=Pagaidām nav neviena noslēpuma. +value=Vērtība +name=Nosaukums +creation=Pievienot noslēpumu +creation.name_placeholder=reģistr-nejūtīgs, tikai burti, cipari un apakšsvītras, nevar sākties ar GITEA_ vai GITHUB_ +creation.value_placeholder=Ievadiet jebkādu saturu. Atstarpes sākumā un beigā tiks noņemtas. +creation.success=Noslēpums '%s' tika pievienots. +creation.failed=Neizdevās pievienot noslēpumu. +deletion=Dzēst noslēpumu +deletion.description=Noslēpuma dzēšana ir neatgriezeniska. Vai turpināt? +deletion.success=Noslēpums tika izdzēsts. +deletion.failed=Neizdevās dzēst noslēpumu. + +[actions] +actions=Darbības +unit.desc=Pārvaldīt darbības +status.unknown=Nezināms +status.waiting=Gaida +status.running=Izpildās +status.success=Pabeigts +status.failure=Neveiksmīgs +status.cancelled=Atcelts +status.skipped=Izlaists +status.blocked=Bloķēts +runners=Izpildītāji +runners.runner_manage_panel=Izpildītāju pārvaldība +runners.new=Pievienot jaunu izpildītāju +runners.new_notice=Kā uzstādīt izpildītāju +runners.status=Statuss +runners.id=ID +runners.name=Nosaukums +runners.owner_type=Veids +runners.description=Apraksts +runners.labels=Etiķetes +runners.last_online=Pēdējo reizi tiešsaistē +runners.agent_labels=Aģenta etiķetes +runners.custom_labels=Pielāgotas etiķetes +runners.custom_labels_helper=Pielāgotas etiķetes, ko administrators pievienojis manuāli. Ar komatu atdalītas etiķetes, atstapres pirms un pēc etiķetes nosaukuma tiek ignorētas. +runners.runner_title=Izpildītājs +runners.task_list=Pēdējās darbības, kas izpildītas +runners.task_list.run=Palaist +runners.task_list.status=Statuss +runners.task_list.repository=Repozitorijs +runners.task_list.commit=Revīzija +runners.task_list.done_at=Beigu laiks +runners.edit_runner=Labot izpildītāju +runners.update_runner=Atjaunot izpildītāju +runners.update_runner_success=Izpildītājs veiksmīgi atjaunots +runners.update_runner_failed=Neizdevās atjaunot izpildītāju +runners.delete_runner=Dzēst izpildītāju +runners.delete_runner_success=Izpildītājs veiksmīgi izdzēsts +runners.delete_runner_failed=Neizdevās izdzēst izpildītāju +runners.delete_runner_header=Apstiprināt izpildītāja izdzēšanu +runners.delete_runner_notice=Ja šis izpildītājs veic kādus uzdevumus, tad tie tiks apturēti un atzīmēti kā neizdevušies. Tas var sabojāt būvēšanas darbaplūsmas. +runners.none=Nav pieejami izpildītāji +runners.status.unspecified=Nezināms +runners.status.idle=Dīkstāvē +runners.status.active=Aktīvs +runners.status.offline=Bezsaistē +runs.all_workflows=Visas darbaplūsmas +runs.open_tab=%d atvērti +runs.closed_tab=%d aizvērti +runs.commit=Revīzija +runs.pushed_by=Iesūtītājs diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini index 294ba7e34bfc..f828624ccea1 100644 --- a/options/locale/locale_nl-NL.ini +++ b/options/locale/locale_nl-NL.ini @@ -23,7 +23,6 @@ enable_javascript=Deze website werkt beter met JavaScript. toc=Inhoudsopgave licenses=Licenties return_to_gitea=Terug naar Gitea - username=Gebruikersnaam email=E-mailadres password=Wachtwoord @@ -33,7 +32,6 @@ captcha=CAPTCHA twofa=Twee factor authenticatie twofa_scratch=Eenmalige twee factor authenticatie code passcode=PIN - webauthn_insert_key=Voer uw beveiligingssleutel in webauthn_sign_in=Druk op de knop van uw beveiligingssleutel. Als uw beveiligingssleutel geen knop heeft, voeg deze dan opnieuw in. webauthn_press_button=Druk alstublieft op de knop van uw beveiligingssleutel… @@ -47,7 +45,6 @@ webauthn_error_duplicated=De beveiligingssleutel is niet toegestaan voor dit ver webauthn_error_empty=U moet een naam voor deze sleutel instellen. webauthn_error_timeout=Time-out bereikt voordat uw sleutel kon worden gelezen. Laad deze pagina opnieuw en probeer het opnieuw. webauthn_reload=Vernieuwen - repository=Repository organization=Organisatie mirror=Kopie @@ -65,18 +62,15 @@ settings=Instellingen your_profile=Profiel your_starred=Favoriet your_settings=Instellingen - all=Alles sources=Bronnen mirrors=Spiegels collaborative=Samenwerkend forks=Forks - activities=Activiteiten pull_requests=Pull requests issues=Kwesties milestones=Mijlpalen - ok=OK cancel=Annuleren save=Opslaan @@ -85,26 +79,22 @@ add_all=Alles toevoegen remove=Verwijder remove_all=Alles verwijderen edit=Bewerk - copy=Kopieer copy_url=Kopieer URL copy_branch=Kopieer branchnaam copy_success=Gekopieerd! copy_error=Kopiëren mislukt - write=Schrijf preview=Voorbeeld loading=Laden… - step1=Stap 1: step2=Stap 2: - error=Fout error404=De pagina die u probeert te bereiken bestaat niet of u bent niet gemachtigd om het te bekijken. - never=Nooit - rss_feed=RSS Feed +enabled=Ingeschakeld +disabled=Uitgeschakeld [filter] @@ -157,7 +147,6 @@ 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 is gereserveerd err_admin_name_is_invalid=Gebruikersnaam van beheerder is ongeldig - general_title=Algemene Instellingen app_name=Naam site app_name_helper=U kan de naam van uw bedrijf hier invullen. @@ -177,7 +166,6 @@ app_url=Gitea base URL app_url_helper=Basisadres voor HTTP(S) kloon URL's en e-mailmeldingen. log_root_path=Log-pad log_root_path_helper=Logboekbestanden worden geschreven naar deze map. - optional_title=Optionele instellingen email_title=E-mail instellingen smtp_addr=SMTP Host @@ -235,7 +223,7 @@ default_enable_timetracking_popup=Tijdsregistratie voor nieuwe repositories stan no_reply_address=Verborgen e-maildomein no_reply_address_helper=Domeinnaam voor gebruikers met een verborgen e-mailadres. Bijvoorbeeld zal de gebruikersnaam 'joe' in Git worden geregistreerd als 'joe@noreply.example.org' als het verborgen email domein is ingesteld op 'noreply.example.org'. password_algorithm=Wachtwoord Hash Algoritme -password_algorithm_helper=Stel het wachtwoord hashing-algoritme in. Algoritmen hebben verschillende vereisten en sterkte. `argon2` heeft goede kenmerken, maar gebruikt veel geheugen en kan ongepast zijn voor kleinere systemen. +password_algorithm_helper="""Stel het wachtwoord hashing-algoritme in. Algoritmen hebben verschillende vereisten en sterkte. `argon2` heeft goede kenmerken, maar gebruikt veel geheugen en kan ongepast zijn voor kleinere systemen.""" [home] uname_holder=Gebruikersnaam of e-mailadres @@ -251,17 +239,14 @@ search_repos=Zoek een repository… filter=Andere filters filter_by_team_repositories=Filter op team repositories feed_of=Feed van "%s" - show_archived=Gearchiveerd show_both_archived_unarchived=Toont zowel gearchiveerd als niet-gearchiveerd show_only_archived=Toon alleen gearchiveerd show_only_unarchived=Toon alleen niet gearchiveerd - show_private=Privé show_both_private_public=Toon zowel openbaar als privé show_only_private=Toon alleen privé show_only_public=Toon alleen opbenbaar - issues.in_your_repos=In uw repositories [explore] @@ -280,7 +265,6 @@ code_no_results=Geen broncode gevonden in overeenstemming met uw zoekterm. code_search_results=Zoekresultaten voor ‘%s’ code_last_indexed_at=Laatst geïndexeerd %s - [auth] create_new_account=Account registreren register_helper_msg=Heeft u al een account? Klik hier om in te loggen @@ -353,31 +337,24 @@ password_pwned_err=Kan het verzoek om HaveIBeenPwned niet voltooien view_it_on=Bekijk het op %s link_not_working_do_paste=Werkt dit niet? Probeer het te kopiëren en te plakken naar uw browser. hi_user_x=Hoi %s, - activate_account=Activeer uw account activate_account.title=%s, activeer alstublieft uw account activate_account.text_1=Hallo %[1]s, bedankt voor het registeren op %[2]s! activate_account.text_2=Klik op de volgende link om uw account te activeren binnen %s: - activate_email=Verifieer uw e-mailadres activate_email.title=%s, controleer alsjeblieft uw e-mailadres activate_email.text=Klik op de volgende link om je e-mailadres te bevestigen in %s: - register_notify=Welkom bij Gitea register_notify.title=%[1]s, welkom bij %[2]s register_notify.text_1=dit is uw registratie bevestigingsemail voor %s! register_notify.text_2=U kunt nu inloggen via de gebruikersnaam: %s. register_notify.text_3=Als dit account voor u is aangemaakt, kunt u eerst uw wachtwoord instellen. - reset_password=Account herstellen reset_password.title=%s, u heeft verzocht om uw account te herstellen reset_password.text=Klik op de volgende link om je account te herstellen binnen %s: - register_success=Registratie succesvol - issue_assigned.pull=@%[1]s heeft u toegewezen aan de pull request %[2]s in repository %[3]s. issue_assigned.issue=@%[1]heeft u toegewezen aan issue %[2]s in repository %[3]s. - issue.x_mentioned_you=@%s heeft u vermeld: issue.action.force_push=%[1]s heeft een force-push uitgevoerd %[2]s van %[3]s naar %[4]s. issue.action.push_1=@%[1]s heeft %[3]d commits gepusht naar %[2]s @@ -392,7 +369,6 @@ issue.action.review_dismissed=@%[1]s wees de laatste review af van %[2]s issue.action.ready_for_review=@%[1]s markeerde deze pull request klaar voor beoordeling. issue.action.new=@%[1]s heeft #%[2]d aangemaakt. issue.in_tree_path=In %s: - release.new.subject=%s in %s vrijgegeven release.new.text=@%[1]s heeft %[2]s uitgebracht in %[3]s release.title=Titel: %s @@ -400,16 +376,13 @@ release.note=Notitie: release.downloads=Downloads: release.download.zip=Broncode (ZIP) release.download.targz=Broncode (TAR.GZ) - repo.transfer.subject_to=%s zou "%s" willen overdragen aan %s repo.transfer.subject_to_you=%s wil "%s" aan jou overdragen repo.transfer.to_you=jij repo.transfer.body=Om het te accepteren of afwijzen, bezoek %s of negeer het gewoon. - repo.collaborator.added.subject=%s heeft jou toegevoegd aan %s repo.collaborator.added.text=U bent toegevoegd als een medewerker van de repository: - [modal] yes=Ja no=Nee @@ -427,34 +400,30 @@ PayloadUrl=Payload url TeamName=Team naam AuthName=Autorisatienaam AdminEmail=E-mail beheerder - NewBranchName=Nieuwe branch naam CommitSummary=Commit samenvatting CommitMessage=Commit bericht CommitChoice=Commit keuze TreeName=Bestandspad Content=Inhoud - SSPISeparatorReplacement=Scheidingsteken SSPIDefaultLanguage=Standaardtaal - require_error=kan niet leeg zijn. -alpha_dash_error=` moet bevatten alleen alfanumerieke, dash ('-') en onderstrepingstekens ('_').` -alpha_dash_dot_error=` moet bevatten alleen alfanumerieke, dash ('-'), onderstrepingsteken ('_') en de dot ('. ') karakters.` -git_ref_name_error=` moet een correct geformatteerde git referentie naam zijn.` +alpha_dash_error=" moet bevatten alleen alfanumerieke, dash ('-') en onderstrepingstekens ('_')." +alpha_dash_dot_error=" moet bevatten alleen alfanumerieke, dash ('-'), onderstrepingsteken ('_') en de dot ('. ') karakters." +git_ref_name_error=" moet een correct geformatteerde git referentie naam zijn." size_error=moet groter zijn dan %s min_size_error=moet minimaal %s karakters bevatten. max_size_error=mag maximaal %s karakters bevatten. email_error=is niet een valide e-mail adres. -url_error=`'%s' is niet een geldige URL.` -include_error=` moet substring '%s' bevatten.` -glob_pattern_error=` globpatroon is ongeldig: %s.` -regex_pattern_error=` regex patroon is ongeldig: %s.` +url_error='%s' is niet een geldige URL. +include_error=" moet substring '%s' bevatten." +glob_pattern_error=" globpatroon is ongeldig: %s." +regex_pattern_error=" regex patroon is ongeldig: %s." unknown_error=Onbekende fout: captcha_incorrect=De CAPTCHA-code is onjuist. password_not_match=De wachtwoorden komen niet overeen. lang_select_error=Selecteer een taal uit de lijst. - username_been_taken=Deze naam is al in gebruik. username_change_not_local_user=Niet-lokale gebruikers mogen hun gebruikersnaam niet wijzigen. repo_name_been_taken=De repository-naam wordt al gebruikt. @@ -485,19 +454,16 @@ user_not_exist=De gebruiker bestaat niet. team_not_exist=Dit team bestaat niet. last_org_owner=Je kunt de laatste eigenaar van een organisatie niet verwijderen. Er moet er minimaal één eigenaar in een organisatie zitten. cannot_add_org_to_team=Een organisatie kan niet worden toegevoegd als een teamlid. - invalid_ssh_key=Kan de SSH-sleutel niet verifiëren: %s invalid_gpg_key=Kan de GPG-sleutel niet verifiëren: %s invalid_ssh_principal=Ongeldige verantwoordelijke: %s unable_verify_ssh_key=Kan de SSH-sleutel niet verifiëren; controleer hem op fouten. auth_failed=Verificatie mislukt: %v - still_own_repo=Je account is nog eigenaar van één of meerdere repositories. Deze moeten eerst verwijderd of overgedragen worden. still_has_org=Je account is lid van één of meerdere organisaties. Verlaat deze eerst. still_own_packages=Uw account bezit één of meer pakketten; verwijder deze eerst. org_still_own_repo=Deze organisatie bezit minstens één repositories. Verwijder deze of draag deze eerst over. org_still_own_packages=Deze organisatie is nog eigenaar van één of meer pakketten; verwijder deze eerst. - target_branch_not_exist=Doel branch bestaat niet [user] @@ -515,7 +481,6 @@ unfollow=Niet meer volgen heatmap.loading=Heatmap wordt geladen… user_bio=Biografie disabled_public_activity=Deze gebruiker heeft de publieke zichtbaarheid van de activiteit uitgeschakeld. - form.name_reserved=De gebruikersnaam '%s' is gereserveerd. form.name_pattern_not_allowed=Het patroon '%s' is niet toegestaan in een gebruikersnaam. form.name_chars_not_allowed=Gebruikersnaam '%s' bevat ongeldige tekens. @@ -538,7 +503,6 @@ account_link=Gekoppelde Accounts organization=Organisaties uid=uid webauthn=Beveiligingssleutels - public_profile=Openbaar profiel biography_placeholder=Vertel ons iets over jezelf profile_desc=Je e-mailadres zal gebruikt worden voor notificaties en andere handelingen. @@ -578,7 +542,6 @@ saved_successfully=Uw instellingen zijn succesvol opgeslagen. privacy=Privacy keep_activity_private=De activiteit van de profielpagina verbergen keep_activity_private_popup=Maakt de activiteit alleen zichtbaar voor jou en de admins - lookup_avatar_by_mail=Profielfoto van e-mailadres gebruiken federated_avatar_lookup=Gefedereerde Avatars inschakelen enable_custom_avatar=Aangepaste avatar inschakelen @@ -589,7 +552,6 @@ uploaded_avatar_not_a_image=Het geüploade bestand is geen afbeelding. uploaded_avatar_is_too_big=Het geüploade bestand heeft de maximale grootte overschreden. update_avatar_success=Je avatar is bijgewerkt. update_user_avatar_success=De avatar van de gebruiker is bijgewerkt. - change_password=Wachtwoord bijwerken old_password=Huidige wachtwoord new_password=Nieuw wachtwoord @@ -597,7 +559,6 @@ retype_new_password=Herhaal Nieuw Wachtwoord password_incorrect=Het wachtwoord is niet correct. change_password_success=Je wachtwoord is bijgewerkt. Log vanaf nu in met je nieuwe wachtwoord. password_change_disabled=Niet-lokale gebruikers kunnen hun wachtwoord niet in de webinterface van Gitea wijzigen. - emails=E-mailadressen manage_emails=E-mailadressen beheren manage_themes=Selecteer standaardthema @@ -630,7 +591,6 @@ add_openid_success=Het nieuwe OpenID-adres is toegevoegd. keep_email_private=Verberg e-mailadres keep_email_private_popup=Je e-mailadres wordt verborgen voor andere gebruikers. openid_desc=Met OpenID kan je authenticatie uitbesteden aan een externe provider. - manage_ssh_keys=Beheer SSH sleutels manage_ssh_principals=Beheer SSH-certificaat verantwoordelijke manage_gpg_keys=Beheer GPG sleutels @@ -709,7 +669,6 @@ manage_social=Beheer gekoppelde sociale accounts social_desc=Deze sociale accounts zijn verbonden aan je Gitea-account. Zorg er voor dat je ze allemaal herkent, omdat ermee ingelogd kan worden op je Gitea-account. unbind=Ontkoppelen unbind_success=Dit sociale account is verwijderd van je Gitea-account. - manage_access_token=Beheer toegangstokens generate_new_token=Nieuw Token genereren tokens_desc=Deze tokens geven toegang tot je account via de API van Gitea. @@ -724,7 +683,6 @@ access_token_deletion_cancel_action=Annuleren access_token_deletion_confirm_action=Verwijderen access_token_deletion_desc=Als je een token verwijdert, heeft de applicatie die het gebruikt geen toegang meer tot je account. Doorgaan? delete_token_success=De token is verwijderd. Applicaties die hem gebruiken, verliezen toegang tot je account. - manage_oauth2_applications=Beheer OAuth2-applicaties edit_oauth2_application=Bewerk OAuth2-applicatie oauth2_applications_desc=Met de OAuth2 applicaties kan je derde partij toepassing veilig authenticeren voor gebruikers in deze Gitea. @@ -746,14 +704,12 @@ oauth2_client_secret_hint=Het geheim zal niet zichtbaar zijn als je deze pagina oauth2_application_edit=Wijzig oauth2_application_create_description=OAuth2 applicaties geven je derde partij applicatie toegang tot gebruikersaccounts op deze instantie. oauth2_application_remove_description=Als je een OAuth2 applicatie verwijdert, krijg je geen toegang tot geautoriseerde gebruikersaccounts voor deze instantie. Doorgaan? - authorized_oauth2_applications=Geautoriseerde OAuth2 applicaties authorized_oauth2_applications_description=U hebt toegang tot uw persoonlijke Gitea-account verleend aan deze applicaties van derden. Gelieve toegang voor applicaties die niet meer nodig zijn te weigeren. revoke_key=Intrekken revoke_oauth2_grant=Toegang intrekken revoke_oauth2_grant_description=Het intrekken van toegang voor deze derde partij applicatie zal deze applicatie geen toegang tot uw gegevens geven. Weet u het zeker? revoke_oauth2_grant_success=Toegang met succes ingetrokken. - twofa_desc=Tweefactorauthenticatie verbetert de beveiliging van je account. twofa_is_enrolled=Je account is momenteel ingeschreven voor two-factor authenticatie. twofa_not_enrolled=Je account is momenteel niet ingeschreven voor two-factor authenticatie. @@ -771,13 +727,11 @@ then_enter_passcode=En vul de toegangscode, die in de applicatie weergegeven wor passcode_invalid=De code is niet correct. Probeer het nogmaals. twofa_enrolled=Tweefactorsauthenticatie is geactiveerd voor dit account. Bewaar je token (%s) op een veilige plek, omdat hij maar één keer wordt weergegeven! twofa_failed_get_secret=Kon geheim niet ophalen. - webauthn_desc=Beveiligingssleutels zijn hardware apparaten die cryptografische sleutels bevatten. Ze kunnen worden gebruikt voor tweestapsverificatie. Beveiligingssleutels moeten de WebAuthn Authenticator standaard ondersteunen. webauthn_register_key=Voeg beveiligingssleutel toe webauthn_nickname=Bijnaam webauthn_delete_key=Verwijder beveiligingssleutel webauthn_delete_key_desc=Als u een beveiligingssleutel verwijdert, kunt u er niet meer mee inloggen. Doorgaan? - manage_account_links=Gekoppelde accounts beheren manage_account_links_desc=Deze externe accounts zijn gekoppeld aan je Gitea-account. account_links_not_available=Er zijn momenteel geen externe accounts aan je Gitea-account gelinkt. @@ -785,23 +739,19 @@ link_account=Account koppelen remove_account_link=Gekoppeld account verwijderen remove_account_link_desc=Als je een gekoppeld account verwijdert, verliest dit account toegang tot je Gitea-account. Doorgaan? remove_account_link_success=Het gekoppelde account is verwijderd. - orgs_none=U bent geen lid van een organisatie. repos_none=U bezit geen repositories - delete_account=Verwijder uw account delete_prompt=Als je doorgaat, wordt je gebruikersaccount permanent verwijderd. Dit KAN NIET ongedaan gemaakt worden. delete_with_all_comments=Uw account is jonger dan %s. Om spook opmerkingen te vermijden, worden alle issue/PR reacties er samen mee verwijderd. confirm_delete_account=Bevestig verwijdering delete_account_title=Verwijder gebruikers account delete_account_desc=Weet je zeker dat je dit gebruikersaccount permanent wil verwijderen? - email_notifications.enable=E-mailnotificaties inschakelen email_notifications.onmention=Alleen e-mail op vermelding email_notifications.disable=E-mailnotificaties uitschakelen email_notifications.submit=E-mailvoorkeur instellen email_notifications.andyourown=En je eigen notificaties - visibility=Gebruiker zichtbaarheid visibility.public=Openbaar visibility.public_tooltip=Zichtbaar voor alle gebruikers @@ -895,14 +845,12 @@ delete_preexisting=Verwijder reeds bestaande bestanden delete_preexisting_content=Verwijder bestanden in %s delete_preexisting_success=Niet-geadopteerde bestanden verwijderd in %s blame_prior=Bekijk de schuld voorafgaand aan deze verandering - transfer.accept=Accepteer overdracht transfer.accept_desc=Overmaken naar "%s" transfer.reject=Overdracht afwijzen transfer.reject_desc=Annuleer overdracht naar "%s" transfer.no_permission_to_accept=Je hebt geen toestemming om te accepteren transfer.no_permission_to_reject=Je hebt geen toestemming om te weigeren - desc.private=Privé desc.public=Openbaar desc.private_template=Privé sjabloon @@ -910,7 +858,6 @@ desc.public_template=Sjabloon desc.internal=Interne desc.internal_template=Intern sjabloon desc.archived=Gearchiveerd - template.items=Sjabloon items template.git_content=Git inhoud (standaard Branch) template.git_hooks=Git Hooks @@ -921,16 +868,13 @@ template.avatar=Profielfoto template.issue_labels=Issue Labels template.one_item=Moet ten minste één sjabloon selecteren template.invalid=Moet een sjabloon repository selecteren - archive.title=Deze repo is gearchiveerd. U kunt bestanden bekijken en het klonen, maar niet pushen of problemen/pull-requests openen. 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. form.name_reserved=Repositorienaam '%s' is gereserveerd. form.name_pattern_not_allowed=Het patroon '%s' is niet toegestaan in de naam van een repository. - need_auth=Autorisatie migrate_options=Migratie opties migrate_service=Migratie Service @@ -981,7 +925,6 @@ migrate.migrating_labels=Labels migreren migrate.migrating_releases=Releases migreren migrate.migrating_issues=Issues migreren migrate.migrating_pulls=Pull-verzoeken migreren - mirror_from=kopie van forked_from=geforked van generated_from=gegenereerd van @@ -995,7 +938,6 @@ unstar=Ontster star=Ster fork=Vork download_archive=Download repository - no_desc=Geen omschrijving quick_guide=Snelstart gids clone_this_repo=Kloon deze repository @@ -1003,12 +945,11 @@ create_new_repo_command=Maak een nieuwe repository aan vanaf de console push_exist_repo=Push een bestaande repositorie vanaf de console empty_message=Deze repository bevat geen inhoud. broken_message=De Git gegevens die ten grondslag liggen aan deze repository kunnen niet worden gelezen. Neem contact op met de beheerder van deze instantie of verwijder deze repository. - code=Code code.desc=Toegang tot broncode, bestanden, commits en branches. branch=Branch tree=Tree -clear_ref=`Huidige referentie wissen` +clear_ref=Huidige referentie wissen filter_branch_and_tag=Filter op branch of tag find_tag=Label zoeken branches=Branches @@ -1020,7 +961,6 @@ packages=Paketten labels=Labels org_labels_desc=Organisatielabel dat gebruikt kan worden met alle repositories onder deze organisatie org_labels_desc_manage=beheren - milestones=Mijlpalen commits=Commits commit=Commit @@ -1036,14 +976,13 @@ file_view_rendered=Weergave weergeven file_view_raw=Weergave ruw bestand file_permalink=Permalink file_too_large=Dit bestand is te groot om te tonen. -invisible_runes_header=`Dit bestand bevat onzichtbare Unicode-karakters!` -invisible_runes_description=`Dit bestand bevat onzichtbare Unicode karakters die mogelijk anders verwerkt worden dan wat hieronder staat. Als uw gebruik opzettelijk en legitiem is, kunt u deze waarschuwing veilig negeren. Gebruik de Escape knop om verborgen karakters te onthullen.` -ambiguous_runes_header=`Dit bestand bevat dubbelzinnige Unicode karakters!` -ambiguous_runes_description=`Dit bestand bevat dubbelzinnige Unicode karakters die verward kunnen worden met andere karakters in uw huidige taal. Als je het opzettelijk en legitiem gebruikt, kun je deze waarschuwing veilig negeren. Gebruik de Escape knop om deze karakters te markeren.` -invisible_runes_line=`Deze lijn heeft onzichtbare unicode karakters` -ambiguous_runes_line=`Deze lijn heeft dubbelzinnige unicode karakters` -ambiguous_character=`%[1]c [U+%04[1]X] is verwarrend met %[2]c [U+%04[2]X]` - +invisible_runes_header=Dit bestand bevat onzichtbare Unicode-karakters! +invisible_runes_description=Dit bestand bevat onzichtbare Unicode karakters die mogelijk anders verwerkt worden dan wat hieronder staat. Als uw gebruik opzettelijk en legitiem is, kunt u deze waarschuwing veilig negeren. Gebruik de Escape knop om verborgen karakters te onthullen. +ambiguous_runes_header=Dit bestand bevat dubbelzinnige Unicode karakters! +ambiguous_runes_description=Dit bestand bevat dubbelzinnige Unicode karakters die verward kunnen worden met andere karakters in uw huidige taal. Als je het opzettelijk en legitiem gebruikt, kun je deze waarschuwing veilig negeren. Gebruik de Escape knop om deze karakters te markeren. +invisible_runes_line=Deze lijn heeft onzichtbare unicode karakters +ambiguous_runes_line=Deze lijn heeft dubbelzinnige unicode karakters +ambiguous_character=%[1]c [U+%04[1]X] is verwarrend met %[2]c [U+%04[2]X] escape_control_characters=Escape unescape_control_characters=Onescape file_copy_permalink=Permalink kopiëren @@ -1062,7 +1001,6 @@ download_file=Download het bestand normal_view=Normale weergave line=regel lines=regels - editor.add_file=Bestand toevoegen editor.new_file=Nieuw bestand editor.upload_file=Upload bestand @@ -1128,7 +1066,6 @@ editor.user_no_push_to_branch=Gebruiker kan niet pushen naar branch editor.require_signed_commit=Branch vereist een ondertekende commit editor.cherry_pick=Cherry-pick %s op: editor.revert=%s ongedaan maken op: - commits.desc=Bekijk de broncode-wijzigingsgeschiedenis. commits.commits=Commits commits.no_commits=Geen overeenkomstige commits. '%s' en '%s' hebben totaal verschillende histories. @@ -1147,7 +1084,6 @@ commits.signed_by_untrusted_user=Ondertekend door niet-vertrouwde gebruiker commits.signed_by_untrusted_user_unmatched=Ondertekend door niet-vertrouwde gebruiker die niet overeenkomt met de committer commits.gpg_key_id=GPG sleutel-ID commits.ssh_key_fingerprint=SSH sleutel vingerafdruk - commit.actions=Acties commit.revert=Ongedaan maken commit.revert-header=Maak %s ongedaan @@ -1155,10 +1091,8 @@ commit.revert-content=Selecteer een branch om terug te zetten: commit.cherry-pick=Cherry-pick commit.cherry-pick-header=Cherry-pick: %s commit.cherry-pick-content=Selecteer een branch om te cherry-pick op: - ext_issues=Toegang tot Externe Issues ext_issues.desc=Koppelen aan een externe kwestie-tracker. - projects=Projecten projects.desc=Beheer issues en pulls in projectborden. projects.description=Omschrijving (optioneel) @@ -1194,7 +1128,6 @@ projects.board.color=Kleur projects.open=Open projects.close=Sluiten projects.board.assigned_to=Toegewezen aan - issues.desc=Organiseer bugrapporten, taken en mijlpalen. issues.filter_assignees=Filter verantwoordelijke issues.filter_milestones=Filter mijlpaal @@ -1245,28 +1178,30 @@ issues.add_labels=voegde de %s labels %s toe issues.remove_label=verwijderde het %s label %s issues.remove_labels=verwijderde de %s labels %s issues.add_remove_labels=voegde de %s toe en verwijderde de %s labels %s -issues.add_milestone_at=`heeft dit %[2]s aan de mijlpaal %[1]s toegevoegd` -issues.add_project_at=`heeft dit toegevoegd aan het %s project %s` -issues.change_milestone_at='mijlpaal bewerkt van %s %s %s' -issues.change_project_at=`heeft het project gewijzigd van %s naar %s %s` -issues.remove_milestone_at=' %s is verwijderd uit de %s mijlpaal' -issues.remove_project_at=`verwijderd uit het %s project %s` -issues.deleted_milestone=` (verwijderd)` -issues.deleted_project=` (verwijderd)` -issues.self_assign_at=`heeft dit %s aan zichzelf toegewezen` -issues.add_assignee_at=`was toegekend door %s %s` -issues.remove_assignee_at=`is niet toegewezen door %s %s` -issues.remove_self_assignment=`heeft %s zijn/haar toewijzing verwijderd` -issues.change_title_at='titel aangepast van %s naar %s %s' -issues.change_ref_at=`wijzig referentie van %s naar %s %s` -issues.remove_ref_at=`heeft referentie %s verwijderd %s` -issues.add_ref_at=`heeft referentie %s toegevoegd %s` -issues.delete_branch_at=`heeft %[2]s de branch %[1]s verwijderd.` +issues.add_milestone_at=heeft dit %[2]s aan de mijlpaal %[1]s toegevoegd +issues.add_project_at=heeft dit toegevoegd aan het %s project %s +issues.change_milestone_at=mijlpaal bewerkt van %s %s %s +issues.change_project_at=heeft het project gewijzigd van %s naar %s %s +issues.remove_milestone_at=" %s is verwijderd uit de %s mijlpaal" +issues.remove_project_at=verwijderd uit het %s project %s +issues.deleted_milestone=" (verwijderd)" +issues.deleted_project=" (verwijderd)" +issues.self_assign_at=heeft dit %s aan zichzelf toegewezen +issues.add_assignee_at=was toegekend door %s %s +issues.remove_assignee_at=is niet toegewezen door %s %s +issues.remove_self_assignment=heeft %s zijn/haar toewijzing verwijderd +issues.change_title_at=titel aangepast van %s naar %s %s +issues.change_ref_at=wijzig referentie van %s naar %s %s +issues.remove_ref_at=heeft referentie %s verwijderd %s +issues.add_ref_at=heeft referentie %s toegevoegd %s +issues.delete_branch_at=heeft %[2]s de branch %[1]s verwijderd. issues.filter_label=Label -issues.filter_label_exclude=`Gebruik alt + klik/voer in om labels uit te sluiten +issues.filter_label_exclude=Gebruik alt + klik/voer in om labels uit te sluiten issues.filter_label_no_select=Alle labels issues.filter_milestone=Mijlpaal issues.filter_milestone_no_select=Alle mijlpalen +issues.filter_project=Project +issues.filter_project_none=Geen project issues.filter_assignee=Aangewezene issues.filter_assginee_no_select=Alle toegewezen personen issues.filter_poster=Auteur @@ -1319,22 +1254,22 @@ issues.context.edit=Bewerken issues.context.delete=Verwijder issues.no_content=Er is nog geen inhoud. issues.close_issue=Sluit -issues.pull_merged_at=`commit samengevoegd %[2]s in %[3]s %[4]s` -issues.manually_pull_merged_at=`commit handmatig samengevoegd %[2]s in %[3]s %[4]s` +issues.pull_merged_at=commit samengevoegd %[2]s in %[3]s %[4]s +issues.manually_pull_merged_at=commit handmatig samengevoegd %[2]s in %[3]s %[4]s issues.close_comment_issue=Reageer en sluit issues.reopen_issue=Heropen issues.reopen_comment_issue=Heropen en geef commentaar issues.create_comment=Reageer -issues.closed_at=`heeft dit probleem gesloten %[2]s` -issues.reopened_at=`heropende dit probleem %[2]s` -issues.commit_ref_at=`verwees naar dit probleem vanuit commit %[2]s'` -issues.ref_issue_from=`refereerde aan dit issue %[4]s %[2]s` -issues.ref_pull_from=`refereerde aan deze pull request %[4]s %[2]s` -issues.ref_closing_from=`verwees naar een pull request %[4]s dat het issue zal sluiten %[2]s` -issues.ref_reopening_from=`verwees naar een pull request %[4]s dat dit issue heropent %[2]s ` -issues.ref_closed_from=`sloot dit issue %[4]s %[2]s` -issues.ref_reopened_from=`heropende dit issue %[4]s %[2]s` -issues.ref_from=`van %[1]s` +issues.closed_at=heeft dit probleem gesloten %[2]s +issues.reopened_at=heropende dit probleem %[2]s +issues.commit_ref_at=verwees naar dit probleem vanuit commit %[2]s' +issues.ref_issue_from=refereerde aan dit issue %[4]s %[2]s +issues.ref_pull_from=refereerde aan deze pull request %[4]s %[2]s +issues.ref_closing_from=verwees naar een pull request %[4]s dat het issue zal sluiten %[2]s +issues.ref_reopening_from="verwees naar een pull request %[4]s dat dit issue heropent %[2]s " +issues.ref_closed_from=sloot dit issue %[4]s %[2]s +issues.ref_reopened_from=heropende dit issue %[4]s %[2]s +issues.ref_from=van %[1]s issues.poster=Poster issues.collaborator=Medewerker issues.owner=Eigenaar @@ -1364,8 +1299,8 @@ issues.label.filter_sort.reverse_alphabetically=Omgekeerd alfabetisch issues.label.filter_sort.by_size=Kleinste grootte issues.label.filter_sort.reverse_by_size=Grootste grootte issues.num_participants=%d deelnemers -issues.attachment.open_tab=`Klik om "%s" in een nieuw tabblad te bekijken` -issues.attachment.download=`Klik om "%s" te downloaden` +issues.attachment.open_tab=Klik om "%s" in een nieuw tabblad te bekijken +issues.attachment.download=Klik om "%s" te downloaden issues.subscribe=Abonneren issues.unsubscribe=Uitschrijven issues.lock=Gesprek vergrendelen @@ -1393,31 +1328,31 @@ issues.delete.text=Wilt u deze issue echt verwijderen? (Dit is permanent en verw issues.tracker=Tijdregistratie issues.start_tracking_short=Start timer issues.start_tracking=Start tijdregistratie -issues.start_tracking_history=`%s is begonnen` +issues.start_tracking_history=%s is begonnen issues.tracker_auto_close=Timer wordt automatisch gestopt wanneer dit probleem wordt gesloten -issues.tracking_already_started=`Je houd al tijd bij voor een ander issue!` +issues.tracking_already_started=Je houd al tijd bij voor een ander issue! issues.stop_tracking=Stop timer -issues.stop_tracking_history=`gestopt met werken aan %s` +issues.stop_tracking_history=gestopt met werken aan %s issues.cancel_tracking=Weggooien -issues.cancel_tracking_history=`tijd bijhouden geannuleerd: %s` +issues.cancel_tracking_history=tijd bijhouden geannuleerd: %s issues.add_time=Tijd handmatig toevoegen issues.del_time=Verwijder deze tijdlog issues.add_time_short=Timer toevoegen issues.add_time_cancel=Annuleren -issues.add_time_history=`heeft besteedde tijd toegevoegd: %s` -issues.del_time_history=`heeft besteedde tijd verwijderd: %s` +issues.add_time_history=heeft besteedde tijd toegevoegd: %s +issues.del_time_history=heeft besteedde tijd verwijderd: %s issues.add_time_hours=Uren issues.add_time_minutes=Minuten issues.add_time_sum_to_small=Geen tijd opgegeven. issues.time_spent_total=Totaal besteedde tijd -issues.time_spent_from_all_authors=`Totaal besteedde tijd: %s` +issues.time_spent_from_all_authors=Totaal besteedde tijd: %s issues.due_date=Vervaldatum issues.invalid_due_date_format=Het formaat van de deadline is moet 'jjjj-mm-dd' zijn. 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.due_date_form=jjjj-mm-dd issues.due_date_form_add=Vervaldatum toevoegen issues.due_date_form_edit=Bewerk @@ -1436,8 +1371,8 @@ issues.dependency.add=Voeg afhankelijkheid toe… issues.dependency.cancel=Annuleer issues.dependency.remove=Verwijder issues.dependency.remove_info=Verwijder afhankelijkheid -issues.dependency.added_dependency=`voegde een nieuwe afhankelijkheid %s toe ` -issues.dependency.removed_dependency=`verwijderde een afhankelijkheid %s` +issues.dependency.added_dependency="voegde een nieuwe afhankelijkheid %s toe " +issues.dependency.removed_dependency=verwijderde een afhankelijkheid %s issues.dependency.pr_closing_blockedby=Het sluiten van deze pull-aanvraag is geblokkeerd door de volgende issues issues.dependency.issue_closing_blockedby=Het sluiten van dit issue is geblokkeerd door de volgende problemen issues.dependency.issue_close_blocks=Deze kwestie blokkeert het sluiten van de volgende kwesties @@ -1490,10 +1425,8 @@ issues.content_history.delete_from_history=Uit geschiedenis verwijderen issues.content_history.delete_from_history_confirm=Uit geschiedenis verwijderen? issues.content_history.options=Opties issues.reference_link=Referentie: %s - compare.compare_base=basis compare.compare_head=vergelijk - pulls.desc=Schakel pull-aanvragen en code-beoordelingen in. pulls.new=Nieuwe Pull aanvraag pulls.view=Pull verzoek bekijken @@ -1513,11 +1446,11 @@ pulls.filter_branch=Filter branch pulls.no_results=Geen resultaten gevonden. pulls.nothing_to_compare=Deze branches zijn gelijk. Er is geen pull-aanvraag nodig. 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.has_pull_request=Een pull-verzoek tussen deze branches bestaat al: %[2]s#%[3]d pulls.create=Pull verzoek aanmaken pulls.title_desc=wil %[1]d commits van %[2]s samenvoegen met %[3]s pulls.merged_title_desc=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.change_target_branch_at=doelbranch aangepast van %s naar %s %s pulls.tab_conversation=Discussie pulls.tab_commits=Commits pulls.tab_files=Bestanden gewijzigd @@ -1529,7 +1462,7 @@ pulls.manually_merged=Handmatig samengevoegd pulls.manually_merged_as=Het pull-verzoek is handmatig samengevoegd als %[2]s. pulls.is_closed=Deze pull-aanvraag is gesloten. pulls.has_merged=Deze pull-aanvraag is al samengevoegd. -pulls.title_wip_desc=`Start de titel met %s om te voorkomen dat deze pull-aanvraag per ongeluk wordt samengevoegd.` +pulls.title_wip_desc=Start de titel met %s om te voorkomen dat deze pull-aanvraag per ongeluk wordt samengevoegd. pulls.cannot_merge_work_in_progress=Dit pull request is gemarkeerd als werk in uitvoering. pulls.still_in_progress=Nog steeds bezig? pulls.add_prefix=Voeg %s prefix toe @@ -1560,7 +1493,6 @@ pulls.reject_count_n=%d wijzigingsverzoeken pulls.waiting_count_1=%d wachtende beoordeling pulls.waiting_count_n=%d wachtende beoordelingen pulls.wrong_commit_id=commit id moet een commit id zijn op de doelbranch - pulls.no_merge_desc=Deze pull-aanvraag kan niet worden samengevoegd, omdat alle samenvoegingsopties zijn uitgeschakeld. pulls.no_merge_helper=Schakel samenvoegingsopties in in de repositoryinstellingen of voeg de pull-aanvraag handmatig samen. pulls.no_merge_wip=Deze pull-aanvraag kan niet worden samengevoegd omdat hij als "work in progress" is gemarkeerd. @@ -1573,7 +1505,6 @@ pulls.squash_merge_pull_request=Maak samenvoeg-commit pulls.merge_manually=Handmatig samengevoegd pulls.merge_commit_id=De merge commit ID pulls.require_signed_wont_sign=De branch heeft ondertekende commits nodig, maar deze merge zal niet worden ondertekend - pulls.invalid_merge_option=Je kan de samenvoegingsoptie niet gebruiken voor deze pull-aanvraag. pulls.merge_conflict=Samenvoegen mislukt: Er was een conflict tijdens het samenvoegen. Hint: Probeer een andere strategie pulls.merge_conflict_summary=Foutmelding @@ -1586,7 +1517,7 @@ pulls.head_out_of_date=Samenvoegen mislukt: tijdens het genereren van de samenvo pulls.push_rejected=Samenvoegen mislukt: De push is geweigerd. Controleer de Git Hooks voor deze repository. pulls.push_rejected_summary=Volledig afwijzingsbericht pulls.push_rejected_no_message=Samenvoegen mislukt: De push is afgewezen, maar er was geen extern bericht.
    Controleer de Git Hooks voor deze repository -pulls.open_unmerged_pull_exists=`Je kan deze pull-aanvraag niet opnieuw openen omdat er een andere (#%d) met identieke eigenschappen open staat.` +pulls.open_unmerged_pull_exists=Je kan deze pull-aanvraag niet opnieuw openen omdat er een andere (#%d) met identieke eigenschappen open staat. pulls.status_checking=Sommige controles zijn in behandeling pulls.status_checks_success=Alle checks waren succesvol pulls.status_checks_warning=Sommige controles hebben waarschuwingen gerapporteerd @@ -1599,25 +1530,20 @@ pulls.update_branch_rebase=Update branch via herbaseren pulls.update_branch_success=Branch update is geslaagd pulls.update_not_allowed=Je hebt geen toestemming om branch bij te werken pulls.outdated_with_base_branch=Deze branch is verouderd met de basis branch -pulls.closed_at=`heeft deze pull request gesloten %[2]s` -pulls.reopened_at=`heropende deze pull request %[2]s` -pulls.merge_instruction_hint=`Je kunt ook command line instructies bekijken.` +pulls.closed_at=heeft deze pull request gesloten %[2]s +pulls.reopened_at=heropende deze pull request %[2]s +pulls.merge_instruction_hint=Je kunt ook command line instructies bekijken. pulls.merge_instruction_step1_desc=Vanuit het project, check een branch uit en test de veranderingen. pulls.merge_instruction_step2_desc=Voeg de wijzigingen samen en update ze op Gitea. - pulls.auto_merge_button_when_succeed=(Bij geslaagde controles) pulls.auto_merge_when_succeed=Automatisch samenvoegen wanneer alle controles gelukt zijn pulls.auto_merge_newly_scheduled=De pull-verzoek was gepland om samen te voegen wanneer alle controles geslaagd zijn. pulls.auto_merge_has_pending_schedule=%[1]s heeft deze pull-verzoek automatisch samengevoegd wanneer alle checks succesvol zijn geweest %[2]s. - pulls.auto_merge_cancel_schedule=Automatisch samenvoegen annuleren pulls.auto_merge_not_scheduled=Deze pull-aanvraag is niet gepland om automatisch samen te voegen. pulls.auto_merge_canceled_schedule=De automatisch samenvoegen is geannuleerd voor deze pull-aanvraag. - - pulls.delete.title=Deze pull-verzoek verwijderen? pulls.delete.text=Weet je zeker dat je deze pull-verzoek wilt verwijderen? (Dit zal alle inhoud permanent verwijderen. Overweeg om het te sluiten als je het gearchiveerd wilt houden) - milestones.new=Nieuwe mijlpaal milestones.closed=%s werd gesloten milestones.update_ago=%s dagen geleden bijgewerkt @@ -1647,7 +1573,6 @@ milestones.filter_sort.least_complete=Minst compleet milestones.filter_sort.most_complete=Meest compleet milestones.filter_sort.most_issues=Meeste problemen milestones.filter_sort.least_issues=Minste problemen - signing.will_sign=Deze commit zal worden ondertekend met sleutel '%s' signing.wont_sign.error=Er is een fout opgetreden tijdens het controleren of de commit ondertekend kan worden signing.wont_sign.nokey=Er is geen sleutel beschikbaar om deze commit te ondertekenen @@ -1661,10 +1586,8 @@ signing.wont_sign.headsigned=De samenvoeging wordt niet ondertekend omdat de hoo signing.wont_sign.commitssigned=De samenvoeging wordt niet ondertekend omdat alle bijbehorende commits niet ondertekend zijn signing.wont_sign.approved=De samenvoeging wordt niet ondertekend omdat de PR niet is goedgekeurd signing.wont_sign.not_signed_in=U bent niet ingelogd - ext_wiki=Toegang tot Externe Wiki ext_wiki.desc=Koppelen aan een externe wiki. - wiki=Wiki wiki.welcome=Welkom op de wiki. wiki.welcome_desc=Op de wiki kan je documentatie schrijven en met medewerkers delen. @@ -1688,7 +1611,6 @@ wiki.reserved_page=De wiki-paginanaam '%s' is gereserveerd. wiki.pages=Pagina’s wiki.last_updated=Laatst bijgewerkt: %s wiki.page_name_desc=Voer een naam in voor deze Wiki pagina. Sommige speciale namen zijn: 'Home', '_Sidebar' en '_Footer'. - activity=Activiteit activity.period.filter_label=Periode: activity.period.daily=1 dag @@ -1754,7 +1676,6 @@ activity.git_stats_addition_n=%d toevoegingen activity.git_stats_and_deletions=en activity.git_stats_deletion_1=%d verwijdering activity.git_stats_deletion_n=%d verwijderingen - search=Zoek search.search_repo=Zoek repository search.fuzzy=Vergelijkbaar @@ -1762,7 +1683,6 @@ search.match=Overeenkomst search.results=Zoek resultaat voor "%s" in %s search.code_no_results=Geen broncode gevonden die aan uw zoekterm voldoet. search.code_search_unavailable=Er is momenteel geen code zoekfunctie beschikbaar. Neem contact op met uw sitebeheerder. - settings=Instellingen settings.desc=In de instellingen kan je de instellingen van de repository aanpassen settings.options=Repository @@ -2033,10 +1953,10 @@ settings.dismiss_stale_approvals=Verouderde goedkeuringen afwijzen settings.dismiss_stale_approvals_desc=Wanneer nieuwe commits die de inhoud van het pull-verzoek veranderen, naar de branch worden gepusht, worden oude goedkeuringen verwijderd. settings.require_signed_commits=Ondertekende Commits vereisen settings.require_signed_commits_desc=Weiger pushes naar deze branch als deze niet ondertekend of niet verifieerbaar is. -settings.protect_protected_file_patterns=Beschermde bestandspatronen (gescheiden door een puntkomma '\;'): -settings.protect_protected_file_patterns_desc=Beschermde bestanden die niet direct gewijzigd mogen worden, zelfs als de gebruiker het recht heeft om bestanden in deze branch toe te voegen, te bewerken of te verwijderen. Meerdere patronen kunnen worden gescheiden met een puntkomma ('\;'). Zie github.com/gobwas/glob documentatie voor patroon syntax. Voorbeelden: .drone.yml, /docs/**/*.txt. -settings.protect_unprotected_file_patterns=Onbeschermde bestandspatronen (gescheiden met een puntkomma '\;'): -settings.protect_unprotected_file_patterns_desc=Onbeschermde bestanden die direct mogen worden gewijzigd als gebruiker schrijfrechten heeft, waardoor push-beperking wordt omzeild. Meerdere patronen kunnen worden gescheiden met behulp van een puntkomma ('\;'). Zie github.com/gobwas/glob documentatie voor patroon syntax. Voorbeelden: .drone.yml, /docs/**/*.txt. +settings.protect_protected_file_patterns=Beschermde bestandspatronen (gescheiden door een puntkomma ';'): +settings.protect_protected_file_patterns_desc=Beschermde bestanden die niet direct gewijzigd mogen worden, zelfs als de gebruiker het recht heeft om bestanden in deze branch toe te voegen, te bewerken of te verwijderen. Meerdere patronen kunnen worden gescheiden met een puntkomma (';'). Zie github.com/gobwas/glob documentatie voor patroon syntax. Voorbeelden: .drone.yml, /docs/**/*.txt. +settings.protect_unprotected_file_patterns=Onbeschermde bestandspatronen (gescheiden met een puntkomma ';'): +settings.protect_unprotected_file_patterns_desc=Onbeschermde bestanden die direct mogen worden gewijzigd als gebruiker schrijfrechten heeft, waardoor push-beperking wordt omzeild. Meerdere patronen kunnen worden gescheiden met behulp van een puntkomma (';'). Zie github.com/gobwas/glob documentatie voor patroon syntax. Voorbeelden: .drone.yml, /docs/**/*.txt. settings.add_protected_branch=Bescherming aanzetten settings.delete_protected_branch=Bescherming uitzetten settings.update_protect_branch_success=Branch bescherming voor branch '%s' is bijgewerkt. @@ -2116,7 +2036,6 @@ settings.rename_branch_success=Branch %s is succesvol hernoemd naar %s. settings.rename_branch_from=oude branch naam settings.rename_branch_to=nieuwe branch naam settings.rename_branch=Hernoem branch - diff.browse_source=Bladeren bron diff.parent=bovenliggende diff.commit=commit @@ -2168,7 +2087,6 @@ diff.image.side_by_side=Zij aan zij diff.image.swipe=Vegen diff.image.overlay=Overlay diff.has_escaped=Deze regel heeft verborgen Unicode-tekens - releases.desc=Volg de projectversies en downloads. release.releases=Publicaties release.detail=Release details @@ -2200,7 +2118,6 @@ release.tag_name_already_exist=Een versie met deze naam bestaat al. release.tag_name_invalid=Labelnaam is niet geldig. release.downloads=Downloads release.download_count=Downloads: %s - branch.name=Branch naam branch.search=Zoek branches branch.already_exists=Een branch genaamd '%s' bestaat al. @@ -2226,15 +2143,11 @@ branch.restore=Herstel branch '%s' branch.download=Download Branch '%s' branch.included_desc=Deze branch maakt deel uit van de standaard branch branch.included=Inbegrepen - - - topic.manage_topics=Beheer topics topic.done=Klaar topic.count_prompt=Je kunt niet meer dan 25 onderwerpen selecteren topic.format_prompt=Onderwerpen moeten beginnen met een letter of nummer, kunnen streepjes bevatten ('-') en kunnen maximaal 35 tekens lang zijn. - - +settings.event_wiki=Wiki [org] org_name_holder=Organisatienaam @@ -2257,11 +2170,9 @@ team_access_desc=Repository toegang team_permission_desc=Machtiging team_unit_desc=Toegang tot repository secties toestaan team_unit_disabled=(Uitgeschakeld) - form.name_reserved=Organisatienaam '%s' is gereserveerd. form.name_pattern_not_allowed=Het patroon '%s' is niet toegestaan in een organisatienaam. form.create_org_not_allowed=U mag geen organisaties maken. - settings=Instellingen settings.options=Organisatie settings.full_name=Volledige naam @@ -2275,7 +2186,6 @@ settings.visibility.limited=Beperkt (alleen zichtbaar voor ingelogde gebruikers) settings.visibility.limited_shortname=Beperkt settings.visibility.private=Privé (alleen zichtbaar voor organisatieleden) settings.visibility.private_shortname=Privé - settings.update_settings=Instellingen bijwerken settings.update_setting_success=Organisatie instellingen zijn succesvol bijgewerkt. settings.change_orgname_prompt=Opmerking: het wijzigen van de organisatienaam verandert ook de URL van de organisatie. @@ -2287,9 +2197,7 @@ settings.confirm_delete_account=Bevestig verwijdering settings.delete_org_title=Verwijder organisatie settings.delete_org_desc=Deze organisatie zal permanent verwijderd worden. Doorgaan? settings.hooks_desc=Een webhook toevoegen die door alle repositories in deze organisatie getriggerd kan worden. - settings.labels_desc=Voeg labels toe die kunnen worden gebruikt bij problemen voor alle repositories in deze organisatie. - members.membership_visibility=Zichtbaarheid lidmaatschap: members.public=Zichtbaar members.public_helper=verborgen maken @@ -2302,7 +2210,6 @@ members.remove=Verwijderen members.leave=Verlaat members.invite_desc=Voeg nieuw lid toe aan %s: members.invite_now=Nu uitnodigen - teams.join=Lid worden teams.leave=Vertlaat teams.can_create_org_repo=Maak repositories @@ -2340,6 +2247,8 @@ teams.specific_repositories_helper=Leden zullen alleen toegang hebben tot reposi teams.all_repositories=Alle repositories teams.all_repositories_helper=Team heeft toegang tot alle repositories. Door dit te selecteren worden alle bestaande repositories aan het team toegevoegd. teams.all_repositories_read_permission_desc=Dit team heeft Lees toegang tot alle repositories: leden kunnen repositories bekijken en klonen. +members=Leden +teams.read_access=Gelezen [admin] dashboard=Overzicht @@ -2354,7 +2263,6 @@ monitor=Bijhouden first_page=Eerste last_page=Laatste total=Totaal: %d - dashboard.statistic=Overzicht dashboard.operations=Onderhoudswerkzaamheden dashboard.system_status=Systeemtatus @@ -2425,7 +2333,6 @@ dashboard.total_gc_pause=Totaal GC verwerkingstijd dashboard.last_gc_pause=Laatste GC verwerkingstijd dashboard.gc_times=GC verwerkingen dashboard.delete_old_system_notices=Verwijder alle oude systeemmededelingen uit de database - users.user_manage_panel=Gebruikersaccount beheer users.new_account=Nieuw account aanmaken users.name=Gebruikersnaam @@ -2466,7 +2373,6 @@ users.list_status_filter.menu_text=Filter users.list_status_filter.is_active=Actief users.list_status_filter.not_active=Inactief users.list_status_filter.is_admin=Beheerder - emails.email_manage_panel=Gebruikers e-mail beheer emails.primary=Primair emails.activated=Geactiveerd @@ -2479,13 +2385,11 @@ emails.not_updated=Bijwerken van het gevraagde e-mailadres is mislukt: %v emails.duplicate_active=Dit e-mailadres is al actief voor een andere gebruiker. emails.change_email_header=Update E-mail Eigenschappen emails.change_email_text=Weet je zeker dat je dit e-mailadres wilt bijwerken? - orgs.org_manage_panel=Organisaties beheren orgs.name=Naam orgs.teams=Teams orgs.members=Leden orgs.new_orga=Nieuwe organisatie - repos.repo_manage_panel=Repositories beheren repos.unadopted=Niet-geadopteerde repositories repos.unadopted.no_more=Geen niet-geadopteerde repositories meer gevonden @@ -2497,13 +2401,9 @@ repos.stars=Sterren repos.forks=Forks repos.issues=Kwesties repos.size=Grootte - - - systemhooks=Systeem webhooks systemhooks.add_webhook=Systeem Webhook toevoegen systemhooks.update_webhook=Systeem-webhook bijwerken - auths.new=Authenticatiebron toevoegen auths.name=Naam auths.type=Type @@ -2583,7 +2483,6 @@ auths.delete=Authenticatiebron verwijderen auths.delete_auth_title=Authenticatiebron verwijderen auths.still_in_used=De authenticatiebron is nog in gebruik. Converteer of verwijder eerst een gebruiker met deze authenticatiebron. auths.deletion_success=De authenticatie-bron is verwijderd. - config.server_config=Serverconfiguratie config.app_name=Naam site config.app_ver=Gitea versie @@ -2601,7 +2500,6 @@ config.static_file_root_path=Statische bestanden basis pad config.log_file_root_path=Log-pad config.script_type=Script type config.reverse_auth_user=Omgekeerde verificatie gebruiker - config.ssh_config=SSH-configuratie config.ssh_enabled=Ingeschakeld config.ssh_start_builtin_server=Gebruik de ingebouwde server @@ -2612,12 +2510,10 @@ config.ssh_key_test_path=Pad voor key-tests config.ssh_keygen_path=Pad van keygen ('ssh-keygen') config.ssh_minimum_key_size_check=Controleer minimale key-lengte config.ssh_minimum_key_sizes=Minimale key-lengtes - config.lfs_config=LFS Configuratie config.lfs_enabled=Ingeschakeld config.lfs_content_path=LFS inhoudspad config.lfs_http_auth_expiry=LFS HTTP Auth Vervaltijd - config.db_config=Databaseconfiguratie config.db_type=Type config.db_host=Host @@ -2626,7 +2522,6 @@ config.db_user=Gebruikersnaam config.db_schema=Schema config.db_ssl_mode=SSL config.db_path=Pad - config.service_config=Serviceconfiguratie config.register_email_confirm=E-mailbevestiging vereist bij registreren config.disable_register=Schakel zelf registratie uit @@ -2648,12 +2543,10 @@ config.default_allow_only_contributors_to_track_time=Sta alleen bijdragers toe t config.no_reply_address=Verborgen e-maildomein config.default_visibility_organization=Standaard zichtbaarheid voor nieuwe organisaties config.default_enable_dependencies=Issue afhankelijkheden standaard inschakelen - config.webhook_config=Webhook configuratie config.queue_length=Lengte van wachtrij config.deliver_timeout=Bezorging verlooptijd config.skip_tls_verify=TLS-verificatie overslaan - config.mailer_enabled=Ingeschakeld config.mailer_name=Naam config.mailer_smtp_port=SMTP Poort @@ -2667,16 +2560,13 @@ config.test_email_placeholder=E-mailadres (bijv. test@example.com) config.send_test_mail=Test e-mail verzenden config.test_mail_failed=Verzenden van een testmail naar '%s' is mislukt: %v config.test_mail_sent=Test-email is verstuurd naar '%s'. - config.oauth_config=OAuth-configuratie config.oauth_enabled=Ingeschakeld - config.cache_config=Cache-configuratie config.cache_adapter=Cache-adapter config.cache_interval=Cache-interval config.cache_conn=Cache-connectie config.cache_item_ttl=Cache-item TTL - config.session_config=Sessieconfiguratie config.session_provider=Sessieprovider config.provider_config=Provider config @@ -2685,12 +2575,10 @@ config.gc_interval_time=GC interval time config.session_life_time=Sessie duur config.https_only=Alleen HTTPS config.cookie_life_time=Cookie duur leeftijd - config.picture_config=Foto en avatar configuratie config.picture_service=Foto service config.disable_gravatar=Gravatar uitschakelen config.enable_federated_avatar=Federated avatars toestaan - config.git_config=Git configuratie config.git_disable_diff_highlight=Uitschakelen Diff Syntaxis-Highlight config.git_max_diff_lines=Maximum Diff Lijnen (voor een enkel bestand) @@ -2701,7 +2589,6 @@ config.git_mirror_timeout=Kopie Update Timeout config.git_clone_timeout=Kloon operatie timeout config.git_pull_timeout=Pull operatie timeout config.git_gc_timeout=GC operatie timeout - config.log_config=Logconfiguratie config.log_mode=Log-modus config.own_named_logger=Benoemde Logger @@ -2713,8 +2600,6 @@ config.access_log_mode=Toegangslog-modus config.access_log_template=Sjabloon config.xorm_log_mode=XORM Log-modus config.xorm_log_sql=Log SQL - - monitor.cron=Cron-taken monitor.name=Naam monitor.schedule=Planning @@ -2752,7 +2637,6 @@ monitor.queue.pool.flush.title=Wachtrij leegmaken monitor.queue.pool.flush.desc=Flush voegt een arbeider toe die zal afbreken zodra de wachtrij leeg is, of wanneer de wachtrij verlopen is. monitor.queue.pool.flush.submit=Flush Worker toevoegen monitor.queue.pool.flush.added=Flush Worker toegevoegd voor %[1]s - monitor.queue.settings.title=Pool instellingen monitor.queue.settings.timeout=Boost time-out monitor.queue.settings.timeout.placeholder=Momenteel %[1]v @@ -2767,7 +2651,6 @@ monitor.queue.settings.submit=Instellingen bijwerken monitor.queue.settings.changed=Instellingen bijgewerkt monitor.queue.settings.blocktimeout=Huidige Blok Time-out monitor.queue.settings.blocktimeout.value=%[1]v - monitor.queue.pool.none=Deze wachtrij heeft geen pool monitor.queue.pool.added=Worker groep toegevoegd monitor.queue.pool.max_changed=Maximum aantal workers veranderd @@ -2776,7 +2659,6 @@ monitor.queue.pool.workers.none=Geen worker groepen. monitor.queue.pool.cancel=Sluiten Worker Groep af monitor.queue.pool.cancelling=Worker roep wordt afgesloten monitor.queue.pool.cancel_notices=Deze groep van %s workers afsluiten? - notices.system_notice_list=Systeem aankondigingen notices.view_detail_header=Bekijk notificatie details notices.actions=Acties @@ -2791,6 +2673,12 @@ notices.type_2=Taak notices.desc=Beschrijving notices.op=Op. notices.delete_success=De systeemmeldingen zijn verwijderd. +users.list_status_filter.is_restricted=Beperkt +packages.owner=Eigenaar +packages.name=Naam +packages.type=Type +packages.repository=Opslagplaats +packages.size=Grootte [action] create_repo=repository aangemaakt in %s @@ -2859,4 +2747,21 @@ assets=Assets rubygems.required.ruby=Vereist Ruby versie rubygems.required.rubygems=Vereist RubyGem versie settings.link.button=Repository link bijwerken - +filter.type=Type +conan.details.repository=Opslagplaats +owner.settings.cleanuprules.enabled=Ingeschakeld + +[aria] + +[secrets] +name=Naam + +[actions] +runners.name=Naam +runners.owner_type=Type +runners.description=Omschrijving +runners.task_list.run=Uitvoeren +runners.task_list.repository=Opslagplaats +runners.task_list.commit=Commit +runners.status.active=Actief +runs.commit=Commit diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini index 8d2b7461d53c..16895a3cf2ba 100644 --- a/options/locale/locale_pl-PL.ini +++ b/options/locale/locale_pl-PL.ini @@ -22,7 +22,6 @@ enable_javascript=Strona działa najlepiej z włączonym JavaScript. toc=Spis treści licenses=Licencje return_to_gitea=Wróć do Gitea - username=Nazwa użytkownika email=Adres e-mail password=Hasło @@ -32,7 +31,6 @@ captcha=CAPTCHA twofa=Autoryzacja dwuskładnikowa twofa_scratch=Kod jednorazowy weryfikacji dwuetapowej passcode=Kod dostępu - webauthn_insert_key=Podłącz swój klucz bezpieczeństwa webauthn_sign_in=Naciśnij przycisk na swoim kluczu bezpieczeństwa. Jeśli go nie posiada, podłącz go ponownie. webauthn_press_button=Naciśnij przycisk na swoim kluczu bezpieczeństwa… @@ -46,7 +44,6 @@ webauthn_error_duplicated=Klucz bezpieczeństwa nie jest dozwolony dla tego żą webauthn_error_empty=Musisz ustawić nazwę dla tego klucza. webauthn_error_timeout=Osiągnięto limit czasu zanim Twój klucz może zostać odczytany. Odśwież stronę i spróbuj ponownie. webauthn_reload=Odśwież - repository=Repozytorium organization=Organizacja mirror=Kopia lustrzana @@ -64,18 +61,15 @@ settings=Ustawienia your_profile=Profil your_starred=Z gwiazdką your_settings=Ustawienia - all=Wszystko sources=Źródła mirrors=Kopie lustrzne collaborative=Współtworzone forks=Forki - activities=Aktywności pull_requests=Oczekujące zmiany issues=Zgłoszenia milestones=Kamienie milowe - ok=OK cancel=Anuluj save=Zapisz @@ -84,25 +78,21 @@ add_all=Dodaj wszystko remove=Usuń remove_all=Usuń wszystko edit=Edytuj - copy=Kopiuj copy_url=Kopiuj adres URL copy_branch=Kopiuj nazwę gałęzi copy_success=Skopiowano! copy_error=Kopiowanie nie powiodło się - write=Napisz preview=Podgląd loading=Ładowanie… - step1=Krok 1: step2=Krok 2: - error=Błąd error404=Strona, do której próbujesz dotrzeć nie istnieje lub nie jesteś autoryzowany aby go zobaczyć. - never=Nigdy - +enabled=Włączone +disabled=Wyłączone [filter] @@ -155,7 +145,6 @@ 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 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 - general_title=Ustawienia ogólne app_name=Tytuł witryny app_name_helper=Wprowadź nazwę firmy. @@ -175,7 +164,6 @@ app_url=Podstawowy adres URL Gitea app_url_helper=Podstawowy adres dla klonowania adresów URL HTTP(S) oraz powiadomień e-mail. log_root_path=Ścieżka dla logów log_root_path_helper=Pliki logów będą zapisywane w tym katalogu. - optional_title=Ustawienia opcjonalne email_title=Ustawienia e-mail smtp_from=Wyślij e-mail jako @@ -231,7 +219,9 @@ default_enable_timetracking_popup=Domyślnie włącz śledzenie czasu dla nowych no_reply_address=Ukryta domena e-mail no_reply_address_helper=Nazwa domeny dla użytkowników z ukrytym adresem e-mail. Przykładowo, użytkownik "jan" będzie zalogowany na Git'cie jako "jan@noreply.example.org", jeśli domena ukrytego adresu e-mail jest ustawiona na "noreply.example.org". password_algorithm=Algorytm hashowania haseł -password_algorithm_helper=Ustaw algorytm hashowania hasła. Algorytmy mają różne wymagania i moc. `argon2` posiadając dobrą charakterystykę używa dużej ilości pamięci i może być nieodpowiednie dla małych systemów. +password_algorithm_helper="""Ustaw algorytm hashowania hasła. Algorytmy mają różne wymagania i moc. `argon2` posiadając dobrą charakterystykę używa dużej ilości pamięci i może być nieodpowiednie dla małych systemów.""" +smtp_addr=Serwer SMTP +smtp_port=Port SMTP [home] uname_holder=Nazwa użytkownika lub adres email @@ -247,17 +237,14 @@ search_repos=Znajdź repozytorium… filter=Inne filtry filter_by_team_repositories=Filtruj według repozytoriów zespołu feed_of=Kanał "%s" - show_archived=Zarchiwizowane show_both_archived_unarchived=Wyświetlanie zarchiwizowanych i niezarchiwizowanych show_only_archived=Wyświetlanie tylko zarchiwizowanych show_only_unarchived=Wyświetlanie tylko niezarchiwizowanych - show_private=Prywatne show_both_private_public=Wyświetlanie publicznych i prywatnych show_only_private=Wyświetlanie tylko prywatnych show_only_public=Wyświetlanie tylko publicznych - issues.in_your_repos=W Twoich repozytoriach [explore] @@ -275,7 +262,6 @@ code_no_results=Nie znaleziono kodu źródłowego odpowiadającego Twojej frazie code_search_results=Wyniki wyszukiwania dla '%s' code_last_indexed_at=Ostatnio indeksowane %s - [auth] create_new_account=Zarejestruj konto register_helper_msg=Masz już konto? Zaloguj się teraz! @@ -344,31 +330,24 @@ password_pwned_err=Nie udało się ukończyć żądania do HaveIBeenPwned view_it_on=Zobacz na %s link_not_working_do_paste=Nie działa? Spróbuj skopiować i wkleić go do przeglądarki. hi_user_x=Cześć %s, - activate_account=Aktywuj swoje konto activate_account.title=%s, proszę aktywuj swoje konto activate_account.text_1=Cześć %[1]s, dziękujemy za rejestrację na %[2]! activate_account.text_2=Kliknij poniższy link, aby aktywować swoje konto w ciągu %s: - activate_email=Potwierdź swój adres e-mail activate_email.title=%s, proszę zweryfikować swój adres e-mail activate_email.text=Aby zweryfikować swój adres e-mail, w ciągu następnych %s kliknij poniższy link: - register_notify=Witamy w Gitea register_notify.title=%[1]s, witaj w %[2]s register_notify.text_1=to jest Twój e-mail z potwierdzeniem rejestracji dla %s! register_notify.text_2=Możesz teraz zalogować się za pomocą nazwy użytkownika: %s. register_notify.text_3=Jeśli to konto zostało utworzone dla Ciebie, ustaw swoje hasło. - reset_password=Odzyskaj swoje konto reset_password.title=%s, prosiłeś o odzyskanie konta reset_password.text=Kliknij poniższy link, aby odzyskać swoje konto w ciągu %s: - register_success=Rejestracja powiodła się - issue_assigned.pull=@%[1]s przypisał cię do pull request'a %[2]s w repozytorium %[3]s. issue_assigned.issue=@%[1]s przypisał cię do sprawy %[2]s w repozytorium %[3]s. - issue.x_mentioned_you=@%s wspomniał o Tobie: issue.action.force_push=%[1]s wymusił push'a %[2]s z %[3]s do %[4]s. issue.action.close=@%[1]s zamknął #%[2]d. @@ -377,7 +356,6 @@ issue.action.review=@%[1]s skomentował ten pull request. issue.action.ready_for_review=@%[1]s oznaczył ten pull request jako gotowy do sprawdzenia. issue.action.new=@%[1]s założył #%[2]d. issue.in_tree_path=W %s: - release.new.subject=%s w %s opublikowane release.new.text=@%[1]s wydał %[2]s w %[3]s release.title=Tytuł: %s @@ -385,16 +363,13 @@ release.note=Notatka: release.downloads=Pobierz: release.download.zip=Kod źródłowy (ZIP) release.download.targz=Kod źródłowy (TAR.GZ) - repo.transfer.subject_to=%s chciałby przenieść "%s" do %s repo.transfer.subject_to_you=%s chciałby przenieść "%s" do ciebie repo.transfer.to_you=ciebie repo.transfer.body=Aby zaakceptować lub odrzucić go, odwiedź %s lub po prostu go zignoruj. - repo.collaborator.added.subject=%s dodał Cię do %s repo.collaborator.added.text=Zostałeś dodany jako współtwórca repozytorium: - [modal] yes=Tak no=Nie @@ -412,33 +387,29 @@ PayloadUrl=URL do wywołania TeamName=Nazwa zespołu AuthName=Nazwa autoryzacji AdminEmail=E-mail administratora - NewBranchName=Nazwa nowej gałęzi CommitSummary=Podsumowanie commita CommitMessage=Wiadomość commita CommitChoice=Wybór commita TreeName=Ścieżka pliku Content=Treść - SSPISeparatorReplacement=Separator SSPIDefaultLanguage=Domyślny język - -require_error=` nie może być puste.` -alpha_dash_error=` powinno zawierać tylko znaki alfanumeryczne, myślniki ("-") i znaki podkreślenia ("_").` -alpha_dash_dot_error=` powinno zawierać tylko znaki alfanumeryczne, myślniki ("-"), znaki podkreślenia ("_") i kropki (".").` -git_ref_name_error=` musi być prawidłową nazwą Git.` -size_error=` musi być wielkości %s.` -min_size_error=` musi zawierać co najwyżej %s znaków.` -max_size_error=` musi zawierać co najwyżej %s znaków.` -email_error=` nie jest poprawnym adresem e-mail.` -include_error=`musi zawierać tekst '%s'.` -glob_pattern_error=` wzorzec glob jest nieprawidłowy: %s.` -regex_pattern_error=` wzorzec regex jest nieprawidłowy: %s.` +require_error=" nie może być puste." +alpha_dash_error=" powinno zawierać tylko znaki alfanumeryczne, myślniki ("-") i znaki podkreślenia ("_")." +alpha_dash_dot_error=" powinno zawierać tylko znaki alfanumeryczne, myślniki ("-"), znaki podkreślenia ("_") i kropki (".")." +git_ref_name_error=" musi być prawidłową nazwą Git." +size_error=" musi być wielkości %s." +min_size_error=" musi zawierać co najwyżej %s znaków." +max_size_error=" musi zawierać co najwyżej %s znaków." +email_error=" nie jest poprawnym adresem e-mail." +include_error=musi zawierać tekst '%s'. +glob_pattern_error=" wzorzec glob jest nieprawidłowy: %s." +regex_pattern_error=" wzorzec regex jest nieprawidłowy: %s." unknown_error=Nieznany błąd: captcha_incorrect=Kod CAPTCHA jest nieprawidłowy. password_not_match=Hasła nie są identyczne. lang_select_error=Wybierz język z listy. - username_been_taken=Ta nazwa użytkownika jest już zajęta. username_change_not_local_user=Użytkownicy nielokalni nie mogą zmieniać swojej nazwy użytkownika. repo_name_been_taken=Nazwa repozytorium jest już zajęta. @@ -468,16 +439,13 @@ user_not_exist=Użytkownik nie istnieje. team_not_exist=Ten zespół nie istnieje. last_org_owner=Nie możesz usunąć ostatniego użytkownika z zespołu "Owners". Organizacja musi mieć przynajmniej jednego właściciela. cannot_add_org_to_team=Organizacja nie może zostać dodana jako członek zespołu. - invalid_ssh_key=Nie można zweryfikować Twojego klucza SSH: %s invalid_gpg_key=Nie można zweryfikować Twojego klucza GPG: %s unable_verify_ssh_key=Nie można zweryfikować klucza SSH. Sprawdź czy wprowadzono go poprawnie. auth_failed=Uwierzytelnienie się nie powiodło: %v - still_own_repo=Twoje konto jest właścicielem jednego lub więcej repozytoriów - musisz je najpierw usunąć lub przekazać. still_has_org=Twoje konto jest członkiem jednej lub więcej organizacji - musisz je najpierw opuścić. org_still_own_repo=Twoje konto jest wciąż właścicielem jednego lub więcej repozytoriów - musisz je najpierw usunąć lub przekazać. - target_branch_not_exist=Gałąź docelowa nie istnieje. [user] @@ -495,7 +463,6 @@ unfollow=Przestań obserwować heatmap.loading=Ładowanie mapy cieplnej… user_bio=Biografia disabled_public_activity=Ten użytkownik wyłączył publiczne wyświetlanie jego aktywności. - form.name_reserved=Nazwa użytkownika '%s' jest zarezerwowana. form.name_pattern_not_allowed=Wzór "%s" nie jest dozwolony dla nazwy użytkownika. form.name_chars_not_allowed=Nazwa użytkownika '%s' zawiera nieprawidłowe znaki. @@ -518,7 +485,6 @@ account_link=Powiązane Konta organization=Organizacje uid=UID webauthn=Klucze bezpieczeństwa - public_profile=Profil publiczny biography_placeholder=Powiedz nam coś o sobie profile_desc=Twój adres e-mail będzie używany do powiadomień i innych działań. @@ -540,7 +506,6 @@ ui=Motyw privacy=Prywatność keep_activity_private=Ukryj moją aktywność na stronie profilu keep_activity_private_popup=Aktywność staje się widoczna tylko dla Ciebie i administratorów - lookup_avatar_by_mail=Znajdź awatar po adresie e-mail federated_avatar_lookup=Wyszukiwanie zewnętrznych awatarów enable_custom_avatar=Włącz niestandardowe awatary @@ -550,7 +515,6 @@ delete_current_avatar=Usuń obecny Avatar uploaded_avatar_not_a_image=Załadowany plik nie jest obrazem. uploaded_avatar_is_too_big=Przesłany plik przekroczył maksymalny rozmiar. update_avatar_success=Twój awatar został zmieniony. - change_password=Aktualizuj hasło old_password=Aktualne hasło new_password=Nowe hasło @@ -558,7 +522,6 @@ retype_new_password=Powtórz nowe hasło password_incorrect=Bieżące hasło nie jest prawidłowe. change_password_success=Twoje hasło zostało zaktualizowane. Od teraz możesz logować się za pomocą nowego hasła. password_change_disabled=Konta niebędące lokalnymi nie mogą zmienić swojego hasła poprzez interfejs przeglądarkowy Gitea. - emails=Adresy e-mail manage_emails=Zarządzaj adresami e-mail manage_themes=Wybierz motyw domyślny @@ -591,7 +554,6 @@ add_openid_success=Nowy adres OpenID został dodany. keep_email_private=Ukryj adres e-mail keep_email_private_popup=Twój adres e-mail zostanie ukryty przed innymi użytkownikami. openid_desc=OpenID pozwala na delegowanie uwierzytelniania do zewnętrznego operatora. - manage_ssh_keys=Zarządzaj kluczami SSH manage_gpg_keys=Zarządzaj kluczami GPG add_key=Dodaj klucz @@ -664,7 +626,6 @@ manage_social=Zarządzaj powiązanymi kontami społecznościowymi social_desc=Te konta społecznościowe są powiązane z Twoim kontem Gitea. Upewnij się, że rozpoznajesz każde z nich, gdyż za ich pomocą można zalogować się do Twojego konta Gitea. unbind=Rozłącz unbind_success=Konto społecznościowe zostało odłączone od Twojego konta Gitea. - 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 Gitea. @@ -676,7 +637,6 @@ generate_token_name_duplicate=%s istnieje już jako nazwa aplik delete_token=Usuń access_token_deletion=Usuń token dostępu delete_token_success=Token został usunięty. Aplikacje używające go nie będą miały już dostępu do Twojego konta. - manage_oauth2_applications=Zarządzaj aplikacjami OAuth2 edit_oauth2_application=Edytuj aplikację OAuth2 oauth2_applications_desc=Aplikacje OAuth2 pozwalają Twojej aplikacji zewnętrznej na bezpiecznie uwierzytelnianie użytkowników w tej instancji Gitea. @@ -698,14 +658,12 @@ oauth2_client_secret_hint=Sekret nie będzie więcej widoczny po opuszczeniu tej oauth2_application_edit=Zmień oauth2_application_create_description=Aplikacje OAuth2 umożliwiają Twojej aplikacji dostęp do kont użytkowników na tej instancji. oauth2_application_remove_description=Usunięcie aplikacji OAuth2 uniemożliwi jej dostępu do autoryzowanych kont użytkowników na tej instancji. Kontynuować? - authorized_oauth2_applications=Autoryzowane aplikacje OAuth2 authorized_oauth2_applications_description=Udzielono dostępu do swojego konta Gitea następującym aplikacjom. Odwołaj dostęp dla aplikacji, których już nie używasz. revoke_key=Odwołaj 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)? revoke_oauth2_grant_success=Pomyślnie odwołano dostępu. - 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. @@ -723,33 +681,27 @@ then_enter_passcode=Oraz wpisz kod dostępu pokazany w aplikacji: passcode_invalid=Kod dostępu jest nieprawidłowy. Spróbuj ponownie. twofa_enrolled=Na Twoim koncie została uruchomiona weryfikacja dwuetapowa. Przechowuj swój kod jednorazowy (%s) w bezpiecznym miejscu, gdyż jest widoczny tylko raz! twofa_failed_get_secret=Nie udało się uzyskać sekretu. - 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=Zarządzaj powiązanymi kontami manage_account_links_desc=Te konta zewnętrzne są powiązane z Twoim kontem Gitea. account_links_not_available=Obecnie nie ma żadnych zewnętrznych kont powiązanych z tym kontem Gitea. remove_account_link=Usuń powiązane konto remove_account_link_desc=Usunięcie powiązanego konta unieważni jego dostęp do Twojego konta Gitea. Kontynuować? remove_account_link_success=Powiązane konto zostało odłączone. - orgs_none=Nie jesteś członkiem żadnej organizacji. repos_none=Nie posiadasz żadnych repozytoriów - 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ń swoje konto delete_account_desc=Czy na pewno chcesz permanentnie usunąć to konto użytkownika? - email_notifications.enable=Włącz powiadomienia e-mail email_notifications.onmention=Wyślij wiadomość e-mail wyłącznie przy wzmiankach email_notifications.disable=Wyłącz powiadomienia e-mail email_notifications.submit=Ustaw preferencje wiadomości e-mail - visibility=Widoczność użytkownika visibility.public=Publiczny visibility.public_tooltip=Widoczne dla wszystkich użytkowników @@ -757,6 +709,10 @@ visibility.limited=Ograniczony visibility.limited_tooltip=Widoczne tylko dla zalogowanych użytkowników visibility.private=Prywatny visibility.private_tooltip=Widoczne tylko dla członków organizacji +comment_type_group_title=Tytuł +access_token_deletion_cancel_action=Anuluj +access_token_deletion_confirm_action=Usuń +link_account=Powiąż konto [repo] new_repo_helper=Repozytorium zawiera wszystkie pliki projektu, w tym historię zmian. Masz już to gdzie indziej? Migruj repozytorium. @@ -831,14 +787,12 @@ delete_preexisting_label=Usuń delete_preexisting=Usuń istniejące pliki delete_preexisting_content=Usuń pliki w %s delete_preexisting_success=Usunięto nieprzyjęte pliki w %s - transfer.accept=Akceptuj transfer transfer.accept_desc=Przenieś do "%s" transfer.reject=Odrzuć transfer transfer.reject_desc=Anuluj transfer do "%s" transfer.no_permission_to_accept=Nie masz uprawnień do akceptacji transfer.no_permission_to_reject=Nie masz uprawnień do odrzucenia - desc.private=Prywatne desc.public=Publiczne desc.private_template=Szablon prywatny @@ -846,7 +800,6 @@ desc.public_template=Szablon desc.internal=Wewnętrzny desc.internal_template=Wewnętrzny szablon desc.archived=Zarchiwizowane - template.items=Elementy szablonu template.git_content=Zawartość gita (domyślna gałąź) template.git_hooks=Hooki Git @@ -856,16 +809,13 @@ template.avatar=Awatar template.issue_labels=Etykiety zgłoszenia template.one_item=Musisz wybrać co najmniej jeden element szablonu template.invalid=Musisz wybrać repozytorium dla szablonu - archive.title=To repozytorium jest zarchiwizowane. Możesz wyświetlać pliki i je sklonować, ale nie możesz do niego przepychać zmian lub otwierać zgłoszeń/Pull Requestów. archive.issue.nocomment=To repozytorium jest zarchiwizowane. Nie możesz komentować zgłoszeń. archive.pull.nocomment=To repozytorium jest zarchiwizowane. Nie możesz komentować Pull Requestów. - form.reach_limit_of_creation_1=Osiągnąłeś już limit %d repozytorium. form.reach_limit_of_creation_n=Osiągnąłeś już limit %d repozytoriów. form.name_reserved=Nazwa repozytorium „%s” jest zarezerwowana. form.name_pattern_not_allowed=Wzór "%s" nie jest dozwolony w nazwie repozytorium. - need_auth=Autoryzacja migrate_options=Opcje migracji migrate_service=Usługa migracji @@ -914,7 +864,6 @@ migrate.migrating_labels=Migracja etykiet migrate.migrating_releases=Migracja wydań migrate.migrating_issues=Migracja problemów migrate.migrating_pulls=Migracja Pull Requestów - mirror_from=kopia lustrzana forked_from=sforkowany z generated_from=wygenerowane z @@ -928,19 +877,17 @@ unstar=Usuń polubienie star=Polub fork=Forkuj download_archive=Pobierz repozytorium - no_desc=Brak opisu quick_guide=Skrócona instrukcja clone_this_repo=Klonuj repozytorium create_new_repo_command=Tworzenie nowego repozytorium z linii poleceń push_exist_repo=Wypychanie istniejącego repozytorium z linii poleceń empty_message=To repozytorium nie zawiera żadnej zawartości. - code=Kod code.desc=Uzyskaj dostęp do kodu źródłowego, plików, commitów i gałęzi. branch=Gałąź tree=Drzewo -clear_ref=`Wyczyść bieżące odniesienie` +clear_ref=Wyczyść bieżące odniesienie filter_branch_and_tag=Filtruj gałąź lub tag find_tag=Znajdź tag branches=Gałęzie @@ -951,7 +898,6 @@ project_board=Projekty labels=Etykiety org_labels_desc=Etykiety organizacji, które mogą być używane z wszystkimi repozytoriami w tej organizacji org_labels_desc_manage=zarządzaj - milestones=Kamienie milowe commits=Commity commit=Commit @@ -967,7 +913,6 @@ file_view_rendered=Wyświetl renderowane file_view_raw=Zobacz czysty file_permalink=Bezpośredni odnośnik file_too_large=Ten plik jest zbyt duży, aby go wyświetlić. - file_copy_permalink=Kopiuj bezpośredni odnośnik video_not_supported_in_browser=Twoja przeglądarka nie obsługuje znacznika HTML5 "video". audio_not_supported_in_browser=Twoja przeglądarka nie obsługuje znacznika HTML5 "audio". @@ -983,7 +928,6 @@ download_file=Pobierz plik normal_view=Zwykły widok line=wiersz lines=wiersze - editor.new_file=Nowy plik editor.upload_file=Wyślij plik editor.edit_file=Edytuj plik @@ -1039,7 +983,6 @@ editor.cannot_commit_to_protected_branch=Nie można commitować do chronionej ga editor.no_commit_to_branch=Zatwierdzanie bezpośrednio do tej gałęzi nie jest możliwe, ponieważ: editor.user_no_push_to_branch=Użytkownik nie może wypychać do gałęzi editor.require_signed_commit=Gałąź wymaga podpisanych commitów - commits.desc=Przeglądaj historię zmian kodu źródłowego. commits.commits=Commity commits.no_commits=Brak pokrewnych commitów. '%s' i '%s' mają zupełnie odrębne historie. @@ -1056,10 +999,7 @@ commits.signed_by=Podpisane przez commits.signed_by_untrusted_user=Podpisane przez niezaufanego użytkownika commits.signed_by_untrusted_user_unmatched=Podpisane przez niezaufanego użytkownika, który nie pasuje do autora commita commits.gpg_key_id=ID klucza GPG - - ext_issues.desc=Link do zewnętrznego systemu śledzenia zgłoszeń. - projects=Projekty projects.description=Opis (opcjonalnie) projects.description_placeholder=Opis @@ -1093,7 +1033,6 @@ projects.board.deletion_desc=Usunięcie tablicy projektowej przeniesie wszystkie projects.board.color=Kolor projects.open=Otwórz projects.close=Zamknij - issues.desc=Organizuj zgłoszenia o błędach, zadania i cele. issues.filter_assignees=Filtruj przypisania issues.filter_milestones=Filtruj kamienie milowe @@ -1144,22 +1083,22 @@ issues.add_labels=dodano %s etykiety %s issues.remove_label=usunięto %s etykietę %s issues.remove_labels=usunięto %s etykiety %s issues.add_remove_labels=dodano %s i usunięto %s etykiety %s -issues.add_milestone_at=`dodaje to do kamienia milowego %s %s` -issues.add_project_at=`dodał to do %s projektu %s` -issues.change_milestone_at=`zmienia kamień milowy z %s na %s %s` -issues.change_project_at=`zmodyfikowano projekt z %s na %s %s` -issues.remove_milestone_at=`usuwa to z kamienia milowego %s %s` -issues.remove_project_at=`usunął to z %s projektu %s` -issues.deleted_milestone=`(usunięto)` -issues.deleted_project=`(usunięty)` -issues.self_assign_at=`przypisuje to na siebie %s` -issues.add_assignee_at=`zostaje przypisany(-a) przez %s %s` -issues.remove_assignee_at=`usunięto przypisanie przez %s %s` -issues.remove_self_assignment=`usuwa swoje przypisanie %s` -issues.change_title_at=`zmieniono tytuł z %s na %s %s` -issues.delete_branch_at=`usuwa gałąź %s %s` +issues.add_milestone_at=dodaje to do kamienia milowego %s %s +issues.add_project_at=dodał to do %s projektu %s +issues.change_milestone_at=zmienia kamień milowy z %s na %s %s +issues.change_project_at=zmodyfikowano projekt z %s na %s %s +issues.remove_milestone_at=usuwa to z kamienia milowego %s %s +issues.remove_project_at=usunął to z %s projektu %s +issues.deleted_milestone=(usunięto) +issues.deleted_project=(usunięty) +issues.self_assign_at=przypisuje to na siebie %s +issues.add_assignee_at=zostaje przypisany(-a) przez %s %s +issues.remove_assignee_at=usunięto przypisanie przez %s %s +issues.remove_self_assignment=usuwa swoje przypisanie %s +issues.change_title_at=zmieniono tytuł z %s na %s %s +issues.delete_branch_at=usuwa gałąź %s %s issues.filter_label=Etykieta -issues.filter_label_exclude=`Użyj Alt + Kliknij/Enter, aby wykluczyć etykiety` +issues.filter_label_exclude=Użyj Alt + Kliknij/Enter, aby wykluczyć etykiety issues.filter_label_no_select=Wszystkie etykiety issues.filter_milestone=Kamień milowy issues.filter_milestone_no_select=Wszystkie kamienie milowe @@ -1196,7 +1135,7 @@ issues.next=Następny issues.open_title=Otwarty issues.closed_title=Zamknięty issues.num_comments=%d komentarzy -issues.commented_at=`skomentował(-a) %s` +issues.commented_at=skomentował(-a) %s issues.delete_comment_confirm=Czy na pewno chcesz usunąć ten komentarz? issues.context.copy_link=Skopiuj link issues.context.quote_reply=Cytuj odpowiedź @@ -1208,16 +1147,16 @@ issues.close_comment_issue=Skomentuj i zamknij issues.reopen_issue=Otwórz ponownie issues.reopen_comment_issue=Skomentuj i otwórz ponownie issues.create_comment=Skomentuj -issues.closed_at=`zamknął(-ęła) to zgłoszenie %[2]s` -issues.reopened_at=`otworzył(-a) ponownie to zgłoszenie %[2]s` -issues.commit_ref_at=`wspomniał(-a) to zgłoszenie z commita %[2]s` -issues.ref_issue_from=`odwołał(-a) się do tego zgłoszenia %[4]s %[2]s` -issues.ref_pull_from=`odwołał(-a) się do tego Pull Requesta %[4]s %[2]s` -issues.ref_closing_from=`odwołał(-a) się do Pull Requesta %[4]s, który zamknie to zgłoszenie %[2]s` -issues.ref_reopening_from=`odwołał(-a) się do Pull Requesta %[4]s, który otworzy na nowo to zgłoszenie %[2]s` -issues.ref_closed_from=`zamknął(-ęła) to zgłoszenie %[4]s %[2]s` -issues.ref_reopened_from=`ponownie otworzył(-a) to zgłoszenie %[4]s %[2]s` -issues.ref_from=`z %[1]s` +issues.closed_at=zamknął(-ęła) to zgłoszenie %[2]s +issues.reopened_at=otworzył(-a) ponownie to zgłoszenie %[2]s +issues.commit_ref_at=wspomniał(-a) to zgłoszenie z commita %[2]s +issues.ref_issue_from=odwołał(-a) się do tego zgłoszenia %[4]s %[2]s +issues.ref_pull_from=odwołał(-a) się do tego Pull Requesta %[4]s %[2]s +issues.ref_closing_from=odwołał(-a) się do Pull Requesta %[4]s, który zamknie to zgłoszenie %[2]s +issues.ref_reopening_from=odwołał(-a) się do Pull Requesta %[4]s, który otworzy na nowo to zgłoszenie %[2]s +issues.ref_closed_from=zamknął(-ęła) to zgłoszenie %[4]s %[2]s +issues.ref_reopened_from=ponownie otworzył(-a) to zgłoszenie %[4]s %[2]s +issues.ref_from=z %[1]s issues.poster=Autor issues.collaborator=Współpracownik issues.owner=Właściciel @@ -1244,8 +1183,8 @@ issues.label.filter_sort.reverse_alphabetically=Alfabetycznie odwrotnie issues.label.filter_sort.by_size=Najmniejszy rozmiar issues.label.filter_sort.reverse_by_size=Największy rozmiar issues.num_participants=Uczestnicy %d -issues.attachment.open_tab=`Kliknij, aby zobaczyć "%s" w nowej karcie` -issues.attachment.download=`Kliknij, aby pobrać "%s"` +issues.attachment.open_tab=Kliknij, aby zobaczyć "%s" w nowej karcie +issues.attachment.download=Kliknij, aby pobrać "%s" issues.subscribe=Subskrybuj issues.unsubscribe=Anuluj subskrypcję issues.lock=Zablokuj konwersację @@ -1269,17 +1208,17 @@ issues.unlock.title=Odblokuj konwersację w tym zgłoszeniu. issues.comment_on_locked=Nie możesz umieszczać komentarzy pod zablokowanym zgłoszeniem. issues.tracker=Śledzenie czasu issues.start_tracking=Rozpocznij śledzenie czasu -issues.start_tracking_history=`rozpoczął(-ęła) pracę nad %s` +issues.start_tracking_history=rozpoczął(-ęła) pracę nad %s issues.tracker_auto_close=Licznik czasu zostanie automatycznie zatrzymany w momencie zamknięcia tego zgłoszenia -issues.stop_tracking_history=`zakończył(-a) pracę nad %s` +issues.stop_tracking_history=zakończył(-a) pracę nad %s issues.cancel_tracking=Odrzuć -issues.cancel_tracking_history=`anulował(-a) śledzenie czasu %s` +issues.cancel_tracking_history=anulował(-a) śledzenie czasu %s issues.add_time=Dodaj czas ręcznie issues.del_time=Usuń ten dziennik czasu issues.add_time_short=Dodaj czas issues.add_time_cancel=Anuluj -issues.add_time_history=`dodał(-a) spędzony czas %s` -issues.del_time_history=`usunął(-ęła) spędzony czas %s' +issues.add_time_history=dodał(-a) spędzony czas %s +issues.del_time_history='usunął(-ęła) spędzony czas %s' issues.add_time_hours=Godziny issues.add_time_minutes=Minuty issues.add_time_sum_to_small=Czas nie został wprowadzony. @@ -1306,8 +1245,8 @@ issues.dependency.add=Dodaj zależność… issues.dependency.cancel=Anuluj issues.dependency.remove=Usuń issues.dependency.remove_info=Usuń tę zależność -issues.dependency.added_dependency=`dodał nową zależność %s` -issues.dependency.removed_dependency=`usunął zależność %s` +issues.dependency.added_dependency=dodał nową zależność %s +issues.dependency.removed_dependency=usunął zależność %s issues.dependency.issue_close_blocks=To zgłoszenie blokuje zamknięcie następujących zgłoszeń issues.dependency.pr_close_blocks=Ten Pull Request blokuje zamknięcie następujących zgłoszeń issues.dependency.issue_close_blocked=Musisz zamknąć wszystkie zgłoszenia blokujące to zgłoszenie zanim je zamkniesz. @@ -1351,10 +1290,8 @@ issues.assignee.error=Nie udało się dodać wszystkich wybranych osób do przyp issues.reference_issue.body=Treść issues.content_history.edited=edytowano issues.content_history.delete_from_history=Usuń z historii - compare.compare_base=baza compare.compare_head=porównaj - pulls.desc=Włącz Pull Requesty i recenzjonowanie kodu. pulls.new=Nowy Pull Request pulls.compare_changes=Nowy Pull Request @@ -1368,7 +1305,7 @@ pulls.nothing_to_compare_and_allow_empty_pr=Te gałęzie są równe. Ten PR będ pulls.create=Utwórz Pull Request pulls.title_desc=chce scalić %[1]d commity/ów z %[2]s do %[3]s pulls.merged_title_desc=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.change_target_branch_at=zmienia gałąź docelową z %s na %s %s pulls.tab_conversation=Dyskusja pulls.tab_commits=Commity pulls.tab_files=Zmodyfikowane pliki @@ -1379,7 +1316,7 @@ pulls.merged_as=Pull Request został scalony jako Poprzedź tytuł przy pomocy %s, aby zapobiec przypadkowemu scaleniu tego Pull Requesta.` +pulls.title_wip_desc=Poprzedź tytuł przy pomocy %s, aby zapobiec przypadkowemu scaleniu tego Pull Requesta. pulls.still_in_progress=Wciąż w toku? pulls.add_prefix=Dodaj %s prefiks pulls.remove_prefix=Usuń %s prefiks @@ -1405,7 +1342,6 @@ pulls.reject_count_1=%d żądanie zmiany pulls.reject_count_n=%d żądań zmian pulls.waiting_count_1=%d oczekująca recenzja pulls.waiting_count_n=%d oczekujących recenzji - pulls.no_merge_desc=Ten Pull Request nie może zostać scalony, ponieważ wszystkie opcje scalania dla tego repozytorium są wyłączone. pulls.no_merge_helper=Włącz opcje scalania w ustawieniach repozytorium, lub scal ten Pull Request ręcznie. pulls.no_merge_wip=Ten pull request nie może być automatycznie scalony, ponieważ jest oznaczony jako praca w toku. @@ -1413,7 +1349,6 @@ pulls.no_merge_not_ready=Ten Pull Request nie jest gotowy do scalenia, sprawdź pulls.no_merge_access=Nie masz uprawnień, aby scalić ten Pull Request. pulls.merge_manually=Ręcznie scalone pulls.require_signed_wont_sign=Ta gałąź wymaga podpisanych commitów, ale to scalenie nie będzie podpisane - pulls.invalid_merge_option=Nie możesz użyć tej opcji scalania dla tego pull request'a. pulls.merge_conflict=Scalenie nie powiodło się: Wystąpił konflikt przy scalaniu. Porada: Wypróbuj innej strategii pulls.merge_conflict_summary=Komunikat o błędzie @@ -1423,7 +1358,7 @@ pulls.rebase_conflict_summary=Komunikat o błędzie pulls.unrelated_histories=Scalenie nie powiodło się: Head scalenia i baza nie mają wspólnej historii. Porada: Spróbuj innej strategii scalania pulls.merge_out_of_date=Scalenie nie powiodło się: Przy generowaniu scalenia, baza została zaktualizowana. Porada: Spróbuj ponownie. pulls.push_rejected_summary=Komunikat o całkowitym odrzuceniu -pulls.open_unmerged_pull_exists=`Nie możesz wykonać operacji ponownego otwarcia, ponieważ jest już oczekujący pull request (#%d) z identycznymi właściwościami.` +pulls.open_unmerged_pull_exists=Nie możesz wykonać operacji ponownego otwarcia, ponieważ jest już oczekujący pull request (#%d) z identycznymi właściwościami. pulls.status_checking=Niektóre etapy są w toku pulls.status_checks_success=Wszystkie etapy powiodły się pulls.status_checks_warning=Niektóre etapy zgłosiły ostrzeżenia @@ -1436,16 +1371,11 @@ pulls.update_branch_rebase=Aktualizuj branch przez rebase pulls.update_branch_success=Aktualizacja gałęzi powiodła się pulls.update_not_allowed=Nie masz uprawnień do aktualizacji gałęzi pulls.outdated_with_base_branch=Ta gałąź jest przestarzała w stosunku do gałęzi bazowej -pulls.closed_at=`zamknął(-ęła) ten pull request %[2]s` -pulls.reopened_at=`otworzył(-a) ponownie ten Pull Request %[2]s` -pulls.merge_instruction_hint=`Możesz także zobaczyć instrukcje wiersza poleceń.` +pulls.closed_at=zamknął(-ęła) ten pull request %[2]s +pulls.reopened_at=otworzył(-a) ponownie ten Pull Request %[2]s +pulls.merge_instruction_hint=Możesz także zobaczyć instrukcje wiersza poleceń. pulls.merge_instruction_step1_desc=Z repozytorium twojego projektu, sprawdź nową gałąź i przetestuj zmiany. pulls.merge_instruction_step2_desc=Połącz zmiany i zaktualizuj na Gitea. - - - - - milestones.new=Nowy kamień milowy milestones.closed=Zamknięto %s milestones.update_ago=Zaktualizowano %s temu @@ -1475,7 +1405,6 @@ milestones.filter_sort.least_complete=Najmniej kompletne milestones.filter_sort.most_complete=Najbardziej kompletne milestones.filter_sort.most_issues=Najwięcej zgłoszeń milestones.filter_sort.least_issues=Najmniej zgłoszeń - signing.will_sign=Ten commit zostanie podpisany przy pomocy klucza '%s' signing.wont_sign.error=Wystąpił błąd podczas sprawdzania, czy commit mógł być podpisany signing.wont_sign.nokey=Brak dostępnego klucza do podpisania tego commita @@ -1489,9 +1418,7 @@ signing.wont_sign.headsigned=Scalenie nie będzie podpisane, ponieważ head comm signing.wont_sign.commitssigned=Scalenie nie będzie podpisane, ponieważ wszystkie powiązane commity nie są podpisane signing.wont_sign.approved=Scalenie nie będzie podpisane, ponieważ PR nie został zatwierdzony signing.wont_sign.not_signed_in=Nie jesteś zalogowany - ext_wiki.desc=Link do zewnętrznego wiki. - wiki=Wiki wiki.welcome=Witaj na wiki! wiki.welcome_desc=Wiki pozwala Ci na tworzenie i współdzielenie dokumentacji ze współpracownikami. @@ -1514,7 +1441,6 @@ wiki.page_already_exists=Strona Wiki o tej samej nazwie już istnieje. wiki.reserved_page=Nazwa strony wiki '%s' jest zastrzeżona. wiki.pages=Strony wiki.last_updated=Ostatnia aktualizacja %s - activity=Aktywność activity.period.filter_label=Okres: activity.period.daily=1 dzień @@ -1579,13 +1505,11 @@ activity.git_stats_addition_n=%d dodań activity.git_stats_and_deletions=i activity.git_stats_deletion_1=%d usunięcie activity.git_stats_deletion_n=%d usunięć - search=Szukaj search.search_repo=Przeszukaj repozytorium search.fuzzy=Fuzzy search.match=Dopasuj search.results=Wyniki wyszukiwania dla "%s" w %s - settings=Ustawienia settings.desc=Ustawienia to miejsce, w którym możesz zmieniać parametry repozytorium settings.options=Repozytorium @@ -1845,8 +1769,8 @@ settings.dismiss_stale_approvals=Unieważnij przestarzałe zatwierdzenia settings.dismiss_stale_approvals_desc=Kiedy nowe commity zmieniające zawartość Pull Requesta są wypychane do gałęzi, wcześniejsze zatwierdzenia zostaną unieważnione. settings.require_signed_commits=Wymagaj podpisanych commitów settings.require_signed_commits_desc=Odrzucaj zmiany wypychane do tej gałęzi, jeśli nie są podpisane, lub są niemożliwe do zweryfikowania. -settings.protect_protected_file_patterns=Wzory chronionych plików (rozdzielone średnikiem '\;'): -settings.protect_protected_file_patterns_desc=Chronione pliki, które nie mogą być zmieniane bezpośrednio, nawet jeśli użytkownik ma uprawnienia do dodawania, edytowania lub usuwania plików w tej branży. Wiele wzorów można rozdzielić za pomocą średnika ('\;'). Zobacz dokumentację github.com/gobwas/glob dla składni wzorca. Przykłady: .drone.yml, /docs/**/*.txt. +settings.protect_protected_file_patterns=Wzory chronionych plików (rozdzielone średnikiem ';'): +settings.protect_protected_file_patterns_desc=Chronione pliki, które nie mogą być zmieniane bezpośrednio, nawet jeśli użytkownik ma uprawnienia do dodawania, edytowania lub usuwania plików w tej branży. Wiele wzorów można rozdzielić za pomocą średnika (';'). Zobacz dokumentację github.com/gobwas/glob dla składni wzorca. Przykłady: .drone.yml, /docs/**/*.txt. settings.add_protected_branch=Włącz ochronę settings.delete_protected_branch=Wyłącz ochronę settings.update_protect_branch_success=Ochrona gałęzi dla gałęzi "%s" została zaktualizowana. @@ -1921,7 +1845,6 @@ settings.lfs_pointers.accessible=Dostępne dla użytkownika settings.lfs_pointers.associateAccessible=Powiąż dostępne %d OID settings.rename_branch_from=nazwa starej gałęzi settings.rename_branch_to=nazwa nowej gałęzi - diff.browse_source=Przeglądaj źródła diff.parent=rodzic diff.commit=commit @@ -1965,7 +1888,6 @@ diff.review.reject=Zażądaj zmian diff.committed_by=zatwierdzone przez diff.protected=Chronione diff.image.overlay=Nakładka - releases.desc=Śledź wersje projektu i pobrania. release.releases=Wydania release.detail=Szczegóły wydania @@ -2007,7 +1929,6 @@ release.downloads=Pliki do pobrania release.download_count=Pobrania: %s release.add_tag_msg=Użyj tytułu i zawartości wydania jako wiadomości znacznika. release.add_tag=Utwórz tylko znacznik - branch.name=Nazwa gałęzi branch.search=Szukaj gałęzi branch.already_exists=Gałąź z nazwą '%s' już istnieje. @@ -2037,20 +1958,22 @@ branch.create_new_branch=Utwórz branch z branch'a: branch.confirm_create_branch=Utwórz gałąź branch.new_branch=Utwórz nową gałąź branch.new_branch_from=Utwórz nowy branch z '%s' - tag.create_tag=Utwóz tag %s - tag.create_success=Tag '%s' został utworzony. - topic.manage_topics=Zarządzaj tematami topic.done=Gotowe topic.count_prompt=Nie możesz wybrać więcej, niż 25 tematów topic.format_prompt=Tematy muszą się zaczynać od litery lub cyfry, mogą zawierać myślniki ('-') i mogą mieć do 35 znaków. - - error.csv.too_large=Nie można wyświetlić tego pliku, ponieważ jest on zbyt duży. error.csv.unexpected=Nie można renderować tego pliku, ponieważ zawiera nieoczekiwany znak w wierszu %d i kolumnie %d. error.csv.invalid_field_count=Nie można renderować tego pliku, ponieważ ma nieprawidłową liczbę pól w wierszu %d. +issues.filter_project_none=Brak projektu +issues.draft_title=Szkic +issues.delete=Usuń +search.code_no_results=Nie znaleziono kodu źródłowego odpowiadającego Twojej frazie wyszukiwania. +settings.slack_color=Kolor +settings.event_wiki=Wiki +branch.create_branch_operation=Utwórz gałąź [org] org_name_holder=Nazwa organizacji @@ -2073,11 +1996,9 @@ team_access_desc=Dostęp do repozytorium team_permission_desc=Uprawnienie team_unit_desc=Zezwól na dostęp do sekcji repozytoriów team_unit_disabled=(Wyłączone) - form.name_reserved=Nazwa organizacji '%s' jest zastrzeżona. form.name_pattern_not_allowed=Wzór '%s' nie jest dozwolony w nazwie organizacji. form.create_org_not_allowed=Nie masz uprawnień do stworzenia organizacji. - settings=Ustawienia settings.options=Organizacja settings.full_name=Imię i nazwisko @@ -2091,7 +2012,6 @@ settings.visibility.limited=Ukryte (widoczność tylko dla zalogowanych użytkow settings.visibility.limited_shortname=Ograniczony settings.visibility.private=Prywatne (widoczne tylko dla użytkowników organizacji) settings.visibility.private_shortname=Prywatny - settings.update_settings=Aktualizuj ustawienia settings.update_setting_success=Ustawienia organizacji zostały zaktualizowane. settings.change_orgname_prompt=Uwaga: zmiana nazwy organizacji zmieni również adres URL tej organizacji. @@ -2104,9 +2024,7 @@ settings.confirm_delete_account=Potwierdź usunięcie settings.delete_org_title=Usuń organizację settings.delete_org_desc=Ta organizacja zostanie trwale usunięta. Kontynuować? settings.hooks_desc=Dodaj webhooki, uruchamiane dla wszystkich repozytoriów w tej organizacji. - settings.labels_desc=Dodaj etykiety, które mogą być używane w zgłoszeniach dla wszystkich repozytoriów w tej organizacji. - members.membership_visibility=Widoczność członkostwa: members.public=Widoczny members.public_helper=ukryj @@ -2120,7 +2038,6 @@ members.leave=Opuść members.leave.detail=Opuścić %s? members.invite_desc=Dodaj nowego członka do %s: members.invite_now=Zaproś teraz - teams.join=Dołącz teams.leave=Opuść teams.leave.detail=Opuścić %s? @@ -2161,6 +2078,8 @@ teams.all_repositories_helper=Zespół ma dostęp do wszystkich repozytoriów. W teams.all_repositories_read_permission_desc=Ten zespół nadaje uprawnienie Odczytu do wszystkich repozytoriów: jego członkowie mogą wyświetlać i klonować repozytoria. teams.all_repositories_write_permission_desc=Ten zespół nadaje uprawnienie Zapisu do wszystkich repozytoriów: jego członkowie mogą odczytywać i przesyłać do repozytoriów. teams.all_repositories_admin_permission_desc=Ten zespół nadaje uprawnienia Administratora do wszystkich repozytoriów: jego członkowie mogą odczytywać, przesyłać oraz dodawać innych współtwórców do repozytoriów. +members=Członkowie +teams.read_access=Przeczytane [admin] dashboard=Pulpit @@ -2176,7 +2095,6 @@ monitor=Monitorowanie first_page=Pierwsza last_page=Ostatnia total=Ogółem: %d - dashboard.statistic=Podsumowanie dashboard.operations=Operacje konserwacji dashboard.system_status=Status strony @@ -2248,7 +2166,6 @@ dashboard.last_gc_pause=Ostatnie wstrzymanie przez GC dashboard.gc_times=Ilość wywołań GC dashboard.delete_old_actions=Usuń wszystkie stare akcje z bazy danych dashboard.delete_old_actions.started=Usuwanie wszystkich starych akcji z bazy danych rozpoczęte. - users.user_manage_panel=Zarządzanie kontami użytkowników users.new_account=Nowy użytkownik users.name=Nazwa użytkownika @@ -2286,7 +2203,6 @@ users.still_own_repo=Ten użytkownik jest właścicielem jednego lub większej i users.still_has_org=Ten użytkownik jest członkiem organizacji. Musisz go najpierw usunąć ze wszystkich organizacji. users.deletion_success=Konto użytkownika zostało usunięte. users.reset_2fa=Zresetuj 2FA - emails.email_manage_panel=Zarządzanie adresami email emails.primary=Podstawowy emails.activated=Aktywowany @@ -2299,13 +2215,11 @@ emails.not_updated=Nie udało się zaktualizować żądanego adresu e-mail: %v emails.duplicate_active=Ten e-mail jest już aktywny dla innego użytkownika. emails.change_email_header=Aktualizuj właściwości adresu e-mail emails.change_email_text=Czy na pewno chcesz zaktualizować ten adres? - orgs.org_manage_panel=Zarządzanie organizacją orgs.name=Nazwa orgs.teams=Zespoły orgs.members=Członkowie orgs.new_orga=Nowa organizacja - repos.repo_manage_panel=Zarządzanie repozytoriami repos.unadopted=Nieprzyjęte repozytoria repos.unadopted.no_more=Nie znaleziono więcej nieprzyjętych repozytoriów @@ -2317,18 +2231,14 @@ repos.stars=Polubienia repos.forks=Forki repos.issues=Zgłoszenia repos.size=Rozmiar - - defaulthooks=Domyślne Webhooki defaulthooks.desc=Webhooki automatycznie wysyłają zapytania HTTP POST na serwer, gdy niektóre zdarzenia Gitea je wyzwalają. Webhooki zdefiniowane tutaj są domyślne i zostaną skopiowane do wszystkich nowych repozytoriów. Przeczytaj więcej w przewodniku webhooków. defaulthooks.add_webhook=Dodaj domyślny Webhook defaulthooks.update_webhook=Zaktualizuj domyślny Webhook - systemhooks=Webhooki Systemowe systemhooks.desc=Webhooki automatycznie tworzą zapytania HTTP POST do serwera, kiedy następują pewne zdarzenia w Gitea. Webhooki zdefiniowane w tym miejscu będą wykonywane dla wszystkich repozytoriów, więc rozważ ewentualne konsekwencje pod względem wydajności. Przeczytaj o tym więcej w przewodniku o Webhookach. systemhooks.add_webhook=Dodaj Webhook Systemowy systemhooks.update_webhook=Aktualizuj Webhook Systemowy - auths.auth_manage_panel=Zarządzanie źródłami uwierzytelniania auths.new=Dodaj źródło uwierzytelniania auths.name=Nazwa @@ -2421,7 +2331,6 @@ auths.still_in_used=Źródło uwierzytelniania jest wciąż w użyciu. Przekonwe auths.deletion_success=Źródło uwierzytelniania zostało usunięte. auths.login_source_exist=Źródło uwierzytelniania '%s' już istnieje. auths.login_source_of_type_exist=Źródło uwierzytelniania tego typu już istnieje. - config.server_config=Konfiguracja serwera config.app_name=Tytuł strony config.app_ver=Wersja Gitea @@ -2439,7 +2348,6 @@ config.static_file_root_path=Ścieżka główna plików statycznych config.log_file_root_path=Ścieżka dla logów config.script_type=Typ skryptu config.reverse_auth_user=Użytkownik odwrotnego proxy - config.ssh_config=Konfiguracja SSH config.ssh_enabled=Włączone config.ssh_start_builtin_server=Wykorzystaj wbudowany serwer @@ -2450,12 +2358,10 @@ config.ssh_key_test_path=Ścieżka do klucza testowego config.ssh_keygen_path=Ścieżka do generatora ('ssh-keygen') config.ssh_minimum_key_size_check=Sprawdzanie minimalnej długości klucza config.ssh_minimum_key_sizes=Minimalne rozmiary kluczy - config.lfs_config=Konfiguracja LFS config.lfs_enabled=Włączone config.lfs_content_path=Ścieżka zawartości LFS config.lfs_http_auth_expiry=Wygasanie uwierzytelnienia LFS HTTP - config.db_config=Konfiguracja bazy danych config.db_type=Typ config.db_host=Serwer @@ -2464,7 +2370,6 @@ config.db_user=Nazwa użytkownika config.db_schema=Schemat config.db_ssl_mode=SSL config.db_path=Ścieżka - config.service_config=Konfiguracja usługi config.register_email_confirm=Wymagaj potwierdzenia adresu e-mail przy rejestracji config.disable_register=Wyłącz samodzielną rejestrację @@ -2487,12 +2392,10 @@ config.default_allow_only_contributors_to_track_time=Zezwalaj wyłącznie wspó config.no_reply_address=Ukryta domena e-mail config.default_visibility_organization=Domyślna widoczność dla nowych organizacji config.default_enable_dependencies=Domyślne włączanie zależności zgłoszeń - config.webhook_config=Konfiguracja webhooka config.queue_length=Długość kolejki config.deliver_timeout=Limit czasu doręczenia config.skip_tls_verify=Pomiń weryfikację TLS - config.mailer_enabled=Włączona config.mailer_name=Nazwa config.mailer_user=Użytkownik @@ -2504,16 +2407,13 @@ config.test_email_placeholder=Email (np. test@example.com) config.send_test_mail=Wyślij testową wiadomość e-mail config.test_mail_failed=Nie udało się wysłać testowej wiadomości e-mail do '%s': %v config.test_mail_sent=Testowa wiadomość e-mail została wysłana do '%s'. - config.oauth_config=Konfiguracja OAuth config.oauth_enabled=Włączone - config.cache_config=Konfiguracja pamięci podręcznej config.cache_adapter=Adapter pamięci podręcznej config.cache_interval=Interwał pamięci podręcznej config.cache_conn=Połączenie z pamięcią podręczną config.cache_item_ttl=TTL składnika pamięci podręcznej - config.session_config=Konfiguracja sesji config.session_provider=Dostawca sesji config.provider_config=Konfiguracja dostawcy @@ -2522,12 +2422,10 @@ config.gc_interval_time=Interwał usuwania śmieci config.session_life_time=Czas ważności sesji config.https_only=Tylko HTTPS config.cookie_life_time=Czas ważności ciasteczka - config.picture_config=Konfiguracja obrazu i awataru config.picture_service=Usługa obrazów config.disable_gravatar=Wyłącz Gravatar config.enable_federated_avatar=Włącz sfederowane awatary - config.git_config=Konfiguracja Git config.git_disable_diff_highlight=Wyłączyć wyróżnianie składni diff config.git_max_diff_lines=Maksymalna liczba linii diff (dla pojedynczego pliku) @@ -2539,7 +2437,6 @@ config.git_mirror_timeout=Limit czasu aktualizacji kopii lustrzanej config.git_clone_timeout=Limit czasu operacji klonowania config.git_pull_timeout=Limit czasu dla operacji pull config.git_gc_timeout=Limit czasu usuwania śmieci - config.log_config=Konfiguracja dziennika config.log_mode=Tryb dziennika config.own_named_logger=Nazwany logger @@ -2551,8 +2448,6 @@ config.access_log_mode=Tryb dziennika dostępu config.access_log_template=Szablon config.xorm_log_mode=Tryb dziennika XORM config.xorm_log_sql=Dziennik SQL - - monitor.cron=Zadania cron monitor.name=Nazwa monitor.schedule=Harmonogram @@ -2590,7 +2485,6 @@ monitor.queue.pool.flush.title=Wyczyść kolejkę monitor.queue.pool.flush.desc=Czyszczenie doda proces pracujący, który zakończy się po opróżnieniu kolejki lub osiągnięciu limitu czasu. monitor.queue.pool.flush.submit=Dodaj proces czyszczący monitor.queue.pool.flush.added=Proces czyszczący dodany dla %[1]s - monitor.queue.settings.title=Ustawienia Puli monitor.queue.settings.timeout=Zwiększ limit czasu monitor.queue.settings.timeout.placeholder=Obecnie %[1]v @@ -2605,7 +2499,6 @@ monitor.queue.settings.submit=Aktualizuj ustawienia monitor.queue.settings.changed=Zaktualizowano ustawienia monitor.queue.settings.blocktimeout=Limit czasu wybranego bloku monitor.queue.settings.blocktimeout.value=%[1]v - monitor.queue.pool.none=Ta kolejka nie ma Puli monitor.queue.pool.added=Dodano grupę pracowników monitor.queue.pool.max_changed=Zmieniono maksymalną ilość procesów pracujących @@ -2615,7 +2508,6 @@ monitor.queue.pool.cancel=Wyłącz grupę pracowników monitor.queue.pool.cancelling=Grupa pracowników wyłącza się monitor.queue.pool.cancel_notices=Wyłączyć grupę %s pracowników? monitor.queue.pool.cancel_desc=Pozostawienie kolejki bez żadnej grupy pracowników może powodować blokowanie żądań. - notices.system_notice_list=Powiadomienia systemu notices.view_detail_header=Pokaż szczegóły powiadomienia notices.actions=Czynności @@ -2630,6 +2522,15 @@ notices.type_2=Zadanie notices.desc=Opis notices.op=Operacja notices.delete_success=Powiadomienia systemu zostały usunięte. +users.list_status_filter.is_active=Aktywne +users.list_status_filter.is_admin=Administrator +users.list_status_filter.is_restricted=Ograniczone +packages.owner=Właściciel +packages.name=Nazwa +packages.type=Typ +packages.repository=Repozytorium +packages.size=Rozmiar +config.mailer_smtp_port=Port SMTP [action] create_repo=tworzy repozytorium %s @@ -2698,4 +2599,21 @@ error.no_unit_allowed_repo=Nie masz uprawnień do żadnej sekcji tego repozytori error.unit_not_allowed=Nie masz uprawnień do tej sekcji repozytorium. [packages] - +filter.type=Typ +conan.details.repository=Repozytorium +owner.settings.cleanuprules.enabled=Włączone + +[aria] + +[secrets] +name=Nazwa + +[actions] +runners.name=Nazwa +runners.owner_type=Typ +runners.description=Opis +runners.task_list.run=Uruchom +runners.task_list.repository=Repozytorium +runners.task_list.commit=Commit +runners.status.active=Aktywne +runs.commit=Commit diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini index 41710ce6fa01..d081cf262f8a 100644 --- a/options/locale/locale_pt-BR.ini +++ b/options/locale/locale_pt-BR.ini @@ -23,7 +23,6 @@ enable_javascript=Este site funciona melhor com JavaScript. toc=Índice licenses=Licenças return_to_gitea=Volte para Gitea - username=Nome de usuário email=Endereço de e-mail password=Senha @@ -33,7 +32,6 @@ captcha=CAPTCHA twofa=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 webauthn_sign_in=Pressione o botão na sua chave de segurança. Se a sua chave de segurança não tiver um botão, insira-a novamente. webauthn_press_button=Por favor, pressione o botão na sua chave de segurança… @@ -47,7 +45,6 @@ webauthn_error_duplicated=A chave de segurança não é permitida para esta soli webauthn_error_empty=Você deve definir um nome para esta chave. webauthn_error_timeout=Tempo limite atingido antes de sua chave poder ser lida. Por favor, recarregue esta página e tente novamente. webauthn_reload=Recarregar - repository=Repositório organization=Organização mirror=Espelhamento @@ -65,18 +62,15 @@ settings=Configurações your_profile=Perfil your_starred=Favorito your_settings=Configurações - all=Todos sources=Fontes mirrors=Espelhamentos collaborative=Colaborativo forks=Forks - activities=Atividades pull_requests=Pull requests issues=Issues milestones=Marcos - ok=Ok cancel=Cancelar save=Salvar @@ -85,28 +79,28 @@ add_all=Adicionar todos remove=Remover remove_all=Excluir todos edit=Editar - copy=Copiar copy_url=Copiar URL copy_branch=Copiar nome do branch copy_success=Copiado! copy_error=A cópia falhou - write=Escrever preview=Pré-visualização loading=Carregando… - step1=Passo 1: step2=Passo 2: - error=Erro error404=A página que você está tentando acessar não existe ou você não está autorizado a visualizá-la. - never=Nunca - rss_feed=Feed RSS +enabled=Habilitado +disabled=Desabilitado +copy_content=Copiar conteúdo +copy_type_unsupported=Este tipo de arquivo não pode ser copiado [filter] +string.asc=A - Z +string.desc=Z - A [error] occurred=Ocorreu um erro @@ -157,7 +151,6 @@ err_empty_admin_email=O e-mail do administrador não pode ser em branco. err_admin_name_is_reserved=Nome de usuário do administrador é inválido, nome de usuário está reservado err_admin_name_pattern_not_allowed=Nome de usuário administrador é inválido, o nome de usuário corresponde a um padrão reservado err_admin_name_is_invalid=Nome de usuário do administrador inválido - general_title=Configurações gerais app_name=Nome do servidor app_name_helper=Você pode inserir o nome da empresa aqui. @@ -177,7 +170,6 @@ app_url=URL base do Gitea app_url_helper=Endereço base para URLs clone HTTP(S) e notificações por e-mail. log_root_path=Caminho do log log_root_path_helper=Arquivos de log serão gravados neste diretório. - optional_title=Configurações opcionais email_title=Configurações de e-mail smtp_addr=Host SMTP @@ -235,7 +227,10 @@ default_enable_timetracking_popup=Habilitar o cronômetro para novos repositóri no_reply_address=Domínio de e-mail oculto no_reply_address_helper=Nome de domínio para usuários com um 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 Hash de Senha -password_algorithm_helper=Escolha o algoritmo de hash para as senhas. Diferentes algoritmos têm requerimentos e forças diversos. O `Argon2` possui boa qualidade, porém usa muita memória e pode ser inapropriado para sistemas com menos recursos. +password_algorithm_helper="""Escolha o algoritmo de hash para as senhas. Diferentes algoritmos têm requerimentos e forças diversos. O `Argon2` possui boa qualidade, porém usa muita memória e pode ser inapropriado para sistemas com menos recursos.""" +invalid_password_algorithm=Algoritmo de hash de senha inválido +enable_update_checker=Habilitar Verificador de Atualizações +enable_update_checker_helper=Procura por novas versões periodicamente conectando-se ao gitea.io. [home] uname_holder=Usuário ou e-mail @@ -251,17 +246,14 @@ search_repos=Encontre um repositório… filter=Outros filtros filter_by_team_repositories=Filtrar por repositórios da equipe feed_of=Feed de "%s" - show_archived=Arquivado show_both_archived_unarchived=Mostrando arquivados e não arquivados show_only_archived=Mostrando somente arquivados show_only_unarchived=Mostrando somente não arquivados - show_private=Privado show_both_private_public=Mostrando públicos e privados show_only_private=Mostrando somente privados show_only_public=Mostrando somente públicos - issues.in_your_repos=Em seus repositórios [explore] @@ -281,7 +273,9 @@ code_search_results=Resultados da pesquisa por: '%s' code_last_indexed_at=Última indexação %s relevant_repositories_tooltip=Repositórios que são forks ou que não possuem tópico, nem ícone e nem descrição estão ocultos. relevant_repositories=Apenas repositórios relevantes estão sendo mostrados, mostrar resultados não filtrados. - +search.type.tooltip=Tipo de pesquisa +search.fuzzy.tooltip=Incluir resultados que sejam próximos ao termo de busca +search.match.tooltip=Incluir somente resultados que correspondam exatamente ao termo de busca [auth] create_new_account=Cadastrar conta @@ -350,36 +344,30 @@ authorization_failed_desc=A autorização falhou porque detectamos uma solicita sspi_auth_failed=Falha de autenticação SSPI password_pwned=A senha escolhida está em uma lista de senhas roubadas anteriormente expostas em violações de dados públicos. Por favor, tente novamente com uma senha diferente. password_pwned_err=Não foi possível concluir a requisição ao HaveIBeenPwned +invalid_password=Sua senha não coincide com a senha que foi usada para criar a conta. [mail] view_it_on=Veja em %s link_not_working_do_paste=Não está funcionando? Tente copiá-lo e colá-lo no seu navegador. hi_user_x=Olá %s, - activate_account=Por favor, ative sua conta activate_account.title=%s, por favor, ative a sua conta activate_account.text_1=Olá %[1]s, obrigado por se registrar em %[2]s! activate_account.text_2=Por favor clique no link a seguir para ativar sua conta em %s: - activate_email=Verifique seu endereço de e-mail activate_email.title=%s, por favor valide 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=Bem-vindo ao Gitea 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=Agora você pode entrar com o nome de usuário: %s. register_notify.text_3=Se esta conta foi criada para você, defina sua senha primeiro. - reset_password=Recuperar sua conta reset_password.title=%s, você pediu para recuperar a sua conta reset_password.text=Por favor clique no link a seguir para recuperar sua conta em %s: - register_success=Cadastro bem-sucedido - issue_assigned.pull=@%[1]atribuiu a você o pull request %[2]s no repositório %[3]s. issue_assigned.issue=@%[1]s atribuiu a você a issue %[2]s no repositório %[3]s. - issue.x_mentioned_you=@%s mencionou você: issue.action.force_push=%[1]s forçou o push de %[2]s de %[3]s para %[4]s. issue.action.push_1=@%[1]s fez o push de %[3]d commit para %[2]s @@ -394,7 +382,6 @@ issue.action.review_dismissed=@%[1]s descartou a última revisão de %[2] issue.action.ready_for_review=@%[1]s marcou este pull request como pronto para revisão. issue.action.new=@%[1]s criou #%[2]d. issue.in_tree_path=Em %s: - release.new.subject=%s em %s lançado release.new.text=@%[1]s lançou a versão %[2]s em %[3]s release.title=Título: %s @@ -402,15 +389,17 @@ release.note=Nota: release.downloads=Downloads: release.download.zip=Código fonte (ZIP) release.download.targz=Código fonte (TAR.GZ) - repo.transfer.subject_to=%s gostaria de transferir "%s" para %s repo.transfer.subject_to_you=%s gostaria de transferir "%s" para você repo.transfer.to_you=você repo.transfer.body=Para o aceitar ou rejeitar visite %s, ou simplesmente o ignore. - repo.collaborator.added.subject=%s adicionou você a %s repo.collaborator.added.text=Você foi adicionado como um colaborador do repositório: - +reply=ou responda diretamente a este email +team_invite.subject=%[1]s convidou você para participar da organização %[2]s +team_invite.text_1=%[1]s convidou você para participar da equipe %[2]s na organização %[3]s. +team_invite.text_2=Por favor, clique no seguinte link para se juntar à equipe: +team_invite.text_3=Nota: este convite foi destinado a %[1]s. Se você não estava esperando este convite, você pode ignorar este e-mail. [modal] yes=Sim @@ -429,34 +418,30 @@ PayloadUrl=URL de carga TeamName=Nome da equipe AuthName=Nome de autorização AdminEmail=E-mail do administrador - NewBranchName=Novo nome do branch CommitSummary=Resumo dos commits CommitMessage=Mensagem do commit CommitChoice=Escolha de commit TreeName=Caminho do arquivo Content=Conteúdo - SSPISeparatorReplacement=Separador SSPIDefaultLanguage=Idioma padrão - -require_error=` não pode estar em branco.` -alpha_dash_error=` deve conter somente alfanumérico, caracteres de traço ('-') e sublinhado ('_').` -alpha_dash_dot_error=` deve conter somente alfanumérico, caracteres de traço ('-'), sublinhado ('_') e ponto ('. ') .` -git_ref_name_error=` deve ser um nome de referência Git válido.` -size_error=`deve ser do tamanho %s.` -min_size_error=` deve conter pelo menos %s caracteres.` -max_size_error=` deve conter no máximo %s caracteres.` -email_error=` não é um endereço de e-mail válido.` -url_error=`'%s' não é uma URL válida.` -include_error=` deve conter '%s'.` -glob_pattern_error=` padrão glob é inválido: %s.` -regex_pattern_error=` o regex é inválido: %s.` +require_error=" não pode estar em branco." +alpha_dash_error=" deve conter somente alfanumérico, caracteres de traço ('-') e sublinhado ('_')." +alpha_dash_dot_error=" deve conter somente alfanumérico, caracteres de traço ('-'), sublinhado ('_') e ponto ('. ') ." +git_ref_name_error=" deve ser um nome de referência Git válido." +size_error=deve ser do tamanho %s. +min_size_error=" deve conter pelo menos %s caracteres." +max_size_error=" deve conter no máximo %s caracteres." +email_error=" não é um endereço de e-mail válido." +url_error='%s' não é uma URL válida. +include_error=" deve conter '%s'." +glob_pattern_error=" padrão glob é inválido: %s." +regex_pattern_error=" o regex é inválido: %s." unknown_error=Erro desconhecido: captcha_incorrect=O código CAPTCHA está incorreto. password_not_match=As senhas não coincidem. lang_select_error=Selecione um idioma da lista. - username_been_taken=O nome de usuário já está sendo usado. username_change_not_local_user=Usuários não-locais não são autorizados a alterar nome de usuário. repo_name_been_taken=O nome de repositório já está sendo usado. @@ -487,20 +472,22 @@ user_not_exist=O usuário não existe. team_not_exist=A equipe não existe. last_org_owner=Você não pode remover o último usuário do time 'proprietários'. Deve haver pelo menos um proprietário em uma organização. cannot_add_org_to_team=Uma organização não pode ser adicionada como membro de uma equipe. - invalid_ssh_key=Não é possível verificar sua chave SSH: %s invalid_gpg_key=Não é possível verificar sua chave GPG: %s invalid_ssh_principal=Nome principal inválido: %s unable_verify_ssh_key=Não é possível verificar sua chave SSH; verifique novamente se há erros. auth_failed=Autenticação falhou: %v - still_own_repo=Sua conta possui um ou mais repositórios; você deve excluí-los ou transferi-los primeiro. still_has_org=Sua conta é um membro de uma ou mais organizações; você deve deixá-las primeiro. still_own_packages=Sua conta possui um ou mais pacotes; você deve excluí-los primeiro. org_still_own_repo=Esta organização ainda possui repositórios; você deve excluí-los ou transferi-los primeiro. org_still_own_packages=Esta organização ainda possui pacotes; você deve excluí-los primeiro. - target_branch_not_exist=O branch de destino não existe. +username_error=" só pode conter caracteres alfanuméricos ('0-9','a-z','A-Z'), traço ('-'), sublinhado ('_') e ponto ('.'). Não pode começar ou terminar com caracteres não alfanuméricos, e caracteres não-alfanuméricos consecutivos também são proibidos." +invalid_group_team_map_error=" mapeamento é inválido: %s" +duplicate_invite_to_team=O usuário já foi convidado para se juntar da equipe. +organization_leave_success=Você saiu da organização %s com sucesso. +must_use_public_key=A chave que você forneceu é uma chave privada. Por favor, não envie sua chave privada em nenhum lugar. Use sua chave pública em vez disso. [user] change_avatar=Altere seu avatar... @@ -517,10 +504,10 @@ unfollow=Deixar de seguir heatmap.loading=Carregando mapa de calor... user_bio=Biografia disabled_public_activity=Este usuário desativou a visibilidade pública da atividade. - form.name_reserved=O nome de usuário '%s' está reservado. form.name_pattern_not_allowed=O padrão de '%s' não é permitido em um nome de usuário. form.name_chars_not_allowed=Nome de usuário '%s' contém caracteres inválidos. +code=Código [settings] profile=Perfil @@ -540,7 +527,6 @@ account_link=Contas vinculadas organization=Organizações uid=Uid webauthn=Chaves de segurança - public_profile=Perfil público biography_placeholder=Nos conte um pouco sobre você profile_desc=Seu endereço de e-mail será usado para notificações e outras operações. @@ -580,7 +566,6 @@ saved_successfully=Suas configurações foram salvas com sucesso. privacy=Privacidade keep_activity_private=Ocultar a atividade da página de perfil keep_activity_private_popup=Torna a atividade visível somente para você e os administradores - lookup_avatar_by_mail=Procurar o avatar do endereço de e-mail federated_avatar_lookup=Busca de avatar federativo enable_custom_avatar=Habilitar avatar customizado @@ -591,7 +576,6 @@ uploaded_avatar_not_a_image=O arquivo enviado não é uma imagem. uploaded_avatar_is_too_big=O arquivo enviado excedeu o tamanho máximo. update_avatar_success=Seu avatar foi atualizado. update_user_avatar_success=O avatar do usuário foi atualizado. - change_password=Atualizar senha old_password=Senha atual new_password=Nova senha @@ -599,7 +583,6 @@ retype_new_password=Digite a nova senha novamente password_incorrect=A senha atual está incorreta. change_password_success=Sua senha foi atualizada. Acesse usando sua nova senha de agora em diante. password_change_disabled=Contas não-locais não podem alterar sua senha através da interface web do Gitea. - emails=Endereços de e-mail manage_emails=Gerenciar endereços de e-mail manage_themes=Selecione o tema padrão @@ -632,7 +615,6 @@ 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 e-mail será ocultado de outros usuários. openid_desc=OpenID permite delegar autenticação para um provedor externo. - manage_ssh_keys=Gerenciar Chaves SSH manage_ssh_principals=Gerenciar Nomes Principais do certificado SSH manage_gpg_keys=Gerenciar chaves GPG @@ -711,7 +693,6 @@ manage_social=Gerenciar contas sociais associadas social_desc=Essas contas sociais estão vinculadas à sua conta do Gitea. Certifique-se de reconhecer todas elas, pois elas podem ser usadas para acessar a sua conta do Gitea. unbind=Desvincular unbind_success=A conta social foi desvinculada da sua conta do Gitea. - manage_access_token=Gerenciar tokens de acesso generate_new_token=Gerar novo token tokens_desc=Esses tokens concedem acesso à sua conta usando a API do Gitea. @@ -726,7 +707,6 @@ access_token_deletion_cancel_action=Cancelar access_token_deletion_confirm_action=Excluir access_token_deletion_desc=A exclusão de um token revoga o acesso à sua conta para aplicativos que o usam. Continuar? delete_token_success=O token foi excluído. Os aplicativos que o utilizam já não têm acesso à sua conta. - manage_oauth2_applications=Gerenciar aplicativos OAuth2 edit_oauth2_application=Editar aplicativo OAuth2 oauth2_applications_desc=Aplicativos OAuth2 permitem que seus aplicativos de terceiros autentiquem com segurança usuários nesta instância do Gitea. @@ -748,14 +728,12 @@ oauth2_client_secret_hint=O Client Secret não será visível se você revisitar oauth2_application_edit=Editar oauth2_application_create_description=Os aplicativos OAuth2 fornecem ao seus aplicativos de terceiros acesso a contas de usuário nesta instância. oauth2_application_remove_description=Remover um aplicativo OAuth2 impedirá que ele acesse contas de usuários autorizadas nesta instância. Continuar? - authorized_oauth2_applications=Aplicações OAuth2 autorizadas authorized_oauth2_applications_description=Você concedeu acesso à sua conta Gitea pessoal para estas aplicações de terceiros. Por favor, revogue o acesso para aplicações que não são mais necessárias. revoke_key=Revogar revoke_oauth2_grant=Revogar acesso revoke_oauth2_grant_description=Revogando o acesso para este aplicativo de terceiros impedirá este aplicativo de acessar seus dados. Tem certeza? revoke_oauth2_grant_success=Você revogou o acesso com sucesso. - 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. @@ -773,13 +751,11 @@ then_enter_passcode=E insira a senha mostrada no aplicativo: passcode_invalid=Esse código de acesso é inválido. Tente novamente. twofa_enrolled=Sua conta foi inscrita na autenticação de dois fatores. Armazene seu token de backup (%s) em um local seguro, pois ele é exibido apenas uma vez! twofa_failed_get_secret=Falha ao obter o segredo. - webauthn_desc=Chaves de segurança são dispositivos de hardware que contém chaves de criptografia. Elas podem ser usadas para autenticação de dois fatores. A chave de segurança deve suportar o padrão WebAuthnn Authenticator. webauthn_register_key=Adicionar chave de segurança webauthn_nickname=Apelido webauthn_delete_key=Remover chave de segurança webauthn_delete_key_desc=Se você remover uma chave de segurança, não poderá mais entrar com ela. Continuar? - manage_account_links=Gerenciar contas vinculadas manage_account_links_desc=Estas contas externas estão vinculadas a sua conta de Gitea. account_links_not_available=Não existem contas externas atualmente vinculadas a esta conta. @@ -787,23 +763,19 @@ link_account=Vincular Conta remove_account_link=Remover conta vinculada remove_account_link_desc=A exclusão da chave SSH revogará o acesso à sua conta. Continuar? remove_account_link_success=A conta vinculada foi removida. - orgs_none=Você não é membro de nenhuma organização. repos_none=Você não possui nenhum repositório - delete_account=Excluir sua conta delete_prompt=Esta operação irá apagar permanentemente a sua conta de usuário. Isto NÃO PODERÁ ser desfeito. delete_with_all_comments=Sua conta é mais nova que %s. Para evitar comentários fantasmas, todos os comentários de Issue/PR serão excluídos com ela. confirm_delete_account=Confirmar exclusão delete_account_title=Excluir conta de usuário delete_account_desc=Tem certeza que deseja apagar sua conta de usuário permanentemente? - email_notifications.enable=Habilitar notificações de e-mail email_notifications.onmention=Somente e-mail com menção email_notifications.disable=Desabilitar notificações de e-mail email_notifications.submit=Atualizar preferências de e-mail email_notifications.andyourown=E Suas Próprias Notificações - visibility=Visibilidade do usuário visibility.public=Pública visibility.public_tooltip=Visível para todos os usuários @@ -811,6 +783,9 @@ visibility.limited=Limitada visibility.limited_tooltip=Visível apenas para usuários logados visibility.private=Privada visibility.private_tooltip=Visível apenas para membros da organização +select_scopes=Selecione os escopos +scopes_list=Escopos: +oauth2_confidential_client=Cliente Confidencial. Selecione para aplicativos que mantêm a confidencialidade do segredo, como aplicativos web. Não selecione para aplicativos nativos, incluindo aplicativos desktop e celulares. [repo] new_repo_helper=Um repositório contém todos os arquivos do projeto, incluindo o histórico de revisão. Já o tem em outro lugar? Migre o repositório. @@ -897,14 +872,12 @@ delete_preexisting=Excluir arquivos pré-existentes delete_preexisting_content=Excluir arquivos em %s delete_preexisting_success=Arquivos órfãos excluídos em %s blame_prior=Ver a responsabilização anterior a esta modificação - transfer.accept=Aceitar transferência transfer.accept_desc=Transferir para "%s" transfer.reject=Rejeitar transferência transfer.reject_desc=Cancelar a transferência para "%s" transfer.no_permission_to_accept=Você não tem permissão para Aceitar transfer.no_permission_to_reject=Você não tem permissão para Rejeitar - desc.private=Privado desc.public=Público desc.private_template=Modelo privado @@ -912,7 +885,6 @@ desc.public_template=Modelo desc.internal=Interno desc.internal_template=Modelo interno desc.archived=Arquivado - template.items=Itens do modelo template.git_content=Conteúdo Git (Branch padrão) template.git_hooks=Hooks do Git @@ -923,16 +895,13 @@ template.avatar=Avatar template.issue_labels=Etiquetas de issue template.one_item=Deve-se selecionar pelo menos um item de modelo template.invalid=Deve-se selecionar um repositório de modelo - archive.title=Este repositório está arquivado. Você pode visualizar os arquivos e realizar clone, mas não poderá realizar push nem abrir issues e 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. form.name_reserved=O nome de repositório '%s' está reservado e não pode ser usado. form.name_pattern_not_allowed=O padrão de '%s' não é permitido em um nome de repositório. - need_auth=Autorização migrate_options=Opções de Migração migrate_service=Serviço de Migração @@ -983,7 +952,6 @@ migrate.migrating_labels=Migrando Rótulos migrate.migrating_releases=Migrando Versões migrate.migrating_issues=Migrando Issues migrate.migrating_pulls=Migrando Pull Requests - mirror_from=espelhamento de forked_from=feito fork de generated_from=gerado a partir de @@ -997,7 +965,6 @@ unstar=Retirar dos favoritos star=Juntar aos favoritos fork=Fork download_archive=Baixar repositório - no_desc=Nenhuma descrição quick_guide=Guia Rápido clone_this_repo=Clonar este repositório @@ -1005,12 +972,11 @@ create_new_repo_command=Criando um novo repositório por linha de comando push_exist_repo=Realizando push para um repositório existente por linha de comando empty_message=Este repositório está vazio. broken_message=Os dados Git subjacentes a este repositório não podem ser lidos. Entre em contato com o administrador desta instância ou exclua este repositório. - code=Código code.desc=Acesso a código-fonte, arquivos, commits e branches. branch=Branch tree=Tag -clear_ref=`Limpar referência atual` +clear_ref=Limpar referência atual filter_branch_and_tag=Filtrar branch ou tag find_tag=Pesquisar etiqueta branches=Branches @@ -1022,7 +988,6 @@ packages=Pacotes labels=Etiquetas org_labels_desc=Rótulos de nível de organização que podem ser usados em todos os repositórios sob esta organização org_labels_desc_manage=gerenciar - milestones=Marcos commits=Commits commit=Commit @@ -1038,14 +1003,13 @@ file_view_rendered=Ver Renderizado file_view_raw=Ver original file_permalink=Link permanente file_too_large=O arquivo é muito grande para ser mostrado. -invisible_runes_header=`Este arquivo contém caracteres Unicode invisíveis!` -invisible_runes_description=`Este arquivo contém caracteres Unicode invisíveis que podem ser processados de forma diferente do que aparece abaixo. Se seu caso de uso for intencional e legítimo, você pode ignorar com segurança esse aviso. Use o botão Escapar para revelar caracteres ocultos.` -ambiguous_runes_header=`Esse arquivo contém caracteres Unicode ambíguos!` -ambiguous_runes_description=`Este arquivo contém caracteres ambíguos Unicode que podem ser confundidos com outros no seu idioma atual. Se o seu caso de uso for intencional e legítimo, você pode ignorar com segurança este aviso. Use o botão Escapar para destacar esses caracteres.` -invisible_runes_line=`Esta linha tem caracteres unicode invisíveis` -ambiguous_runes_line=`Esta linha tem caracteres unicode ambíguos` -ambiguous_character=`%[1]c [U+%04[1]X] é confundível com o %[2]c [U+%04[2]X]` - +invisible_runes_header=Este arquivo contém caracteres Unicode invisíveis! +invisible_runes_description=Este arquivo contém caracteres Unicode invisíveis que podem ser processados de forma diferente do que aparece abaixo. Se seu caso de uso for intencional e legítimo, você pode ignorar com segurança esse aviso. Use o botão Escapar para revelar caracteres ocultos. +ambiguous_runes_header=Esse arquivo contém caracteres Unicode ambíguos! +ambiguous_runes_description=Este arquivo contém caracteres ambíguos Unicode que podem ser confundidos com outros no seu idioma atual. Se o seu caso de uso for intencional e legítimo, você pode ignorar com segurança este aviso. Use o botão Escapar para destacar esses caracteres. +invisible_runes_line=Esta linha tem caracteres unicode invisíveis +ambiguous_runes_line=Esta linha tem caracteres unicode ambíguos +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 @@ -1064,7 +1028,6 @@ download_file=Baixar arquivo normal_view=Visão normal line=linha lines=linhas - editor.add_file=Adicionar Arquivo editor.new_file=Novo arquivo editor.upload_file=Enviar arquivo @@ -1130,7 +1093,6 @@ editor.user_no_push_to_branch=O usuário não pode fazer push no branch editor.require_signed_commit=Branch requer um commit assinado editor.cherry_pick=Cherry-pick %s para: editor.revert=Reverter %s para: - commits.desc=Veja o histórico de alterações do código de fonte. commits.commits=Commits commits.no_commits=Nenhum commit em comum. '%s' e '%s' tem histórias completamente diferentes. @@ -1149,7 +1111,6 @@ commits.signed_by_untrusted_user=Assinado por usuário não confiável commits.signed_by_untrusted_user_unmatched=Assinado por usuário não confiável que não corresponde ao autor da submissão commits.gpg_key_id=ID da chave GPG commits.ssh_key_fingerprint=Impressão Digital da Chave SSH - commit.actions=Ações commit.revert=Reverter commit.revert-header=Reverter: %s @@ -1157,10 +1118,8 @@ commit.revert-content=Selecione a branch para reverter para: commit.cherry-pick=Cherry-pick commit.cherry-pick-header=Cherry-pick: %s commit.cherry-pick-content=Selecione o branch para receber o cherry-pick: - ext_issues=Acesso a Issues Externos ext_issues.desc=Link para o issue tracker externo. - projects=Projetos projects.desc=Gerencie issues e PRs nos quadros do projeto. projects.description=Descrição (opcional) @@ -1196,7 +1155,6 @@ projects.board.color=Cor projects.open=Abrir projects.close=Fechar projects.board.assigned_to=Atribuído a - issues.desc=Organize relatórios de bugs, tarefas e marcos. issues.filter_assignees=Filtrar Atribuição issues.filter_milestones=Filtrar Marco @@ -1249,25 +1207,25 @@ issues.add_labels=adicionou os rótulos %s %s issues.remove_label=removeu o rótulo %s %s issues.remove_labels=removeu os rótulos %s %s issues.add_remove_labels=adicionou o(s) rótulo(s) %s e removeu %s %s -issues.add_milestone_at=`adicionou esta issue para o marco %s %s` -issues.add_project_at=`adicionado ao projeto %s %s` -issues.change_milestone_at=`modificou o marco de %s para %s %s` -issues.change_project_at=`modificou o projeto de %s para %s %s` -issues.remove_milestone_at=`removeu esta issue do marco %s %s` -issues.remove_project_at=`removido do projeto %s %s` -issues.deleted_milestone='(excluído)' -issues.deleted_project=`(excluído)` -issues.self_assign_at=`se auto atribuiu para esta issue %s` -issues.add_assignee_at=`foi atribuído por %s %s` -issues.remove_assignee_at=`teve sua atribuição removida por %s %s` -issues.remove_self_assignment=`removeu sua atribuição %s` -issues.change_title_at=`alterou o título de %s para %s %s` -issues.change_ref_at=`mudou a referência de %s para %s %s` -issues.remove_ref_at=`removeu a referência %s %s` -issues.add_ref_at=`adicionou a referência %s %s` -issues.delete_branch_at=`excluiu branch %s %s` +issues.add_milestone_at=adicionou esta issue para o marco %s %s +issues.add_project_at=adicionado ao projeto %s %s +issues.change_milestone_at=modificou o marco de %s para %s %s +issues.change_project_at=modificou o projeto de %s para %s %s +issues.remove_milestone_at=removeu esta issue do marco %s %s +issues.remove_project_at=removido do projeto %s %s +issues.deleted_milestone=(excluído) +issues.deleted_project=(excluído) +issues.self_assign_at=se auto atribuiu para esta issue %s +issues.add_assignee_at=foi atribuído por %s %s +issues.remove_assignee_at=teve sua atribuição removida por %s %s +issues.remove_self_assignment=removeu sua atribuição %s +issues.change_title_at=alterou o título de %s para %s %s +issues.change_ref_at=mudou a referência de %s para %s %s +issues.remove_ref_at=removeu a referência %s %s +issues.add_ref_at=adicionou a referência %s %s +issues.delete_branch_at=excluiu branch %s %s issues.filter_label=Etiqueta -issues.filter_label_exclude=`Use alt + clique/enter para excluir etiquetas` +issues.filter_label_exclude=Use alt + clique/enter para excluir etiquetas issues.filter_label_no_select=Todas as etiquetas issues.filter_milestone=Marco issues.filter_milestone_no_select=Todos os marcos @@ -1314,7 +1272,7 @@ issues.open_title=Aberto issues.closed_title=Fechado issues.draft_title=Rascunho issues.num_comments=%d comentários -issues.commented_at=`comentou %s` +issues.commented_at=comentou %s issues.delete_comment_confirm=Tem certeza que deseja excluir este comentário? issues.context.copy_link=Copiar link issues.context.quote_reply=Citar resposta @@ -1323,22 +1281,22 @@ issues.context.edit=Editar issues.context.delete=Excluir issues.no_content=Ainda não há conteúdo. issues.close_issue=Fechar -issues.pull_merged_at=`aplicou o merge do commit %[2]s em %[3]s %[4]s` -issues.manually_pull_merged_at=`aplicou o merge do commit %[2]s em %[3]s manualmente %[4]s` +issues.pull_merged_at=aplicou o merge do commit %[2]s em %[3]s %[4]s +issues.manually_pull_merged_at=aplicou o merge do commit %[2]s em %[3]s manualmente %[4]s issues.close_comment_issue=Comentar e fechar issues.reopen_issue=Reabrir issues.reopen_comment_issue=Comentar e reabrir issues.create_comment=Comentar -issues.closed_at=`fechou esta issue %[2]s` -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 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` +issues.closed_at=fechou esta issue %[2]s +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 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 issues.poster=Autor issues.collaborator=Colaborador issues.owner=Proprietário @@ -1368,8 +1326,8 @@ issues.label.filter_sort.reverse_alphabetically=Alfabeticamente inverso issues.label.filter_sort.by_size=Menor tamanho issues.label.filter_sort.reverse_by_size=Maior tamanho issues.num_participants=%d participante(s) -issues.attachment.open_tab=`Clique para ver "%s" em uma nova aba` -issues.attachment.download=`Clique para baixar "%s"` +issues.attachment.open_tab=Clique para ver "%s" em uma nova aba +issues.attachment.download=Clique para baixar "%s" issues.subscribe=Inscrever-se issues.unsubscribe=Desinscrever issues.lock=Bloquear conversação @@ -1397,31 +1355,31 @@ issues.delete.text=Você realmente deseja excluir esta issue? (Isto irá remover issues.tracker=Contador de tempo issues.start_tracking_short=Iniciar Cronômetro issues.start_tracking=Iniciar Cronômetro -issues.start_tracking_history=`começou a trabalhar %s` +issues.start_tracking_history=começou a trabalhar %s issues.tracker_auto_close=Contador de tempo será parado automaticamente quando esta issue for fechada -issues.tracking_already_started=`Você já iniciou o cronômetro em outra issue!` +issues.tracking_already_started=Você já iniciou o cronômetro em outra issue! issues.stop_tracking=Parar Cronômetro -issues.stop_tracking_history=`parou de trabalhar %s` +issues.stop_tracking_history=parou de trabalhar %s issues.cancel_tracking=Descartar -issues.cancel_tracking_history=`cancelou o cronômetro %s` +issues.cancel_tracking_history=cancelou o cronômetro %s issues.add_time=Adicionar tempo manualmente issues.del_time=Apagar este registro de tempo issues.add_time_short=Adicionar tempo issues.add_time_cancel=Cancelar -issues.add_time_history=`adicionou tempo gasto %s` -issues.del_time_history=`removeu tempo gasto %s` +issues.add_time_history=adicionou tempo gasto %s +issues.del_time_history=removeu tempo gasto %s issues.add_time_hours=Horas issues.add_time_minutes=Minutos issues.add_time_sum_to_small=Nenhum tempo foi inserido. issues.time_spent_total=Tempo total gasto -issues.time_spent_from_all_authors=`Tempo total gasto: %s` +issues.time_spent_from_all_authors=Tempo total gasto: %s issues.due_date=Data limite issues.invalid_due_date_format=Formato da data limite inválido, deve ser 'dd/mm/aaaa'. 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.due_date_form=dd/mm/aaaa issues.due_date_form_add=Adicionar data limite issues.due_date_form_edit=Editar @@ -1440,8 +1398,8 @@ issues.dependency.add=Adicione… issues.dependency.cancel=Cancelar issues.dependency.remove=Remover issues.dependency.remove_info=Remover esta dependência -issues.dependency.added_dependency=`adicionou uma nova dependência %s` -issues.dependency.removed_dependency=`removeu uma dependência %s` +issues.dependency.added_dependency=adicionou uma nova dependência %s +issues.dependency.removed_dependency=removeu uma dependência %s issues.dependency.pr_closing_blockedby=Fechamento deste pull request está bloqueado pelas seguintes issues issues.dependency.issue_closing_blockedby=Fechamento desta issue está bloqueado pelas seguintes issues issues.dependency.issue_close_blocks=Esta issue bloqueia o fechamento das seguintes issues @@ -1494,10 +1452,8 @@ issues.content_history.delete_from_history=Excluir do histórico issues.content_history.delete_from_history_confirm=Excluir do histórico? issues.content_history.options=Opções issues.reference_link=Referência: %s - compare.compare_base=base 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 @@ -1517,11 +1473,11 @@ pulls.filter_branch=Filtrar branch pulls.no_results=Nada encontrado. pulls.nothing_to_compare=Estes branches são iguais. Não há nenhuma necessidade para criar um pull request. 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.has_pull_request=Um pull request entre esses branches já existe: %[2]s#%[3]d pulls.create=Criar pull request pulls.title_desc=quer aplicar o merge de %[1]d commits de %[2]s em %[3]s pulls.merged_title_desc=aplicou merge dos %[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.change_target_branch_at=mudou o branch de destino de %s para %s %s pulls.tab_conversation=Conversação pulls.tab_commits=Commits pulls.tab_files=Arquivos alterados @@ -1533,7 +1489,7 @@ pulls.manually_merged=Merge aplicado manualmente pulls.manually_merged_as=O pull request foi aplicado manualmente como %[2]s. pulls.is_closed=O pull request foi fechado. pulls.has_merged=O merge deste pull request foi aplicado. -pulls.title_wip_desc=`Inicie o título com o prefixo %s para prevenir o merge do pull request até que o mesmo esteja pronto.` +pulls.title_wip_desc=Inicie o título com o prefixo %s para prevenir o merge do pull request até que o mesmo esteja pronto. pulls.cannot_merge_work_in_progress=Este pull request está marcado como um trabalho em andamento. pulls.still_in_progress=Ainda em andamento? pulls.add_prefix=Adicione o prefixo %s @@ -1564,7 +1520,6 @@ pulls.reject_count_n=%d pedidos de alteração pulls.waiting_count_1=aguardando %d revisão pulls.waiting_count_n=aguardando %d revisões pulls.wrong_commit_id=id de commit tem que ser um id de commit no branch de destino - pulls.no_merge_desc=O merge deste pull request não pode ser aplicado porque todas as opções de mesclagem do repositório estão desabilitadas. pulls.no_merge_helper=Habilite as opções de merge nas configurações do repositório ou faça o merge do pull request manualmente. pulls.no_merge_wip=O merge deste pull request não pode ser aplicado porque está marcado como um trabalho em andamento. @@ -1577,7 +1532,6 @@ pulls.squash_merge_pull_request=Criar commit de squash pulls.merge_manually=Merge feito manualmente pulls.merge_commit_id=A ID de merge commit pulls.require_signed_wont_sign=O branch requer commits assinados, mas este merge não será assinado - pulls.invalid_merge_option=Você não pode usar esta opção de merge neste pull request. 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 @@ -1590,7 +1544,7 @@ pulls.head_out_of_date=O merge falhou: Enquanto gerava o merge, a head foi atual 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 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.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 pulls.status_checks_warning=Algumas verificações reportaram avisos @@ -1603,27 +1557,22 @@ pulls.update_branch_rebase=Atualizar branch por rebase pulls.update_branch_success=Atualização do branch foi bem-sucedida pulls.update_not_allowed=Você não tem permissão para atualizar o branch pulls.outdated_with_base_branch=Este branch está desatualizado com o branch base -pulls.closed_at=`fechou este pull request %[2]s` -pulls.reopened_at=`reabriu este pull request %[2]s` -pulls.merge_instruction_hint=`Você também pode ver as instruções para a linha de comandos.` +pulls.closed_at=fechou este pull request %[2]s +pulls.reopened_at=reabriu este pull request %[2]s +pulls.merge_instruction_hint=Você também pode ver as instruções para a linha de comandos. pulls.merge_instruction_step1_desc=No repositório do seu projeto, crie um novo branch e teste as alterações. pulls.merge_instruction_step2_desc=Faça merge das alterações e atualize no Gitea. - pulls.auto_merge_button_when_succeed=(Quando a verificação for bem-sucedida) pulls.auto_merge_when_succeed=Mesclar automaticamente quando todas as verificações forem bem sucedidas pulls.auto_merge_newly_scheduled=O merge do pull request foi agendado para quando todas as verificações forem bem-sucedidas. pulls.auto_merge_has_pending_schedule=%[1]s agendou este pull request para merge automático quando todas as verificações tiverem sucesso %[2]s. - pulls.auto_merge_cancel_schedule=Cancelar merge automático pulls.auto_merge_not_scheduled=Este pull request não está programado para ser automaticamente mesclado. pulls.auto_merge_canceled_schedule=O merge automático foi cancelado para este pull request. - -pulls.auto_merge_newly_scheduled_comment=`agendou este pull request para merge automático quando todas as verificações tiverem sucesso %[1]s` -pulls.auto_merge_canceled_schedule_comment=`cancelou o merge automático deste pull request quando todos as verificações tiverem sucesso %[1]s` - +pulls.auto_merge_newly_scheduled_comment=agendou este pull request para merge automático quando todas as verificações tiverem sucesso %[1]s +pulls.auto_merge_canceled_schedule_comment=cancelou o merge automático deste pull request quando todos as verificações tiverem sucesso %[1]s pulls.delete.title=Excluir este pull request? pulls.delete.text=Você realmente deseja excluir este pull request? (Isto irá remover permanentemente todo o conteúdo. Considere fechá-la em vez disso, se você pretende mantê-la arquivado) - milestones.new=Novo marco milestones.closed=Fechado %s milestones.update_ago=Atualizado há %s @@ -1653,7 +1602,6 @@ milestones.filter_sort.least_complete=Menos completo milestones.filter_sort.most_complete=Mais completo milestones.filter_sort.most_issues=Com mais issues milestones.filter_sort.least_issues=Com menos issues - signing.will_sign=Este commit será assinado com a chave '%s' signing.wont_sign.error=Houve um erro ao verificar se o commit poderia ser assinado signing.wont_sign.nokey=Não há chave disponível para assinar este commit @@ -1667,10 +1615,8 @@ signing.wont_sign.headsigned=O merge não será assinado porque o commit princip signing.wont_sign.commitssigned=O merge não será assinado pois todos os commits associados não foram assinados signing.wont_sign.approved=O merge não será assinado pois o PR não foi aprovado signing.wont_sign.not_signed_in=Você não está logado - ext_wiki=Acesso a Wiki Externo ext_wiki.desc=Link para uma wiki externa. - wiki=Wiki wiki.welcome=Bem-vindo a wiki. wiki.welcome_desc=A wiki permite que você escreva e compartilhe a documentação com os colaboradores. @@ -1694,7 +1640,6 @@ wiki.reserved_page=O nome da página wiki '%s' está reservada. 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'. - activity=Atividade activity.period.filter_label=Período: activity.period.daily=1 dia @@ -1760,7 +1705,6 @@ activity.git_stats_addition_n=%d inclusões activity.git_stats_and_deletions=e activity.git_stats_deletion_1=%d exclusão activity.git_stats_deletion_n=%d exclusões - search=Pesquisar search.search_repo=Pesquisar no repositório... search.fuzzy=Aproximada @@ -1768,7 +1712,6 @@ search.match=Corresponde search.results=Resultados da pesquisa para "%s" em %s search.code_no_results=Nenhum código-fonte correspondente ao seu termo de pesquisa foi encontrado. search.code_search_unavailable=A pesquisa por código não está disponível no momento. Entre em contato com o administrador do site. - settings=Configurações settings.desc=Opções é onde você pode gerenciar as configurações para o repositório settings.options=Repositório @@ -2073,10 +2016,10 @@ 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=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_protected_file_patterns=Padrões de arquivos protegidos (separados usando ponto e vírgula '\;'): -settings.protect_protected_file_patterns_desc=Arquivos protegidos que não têm permissão para serem alterados diretamente, mesmo se o usuário tiver permissão para adicionar, editar ou apagar arquivos neste branch. Vários padrões podem ser separados usando ponto e vírgula ('\;'). Veja github.com/gobwas/glob documentação para sintaxe de padrões. 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 github.com/gobwas/glob documentação para sintaxe de padrões. Exemplos: .drone.yml, /docs/**/*.txt. +settings.protect_protected_file_patterns=Padrões de arquivos protegidos (separados usando ponto e vírgula ';'): +settings.protect_protected_file_patterns_desc=Arquivos protegidos que não têm permissão para serem alterados diretamente, mesmo se o usuário tiver permissão para adicionar, editar ou apagar arquivos neste branch. Vários padrões podem ser separados usando ponto e vírgula (';'). Veja github.com/gobwas/glob documentação para sintaxe de padrões. 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 github.com/gobwas/glob 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. @@ -2156,7 +2099,6 @@ settings.rename_branch_success=Branch %s foi renomeado com sucesso para %s. settings.rename_branch_from=nome antigo do branch settings.rename_branch_to=novo nome do branch settings.rename_branch=Renomear branch - diff.browse_source=Ver código fonte diff.parent=pai diff.commit=commit @@ -2208,7 +2150,6 @@ diff.image.side_by_side=Lado a Lado diff.image.swipe=Deslizar diff.image.overlay=Sobrepor diff.has_escaped=Essa linha tem caracteres Unicode ocultos - releases.desc=Acompanhe as versões e downloads do projeto. release.releases=Versões release.detail=Detalhes da versão @@ -2250,7 +2191,6 @@ 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 apenas a tag - branch.name=Nome do Branch branch.search=Pesquisar branches branch.already_exists=Um branch com o nome %s já existe. @@ -2282,25 +2222,55 @@ branch.create_branch_operation=Criar branch branch.new_branch=Criar novo branch branch.new_branch_from=Criar novo branch a partir de '%s' branch.renamed=Branch %s foi renomeado para %s. - tag.create_tag=Criar tag %s tag.create_tag_operation=Criar tag tag.confirm_create_tag=Criar tag tag.create_tag_from=Criar tag a partir de '%s' - tag.create_success=Tag '%s' foi criada. - topic.manage_topics=Gerenciar Tópicos topic.done=Feito topic.count_prompt=Você não pode selecionar mais de 25 tópicos topic.format_prompt=Os tópicos devem começar com uma letra ou um número, podem incluir traços ('-') e podem ter até 35 caracteres. - 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. error.csv.unexpected=Não é possível renderizar este arquivo porque ele contém um caractere inesperado na linha %d e coluna %d. error.csv.invalid_field_count=Não é possível renderizar este arquivo porque ele tem um número errado de campos na linha %d. +more_operations=Mais Operações +cite_this_repo=Citar este repositório +editor.new_branch_name=Nome do novo branch para este commit +commit.operations=Operações +projects.card_type.desc=Pré-visualizações de Cards +projects.card_type.images_and_text=Imagens e Texto +projects.card_type.text_only=Somente texto +issues.filter_project=Projeto +issues.filter_project_all=Todos os projetos +issues.filter_project_none=Sem projeto +issues.action_check=Marcar/Desmarcar +issues.action_check_all=Marcar/Desmarcar todos os itens +issues.label_exclusive=Exclusivo +issues.label_exclusive_desc=Nomeie o rótulo escopo/item para torná-lo mutuamente exclusivo com outros rótulos do escopo/. +issues.label_exclusive_warning=Quaisquer rótulos com escopo conflitantes serão removidos ao editar os rótulos de uma issue ou pull request. +pulls.clear_merge_message=Limpar mensagem do merge +pulls.clear_merge_message_hint=Limpar a mensagem de merge só irá remover o conteúdo da mensagem de commit e manter trailers git gerados, como "Co-Authored-By …". +search.type.tooltip=Tipo de pesquisa +search.fuzzy.tooltip=Incluir resultados que sejam próximos ao termo de busca +search.match.tooltip=Incluir somente resultados que correspondam exatamente ao termo de busca +settings.branches.add_new_rule=Adicionar Nova Regra +settings.pulls.default_allow_edits_from_maintainers=Permitir edições de mantenedores por padrão +settings.releases_desc=Habilitar versões do Repositório +settings.actions_desc=Habilitar ações do repositório +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.protected_branch.save_rule=Salvar Regra +settings.protected_branch.delete_rule=Excluir Regra +settings.protect_branch_name_pattern=Padrão de Nome de Branch Protegida +settings.remove_protected_branch_failed=Removendo regra de proteção de branch '%s' falhou. +settings.merge_style_desc=Estilos de Merge +settings.protected_branch_required_rule_name=Nome da regra é obrigatório +settings.protected_branch_duplicate_rule_name=Regra com nome duplicado +release.releases_for=Versões para %s +release.tags_for=Tags para %s [org] org_name_holder=Nome da organização @@ -2323,11 +2293,9 @@ team_access_desc=Acesso ao repositório team_permission_desc=Permissão 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. form.name_pattern_not_allowed=O padrão de '%s' não é permitido em um nome de organização. form.create_org_not_allowed=Você não tem permissão para criar uma organização. - settings=Configurações settings.options=Organização settings.full_name=Nome completo @@ -2341,7 +2309,6 @@ settings.visibility.limited=Limitada (Visível apenas para usuários registrados settings.visibility.limited_shortname=Limitado 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_setting_success=Configurações da organização foram atualizadas. settings.change_orgname_prompt=Nota: alterar o nome da organização também altera a URL da mesma. @@ -2354,9 +2321,7 @@ settings.confirm_delete_account=Confirmar exclusão settings.delete_org_title=Excluir organização settings.delete_org_desc=Essa organização será excluída permanentemente. Continuar? settings.hooks_desc=Adicionar Webhooks que serão acionados para todos os repositórios desta organizaçã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 da associação: members.public=Público members.public_helper=tornar privado @@ -2371,7 +2336,6 @@ members.leave=Sair 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=Sair de %s? @@ -2418,6 +2382,13 @@ teams.all_repositories_helper=A equipe tem acesso a todos os repositórios. Sele teams.all_repositories_read_permission_desc=Esta equipe concede acesso Leitura a todos os repositórios: membros podem ver e clonar repositórios. teams.all_repositories_write_permission_desc=Esta equipe concede acesso Escrita a todos os repositórios: os membros podem ler de e fazer push para os repositórios. teams.all_repositories_admin_permission_desc=Esta equipe concede acesso Administrativo a todos os repositórios: os membros podem ler, fazer push e adicionar colaboradores aos repositórios. +members=Membros +code=Código +teams.invite_team_member=Convidar para %s +teams.invite_team_member.list=Convites pendentes +teams.invite.title=Você foi convidado para se juntar à equipe %s na organização %s. +teams.invite.by=Convidado por %s +teams.invite.description=Por favor, clique no botão abaixo para se juntar à equipe. [admin] dashboard=Painel @@ -2433,7 +2404,6 @@ monitor=Monitoramento first_page=Primeira last_page=Última total=Total: %d - dashboard.new_version_hint=Gitea %s está disponível, você está executando %s. Verifique o blog para mais detalhes. dashboard.statistic=Resumo dashboard.operations=Operações de manutenção @@ -2510,7 +2480,6 @@ 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 - users.user_manage_panel=Gerenciamento de conta de usuário users.new_account=Criar conta de usuário users.name=Nome de usuário @@ -2564,7 +2533,6 @@ 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=2FA Ativado users.list_status_filter.not_2fa_enabled=2FA Desativado - emails.email_manage_panel=Gerenciamento de E-mail de Usuário emails.primary=Principal emails.activated=Ativado @@ -2577,13 +2545,11 @@ emails.not_updated=Falha ao atualizar o endereço de e-mail solicitado: %v emails.duplicate_active=Este endereço de e-mail já está ativo para um usuário diferente. emails.change_email_header=Atualizar Propriedades do E-mail emails.change_email_text=Você tem certeza que deseja atualizar este endereço de e-mail? - orgs.org_manage_panel=Gerenciamento da organização orgs.name=Nome orgs.teams=Equipes orgs.members=Membros orgs.new_orga=Nova organização - repos.repo_manage_panel=Gerenciamento do repositório repos.unadopted=Repositórios Não Adotados repos.unadopted.no_more=Não foram encontrados mais repositórios não adotados @@ -2595,7 +2561,6 @@ repos.stars=Favoritos repos.forks=Forks repos.issues=Issues repos.size=Tamanho - packages.package_manage_panel=Gerenciamento de Pacotes packages.total_size=Tamanho Total: %s packages.owner=Proprietário @@ -2606,17 +2571,14 @@ packages.type=Tipo packages.repository=Repositório packages.size=Tamanho packages.published=Publicado - defaulthooks=Webhooks Padrões defaulthooks.desc=Webhooks automaticamente fazem requisições HTTP POST para um servidor quando acionados por determinados eventos do Gitea. Webhooks definidos aqui são os padrões e serão copiados para todos os novos repositórios. Leia mais no guia de webhooks. defaulthooks.add_webhook=Adicionar Webhook Padrão defaulthooks.update_webhook=Atualizar Webhook Padrão - systemhooks=Webhooks do Sistema systemhooks.desc=Webhooks automaticamente fazem requisições HTTP POST para um servidor quando acionados por determinados eventos do Gitea. Webhooks definidos aqui agirão em todos os repositórios do sistema, então, por favor, considere quaisquer implicações de desempenho que isso possa ter. Leia mais no guia de webhooks. systemhooks.add_webhook=Adicionar Webhook do Sistema systemhooks.update_webhook=Atualizar Webhook do Sistema - auths.auth_manage_panel=Gerenciamento de fonte de autenticação auths.new=Adicionar fonte de autenticação auths.name=Nome @@ -2719,7 +2681,6 @@ auths.still_in_used=A fonte de autenticação ainda está em uso. Converta ou ex auths.deletion_success=A fonte de autenticação foi excluída. auths.login_source_exist=A fonte de autenticação '%s' já existe. auths.login_source_of_type_exist=Uma fonte de autenticação deste tipo já existe. - config.server_config=Configuração do servidor config.app_name=Nome do servidor config.app_ver=Versão do Gitea @@ -2738,7 +2699,6 @@ config.static_file_root_path=Caminho raiz para arquivo estático config.log_file_root_path=Caminho do log config.script_type=Tipo de script config.reverse_auth_user=Usuário de autenticação reversa - config.ssh_config=Configuração de SSH config.ssh_enabled=Habilitado config.ssh_start_builtin_server=Usar o servidor embutido @@ -2750,12 +2710,10 @@ 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=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 config.db_host=Servidor @@ -2764,7 +2722,6 @@ config.db_user=Nome de usuário config.db_schema=Esquema config.db_ssl_mode=SSL 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 auto-cadastro @@ -2787,12 +2744,10 @@ config.default_allow_only_contributors_to_track_time=Permitir que apenas os cola 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 Hook da Web config.queue_length=Tamanho da fila config.deliver_timeout=Intervalo de entrega config.skip_tls_verify=Ignorar verificação de TLS - config.mailer_config=Configuração de Envio de E-mail config.mailer_enabled=Habilitado config.mailer_enable_helo=Ativar HELO @@ -2809,16 +2764,13 @@ config.test_email_placeholder=E-mail (por exemplo, teste@exemplo.com.br) config.send_test_mail=Enviar e-mail de teste config.test_mail_failed=Falha ao enviar o e-mail de teste para '%s': %v config.test_mail_sent=O e-mail de teste foi enviado para '%s'. - 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=Item de cache TTL - config.session_config=Configuração da sessão config.session_provider=Provedor da sessão config.provider_config=Configuração do provedor @@ -2827,12 +2779,10 @@ 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 - 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 federativos - config.git_config=Configuração do Git 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) @@ -2844,7 +2794,6 @@ 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.log_mode=Modo do log config.own_named_logger=Logger nomeado @@ -2856,8 +2805,6 @@ config.access_log_mode=Modo log Access config.access_log_template=Modelo config.xorm_log_mode=Modo log XORM config.xorm_log_sql=Log SQL - - monitor.cron=Tarefas cron monitor.name=Nome monitor.schedule=Cronograma @@ -2909,7 +2856,6 @@ monitor.queue.pool.pause.submit=Pausar Fila monitor.queue.pool.resume.title=Retomar fila monitor.queue.pool.resume.desc=Definir esta fila para retomar o trabalho monitor.queue.pool.resume.submit=Retomar fila - monitor.queue.settings.title=Configurações do conjunto monitor.queue.settings.desc=Os conjuntos crescem dinamicamente com um aumento em resposta ao bloqueio da fila de executores. Essas alterações não afetarão os grupos de executores atuais. monitor.queue.settings.timeout=Tempo de espera do impulso @@ -2925,7 +2871,6 @@ monitor.queue.settings.submit=Atualizar configurações monitor.queue.settings.changed=Configurações atualizadas monitor.queue.settings.blocktimeout=Tempo de espera do bloqueio atual monitor.queue.settings.blocktimeout.value=%[1]v - monitor.queue.pool.none=Esta fila não tem um conjunto monitor.queue.pool.added=Grupo de executores adicionado monitor.queue.pool.max_changed=Número máximo de executores alterado @@ -2935,7 +2880,6 @@ monitor.queue.pool.cancel=Encerrar grupo de executores monitor.queue.pool.cancelling=Encerrando grupo de executores monitor.queue.pool.cancel_notices=Encerrar este grupo de %s executores? monitor.queue.pool.cancel_desc=Deixar uma fila sem grupos de executores pode fazer com que as solicitações sejam bloqueadas indefinidamente. - notices.system_notice_list=Avisos do sistema notices.view_detail_header=Ver detalhes do aviso notices.actions=Ações @@ -2950,20 +2894,48 @@ notices.type_2=Tarefa notices.desc=Descrição notices.op=Op. notices.delete_success=Os avisos do sistema foram excluídos. +dashboard.update_migration_poster_id=Sincronizar os IDs do remetente da migração +dashboard.gc_lfs=Coletar lixos dos meta-objetos LFS +dashboard.stop_zombie_tasks=Parar tarefas zumbi +dashboard.stop_endless_tasks=Parar tarefas infinitas +dashboard.cancel_abandoned_jobs=Cancelar trabalhos abandonados +packages.unreferenced_size=Tamanho Não Referenciado: %s +auths.verify_group_membership=Verificar associação ao grupo no LDAP (deixe o filtro vazio para ignorar) +auths.group_search_base=Grupo de Pesquisa DN Base +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.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 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 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.unable_to_initialize_openid=Não é possível inicializar o Provedor OpenID Connect: %s +auths.invalid_openIdConnectAutoDiscoveryURL=URL do Auto Discovery inválida (deve ser uma URL válida, começando com http:// ou https://) +config.mailer_use_dummy=Dummy +config.git_enable_reflogs=Habilitar Reflogs +config.git_reflog_expiry_time=Tempo de expiração +config.get_setting_failed=Falha ao obter configuração %s +config.set_setting_failed=Falha ao definir configuração %s +notices.operations=Operações [action] create_repo=criou o repositório %s rename_repo=renomeou o repositório %[1]s para %[3]s commit_repo=push feito para %[3]s em %[4]s -create_issue=`abriu a issue %[3]s#%[2]s` -close_issue=`fechou a issue %[3]s#%[2]s` -reopen_issue=`reabriu a issue %[3]s#%[2]s` -create_pull_request=`criou o pull request %[3]s#%[2]s` -close_pull_request=`fechou o pull request %[3]s#%[2]s` -reopen_pull_request=`reabriu o pull request %[3]s#%[2]s` -comment_issue=`comentou na issue %[3]s#%[2]s` -comment_pull=`comentou no pull request %[3]s#%[2]s` -merge_pull_request=`fez merge do pull request %[3]s#%[2]s` +create_issue=abriu a issue %[3]s#%[2]s +close_issue=fechou a issue %[3]s#%[2]s +reopen_issue=reabriu a issue %[3]s#%[2]s +create_pull_request=criou o pull request %[3]s#%[2]s +close_pull_request=fechou o pull request %[3]s#%[2]s +reopen_pull_request=reabriu o pull request %[3]s#%[2]s +comment_issue=comentou na issue %[3]s#%[2]s +comment_pull=comentou no pull request %[3]s#%[2]s +merge_pull_request=fez merge do pull request %[3]s#%[2]s transfer_repo=transferiu repositório de %s para %s push_tag=fez push da tag %[3]s to %[4]s delete_tag=excluiu tag %[2]s de %[3]s @@ -2974,14 +2946,15 @@ compare_commits_general=Comparar commits mirror_sync_push=sincronizou os commits para %[3]s em %[4]s do espelho mirror_sync_create=sincronizou a nova referência %[3]s para %[4]s do espelho 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 a versão "%[4]s" em %[3]s` -review_dismissed=`descartou a revisão de %[4]s para %[3]s#%[2]s` +approve_pull_request=aprovou %[3]s#%[2]s +reject_pull_request=sugeriu modificações para %[3]s#%[2]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 starred_repo=favoritou %[2]s watched_repo=começou a observar %[2]s +auto_merge_pull_request=fez merge automático do pull request %[3]s#%[2]s [tool] ago=%s atrás @@ -3140,4 +3113,124 @@ 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. - +details.repository_site=Site do Repositório +details.documentation_site=Site da Documentação +cargo.registry=Configurar este registro no arquivo de configuração de Cargo (por exemplo ~/.cargo/config.toml): +cargo.install=Para instalar o pacote usando Cargo, execute o seguinte comando: +cargo.documentation=Para obter mais informações sobre o registro Cargo, consulte a documentação. +cargo.details.repository_site=Site do Repositório +cargo.details.documentation_site=Site da Documentação +chef.registry=Configure este registro em seu arquivo ~/.chef/config.rb: +chef.install=Para instalar o pacote, execute o seguinte comando: +chef.documentation=Para obter mais informações sobre o registro Chef, consulte a documentação. +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: +conda.documentation=Para obter mais informações sobre o registro Conda, consulte a documentação. +conda.details.repository_site=Site do Repositório +conda.details.documentation_site=Site da Documentação +owner.settings.cargo.title=Índice do Registro Cargo +owner.settings.cargo.initialize=Iniciar Índice +owner.settings.cargo.initialize.description=Para usar o registro Cargo é necessário um repositório git especial. Aqui você pode (re)criá-lo com a configuração necessária. +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.description=Se o índice está fora de sincronia com os pacotes Cargo, você pode reconstruí-lo aqui. +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=Gerenciar Regras de Limpeza +owner.settings.cleanuprules.add=Adicionar Regra de Limpeza +owner.settings.cleanuprules.edit=Editar Regra de Limpeza +owner.settings.cleanuprules.none=Não há regras de limpeza disponíveis. Leia a documentação para saber mais. +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 +owner.settings.cleanuprules.pattern_full_match=Aplicar padrão ao nome completo do pacote +owner.settings.cleanuprules.keep.title=Versões que correspondem a estas regras são mantidas, mesmo se corresponderem a uma regra de remoção abaixo. +owner.settings.cleanuprules.keep.count=Manter o mais recente +owner.settings.cleanuprules.keep.count.1=1 versão por pacote +owner.settings.cleanuprules.keep.count.n=%d versões por pacote +owner.settings.cleanuprules.keep.pattern=Manter versões correspondentes +owner.settings.cleanuprules.keep.pattern.container=A versão latest é sempre mantida para pacotes de Container. +owner.settings.cleanuprules.remove.title=Versões que correspondem a essas regras são removidas, a menos que uma regra acima diga para mantê-las. +owner.settings.cleanuprules.remove.days=Remover versões mais antigas que +owner.settings.cleanuprules.remove.pattern=Remover versões correspondentes +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 +owner.settings.chef.keypair.description=Gerar um par de chaves usado para autenticar no registro Chef. A chave anterior não pode ser usada depois. + +[aria] +navbar=Barra de navegação +footer=Rodapé +footer.software=Sobre o Software +footer.links=Links + +[secrets] +secrets=Segredos +description=Os segredos serão passados a certas ações e não poderão ser lidos de outra forma. +none=Não há segredos ainda. +value=Valor +name=Nome +creation=Adicionar Segredo +creation.name_placeholder=apenas caracteres alfanuméricos ou underline (_), não pode começar com GITEA_ ou GITHUB_ +creation.value_placeholder=Insira qualquer conteúdo. Espaços em branco no início e no fim serão omitidos. +creation.success=O segredo '%s' foi adicionado. +creation.failed=Falha ao adicionar segredo. +deletion=Excluir segredo +deletion.description=A exclusão de um segredo é permanente e não pode ser desfeita. Continuar? +deletion.success=O segredo foi excluído. +deletion.failed=Falha ao excluir segredo. + +[actions] +actions=Ações +unit.desc=Gerenciar ações +status.unknown=Desconhecido +status.waiting=Em espera +status.running=Rodando +status.success=Sucesso +status.failure=Falha +status.cancelled=Cancelado +status.skipped=Ignorado +status.blocked=Bloqueado +runners=Runners +runners.runner_manage_panel=Gerenciamento de Runners +runners.new=Criar novo Runner +runners.new_notice=Como iniciar um runner +runners.status=Status +runners.id=ID +runners.name=Nome +runners.owner_type=Tipo +runners.description=Descrição +runners.labels=Rótulos +runners.last_online=Última Vez Online +runners.agent_labels=Etiquetas do Agente +runners.custom_labels=Etiquetas Personalizadas +runners.custom_labels_helper=Etiquetas personalizadas são etiquetas que são adicionadas manualmente por um administrador. Separe as etiquetas com vírgula. Espaço em branco no começo ou no final de cada etiqueta é ignorado. +runners.runner_title=Runner +runners.task_list=Tarefas recentes neste runner +runners.task_list.run=Executar +runners.task_list.status=Status +runners.task_list.repository=Repositório +runners.task_list.commit=Commit +runners.task_list.done_at=Feito em +runners.edit_runner=Editar Runner +runners.update_runner=Atualizar as Alterações +runners.update_runner_success=Runner atualizado com sucesso +runners.update_runner_failed=Falha ao atualizar runner +runners.delete_runner=Deletar esse runner +runners.delete_runner_success=Runner excluído com sucesso +runners.delete_runner_failed=Falha ao excluir runner +runners.delete_runner_header=Confirme para excluir este runner +runners.delete_runner_notice=Se uma tarefa estiver sendo executada neste runner, ela será encerrada e marcada como falha. Pode quebrar o workflow de construção. +runners.none=Nenhum runner disponível +runners.status.unspecified=Desconhecido +runners.status.idle=Inativo +runners.status.active=Ativo +runners.status.offline=Offiline +runs.all_workflows=Todos os Workflows +runs.open_tab=%d Aberto +runs.closed_tab=%d Fechado +runs.commit=Commit +runs.pushed_by=Push realizado por diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini index 9c38a1727a3c..06e658c31cfc 100644 --- a/options/locale/locale_pt-PT.ini +++ b/options/locale/locale_pt-PT.ini @@ -23,7 +23,6 @@ enable_javascript=Este sítio funciona melhor com JavaScript. toc=Índice licenses=Licenças return_to_gitea=Retornar ao Gitea - username=Nome de utilizador email=Endereço de email password=Senha @@ -33,7 +32,6 @@ captcha=CAPTCHA twofa=Autenticação com dois passos twofa_scratch=Código de uso único em dois passos passcode=Código - webauthn_insert_key=Insira a sua chave de segurança webauthn_sign_in=Pressione o botão da sua chave de segurança. Se a sua chave de segurança não tiver um botão, insira-a novamente. webauthn_press_button=Por favor, prima o botão da sua chave de segurança… @@ -47,7 +45,6 @@ webauthn_error_duplicated=A chave de segurança não é permitida neste pedido. webauthn_error_empty=Você tem que definir um nome para esta chave. webauthn_error_timeout=O tempo limite foi atingido antes que a sua chave pudesse ser lida. Recarregue esta página e tente novamente. webauthn_reload=Recarregar - repository=Repositório organization=Organização mirror=Réplica @@ -65,18 +62,15 @@ settings=Configurações your_profile=Perfil your_starred=Favoritos your_settings=Configurações - all=Todos sources=Fontes mirrors=Réplicas collaborative=Colaborativo forks=Derivações - activities=Operações pull_requests=Pedidos de integração issues=Questões milestones=Etapas - ok=OK cancel=Cancelar save=Guardar @@ -85,26 +79,24 @@ add_all=Adicionar tudo remove=Remover remove_all=Remover tudo edit=Editar - copy=Copiar copy_url=Copiar URL copy_branch=Copiar nome do ramo copy_success=Copiado! copy_error=Falha ao copiar - write=Escrever preview=Pré-visualizar loading=Carregando… - step1=Passo 1: step2=Passo 2: - error=Erro error404=A página que pretende aceder não existe ou não tem autorização para a ver. - never=Nunca - rss_feed=Fonte RSS +enabled=Habilitado +disabled=Desabilitado +copy_content=Copiar conteúdo +copy_type_unsupported=Este tipo de ficheiro não pode ser copiado [filter] string.asc=A - Z @@ -159,7 +151,6 @@ err_empty_admin_email=O email do administrador não pode estar em branco. err_admin_name_is_reserved=O nome de utilizador do administrador é inválido porque está reservado err_admin_name_pattern_not_allowed=O nome de utilizador do administrador é inválido porque corresponde a um padrão reservado err_admin_name_is_invalid=O nome de utilizador do administrador é inválido - general_title=Configurações gerais app_name=Título do sítio app_name_helper=Pode escrever aqui o nome da sua companhia. @@ -179,7 +170,6 @@ app_url=URL base do Gitea app_url_helper=Endereço base para os URLs e notificações por email das clonagens por HTTP(S). log_root_path=Localização dos registos log_root_path_helper=Os ficheiros de registo serão escritos nesta pasta. - optional_title=Configurações opcionais email_title=Configurações de email smtp_addr=Servidor SMTP @@ -237,9 +227,10 @@ default_enable_timetracking_popup=Habilitar, por norma, a contagem do tempo nos no_reply_address=Domínio dos emails ocultos no_reply_address_helper=Nome de domínio para utilizadores com um endereço de email oculto. Por exemplo, o nome de utilizador 'silva' será registado no Git como 'silva@semresposta.exemplo.org' se o domínio de email oculto estiver definido como 'semresposta.exemplo.org'. password_algorithm=Algoritmo de Hash da Senha -password_algorithm_helper=Definir o algoritmo de hash da senha. Os algoritmos têm requisitos e resistência distintos. `argon2`, embora tenha boas características, usa muita memória e pode ser inapropriado para sistemas pequenos. +password_algorithm_helper="""Definir o algoritmo de hash da senha. Os algoritmos têm requisitos e resistência distintos. `argon2`, embora tenha boas características, usa muita memória e pode ser inapropriado para sistemas pequenos.""" enable_update_checker=Habilitar verificador de novidades enable_update_checker_helper=Verifica, periodicamente, se foi lançada alguma versão nova, fazendo uma ligação ao gitea.io. +invalid_password_algorithm=Algoritmo de hash da senha inválido [home] uname_holder=Nome de utilizador ou endereço de email @@ -255,17 +246,14 @@ search_repos=Procurar um repositório… filter=Outros filtros filter_by_team_repositories=Filtrar por repositórios da equipa feed_of=Fonte de "%s" - show_archived=Arquivado show_both_archived_unarchived=Apresentando arquivados e não arquivados show_only_archived=Apresentando somente os arquivados show_only_unarchived=Apresentando somente os não arquivados - show_private=Privado show_both_private_public=Apresentando públicos e privados show_only_private=Apresentando somente os privados show_only_public=Apresentando somente os públicos - issues.in_your_repos=Nos seus repositórios [explore] @@ -289,7 +277,6 @@ code_last_indexed_at=Última indexação %s relevant_repositories_tooltip=Repositórios que são derivações ou que não têm tópico, nem ícone, nem descrição, estão escondidos. relevant_repositories=Apenas estão a ser mostrados os repositórios relevantes. Mostrar resultados não filtrados. - [auth] create_new_account=Fazer inscrição register_helper_msg=Já tem uma conta? Inicie a sessão agora! @@ -357,36 +344,30 @@ authorization_failed_desc=A autorização falhou porque encontrámos um pedido i sspi_auth_failed=Falhou a autenticação SSPI password_pwned=A senha utilizada está numa lista de senhas roubadas anteriormente expostas em fugas de dados públicas. Tente novamente com uma senha diferente. password_pwned_err=Não foi possível completar o pedido ao HaveIBeenPwned +invalid_password=A sua senha não corresponde à senha que foi usada para criar a conta. [mail] view_it_on=Ver em %s link_not_working_do_paste=Não está a funcionar? Tente copiar e colar no seu navegador. hi_user_x=Olá %s, - activate_account=Por favor, ponha a sua conta em funcionamento activate_account.title=%s, por favor habilite a sua conta activate_account.text_1=Olá %[1]s, obrigado por se registar em %[2]s! activate_account.text_2=Clique, por favor, na ligação seguinte para activar a sua conta dentro de %s: - activate_email=Valide o seu endereço de email activate_email.title=%s, por favor valide o seu endereço de email activate_email.text=Por favor clique na seguinte ligação para validar o seu endereço de email dentro de %s: - register_notify=Bem-vindo(a) ao Gitea register_notify.title=%[1]s, bem-vindo(a) a %[2]s register_notify.text_1=este é o seu email de confirmação de registo para %s! register_notify.text_2=Agora pode iniciar a sessão com o nome de utilizador: %s. register_notify.text_3=Se esta conta foi criada para si, defina a sua senha primeiro. - reset_password=Recupere a sua conta reset_password.title=%s, você pediu para recuperar a sua conta reset_password.text=Por favor clique na seguinte ligação para recuperar a sua conta em %s: - register_success=Inscrição bem sucedida - issue_assigned.pull=@%[1]s atribuiu-lhe o pedido de integração %[2]s no repositório %[3]s. issue_assigned.issue=@%[1]s atribuiu-lhe a questão %[2]s no repositório %[3]s. - issue.x_mentioned_you=@%s mencionou a si: issue.action.force_push=%[1]s forçou o envio de %[2]s de %[3]s para %[4]s. issue.action.push_1=@%[1]s enviou %[3]d cometimento para o ramo %[2]s @@ -401,7 +382,6 @@ issue.action.review_dismissed=@%[1]s descartou a última revisão de %[2] issue.action.ready_for_review=@%[1]s marcou este pedido de integração como estando pronto para revisão. issue.action.new=@%[1]s criou #%[2]d. issue.in_tree_path=Em %s: - release.new.subject=%s em %s lançado release.new.text=@%[1]s lançou %[2]s em %[3]s release.title=Título: %s @@ -409,19 +389,17 @@ release.note=Nota: release.downloads=Descargas: release.download.zip=Código fonte (ZIP) release.download.targz=Código fonte (TAR.GZ) - repo.transfer.subject_to=%s gostaria de transferir "%s" para %s repo.transfer.subject_to_you=%s gostaria de transferir "%s" para si repo.transfer.to_you=você repo.transfer.body=Para o aceitar ou rejeitar visite %s, ou ignore-o, simplesmente. - repo.collaborator.added.subject=%s adicionou você a %s repo.collaborator.added.text=Foi adicionado(a) como colaborador(a) do repositório: - team_invite.subject=%[1]s fez-lhe um convite para se juntar à organização %[2]s team_invite.text_1=%[1]s fez-lhe um convite para se juntar à equipa %[2]s na organização %[3]s. team_invite.text_2=Clique na ligação seguinte para se juntar à equipa: team_invite.text_3=Nota: Este convite é dirigido a %[1]s. Se não estava à espera deste convite, pode ignorar este email. +reply=ou responda a este email imediatamente [modal] yes=Sim @@ -440,34 +418,30 @@ PayloadUrl=URL da carga TeamName=Nome da equipa AuthName=Nome da autorização AdminEmail=Email do administrador - NewBranchName=Novo nome de ramo CommitSummary=Sumário do cometimento CommitMessage=Mensagem do cometimento CommitChoice=Escolha do cometimento TreeName=Caminho do ficheiro Content=Conteúdo - SSPISeparatorReplacement=Separador SSPIDefaultLanguage=Idioma predefinido - -require_error=` não pode estar em branco.` -alpha_dash_error=` deve conter apenas caracteres alfanuméricos, hífen ('-') e sublinhado ('_').` -alpha_dash_dot_error=` deve conter apenas caracteres alfanuméricos, hífen ('-'), sublinhado ('_') e ponto ('.').` -git_ref_name_error=` tem que ser um nome de referência Git bem formado.` -size_error=` tem que ser do tamanho %s.` -min_size_error=` tem que conter pelo menos %s caracteres.` -max_size_error=` só pode conter no máximo %s caracteres.` -email_error=` não é um endereço de email válido.` -url_error=`'%s' não é um URL válido.` -include_error=` tem que conter o texto '%s'.` -glob_pattern_error=` o padrão glob é inválido: %s.` -regex_pattern_error=` o padrão regex é inválido: %s.` +require_error=" não pode estar em branco." +alpha_dash_error=" deve conter apenas caracteres alfanuméricos, hífen ('-') e sublinhado ('_')." +alpha_dash_dot_error=" deve conter apenas caracteres alfanuméricos, hífen ('-'), sublinhado ('_') e ponto ('.')." +git_ref_name_error=" tem que ser um nome de referência Git bem formado." +size_error=" tem que ser do tamanho %s." +min_size_error=" tem que conter pelo menos %s caracteres." +max_size_error=" só pode conter no máximo %s caracteres." +email_error=" não é um endereço de email válido." +url_error='%s' não é um URL válido. +include_error=" tem que conter o texto '%s'." +glob_pattern_error=" o padrão glob é inválido: %s." +regex_pattern_error=" o padrão regex é inválido: %s." unknown_error=Erro desconhecido: captcha_incorrect=O código CAPTCHA está errado. password_not_match=As senhas não coincidem. lang_select_error=Escolha um idioma da lista. - username_been_taken=O nome de utilizador já foi tomado. username_change_not_local_user=Utilizadores que não são locais não têm permissão para mudar o nome de utilizador. repo_name_been_taken=O nome do repositório já foi usado. @@ -499,20 +473,21 @@ team_not_exist=A equipa não existe. last_org_owner=Não pode remover o último utilizador da equipa 'proprietários'. Tem que haver pelo menos um proprietário numa organização. cannot_add_org_to_team=Uma organização não pode ser adicionada como membro de uma equipa. duplicate_invite_to_team=O(A) utilizador(a) já tinha sido convidado(a) para ser membro da equipa. - invalid_ssh_key=Não é possível validar a sua chave SSH: %s invalid_gpg_key=Não é possível validar a sua chave GPG: %s invalid_ssh_principal=Protagonista inválido: %s unable_verify_ssh_key=Não é possível validar a chave SSH; verifique novamente se há erros. auth_failed=Falhou a autenticação: %v - still_own_repo=A sua conta possui um ou mais repositórios; deve excluí-los ou transferi-los primeiro. still_has_org=A sua conta é membro de uma ou mais organizações; deixe-as primeiro. still_own_packages=A sua conta possui um ou mais pacotes; elimine-os primeiro. org_still_own_repo=Esta organização ainda possui repositórios; deve excluí-los ou transferi-los primeiro. org_still_own_packages=Esta organização ainda possui um ou mais pacotes; elimine-os primeiro. - target_branch_not_exist=O ramo de destino não existe. +username_error=" só pode conter caracteres alfanuméricos ('0-9','a-z','A-Z'), hífen ('-'), sublinhado ('_') e ponto ('.') Não pode começar nem terminar com caracteres não alfanuméricos, e caracteres não alfanuméricos consecutivos também são proibidos." +invalid_group_team_map_error=" o mapeamento é inválido: %s" +organization_leave_success=Você deixou a organização %s com sucesso. +must_use_public_key=A chave que você forneceu é privada. Não carregue a sua chave em lugar nenhum, em vez disso use a sua chave pública. [user] change_avatar=Mude o seu avatar… @@ -530,7 +505,6 @@ unfollow=Deixar de seguir heatmap.loading=Carregando mapa de laboração… user_bio=Biografia disabled_public_activity=Este utilizador desabilitou a visibilidade pública do trabalho. - form.name_reserved=O nome de utilizador '%s' está reservado. form.name_pattern_not_allowed=O padrão '%s' não é permitido no nome de utilizador. form.name_chars_not_allowed=O nome de utilizador '%s' contém caracteres inválidos. @@ -553,7 +527,6 @@ account_link=Contas vinculadas organization=Organizações uid=Uid webauthn=Chaves de segurança - public_profile=Perfil público biography_placeholder=Conte-nos um pouco sobre si profile_desc=O seu endereço de email será usado para notificações e outras operações. @@ -593,7 +566,6 @@ saved_successfully=As suas configurações foram guardadas com sucesso. privacy=Privacidade keep_activity_private=Esconder o trabalho da página do perfil keep_activity_private_popup=Torna o trabalho visível apenas para si e para os administradores - lookup_avatar_by_mail=Procurar avatar com base no endereço de email federated_avatar_lookup=Pesquisa de avatar federada enable_custom_avatar=Usar avatar personalizado @@ -604,7 +576,6 @@ uploaded_avatar_not_a_image=O ficheiro carregado não é uma imagem. uploaded_avatar_is_too_big=O ficheiro carregado excedeu o tamanho máximo. update_avatar_success=O seu avatar foi substituído. update_user_avatar_success=O avatar do utilizador foi modificado. - change_password=Substituir a senha old_password=Senha corrente new_password=Nova senha @@ -612,7 +583,6 @@ retype_new_password=Volte a introduzir a nova senha password_incorrect=A senha corrente está errada. change_password_success=A sua senha foi substituída. Inicie a sessão com a nova senha a partir de agora. password_change_disabled=Os utilizadores não-locais não podem alterar a sua senha através da interface web do Gitea. - emails=Endereços de email manage_emails=Gerir endereços de email manage_themes=Escolher o tema padrão @@ -645,7 +615,6 @@ add_openid_success=O novo endereço OpenID foi adicionado. keep_email_private=Ocultar endereço de email keep_email_private_popup=Seu endereço de email será escondido dos outros utilizadores. openid_desc=O OpenID permite delegar a autenticação num fornecedor externo. - manage_ssh_keys=Gerir chaves SSH manage_ssh_principals=Gerir Protagonistas de Certificados SSH manage_gpg_keys=Gerir chaves GPG @@ -724,7 +693,6 @@ manage_social=Gerir contas sociais associadas social_desc=Estas contas sociais estão vinculadas à sua conta do Gitea. Certifique-se que as reconhece todas, uma vez que podem ser usadas para iniciar sessão na sua conta do Gitea. unbind=Desvincular unbind_success=A conta social foi desvinculada da sua conta do Gitea. - manage_access_token=Gerir códigos de acesso generate_new_token=Gerar um novo código tokens_desc=Esses códigos concedem acesso à sua conta usando a API do Gitea. @@ -739,7 +707,6 @@ access_token_deletion_cancel_action=Cancelar access_token_deletion_confirm_action=Eliminar access_token_deletion_desc=Eliminar um código revoga o acesso à sua conta nas aplicações que o usem. Esta operação não poderá ser revertida. Quer continuar? delete_token_success=O código foi eliminado. Aplicações que o usavam deixaram de ter acesso à sua conta. - manage_oauth2_applications=Gerir aplicações OAuth2 edit_oauth2_application=Editar aplicação OAuth2 oauth2_applications_desc=Aplicações OAuth2 permitem que as suas aplicações de terceiros autentiquem com segurança utilizadores nesta instância do Gitea. @@ -762,14 +729,12 @@ oauth2_client_secret_hint=O segredo não será visível se revisitar esta págin oauth2_application_edit=Editar oauth2_application_create_description=As aplicações OAuth2 dão à sua aplicação de terceiros acesso a contas de utilizador nesta instância. oauth2_application_remove_description=A remoção de uma aplicação OAuth2 impedi-la-á de aceder a contas de utilizador autorizadas nesta instância. Quer continuar? - authorized_oauth2_applications=Aplicações OAuth2 autorizadas authorized_oauth2_applications_description=Concedeu acesso à sua conta pessoal do Gitea a essas aplicações de terceiros. Por favor, revogue o acesso às aplicações que já não sejam necessárias. revoke_key=Revogar revoke_oauth2_grant=Revogar acesso revoke_oauth2_grant_description=Revogar o acesso desta aplicação de terceiros impedi-la-á de aceder aos seus dados. Tem a certeza? revoke_oauth2_grant_success=Revogou o acesso com sucesso. - twofa_desc=Autenticação em dois passos melhora a segurança da sua conta. twofa_is_enrolled=A autenticação em dois passos está neste momento habilitada na sua conta. twofa_not_enrolled=A autenticação em dois passos não está neste momento habilitada na sua conta. @@ -787,13 +752,11 @@ then_enter_passcode=E insira o código apresentado na aplicação: passcode_invalid=O código está errado. Tente de novo. twofa_enrolled=A sua conta usa autenticação em dois passos. Guarde o seu código de recuperação (%s) num lugar seguro porque é mostrado somente uma vez! twofa_failed_get_secret=Falhou a obtenção do segredo. - webauthn_desc=Chaves de segurança são dispositivos de hardware contendo chaves criptográficas. Podem ser usadas para autenticação em dois passos. As chaves de segurança têm de suportar o standard Autenticador WebAuthn. webauthn_register_key=Adicionar chave de segurança webauthn_nickname=Apelido webauthn_delete_key=Remover chave de segurança webauthn_delete_key_desc=Se remover uma chave de segurança, deixará de poder usá-la para iniciar a sessão. Quer continuar? - manage_account_links=Gerir contas vinculadas manage_account_links_desc=Estas contas externas estão vinculadas à sua conta do Gitea. account_links_not_available=Neste momento não existem contas externas vinculadas à sua conta do Gitea. @@ -801,23 +764,19 @@ link_account=Vincular conta remove_account_link=Remover conta vinculada remove_account_link_desc=A remoção de uma conta vinculada revogará o acesso dessa conta à sua conta do Gitea. Quer continuar? remove_account_link_success=A conta vinculada foi removida. - orgs_none=Não é membro de nenhuma organização. repos_none=Não tem nenhum repositório - delete_account=Eliminar a sua conta delete_prompt=Esta operação irá eliminar permanentemente a sua conta de utilizador. Isso NÃO PODERÁ ser desfeito. delete_with_all_comments=A sua conta tem menos de %s. Para evitar comentários fantasma, todas os comentários em questões ou nos pedidos de integração serão também eliminados. confirm_delete_account=Confirme a eliminação delete_account_title=Eliminar conta de utilizador delete_account_desc=Tem a certeza que quer eliminar permanentemente esta conta de utilizador? - email_notifications.enable=Habilitar notificações por email email_notifications.onmention=Enviar email somente quando mencionado(a) email_notifications.disable=Desabilitar notificações por email email_notifications.submit=Definir preferência do email email_notifications.andyourown=e as suas próprias notificações - visibility=Visibilidade do utilizador visibility.public=Pública visibility.public_tooltip=Visível para todos os utilizadores @@ -825,6 +784,8 @@ visibility.limited=Limitada visibility.limited_tooltip=Visível apenas para utilizadores com sessão iniciada visibility.private=Privada visibility.private_tooltip=Visível apenas para membros da organização +select_scopes=Escolha os âmbitos +scopes_list=Âmbitos: [repo] new_repo_helper=Um repositório contém todos os ficheiros do trabalho, incluindo o histórico das revisões. Já o tem noutro sítio? Migre o repositório. @@ -868,7 +829,7 @@ license_helper_desc=Uma licença rege o que os outros podem, ou não, fazer com 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 (adiciona `.gitignore`, `LICENSE` e `README.md`) +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 @@ -911,14 +872,12 @@ delete_preexisting=Eliminar ficheiros pré-existentes delete_preexisting_content=Eliminar ficheiros em %s delete_preexisting_success=Eliminados os ficheiros não adoptados em %s blame_prior=Ver a responsabilização anterior a esta modificação - transfer.accept=Aceitar transferência transfer.accept_desc=Transferir para "%s" transfer.reject=Rejeitar transferência transfer.reject_desc=Cancelar transferência para "%s" transfer.no_permission_to_accept=Não tem permissão para Aceitar transfer.no_permission_to_reject=Não tem permissão para Rejeitar - desc.private=Privado desc.public=Público desc.private_template=Modelo privado @@ -926,7 +885,6 @@ desc.public_template=Modelo desc.internal=Interno desc.internal_template=Modelo interno desc.archived=Arquivado - template.items=Itens do modelo template.git_content=Conteúdo Git (ramo principal) template.git_hooks=Automatismos do Git @@ -937,16 +895,13 @@ template.avatar=Avatar 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 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.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. - form.reach_limit_of_creation_1=Já atingiu o seu limite de %d repositório. form.reach_limit_of_creation_n=Já atingiu o seu limite de %d repositórios. form.name_reserved=O nome de repositório '%s' está reservado. form.name_pattern_not_allowed=O padrão '%s' não é permitido no nome de um repositório. - need_auth=Autorização migrate_options=Opções de migração migrate_service=Serviço de migração @@ -997,7 +952,6 @@ migrate.migrating_labels=Migrando rótulos migrate.migrating_releases=Migrando lançamentos migrate.migrating_issues=Migrando questões migrate.migrating_pulls=Migrando pedidos de integração - mirror_from=réplica de forked_from=derivado de generated_from=gerado a partir de @@ -1011,7 +965,6 @@ unstar=Tirar dos favoritos star=Juntar aos favoritos fork=Derivar download_archive=Descarregar repositório - no_desc=Sem descrição quick_guide=Guia rápido clone_this_repo=Clonar este repositório @@ -1019,12 +972,11 @@ create_new_repo_command=Criando um novo repositório na linha de comandos push_exist_repo=Enviando, pela linha de comandos, um repositório existente empty_message=Este repositório não contém qualquer conteúdo. broken_message=Os dados Git subjacentes a este repositório não podem ser lidos. Contacte o administrador desta instância ou elimine este repositório. - code=Código code.desc=Aceder ao código fonte, ficheiros, cometimentos e ramos. branch=Ramo tree=Árvore -clear_ref=`Apagar a referência vigente` +clear_ref=Apagar a referência vigente filter_branch_and_tag=Filtrar ramo ou etiqueta find_tag=Procurar etiqueta branches=Ramos @@ -1036,7 +988,6 @@ packages=Pacotes labels=Rótulos org_labels_desc=Rótulos ao nível da organização que podem ser usados em todos os repositórios desta organização org_labels_desc_manage=gerir - milestones=Etapas commits=Cometimentos commit=Cometimento @@ -1052,14 +1003,13 @@ file_view_rendered=Ver resultado processado file_view_raw=Ver em bruto file_permalink=Ligação permanente file_too_large=O ficheiro é demasiado grande para ser apresentado. -invisible_runes_header=`Este ficheiro contém caracteres Unicode invisíveis!` -invisible_runes_description=`Este ficheiro contém caracteres Unicode invisíveis que podem ser processados de forma diferente do que aparece abaixo. Se o uso é intencional e legítimo, pode ignorar este aviso com segurança. Use o botão Revelar para mostrar os caracteres invisíveis.` -ambiguous_runes_header=`Este ficheiro contém caracteres Unicode ambíguos!` -ambiguous_runes_description=`Este ficheiro contém caracteres Unicode ambíguos que podem ser confundidos com outros da sua configuração regional vigente. Se o uso é intencional e legítimo, pode ignorar este aviso com segurança. Use o botão Revelar para realçar esses caracteres.` -invisible_runes_line=`Esta linha tem caracteres unicode invisíveis` -ambiguous_runes_line=`Esta linha tem caracteres unicode ambíguos` -ambiguous_character=`%[1]c [U+%04[1]X] pode confundir-se com %[2]c [U+%04[2]X]` - +invisible_runes_header=Este ficheiro contém caracteres Unicode invisíveis! +invisible_runes_description=Este ficheiro contém caracteres Unicode invisíveis que podem ser processados de forma diferente do que aparece abaixo. Se o uso é intencional e legítimo, pode ignorar este aviso com segurança. Use o botão Revelar para mostrar os caracteres invisíveis. +ambiguous_runes_header=Este ficheiro contém caracteres Unicode ambíguos! +ambiguous_runes_description=Este ficheiro contém caracteres Unicode ambíguos que podem ser confundidos com outros da sua configuração regional vigente. Se o uso é intencional e legítimo, pode ignorar este aviso com segurança. Use o botão Revelar para realçar esses caracteres. +invisible_runes_line=Esta linha tem caracteres unicode invisíveis +ambiguous_runes_line=Esta linha tem caracteres unicode ambíguos +ambiguous_character=%[1]c [U+%04[1]X] pode confundir-se com %[2]c [U+%04[2]X] escape_control_characters=Revelar unescape_control_characters=Esconder file_copy_permalink=Copiar ligação permanente @@ -1078,7 +1028,6 @@ download_file=Descarregar ficheiro normal_view=Vista normal line=linha lines=linhas - editor.add_file=Adicionar ficheiro editor.new_file=Novo ficheiro editor.upload_file=Carregar ficheiro @@ -1144,7 +1093,6 @@ editor.user_no_push_to_branch=O utilizador não pode enviar para o ramo editor.require_signed_commit=O ramo requer um cometimento assinado editor.cherry_pick=Escolher a dedo %s para: editor.revert=Reverter %s para: - commits.desc=Navegar pelo histórico de modificações no código fonte. commits.commits=Cometimentos commits.no_commits=Não há cometimentos em comum. '%s' e '%s' têm históricos completamente diferentes. @@ -1163,7 +1111,6 @@ commits.signed_by_untrusted_user=Assinado por um utilizador não fiável commits.signed_by_untrusted_user_unmatched=Assinado por um utilizador não fiável que não corresponde a quem comete commits.gpg_key_id=ID da chave GPG commits.ssh_key_fingerprint=Identificação digital da chave SSH - commit.actions=Operações commit.revert=Reverter commit.revert-header=Reverter: %s @@ -1171,10 +1118,8 @@ commit.revert-content=Escolha o ramo para onde vai reverter: commit.cherry-pick=Escolher a dedo commit.cherry-pick-header=Escolher a dedo: %s commit.cherry-pick-content=Escolha o ramo para onde vai escolher a dedo: - ext_issues=Acesso a questões externas ext_issues.desc=Ligação para um rastreador de questões externo. - projects=Planeamentos projects.desc=Gerir questões e integrações nos quadros do planeamento. projects.description=Descrição (opcional) @@ -1210,7 +1155,6 @@ projects.board.color=Cor projects.open=Abrir projects.close=Fechar projects.board.assigned_to=Atribuído a - issues.desc=Organize relatórios de erros, tarefas e etapas. issues.filter_assignees=Filtrar encarregado issues.filter_milestones=Filtrar etapa @@ -1263,25 +1207,25 @@ issues.add_labels=adicionou os rótulos %s %s issues.remove_label=removeu o rótulo %s %s issues.remove_labels=removeu os rótulos %s %s issues.add_remove_labels=adicionou o(s) rótulo(s) %s e removeu %s %s -issues.add_milestone_at=`adicionou esta questão à etapa %s %s` -issues.add_project_at=`adicionou esta questão ao planeamento %s %s` -issues.change_milestone_at=`modificou a etapa de %s para %s %s` -issues.change_project_at=`modificou o planeamento de %s para %s %s` -issues.remove_milestone_at=`removeu esta questão da etapa %s %s` -issues.remove_project_at=`removeu isto do planeamento %s %s` -issues.deleted_milestone=`(eliminada)` -issues.deleted_project=`(eliminado)` -issues.self_assign_at=`atribuiu a si mesmo(a) esta questão %s` -issues.add_assignee_at=`foi atribuída por %s %s` -issues.remove_assignee_at=`a atribuição foi retirada por %s %s` -issues.remove_self_assignment=`removeu a auto-atribuição %s` -issues.change_title_at=`mudou o título de %s para %s %s` -issues.change_ref_at=`mudou a referência de %s para %s %s` -issues.remove_ref_at=`removeu a referência %s %s` -issues.add_ref_at=`adicionou a referência %s %s` -issues.delete_branch_at=`eliminou o ramo %s %s` +issues.add_milestone_at=adicionou esta questão à etapa %s %s +issues.add_project_at=adicionou esta questão ao planeamento %s %s +issues.change_milestone_at=modificou a etapa de %s para %s %s +issues.change_project_at=modificou o planeamento de %s para %s %s +issues.remove_milestone_at=removeu esta questão da etapa %s %s +issues.remove_project_at=removeu isto do planeamento %s %s +issues.deleted_milestone=(eliminada) +issues.deleted_project=(eliminado) +issues.self_assign_at=atribuiu a si mesmo(a) esta questão %s +issues.add_assignee_at=foi atribuída por %s %s +issues.remove_assignee_at=a atribuição foi retirada por %s %s +issues.remove_self_assignment=removeu a auto-atribuição %s +issues.change_title_at=mudou o título de %s para %s %s +issues.change_ref_at=mudou a referência de %s para %s %s +issues.remove_ref_at=removeu a referência %s %s +issues.add_ref_at=adicionou a referência %s %s +issues.delete_branch_at=eliminou o ramo %s %s issues.filter_label=Rótulo -issues.filter_label_exclude=`Use alt + clique/enter para excluir rótulos` +issues.filter_label_exclude=Use alt + clique/enter para excluir rótulos issues.filter_label_no_select=Todos os rótulos issues.filter_milestone=Etapa issues.filter_milestone_no_select=Todas as etapas @@ -1324,11 +1268,11 @@ issues.opened_by_fake=%[1]s aberta(s) por %[2]s issues.closed_by_fake=por %[2]s foi fechada %[1]s issues.previous=Anterior issues.next=Seguinte -issues.open_title=Aberta -issues.closed_title=Fechada +issues.open_title=aberta(s) +issues.closed_title=fechada(s) issues.draft_title=Rascunho issues.num_comments=%d comentários -issues.commented_at=`comentou %s` +issues.commented_at=comentou %s issues.delete_comment_confirm=Tem a certeza que quer eliminar este comentário? issues.context.copy_link=Copiar ligação issues.context.quote_reply=Citar resposta @@ -1337,22 +1281,22 @@ issues.context.edit=Editar issues.context.delete=Eliminar issues.no_content=Ainda não há conteúdo. issues.close_issue=Fechar -issues.pull_merged_at=`integrou o cometimento %[2]s no ramo %[3]s %[4]s` -issues.manually_pull_merged_at=`integrou o cometimento %[2]s no ramo %[3]s manualmente %[4]s` +issues.pull_merged_at=integrou o cometimento %[2]s no ramo %[3]s %[4]s +issues.manually_pull_merged_at=integrou o cometimento %[2]s no ramo %[3]s manualmente %[4]s issues.close_comment_issue=Comentar e fechar issues.reopen_issue=Reabrir 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` -issues.commit_ref_at=`referenciou esta questão num cometimento %[2]s` -issues.ref_issue_from=`referiu esta questão %[4]s %[2]s` -issues.ref_pull_from=`referiu este pedido de integração %[4]s %[2]s` -issues.ref_closing_from=`referiu um pedido de integração %[4]s que fechará esta questão %[2]s` -issues.ref_reopening_from=`referiu um pedido de integração %[4]s que reabrirá esta questão %[2]s` -issues.ref_closed_from=`encerrou esta questão %[4]s %[2]s` -issues.ref_reopened_from=`reabriu esta questão %[4]s %[2]s` -issues.ref_from=`de %[1]s` +issues.closed_at=encerrou esta questão %[2]s +issues.reopened_at=reabriu esta questão %[2]s +issues.commit_ref_at=referenciou esta questão num cometimento %[2]s +issues.ref_issue_from=referiu esta questão %[4]s %[2]s +issues.ref_pull_from=referiu este pedido de integração %[4]s %[2]s +issues.ref_closing_from=referiu um pedido de integração %[4]s que fechará esta questão %[2]s +issues.ref_reopening_from=referiu um pedido de integração %[4]s que reabrirá esta questão %[2]s +issues.ref_closed_from=encerrou esta questão %[4]s %[2]s +issues.ref_reopened_from=reabriu esta questão %[4]s %[2]s +issues.ref_from=de %[1]s issues.poster=Remetente issues.collaborator=Colaborador(a) issues.owner=Proprietário(a) @@ -1382,8 +1326,8 @@ issues.label.filter_sort.reverse_alphabetically=por ordem alfabética inversa issues.label.filter_sort.by_size=Menor tamanho issues.label.filter_sort.reverse_by_size=Maior tamanho issues.num_participants=%d Participantes -issues.attachment.open_tab=`Clique para ver "%s" num separador novo` -issues.attachment.download=`Clique para descarregar "%s"` +issues.attachment.open_tab=Clique para ver "%s" num separador novo +issues.attachment.download=Clique para descarregar "%s" issues.subscribe=Subscrever issues.unsubscribe=Anular subscrição issues.lock=Bloquear diálogo @@ -1411,31 +1355,31 @@ issues.delete.text=Tem a certeza que quer eliminar esta questão? Isso irá remo issues.tracker=Gestor de tempo issues.start_tracking_short=Iniciar cronómetro issues.start_tracking=Iniciar contagem de tempo -issues.start_tracking_history=`começou a trabalhar %s` +issues.start_tracking_history=começou a trabalhar %s issues.tracker_auto_close=O cronómetro será parado automaticamente quando esta questão for fechada -issues.tracking_already_started=`Você já iniciou a contagem de tempo noutra questão!` +issues.tracking_already_started=Você já iniciou a contagem de tempo noutra questão! issues.stop_tracking=Parar cronómetro -issues.stop_tracking_history=`parou de trabalhar %s` +issues.stop_tracking_history=parou de trabalhar %s issues.cancel_tracking=Descartar -issues.cancel_tracking_history=`cancelou a contagem de tempo %s` +issues.cancel_tracking_history=cancelou a contagem de tempo %s issues.add_time=Adicionar tempo manualmente issues.del_time=Eliminar este registo de tempo issues.add_time_short=Adicionar tempo issues.add_time_cancel=Cancelar -issues.add_time_history=`adicionou tempo gasto nesta questão %s` -issues.del_time_history=`eliminou o tempo gasto nesta questão %s` +issues.add_time_history=adicionou tempo gasto nesta questão %s +issues.del_time_history=eliminou o tempo gasto nesta questão %s issues.add_time_hours=Horas issues.add_time_minutes=Minutos issues.add_time_sum_to_small=Não foi inserido qualquer tempo. issues.time_spent_total=Total de tempo gasto -issues.time_spent_from_all_authors=`Total de tempo gasto: %s` +issues.time_spent_from_all_authors=Total de tempo gasto: %s issues.due_date=Data de vencimento issues.invalid_due_date_format=O formato da data de vencimento tem que ser 'aaaa-mm-dd'. 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.due_date_form=yyyy-mm-dd issues.due_date_form_add=Adicionar data de vencimento issues.due_date_form_edit=Editar @@ -1454,8 +1398,8 @@ issues.dependency.add=Adicionar dependência… issues.dependency.cancel=Cancelar issues.dependency.remove=Remover issues.dependency.remove_info=Remover esta dependência -issues.dependency.added_dependency=`adicionou uma nova dependência %s` -issues.dependency.removed_dependency=`removeu uma dependência %s` +issues.dependency.added_dependency=adicionou uma nova dependência %s +issues.dependency.removed_dependency=removeu uma dependência %s issues.dependency.pr_closing_blockedby=O encerramento deste pedido de integração está bloqueado pelas seguintes questões issues.dependency.issue_closing_blockedby=O encerramento desta questão está bloqueado pelas seguintes questões issues.dependency.issue_close_blocks=Esta questão bloqueia o encerramento das seguintes questões @@ -1508,10 +1452,8 @@ issues.content_history.delete_from_history=Eliminar do histórico issues.content_history.delete_from_history_confirm=Eliminar do histórico? issues.content_history.options=Opções issues.reference_link=Referência: %s - compare.compare_base=base compare.compare_head=comparar - pulls.desc=Habilitar pedidos de integração e revisão de código. pulls.new=Novo pedido de integração pulls.view=Ver pedido de integração @@ -1531,11 +1473,11 @@ pulls.filter_branch=Filtrar ramo pulls.no_results=Não foram encontrados quaisquer resultados. pulls.nothing_to_compare=Estes ramos são iguais. Não há necessidade de criar um pedido de integração. 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.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=quer integrar %[1]d cometimento(s) do ramo %[2]s no ramo %[3]s pulls.merged_title_desc=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.change_target_branch_at=mudou o ramo de destino de %s para %s %s pulls.tab_conversation=Diálogo pulls.tab_commits=Cometimentos pulls.tab_files=Ficheiros modificados @@ -1547,7 +1489,7 @@ pulls.manually_merged=Integrado manualmente pulls.manually_merged_as=A integração foi executada manualmente no cometimento %[2]s. pulls.is_closed=O pedido de integração foi fechado. pulls.has_merged=A integração foi executada. -pulls.title_wip_desc=`Inicie o título com %s para evitar que a integração seja executada acidentalmente.` +pulls.title_wip_desc=Inicie o título com %s para evitar que a integração seja executada acidentalmente. pulls.cannot_merge_work_in_progress=Este pedido de integração está marcado como trabalho em andamento. pulls.still_in_progress=Ainda em andamento? pulls.add_prefix=Adicione o prefixo %s @@ -1578,7 +1520,6 @@ pulls.reject_count_n=%d pedidos de modificação pulls.waiting_count_1=%d revisão pendente pulls.waiting_count_n=%d revisões pendentes pulls.wrong_commit_id=ID do cometimento tem que ser um ID de cometimento no ramo de destino - pulls.no_merge_desc=A integração constante neste pedido não pode ser executada porque todas as opções de integração do repositório estão desabilitadas. pulls.no_merge_helper=Habilite as opções de integração nas configurações do repositório ou faça a integração manualmente. pulls.no_merge_wip=A integração constante neste pedido não pode ser executada porque está marcada como sendo trabalho em andamento. @@ -1591,7 +1532,6 @@ pulls.squash_merge_pull_request=Criar cometimento de compactação pulls.merge_manually=Integrado manualmente pulls.merge_commit_id=O ID de cometimento da integração pulls.require_signed_wont_sign=O ramo requer que os cometimentos sejam assinados mas esta integração não vai ser assinada - pulls.invalid_merge_option=Não pode usar esta opção de integração neste pedido de integração. pulls.merge_conflict=A integração falhou: Houve um conflito durante a integração. Dica: tente uma estratégia diferente pulls.merge_conflict_summary=Mensagem de erro @@ -1604,7 +1544,7 @@ pulls.head_out_of_date=Falhou a integração: Enquanto estava a gerar a integra pulls.push_rejected=A integração falhou: O envio foi rejeitado. Reveja os Automatismos do Git neste repositório. pulls.push_rejected_summary=Mensagem completa de rejeição pulls.push_rejected_no_message=A integração falhou: O envio foi rejeitado mas não houve qualquer mensagem remota.
    Reveja os Automatismos do Git para este repositório -pulls.open_unmerged_pull_exists=`Não pode executar uma operação de reabertura porque há um pedido de integração pendente (#%d) com propriedades idênticas.` +pulls.open_unmerged_pull_exists=Não pode executar uma operação de reabertura porque há um pedido de integração 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 pulls.status_checks_warning=Algumas verificações reportaram avisos @@ -1617,27 +1557,22 @@ pulls.update_branch_rebase=Modificar ramo mudando a base pulls.update_branch_success=A sincronização do ramo foi bem sucedida pulls.update_not_allowed=Não tem autorização para sincronizar o ramo pulls.outdated_with_base_branch=Este ramo é obsoleto em relação ao ramo base -pulls.closed_at=`fechou este pedido de integração %[2]s` -pulls.reopened_at=`reabriu este pedido de integração %[2]s` -pulls.merge_instruction_hint=`Também pode ver as instruções para a linha de comandos.` +pulls.closed_at=fechou este pedido de integração %[2]s +pulls.reopened_at=reabriu este pedido de integração %[2]s +pulls.merge_instruction_hint=Também pode ver as instruções para a linha de comandos. pulls.merge_instruction_step1_desc=No seu repositório, crie um novo ramo e teste as modificações. pulls.merge_instruction_step2_desc=Integre as modificações e envie para o Gitea. - pulls.auto_merge_button_when_succeed=(quando as verificações forem bem-sucedidas) pulls.auto_merge_when_succeed=Integrar automaticamente quando todas as verificações forem bem-sucedidas pulls.auto_merge_newly_scheduled=O pedido de integração foi agendado para ser executado quando todas as verificações forem bem-sucedidas. pulls.auto_merge_has_pending_schedule=%[1]s agendou este pedido de integração para ser executado automaticamente quando todas as verificações forem bem-sucedidas %[2]s. - pulls.auto_merge_cancel_schedule=Cancelar a integração automática pulls.auto_merge_not_scheduled=Este pedido de integração não está agendado para ser executado automaticamente. pulls.auto_merge_canceled_schedule=A integração automática foi cancelada para este pedido de integração. - -pulls.auto_merge_newly_scheduled_comment=`agendou este pedido de integração para ser executado automaticamente quando todas as verificações forem bem-sucedidas %[1]s` -pulls.auto_merge_canceled_schedule_comment=`cancelou a execução automática deste pedido de integração que iria ocorrer quando todas as verificações fossem bem-sucedidas %[1]s` - +pulls.auto_merge_newly_scheduled_comment=agendou este pedido de integração para ser executado automaticamente quando todas as verificações forem bem-sucedidas %[1]s +pulls.auto_merge_canceled_schedule_comment=cancelou a execução automática deste pedido de integração que iria ocorrer quando todas as verificações fossem bem-sucedidas %[1]s pulls.delete.title=Eliminar este pedido de integração? pulls.delete.text=Tem a certeza que quer eliminar este pedido de integração? Isso irá remover todo o conteúdo permanentemente. Como alternativa considere fechá-lo, se pretender mantê-lo em arquivo. - milestones.new=Nova etapa milestones.closed=Encerrada %s milestones.update_ago=Modificada há %s @@ -1667,7 +1602,6 @@ milestones.filter_sort.least_complete=Menos completo milestones.filter_sort.most_complete=Mais completo milestones.filter_sort.most_issues=Mais questões milestones.filter_sort.least_issues=Menos questões - signing.will_sign=Este cometimento irá ser assinado com a chave '%s' signing.wont_sign.error=Ocorreu um erro enquanto estava a ser verificado se o cometimento poderia ser assinado signing.wont_sign.nokey=Não existe qualquer chave disponível para assinar este cometimento @@ -1681,10 +1615,8 @@ signing.wont_sign.headsigned=A integração não irá ser assinada, uma vez que signing.wont_sign.commitssigned=A integração não irá ser assinada, uma vez que nenhum dos cometimentos associados foram assinados 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=Acesso a wiki externo ext_wiki.desc=Ligação para um wiki externo. - wiki=Wiki wiki.welcome=Bem-vindo(a) ao Wiki. wiki.welcome_desc=O wiki permite escrever e partilhar documentação com os colaboradores. @@ -1708,7 +1640,6 @@ wiki.reserved_page=O nome de página wiki '%s' está reservado. wiki.pages=Páginas wiki.last_updated=Última modificação em %s wiki.page_name_desc=Insira um nome para esta página Wiki. Alguns dos nomes especiais são: 'Home', '_Sidebar' e '_Footer'. - activity=Trabalho activity.period.filter_label=Período: activity.period.daily=1 dia @@ -1741,7 +1672,7 @@ activity.title.issues_1=%d questão activity.title.issues_n=%d questões activity.title.issues_closed_from=%s resolvida(s) de %s activity.title.issues_created_by=%s criada por %s -activity.closed_issue_label=Encerrada +activity.closed_issue_label=Fechada activity.new_issues_count_1=questão nova activity.new_issues_count_n=questões novas activity.new_issue_label=Em aberto @@ -1774,7 +1705,6 @@ activity.git_stats_addition_n=%d adições activity.git_stats_and_deletions=e activity.git_stats_deletion_1=%d eliminação activity.git_stats_deletion_n=%d eliminações - search=Procurar search.search_repo=Procurar repositório search.type.tooltip=Tipo de pesquisa @@ -1785,7 +1715,6 @@ search.match.tooltip=Incluir somente os resultados que correspondam rigorosament search.results=Resultados da procura de "%s" em %s search.code_no_results=Não foi encontrado qualquer código-fonte correspondente à sua pesquisa. search.code_search_unavailable=A pesquisa por código-fonte não está disponível, neste momento. Entre em contacto com o administrador. - settings=Configurações settings.desc=Configurações é onde pode gerir as configurações do repositório settings.options=Repositório @@ -1892,7 +1821,7 @@ settings.trust_model.default=Modelo de confiança padrão settings.trust_model.default.desc=Usar o modelo de confiança padrão do repositório para esta instalação. settings.trust_model.collaborator=Colaborador settings.trust_model.collaborator.long=Colaborador: Confiar nas assinaturas dos colaboradores -settings.trust_model.collaborator.desc=Assinaturas válidas dos colaboradores deste repositório serão marcadas como "fiável" (quer correspondam ou não ao autor do cometimento). Caso contrário, assinaturas válidas serão marcadas como "não fiável" se a assinatura corresponder ao autor do cometimento e "não corresponde", se não corresponder. +settings.trust_model.collaborator.desc=Assinaturas válidas dos colaboradores deste repositório serão marcadas como "fiável" (independentemente de corresponderem, ou não, ao autor do cometimento). Caso contrário, assinaturas válidas serão marcadas como "não fiável" se a assinatura corresponder ao autor do cometimento e "não corresponde", se não corresponder. settings.trust_model.committer=Autor do cometimento settings.trust_model.committer.long=Autor do cometimento: Confiar nas assinaturas que correspondam aos autores dos cometimentos (isto corresponde ao funcionamento do GitHub e força a que os cometimentos assinados do Gitea tenham o Gitea como autor do cometimento) settings.trust_model.committer.desc=Assinaturas válidas apenas serão marcadas como "fiável" se corresponderem ao autor do cometimento, caso contrário serão marcadas como "não corresponde". Isto irá forçar a que o Gitea seja o autor do cometimento nos cometimentos assinados, ficando o autor real marcado como "Co-autorado-por:" e "Co-cometido-por:" no resumo do cometimento. A chave padrão do Gitea tem que corresponder a um utilizador na base de dados. @@ -2090,10 +2019,10 @@ settings.dismiss_stale_approvals=Descartar aprovações obsoletas settings.dismiss_stale_approvals_desc=Quando novos cometimentos que mudam o conteúdo do pedido de integração forem enviados para o ramo, as aprovações antigas serão descartadas. settings.require_signed_commits=Exigir cometimentos assinados settings.require_signed_commits_desc=Rejeitar envios para este ramo que não estejam assinados ou que não sejam validáveis. -settings.protect_protected_file_patterns=Padrões de ficheiros protegidos (separados com ponto e vírgula '\;'): -settings.protect_protected_file_patterns_desc=Ficheiros protegidos que não podem ser modificados, 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 se o utilizador tiver direitos de escrita, contornando a restrição no envio. 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_protected_file_patterns=Padrões de ficheiros protegidos (separados com ponto e vírgula ';'): +settings.protect_protected_file_patterns_desc=Ficheiros protegidos que não podem ser modificados, 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 se o utilizador tiver direitos de escrita, contornando a restrição no envio. 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.add_protected_branch=Habilitar salvaguarda settings.delete_protected_branch=Desabilitar salvaguarda settings.update_protect_branch_success=A salvaguarda do ramo '%s' foi modificada. @@ -2173,7 +2102,6 @@ settings.rename_branch_success=O ramo %s foi renomeado para %s com sucesso. settings.rename_branch_from=antigo nome do ramo settings.rename_branch_to=novo nome do ramo settings.rename_branch=Renomear ramo - diff.browse_source=Ver a proveniência diff.parent=ascendente diff.commit=cometimento @@ -2225,7 +2153,6 @@ diff.image.side_by_side=Lado a Lado diff.image.swipe=Deslizar diff.image.overlay=Sobrepor diff.has_escaped=Esta linha tem caracteres unicode escondidos - releases.desc=Acompanhe as versões e as descargas do repositório. release.releases=Lançamentos release.detail=Detalhes do lançamento @@ -2267,7 +2194,6 @@ release.downloads=Descargas release.download_count=Descargas: %s release.add_tag_msg=Usar o título e o conteúdo do lançamento como mensagem da etiqueta. release.add_tag=Criar apenas a etiqueta - branch.name=Nome do ramo branch.search=Procurar ramos branch.already_exists=Já existe um ramo com o nome '%s'. @@ -2299,25 +2225,52 @@ branch.create_branch_operation=Criar ramo branch.new_branch=Criar um novo ramo branch.new_branch_from=Criar um novo ramo a partir do ramo '%s' branch.renamed=O ramo %s foi renomeado para %s. - tag.create_tag=Criar etiqueta %s tag.create_tag_operation=Criar etiqueta tag.confirm_create_tag=Criar etiqueta tag.create_tag_from=Criar uma etiqueta a partir do ramo '%s' - tag.create_success=A etiqueta '%s' foi criada. - topic.manage_topics=Gerir tópicos topic.done=Concluído topic.count_prompt=Não pode escolher mais do que 25 tópicos topic.format_prompt=Os tópicos devem começar com uma letra ou um número, podem incluir traços ('-') e podem ter até 35 caracteres. - find_file.go_to_file=Ir para o ficheiro find_file.no_matching=Não foi encontrado qualquer ficheiro correspondente - error.csv.too_large=Não é possível apresentar este ficheiro por ser demasiado grande. error.csv.unexpected=Não é possível apresentar este ficheiro porque contém um caractere inesperado na linha %d e coluna %d. error.csv.invalid_field_count=Não é possível apresentar este ficheiro porque tem um número errado de campos na linha %d. +more_operations=Mais operações +cite_this_repo=Citar este repositório +editor.new_branch_name=Dê um nome ao novo ramo para este cometimento +commit.operations=Operações +projects.card_type.desc=Previsão dos cartões +projects.card_type.images_and_text=Imagens e texto +projects.card_type.text_only=Apenas texto +issues.filter_project=Planeamento +issues.filter_project_all=Todos os planeamentos +issues.filter_project_none=Nenhum planeamento +issues.action_check=Marcar/desmarcar +issues.action_check_all=Marcar/desmarcar todos os itens +issues.label_exclusive=Exclusivo +issues.label_exclusive_desc=Nomeie o rótulo âmbito/item para torná-lo mutuamente exclusivo com outros rótulos do âmbito/. +issues.label_exclusive_warning=Quaisquer rótulos com âmbito que estejam em conflito irão ser removidos ao editar os rótulos de uma questão ou de um pedido de integração. +pulls.clear_merge_message=Apagar mensagem de integração +pulls.clear_merge_message_hint=Apagar a mensagem de integração apenas remove o conteúdo da mensagem de cometimento e mantém os rodapés do git, tais como "Co-Autorado-Por …". +settings.branches.add_new_rule=Adicionar nova regra +settings.pulls.default_allow_edits_from_maintainers=Permitir, por padrão, que os responsáveis editem +settings.releases_desc=Habilitar lançamentos no repositório +settings.actions_desc=Habilitar operações no repositório +settings.authorization_header=Cabeçalho de Autorização +settings.authorization_header_desc=Será incluído como cabeçalho de autorização para pedidos, quando estiver presente. Exemplos: %s. +settings.protected_branch.save_rule=Guardar regra +settings.protected_branch.delete_rule=Eliminar regra +settings.protect_branch_name_pattern=Padrão do nome do ramo protegido +settings.remove_protected_branch_failed=A remoção da regra '%s' de salvaguarda do ramo falhou. +settings.merge_style_desc=Estilos de integração +settings.protected_branch_required_rule_name=Nome de regra obrigatório +settings.protected_branch_duplicate_rule_name=Nome de regra duplicado +release.releases_for=Lançamentos para %s +release.tags_for=Etiquetas para %s [org] org_name_holder=Nome da organização @@ -2341,11 +2294,9 @@ team_access_desc=Acesso ao repositório team_permission_desc=Permissão team_unit_desc=Permitir acesso às secções do repositório team_unit_disabled=(desabilitada) - form.name_reserved=O nome de organização '%s' está reservado. form.name_pattern_not_allowed=O padrão '%s' não é permitido no nome de uma organização. form.create_org_not_allowed=Não tem permissão para criar uma organização. - settings=Configurações settings.options=Organização settings.full_name=Nome completo @@ -2359,7 +2310,6 @@ settings.visibility.limited=Limitado (visível apenas para utilizadores com sess settings.visibility.limited_shortname=Limitada settings.visibility.private=Privada (visível apenas para os membros da organização) settings.visibility.private_shortname=Privado - settings.update_settings=Modificar configurações settings.update_setting_success=As configurações da organização foram modificadas. settings.change_orgname_prompt=Nota: alterar o nome da organização altera também o URL da organização. @@ -2372,9 +2322,7 @@ settings.confirm_delete_account=Confirme a eliminação settings.delete_org_title=Eliminar organização settings.delete_org_desc=Esta organização será eliminada permanentemente. Quer continuar? settings.hooks_desc=Adicionar automatismos web que serão despoletados para todos os repositórios desta organização. - settings.labels_desc=Adicionar rótulos que possam ser usados em questões para todos os repositórios desta organização. - members.membership_visibility=Visibilidade da filiação: members.public=Visível members.public_helper=tornar oculto @@ -2389,7 +2337,6 @@ members.leave=Sair members.leave.detail=Sair de %s? members.invite_desc=Adicionar um novo membro a %s: members.invite_now=Convidar agora - teams.join=Aderir teams.leave=Sair teams.leave.detail=Sair de %s? @@ -2441,6 +2388,7 @@ teams.all_repositories_admin_permission_desc=Esta equipa atribui o acesso de %s     na organização%s. teams.invite.by=Convidado(a) por %s teams.invite.description=Clique no botão abaixo para se juntar à equipa. +members=Membros [admin] dashboard=Painel de controlo @@ -2456,7 +2404,6 @@ monitor=Monitorização first_page=Primeira last_page=Última total=total: %d - dashboard.new_version_hint=O Gitea %s está agora disponível, você está a correr a versão %s. Verifique o blog para mais detalhes. dashboard.statistic=Resumo dashboard.operations=Operações de manutenção @@ -2534,7 +2481,6 @@ dashboard.delete_old_actions=Eliminar todas as operações antigas da base de da dashboard.delete_old_actions.started=Foi iniciado o processo de eliminação de todas as operações antigas da base de dados. dashboard.update_checker=Verificador de novas versões dashboard.delete_old_system_notices=Eliminar todas as notificações do sistema antigas da base de dados - users.user_manage_panel=Gestão das contas de utilizadores users.new_account=Criar conta de utilizador users.name=Nome de utilizador @@ -2588,7 +2534,6 @@ users.list_status_filter.is_prohibit_login=Proibir início de sessão users.list_status_filter.not_prohibit_login=Permitir início de sessão users.list_status_filter.is_2fa_enabled=Autenticação em dois passos habilitada users.list_status_filter.not_2fa_enabled=Autenticação em dois passos desabilitada - emails.email_manage_panel=Gestão de endereços de email do utilizador emails.primary=Principal emails.activated=Operante @@ -2601,13 +2546,11 @@ emails.not_updated=Falhou a modificação do endereço de email solicitado: %v emails.duplicate_active=Este endereço de email já está a ser usado por outro utilizador. emails.change_email_header=Modificar propriedades do email emails.change_email_text=Tem a certeza que quer modificar este endereço de email? - orgs.org_manage_panel=Gestão das organizações orgs.name=Nome orgs.teams=Equipas orgs.members=Membros orgs.new_orga=Nova organização - repos.repo_manage_panel=Gestão dos repositórios repos.unadopted=Repositórios não adoptados repos.unadopted.no_more=Não foram encontrados mais repositórios não adoptados @@ -2619,7 +2562,6 @@ repos.stars=Favoritos repos.forks=Derivações repos.issues=Questões repos.size=Tamanho - packages.package_manage_panel=Gestão de pacotes packages.total_size=Tamanho total: %s packages.owner=Proprietário @@ -2630,17 +2572,14 @@ packages.type=Tipo packages.repository=Repositório packages.size=Tamanho packages.published=Publicado - defaulthooks=Automatismos web padrão defaulthooks.desc=Os automatismos web fazem pedidos HTTP POST automaticamente a um servidor quando são despoletados determinados eventos do Gitea. Os automatismos web definidos aqui são os padrões e serão copiados para todos os novos repositórios. Leia mais no guia de automatismos web. defaulthooks.add_webhook=Adicionar automatismo web padrão defaulthooks.update_webhook=Modificar automatismo web padrão - systemhooks=Automatismos web do sistema systemhooks.desc=Os automatismos web fazem pedidos HTTP POST automaticamente a um servidor quando são despoletados determinados eventos do Gitea. Os automatismos web definidos aqui irão operar em todos os repositórios deste sistema, por isso tenha em consideração quaisquer implicações de desempenho que isso possa ter. Leia mais no guia de automatismos web. systemhooks.add_webhook=Adicionar automatismo web do sistema systemhooks.update_webhook=Modificar automatismo web do sistema - auths.auth_manage_panel=Gestão das fontes de autenticação auths.new=Adicionar fonte de autenticação auths.name=Nome @@ -2755,7 +2694,6 @@ auths.still_in_used=A fonte de autenticação ainda está em uso. Tem que primei auths.deletion_success=A fonte de autenticação foi eliminada. auths.login_source_exist=A fonte de autenticação '%s' já existe. auths.login_source_of_type_exist=Já existe uma fonte de autenticação deste tipo. - config.server_config=Configuração do servidor config.app_name=Título do sítio config.app_ver=Versão do Gitea @@ -2774,7 +2712,6 @@ config.static_file_root_path=Localização dos ficheiros estáticos config.log_file_root_path=Localização dos registos config.script_type=Tipo de script config.reverse_auth_user=Utilizador de autenticação reversa - config.ssh_config=Configuração SSH config.ssh_enabled=Habilitado config.ssh_start_builtin_server=Usar servidor integrado @@ -2786,12 +2723,10 @@ config.ssh_key_test_path=Localização do teste das chaves config.ssh_keygen_path=Localização do gerador de chaves ('ssh-keygen') config.ssh_minimum_key_size_check=Verificação de tamanho mínimo da chave config.ssh_minimum_key_sizes=Tamanhos mínimos da chave - config.lfs_config=Configuração do LFS config.lfs_enabled=Habilitado config.lfs_content_path=Localização do conteúdo LFS config.lfs_http_auth_expiry=Prazo da autenticação LFS HTTP - config.db_config=Configuração da base de dados config.db_type=Tipo config.db_host=Servidor @@ -2800,7 +2735,6 @@ config.db_user=Nome de utilizador config.db_schema=Esquema config.db_ssl_mode=SSL config.db_path=Caminho - config.service_config=Configuração do serviço config.register_email_confirm=Exigir confirmação de email para se inscrever config.disable_register=Desabilitar a auto-inscrição @@ -2823,12 +2757,10 @@ config.default_allow_only_contributors_to_track_time=Permitir a contagem de temp config.no_reply_address=Domínio dos emails ocultos config.default_visibility_organization=Visibilidade predefinida para as novas organizações config.default_enable_dependencies=Habilitar, por norma, dependências nas questões - config.webhook_config=Configuração do automatismo web config.queue_length=Tamanho da fila config.deliver_timeout=Prazo da entrega config.skip_tls_verify=Ignorar validação TLS - config.mailer_config=Configuração de envio de email config.mailer_enabled=Habilitado config.mailer_enable_helo=Habilitar HELO @@ -2846,16 +2778,13 @@ config.test_email_placeholder=Email (ex.: teste@exemplo.com) config.send_test_mail=Enviar email de teste config.test_mail_failed=Falhou o envio de um email de teste para '%s': %v config.test_mail_sent=Foi enviado um email de teste para '%s'. - config.oauth_config=Configuração 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.session_config=Configuração de sessão config.session_provider=Fornecedor da sessão config.provider_config=Configuração do fornecedor @@ -2864,12 +2793,10 @@ config.gc_interval_time=Intervalo da recolha do lixo config.session_life_time=Tempo de vida da sessão config.https_only=Apenas HTTPS config.cookie_life_time=Tempo de vida do cookie - config.picture_config=Configuração da imagem e do avatar config.picture_service=Serviço de imagem config.disable_gravatar=Desabilitar o Gravatar config.enable_federated_avatar=Habilitar avatares federados - config.git_config=Configuração Git config.git_disable_diff_highlight=Desabilitar o realce de sintaxe no diff config.git_max_diff_lines=Número máximo de linhas diff (por ficheiro) @@ -2881,7 +2808,6 @@ config.git_mirror_timeout=Prazo para sincronização da réplica config.git_clone_timeout=Prazo da operação de clonagem config.git_pull_timeout=Prazo da operação de puxar config.git_gc_timeout=Prazo da operação de recolha de lixo - config.log_config=Configuração do registo config.log_mode=Modo de registo config.own_named_logger=Registador nomeado @@ -2893,10 +2819,8 @@ config.access_log_mode=Modo de registo de acesso config.access_log_template=Modelo config.xorm_log_mode=Modo de registo XORM config.xorm_log_sql=Registo do SQL - config.get_setting_failed=Falha ao obter a configuração %s config.set_setting_failed=Falha ao definir a configuração %s - monitor.cron=Tarefas Cron monitor.name=Nome monitor.schedule=Programação @@ -2948,7 +2872,6 @@ monitor.queue.pool.pause.submit=Pausar fila monitor.queue.pool.resume.title=Retomar fila monitor.queue.pool.resume.desc=Definir esta fila para continuar o trabalho monitor.queue.pool.resume.submit=Retomar fila - monitor.queue.settings.title=Configurações do agregado monitor.queue.settings.desc=Os agregados crescem dinamicamente com um aumento em resposta à ocorrência de bloqueios na sua fila de trabalhadores. Essas mudanças não irão influenciar os grupos de trabalhadores correntes. monitor.queue.settings.timeout=Prazo do impulso @@ -2964,7 +2887,6 @@ monitor.queue.settings.submit=Modificar configurações monitor.queue.settings.changed=Configurações modificadas monitor.queue.settings.blocktimeout=Prazo do bloco corrente monitor.queue.settings.blocktimeout.value=%[1]v - monitor.queue.pool.none=Esta fila não tem um agregado monitor.queue.pool.added=Foi adicionado um grupo de trabalhadores monitor.queue.pool.max_changed=O número máximo de trabalhadores mudou @@ -2974,7 +2896,6 @@ monitor.queue.pool.cancel=Desligar o grupo de trabalhadores monitor.queue.pool.cancelling=O grupo de trabalhadores está a encerrar monitor.queue.pool.cancel_notices=Desligar este grupo de %s trabalhadores? monitor.queue.pool.cancel_desc=Deixar uma fila sem quaisquer grupos de trabalhadores pode fazer com que os pedidos sejam bloqueados indefinidamente. - notices.system_notice_list=Notificações do sistema notices.view_detail_header=Ver os detalhes da notificação notices.actions=Operações @@ -2989,20 +2910,32 @@ notices.type_2=Tarefa notices.desc=Descrição notices.op=Op. notices.delete_success=As notificações do sistema foram eliminadas. +dashboard.gc_lfs=Recolher lixo dos meta-elementos LFS +dashboard.stop_zombie_tasks=Parar tarefas zombies +dashboard.stop_endless_tasks=Parar tarefas intermináveis +dashboard.cancel_abandoned_jobs=Cancelar trabalhos abandonados +packages.unreferenced_size=Tamanho não referenciado: %s +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.unable_to_initialize_openid=Não é possível inicializar o Fornecedor de Ligação OpenID: %s +auths.invalid_openIdConnectAutoDiscoveryURL=URL de descoberta automática inválido (tem que ser um URL válido começando com http:// ou https://) +config.git_enable_reflogs=Habilitar reflogs +config.git_reflog_expiry_time=Tempo de expiração +notices.operations=Operações [action] create_repo=criou o repositório %s rename_repo=renomeou o repositório de %[1]s para %[3]s commit_repo=enviado para %[3]s em %[4]s -create_issue=`abriu a questão %[3]s#%[2]s` -close_issue=`fechou a questão %[3]s#%[2]s` -reopen_issue=`reabriu a questão %[3]s#%[2]s` -create_pull_request=`criou o pedido de integração %[3]s#%[2]s` -close_pull_request=`fechou o pedido de integração %[3]s#%[2]s` -reopen_pull_request=`reabriu o pedido de integração %[3]s#%[2]s` -comment_issue=`comentou na questão %[3]s#%[2]s` -comment_pull=`comentou no pedido de integração %[3]s#%[2]s` -merge_pull_request=`fez a integração constante no pedido %[3]s#%[2]s` +create_issue=abriu a questão %[3]s#%[2]s +close_issue=fechou a questão %[3]s#%[2]s +reopen_issue=reabriu a questão %[3]s#%[2]s +create_pull_request=criou o pedido de integração %[3]s#%[2]s +close_pull_request=fechou o pedido de integração %[3]s#%[2]s +reopen_pull_request=reabriu o pedido de integração %[3]s#%[2]s +comment_issue=comentou na questão %[3]s#%[2]s +comment_pull=comentou no pedido de integração %[3]s#%[2]s +merge_pull_request=fez a integração constante no pedido %[3]s#%[2]s transfer_repo=transferiu o repositório %s para %s push_tag=enviou a etiqueta %[3]s para %[4]s delete_tag=eliminou a etiqueta %[2]de %[3]s @@ -3013,14 +2946,15 @@ compare_commits_general=Comparar comentimentos mirror_sync_push=sincronizou os cometimentos para %[3]s em %[4]s da réplica mirror_sync_create=sincronizou a nova referência %[3]s para %[4]s da réplica mirror_sync_delete=sincronizou e eliminou a referência %[2]s em %[3]s da réplica -approve_pull_request=`aprovou %[3]s#%[2]s` -reject_pull_request=`sugeriu modificações para %[3]s#%[2]s` -publish_release=`lançou "%[4]s" em %[3]s` -review_dismissed=`descartou a revisão de %[4]s para %[3]s#%[2]s` +approve_pull_request=aprovou %[3]s#%[2]s +reject_pull_request=sugeriu modificações para %[3]s#%[2]s +publish_release=lançou "%[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 ramo %[3]s em %[4]s starred_repo=juntou %[2]s aos favoritos watched_repo=começou a vigiar %[2]s +auto_merge_pull_request=fez automaticamente a integração constante no pedido %[3]s#%[2]s [tool] ago=há %s @@ -3179,4 +3113,124 @@ settings.delete.description=Eliminar o pacote é permanente e não pode ser desf settings.delete.notice=Está prestes a eliminar %s (%s). Esta operação é irreversível. Tem a certeza? settings.delete.success=O pacote foi eliminado. settings.delete.error=Falhou a eliminação do pacote. - +details.repository_site=Página web do repositório +details.documentation_site=Página web da documentação +cargo.registry=Configurar este registo no ficheiro de configuração do Cargo (por exemplo: ~/.cargo/config.toml): +cargo.install=Para instalar o pacote usando o Cargo, execute o seguinte comando: +cargo.documentation=Para obter mais informações sobre o registo do Cargo, consulte a documentação. +cargo.details.repository_site=Página web do repositório +cargo.details.documentation_site=Página web da documentação +chef.registry=Configure este registo no seu ficheiro ~/.chef/config.rb: +chef.install=Para instalar o pacote, execute o seguinte comando: +chef.documentation=Para obter mais informações sobre o registo do Chef, consulte a documentação. +conda.registry=Configure este registo como um repositório Conda no seu ficheiro .condarc: +conda.install=Para instalar o pacote usando o Conda, execute o seguinte comando: +conda.documentation=Para obter mais informações sobre o registo do Conda, consulte a documentação. +conda.details.repository_site=Página web do repositório +conda.details.documentation_site=Página web da documentação +owner.settings.cargo.title=Índice do registo do Cargo +owner.settings.cargo.initialize=Inicializar índice +owner.settings.cargo.initialize.description=Para usar o registo Cargo, é necessário um repositório git de índice especial. Aqui pode (re)criá-lo com a configuração necessária. +owner.settings.cargo.initialize.error=Falhou ao inicializar o índice do Cargo: %v +owner.settings.cargo.initialize.success=O índice do Cargo foi criado com sucesso. +owner.settings.cargo.rebuild=Reconstruir índice +owner.settings.cargo.rebuild.description=Se o índice não estiver sincronizado com os pacotes Cargo armazenados, pode reconstruí-lo aqui. +owner.settings.cargo.rebuild.error=Falhou ao reconstruir o índice do Cargo: %v +owner.settings.cargo.rebuild.success=O índice do Cargo foi reconstruído com sucesso. +owner.settings.cleanuprules.title=Gerir regras de limpeza +owner.settings.cleanuprules.add=Adicionar regra de limpeza +owner.settings.cleanuprules.edit=Editar regra de limpeza +owner.settings.cleanuprules.none=Não há regras de limpeza disponíveis. Leia a documentação para obter mais informação. +owner.settings.cleanuprules.preview=Previsão da regra de limpeza +owner.settings.cleanuprules.preview.overview=%d pacotes estão agendados para serem removidos. +owner.settings.cleanuprules.preview.none=A regra de limpeza não corresponde a nenhum pacote. +owner.settings.cleanuprules.enabled=Habilitado +owner.settings.cleanuprules.pattern_full_match=Aplicar o padrão ao nome completo do pacote +owner.settings.cleanuprules.keep.title=As versões que correspondem a estas regras serão mantidas, mesmo que correspondam à regra de remoção abaixo. +owner.settings.cleanuprules.keep.count=Manter a mais recente +owner.settings.cleanuprules.keep.count.1=1 versão por pacote +owner.settings.cleanuprules.keep.count.n=%d versões por pacote +owner.settings.cleanuprules.keep.pattern=Manter as versões correspondentes +owner.settings.cleanuprules.keep.pattern.container=A última versão será sempre mantida para pacotes de contentor. +owner.settings.cleanuprules.remove.title=Versões que correspondam a estas regras serão removidos, a não ser que a regra acima diga para os manter. +owner.settings.cleanuprules.remove.days=Remover versões mais antigas do que +owner.settings.cleanuprules.remove.pattern=Remover as versões correspondentes +owner.settings.cleanuprules.success.update=A regra de limpeza foi modificada. +owner.settings.cleanuprules.success.delete=A regra de limpeza foi eliminada. +owner.settings.chef.title=Registo do Chef +owner.settings.chef.keypair=Gerar par de chaves +owner.settings.chef.keypair.description=Gerar um par de chaves para se autenticar no registo do Chef. A chave anterior deixará de poder ser utilizada. + +[aria] +navbar=Barra de navegação +footer=Rodapé +footer.software=Sobre o Software +footer.links=Ligações + +[secrets] +secrets=Segredos +description=Os segredos serão transmitidos a certas operações e não poderão ser lidos de outra forma. +none=Ainda não há segredos. +value=Valor +name=Nome +creation=Adicionar segredo +creation.name_placeholder=apenas caracteres sem distinção de maiúsculas, alfanuméricos ou sublinhados, não podem começar com GITEA_ nem com GITHUB_ +creation.value_placeholder=Insira um conteúdo qualquer. Espaços em branco no início ou no fim serão omitidos. +creation.success=O segredo '%s' foi adicionado. +creation.failed=Falhou ao adicionar o segredo. +deletion=Remover segredo +deletion.description=Remover um segredo é permanente e não pode ser revertido. Continuar? +deletion.success=O segredo foi removido. +deletion.failed=Falhou ao remover o segredo. + +[actions] +actions=Operações +unit.desc=Gerir operações +status.unknown=Desconhecido +status.waiting=Aguardando +status.running=Em execução +status.success=Sucesso +status.failure=Falha +status.cancelled=Cancelada +status.skipped=Ignorada +status.blocked=Bloqueada +runners=Executores +runners.runner_manage_panel=Gestão de executores +runners.new=Criar um novo executor +runners.new_notice=Como iniciar um executor +runners.status=Estado +runners.id=ID +runners.name=Nome +runners.owner_type=Tipo +runners.description=Descrição +runners.labels=Rótulos +runners.last_online=Última vez ligado +runners.agent_labels=Rótulos do agente +runners.custom_labels=Rótulos personalizados +runners.custom_labels_helper=Rótulos personalizados são rótulos que são adicionados manualmente por um administrador. São separados por vírgulas e espaços em branco antes e após cada rótulo são ignorados. +runners.runner_title=Executor +runners.task_list=Tarefas recentes deste executor +runners.task_list.run=Executar +runners.task_list.status=Estado +runners.task_list.repository=Repositório +runners.task_list.commit=Cometimento +runners.task_list.done_at=Feito em +runners.edit_runner=Editar executor +runners.update_runner=Guardar alterações +runners.update_runner_success=O executor foi modificado com sucesso +runners.update_runner_failed=Falhou ao modificar o executor +runners.delete_runner=Eliminar o executor +runners.delete_runner_success=O executor foi eliminado com sucesso +runners.delete_runner_failed=Falhou ao eliminar o executor +runners.delete_runner_header=Confirme que quer eliminar este executor +runners.delete_runner_notice=Se uma tarefa estiver a correr sob este executor, será terminada e marcada como tendo falhado. Isso poderá quebrar a sequência de trabalho de construção. +runners.none=Não há executores disponíveis +runners.status.unspecified=Desconhecido +runners.status.idle=Parada +runners.status.active=Em funcionamento +runners.status.offline=Desconectada +runs.all_workflows=Todas as sequências de trabalho +runs.open_tab=%d abertas +runs.closed_tab=%d fechadas +runs.commit=Cometimento +runs.pushed_by=Enviada por diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini index f3efcf8c70f4..1a970f389f21 100644 --- a/options/locale/locale_ru-RU.ini +++ b/options/locale/locale_ru-RU.ini @@ -23,7 +23,6 @@ enable_javascript=Пожалуйста, включите JavaScript. toc=Содержание licenses=Лицензии return_to_gitea=Вернуться к Gitea - username=Имя пользователя email=Адрес эл. почты password=Пароль @@ -33,7 +32,6 @@ captcha=CAPTCHA twofa=Двухфакторная аутентификация twofa_scratch=Двухфакторный scratch-код passcode=Пароль - webauthn_insert_key=Вставьте ваш ключ безопасности webauthn_sign_in=Нажмите кнопку на ключе безопасности. Если ваш ключ безопасности не имеет кнопки, вставьте его снова. webauthn_press_button=Пожалуйста, нажмите кнопку на ключе безопасности… @@ -47,7 +45,6 @@ webauthn_error_duplicated=Представленный ключ не подхо webauthn_error_empty=Вы должны указать имя для этого ключа. webauthn_error_timeout=Тайм-аут достигнут до того, как ваш ключ был прочитан. Перезагрузите эту страницу и повторите попытку. webauthn_reload=Обновить - repository=Репозиторий organization=Организация mirror=Зеркало @@ -65,18 +62,15 @@ settings=Настройки your_profile=Профиль your_starred=Избранные your_settings=Настройки - all=Все sources=Собственные mirrors=Зеркала collaborative=Совместные forks=Форки - activities=Активность pull_requests=Запросы на слияние issues=Задачи milestones=Этапы - ok=ОК cancel=Отмена save=Сохранить @@ -85,26 +79,22 @@ add_all=Добавить все remove=Удалить remove_all=Удалить все edit=Изменить - copy=Скопировать copy_url=Копировать URL copy_branch=Скопировать имя ветки copy_success=Скопировано! copy_error=Ошибка при копировании - write=Редактирование preview=Предпросмотр loading=Загрузка… - step1=Шаг 1: step2=Шаг 2: - error=Ошибка error404=Страница, которую вы пытаетесь открыть, либо не существует, либо недостаточно прав для ее просмотра. - never=Никогда - rss_feed=RSS-лента +enabled=Включено +disabled=Отключен [filter] @@ -155,7 +145,6 @@ err_empty_admin_email=Адрес электронной почты админи err_admin_name_is_reserved=Неверное имя администратора, это имя зарезервировано err_admin_name_pattern_not_allowed=Неверное имя администратора, имя попадает под зарезервированный шаблон err_admin_name_is_invalid=Неверное имя администратора - general_title=Основные настройки app_name=Название сайта app_name_helper=Здесь вы можете ввести название своей компании. @@ -175,7 +164,6 @@ app_url=Базовый URL-адрес Gitea app_url_helper=Этот параметр влияет на URL для клонирования по HTTP/HTTPS и на некоторые уведомления по электронной почте. log_root_path=Путь к журналу log_root_path_helper=Файлы журнала будут записываться в этот каталог. - optional_title=Расширенные настройки email_title=Настройки электронной почты smtp_from=Отправить эл. почту как @@ -231,7 +219,9 @@ default_enable_timetracking_popup=Включить отслеживание вр no_reply_address=Скрытый почтовый домен no_reply_address_helper=Доменное имя для пользователей со скрытым адресом электронной почты. Например, имя пользователя 'joe' будет зарегистрировано в Git как 'joe@noreply.example.org' если скрытый домен электронной почты установлен как 'noreply.example.org'. password_algorithm=Алгоритм хеширования пароля -password_algorithm_helper=Задайте алгоритм хеширования паролей. Алгоритмы имеют различные требования и стойкость. У алгоритма `argon2` хорошие характеристики, но он использует много памяти и может не подходить для слабых систем. +password_algorithm_helper="""Задайте алгоритм хеширования паролей. Алгоритмы имеют различные требования и стойкость. У алгоритма `argon2` хорошие характеристики, но он использует много памяти и может не подходить для слабых систем.""" +smtp_addr=Узел SMTP +smtp_port=SMTP-порт [home] uname_holder=Имя пользователя / Адрес эл. почты @@ -247,17 +237,14 @@ search_repos=Поиск репозитория… filter=Другие фильтры filter_by_team_repositories=Фильтровать по репозиториям команды feed_of=Лента "%s" - show_archived=Архивировано show_both_archived_unarchived=Показаны архивированные и разархивированные show_only_archived=Показаны только архивированные show_only_unarchived=Показаны только разархивированные - show_private=Приватный show_both_private_public=Показаны как публичные, так и частные show_only_private=Показаны только приватные show_only_public=Показаны только публичные - issues.in_your_repos=В ваших репозиториях [explore] @@ -276,7 +263,6 @@ code_no_results=Соответствующий поисковому запрос code_search_results=Результаты поиска для '%s' code_last_indexed_at=Последний проиндексированный %s - [auth] create_new_account=Регистрация аккаунта register_helper_msg=Уже есть аккаунт? Авторизуйтесь! @@ -349,31 +335,24 @@ password_pwned_err=Не удалось завершить запрос к HaveIB view_it_on=Посмотреть на %s link_not_working_do_paste=Не работает? Попробуйте скопировать и вставить в ваш браузер. hi_user_x=Привет %s, - activate_account=Пожалуйста активируйте свой аккаунт activate_account.title=%s, пожалуйста, активируйте вашу учетную запись activate_account.text_1=Привет, %[1]s, спасибо за регистрацию в %[2]s! activate_account.text_2=Пожалуйста, перейдите по ссылке, чтобы активировать свою учетную запись в течение %s: - activate_email=Подтвердите адрес своей электронной почты activate_email.title=%s, пожалуйста, подтвердите ваш адрес электронной почты activate_email.text=Пожалуйста, перейдите по ссылке, чтобы подтвердить ваш адрес электронной почты в течение %s: - register_notify=Добро пожаловать на Gitea register_notify.title=%[1]s, добро пожаловать в %[2]s register_notify.text_1=это письмо с вашим подтверждением регистрации в %s! register_notify.text_2=Теперь вы можете войти через логин: %s. register_notify.text_3=Если эта учетная запись была создана для вас, пожалуйста, сначала установите пароль. - reset_password=Восстановить учётную запись reset_password.title=%s, вы запросили восстановление вашей учетной записи reset_password.text=Пожалуйста, перейдите по ссылке, чтобы восстановить учетную запись в течение %s: - register_success=Регистрация прошла успешно - issue_assigned.pull=@%[1]s назначил(а) вам запрос на слияние %[2]s в репозитории %[3]s. issue_assigned.issue=@%[1]s назначил(а) вам задачу %[2]s в репозитории %[3]s. - issue.x_mentioned_you=@%s упомянул(а) вас: issue.action.force_push=%[1]s форсировал(а) отправку изменений %[2]s с %[3]s до %[4]s. issue.action.push_1=@%[1]s отправил(а) %[3]d изменение в %[2]s @@ -388,7 +367,6 @@ issue.action.review_dismissed=@%[1]s отклонил(а) последн issue.action.ready_for_review=@%[1]s отметил(а) этот запрос на слияние как готовый к рассмотрению. issue.action.new=@%[1]s создал(а) #%[2]d. issue.in_tree_path=В %s: - release.new.subject=%s в %s выпущено release.new.text=@%[1]s выпустил(а) релиз %[2]s в %[3]s release.title=Название: %s @@ -396,16 +374,13 @@ release.note=Примечание: 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.to_you=вам repo.transfer.body=Для того чтобы принять или отклонить перейдите по ссылке %s или просто проигнорируйте данный запрос. - repo.collaborator.added.subject=%s добавил вас в %s repo.collaborator.added.text=Вы были добавлены в качестве соавтора репозитория: - [modal] yes=Да no=Нет @@ -423,33 +398,29 @@ PayloadUrl=URL обработчика TeamName=Название команды AuthName=Имя авторизации AdminEmail=Электронная почта администратора - NewBranchName=Новая ветка CommitSummary=Резюме коммита CommitMessage=Зафиксировать сообщение CommitChoice=Выбор коммита TreeName=Путь к файлу Content=Содержимое - SSPISeparatorReplacement=Разделитель SSPIDefaultLanguage=Язык по умолчанию - -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=` не является адресом электронной почты.` -include_error=` должен содержать '%s'.` -glob_pattern_error=` неверный glob шаблон: %s.` -regex_pattern_error=` Неверный шаблон регулярного выражения: %s.` +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=" не является адресом электронной почты." +include_error=" должен содержать '%s'." +glob_pattern_error=" неверный glob шаблон: %s." +regex_pattern_error=" Неверный шаблон регулярного выражения: %s." unknown_error=Неизвестная ошибка: captcha_incorrect=Капча не пройдена. password_not_match=Пароли не совпадают. lang_select_error=Выберите язык из списка. - username_been_taken=Имя пользователя уже занято. username_change_not_local_user=Нелокальным пользователям запрещено изменять их имя пользователя. repo_name_been_taken=Название репозитория уже используется. @@ -480,19 +451,16 @@ user_not_exist=Пользователь не существует. team_not_exist=Команда не существует. last_org_owner=Вы не можете удалить последнего пользователя из команды 'Владельцы'. Для организации должен быть хотя бы один владелец. cannot_add_org_to_team=Организацию нельзя добавить в качестве члена команды. - invalid_ssh_key=Не удается проверить SSH ключ: %s invalid_gpg_key=Не удается проверить GPG ключ: %s invalid_ssh_principal=Неверный участник: %s unable_verify_ssh_key=Не удаётся проверить ключ SSH; перепроверьте его на наличие ошибок. auth_failed=Ошибка аутентификации: %v - still_own_repo=Ваша учётная запись владеет одним или несколькими репозиториями; сначала удалите или перенесите их. still_has_org=Ваша учётная запись является членом одной или нескольких организаций; сначала выйдите из них. still_own_packages=Ваша учётная запись владеет одним или несколькими пакетами, сначала удалите их. org_still_own_repo=Эта организация по-прежнему владеет одним или несколькими репозиториями; сначала удалите или перенесите их. org_still_own_packages=Эта организация всё ещё имеет пакеты, сначала удалите их. - target_branch_not_exist=Целевая ветка не существует. [user] @@ -510,7 +478,6 @@ unfollow=Отписаться heatmap.loading=Загрузка тепловой карты… user_bio=О себе disabled_public_activity=Этот пользователь отключил публичную видимость активности. - form.name_reserved=Имя пользователя '%s' зарезервировано. form.name_pattern_not_allowed=Шаблон '%s' не допускается в имени пользователя. form.name_chars_not_allowed=Имя пользователя '%s' содержит недопустимые символы. @@ -533,7 +500,6 @@ account_link=Привязанные аккаунты organization=Организации uid=UID webauthn=Ключи безопасности - public_profile=Открытый профиль biography_placeholder=Расскажите немного о себе profile_desc=Ваш адрес электронной почты будет использован для уведомлений и других операций. @@ -570,7 +536,6 @@ saved_successfully=Ваши настройки успешно сохранены privacy=Приватность keep_activity_private=Скрыть активность со страницы профиля keep_activity_private_popup=Делает активность видимой только для вас и администраторов - lookup_avatar_by_mail=Найти аватар по адресу эл. почты federated_avatar_lookup=Найти внешний аватар enable_custom_avatar=Включить собственный аватар @@ -581,7 +546,6 @@ uploaded_avatar_not_a_image=Загружаемый файл не являетс uploaded_avatar_is_too_big=Загруженный файл превысил максимальный размер. update_avatar_success=Ваш аватар был изменен. update_user_avatar_success=Аватар пользователя обновлён. - change_password=Обновить пароль old_password=Текущий пароль new_password=Новый пароль @@ -589,7 +553,6 @@ retype_new_password=Подтверждение нового пароля password_incorrect=Текущий пароль неправильный. change_password_success=Ваш пароль был изменён. С этого момента необходимо использовать новый пароль для входа. password_change_disabled=Нелокальные аккаунты не могут изменить пароль через Gitea. - emails=Email адреса manage_emails=Управление адресами электронной почты manage_themes=Выберите тему по умолчанию @@ -622,7 +585,6 @@ add_openid_success=Добавлен новый адрес OpenID. keep_email_private=Скрыть адрес электронной почты keep_email_private_popup=Ваш адрес электронной почты будет скрыт от других пользователей. openid_desc=OpenID позволяет делегировать проверку подлинности внешнему поставщику. - manage_ssh_keys=Управление SSH ключами manage_ssh_principals=Управление SSH сертификатами участников manage_gpg_keys=Управление GPG ключами @@ -701,7 +663,6 @@ manage_social=Управление привязанными учетными з social_desc=Эти социальные сети связаны с вашим аккаунтом Gitea. Их можно использовать для входа в учетную запись Gitea, поэтому необходимо быть уверенным в том, что никаких посторонних аккаунтов не подключено. unbind=Удалить связь unbind_success=Связанная внешняя учётная запись была удалена. - manage_access_token=Управление токенами generate_new_token=Создать новый токен tokens_desc=Эти токены предоставляют доступ к вашей учетной записи с помощью Gitea API. @@ -713,7 +674,6 @@ generate_token_name_duplicate=%s уже используетс delete_token=Удалить access_token_deletion=Удалить токен доступа delete_token_success=Токен удалён. Приложения, использующие его, больше не имеют доступа к вашему аккаунту. - manage_oauth2_applications=Управление приложениями OAuth2 edit_oauth2_application=Изменить OAuth2 приложение oauth2_applications_desc=Приложения OAuth2 позволяет стороннему приложению к безопасно аутентифицировать пользователей данной установки Gitea. @@ -735,14 +695,12 @@ oauth2_client_secret_hint=Секретный ключ не будет показ oauth2_application_edit=Изменить oauth2_application_create_description=Приложения OAuth2 предоставляет стороннему приложению доступ к учётным записям пользователей данного сервиса. oauth2_application_remove_description=Удаление приложения OAuth2 приведёт к отмене его доступа к авторизованным учётным записям пользователей в данном экземпляре. Продолжить? - authorized_oauth2_applications=Авторизованные приложения OAuth2 authorized_oauth2_applications_description=Вы предоставили доступ к вашему персональному аккаунту Gitea этим сторонним приложениям. Пожалуйста, отзовите доступ у приложений, которые больше не используются. revoke_key=Отозвать revoke_oauth2_grant=Отозвать доступ revoke_oauth2_grant_description=Отзыв доступа у этого стороннего приложения не позволит ему получать доступ к вашим данным. Вы уверены? revoke_oauth2_grant_success=Вы успешно отозвали доступ. - twofa_desc=Двухфакторная проверка подлинности повышает уровень безопасности вашей учётной записи. twofa_is_enrolled=Ваша учётная запись в настоящее время использует двухфакторную аутентификацию. twofa_not_enrolled=Ваша учётная запись в настоящее время не использует двухфакторную аутентификацию. @@ -760,35 +718,29 @@ then_enter_passcode=И введите пароль, показанный в пр passcode_invalid=Неверный пароль. попробуйте снова. twofa_enrolled=Для вашего аккаунта была включена двухфакторная аутентификация. Сохраните ваш scratch-токен (%s), он будет показан только один раз! twofa_failed_get_secret=Не удалось получить ключ. - webauthn_desc=Ключи безопасности - это аппаратные устройства, содержащие криптографические ключи. Они могут использоваться для двухфакторной аутентификации. Ключи безопасности должны поддерживать стандарт WebAuthn Authenticator. webauthn_register_key=Добавить ключ безопасности webauthn_nickname=Имя пользователя webauthn_delete_key=Удалить ключ безопасности webauthn_delete_key_desc=Если вы удалите ключ безопасности, вы больше не сможете войти с его помощью. Продолжить? - manage_account_links=Управление привязанными аккаунтами manage_account_links_desc=Эти внешние аккаунты привязаны к вашему аккаунту Gitea. account_links_not_available=В настоящее время нет внешних аккаунтов, привязанных к вашему аккаунту Gitea. remove_account_link=Удалить привязанный аккаунт remove_account_link_desc=Удаление привязанной учетной записи отменит её доступ к вашей учетной записи Gitea. Продолжить? remove_account_link_success=Привязанная учетная запись удалена. - orgs_none=Вы не состоите ни в одной организации. repos_none=Вы не владеете репозиториями - delete_account=Удалить свой аккаунт delete_prompt=Эта операция навсегда удалит вашу учетную запись. Это НЕВОЗМОЖНО будет отменить. delete_with_all_comments=Ваша учетная запись младше %s. Чтобы избежать комментариев к плану, все комментарии к ней будут удалены. confirm_delete_account=Подтвердите удаление delete_account_title=Удалить аккаунт delete_account_desc=Вы уверены, что хотите навсегда удалить этот аккаунт? - email_notifications.enable=Включить почтовые уведомления email_notifications.onmention=Посылать письмо на эл. почту только при упоминании email_notifications.disable=Отключить почтовые уведомления email_notifications.submit=Установить настройки электронной почты - visibility=Видимость пользователя visibility.public=Публичный visibility.public_tooltip=Видимый для всех пользователей @@ -796,6 +748,9 @@ visibility.limited=Ограниченный visibility.limited_tooltip=Видимый только авторизованным пользователям visibility.private=Приватный visibility.private_tooltip=Видимый только членам организации +access_token_deletion_cancel_action=Отменить +access_token_deletion_confirm_action=Удалить +link_account=Привязать аккаунт [repo] new_repo_helper=Репозиторий содержит все файлы проекта, включая историю ревизии. Уже есть где-то еще? Мигрировать репозиторий. @@ -879,14 +834,12 @@ delete_preexisting=Удалить уже существующие файлы delete_preexisting_content=Удалить файлы из %s delete_preexisting_success=Удалены непринятые файлы в %s blame_prior=Посмотреть авторство до этих изменений - transfer.accept=Принять трансфер transfer.accept_desc=Переместить в "%s" transfer.reject=Отказаться от перемещения transfer.reject_desc=Отменить перемещение в "%s" transfer.no_permission_to_accept=Недостаточно прав чтобы принять transfer.no_permission_to_reject=Недостаточно прав чтобы отказать - desc.private=Приватный desc.public=Публичный desc.private_template=Приватный шаблон @@ -894,7 +847,6 @@ desc.public_template=Шаблон desc.internal=Внутренний desc.internal_template=Внутренний шаблон desc.archived=Архивировано - template.items=Элементы шаблона template.git_content=Содержимое Git (ветвь по умолчанию) template.git_hooks=Git hook'и @@ -905,16 +857,13 @@ template.avatar=Аватар template.issue_labels=Метки задач template.one_item=Необходимо выбрать хотя бы один элемент шаблона template.invalid=Необходимо выбрать хранилище шаблонов - archive.title=Это репозиторий в архиве. Вы можете его клонировать или просматривать файлы, но не вносить изменения или открывать задачи/запросы на слияние. archive.issue.nocomment=Этот репозиторий в архиве. Вы не можете комментировать задачи. archive.pull.nocomment=Это репозиторий в архиве. Вы не можете комментировать запросы на слияние. - form.reach_limit_of_creation_1=Достигнуто ограничение на количество репозиториев: %d. form.reach_limit_of_creation_n=Достигнуто ограничение на количество репозиториев: %d. form.name_reserved=Название репозитория '%s' зарезервировано. form.name_pattern_not_allowed=Шаблон имени репозитория '%s' не допускается. - need_auth=Авторизация migrate_options=Параметры миграции migrate_service=Сервис миграции @@ -962,7 +911,6 @@ migrate.migrating_milestones=Перенос этапов migrate.migrating_labels=Миграция меток migrate.migrating_issues=Миграция задач migrate.migrating_pulls=Миграция запросов на слияние - mirror_from=зеркало из forked_from=форкнуто от generated_from=создано из @@ -976,19 +924,17 @@ unstar=Убрать из избранного star=В избранное fork=Форкнуть download_archive=Скачать репозиторий - no_desc=Нет описания quick_guide=Краткое руководство clone_this_repo=Клонировать репозиторий create_new_repo_command=Создать новый репозиторий из командной строки push_exist_repo=Push существующего репозитория из командной строки empty_message=В репозитории нет файлов. - code=Код code.desc=Исходный код, файлы, коммиты и ветки. branch=ветка tree=Дерево -clear_ref=`Удалить текущую ссылку` +clear_ref=Удалить текущую ссылку filter_branch_and_tag=Фильтр по ветке или тегу find_tag=Найти тег branches=Ветки @@ -999,7 +945,6 @@ project_board=Проекты labels=Метки org_labels_desc=Метки уровня организации, которые можно использовать с всеми репозиториями< / strong> в этой организации org_labels_desc_manage=управлять - milestones=Этапы commits=коммитов commit=коммит @@ -1015,7 +960,6 @@ file_view_rendered=Просмотр отрендеренного file_view_raw=Посмотреть исходник file_permalink=Постоянная ссылка file_too_large=Этот файл слишком большой, поэтому он не может быть отображён. - file_copy_permalink=Копировать постоянную ссылку video_not_supported_in_browser=Ваш браузер не поддерживает HTML5 'video' тэг. audio_not_supported_in_browser=Ваш браузер не поддерживает HTML5 'audio' тэг. @@ -1031,7 +975,6 @@ download_file=Скачать файл normal_view=Обычный вид line=строка lines=строки - editor.new_file=Новый файл editor.upload_file=Загрузить файл editor.edit_file=Редактировать файл @@ -1090,7 +1033,6 @@ editor.cannot_commit_to_protected_branch=Нельзя коммитить в за editor.no_commit_to_branch=Невозможно совершить прямой коммит в ветку по причине: editor.user_no_push_to_branch=Пользователь не может отправлять коммиты в эту ветку editor.require_signed_commit=Ветка ожидает подписанный коммит - commits.desc=Просмотр истории изменений исходного кода. commits.commits=Коммитов commits.no_commits=Ничего общего в коммитах. '%s' и '%s' имеют совершенно разные истории. @@ -1108,16 +1050,13 @@ commits.signed_by=Подписано commits.signed_by_untrusted_user=Подписано ненадежным пользователем commits.signed_by_untrusted_user_unmatched=Подписан ненадежным пользователем, который не соответствует коммиту commits.gpg_key_id=Идентификатор GPG ключа - commit.revert=Откатить commit.revert-header=Откат: %s commit.revert-content=Выбрать ветку для отката: commit.cherry-pick=Cherry-pick commit.cherry-pick-header=Cherry-pick: %s commit.cherry-pick-content=Выбрать ветку для cherry-pick: - ext_issues.desc=Ссылка на внешнюю систему отслеживания ошибок. - projects=Проекты projects.desc=Управление задачами и pull'ами в досках проекта. projects.description=Описание (необязательно) @@ -1152,7 +1091,6 @@ projects.board.deletion_desc=Удаление доски проектов пер projects.board.color=Цвет projects.open=Открыть projects.close=Закрыть - issues.desc=Организация отчетов об ошибках, задач и этапов. issues.filter_assignees=Фильтр назначений issues.filter_milestones=Фильтр этапов @@ -1203,25 +1141,25 @@ issues.add_labels=добавлен %s с метками %s issues.remove_label=удалён %s с меткой %s issues.remove_labels=удалён %s с метками %s issues.add_remove_labels=добавлен %s и удалён %s с метками %s -issues.add_milestone_at=`добавил(а) к этапу %s %s` -issues.add_project_at=`добавил(а) в %s проект %s` -issues.change_milestone_at=`поменял(а) целевой этап с %s на %s %s` -issues.change_project_at=`изменил(а) проект с %s на %s %s` -issues.remove_milestone_at=`удалил(а) из этапа %s %s` -issues.remove_project_at=`удалил(а) это из проекта %s %s` -issues.deleted_milestone=`(удалено)` -issues.deleted_project=`(удалено)` -issues.self_assign_at=`назначил(а) на себя %s` -issues.add_assignee_at=`был(а) назначен(а) %s %s` -issues.remove_assignee_at=`был снят с назначения %s %s` -issues.remove_self_assignment=`убрал(а) их назначение %s` -issues.change_title_at=`изменил(а) заголовок с %s на %s %s` -issues.change_ref_at=`изменил(а) ссылку с %s на %s %s` -issues.remove_ref_at=`убрал(а) ссылку %s %s` -issues.add_ref_at=`добавил(а) ссылку %s %s` -issues.delete_branch_at=`удалил(а) ветку %s %s` +issues.add_milestone_at=добавил(а) к этапу %s %s +issues.add_project_at=добавил(а) в %s проект %s +issues.change_milestone_at=поменял(а) целевой этап с %s на %s %s +issues.change_project_at=изменил(а) проект с %s на %s %s +issues.remove_milestone_at=удалил(а) из этапа %s %s +issues.remove_project_at=удалил(а) это из проекта %s %s +issues.deleted_milestone=(удалено) +issues.deleted_project=(удалено) +issues.self_assign_at=назначил(а) на себя %s +issues.add_assignee_at=был(а) назначен(а) %s %s +issues.remove_assignee_at=был снят с назначения %s %s +issues.remove_self_assignment=убрал(а) их назначение %s +issues.change_title_at=изменил(а) заголовок с %s на %s %s +issues.change_ref_at=изменил(а) ссылку с %s на %s %s +issues.remove_ref_at=убрал(а) ссылку %s %s +issues.add_ref_at=добавил(а) ссылку %s %s +issues.delete_branch_at=удалил(а) ветку %s %s issues.filter_label=Метка -issues.filter_label_exclude=`Используйте alt + click/enter, чтобы исключить метки` +issues.filter_label_exclude=Используйте alt + click/enter, чтобы исключить метки issues.filter_label_no_select=Все метки issues.filter_milestone=Этап issues.filter_milestone_no_select=Все этапы @@ -1262,7 +1200,7 @@ issues.open_title=Открыто issues.closed_title=Закрыто issues.draft_title=Черновик issues.num_comments=комментариев: %d -issues.commented_at=`прокомментировал(а) %s` +issues.commented_at=прокомментировал(а) %s issues.delete_comment_confirm=Вы уверены, что хотите удалить этот комментарий? issues.context.copy_link=Копировать ссылку issues.context.quote_reply=Цитировать ответ @@ -1271,22 +1209,22 @@ issues.context.edit=Редактировать issues.context.delete=Удалить issues.no_content=Пока нет содержимого. issues.close_issue=Закрыть -issues.pull_merged_at=`объединил(а) коммит %[2]s в %[3]s %[4]s` -issues.manually_pull_merged_at=`%[4]s вручную объединил(а) коммит %[2]s в %[3]s` +issues.pull_merged_at=объединил(а) коммит %[2]s в %[3]s %[4]s +issues.manually_pull_merged_at=%[4]s вручную объединил(а) коммит %[2]s в %[3]s issues.close_comment_issue=Прокомментировать и закрыть issues.reopen_issue=Открыть снова issues.reopen_comment_issue=Прокомментировать и открыть снова issues.create_comment=Комментировать -issues.closed_at=`закрыл(а) эту задачу %[2]s` -issues.reopened_at=`переоткрыл(а) эту проблему %[2]s` -issues.commit_ref_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_from=`из %[1]s` +issues.closed_at=закрыл(а) эту задачу %[2]s +issues.reopened_at=переоткрыл(а) эту проблему %[2]s +issues.commit_ref_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_from=из %[1]s issues.poster=Автор issues.collaborator=Соавтор issues.owner=Владелец @@ -1316,8 +1254,8 @@ issues.label.filter_sort.reverse_alphabetically=С конца алфавита issues.label.filter_sort.by_size=Минимальный размер issues.label.filter_sort.reverse_by_size=Максимальный размер issues.num_participants=%d участников -issues.attachment.open_tab=`Нажмите, чтобы увидеть "%s" в новой вкладке` -issues.attachment.download=`Нажмите, чтобы скачать "%s"` +issues.attachment.open_tab=Нажмите, чтобы увидеть "%s" в новой вкладке +issues.attachment.download=Нажмите, чтобы скачать "%s" issues.subscribe=Подписаться issues.unsubscribe=Отказаться от подписки issues.lock=Ограничить обсуждение @@ -1345,31 +1283,31 @@ issues.delete.text=Вы действительно хотите удалить issues.tracker=Отслеживание времени issues.start_tracking_short=Запустить таймер issues.start_tracking=Начать отслеживание времени -issues.start_tracking_history=`начал(а) работать %s` +issues.start_tracking_history=начал(а) работать %s issues.tracker_auto_close=Таймер будет остановлен автоматически, когда эта проблема будет закрыта -issues.tracking_already_started=`Вы уже начали отслеживать время для другой задачи!` +issues.tracking_already_started=Вы уже начали отслеживать время для другой задачи! issues.stop_tracking=Остановить таймер -issues.stop_tracking_history=`перестал работать %s` +issues.stop_tracking_history=перестал работать %s issues.cancel_tracking=Отмена -issues.cancel_tracking_history=`отменил отслеживание %s` +issues.cancel_tracking_history=отменил отслеживание %s issues.add_time=Вручную добавить время issues.del_time=Удалить этот журнал времени issues.add_time_short=Добавить время issues.add_time_cancel=Отмена -issues.add_time_history=`добавил(а) к затраченному времени %s` -issues.del_time_history=`удалил потраченное время %s` +issues.add_time_history=добавил(а) к затраченному времени %s +issues.del_time_history=удалил потраченное время %s issues.add_time_hours=Часы issues.add_time_minutes=Минуты issues.add_time_sum_to_small=Время не было введено. issues.time_spent_total=Общее затраченное время -issues.time_spent_from_all_authors=`Общее затраченное время: %s` +issues.time_spent_from_all_authors=Общее затраченное время: %s issues.due_date=Срок выполнения issues.invalid_due_date_format=Дата окончания должна быть в формате 'гггг-мм-дд'. 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.due_date_form=гггг-мм-дд issues.due_date_form_add=Добавить срок выполнения issues.due_date_form_edit=Редактировать @@ -1387,8 +1325,8 @@ issues.dependency.add=Добавить зависимость… issues.dependency.cancel=Отменить issues.dependency.remove=Удалить issues.dependency.remove_info=Удалить эту зависимость -issues.dependency.added_dependency=`добавить новую зависимость %s` -issues.dependency.removed_dependency=`убрал зависимость %s` +issues.dependency.added_dependency=добавить новую зависимость %s +issues.dependency.removed_dependency=убрал зависимость %s issues.dependency.pr_closing_blockedby=Закрытие этого запроса на слияние блокируется следующими задачами issues.dependency.issue_closing_blockedby=Закрытие этой задачи блокируется следующими задачами issues.dependency.issue_close_blocks=Эта задача блокирует закрытие следующих задач @@ -1439,10 +1377,8 @@ issues.content_history.created=создано issues.content_history.delete_from_history=Удалить из истории issues.content_history.delete_from_history_confirm=Удалить из истории? issues.content_history.options=Настройки - compare.compare_base=Основа compare.compare_head=сравнить - pulls.desc=Включить запросы на слияние и проверки кода. pulls.new=Новый запрос на слияние pulls.view=Просмотр запроса на слияние @@ -1456,11 +1392,11 @@ pulls.filter_branch=Фильтр по ветке pulls.no_results=Результатов не найдено. pulls.nothing_to_compare=Нечего сравнивать, родительская и текущая ветка одинаковые. pulls.nothing_to_compare_and_allow_empty_pr=Ветки идентичны. Этот PR будет пустым. -pulls.has_pull_request=`Запрос на слияние этих веток уже существует: %[2]s#%[3]d` +pulls.has_pull_request=Запрос на слияние этих веток уже существует: %[2]s#%[3]d pulls.create=Создать запрос на слияние pulls.title_desc=хочет смерджить %[1]d коммит(ов) из %[2]s в %[3]s pulls.merged_title_desc=слито %[1]d коммит(ов) из %[2]s в %[3]s %[4]s -pulls.change_target_branch_at=`изменил целевую ветку с %s на %s %s` +pulls.change_target_branch_at=изменил целевую ветку с %s на %s %s pulls.tab_conversation=Обсуждение pulls.tab_commits=Коммиты pulls.tab_files=Изменённые файлы @@ -1472,7 +1408,7 @@ pulls.manually_merged=Слито вручную pulls.manually_merged_as=Запрос на слияние был объединён вручную, как %[2]s. pulls.is_closed=Запрос на слияние был закрыт. pulls.has_merged=Слияние этого запроса успешно завершено. -pulls.title_wip_desc=`Добавьте %s в начало заголовка для защиты от случайного досрочного принятия запроса на слияние` +pulls.title_wip_desc=Добавьте %s в начало заголовка для защиты от случайного досрочного принятия запроса на слияние pulls.cannot_merge_work_in_progress=Этот запрос на слияние помечен как в процессе работы. pulls.still_in_progress=Всё ещё в процессе? pulls.add_prefix=Добавить %s префикс @@ -1501,7 +1437,6 @@ pulls.reject_count_n=%d запросов на изменение pulls.waiting_count_1=%d ожидает проверки pulls.waiting_count_n=%d ожидающих отзывов pulls.wrong_commit_id=id фиксации должен быть идентификатором фиксации в целевой ветке - pulls.no_merge_desc=Запрос на слияние не может быть принят, так как отключены все настройки слияния. pulls.no_merge_helper=Включите опции слияния в настройках репозитория или совершите слияние этого запроса вручную. pulls.no_merge_wip=Данный запрос на слияние не может быть принят, поскольку он помечен как находящийся в разработке. @@ -1514,7 +1449,6 @@ pulls.squash_merge_pull_request=Создать объединенный (squash) pulls.merge_manually=Слито вручную pulls.merge_commit_id=ID коммита слияния pulls.require_signed_wont_sign=Данная ветка ожидает подписанные коммиты, однако слияние не будет подписано - pulls.invalid_merge_option=Этот параметр слияния нельзя использовать для этого запроса на слияние. pulls.merge_conflict=Слияние не удалось: Произошел конфликт во время слияния. Совет: попробуйте другую стратегию pulls.merge_conflict_summary=Сообщение об ошибке @@ -1526,7 +1460,7 @@ pulls.merge_out_of_date=Ошибка слияния: при создании с pulls.push_rejected=Слияние не удалось: push был отклонён. Проверьте Git-хуки для этого репозитория. pulls.push_rejected_summary=Полная ошибка отклонения pulls.push_rejected_no_message=Слияние не удалось: push был отклонён, но сервер не указал причину.
    Проверьте Git-хуки для этого репозитория -pulls.open_unmerged_pull_exists=`Вы не можете снова открыть, поскольку уже существует запрос на слияние (#%d) из того же репозитория с той же информацией о слиянии и ожидающий слияния.` +pulls.open_unmerged_pull_exists=Вы не можете снова открыть, поскольку уже существует запрос на слияние (#%d) из того же репозитория с той же информацией о слиянии и ожидающий слияния. pulls.status_checking=Выполняются некоторые проверки pulls.status_checks_success=Все проверки выполнены успешно pulls.status_checks_warning=Некоторые проверки сообщили о предупреждениях @@ -1539,16 +1473,11 @@ pulls.update_branch_rebase=Обновить ветку через rebase pulls.update_branch_success=Обновление ветки выполнено успешно pulls.update_not_allowed=У вас недостаточно прав для обновления ветки pulls.outdated_with_base_branch=Эта ветка отстает от базовой ветки -pulls.closed_at=`закрыл этот запрос на слияние %[2]s` -pulls.reopened_at=`переоткрыл этот запрос на слияние %[2]s` -pulls.merge_instruction_hint=`Вы также можете просмотреть инструкции командной строки.` +pulls.closed_at=закрыл этот запрос на слияние %[2]s +pulls.reopened_at=переоткрыл этот запрос на слияние %[2]s +pulls.merge_instruction_hint=Вы также можете просмотреть инструкции командной строки. pulls.merge_instruction_step1_desc=В репозитории вашего проекта посмотрите новую ветку и протестируйте изменения. pulls.merge_instruction_step2_desc=Объединить изменения и обновить на Gitea. - - - - - milestones.new=Новый этап milestones.closed=Закрыт %s milestones.update_ago=Обновлено %s назад @@ -1578,7 +1507,6 @@ milestones.filter_sort.least_complete=Менее полное milestones.filter_sort.most_complete=Более полное milestones.filter_sort.most_issues=Большинство задач milestones.filter_sort.least_issues=Меньшинство задач - signing.will_sign=Этот коммит будет подписан ключом '%s' signing.wont_sign.error=При проверке возможности подписать коммит произошла ошибка signing.wont_sign.nokey=Нет ключа, доступного для подписания этого коммита @@ -1592,9 +1520,7 @@ signing.wont_sign.headsigned=Слияние не будет подписано, signing.wont_sign.commitssigned=Слияние не будет подписано, так как все связанные коммиты не подписаны signing.wont_sign.approved=Слияние не будет подписано, так как PR не одобрен signing.wont_sign.not_signed_in=Вы не авторизовались - ext_wiki.desc=Ссылка на внешнюю вики. - wiki=Вики wiki.welcome=Добро пожаловать в Вики. wiki.welcome_desc=Вики позволяет писать и делиться документацией с сотрудниками. @@ -1618,7 +1544,6 @@ wiki.reserved_page=Имя вики-страницы '%s' зарезервиро wiki.pages=Страницы wiki.last_updated=Последнее обновление %s wiki.page_name_desc=Введите имя страницы Вики. Некоторые специальные имена: 'Главна', '_Sidebar' и '_Footer'. - activity=Активность activity.period.filter_label=Период: activity.period.daily=1 день @@ -1684,7 +1609,6 @@ activity.git_stats_addition_n=%d добавлений activity.git_stats_and_deletions=и activity.git_stats_deletion_1=%d удаление activity.git_stats_deletion_n=%d удалений - search=Поиск search.search_repo=Поиск по репозиторию search.fuzzy=Неточный @@ -1692,7 +1616,6 @@ search.match=Соответствие search.results=Результаты поиска "%s" в %s search.code_no_results=Не найдено исходного кода, соответствующего поисковому запросу. search.code_search_unavailable=В настоящее время поиск по коду недоступен. Обратитесь к администратору сайта. - settings=Настройки settings.desc=В настройках вы можете менять различные параметры этого репозитория settings.options=Репозиторий @@ -1977,10 +1900,10 @@ settings.dismiss_stale_approvals=Отклонить устаревшие раз settings.dismiss_stale_approvals_desc=Когда новые коммиты, изменяющие содержимое запроса на слияние, отправляются в ветку, старые разрешения будут отклонены. settings.require_signed_commits=Требовать подписанные коммиты settings.require_signed_commits_desc=Отклонить push'ы в эту ветку, если они не подписаны или не проверены. -settings.protect_protected_file_patterns=Защищённые шаблоны файлов (разделённые через '\;'): -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=Незащищенные файлы, которые могут быть изменены напрямую, если пользователь имеет доступ на запись, ограничения связанные с push здесь не влияют. Шаблоны могут быть разделены точкой с запятой ('\;'). Смотрите github.com/gobwas/glob документацию для синтаксиса шаблонов. Например: .drone.yml, /docs/**/*.txt. +settings.protect_protected_file_patterns=Защищённые шаблоны файлов (разделённые через ';'): +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=Незащищенные файлы, которые могут быть изменены напрямую, если пользователь имеет доступ на запись, ограничения связанные с push здесь не влияют. Шаблоны могут быть разделены точкой с запятой (';'). Смотрите github.com/gobwas/glob документацию для синтаксиса шаблонов. Например: .drone.yml, /docs/**/*.txt. settings.add_protected_branch=Включить защиту settings.delete_protected_branch=Отключить защиту settings.update_protect_branch_success=Настройки защиты ветки '%s' были успешно изменены. @@ -2060,7 +1983,6 @@ settings.rename_branch_success=Ветка %s была успешно переи settings.rename_branch_from=старое название ветки settings.rename_branch_to=новое название ветки settings.rename_branch=Переименовать ветку - diff.browse_source=Просмотр исходного кода diff.parent=Родитель diff.commit=Сommit @@ -2111,7 +2033,6 @@ diff.protected=Защищено diff.image.side_by_side=Режим "рядом" diff.image.swipe=Свайп diff.image.overlay=Оверлей - releases.desc=Релизы позволяют организовать хранение готовых сборок проекта в строгом хронологически верном порядке. release.releases=Релизы release.detail=Детали релиза @@ -2153,7 +2074,6 @@ release.downloads=Загрузки release.download_count=Загрузки: %s release.add_tag_msg=Использовать заголовок и содержимое релиза в качестве тега сообщения. release.add_tag=Создать только тег - branch.name=Имя ветки branch.search=Поиск веток branch.already_exists=Ветка с именем '%s' уже существует. @@ -2185,22 +2105,20 @@ branch.create_branch_operation=Создать ветку branch.new_branch=Создать новую ветку branch.new_branch_from=Создать новую ветку из '%s' branch.renamed=Ветка %s была переименована в %s. - tag.create_tag=Создать тег %s tag.create_tag_operation=Создать тег tag.confirm_create_tag=Создать тег - tag.create_success=Тег '%s' был создан. - topic.manage_topics=Редактировать тематические метки topic.done=Сохранить topic.count_prompt=Вы не можете выбрать более 25 тем topic.format_prompt=Темы должны начинаться с буквы или цифры, могут содержать дефисы(-) и должны содержать не более 35 символов. - - error.csv.too_large=Не удается отобразить этот файл, потому что он слишком большой. error.csv.unexpected=Не удается отобразить этот файл, потому что он содержит неожиданный символ в строке %d и столбце %d. error.csv.invalid_field_count=Не удается отобразить этот файл, потому что он имеет неправильное количество полей в строке %d. +packages=Пакеты +issues.filter_project_none=Нет проекта +settings.event_wiki=Вики [org] org_name_holder=Название организации @@ -2223,11 +2141,9 @@ team_access_desc=Доступ к репозиторию team_permission_desc=Разрешение team_unit_desc=Разрешить доступ к разделам репозитория team_unit_disabled=(Отключено) - form.name_reserved=Наименование организации '%s' зарезервированно. form.name_pattern_not_allowed=Шаблон организации '%s' не допускается. form.create_org_not_allowed=Этому пользователю не разрешено создавать организацию. - settings=Настройки settings.options=Организация settings.full_name=Полное имя @@ -2241,7 +2157,6 @@ settings.visibility.limited=Ограничено (Видно только для settings.visibility.limited_shortname=Ограничить settings.visibility.private=Частный (Видимый только для участников организации) settings.visibility.private_shortname=Приватный - settings.update_settings=Обновить настройки settings.update_setting_success=Настройки организации обновлены. settings.change_orgname_prompt=Это изменение изменит ссылки на организацию. @@ -2254,9 +2169,7 @@ settings.confirm_delete_account=Подтвердить удаление settings.delete_org_title=Удалить организацию settings.delete_org_desc=Эта организация будет безвозвратно удалена. Продолжить? settings.hooks_desc=Добавьте вебхуки, которые будет вызываться для всех репозиториев под этой организации. - settings.labels_desc=Добавьте метки, которые могут быть использованы в задачах для всех репозиториев этой организации. - members.membership_visibility=Видимость участника команды: members.public=Видимый members.public_helper=скрыть @@ -2271,7 +2184,6 @@ members.leave=Покинуть members.leave.detail=Покинуть %s? members.invite_desc=Добавить нового участника в %s: members.invite_now=Пригласите сейчас - teams.join=Объединить teams.leave=Выйти teams.leave.detail=Покинуть %s? @@ -2314,6 +2226,7 @@ teams.all_repositories_helper=Команда имеет доступ ко все teams.all_repositories_read_permission_desc=Эта команда предоставляет прочтено доступ к всем репозиториям: участники могут просматривать и клонировать репозитории. teams.all_repositories_write_permission_desc=Эта команда предоставляет Написать доступ к всем репозиториям: участники могут читать и выполнять push в репозитории. teams.all_repositories_admin_permission_desc=Эта команда предоставляет администратору доступ к всем репозиториям: участники могут читать, отправлять сообщения и добавлять соавторов в репозитории. +members=Участники [admin] dashboard=Панель @@ -2329,7 +2242,6 @@ monitor=Мониторинг first_page=Первая last_page=Последняя total=Всего: %d - dashboard.statistic=Статистика dashboard.operations=Операции dashboard.system_status=Статус системного монитора @@ -2403,7 +2315,6 @@ dashboard.gc_times=Количество сборок мусора dashboard.delete_old_actions=Удалите все старые действия из базы данных dashboard.delete_old_actions.started=Удалите все старые действия из запущенной базы данных. dashboard.update_checker=Проверка обновлений - users.user_manage_panel=Панель управления пользователями users.new_account=Создать новый аккаунт users.name=Имя пользователя @@ -2453,7 +2364,6 @@ 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 отключено - emails.email_manage_panel=Управление эл. почтой пользователя emails.primary=Первичный emails.activated=Активирован @@ -2466,13 +2376,11 @@ emails.not_updated=Не удалось обновить запрошенный emails.duplicate_active=Этот адрес электронной почты уже активирован для другого пользователя. emails.change_email_header=Обновить свойства электронной почты emails.change_email_text=Вы уверены, что хотите обновить этот адрес электронной почты? - orgs.org_manage_panel=Управление организациями orgs.name=Название orgs.teams=Команды orgs.members=Участники orgs.new_orga=Новая организация - repos.repo_manage_panel=Управление репозиториями repos.unadopted=Непринятые репозитории repos.unadopted.no_more=Больше непринятых репозиториев не найдено @@ -2484,7 +2392,6 @@ repos.stars=Звезды repos.forks=Форки repos.issues=Задачи repos.size=Размер - packages.owner=Владелец packages.creator=Автор packages.name=Наименование @@ -2493,17 +2400,14 @@ packages.type=Тип packages.repository=Репозиторий packages.size=Размер packages.published=Опубликовано - defaulthooks=Стандартные Веб-хуки defaulthooks.desc=Вебхуки автоматически делают HTTP-POST запросы на сервер, когда вызываются определенные события Gitea. Вебхуки, определённые здесь, по умолчанию и будут скопированы во все новые репозитории. Подробнее читайте в руководстве по вебхукам. defaulthooks.add_webhook=Добавить стандартный Веб-хук defaulthooks.update_webhook=Обновить стандартный Веб-хук - systemhooks=Системные вебхуки systemhooks.desc=Вебхуки автоматически делают HTTP-POST запросы на сервер, когда вызываются определённые события Gitea. Определённые вебхуки будут действовать на всех репозиториях системы, поэтому пожалуйста, учитывайте любые последствия для производительности. Подробнее читайте в руководстве по вебхукам. systemhooks.add_webhook=Добавить системный вебхук systemhooks.update_webhook=Обновить системный вебхук - auths.auth_manage_panel=Управление аутентификацией auths.new=Добавить новый источник auths.name=Имя @@ -2606,7 +2510,6 @@ auths.still_in_used=Эта проверка подлинности до сих auths.deletion_success=Канал аутентификации успешно удалён! auths.login_source_exist=Источник входа '%s' уже существует. auths.login_source_of_type_exist=Источник аутентификации этого типа уже существует. - config.server_config=Конфигурация сервера config.app_name=Название сайта config.app_ver=Версия Gitea @@ -2625,7 +2528,6 @@ config.static_file_root_path=Путь до папки со статичными config.log_file_root_path=Путь к журналу config.script_type=Тип скрипта config.reverse_auth_user=Имя пользователя для авторизации на reverse proxy - config.ssh_config=Конфигурация SSH config.ssh_enabled=SSH включён config.ssh_start_builtin_server=Использовать встроенный сервер @@ -2637,12 +2539,10 @@ config.ssh_key_test_path=Путь к тестовому ключу 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=Устаревание HTTP-аутентификации LFS - config.db_config=Конфигурация базы данных config.db_type=Тип config.db_host=Сервер @@ -2651,7 +2551,6 @@ config.db_user=Пользователь config.db_schema=Схема config.db_ssl_mode=SSL config.db_path=Путь - config.service_config=Сервисная конфигурация config.register_email_confirm=Требуется подтверждение по электронной почте config.disable_register=Отключить самостоятельную регистрацию @@ -2674,12 +2573,10 @@ config.default_allow_only_contributors_to_track_time=Учитывать толь config.no_reply_address=No-reply адрес config.default_visibility_organization=Видимость по умолчанию для новых организаций config.default_enable_dependencies=Включение зависимостей для задач по умолчанию - config.webhook_config=Конфигурация вебхуков config.queue_length=Длина очереди config.deliver_timeout=Задержка доставки config.skip_tls_verify=Пропустить проверку TLS - config.mailer_enabled=Почта включена config.mailer_name=Имя config.mailer_user=Пользователь @@ -2691,16 +2588,13 @@ config.test_email_placeholder=Электронная почта (наприме config.send_test_mail=Отправить тестовое письмо config.test_mail_failed=Не удалось отправить тестовое письмо на «%s»: %v config.test_mail_sent=Тестовое письмо было отправлено «%s». - config.oauth_config=Конфигурация OAuth config.oauth_enabled=OAuth включен - config.cache_config=Настройки кеша config.cache_adapter=Адаптер кэша config.cache_interval=Интервал кэширования config.cache_conn=Подключение кэша config.cache_item_ttl=Время жизни данных в кеше - config.session_config=Конфигурация сессии config.session_provider=Провайдер сессии config.provider_config=Конфигурация провайдера @@ -2709,12 +2603,10 @@ config.gc_interval_time=Интервал работы сборщика мусо config.session_life_time=Время жизни сессии config.https_only=Только HTTPS config.cookie_life_time=Время жизни файла cookie - config.picture_config=Настройка изображения config.picture_service=Сервис изображений config.disable_gravatar=Отключить Gravatar config.enable_federated_avatar=Включить внешние аватары - config.git_config=Конфигурация Git config.git_disable_diff_highlight=Отключить подсветку синтаксиса при сравнении config.git_max_diff_lines=Максимальное количество строк сравнения (на файл) @@ -2726,7 +2618,6 @@ config.git_mirror_timeout=Лимит времени обновления зер config.git_clone_timeout=Лимит времени операции клонирования config.git_pull_timeout=Лимит времени операции Pull config.git_gc_timeout=Лимит времени сборки мусора - config.log_config=Конфигурация журнала config.log_mode=Режим журналирования config.own_named_logger=Именованный журнал @@ -2738,8 +2629,6 @@ config.access_log_mode=Режим доступа к журналу config.access_log_template=Шаблон config.xorm_log_mode=Режим журнала XORM config.xorm_log_sql=Лог SQL - - monitor.cron=Задачи cron monitor.name=Название monitor.schedule=Расписание @@ -2787,7 +2676,6 @@ monitor.queue.pool.pause.submit=Приостановить очередь monitor.queue.pool.resume.title=Возобновить очередь monitor.queue.pool.resume.desc=Эта очередь возобновит работу monitor.queue.pool.resume.submit=Возобновить очередь - monitor.queue.settings.title=Настройки пула monitor.queue.settings.desc=Пулы динамично растут с ускорением в ответ на блокировку их рабочих очередей. Эти изменения не повлияют на текущие рабочие группы. monitor.queue.settings.timeout=Тайм-аут ускорения @@ -2803,7 +2691,6 @@ monitor.queue.settings.submit=Обновить настройки monitor.queue.settings.changed=Настройки обновлены monitor.queue.settings.blocktimeout=Тайм-аут текущего блока monitor.queue.settings.blocktimeout.value=%[1]v - monitor.queue.pool.none=В этой очереди нет пула monitor.queue.pool.added=Группа рабочих добавлена monitor.queue.pool.max_changed=Изменено максимальное количество рабочих @@ -2813,7 +2700,6 @@ monitor.queue.pool.cancel=Выключить группу рабочих monitor.queue.pool.cancelling=Завершение работы группы рабочих monitor.queue.pool.cancel_notices=Завершить эту группу из %s рабочих? monitor.queue.pool.cancel_desc=Выход из очереди без групп рабочих может вызвать блокировку запросов на неопределенный срок. - notices.system_notice_list=Уведомления системы notices.view_detail_header=Подробности уведомления notices.actions=Действия @@ -2828,20 +2714,21 @@ notices.type_2=Задача notices.desc=Описание notices.op=Oп. notices.delete_success=Уведомления системы были удалены. +config.mailer_smtp_port=SMTP-порт [action] create_repo=создал(а) репозиторий %s rename_repo=переименовал(а) репозиторий из %[1]s на %[3]s commit_repo=отправил(а) изменения в %[3]s в %[4]s -create_issue=`открыл(а) задачу %[3]s#%[2]s` -close_issue=`закрыл(а) задачу %[3]s#%[2]s` -reopen_issue=`переоткрыл(а) задачу %[3]s#%[2]s` -create_pull_request=`создал(а) запрос на слияние %[3]s#%[2]s` -close_pull_request=`закрыл(а) запрос на слияние %[3]s#%[2]s` -reopen_pull_request=`переоткрыл(а) запрос на слияние %[3]s#%[2]s` -comment_issue=`прокомментировал(а) задачу %[3]s#%[2]s` -comment_pull=`прокомментировал(а) запрос на слияние %[3]s#%[2]s` -merge_pull_request=`принял(а) запрос на слияние %[3]s#%[2]s` +create_issue=открыл(а) задачу %[3]s#%[2]s +close_issue=закрыл(а) задачу %[3]s#%[2]s +reopen_issue=переоткрыл(а) задачу %[3]s#%[2]s +create_pull_request=создал(а) запрос на слияние %[3]s#%[2]s +close_pull_request=закрыл(а) запрос на слияние %[3]s#%[2]s +reopen_pull_request=переоткрыл(а) запрос на слияние %[3]s#%[2]s +comment_issue=прокомментировал(а) задачу %[3]s#%[2]s +comment_pull=прокомментировал(а) запрос на слияние %[3]s#%[2]s +merge_pull_request=принял(а) запрос на слияние %[3]s#%[2]s transfer_repo=передал(а) репозиторий %s %s push_tag=создал(а) тег %[3]s в %[4]s delete_tag=удалил(а) тэг %[2]s из %[3]s @@ -2852,10 +2739,10 @@ 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` -reject_pull_request=`предложил(а) изменения для %[3]s#%[2]s` -publish_release=`выпустил(а) "%[4]s" в %[3]s` -review_dismissed=`отклонил(а) отзыв от %[4]s для %[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 review_dismissed_reason=Причина: create_branch=создал(а) ветку %[3]s в %[4]s starred_repo=добавил(а) %[2]s в избранное @@ -2932,4 +2819,22 @@ conan.details.repository=Репозиторий container.multi_arch=ОС / архитектура container.labels.key=Ключ container.labels.value=Значение - +dependency.version=Версия +npm.dependencies=Зависимости +owner.settings.cleanuprules.enabled=Включено + +[aria] + +[secrets] +value=Значение +name=Название + +[actions] +runners.name=Название +runners.owner_type=Тип +runners.description=Описание +runners.task_list.run=Запуск +runners.task_list.repository=Репозиторий +runners.task_list.commit=коммит +runners.status.active=Активный +runs.commit=коммит diff --git a/options/locale/locale_si-LK.ini b/options/locale/locale_si-LK.ini index 5308886635f0..350aa51dcd3b 100644 --- a/options/locale/locale_si-LK.ini +++ b/options/locale/locale_si-LK.ini @@ -22,7 +22,6 @@ enable_javascript=මෙම වියමන අඩවිය ජාවාස් toc=පටුන licenses=බලපත්‍ර return_to_gitea=ගිටියා වෙත ආපසු - username=පරිශීලක නාමය email=වි-තැපැල් ලිපිනය password=මුරපදය @@ -32,8 +31,6 @@ captcha=කැප්චා twofa=ද්වි-සාධක සත්යාපනය twofa_scratch=ද්වි-සාධක සීරීම් කේතය passcode=මුරකේතය - - repository=කෝෂ්ඨය organization=සංවිධානය mirror=මිරර් @@ -51,18 +48,15 @@ settings=සැකසුම් your_profile=පැතිකඩ your_starred=තරු පිරුණු your_settings=සැකසුම් - all=සියල්ල sources=මූලාශ්‍ර mirrors=දර්පණ collaborative=සහයෝගී forks=දෙබලක - activities=ක්‍රියාකාරකම් pull_requests=ඉල්ලීම් අදින්න issues=ගැටළු milestones=සන්ධිස්ථාන - ok=හරි cancel=අවලංගු කරන්න save=සුරකින්න @@ -71,25 +65,21 @@ add_all=සියල්ල එක්කරන්න remove=ඉවත් කරන්න remove_all=සියල්ල ඉවත් කරන්න edit=සංස්කරණය - copy=පිටපත් කරන්න copy_url=ඒ.ස.නි. පිටපත් copy_branch=ශාඛාවේ නම පිටපත් කරන්න copy_success=පිටපත් විය! copy_error=පිටපත් වීමට අසමත් විය - write=ලියන්න preview=පෙරදසුන loading=පූරණය වෙමින්... - step1=පියවර 1: step2=පියවර 2: - error=දෝෂයකි error404=ඔබ ළඟා වීමට උත්සාහ කරන පිටුව නොපවතී හෝ ඔබට අවසර නැත එය බැලීමට. - never=කිසි විටෙකත් - +enabled=සබල කර ඇත +disabled=අබල කර ඇත [filter] @@ -129,7 +119,6 @@ err_empty_admin_email=පරිපාලක විද්යුත් තැප err_admin_name_is_reserved=පරිපාලක පරිශීලක නාමය අවලංගුයි, පරිශීලක නාමය වෙන් කර ඇත err_admin_name_pattern_not_allowed=පරිපාලක පරිශීලක නාමය අවලංගුයි, පරිශීලක නාමය වෙන් කළ රටාවකට ගැලපෙයි err_admin_name_is_invalid=පරිපාලක පරිශීලක නාමය වලංගු නොවේ - general_title=පොදු සැකසුම් app_name=අඩවියේ සිරැසිය app_name_helper=ඔබට ඔබේ සමාගමේ නම මෙහි ඇතුළත් කළ හැකිය. @@ -149,7 +138,6 @@ app_url=මූලික URL එක කරන්න app_url_helper=HTTP සඳහා මූලික ලිපිනය (S) URL පරිගණක ක්රිඩාවට සමාන සහ විද්යුත් තැපැල් දැනුම්දීම්. log_root_path=ලොග් මාර්ගය log_root_path_helper=ලොග් ගොනු මෙම ඩිරෙක්ටරයට ලියනු ඇත. - optional_title=වෛකල්පිත සැකසුම් email_title=වි-තැපෑලේ සැකසුම් smtp_from=ලෙස වි-තැපෑල යවන්න @@ -201,7 +189,9 @@ default_enable_timetracking_popup=පෙරනිමියෙන් නව ග no_reply_address=සැඟවුණු වි-තැපැල් වසම no_reply_address_helper=සැඟවුණු විද්යුත් තැපැල් ලිපිනයක් සහිත පරිශීලකයින් සඳහා ඩොමේන් නාමය. උදාහරණයක් ලෙස, සැඟවුණු විද්යුත් තැපැල් වසම 'no.example.org' ලෙස සකසා තිබේ නම්, 'ජෝ' යන පරිශීලක නාමය ගිට් 'joe@noreply.example.org' ලෙස ලොගින් වනු ලැබේ. password_algorithm=මුරපදය හැෂ් ඇල්ගොරිතම -password_algorithm_helper=මුරපදය හැෂ් ඇල්ගොරිතම සකසන්න. ඇල්ගොරිතම වලට විවිධ අවශ්යතා සහ ශක්තිය ඇත. හොඳ ලක්ෂණ ඇති අතර `argon2` මතකය ගොඩක් භාවිතා කරන අතර කුඩා පද්ධති සඳහා නුසුදුසු විය හැක. +password_algorithm_helper="""මුරපදය හැෂ් ඇල්ගොරිතම සකසන්න. ඇල්ගොරිතම වලට විවිධ අවශ්යතා සහ ශක්තිය ඇත. හොඳ ලක්ෂණ ඇති අතර `argon2` මතකය ගොඩක් භාවිතා කරන අතර කුඩා පද්ධති සඳහා නුසුදුසු විය හැක.""" +smtp_addr=SMTP සත්කාරක +smtp_port=ප්රශ්නය විසඳිලා වරාය [home] uname_holder=පරිශීලක නාමය හෝ වි-තැපෑල @@ -216,17 +206,14 @@ view_home=%s දකින්න search_repos=ගබඩාවක් සොයා ගන්න… filter=වෙනත් පෙරහන් filter_by_team_repositories=කණ්ඩායම් කෝෂ්ඨ අනුව පෙරන්න - show_archived=සංරක්ෂිත show_both_archived_unarchived=සංරක්ෂිත සහ අක්රීය දෙකම පෙන්වීම show_only_archived=සංරක්ෂිත පමණක් පෙන්වයි show_only_unarchived=සංරක්ෂිත පමණක් පෙන්වීම - show_private=පෞද්ගලික show_both_private_public=ප්‍රසිද්ධ හා පෞද්ගලික පෙන්වයි show_only_private=පෞද්ගලික පමණක් පෙන්වයි show_only_public=ප්‍රසිද්ධ පමණක් පෙන්වයි - issues.in_your_repos=ඔබගේ කෝෂ්ඨවල [explore] @@ -243,7 +230,6 @@ code_no_results=ඔබගේ සෙවුම් පදය ගැලපෙන ප code_search_results='%s' සඳහා සෙවුම් ප්‍රතිඵල code_last_indexed_at=අවසන් සුචිගත %s - [auth] create_new_account=ගිණුමක් ලියාපදිංචි කරන්න register_helper_msg=දැනටමත් ගිණුමක් තිබේද? දැන්ම පුරනය වන්න! @@ -311,31 +297,24 @@ password_pwned_err=HaveibeenPwned කිරීමට ඉල්ලීම සම view_it_on=%sමත එය බලන්න link_not_working_do_paste=වැඩ කරන්නේ නැද්ද? ඔබගේ බ්රව්සරයට පිටපත් කිරීම සහ ඇලවීම උත්සාහ කරන්න. hi_user_x=ආයුබෝ %s, - activate_account=ඔබගේ ගිණුම ක්‍රියාත්මක කරන්න activate_account.title=%s, ඔබගේ ගිණුම ක්‍රියාත්මක කරන්න activate_account.text_1=ආයුබෝ %[1]s, %[2]s හි ලියාපදිංචි වීමට තුති! activate_account.text_2=%sතුළ ඔබගේ ගිණුම සක්රිය කිරීමට කරුණාකර පහත සබැඳිය ක්ලික් කරන්න: - activate_email=ඔබගේ විද්යුත් තැපැල් ලිපිනය සත්යාපනය කරන්න activate_email.title=%s, කරුණාකර ඔබගේ විද්යුත් තැපැල් ලිපිනය සත්යාපනය කරන්න activate_email.text=තුළ ඔබගේ විද්යුත් තැපැල් ලිපිනය සත්යාපනය කිරීමට පහත සබැඳිය ක්ලික් කරන්න %s: - register_notify=ගිටියා වෙත සාදරයෙන් පිළිගනිමු register_notify.title=%[1]s, %[2]s වෙත සාදරයෙන් පිළිගනිමු register_notify.text_1=මෙය %sසඳහා ඔබගේ ලියාපදිංචි තහවුරු කිරීමේ විද්යුත් තැපෑලයි! register_notify.text_2=ඔබට දැන් පරිශීලක නාමය හරහා පිවිසිය හැකිය: %s. register_notify.text_3=මෙම ගිණුම ඔබ වෙනුවෙන් නිර්මාණය කර තිබේ නම්, කරුණාකර ඔබගේ මුරපදය පළමු සකසන්න. - reset_password=ඔබගේ ගිණුම ප්‍රතිසාධනය reset_password.title=%s, ඔබගේ ගිණුම නැවත ලබා ගැනීමට ඔබ ඉල්ලා ඇත reset_password.text=%sතුළ ඔබගේ ගිණුම නැවත ලබා ගැනීමට කරුණාකර පහත සබැඳිය ක්ලික් කරන්න: - register_success=ලියාපදිංචි වීම සාර්ථකයි - issue_assigned.pull=@%[1]s ඉල්ලීම අදින්න ඔබට පවරා ඇත[2]ගබඩාව%[3]s. issue_assigned.issue=@%[1]s නිකුත් කිරීමට ඔබට පවරා ඇත[2]s ගබඩාව%[3]s. - issue.x_mentioned_you=@%s ඔබ සඳහන්: issue.action.force_push=%[1]s බලය-තල්ලු %[2]s සිට%[3]s[4]s. issue.action.push_1=@%[1]s pushed%[3]d%[2]s කිරීමට කැප @@ -350,7 +329,6 @@ issue.action.review_dismissed=@%[1]s මෙම අදින්න ඉල issue.action.ready_for_review=@%[1]s සමාලෝචනය සඳහා සූදානම් මෙම අදින්න ඉල්ලීම සලකුණු. issue.action.new=@%[1]ගේ නිර්මාණය #%[2]ඈ. issue.in_tree_path=%sදී: - release.new.subject=%s %s නිදහස් release.new.text=@%[1]හි නිකුතුව%[2]හි[3]හි release.title=සිරැසිය: %s @@ -358,16 +336,13 @@ release.note=සටහන: 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.to_you=ඔබ repo.transfer.body=එය පිළිගැනීමට හෝ ප්රතික්ෂේප කිරීමට පිවිසෙන්න %s හෝ එය නොසලකා හරින්න. - repo.collaborator.added.subject=%s ඔබව %s ට එකතු කළා repo.collaborator.added.text=ඔබ ගබඩාවේ සහයෝගිතාකරුවෙකු ලෙස එකතු කර ඇත: - [modal] yes=ඔව් no=නැහැ @@ -384,33 +359,29 @@ PayloadUrl=ගෙවීම් URL TeamName=කණ්ඩායමේ නම AuthName=බලය පැවරීමේ නම AdminEmail=පරිපාලකගේ වි-තැපෑල - NewBranchName=නව ශාඛාවේ නම CommitSummary=සාරාංශය කරන්න CommitMessage=පණිවිඩය කැප CommitChoice=තේරීම කරන්න TreeName=ගොනුවේ මාර්ගය Content=අන්තර්ගතය - SSPISeparatorReplacement=වෙන්කර SSPIDefaultLanguage=පෙරනිමි භාෂාව - -require_error=` හිස් විය නොහැක.` -alpha_dash_error=` අක්ෂරාංක, ඉරක් ('-') සහ යටි ඉරි ('_') අක්ෂර පමණක් අඩංගු විය යුතුය.` -alpha_dash_dot_error=` අක්ෂරාංක, ඉරක් ('-'), යටි ඉරි ('_') සහ තිතක් ('.') අක්ෂර පමණක් අඩංගු විය යුතුය.` -git_ref_name_error=` හොඳින් සාදන ලද Git යොමු නාමයක් විය යුතුය.` -size_error=`%sප්රමාණය විය යුතුය. ` -min_size_error=` අවම වශයෙන් අක්ෂර %s ක් වත් අඩංගු විය යුතුය.` -max_size_error=` Ost බොහෝ අක්ෂර %s හි අඩංගු විය යුතුය.` -email_error=` A වලංගු විද්යුත් තැපැල් ලිපිනයක් නොවේ.` -include_error=` උප නූල් '%s' අඩංගු විය යුතුය.` -glob_pattern_error=` ලෝක ගෝලය රටාව අවලංගුයි: %s.` -regex_pattern_error=` regex රටාව අවලංගුයි: %s.` +require_error=" හිස් විය නොහැක." +alpha_dash_error=" අක්ෂරාංක, ඉරක් ('-') සහ යටි ඉරි ('_') අක්ෂර පමණක් අඩංගු විය යුතුය." +alpha_dash_dot_error=" අක්ෂරාංක, ඉරක් ('-'), යටි ඉරි ('_') සහ තිතක් ('.') අක්ෂර පමණක් අඩංගු විය යුතුය." +git_ref_name_error=" හොඳින් සාදන ලද Git යොමු නාමයක් විය යුතුය." +size_error="%sප්රමාණය විය යුතුය. " +min_size_error=" අවම වශයෙන් අක්ෂර %s ක් වත් අඩංගු විය යුතුය." +max_size_error=" Ost බොහෝ අක්ෂර %s හි අඩංගු විය යුතුය." +email_error=" A වලංගු විද්යුත් තැපැල් ලිපිනයක් නොවේ." +include_error=" උප නූල් '%s' අඩංගු විය යුතුය." +glob_pattern_error=" ලෝක ගෝලය රටාව අවලංගුයි: %s." +regex_pattern_error=" regex රටාව අවලංගුයි: %s." unknown_error=නොදන්නා දෝෂය: captcha_incorrect=CAPTCHA කේතය වැරදිය. password_not_match=මුරපද නොගැලපේ. lang_select_error=ලැයිස්තුවෙන් භාෂාවක් තෝරන්න. - username_been_taken=පරිශීලක නාමය දැනටමත් ගෙන ඇත. username_change_not_local_user=දේශීය නොවන පරිශීලකයින්ට ඔවුන්ගේ පරිශීලක නාමය වෙනස් කිරීමට අවසර නැත. repo_name_been_taken=කෝෂ්ඨයේ නම භාවිතා කර ඇත. @@ -440,17 +411,14 @@ user_not_exist=පරිශීලක නොපවතී. team_not_exist=කණ්ඩායම නොපවතී. last_org_owner=ඔබට අවසාන පරිශීලකයා 'අයිතිකරුවන්ගේ' කණ්ඩායමෙන් ඉවත් කළ නොහැක. සංවිධානයක් සඳහා අවම වශයෙන් එක් හිමිකරුවෙකු සිටිය යුතුය. cannot_add_org_to_team=කණ්ඩායම් සාමාජිකයෙකු ලෙස සංවිධානයක් එකතු කළ නොහැක. - invalid_ssh_key=ඔබගේ SSH යතුර සත්යාපනය කළ නොහැක: %s invalid_gpg_key=ඔබගේ GPG යතුර සත්යාපනය කළ නොහැක: %s invalid_ssh_principal=වලංගු නොවන විදුහල්පති: %s unable_verify_ssh_key=SSH යතුර සත්යාපනය කළ නොහැක; වැරදි සඳහා එය දෙවරක් පරීක්ෂා කරන්න. auth_failed=සත්යාපන අසමත් විය: %v - still_own_repo=ඔබගේ ගිණුම සතුව ගබඩාවක් හෝ කිහිපයක් තිබේ; පළමුව ඒවා මකා දැමීම හෝ මාරු කිරීම. still_has_org=ඔබගේ ගිණුම සංවිධාන එකක් හෝ වැඩි ගණනක සාමාජිකයෙකි; පළමුව ඒවා තබන්න. org_still_own_repo=මෙම සංවිධානය තවමත් ගබඩාවක් හෝ වැඩි ගණනක් සතුය; පළමුව ඒවා මකා දැමීම හෝ මාරු කිරීම. - target_branch_not_exist=ඉලක්කගත ශාඛාව නොපවතී. [user] @@ -468,7 +436,6 @@ unfollow=අනුගමනය නොකරන්න heatmap.loading=තාප සිතියම් පූරණය… user_bio=චරිතාපදානය disabled_public_activity=මෙම පරිශීලකයා ක්රියාකාරකම්වල මහජන දෘශ්යතාව අක්රීය කර ඇත. - form.name_reserved=පරිශීලක නාමය '%s' වෙන් කර ඇත. form.name_pattern_not_allowed='%s' රටාව පරිශීලක නාමයකින් අවසර නැත. form.name_chars_not_allowed=පරිශීලක නාමයේ '%s' වලංගු නොවන අක්ෂර අඩංගු වේ. @@ -489,7 +456,6 @@ delete=ගිණුම මකන්න twofa=ද්වි-සාධක සත්යාපනය account_link=සම්බන්ධිත ගිණුම් organization=සංවිධාන - public_profile=ප්‍රසිද්ධ පැතිකඩ biography_placeholder=අපට ඔබ ගැන ටිකක් කියන්න profile_desc=දැනුම්දීම් සහ වෙනත් මෙහෙයුම් සඳහා ඔබගේ විද්යුත් තැපැල් ලිපිනය භාවිතා කරනු ඇත. @@ -513,7 +479,6 @@ ui=තේමාව privacy=පෞද්ගලිකත්වය keep_activity_private=පැතිකඩ පිටුවෙන් ක්රියාකාරකම් සඟවන්න keep_activity_private_popup=ක්රියාකාරකම් දෘශ්යමාන වන්නේ ඔබට සහ පරිපාලකවරු සඳහා පමණි - lookup_avatar_by_mail=විද්යුත් තැපැල් ලිපිනය මගින් අවතාර් දෙස බලන්න federated_avatar_lookup=ෆෙඩරේටඩ් අවතාර් Lookup enable_custom_avatar=අභිරුචි අවතාර් භාවිතා @@ -524,7 +489,6 @@ uploaded_avatar_not_a_image=උඩුගත කරන ලද ගොනුව ර uploaded_avatar_is_too_big=උඩුගත කරන ලද ගොනුව උපරිම ප්රමාණය ඉක්මවා ඇත. update_avatar_success=ඔබගේ අවතාරය යාවත්කාලීන කර ඇත. update_user_avatar_success=පරිශීලකයාගේ අවතාරය යාවත්කාලීන කර ඇත. - change_password=මුරපදය යාවත්කාල කරන්න old_password=වත්මන් මුරපදය new_password=නව මුරපදය @@ -532,7 +496,6 @@ retype_new_password=නව මුරපදය නැවත ටයිප් ක password_incorrect=වත්මන් මුරපදය වැරදිය. change_password_success=ඔබගේ මුරපදය යාවත්කාලීන කර ඇත. මෙතැන් සිට ඔබගේ නව මුරපදය භාවිතා කරමින් පුරනය වන්න. password_change_disabled=දේශීය නොවන පරිශීලකයින්ට Gitea වෙබ් අතුරුමුහුණත හරහා ඔවුන්ගේ මුරපදය යාවත්කාලීන කළ නොහැක. - emails=වි-තැපැල් ලිපින manage_emails=වි-තැපැල් ලිපින කළමනාකරණය manage_themes=පෙරනිමි තේමාව තෝරන්න @@ -565,7 +528,6 @@ add_openid_success=නව OpenID ලිපිනය එකතු කර ඇත. keep_email_private=වි-තැපෑල සඟවන්න keep_email_private_popup=ඔබගේ ඊ-තැපැල් ලිපිනය වෙනත් පරිශීලකයන්ගෙන් සඟවා ඇත. openid_desc=OpenID ඔබට බාහිර සැපයුම්කරුවෙකුට සත්යාපනය පැවරීම සඳහා ඉඩ දෙයි. - manage_ssh_keys=SSH යතුරු කළමනාකරණය කරන්න manage_ssh_principals=SSH සහතික විදුහල්පතිවරුන් කළමනාකරණය කරන්න manage_gpg_keys=ජීපීජී යතුරු කළමනාකරණය @@ -633,7 +595,6 @@ manage_social=ආශ්රිත සමාජ ගිණුම් කළමනා social_desc=මෙම සමාජ ගිණුම් ඔබගේ Gitea ගිණුමට සම්බන්ධ කර ඇත. ඒවා ඔබගේ Gitea ගිණුමට පුරනය වීමට භාවිතා කළ හැකි බැවින් ඔබ ඒවා සියල්ල හඳුනා ගැනීමට වග බලා ගන්න. unbind=සබැඳිය unbind_success=සමාජ ගිණුම ඔබගේ Gitea ගිණුමෙන් ඉවත් කර ඇත. - manage_access_token=ප්රවේශ ටෝකන කළමනාකරණය කරන්න generate_new_token=නව ටෝකනය ජනනය කරන්න tokens_desc=මෙම ටෝකන Gitea API භාවිතයෙන් ඔබගේ ගිණුමට ප්රවේශය ලබා දෙයි. @@ -645,7 +606,6 @@ generate_token_name_duplicate=%s දැනටමත් යෙ delete_token=මකන්න access_token_deletion=ප්රවේශ ටෝකනය මකන්න delete_token_success=ටෝකනය මකා දමා ඇත. එය භාවිතා කරන යෙදුම් තවදුරටත් ඔබගේ ගිණුමට ප්රවේශය නොමැත. - manage_oauth2_applications=OUTU2 යෙදුම් කළමනාකරණය කරන්න edit_oauth2_application=OUT2 අයදුම්පත සංස්කරණය කරන්න oauth2_applications_desc=OUTU2 අයදුම්පත් ආරක්ෂිතව මෙම Gitea උදාහරණයක් පරිශීලකයන් සත්යාපනය කිරීමට ඔබගේ තෙවන පාර්ශවීය අයදුම් හැකියාව ලබා දෙයි. @@ -667,14 +627,12 @@ oauth2_client_secret_hint=ඔබ මෙම පිටුව නැවත බැ oauth2_application_edit=සංස්කරණය oauth2_application_create_description=OUTU2 යෙදුම් මෙම අවස්ථාවේ දී පරිශීලක ගිණුම් වෙත ඔබගේ තෙවන පාර්ශවීය අයදුම් ප්රවේශය ලබා දෙයි. oauth2_application_remove_description=OUTU2 යෙදුමක් ඉවත් කිරීම මෙම අවස්ථාවේ දී බලයලත් පරිශීලක ගිණුම් වෙත ප්රවේශ වීම වලක්වනු ඇත. දිගටම? - authorized_oauth2_applications=බලයලත් OUTU2 authorized_oauth2_applications_description=මෙම තෙවන පාර්ශවීය යෙදුම් සඳහා ඔබේ පුද්ගලික Gitea ගිණුමට ප්රවේශය ලබා දී ඇත. කරුණාකර යෙදුම් සඳහා ප්රවේශය අවලංගු කරන්න තවදුරටත් අවශ්ය නොවේ. revoke_key=අවලංගු revoke_oauth2_grant=ප්රවේශ අවලංගු revoke_oauth2_grant_description=මෙම තෙවන පාර්ශවීය යෙදුම සඳහා ප්රවේශය අවලංගු කිරීමෙන් මෙම යෙදුම ඔබගේ දත්ත වෙත ප්රවේශ වීම වළක්වනු ඇත. ඔබට විශ්වාසද? revoke_oauth2_grant_success=ඔබ සාර්ථකව ප්රවේශය අවලංගු කර ඇත. - twofa_desc=ද්වි-සාධක සත්යාපනය ඔබගේ ගිණුමේ ආරක්ෂාව වැඩි කරයි. twofa_is_enrolled=ඔබගේ ගිණුම දැනට සාධක දෙකක සත්යාපනය තුළ ලියාපදිංචි කර ඇත. twofa_not_enrolled=ඔබගේ ගිණුම දැනට සාධක දෙකක සත්යාපනය තුළ ලියාපදිංචි වී නොමැත. @@ -692,30 +650,24 @@ then_enter_passcode=යෙදුමේ දැක්වෙන මුරකේත passcode_invalid=මුරකේතය වැරදිය. නැවත උත්සාහ කරන්න. twofa_enrolled=ඔබගේ ගිණුම සාධක දෙකක සත්යාපනය බවට පත් කර ඇත. එක් වරක් පමණක් පෙන්වන පරිදි ඔබේ සීරීම් ටෝකනය (%s) ආරක්ෂිත ස්ථානයක ගබඩා කරන්න! twofa_failed_get_secret=රහස්ය වීමට අසමත් විය. - - manage_account_links=සම්බන්ධිත ගිණුම් කළමනාකරණය කරන්න manage_account_links_desc=මෙම බාහිර ගිණුම් ඔබගේ Gitea ගිණුමට සම්බන්ධ කර ඇත. account_links_not_available=දැනට ඔබගේ Gitea ගිණුමට සම්බන්ධ බාහිර ගිණුම් නොමැත. remove_account_link=සම්බන්ධිත ගිණුම ඉවත් කරන්න remove_account_link_desc=සම්බන්ධිත ගිණුමක් ඉවත් කිරීම ඔබගේ Gitea ගිණුමට එහි ප්රවේශය අවලංගු කරනු ඇත. දිගටම? remove_account_link_success=සම්බන්ධිත ගිණුම ඉවත් කර ඇත. - orgs_none=ඔබ කිසිදු සංවිධානයක සාමාජිකයෙකු නොවේ. repos_none=ඔබට කිසිදු ගබඩාවක් නොමැත - delete_account=ඔබගේ ගිණුම මකන්න delete_prompt=මෙම මෙහෙයුම ඔබගේ පරිශීලක ගිණුම ස්ථිරවම මකා දමනු ඇත. එය අහෝසි කළ නොහැක. delete_with_all_comments=ඔබගේ ගිණුම %sට වඩා අඩුය. අවතාර අදහස් වළක්වා ගැනීම සඳහා, සියලු ගැටළු/මහජන අදහස් ඒ සමඟ මකා දැමෙනු ඇත. confirm_delete_account=මකාදැමීම තහවුරු කරන්න delete_account_title=පරිශීලක ගිණුම මකන්න delete_account_desc=ඔබට මෙම පරිශීලක ගිණුම ස්ථිරවම මකා දැමීමට අවශ්ය බව ඔබට විශ්වාසද? - email_notifications.enable=වි-තැපැල් දැනුම්දීම් සබල කරන්න email_notifications.onmention=සැඳහුම් සඳහා තැපැල් කරන්න email_notifications.disable=වි-තැපැල් දැනුම්දීම් අබල කරන්න email_notifications.submit=ඊ-තැපැල් මනාප සකසන්න - visibility=පරිශීලක දෘශ්යතාව visibility.public=ප්‍රසිද්ධ visibility.public_tooltip=සියලුම පරිශීලකයින්ට දෘශ්යමාන වේ @@ -723,6 +675,15 @@ visibility.limited=සීමිත visibility.limited_tooltip=පරිශීලකයන් පමණක් ලොගින් වී කිරීමට දෘශ්යමාන visibility.private=පෞද්ගලික visibility.private_tooltip=සංවිධාන සාමාජිකයින්ට පමණක් දෘශ්යමාන වේ +comment_type_group_title=සිරැසිය +ssh_key_verified=සත්යාපිත යතුර +ssh_key_verify=සත්යාපනය කරන්න +ssh_token_required=පහත ටෝකනය සඳහා ඔබ අත්සනක් ලබා දිය යුතුය +ssh_token=ටෝකනය +ssh_token_help=ඔබට අත්සනක් ජනනය කළ හැකිය: +access_token_deletion_cancel_action=අවලංගු කරන්න +access_token_deletion_confirm_action=මකන්න +link_account=ගිණුම සබැඳින්න [repo] new_repo_helper=ප්රතිශෝධන ඉතිහාසය ඇතුළුව සියලුම ව්යාපෘති ලිපිගොනු ගබඩාවක් අඩංගු වේ. දැනටමත් එය වෙනත් තැනක තිබේද? නිධිය සංක්රමණය කරන්න. @@ -805,20 +766,14 @@ delete_preexisting=පෙර පවතින ගොනු මකන්න delete_preexisting_content=%sහි ගොනු මකන්න delete_preexisting_success=%sදී සම්මත නොකළ ගොනු මකාදැමුවා blame_prior=මෙම වෙනසට පෙර දොස් බලන්න - transfer.accept=මාරු කිරීම පිළිගන්න -transfer.accept_desc="%s" වෙත මාරු කරන්න -transfer.reject_desc="%s" වෙත මාරු කිරීම අවලංගු කරන්න - +transfer.accept_desc=`"%s" වෙත මාරු කරන්න` +transfer.reject_desc=" desc.private=පෞද්ගලික desc.public=ප්‍රසිද්ධ desc.internal=අභ්‍යන්තර desc.archived=සංරක්ෂිත - template.topics=මාතෘකා - - - migrate_options_lfs=LFS ගොනු සංක්රමණය migrate_options_lfs_endpoint.label=LFS එන්පොයින්ට් migrate_options_lfs_endpoint.description=සංක්රමණය ඔබගේ Git දුරස්ථ භාවිතා කිරීමට උත්සාහ කරනු ඇත LFS සේවාදායකය තීරණය. නිධිය LFS දත්ත වෙන කොහේ හරි ගබඩා කර තිබේ නම් ඔබට අභිරුචි අන්ත ලක්ෂ්යයක් නියම කළ හැකිය. @@ -862,7 +817,6 @@ migrate.migrating_labels=සංක්රමණය ලේබල migrate.migrating_releases=සංක්රමණ නිකුතු migrate.migrating_issues=සංක්රමණ ගැටළු migrate.migrating_pulls=අදින්න ඉල්ලීම් සංක්රමණය - mirror_from=කැඩපත forked_from=සිට දෙබලක generated_from=වෙතින් ජනනය කරන ලද @@ -875,19 +829,17 @@ watch=වොච් star=ස්ටාර් fork=දෙබලක download_archive=කෝෂ්ඨය බාගන්න - no_desc=සවිස්තරයක් නැත quick_guide=ඉක්මන් මාර්ගෝපදේශය clone_this_repo=මෙම ගබඩාව පරිගණක ක්රිඩාවට සමාන create_new_repo_command=විධාන රේඛාවේ නව ගබඩාවක් නිර්මාණය කිරීම push_exist_repo=විධාන රේඛාවේ සිට පවත්නා ගබඩාවක් තල්ලු කිරීම empty_message=මෙම ගබඩාව කිසිදු අන්තර්ගතයක් අඩංගු නොවේ. - code=කේතය code.desc=ප්රවේශ මූල කේතය, ගොනු, විවරයන් සහ ශාඛා. branch=ශාඛාව tree=ගස -clear_ref=`පැහැදිලි වත්මන් සඳහන` +clear_ref=පැහැදිලි වත්මන් සඳහන filter_branch_and_tag=පෙරහන් ශාඛාව හෝ ටැගය find_tag=ටැගය සොයන්න branches=ශාඛා @@ -898,7 +850,6 @@ project_board=ව්‍යාපෘති labels=ලේබල org_labels_desc=මෙම සංවිධානය යටතේ සියලුම ගබඩාවලදී සමඟ භාවිතා කළ හැකි සංවිධාන මට්ටමේ ලේබල් org_labels_desc_manage=කළමනාකරණය - milestones=සන්ධිස්ථාන commits=විවරයන් commit=කැප @@ -914,7 +865,6 @@ file_view_rendered=දැක්ම විදැහුම file_view_raw=අමු දැක්ම file_permalink=මාලින්ක් file_too_large=ගොනුව පෙන්වීමට තරම් විශාලයි. - file_copy_permalink=පිටපත් මාමලින්ක් video_not_supported_in_browser=ඔබගේ බ්රව්සරය HTML5 'වීඩියෝ' ටැගය සඳහා සහය නොදක්වයි. audio_not_supported_in_browser=ඔබගේ බ්රව්සරය HTML5 'ශ්රව්ය' ටැගය සඳහා සහය නොදක්වයි. @@ -930,7 +880,6 @@ download_file=ගොනුව බාගන්න normal_view=සාමාන්ය දැක්ම line=මාර්ගය lines=රේඛා - editor.new_file=නව ගොනුව editor.upload_file=ගොනුව උඩුගත කරන්න editor.edit_file=ගොනුව සංස්කරණය @@ -987,7 +936,6 @@ editor.cannot_commit_to_protected_branch=ආරක්ෂිත ශාඛාව editor.no_commit_to_branch=ශාඛාවට කෙලින්ම කැපවිය නොහැකි නිසා: editor.user_no_push_to_branch=පරිශීලකයාට ශාඛාවට තල්ලු කළ නොහැක editor.require_signed_commit=ශාඛාවට අත්සන් කළ කැපවීමක් අවශ්ය වේ - commits.desc=මූලාශ්ර කේත වෙනස් කිරීමේ ඉතිහාසය පිරික්සන්න. commits.commits=විවරයන් commits.no_commits=පොදු කිසිදු විවරයක් නැත. '%s' සහ '%s' සම්පූර්ණයෙන්ම වෙනස් ඉතිහාස ඇත. @@ -1005,10 +953,7 @@ commits.signed_by=විසින් අත්සන් කරන ලදී commits.signed_by_untrusted_user=විශ්වාස නොකරන පරිශීලකයා විසින් අත්සන් කරන ලදී commits.signed_by_untrusted_user_unmatched=කමිටුව නොගැලපේ, විශ්වාස නොකරන පරිශීලකයා විසින් අත්සන් කරන ලදී commits.gpg_key_id=ජීපීජී යතුරෙහි හැඳු. - - ext_issues.desc=බාහිර නිකුතුවකට සම්බන්ධ වන්න ට්රැකර්. - projects=ව්‍යාපෘති projects.desc=ව්යාපෘති මණ්ඩලවල ගැටළු සහ අදින කළමනාකරණය කිරීම. projects.description=විස්තරය (විකල්ප) @@ -1042,7 +987,6 @@ projects.board.deletion_desc=ව්යාපෘති මණ්ඩලයක් projects.board.color=වර්ණය projects.open=විවෘත projects.close=වසන්න - issues.desc=දෝෂ වාර්තා, කාර්යයන් සහ සන්ධිස්ථාන සංවිධානය කිරීම. issues.filter_assignees=පෙරහන් ස්පෙක්ටරය issues.filter_milestones=සන්ධිස්ථානයක් පෙරහන් @@ -1092,18 +1036,18 @@ issues.add_labels=%s ලේබල් %sඑකතු කරන ලදි issues.remove_label=%s ලේබලය %sඉවත් කරන ලදි issues.remove_labels=%s ලේබල් %sඉවත් කර ඇත issues.add_remove_labels=%s එකතු කර %s ලේබල් %sඉවත් කරන ලදි -issues.add_milestone_at=`මෙය %s සන්ධිස්ථානයට එකතු කළේය %s` -issues.deleted_milestone=`(මකාදැමූ)` -issues.deleted_project=`(මකාදැමූ)` -issues.self_assign_at=`ස්වයං පවරා ඇති මෙම %s` -issues.remove_self_assignment=`ඔවුන්ගේ පැවරුම ඉවත් කර %s` +issues.add_milestone_at=මෙය %s සන්ධිස්ථානයට එකතු කළේය %s +issues.deleted_milestone=(මකාදැමූ) +issues.deleted_project=(මකාදැමූ) +issues.self_assign_at=ස්වයං පවරා ඇති මෙම %s +issues.remove_self_assignment=ඔවුන්ගේ පැවරුම ඉවත් කර %s issues.change_title_at=%s සිට %s දක්වා මාතෘකාව වෙනස් කර ඇත %s issues.change_ref_at=%s සිට %s දක්වා වෙනස් කර ඇත %s -issues.remove_ref_at=`ඉවත් කරන ලද යොමු %s %s` -issues.add_ref_at=`එකතු කරන ලද යොමු %s %s` -issues.delete_branch_at=`මකාදැමූ ශාඛාව %s %s` +issues.remove_ref_at=ඉවත් කරන ලද යොමු %s %s +issues.add_ref_at=එකතු කරන ලද යොමු %s %s +issues.delete_branch_at=මකාදැමූ ශාඛාව %s %s issues.filter_label=ලේබලය -issues.filter_label_exclude=Labels` ඉවත් කිරීමට alt + ක්ලික් කරන්න/ඇතුළු කරන්න +issues.filter_label_exclude="""Labels` ඉවත් කිරීමට alt + ක්ලික් කරන්න/ඇතුළු කරන්න""" issues.filter_label_no_select=සියලු ලේබල issues.filter_milestone=සන්ධිස්ථානය issues.filter_milestone_no_select=සියලු සන්ධිස්ථාන @@ -1142,7 +1086,7 @@ issues.next=ඊළඟ issues.open_title=විවෘත issues.closed_title=වසා ඇත issues.num_comments=අදහස් %d -issues.commented_at=`අදහස් %s` +issues.commented_at=අදහස් %s issues.delete_comment_confirm=ඔබට මෙම අදහස මකා දැමීමට අවශ්ය බව ඔබට විශ්වාසද? issues.context.copy_link=සබැඳිය පිටපත් issues.context.quote_reply=පිළිතුර උපුටා @@ -1151,21 +1095,21 @@ issues.context.edit=සංස්කරණය issues.context.delete=මකන්න issues.no_content=තවම අන්තර්ගතයක් නැත. issues.close_issue=වසන්න -issues.pull_merged_at=`ඒකාබද්ධ කැප %[2]ගේ %[3]ගේ %[4]දින +issues.pull_merged_at=ඒකාබද්ධ කැප %[2]ගේ %[3]ගේ %[4]දින issues.manually_pull_merged_at=`ඒකාබද්ධ කැප %[2]ගේ %[3]ගේ අත්පොත%[4]s` issues.close_comment_issue=අදහස් දක්වා වසන්න issues.reopen_issue=නැවත විවෘත කරන්න issues.reopen_comment_issue=අදහස් දක්වා විවෘත කරන්න issues.create_comment=අදහස -issues.closed_at=`මෙම ගැටළුව වසා %[2]s` -issues.reopened_at=`මෙම ගැටළුව නැවත විවෘත කරන ලදි %[2]s` +issues.closed_at=මෙම ගැටළුව වසා %[2]s +issues.reopened_at=මෙම ගැටළුව නැවත විවෘත කරන ලදි %[2]s issues.ref_issue_from=මෙම නිකුතුව%[4]හි %[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_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.ref_reopened_from="""මෙම නිකුතුව%[4]s %[2]s`නැවත විවෘත කරන ලදි""" +issues.ref_from=හිම%[1]s issues.poster=පෝස්ටර් issues.collaborator=සහයෝගීතාව issues.owner=හිමිකරු @@ -1195,8 +1139,8 @@ issues.label.filter_sort.reverse_alphabetically=අකාරාදී ප්ර issues.label.filter_sort.by_size=කුඩාම ප්‍රමාණය issues.label.filter_sort.reverse_by_size=විශාලම ප්‍රමාණය issues.num_participants=සහභාගිවන්නන් %d -issues.attachment.open_tab=`නව වගුවක "%s" බැලීමට ක්ලික් කරන්න` -issues.attachment.download=`"%s“ බාගැනීමට ඔබන්න` +issues.attachment.open_tab=නව වගුවක "%s" බැලීමට ක්ලික් කරන්න +issues.attachment.download="%s“ බාගැනීමට ඔබන්න issues.subscribe=දායක වන්න issues.unsubscribe=දායක වන්න issues.lock=ලොක් සංවාදය @@ -1221,31 +1165,31 @@ issues.comment_on_locked=අගුලු දමා ඇති ගැටළුව issues.tracker=වේලාව ට්රැකර් issues.start_tracking_short=ටයිමරයට ගැලපෙන ලෙස issues.start_tracking=ආරම්භ වේලාව ට්රැකින් -issues.start_tracking_history=`වැඩ ආරම්භ %s` +issues.start_tracking_history=වැඩ ආරම්භ %s issues.tracker_auto_close=මෙම ගැටළුව වසා දැමූ විට ටයිමරයට ස්වයංක්රීයව නතර වේ -issues.tracking_already_started=`ඔබ දැනටමත් හි තවත් නිකුතුවක්හි කාලය සොයා ගැනීම ආරම්භ කර ඇත! ` +issues.tracking_already_started="ඔබ දැනටමත් හි තවත් නිකුතුවක්හි කාලය සොයා ගැනීම ආරම්භ කර ඇත! " issues.stop_tracking=ටයිමරයට නවත්වන්න -issues.stop_tracking_history=`නතර වැඩ %s` +issues.stop_tracking_history=නතර වැඩ %s issues.cancel_tracking=ඉවතලන්න -issues.cancel_tracking_history=`අවලංගු කරන ලද කාලය ලුහුබැඳීම %s` +issues.cancel_tracking_history=අවලංගු කරන ලද කාලය ලුහුබැඳීම %s issues.add_time=අතින් වේලාව එකතු කරන්න issues.del_time=මෙම කාල ලොග් මකන්න issues.add_time_short=කාලය එකතු කරන්න issues.add_time_cancel=අවලංගු කරන්න -issues.add_time_history=`එකතු කළ කාලය %s` -issues.del_time_history=`මකාදැමුවා කාලය ගත %s` +issues.add_time_history=එකතු කළ කාලය %s +issues.del_time_history=මකාදැමුවා කාලය ගත %s issues.add_time_hours=පැය issues.add_time_minutes=විනාඩි issues.add_time_sum_to_small=කාලයක් ඇතුළු නොවීය. issues.time_spent_total=වැය කළ මුළු කාලය -issues.time_spent_from_all_authors=වැය කළ මුළු කාලය: %s` +issues.time_spent_from_all_authors="""වැය කළ මුළු කාලය: %s`""" issues.due_date=නියමිත දිනය issues.invalid_due_date_format=නියමිත දින ආකෘතිය 'yyy-mm-dd' විය යුතුය. 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]ගේ %[6]s` +issues.force_push_codes=බලය-pushed%[1]s සිට %[2]s %[4]ගේ %[6]s issues.due_date_form=Yyy-mm-dd issues.due_date_form_add=නියමිත දිනය එකතු කරන්න issues.due_date_form_edit=සංස්කරණය @@ -1261,8 +1205,8 @@ issues.dependency.add=පරායත්ත එක් කරන්න… issues.dependency.cancel=අවලංගු කරන්න issues.dependency.remove=ඉවත් කරන්න issues.dependency.remove_info=මෙම පරායත්තය ඉවත් කරන්න -issues.dependency.added_dependency=`%s නව පරායත්තයක් එකතු කළා` -issues.dependency.removed_dependency=`%s පරායත්තයක් ඉවත් කළා` +issues.dependency.added_dependency=%s නව පරායත්තයක් එකතු කළා +issues.dependency.removed_dependency=%s පරායත්තයක් ඉවත් කළා issues.dependency.pr_closing_blockedby=මෙම ඇදීමේ ඉල්ලීම අවසන් කිරීම පහත සඳහන් ගැටළු මගින් අවහිර කරනු ලැබේ issues.dependency.issue_closing_blockedby=මෙම ගැටළුව අවසන් කිරීම පහත සඳහන් ගැටළු මගින් අවහිර කරනු ලැබේ issues.dependency.issue_close_blocks=මෙම ගැටළුව පහත සඳහන් ගැටළු අවසන් කිරීම @@ -1313,10 +1257,8 @@ issues.content_history.created=නිර්මාණය issues.content_history.delete_from_history=ඉතිහාසයෙන් මකන්න issues.content_history.delete_from_history_confirm=ඉතිහාසයෙන් මකන්න? issues.content_history.options=විකල්ප - compare.compare_base=පදනම compare.compare_head=සසඳන්න - pulls.desc=අදින්න ඉල්ලීම් සහ කේත සමාලෝචන සක්රීය කරන්න. pulls.new=නව අදින්න ඉල්ලීම pulls.compare_changes=නව අදින්න ඉල්ලීම @@ -1329,11 +1271,11 @@ pulls.filter_branch=ශාඛාව පෙරන්න pulls.no_results=ප්රතිඵල සොයාගත නොහැකි විය. pulls.nothing_to_compare=මෙම ශාඛා සමාන වේ. අදින්න ඉල්ලීමක් නිර්මාණය කිරීමට අවශ්ය නැත. pulls.nothing_to_compare_and_allow_empty_pr=මෙම ශාඛා සමාන වේ. මෙම මහජන සම්බන්ධතා හිස් වනු ඇත. -pulls.has_pull_request=`මෙම ශාඛා අතර අදින්න ඉල්ලීම දැනටමත් පවතී: %[2]s #%[3]d` +pulls.has_pull_request=මෙම ශාඛා අතර අදින්න ඉල්ලීම දැනටමත් පවතී: %[2]s #%[3]d pulls.create=අදින්න ඉල්ලීම නිර්මාණය pulls.title_desc=%[1]d සිට %[2]s දක්වා %[3]s pulls.merged_title_desc=මර්ජ්%[1]d සිට %[2]s දක්වා %[3]s %[4]s -pulls.change_target_branch_at=`ඉලක්කගත ශාඛාව %s සිට %s %sදක්වා වෙනස් කර ඇත` +pulls.change_target_branch_at=ඉලක්කගත ශාඛාව %s සිට %s %sදක්වා වෙනස් කර ඇත pulls.tab_conversation=සංවාදය pulls.tab_commits=විවරයන් pulls.tab_files=වෙනස් වූ ගොනු @@ -1345,7 +1287,7 @@ pulls.manually_merged=අතින් සංයුක්ත කර ඇත pulls.manually_merged_as=මෙම අදින්න ඉල්ලීම අතින් %[2]ගේලෙස ඒකාබද්ධ කර ඇත. pulls.is_closed=අදින්න ඉල්ලීම වසා දමා ඇත. pulls.has_merged=මෙම අදින්න ඉල්ලීම ඒකාබද්ධ කර ඇත. -pulls.title_wip_desc=0අහම්බෙන් ඒකාබද්ධ කිරීමෙන් අදින්න ඉල්ලීම වැළැක්වීම සඳහා %s සමඟ මාතෘකාව ආරම්භ කරන්න. ` +pulls.title_wip_desc="""0අහම්බෙන් ඒකාබද්ධ කිරීමෙන් අදින්න ඉල්ලීම වැළැක්වීම සඳහා %s සමඟ මාතෘකාව ආරම්භ කරන්න. `""" pulls.cannot_merge_work_in_progress=මෙම අදින්න ඉල්ලීම ක්රියාත්මක වන කාර්යයක් ලෙස සලකුණු කර ඇත. pulls.still_in_progress=තවමත් ක්රියාත්මක වෙමින් තිබේද? pulls.add_prefix=%s උපසර්ගය එකතු කරන්න @@ -1374,7 +1316,6 @@ pulls.reject_count_n=වෙනස් කිරීමේ ඉල්ලීම් %d pulls.waiting_count_1=%d සමාලෝචන බලා pulls.waiting_count_n=%d සමාලෝචන බලා pulls.wrong_commit_id=ඉලක්කගත ශාඛාවේ කැපවූ හැඳුනුම්පතක් විය යුතුය - pulls.no_merge_desc=සියලු නිධි ඒකාබද්ධ විකල්ප අක්රීය කර ඇති නිසා මෙම අදින්න ඉල්ලීම ඒකාබද්ධ කළ නොහැක. pulls.no_merge_helper=ගබඩාවේ සැකසුම් ඒකාබද්ධ විකල්ප සක්රීය කරන්න හෝ අදින්න ඉල්ලීම අතින් ඒකාබද්ධ කරන්න. pulls.no_merge_wip=එය ප්රගතියේ කාර්යයක් ලෙස සලකුණු කර ඇති නිසා මෙම අදින්න ඉල්ලීම ඒකාබද්ධ කළ නොහැකිය. @@ -1387,7 +1328,6 @@ pulls.squash_merge_pull_request=ස්කොෂ් කැපීමට සාද pulls.merge_manually=අතින් සංයුක්ත කර ඇත pulls.merge_commit_id=ඒකාබද්ධ කිරීමේ හැඳුනුම්පත pulls.require_signed_wont_sign=ශාඛාවට අත්සන් කළ කොපියක් අවශ්ය වුවද මෙම ඒකාබද්ධ කිරීම අත්සන් නොකෙරේ - pulls.invalid_merge_option=ඔබ මෙම අදින්න ඉල්ලීම සඳහා මෙම ඒකාබද්ධ විකල්පය භාවිතා කළ නොහැක. pulls.merge_conflict=ඒකාබද්ධ කිරීම අසමත් විය: ඒකාබද්ධ වන අතර ගැටුමක් ඇති විය. ඉඟිය: වෙනත් උපාය මාර්ගයක් උත්සාහ කරන්න pulls.merge_conflict_summary=දෝෂ පණිවිඩය @@ -1397,7 +1337,7 @@ pulls.rebase_conflict_summary=දෝෂ පණිවිඩය pulls.unrelated_histories=ඒකාබද්ධ කිරීම අසමත් විය: ඒකාබද්ධ හිස සහ පාදය පොදු ඉතිහාසයක් බෙදා නොගනී. ඉඟිය: වෙනත් උපාය මාර්ගයක් උත්සාහ කරන්න pulls.merge_out_of_date=ඒකාබද්ධ කිරීම අසමත් විය: ඒකාබද්ධ කිරීම ජනනය කරන අතර, පදනම යාවත්කාලීන කරන ලදී. ඉඟිය: නැවත උත්සාහ කරන්න. pulls.push_rejected_summary=පූර්ණ ප්රතික්ෂේප පණිවිඩය -pulls.open_unmerged_pull_exists=සමාන ගුණාංග සහිත අදින්න ඉල්ලීමක් (#%d) ඇති බැවින් ඔබට නැවත විවෘත කිරීමේ මෙහෙයුමක් කළ නොහැක. ` +pulls.open_unmerged_pull_exists=සමාන ගුණාංග සහිත අදින්න ඉල්ලීමක් (#%d) ඇති බැවින් ඔබට නැවත විවෘත කිරීමේ මෙහෙයුමක් කළ නොහැක. pulls.status_checking=සමහර චෙක්පත් බලා ඇත pulls.status_checks_success=සියලුම චෙක්පත් සාර්ථක විය pulls.status_checks_warning=සමහර චෙක්පත් අනතුරු ඇඟවීම් වාර්තා කරයි @@ -1410,16 +1350,11 @@ pulls.update_branch_rebase=රිබේස් මගින් ශාඛාව pulls.update_branch_success=ශාඛා යාවත්කාලීන කිරීම සාර්ථක විය pulls.update_not_allowed=ශාඛාව යාවත්කාලීන කිරීමට ඔබට අවසර නැත pulls.outdated_with_base_branch=මෙම ශාඛාව මූලික ශාඛාව සමඟ දිවයයි -pulls.closed_at=`මෙම අදින්න ඉල්ලීම වසා %[2]s` -pulls.reopened_at=`මෙම අදින්න ඉල්ලීම නැවත විවෘත කරන ලදි %[2]s` -pulls.merge_instruction_hint=`ඔබට විධාන රේඛා උපදෙස්ද නැරඹිය හැකිය. ` +pulls.closed_at=මෙම අදින්න ඉල්ලීම වසා %[2]s +pulls.reopened_at=මෙම අදින්න ඉල්ලීම නැවත විවෘත කරන ලදි %[2]s +pulls.merge_instruction_hint="ඔබට විධාන රේඛා උපදෙස්ද නැරඹිය හැකිය. " pulls.merge_instruction_step1_desc=ඔබගේ ව්යාපෘති ගබඩාවෙන්, නව ශාඛාවක් පරීක්ෂා කර වෙනස්කම් පරීක්ෂා කරන්න. pulls.merge_instruction_step2_desc=Gitea හි වෙනස්කම් සහ යාවත්කාලීන කිරීම ඒකාබද්ධ කරන්න. - - - - - milestones.new=නව සන්ධිස්ථානයක් milestones.closed=%s වසා ඇත milestones.update_ago=යාවත්කාලීන %s පෙර @@ -1448,7 +1383,6 @@ milestones.filter_sort.least_complete=අවම වශයෙන් සම්ප milestones.filter_sort.most_complete=වඩාත්ම සම්පූර්ණයි milestones.filter_sort.most_issues=බොහෝ ප්රශ්න milestones.filter_sort.least_issues=අවම ගැටළු - signing.will_sign=මෙම කැප කිරීම '%s' යතුර සමඟ අත්සන් කරනු ලැබේ signing.wont_sign.error=කැපවීමට අත්සන් කළ හැකිදැයි පරීක්ෂා කිරීමේදී දෝෂයක් ඇති විය signing.wont_sign.nokey=මෙම කැපවීමට අත්සන් කිරීමට කිසිදු යතුරක් නොමැත @@ -1462,9 +1396,7 @@ signing.wont_sign.headsigned=හිස කැපකිරීම අත්සන signing.wont_sign.commitssigned=සම්බන්ධ සියලුම සංක්රමණ අත්සන් කර නොමැති බැවින් ඒකාබද්ධ කිරීම අත්සන් නොකෙරේ signing.wont_sign.approved=මහජන සම්බන්ධතා අනුමත කර නොමැති බැවින් ඒකාබද්ධ කිරීම අත්සන් නොකෙරේ signing.wont_sign.not_signed_in=ඔබ අත්සන් කර නැත - ext_wiki.desc=බාහිර විකියකට සබැඳිය. - wiki=විකි wiki.welcome=විකි වෙත සාදරයෙන් පිළිගනිමු. wiki.welcome_desc=විකි ඔබට සහයෝගිතාකරුවන් සමඟ ලේඛන ලිවීමට සහ බෙදා ගැනීමට ඉඩ දෙයි. @@ -1487,7 +1419,6 @@ wiki.page_already_exists=එකම නමක් සහිත විකි පි wiki.reserved_page=විකි පිටු නාමය '%s' වෙන් කර ඇත. wiki.pages=පිටු wiki.last_updated=අවසන් වරට යාවත්කාලීන කිරීම %s - activity=ක්‍රියාකාරකම activity.period.filter_label=කාල සීමාව: activity.period.daily=දවස් 1 @@ -1553,13 +1484,11 @@ activity.git_stats_addition_n=%d එකතු කිරීම් activity.git_stats_and_deletions=සහ activity.git_stats_deletion_1=%d මකාදැමීම activity.git_stats_deletion_n=%d මකාදැමීම් - search=සොයන්න search.search_repo=කෝෂ්ඨය සොයන්න search.fuzzy=සිනිඳු search.match=තරගය search.results=%s හි "%s" සඳහා සෙවුම් ප්‍රතිඵල - settings=සැකසුම් settings.desc=සැකසුම් යනු ගබඩාව සඳහා සැකසුම් කළමනාකරණය කළ හැකි ස්ථානයයි settings.options=කෝෂ්ඨය @@ -1828,8 +1757,8 @@ settings.dismiss_stale_approvals=ස්ථාවර අනුමැතිය බ settings.dismiss_stale_approvals_desc=අදින්න ඉල්ලීමෙහි අන්තර්ගතය වෙනස් කරන නව විවරයන් ශාඛාවට තල්ලු කරන විට, පැරණි අනුමත කිරීම් නිෂ්ප්රභා කරනු ලැබේ. settings.require_signed_commits=අත්සන් කළ යුතු settings.require_signed_commits_desc=අත්සන් නොකළ හෝ සත්යාපනය කළ නොහැකි නම් මෙම ශාඛාවට තල්ලු කිරීම ප්රතික්ෂේප කරන්න. -settings.protect_protected_file_patterns=ආරක්ෂිත ගොනු රටා (semicolon '\;' භාවිතා වෙන්): -settings.protect_unprotected_file_patterns=අනාරක්ෂිත ගොනු රටා (semicolon '\;' භාවිතා වෙන්): +settings.protect_protected_file_patterns=ආරක්ෂිත ගොනු රටා (semicolon ';' භාවිතා වෙන්): +settings.protect_unprotected_file_patterns=අනාරක්ෂිත ගොනු රටා (semicolon ';' භාවිතා වෙන්): settings.add_protected_branch=ආරක්ෂාව සක්රීය කරන්න settings.delete_protected_branch=ආරක්ෂාව අක්‍රීය කරන්න settings.protected_branch_deletion=ශාඛා ආරක්ෂණය අක්රීය කරන්න @@ -1905,7 +1834,6 @@ settings.rename_branch_success=ශාඛාව %s සාර්ථකව %sලෙ settings.rename_branch_from=පරණ ශාඛාවේ නම settings.rename_branch_to=නව ශාඛාවේ නම settings.rename_branch=ශාඛාව යළි නම් කරන්න - diff.browse_source=මූලාශ්‍රය පිරික්සන්න diff.parent=මව් diff.commit=කැප @@ -1956,7 +1884,6 @@ diff.protected=ආරක්ෂිත diff.image.side_by_side=පැත්ත විසින් පැත්ත diff.image.swipe=ස්වයිප් diff.image.overlay=අතුරා - releases.desc=ව්යාපෘති අනුවාදයන් සහ බාගත කිරීම් නිරීක්ෂණය කරන්න. release.releases=නිකුතු release.detail=නිකුතුවේ විස්තර @@ -1998,7 +1925,6 @@ release.downloads=බාගැනීම් release.download_count=බාගැනීම්: %s release.add_tag_msg=ටැග් පණිවිඩයක් ලෙස නිකුත් කිරීමේ මාතෘකාව සහ අන්තර්ගතය භාවිතා කරන්න. release.add_tag=ටැග පමණක් සාදන්න - branch.name=ශාඛාවේ නම branch.search=ශාඛා සොයන්න branch.already_exists='%s' නම් ශාඛාවක් දැනටමත් පවතී. @@ -2029,20 +1955,25 @@ branch.confirm_create_branch=ශාඛාව සාදන්න branch.new_branch=නව ශාඛාවක් සාදන්න branch.new_branch_from='%s' වෙතින් නව ශාඛාවක් සාදන්න branch.renamed=ශාඛාව %s %sලෙස නම් කරන ලදී. - tag.create_tag=ටැගය නිර්මාණය %s - tag.create_success=ටැගය '%s' නිර්මාණය කර ඇත. - topic.manage_topics=මාතෘකා කළමනාකරණය topic.done=සිදු topic.count_prompt=ඔබට 25 මාතෘකා වලට වඩා තෝරා ගත නොහැක topic.format_prompt=මාතෘකා අකුරකින් හෝ අංකයකින් ආරම්භ කළ යුතුය, දෂ්ට කිරීම් ඇතුළත් කළ හැකිය ('-') සහ අක්ෂර 35 ක් දිගු විය හැකිය. - - error.csv.too_large=එය ඉතා විශාල නිසා මෙම ගොනුව විදැහුම්කරණය කළ නොහැක. error.csv.unexpected=%d පේළියේ සහ %dතීරුවේ අනපේක්ෂිත චරිතයක් අඩංගු බැවින් මෙම ගොනුව විදැහුම්කරණය කළ නොහැක. error.csv.invalid_field_count=මෙම ගොනුව රේඛාවේ වැරදි ක්ෂේත්ර සංඛ්යාවක් ඇති බැවින් එය විදැහුම්කරණය කළ නොහැක %d. +desc.public_template=සැකිල්ල +template.webhooks=වෙබ්කොකු +template.avatar=අවතාර් +template.issue_labels=නිකුත් ලේබල +issues.filter_project_none=ව්‍යාපෘති නැත +issues.draft_title=කටුපිටපත +issues.delete=මකන්න +search.code_no_results=ඔබගේ සෙවුම් පදය ගැලපෙන ප්රභව කේතයක් නොමැත. +settings.event_wiki=විකි +branch.create_branch_operation=ශාඛාව සාදන්න [org] org_name_holder=සංවිධානයේ නම @@ -2065,11 +1996,9 @@ team_access_desc=කෝෂ්ඨයට ප්‍රවේශය team_permission_desc=අවසරය team_unit_desc=ගබඩාවට ප්රවේශ වීමට ඉඩ දෙන්න team_unit_disabled=(අබල කර ඇත) - form.name_reserved=සංවිධානයේ නම '%s' වෙන් කර ඇත. form.name_pattern_not_allowed=සංවිධානයේ නාමයක '%s' රටාවට අවසර නැත. form.create_org_not_allowed=සංවිධානයක් නිර්මාණය කිරීමට ඔබට අවසර නැත. - settings=සැකසුම් settings.options=සංවිධානය settings.full_name=සම්පූර්ණ නම @@ -2083,7 +2012,6 @@ settings.visibility.limited=සීමිත (පරිශීලකයන් ප settings.visibility.limited_shortname=සීමිත settings.visibility.private=පුද්ගලික (සංවිධාන සාමාජිකයින්ට පමණක් දෘශ්යමාන වේ) settings.visibility.private_shortname=පෞද්ගලික - settings.update_settings=සැකසුම් යාවත්කාල කරන්න settings.update_setting_success=සංවිධානයේ සැකසුම් යාවත්කාල කර ඇත. settings.change_orgname_prompt=සටහන: සංවිධානයේ නම වෙනස් කිරීම සංවිධානයේ ඒ.ස.නි. ද වෙනස් කරයි. @@ -2096,9 +2024,7 @@ settings.confirm_delete_account=මකාදැමීම තහවුරු ක settings.delete_org_title=සංවිධානය මකන්න settings.delete_org_desc=මෙම සංවිධානය ස්ථිරවම මකා දමනු ඇත. දිගටම? settings.hooks_desc=මෙම සංවිධානය යටතේ සියලුම ගබඩාවන් සඳහා මුලපුරනු ලබන වෙබ් කොකු එකතු කරන්න. - settings.labels_desc=මෙම සංවිධානය යටතේ සියලුම ගබඩාවලදී සඳහා ගැටළු සඳහා භාවිතා කළ හැකි ලේබල් එකතු කරන්න. - members.membership_visibility=සාමාජිකත්ව දෘශ්යතාව: members.public=දෘශ්යමාන members.public_helper=සැඟවුනු කරන්න @@ -2113,7 +2039,6 @@ members.leave=හැරයන්න members.leave.detail=%s හැරයනවාද? members.invite_desc=%sවෙත නව සාමාජිකයෙකු එක් කරන්න: members.invite_now=දැන් ආරාධනා කරන්න - teams.join=එක්වන්න teams.leave=හැරයන්න teams.leave.detail=%s හැරයනවාද? @@ -2154,6 +2079,8 @@ teams.all_repositories_helper=කණ්ඩායමට සියලුම ගබ teams.all_repositories_read_permission_desc=මෙම කණ්ඩායම ප්රදානය කියවන්න ප්රවේශ සියලු ගබඩාවන්ට: සාමාජිකයින්ට නිධි බැලීම හා පරිගණක ක්රිඩාවට සමාන කළ හැකිය. teams.all_repositories_write_permission_desc=මෙම කණ්ඩායම ප්රදානය කරයි වෙත ප්රවේශය ලියන්න සියලු ගබඩාවන්ට: සාමාජිකයින්ට කියවීමට සහ ගබඩාවන්ට තල්ලු කළ හැකිය. teams.all_repositories_admin_permission_desc=මෙම කණ්ඩායම ප්රදානය කරයි පරිපාලක වෙත ප්රවේශය සියලු ගබඩාවන්ට: සාමාජිකයින්ට කියවීමට, තල්ලු කිරීමට සහ ගබඩාවන්ට සහයෝගීකයින් එකතු කිරීමට. +members=සාමාජිකයින් +teams.read_access=කියවූ [admin] dashboard=උපකරණ පුවරුව @@ -2169,7 +2096,6 @@ monitor=අධීක්ෂණය first_page=පළමු last_page=පසුගිය total=මුළු: %d - dashboard.statistic=සාරාංශය dashboard.operations=නඩත්තු මෙහෙයුම් dashboard.system_status=පද්ධතියේ තත්වය @@ -2242,7 +2168,6 @@ dashboard.last_gc_pause=අවසන් GC විරාමය dashboard.gc_times=GC ටයිම්ස් dashboard.delete_old_actions=සියලු පැරණි ක්රියා දත්ත සමුදායෙන් මකන්න dashboard.delete_old_actions.started=දත්ත සමුදාය ආරම්භ සිට සියලු පැරණි ක්රියා මකන්න. - users.user_manage_panel=පරිශීලක ගිණුම් කළමනාකරණය users.new_account=පරිශීලක ගිණුමක් සාදන්න users.name=පරිශීලක නාමය @@ -2291,7 +2216,6 @@ 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 ආබාධිත - emails.email_manage_panel=පරිශීලක විද්යුත් කළමනාකරණය emails.primary=ප්රාථමික emails.activated=සක්රිය @@ -2304,13 +2228,11 @@ emails.not_updated=ඉල්ලූ විද්යුත් තැපැල් emails.duplicate_active=මෙම විද්යුත් තැපැල් ලිපිනය වෙනත් පරිශීලකයෙකු සඳහා දැනටමත් ක්රියාකාරී වේ. emails.change_email_header=විද්යුත් ගුණාංග යාවත්කාලීන කරන්න emails.change_email_text=මෙම ඊ-තැපැල් ලිපිනය යාවත්කාලීන කිරීමට ඔබට අවශ්යද? - orgs.org_manage_panel=සංවිධාන කළමනාකරණය orgs.name=නම orgs.teams=කණ්ඩායම් orgs.members=සාමාජිකයින් orgs.new_orga=නව සංවිධානය - repos.repo_manage_panel=කෝෂ්ඨ කළමනාකරණය repos.unadopted=සම්මත නොකළ ගබඩාවලදී repos.unadopted.no_more=තවත් සම්මත නොකළ ගබඩාවක් සොයාගත නොහැකි විය @@ -2322,18 +2244,14 @@ repos.stars=තරු repos.forks=දෙබලක repos.issues=ගැටළු repos.size=ප්‍රමාණය - - defaulthooks=පෙරනිමි වෙබ් කොකු defaulthooks.desc=ඇතැම් Gitea සිදුවීම් අවුලුවාලන විට වෙබ් හූක්ස් ස්වයංක්රීයව සේවාදායකයකට HTTP පෝස්ට් ඉල්ලීම් කරයි. මෙහි අර්ථ දක්වා ඇති වෙබ්කොකු පැහැර හැරීම් වන අතර සියලු නව ගබඩාවන් වෙත පිටපත් කරනු ලැබේ. තව දුරටත් කියවන්න වෙබ් කොකු මාර්ගෝපදේශය. defaulthooks.add_webhook=පෙරනිමි වෙබ් හූක් එකතු කරන්න defaulthooks.update_webhook=පෙරනිමි වෙබ් හූක් යාවත්කාලීන කරන්න - systemhooks=වෙබ් කොකු පද්ධතිය systemhooks.desc=ඇතැම් Gitea සිදුවීම් අවුලුවාලන විට වෙබ් හූක්ස් ස්වයංක්රීයව සේවාදායකයකට HTTP පෝස්ට් ඉල්ලීම් කරයි. මෙහි අර්ථ Webhooks පද්ධතිය මත සියලු ගබඩාවන් මත ක්රියා කරනු ඇත, ඒ නිසා මෙම ඇති විය හැකි ඕනෑම කාර්ය සාධන ඇඟවුම් සලකා බලන්න. තව දුරටත් කියවන්න වෙබ් කොකු මාර්ගෝපදේශය. systemhooks.add_webhook=පද්ධතිය වෙබ්හූක් එකතු කරන්න systemhooks.update_webhook=වෙබ්හූක් පද්ධතිය යාවත්කාලීන - auths.auth_manage_panel=සත්යාපන ප්රභව කළමනාකරණය auths.new=සත්යාපන මූලාශ්රය එකතු කරන්න auths.name=නම @@ -2434,7 +2352,6 @@ auths.still_in_used=සත්යාපන ප්රභවය තවමත් භ auths.deletion_success=සත්යාපන මූලාශ්රය මකා දමා ඇත. auths.login_source_exist=සත්යාපන ප්රභවය '%s' දැනටමත් පවතී. auths.login_source_of_type_exist=මෙම වර්ගයේ සත්යාපන ප්රභවයක් දැනටමත් පවතී. - config.server_config=සේවාදායකයේ වින්‍යාසය config.app_name=අඩවියේ සිරැසිය config.app_ver=ගිටියා අනුවාදය @@ -2453,7 +2370,6 @@ config.static_file_root_path=ස්ථිතික ගොනු රූට් ම config.log_file_root_path=ලොග් මාර්ගය config.script_type=ස්ක්රිප්ට් වර්ගය config.reverse_auth_user=ප්රතිලෝම පරිශීලක සත්යාපන - config.ssh_config=SSH වින්යාසය config.ssh_enabled=සබල කර ඇත config.ssh_start_builtin_server=Built-දී සේවාදායකය භාවිතා @@ -2465,12 +2381,10 @@ config.ssh_key_test_path=ප්රධාන ටෙස්ට් මාර්ග config.ssh_keygen_path=Keygen ('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.db_config=දත්ත සමුදායෙහි වින්‍යාසය config.db_type=වර්ගය config.db_host=සත්කාරක @@ -2478,7 +2392,6 @@ config.db_name=නම config.db_user=පරිශීලක නාමය config.db_schema=යෝජනා ක්රමය config.db_path=මාර්ගය - config.service_config=සේවාවේ වින්‍යාසය config.register_email_confirm=ලියාපදිංචි වීමට විද්යුත් තැපැල් තහවුරු කිරීම අවශ්ය වේ config.disable_register=ස්වයං ලියාපදිංචිය අක්රීය කරන්න @@ -2501,12 +2414,10 @@ config.default_allow_only_contributors_to_track_time=දායකයින්ට config.no_reply_address=සැඟවුණු ඊ-තැපැල් වසම config.default_visibility_organization=නව සංවිධාන සඳහා පෙරනිමි දෘශ්යතාව config.default_enable_dependencies=පෙරනිමියෙන් නිකුත් යැපීම් සක්රීය - config.webhook_config=වෙබ්හූක් වින්යාසය config.queue_length=පෝලිම් දිග config.deliver_timeout=කාලය ගලවාගන්න config.skip_tls_verify=TLS සත්යාපනය මඟ හරින්න - config.mailer_enabled=සබල කර ඇත config.mailer_name=නම config.mailer_user=පරිශීලක @@ -2518,16 +2429,13 @@ config.test_email_placeholder=වි-තැපෑල (උදා. පරීක් config.send_test_mail=අත්හදා බැලීමේ වි-තැපෑල යවන්න config.test_mail_failed='%s' වෙත පරීක්ෂණ විද්යුත් තැපෑලක් යැවීමට අපොහොසත් විය: %v config.test_mail_sent=පරීක්ෂණ විද්යුත් තැපෑලක් '%s' වෙත යවා ඇත. - config.oauth_config=ඕත් වින්යාසය config.oauth_enabled=සබල කර ඇත - config.cache_config=නිහිතයේ වින්‍යාසය config.cache_adapter=හැඹිලි ඇඩප්ටර config.cache_interval=හැඹිලි පරතරය config.cache_conn=නිහිතයේ සම්බන්ධතාවය config.cache_item_ttl=හැඹිලි අයිතමය TTL - config.session_config=සැසිය වින්යාසය config.session_provider=සැසිය සැපයුම්කරු config.provider_config=සපයන්නා වින්යාස @@ -2536,12 +2444,10 @@ config.gc_interval_time=GC පරතරය වේලාව config.session_life_time=සැසිය ජීවිත කාලය config.https_only=HTTPS පමණි config.cookie_life_time=කුකී ජීවිත කාලය - config.picture_config=පින්තූරය සහ අවතාර් වින්යාසය config.picture_service=පින්තුරය සේවා config.disable_gravatar=ග්‍රැවටාර් අබල කරන්න config.enable_federated_avatar=ෆෙඩරල් අවතාර් සක්රීය කරන්න - config.git_config=ගිට් වින්‍යාසය config.git_disable_diff_highlight=ඩිෆ් සයින්ටැක්ස් ඉස්මතු කරන්න අක්රීය කරන්න config.git_max_diff_lines=මැක්ස් ඩිෆ් ලයින්ස් (තනි ගොනුවක් සඳහා) @@ -2553,7 +2459,6 @@ config.git_mirror_timeout=මිරර් යාවත්කාලීන වේ config.git_clone_timeout=පරිගණක ක්රිඩාවට සමාන මෙහෙයුම් කාලය config.git_pull_timeout=මෙහෙයුම කාල ඉමුද අදින්න config.git_gc_timeout=GC මෙහෙයුම කාලය - config.log_config=ලොග් වින්යාසය config.log_mode=ලොග් ප්රකාරය config.own_named_logger=ලොගර් නම් @@ -2565,8 +2470,6 @@ config.access_log_mode=ප්රවේශ ලොග් ප්රකාරය config.access_log_template=සැකිල්ල config.xorm_log_mode=XORM ලොග් ප්රකාරය config.xorm_log_sql=ලොග් SQL - - monitor.cron=Con කාර්යයන් monitor.name=නම monitor.schedule=කාලසටහන @@ -2606,7 +2509,6 @@ monitor.queue.pool.flush.title=දෝර පෝලිම් monitor.queue.pool.flush.desc=දෝර පෝලිම් හිස් වරක් අවසන් කරන බව සේවකයෙකු එකතු කරනු ඇත, හෝ එය වරක් සිදු. monitor.queue.pool.flush.submit=දෝර කම්කරුවෙකු එකතු කරන්න monitor.queue.pool.flush.added=ෆ්ලෂ් කම්කරුවෙකු%[1]s සඳහා එකතු කරන ලදි - monitor.queue.settings.title=තටාකය සැකසුම් monitor.queue.settings.desc=තටාක ගතිකව ඔවුන්ගේ සේවක පෝලිමේ අවහිර ප්රතිචාර තල්ලුවක් සමග වර්ධනය. මෙම වෙනස්කම් වර්තමාන සේවක කණ්ඩායම්වලට බලපාන්නේ නැත. monitor.queue.settings.timeout=කාලය වැඩි කරන්න @@ -2621,7 +2523,6 @@ monitor.queue.settings.maxnumberworkers.error=මැක්ස් කම්කර monitor.queue.settings.submit=සැකසුම් යාවත්කාල කරන්න monitor.queue.settings.changed=සැකසුම් යාවත්කාල කෙරිණි monitor.queue.settings.blocktimeout=වත්මන් බ්ලොක් වේලාව - monitor.queue.pool.none=මෙම පෝලිම් සංචිතයක් නොමැත monitor.queue.pool.added=සේවක සමූහය එකතු කරන ලදි monitor.queue.pool.max_changed=කම්කරුවන් උපරිම සංඛ්යාව වෙනස් @@ -2631,7 +2532,6 @@ monitor.queue.pool.cancel=වසා දැමීමේ සේවක කණ්ඩ monitor.queue.pool.cancelling=සේවක සමූහය වසා දැමීම monitor.queue.pool.cancel_notices=සේවකයින් %s දෙනෙකුගෙන් යුත් මෙම කණ්ඩායම වසා දැමීම? monitor.queue.pool.cancel_desc=කිසිදු සේවක කණ්ඩායමක් නොමැතිව පෝලිමේ සිටීම දින නියමයක් නොමැතිව අවහිර කිරීමට ඉල්ලීම් හේතු විය හැක. - notices.system_notice_list=පද්ධතියේ දැන්වීම් notices.view_detail_header=දැන්වීමේ විස්තර දකින්න notices.actions=ක්‍රියාමාර්ග @@ -2646,20 +2546,26 @@ notices.type_2=කාර්යය notices.desc=සවිස්තරය notices.op=ඔප්. notices.delete_success=පද්ධති දැන්වීම් මකා දමා ඇත. +packages.owner=හිමිකරු +packages.name=නම +packages.type=වර්ගය +packages.repository=කෝෂ්ඨය +packages.size=ප්‍රමාණය +config.mailer_smtp_port=ප්රශ්නය විසඳිලා වරාය [action] create_repo=නිර්මිත ගබඩාව %s rename_repo=%[1]s සිට %[3]sදක්වා නම් කරන ලද ගබඩාව commit_repo=%[3]s ට %[4]sට තල්ලු කර ඇත -create_issue=`විවෘත නිකුතුව %[3]s #%[2]s` -close_issue=`සංවෘත නිකුත් %[3]s #%[2]s` -reopen_issue=`නැවත විවෘත කරන ලද නිකුතුව %[3]s #%[2]s` -create_pull_request=`නිර්මාණය අදින්න ඉල්ලීම %[3]s #%[2]s` -close_pull_request=`closed අදින්න ඉල්ලීම %[3]s #%[2]s` -reopen_pull_request=`නැවත විවෘත කරන ලද අදින්න ඉල්ලීම %[3]s #%[2]s` -comment_issue=`නිකුතුව පිළිබඳ අදහස් %[3]s #%[2]s` -comment_pull=`අදින්න ඉල්ලීම මත අදහස් %[3]s #%[2]s` -merge_pull_request=`ඒකාබද්ධ අදින්න ඉල්ලීම %[3]s #%[2]s` +create_issue=විවෘත නිකුතුව %[3]s #%[2]s +close_issue=සංවෘත නිකුත් %[3]s #%[2]s +reopen_issue=නැවත විවෘත කරන ලද නිකුතුව %[3]s #%[2]s +create_pull_request=නිර්මාණය අදින්න ඉල්ලීම %[3]s #%[2]s +close_pull_request=closed අදින්න ඉල්ලීම %[3]s #%[2]s +reopen_pull_request=නැවත විවෘත කරන ලද අදින්න ඉල්ලීම %[3]s #%[2]s +comment_issue=නිකුතුව පිළිබඳ අදහස් %[3]s #%[2]s +comment_pull=අදින්න ඉල්ලීම මත අදහස් %[3]s #%[2]s +merge_pull_request=ඒකාබද්ධ අදින්න ඉල්ලීම %[3]s #%[2]s transfer_repo=මාරු කරන ලද ගබඩාව %s සිට %s push_tag=තල්ලු ටැගය %[3]ගේ %[4]ගේ delete_tag=මකාදැමුවා ටැගය%[2]සිට %[3]s @@ -2670,9 +2576,9 @@ 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]ගේ` +approve_pull_request=අනුමත %[3]s #%[2]ගේ reject_pull_request=%[3]s #%[2]sසඳහා යෝජිත වෙනස්කම් -publish_release=`නිදහස් "%[4]s" හි %[3]s` +publish_release=නිදහස් "%[4]s" හි %[3]s review_dismissed_reason=හේතුව: create_branch=නිර්මාණය කරන ලද ශාඛාව %[3]s %[4]s watched_repo=%[2]sනැරඹීමට පටන් ගත්තා @@ -2715,4 +2621,21 @@ no_read=කියවූ දැනුම්දීම් නැත. [units] [packages] - +filter.type=වර්ගය +conan.details.repository=කෝෂ්ඨය +owner.settings.cleanuprules.enabled=සබල කර ඇත + +[aria] + +[secrets] +name=නම + +[actions] +runners.name=නම +runners.owner_type=වර්ගය +runners.description=සවිස්තරය +runners.task_list.run=ධාවනය +runners.task_list.repository=කෝෂ්ඨය +runners.task_list.commit=කැප +runners.status.active=ක්රියාකාරී +runs.commit=කැප diff --git a/options/locale/locale_sk-SK.ini b/options/locale/locale_sk-SK.ini index be254f65b1f7..f81c7fe9e942 100644 --- a/options/locale/locale_sk-SK.ini +++ b/options/locale/locale_sk-SK.ini @@ -23,7 +23,6 @@ enable_javascript=Táto stránka pracuje lepšie s JavaScript-om. toc=Obsah licenses=Licencie return_to_gitea=Naspäť do Gitea - username=Používateľské meno email=E-mailová adresa password=Heslo @@ -33,7 +32,6 @@ captcha=CAPTCHA twofa=Dvojfaktorová autentifikácia twofa_scratch=Dvojfaktorový dočasný kód passcode=Prístupový kód - webauthn_insert_key=Zadajte bezpečnostný kľúč webauthn_sign_in=Stlačte tlačidlo na vašom bezpečnostnom kľúči. Ak váš kľúč nemá tlačidlo, vyberte a zasunte ho znova. webauthn_press_button=Stlačte, prosím, tlačidlo na vašom bezpečnostnom kľúči… @@ -47,7 +45,6 @@ webauthn_error_duplicated=Bezpečnostný kľúč nie je pre túto požiadavku po webauthn_error_empty=Musíte nastaviť meno pre tento kľúč. webauthn_error_timeout=Vypršal čas na čítanie vašeho kľúča. Znova načítajte túto stránku a skúste to opäť. webauthn_reload=Znovu načítať - repository=Repozitár organization=Organizácia mirror=Zrkadlo @@ -65,18 +62,15 @@ settings=Nastavenia your_profile=Profil your_starred=Obľúbené your_settings=Nastavenia - all=Všetko sources=Zdrojové kódy mirrors=Zrkadlá collaborative=Spolupráca forks=Forky - activities=Aktivity pull_requests=Pull requesty issues=Úkoly milestones=Míľniky - ok=OK cancel=Zrušiť save=Uložiť @@ -85,26 +79,21 @@ add_all=Pridať všetko remove=Odstrániť remove_all=Odstrániť všetko edit=Upraviť - copy=Kopírovať copy_url=Kopírovať URL copy_branch=Kopírovať meno vetvy copy_success=Skopírované! copy_error=Kopírovanie zlyhalo - write=Zapísať preview=Náhľad loading=Načítava sa… - step1=Krok 1: step2=Krok 2: - error=Chyba error404=Stránka, na ktorú sa pokúšate dostať, buď neexistuje, alebo nemáte oprávnenie na jej zobrazenie. - never=Nikdy - rss_feed=RSS kanál +enabled=Povolené [filter] @@ -157,7 +146,6 @@ err_empty_admin_email=E-mail administrátora nemôže byť prázdny. err_admin_name_is_reserved=Používateľské meno administrátora je neplatné, používateľské meno je rezervované err_admin_name_pattern_not_allowed=Používateľské meno administrátora je neplatné, používateľské meno zodpovedá vyhradenému vzoru err_admin_name_is_invalid=Používateľské meno administrátora je neplatné - general_title=Všeobecné nastavenia app_name=Názov webu app_name_helper=Sem môžete zadať meno vašej spoločnosti. @@ -177,7 +165,6 @@ app_url=Základná URL Gitea app_url_helper=Základná adresa pre klonované HTTP(S) URL adresy a e-mailové upozornenia. log_root_path=Adresár logov log_root_path_helper=Do tohoto adresára budú uložené súbory protokolu. - optional_title=Voliteľné nastavenia email_title=Nastavenia e-mailu smtp_addr=SMTP Host @@ -235,7 +222,7 @@ default_enable_timetracking_popup=Predvolene povoliť sledovanie času pre nové no_reply_address=Skrytá e-mailová doména no_reply_address_helper=Doménové meno pre používateľov so skrytou e-mailovou adresou. Napríklad, používateľ s menom 'joe' bude zalogovaný v Git-e ako 'joe@noreply.example.org' ak je skrytá e-mailová doména nastavená na 'noreply.example.org'. password_algorithm=Hašovací algoritmus hesla -password_algorithm_helper=Nastavte algoritmus hašovania hesla. Algoritmy majú rozličné požiadavky a silu. Algoritmus `argon2` má síce dobré charakteristiky ale používa veľa pamäte a nemusí byť vhodný pre malé systémy. +password_algorithm_helper="""Nastavte algoritmus hašovania hesla. Algoritmy majú rozličné požiadavky a silu. Algoritmus `argon2` má síce dobré charakteristiky ale používa veľa pamäte a nemusí byť vhodný pre malé systémy.""" [home] uname_holder=Používateľské meno alebo emailová adresa @@ -251,17 +238,14 @@ search_repos=Nájsť repozitár… filter=Ostatné filtre filter_by_team_repositories=Filtrovať podľa tímových repozitárov feed_of=Informačný kanál „%s“ - show_archived=Archivované show_both_archived_unarchived=Zobrazujú sa archivované aj nearchivované show_only_archived=Zobrazuje sa iba archivované show_only_unarchived=Zobrazuje sa iba nearchivované - show_private=Súkromné show_both_private_public=Zobrazuje sa verejné aj súkromné show_only_private=Zobrazuje sa iba súkromné show_only_public=Zobrazuje sa iba verejné - issues.in_your_repos=Vo vašich repozitároch [explore] @@ -282,7 +266,6 @@ code_last_indexed_at=Naposledy indexované %s relevant_repositories_tooltip=Repozitáre, ktoré sú forkami alebo ktoré nemajú tému, žiadnu ikonu ani popis, sú skryté. relevant_repositories=Zobrazujú sa iba relevantné repozitáre, zobraziť nefiltrované výsledky. - [auth] create_new_account=Zaregistrovať účet register_helper_msg=Máte už účet? Prihláste sa teraz! @@ -355,31 +338,24 @@ password_pwned_err=Nie je možné dokončiť žiadosť na HaveIBeenPwned view_it_on=Zobraziť na %s link_not_working_do_paste=Nefunguje? Skúste ho skopírovať a vložiť do svojho prehliadača. hi_user_x=Ahoj %s, - activate_account=Aktivujte si svoj účet, prosím activate_account.title=%s, aktivujte si svoj účet, prosím activate_account.text_1=Ahoj %[1]s, ďakujeme za registráciu na %[2]s! activate_account.text_2=Pre aktiváciu vašeho účtu kliknite, prosím, na nasledovný odkaz do %s: - activate_email=Overte svoju e-mailovú adresu activate_email.title=%s, overte prosím, svoju e-mailovú adresu activate_email.text=Pre overenie vašej e-mailovej adresy kliknite, prosím, na nasledovný odkaz do %s: - register_notify=Vitajte v Gitea register_notify.title=%[1]s, vitajte v %[2]s register_notify.text_1=toto je e-mail potvrdzujúci vašu registráciu pre %s! register_notify.text_2=Teraz sa môžete prihlásiť s používateľským menom: %s. register_notify.text_3=Ak bol tento účet vytvorený pre vás, nastavte prosím najskôr svoje heslo. - reset_password=Obnoviť váš účet reset_password.title=%s, požiadali ste o obnovenie vášho účtu reset_password.text=Pre obnovenie vašeho účtu kliknite, prosím, na nasledovný odkaz do %s: - register_success=Registrácia prebehla úspešne - issue_assigned.pull=@%[1]s vám pridelil pull request %[2] v repozitári %[3]s. issue_assigned.issue=@%[1]s vám pridelil úkol %[2]s v repozitári %[3]s. - issue.x_mentioned_you=@%s vás zmienil: issue.action.force_push=%[1]s vynútil nahranie %[2]s z %[3]s do %[4]s. issue.action.push_1=@%[1]s nahral %[3]d commit do %[2]s @@ -394,7 +370,6 @@ issue.action.review_dismissed=@%[1]s zamietol poslednú recenziu od %[2]s issue.action.ready_for_review=@%[1]s označil tento pull request ako pripravený na revíziu. issue.action.new=@%[1] vytvoril/a #%[2]d. issue.in_tree_path=V %s: - release.new.subject=%s v %s vydané release.new.text=@%[1]s vydal/a %[2]s v %[3]s release.title=Názov: %s @@ -402,16 +377,13 @@ release.note=Poznámka: release.downloads=Sťahovania: release.download.zip=Zdrojový kód (ZIP) release.download.targz=Zdrojový kód (TAR.GZ) - repo.transfer.subject_to=%s by chcel preniesť "%s" do %s repo.transfer.subject_to_you=%s by chcel preniesť "%s" k vám repo.transfer.to_you=vy repo.transfer.body=Ak to chcete prijať alebo odmietnuť, navštívte %s alebo to jednoducho ignorujte. - repo.collaborator.added.subject=%s vás pridal do %s repo.collaborator.added.text=Boli ste pridaný ako spolupracovník repozitára: - [modal] yes=Áno no=Nie @@ -429,34 +401,30 @@ PayloadUrl=URL nákladu TeamName=Názov tímu AuthName=Názov autorizácie AdminEmail=E-mail administrátora - NewBranchName=Názov novej vetvy CommitSummary=Zhrnutie commitu CommitMessage=Správa ku commitu CommitChoice=Výber commitu TreeName=Cesta k súboru Content=Obsah - SSPISeparatorReplacement=Oddeľovač SSPIDefaultLanguage=Predvolený jazyk - -require_error=` nemôže byť prázdne.` -alpha_dash_error=` by mal obsahovať iba alfanumerické znaky, pomlčku ('-') a podčiarkovník ('_').` -alpha_dash_dot_error=` by mal obsahovať iba alfanumerické znaky, pomlčku ('-'), podčiarkovník ('_') a bodku ('.').` -git_ref_name_error=` musí byť správny názov odkazu Git.` -size_error=` musí byť dĺžky %s.` -min_size_error=` musí obsahovať minimálne %s znakov.` -max_size_error=` musí obsahovať maximálne %s znakov.` -email_error=` nie je platná e-mailová adresa.` -url_error=`'%s' nieje platná URL.` -include_error=` musí obsahovať podreťazec '%s'.` -glob_pattern_error=` glob vzor je neplatný: %s.` -regex_pattern_error=` regex vzor je neplatný: %s.` +require_error=" nemôže byť prázdne." +alpha_dash_error=" by mal obsahovať iba alfanumerické znaky, pomlčku ('-') a podčiarkovník ('_')." +alpha_dash_dot_error=" by mal obsahovať iba alfanumerické znaky, pomlčku ('-'), podčiarkovník ('_') a bodku ('.')." +git_ref_name_error=" musí byť správny názov odkazu Git." +size_error=" musí byť dĺžky %s." +min_size_error=" musí obsahovať minimálne %s znakov." +max_size_error=" musí obsahovať maximálne %s znakov." +email_error=" nie je platná e-mailová adresa." +url_error='%s' nieje platná URL. +include_error=" musí obsahovať podreťazec '%s'." +glob_pattern_error=" glob vzor je neplatný: %s." +regex_pattern_error=" regex vzor je neplatný: %s." unknown_error=Neznáma chyba: captcha_incorrect=Overovací kód CAPTCHA je nesprávny. password_not_match=Heslá sa nezhodujú. lang_select_error=Zvoľte jazyk zo zoznamu. - username_been_taken=Používateľské meno je už obsadené. username_change_not_local_user=Používatelia overovaní inak ako lokálne si nemôžu zmeniť svoje používateľské meno. repo_name_been_taken=Meno repozitára sa už používa. @@ -487,19 +455,16 @@ user_not_exist=Tento používateľ neexistuje. team_not_exist=Tento tím neexistuje. last_org_owner=Nemôžete odstrániť posledného používateľa z tímu 'vlastníkov'. Musí existovať aspoň jeden vlastník pre organizáciu. cannot_add_org_to_team=Organizácia nemôže byť pridaná ako člen tímu. - invalid_ssh_key=Nie je možné overiť váš SSH kľúč: %s invalid_gpg_key=Nie je možné overiť váš GPG kľúč: %s invalid_ssh_principal=Neplatná identita: %s unable_verify_ssh_key=Nie je možné overiť SSH kľúč; znovu skontrolujte chyby. auth_failed=Overenie zlyhalo: %v - still_own_repo=Váš účet je vlastníkom jedného alebo viacerých repozitárov; najskôr ich zmažte alebo preveďte. still_has_org=Váš účet je členom jednej alebo viacerých organizácií; najskôr ich opustite. still_own_packages=Váš účet je vlastníkom jedného alebo viacerých repozitárov; najskôr ich zmažte alebo preveďte. org_still_own_repo=Váš účet je stále vlastníkom jedného alebo viacerých repozitárov; najskôr ich zmažte alebo preveďte. org_still_own_packages=Váš organizácia je vlastníkom jedného alebo viacerých repozitárov; najskôr ich zmažte alebo preveďte. - target_branch_not_exist=Cieľová vetva neexistuje. [user] @@ -517,7 +482,6 @@ unfollow=Zrušiť sledovanie heatmap.loading=Načítanie teplotnej mapy… user_bio=Životopis disabled_public_activity=Tento používateľ zákázal verejnú viditeľnosť aktivity. - form.name_reserved=Toto používateľské meno '%s' je vyhradené. form.name_pattern_not_allowed=Tento vzor '%s' nie je povolený v mene používateľa. form.name_chars_not_allowed=Používateľské meno '%s' obsahuje neplatné znaky. @@ -540,7 +504,6 @@ account_link=Prepojené účty organization=Organizácie uid=Uid webauthn=Bezpečnostné kľúče - public_profile=Verejný profil biography_placeholder=Povedzte nám niečo o sebe profile_desc=Vaša e-mailová adresa bude použitá pre oznámenia a iné operácie. @@ -580,7 +543,6 @@ saved_successfully=Nastavenia úspešne uložené. privacy=Súkromie keep_activity_private=Skryť aktivitu z profilovej stránky keep_activity_private_popup=Nastaviť aktivitu viditeľnú iba pre vás a administrátorov - lookup_avatar_by_mail=Vyhľadať avatar pomocou e-mailovej adresy federated_avatar_lookup=Vyhľadanie avatarov z verejných zdrojov enable_custom_avatar=Použiť užívateľský avatar @@ -591,7 +553,6 @@ uploaded_avatar_not_a_image=Nahraný súbor nieje obrázok. uploaded_avatar_is_too_big=Nahraný súbor prekročil maximálnu veľkosť. update_avatar_success=Váš avatar sa aktualizoval. update_user_avatar_success=Užívateľov avatar bol aktualizovaný. - change_password=Aktualizovať heslo old_password=Aktuálne heslo new_password=Nové heslo @@ -599,7 +560,6 @@ retype_new_password=Znova zadajte nové heslo password_incorrect=Aktuálne heslo nie je správne. change_password_success=Vaše heslo bolo aktualizované. Od teraz sa prihlasujte novým heslom. password_change_disabled=Externe overovaní používatelia nemôžu aktualizovať svoje heslo prostredníctvom webového rozhrania Gitea. - emails=E-mailové adresy manage_emails=Správa e-mailových adries manage_themes=Nastavenie predvolenej témy @@ -632,7 +592,6 @@ add_openid_success=Bola pridaná nová adresa OpenID. keep_email_private=Skryť e-mailovú adresu keep_email_private_popup=Vaša e-mailová adresa bola skrytá pred ostatnými používateľmi. openid_desc=OpenID dovoľuje delegovať overovanie na externého poskytovateľa. - manage_ssh_keys=Spravovať SSH kľúče manage_ssh_principals=Spravovať SSH certifikačné identity manage_gpg_keys=Správa GPG kľúčov @@ -711,7 +670,6 @@ manage_social=Spravovať súvisiace sociálne účty social_desc=Tieto sociálne účty sú prepojené s vaším účtom Gitea. Uistite sa, že ich všetky poznáte, pretože sa dajú použiť na prihlásenie do vášho účtu Gitea. unbind=Odpojiť unbind_success=Sociálny účet bol odpojený od vášho účtu Gitea. - manage_access_token=Správa prístupových tokenov generate_new_token=Vygenerovať nový token tokens_desc=Tieto tokeny poskytujú prístup k vášmu účtu pomocou rozhrania Gitea API. @@ -726,7 +684,6 @@ access_token_deletion_cancel_action=Zrušiť access_token_deletion_confirm_action=Vymazať access_token_deletion_desc=Odstránením tokenu zrušíte prístup k vášmu účtu pre aplikácie, ktoré ho používajú. To nie je možné vrátiť späť. Ďalej? delete_token_success=Token bol odstránený. Aplikácie, ktoré ho používajú, už nemajú prístup k vášmu účtu. - manage_oauth2_applications=Správa OAuth2 aplikácií edit_oauth2_application=Upraviť aplikáciu OAuth2 oauth2_applications_desc=OAuth2 aplikácie umožňujú aplikáciám tretej strany bezpečne autentifikovať používateľov v tejto inštancii Gitea. @@ -748,14 +705,12 @@ oauth2_client_secret_hint=Ak znova navštívite túto stránku, tajný kľúč n oauth2_application_edit=Upraviť oauth2_application_create_description=Aplikácie OAuth2 poskytujú aplikáciám tretích strán prístup k používateľským účtom v tejto inštancii. oauth2_application_remove_description=Odstránenie aplikácie OAuth2 zabráni v prístupe autorizovaným používateľom v tejto inštancii. Ďalej? - authorized_oauth2_applications=Autorizované aplikácie OAuth2 authorized_oauth2_applications_description=Týmto aplikáciám tretích strán ste udelili prístup k vášmu osobnému účtu Gitea. Zrušte prístup pre aplikácie, ktoré už nie sú potrebné. revoke_key=Odvolať revoke_oauth2_grant=Odstrániť prístup revoke_oauth2_grant_description=Zrušenie prístupu tejto aplikáciu tretej strany zabráni tejto aplikácii v prístupe k vašim údajom. Ste si istý? revoke_oauth2_grant_success=Úspešne ste zrušili prístup. - twofa_desc=Dvojstupňové overenie pridá ďalšiu vrstvu bezpečnosti k vášmu účtu. twofa_is_enrolled=Váš účet je momentálne používa dvojfaktorovú autentifikáciu. twofa_not_enrolled=Váš účet momentálne nepoužíva dvojfaktorovú autentifikáciu. @@ -773,29 +728,23 @@ then_enter_passcode=A zadajte prístupový kód zobrazený v aplikácii: passcode_invalid=Prístupový kód je nesprávny. Skúste to znova. twofa_enrolled=Váš účet bol zaregistrovaný do dvojfaktorovej autentifikácie. Uložte si token (%s) na bezpečnom mieste, pretože sa zobrazuje iba raz! twofa_failed_get_secret=Nepodarilo sa získať tajomstvo. - webauthn_register_key=Pridať bezpečnostný kľúč webauthn_nickname=Prezývka webauthn_delete_key=Odstrániť bezpečnostný kľúč webauthn_delete_key_desc=Ak odstránite bezpečnostný kľúč, už sa s ním nebudete môcť prihlásiť. Ďalej? - manage_account_links=Spravovať prepojené kontá manage_account_links_desc=Tieto externé účty sú prepojené s vaším účtom Gitea. link_account=Pripojiť účet - orgs_none=Nieste členom žiadnej organizácie. repos_none=Nevlastníte žiadne repozitáre - delete_account=Odstrániť môj účet confirm_delete_account=Potvrdiť odstránenie delete_account_title=Odstrániť používateľský účet delete_account_desc=Naozaj chcete natrvalo odstrániť tento účet? - email_notifications.enable=Povoliť e-mailové upozornenia email_notifications.onmention=E-mail iba pri zmienke email_notifications.disable=Vypnúť e-mailové upozornenia email_notifications.submit=Nastaviť predvoľby e-mailu - visibility=Viditeľnosť používateľa visibility.public=Verejný visibility.public_tooltip=Viditeľné pre všetkých užívateľov @@ -876,13 +825,11 @@ delete_preexisting_label=Vymazať delete_preexisting=Vymazať už existujúce súbory delete_preexisting_content=Vymazať súbory v %s delete_preexisting_success=Vymazané neprijaté súbory v %s - transfer.accept=Prijať prevod transfer.accept_desc=Previesť do "%s" transfer.reject=Odmietnuť prevod transfer.reject_desc=Zrušiť prevod do "%s" transfer.no_permission_to_accept=Nemáte povolenie na prijatie - desc.private=Súkromný desc.public=Verejný desc.private_template=Súkromná šablóna @@ -890,20 +837,16 @@ desc.public_template=Šablóna desc.internal=Interný desc.internal_template=Interná šablóna desc.archived=Archivovaný - template.items=Položky šablóny template.git_hooks=Git hooky template.webhooks=Webhooky template.issue_labels=Štítky úkolov template.invalid=Vyberte šablónu repozitára - archive.issue.nocomment=Tento repozitár je archivovaný. Nemôžete komentovať úkoly. - form.reach_limit_of_creation_1=Už ste dosiahli svoj limit pre %d repozitár. form.reach_limit_of_creation_n=Už ste dosiahli svoj limit pre %d repozitáre. form.name_reserved=Repozitár s názvom '%s' je rezervovaný. form.name_pattern_not_allowed=Vzor '%s' nie je povolený v mene repozitára. - migrate_options_mirror_helper=Tento repozitár bude zrkadlom migrate_options_lfs_endpoint.description=Migrácia sa pokúsi použiť váš vzdialený Git na určenie servera LFS. Môžete tiež zadať vlastný koncový bod, ak sú dáta repozitára LFS uložené niekde inde. migrate_items_issues=Úkoly @@ -917,7 +860,6 @@ migrate.migrating_failed.error=Chyba: %s migrate.migrating_failed_no_addr=Migrácia zlyhala. migrate.git.description=Migrujte repozitár iba z akejkoľvek služby Git. migrate.migrating_issues=Migrovanie úkolov - forked_from=forknuté z fork_from_self=Repozitár, ktorý vlastníte, nemôžete forknúť. fork_guest_user=Prihláste sa, aby ste forkli repozitár. @@ -928,7 +870,6 @@ unstar=Zrušiť hviezdičku star=Hviezdička fork=Forknúť download_archive=Stiahnuť repozitár - no_desc=Bez popisu quick_guide=Rýchly sprievodca clone_this_repo=Klonovať tento repozitár @@ -936,12 +877,11 @@ create_new_repo_command=Vytvoriť nový repozitár v príkazovom riadku push_exist_repo=Odoslanie existujúceho repozitára z príkazového riadku empty_message=Tento repozitár ešte nemá obsah. broken_message=Údaje Git, ktoré sú základom tohto úložiska, sa nedajú prečítať. Kontaktujte správcu tejto inštancie alebo odstráňte toto úložisko. - code=Zdrojový kód code.desc=Prístup k zdrojovému kódu, súborom, commitom a vetvám. branch=Vetva tree=Strom -clear_ref=`Vymazať aktuálnu referenciu`. +clear_ref=Vymazať aktuálnu referenciu filter_branch_and_tag=Filter vetvy alebo tagu find_tag=Hľadať tag branches=Vetvy @@ -949,10 +889,8 @@ tags=Tagy issues=Úkoly pulls=Pull requesty project_board=Projekty - commits=Commitov commit=Commit - escape_control_characters=Ošetriť file_copy_permalink=Kopírovať trvalý odkaz view_git_blame=Zobraziť Git Blame @@ -961,7 +899,6 @@ audio_not_supported_in_browser=Váš prehliadač nepodporuje HTML5 tag 'audio'. stored_lfs=Uložené pomocou Git LFS symbolic_link=Symbolický odkaz commit_graph=Graf commitov - editor.preview_changes=Náhľad zmien editor.edit_this_file=Upraviť súbor editor.fork_before_edit=Musíte forknúť tento repozitár pre vytvorenie alebo navrhnutie zmeny tohoto súboru. @@ -981,7 +918,6 @@ editor.commit_empty_file_text=Súbor, ktorý sa chystáte odoslať, je prázdny. editor.cannot_commit_to_protected_branch=Nedá sa vytvoriť commit v chránenej vetve '%s'. editor.no_commit_to_branch=Nedá sa odoslať priamo do vetvy, pretože: editor.require_signed_commit=Vetva vyžaduje podpísaný commit - commits.commits=Commity commits.no_commits=Žiadne spoločné commity. '%s' a '%s' majú úplne odlišnú históriu. commits.search=Hľadanie commitov… @@ -998,7 +934,6 @@ commits.signed_by_untrusted_user=Podpísané nedôveryhodným užívateľom commits.signed_by_untrusted_user_unmatched=Podpísané nedôveryhodným užívateľom, ktorý sa nezhoduje s prispievateľom commits.gpg_key_id=ID GPG kľúča commits.ssh_key_fingerprint=odtlačok SSH kľúča - commit.actions=Akcie commit.revert=Vrátiť commit.revert-header=Vrátiť: %s @@ -1006,10 +941,8 @@ commit.revert-content=Vyberte vetvu pre návrat na: commit.cherry-pick=Cherry-pick commit.cherry-pick-header=Cherry-pick: %s commit.cherry-pick-content=Vyberte vetvu pre cherry-pick na: - ext_issues=Prístup k externým úkolom ext_issues.desc=Odkaz na externé sledovanie úkolov. - projects=Projekty projects.title=Názov projects.new=Nový projekt @@ -1021,7 +954,6 @@ projects.board.new_submit=Poslať projects.open=Otvoriť projects.close=Zavrieť projects.board.assigned_to=Priradené k - issues.filter_reviewers=Filtrovať revidentov issues.new=Nový úkol issues.new.no_reviewers=Žiadni revidenti @@ -1033,14 +965,14 @@ issues.filter_type.review_requested=Požiadané o revíziu issues.filter_sort.mostforks=Najviac forkov issues.filter_sort.fewestforks=Najmenej forkov issues.context.reference_issue=Odkázať v novom úkole -issues.closed_at=`uzavrel/a tento úkol %[2]s` -issues.reopened_at=`znovuotvoril/a tento úkol %[2]s` -issues.commit_ref_at=`odkázal na tento úkol z commitu %[2]s` -issues.ref_issue_from=`odkazoval/a na tento úkol %[4]s %[2]s` -issues.ref_closing_from=`odkazoval/a na pull request %[4]s, ktorý uzavrie tento úkol %[2]s` -issues.ref_reopening_from=`odkazoval/a na pull request %[4]s, ktorý znovu otvorí tento úkol %[2]s` -issues.ref_closed_from=`uzavrel/a tento úkol %[4]s %[2]s` -issues.ref_reopened_from=`znovu otvoril/a tento úkol %[4]s %[2]s` +issues.closed_at=uzavrel/a tento úkol %[2]s +issues.reopened_at=znovuotvoril/a tento úkol %[2]s +issues.commit_ref_at=odkázal na tento úkol z commitu %[2]s +issues.ref_issue_from=odkazoval/a na tento úkol %[4]s %[2]s +issues.ref_closing_from=odkazoval/a na pull request %[4]s, ktorý uzavrie tento úkol %[2]s +issues.ref_reopening_from=odkazoval/a na pull request %[4]s, ktorý znovu otvorí tento úkol %[2]s +issues.ref_closed_from=uzavrel/a tento úkol %[4]s %[2]s +issues.ref_reopened_from=znovu otvoril/a tento úkol %[4]s %[2]s issues.owner=Vlastník issues.re_request_review=Znovu požiadať o revíziu issues.is_stale=Od tejto kontroly došlo k zmenám v tomto pull requeste @@ -1064,7 +996,7 @@ issues.comment_on_locked=Nemôžete komentovať zamknutý úkol. issues.delete.title=Vymazať tento úkol? issues.delete.text=Naozaj chcete odstrániť tento úkol? (Týmto natrvalo odstránite všetok obsah. Ak ho chcete ponechať archivovaný, zvážte radšej jeho zatvorenie.) issues.tracker_auto_close=Po vyriešení tohto úkolu sa časovač automaticky zastaví -issues.tracking_already_started=`Už ste spustili sledovanie času v inom úkole!` +issues.tracking_already_started=Už ste spustili sledovanie času v inom úkole! issues.cancel_tracking=Zahodiť issues.add_time_cancel=Zrušiť issues.push_commit_1=pridal/a %d commit %s @@ -1084,8 +1016,6 @@ issues.review.remove_review_request=odstránil žiadosť o revidovanie na %s %s issues.review.remove_review_request_self=odmietol revidovať %s issues.review.review=Revízia issues.review.reviewers=Revidenti - - pulls.desc=Povoliť pull requesty a revízie kódu. pulls.tab_commits=Commity pulls.data_broken=Tento pull request je nefunkčný z dôvodu chýbajúcich informácií o forku. @@ -1094,34 +1024,19 @@ pulls.blocked_by_official_review_requests=Tento pull request obsahuje oficiálne pulls.waiting_count_1=%d čakajúca revízia pulls.waiting_count_n=%d čakajúcich revízií pulls.wrong_commit_id=ID commitu musí byť ID commitu v cieľovej vetve - pulls.no_merge_not_ready=Tento pull request nie je pripravený na merge, skontrolujte stav revízie a kontroly stavu. pulls.rebase_merge_commit_pull_request=Rebase a potom vytvoriť zlučovací commit pulls.merge_commit_id=ID zlučovacieho commitu - ; %[2]s
    %[3]s     - - - - - milestones.cancel=Zrušiť - - - - activity.git_stats_commit_1=%d commit activity.git_stats_commit_n=%d commity - - settings.collaboration.owner=Vlastník settings.hooks=Webhooky settings.githooks=Git hooky settings.mirror_settings.mirrored_repository=Zrkadlený repozitár settings.pulls.allow_merge_commits=Povoliť Commit Merging settings.pulls.allow_rebase_merge_commit=Povoliť Rebase s explicitnými potvrdeniami commitov (--no-ff) - - settings.pulls.allow_squash_commits=Povoliť Squash pre merge commity settings.admin_enable_close_issues_via_commit_in_any_branch=Zavrieť úkol pomocou commitu v inej ako východzej vetve settings.new_owner_has_same_repo=Nový vlastník už repozitár s rovnakým názvom má. Vyberte, prosím, iné meno. @@ -1194,38 +1109,53 @@ settings.bot_token=Token robota settings.matrix.access_token=Prístupový token settings.lfs_findcommits=Hľadať commity settings.lfs_lfs_file_no_commits=Pre tento súbor LFS sa nenašli žiadne commity - diff.commit=commit diff.comment.start_review=Začať revíziu diff.review=Revízia diff.review.header=Odoslať revíziu diff.review.placeholder=Revízna poznámka diff.committed_by=odovzdal - release.ahead.commits=%d commitov release.cancel=Zrušiť - branch.delete_branch_has_new_commits=Vetva '%s' nemôže byť vymazaná, pretože po zlúčení boli pridané nové commity. - - - - - +template.avatar=Avatar +migrate_options_lfs_endpoint.label=Koncový bod LFS +migrate_items_milestones=Míľniky +milestones=Míľniky +issues.new.projects=Projekty +issues.new.milestone=Míľnik +issues.filter_label=Štítok +issues.filter_milestone=Míľnik +issues.filter_project=Projekt +issues.filter_assignee=Príjemca +issues.action_open=Otvoriť +issues.action_close=Zavrieť +issues.action_label=Štítok +issues.action_milestone=Míľnik +issues.action_assignee=Príjemca +issues.open_title=Otvoriť +issues.save=Uložiť +milestones.open=Otvoriť +milestones.close=Zavrieť +wiki.page=Stránka +wiki.new_page=Stránka +activity.new_issues_count_1=Nový úkol +activity.unresolved_conv_label=Otvoriť +search=Hľadať +search.fuzzy=Fuzzy +search.match=Zhoda +search.code_no_results=Nenašiel sa žiaden zdrojový kód zodpovedajúci hľadanému výrazu. +search.code_search_unavailable=Vyhľadávanie kódu momentálne nie je dostupné. Kontaktujte, prosím, správcu. +settings.trust_model.collaborator.long=Spolupracovník: Dôverovať podpisom spolupracovníkov [org] lower_repositories=repozitáre - - settings.visibility.private=Súkromná ​​(viditeľné iba pre členov organizácie) settings.visibility.private_shortname=Súkromný - settings.hooks_desc=Pridajte webhooky, ktoré sa spustia nad všetkými repozitármi v rámci tejto organizácie. - - members.private=Skrytý members.private_helper=zviditeľniť members.owner=Vlastník - teams.owners_permission_desc=Vlastníci majú úplný prístup ku všetkým repozitárom a majú prístup správcu tejto organizácie. teams.repositories=Repozitáre týmu teams.specific_repositories=Konkrétne repozitáre @@ -1239,69 +1169,42 @@ teams.all_repositories_admin_permission_desc=Tomuto tímu je pridelený [admin] repositories=Repozitáre hooks=Webhooky - dashboard.statistic_info=Databáza Gitea obsahuje %d používateľov, %d organizácií, %d verejných kľúčov, %d repozitárov, %d sledovaní, %d hviezd, %d akcií, %d prístupov, %d issues, %d komentárov, %d sociálnych účtov, %d nasledovaní, %d mirrorov, %d vydaní, %d zdrojov prihlásení, %d webhookov, %d míľnikov, %d štítkov, %d hook úloh, %d tímov, %d aktualizačných úloh, %d príloh. dashboard.delete_generated_repository_avatars=Odstrániť vygenerované avatary repozitárov - - - - repos.owner=Vlastník repos.private=Súkromný repos.forks=Forky - packages.owner=Vlastník packages.repository=Repozitár - defaulthooks=Defaultné webhooky defaulthooks.desc=Webhooky automaticky odosielajú požiadavky HTTP POST na server, keď sa spustia určité udalosti Gitea. Tu definované webhooky sú predvolené a skopírujú sa do všetkých nových repozitárov. Prečítajte si viac v sprievodcovi webhookmi. defaulthooks.add_webhook=Pridať defaultný webhook defaulthooks.update_webhook=Aktualizovať defaultný webhook - systemhooks=Systémové webhooky systemhooks.desc=Webhooky automaticky odosielajú požiadavky HTTP POST na server, keď sa spustia určité udalosti Gitea. Tu definované webhooky budú pôsobiť na všetky repozitáre v systéme, takže zvážte akékoľvek dôsledky na výkon, ktoré to môže mať. Prečítajte si viac v sprievodcovi webhookmi. systemhooks.add_webhook=Pridať systémový webhook systemhooks.update_webhook=Aktualizovať defaultný webhook - auths.enabled=Povolené auths.oauth2_tokenURL=Token URL auths.sspi_default_language=Predvolený jazyk používateľa auths.sspi_default_language_helper=Predvolený jazyk pre používateľov automaticky vytvorený metódou SSPI auth. Ak uprednostňujete automatické zisťovanie jazyka, nechajte pole prázdne. - config.app_ver=Verzia Gitea config.app_url=Základná URL Gitea - config.ssh_enabled=Povolené - config.lfs_enabled=Povolené - - config.default_keep_email_private=Skrývanie e-mail adries ako predvolené - config.webhook_config=Nastavenie webhooku - config.mailer_enabled=Povolené config.mailer_enable_helo=Povolené HELO - config.oauth_enabled=Povolené - - - - - - - monitor.process.cancel=Zrušiť proces monitor.queue.review=Konfigurácia revidovania monitor.queue.review_add=Revidovať/Pridať revidentov - - - [action] compare_commits=Porovnať %d commitov compare_commits_general=Porovnať commity -review_dismissed=`odmietnutá revízia od %[4]s pre %[3]s#%[2]s` +review_dismissed=odmietnutá revízia od %[4]s pre %[3]s#%[2]s [tool] @@ -1319,4 +1222,12 @@ error.not_signed_commit=Nie je podpísaný commit conan.details.repository=Repozitár container.details.repository_site=Stránka repozitára pub.details.repository_site=Stránka repozitára +owner.settings.cleanuprules.enabled=Povolené + +[aria] + +[secrets] +[actions] +runners.task_list.commit=Commit +runs.commit=Commit diff --git a/options/locale/locale_sv-SE.ini b/options/locale/locale_sv-SE.ini index 55bfbcb5b194..b5d8eef400ac 100644 --- a/options/locale/locale_sv-SE.ini +++ b/options/locale/locale_sv-SE.ini @@ -21,7 +21,6 @@ enable_javascript=Denna sida fungerar bättre med Javascript igång. toc=Innehållsförteckning licenses=Licenser return_to_gitea=Återgå till Gitea - username=Användarnamn email=E-postadress password=Lösenord @@ -31,8 +30,6 @@ captcha=CAPTCHA twofa=Tvåfaktorsautentisering twofa_scratch=Tvåfaktorsskrapkod passcode=Kod - - repository=Utvecklingskatalog organization=Organisation mirror=Spegel @@ -50,34 +47,28 @@ settings=inställningar your_profile=Profil your_starred=Stjärnmärkt your_settings=Inställningar - all=Alla sources=Källor mirrors=Speglar collaborative=Kollaborativa forks=Forks - activities=Aktiviteter pull_requests=Pull förfrågningar issues=Ärenden milestones=Milstolpar - cancel=Avbryt save=Spara add=Lägg till add_all=Lägg till alla remove=Ta bort remove_all=Ta bort alla - - write=Skriv preview=Förhandsgranska loading=Laddar… - - error404=Sidan du försöker nå finns inte eller så har du inte behörighet att se den. - - +edit=Redigera +enabled=Aktiv +disabled=Inaktiverad [filter] @@ -118,7 +109,6 @@ err_empty_admin_email=Administratörens mail kan inte vara tom. err_admin_name_is_reserved=Administratörsanvändarnamnet är ogiltigt, användarnamnet är reserverat err_admin_name_pattern_not_allowed=Administratörens användarnamn är ogiltigt, användarnamnet matchar ett reserverat mönster err_admin_name_is_invalid=Administratörsanvändarnamnet är ogiltigt - general_title=Allmänna inställningar app_name=Sajtens namn app_name_helper=Du kan ange ditt företagsnamn här. @@ -136,7 +126,6 @@ app_url=Gitea 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=Mejlinställningar smtp_from=Skicka Mejl Som @@ -187,6 +176,8 @@ default_enable_timetracking=Aktivera tidredovisning som Standard default_enable_timetracking_popup=Aktivera tidsredovisning för nya utvecklingskataloger som standard. 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'. +smtp_addr=SMTP-server +smtp_port=SMTP-port [home] uname_holder=Användarnamn eller Mejladress @@ -200,17 +191,14 @@ my_mirrors=Mina speglar view_home=Visa %s search_repos=Hitta en utvecklingskatalog… filter=Övriga Filter - show_archived=Arkiverade show_both_archived_unarchived=Visar både arkiverade och icke arkiverade show_only_archived=Visar endast arkiverade show_only_unarchived=Visa endast icke arkiverade - show_private=Privat show_both_private_public=Visar både offentliga och privata show_only_private=Visar endast privata show_only_public=Visar endast publika - issues.in_your_repos=I dina utvecklingskataloger [explore] @@ -226,7 +214,6 @@ code_no_results=Ingen källkod hittades som matchar din sökterm. code_search_results=Söktresultat för '%s' code_last_indexed_at=Indexerades senast %s - [auth] create_new_account=Registrera Konto register_helper_msg=Har du redan ett konto? Logga in nu! @@ -290,23 +277,12 @@ password_pwned=Lösenordet du valde finns på en %s finns redan som programnamn. V delete_token=Radera access_token_deletion=Ta bort åtkomst token delete_token_success=Token har tagits bort. Applikationer som använder den kommer inte längre ha åtkomst till ditt konto. - manage_oauth2_applications=Hantera OAuth2-applikationer edit_oauth2_application=Redigera OAuth2-applikation oauth2_applications_desc=OAuth2-program tillåter ditt tredjepartsprogram att säkert autentisera användare på denna Gitea instans. @@ -571,14 +532,12 @@ oauth2_client_secret_hint=Hemligheten kommer inte att synas om sidan laddas om. oauth2_application_edit=Ändra oauth2_application_create_description=OAuth2-applikationer ger tredjepartsapplikationer åtkomst till användarkonton på denna instans. oauth2_application_remove_description=Genom att ta bort en OAuth2-applikation kommer dess åtkomst till auktoriserade användarkonton nekas. Vill du fortsätta? - authorized_oauth2_applications=Auktoriserade OAuth2-appar authorized_oauth2_applications_description=Du har beviljat åtkomst till ditt personliga Gitea-konto till dessa tredjepartsapplikationer. Se till att ta bort åtkomst för applikationer som inte längre behövs. revoke_key=Upphäv 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? revoke_oauth2_grant_success=Du har tagit bort åtkomsten. - twofa_desc=Tvåfaktorsautentisering förbättrar säkerheten på ditt konto. twofa_is_enrolled=Ditt konto är för närvarande uppsäkrad med tvåfaktorsautentisering. twofa_not_enrolled=Ditt konto är för närvarande inte uppsäkrad med tvåfaktorsautentisering. @@ -595,29 +554,34 @@ or_enter_secret=Eller skriv in följande sträng: %s then_enter_passcode=Och ange den lösenkod som visas i programmet: 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=Hantera Länkade Konton manage_account_links_desc=Dessa externa konton är länkade till ditt Gitea-konto. account_links_not_available=Det finns för närvarande inga externa konton länkade till ditt Gitea-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 Gitea-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. repos_none=Du har inga utvecklingskataloger associerade med 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 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 mejl email_notifications.onmention=Endast e-post vid omnämnanden email_notifications.disable=Inaktivera notiser via mejl email_notifications.submit=Ställ in e-post inställningar - +comment_type_group_title=Titel +gpg_key_verify=Verifiera +gpg_token=Pollett +ssh_key_verify=Verifiera +ssh_token=Pollett +principal_content=Innehåll +access_token_deletion_cancel_action=Avbryt +access_token_deletion_confirm_action=Radera +link_account=Länka konto +visibility.public=Offentlig +visibility.private=Privat [repo] owner=Ägare @@ -674,8 +638,6 @@ adopt_preexisting_content=Skapa utvecklingskatalog från %s delete_preexisting_label=Radera delete_preexisting=Ta bort befintliga filer delete_preexisting_content=Ta bort filer i %s - - desc.private=Privat desc.public=Publik desc.private_template=Privat mall @@ -683,7 +645,6 @@ desc.public_template=Mall desc.internal=Intern desc.internal_template=Intern mall desc.archived=Arkiverade - template.items=Mallobjekt template.git_content=Git innehåll (Default branch) template.git_hooks=Githookar @@ -693,14 +654,11 @@ template.avatar=Profilbild template.issue_labels=Ärendeetiketter template.one_item=Du måste välja minst ett mallobjekt template.invalid=Du måste välja minst en utvecklingskatalog för mallar - archive.title=Den här utvecklingskatalogen är arkiverad. Du kan se filer och klona katalogen, men inte öppna ärenden eller genomföra push- eller pull-förfrågningar. archive.issue.nocomment=Den här utvecklingskatalogen är arkiverad. Du kan inte kommentera ärenden. archive.pull.nocomment=Den här utvecklingskatalogen är arkiverad. Du kan inte kommentera på pull-förfrågningar. - form.name_reserved=Utvecklingskatalogsnamnet '%s' är reserverat. form.name_pattern_not_allowed=Mönstret '%s' är otillåtet i ett utvecklingskatalogsnamn. - migrate_options=Migrationsalternativ migrate_service=Migreringstjänst migrate_items=Migrationsobjekt @@ -725,7 +683,6 @@ 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 - mirror_from=spegling av forked_from=forkad från generated_from=skapad från @@ -739,19 +696,17 @@ unstar=Ta bort stjärnmärkning star=Stjärnmärk fork=Förgrening download_archive=Ladda Ned Utvecklingskatalogen - no_desc=Ingen beskrivning quick_guide=Snabbguide clone_this_repo=Klona detta repo create_new_repo_command=Skapa en ny utvecklingskatalog på kommandoraden push_exist_repo=Pusha en existerande utvecklingskatalog från kommandoraden empty_message=Detta förråd innehåller inget. - code=Kod code.desc=Se källkod, filer, commits och brancher. branch=Gren tree=Träd -clear_ref=`Rensa aktuell referens` +clear_ref=Rensa aktuell referens filter_branch_and_tag=Filtrera gren eller tagg branches=Grenar tags=Taggar @@ -761,7 +716,6 @@ project_board=Projekt labels=Etiketter org_labels_desc=Etiketter på organisationsnivå som kan användas i alla utvecklingskataloger tillhörande denna organisation org_labels_desc_manage=hantera - milestones=Milstenar commits=Incheckningar commit=Commit @@ -771,7 +725,6 @@ file_history=Historik 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öder inte taggen 'audio' i HTML5. stored_lfs=Sparad med Git LFS @@ -782,7 +735,6 @@ 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 @@ -836,7 +788,6 @@ editor.cannot_commit_to_protected_branch=Kan inte commita till den skyddade bran editor.no_commit_to_branch=Det gick inte att committa direkt till branchen för: editor.user_no_push_to_branch=Användaren kan inte pusha till branchen editor.require_signed_commit=Branchen kräver en signerad commit - commits.desc=Bläddra i källkodens förändringshistorik. commits.commits=Incheckningar commits.no_commits=Inga gemensamma commits, '%s' och '%s' har helt olika historik. @@ -853,10 +804,7 @@ 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 - - ext_issues.desc=Länk till externt ärendehanteringssystem. - projects=Projekt projects.create=Skapa projekt projects.title=Titel @@ -876,7 +824,6 @@ projects.board.new=Ny tavla projects.board.delete=Ta bort tavla projects.open=Öppna projects.close=Stäng - issues.desc=Organisera felrapporteringar, ärenden och milstolpar. issues.filter_assignees=Filtrera tilldelad person issues.filter_milestones=Filtrera milstolpe @@ -922,21 +869,21 @@ issues.label_templates.info=Inga etiketter finns ännu. Skapa en etikett med 'Ny issues.label_templates.helper=Markera en uppsättning etiketter issues.label_templates.use=Använd etikettsamling issues.label_templates.fail_to_load_file=Laddning av etikettmallen '%s' misslyckades: %v -issues.add_milestone_at=`lade till denna till milstolpe %s %s` -issues.add_project_at=`lade till detta till projektet %s %s` -issues.change_milestone_at='modifierade milstolpen från %s till %s %s' -issues.remove_milestone_at='tog bort denna från milstolpen %s %s' -issues.remove_project_at=`tog bort detta från projektet %s %s` -issues.deleted_milestone=`(raderad)` -issues.deleted_project=`(raderad)` -issues.self_assign_at=`tilldelade denna till sig själv %s` -issues.add_assignee_at=`blev tilldelad denna av %s %s` -issues.remove_assignee_at=`tilldelning togs bort av %s %s` -issues.remove_self_assignment=`tog bort sin tilldelning %s` -issues.change_title_at='ändrade titeln från %s till %s %s' -issues.delete_branch_at='tog bort grenen %s %s' +issues.add_milestone_at=lade till denna till milstolpe %s %s +issues.add_project_at=lade till detta till projektet %s %s +issues.change_milestone_at=modifierade milstolpen från %s till %s %s +issues.remove_milestone_at=tog bort denna från milstolpen %s %s +issues.remove_project_at=tog bort detta från projektet %s %s +issues.deleted_milestone=(raderad) +issues.deleted_project=(raderad) +issues.self_assign_at=tilldelade denna till sig själv %s +issues.add_assignee_at=blev tilldelad denna av %s %s +issues.remove_assignee_at=tilldelning togs bort av %s %s +issues.remove_self_assignment=tog bort sin tilldelning %s +issues.change_title_at=ändrade titeln från %s till %s %s +issues.delete_branch_at=tog bort grenen %s %s issues.filter_label=Etikett -issues.filter_label_exclude=`Använd alt + klicka/enter för att exkludera etiketter` +issues.filter_label_exclude=Använd alt + klicka/enter för att exkludera etiketter issues.filter_label_no_select=Alla etiketter issues.filter_milestone=Milsten issues.filter_milestone_no_select=Alla milstolpar @@ -973,7 +920,7 @@ issues.next=Nästa issues.open_title=Öppen issues.closed_title=Stängd issues.num_comments=%d kommentarer -issues.commented_at=`kommenterad %s` +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 @@ -986,16 +933,16 @@ issues.close_comment_issue=Kommentera och stäng issues.reopen_issue=Återöppna 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=`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` +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=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 issues.poster=Skapare issues.collaborator=Deltagare issues.owner=Ägare @@ -1022,8 +969,8 @@ issues.label.filter_sort.reverse_alphabetically=Alfabetiskt Ö-A issues.label.filter_sort.by_size=Minsta storlek issues.label.filter_sort.reverse_by_size=Största storlek issues.num_participants=%d Deltagare -issues.attachment.open_tab=`Klicka för att se "%s" i en ny flik` -issues.attachment.download=`Klicka för att hämta "%s"` +issues.attachment.open_tab=Klicka för att se "%s" i en ny flik +issues.attachment.download=Klicka för att hämta "%s" issues.subscribe=Prenumerera issues.unsubscribe=Avsluta prenumerationen issues.lock=Lås konversation @@ -1049,21 +996,21 @@ issues.delete.title=Radera detta ärende? issues.delete.text=Vill du verkligen ta bort detta ärende? (Detta kommer att permanent ta bort allt innehåll. Överväg att stänga det istället om du avser att hålla det arkiverat) issues.tracker=Tidsredovisning issues.start_tracking=Starta tidsredovisning -issues.start_tracking_history=`började arbeta %s` +issues.start_tracking_history=började arbeta %s issues.tracker_auto_close=Timern stoppas automatiskt när ärendet stängs -issues.tracking_already_started=`Du har redan påbörjat tidredovisning på ett annat ärende!` -issues.stop_tracking_history=`slutade arbeta %s` +issues.tracking_already_started=Du har redan påbörjat tidredovisning på ett annat ärende! +issues.stop_tracking_history=slutade arbeta %s issues.cancel_tracking_history=”avbröt tidredovisning %s' issues.add_time=Lägg till tid manuellt issues.add_time_short=Lägg till tid issues.add_time_cancel=Avbryt -issues.add_time_history=`la till tillbringad tid %s` -issues.del_time_history=`raderade tillbringad tid %s` +issues.add_time_history=la till tillbringad tid %s +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_from_all_authors=`Total Tid Spenderad: %s` +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'. issues.error_modifying_due_date=Det gick inte att ändra förfallodatumet. @@ -1085,8 +1032,8 @@ issues.dependency.add=Lägg till beroende… issues.dependency.cancel=Avbryt issues.dependency.remove=Ta bort issues.dependency.remove_info=Ta bort detta beroende -issues.dependency.added_dependency=`lade till ett nytt beroende %s` -issues.dependency.removed_dependency=`tog bort ett beroende %s` +issues.dependency.added_dependency=lade till ett nytt beroende %s +issues.dependency.removed_dependency=tog bort ett beroende %s issues.dependency.issue_close_blocks=Detta ärende blockerar en stängning av följande ärenden issues.dependency.pr_close_blocks=Denna pull-förfrågan blockerar stängning av följande ärenden issues.dependency.issue_close_blocked=Du måste stänga alla ärenden som blockerar det här ärendet innan du kan stänga det. @@ -1125,8 +1072,6 @@ issues.review.resolve_conversation=Lös konversation issues.review.resolved_by=markerade denna konversation som löst issues.assignee.error=Inte alla tilldelade har lagts till på grund av ett oväntat fel. 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-Request @@ -1139,7 +1084,7 @@ pulls.nothing_to_compare=Dessa brancher är ekvivalenta. Det finns ingen anledni pulls.create=Skapa Pullförfrågan pulls.title_desc=vill sammanfoga %[1]d incheckningar från s[2]s in i %[3]s pulls.merged_title_desc=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.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 @@ -1149,7 +1094,7 @@ pulls.merged=Sammanfogat pulls.merged_as=Pull-förfrågan har sammanfogats som %[2]s. pulls.is_closed=Pull-förfrågan har stängts. pulls.has_merged=Pull-requested har blivit mergad. -pulls.title_wip_desc=`Börja titeln med %s för att förhindra att pull-förfrågan sammanfogas av misstag` +pulls.title_wip_desc=Börja titeln med %s för att förhindra att pull-förfrågan sammanfogas av misstag pulls.data_broken=Pull-requesten är trasig pågrund av oexisterande information on forken. pulls.files_conflicted=Den här pull-förfrågan ha ändringar som är i konflikt med mål-branchen. pulls.is_checking=Merge-konfliktkontroll pågår. Försök igen senare. @@ -1160,21 +1105,14 @@ pulls.blocked_by_approvals=Denna pull request har inte tillräckligt många godk pulls.can_auto_merge_desc=Denna pull-förfrågan kan sammanfogas automatiskt. pulls.cannot_auto_merge_desc=Pull-requesten kan inte bli mergad automatiskt på grund av konflikter. pulls.cannot_auto_merge_helper=Merga manuellt för att lösa konlifterna. - pulls.no_merge_desc=Pull-requesten kan inte mergas för alla alternativ för merging är inaktiverade för denna utvecklingskatalog. pulls.no_merge_helper=Aktivera mergealternativ i utvecklingskatalogsinställningarna, eller merga manuellt. - pulls.invalid_merge_option=Du kan inte använda detta mergealternativet för denna pull-request. ; %[2]s
    %[3]s     -pulls.open_unmerged_pull_exists=`Du kan inte återuppliva denna pull-request då det redan finns en identisk pull-request öppen (#%d).` +pulls.open_unmerged_pull_exists=Du kan inte återuppliva denna pull-request då det redan finns en identisk pull-request öppen (#%d). pulls.update_branch_success=Uppdatering av branchen lyckades pulls.update_not_allowed=Du är inte behörig att uppdatera grenen pulls.outdated_with_base_branch=Denna branch är föråldrad gentemot bas-branchen - - - - - milestones.new=Ny milstolpe milestones.closed=Stängt %s milestones.no_due_date=Inget förfallodatum @@ -1203,15 +1141,12 @@ milestones.filter_sort.least_complete=Minst klar milestones.filter_sort.most_complete=Mest klar milestones.filter_sort.most_issues=Mest ärenden milestones.filter_sort.least_issues=Minst ärenden - signing.will_sign=Denna commit kommer att signeras med nyckeln '%s' signing.wont_sign.never=Commits signeras aldrig signing.wont_sign.always=Commits signeras alltid signing.wont_sign.pubkey=Comitten kommer inte signeras på grund av att du inte har någon publik nyckel kopplad till kontot signing.wont_sign.twofa=Du måste ha tvåfaktorsautentisering aktiverad för att få commits signerade - ext_wiki.desc=Länk till extern wiki. - wiki=Wiki wiki.welcome=Välkommen till Wikin. wiki.welcome_desc=Wikin låter dig skriva och dela dokumentation med medarbetare. @@ -1232,7 +1167,6 @@ wiki.page_already_exists=Wiki-sida med samma namn finns redan. wiki.reserved_page=Namnet för wikisidan '%s' är reserverat. wiki.pages=Sidor wiki.last_updated=Senast uppdaterad %s - activity=Aktiviteter activity.period.filter_label=Period: activity.period.daily=1 dag @@ -1291,11 +1225,9 @@ activity.git_stats_addition_n=%d tillägg activity.git_stats_and_deletions=och activity.git_stats_deletion_1=%d borttagen activity.git_stats_deletion_n=%d borttagningar - search=Sök search.search_repo=Sök utvecklingskatalog search.results=Sökresultat för ”%s” i %s - settings=Inställningar settings.desc=Inställningarna är där du kan hantera inställningar för utvecklingskatalogen settings.options=Utvecklingskatalog @@ -1530,7 +1462,6 @@ 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 i källkod diff.parent=förälder diff.commit=incheckning @@ -1564,7 +1495,6 @@ diff.review.comment=Kommentar diff.review.approve=Godkänn diff.review.reject=Begär ändringar diff.committed_by=committad av - releases.desc=Följ projektversioner och nerladdningar. release.releases=Släpp release.new_release=Nytt Släpp @@ -1595,7 +1525,6 @@ 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=Branch namn branch.search=Sök brancher branch.already_exists=En branch namngiven '%s' finns redan. @@ -1618,15 +1547,19 @@ branch.restore_failed=Återställning av branch '%s' misslyckades. branch.protected_deletion_failed=Branch '%s' är skyddad. Den kan inte bli borttagen. branch.restore=Återställ branch '%s' branch.download=Ladda ner branch '%s' - - - topic.manage_topics=Hantera ämnen topic.done=Klar topic.count_prompt=Du kan inte välja fler än 25 ämnen topic.format_prompt=Ämnen måste starta med en bokstav eller siffra, kan innehålla bindestreck ('-') och vara max 35 tecken långa. - - +projects.description_placeholder=Beskrivning +issues.filter_project_none=Inget projekt +issues.draft_title=Utkast +issues.delete=Radera +search.code_no_results=Ingen källkod hittades som matchar din sökterm. +settings.convert_fork_confirm=Konvertera utvecklingskatalog +settings.teams=Grupper +settings.event_wiki=Wiki +release.compare=Jämför [org] org_name_holder=Organisationsnamn @@ -1649,11 +1582,9 @@ team_access_desc=Åtkomst till utvecklingskatalogen team_permission_desc=Behörighet team_unit_desc=Tillåt åtkomst till delar utav utvecklingskatalogen team_unit_disabled=(Inaktiverad) - form.name_reserved=Organisationsnamnet '%s' är reserverat. form.name_pattern_not_allowed=Mönstret '%s' är inte tillåtet i ett organisationsnamn. form.create_org_not_allowed=Du tillåts inte att skapa organisationer. - settings=Inställningar settings.options=Organisation settings.full_name=Fullständigt namn @@ -1665,7 +1596,6 @@ settings.visibility=Synlighet settings.visibility.public=Offentlig settings.visibility.limited=Begränsad (visas endast för inloggade användare) settings.visibility.private=Privat (synlig endast för organisationens medlemmar) - settings.update_settings=Uppdatera inställningar settings.update_setting_success=Organisationsinställningarna har uppdaterats. settings.change_orgname_prompt=Notera: ändring av organisationsnamnet ändrar även organisationens URL. @@ -1677,9 +1607,7 @@ settings.confirm_delete_account=Bekräfta borttagning settings.delete_org_title=Ta bort organisation settings.delete_org_desc=Denna organisation kommer tas bort permanent. Vill du fortsätta? settings.hooks_desc=Lägg till webbhook som triggas för alla utvecklingskataloger under denna organisationen. - settings.labels_desc=Lägg till etiketter som kan användas till ärenden för alla utvecklingskataloger under denna organisation. - members.membership_visibility=Synlighet för medlemskap: members.public=Synlig members.public_helper=gör dold @@ -1692,7 +1620,6 @@ members.remove=Ta bort members.leave=Lämna members.invite_desc=Lägg till en ny medlem i %s: members.invite_now=Bjud in - teams.join=Gå med teams.leave=Gå ur teams.can_create_org_repo=Skapa utvecklingskataloger @@ -1732,6 +1659,9 @@ teams.all_repositories_helper=Teamet har tillgång till alla utvecklingskataloge teams.all_repositories_read_permission_desc=Detta team beviljar Läs-rättigheter till alla utvecklingskataloger: medlemmar kan visa och klona utvecklingskataloger. teams.all_repositories_write_permission_desc=Detta team beviljar Skriv-rättigheter till alla utvecklingskataloger: medlemmar kan läsa från och pusha till utvecklingskataloger. teams.all_repositories_admin_permission_desc=Detta team beviljar Admin-rättigheter till alla utvecklingskataloger: medlemmar kan läsa från, pusha till och lägga till kollaboratörer för utvecklingskatalogerna. +members=Medlemmar +settings.visibility.private_shortname=Privat +teams.read_access=Lästa [admin] dashboard=Instrumentpanel @@ -1745,7 +1675,6 @@ monitor=Övervakning first_page=Första last_page=Sista total=Totalt: %d - dashboard.statistic=Översikt dashboard.operations=Operationer för underhåll dashboard.system_status=Status @@ -1789,7 +1718,6 @@ dashboard.total_gc_time=Total tid för pauser vid skräpsamling dashboard.total_gc_pause=Total tid för pauser vid skräpsamling dashboard.last_gc_pause=Senaste paus vid skräpsamling dashboard.gc_times=Skräpsamlingstider - users.user_manage_panel=Hantering av användarkonton users.new_account=Skapa användarkonto users.name=Användarnamn @@ -1822,20 +1750,17 @@ users.delete_account=Ta bort användarkontot users.still_own_repo=Denna användare äger fortfarande en eller flera utvecklingskataloger. Ta bort eller överför dessa utvecklingskataloger först. users.still_has_org=Denna användare är medlem i en eller flera organisationer. Ta bort användaren från dessa först. users.deletion_success=Användarkontot har blivit borttaget. - emails.primary=Primär emails.activated=Aktiverad emails.filter_sort.email=E-post emails.filter_sort.email_reverse=E-post (omvänd) emails.filter_sort.name=Användarnamn emails.filter_sort.name_reverse=Användarnamn (omvänd) - orgs.org_manage_panel=Organisationshantering orgs.name=Namn orgs.teams=Team orgs.members=Medlemmar orgs.new_orga=Ny organisation - repos.repo_manage_panel=Utvecklingskatalogshantering repos.owner=Ägare repos.name=Namn @@ -1845,11 +1770,7 @@ repos.stars=Stjärnor repos.forks=Forkar repos.issues=Ärenden repos.size=Storlek - - - systemhooks=Systemets webbhooks - auths.auth_manage_panel=Hantering av autentiseringkälla auths.new=Lägg till autensieringskälla auths.name=Namn @@ -1920,7 +1841,6 @@ auths.delete_auth_desc=Borttagning av en autensieringskälla förhindrar använd 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. auths.login_source_exist=Autentiseringkällan '%s' finns redan. - config.server_config=Server-konfiguration config.app_name=Sajtens namn config.app_ver=Gitea Version @@ -1937,7 +1857,6 @@ config.static_file_root_path=Rotsökväg för Statiska Filer config.log_file_root_path=Sökväg för loggar 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 @@ -1948,9 +1867,7 @@ 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_minimum_key_size_check=Kontroll av minsta tillåtna nyckelstorlek config.ssh_minimum_key_sizes=Minsta tillåtna nyckelstorlek - config.lfs_enabled=Aktiverad - config.db_config=Databaskonfiguration config.db_type=Typ config.db_host=Värd @@ -1959,7 +1876,6 @@ config.db_user=Användarnamn config.db_schema=Schema config.db_ssl_mode=SSL config.db_path=Sökväg - config.service_config=Tjänstkonfiguration config.register_email_confirm=Kräv mejlbekräftelse för att registrera config.disable_register=Inaktivera självregistrering @@ -1977,12 +1893,10 @@ config.enable_timetracking=Aktivera tidsredovisning 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.mailer_enabled=Aktiverad config.mailer_name=Namn config.mailer_user=Användare @@ -1992,15 +1906,12 @@ config.mailer_sendmail_args=Extra argument till sendmail config.send_test_mail=Skicka testmeddelande config.test_mail_failed=Det gick inte att skicka testmeddelande till '%s': %v config.test_mail_sent=Ett testmeddelande har skickats till '%s'. - config.oauth_config=OAuth-konfiguration config.oauth_enabled=Aktiverad - 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 @@ -2009,12 +1920,10 @@ config.gc_interval_time=Tidsintervall för skräpsamling config.session_life_time=Livstid för session config.https_only=Endast HTTPS 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 Förenad Uppslaging av Profilbilder - config.git_config=Git-konfiguration config.git_disable_diff_highlight=Inaktivera Diff Syntax Highlight config.git_max_diff_lines=Max Diff-rader (per fil) @@ -2026,14 +1935,11 @@ config.git_mirror_timeout=Spelgingsuppdateringstimeout config.git_clone_timeout=Klonoperationstimeout config.git_pull_timeout=Klonoperationstimeout config.git_gc_timeout=GC-operationstimeout - config.log_config=Logg-konfiguration config.log_mode=Loggningsläge config.disabled_logger=Inaktiverad config.access_log_template=Mall config.xorm_log_sql=Logga SQL - - monitor.cron=Cron-jobb monitor.name=Namn monitor.schedule=Schemaläggning @@ -2058,10 +1964,7 @@ monitor.queue.pool.addworkers.submit=Lägg till arbetare monitor.queue.pool.addworkers.numberworkers.placeholder=Antal arbetare monitor.queue.pool.flush.title=Töm kö monitor.queue.pool.flush.desc=Töm komma att lägga till en arbetare som kommer lämna när kön är tom eller när tidsgränsen är nådd. - monitor.queue.settings.changed=Inställningar uppdaterade - - notices.system_notice_list=Systemnotiser notices.view_detail_header=Visa notisdetaljer notices.actions=Åtgärder @@ -2076,6 +1979,15 @@ notices.type_2=Uppgift notices.desc=Beskrivning notices.op=Op. notices.delete_success=Systemnotifikationer har blivit raderade. +users.list_status_filter.is_active=Aktiv +users.list_status_filter.is_admin=Administratör +packages.owner=Ägare +packages.name=Namn +packages.type=Typ +packages.repository=Utvecklingskatalog +packages.size=Storlek +config.mailer_smtp_port=SMTP-port +monitor.queue.settings.submit=Uppdatera inställningar [action] create_repo=skapade utvecklingskatalog %s @@ -2143,4 +2055,21 @@ error.no_unit_allowed_repo=Du tillåts inte åtkomst till någon del av denna ut error.unit_not_allowed=Du har inte åtkomst till denna del av utvecklingskatalogen. [packages] - +filter.type=Typ +conan.details.repository=Utvecklingskatalog +owner.settings.cleanuprules.enabled=Aktiv + +[aria] + +[secrets] +name=Namn + +[actions] +runners.name=Namn +runners.owner_type=Typ +runners.description=Beskrivning +runners.task_list.run=Kör +runners.task_list.repository=Utvecklingskatalog +runners.task_list.commit=Commit +runners.status.active=Aktiv +runs.commit=Commit diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini index 37b7491f6ab2..87fdf1287e67 100644 --- a/options/locale/locale_tr-TR.ini +++ b/options/locale/locale_tr-TR.ini @@ -23,7 +23,6 @@ enable_javascript=Bu web sitesi JavaScript ile daha iyi çalışır. toc=İçindekiler Tablosu licenses=Lisanslar return_to_gitea=Gitea'ya Dön - username=Kullanıcı Adı email=E-posta Adresi password=Parola @@ -33,7 +32,6 @@ captcha=CAPTCHA twofa=İki Aşamalı Doğrulama twofa_scratch=İki aşamalı kazınmış kod passcode=Şifre - webauthn_insert_key=Güvenlik anahtarınızı ekleyin webauthn_sign_in=Güvenlik anahtarınızdaki düğmeye basın. Eğer düğme yoksa güvenlik anahtarınızı tekrar ekleyin. webauthn_press_button=Lütfen güvenlik anahtarınızdaki düğmeye basın… @@ -47,7 +45,6 @@ webauthn_error_duplicated=Güvenlik anahtarının bu istek için izni yok. Anaht webauthn_error_empty=Bu anahtar için bir isim belirlemelisiniz. webauthn_error_timeout=Anahtarınız okunamadan zaman aşımı oldu. Lütfen sayfayı yenileyin ve tekrar deneyin. webauthn_reload=Yeniden yükle - repository=Depo organization=Organizasyon mirror=Yansı @@ -65,18 +62,15 @@ settings=Ayarlar your_profile=Profil your_starred=Yıldızlı your_settings=Ayarlar - all=Tümü sources=Kaynaklar mirrors=Yansılar collaborative=İşbirlikçi forks=Çatallar - activities=Etkinlikler pull_requests=Değişiklik İstekleri issues=Konular milestones=Kilometre Taşları - ok=Tamam cancel=İptal save=Kaydet @@ -85,26 +79,24 @@ add_all=Tümünü Ekle remove=Kaldır remove_all=Tümünü Kaldır edit=Düzenle - copy=Kopyala copy_url=URL'yi kopyala copy_branch=Dal adını kopyala copy_success=Kopyalandı! copy_error=Kopyalama başarısız oldu - write=Yaz preview=Önizleme loading=Yükleniyor… - step1=1. Adım: step2=2. Adım: - error=Hata error404=Ulaşmaya çalıştığınız sayfa mevcut değil veya görüntüleme yetkiniz yok. - never=Asla - rss_feed=RSS Beslemesi +enabled=Aktifleştirilmiş +disabled=Devre Dışı +copy_content=İçeriği kopyala +copy_type_unsupported=Bu dosya türü kopyalanamaz [filter] string.asc=A - Z @@ -159,7 +151,6 @@ err_empty_admin_email=Yönetici e-postası boş olamaz. err_admin_name_is_reserved=Yönetici Kullanıcı Adı geçersiz, bu kullanıcı adı rezerv edilen bir kelimedir err_admin_name_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 app_name=Site Başlığı app_name_helper=Şirket adınızı buraya girebilirsiniz. @@ -179,7 +170,6 @@ app_url=Gitea Kök URL app_url_helper=HTTP(S) kopyalama URL'leri ve e-posta bildirimleri için temel adres. 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 @@ -237,7 +227,10 @@ default_enable_timetracking_popup=Yeni depolar için zaman takibini varsayılan no_reply_address=Gizlenecek E-Posta Alan Adı no_reply_address_helper=Gizlenmiş e-posta adresine sahip kullanıcılar için alan adı. Örneğin 'ali' kullanıcı adı, gizlenmiş e-postalar için alan adı 'yanityok.ornek.org' olarak ayarlandığında Git günlüğüne 'ali@yanityok.ornek.org' olarak kaydedilecektir. password_algorithm=Parola Hash Algoritması -password_algorithm_helper=Parola için hash algoritmasını ayarlayın. Algoritmalar değişen gereksinimlere ve güce sahiptirler. `argon2` iyi özelliklere sahip olmasına rağmen fazla miktarda bellek kullanır ve küçük sistemler için uygun olmayabilir. +password_algorithm_helper="""Parola için hash algoritmasını ayarlayın. Algoritmalar değişen gereksinimlere ve güce sahiptirler. `argon2` iyi özelliklere sahip olmasına rağmen fazla miktarda bellek kullanır ve küçük sistemler için uygun olmayabilir.""" +invalid_password_algorithm=Hatalı parola hash algoritması +enable_update_checker=Güncelleme Denetleyicisini Etkinleştir +enable_update_checker_helper=Düzenli olarak gitea.io'ya bağlanarak yeni yayınlanan sürümleri denetler. [home] uname_holder=Kullanıcı Adı veya E-Posta Adresi @@ -252,18 +245,15 @@ view_home=%s Görüntüle search_repos=Depo bul… filter=Diğer Süzgeçler filter_by_team_repositories=Takım depolarına göre süz -feed_of="%s" beslemesi - +feed_of=`"%s" beslemesi` show_archived=Arşivlenmiş show_both_archived_unarchived=Arşivlenenler ve arşivlenmeyenlerin hepsi gösteriliyor show_only_archived=Yalnızca arşivlenenler gösteriliyor show_only_unarchived=Yalnızca arşivlenmeyenler gösteriliyor - show_private=Özel show_both_private_public=Hem genel hem de özel gösteriliyor show_only_private=Yalnızca özel gösteriliyor show_only_public=Yalnızca genel gösteriliyor - issues.in_your_repos=Depolarınızda [explore] @@ -273,20 +263,19 @@ organizations=Organizasyonlar search=Ara code=Kod search.type.tooltip=Arama türü -search.fuzzy=Belirsiz +search.fuzzy=Bulanık search.fuzzy.tooltip=Arama terimine benzeyen sonuçları da içer search.match=Eşleştir search.match.tooltip=Sadece arama terimiyle tamamen eşleşen sonuçları içer code_search_unavailable=Kod arama şu an mevcut değil. Lütfen site yöneticinizle bağlantıya geçin. -repo_no_results=Eşleşen bir depo bulunamadı. +repo_no_results=Eşleşen depo bulunamadı. user_no_results=Eşleşen kullanıcı bulunamadı. org_no_results=Eşleşen organizasyon bulunamadı. code_no_results=Aranan terimlerle eşleşen bir kaynak kod bulunamadı. code_search_results='%s' için arama sonuçları -code_last_indexed_at=Son endekslenen %s +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, filtrelenmemiş sonuçları göster. - +relevant_repositories=Sadece ilişkili depolar gösteriliyor, şifrenizi ayarlayın. - reset_password=Hesabınızı kurtarın reset_password.title=%s, hesap kurtarma talep ettiniz reset_password.text=Hesabınızı kurtarmak için lütfen %s içinde linke tıklayın: - register_success=Kayıt başarılı - issue_assigned.pull=@%[1]s sizi %[3]s deposundaki %[2]s değişiklik isteğine atadı. issue_assigned.issue=@%[1]s sizi %[3]s deposundaki %[2]s konusuna atadı. - issue.x_mentioned_you=@%s sizden bahsetti: issue.action.force_push=%[1]s %[3]s den %[2]s i %[4]s e zorla gönderdi. issue.action.push_1=@%[1]s %[3]d işlemesini %[2]s konumuna gönderdi @@ -399,7 +381,6 @@ issue.action.review_dismissed=@%[1]s %[2]s tarafından bu değişiklik is issue.action.ready_for_review=@%[1]s bu değişiklik isteğini incelemeye hazır olarak işaretledi. issue.action.new=@%[1]s #%[2]d oluşturdu. issue.in_tree_path=%s içinde: - release.new.subject=%s içinden %s bırakıldı release.new.text=@%[1]s %[2]s içinde %[3]s çıkardı release.title=Başlık: %s @@ -407,15 +388,12 @@ release.note=Not: release.downloads=İndirmeler: release.download.zip=Kaynak Kodu (ZIP) release.download.targz=Kaynak Kodu (TAR.GZ) - repo.transfer.subject_to=%s "%s" aktarımını %s tarafına gerçekleştirmek istiyor repo.transfer.subject_to_you=%s size "%s" aktarmak istiyor repo.transfer.to_you=siz repo.transfer.body=Kabul veya reddetmek için %s ziyaret edin veya görmezden gelin. - repo.collaborator.added.subject=%s sizi %s ekledi repo.collaborator.added.text=Bu depo için katkıcı olarak eklendiniz: - team_invite.subject=%[1] sizi %[2] organizasyonuna katılmaya davet etti team_invite.text_1=%[1] sizi %[3] organizasyonundaki %[2] 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: @@ -438,34 +416,30 @@ PayloadUrl=Yük Bağlantısı TeamName=Takım ismi AuthName=Yetkilendirme adı AdminEmail=Yönetici e-postası - NewBranchName=Yeni dal adı CommitSummary=İşleme özeti CommitMessage=İşleme mesajı CommitChoice=İşleme tercihi TreeName=Dosya yolu Content=İçerik - SSPISeparatorReplacement=Ayırıcı SSPIDefaultLanguage=Varsayılan Dil - -require_error=` boş olamaz.` -alpha_dash_error=` yalnızca alfasayısal, çizgi ('-') ve alt çizgi ('_') karakterlerini içermelidir. ` -alpha_dash_dot_error=` yalnızca alfasayısal, çizgi ('-'), alt çizgi ('_') ve nokta ('.') karakterlerini içermelidir. ` -git_ref_name_error=` git referans ismi iyi oluşturulmuş olmalıdır.` -size_error=` uzunluk en fazla %s olmalıdır.` -min_size_error=` en az %s karakter içermelidir.` -max_size_error=` en fazla %s karakter içermelidir.` -email_error=' geçerli bir e-posta adresi değil.' -url_error=`'%s' geçerli bir bağlantı değil.` -include_error=` '%s' içermelidir.` -glob_pattern_error=` glob deseni geçersiz: %s.` -regex_pattern_error=` regex dizisi geçersiz: %s.` +require_error=" boş olamaz." +alpha_dash_error=" yalnızca alfasayısal, çizgi ('-') ve alt çizgi ('_') karakterlerini içermelidir. " +alpha_dash_dot_error=" yalnızca alfasayısal, çizgi ('-'), alt çizgi ('_') ve nokta ('.') karakterlerini içermelidir. " +git_ref_name_error=" git referans ismi iyi oluşturulmuş olmalıdır." +size_error=" uzunluk en fazla %s olmalıdır." +min_size_error=" en az %s karakter içermelidir." +max_size_error=" en fazla %s karakter içermelidir." +email_error=" geçerli bir e-posta adresi değil." +url_error='%s' geçerli bir bağlantı değil. +include_error=" '%s' içermelidir." +glob_pattern_error=" glob deseni geçersiz: %s." +regex_pattern_error=" regex dizisi geçersiz: %s." unknown_error=Bilinmeyen hata: captcha_incorrect=CAPTCHA eşleşmedi. password_not_match=Parolalar uyuşmuyor. lang_select_error=Listeden bir dil seçin. - username_been_taken=Bu kullanıcı adı daha önce alınmış. username_change_not_local_user=Yerel olmayan kullanıcılar kendi kullanıcı adlarını değiştiremezler. repo_name_been_taken=Depo adı zaten kullanılıyor. @@ -497,19 +471,16 @@ team_not_exist=Böyle bir takım bulunmuyor. last_org_owner=Son kullanıcıyı 'sahipler' takımından çıkaramazsınız. Bir organizasyonun en az bir sahibi olmalıdır. cannot_add_org_to_team=Organizasyon, takım üyesi olarak eklenemez. duplicate_invite_to_team=Bu kullanıcı zaten takım üyesi olarak davet edilmişti. - invalid_ssh_key=SSH anahtarınız doğrulanamıyor: %s invalid_gpg_key=GPG anahtarınız doğrulanamıyor: %s invalid_ssh_principal=Geçersiz sorumlu: %s unable_verify_ssh_key=SSH anahtarı doğrulanamıyor; hatalar için lütfen tekrar kontrol edin. auth_failed=Kimlik doğrulaması başarısız oldu: %v - still_own_repo=Hesabınız bir veya daha fazla depoya sahip; önce onları silin veya transfer edin. still_has_org=Hesabınız bir veya daha fazla organizasyonun üyesi; öncelikle onlardan ayrılın. still_own_packages=Hesabınız bir veya daha fazla pakete sahip; önce onları silin. org_still_own_repo=Bu organizasyon hala bir veya daha fazla depoya sahip; önce onları silin veya transfer edin. 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. [user] @@ -528,7 +499,6 @@ unfollow=Takibi Bırak heatmap.loading=Isı haritası yükleniyor… user_bio=Biyografi disabled_public_activity=Bu kullanıcı, etkinliğin herkese görünür olmasını devre dışı bıraktı. - 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. @@ -551,7 +521,6 @@ account_link=Bağlı Hesaplar organization=Organizasyonlar uid=Tekil ID webauthn=Güvenlik Anahtarları - public_profile=Herkese Açık Profil biography_placeholder=Bize biraz kendinizden bahsedin profile_desc=E-posta adresiniz bilgilendirmeler ve diğer işlemler için kullanılacaktır. @@ -591,7 +560,6 @@ saved_successfully=Ayarlarınız başarılı bir şekilde kaydedildi. privacy=Gizlilik keep_activity_private=Etkinliği profil sayfasından gizle keep_activity_private_popup=Etkinliği yalnızca siz ve yöneticiler için görünür hale getirir - lookup_avatar_by_mail=Avatarı E-posta Adresine Göre Ara federated_avatar_lookup=Birleşmiş Avatar Araması enable_custom_avatar=Özel Avatarı Etkinleştir @@ -602,7 +570,6 @@ uploaded_avatar_not_a_image=Yüklenen dosya bir resim dosyası değil. uploaded_avatar_is_too_big=Yüklenen dosya maksimum boyutu aştı. update_avatar_success=Profil resminiz değiştirildi. update_user_avatar_success=Kullanıcının avatarı güncellendi. - change_password=Parolayı Güncelle old_password=Mevcut Parola new_password=Yeni Parola @@ -610,7 +577,6 @@ retype_new_password=Yeni parolayı tekrar yazın password_incorrect=Mevcut parola hatalı. change_password_success=Parolanız güncelleştirildi. Şu andan itibaren yeni parolanızı kullanarak oturum açın. password_change_disabled=Yerel olmayan kullanıcılar parolalarını Gitea web arayüzünden güncelleyemezler. - emails=E-Posta Adresleri manage_emails=E-posta Adreslerini Yönet manage_themes=Varsayılan temayı seç @@ -643,7 +609,6 @@ add_openid_success=Yeni OpenID adresi eklendi. keep_email_private=E-posta Adresini Gizle keep_email_private_popup=E-posta adresiniz diğer kullanıcılardan gizlenir. openid_desc=OpenID, kimlik doğrulama işlemini harici bir sağlayıcıya devretmenize olanak sağlar. - manage_ssh_keys=SSH Anahtarlarını Yönet manage_ssh_principals=SSH Sertifika Sorumlularını Yönet manage_gpg_keys=GPH Anahtarlarını Yönet @@ -722,14 +687,13 @@ manage_social=Bağlanmış Sosyal Hesapları Yönet social_desc=Bu sosyal hesaplar Gitea hesabınızla bağlantılı. Hepsini Gitea hesabınıza giriş yapmak için kullanılabildiğinden emin olun. unbind=Bağlantıyı Kaldır unbind_success=Sosyal hesabın bağlantısı Gitea hesabınızdan kaldırılmıştır. - manage_access_token=Erişim Jetonlarını Yönet -generate_new_token=Yeni Jeton Üret +generate_new_token=Yeni Erişim Anahtarı Üret tokens_desc=Bu jetonlar Gitea API'sini kullanarak hesabınıza erişim sağlar. new_token_desc=Jeton kullanan uygulamalar hesabınıza tam erişime sahiptir. token_name=Jeton İsmi -generate_token=Jeton Üret -generate_token_success=Yeni bir jeton oluşturuldu. Tekrar gösterilmeyeceği için şimdi kopyalayın. +generate_token=Erişim Anahtarı Üret +generate_token_success=Yeni bir erişim anahtarı oluşturuldu. Tekrar gösterilmeyeceği için şimdi kopyalayın. generate_token_name_duplicate=%s zaten bir uygulama adı olarak kullanılmış. Lütfen yeni bir tane kullanın. delete_token=Sil access_token_deletion=Erişim Jetonunu Sil @@ -737,7 +701,6 @@ access_token_deletion_cancel_action=İptal access_token_deletion_confirm_action=Sil access_token_deletion_desc=Bir erişim anahtarını silmek, onu kullanan uygulamaların hesabınıza erişimini kaldırır. Bu geri alınamaz. Devam edilsin mi? delete_token_success=Jeton silindi. Onu kullanan uygulamalar artık hesabınıza erişemez. - manage_oauth2_applications=OAuth2 Uygulamalarını Yönet edit_oauth2_application=OAuth2 Uygulamalarını Düzenle oauth2_applications_desc=OAuth2 uygulamaları, üçüncü parti uygulamanızın bu Gitea örneğinde kullanıcıları güvenli bir şekilde doğrulamasını sağlar. @@ -760,24 +723,22 @@ oauth2_client_secret_hint=Bu sayfayı tekrar ziyaret ederseniz gizlilik görünm oauth2_application_edit=Düzenle oauth2_application_create_description=OAuth2 uygulamaları, üçüncü taraf uygulamanıza bu durumda kullanıcı hesaplarına erişim sağlar. oauth2_application_remove_description=Bir OAuth2 uygulamasının kaldırılması, bu durumda yetkili kullanıcı hesaplarına erişmesini önler. Devam edilsin mi? - authorized_oauth2_applications=Yetkili OAuth2 Uygulamaları authorized_oauth2_applications_description=Kişisel Gitea hesabınıza bu üçüncü parti uygulamalara erişim izni verdiniz. Lütfen artık ihtiyaç duyulmayan uygulamalara erişimi iptal edin. revoke_key=İptal Et revoke_oauth2_grant=Erişimi İptal Et revoke_oauth2_grant_description=Bu üçüncü taraf uygulamasına erişimin iptal edilmesi bu uygulamanın verilerinize erişmesini önleyecektir. Emin misiniz? revoke_oauth2_grant_success=Erişimi başarıyla iptal ettiniz. - twofa_desc=İki faktörlü kimlik doğrulama, hesabınızın güvenliğini artırır. twofa_is_enrolled=Hesabınız şu anda iki faktörlü kimlik doğrulaması içinde kaydedilmiş. twofa_not_enrolled=Hesabınız şu anda iki faktörlü kimlik doğrulaması içinde kaydedilmemiş. twofa_disable=İki Aşamalı Doğrulamayı Devre Dışı Bırak -twofa_scratch_token_regenerate=Kazıma Belirtecini Yenile -twofa_scratch_token_regenerated=Kazıma belirteciniz şimdi %s. Güvenli bir yerde saklayın. +twofa_scratch_token_regenerate=Geçici Kodu Yeniden Üret +twofa_scratch_token_regenerated=Geçici kodunuz artık %s. Güvenilir bir yerde saklayın. twofa_enroll=İki Faktörlü Kimlik Doğrulamaya Kaydolun twofa_disable_note=Gerekirse iki faktörlü kimlik doğrulamayı devre dışı bırakabilirsiniz. twofa_disable_desc=İki faktörlü kimlik doğrulamayı devre dışı bırakmak hesabınızı daha az güvenli hale getirir. Devam edilsin mi? -regenerate_scratch_token_desc=Karalama belirtecinizi yanlış yerleştirdiyseniz veya oturum açmak için kullandıysanız, buradan sıfırlayabilirsiniz. +regenerate_scratch_token_desc=Geçici kodunuzu kaybettiyseniz veya oturum açmak için kullandıysanız, buradan sıfırlayabilirsiniz. twofa_disabled=İki faktörlü kimlik doğrulama devre dışı bırakıldı. scan_this_image=Kim doğrulama uygulamanızla bu görüntüyü tarayın: or_enter_secret=Veya gizli şeyi girin: %s @@ -785,13 +746,11 @@ then_enter_passcode=Ve uygulamada gösterilen şifreyi girin: passcode_invalid=Şifre geçersiz. Tekrar deneyin. twofa_enrolled=Hesabınız iki faktörlü kimlik doğrulamasına kaydedildi. Kazıma belirtecini (%s) yalnızca bir kez gösterdiği gibi güvenli bir yerde saklayın! twofa_failed_get_secret=Gizlilik elde edilemedi. - webauthn_desc=Güvenlik anahtarları, şifreleme anahtarlarını içeren donanım aygıtlarıdır. İki aşamalı kimlik doğrulama için kullanılabilirler. Güvenlik anahtarları WebAuthn Authenticator standardını desteklemelidir. webauthn_register_key=Güvenlik Anahtarı Ekle webauthn_nickname=Takma Ad webauthn_delete_key=Güvenlik Anahtarını Kaldır webauthn_delete_key_desc=Bir güvenlik anahtarını kaldırırsanız, onunla artık giriş yapamazsınız. Devam edilsin mi? - manage_account_links=Bağlı Hesapları Yönet manage_account_links_desc=Bu harici hesaplar Gitea hesabınızla bağlantılı. account_links_not_available=Şu anda Gitea hesabınıza bağlı harici bir hesap yok. @@ -799,23 +758,19 @@ link_account=Hesap Bağla remove_account_link=Bağlantılı Hesabı Kaldır remove_account_link_desc=Bağlantılı bir hesabı kaldırmak, onunla Gitea hesabınıza erişimi iptal edecektir. Devam edilsin mi? remove_account_link_success=Bağlantılı hesap kaldırıldı. - orgs_none=Herhangi bir organizasyonun bir üyesi değilsiniz. repos_none=Herhangi bir depoya sahip değilsiniz - delete_account=Hesabınızı Silin delete_prompt=Bu işlem kullanıcı hesabınızı kalıcı olarak siler. Bu işlem GERİ ALINAMAZ. delete_with_all_comments=Hesabınız %s günden daha genç. Hayalet yorumları önlemek için, tüm konu/Dİ yorumları onunla birlikte silinecektir. confirm_delete_account=Silmeyi Onayla delete_account_title=Kullanıcı Hesabını Silin delete_account_desc=Bu kullanıcı hesabını kalıcı olarak silmek istediğinizden emin misiniz? - email_notifications.enable=E-posta Bildirimlerini Etkinleştir email_notifications.onmention=Sadece Bahsedilen E-posta email_notifications.disable=E-posta Bildirimlerini Devre Dışı Bırak email_notifications.submit=E-posta Tercihlerini Ayarla email_notifications.andyourown=Ve Sizin Bildirimleriniz - visibility=Kullanıcı görünürlüğü visibility.public=Herkese Açık visibility.public_tooltip=Bütün kullanıcılara görünür @@ -909,14 +864,12 @@ delete_preexisting=Önceden var olan dosyaları sil delete_preexisting_content=%s içindeki dosyaları sil delete_preexisting_success=%s içindeki kabul edilmeyen dosyalar silindi blame_prior=Bu değişiklikten önceki suçu görüntüle - transfer.accept=Aktarımı Kabul Et -transfer.accept_desc="%s" tarafına aktar +transfer.accept_desc=`"%s" tarafına aktar` transfer.reject=Aktarımı Reddet -transfer.reject_desc="%s" tarafına aktarımı iptal et +transfer.reject_desc=" transfer.no_permission_to_accept=Kabul Etme iznine sahip değilsiniz transfer.no_permission_to_reject=Reddetme iznine sahip değilsiniz - desc.private=Özel desc.public=Genel desc.private_template=Özel şablon @@ -924,7 +877,6 @@ desc.public_template=Şablon desc.internal=Dahili desc.internal_template=Dahili şablon desc.archived=Arşivlenmiş - template.items=Şablon Öğeleri template.git_content=Git İçeriği (Varsayılan Dal) template.git_hooks=Git İstemcileri @@ -935,16 +887,13 @@ template.avatar=Profil Resmi template.issue_labels=Konu Etiketleri template.one_item=En az bir şablon öğesi seçmelisiniz template.invalid=Bir şablon deposu seçmelisiniz - archive.title=Bu depo arşivlendi. Dosyaları görüntüleyebilir ve klonlayabilirsiniz ama işlem gönderemez ve konu/değişiklik isteği açamazsınız. archive.issue.nocomment=Bu depo arşivlendi. Konular bölümünde yorum yapamazsınız. archive.pull.nocomment=Bu depo arşivlendi. Değişiklik istekleri bölümünde yorum yapamazsınız. - form.reach_limit_of_creation_1=Zaten %d depo limitinize ulaştınız. form.reach_limit_of_creation_n=Zaten %d depo limitinize ulaştınız. form.name_reserved=Depo ismi '%s' rezerve edildi. form.name_pattern_not_allowed='%s' deseni, depo adı için geçerli değildir. - need_auth=Yetkilendirme migrate_options=Göç Seçenekleri migrate_service=Göç Hizmeti @@ -995,7 +944,6 @@ migrate.migrating_labels=Etiketleri Taşıma migrate.migrating_releases=Sürümleri Taşıma migrate.migrating_issues=Konuları Taşıma migrate.migrating_pulls=Değişiklik İsteklerini Taşıma - mirror_from=şunun yansıması forked_from=şundan çatallanmış generated_from=şuradan oluşturuldu @@ -1009,7 +957,6 @@ unstar=Yıldızı Kaldır star=Yıldızla fork=Çatalla download_archive=Depoyu İndir - no_desc=Açıklama Yok quick_guide=Hızlı Başlangıç Kılavuzu clone_this_repo=Bu depoyu klonla @@ -1017,12 +964,11 @@ create_new_repo_command=Komut satırında yeni bir depo oluşturuluyor push_exist_repo=Komut satırından mevcut bir depo itiliyor empty_message=Bu depoda herhangi bir içerik yok. broken_message=Bu deponun altındaki Git verisi okunamıyor. Bu sunucunun yöneticisiyle bağlantıya geçin veya bu depoyu silin. - code=Kod code.desc=Kaynak koda, dosyalara, işlemelere ve dallara eriş. branch=Dal tree=Ağaç -clear_ref='Geçerli referansı temizle' +clear_ref=Geçerli referansı temizle filter_branch_and_tag=Dal veya biçim imini filtrele find_tag=Etiketi bul branches=Dal @@ -1034,7 +980,6 @@ packages=Paketler labels=Etiketler org_labels_desc=Bu organizasyon altında tüm depolarla kullanılabilen organizasyon düzeyinde etiketler org_labels_desc_manage=yönet - milestones=Kilometre Taşları commits=İşleme commit=İşle @@ -1050,14 +995,13 @@ file_view_rendered=Oluşturulanları Görüntüle file_view_raw=Ham Görünüm file_permalink=Kalıcı Bağlantı file_too_large=Bu dosya görüntülemek için çok büyük. -invisible_runes_header=`Bu dosya görünmez Evrensel Kodlu karakter içeriyor!` -invisible_runes_description=`Bu dosya, aşağıda görünenden farklı bir şekilde işlenebilecek görünmez Evrensel Kodlu karakter içeriyor. Eğer bunu kasıtlı ve meşru olarak yaptıysanız bu uyarıyı yok sayabilirsiniz. Gizli karakterleri göstermek için Kaçış düğmesine tıklayın.` -ambiguous_runes_header=`Bu dosya muğlak Evrensel Kodlu karakter içeriyor!` -ambiguous_runes_description=`Bu dosya, aşağıda görünenden farklı bir şekilde işlenebilecek muğlak Evrensel Kodlu karakter içeriyor. Eğer bunu kasıtlı ve meşru olarak yaptıysanız bu uyarıyı yok sayabilirsiniz. Bu karakterleri göstermek için Kaçış düğmesine tıklayın.` -invisible_runes_line=`Bu satırda görünmez evrensel kodlu karakter var` -ambiguous_runes_line=`Bu satırda muğlak evrensel kodlu karakter var` -ambiguous_character=`%[1]c [U+%04[1]X], %[2]c [U+%04[2]X] ile karıştırılabilir` - +invisible_runes_header=Bu dosya görünmez Evrensel Kodlu karakter içeriyor! +invisible_runes_description=Bu dosya, aşağıda görünenden farklı bir şekilde işlenebilecek görünmez Evrensel Kodlu karakter içeriyor. Eğer bunu kasıtlı ve meşru olarak yaptıysanız bu uyarıyı yok sayabilirsiniz. Gizli karakterleri göstermek için Kaçış düğmesine tıklayın. +ambiguous_runes_header=Bu dosya muğlak Evrensel Kodlu karakter içeriyor! +ambiguous_runes_description=Bu dosya, aşağıda görünenden farklı bir şekilde işlenebilecek muğlak Evrensel Kodlu karakter içeriyor. Eğer bunu kasıtlı ve meşru olarak yaptıysanız bu uyarıyı yok sayabilirsiniz. Bu karakterleri göstermek için Kaçış düğmesine tıklayın. +invisible_runes_line=Bu satırda görünmez evrensel kodlu karakter var +ambiguous_runes_line=Bu satırda muğlak evrensel kodlu karakter var +ambiguous_character=%[1]c [U+%04[1]X], %[2]c [U+%04[2]X] ile karıştırılabilir escape_control_characters=Kaçış Karakterli unescape_control_characters=Kaçış Karaktersiz file_copy_permalink=Kalıcı Bağlantıyı Kopyala @@ -1076,7 +1020,6 @@ download_file=Dosya indir normal_view=Normal Görünüm line=satır lines=satır - editor.add_file=Dosya Ekle editor.new_file=Yeni dosya editor.upload_file=Dosya Yükle @@ -1142,7 +1085,6 @@ editor.user_no_push_to_branch=Kullanıcı dala gönderemez editor.require_signed_commit=Dal imzalı bir işleme gerektirir editor.cherry_pick=%s şunun üzerine cımbızla: editor.revert=%s şuna geri döndür: - commits.desc=Kaynak kodu değişiklik geçmişine göz atın. commits.commits=İşleme commits.no_commits=Ortak bir işleme yok. '%s' ve '%s' tamamen farklı geçmişlere sahip. @@ -1161,7 +1103,6 @@ commits.signed_by_untrusted_user=Güvenilmeyen kullanıcı tarafından imzaland commits.signed_by_untrusted_user_unmatched=İşleyici ile eşleşmeyen güvenilmeyen kullanıcı tarafından imzalanmış commits.gpg_key_id=GPG Anahtar Kimliği commits.ssh_key_fingerprint=SSH Anahtar Parmak İzi - commit.actions=Eylemler commit.revert=Geri Al commit.revert-header=Geri al: %s @@ -1169,10 +1110,8 @@ commit.revert-content=Geri almak için dal seçin: commit.cherry-pick=Cımbızla commit.cherry-pick-header=Cımbızla: %s commit.cherry-pick-content=Cımbızlamak için dal seçin: - ext_issues=Harici Konulara Erişim ext_issues.desc=Dışsal konu takip sistemine bağla. - projects=Projeler projects.desc=Proje panolarındaki konuları ve değişiklikleri yönetin. projects.description=Açıklama (isteğe bağlı) @@ -1208,7 +1147,6 @@ projects.board.color=Renk projects.open=Aç projects.close=Kapat projects.board.assigned_to=Atanan - issues.desc=Hata raporlarını, görevleri ve kilometre taşlarını yönetmenizi sağlar. issues.filter_assignees=Atama Süzgeci issues.filter_milestones=Kilometre Taşı Süzgeci @@ -1261,25 +1199,25 @@ issues.add_labels=%s etiketlerini %s ekledi issues.remove_label=%s etiketini %s sildi issues.remove_labels=%s etiketlerini %s sildi issues.add_remove_labels=%s ekleme ve %s kaldırma işlemlerini %s yaptı -issues.add_milestone_at=`%[2]s %[1]s kilometre taşına ekledi` -issues.add_project_at=`bunu %s projesine %s ekledi` -issues.change_milestone_at=`%s kilometre taşını %s iken %s olarak değiştirdi` -issues.change_project_at=`%s %s olan projeyi %s olarak değiştirdi +issues.add_milestone_at=%[2]s %[1]s kilometre taşına ekledi +issues.add_project_at=bunu %s projesine %s ekledi +issues.change_milestone_at=%s kilometre taşını %s iken %s olarak değiştirdi +issues.change_project_at=%s %s olan projeyi %s olarak değiştirdi issues.remove_milestone_at=`%[2]s %[1]s kilometre taşından kaldırdı` -issues.remove_project_at=`bunu %s projesinden %s kaldırdı` -issues.deleted_milestone=`(silindi)` -issues.deleted_project=`(silindi)` -issues.self_assign_at=`%s kendini atadı` -issues.add_assignee_at=`%[2]s %[1]s tarafından atandı` -issues.remove_assignee_at=`ataması %[2]s %[1]s tarafından kaldırıldı` -issues.remove_self_assignment=`atamalarını kaldırdı %s` -issues.change_title_at=`başlığı %s iken %s olarak %s değiştirdi` -issues.change_ref_at=`%s referans %s %s olarak değiştirildi` -issues.remove_ref_at=`%s referansı %s tarihinde kaldırıldı` -issues.add_ref_at=`%s referansı %s tarihinde eklendi` -issues.delete_branch_at=`%s dalı silindi %s` +issues.remove_project_at=bunu %s projesinden %s kaldırdı +issues.deleted_milestone=(silindi) +issues.deleted_project=(silindi) +issues.self_assign_at=%s kendini atadı +issues.add_assignee_at=%[2]s %[1]s tarafından atandı +issues.remove_assignee_at=ataması %[2]s %[1]s tarafından kaldırıldı +issues.remove_self_assignment=atamalarını kaldırdı %s +issues.change_title_at=başlığı %s iken %s olarak %s değiştirdi +issues.change_ref_at=%s referans %s %s olarak değiştirildi +issues.remove_ref_at=%s referansı %s tarihinde kaldırıldı +issues.add_ref_at=%s referansı %s tarihinde eklendi +issues.delete_branch_at=%s dalı silindi %s issues.filter_label=Etiket -issues.filter_label_exclude=`Etiketleri hariç tutmak için alt + tıkla/enter kullanın` +issues.filter_label_exclude=Etiketleri hariç tutmak için alt + tıkla/enter kullanın issues.filter_label_no_select=Tüm etiketler issues.filter_milestone=Kilometre Taşı issues.filter_milestone_no_select=Tüm kilometre taşları @@ -1326,7 +1264,7 @@ issues.open_title=Açık issues.closed_title=Kapalı issues.draft_title=Taslak issues.num_comments=%d yorum -issues.commented_at=`%s yorum yaptı` +issues.commented_at=%s yorum yaptı issues.delete_comment_confirm=Bu yorumu silmek istediğinizden emin misiniz? issues.context.copy_link=Bağlantıyı Kopyala issues.context.quote_reply=Alıntı Cevapla @@ -1335,22 +1273,22 @@ issues.context.edit=Düzenle issues.context.delete=Sil issues.no_content=Henüz bir içerik yok. issues.close_issue=Kapat -issues.pull_merged_at=`%[2]s işlemesini %[3]s %[4]s ile birleştirdi` -issues.manually_pull_merged_at=`%[2]s işlemesini %[3]s %[4]s ile elle birleştirdi` +issues.pull_merged_at=%[2]s işlemesini %[3]s %[4]s ile birleştirdi +issues.manually_pull_merged_at=%[2]s işlemesini %[3]s %[4]s ile elle birleştirdi issues.close_comment_issue=Yorum Yap ve Kapat issues.reopen_issue=Yeniden aç issues.reopen_comment_issue=Yorum Yap ve Yeniden Aç issues.create_comment=Yorum yap -issues.closed_at=`%[2]s konusunu kapattı` -issues.reopened_at=`%[2]s konusunu yeniden açtı` -issues.commit_ref_at=`%[2]s işlemesinde bu konuyu işaret etti` -issues.ref_issue_from=`bu konuya referansta bulundu %[4]s %[2]s` -issues.ref_pull_from=`bu değişiklik isteğine referansta bulundu %[4]s %[2]s` -issues.ref_closing_from=`bir değişiklik isteğine referansta bulundu %[4]s bu konu kapatılacak %[2]s` -issues.ref_reopening_from=`bir değişiklik isteğine referansta bulundu %[4]s bu konu yeniden açılacak %[2]s` -issues.ref_closed_from=`bu konuyu kapat%[4]s %[2]s` -issues.ref_reopened_from=`konuyu yeniden aç%[4]s %[2]s` -issues.ref_from=`%[1]s'den` +issues.closed_at=%[2]s konusunu kapattı +issues.reopened_at=%[2]s konusunu yeniden açtı +issues.commit_ref_at=%[2]s işlemesinde bu konuyu işaret etti +issues.ref_issue_from=bu konuya referansta bulundu %[4]s %[2]s +issues.ref_pull_from=bu değişiklik isteğine referansta bulundu %[4]s %[2]s +issues.ref_closing_from=bir değişiklik isteğine referansta bulundu %[4]s bu konu kapatılacak %[2]s +issues.ref_reopening_from=bir değişiklik isteğine referansta bulundu %[4]s bu konu yeniden açılacak %[2]s +issues.ref_closed_from=bu konuyu kapat%[4]s %[2]s +issues.ref_reopened_from=konuyu yeniden aç%[4]s %[2]s +issues.ref_from=%[1]s'den issues.poster=Poster issues.collaborator=Katkıcı issues.owner=Sahibi @@ -1380,8 +1318,8 @@ issues.label.filter_sort.reverse_alphabetically=Ters alfabetik issues.label.filter_sort.by_size=En küçük boyut issues.label.filter_sort.reverse_by_size=En büyük boyut issues.num_participants=%d Katılımcı -issues.attachment.open_tab=`Yeni bir sekmede "%s" görmek için tıkla` -issues.attachment.download=`"%s" indirmek için tıkla` +issues.attachment.open_tab=Yeni bir sekmede "%s" görmek için tıkla +issues.attachment.download="%s" indirmek için tıkla issues.subscribe=Abone Ol issues.unsubscribe=Abonelikten Çık issues.lock=Konuşmayı kilitle @@ -1409,31 +1347,31 @@ issues.delete.text=Bu konuyu gerçekten silmek istiyor musunuz? (Bu işlem tüm issues.tracker=Zaman Takibi issues.start_tracking_short=Zamanlayıcıyı Başlat issues.start_tracking=Zaman İzlemeyi Başlat -issues.start_tracking_history=`%s çalışma başlattı` +issues.start_tracking_history=%s çalışma başlattı issues.tracker_auto_close=Bu konu kapatıldığında zamanlayıcı otomatik olarak durur -issues.tracking_already_started=`başka bir konuda zaten zaman izleyici başlattınız!` +issues.tracking_already_started=başka bir konuda zaten zaman izleyici başlattınız! issues.stop_tracking=Zamanlayıcıyı Bitir -issues.stop_tracking_history=`%s çalışmayı durdurdu` +issues.stop_tracking_history=%s çalışmayı durdurdu issues.cancel_tracking=Yoksay -issues.cancel_tracking_history=` %s zaman takibini iptal etti` +issues.cancel_tracking_history=" %s zaman takibini iptal etti" issues.add_time=El ile Zaman Ekle issues.del_time=Bu zaman kaydını sil issues.add_time_short=Zaman Ekle issues.add_time_cancel=İptal -issues.add_time_history=`%s harcanan zaman eklendi` -issues.del_time_history=`%s harcanan zaman silindi` +issues.add_time_history=%s harcanan zaman eklendi +issues.del_time_history=%s harcanan zaman silindi issues.add_time_hours=Saat issues.add_time_minutes=Dakika issues.add_time_sum_to_small=Zaman girilmedi. issues.time_spent_total=Toplam Harcanan Zaman -issues.time_spent_from_all_authors=`Toplam Harcanan Zaman: %s` +issues.time_spent_from_all_authors=Toplam Harcanan Zaman: %s issues.due_date=Bitiş Tarihi issues.invalid_due_date_format=Bitiş tarihinin biçimi 'yyyy-aa-gg' olmalıdır. 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.due_date_form=yyyy-aa-gg issues.due_date_form_add=Bitiş tarihi ekle issues.due_date_form_edit=Düzenle @@ -1452,8 +1390,8 @@ issues.dependency.add=Bağımlılık ekle… issues.dependency.cancel=İptal issues.dependency.remove=Kaldır issues.dependency.remove_info=Bu bağımlılığı kaldır -issues.dependency.added_dependency=`yeni bir %s bağımlılığı eklendi` -issues.dependency.removed_dependency=`bir %s bağımlılığı kaldırıldı` +issues.dependency.added_dependency=yeni bir %s bağımlılığı eklendi +issues.dependency.removed_dependency=bir %s bağımlılığı kaldırıldı issues.dependency.pr_closing_blockedby=Bu değişiklik isteğinin kapatılması aşağıdaki konular nedeniyle engelleniyor issues.dependency.issue_closing_blockedby=Bu konunun kapatılması aşağıdaki konular tarafından engelleniyor issues.dependency.issue_close_blocks=Bu konu aşağıdaki konuların kapatılmasını engelliyor @@ -1506,10 +1444,8 @@ issues.content_history.delete_from_history=Geçmişten kaldır issues.content_history.delete_from_history_confirm=Geçmişten kaldırılsın mı? issues.content_history.options=Seçenekler issues.reference_link=Referans: %s - compare.compare_base=temel compare.compare_head=karşılaştır - pulls.desc=Değişiklik isteklerini ve kod incelemelerini etkinleştir. pulls.new=Yeni Değişiklik İsteği pulls.view=Değişiklik İsteği Görüntüle @@ -1529,11 +1465,11 @@ pulls.filter_branch=Dal filtrele pulls.no_results=Sonuç bulunamadı. pulls.nothing_to_compare=Bu dallar eşit. Değişiklik isteği oluşturmaya gerek yok. 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.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=%[2]s içindeki %[1]d işlemeyi %[3]s ile birleştirmek istiyor pulls.merged_title_desc=%[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.change_target_branch_at=hedef dal %s adresinden %s%s adresine değiştirildi pulls.tab_conversation=Sohbet pulls.tab_commits=İşleme pulls.tab_files=Değiştirilen Dosyalar @@ -1545,7 +1481,7 @@ pulls.manually_merged=Elle birleştirildi pulls.manually_merged_as=Değişiklik isteği %[2]s olarak elle birleştirildi. pulls.is_closed=Değişiklik isteği kapatıldı. pulls.has_merged=Değişiklik isteği birleştirildi. -pulls.title_wip_desc=`Değişiklik isteğinin yanlışlıkla birleştirilmesini önlemek için, başlığı %s ile başlatın` +pulls.title_wip_desc=Değişiklik isteğinin yanlışlıkla birleştirilmesini önlemek için, başlığı %s ile başlatın pulls.cannot_merge_work_in_progress=Bu değişiklik isteği, devam eden bir çalışma olarak işaretlendi. pulls.still_in_progress=Hala devam ediyor mu? pulls.add_prefix=%s ön ekini ekle @@ -1576,7 +1512,6 @@ pulls.reject_count_n=%d değişiklik isteği pulls.waiting_count_1=%d bekleyen inceleme pulls.waiting_count_n=%d bekleyen inceleme pulls.wrong_commit_id=işleme kimliği, hedef daldaki bir işleme kimliği olmalıdır - pulls.no_merge_desc=Tüm depo birleştirme seçenekleri devre dışı bırakıldığından, bu değişiklik isteği birleştirilemez. pulls.no_merge_helper=Depo ayarlarındaki birleştirme seçeneklerini etkinleştirin veya değişiklik isteğini el ile birleştirin. pulls.no_merge_wip=Bu değişiklik isteği birleştirilemez çünkü devam eden bir çalışma olarak işaretlendi. @@ -1589,7 +1524,6 @@ pulls.squash_merge_pull_request=Ezme işlemi oluştur pulls.merge_manually=Elle birleştirildi pulls.merge_commit_id=Birleştirme işlemesi kimliği pulls.require_signed_wont_sign=Dal imzalı işlemeler gerektiriyor, ancak bu birleştirme imzalanmayacak - pulls.invalid_merge_option=Bu değişiklik isteği için bu birleştirme seçeneğini kullanamazsınız. pulls.merge_conflict=Birleştirme Başarısız Oldu: Birleştirme sırasında bir çakışma oldu. İpucu: Farklı bir strateji deneyin pulls.merge_conflict_summary=Hata Mesajı @@ -1602,7 +1536,7 @@ pulls.head_out_of_date=Birleştirme Başarısız: Birleştirme oluşturulurken, pulls.push_rejected=Birleştirme Başarısız Oldu: Gönderme reddedildi. Bu depo için Git İstemcilerini inceleyin. pulls.push_rejected_summary=Tam Red Mesajı pulls.push_rejected_no_message=Birleştirme başarısız oldu: Gönderme reddedildi, ancak uzak bir mesaj yoktu.
    Bu depo için Git İstemcilerini inceleyin -pulls.open_unmerged_pull_exists=`Aynı özelliklere sahip bekleyen bir değişiklik isteği (#%d) olduğundan yeniden açma işlemini gerçekleştiremezsiniz.` +pulls.open_unmerged_pull_exists=Aynı özelliklere sahip bekleyen bir değişiklik isteği (#%d) olduğundan yeniden açma işlemini gerçekleştiremezsiniz. pulls.status_checking=Bazı denetlemeler beklemede pulls.status_checks_success=Tüm denetlemeler başarılı oldu pulls.status_checks_warning=Bazı kontroller uyarılar bildirdi @@ -1615,27 +1549,22 @@ pulls.update_branch_rebase=Dalı yeniden yapılandırmayla güncelle pulls.update_branch_success=Dal güncellemesi başarıyla gerçekleştirildi pulls.update_not_allowed=Dalı güncelleme izniniz yok pulls.outdated_with_base_branch=Bu dal, temel dal ile güncel değil -pulls.closed_at=`%[2]s değişiklik isteğini kapattı` -pulls.reopened_at=`%[2]s değişiklik isteğini yeniden açtı` -pulls.merge_instruction_hint=`komut satırı talimatlarını da görüntüleyebilirsiniz.` +pulls.closed_at=%[2]s değişiklik isteğini kapattı +pulls.reopened_at=%[2]s değişiklik isteğini yeniden açtı +pulls.merge_instruction_hint=komut satırı talimatlarını da görüntüleyebilirsiniz. pulls.merge_instruction_step1_desc=Proje deponuzdan yeni bir dala göz atın ve değişiklikleri test edin. pulls.merge_instruction_step2_desc=Gitea'daki değişiklikleri ve güncellemeleri birleştirin. - pulls.auto_merge_button_when_succeed=(Denetlemeler başarılı olduğunda) pulls.auto_merge_when_succeed=Tüm denetlemeler başarılı olduğundan otomatik olarak birleştir pulls.auto_merge_newly_scheduled=Değişiklik İsteği tüm denetlemeler başarılı olduğunda birleştirilecek şekilde ayarlanmış. pulls.auto_merge_has_pending_schedule=%[1]s, bu değişiklik isteğini tüm denetlemeler başarılı olduğunda %[2]s, otomatik olarak birleşecek şekilde ayarlamış. - pulls.auto_merge_cancel_schedule=Otomatik birleştirmeyi iptal et pulls.auto_merge_not_scheduled=Bu değişiklik isteği için otomatik birleştirme zamanlanmamış. pulls.auto_merge_canceled_schedule=Bu değişiklik isteği için otomatik birleştirme iptal edildi. - -pulls.auto_merge_newly_scheduled_comment=`bu değişiklik isteği, tüm denetlemeler başarılı olduğunda %[1]s, otomatik olarak birleşecek şekilde ayarlandı` -pulls.auto_merge_canceled_schedule_comment=`bu değişiklik isteğinin, tüm denetlemeler başarılı olduğunda %[1]s, otomatik birleştirmesi iptal edildi` - +pulls.auto_merge_newly_scheduled_comment=bu değişiklik isteği, tüm denetlemeler başarılı olduğunda %[1]s, otomatik olarak birleşecek şekilde ayarlandı +pulls.auto_merge_canceled_schedule_comment=bu değişiklik isteğinin, tüm denetlemeler başarılı olduğunda %[1]s, otomatik birleştirmesi iptal edildi pulls.delete.title=Bu değişiklik isteği silinsin mi? pulls.delete.text=Bu değişiklik isteğini gerçekten silmek istiyor musunuz? (Bu işlem tüm içeriği kalıcı olarak silecektir. Arşivde tutma niyetiniz varsa silmek yerine kapatmayı düşünün) - milestones.new=Yeni Kilometre Taşı milestones.closed=Kapalı %s milestones.update_ago=%s önce güncellendi @@ -1655,7 +1584,7 @@ milestones.edit=Kilometre Taşını Düzenle milestones.edit_subheader=Kilometre taşları konuları yönetir ve gelişmeleri takip eder. milestones.cancel=İptal milestones.modify=Kilometre Taşını Güncelle -milestones.edit_success=`%s` kilometre taşı güncellendi. +milestones.edit_success=%s milestones.deletion=Kilometre Taşını Sil milestones.deletion_desc=Bir kilometre taşını silmek, onu ilgili tüm sorunlardan kaldırır. Devam edilsin mi? milestones.deletion_success=Kilometre taşı silindi. @@ -1665,7 +1594,6 @@ milestones.filter_sort.least_complete=En az tamamlama milestones.filter_sort.most_complete=En çok tamamlama milestones.filter_sort.most_issues=En çok konu milestones.filter_sort.least_issues=En az konu - signing.will_sign=Bu işleme '%s' anahtarıyla imzalanacak signing.wont_sign.error=İşlemenin imzalanıp imzalanamayacağını kontrol ederken bir hata oluştu signing.wont_sign.nokey=Bu işlemeyi imzalamak için anahtar yok @@ -1679,10 +1607,8 @@ signing.wont_sign.headsigned=Ana işleme imzalanmadığı için birleştirme imz signing.wont_sign.commitssigned=İlişkili tüm işlemeler imzalanmadığı için birleştirme imzalanmayacak signing.wont_sign.approved=Değişiklik İsteği onaylanmadığı için birleştirme imzalanmayacak signing.wont_sign.not_signed_in=Oturum açmadınız - ext_wiki=Harici Vikiye Erişim ext_wiki.desc=Harici bir wiki'ye bağlantı. - wiki=Wiki wiki.welcome=Wiki'ye Hoşgeldiniz. wiki.welcome_desc=Wiki, katkıcılarla belge yazmanıza ve paylaşmanıza olanak tanır. @@ -1706,7 +1632,6 @@ wiki.reserved_page='%s' wiki sayfa adı rezerve edilmiştir. wiki.pages=Sayfalar wiki.last_updated=Son güncelleme %s wiki.page_name_desc=Bu Viki sayfası için bir ad girin. Bazı özel isimler 'Home', '_Sidebar' ve '_Footer' şeklindedir. - activity=Aktivite activity.period.filter_label=Dönem: activity.period.daily=1 gün @@ -1755,8 +1680,8 @@ activity.no_git_activity=Bu dönemde herhangi bir işleme yapılmamıştır. activity.git_stats_exclude_merges=Birleştirmeler hariç, activity.git_stats_author_1=%d yazar activity.git_stats_author_n=%d yazar -activity.git_stats_pushed_1= -activity.git_stats_pushed_n= +activity.git_stats_pushed_1= +activity.git_stats_pushed_n= activity.git_stats_commit_1=%d işlemeyi activity.git_stats_commit_n=%d işlemeyi activity.git_stats_push_to_branch=%s dalına ve @@ -1772,7 +1697,6 @@ activity.git_stats_addition_n=%d ekleme activity.git_stats_and_deletions=ve activity.git_stats_deletion_1=%d silme oldu activity.git_stats_deletion_n=%d silme oldu - search=Ara search.search_repo=Depo ara search.type.tooltip=Arama türü @@ -1780,24 +1704,23 @@ search.fuzzy=Belirsiz search.fuzzy.tooltip=Arama terimine benzeyen sonuçları da içer search.match=Eşleştir search.match.tooltip=Sadece arama terimiyle tamamen eşleşen sonuçları içer -search.results="%s" için %s içinde sonuçları ara +search.results=`"%s" için %s içinde sonuçları ara` search.code_no_results=Arama teriminizle eşleşen bir kaynak kod bulunamadı. -search.code_search_unavailable=Kod arama şu an mevcut değil. Lütfen site yöneticisiyle iletişime geçin. - +search.code_search_unavailable=Kod arama şu an mevcut değil. Lütfen site yöneticinizle bağlantıya geçin. settings=Ayarlar settings.desc=Ayarlar, depo için ayarları yönetebileceğiniz yerdir settings.options=Depo settings.collaboration=Katkıcılar settings.collaboration.admin=Yönetici -settings.collaboration.write=Yaz -settings.collaboration.read=Oku +settings.collaboration.write=Yazma +settings.collaboration.read=Okunmuş settings.collaboration.owner=Sahibi settings.collaboration.undefined=Belirsiz settings.hooks=Web İstemcileri settings.githooks=Git İstemcileri settings.basic_settings=Temel Ayarlar settings.mirror_settings=Yansıma Ayarları -settings.mirror_settings.docs=Projenizi, değişiklikleri başka bir depoya/depodan otomatik olarak gönderecek ve/veya çekecek şekilde ayarlayın. Dallar, etiketler ve işlemeler otomatik olarak senkronize edilecektir. Depoları nasıl yansıtrım? +settings.mirror_settings.docs=Projenizi, değişiklikleri başka bir depoya/depodan otomatik olarak gönderecek ve/veya çekecek şekilde ayarlayın. Dallar, etiketler ve işlemeler otomatik olarak senkronize edilecektir. 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 github.com/gobwas/glob belgelerine bakın. Örnekler: .drone.yml, /docs/**/*.txt. +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 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 github.com/gobwas/glob belgelerine bakın. Örnekler: .drone.yml, /docs/**/*.txt. settings.add_protected_branch=Korumayı etkinleştir settings.delete_protected_branch=Korumayı devre dışı bırak settings.update_protect_branch_success='%s' dalı için dal koruması güncellendi. @@ -2171,7 +2094,6 @@ settings.rename_branch_success=%s dalının adı başarılı bir şekilde %s old settings.rename_branch_from=önceki dal adı settings.rename_branch_to=yeni dal adı settings.rename_branch=Dalı yeniden adlandır - diff.browse_source=Kaynağa Gözat diff.parent=ebeveyn diff.commit=işleme @@ -2223,7 +2145,6 @@ diff.image.side_by_side=Yan Yana diff.image.swipe=Kaydır diff.image.overlay=Arayüz diff.has_escaped=Bu satırda gizli evrensel kod karakterler var - releases.desc=Proje sürümlerini ve indirmeleri takip edin. release.releases=Sürümler release.detail=Sürüm ayrıntıları @@ -2265,7 +2186,6 @@ release.downloads=İndirmeler release.download_count=İndirilen: %s release.add_tag_msg=Sürümün başlığını ve içeriğini etiket mesajı olarak kullanın. release.add_tag=Yalnızca Etiket Oluştur - branch.name=Dal Adı branch.search=Dalları ara branch.already_exists='%s' adında bir dal zaten var. @@ -2282,7 +2202,7 @@ branch.create_success='%s' dalı oluşturuldu. branch.branch_already_exists='%s' dalı zaten bu depoda var. branch.branch_name_conflict='%s' dal adı zaten mevcut olan '%s' dalıyla çakışıyor. branch.tag_collision='%s' dalı, depoda aynı ada sahip bir etiket olduğundan oluşturulamıyor. -branch.deleted_by=%s tarafından silindi +branch.deleted_by=%s tarafından silindi branch.restore_success='%s' dalı geri yüklendi. branch.restore_failed='%s' dalı geri yüklenemedi. branch.protected_deletion_failed='%s' dalı korunuyor. Silinemez. @@ -2297,25 +2217,24 @@ branch.create_branch_operation=Dal oluştur branch.new_branch=Yeni dal oluştur branch.new_branch_from='%s' dalından yeni dal oluştur branch.renamed=%s dalının adı %s olarak değiştirildi. - tag.create_tag=%s etiketi oluştur tag.create_tag_operation=Etiket oluştur tag.confirm_create_tag=Etiket oluştur tag.create_tag_from='%s' kullanarak yeni etiket oluştur - tag.create_success='%s' etiketi oluşturuldu. - topic.manage_topics=Konuları Yönet topic.done=Bitti topic.count_prompt=25'ten fazla konu seçemezsiniz topic.format_prompt=Konular bir harf veya rakamla başlamalı, kısa çizgiler ('-') içerebilir ve en fazla 35 karakter uzunluğunda olabilir. - find_file.go_to_file=Dosyaya git 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. +issues.filter_project=Proje +issues.filter_project_none=Proje yok +settings.authorization_header=Yetkilendirme Başlığı +settings.authorization_header_desc=Mevcutsa isteklere yetkilendirme başlığı olarak eklenecektir. Örnekler: %s. [org] org_name_holder=Organizasyon Adı @@ -2339,11 +2258,9 @@ team_access_desc=Depo erişimi team_permission_desc=İzin team_unit_desc=Depo Bölümlerine Erişime İzin Ver team_unit_disabled=(Devre dışı) - form.name_reserved='%s' organizasyon adı rezerve edilmiştir. form.name_pattern_not_allowed=Organizasyon adında '%s' desenine izin verilmiyor. form.create_org_not_allowed=Organizasyon oluşturmanıza izin verilmiyor. - settings=Ayarlar settings.options=Organizasyon settings.full_name=Tam İsim @@ -2357,7 +2274,6 @@ settings.visibility.limited=Sınırlı (Sadece oturum açan kullanıcılar göre settings.visibility.limited_shortname=Sınırlı settings.visibility.private=Özel (Sadece organizasyon üyeleri görebilir) settings.visibility.private_shortname=Özel - settings.update_settings=Ayarları Güncelle settings.update_setting_success=Organizasyon ayarları güncellendi. settings.change_orgname_prompt=Not: Organizasyon adını değiştirmek, kuruluşun URL’sini de değiştirir. @@ -2370,9 +2286,7 @@ settings.confirm_delete_account=Silmeyi Onaylıyorum settings.delete_org_title=Organizasyonu Sil settings.delete_org_desc=Bu organizasyon kalıcı olarak silinecektir. Devam edilsin mi? settings.hooks_desc=Bu organizasyon altındaki tüm depolar için tetiklenecek webhook'lar ekle. - settings.labels_desc=Bu organizasyonun altındaki tüm depolar ile ilgili konularda kullanılabilecek etiketler ekleyin. - members.membership_visibility=Üyelik Görünürlüğü: members.public=Görünür members.public_helper=gizle @@ -2387,7 +2301,6 @@ members.leave=Ayrıl members.leave.detail=%s bırakılsın mı? members.invite_desc=Buraya yeni bir üye ekle %s: members.invite_now=Şimdi Davet Et - teams.join=Katıl teams.leave=Ayrıl teams.leave.detail=%s bırakılsın mı? @@ -2438,6 +2351,8 @@ teams.all_repositories_write_permission_desc=Bu takım tüm depolara Yaz teams.all_repositories_admin_permission_desc=Bu takım tüm depolara Yönetici erişimi sağlar: üyeler depolardan okuyabilir, itebilir ve katkıcıları ekleyebilir. teams.invite.by=%s tarafından davet edildi teams.invite.description=Takıma katılmak için aşağıdaki düğmeye tıklayın. +members=Üyeler +teams.invite.title=%s takımına (Organizasyon: %s) katılmaya davet edildiniz. [admin] dashboard=Pano @@ -2453,7 +2368,6 @@ monitor=İzleme first_page=İlk last_page=Son total=Toplam: %d - dashboard.new_version_hint=Gitea %s şimdi hazır, %s çalıştırıyorsunuz. Ayrıntılar için blog'a bakabilirsiniz. dashboard.statistic=Özet dashboard.operations=Bakım İşlemleri @@ -2531,7 +2445,6 @@ dashboard.delete_old_actions=Veritabanından tüm eski eylemleri sil dashboard.delete_old_actions.started=Veritabanından başlatılan tüm eski eylemleri silin. dashboard.update_checker=Denetleyiciyi güncelle dashboard.delete_old_system_notices=Veritabanından tüm eski sistem bildirimlerini sil - users.user_manage_panel=Kullanıcı Hesap Yönetimi users.new_account=Yeni Kullanıcı Hesabı users.name=Kullanıcı Adı @@ -2585,7 +2498,6 @@ users.list_status_filter.is_prohibit_login=Oturum Açmayı Önle users.list_status_filter.not_prohibit_login=Oturum Açmaya İzin Ver users.list_status_filter.is_2fa_enabled=2FA Etkin users.list_status_filter.not_2fa_enabled=2FA Devre Dışı - emails.email_manage_panel=Kullanıcı E-posta Yönetimi emails.primary=Birincil emails.activated=Aktifleştirildi @@ -2598,13 +2510,11 @@ emails.not_updated=İstenen e-posta adresi güncellenemedi: %v emails.duplicate_active=Bu e-posta adresi farklı bir kullanıcı için zaten aktif. emails.change_email_header=E-posta Özelliklerini Güncelle emails.change_email_text=Bu e-posta adresini güncellemek istediğinizden emin misiniz? - orgs.org_manage_panel=Organizasyon Yönetimi orgs.name=İsim orgs.teams=Takımlar orgs.members=Üyeler orgs.new_orga=Yeni Organizasyon - repos.repo_manage_panel=Depo Yönetimi repos.unadopted=Kabul Edilmemiş Depolar repos.unadopted.no_more=Kabul edilmemiş başka depo bulunamadı @@ -2616,7 +2526,6 @@ repos.stars=Yıldızlar repos.forks=Çatallar repos.issues=Konular repos.size=Boyut - packages.package_manage_panel=Paket Yönetimi packages.total_size=Toplam Boyut: %s packages.owner=Sahibi @@ -2627,17 +2536,14 @@ packages.type=Tür packages.repository=Depo packages.size=Boyut packages.published=Yayınlandı - defaulthooks=Varsayılan Web İstemcileri defaulthooks.desc=Web İstemcileri, belirli Gitea olayları tetiklendiğinde otomatik olarak HTTP POST isteklerini sunucuya yapar. Burada tanımlanan Web İstemcileri varsayılandır ve tüm yeni depolara kopyalanır. web istemcileri kılavuzunda daha fazla bilgi edinin. defaulthooks.add_webhook=Varsayılan Web İstemcisi Ekle defaulthooks.update_webhook=Varsayılan Web İstemcisini Güncelle - systemhooks=Sistem Web İstemcileri systemhooks.desc=Belirli Gitea olayları tetiklendiğinde Web istemcileri otomatik olarak bir sunucuya HTTP POST istekleri yapar. Burada tanımlanan web istemcileri sistemdeki tüm depolar üzerinde çalışır, bu yüzden lütfen bunun olabilecek tüm performans sonuçlarını göz önünde bulundurun. web istemcileri kılavuzunda daha fazla bilgi edinin. systemhooks.add_webhook=Sistem Web İstemcisi Ekle systemhooks.update_webhook=Sistem Web İstemcisi Güncelle - auths.auth_manage_panel=Kimlik Doğrulama Kaynak Yönetimi auths.new=Kimlik Doğrulama Kaynağı Ekle auths.name=İsim @@ -2752,7 +2658,6 @@ auths.still_in_used=Kimlik doğrulama kaynağı hala kullanımda. Önce bu kimli auths.deletion_success=Kimlik doğrulama kaynağı silindi. auths.login_source_exist='%s' kimlik doğrulama kaynağı zaten var. auths.login_source_of_type_exist=Bu tür bir kimlik doğrulama kaynağı zaten var. - config.server_config=Sunucu Yapılandırması config.app_name=Site Başlığı config.app_ver=Gitea Sürümü @@ -2771,7 +2676,6 @@ config.static_file_root_path=Sabit Dosya Kök Yolu config.log_file_root_path=Günlük Dosyası Yolu config.script_type=Betik Türü config.reverse_auth_user=Tersine Yetkilendirme Kullanıcısı - config.ssh_config=SSH Yapılandırması config.ssh_enabled=Aktif config.ssh_start_builtin_server=Yerleşik Sunucuyu Kullan @@ -2783,12 +2687,10 @@ config.ssh_key_test_path=Anahtar Test Yolu config.ssh_keygen_path=Keygen ('ssh-keygen') Yolu config.ssh_minimum_key_size_check=Minimum Anahtar Uzunluğu Kontrolü config.ssh_minimum_key_sizes=Minimum Anahtar Uzunlukları - config.lfs_config=LFS Yapılandırması config.lfs_enabled=Etkin config.lfs_content_path=LFS İçerik Yolu config.lfs_http_auth_expiry=LFS HTTP Yetkilendirme Süresi - config.db_config=Veritabanı Yapılandırması config.db_type=Türü config.db_host=Sunucu @@ -2797,7 +2699,6 @@ config.db_user=Kullanıcı adı config.db_schema=Şema config.db_ssl_mode=SSL config.db_path=Yol - config.service_config=Servis Yapılandırması config.register_email_confirm=Kayıt Olmak İçin E-posta Onayı Gereksin config.disable_register=Kullanıcı Kaydını Devre Dışı Bırak @@ -2820,12 +2721,10 @@ config.default_allow_only_contributors_to_track_time=Yalnızca Katkıda Bulunanl config.no_reply_address=Gizlenmiş E-Postalar için Alan Adı config.default_visibility_organization=Yeni organizasyonlar için varsayılan görünürlük config.default_enable_dependencies=Konu Bağımlılıklarını Varsayılan Olarak Etkinleştir - config.webhook_config=Web İstemcileri Yapılandırması config.queue_length=Kuyruk Uzunluğu config.deliver_timeout=Dağıtım Zaman Aşımı config.skip_tls_verify=TLS Doğrulamasını Geç - config.mailer_config=Mailer Yapılandırması config.mailer_enabled=Aktif config.mailer_enable_helo=HELO'yu etkinleştir @@ -2843,16 +2742,13 @@ config.test_email_placeholder=E-posta (ör. test@example.com) config.send_test_mail=Test E-postası Gönder config.test_mail_failed='%s' adresine test e-postası gönderilemedi: %v config.test_mail_sent='%s' adresine bir test e-postası gönderildi. - config.oauth_config=OAuth Yapılandırması config.oauth_enabled=Aktif - config.cache_config=Önbellek Yapılandırması config.cache_adapter=Önbellek Uyarlayıcısı config.cache_interval=Önbellek Aralığı config.cache_conn=Önbellek Bağlantısı config.cache_item_ttl=TTL Önbellek Öğesi - config.session_config=Oturum Yapılandırması config.session_provider=Oturum Sağlayıcı config.provider_config=Sağlayıcı Yapılandırması @@ -2861,12 +2757,10 @@ config.gc_interval_time=GC Aralık Zamanı config.session_life_time=Oturum Yaşam Zamanı config.https_only=Yalnız HTTPS config.cookie_life_time=Çerez Yaşam Zamanı - config.picture_config=Resim ve Avatar Yapılandırması config.picture_service=Resim Servisi config.disable_gravatar=Gravatar Hizmet Dışı config.enable_federated_avatar=Birleştirilmiş Avatarları Etkinleştir - config.git_config=Git Yapılandırması config.git_disable_diff_highlight=Değişiklik Sözdizimi Vurgusunu Devre Dışı Bırak config.git_max_diff_lines=Maksimum Değişiklik Satırı (tek bir dosya için) @@ -2878,7 +2772,6 @@ config.git_mirror_timeout=Yansı Güncelleme Zaman Aşımı config.git_clone_timeout=Klonlama İşlemi Zaman Aşımı config.git_pull_timeout=Çekme İşlemi Zaman Aşımı config.git_gc_timeout=GC İşlemi Zaman Aşımı - config.log_config=Log Yapılandırması config.log_mode=Log Modu config.own_named_logger=Adlandırılmış Günlük Kaydedicisi @@ -2890,10 +2783,8 @@ config.access_log_mode=Erişim Günlüğü Kipi config.access_log_template=Şablon config.xorm_log_mode=XORM Günlük Kipi config.xorm_log_sql=SQL Günlüğü - config.get_setting_failed=%s ayarı alınamadı config.set_setting_failed=%s ayarı yapılamadı - monitor.cron=Cron Görevleri monitor.name=İsim monitor.schedule=Program @@ -2945,7 +2836,6 @@ monitor.queue.pool.pause.submit=Kuyruğu Duraklat monitor.queue.pool.resume.title=Kuyruğu Sürdür monitor.queue.pool.resume.desc=Bu kuyruğun çalışmasını sürdür monitor.queue.pool.resume.submit=Kuyruğu Sürdür - monitor.queue.settings.title=Havuz Ayarları monitor.queue.settings.desc=Havuzlar, çalışan kuyruğunun engellenmesine yanıt olarak dinamik bir şekilde büyür. Bu değişiklikler mevcut çalışan gruplarını etkilemeyecektir. monitor.queue.settings.timeout=Artırma Zaman Aşımı @@ -2961,7 +2851,6 @@ monitor.queue.settings.submit=Ayarları Güncelle monitor.queue.settings.changed=Ayarlar Güncellendi monitor.queue.settings.blocktimeout=Geçerli Engelleme Zaman Aşımı monitor.queue.settings.blocktimeout.value=%[1]v - monitor.queue.pool.none=Bu kuyruğun bir havuzu yok monitor.queue.pool.added=Çalışan Grubu Eklendi monitor.queue.pool.max_changed=En fazla çalışan sayısı değişti @@ -2971,7 +2860,6 @@ monitor.queue.pool.cancel=Çalışan Grubunu Kapat monitor.queue.pool.cancelling=Çalışan Grubu kapatılıyor monitor.queue.pool.cancel_notices=Bu %s çalışan grubu kapatılsın mı? monitor.queue.pool.cancel_desc=Herhangi bir çalışan grubu olmadan bir kuyruk bırakmak, isteklerin süresiz olarak engellenmesine neden olabilir. - notices.system_notice_list=Sistem Bildirimleri notices.view_detail_header=Bildirim Ayrıntılarını Görüntüle notices.actions=İşlemler @@ -2991,15 +2879,15 @@ notices.delete_success=Sistem bildirimleri silindi. create_repo=depo %s oluşturuldu rename_repo=%[1]s olan depo adını %[3]s buna çevirdi commit_repo=%[4]s deposuna %[3]s dalını gönderdi -create_issue=`%[3]s#%[2]s konusunu açtı` -close_issue=`%[3]s#%[2]s konusunu kapattı` -reopen_issue=`%[3]s#%[2]s konusunu tekrar açtı` -create_pull_request=`%[3]s#%[2]s değişiklik isteğini oluşturdu` -close_pull_request=`%[3]s#%[2]s değişiklik isteğini kapattı` -reopen_pull_request=`%[3]s#%[2]s değişiklik isteğini yeniden açtı` -comment_issue=`%[3]s#%[2]s konusuna yorum yaptı` -comment_pull=`%[3]s#%[2]s değişiklik isteğine yorum yaptı` -merge_pull_request=`%[3]s#%[2]s değişiklik isteğini birleştirdi` +create_issue=%[3]s#%[2]s konusunu açtı +close_issue=%[3]s#%[2]s konusunu kapattı +reopen_issue=%[3]s#%[2]s konusunu tekrar açtı +create_pull_request=%[3]s#%[2]s değişiklik isteğini oluşturdu +close_pull_request=%[3]s#%[2]s değişiklik isteğini kapattı +reopen_pull_request=%[3]s#%[2]s değişiklik isteğini yeniden açtı +comment_issue=%[3]s#%[2]s konusuna yorum yaptı +comment_pull=%[3]s#%[2]s değişiklik isteğine yorum yaptı +merge_pull_request=%[3]s#%[2]s değişiklik isteğini birleştirdi transfer_repo=depo %s %s'a aktarıldı push_tag=%[3]s etiketini %[4]s dalına gönderdi delete_tag=%[2]s etiketi %[3]s deposundan silindi @@ -3010,14 +2898,15 @@ compare_commits_general=İşlemeleri karşılaştır mirror_sync_push=yansıdan %[4]s deposundaki %[3]s dalına işlemeleri eşitledi mirror_sync_create=%[3]s yeni referansını, %[4]s olarak yansıdan eşledi mirror_sync_delete=%[3]s adresindeki %[2]s referansını eşitledi ve sildi -approve_pull_request=`%[3]s#%[2]s değişiklik isteğini onayladı` -reject_pull_request=`%[3]s#%[2]s için değişiklikler önerdi` -publish_release=`%[3]s deposu için "%[4]s" sürümü yayınlandı` -review_dismissed=`%[3]s#%[2]s için %[4]s yorumunu reddetti` +approve_pull_request=%[3]s#%[2]s değişiklik isteğini onayladı +reject_pull_request=%[3]s#%[2]s için değişiklikler önerdi +publish_release=%[3]s deposu için "%[4]s" sürümü yayınlandı +review_dismissed=%[3]s#%[2]s için %[4]s yorumunu reddetti review_dismissed_reason=Sebep: create_branch=%[4]s deposunda %[3]s dalını oluşturdu starred_repo=%[2]s deposuna yıldız bıraktı watched_repo=%[2]s deposunu izlemeye başladı +auto_merge_pull_request=%[3]s#%[2]s değişiklik isteği otomatik olarak birleştirildi [tool] ago=%s önce @@ -3176,4 +3065,27 @@ settings.delete.description=Bir paketi silmek kalıcıdır ve geri alınamaz. settings.delete.notice=%s (%s) paketini silmek üzeresiniz. Bu işlem geri alınamaz, emin misiniz? settings.delete.success=Paket silindi. settings.delete.error=Paket silinemedi. - +chef.install=Paketi kurmak için, aşağıdaki komutu çalıştırın: +owner.settings.cleanuprules.enabled=Aktifleştirilmiş + +[aria] +navbar=Gezinti Çubuğu +footer=Alt Bilgi +footer.software=Yazılım Hakkında +footer.links=Bağlantılar + +[secrets] +value=Değer +name=İsim + +[actions] +runners.id=Kimlik +runners.name=İsim +runners.owner_type=Tür +runners.description=Açıklama +runners.labels=Etiketler +runners.task_list.run=Çalıştır +runners.task_list.repository=Depo +runners.task_list.commit=İşle +runners.status.active=Etkin +runs.commit=İşle diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini index 0b02a82ec23d..f9761a8d83e7 100644 --- a/options/locale/locale_uk-UA.ini +++ b/options/locale/locale_uk-UA.ini @@ -22,7 +22,6 @@ enable_javascript=Цей веб-сайт працює краще з JavaScript. toc=Зміст licenses=Ліцензії return_to_gitea=Повернутися до Gitea - username=Ім'я кристувача email=Адреса електронної пошти password=Пароль @@ -32,9 +31,7 @@ captcha=CAPTCHA twofa=Двофакторна авторизація twofa_scratch=Двофакторний одноразовий пароль passcode=Код доступу - webauthn_reload=Оновити - repository=Репозиторій organization=Організація mirror=Дзеркало @@ -52,18 +49,15 @@ settings=Налаштування your_profile=Профіль your_starred=Обрані your_settings=Налаштування - all=Усі sources=Власні mirrors=Дзеркала collaborative=Спільні forks=Форки - activities=Дії pull_requests=Запити на злиття issues=Задачі milestones=Етапи - ok=OK cancel=Відмінити save=Зберегти @@ -72,25 +66,21 @@ add_all=Додати все remove=Видалити remove_all=Видалити все edit=Редагувати - copy=Копіювати copy_url=Копіювати URL copy_branch=Копіювати назву гілки copy_success=Скопійовано! copy_error=Не вдалося скопіювати - write=Писати preview=Попередній перегляд loading=Завантаження… - step1=Крок 1: step2=Крок 2: - error=Помилка error404=Сторінка, до якої ви намагаєтеся звернутися або до , не існує або Ви не маєте права на її перегляд. - never=Ніколи - +enabled=Увімкнено +disabled=Вимкнено [filter] @@ -139,7 +129,6 @@ err_empty_admin_email=Електронна адреса адміністрато err_admin_name_is_reserved=Неправильне ім'я користувача-адміністратора - ім'я зарезервоване err_admin_name_pattern_not_allowed=Ім'я адміністратора недійсне, це ім'я підпадає під зарезервований шаблон err_admin_name_is_invalid=Неправильне ім'я користувача-адміністратора - general_title=Загальні налаштування app_name=Назва сайту app_name_helper=Тут ви можете ввести назву своєї компанії. @@ -159,7 +148,6 @@ app_url=Базова URL-адреса Gitea app_url_helper=Базова адреса для HTTP(S) клонування через URL та повідомлень електронної пошти. log_root_path=Шлях до лог файлу log_root_path_helper=Файли журналу будуть записані в цей каталог. - optional_title=Додаткові налаштування email_title=Налаштування Email smtp_from=Відправляти Email від імені @@ -215,7 +203,9 @@ default_enable_timetracking_popup=Включити відстеження час no_reply_address=Прихований поштовий домен no_reply_address_helper=Доменне ім'я для користувачів із прихованою електронною адресою. Наприклад, ім'я користувача 'joe' буде входити в Git як 'joe@noreply.example.org', якщо для прихованого домену електронної пошти встановлено 'noreply.example.org'. password_algorithm=Алгоритм хешування пароля -password_algorithm_helper=Встановіть алгоритм хешування пароля. Алгоритми мають різні вимоги та силу. `argon2` незважаючи на хороші характеристики використовує багато пам'яті і може бути недоцільним для малих систем. +password_algorithm_helper="""Встановіть алгоритм хешування пароля. Алгоритми мають різні вимоги та силу. `argon2` незважаючи на хороші характеристики використовує багато пам'яті і може бути недоцільним для малих систем.""" +smtp_addr=SMTP хост +smtp_port=SMTP порт [home] uname_holder=Ім'я користувача або Ел. пошта @@ -231,17 +221,14 @@ search_repos=Шукати репозиторій… filter=Інші фільтри filter_by_team_repositories=Фільтрувати за репозиторіями команд feed_of=Стрічка "%s" - show_archived=Архівовані show_both_archived_unarchived=Показано архівовані і не архівовані show_only_archived=Показано тільки архівовані show_only_unarchived=Показано тільки не архівовані - show_private=Приватні show_both_private_public=Показано публічні та приватні show_only_private=Показано тільки приватні show_only_public=Показано тільки публічні - issues.in_your_repos=В ваших репозиторіях [explore] @@ -259,7 +246,6 @@ code_no_results=Відповідний пошуковому запитанню code_search_results=Результати пошуку '%s' code_last_indexed_at=Останні індексовані %s - [auth] create_new_account=Реєстрація облікового запису register_helper_msg=Вже зареєстровані? Увійдіть зараз! @@ -328,31 +314,24 @@ password_pwned_err=Не вдалося виконати запит до HaveIBee view_it_on=Переглянути на %s link_not_working_do_paste=Не працює? Спробуйте скопіювати та вставити його в свій браузер. hi_user_x=Привіт %s, - activate_account=Будь ласка, активуйте ваш обліковий запис activate_account.title=%s, будь ласка, активуйте свій обліковий запис activate_account.text_1=Привіт, %[1]s, дякуємо за реєстрацію на %[2]s! activate_account.text_2=Перейдіть за цим посиланням, щоб активувати ваш обліковий запис в %s: - activate_email=Підтвердить вашу адресу електронної пошти activate_email.title=%s, будь ласка, підтвердіть вашу адресу електронної пошти activate_email.text=Перейдіть за цим посиланням, щоб підтвердити вашу електронну адресу в %s: - register_notify=Ласкаво просимо у Gitea register_notify.title=%[1]s, ласкаво просимо до %[2]s register_notify.text_1=це ваша е-пошта для підтвердження реєстрації для %s! register_notify.text_2=Тепер ви можете увійти як: %s. register_notify.text_3=Якщо цей обліковий запис було створено для вас, будь ласка, спочатку встановіть свій пароль. - reset_password=Відновлення вашого облікового запису reset_password.title=%s, ви відправили запит на відновлення облікового запису reset_password.text=Перейдіть за цим посиланням, щоб відновити ваш обліковий запис в %s: - register_success=Реєстрація успішна - issue_assigned.pull=@%[1]s призначив вам запит злиття %[2]s в репозиторії %[3]s. issue_assigned.issue=@%[1]s призначив вам задачу %[2]s у репозиторії %[3]s. - issue.x_mentioned_you=@%s згадав вас: issue.action.force_push=%[1]s force-pushed %[2]s з %[3]s в %[4]s. issue.action.push_1=@%[1]s надіслав %[3]d коміти %[2]s @@ -367,7 +346,6 @@ issue.action.review_dismissed=@%[1]s відхилено останній issue.action.ready_for_review=@%[1]s позначили цей запит на злиття як готовий до розгляду. issue.action.new=@%[1]s створили #%[2]d. issue.in_tree_path=В %s: - release.new.subject=%s в %s випущено release.new.text=@%[1]s випустив %[2]s в %[3]s release.title=Назва: %s @@ -375,16 +353,13 @@ release.note=Примітка: 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.to_you=вам repo.transfer.body=Щоб прийняти або відхилити перейдіть до %s або просто ігноруйте. - repo.collaborator.added.subject=%s додав вас до %s repo.collaborator.added.text=Ви були додані в якості співавтора репозиторію: - [modal] yes=Так no=Ні @@ -402,33 +377,29 @@ PayloadUrl=URL обробника TeamName=Назва команди AuthName=Назва авторизації AdminEmail=Email адміністратора - NewBranchName=Ім'я нової гілки CommitSummary=Резюме коміту CommitMessage=Повідомлення коміту CommitChoice=Вибір коміта TreeName=Шлях до файлу Content=Зміст - SSPISeparatorReplacement=Розділювач SSPIDefaultLanguage=Типова мова - -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=` не є адресою електронної пошти.` -include_error=`повинен бути текст '%s'` -glob_pattern_error=` неприпустимий шаблон glob: %s.` -regex_pattern_error=` неприпустимий шаблон regex: %s.` +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=" не є адресою електронної пошти." +include_error=повинен бути текст '%s' +glob_pattern_error=" неприпустимий шаблон glob: %s." +regex_pattern_error=" неприпустимий шаблон regex: %s." unknown_error=Невідома помилка: captcha_incorrect=Код CAPTCHA неправильний. password_not_match=Паролі не співпадають. lang_select_error=Оберіть мову з переліку. - username_been_taken=Ім'я користувача вже зайнято. username_change_not_local_user=Нелокальні користувачі не можуть змінити своє ім'я користувача. repo_name_been_taken=Ім'я репозіторію вже використовується. @@ -458,17 +429,14 @@ user_not_exist=Даний користувач не існує. team_not_exist=Команда не існує. last_org_owner=Ви не можете видалити останнього користувача з команди 'власники'. У кожній команді має бути принаймні один власник. cannot_add_org_to_team=Організацію неможливо додати як учасника команди. - invalid_ssh_key=Неможливо перевірити ваш SSH ключ: %s invalid_gpg_key=Неможливо перевірити ваш GPG ключ: %s invalid_ssh_principal=Некоректний відповідальний: %s unable_verify_ssh_key=Не вдається підтвердити ключ SSH; подвійно перевірте його на наявність похибки. auth_failed=Помилка автентифікації: %v - still_own_repo=Ваш обліковий запис володіє одним або декількома репозиторіями; видаліть або перенесіть їх в першу чергу. still_has_org=Ваш обліковий запис є учасником однієї чи декількох організацій; вийдіть з них в першу чергу. org_still_own_repo=Ця організація як і раніше володіє одним або декількома репозиторіями; спочатку видаліть або перенесіть їх. - target_branch_not_exist=Цільової гілки не існує. [user] @@ -486,7 +454,6 @@ unfollow=Відписатися heatmap.loading=Завантаження карти активності… user_bio=Біографія disabled_public_activity=Цей користувач вимкнув публічний показ діяльності. - form.name_reserved=Ім'я користувача "%s" зарезервовано. form.name_pattern_not_allowed=Шаблон '%s' не дозволено в імені користувача. form.name_chars_not_allowed=Ім'я користувача '%s' містить неприпустимі символи. @@ -508,7 +475,6 @@ twofa=Двофакторна авторизація account_link=Прив'язані облікові записи organization=Організації uid=Ідентифікатор Uid - public_profile=Загальнодоступний профіль biography_placeholder=Розкажіть трохи про себе profile_desc=Ваша адреса електронної пошти використовуватиметься для сповіщення та інших операцій. @@ -538,7 +504,6 @@ comment_type_group_project=Проєкт privacy=Приватність keep_activity_private=Приховати діяльність на сторінці профілю keep_activity_private_popup=Показувати вашу активність лише Вам та адміністраторам - lookup_avatar_by_mail=Знайти Аватар за адресою електронної пошти federated_avatar_lookup=Знайти зовнішній аватар enable_custom_avatar=Увімкнути користувацькі аватари @@ -549,7 +514,6 @@ uploaded_avatar_not_a_image=Завантажений файл не є зобра uploaded_avatar_is_too_big=Файл, що завантажувався, перевищив максимальний розмір. update_avatar_success=Ваш аватар був змінений. update_user_avatar_success=Аватар користувача оновлено. - change_password=Оновити пароль old_password=Поточний пароль new_password=Новий пароль @@ -557,7 +521,6 @@ retype_new_password=Введіть новий пароль ще раз password_incorrect=Поточний пароль неправильний. change_password_success=Ваш пароль був оновлений. Тепер увійдіть в систему, використовуючи новий пароль. password_change_disabled=Нелокальні акаунти не можуть змінити пароль через Gitea. - emails=Адреса електронної пошти manage_emails=Керування адресами ел. пошти manage_themes=Виберіть тему за замовчуванням @@ -574,7 +537,7 @@ delete_email=Видалити email_deletion=Видалити адресу електронної пошти email_deletion_desc=Електронна адреса та пов'язана з нею інформація буде видалена з вашого облікового запису. Git коміти, здійснені через цю електронну адресу, залишиться без змін. Продовжити? email_deletion_success=Адресу електронної пошти було видалено. -theme_update_success=Тему оновлено. +theme_update_success=Тему оновлено. theme_update_error=Вибрана тема не існує. openid_deletion=Видалити адресу OpenID openid_deletion_desc=Видалення цієї OpenID-адреси з вашого облікового запису забороняє вам входити з ним. Продовжити? @@ -590,7 +553,6 @@ add_openid_success=Нова адреса OpenID була додана. keep_email_private=Приховати адресу електронної пошти keep_email_private_popup=Вашу адресу електронної пошти буде приховано від інших користувачів. openid_desc=OpenID дозволяє делегувати аутентифікацію зовнішньому постачальнику послуг. - manage_ssh_keys=Керувати SSH ключами manage_ssh_principals=Управління SSH сертифікатами користувачів manage_gpg_keys=Керувати GPG ключами @@ -659,7 +621,6 @@ manage_social=Керувати зв'язаними обліковими запи social_desc=Ці адреси соціальних мереж пов'язані з вашим обліковим записом Gitea. Переконайтеся, що ви їх впізнаєте, оскільки вони можуть бути використані для входу в обліковий запис Gitea. unbind=Від'єднати unbind_success=Зв'язаний зовнішній обліковий запис було видалено. - manage_access_token=Керування токенами доступу generate_new_token=Згенерувати новий токен tokens_desc=Ці токени надають доступ до вашого облікового запису за допомогою Gitea API. @@ -671,7 +632,6 @@ generate_token_name_duplicate=Назва програми %s в delete_token=Видалити access_token_deletion=Видалити токен доступу delete_token_success=Токен був знищений. Програми, що використовують його, більше не мають доступу до вашого облікового запису. - manage_oauth2_applications=Керування програмами OAuth2 edit_oauth2_application=Редагувати програму OAuth2 oauth2_applications_desc=Програми OAuth2 дають можливість вашим стороннім програмам надійно аутентифікувати користувачів у цьому екземплярі Gitea. @@ -693,14 +653,12 @@ oauth2_client_secret_hint=Ключ не буде видимим, якщо ви oauth2_application_edit=Редагувати oauth2_application_create_description=Програми OAuth2 надають вашим стороннім програмам доступ до облікових записів користувачів у цьому екземплярі. oauth2_application_remove_description=Видалення програми OAuth2 скасує доступ до авторизованих облікових записів користувачів у цьому екземплярі. Продовжити? - authorized_oauth2_applications=Авторизовані програми OAuth2 authorized_oauth2_applications_description=Ви надали цим програмам третіх сторін доступ до вашого облікового запису Gitea. Будь ласка, скасуйте доступ для програм, які більше не потрібні. revoke_key=Відкликати revoke_oauth2_grant=Скасувати доступ revoke_oauth2_grant_description=Скасування доступу для цієї програми третьої сторони не дозволить їй отримувати доступ до ваших даних. Ви впевнені? revoke_oauth2_grant_success=Ви успішно скасували доступ. - twofa_desc=Двофакторна автентифікація підвищує безпеку вашого облікового запису. twofa_is_enrolled=Ваш обліковий запис на даний час використовує двофакторну автентифікацію. twofa_not_enrolled=Ваш обліковий запис наразі не використовує двофакторну автентифікаціїю. @@ -718,30 +676,24 @@ then_enter_passcode=І введіть пароль, який відобража passcode_invalid=Некоректний пароль. Спробуй ще раз. twofa_enrolled=Для вашого облікового запису було включена двофакторна автентифікація. Зберігайте свій scratch-токен (%s) у безпечному місці, оскільки він показується лише один раз! twofa_failed_get_secret=Не вдалося отримати секрет. - - manage_account_links=Керування обліковими записами manage_account_links_desc=Ці зовнішні акаунти прив'язані до вашого аккаунту Gitea. account_links_not_available=Наразі немає зовнішніх облікових записів, пов'язаних із вашим обліковим записом Gitea. remove_account_link=Видалити облікові записи remove_account_link_desc=Видалення пов'язаного облікового запису відкликає його доступ до вашого облікового запису Gitea. Продовжити? remove_account_link_success=Зв'язаний обліковий запис видалено. - orgs_none=Ви не є учасником будь-якої організації. repos_none=У вас немає власних репозиторіїв - delete_account=Видалити ваш обліковий запис delete_prompt=Ця операція остаточно видалить обліковий запис користувача. Це НЕ МОЖЛИВО відмінити. delete_with_all_comments=Ваш обліковий запис молодший за %s днів. Щоб уникнути коментарів-привидів, всі запити/PR коментрарі будуть видалені з ним. 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 - visibility=Видимість користувача visibility.public=Публічний visibility.public_tooltip=Видимий для всіх користувачів @@ -749,6 +701,13 @@ visibility.limited=Обмежений visibility.limited_tooltip=Видимий лише для користувачів, що ввійшли в систему visibility.private=Приватний visibility.private_tooltip=Видимий лише членам організації +ssh_key_verified=Перевірений ключ +ssh_key_verify=Підтвердити +ssh_token_required=Вам потрібно надати підпис для нижчевказаного токена +ssh_token_help=Ви можете створити підпис за допомогою: +access_token_deletion_cancel_action=Відмінити +access_token_deletion_confirm_action=Видалити +link_account=Прив'язати обліковий запис [repo] new_repo_helper=Репозиторій містить усі файли проєкту, включаючи історію ревізій. Ще десь є? Мігрувати репозиторій. @@ -831,14 +790,12 @@ delete_preexisting=Видалити існуючі файли delete_preexisting_content=Видалити файли з %s delete_preexisting_success=Видалено неприйняті файли в %s blame_prior=Переглянути анотацію, що передує цій зміні - transfer.accept=Дозволити трансфер transfer.accept_desc=Перемістити до "%s" transfer.reject=Відхилити трансфер transfer.reject_desc=Скасувати переміщення до "%s" transfer.no_permission_to_accept=У вас немає дозволу на прийняття transfer.no_permission_to_reject=У вас немає дозволу для відхилення - desc.private=Приватний desc.public=Публічний desc.private_template=Приватний шаблон @@ -846,7 +803,6 @@ desc.public_template=Шаблон desc.internal=Внутрішній desc.internal_template=Внутрішній шаблон desc.archived=Архівний - template.items=Елементи шаблону template.git_content=Вміст Git (типова гілка) template.git_hooks=Перехоплювачі Git @@ -856,16 +812,13 @@ template.avatar=Аватар template.issue_labels=Мітки задачі template.one_item=Слід обрати хоча б один елемент шаблону template.invalid=Слід обрати шаблонний репозиторій - archive.title=Цей репозиторій архівовано. Ви можете переглядати файли та клонувати його, але не можете виконувати push чи відкривати задачі та запити злиття. archive.issue.nocomment=Цей репозиторій архівовано. Ви не можете коментувати задачі. archive.pull.nocomment=Це архівний репозитарій. Ви не можете коментувати пулл-реквести. - form.reach_limit_of_creation_1=Ви вже досягли ліміту в %d репозиторіїв. form.reach_limit_of_creation_n=Ви досягли максимальної кількості %d створених репозиторіїв. form.name_reserved=Назву репозиторію '%s' зарезервовано. form.name_pattern_not_allowed=Шаблон '%s' не дозволено в назві репозиторія. - need_auth=Авторизація migrate_options=Параметри міграції migrate_service=Сервіс міграції @@ -913,7 +866,6 @@ migrate.migrating_labels=Міграція міток migrate.migrating_releases=Міграція релізів migrate.migrating_issues=Міграція задач migrate.migrating_pulls=Міграція запитів на злиття - mirror_from=дзеркало forked_from=форк від generated_from=згенеровано з @@ -927,19 +879,17 @@ unstar=Видалити із обраних star=В обрані fork=Форк download_archive=Скачати репозиторій - no_desc=Без опису quick_guide=Короткий посібник clone_this_repo=Кнонувати цей репозиторій create_new_repo_command=Створити новий репозиторій з командного рядка push_exist_repo=Опублікувати існуючий репозиторій з командного рядка empty_message=Цей репозиторій порожній. - code=Код code.desc=Доступ до коду, файлів, комітів та гілок. branch=Гілка tree=Дерево -clear_ref=`Очистити поточне посилання` +clear_ref=Очистити поточне посилання filter_branch_and_tag=Фільтрувати гілку або тег find_tag=Знайти тег branches=Гілки @@ -950,7 +900,6 @@ project_board=Проєкти labels=Мітки org_labels_desc=Мітки рівня організації можуть використовуватися в усіх репозиторіях цієї організації org_labels_desc_manage=керувати - milestones=Етап commits=Коміти commit=Коміт @@ -966,7 +915,6 @@ file_view_rendered=Переглянути відрендерено file_view_raw=Перегляд Raw file_permalink=Постійне посилання file_too_large=Цей файл завеликий щоб бути показаним. - file_copy_permalink=Копіювати постійне посилання video_not_supported_in_browser=Ваш браузер не підтримує тег 'video' HTML5. audio_not_supported_in_browser=Ваш браузер не підтримує тег HTML5 'audio'. @@ -982,7 +930,6 @@ download_file=Завантажити файл normal_view=Звичайний вигляд line=рядок lines=рядки - editor.new_file=Новий файл editor.upload_file=Завантажити файл editor.edit_file=Редагування файлу @@ -1039,7 +986,6 @@ editor.cannot_commit_to_protected_branch=Заборонено вносити к editor.no_commit_to_branch=Не вдалося внести коміт безпосередньо до гілки, тому що: editor.user_no_push_to_branch=Користувач не може здійснити пуш до гілки editor.require_signed_commit=Гілка вимагає підписаного коміту - commits.desc=Переглянути історію зміни коду. commits.commits=Коміти commits.no_commits=Немає спільних комітів. '%s' та '%s' мають різну історію. @@ -1057,11 +1003,8 @@ commits.signed_by=Підписано commits.signed_by_untrusted_user=Підписаний недовіреним користувачем commits.signed_by_untrusted_user_unmatched=Підписаний недовіреним користувачем, який не відповідає комітеру commits.gpg_key_id=Ідентифікатор GPG ключа - - ext_issues=Доступ до зовнішніх задач ext_issues.desc=Посилання на зовнішню систему відстеження задач. - projects=Проєкти projects.desc=Керуйте задачами та запитами злиття на дошках проєкту. projects.description=Опис (необов'язково) @@ -1096,7 +1039,6 @@ projects.board.deletion_desc=Видалення дошки проєкту пер projects.board.color=Колір projects.open=Відкрити projects.close=Закрити - issues.desc=Організація звітів про помилки, завдань та етапів. issues.filter_assignees=Фільтр виконавців issues.filter_milestones=Фільтр етапів @@ -1147,25 +1089,25 @@ issues.add_labels=додано %s з мітками %s issues.remove_label=видалено %s з міткою %s issues.remove_labels=видалено %s з мітками %s issues.add_remove_labels=додано %s і видалено %s мітками %s -issues.add_milestone_at=`додав(ла) до %s етапу %s` -issues.add_project_at=`додав до проєкту %s %s` -issues.change_milestone_at=`змінено цільової етап з %s на %s %s` -issues.change_project_at=`змінив проєкт з %s на %s %s` -issues.remove_milestone_at=`видалено з етапу%s %s` -issues.remove_project_at=`видалив з проєкту %s %s` -issues.deleted_milestone=`(видалено)` -issues.deleted_project=`(видалено)` -issues.self_assign_at=`самостійно призначений %s` -issues.add_assignee_at=`був призначений %s %s` -issues.remove_assignee_at=`був знятий з призначення %s %s` -issues.remove_self_assignment=`видалено призначення %s` -issues.change_title_at=`змінився заголовок з %s на %s %s` -issues.change_ref_at=`змінив посилання з %s на %s %s` -issues.remove_ref_at=`видалив посилання %s %s` -issues.add_ref_at=`додав посилання %s %s` -issues.delete_branch_at=`видалена гілка %s %s` +issues.add_milestone_at=додав(ла) до %s етапу %s +issues.add_project_at=додав до проєкту %s %s +issues.change_milestone_at=змінено цільової етап з %s на %s %s +issues.change_project_at=змінив проєкт з %s на %s %s +issues.remove_milestone_at=видалено з етапу%s %s +issues.remove_project_at=видалив з проєкту %s %s +issues.deleted_milestone=(видалено) +issues.deleted_project=(видалено) +issues.self_assign_at=самостійно призначений %s +issues.add_assignee_at=був призначений %s %s +issues.remove_assignee_at=був знятий з призначення %s %s +issues.remove_self_assignment=видалено призначення %s +issues.change_title_at=змінився заголовок з %s на %s %s +issues.change_ref_at=змінив посилання з %s на %s %s +issues.remove_ref_at=видалив посилання %s %s +issues.add_ref_at=додав посилання %s %s +issues.delete_branch_at=видалена гілка %s %s issues.filter_label=Мітка -issues.filter_label_exclude=`Використовуйте Alt + клік/Enter для виключення міток` +issues.filter_label_exclude=Використовуйте Alt + клік/Enter для виключення міток issues.filter_label_no_select=Всі мітки issues.filter_milestone=Етап issues.filter_milestone_no_select=Всі етапи @@ -1204,7 +1146,7 @@ issues.next=Далі issues.open_title=Відкрито issues.closed_title=Закрито issues.num_comments=%d коментарів -issues.commented_at=`прокоментував(ла) %s` +issues.commented_at=прокоментував(ла) %s issues.delete_comment_confirm=Ви впевнені, що хочете видалити цей коментар? issues.context.copy_link=Скопіювати посилання issues.context.quote_reply=Цитувати відповідь @@ -1213,22 +1155,22 @@ issues.context.edit=Редагувати issues.context.delete=Видалити issues.no_content=Тут ще немає жодного змісту. issues.close_issue=Закрити -issues.pull_merged_at=`Злиті коміти %[2]s в %[3]s %[4]s` -issues.manually_pull_merged_at=`%[4]s вручну злив коміти %[2]s в %[3]s` +issues.pull_merged_at=Злиті коміти %[2]s в %[3]s %[4]s +issues.manually_pull_merged_at=%[4]s вручну злив коміти %[2]s в %[3]s issues.close_comment_issue=Прокоментувати і закрити issues.reopen_issue=Відкрити знову issues.reopen_comment_issue=Прокоментувати та відкрити знову issues.create_comment=Коментар -issues.closed_at=`закрив цю задачу %[2]s` -issues.reopened_at=`повторно відкрив цю задачу %[2]s` -issues.commit_ref_at=`згадано цю задачу в коміті %[2]s` -issues.ref_issue_from=`посилання на цю задачу %[4] %[2]s` -issues.ref_pull_from=`послався на цей запит злиття %[4]s %[2]s` -issues.ref_closing_from=`згадав запит на злиття %[4]с, які закриють цю задачу %[2]s` -issues.ref_reopening_from=`згадав запит на злиття %[4]с, які повторно відкриють цю задачу %[2]s` -issues.ref_closed_from=`закрив цю задачу %[4]s %[2]s` -issues.ref_reopened_from=`повторно відкрито цю задачу %[4]s %[2]s` -issues.ref_from=`із %[1]s` +issues.closed_at=закрив цю задачу %[2]s +issues.reopened_at=повторно відкрив цю задачу %[2]s +issues.commit_ref_at=згадано цю задачу в коміті %[2]s +issues.ref_issue_from=посилання на цю задачу %[4] %[2]s +issues.ref_pull_from=послався на цей запит злиття %[4]s %[2]s +issues.ref_closing_from=згадав запит на злиття %[4]с, які закриють цю задачу %[2]s +issues.ref_reopening_from=згадав запит на злиття %[4]с, які повторно відкриють цю задачу %[2]s +issues.ref_closed_from=закрив цю задачу %[4]s %[2]s +issues.ref_reopened_from=повторно відкрито цю задачу %[4]s %[2]s +issues.ref_from=із %[1]s issues.poster=Автор issues.collaborator=Співавтор issues.owner=Власник @@ -1258,8 +1200,8 @@ issues.label.filter_sort.reverse_alphabetically=З кінця алфавіту issues.label.filter_sort.by_size=Найменший розмір issues.label.filter_sort.reverse_by_size=Найбільший розмір issues.num_participants=%d учасників -issues.attachment.open_tab=`Натисніть щоб побачити "%s" у новій вкладці` -issues.attachment.download=`Натисніть щоб завантажити "%s"` +issues.attachment.open_tab=Натисніть щоб побачити "%s" у новій вкладці +issues.attachment.download=Натисніть щоб завантажити "%s" issues.subscribe=Підписатися issues.unsubscribe=Відписатися issues.lock=Блокування обговорення @@ -1284,31 +1226,31 @@ issues.comment_on_locked=Ви не можете коментувати забл issues.tracker=Відстеження часу issues.start_tracking_short=Запустити таймер issues.start_tracking=Почати відстеження часу -issues.start_tracking_history=`почав працювати %s` +issues.start_tracking_history=почав працювати %s issues.tracker_auto_close=Таймер буде автоматично зупинено, коли ця задача буде закрита -issues.tracking_already_started=`Ви вже почали відстежувати час для іншої задачі!` +issues.tracking_already_started=Ви вже почали відстежувати час для іншої задачі! issues.stop_tracking=Зупинити таймер -issues.stop_tracking_history=`перестав(-ла) працювати %s` +issues.stop_tracking_history=перестав(-ла) працювати %s issues.cancel_tracking=Скасувати -issues.cancel_tracking_history=`скасував відстеження часу %s` +issues.cancel_tracking_history=скасував відстеження часу %s issues.add_time=Вручну додати час issues.del_time=Видалити цей журнал часу issues.add_time_short=Додати час issues.add_time_cancel=Відмінити -issues.add_time_history=`додав(-ла) витрачений час %s` -issues.del_time_history=`видалив витрачений час %s` +issues.add_time_history=додав(-ла) витрачений час %s +issues.del_time_history=видалив витрачений час %s issues.add_time_hours=Години issues.add_time_minutes=Хвилини issues.add_time_sum_to_small=Час не введено. issues.time_spent_total=Загальний витрачений час -issues.time_spent_from_all_authors=`Загальний витрачений час: %s` +issues.time_spent_from_all_authors=Загальний витрачений час: %s issues.due_date=Дата завершення issues.invalid_due_date_format=Дата закінчення має бути в форматі 'ррр-мм-дд'. 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] до %[4]s %[6]s` +issues.force_push_codes=примусово залито %[1]s з %[2] до %[4]s %[6]s issues.due_date_form=рррр-мм-дд issues.due_date_form_add=Додати дату завершення issues.due_date_form_edit=Редагувати @@ -1324,8 +1266,8 @@ issues.dependency.add=Додати залежність… issues.dependency.cancel=Відмінити issues.dependency.remove=Видалити issues.dependency.remove_info=Видалити цю залежність -issues.dependency.added_dependency=`додав нову залежність %s` -issues.dependency.removed_dependency=`видалив залежність %s` +issues.dependency.added_dependency=додав нову залежність %s +issues.dependency.removed_dependency=видалив залежність %s issues.dependency.pr_closing_blockedby=Закриття цього запиту злиття заблоковано наступними задачами issues.dependency.issue_closing_blockedby=Закриття цієї задачи заблоковано наступними задачами issues.dependency.issue_close_blocks=Ця задача блокує закриття залежних задач @@ -1376,10 +1318,8 @@ issues.content_history.created=створено issues.content_history.delete_from_history=Видалити з історії issues.content_history.delete_from_history_confirm=Видалити з історії? issues.content_history.options=Налаштування - compare.compare_base=основа compare.compare_head=порівняти - pulls.desc=Увімкнути запити на злиття та огляд коду. pulls.new=Новий запит на злиття pulls.compare_changes=Новий запит на злиття @@ -1392,11 +1332,11 @@ pulls.filter_branch=Фільтр по гілці pulls.no_results=Результатів не знайдено. pulls.nothing_to_compare=Ці гілки однакові. Немає необхідності створювати запитів на злиття. pulls.nothing_to_compare_and_allow_empty_pr=Одинакові гілки. Цей PR буде порожнім. -pulls.has_pull_request=`Запит злиття для цих гілок вже існує: %[2]s#%[3]d` +pulls.has_pull_request=Запит злиття для цих гілок вже існує: %[2]s#%[3]d pulls.create=Створити запит на злиття pulls.title_desc=хоче злити %[1]d комітів з %[2]s в %[3]s pulls.merged_title_desc=злито %[1]d комітів з %[2]s до %[3]s %[4]s -pulls.change_target_branch_at=`змінена цільова гілка з %s на %s %s` +pulls.change_target_branch_at=змінена цільова гілка з %s на %s %s pulls.tab_conversation=Обговорення pulls.tab_commits=Коміти pulls.tab_files=Змінені файли @@ -1408,7 +1348,7 @@ pulls.manually_merged=Ручне злиття pulls.manually_merged_as=Запит на злиття був вручну злитиий як %[2]s. pulls.is_closed=Запит на злиття було закрито. pulls.has_merged=Запит на злиття було об'єднано. -pulls.title_wip_desc=`Почніть заголовок з %s щоб запобігти випадковому злиттю запитів.` +pulls.title_wip_desc=Почніть заголовок з %s щоб запобігти випадковому злиттю запитів. pulls.cannot_merge_work_in_progress=Цей пулл-реквест позначений як прийнятий в опрацювання. pulls.still_in_progress=Все ще в процесі? pulls.add_prefix=Додати префікс %s @@ -1437,7 +1377,6 @@ pulls.reject_count_n=%d запити на зміну pulls.waiting_count_1=очікується %d рецензія pulls.waiting_count_n=очікується %d рецензії(й) pulls.wrong_commit_id=id коміту повинен бути id коміту в цільовій гілці - pulls.no_merge_desc=Цей запити на злиття неможливо злити, оскільки всі параметри об'єднання репозиторія вимкнено. pulls.no_merge_helper=Увімкніть параметри злиття в налаштуваннях репозиторія або злийте запити на злиття вручну. pulls.no_merge_wip=Цей пулл-реквест не можливо об'єднати, тому-що він вже виконується. @@ -1450,7 +1389,6 @@ pulls.squash_merge_pull_request=Створити зварений (squash) ко pulls.merge_manually=Об’єднано вручну pulls.merge_commit_id=ID коміту злиття pulls.require_signed_wont_sign=Гілка вимагає підписаних комітів, але це злиття не буде підписано - pulls.invalid_merge_option=Цей параметр злиття не можна використовувати для цього Pull Request'а. pulls.merge_conflict=Злиття не вдалося: Був конфлікт при злиття. Підказка: спробуйте іншу стратегію pulls.merge_conflict_summary=Помилка @@ -1460,7 +1398,7 @@ 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.open_unmerged_pull_exists=Ви не можете знову відкрити, оскільки вже існує запит на злиття (%d) з того ж репозиторія з тією ж інформацією про злиття і в очікуванні. pulls.status_checking=Деякі перевірки знаходяться на розгляді pulls.status_checks_success=Всі перевірки були успішними pulls.status_checks_warning=Декілька перевірок завершилися з попередженнями @@ -1473,16 +1411,11 @@ pulls.update_branch_rebase=Оновити гілку перебазування pulls.update_branch_success=Оновлення гілки пройшло успішно pulls.update_not_allowed=Ви не можете оновити гілку pulls.outdated_with_base_branch=Ця гілка застаріла відносно базової гілки -pulls.closed_at=`закрив цей запит на злиття %[2]s` -pulls.reopened_at=`повторно відкрив цей запит на злиття %[2]s` -pulls.merge_instruction_hint=`Також можна переглянути інструкції для командного рядка.` +pulls.closed_at=закрив цей запит на злиття %[2]s +pulls.reopened_at=повторно відкрив цей запит на злиття %[2]s +pulls.merge_instruction_hint=Також можна переглянути інструкції для командного рядка. pulls.merge_instruction_step1_desc=У репозиторії вашого проєкту перевірте нову гілку і протестуйте зміни. pulls.merge_instruction_step2_desc=Об'єднати зміни і оновити на Gitea. - - - - - milestones.new=Новий етап milestones.closed=Закрито %s milestones.update_ago=Оновлено %s назад @@ -1512,7 +1445,6 @@ milestones.filter_sort.least_complete=Менш повне milestones.filter_sort.most_complete=Більш повне milestones.filter_sort.most_issues=Найбільш задач milestones.filter_sort.least_issues=Найменш задач - signing.will_sign=Цей коміт буде підписано ключем '%s' signing.wont_sign.error=Під час підписання коміту, сталася помилка signing.wont_sign.nokey=Немає доступного ключа для підпису цього коміту @@ -1526,9 +1458,7 @@ signing.wont_sign.headsigned=Злиття не буде підписано, ос signing.wont_sign.commitssigned=Злиття не буде підписано, оскільки всі пов'язані коміти не підписані signing.wont_sign.approved=Злиття не буде підписано, оскільки PR не затверджено signing.wont_sign.not_signed_in=Ви не ввійшли - ext_wiki.desc=Посилання на зовнішню вікі. - wiki=Вікі wiki.welcome=Ласкаво просимо до Вікі. wiki.welcome_desc=Wiki дозволяє писати та ділитися документацією з співавторами. @@ -1552,7 +1482,6 @@ wiki.reserved_page=Назва сторінки вікі '%s' зарезерво wiki.pages=Сторінки wiki.last_updated=Останні оновлення %s wiki.page_name_desc=Введіть назву вікі-сторінки. Деякі із спеціальних імен: 'Home', '_Sidebar' та '_Footer'. - activity=Активність activity.period.filter_label=Період: activity.period.daily=1 день @@ -1618,13 +1547,11 @@ activity.git_stats_addition_n=%d добавки activity.git_stats_and_deletions=та activity.git_stats_deletion_1=%d видалений activity.git_stats_deletion_n=%d видалені - search=Пошук search.search_repo=Пошук репозиторію search.fuzzy=Неточний search.match=Збігається search.results=Результати пошуку для "%s" в %s - settings=Налаштування settings.desc=У налаштуваннях ви можете змінювати різні параметри цього репозиторія settings.options=Репозиторій @@ -1893,10 +1820,10 @@ settings.dismiss_stale_approvals=Відхилити застарілі пого settings.dismiss_stale_approvals_desc=Коли нові коміти що змінюють вміст пулл-запиту відправляються в гілку, старі погодження будуть відхилені. settings.require_signed_commits=Потрібно підписані коміти settings.require_signed_commits_desc=Відхиляти push до цієї гілки, якщо вони не підписані або підпис неможливо перевірити. -settings.protect_protected_file_patterns=Шаблони захищених файлів (розділені крапками з комою '\;'): -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=Незахищені файли, які користувачі із доступом на запис можуть змінити безпосередньо, оминаючи обмеження на push. Декілька шаблонів відокремлюються крапкою з комою ('\;'). Документацію із синтаксису шаблонів дивіться в github.com/gobwas/glob. Приклади: .drone.yml, /docs/**/*.txt. +settings.protect_protected_file_patterns=Шаблони захищених файлів (розділені крапками з комою ';'): +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=Незахищені файли, які користувачі із доступом на запис можуть змінити безпосередньо, оминаючи обмеження на push. Декілька шаблонів відокремлюються крапкою з комою (';'). Документацію із синтаксису шаблонів дивіться в github.com/gobwas/glob. Приклади: .drone.yml, /docs/**/*.txt. settings.add_protected_branch=Увімкнути захист settings.delete_protected_branch=Вимкнути захист settings.update_protect_branch_success=Налаштування захисту гілки '%s' були успішно змінені. @@ -1976,7 +1903,6 @@ settings.rename_branch_success=Гілку %s успішно перейменов settings.rename_branch_from=стара назва гілки settings.rename_branch_to=назва нової гілки settings.rename_branch=Перейменувати гілку - diff.browse_source=Переглянути джерело diff.parent=джерело diff.commit=коміт @@ -2027,7 +1953,6 @@ diff.protected=Захищений diff.image.side_by_side=Пліч-о-пліч diff.image.swipe=Свайп diff.image.overlay=Оверлей - releases.desc=Відслідковувати версії проєкту і завантаження. release.releases=Релізи release.detail=Деталі релізу @@ -2069,7 +1994,6 @@ release.downloads=Завантажити release.download_count=Завантаження: %s release.add_tag_msg=Використовуйте заголовок і зміст релізу як повідомлення як тег повідомлення. release.add_tag=Створити тільки мітку - branch.name=Ім'я гілки branch.search=Пошук гілок branch.already_exists=Гілка з ім'ям '%s' вже існує. @@ -2100,20 +2024,22 @@ branch.confirm_create_branch=Створити гілку branch.new_branch=Створити нову гілку branch.new_branch_from=Створити нову гілку з '%s' branch.renamed=Гілку %s перейменовано на %s. - tag.create_tag=Створити тег %s - tag.create_success=Тег '%s' був створений. - topic.manage_topics=Керувати тематичними мітками topic.done=Готово topic.count_prompt=Ви не можете вибрати більше 25 тем topic.format_prompt=Теми мають розпочинатися з літери або цифри, можуть містити дефіси (-) і не повинні перевищувати 35 символів. - - error.csv.too_large=Не вдається відобразити цей файл, тому що він завеликий. error.csv.unexpected=Не вдається відобразити цей файл, тому що він містить неочікуваний символ в рядку %d і стовпці %d. error.csv.invalid_field_count=Не вдається відобразити цей файл, тому що він має неправильну кількість полів у рядку %d. +issues.filter_project=Проєкт +issues.filter_project_none=Проєкт відсутній +issues.draft_title=Чернетка +issues.delete=Видалити +search.code_no_results=Відповідний пошуковому запитанню код не знайдено. +settings.event_wiki=Вікі +branch.create_branch_operation=Створити гілку [org] org_name_holder=Назва організації @@ -2136,11 +2062,9 @@ team_access_desc=Доступ до репозиторія team_permission_desc=Права доступу team_unit_desc=Дозволити доступ до розділів репозиторію team_unit_disabled=(Вимкнено) - form.name_reserved=Назву організації '%s' зарезервовано. form.name_pattern_not_allowed=Шаблон '%s' не дозволено в назві організації. form.create_org_not_allowed=Вам не дозволено створювати організації. - settings=Налаштування settings.options=Організація settings.full_name=Повне ім'я @@ -2154,7 +2078,6 @@ settings.visibility.limited=Обмежений (Видимий лише для settings.visibility.limited_shortname=Обмежений settings.visibility.private=Приватний (Видимий лише членам організації) settings.visibility.private_shortname=Приватний - settings.update_settings=Оновити налаштування settings.update_setting_success=Налаштування організації оновлені. settings.change_orgname_prompt=Ця зміна змінить посилання на організацію. @@ -2167,9 +2090,7 @@ settings.confirm_delete_account=Підтвердіть видалення settings.delete_org_title=Видалити організацію settings.delete_org_desc=Ця організація буде безповоротно видалена. Продовжити? settings.hooks_desc=Додайте webhooks, який буде викликатися для всіх репозиторіїв якими володіє ця організація. - settings.labels_desc=Додати мітки, які можуть бути використані для задач для всіх репозиторіїв в цій організації. - members.membership_visibility=Видимість учасника: members.public=Показувати members.public_helper=зробити прихованим @@ -2184,7 +2105,6 @@ members.leave=Покинути members.leave.detail=Покинути %s? members.invite_desc=Додати нового учасника до %s: members.invite_now=Запросити зараз - teams.join=Приєднатися teams.leave=Покинути teams.leave.detail=Покинути %s? @@ -2225,6 +2145,8 @@ teams.all_repositories_helper=Команда має доступ до всіх teams.all_repositories_read_permission_desc=Ця команда надає дозвіл Перегляд для всіх репозиторіїв: учасники можуть переглядати та клонувати їх. teams.all_repositories_write_permission_desc=Ця команда надає дозвіл Запис для всіх репозиторіїв: учасники можуть переглядати та виконувати push в репозиторіях. teams.all_repositories_admin_permission_desc=Ця команда надає дозвіл Адміністрування для всіх репозиторіїв: учасники можуть переглядати, виконувати push та додавати співробітників. +members=Учасники +teams.read_access=Прочитані [admin] dashboard=Панель управління @@ -2240,7 +2162,6 @@ monitor=Моніторинг first_page=Перша last_page=Остання total=Разом: %d - dashboard.statistic=Підсумок dashboard.operations=Технічне обслуговування dashboard.system_status=Статус системи @@ -2313,7 +2234,6 @@ dashboard.last_gc_pause=Остання пауза збирача сміття (G dashboard.gc_times=Кількість запусків збирача сміття (GC) dashboard.delete_old_actions=Видалити всі старі дії з бази даних dashboard.delete_old_actions.started=Видалення всіх старі дії з бази даних розпочато. - users.user_manage_panel=Керування обліковими записами користувачів users.new_account=Створити обліковий запис users.name=Ім'я кристувача @@ -2363,7 +2283,6 @@ 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 вимкнена - emails.email_manage_panel=Управління поштою користувача emails.primary=Головний emails.activated=Активовано @@ -2376,13 +2295,11 @@ emails.not_updated=Не вдалось оновити адресу електр emails.duplicate_active=Ця електронна адреса вже активна для іншого користувача. emails.change_email_header=Редагувати властивості електронної пошти emails.change_email_text=Ви впевнені, що хочете оновити цю адресу електронної пошти? - orgs.org_manage_panel=Керування організаціями orgs.name=Назва orgs.teams=Команди orgs.members=Учасники orgs.new_orga=Нова організація - repos.repo_manage_panel=Керування репозиторіями repos.unadopted=Неприйняті репозиторії repos.unadopted.no_more=Не знайдено більше неприйнятих репозиторіїв @@ -2394,18 +2311,14 @@ repos.stars=В обраному repos.forks=Форки repos.issues=Задачі repos.size=Розмір - - defaulthooks=Веб-хуки за замовчуванням defaulthooks.desc=Веб-хуки автоматично створюють HTTP POST-запити до сервера, коли виконуються певні події Gitea. Визначені тут веб-хуки є типовими і копіюються у всі нові сховища. Детальніше читайте в інструкції по використанню web-хуків. defaulthooks.add_webhook=Додати веб-хук за замовчуванням defaulthooks.update_webhook=Змінити веб-хук за замовчуванням - systemhooks=Системні вебхуки systemhooks.desc=Веб-хуки автоматично створюють HTTP POST-запити до сервера, коли виконуються певні тригери в Gitea. Визначені веб-хуки є типовими і копіюються у всі нові сховища. Детальніше читайте в інструкції по використанню web-хуків. systemhooks.add_webhook=Додати системний вебхук systemhooks.update_webhook=Оновити системний вебхук - auths.auth_manage_panel=Керування джерелом автентифікації auths.new=Додати джерело автентифікації auths.name=Ім'я @@ -2507,7 +2420,6 @@ auths.still_in_used=Ця перевірка справжності досі ви auths.deletion_success=Канал аутентифікації успішно знищений. auths.login_source_exist=Джерело входу '%s' вже існує. auths.login_source_of_type_exist=Джерело автентифікації такого типу вже наявне. - config.server_config=Конфігурація сервера config.app_name=Назва сайту config.app_ver=Версія Gitea @@ -2526,7 +2438,6 @@ config.static_file_root_path=Повний шлях до статичного ф config.log_file_root_path=Шлях до лог файлу config.script_type=Тип скрипта config.reverse_auth_user=Ім'я користувача для авторизації на reverse proxy - config.ssh_config=Конфігурація SSH config.ssh_enabled=Увімкнено config.ssh_start_builtin_server=Використовувати вбудований сервер @@ -2538,12 +2449,10 @@ config.ssh_key_test_path=Шлях до тестового ключа 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.db_config=Конфігурація бази даних config.db_type=Тип config.db_host=Хост @@ -2552,7 +2461,6 @@ config.db_user=Ім'я кристувача config.db_schema=Схема config.db_ssl_mode=SSL config.db_path=Шлях - config.service_config=Конфігурація сервісу config.register_email_confirm=Потрібно підтвердити електронну пошту для реєстрації config.disable_register=Вимкнути самостійну реєстрацію @@ -2575,12 +2483,10 @@ config.default_allow_only_contributors_to_track_time=Враховувати ті config.no_reply_address=Прихований домен електронної пошти config.default_visibility_organization=Видимість за замовчуванням для нових організацій config.default_enable_dependencies=Увімкнути залежності задачі за замовчуванням - config.webhook_config=Конфігурація web-хуків config.queue_length=Довжина черги config.deliver_timeout=Затримка доставки config.skip_tls_verify=Пропустити перевірку TLS - config.mailer_enabled=Увімкнено config.mailer_name=Ім'я config.mailer_user=Користувач @@ -2592,16 +2498,13 @@ config.test_email_placeholder=Адреса електронної пошти (н config.send_test_mail=Відправити тестового листа config.test_mail_failed=Не вдалося відправити тестовий лист на «%s»: %v config.test_mail_sent=Тестового листа було відправлено до '%s'. - config.oauth_config=Конфігурація OAuth config.oauth_enabled=Увімкнено - config.cache_config=Конфігурація кешу config.cache_adapter=Адаптер кешу config.cache_interval=Інтервал кешування config.cache_conn=Підключення до кешу config.cache_item_ttl=Час зберігання даних кешу - config.session_config=Конфігурація сесії config.session_provider=Провайдер сесії config.provider_config=Конфігурація постачальника @@ -2610,12 +2513,10 @@ config.gc_interval_time=Інтервал запуску збирача сміт config.session_life_time=Час життя сесії config.https_only=Тільки HTTPS config.cookie_life_time=Час життя cookie-файлу - config.picture_config=Налаштування фотографії або аватари config.picture_service=Сервіс зображень config.disable_gravatar=Вимкнути Gravatar config.enable_federated_avatar=Увімкнути зовнішні аватари - config.git_config=Конфігурація git config.git_disable_diff_highlight=Вимкнути підсвітку синтаксису diff config.git_max_diff_lines=Максимум рядків на diff (на один файл) @@ -2627,7 +2528,6 @@ config.git_mirror_timeout=Тайм-аут оновлення дзеркала config.git_clone_timeout=Тайм-аут операції клонування config.git_pull_timeout=Тайм-аут операції Pull config.git_gc_timeout=Тайм-аут операції збирача сміття (GC) - config.log_config=Конфігурація журналу config.log_mode=Режим журналювання config.own_named_logger=Іменований журнал @@ -2639,8 +2539,6 @@ config.access_log_mode=Режим доступу до журналу config.access_log_template=Шаблон config.xorm_log_mode=XORM-режим запису журналу config.xorm_log_sql=Журнал SQL - - monitor.cron=Завдання cron monitor.name=Ім'я monitor.schedule=Розклад @@ -2681,7 +2579,6 @@ monitor.queue.pool.flush.title=Очистити чергу monitor.queue.pool.flush.desc=Очистка додасть потік, який припиниться, коли черга буде порожньою, або по тайм-ауту. monitor.queue.pool.flush.submit=Додати робочий потік "Очистка" monitor.queue.pool.flush.added=Потік очистки додано до %[1]s - monitor.queue.settings.title=Налаштування пулу monitor.queue.settings.desc=Пули динамічно зростають у відповідь на блокування черги своїх робочих потоків. Ці зміни не вплинуть на поточні групи потоків. monitor.queue.settings.timeout=Час очікування посилення @@ -2697,7 +2594,6 @@ monitor.queue.settings.submit=Оновити налаштування monitor.queue.settings.changed=Налаштування оновлено monitor.queue.settings.blocktimeout=Таймаут блокування monitor.queue.settings.blocktimeout.value=%[1]v - monitor.queue.pool.none=У цій черзі немає пулу monitor.queue.pool.added=Робочу групу додано monitor.queue.pool.max_changed=Змінено максимальну кількість робочих потоків @@ -2707,7 +2603,6 @@ monitor.queue.pool.cancel=Вимкнути робочу групу monitor.queue.pool.cancelling=Закриття робочої групи monitor.queue.pool.cancel_notices=Вимкнути цю групу з %s робочих потоків? monitor.queue.pool.cancel_desc=Залишення черги без робочих груп може призвести до блокування запитів на невизначений термін. - notices.system_notice_list=Сповіщення системи notices.view_detail_header=Переглянути деталі повідомлення notices.actions=Дії @@ -2722,20 +2617,26 @@ notices.type_2=Завдання notices.desc=Опис notices.op=Оп. notices.delete_success=Сповіщення системи були видалені. +packages.owner=Власник +packages.name=Назва +packages.type=Тип +packages.repository=Репозиторій +packages.size=Розмір +config.mailer_smtp_port=SMTP порт [action] create_repo=створив(ла) репозиторій %s rename_repo=репозиторій перейменовано з %[1]s на %[3]s commit_repo=надіслав зміни (push) до %[3]s о %[4]s -create_issue=`відкрив задачу %[3]s#%[2]s` -close_issue=`закрив задачу %[3]s#%[2]s` -reopen_issue=`повторно відкрив задачу %[3]s#%[2]s` -create_pull_request=`створив запит злиття %[3]s#%[2]s` -close_pull_request=`закрив запит злиття %[3]s#%[2]s` -reopen_pull_request=`повторно відкрив запит злиття %[3]s#%[2]s` -comment_issue=`прокоментував задачу %[3]s#%[2]s` -comment_pull=`прокоментував запит злиття %[3]s#%[2]s` -merge_pull_request=`прийняв запит злиття %[3]s#%[2]s` +create_issue=відкрив задачу %[3]s#%[2]s +close_issue=закрив задачу %[3]s#%[2]s +reopen_issue=повторно відкрив задачу %[3]s#%[2]s +create_pull_request=створив запит злиття %[3]s#%[2]s +close_pull_request=закрив запит злиття %[3]s#%[2]s +reopen_pull_request=повторно відкрив запит злиття %[3]s#%[2]s +comment_issue=прокоментував задачу %[3]s#%[2]s +comment_pull=прокоментував запит злиття %[3]s#%[2]s +merge_pull_request=прийняв запит злиття %[3]s#%[2]s transfer_repo=перенесено репозиторій %s у %s push_tag=створив мітку %[3] в %[4]s delete_tag=видалено мітку %[2]s з %[3]s @@ -2746,10 +2647,10 @@ 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]` -reject_pull_request=`запропонував зміни до %[3]s#%[2]s` -publish_release=`опублікував випуск "%[4]s" з %[3]s` -review_dismissed=`відхилив відгук від %[4] для %[3]s#%[2]s` +approve_pull_request=схвалив %[3]s#%[2] +reject_pull_request=запропонував зміни до %[3]s#%[2]s +publish_release=опублікував випуск "%[4]s" з %[3]s +review_dismissed=відхилив відгук від %[4] для %[3]s#%[2]s review_dismissed_reason=Причина: create_branch=створив гілку %[3]s в %[4]s starred_repo=додав %[2]s у обране @@ -2810,4 +2711,21 @@ error.no_unit_allowed_repo=У вас немає доступу до жодног error.unit_not_allowed=У вас немає доступу до жодного розділу цього репозитория. [packages] - +filter.type=Тип +conan.details.repository=Репозиторій +owner.settings.cleanuprules.enabled=Увімкнено + +[aria] + +[secrets] +name=Назва + +[actions] +runners.name=Назва +runners.owner_type=Тип +runners.description=Опис +runners.task_list.run=Запустити +runners.task_list.repository=Репозиторій +runners.task_list.commit=Коміт +runners.status.active=Активний +runs.commit=Коміт diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index ee6f686a8579..247f72cfbd60 100644 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -23,7 +23,6 @@ enable_javascript=使用 JavaScript 能使本网站更好的工作。 toc=目录 licenses=许可证 return_to_gitea=返回 Gitea - username=用户名 email=电子邮件地址 password=密码 @@ -33,7 +32,6 @@ captcha=验证码 twofa=两步验证 twofa_scratch=两步验证口令 passcode=验证码 - webauthn_insert_key=插入安全密钥 webauthn_sign_in=按下安全密钥上的按钮。如果安全密钥没有按钮，请重新插入它。 webauthn_press_button=请按下安全密钥上的按钮… @@ -47,7 +45,6 @@ webauthn_error_duplicated=此安全密钥未被许可用于这个请求。请确 webauthn_error_empty=您必须为此密钥设置一个名称。 webauthn_error_timeout=未能在允许的时限内读取密钥。请重新加载此页面并重试。 webauthn_reload=重新加载 - repository=仓库 organization=组织 mirror=镜像 @@ -65,18 +62,15 @@ settings=帐户设置 your_profile=个人信息 your_starred=已点赞 your_settings=设置 - all=所有 sources=自建 mirrors=镜像 collaborative=协作 forks=派生 - activities=最近活动 pull_requests=合并请求 issues=工单管理 milestones=里程碑 - ok=确定 cancel=取消 save=保存 @@ -85,26 +79,24 @@ add_all=添加所有 remove=移除 remove_all=移除所有 edit=编辑 - copy=复制 copy_url=复制网址 copy_branch=复制分支名 copy_success=复制成功！ copy_error=复制失败 - write=撰写 preview=预览 loading=正在加载... - step1=第一步: step2=第二步： - error=错误 error404=您正尝试访问的页面 不存在 或 您尚未被授权 查看该页面。 - never=从不 - rss_feed=RSS 订阅源 +enabled=启用 +disabled=禁用 +copy_content=复制内容 +copy_type_unsupported=无法复制此类型的文件内容 [filter] string.asc=A - Z @@ -159,7 +151,6 @@ err_empty_admin_email=管理员电子邮件不能为空。 err_admin_name_is_reserved=管理员用户名无效，用户名是保留的 err_admin_name_pattern_not_allowed=管理员用户名无效，用户名是保留字 err_admin_name_is_invalid=管理员用户名无效 - general_title=一般设置 app_name=站点名称 app_name_helper=您可以在此输入您公司的名称。 @@ -179,7 +170,6 @@ app_url=基础URL app_url_helper=用于 HTTP (S) 克隆和电子邮件通知的基本地址。 log_root_path=日志路径 log_root_path_helper=日志文件将写入此目录。 - optional_title=可选设置 email_title=电子邮箱设置 smtp_addr=SMTP 主机地址 @@ -237,9 +227,10 @@ default_enable_timetracking_popup=默认情况下启用新仓库的时间跟踪 no_reply_address=隐藏电子邮件 no_reply_address_helper=具有隐藏电子邮件地址的用户的域名。例如, 用户名 "joe" 将以 "joe@noreply.example.org" 的身份登录到 Git 中. 如果隐藏的电子邮件域设置为 "noreply.example.org"。 password_algorithm=密码哈希算法 -password_algorithm_helper=设置密码哈希算法。 算法具有不同的要求和强度。 具有良好特性的`argon2`却会占用大量内存，可能不适用于小型系统。 +password_algorithm_helper="""设置密码哈希算法。 算法具有不同的要求和强度。 具有良好特性的`argon2`却会占用大量内存，可能不适用于小型系统。""" enable_update_checker=启用更新检查 enable_update_checker_helper=通过连接到 gitea.io 定期检查新版本发布。 +invalid_password_algorithm=无效的密码哈希算法 [home] uname_holder=用户名或邮箱 @@ -254,24 +245,21 @@ view_home=访问 %s search_repos=查找仓库… filter=其他过滤器 filter_by_team_repositories=按团队仓库筛选 -feed_of="%s" 的源 - -show_archived=已存档 -show_both_archived_unarchived=显示已存档和未存档的 +feed_of="%s"的源 +show_archived=已归档 +show_both_archived_unarchived=显示已归档和未归档的 show_only_archived=只显示已归档的 -show_only_unarchived=只显示未存档的 - -show_private=私有 -show_both_private_public=显示公开的和私有的 +show_only_unarchived=只显示未归档的 +show_private=私有库 +show_both_private_public=同时显示公开的和私有的 show_only_private=只显示私有的 show_only_public=只显示公开的 - -issues.in_your_repos=属于该用户仓库的 +issues.in_your_repos=在您的仓库中 [explore] -repos=仓库 +repos=仓库管理 users=用户 -organizations=组织 +organizations=组织管理 search=搜索 code=代码 search.type.tooltip=搜索类型 @@ -279,17 +267,16 @@ search.fuzzy=模糊 search.fuzzy.tooltip=包含近似匹配搜索词的结果 search.match=匹配 search.match.tooltip=仅包含精确匹配搜索词的结果 -code_search_unavailable=当前代码搜索不可用。请与网站管理员联系。 +code_search_unavailable=目前代码搜索不可用。请与网站管理员联系。 repo_no_results=未找到匹配的仓库。 user_no_results=未找到匹配的用户。 org_no_results=未找到匹配的组织。 code_no_results=未找到与搜索字词匹配的源代码。 -code_search_results=“%s” 的搜索结果是 +code_search_results=“%s” 的搜索结果 code_last_indexed_at=最后索引于 %s relevant_repositories_tooltip=派生的仓库，以及缺少主题、图标和描述的仓库将被隐藏。 relevant_repositories=只显示相关的仓库， 显示未过滤结果。 - [auth] create_new_account=注册帐号 register_helper_msg=已经注册？立即登录！ @@ -357,36 +344,30 @@ authorization_failed_desc=授权失败，这是一个无效的请求。请联系 sspi_auth_failed=SSPI 认证失败 password_pwned=此密码出现在 被盗密码 列表上并且曾经被公开。 请使用另一个密码再试一次。 password_pwned_err=无法完成对 HaveIBeenPwned 的请求 +invalid_password=您的密码与用于创建账户的密码不匹配。 [mail] view_it_on=在 %s 上查看 link_not_working_do_paste=不起作用？尝试复制并粘贴到您的浏览器。 hi_user_x=%s 您好， - activate_account=请激活您的帐户 activate_account.title=%s，请激活您的帐户 activate_account.text_1=%[1]s 您好，感谢注册 %[2]s ！ activate_account.text_2=请在 %s 时间内，点击以下链接激活您的账户： - activate_email=请验证您的邮箱地址 activate_email.title=%s，请验证您的电子邮件地址 activate_email.text=请在 %s 时间内，点击以下链接，以验证你的电子邮件地址： - register_notify=欢迎来到 Gitea register_notify.title=%[1]s，欢迎来到 %[2]s register_notify.text_1=这是您的 %s 注册确认电子邮件 ！ register_notify.text_2=您现在可以以用户名 %s 登录。 register_notify.text_3=如果此账户已为您创建，请先 设置您的密码。 - reset_password=恢复您的账户 reset_password.title=%s，您已请求恢复您的帐户 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.x_mentioned_you=@%s 提到了您： issue.action.force_push=%[1]s 强制从 %[3]s 推送 %[2]s 至 [4]s。 issue.action.push_1=@%[1]s 推送了 %[3]d 个提交到 %[2]s @@ -401,7 +382,6 @@ 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 中： - release.new.subject=%[2]s 中的 %[1]s 发布了 release.new.text=@%[1]s 于 %[3]s 发布了 %[2]s release.title=标题： %s @@ -409,19 +389,17 @@ release.note=注释： 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.to_you=你 repo.transfer.body=访问 %s 以接受或拒绝转移，亦可忽略此邮件。 - repo.collaborator.added.subject=%s 把你添加到了 %s repo.collaborator.added.text=您已被添加为代码库的协作者： - team_invite.subject=%[1]s 邀请您加入组织 %[2]s team_invite.text_1=%[1]s 邀请您加入组织 %[3]s 中的团队 %[2]s。 team_invite.text_2=请点击下面的链接加入团队： team_invite.text_3=注意：这是发送给 %[1]s 的邀请。如果您未曾收到过此类邀请，请忽略这封电子邮件。 +reply=或直接回复此邮件 [modal] yes=确认操作 @@ -440,34 +418,30 @@ PayloadUrl=推送地址 TeamName=团队名称 AuthName=认证名称 AdminEmail=管理员邮箱 - NewBranchName=新的分支名称 CommitSummary=提交小结 CommitMessage=提交消息 CommitChoice=提交选择 TreeName=文件路径 Content=内容 - SSPISeparatorReplacement=分隔符 SSPIDefaultLanguage=默认语言 - require_error=不能为空。 alpha_dash_error=应该只包含字母数字、破折号 ('-') 和下划线 ('_') 字符。 -alpha_dash_dot_error=` 应该只包含字母数字, 破折号 ('-'), 下划线 ('_') 和点 ('. ') 。` -git_ref_name_error=` 必须是格式良好的 git 引用名称。` +alpha_dash_dot_error=" 应该只包含字母数字, 破折号 ('-'), 下划线 ('_') 和点 ('. ') 。" +git_ref_name_error=" 必须是格式良好的 git 引用名称。" size_error=长度必须为 %s。 min_size_error=长度最小为 %s 个字符。 max_size_error=长度最大为 %s 个字符。 email_error=不是一个有效的邮箱地址。 -url_error=`'%s' 不是一个有效的 URL。` -include_error=`必须包含子字符串 '%s'。` -glob_pattern_error=`匹配模式无效：%s.` -regex_pattern_error=`正则表达式无效：%s.` +url_error='%s' 不是一个有效的 URL。 +include_error=必须包含子字符串 '%s'。 +glob_pattern_error=匹配模式无效：%s. +regex_pattern_error=正则表达式无效：%s. unknown_error=未知错误： captcha_incorrect=验证码不正确。 password_not_match=密码不匹配。 lang_select_error=从列表中选出语言 - username_been_taken=用户名已被使用。 username_change_not_local_user=非本地用户不允许更改用户名。 repo_name_been_taken=仓库名称已被使用。 @@ -499,20 +473,21 @@ team_not_exist=团队不存在 last_org_owner=您不能从 "所有者" 团队中删除最后一个用户。组织中必须至少有一个所有者。 cannot_add_org_to_team=组织不能被加入到团队中。 duplicate_invite_to_team=此用户已被邀请为团队成员。 - invalid_ssh_key=无法验证您的 SSH 密钥: %s invalid_gpg_key=无法验证您的 GPG 密钥: %s invalid_ssh_principal=无效的规则： %s unable_verify_ssh_key=无法验证SSH密钥，再次检查是否有误。 auth_failed=授权验证失败：%v - still_own_repo=此帐户仍拥有至少一个仓库，您需要先删除或转移它们。 still_has_org=此帐户仍隶属于一个或多个组织，您需要退出他们。 still_own_packages=您的账户拥有一个或多个软件包；请先删除它们。 org_still_own_repo=该组织仍然是某些仓库的拥有者，您必须先转移或删除它们才能执行删除组织操作！ org_still_own_packages=该组织仍然是一个或多个软件包的拥有者，您必须先删除它们。 - target_branch_not_exist=目标分支不存在。 +username_error=" 只能包含字母数字字符('0-9','a-z','A-Z'), 破折号 ('-'), 下划线 ('_') 和点 ('.'). 不能以非字母数字字符开头或结尾，并且不允许连续的非字母数字字符。" +invalid_group_team_map_error=映射无效： %s +organization_leave_success=您已成功离开组织 %s。 +must_use_public_key=您提供的密钥是私钥。不要在任何地方上传您的私钥，请改用您的公钥。 [user] change_avatar=修改头像 @@ -530,7 +505,6 @@ unfollow=取消关注 heatmap.loading=正在加载热图... user_bio=简历 disabled_public_activity=该用户已隐藏活动记录。 - form.name_reserved='%s' 用户名被保留。 form.name_pattern_not_allowed=用户名中不允许使用 "%s"。 form.name_chars_not_allowed=用户名 '%s' 包含无效字符。 @@ -553,7 +527,6 @@ account_link=已绑定帐户 organization=组织 uid=用户 ID webauthn=安全密钥 - public_profile=公开信息 biography_placeholder=关于你自己 profile_desc=您的电子邮件地址将用于通知和其他操作。 @@ -593,7 +566,6 @@ saved_successfully=您的设置已成功保存。 privacy=隐私设置 keep_activity_private=隐藏个人资料页面中的活动 keep_activity_private_popup=使活动仅对您和管理员可见 - lookup_avatar_by_mail=从电子邮箱地址查找头像 federated_avatar_lookup=Federated Avatar 查找 enable_custom_avatar=启动自定义头像 @@ -604,7 +576,6 @@ uploaded_avatar_not_a_image=上传的文件不是一张图片。 uploaded_avatar_is_too_big=上传的文件超过了最大大小。 update_avatar_success=您的头像已更新。 update_user_avatar_success=用户头像已更新。 - change_password=更新密码 old_password=当前密码 new_password=新的密码 @@ -612,7 +583,6 @@ retype_new_password=重新输入新的密码 password_incorrect=当前密码不正确！ change_password_success=您的密码已更新。从现在开始使用您的新密码登录。 password_change_disabled=非本地帐户不能通过 Gitea 的 web 界面更改密码。 - emails=邮箱地址 manage_emails=管理邮箱地址 manage_themes=选择默认主题 @@ -645,7 +615,6 @@ add_openid_success=新的 OpenID 地址已添加。 keep_email_private=隐藏电子邮件地址 keep_email_private_popup=您的电子邮件地址将对其他用户隐藏。 openid_desc=OpenID 让你可以将认证转发到外部服务。 - manage_ssh_keys=管理 SSH 密钥 manage_ssh_principals=管理SSH证书规则 manage_gpg_keys=管理 GPG 密钥 @@ -675,7 +644,7 @@ gpg_token_required=您必须为下面的令牌提供签名 gpg_token=令牌 gpg_token_help=您可以使用以下方式生成签名： gpg_token_code=echo "%s" | gpg -a --default-key %s --detach-sig -gpg_token_signature= GPG 增强签名 +gpg_token_signature=GPG 增强签名 key_signature_gpg_placeholder=以 '-----BEGIN PGP PUBLIC KEY BLOCK-----' 开头 verify_gpg_key_success=GPG 密钥 %s 已被验证。 ssh_key_verified=已验证的密钥 @@ -713,8 +682,8 @@ last_used=上次使用在 no_activity=没有最近活动 can_read_info=读取 can_write_info=写入 -key_state_desc=7 天内使用过该密钥 -token_state_desc=7 天内使用过该密钥 +key_state_desc=7 天内使用过该密钥 +token_state_desc=7 天内使用过该密钥 principal_state_desc=7 天内使用过该规则 show_openid=在个人信息上显示 hide_openid=在个人信息上隐藏 @@ -724,7 +693,6 @@ manage_social=管理关联社交帐户 social_desc=这些外部账号已经绑定到你的Gitea账号。请确认这些账号，因为这些账号可以用来登录系统。 unbind=取消链接 unbind_success=社会帐户已从您的帐户中解除绑定。 - manage_access_token=管理 Access Token generate_new_token=生成新的令牌 tokens_desc=这些令牌拥有通过 Gitea API 对您的帐户的访问权限。 @@ -739,7 +707,6 @@ access_token_deletion_cancel_action=取消 access_token_deletion_confirm_action=刪除 access_token_deletion_desc=删除令牌将撤销程序对您账户的访问权限。此操作无法撤消。是否继续？ delete_token_success=令牌已经被删除。使用该令牌的应用将不再能够访问你的账号。 - manage_oauth2_applications=管理 OAuth2 应用程序 edit_oauth2_application=编辑 OAuth2 应用程序 oauth2_applications_desc=OAuth2 应用允许第三方应用程序在此 Gitea 实例中安全验证用户。 @@ -762,14 +729,12 @@ oauth2_client_secret_hint=如果您重新访问此页面, 则该令牌将不可 oauth2_application_edit=编辑 oauth2_application_create_description=OAuth2 应用允许您的第三方应用程序访问此实例的用户帐户。 oauth2_application_remove_description=删除 OAuth2 应用会阻止它访问此实例中的授权用户帐户。继续吗？ - authorized_oauth2_applications=已授权的 OAuth2 应用 authorized_oauth2_applications_description=您已授予这些第三方应用访问您个人 Gitea 账户的权限。请对不再需要的应用撤销授权。 revoke_key=撤销 revoke_oauth2_grant=撤回权限 revoke_oauth2_grant_description=确定撤销此三方应用程序的授权，并阻止此应用程序访问您的数据？ revoke_oauth2_grant_success=您已成功撤销授权 - twofa_desc=两步验证可以加强你的账号安全性。 twofa_is_enrolled=你的账号已启用了两步验证。 twofa_not_enrolled=你的账号未开启两步验证。 @@ -787,13 +752,11 @@ then_enter_passcode=并输入应用程序中显示的密码: passcode_invalid=密码不正确。再试一次。 twofa_enrolled=你的账号已经启用了两步验证。请保存初始令牌（%s）到一个安全的地方，此令牌仅当前显示一次。 twofa_failed_get_secret=获取 secret 失败。 - webauthn_desc=安全密钥是包含加密密钥的硬件设备。它们可以用于双因素身份验证。安全密钥必须支持 WebAuthn 身份验证器 标准。 webauthn_register_key=添加安全密钥 webauthn_nickname=昵称 webauthn_delete_key=移除安全密钥 webauthn_delete_key_desc=如果删除了安全密钥，则不能再使用它登录。继续？ - manage_account_links=管理绑定过的账号 manage_account_links_desc=这些外部帐户已经绑定到您的 Gitea 帐户。 account_links_not_available=当前没有与您的 Gitea 帐户绑定的外部帐户。 @@ -801,23 +764,19 @@ link_account=链接账户 remove_account_link=删除已绑定的账号 remove_account_link_desc=删除已绑定帐户将吊销其对您的 Gitea 帐户的访问权限。继续？ remove_account_link_success=已取消绑定帐户。 - orgs_none=您现在还不是任何组织的成员。 repos_none=你并不拥有任何仓库 - delete_account=删除当前帐户 delete_prompt=此操作将永久删除您的用户帐户。它 不能 被撤消。 delete_with_all_comments=你的帐户年龄小于 %s。为了避免幽灵评论，所有工单/合并请求的评论都将与它一起被删除。 confirm_delete_account=确认删除帐户 delete_account_title=删除当前帐户 delete_account_desc=确实要永久删除此用户帐户吗？ - email_notifications.enable=启用邮件通知 email_notifications.onmention=只在被提到时邮件通知 email_notifications.disable=停用邮件通知 email_notifications.submit=邮件通知设置 email_notifications.andyourown=和您自己的通知 - visibility=用户可见性 visibility.public=公开 visibility.public_tooltip=所有用户可见 @@ -825,6 +784,8 @@ visibility.limited=受限 visibility.limited_tooltip=仅登录用户可见 visibility.private=私有 visibility.private_tooltip=仅对组织成员可见 +select_scopes=选择范围 +scopes_list=范围： [repo] new_repo_helper=仓库包含所有项目文件，包括修订历史。已经在别处有了吗？ 迁移代码库 @@ -898,7 +859,7 @@ watchers=关注者 stargazers=称赞者 forks=派生仓库 pick_reaction=选择你的表情 -reactions_more=再加载 %d +reactions_more=再加载 %d unit_disabled=站点管理员已禁用此仓库单元。 language_other=其它 adopt_search=输入用户名以搜索未被收录的仓库... (留空以查找全部) @@ -911,14 +872,12 @@ delete_preexisting=删除已存在的文件 delete_preexisting_content=删除 %s 中的文件 delete_preexisting_success=删除 %s 中未收录的文件 blame_prior=查看此更改前的 blame - transfer.accept=接受转移 transfer.accept_desc=转移到 "%s" transfer.reject=拒绝转移 transfer.reject_desc=取消转移到 "%s" transfer.no_permission_to_accept=您没有接受的权限 transfer.no_permission_to_reject=您没有拒绝的权限 - desc.private=私有库 desc.public=公开 desc.private_template=私有模板 @@ -926,7 +885,6 @@ desc.public_template=模板 desc.internal=内部 desc.internal_template=内部模板 desc.archived=已存档 - template.items=模板选项 template.git_content=Git数据(默认分支) template.git_hooks=Git 钩子 @@ -937,16 +895,13 @@ template.avatar=头像 template.issue_labels=工单标签 template.one_item=必须至少选择一个模板项 template.invalid=必须选择一个模板仓库 - archive.title=此仓库已存档。您可以查看文件和克隆，但不能推送或创建工单/合并请求。 archive.issue.nocomment=此仓库已存档，您不能在此工单添加评论。 archive.pull.nocomment=此仓库已存档，您不能在此合并请求添加评论。 - form.reach_limit_of_creation_1=你已经达到了 %d 仓库的上限。 form.reach_limit_of_creation_n=你已经达到了 %d 个仓库的上限。 form.name_reserved=仓库名称 '%s' 是被保留的。 form.name_pattern_not_allowed=仓库名称中不允许使用模式 "%s"。 - need_auth=授权 migrate_options=迁移选项 migrate_service=迁移服务 @@ -997,7 +952,6 @@ migrate.migrating_labels=迁移标签 migrate.migrating_releases=迁移发布 migrate.migrating_issues=迁移工单 migrate.migrating_pulls=迁移合并请求 - mirror_from=镜像自地址 forked_from=派生自 generated_from=生成自 @@ -1011,7 +965,6 @@ unstar=取消点赞 star=点赞 fork=派生 download_archive=下载此仓库 - no_desc=暂无描述 quick_guide=快速帮助 clone_this_repo=克隆当前仓库 @@ -1019,12 +972,11 @@ create_new_repo_command=从命令行创建一个新的仓库 push_exist_repo=从命令行推送已经创建的仓库 empty_message=这个家伙很懒，什么都没有推送。 broken_message=无法读取此仓库下的 Git 数据。 联系此实例的管理员或删除此仓库。 - code=代码 code.desc=查看源码、文件、提交和分支。 branch=分支 tree=目录树 -clear_ref=`清除当前引用` +clear_ref=清除当前引用 filter_branch_and_tag=过滤分支或标签 find_tag=查找Git标签 branches=分支列表 @@ -1036,7 +988,6 @@ packages=软件包 labels=标签 org_labels_desc=组织级别的标签，可以被本组织下的 所有仓库 使用 org_labels_desc_manage=管理 - milestones=里程碑 commits=提交 commit=提交 @@ -1052,14 +1003,13 @@ file_view_rendered=渲染模式 file_view_raw=查看原始文件 file_permalink=永久链接 file_too_large=文件过大，无法显示。 -invisible_runes_header=`此文件包含不可见的 Unicode 字符！` -invisible_runes_description=`这个文件包含不可见的 Unicode 字符，其处理方式可能不同于下面显示的字符。 如果您是有意且正当地使用它们，您可以安全地忽略这个警告。使用 Escape 按钮来显示隐藏的字符。` -ambiguous_runes_header=`此行包含模棱两可的 Unicode 字符！` -ambiguous_runes_description=`此文件包含模棱两可的 Unicode 字符，这些字符可能会与您当前语言环境的其他字符混淆。 如果您是有意且正当地使用它们，您可以安全地忽略这个警告。使用 Escape 按钮来高亮这些字符。` -invisible_runes_line=`此行含有不可见的 unicode 字符` -ambiguous_runes_line=`此行有模棱两可的 unicode 字符` -ambiguous_character=`%[1]c [U+%04[1]X] 容易和 %[2]c [U+%04[2]X] 混淆` - +invisible_runes_header=此文件包含不可见的 Unicode 字符！ +invisible_runes_description=这个文件包含不可见的 Unicode 字符，其处理方式可能不同于下面显示的字符。 如果您是有意且正当地使用它们，您可以安全地忽略这个警告。使用 Escape 按钮来显示隐藏的字符。 +ambiguous_runes_header=此行包含模棱两可的 Unicode 字符！ +ambiguous_runes_description=此文件包含模棱两可的 Unicode 字符，这些字符可能会与您当前语言环境的其他字符混淆。 如果您是有意且正当地使用它们，您可以安全地忽略这个警告。使用 Escape 按钮来高亮这些字符。 +invisible_runes_line=此行含有不可见的 unicode 字符 +ambiguous_runes_line=此行有模棱两可的 unicode 字符 +ambiguous_character=%[1]c [U+%04[1]X] 容易和 %[2]c [U+%04[2]X] 混淆 escape_control_characters=Escape unescape_control_characters=Unescape file_copy_permalink=复制永久链接 @@ -1078,7 +1028,6 @@ download_file=下载文件 normal_view=普通视图 line=行 lines=行 - editor.add_file=添加文件 editor.new_file=新建文件 editor.upload_file=上传文件 @@ -1144,7 +1093,6 @@ editor.user_no_push_to_branch=用户不能推送到分支 editor.require_signed_commit=分支需要签名提交 editor.cherry_pick=Cherry-pick %s 到： editor.revert=将 %s 还原到： - commits.desc=浏览代码修改历史 commits.commits=次代码提交 commits.no_commits=没有共同的提交。'%s' 和 '%s' 的历史完全不同。 @@ -1163,7 +1111,6 @@ commits.signed_by_untrusted_user=由未授信的用户签名 commits.signed_by_untrusted_user_unmatched=由与提交者不匹配的未授信的用户签名 commits.gpg_key_id=GPG 密钥 ID commits.ssh_key_fingerprint=SSH 密钥指纹 - commit.actions=操作 commit.revert=还原 commit.revert-header=还原： %s @@ -1171,10 +1118,8 @@ commit.revert-content=选择要还原的分支： commit.cherry-pick=Cherry-pick commit.cherry-pick-header=Cherry-pick: %s commit.cherry-pick-content=选择 cherry-pick 的目标分支： - ext_issues=访问外部工单 ext_issues.desc=链接到外部工单跟踪系统。 - projects=项目 projects.desc=在项目看板中管理工单和合并请求。 projects.description=描述(可选) @@ -1210,7 +1155,6 @@ projects.board.color=颜色 projects.open=开启 projects.close=关闭 projects.board.assigned_to=指派给 - issues.desc=组织 bug 报告、任务和里程碑。 issues.filter_assignees=筛选指派人 issues.filter_milestones=筛选里程碑 @@ -1263,25 +1207,25 @@ issues.add_labels=于 %s 添加 %s 标签 issues.remove_label=于 %[2]s 删除了标签 %[1]s issues.remove_labels=于 %[2]s 删除了标签 %[1]s issues.add_remove_labels=于 %[3]s 添加了标签 %[1]s ，删除了标签 %[2]s -issues.add_milestone_at=`于 %[2]s 添加了里程碑 %[1]s` -issues.add_project_at=`将此添加到 %s 项目 %s` -issues.change_milestone_at=`%[3]s 修改了里程碑从 %[1]s 到 %[2]s` -issues.change_project_at=`修改项目从 %s 到 %s %s +issues.add_milestone_at=于 %[2]s 添加了里程碑 %[1]s +issues.add_project_at=将此添加到 %s 项目 %s +issues.change_milestone_at=%[3]s 修改了里程碑从 %[1]s 到 %[2]s +issues.change_project_at=修改项目从 %s 到 %s %s issues.remove_milestone_at=`%[2]s 删除了里程碑 %[1]s` -issues.remove_project_at=`从 %s 项目 %s 中删除` -issues.deleted_milestone= （已删除） -issues.deleted_project=`(已删除)` -issues.self_assign_at=`于 %s 指派给自己` -issues.add_assignee_at=`于 %[2]s 被 %[1]s 指派` -issues.remove_assignee_at=`%s 取消了指派在 %s` -issues.remove_self_assignment=`于 %s 取消了指派` -issues.change_title_at=`于 %[3]s 修改标题 %[1]s 为 %[2]s` -issues.change_ref_at=`将引用从 %s 更改为了 %s %s` -issues.remove_ref_at=`删除了引用 %s %s` -issues.add_ref_at=`添加了引用 %s %s` -issues.delete_branch_at=`于 %[2]s 删除了分支 %[1]s` +issues.remove_project_at=从 %s 项目 %s 中删除 +issues.deleted_milestone=（已删除） +issues.deleted_project=(已删除) +issues.self_assign_at=于 %s 指派给自己 +issues.add_assignee_at=于 %[2]s 被 %[1]s 指派 +issues.remove_assignee_at=%s 取消了指派在 %s +issues.remove_self_assignment=于 %s 取消了指派 +issues.change_title_at=于 %[3]s 修改标题 %[1]s 为 %[2]s +issues.change_ref_at=将引用从 %s 更改为了 %s %s +issues.remove_ref_at=删除了引用 %s %s +issues.add_ref_at=添加了引用 %s %s +issues.delete_branch_at=于 %[2]s 删除了分支 %[1]s issues.filter_label=标签筛选 -issues.filter_label_exclude=`使用 alt + 鼠标左键 / 回车 排除标签` +issues.filter_label_exclude=使用 alt + 鼠标左键 / 回车 排除标签 issues.filter_label_no_select=所有标签 issues.filter_milestone=里程碑筛选 issues.filter_milestone_no_select=所有里程碑 @@ -1328,7 +1272,7 @@ issues.open_title=开启中 issues.closed_title=已关闭 issues.draft_title=草稿 issues.num_comments=%d 条评论 -issues.commented_at=`评论于 %s` +issues.commented_at=评论于 %s issues.delete_comment_confirm=您确定要删除该条评论吗？ issues.context.copy_link=复制链接 issues.context.quote_reply=引用回复 @@ -1337,22 +1281,22 @@ issues.context.edit=编辑 issues.context.delete=刪除 issues.no_content=这个人很懒，什么都没留下。 issues.close_issue=关闭 -issues.pull_merged_at=`于 %[4]s 合并了提交 %[2]s 到 %[3]s` -issues.manually_pull_merged_at=`于 %[4]s 手动合并了提交 %[2]s 到 %[3]s` +issues.pull_merged_at=于 %[4]s 合并了提交 %[2]s 到 %[3]s +issues.manually_pull_merged_at=于 %[4]s 手动合并了提交 %[2]s 到 %[3]s issues.close_comment_issue=评论并关闭 issues.reopen_issue=重新开启 issues.reopen_comment_issue=评论并重新开启 issues.create_comment=评论 -issues.closed_at=`于 %[2]s 关闭此工单` -issues.reopened_at=`重新打开此问题 %[2]s` -issues.commit_ref_at=`于 %[2]s 在代码提交中引用了该工单` -issues.ref_issue_from=`于 %[2]s 引用了工单 %[4]s ` -issues.ref_pull_from=`于 %[2]s 引用了合并请求 %[4]s ` -issues.ref_closing_from=`于 %[2]s 引用了合并请求 %[4]s 将关闭此工单` -issues.ref_reopening_from=`于 %[2]s 引用了合并请求 %[4]s 将重新讨论此工单 ` -issues.ref_closed_from=`关闭了这个工单 %[4]s %[2]s` -issues.ref_reopened_from=`重新打开这个工单 %[4]s %[2]s` -issues.ref_from=`来自 %[1]s` +issues.closed_at=于 %[2]s 关闭此工单 +issues.reopened_at=重新打开此问题 %[2]s +issues.commit_ref_at=于 %[2]s 在代码提交中引用了该工单 +issues.ref_issue_from="于 %[2]s 引用了工单 %[4]s " +issues.ref_pull_from="于 %[2]s 引用了合并请求 %[4]s " +issues.ref_closing_from=于 %[2]s 引用了合并请求 %[4]s 将关闭此工单 +issues.ref_reopening_from="于 %[2]s 引用了合并请求 %[4]s 将重新讨论此工单 " +issues.ref_closed_from=关闭了这个工单 %[4]s %[2]s +issues.ref_reopened_from=重新打开这个工单 %[4]s %[2]s +issues.ref_from=来自 %[1]s issues.poster=发布者 issues.collaborator=协作者 issues.owner=所有者 @@ -1382,8 +1326,8 @@ issues.label.filter_sort.reverse_alphabetically=按字母逆序排序 issues.label.filter_sort.by_size=最小尺寸 issues.label.filter_sort.reverse_by_size=最大尺寸 issues.num_participants=%d 名参与者 -issues.attachment.open_tab=`在新的标签页中查看 '%s'` -issues.attachment.download=`点击下载 '%s'` +issues.attachment.open_tab=在新的标签页中查看 '%s' +issues.attachment.download=点击下载 '%s' issues.subscribe=订阅 issues.unsubscribe=取消订阅 issues.lock=锁定对话 @@ -1411,31 +1355,31 @@ issues.delete.text=您真的要删除这个工单吗？(该操作将会永久删 issues.tracker=时间跟踪 issues.start_tracking_short=启动计时器 issues.start_tracking=开始时间跟踪 -issues.start_tracking_history=`开始工作 %s` +issues.start_tracking_history=开始工作 %s issues.tracker_auto_close=当此工单关闭时，自动停止计时器 -issues.tracking_already_started=`你已经开始对 另一个工单 进行时间跟踪！` +issues.tracking_already_started=你已经开始对 另一个工单 进行时间跟踪！ issues.stop_tracking=停止计时器 -issues.stop_tracking_history=`停止工作 %s` +issues.stop_tracking_history=停止工作 %s issues.cancel_tracking=放弃 -issues.cancel_tracking_history=`取消时间跟踪 %s` +issues.cancel_tracking_history=取消时间跟踪 %s issues.add_time=手动添加时间 issues.del_time=删除此时间跟踪日志 issues.add_time_short=添加时间 issues.add_time_cancel=取消 -issues.add_time_history=`添加耗时 %s` -issues.del_time_history=`已删除时间 %s` +issues.add_time_history=添加耗时 %s +issues.del_time_history=已删除时间 %s issues.add_time_hours=小时 issues.add_time_minutes=分钟 issues.add_time_sum_to_small=没有输入时间。 issues.time_spent_total=总用时 -issues.time_spent_from_all_authors=`总花费时间：%s` +issues.time_spent_from_all_authors=总花费时间：%s issues.due_date=到期时间 issues.invalid_due_date_format=到期时间的格式必须是 'yyyy-mm-dd' 的形式。 issues.error_modifying_due_date=修改到期时间失败。 issues.error_removing_due_date=删除到期时间失败。 issues.push_commit_1=于 %[2]s 推送了 %[1]d 个提交 issues.push_commits_n=于 %[2]s 推送了 %[1]d 个提交 -issues.force_push_codes=`于 %[6]s 强制推送 %[1]s，从 %[2]s，至 %[4]s` +issues.force_push_codes=于 %[6]s 强制推送 %[1]s，从 %[2]s，至 %[4]s issues.due_date_form=yyyy年mm月dd日 issues.due_date_form_add=设置到期时间 issues.due_date_form_edit=编辑 @@ -1454,8 +1398,8 @@ issues.dependency.add=添加依赖工单... issues.dependency.cancel=取消 issues.dependency.remove=删除 issues.dependency.remove_info=删除此依赖项 -issues.dependency.added_dependency=`添加了一个新的依赖项 %s` -issues.dependency.removed_dependency=`移除了一个依赖项 %s` +issues.dependency.added_dependency=添加了一个新的依赖项 %s +issues.dependency.removed_dependency=移除了一个依赖项 %s issues.dependency.pr_closing_blockedby=以下工单阻止了关闭此合并请求 issues.dependency.issue_closing_blockedby=关闭此工单被以下工单阻止 issues.dependency.issue_close_blocks=此工单阻止了以下工单的关闭 @@ -1508,10 +1452,8 @@ issues.content_history.delete_from_history=从历史记录中删除 issues.content_history.delete_from_history_confirm=从历史记录中删除吗？ issues.content_history.options=选项 issues.reference_link=参考：%s - compare.compare_base=基准分支 compare.compare_head=比较 - pulls.desc=启用合并请求和代码评审。 pulls.new=创建合并请求 pulls.view=查看拉取请求 @@ -1531,7 +1473,7 @@ pulls.filter_branch=过滤分支 pulls.no_results=未找到结果 pulls.nothing_to_compare=分支内容相同，无需创建合并请求。 pulls.nothing_to_compare_and_allow_empty_pr=这些分支是相等的，此合并请求将为空。 -pulls.has_pull_request="这些分支之间的合并请求已存在: %[2]s#%[3]d" +pulls.has_pull_request=这些分支之间的合并请求已存在: %[2]s#%[3]d pulls.create=创建合并请求 pulls.title_desc=请求将 %[1]d 次代码提交从 %[2]s 合并至 %[3]s pulls.merged_title_desc=于 %[4]s 将 %[1]d 次代码提交从 %[2]s合并至 %[3]s @@ -1547,7 +1489,7 @@ pulls.manually_merged=已手动合并 pulls.manually_merged_as=合并请求已被手动合并为 %[2]s pulls.is_closed=合并请求已经关闭。 pulls.has_merged=请求已合并。 -pulls.title_wip_desc=`标题以 %s 开头以免合并请求意外合并。` +pulls.title_wip_desc=标题以 %s 开头以免合并请求意外合并。 pulls.cannot_merge_work_in_progress=此合并请求被标记为正在进行的工作。 pulls.still_in_progress=仍在进行中？ pulls.add_prefix=添加 %s 前缀 @@ -1578,7 +1520,6 @@ pulls.reject_count_n=%d 变更请求 pulls.waiting_count_1=%d 个正在等待审核 pulls.waiting_count_n=%d 个正在等待审核 pulls.wrong_commit_id=提交 id 必须在目标分支 上 - pulls.no_merge_desc=由于未启用合并选项，此合并请求无法被合并。 pulls.no_merge_helper=在仓库设置中启用合并选项或者手工合并请求。 pulls.no_merge_wip=这个合并请求无法合并，因为被标记为尚未完成的工作。 @@ -1591,7 +1532,6 @@ pulls.squash_merge_pull_request=创建压缩提交 pulls.merge_manually=手动合并 pulls.merge_commit_id=合并提交 ID pulls.require_signed_wont_sign=分支需要签名的提交，但这个合并将不会被签名 - pulls.invalid_merge_option=你可以在此合并请求中使用合并选项。 pulls.merge_conflict=合并失败：合并时有冲突发生。提示：采用其它合并策略 pulls.merge_conflict_summary=错误信息 @@ -1604,7 +1544,7 @@ pulls.head_out_of_date=合并失败：在生成合并时，head 已更新。提 pulls.push_rejected=合并失败：推送被拒绝。审查此仓库的 Git 钩子。 pulls.push_rejected_summary=详细拒绝信息 pulls.push_rejected_no_message=合并失败：此推送被拒绝但未提供其他信息。
    请检查此仓库的 Git Hook。 -pulls.open_unmerged_pull_exists=`您不能执行重新打开操作, 因为已经存在相同的合并请求 (#%d)。` +pulls.open_unmerged_pull_exists=您不能执行重新打开操作, 因为已经存在相同的合并请求 (#%d)。 pulls.status_checking=一些检测仍在等待运行 pulls.status_checks_success=所有检测均成功 pulls.status_checks_warning=一些检查报告了警告 @@ -1617,27 +1557,22 @@ pulls.update_branch_rebase=通过变基更新分支 pulls.update_branch_success=分支更新成功 pulls.update_not_allowed=您无权更新分支 pulls.outdated_with_base_branch=此分支相比基础分支已过期 -pulls.closed_at=`于 %[2]s 关闭此合并请求 ` -pulls.reopened_at=`重新打开此合并请求 %[2]s` -pulls.merge_instruction_hint=`你也可以查看 命令行指令` +pulls.closed_at="于 %[2]s 关闭此合并请求 " +pulls.reopened_at=重新打开此合并请求 %[2]s +pulls.merge_instruction_hint=你也可以查看 命令行指令 pulls.merge_instruction_step1_desc=从你的仓库中签出一个新的分支并测试变更。 pulls.merge_instruction_step2_desc=合并变更并更新到 Gitea 上 - pulls.auto_merge_button_when_succeed=(当检查成功时) pulls.auto_merge_when_succeed=在所有检查成功后自动合并 pulls.auto_merge_newly_scheduled=合并请求计划在所有检查成功后合并。 pulls.auto_merge_has_pending_schedule=%[1]s 安排此拉取请求在所有检查成功时自动合并 %[2]s。 - pulls.auto_merge_cancel_schedule=取消自动合并 pulls.auto_merge_not_scheduled=此拉取请求没有计划自动合并。 pulls.auto_merge_canceled_schedule=此拉取请求的自动合并已取消。 - -pulls.auto_merge_newly_scheduled_comment=`已安排此拉取请求在所有检查成功后自动合并 %[1]s` -pulls.auto_merge_canceled_schedule_comment=`已取消当所有检查成功后自动合并此拉取请求 %[1]s` - +pulls.auto_merge_newly_scheduled_comment=已安排此拉取请求在所有检查成功后自动合并 %[1]s +pulls.auto_merge_canceled_schedule_comment=已取消当所有检查成功后自动合并此拉取请求 %[1]s pulls.delete.title=删除此拉取请求？ pulls.delete.text=你真的要删除这个拉取请求吗？ (这将永久删除所有内容。如果你打算将内容存档，请考虑关闭它) - milestones.new=新的里程碑 milestones.closed=于 %s关闭 milestones.update_ago=更新于 %s 前 @@ -1667,7 +1602,6 @@ milestones.filter_sort.least_complete=完成度从低到高 milestones.filter_sort.most_complete=完成度从高到低 milestones.filter_sort.most_issues=工单从多到少 milestones.filter_sort.least_issues=工单从少到多 - signing.will_sign=这个提交将用密钥 '%s' 签名。 signing.wont_sign.error=检查提交是否可以签名时出错 signing.wont_sign.nokey=没有可用的密钥来签署这个提交 @@ -1681,10 +1615,8 @@ signing.wont_sign.headsigned=合并将不会被签名，因为最新提交没有 signing.wont_sign.commitssigned=合并将不会被签名，因为所有相关的提交都没有签名 signing.wont_sign.approved=合并将不会被签名，因为合并请求未被批准 signing.wont_sign.not_signed_in=您还没有登录。 - ext_wiki=访问外部百科 ext_wiki.desc=链接到外部 wiki。 - wiki=百科 wiki.welcome=欢迎来到百科! wiki.welcome_desc=百科允许你撰写和与协作者分享文档 @@ -1708,7 +1640,6 @@ wiki.reserved_page=维基名称 '%s' 是被保留的。 wiki.pages=所有页面 wiki.last_updated=最后更新于 %s wiki.page_name_desc=输入此 Wiki 页面的名称。特殊名称有：'Home', '_Sidebar' 和 '_Footer'。 - activity=动态 activity.period.filter_label=周期： activity.period.daily=1 天 @@ -1774,7 +1705,6 @@ activity.git_stats_addition_n=新增 %d 行 activity.git_stats_and_deletions=和 activity.git_stats_deletion_1=删除 %d 行 activity.git_stats_deletion_n=删除 %d 行 - search=搜索 search.search_repo=搜索仓库... search.type.tooltip=搜索类型 @@ -1785,7 +1715,6 @@ search.match.tooltip=仅包含精确匹配搜索词的结果 search.results=在 %[3]s 中搜索 "%[1]s" 的结果 search.code_no_results=未找到与搜索字词匹配的源代码。 search.code_search_unavailable=当前代码搜索不可用。请与网站管理员联系。 - settings=设置 settings.desc=设置是你可以管理仓库设置的地方 settings.options=仓库 @@ -2091,9 +2020,9 @@ settings.dismiss_stale_approvals_desc=当新的提交更改合并请求内容被 settings.require_signed_commits=需要签名提交 settings.require_signed_commits_desc=拒绝推送未签名或无法验证的提交到分支 settings.protect_protected_file_patterns=受保护的文件模式(使用分号分隔) -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=允许有写入权限的用户进行直接更改的不受保护的文件，可以绕过推送限制。可用分号 ('\;') 分隔多个模式。模式语法参见 github.com/gobwas/glob文档。示例：.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=允许有写入权限的用户进行直接更改的不受保护的文件，可以绕过推送限制。可用分号 (';') 分隔多个模式。模式语法参见 github.com/gobwas/glob文档。示例：.drone.yml,/docs/**/*.txt。 settings.add_protected_branch=启用保护 settings.delete_protected_branch=禁用保护 settings.update_protect_branch_success=分支 "%s" 的分支保护已更新。 @@ -2173,7 +2102,6 @@ settings.rename_branch_success=分支 %s 已成功重命名为 %s。 settings.rename_branch_from=旧分支名称 settings.rename_branch_to=新分支名称 settings.rename_branch=重命名分支 - diff.browse_source=浏览代码 diff.parent=父节点 diff.commit=当前提交 @@ -2225,7 +2153,6 @@ diff.image.side_by_side=双排 diff.image.swipe=滑动 diff.image.overlay=叠加 diff.has_escaped=这一行有隐藏的 Unicode 字符 - releases.desc=跟踪项目版本和下载。 release.releases=版本发布 release.detail=发布详情 @@ -2267,7 +2194,6 @@ release.downloads=下载附件 release.download_count=下载：%s release.add_tag_msg=使用发布的标题和内容作为标签消息。 release.add_tag=仅创建标签 - branch.name=分支名称 branch.search=搜索分支 branch.already_exists=名为 '%s' 的分支已存在。 @@ -2299,25 +2225,52 @@ branch.create_branch_operation=创建分支 branch.new_branch=创建新分支 branch.new_branch_from=从 %s 创建新分支 branch.renamed=分支 %s 被重命名为 %s。 - tag.create_tag=创建标签 %s tag.create_tag_operation=创建标签 tag.confirm_create_tag=创建标签 tag.create_tag_from=从 "%s" 创建新标签 - tag.create_success=标签 '%s' 已创建。 - topic.manage_topics=管理主题 topic.done=保存 topic.count_prompt=您最多选择25个主题 topic.format_prompt=主题必须以字母或数字开头，可以包含连字符 (-)，并且长度不得超过35个字符 - find_file.go_to_file=转到文件 find_file.no_matching=没有找到匹配的文件 - error.csv.too_large=无法渲染此文件，因为它太大了。 error.csv.unexpected=无法渲染此文件，因为它包含了意外字符，其位于第 %d 行和第 %d 列。 error.csv.invalid_field_count=无法渲染此文件，因为它在第 %d 行中的字段数有误。 +more_operations=更多操作 +cite_this_repo=引用此仓库 +editor.new_branch_name=为这次提交的新分支命名 +commit.operations=操作 +projects.card_type.desc=卡片预览 +projects.card_type.images_and_text=图标和文字 +projects.card_type.text_only=仅文本 +issues.filter_project=项目 +issues.filter_project_all=所有项目 +issues.filter_project_none=暂无项目 +issues.action_check=选中/取消选中 +issues.action_check_all=选中/取消选中所有项目 +issues.label_exclusive=独有 +issues.label_exclusive_desc=命名标签为 scope/item 以使其与其他以 scope/ 开头的标签互斥。 +issues.label_exclusive_warning=在编辑工单或合并请求的标签时，任何冲突的范围标签都将被删除。 +pulls.clear_merge_message=清除合并信息 +pulls.clear_merge_message_hint=清除合并消息只会删除提交消息内容，并保留生成的 git 附加内容，如“Co-Authored-By …”。 +settings.branches.add_new_rule=添加新规则 +settings.pulls.default_allow_edits_from_maintainers=默认开启允许维护者编辑 +settings.releases_desc=启用发布 +settings.actions_desc=启用 Actions +settings.authorization_header=授权标头 +settings.authorization_header_desc=当存在时将被作为授权标头包含在内。例如: %s。 +settings.protected_branch.save_rule=保存规则 +settings.protected_branch.delete_rule=删除规则 +settings.protect_branch_name_pattern=受保护的分支名称模式 +settings.remove_protected_branch_failed=删除分支保护规则 '%s' 失败。 +settings.merge_style_desc=合并方式 +settings.protected_branch_required_rule_name=必须填写规则名称 +settings.protected_branch_duplicate_rule_name=规则名称已存在 +release.releases_for=%s 的版本发布 +release.tags_for=%s 的标签 [org] org_name_holder=组织名称 @@ -2341,11 +2294,9 @@ team_access_desc=仓库权限 team_permission_desc=权限 team_unit_desc=允许访问仓库单元 team_unit_disabled=(已禁用) - form.name_reserved=组织名称 '%s' 是被保留的。 form.name_pattern_not_allowed=仓库名称中不允许使用 "%s"。 form.create_org_not_allowed=此账号禁止创建组织 - settings=组织设置 settings.options=组织 settings.full_name=组织全名 @@ -2359,7 +2310,6 @@ settings.visibility.limited=受限 (仅对登录用户可见) settings.visibility.limited_shortname=受限 settings.visibility.private=私有 (仅对组织成员可见) settings.visibility.private_shortname=私有 - settings.update_settings=更新组织设置 settings.update_setting_success=组织设置已更新。 settings.change_orgname_prompt=注意：修改组织名称将会同时修改对应的URL。 @@ -2372,9 +2322,7 @@ settings.confirm_delete_account=确认删除组织 settings.delete_org_title=删除组织 settings.delete_org_desc=此组织将会被永久删除，确认继续吗？ settings.hooks_desc=在此处添加的 Web 钩子将会应用到该组织下的 所有仓库。 - settings.labels_desc=添加能够被该组织下的 所有仓库 的工单使用的标签。 - members.membership_visibility=成员可见性： members.public=可见 members.public_helper=隐藏 @@ -2389,7 +2337,6 @@ members.leave=离开组织 members.leave.detail=离开 %s？ members.invite_desc=邀请新的用户加入 %s： members.invite_now=立即邀请 - teams.join=加入团队 teams.leave=离开团队 teams.leave.detail=离开 %s？ @@ -2441,6 +2388,7 @@ teams.all_repositories_admin_permission_desc=该团队拥有 管理%s 中的团队 %s。 teams.invite.by=邀请人 %s teams.invite.description=请点击下面的按钮加入团队。 +members=成员 [admin] dashboard=管理面板 @@ -2456,7 +2404,6 @@ monitor=监控面板 first_page=首页 last_page=末页 total=总计：%d - dashboard.new_version_hint=Gitea %s 现已可用，您正在运行 %s。查看 博客 了解更多详情。 dashboard.statistic=摘要 dashboard.operations=维护操作 @@ -2534,7 +2481,6 @@ dashboard.delete_old_actions=从数据库中删除所有旧操作记录 dashboard.delete_old_actions.started=已开始从数据库中删除所有旧操作记录。 dashboard.update_checker=更新检查器 dashboard.delete_old_system_notices=从数据库中删除所有旧系统通知 - users.user_manage_panel=用户帐户管理 users.new_account=创建新帐户 users.name=用户名 @@ -2588,7 +2534,6 @@ 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 - emails.email_manage_panel=邮件管理 emails.primary=主要的 emails.activated=已激活 @@ -2601,13 +2546,11 @@ emails.not_updated=无法更新请求的电子邮件地址： %v emails.duplicate_active=此电子邮件地址已被另一个用户激活使用。 emails.change_email_header=更新电子邮件属性 emails.change_email_text=您确认要更新这个电子邮件地址吗？ - orgs.org_manage_panel=组织管理 orgs.name=名称 orgs.teams=团队 orgs.members=成员 orgs.new_orga=创建新的组织 - repos.repo_manage_panel=仓库管理 repos.unadopted=未收录仓库 repos.unadopted.no_more=找不到更多未被收录的仓库 @@ -2619,7 +2562,6 @@ repos.stars=点赞数 repos.forks=派生数 repos.issues=工单数 repos.size=大小 - packages.package_manage_panel=软件包管理 packages.total_size=总大小：%s packages.owner=所有者 @@ -2630,17 +2572,14 @@ packages.type=类型 packages.repository=仓库 packages.size=大小 packages.published=已发布 - defaulthooks=默认Web钩子 defaulthooks.desc=当某些 Gitea 事件触发时，Web 钩子自动向服务器发出 HTTP POST 请求。这里定义的 Web 钩子是默认配置，将被复制到所有新的仓库中。详情请访问 Web 钩子指南。 defaulthooks.add_webhook=添加默认Web 钩子 defaulthooks.update_webhook=更新默认 Web 钩子 - systemhooks=系统 Web 钩子 systemhooks.desc=当某些 Gitea 事件触发时，Web 钩子自动向服务器发出HTTP POST请求。这里定义的 Web 钩子将作用于系统上的所有仓库，所以请考虑这可能带来的任何性能影响。了解详情请访问 Web 钩子指南。 systemhooks.add_webhook=添加系统 Web 钩子 systemhooks.update_webhook=更新系统 Web 钩子 - auths.auth_manage_panel=认证源管理 auths.new=添加认证源 auths.name=名称 @@ -2755,7 +2694,6 @@ auths.still_in_used=认证源仍在使用。请先解除或者删除使用此认 auths.deletion_success=认证源已经更新。 auths.login_source_exist=认证源 '%s' 已经存在。 auths.login_source_of_type_exist=此类型的认证源已存在。 - config.server_config=服务器配置 config.app_name=站点名称 config.app_ver=Gitea版本 @@ -2774,7 +2712,6 @@ config.static_file_root_path=静态文件根目录 config.log_file_root_path=日志路径 config.script_type=脚本类型 config.reverse_auth_user=反向代理认证 - config.ssh_config=SSH 配置 config.ssh_enabled=启用 config.ssh_start_builtin_server=使用内置 SSH 服务器 @@ -2786,12 +2723,10 @@ config.ssh_key_test_path=密钥测试路径 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.db_config=数据库配置 config.db_type=类型 config.db_host=主机 @@ -2800,7 +2735,6 @@ config.db_user=用户名 config.db_schema=架构模式 config.db_ssl_mode=SSL config.db_path=数据库路径 - config.service_config=服务配置 config.register_email_confirm=需要电子邮件确认注册 config.disable_register=禁止用户注册 @@ -2823,12 +2757,10 @@ config.default_allow_only_contributors_to_track_time=仅允许成员跟踪时间 config.no_reply_address=隐藏电子邮件域 config.default_visibility_organization=新组织的默认可见性 config.default_enable_dependencies=默认情况下启用工单依赖 - config.webhook_config=Web 钩子配置 config.queue_length=队列长度 config.deliver_timeout=推送超时 config.skip_tls_verify=跳过 TLS 验证 - config.mailer_config=Mailer 配置 config.mailer_enabled=启用服务 config.mailer_enable_helo=启用HELO @@ -2846,16 +2778,13 @@ config.test_email_placeholder=电子邮址 (例如，test@example.com) config.send_test_mail=发送测试邮件 config.test_mail_failed=发送测试邮件至 '%s' 时失败：%v config.test_mail_sent=测试邮件已经发送至 '%s'。 - config.oauth_config=OAuth 配置 config.oauth_enabled=启用 - config.cache_config=Cache 配置 config.cache_adapter=Cache 适配器 config.cache_interval=Cache 周期 config.cache_conn=Cache 连接字符串 config.cache_item_ttl=缓存项目 TTL - config.session_config=Session 配置 config.session_provider=Session 提供者 config.provider_config=提供者配置 @@ -2864,12 +2793,10 @@ config.gc_interval_time=GC 周期 config.session_life_time=Session 生命周期 config.https_only=仅限 HTTPS config.cookie_life_time=Cookie 生命周期 - config.picture_config=图片和头像配置 config.picture_service=图片服务 config.disable_gravatar=禁用 Gravatar 头像 config.enable_federated_avatar=启用 Federated Avatars - config.git_config=Git 配置 config.git_disable_diff_highlight=禁用差异对比语法高亮 config.git_max_diff_lines=差异对比显示的最大行数（单个文件） @@ -2881,7 +2808,6 @@ config.git_mirror_timeout=镜像更新操作超时 config.git_clone_timeout=克隆操作超时 config.git_pull_timeout=拉取操作超时 config.git_gc_timeout=GC 操作超时 - config.log_config=日志配置 config.log_mode=日志模式 config.own_named_logger=命名日志 @@ -2893,10 +2819,8 @@ config.access_log_mode=访问日志模式 config.access_log_template=模板 config.xorm_log_mode=XORM 日志模式 config.xorm_log_sql=日志 SQL - config.get_setting_failed=获取设置 %s 失败 config.set_setting_failed=设置 %s 失败 - monitor.cron=Cron 任务 monitor.name=任务名称 monitor.schedule=任务安排 @@ -2948,7 +2872,6 @@ monitor.queue.pool.pause.submit=暂停队列 monitor.queue.pool.resume.title=恢复队列 monitor.queue.pool.resume.desc=使此队列恢复工作 monitor.queue.pool.resume.submit=恢复队列 - monitor.queue.settings.title=池设置 monitor.queue.settings.desc=池动态增长以应对队列阻塞。这些变更将不会影响当前的工作者组。 monitor.queue.settings.timeout=提高超时时间 @@ -2964,7 +2887,6 @@ monitor.queue.settings.submit=更新设置 monitor.queue.settings.changed=设置已更新 monitor.queue.settings.blocktimeout=当前阻塞超时时间 monitor.queue.settings.blocktimeout.value=%[1]v - monitor.queue.pool.none=此队列没有工作者池 monitor.queue.pool.added=工作者组添加成功 monitor.queue.pool.max_changed=最大工作者数量已更改 @@ -2974,7 +2896,6 @@ monitor.queue.pool.cancel=停止工作者组 monitor.queue.pool.cancelling=工作者组正在关闭 monitor.queue.pool.cancel_notices=关掉这组 %s 工作者吗？ monitor.queue.pool.cancel_desc=没有工作者组的队列将会引起请求永久阻塞。 - notices.system_notice_list=系统提示管理 notices.view_detail_header=查看提示详情 notices.actions=操作 @@ -2989,20 +2910,28 @@ notices.type_2=任务 notices.desc=提示描述 notices.op=操作 notices.delete_success=系统通知已被删除。 +dashboard.gc_lfs=垃圾回收 LFS 元数据 +dashboard.stop_zombie_tasks=停止僵尸任务 +dashboard.stop_endless_tasks=停止永不停止的任务 +dashboard.cancel_abandoned_jobs=取消丢弃的任务 +packages.unreferenced_size=未引用大小： %s +auths.oauth2_map_group_to_team=映射声明的组到组织团队。（可选 - 要求在上面填写声明的名字） +auths.oauth2_map_group_to_team_removal=如果用户不属于相应的组，从已同步团队中移除用户 +notices.operations=操作 [action] create_repo=创建了仓库 %s rename_repo=重命名仓库 %[1]s 为 %[3]s commit_repo=推送到了仓库 %[4]s 的 %[3]s 分支 -create_issue=`创建了工单 %[3]s#%[2]s` -close_issue=`关闭了工单 %[3]s#%[2]s` -reopen_issue=`重新开启了工单 %[3]s#%[2]s` -create_pull_request=`创建了合并请求 %[3]s#%[2]s` -close_pull_request=`关闭了合并请求 %[3]s#%[2]s` -reopen_pull_request=`重新开启了合并请求 %[3]s#%[2]s` -comment_issue=`评论了工单 %[3]s#%[2]s` -comment_pull=`评论了合并请求 %[3]s#%[2]s` -merge_pull_request=`合并了合并请求 %[3]s#%[2]s` +create_issue=创建了工单 %[3]s#%[2]s +close_issue=关闭了工单 %[3]s#%[2]s +reopen_issue=重新开启了工单 %[3]s#%[2]s +create_pull_request=创建了合并请求 %[3]s#%[2]s +close_pull_request=关闭了合并请求 %[3]s#%[2]s +reopen_pull_request=重新开启了合并请求 %[3]s#%[2]s +comment_issue=评论了工单 %[3]s#%[2]s +comment_pull=评论了合并请求 %[3]s#%[2]s +merge_pull_request=合并了合并请求 %[3]s#%[2]s transfer_repo=将仓库 %s 转移至 %s push_tag=推送了标签 %[3]s 至仓库 %[4]s delete_tag=从%[3]s 删除了标签 %[2]s @@ -3013,14 +2942,15 @@ compare_commits_general=比较提交 mirror_sync_push=从镜像同步了提交至仓库 %[4]s 的 %[3]s 分支 mirror_sync_create=从镜像同步了引用 %[3]s 至仓库 %[4]s mirror_sync_delete=从镜像同步并从 %[3]s 删除了引用 %[2]s -approve_pull_request=`批准了 %[3]s#%[2]s` -reject_pull_request=`建议变更 %[3]s#%[2]s` -publish_release=`在 %[3]s 发布了 "%[4]s" ` -review_dismissed=`取消了 %[4]s 对 %[3]s#%[2]s 的变更请求` +approve_pull_request=批准了 %[3]s#%[2]s +reject_pull_request=建议变更 %[3]s#%[2]s +publish_release=在 %[3]s 发布了 "%[4]s" +review_dismissed=取消了 %[4]s 对 %[3]s#%[2]s 的变更请求 review_dismissed_reason=原因： create_branch=于 %[4]s 创建了分支 %[3]s starred_repo=点赞了 %[2]s watched_repo=开始关注 %[2]s +auto_merge_pull_request=自动合并了拉取请求 %[3]s#%[2]s [tool] ago=%s前 @@ -3179,4 +3109,124 @@ settings.delete.description=删除软件包是永久性的，无法撤消。 settings.delete.notice=您将要删除 %s (%s)。此操作是不可逆的，您确定吗？ settings.delete.success=软件包已被删除。 settings.delete.error=删除软件包失败。 - +details.repository_site=仓库站点 +details.documentation_site=文档站点 +cargo.registry=在 Cargo 配置文件中设置此注册中心(例如：~/.cargo/config.toml)： +cargo.install=要使用 Cargo 安装软件包，请运行以下命令： +cargo.documentation=关于 Cargo 注册中心的更多信息，请参阅 文档。 +cargo.details.repository_site=仓库站点 +cargo.details.documentation_site=文档站点 +chef.registry=在您的 ~/.chef/config.rb 文件中设置此注册中心： +chef.install=要安装包，请运行以下命令： +chef.documentation=关于 Chef 注册中心的更多信息，请参阅 文档。 +conda.registry=在您的 .condarc 文件中将此注册中心设置为 Conda 仓库： +conda.install=要使用 Conda 安装软件包，请运行以下命令： +conda.documentation=关于 Conda 注册中心的更多信息，请参阅 文档。 +conda.details.repository_site=仓库站点 +conda.details.documentation_site=文档站点 +owner.settings.cargo.title=Cargo 注册中心索引 +owner.settings.cargo.initialize=初始化索引 +owner.settings.cargo.initialize.description=使用 Cargo 包管理需要一个特殊的 Git 仓库。你可以在这里使用要求的配置创建或重建它。 +owner.settings.cargo.initialize.error=初始化Cargo索引失败： %v +owner.settings.cargo.initialize.success=Cargo索引已经成功创建。 +owner.settings.cargo.rebuild=重建索引 +owner.settings.cargo.rebuild.description=如果 cargo 包的索引没有同步，你可以重建索引。 +owner.settings.cargo.rebuild.error=无法重建 Cargo 索引: %v +owner.settings.cargo.rebuild.success=Cargo 索引已成功重建。 +owner.settings.cleanuprules.title=管理清理规则 +owner.settings.cleanuprules.add=添加清理规则 +owner.settings.cleanuprules.edit=编辑清理规则 +owner.settings.cleanuprules.none=没有可用的清理规则。请阅读文档了解更多信息。 +owner.settings.cleanuprules.preview=清理规则预览 +owner.settings.cleanuprules.preview.overview=%d 个软件包计划被删除。 +owner.settings.cleanuprules.preview.none=清理规则与任何软件包都不匹配。 +owner.settings.cleanuprules.enabled=启用 +owner.settings.cleanuprules.pattern_full_match=应用规则到完整软件包名称 +owner.settings.cleanuprules.keep.title=与这些规则相匹配的版本即使与下面的删除规则相匹配，也将予以保留。 +owner.settings.cleanuprules.keep.count=保留最新的 +owner.settings.cleanuprules.keep.count.1=每个软件包1个版本 +owner.settings.cleanuprules.keep.count.n=每个软件包 %d 个版本 +owner.settings.cleanuprules.keep.pattern=保持版本匹配 +owner.settings.cleanuprules.keep.pattern.container=容器包的 最新版本 总是会保留。 +owner.settings.cleanuprules.remove.title=与这些规则相匹配的版本将被删除，除非其中存在某个保留它们的规则。 +owner.settings.cleanuprules.remove.days=移除旧于天数的版本 +owner.settings.cleanuprules.remove.pattern=删除匹配的版本 +owner.settings.cleanuprules.success.update=清理规则已更新。 +owner.settings.cleanuprules.success.delete=清理规则已删除。 +owner.settings.chef.title=Chef 注册中心 +owner.settings.chef.keypair=生成密钥对 +owner.settings.chef.keypair.description=生成用于验证Chef 注册中心的密钥对。之前的密钥不能在以后使用。 + +[aria] +navbar=导航栏 +footer=页脚 +footer.software=关于软件 +footer.links=链接 + +[secrets] +secrets=密钥 +description=Secrets 将被传给特定的 Actions，其它情况将不能读取 +none=还没有密钥。 +value=值 +name=名称 +creation=添加密钥 +creation.name_placeholder=不区分大小写，字母数字或下划线不能以GITEA_ 或 GITHUB_ 开头。 +creation.value_placeholder=输入任何内容，开头和结尾的空白都会被省略 +creation.success=您的密钥 '%s' 添加成功。 +creation.failed=添加密钥失败。 +deletion=删除密钥 +deletion.description=删除密钥是永久性的，无法撤消。继续吗？ +deletion.success=此Secret已被删除。 +deletion.failed=删除密钥失败。 + +[actions] +actions=Actions +unit.desc=管理Actions +status.unknown=未知 +status.waiting=等待中 +status.running=正在运行 +status.success=成功 +status.failure=失败 +status.cancelled=已取消 +status.skipped=已忽略 +status.blocked=阻塞中 +runners=Runners +runners.runner_manage_panel=Runners管理 +runners.new=创建 Runner +runners.new_notice=如何启动一个运行器 +runners.status=状态 +runners.id=ID +runners.name=名称 +runners.owner_type=类型 +runners.description=组织描述 +runners.labels=标签 +runners.last_online=上次在线时间 +runners.agent_labels=代理标签 +runners.custom_labels=自定义标签 +runners.custom_labels_helper=自定义标签是由管理员手动添加的标签。标签之间用逗号分隔，每个标签的开头和结尾的空白被忽略。 +runners.runner_title=Runner +runners.task_list=最近在此runner上的任务 +runners.task_list.run=执行 +runners.task_list.status=状态 +runners.task_list.repository=仓库 +runners.task_list.commit=提交 +runners.task_list.done_at=完成于 +runners.edit_runner=编辑运行器 +runners.update_runner=更新更改 +runners.update_runner_success=运行器更新成功 +runners.update_runner_failed=更新运行器失败 +runners.delete_runner=删除运行器 +runners.delete_runner_success=运行器删除成功 +runners.delete_runner_failed=删除运行器失败 +runners.delete_runner_header=确认要删除此运行器 +runners.delete_runner_notice=如果一个任务正在运行在此运行器上，它将被终止并标记为失败。它可能会打断正在构建的工作流。 +runners.none=无可用的 Runner +runners.status.unspecified=未知 +runners.status.idle=空闲 +runners.status.active=激活 +runners.status.offline=离线 +runs.all_workflows=所有工作流 +runs.open_tab=%d 开启中 +runs.closed_tab=%d 已关闭 +runs.commit=提交 +runs.pushed_by=推送者 diff --git a/options/locale/locale_zh-HK.ini b/options/locale/locale_zh-HK.ini index 71e6f7a508a6..0a2505712760 100644 --- a/options/locale/locale_zh-HK.ini +++ b/options/locale/locale_zh-HK.ini @@ -11,11 +11,8 @@ page=頁面 template=樣板 language=語言 notifications=訊息 - password=密碼 passcode=驗證碼 - - repository=儲存庫 organization=組織 mirror=鏡像 @@ -27,24 +24,19 @@ new_org=新增組織 manage_org=管理組織 account_settings=帳號設定 settings=設定 - all=所有 sources=來源 mirrors=鏡像 collaborative=協同者 forks=複製列表 - activities=活動 pull_requests=合併請求 issues=問題 - cancel=取消 - - - - - - +your_settings=組織設定 +remove=移除成員 +edit=編輯 +enabled=已啟用 [filter] @@ -60,10 +52,8 @@ host=主機 password=密碼 db_name=資料庫名稱 path=資料庫文件路徑 - repo_path=儲存庫的根目錄 log_root_path=日誌路徑 - optional_title=可選設定 federated_avatar_lookup_popup=開啟聯合頭像查詢並使用基於開放源碼的 libravatar 服務 enable_captcha_popup=要求在用戶註冊時輸入驗證碼 @@ -72,6 +62,10 @@ confirm_password=確認密碼 install_btn_confirm=立即安裝 test_git_failed=無法識別 'git' 命令：%v save_config_failed=儲存設定失敗：%v +smtp_addr=SMTP 主機地址 +smtp_port=SMTP 主機端口 +disable_gravatar=禁用 Gravatar 頭像 +federated_avatar_lookup=開啟聯合頭像 [home] password_holder=密碼 @@ -80,10 +74,9 @@ collaborative_repos=參與協作的儲存庫 my_orgs=我的組織 my_mirrors=我的鏡像 view_home=訪問 %s - - - issues.in_your_repos=屬於該用戶儲存庫的 +my_repos=儲存庫管理 +show_private=私有庫 [explore] repos=儲存庫 @@ -91,7 +84,6 @@ users=使用者 organizations=組織 search=搜尋 - [auth] register_helper_msg=已經註冊？立即登錄！ forgot_password_title=忘記密碼 @@ -109,24 +101,15 @@ twofa_scratch_token_incorrect=您的備用碼不正確 openid_connect_submit=連接 openid_connect_title=連接到現有帳戶 openid_register_title=建立新帳戶 +login_userpass=登入 +oauth_signin_submit=連結帳戶 [mail] - activate_account=請啟用您的帳戶 - activate_email=請驗證您的郵箱地址 - register_notify=歡迎來到 Gitea - - register_success=註冊成功 - - - - - - [modal] yes=確認操作 no=取消操作 @@ -142,15 +125,12 @@ PayloadUrl=推送地址 TeamName=團隊名稱 AuthName=認證名稱 AdminEmail=管理員郵箱 - NewBranchName=新的分支名稱 CommitSummary=提交摘要 CommitMessage=提交訊息 CommitChoice=提交選擇 TreeName=檔案路徑 Content=內容 - - require_error=不能為空。 size_error=長度必須為 %s。 min_size_error=長度最小為 %s 個字符。 @@ -158,12 +138,8 @@ max_size_error=長度最大為 %s 個字符。 email_error=不是一個有效的郵箱地址。 include_error=必須包含子字符串 '%s'。 unknown_error=未知錯誤： - user_not_exist=該使用者名稱並不存在 - auth_failed=授權驗證失敗：%v - - target_branch_not_exist=目標分支不存在 [user] @@ -174,7 +150,6 @@ followers=關註者 following=關註中 follow=關注 unfollow=取消關注 - form.name_reserved=這個使用者名稱已被系統保留，請改用其他名稱。 [settings] @@ -186,7 +161,6 @@ social=社交帳號綁定 delete=刪除帳戶 twofa=兩步驟驗證 uid=使用者 ID - public_profile=公開訊息 full_name=自定義名稱 website=個人網站 @@ -195,20 +169,16 @@ update_profile=更新訊息 update_profile_success=您的個人資料已被更新 continue=繼續操作 cancel=取消操作 - federated_avatar_lookup=Federated Avatar 查詢 enable_custom_avatar=啟動自定義頭像 choose_new_avatar=選擇新的頭像 delete_current_avatar=刪除當前頭像 - old_password=當前密碼 new_password=新的密碼 - emails=電子郵件地址 email_desc=您的主要邮箱地址将被用于通知提醒和其它操作。 primary=主要 add_openid=新增 OpenID URI - manage_ssh_keys=管理 SSH 金鑰 manage_gpg_keys=管理 GPG 金鑰 add_key=增加金鑰 @@ -230,29 +200,38 @@ token_state_desc=此 token 在過去七天內曾經被使用過 show_openid=在設定檔顯示 hide_openid=從設定檔隱藏 manage_social=管理關聯社交帳戶 - generate_new_token=生成新的令牌 token_name=令牌名稱 generate_token=生成令牌 delete_token=删除令牌 - - - twofa_is_enrolled=您的帳號已經啟用兩步驟驗證。 twofa_not_enrolled=您的帳號目前尚未啟用兩步驟驗證。 twofa_disabled=兩步驟驗證已經被關閉。 scan_this_image=使用您的授權應用程式來掃瞄圖片: or_enter_secret=或者輸入密碼: %s - - - orgs_none=您尚未成為任一組織的成員。 repos_none=您不擁有任何存儲庫 - delete_account=刪除當前帳戶 confirm_delete_account=確認刪除帳戶 - - +orgs=管理組織 +repos=儲存庫管理 +organization=組織管理 +language=語言 +comment_type_group_title=標題 +activated=已啟用 +delete_email=移除成員 +gpg_key_verify=驗證 +gpg_token=令牌 +ssh_key_verify=驗證 +ssh_token=令牌 +principal_content=金鑰文本 +delete_key=移除成員 +can_read_info=已讀 +access_token_deletion_cancel_action=取消 +oauth2_client_secret=用戶端金鑰 +oauth2_application_edit=編輯 +link_account=連結帳戶 +visibility.private=私有庫 [repo] owner=擁有者 @@ -269,17 +248,10 @@ mirror_prune=裁減 watchers=關注者 stargazers=稱讚者 forks=複製儲存庫 - - - - - form.name_reserved=儲存庫名稱 '%s' 是預留的。 - migrate_repo=遷移儲存庫 migrate.permission_denied=您並沒有導入本地儲存庫的權限。 migrate.failed=遷移失敗：%v - mirror_from=镜像来自 forked_from=複製自 unwatch=取消關注 @@ -287,13 +259,11 @@ watch=關註 unstar=取消收藏 star=收藏 fork=複製 - no_desc=暫無描述 quick_guide=快速幫助 clone_this_repo=複製當前儲存庫 create_new_repo_command=從命令列建立新儲存庫。 push_exist_repo=從命令列推送已存在的儲存庫 - code=程式碼 branch=分支 tree=目錄樹 @@ -303,7 +273,6 @@ tags=標籤列表 issues=問題管理 pulls=合併請求 labels=標籤 - milestones=里程碑 commits=提交歷史 releases=版本發佈 @@ -311,9 +280,7 @@ file_raw=原始文件 file_history=文件歷史 file_view_raw=查看原始文件 file_permalink=永久連結 - stored_lfs=儲存到到 Git LFS - editor.preview_changes=預覽更改 editor.or=或 editor.commit_changes=提交更改嗎？ @@ -327,7 +294,6 @@ editor.branch_already_exists='%s' 已存在於此存儲庫。 editor.no_changes_to_show=沒有可以顯示的變更。 editor.unable_to_upload_files=上傳檔案失敗到 '%s', 錯誤訊息: %v editor.upload_files_to_dir=上傳檔案到 '%s' - commits.commits=次程式碼提交 commits.find=搜尋 commits.author=作者 @@ -336,10 +302,6 @@ commits.date=提交日期 commits.older=更舊的提交 commits.newer=更新的提交 commits.signed_by=簽署人 - - - - issues.new=建立問題 issues.new.labels=標籤 issues.new.no_label=未選擇標籤 @@ -355,13 +317,13 @@ issues.create_label=建立標籤 issues.label_templates.title=載入一組預定義的標籤 issues.label_templates.helper=選擇一個標籤集 issues.label_templates.fail_to_load_file=載入標籤範本檔案 '%s' 失敗: %v -issues.add_milestone_at=`新增至%s 里程碑 %s` -issues.change_milestone_at=`%[3]s 修改了里程碑 %[1]s 到 %[2]s` -issues.remove_milestone_at=`從里程碑 %[2]s 刪除 %[1]s` -issues.deleted_milestone=`（已刪除）` +issues.add_milestone_at=新增至%s 里程碑 %s +issues.change_milestone_at=%[3]s 修改了里程碑 %[1]s 到 %[2]s +issues.remove_milestone_at=從里程碑 %[2]s 刪除 %[1]s +issues.deleted_milestone=（已刪除） issues.self_assign_at=將 %s 指派給自己 -issues.add_assignee_at=`被%s %s指派` -issues.delete_branch_at=`刪除分支 %s %s` +issues.add_assignee_at=被%s %s指派 +issues.delete_branch_at=刪除分支 %s %s issues.filter_label=標籤篩選 issues.filter_milestone=里程碑篩選 issues.filter_assignee=指派人篩選 @@ -390,13 +352,13 @@ issues.next=下一頁 issues.open_title=開啟中 issues.closed_title=已關閉 issues.num_comments=%d 條評論 -issues.commented_at=` 評論 %s` +issues.commented_at=" 評論 %s" issues.delete_comment_confirm=您確定要刪除該條評論嗎？ issues.no_content=尚未有任何內容 issues.close_issue=關閉 issues.reopen_issue=重新開啟 issues.create_comment=評論 -issues.commit_ref_at=`在代碼提交 %[2]s 中引用了該問題` +issues.commit_ref_at=在代碼提交 %[2]s 中引用了該問題 issues.poster=發佈者 issues.collaborator=協同者 issues.owner=所有者 @@ -413,12 +375,10 @@ issues.label_delete=刪除 issues.label.filter_sort.alphabetically=按字母顺序排序 issues.label.filter_sort.reverse_alphabetically=按字母反向排序 issues.num_participants=%d 參與者 -issues.attachment.open_tab=`在新的標籤頁中查看 '%s'` -issues.attachment.download=`點擊下載 '%s'` +issues.attachment.open_tab=在新的標籤頁中查看 '%s' +issues.attachment.download=點擊下載 '%s' issues.subscribe=訂閱 issues.unsubscribe=取消訂閱 - - pulls.new=建立合併請求 pulls.filter_branch=過濾分支 pulls.no_results=未找到結果 @@ -429,14 +389,7 @@ pulls.tab_commits=程式碼提交 pulls.reopen_to_merge=請重新開啟合併請求來完成合併操作。 pulls.merged=已合併 pulls.can_auto_merge_desc=這個拉請求可以自動合併。 - - ; %[2]s
    %[3]s     - - - - - milestones.new=新的里程碑 milestones.closed=於 %s關閉 milestones.no_due_date=暫無截止日期 @@ -455,9 +408,6 @@ milestones.filter_sort.least_complete=完成度由低到高 milestones.filter_sort.most_complete=完成度由高到低 milestones.filter_sort.most_issues=問題由多到少 milestones.filter_sort.least_issues=問題由少到多 - - - wiki.page=頁面 wiki.filter_page=過濾頁面 wiki.default_commit_message=關於此次頁面修改的說明(非必要)。 @@ -469,9 +419,6 @@ wiki.delete_page_button=刪除頁面 wiki.page_already_exists=相同名稱的 Wiki 頁面已經存在。 wiki.pages=所有頁面 wiki.last_updated=最後更新於 %s - - - settings=儲存庫設定 settings.desc=設定是您可以管理儲存庫設定的地方 settings.collaboration.write=可寫權限 @@ -527,7 +474,6 @@ settings.protected_branch_can_push_yes=你可以推送 settings.protected_branch_can_push_no=你不能推送 settings.add_protected_branch=啟用保護 settings.delete_protected_branch=停用保護 - diff.browse_source=瀏覽代碼 diff.parent=父節點 diff.commit=當前提交 @@ -538,7 +484,6 @@ diff.stats_desc=共有 %d 個文件被更改，包括 diff.bin=二進制 diff.view_file=查看文件 diff.file_suppressed=文件差異過大導致無法顯示 - release.releases=版本發佈 release.new_release=發佈新版本 release.draft=草稿 @@ -555,12 +500,46 @@ release.publish=發佈版本 release.save_draft=儲存草稿 release.deletion_success=已刪除此版本發佈。 release.downloads=下載附件 - - - - - - +desc.private=私有庫 +template.avatar=頭像 +migrate_items_issues=問題數 +migrate_items_pullrequests=合併請求 +migrate_items_releases=版本發佈 +editor.cancel_lower=取消 +projects.description_placeholder=組織描述 +projects.title=標題 +issues.new_label_desc_placeholder=組織描述 +issues.deleted_project=（已刪除） +issues.draft_title=草稿 +issues.context.edit=編輯 +issues.label_description=組織描述 +issues.add_time_cancel=取消 +issues.due_date_form_edit=編輯 +issues.due_date_form_remove=移除成員 +issues.dependency.cancel=取消 +issues.dependency.remove=移除成員 +pulls.compare_changes=建立合併請求 +wiki.new_page=頁面 +activity.period.daily=1 天 +activity.period.weekly=1 周 +activity.period.monthly=1 月 +activity.period.yearly=1 年 +activity.merged_prs_label=已合併 +activity.closed_issue_label=已關閉 +activity.new_issues_count_1=建立問題 +search=搜尋 +settings.options=儲存庫 +settings.collaboration.owner=管理員 +settings.site=官方網站 +settings.trust_model.collaborator=協同者 +settings.delete_collaborator=移除成員 +settings.teams=組織團隊 +settings.webhook.payload=金鑰文本 +settings.event_fork=複製 +settings.event_repository=儲存庫 +settings.event_issues=問題數 +settings.edit_protected_branch=編輯 +diff.file_byte_size=大小 [org] org_name_holder=組織名稱 @@ -574,21 +553,16 @@ lower_repositories=個儲存庫 org_desc=組織描述 team_name=團隊名稱 team_desc=團隊描述 - - settings=組織設定 settings.full_name=組織全名 settings.website=官方網站 settings.location=所在地區 - settings.update_settings=更新組織設定 settings.update_setting_success=組織設定已更新。 settings.delete=刪除組織 settings.delete_account=刪除當前組織 settings.confirm_delete_account=確認刪除組織 settings.hooks_desc=新增 webhooks 將觸發在這個組織下 全部的儲存庫 。 - - members.membership_visibility=成員可見性： members.member_role=成員角色： members.owner=管理員 @@ -597,7 +571,6 @@ members.remove=移除成員 members.leave=離開組織 members.invite_desc=邀請新的用戶加入 %s： members.invite_now=立即邀請 - teams.join=加入團隊 teams.leave=離開團隊 teams.no_desc=該團隊暫無描述 @@ -608,6 +581,10 @@ teams.add_team_member=新增團隊成員 teams.delete_team_success=該團隊已被刪除。 teams.repositories=團隊儲存庫 teams.add_nonexistent_repo=您嘗試新增到團隊的儲存庫不存在，請先建立儲存庫！ +members=成員數 +settings.visibility.private_shortname=私有庫 +settings.delete_org_title=刪除組織 +teams.read_access=已讀 [admin] dashboard=控制面版 @@ -619,7 +596,6 @@ monitor=應用監控面版 first_page=首頁 last_page=末頁 total=總計：%d - dashboard.operation_name=操作名稱 dashboard.operation_switch=開關 dashboard.operation_run=執行 @@ -654,7 +630,6 @@ dashboard.total_gc_time=垃圾收集執行時間總量 dashboard.total_gc_pause=垃圾收集暫停時間總量 dashboard.last_gc_pause=上次垃圾收集暫停時間 dashboard.gc_times=垃圾收集執行次數 - users.activated=已啟用 users.admin=管理員 users.repos=儲存庫數 @@ -662,13 +637,10 @@ users.created=建立時間 users.edit=編輯 users.auth_source=認證源 users.local=本地 - - orgs.org_manage_panel=組織管理 orgs.name=組織名稱 orgs.teams=團隊數 orgs.members=成員數 - repos.repo_manage_panel=儲存庫管理 repos.owner=所有者 repos.name=儲存庫名稱 @@ -677,10 +649,6 @@ repos.watches=關註數 repos.stars=讚好數 repos.issues=問題數 repos.size=大小 - - - - auths.name=認證名稱 auths.type=認證類型 auths.enabled=已啟用 @@ -722,7 +690,6 @@ auths.tip.gitlab=在 https://gitlab.com/profile/applications 註冊一個新的 auths.tip.openid_connect=使用 OpenID 連接探索 URL (/.well-known/openid-configuration) 來指定節點 auths.new_success=已增加認證'%s'。 auths.delete_auth_title=刪除認證來源 - config.server_config=伺服器設定 config.custom_conf=設定檔案路徑 config.disable_router_log=關閉路由日誌 @@ -733,7 +700,6 @@ config.lfs_root_path=LFS 根目錄 config.static_file_root_path=靜態檔案目錄 config.script_type=腳本類型 config.reverse_auth_user=反向代理認證 - config.ssh_config=SSH 設定 config.ssh_enabled=已啟用 config.ssh_port=埠 @@ -743,36 +709,28 @@ config.ssh_key_test_path=金鑰測試路徑 config.ssh_keygen_path=金鑰產生 (' ssh-keygen ') 路徑 config.ssh_minimum_key_size_check=金鑰最小大小檢查 config.ssh_minimum_key_sizes=金鑰最小大小 - - config.db_config=資料庫設定 config.db_type=資料庫類型 config.db_host=主機地址 config.db_name=資料庫名稱 config.db_path=資料庫路徑 - config.service_config=服務設定 config.show_registration_button=顯示註冊按鈕 config.disable_key_size_check=禁用金鑰最小長度檢查 config.active_code_lives=啟用用戶連結有效期 - config.webhook_config=Webhook 設定 config.queue_length=隊列長度 config.deliver_timeout=推送超時 config.skip_tls_verify=略過 TLS 驗證 - config.mailer_enabled=啟用服務 config.mailer_name=發送者名稱 config.mailer_user=發送者帳號 - config.oauth_config=社交帳號設定 config.oauth_enabled=啟用服務 - config.cache_config=Cache 設定 config.cache_adapter=Cache 適配器 config.cache_interval=Cache 周期 config.cache_conn=Cache 連接字符串 - config.session_config=Session 設定 config.session_provider=Session 提供者 config.provider_config=提供者設定 @@ -781,11 +739,9 @@ config.gc_interval_time=垃圾收集周期 config.session_life_time=Session 生命周期 config.https_only=僅限 HTTPS config.cookie_life_time=Cookie 生命周期 - config.picture_service=圖片服務 config.disable_gravatar=禁用 Gravatar 頭像 config.enable_federated_avatar=開啟聯合頭像 - config.git_config=Git 設定 config.git_disable_diff_highlight=禁用比較語法高亮 config.git_max_diff_lines=Max Diff 線 （對於單個檔） @@ -797,11 +753,8 @@ config.git_mirror_timeout=鏡像更新超時 config.git_clone_timeout=複製操作超時 config.git_pull_timeout=操作超時 config.git_gc_timeout=GC 操作超時 - config.log_config=日誌設定 config.log_mode=日誌模式 - - monitor.cron=Cron 任務 monitor.name=任務名稱 monitor.schedule=任務安排 @@ -811,9 +764,6 @@ monitor.process=執行中進程 monitor.desc=進程描述 monitor.start=開始時間 monitor.execute_time=已執行時間 - - - notices.system_notice_list=系統提示管理 notices.view_detail_header=查看提示細節 notices.actions=操作 @@ -827,6 +777,20 @@ notices.type_1=儲存庫 notices.desc=描述 notices.op=操作 notices.delete_success=已刪除系統提示。 +users.full_name=組織全名 +users.list_status_filter.is_admin=管理員 +emails.activated=已啟用 +packages.owner=管理員 +packages.name=組織名稱 +packages.type=認證類型 +packages.repository=儲存庫 +packages.size=大小 +auths.delete=刪除認證來源 +config.lfs_enabled=已啟用 +config.mailer_smtp_port=SMTP 主機端口 +monitor.queue.name=組織名稱 +monitor.queue.type=認證類型 +monitor.queue.settings.submit=更新組織設定 [action] create_repo=建立了儲存庫 %s @@ -877,4 +841,18 @@ error.not_signed_commit=未簽名的提交 [units] [packages] +filter.type=認證類型 +conan.details.repository=儲存庫 +owner.settings.cleanuprules.enabled=已啟用 + +[aria] + +[secrets] +name=組織名稱 +[actions] +runners.name=組織名稱 +runners.owner_type=認證類型 +runners.description=組織描述 +runners.task_list.run=執行 +runners.task_list.repository=儲存庫 diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini index ff2a238fa022..e0c507d30049 100644 --- a/options/locale/locale_zh-TW.ini +++ b/options/locale/locale_zh-TW.ini @@ -23,7 +23,6 @@ enable_javascript=本網站在啟用 JavaScript 的情況下可以運作的更 toc=目錄 licenses=授權條款 return_to_gitea=返回 Gitea - username=帳號 email=電子信箱 password=密碼 @@ -33,7 +32,6 @@ captcha=驗證碼 twofa=兩步驟驗證 twofa_scratch=兩步驟驗證備用驗證碼 passcode=驗證碼 - webauthn_insert_key=插入您的安全金鑰 webauthn_sign_in=按下您安全金鑰上的按鈕。如果您的安全金鑰沒有按鈕，請重新插入。 webauthn_press_button=請按下您安全金鑰上的按鈕… @@ -47,14 +45,13 @@ webauthn_error_duplicated=此請求不允許使用這個安全金鑰。請確保 webauthn_error_empty=您必須命名此金鑰。 webauthn_error_timeout=在成功讀取金鑰之前已逾時，請重新載入此頁面並重試。 webauthn_reload=重新載入 - repository=儲存庫 organization=組織 mirror=鏡像 new_repo=新增儲存庫 new_migrate=遷移外部儲存庫 new_mirror=新鏡像 -new_fork=新增儲存庫 fork +new_fork=新增儲存庫 Fork new_org=新增組織 new_project=新增專案 new_project_board=新增專案看板 @@ -65,18 +62,15 @@ settings=設定 your_profile=個人資料 your_starred=已加星號 your_settings=設定 - all=所有 sources=來源 mirrors=鏡像 collaborative=協作 forks=Fork - activities=動態 pull_requests=合併請求 issues=問題 milestones=里程碑 - ok=確認 cancel=取消 save=儲存 @@ -85,28 +79,28 @@ add_all=全部增加 remove=移除 remove_all=全部移除 edit=編輯 - copy=複製 copy_url=複製 URL copy_branch=複製分支名稱 copy_success=複製成功！ copy_error=複製失敗 - write=撰寫 preview=預覽 loading=載入中… - step1=第一步： step2=第二步： - error=錯誤 error404=您正嘗試訪問的頁面 不存在 或 您尚未被授權 查看該頁面。 - never=從來沒有 - rss_feed=RSS 摘要 +enabled=已啟用 +disabled=已停用 +copy_content=複製內容 +copy_type_unsupported=無法複製此類型的檔案 [filter] +string.asc=A - Z +string.desc=Z - A [error] occurred=發生錯誤 @@ -157,7 +151,6 @@ err_empty_admin_email=管理員信箱不能為空。 err_admin_name_is_reserved=無效的管理員帳號，帳號已被保留 err_admin_name_pattern_not_allowed=管理員帳號無效，該帳號是保留名稱 err_admin_name_is_invalid=無效的管理員帳號 - general_title=一般設定 app_name=網站標題 app_name_helper=您可以在此輸入您的公司名稱。 @@ -177,7 +170,6 @@ app_url=Gitea 基本 URL app_url_helper=用於 HTTP(S) Clone 和電子郵件通知的基本網址。 log_root_path=日誌路徑 log_root_path_helper=日誌檔將寫入此目錄。 - optional_title=可選設定 email_title=電子郵件設定 smtp_addr=SMTP 主機 @@ -236,6 +228,9 @@ no_reply_address=隱藏電子信箱域名 no_reply_address_helper=作為隱藏電子信箱使用者的域名。例如，如果隱藏的電子信箱域名設定為「noreply.example.org」，帳號「joe」將以「joe@noreply.example.org」的身分登錄到 Git 中。 password_algorithm=密碼雜湊演算法 password_algorithm_helper=設定密碼雜湊演算法。演算法有不同的需求和強度。「argon2」雖然有優秀的特性但會占用大量記憶體，所以可能不適用於小型系統。 +invalid_password_algorithm=無效的密碼雜湊演算法 +enable_update_checker=啟用更新檢查器 +enable_update_checker_helper=定期連線到 gitea.io 檢查更新。 [home] uname_holder=帳號或電子信箱 @@ -251,17 +246,14 @@ search_repos=搜尋儲存庫... filter=其他篩選條件 filter_by_team_repositories=以團隊儲存庫篩選 feed_of=「%s」的訊息來源 - show_archived=已封存 show_both_archived_unarchived=顯示已封存和未封存 show_only_archived=只顯示已封存 show_only_unarchived=只顯示未封存 - show_private=私有 show_both_private_public=顯示公開和私有 show_only_private=只顯示私有 show_only_public=只顯示公開 - issues.in_your_repos=在您的儲存庫中 [explore] @@ -282,7 +274,8 @@ org_no_results=沒有找到符合的組織。 code_no_results=找不到符合您關鍵字的原始碼。 code_search_results=「%s」的搜尋結果 code_last_indexed_at=最後索引 %s - +relevant_repositories_tooltip=已隱藏缺少主題、圖示、說明、Fork 的儲存庫。 +relevant_repositories=只顯示相關的儲存庫，顯示未篩選的結果。 [auth] create_new_account=註冊帳戶 @@ -351,36 +344,30 @@ authorization_failed_desc=授權失敗，因為我們偵測到無效的請求。 sspi_auth_failed=SSPI 認證失敗 password_pwned=您選擇的密碼已被列於被盜密碼清單中，該清單因公共資料外洩而暴露。請試試其他密碼。 password_pwned_err=無法完成對 HaveIBeenPwned 的請求。 +invalid_password=您的密碼和用來建立帳戶的不符。 [mail] view_it_on=在 %s 上查看 link_not_working_do_paste=無法開啟？請複製超連結到瀏覽器貼上。 hi_user_x=%s 您好， - activate_account=請啟用您的帳戶 activate_account.title=%s，請啟用您的帳戶 activate_account.text_1=%[1]s 您好，感謝您註冊 %[2]s！ activate_account.text_2=請在 %s內點擊下列連結以啟用您的帳戶： - activate_email=請驗證您的電子信箱 activate_email.title=%s，請驗證您的電子信箱 activate_email.text=請在 %s內點擊下列連結以驗證您的電子信箱： - register_notify=歡迎來到 Gitea register_notify.title=%[1]s，歡迎來到 %[2]s register_notify.text_1=這是您在 %s 的註冊確認信！ register_notify.text_2=您現在可以用帳號 %s 登入。 register_notify.text_3=如果這是由管理員為您建立的帳戶，請先設定您的密碼。 - reset_password=救援您的帳戶 reset_password.title=%s，您已請求帳戶救援 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.x_mentioned_you=@%s 提到了您： issue.action.force_push=%[1]s 強制推送了 %[2]s 自 %[3]s 至 %[4]s。 issue.action.push_1=@%[1]s 推送了 %[3]d 個提交到 %[2]s @@ -395,7 +382,6 @@ 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 中： - release.new.subject=%[2]s 中的 %[1]s 發布了 release.new.text=@%[1]s 於 %[3]s 發布了 %[2]s release.title=標題：%s @@ -403,15 +389,17 @@ release.note=說明： 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.to_you=您 repo.transfer.body=請造訪 %s 以接受或拒絕轉移，您也可以忽略它。 - repo.collaborator.added.subject=%s 把您加入到 %s repo.collaborator.added.text=您已被新增為儲存庫的協作者： - +reply=或是直接回覆此電子郵件 +team_invite.subject=%[1]s 邀請您加入組織 %[2]s +team_invite.text_1=%[1]s 邀請您加入組織 %[3]s 中的 %[2]s 團隊 +team_invite.text_2=請點擊下方連結加入團隊: +team_invite.text_3=備註: 這是寄給 %[1]s 的邀請。若您未預期收到此邀請，請忽略此郵件。 [modal] yes=是 @@ -428,36 +416,32 @@ SSHTitle=SSH 金鑰名稱 HttpsUrl=HTTPS URL 地址 PayloadUrl=推送地址 TeamName=團隊名稱 -AuthName=認證名稱 +AuthName=授權名稱 AdminEmail=管理員電子信箱 - NewBranchName=新的分支名稱 CommitSummary=提交摘要 CommitMessage=提交訊息 CommitChoice=提交選擇 TreeName=檔案路徑 Content=內容 - SSPISeparatorReplacement=分隔符 SSPIDefaultLanguage=預設語言 - -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=` 是無效的電子信箱。` -url_error=`'%s' 是無效的 URL。` -include_error=` 必須包含子字串「%s」。 +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=" 是無效的電子信箱。" +url_error='%s' 是無效的 URL。 +include_error=` 必須包含子字串「%s」。` glob_pattern_error=` glob 比對模式無效：%s.` -regex_pattern_error=` 正規表示式模式無效：%s.` +regex_pattern_error=" 正規表示式模式無效：%s." unknown_error=未知錯誤： captcha_incorrect=驗證碼不正確。 password_not_match=密碼錯誤。 lang_select_error=從清單中選擇一個語言。 - username_been_taken=帳號已被使用 username_change_not_local_user=非本地使用者不允許更改他們的帳號。詳細資訊請聯絡您的系統管理員。 repo_name_been_taken=儲存庫名稱已被使用。 @@ -488,20 +472,22 @@ user_not_exist=該用戶名不存在 team_not_exist=團隊不存在 last_org_owner=你不能從「Owners」團隊中刪除最後一個使用者。每個組織中至少要有一個擁有者。 cannot_add_org_to_team=組織不能被新增為團隊成員。 - invalid_ssh_key=無法驗證您的 SSH 密鑰：%s invalid_gpg_key=無法驗證您的 GPG 密鑰：%s invalid_ssh_principal=無效的主體: %s unable_verify_ssh_key=無法驗證 SSH 密鑰; 請再次檢查是否有錯誤。 auth_failed=授權認證失敗：%v - -still_own_repo=此帳戶仍然擁有一個或多個儲存庫，您必須先刪除或轉移它們。 -still_has_org=此帳戶仍是一個或多個組織的成員，您必須先離開它們。 -still_own_packages=您的帳戶擁有一個或多個套件，請先刪除他們。 -org_still_own_repo=該組織仍然是某些儲存庫的擁有者，您必須先轉移或刪除它們才能執行刪除組織！ -org_still_own_packages=此組織擁有一個或多個套件，請先刪除他們。 - +still_own_repo=您的帳戶擁有一個以上的儲存庫，請先刪除或轉移它們。 +still_has_org=您的帳戶是一個或多個組織的成員，請先離開它們。 +still_own_packages=您的帳戶擁有一個以上的套件，請先刪除它們。 +org_still_own_repo=此組織仍然擁有一個以上的儲存庫，請先刪除或轉移它們。 +org_still_own_packages=此組織仍然擁有一個以上的套件，請先刪除它們。 target_branch_not_exist=目標分支不存在 +username_error=只能包含英文字母數字 ('0-9'、'a-z'、'A-Z')、破折號 ('-')、底線 ('_')、句點 ('.')，不能以非英文字母數字開頭或結尾，也不允許連續的非英文字母數字。 +invalid_group_team_map_error=" 對應無效: %s" +duplicate_invite_to_team=該使用者已經被邀請為團隊成員。 +organization_leave_success=您已成功離開組織 %s。 +must_use_public_key=您提供的金鑰是私有金鑰，請勿上傳您的私有金鑰到任何地方，請使用您的公鑰。 [user] change_avatar=更改大頭貼... @@ -519,7 +505,6 @@ unfollow=取消追蹤 heatmap.loading=正在載入熱點圖... user_bio=個人簡介 disabled_public_activity=這個使用者已對外隱藏動態 - form.name_reserved=帳號「%s」是被保留的。 form.name_pattern_not_allowed=帳號不可包含字元「%s」。 form.name_chars_not_allowed=使用者名稱「%s」包含無效字元。 @@ -542,7 +527,6 @@ account_link=已連結帳號 organization=組織 uid=用戶 ID webauthn=安全金鑰 - public_profile=公開的個人資料 biography_placeholder=告訴我們一些關於你的事 profile_desc=您的電子信箱將被用於通知提醒和其他作業。 @@ -582,7 +566,6 @@ saved_successfully=您的設定已成功儲存。 privacy=隱私 keep_activity_private=在個人資料頁面隱藏動態 keep_activity_private_popup=讓動態只有你和管理員看得到 - lookup_avatar_by_mail=以電子信箱查詢大頭貼 federated_avatar_lookup=Federated Avatar 查詢 enable_custom_avatar=使用自訂大頭貼 @@ -593,7 +576,6 @@ uploaded_avatar_not_a_image=上傳的檔案不是圖片 uploaded_avatar_is_too_big=上傳的檔案大小超過了最大限制 update_avatar_success=您的大頭貼已更新 update_user_avatar_success=已更新使用者的大頭貼。 - change_password=更新密碼 old_password=目前的密碼 new_password=新的密碼 @@ -601,7 +583,6 @@ retype_new_password=重新輸入新的密碼 password_incorrect=輸入的密碼不正確！ change_password_success=您的密碼已更新。 從現在起使用您的新密碼登入。 password_change_disabled=非本地帳戶無法透過 Gitea 的網頁介面更改密碼。 - emails=電子信箱 manage_emails=管理電子信箱 manage_themes=選擇預設佈景主題 @@ -634,7 +615,6 @@ add_openid_success=已加入新的 OpenID 地址。 keep_email_private=隱藏電子信箱 keep_email_private_popup=您的電子信箱將對其他使用者隱藏。 openid_desc=OpenID 讓你可以授權認證給外部服務。 - manage_ssh_keys=管理 SSH 金鑰 manage_ssh_principals=管理 SSH 認證主體 manage_gpg_keys=管理 GPG 金鑰 @@ -713,7 +693,6 @@ manage_social=管理關聯的社群帳戶 social_desc=這些社群帳戶已經連結到你的 Gitea 帳戶。請確保您認得這些帳戶，因為這些帳戶能用來登入寧的 Gitea 帳戶。 unbind=解除連結 unbind_success=已從您的 Gitea 帳戶解除連結社群帳戶。 - manage_access_token=管理 Access Token generate_new_token=產生新的 Token tokens_desc=這些 Token 透過 Gitea API 獲得存取你帳戶的權限。 @@ -728,7 +707,6 @@ access_token_deletion_cancel_action=取消 access_token_deletion_confirm_action=刪除 access_token_deletion_desc=刪除 Token 後，使用此 Token 的應用程式將無法再存取您的帳戶，此動作不可還原。是否繼續？ delete_token_success=已刪除 Token。使用此 Token 的應用程式無法再存取您的帳戶。 - manage_oauth2_applications=管理 OAuth2 應用程式 edit_oauth2_application=編輯 OAuth2 應用程式 oauth2_applications_desc=OAuth2 應用程式讓您的第三方應用程式安全地驗證此 Gitea 中的使用者。 @@ -750,14 +728,12 @@ oauth2_client_secret_hint=請備份您的祕鑰。祕鑰在您離開這個頁面 oauth2_application_edit=編輯 oauth2_application_create_description=OAuth2 應用程式讓您的第三方應用程式可以存取此 Gitea 上的帳戶。 oauth2_application_remove_description=刪除 OAuth2 應用程式會拒絕它存取此 Gitea 上已授權的帳戶。是否繼續？ - authorized_oauth2_applications=已授權的 OAuth2 應用程式 authorized_oauth2_applications_description=您已授權給這些第三方應用程式存取您個人 Gitea 帳戶。請對不再需要的應用程式撤銷存取權。 revoke_key=撤銷 revoke_oauth2_grant=撤銷存取權 revoke_oauth2_grant_description=撤銷此第三方應用程式的存取權，此應用程式就無法再存取您的資料？您確定嗎？ revoke_oauth2_grant_success=您已成功撤銷存取權 - twofa_desc=兩步驟驗證可以增強您的帳戶安全性。 twofa_is_enrolled=您的帳戶已經啟用兩步驟驗證。 twofa_not_enrolled=您的帳戶目前尚未啟用兩步驟驗證。 @@ -775,13 +751,11 @@ then_enter_passcode=然後輸入應用程式中顯示的驗證碼： passcode_invalid=無效的驗證碼，請重試。 twofa_enrolled=您的帳戶已經啟用了兩步驟驗證。請將備用驗證碼 (%s) 保存到安全的地方，它只會顯示這麼一次！ twofa_failed_get_secret=取得密鑰 (Secret) 失敗。 - webauthn_desc=安全金鑰是包含加密密鑰的硬體設備，它們可以用於兩步驟驗證。安全金鑰必須支援 WebAuthn Authenticator 標準。 webauthn_register_key=新增安全金鑰 webauthn_nickname=暱稱 webauthn_delete_key=移除安全金鑰 webauthn_delete_key_desc=如果您移除安全金鑰，將不能再使用它登入。是否繼續？ - manage_account_links=管理已連結的帳戶 manage_account_links_desc=這些外部帳戶已連結到您的 Gitea 帳戶。 account_links_not_available=目前沒有連結到您的 Gitea 帳戶的外部帳戶 @@ -789,23 +763,19 @@ link_account=連結帳戶 remove_account_link=刪除已連結的帳戶 remove_account_link_desc=刪除連結帳戶將撤銷其對 Gitea 帳戶的存取權限。是否繼續？ remove_account_link_success=已移除連結的帳戶。 - orgs_none=您尚未成為任一組織的成員。 repos_none=您不擁有任何存儲庫 - delete_account=刪除您的帳戶 delete_prompt=此動作將永久刪除您的使用者帳戶，而且無法復原。 delete_with_all_comments=因為您的帳戶年齡小於 %s，為了避免幽靈留言，所有問題及合併請求的留言都會隨帳戶一同被刪除。 confirm_delete_account=確認刪除帳戶 delete_account_title=刪除使用者帳戶 delete_account_desc=您確定要永久刪除此帳戶嗎？ - email_notifications.enable=啟用郵件通知 email_notifications.onmention=只在被提到時傳送郵件通知 email_notifications.disable=關閉郵件通知 email_notifications.submit=套用郵件偏好設定 email_notifications.andyourown=和您自己的通知 - visibility=使用者瀏覽權限 visibility.public=公開 visibility.public_tooltip=對所有人公開 @@ -813,6 +783,9 @@ visibility.limited=受限 visibility.limited_tooltip=只有登入的使用者才能看到 visibility.private=私人 visibility.private_tooltip=只有組織成員才能看到 +select_scopes=選擇範圍 (Scope) +scopes_list=範圍 (Scope): +oauth2_confidential_client=機密客戶端 (Confidential Client)。請為能保持機密性的程式勾選，例如網頁應用程式。使用原生程式時不要勾選，包含桌面、行動應用程式。 [repo] new_repo_helper=儲存庫包含所有專案檔案，包含修訂歷史。已經存放於別處了嗎？遷移儲存庫。 @@ -899,14 +872,12 @@ delete_preexisting=刪除既有的檔案 delete_preexisting_content=刪除 %s 中的檔案 delete_preexisting_success=刪除 %s 中未接管的檔案 blame_prior=檢視此變更前的 Blame - transfer.accept=同意轉移 transfer.accept_desc=轉移到「%s」 transfer.reject=拒絕轉移 transfer.reject_desc=取消轉移到「%s」 transfer.no_permission_to_accept=您沒有同意的權限 transfer.no_permission_to_reject=您沒有拒絕的權限 - desc.private=私有 desc.public=公開 desc.private_template=私有範本 @@ -914,7 +885,6 @@ desc.public_template=範本 desc.internal=組織內部用 desc.internal_template=組織內部範本 desc.archived=已封存 - template.items=範本項目 template.git_content=Git 內容(預設分支) template.git_hooks=Git Hook @@ -925,16 +895,13 @@ template.avatar=大頭貼 template.issue_labels=問題標籤 template.one_item=至少須選擇一個範本項目 template.invalid=必須選擇一個儲存庫範本 - archive.title=此存儲庫已封存。您可以查看檔案及 Clone 此存儲庫，但不能推送、建立問題及發出合併請求。 archive.issue.nocomment=此存儲庫已封存，您不能在問題上留言。 archive.pull.nocomment=此存儲庫已封存，您不能在合併請求上留言。 - form.reach_limit_of_creation_1=您已經達到了您儲存庫的數量上限 (%d 個)。 form.reach_limit_of_creation_n=您已經達到了您儲存庫的數量上限 (%d 個)。 form.name_reserved=儲存庫名稱「%s」是被保留的。 form.name_pattern_not_allowed=儲存庫名稱不可包含字元「%s」。 - need_auth=授權 migrate_options=遷移選項 migrate_service=遷移服務 @@ -985,7 +952,6 @@ migrate.migrating_labels=正在遷移標籤 migrate.migrating_releases=正在遷移版本發布 migrate.migrating_issues=正在遷移問題 migrate.migrating_pulls=正在遷移合併請求 - mirror_from=鏡像自 forked_from=fork 自 generated_from=產生自 @@ -999,7 +965,6 @@ unstar=移除星號 star=加上星號 fork=Fork download_archive=下載此儲存庫 - no_desc=暫無描述 quick_guide=快速幫助 clone_this_repo=Clone 此儲存庫 @@ -1007,12 +972,11 @@ create_new_repo_command=從命令列建立新儲存庫。 push_exist_repo=從命令列推送已存在的儲存庫 empty_message=此儲存庫未包含任何內容。 broken_message=無法讀取此儲存庫底層的 Git 資料。請聯絡此 Gitea 執行個體的管理員或刪除此儲存庫。 - code=程式碼 code.desc=存取原始碼、檔案、提交和分支。 branch=分支 tree=目錄樹 -clear_ref=`清除目前的參考` +clear_ref=清除目前的參考 filter_branch_and_tag=過濾分支或標籤 find_tag=尋找標籤 branches=分支 @@ -1024,7 +988,6 @@ packages=套件 labels=標籤 org_labels_desc=組織層級標籤可用於此組織下的所有存儲庫。 org_labels_desc_manage=管理 - milestones=里程碑 commits=提交歷史 commit=提交 @@ -1040,14 +1003,13 @@ file_view_rendered=檢視渲染圖 file_view_raw=查看原始文件 file_permalink=永久連結 file_too_large=檔案太大，無法顯示。 -invisible_runes_header=`此檔案含有看不見的 Unicode 字元！` -invisible_runes_description=`此檔案含有看不見的 Unicode 字元，這些字元的處理方式可能和下面呈現的不同。若您是有意且合理的使用，您可以放心地忽略此警告。使用 Escape 按鈕顯示隱藏的字元。` -ambiguous_runes_header=`此檔案含有易混淆的 Unicode 字元！` -ambiguous_runes_description=`此檔案含有易混淆的 Unicode 字元，這些字元的處理方式可能和下面呈現的不同。若您是有意且合理的使用，您可以放心地忽略此警告。使用 Escape 按鈕標記這些字元。` -invisible_runes_line=`這一行有看不見的 Unicode 字元` -ambiguous_runes_line=`這一行有易混淆的 Unicode 字元` -ambiguous_character=`%[1]c [U+%04[1]X] 容易與 %[2]c [U+%04[2]X] 混淆` - +invisible_runes_header=此檔案含有看不見的 Unicode 字元！ +invisible_runes_description=此檔案含有看不見的 Unicode 字元，這些字元的處理方式可能和下面呈現的不同。若您是有意且合理的使用，您可以放心地忽略此警告。使用 Escape 按鈕顯示隱藏的字元。 +ambiguous_runes_header=此檔案含有易混淆的 Unicode 字元！ +ambiguous_runes_description=此檔案含有易混淆的 Unicode 字元，這些字元的處理方式可能和下面呈現的不同。若您是有意且合理的使用，您可以放心地忽略此警告。使用 Escape 按鈕標記這些字元。 +invisible_runes_line=這一行有看不見的 Unicode 字元 +ambiguous_runes_line=這一行有易混淆的 Unicode 字元 +ambiguous_character=%[1]c [U+%04[1]X] 容易與 %[2]c [U+%04[2]X] 混淆 escape_control_characters=Escape unescape_control_characters=Unescape file_copy_permalink=複製固定連結 @@ -1066,7 +1028,6 @@ download_file=下載檔案 normal_view=標準檢視 line=行 lines=行 - editor.add_file=加入檔案 editor.new_file=新增檔案 editor.upload_file=上傳檔案 @@ -1132,7 +1093,6 @@ editor.user_no_push_to_branch=使用者無法推送到分支 editor.require_signed_commit=分支僅接受經簽署的提交 editor.cherry_pick=Cherry-pick %s 到： editor.revert=還原 %s 到： - commits.desc=瀏覽原始碼修改歷程。 commits.commits=次程式碼提交 commits.no_commits=沒有共同的提交。「%s」和「%s」的歷史完全不同。 @@ -1151,7 +1111,6 @@ commits.signed_by_untrusted_user=由不信任的使用者簽署 commits.signed_by_untrusted_user_unmatched=由不受信任且與提交者不相符的使用者簽署 commits.gpg_key_id=GPG 金鑰 ID commits.ssh_key_fingerprint=SSH 金鑰指紋 - commit.actions=操作 commit.revert=還原 commit.revert-header=還原: %s @@ -1159,10 +1118,8 @@ commit.revert-content=選擇還原的目標分支： commit.cherry-pick=Cherry-pick commit.cherry-pick-header=Cherry-pick: %s commit.cherry-pick-content=選擇 Cherry-pick 的目標分支： - ext_issues=存取外部問題 ext_issues.desc=連結到外部問題追蹤器。 - projects=專案 projects.desc=在專案看板中管理問題與合併請求。 projects.description=描述 (選用) @@ -1182,7 +1139,7 @@ projects.edit_success=已更新專案「%s」。 projects.type.none=無 projects.type.basic_kanban=基本看板 projects.type.bug_triage=Bug 檢傷分類 -projects.template.desc=專案範本 +projects.template.desc=範本 projects.template.desc_helper=選擇專案範本以開始 projects.type.uncategorized=未分類 projects.board.edit=編輯看板 @@ -1198,13 +1155,12 @@ projects.board.color=顏色 projects.open=開啟 projects.close=關閉 projects.board.assigned_to=指派給 - issues.desc=管理錯誤報告、任務和里程碑。 issues.filter_assignees=篩選負責人 issues.filter_milestones=篩選里程碑 issues.filter_projects=篩選專案 issues.filter_labels=篩選標籤 -issues.filter_reviewers=篩選審查者 +issues.filter_reviewers=篩選審核者 issues.new=新增問題 issues.new.title_empty=標題不可為空 issues.new.labels=標籤 @@ -1251,25 +1207,25 @@ issues.add_labels=加入了 %s 標籤 %s issues.remove_label=移除了 %s 標籤 %s issues.remove_labels=移除了 %s 標籤 %s issues.add_remove_labels=加入了 %s 並移除了 %s 標籤 %s -issues.add_milestone_at=`新增到 %s 里程碑 %s` -issues.add_project_at=`將此加入到 %s 專案 %s` -issues.change_milestone_at=`%[3]s 修改了里程碑 %[1]s 到 %[2]s` -issues.change_project_at=`將專案從 %s 修改為 %s %s` -issues.remove_milestone_at=`從 %s 里程碑移除 %s` -issues.remove_project_at=`將此從 %s 專案中移除 %s` -issues.deleted_milestone=`(已刪除)` -issues.deleted_project=`(已刪除)` -issues.self_assign_at=`指派給自己 %s` -issues.add_assignee_at=`被 %s 指派 %s` -issues.remove_assignee_at=`被 %s 取消指派 %s` -issues.remove_self_assignment=`取消指派給自己 %s` -issues.change_title_at=`將標題從 %s 改為 %s %s` -issues.change_ref_at=`將參考從 %s 變更為 %s %s` -issues.remove_ref_at=`移除了參考 %s %s` -issues.add_ref_at=`新增了參考 %s %s` -issues.delete_branch_at=`刪除分支 %s %s` +issues.add_milestone_at=新增到 %s 里程碑 %s +issues.add_project_at=將此加入到 %s 專案 %s +issues.change_milestone_at=%[3]s 修改了里程碑 %[1]s 到 %[2]s +issues.change_project_at=將專案從 %s 修改為 %s %s +issues.remove_milestone_at=從 %s 里程碑移除 %s +issues.remove_project_at=將此從 %s 專案中移除 %s +issues.deleted_milestone=(已刪除) +issues.deleted_project=(已刪除) +issues.self_assign_at=指派給自己 %s +issues.add_assignee_at=被 %s 指派 %s +issues.remove_assignee_at=被 %s 取消指派 %s +issues.remove_self_assignment=取消指派給自己 %s +issues.change_title_at=將標題從 %s 改為 %s %s +issues.change_ref_at=將參考從 %s 變更為 %s %s +issues.remove_ref_at=移除了參考 %s %s +issues.add_ref_at=新增了參考 %s %s +issues.delete_branch_at=刪除分支 %s %s issues.filter_label=標籤 -issues.filter_label_exclude=`使用 alt + click/enter 來排除標籤` +issues.filter_label_exclude=使用 alt + click/enter 來排除標籤 issues.filter_label_no_select=所有標籤 issues.filter_milestone=里程碑 issues.filter_milestone_no_select=所有里程碑 @@ -1316,7 +1272,7 @@ issues.open_title=開放中 issues.closed_title=已關閉 issues.draft_title=草稿 issues.num_comments=%d 則留言 -issues.commented_at=`已留言 %s` +issues.commented_at=已留言 %s issues.delete_comment_confirm=您確定要刪除這則留言嗎？ issues.context.copy_link=複製連結 issues.context.quote_reply=引用回覆 @@ -1325,22 +1281,22 @@ issues.context.edit=編輯 issues.context.delete=刪除 issues.no_content=尚未有任何內容 issues.close_issue=關閉 -issues.pull_merged_at=`合併了提交 %[2]s 至 %[3]s %[4]s` -issues.manually_pull_merged_at=`手動合併了提交 %[2]s 至 %[3]s %[4]s` +issues.pull_merged_at=合併了提交 %[2]s 至 %[3]s %[4]s +issues.manually_pull_merged_at=手動合併了提交 %[2]s 至 %[3]s %[4]s issues.close_comment_issue=留言並關閉 issues.reopen_issue=重新開放 issues.reopen_comment_issue=留言並重新開放 issues.create_comment=留言 -issues.closed_at=`關閉了這個問題 %[2]s` -issues.reopened_at=`重新開放了這個問題 %[2]s` -issues.commit_ref_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_from=`自 %[1]s` +issues.closed_at=關閉了這個問題 %[2]s +issues.reopened_at=重新開放了這個問題 %[2]s +issues.commit_ref_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_from=自 %[1]s issues.poster=發布者 issues.collaborator=協作者 issues.owner=擁有者 @@ -1354,11 +1310,11 @@ issues.sign_in_require_desc= 登入 才能加入這對話。 issues.edit=編輯 issues.cancel=取消 issues.save=儲存 -issues.label_title=標籤名稱 -issues.label_description=標籤描述 -issues.label_color=標籤顏色 +issues.label_title=名稱 +issues.label_description=描述 +issues.label_color=顏色 issues.label_count=%d 個標籤 -issues.label_open_issues=%d 個開放中的問題 +issues.label_open_issues=%d 個開放中的問題/合併請求 issues.label_edit=編輯 issues.label_delete=刪除 issues.label_modify=編輯標籤 @@ -1370,8 +1326,8 @@ issues.label.filter_sort.reverse_alphabetically=按字母反向排序 issues.label.filter_sort.by_size=檔案由小到大 issues.label.filter_sort.reverse_by_size=檔案由大到小 issues.num_participants=%d 參與者 -issues.attachment.open_tab=`在新分頁中查看「%s」` -issues.attachment.download=`點擊下載「%s」` +issues.attachment.open_tab=在新分頁中查看「%s」 +issues.attachment.download=點擊下載「%s」 issues.subscribe=訂閱 issues.unsubscribe=取消訂閱 issues.lock=鎖定對話 @@ -1399,31 +1355,31 @@ issues.delete.text=您真的要刪除此問題嗎？(這將會永久移除所有 issues.tracker=時間追蹤 issues.start_tracking_short=開始計時 issues.start_tracking=開始時間追蹤 -issues.start_tracking_history=`開始工作 %s` +issues.start_tracking_history=開始工作 %s issues.tracker_auto_close=當這個問題被關閉時，自動停止計時器 -issues.tracking_already_started=`您已在另一個問題上開始時間追蹤！` +issues.tracking_already_started=您已在另一個問題上開始時間追蹤！ issues.stop_tracking=停止計時 -issues.stop_tracking_history=`結束工作 %s` +issues.stop_tracking_history=結束工作 %s issues.cancel_tracking=捨棄 -issues.cancel_tracking_history=`取消時間追蹤 %s` +issues.cancel_tracking_history=取消時間追蹤 %s issues.add_time=手動新增時間 issues.del_time=刪除此時間記錄 issues.add_time_short=新增時間 issues.add_time_cancel=取消 -issues.add_time_history=`加入了花費時間 %s` -issues.del_time_history=`刪除了花費時間 %s` +issues.add_time_history=加入了花費時間 %s +issues.del_time_history=刪除了花費時間 %s issues.add_time_hours=小時 issues.add_time_minutes=分鐘 issues.add_time_sum_to_small=沒有輸入時間。 issues.time_spent_total=總花費時間 -issues.time_spent_from_all_authors=`總花費時間：%s` +issues.time_spent_from_all_authors=總花費時間：%s issues.due_date=截止日期 issues.invalid_due_date_format=截止日期的格式必須為「yyyy-mm-dd」。 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.due_date_form=yyyy年mm月dd日 issues.due_date_form_add=新增截止日期 issues.due_date_form_edit=編輯 @@ -1442,8 +1398,8 @@ issues.dependency.add=加入先決條件... issues.dependency.cancel=取消 issues.dependency.remove=移除 issues.dependency.remove_info=移除此先決條件 -issues.dependency.added_dependency=`加入了新的先決條件 %s` -issues.dependency.removed_dependency=`移除了先決條件 %s` +issues.dependency.added_dependency=加入了新的先決條件 %s +issues.dependency.removed_dependency=移除了先決條件 %s issues.dependency.pr_closing_blockedby=此合併請求被下列問題阻擋而無法關閉 issues.dependency.issue_closing_blockedby=此問題被下列問題阻擋而無法關閉 issues.dependency.issue_close_blocks=因為此問題的阻擋，下列問題無法被關閉 @@ -1496,10 +1452,8 @@ issues.content_history.delete_from_history=刪除歷程記錄 issues.content_history.delete_from_history_confirm=刪除歷程記錄？ issues.content_history.options=選項 issues.reference_link=參考: %s - compare.compare_base=基底分支 compare.compare_head=比較 - pulls.desc=啟用合併請求和程式碼審核。 pulls.new=建立合併請求 pulls.view=檢視合併請求 @@ -1519,11 +1473,11 @@ pulls.filter_branch=過濾分支 pulls.no_results=未找到結果 pulls.nothing_to_compare=這些分支的內容相同，無需建立合併請求。 pulls.nothing_to_compare_and_allow_empty_pr=這些分支的內容相同，此合併請求將會是空白的。 -pulls.has_pull_request=`已有介於這些分支間的合併請求：%[2]s#%[3]d` +pulls.has_pull_request=已有介於這些分支間的合併請求：%[2]s#%[3]d pulls.create=建立合併請求 pulls.title_desc=請求將 %[1]d 次程式碼提交從 %[2]s 合併至 %[3]s pulls.merged_title_desc=將 %[1]d 次提交從 %[2]s 合併至 %[3]s %[4]s -pulls.change_target_branch_at=`將目標分支從 %s 更改為 %s %s` +pulls.change_target_branch_at=將目標分支從 %s 更改為 %s %s pulls.tab_conversation=對話內容 pulls.tab_commits=程式碼提交 pulls.tab_files=檔案變動 @@ -1535,7 +1489,7 @@ pulls.manually_merged=手動合併 pulls.manually_merged_as=此合併請求已被手動合併為 %[2]s。 pulls.is_closed=合併請求已被關閉。 pulls.has_merged=合併請求已合併。 -pulls.title_wip_desc=`標題用 %s 開頭以避免意外地合併此合併請求。` +pulls.title_wip_desc=標題用 %s 開頭以避免意外地合併此合併請求。 pulls.cannot_merge_work_in_progress=此合併請求被標記為還在進行中 (WIP)。 pulls.still_in_progress=還在進行中嗎？ pulls.add_prefix=加入 %s 前綴 @@ -1566,7 +1520,6 @@ pulls.reject_count_n=%d 變更請求 pulls.waiting_count_1=%d 等待審核 pulls.waiting_count_n=%d 等待審核 pulls.wrong_commit_id=提交 id 必須存在於目標分支上 - pulls.no_merge_desc=無法進行合併，因為所有儲存庫的合併選項已被停用。 pulls.no_merge_helper=在儲存庫設定啟用合併選項或手動合併該合併請求。 pulls.no_merge_wip=無法進行合併，因為它被標記為還在進行中。 @@ -1579,7 +1532,6 @@ pulls.squash_merge_pull_request=建立 Squash 提交 pulls.merge_manually=手動合併 pulls.merge_commit_id=合併提交 ID pulls.require_signed_wont_sign=該分支需要經簽署的提交，但此合併將不會被簽署。 - pulls.invalid_merge_option=您無法對此合併請求使用這個合併選項。 pulls.merge_conflict=合併失敗：合併時發生衝突。 提示：請嘗試不同的策略 pulls.merge_conflict_summary=錯誤訊息 @@ -1592,7 +1544,7 @@ pulls.head_out_of_date=合併失敗：產生合併時，head 已被更新。提 pulls.push_rejected=合併失敗：此推送被拒絕。請檢查此儲存庫的 Git Hook。 pulls.push_rejected_summary=完整的拒絕訊息 pulls.push_rejected_no_message=合併失敗：此推送被拒絕但未提供其他資訊。
    請檢查此儲存庫的 Git Hook。 -pulls.open_unmerged_pull_exists=`您不能重新開放，因為目前有相同的合併請求 (#%d) 正在進行中。` +pulls.open_unmerged_pull_exists=您不能重新開放，因為目前有相同的合併請求 (#%d) 正在進行中。 pulls.status_checking=還在進行一些檢查 pulls.status_checks_success=已通過所有檢查 pulls.status_checks_warning=一些檢查回報了警告 @@ -1605,27 +1557,22 @@ pulls.update_branch_rebase=以 Rebase 更新分支 pulls.update_branch_success=分支更新成功 pulls.update_not_allowed=您無權更新分支 pulls.outdated_with_base_branch=相對於基底分支，此分支已過時 -pulls.closed_at=`關閉了這個合併請求 %[2]s` -pulls.reopened_at=`重新開放了這個合併請求 %[2]s` -pulls.merge_instruction_hint=`您也可以查看命令列指南。` +pulls.closed_at=關閉了這個合併請求 %[2]s +pulls.reopened_at=重新開放了這個合併請求 %[2]s +pulls.merge_instruction_hint=您也可以查看命令列指南。 pulls.merge_instruction_step1_desc=在您的儲存庫中切換到新分支並測試變更。 pulls.merge_instruction_step2_desc=合併變更並更新到 Gitea。 - pulls.auto_merge_button_when_succeed=(當通過檢查後) pulls.auto_merge_when_succeed=通過所有檢查後自動合併 pulls.auto_merge_newly_scheduled=合併請求排定於通過所有檢查後合併。 pulls.auto_merge_has_pending_schedule=%[1]s 排定了在通過所有檢查後自動合併此合併請求 %[2]s。 - pulls.auto_merge_cancel_schedule=取消自動合併 pulls.auto_merge_not_scheduled=此合併請求未排定自動合併。 pulls.auto_merge_canceled_schedule=此合併請求的自動合併已被取消。 - -pulls.auto_merge_newly_scheduled_comment=`排定了在通過所有檢查後自動合併此合併請求 %[1]s` -pulls.auto_merge_canceled_schedule_comment=`取消了在通過所有檢查後自動合併此合併請求 %[1]s` - +pulls.auto_merge_newly_scheduled_comment=排定了在通過所有檢查後自動合併此合併請求 %[1]s +pulls.auto_merge_canceled_schedule_comment=取消了在通過所有檢查後自動合併此合併請求 %[1]s pulls.delete.title=刪除此合併請求？ pulls.delete.text=您真的要刪除此合併請求嗎？(這將會永久移除所有內容。若您還想保留，請考慮改為關閉它。) - milestones.new=新增里程碑 milestones.closed=於 %s關閉 milestones.update_ago=%s前更新 @@ -1655,7 +1602,6 @@ milestones.filter_sort.least_complete=完成度由低到高 milestones.filter_sort.most_complete=完成度由高到低 milestones.filter_sort.most_issues=問題由多到少 milestones.filter_sort.least_issues=問題由少到多 - signing.will_sign=將使用金鑰「%s」簽署此提交。 signing.wont_sign.error=檢查能否簽署提交時發生錯誤 signing.wont_sign.nokey=沒有金鑰可用來簽署此提交 @@ -1669,10 +1615,8 @@ signing.wont_sign.headsigned=將不會簽署此合併，因為 HEAD 提交未經 signing.wont_sign.commitssigned=將不會簽署此合併，因為所有關聯的提交都未經簽署 signing.wont_sign.approved=合併請求未被核可，所以不會簽署此合併。 signing.wont_sign.not_signed_in=你還沒有登入 - ext_wiki=存取外部 Wiki ext_wiki.desc=連結外部 Wiki。 - wiki=Wiki wiki.welcome=歡迎使用 Wiki！ wiki.welcome_desc=Wiki 允許你撰寫和與協作者分享文件 @@ -1696,7 +1640,6 @@ wiki.reserved_page=Wiki 頁面名稱 "%s" 是被保留的。 wiki.pages=所有頁面 wiki.last_updated=最後更新於 %s wiki.page_name_desc=輸入此 Wiki 頁面的名稱。一些特殊名稱有：「Home」、「_Sidebar」、「_Footer」等。 - activity=動態 activity.period.filter_label=期間: activity.period.daily=1 天 @@ -1762,7 +1705,6 @@ activity.git_stats_addition_n=新增 %d 行 activity.git_stats_and_deletions=和 activity.git_stats_deletion_1=刪除 %d 行 activity.git_stats_deletion_n=刪除 %d 行 - search=搜尋 search.search_repo=搜尋儲存庫 search.type.tooltip=搜尋類型 @@ -1773,7 +1715,6 @@ search.match.tooltip=只包含完全符合關鍵字的結果 search.results=在 %s 中搜尋 "%s" 的结果 search.code_no_results=找不到符合您關鍵字的原始碼。 search.code_search_unavailable=現在無法使用程式碼搜尋。請與網站管理員聯絡。 - settings=設定 settings.desc=設定是您可以管理儲存庫設定的地方 settings.options=儲存庫 @@ -2078,10 +2019,10 @@ settings.dismiss_stale_approvals=捨棄過時的核可 settings.dismiss_stale_approvals_desc=當新的提交有修改到合併請求的內容，並被推送到此分支時，將捨棄舊的核可。 settings.require_signed_commits=僅接受經簽署的提交 settings.require_signed_commits_desc=拒絕未經簽署或未經驗證的提交推送到此分支。 -settings.protect_protected_file_patterns=受保護的檔案模式 (以分號區隔「\;」): -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=當使用者有寫入權限時，可繞過推送限制，直接修改未受保護的檔案。可以用半形分號「\;」分隔多個模式。請於github.com/gobwas/glob 文件查看模式格式。範例：.drone.yml, /docs/**/*.txt。 +settings.protect_protected_file_patterns=受保護的檔案模式 (以分號區隔「;」): +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=當使用者有寫入權限時，可繞過推送限制，直接修改未受保護的檔案。可以用半形分號「;」分隔多個模式。請於github.com/gobwas/glob 文件查看模式格式。範例：.drone.yml, /docs/**/*.txt。 settings.add_protected_branch=啟用保護 settings.delete_protected_branch=停用保護 settings.update_protect_branch_success=已更新「%s」的分支保護。 @@ -2095,7 +2036,7 @@ settings.block_on_official_review_requests_desc=如果有官方的審核請求 settings.block_outdated_branch=如果合併請求已經過時則阻擋合併 settings.block_outdated_branch_desc=當 head 分支落後於基礎分支時不得合併。 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=編輯 @@ -2161,7 +2102,6 @@ settings.rename_branch_success=分支 %s 已成功被重新命名為 %s。 settings.rename_branch_from=原分支名稱 settings.rename_branch_to=新分支名稱 settings.rename_branch=重新命名分支 - diff.browse_source=瀏覽代碼 diff.parent=父節點 diff.commit=當前提交 @@ -2213,7 +2153,6 @@ diff.image.side_by_side=並列 diff.image.swipe=滑動 diff.image.overlay=重疊 diff.has_escaped=這一行有隱藏的 Unicode 字元 - releases.desc=追蹤專案版本和檔案下載。 release.releases=版本發布 release.detail=版本詳情 @@ -2231,7 +2170,7 @@ release.new_subheader=發布、整理專案的版本。 release.edit_subheader=發布、整理專案的版本。 release.tag_name=標籤名稱 release.target=目標分支 -release.tag_helper=新增或選擇既有的標籤。 +release.tag_helper=新增或選擇現有的標籤。 release.title=標題 release.content=內容 release.prerelease_desc=標記為 Pre-Release @@ -2255,7 +2194,6 @@ release.downloads=下載附件 release.download_count=下載次數：%s release.add_tag_msg=使用此版本的標題和內容作為標籤訊息。 release.add_tag=只建立標籤 - branch.name=分支名稱 branch.search=搜尋分支 branch.already_exists=已存在名為「%s」的分支。 @@ -2287,25 +2225,52 @@ branch.create_branch_operation=建立分支 branch.new_branch=建立新分支 branch.new_branch_from=從「%s」建立新分支 branch.renamed=分支 %s 被重新命名為 %s。 - tag.create_tag=建立標籤 %s tag.create_tag_operation=建立標籤 tag.confirm_create_tag=建立標籤 tag.create_tag_from=從「%s」建立新標籤 - tag.create_success=已建立標籤「%s」。 - topic.manage_topics=管理主題 topic.done=完成 topic.count_prompt=您最多能選擇 25 個主題 topic.format_prompt=主題必須以字母或數字為開頭，可包含連接號「-」且最長為 35 個字元。 - find_file.go_to_file=移至檔案 find_file.no_matching=找不到符合的檔案 - error.csv.too_large=無法渲染此檔案，因為它太大了。 error.csv.unexpected=無法渲染此檔案，因為它包含了未預期的字元，於第 %d 行第 %d 列。 error.csv.invalid_field_count=無法渲染此檔案，因為它第 %d 行的欄位數量有誤。 +more_operations=更多操作 +cite_this_repo=引用此儲存庫 +editor.new_branch_name=命名此提交的新分支 +commit.operations=操作 +projects.card_type.desc=卡片預覽 +projects.card_type.images_and_text=圖片和文字 +projects.card_type.text_only=純文字 +issues.filter_project=專案 +issues.filter_project_all=所有專案 +issues.filter_project_none=未選擇專案 +issues.action_check=選取/取消選取 +issues.action_check_all=全選/取消全選 +issues.label_exclusive=互斥 +issues.label_exclusive_desc=請以此格式命名標籤: scope/item，使它和其他 scope/ (相同範圍) 標籤互斥。 +issues.label_exclusive_warning=在編輯問題及合併請求的標籤時，將會刪除任何有相同範圍的標籤。 +pulls.clear_merge_message=清除合併訊息 +pulls.clear_merge_message_hint=清除合併訊息將僅移除提交訊息內容，留下產生的 git 結尾，如「Co-Authored-By …」。 +settings.branches.add_new_rule=加入新規則 +settings.pulls.default_allow_edits_from_maintainers=預設允許維護者進行編輯 +settings.releases_desc=啟用儲存庫版本發佈 +settings.actions_desc=啟用儲存庫 Actions +settings.authorization_header=Authorization 標頭 +settings.authorization_header_desc=存在時將將包含此 Authorization 標頭在請求中。例: %s。 +settings.protected_branch.save_rule=儲存規則 +settings.protected_branch.delete_rule=刪除規則 +settings.protect_branch_name_pattern=受保護的分支名稱模式 +settings.remove_protected_branch_failed=刪除分支保護規則「%s」失敗。 +settings.merge_style_desc=合併方式 +settings.protected_branch_required_rule_name=必須填寫規則名稱 +settings.protected_branch_duplicate_rule_name=規則名稱已存在 +release.releases_for=%s 的版本發佈 +release.tags_for=%s 的標籤 [org] org_name_holder=組織名稱 @@ -2329,11 +2294,9 @@ team_access_desc=儲存庫存取權 team_permission_desc=權限 team_unit_desc=允許存取的儲存庫區域 team_unit_disabled=(已停用) - form.name_reserved=組織名稱「%s」是被保留的。 form.name_pattern_not_allowed=儲存庫名稱不可包含字元「%s」。 form.create_org_not_allowed=此帳號禁止建立組織。 - settings=組織設定 settings.options=組織 settings.full_name=組織全名 @@ -2347,7 +2310,6 @@ settings.visibility.limited=受限 (只有登入的使用者才能看到) settings.visibility.limited_shortname=受限 settings.visibility.private=私有 (只有組織成員才能看到) settings.visibility.private_shortname=私有 - settings.update_settings=更新設定 settings.update_setting_success=組織設定已更新。 settings.change_orgname_prompt=注意：修改組織名稱將會同時修改對應的 URL。 @@ -2360,9 +2322,7 @@ settings.confirm_delete_account=確認刪除組織 settings.delete_org_title=刪除組織 settings.delete_org_desc=即將永久刪除這個組織，是否繼續？ settings.hooks_desc=此組織下的所有存儲庫都會觸發在此新增的 Webhook。 - settings.labels_desc=在此處新增的標籤可用於此組織下的所有儲存庫。 - members.membership_visibility=成員可見性： members.public=可見 members.public_helper=隱藏 @@ -2377,14 +2337,13 @@ members.leave=離開 members.leave.detail=確定要離開 %s 嗎？ members.invite_desc=邀請新的用戶加入 %s： members.invite_now=立即邀請 - teams.join=加入 teams.leave=離開 teams.leave.detail=確定要離開 %s 嗎？ teams.can_create_org_repo=建立儲存庫 teams.can_create_org_repo_helper=成員可以在組織中新增儲存庫。建立者將自動取得新儲存庫的管理員權限。 teams.none_access=沒有權限 -teams.none_access_helper=成員無法檢視此單元或對其執行其他動作。 +teams.none_access_helper=成員無法檢視此單元或對其執行其他動作，這對公開儲存庫沒有影響。 teams.general_access=一般權限 teams.general_access_helper=成員權限將由下列權限表決定。 teams.read_access=讀取 @@ -2424,6 +2383,12 @@ teams.all_repositories_helper=團隊擁有可存取所有儲存庫。選擇此 teams.all_repositories_read_permission_desc=這個團隊擁有所有儲存庫的讀取 權限：成員可以查看和 Clone 儲存庫。 teams.all_repositories_write_permission_desc=這個團隊擁有所有儲存庫的寫入 權限：成員可以讀取和推送到儲存庫。 teams.all_repositories_admin_permission_desc=這個團隊擁有所有儲存庫的管理員 權限：成員可以讀取、推送和增加協作者到儲存庫。 +members=成員 +teams.invite_team_member=邀請至 %s +teams.invite_team_member.list=待處理的邀請 +teams.invite.title=您正受邀加入組織 %[2]s 中的 %[1]s 團隊。 +teams.invite.by=邀請人 %s +teams.invite.description=請點擊下方按鈕加入團隊。 [admin] dashboard=資訊主頁 @@ -2439,7 +2404,6 @@ monitor=應用監控面版 first_page=首頁 last_page=末頁 total=總計：%d - dashboard.new_version_hint=現已推出 Gitea %s，您正在執行 %s。查看部落格以獲得更多資訊。 dashboard.statistic=摘要 dashboard.operations=維護作業 @@ -2517,7 +2481,6 @@ dashboard.delete_old_actions=從資料庫刪除所有舊行為 dashboard.delete_old_actions.started=從資料庫刪除所有舊行為的任務已啟動。 dashboard.update_checker=更新檢查器 dashboard.delete_old_system_notices=從資料庫刪除所有舊系統提示 - users.user_manage_panel=使用者帳戶管理 users.new_account=建立使用者帳戶 users.name=帳號 @@ -2556,7 +2519,7 @@ users.still_own_repo=這個使用者還擁有一個或更多的儲存庫。請 users.still_has_org=此使用者是組織的成員。請先將他從組織中移除。 users.purge=清除使用者 users.purge_help=強制刪除使用者和他擁有的所有儲存庫、組織、套件，所有留言也會被刪除。 -users.still_own_packages=此使用者擁有一個或多個套件，請先刪除這些套件。 +users.still_own_packages=此使用者仍然擁有一個以上的套件，請先刪除這些套件。 users.deletion_success=使用者帳戶已被刪除。 users.reset_2fa=重設兩步驟驗證 users.list_status_filter.menu_text=篩選 @@ -2571,7 +2534,6 @@ users.list_status_filter.is_prohibit_login=禁止登入 users.list_status_filter.not_prohibit_login=允許登入 users.list_status_filter.is_2fa_enabled=已啟用兩步驟驗證 users.list_status_filter.not_2fa_enabled=未啟用兩步驟驗證 - emails.email_manage_panel=使用者電子信箱管理 emails.primary=主要 emails.activated=已啟用 @@ -2584,25 +2546,22 @@ emails.not_updated=電子信箱更新失敗: %v emails.duplicate_active=此信箱已被其他使用者使用 emails.change_email_header=更新電子信箱屬性 emails.change_email_text=您確定要更新這個電子信箱？ - orgs.org_manage_panel=組織管理 -orgs.name=組織名稱 +orgs.name=名稱 orgs.teams=團隊數 orgs.members=成員數 orgs.new_orga=新增組織 - repos.repo_manage_panel=儲存庫管理 repos.unadopted=未接管的儲存庫 repos.unadopted.no_more=找不到其他未接管的儲存庫 repos.owner=擁有者 -repos.name=儲存庫名稱 +repos.name=名稱 repos.private=私有 repos.watches=關注數 repos.stars=星號數 repos.forks=Fork 數 repos.issues=問題數 repos.size=大小 - packages.package_manage_panel=套件管理 packages.total_size=總大小: %s packages.owner=擁有者 @@ -2613,21 +2572,18 @@ packages.type=類型 packages.repository=儲存庫 packages.size=大小 packages.published=已發布 - defaulthooks=預設 Webhook defaulthooks.desc=當觸發某些 Gitea 事件時，Webhook 會自動發出 HTTP POST 請求到指定的伺服器。這裡所定義的 Webhook 是預設的，並且會複製到所有新儲存庫。在 Webhook 指南閱讀更多內容。 defaulthooks.add_webhook=新增預設 Webhook defaulthooks.update_webhook=更新預設 Webhook - systemhooks=系統 Webhook systemhooks.desc=當觸發某些 Gitea 事件時，Webhook 會自動發出 HTTP POST 請求到指定的伺服器。由於這裡所定義的 Webhook 會影響此系統上的所有儲存庫，因此請評估這會對效能造成多少影響。在 Webhook 指南閱讀更多內容。 systemhooks.add_webhook=新增系統 Webhook systemhooks.update_webhook=更新系統 Webhook - auths.auth_manage_panel=認證來源管理 auths.new=新增認證來源 -auths.name=認證名稱 -auths.type=認證類型 +auths.name=名稱 +auths.type=類型 auths.enabled=已啟用 auths.syncenabled=啟用使用者同步 auths.updated=最後更新時間 @@ -2738,7 +2694,6 @@ auths.still_in_used=此認證來源正在使用中。請先轉換或刪除使用 auths.deletion_success=已刪除認證來源。 auths.login_source_exist=認證來源「%s」已經存在。 auths.login_source_of_type_exist=已經有相同類型的認證來源。 - config.server_config=伺服器組態 config.app_name=網站標題 config.app_ver=Gitea 版本 @@ -2757,7 +2712,6 @@ config.static_file_root_path=靜態檔案根目錄 config.log_file_root_path=日誌路徑 config.script_type=腳本類型 config.reverse_auth_user=反向代理認證 - config.ssh_config=SSH 組態 config.ssh_enabled=已啟用 config.ssh_start_builtin_server=使用內建的伺服器 @@ -2769,21 +2723,18 @@ config.ssh_key_test_path=金鑰測試路徑 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.db_config=資料庫組態 config.db_type=資料庫類型 config.db_host=主機地址 -config.db_name=資料庫名稱 +config.db_name=名稱 config.db_user=使用者名稱 config.db_schema=結構描述 config.db_ssl_mode=SSL config.db_path=資料庫路徑 - config.service_config=服務組態 config.register_email_confirm=要求註冊時確認電子郵件 config.disable_register=關閉註冊功能 @@ -2806,12 +2757,10 @@ config.default_allow_only_contributors_to_track_time=只讓貢獻者追蹤時間 config.no_reply_address=隱藏電子信箱域名 config.default_visibility_organization=新組織的預設瀏覽權限 config.default_enable_dependencies=預設啟用問題的先決條件 - config.webhook_config=Webhook 組態 config.queue_length=佇列長度 config.deliver_timeout=傳送逾時 config.skip_tls_verify=略過 TLS 驗證 - config.mailer_config=郵件程式組態 config.mailer_enabled=啟用服務 config.mailer_enable_helo=啟用 HELO @@ -2829,16 +2778,13 @@ config.test_email_placeholder=電子信箱 (例：test@example.com) config.send_test_mail=傳送測試郵件 config.test_mail_failed=傳送測試郵件到「%s」時失敗：%v config.test_mail_sent=測試郵件已傳送到「%s」。 - config.oauth_config=OAuth 組態 config.oauth_enabled=啟用服務 - config.cache_config=Cache 組態 config.cache_adapter=Cache 適配器 config.cache_interval=Cache 週期 config.cache_conn=Cache 連接字符串 config.cache_item_ttl=快取項目 TTL - config.session_config=Session 組態 config.session_provider=Session 提供者 config.provider_config=提供者設定 @@ -2847,12 +2793,10 @@ config.gc_interval_time=GC 週期 config.session_life_time=Session 生命週期 config.https_only=僅限 HTTPS config.cookie_life_time=Cookie 生命週期 - config.picture_config=圖片和大頭貼組態 config.picture_service=圖片服務 config.disable_gravatar=停用 Gravatar config.enable_federated_avatar=啟用 Federated Avatars - config.git_config=Git 組態 config.git_disable_diff_highlight=停用比較語法高亮 config.git_max_diff_lines=差異比較時顯示的最多行數 (單檔) @@ -2864,7 +2808,6 @@ config.git_mirror_timeout=鏡像更新超時 config.git_clone_timeout=Clone 作業逾時 config.git_pull_timeout=Pull 作業逾時 config.git_gc_timeout=GC 作業逾時 - config.log_config=日誌組態 config.log_mode=日誌模式 config.own_named_logger=具名日誌記錄器 @@ -2876,10 +2819,8 @@ config.access_log_mode=存取日誌模式 config.access_log_template=範本 config.xorm_log_mode=XORM 日誌模式 config.xorm_log_sql=記錄 SQL - - monitor.cron=Cron 任務 -monitor.name=任務名稱 +monitor.name=名稱 monitor.schedule=任務安排 monitor.next=下次執行時間 monitor.previous=上次執行時間 @@ -2929,7 +2870,6 @@ monitor.queue.pool.pause.submit=暫停佇列 monitor.queue.pool.resume.title=繼續佇列 monitor.queue.pool.resume.desc=令此佇列繼續作業 monitor.queue.pool.resume.submit=繼續佇列 - monitor.queue.settings.title=集區設定 monitor.queue.settings.desc=集區會動態成長以對應它的工作者佇列阻塞。這些變更不會影響目前的工作者群組。 monitor.queue.settings.timeout=增加逾時時間 @@ -2945,7 +2885,6 @@ monitor.queue.settings.submit=更新設定 monitor.queue.settings.changed=已更新設定 monitor.queue.settings.blocktimeout=目前的阻塞逾時時間 monitor.queue.settings.blocktimeout.value=%[1]v - monitor.queue.pool.none=此佇列沒有集區 monitor.queue.pool.added=已加入工作者群組 monitor.queue.pool.max_changed=已更改最大工作者數量 @@ -2955,7 +2894,6 @@ monitor.queue.pool.cancel=結束工作者群組 monitor.queue.pool.cancelling=正在結束工作者群組 monitor.queue.pool.cancel_notices=要結束這 %s 個工作者嗎？ monitor.queue.pool.cancel_desc=讓佇列沒有任何工作者群組可能造成請求永久阻塞。 - notices.system_notice_list=系統提示 notices.view_detail_header=查看提示細節 notices.actions=操作 @@ -2964,26 +2902,40 @@ notices.deselect_all=取消所有選取 notices.inverse_selection=反向選取 notices.delete_selected=刪除選取項 notices.delete_all=刪除所有提示 -notices.type=提示類型 +notices.type=類型 notices.type_1=儲存庫 notices.type_2=任務 notices.desc=描述 notices.op=操作 notices.delete_success=已刪除系統提示。 +dashboard.gc_lfs=對 LFS meta objects 進行垃圾回收 +dashboard.stop_zombie_tasks=停止殭屍任務 +dashboard.stop_endless_tasks=停止永不停止的任務 +dashboard.cancel_abandoned_jobs=取消已放棄的工作 +packages.unreferenced_size=未參考大小: %s +auths.oauth2_map_group_to_team=將已 Claim 的群組對應到組織團隊。(選用 - 需要上述 Claim 名稱) +auths.oauth2_map_group_to_team_removal=如果使用者不屬於相對應的群組，將使用者從已同步的團隊移除。 +auths.unable_to_initialize_openid=無法初始化 OpenID 連接提供者: %s +auths.invalid_openIdConnectAutoDiscoveryURL=自動探索 URL 無效 (它必須是以 http:// 或 https:// 開頭的有效 URL) +config.git_enable_reflogs=啟用 Reflogs +config.git_reflog_expiry_time=到期時間 +config.get_setting_failed=讀取設定值 %s 失敗 +config.set_setting_failed=寫入設定值 %s 失敗 +notices.operations=操作 [action] create_repo=建立了儲存庫 %s rename_repo=重新命名儲存庫 %[1]s 為 %[3]s commit_repo=推送了 %[3]s 到 %[4]s -create_issue=`建立了問題 %[3]s#%[2]s` -close_issue=`關閉了問題 %[3]s#%[2]s` -reopen_issue=`重新開放了問題 %[3]s#%[2]s` -create_pull_request=`建立了合併請求 %[3]s#%[2]s` -close_pull_request=`關閉了合併請求%[3]s#%[2]s` -reopen_pull_request=`重新開放了合併請求 %[3]s#%[2]s` -comment_issue=`在問題上留言 %[3]s#%[2]s` -comment_pull=`在合併請求上留言 %[3]s#%[2]s` -merge_pull_request=`合併了合併請求 %[3]s#%[2]s` +create_issue=建立了問題 %[3]s#%[2]s +close_issue=關閉了問題 %[3]s#%[2]s +reopen_issue=重新開放了問題 %[3]s#%[2]s +create_pull_request=建立了合併請求 %[3]s#%[2]s +close_pull_request=關閉了合併請求%[3]s#%[2]s +reopen_pull_request=重新開放了合併請求 %[3]s#%[2]s +comment_issue=在問題上留言 %[3]s#%[2]s +comment_pull=在合併請求上留言 %[3]s#%[2]s +merge_pull_request=合併了合併請求 %[3]s#%[2]s transfer_repo=將儲存庫 %s 轉移至 %s push_tag=推送了標籤 %[3]s 到 %[4]s delete_tag=刪除了 %[3]s 的標籤 %[2]s @@ -2994,14 +2946,15 @@ compare_commits_general=比較提交 mirror_sync_push=從鏡像同步了提交到 %[4]s 的 %[3]s mirror_sync_create=從鏡像同步了新參考 %[3]s 到 %[4]s mirror_sync_delete=從鏡像同步並從 %[3]s 刪除了參考 %[2]s -approve_pull_request=`核可了 %[3]s#%[2]s` -reject_pull_request=`提出了修改建議 %[3]s#%[2]s` -publish_release=`發布了 %[3]s 的 "%[4]s" ` -review_dismissed=`取消了 %[4]s 對 %[3]s#%[2]s 的審核` +approve_pull_request=核可了 %[3]s#%[2]s +reject_pull_request=提出了修改建議 %[3]s#%[2]s +publish_release=發布了 %[3]s 的 "%[4]s" +review_dismissed=取消了 %[4]s 對 %[3]s#%[2]s 的審核 review_dismissed_reason=原因： create_branch=在 %[4]s 中建立了分支 %[3]s starred_repo=為 %[2]s 加上星號 watched_repo=開始關注 %[2]s +auto_merge_pull_request=自動合併了合併請求 %[3]s#%[2]s [tool] ago=%s前 @@ -3115,7 +3068,7 @@ generic.documentation=關於通用 registry 的詳情請參閱說明文件。 -maven.registry=在您的 pom.xml 檔設定此註冊中心: +maven.registry=在您專案的 pom.xml 檔設定此註冊中心: maven.install=若要使用此套件，請在您 pom.xml 檔的 dependencies 段落加入下列內容: maven.install2=透過下列命令執行: maven.download=透過下列命令下載相依性: @@ -3124,7 +3077,7 @@ nuget.registry=透過下列命令設定此註冊中心: nuget.install=執行下列命令以使用 NuGet 安裝此套件: nuget.documentation=關於 NuGet registry 的詳情請參閱說明文件。 nuget.dependency.framework=目標框架 -npm.registry=在您的 .npmrc 檔設定此註冊中心: +npm.registry=在您專案的 .npmrc 檔設定此註冊中心: npm.install=執行下列命令以使用 npm 安裝此套件: npm.install2=或將它加到 package.json 檔: npm.documentation=關於 npm registry 的詳情請參閱說明文件。 @@ -3160,4 +3113,124 @@ settings.delete.description=刪除套件是永久且不可還原的。 settings.delete.notice=您正要刪除 %s (%s)，此動作是無法還原的，您確定嗎？ settings.delete.success=已刪除該套件。 settings.delete.error=刪除套件失敗。 - +details.repository_site=儲存庫網站 +details.documentation_site=文件網站 +cargo.registry=在 Cargo 組態檔設定此註冊中心 (例如: ~/.cargo/config.toml): +cargo.install=執行下列命令以使用 Cargo 安裝此套件: +cargo.documentation=關於 Cargo registry 的詳情請參閱說明文件。 +cargo.details.repository_site=儲存庫網站 +cargo.details.documentation_site=文件網站 +chef.registry=在您的 ~/.chef/config.rb 檔設定此註冊中心: +chef.install=執行下列命令安裝此套件: +chef.documentation=關於 Chef registry 的詳情請參閱說明文件。 +conda.registry=在您的 .condarc 檔設定此註冊中心為 Conda 存儲庫: +conda.install=執行下列命令以使用 Conda 安裝此套件: +conda.documentation=關於 Conda registry 的詳情請參閱說明文件。 +conda.details.repository_site=儲存庫網站 +conda.details.documentation_site=文件網站 +owner.settings.cargo.title=Cargo Registry 索引 +owner.settings.cargo.initialize=初始化索引 +owner.settings.cargo.initialize.description=使用 Cargo Registry 時需要一個特別的 Git 儲存庫作為索引。您可以在此使用必要的設定建立和重建它。 +owner.settings.cargo.initialize.error=初始化 Cargo 索引失敗: %v +owner.settings.cargo.initialize.success=成功建立了 Cargo 索引。 +owner.settings.cargo.rebuild=重建索引 +owner.settings.cargo.rebuild.description=如果索引和 Cargo 套件不同步，您可在此重建它。 +owner.settings.cargo.rebuild.error=重建 Cargo 索引失敗: %v +owner.settings.cargo.rebuild.success=成功重建了 Cargo 索引。 +owner.settings.cleanuprules.title=管理清理規則 +owner.settings.cleanuprules.add=加入清理規則 +owner.settings.cleanuprules.edit=編輯清理規則 +owner.settings.cleanuprules.none=沒有可用的清理規則。閱讀文件以了解更多。 +owner.settings.cleanuprules.preview=清理規則預覽 +owner.settings.cleanuprules.preview.overview=已排定要移除 %d 個套件。 +owner.settings.cleanuprules.preview.none=清理規則不符合任何套件。 +owner.settings.cleanuprules.enabled=已啟用 +owner.settings.cleanuprules.pattern_full_match=將比對規則套用到完整的套件名稱 +owner.settings.cleanuprules.keep.title=符合這些規則的版本即使符合下面的刪除規則也會被保留。 +owner.settings.cleanuprules.keep.count=保留最新的 +owner.settings.cleanuprules.keep.count.1=每個套件 1 個版本 +owner.settings.cleanuprules.keep.count.n=每個套件 %d 個版本 +owner.settings.cleanuprules.keep.pattern=保留版本的比對規則 +owner.settings.cleanuprules.keep.pattern.container=Container 套件的最新版本總是會保留。 +owner.settings.cleanuprules.remove.title=符合這些規則的版本將被移除，除非前述的規則要求保留它們。 +owner.settings.cleanuprules.remove.days=移除早於天數的版本 +owner.settings.cleanuprules.remove.pattern=移除版本的比對規則 +owner.settings.cleanuprules.success.update=已更新清理規則。 +owner.settings.cleanuprules.success.delete=已刪除清理規則。 +owner.settings.chef.title=Chef Registry +owner.settings.chef.keypair=產生密鑰組 +owner.settings.chef.keypair.description=產生用來認證 Chef Registry 的密鑰組，之前的密鑰未來將無法使用。 + +[aria] +navbar=導航列 +footer=頁尾 +footer.software=關於軟體 +footer.links=連結 + +[secrets] +secrets=Secret +description=Secret 會被傳給特定的 Action，其他情況無法讀取。 +none=還沒有 Secret。 +value=值 +name=名稱 +creation=加入 Secret +creation.name_placeholder=不區分大小寫，只能包含英文字母、數字、底線 ('_')，不能以 GITEA_ 或 GITHUB_ 開頭。 +creation.value_placeholder=輸入任何內容，頭尾的空白都會被忽略。 +creation.success=已加入 Secret「%s」。 +creation.failed=加入 Secret 失敗。 +deletion=移除 Secret +deletion.description=移除 Secret 是永久的且不可還原，是否繼續？ +deletion.success=已移除此 Secret。 +deletion.failed=移除 Secret 失敗。 + +[actions] +actions=Actions +unit.desc=管理 Actions +status.unknown=未知 +status.waiting=正在等候 +status.running=正在執行 +status.success=成功 +status.failure=失敗 +status.cancelled=已取消 +status.skipped=已略過 +status.blocked=已阻塞 +runners=Runner +runners.runner_manage_panel=Runner 管理 +runners.new=建立 Runner +runners.new_notice=如何啟動 Runner +runners.status=狀態 +runners.id=ID +runners.name=名稱 +runners.owner_type=類型 +runners.description=組織描述 +runners.labels=標籤 +runners.last_online=最後上線時間 +runners.agent_labels=代理程式標籤 +runners.custom_labels=自訂標籤 +runners.custom_labels_helper=自訂標籤是由管理員手動加上的標籤。標籤之間以半形逗號「,」分隔，標籤頭尾的空白將被忽略。 +runners.runner_title=Runner +runners.task_list=最近在此 Runner 上的任務 +runners.task_list.run=執行 +runners.task_list.status=狀態 +runners.task_list.repository=儲存庫 +runners.task_list.commit=提交 +runners.task_list.done_at=完成於 +runners.edit_runner=編輯 Runner +runners.update_runner=更新變更 +runners.update_runner_success=更新 Runner 成功 +runners.update_runner_failed=更新 Runner 失敗 +runners.delete_runner=刪除此 Runner +runners.delete_runner_success=刪除 Runner 成功 +runners.delete_runner_failed=刪除 Runner 失敗 +runners.delete_runner_header=確認刪除此 Runner +runners.delete_runner_notice=如果有任務正在此 Runner 上執行，它可能會被中止並標記為失敗，這可能會打斷建置工作流程。 +runners.none=沒有可用的 Runner +runners.status.unspecified=未知 +runners.status.idle=閒置 +runners.status.active=啟用 +runners.status.offline=離線 +runs.all_workflows=所有工作流程 +runs.open_tab=%d 開放中 +runs.closed_tab=%d 已關閉 +runs.commit=提交 +runs.pushed_by=推送者 From 484cb22f1418eba582ced23a9aa70cb93cb363cd Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 24 Mar 2023 14:43:02 -0400 Subject: [PATCH 126/340] Fix incorrect package doc link (#23679) (#23689) Backport #23679 by @yp05327 package doc link is changed in https://github.com/go-gitea/gitea/pull/23629 Co-authored-by: yp05327 <576951401@qq.com> --- options/locale/locale_en-US.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 8c281b213d71..ad7a675b7a8c 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -3140,7 +3140,7 @@ error.unit_not_allowed = You are not allowed to access this repository section. title = Packages desc = Manage repository packages. empty = There are no packages yet. -empty.documentation = For more information on the package registry, see the documentation. +empty.documentation = For more information on the package registry, see the documentation. empty.repo = Did you upload a package, but it's not shown here? Go to package settings and link it to this repo. filter.type = Type filter.type.all = All From 780f71c4caf5164a913e438920bd1c2ba5242453 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sat, 25 Mar 2023 04:18:27 +0800 Subject: [PATCH 127/340] Fix incorrect `show-modal` and `show-panel` class (#23660) (#23663) Backport #23660 That's incorrect code caused by Copy&Paste. `show-modal` / `show-panel` are used by JS to show something, but these links have `href`, they should navigate to new page. Close #23657 --- templates/repo/projects/view.tmpl | 2 +- templates/repo/settings/lfs.tmpl | 6 +++--- templates/repo/settings/lfs_file.tmpl | 2 +- templates/repo/settings/lfs_pointers.tmpl | 2 +- templates/user/settings/keys_gpg.tmpl | 2 +- templates/user/settings/keys_ssh.tmpl | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index 0c49c1d02579..4ec12bb0601e 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -8,7 +8,7 @@
    {{if and .CanWriteProjects (not .Repository.IsArchived)}} - {{.locale.Tr "repo.issues.new"}} + {{.locale.Tr "repo.issues.new"}} {{.locale.Tr "new_project_board"}} {{end}}
    + {{if eq .Status 3}} - {{svg "octicon-pin"}} + {{svg "octicon-pin" 16 "text blue"}} {{else if not $issue}} - {{svg "octicon-repo"}} + {{svg "octicon-repo" 16 "text grey"}} {{else if $issue.IsPull}} {{if $issue.IsClosed}} {{if $issue.GetPullRequest.HasMerged}} - {{svg "octicon-git-merge"}} + {{svg "octicon-git-merge" 16 "text purple"}} {{else}} - {{svg "octicon-git-pull-request"}} + {{svg "octicon-git-pull-request" 16 "text red"}} {{end}} {{else}} - {{svg "octicon-git-pull-request"}} + {{svg "octicon-git-pull-request" 16 "text green"}} {{end}} {{else}} {{if $issue.IsClosed}} - {{svg "octicon-issue-closed"}} + {{svg "octicon-issue-closed" 16 "text red"}} {{else}} - {{svg "octicon-issue-opened"}} + {{svg "octicon-issue-opened" 16 "text green"}} {{end}} {{end}}
    @@ -25,7 +25,7 @@ diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl index 2374b2a01e9e..d4f4ed500024 100644 --- a/templates/user/settings/keys_gpg.tmpl +++ b/templates/user/settings/keys_gpg.tmpl @@ -50,7 +50,7 @@ {{$.locale.Tr "settings.delete_key"}} {{if and (not .Verified) (ne $.VerifyingID .KeyID)}} - {{$.locale.Tr "settings.gpg_key_verify"}} + {{$.locale.Tr "settings.gpg_key_verify"}} {{end}}
    diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl index 691d288b057e..e9d58316a57a 100644 --- a/templates/user/settings/keys_ssh.tmpl +++ b/templates/user/settings/keys_ssh.tmpl @@ -42,7 +42,7 @@ {{$.locale.Tr "settings.delete_key"}} {{if and (not .Verified) (ne $.VerifyingFingerprint .Fingerprint)}} - {{$.locale.Tr "settings.ssh_key_verify"}} + {{$.locale.Tr "settings.ssh_key_verify"}} {{end}}
    From 1faa39b44c9d49e87a94c38c9bad0cde9fe816f8 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 24 Mar 2023 16:57:00 -0400 Subject: [PATCH 128/340] Drop migration for ForeignReference (#23605) (#23666) Backport #23605 by @wolfogre Fix https://github.com/go-gitea/gitea/issues/21086#issuecomment-1476560381 Related to #21721 Co-authored-by: Jason Song --- models/migrations/v1_17/v211.go | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/models/migrations/v1_17/v211.go b/models/migrations/v1_17/v211.go index 16ec51849366..9b72c8610b6e 100644 --- a/models/migrations/v1_17/v211.go +++ b/models/migrations/v1_17/v211.go @@ -4,22 +4,9 @@ package v1_17 //nolint import ( - "fmt" - "xorm.io/xorm" ) -func CreateForeignReferenceTable(x *xorm.Engine) error { - type ForeignReference struct { - // RepoID is the first column in all indices. now we only need 2 indices: (repo, local) and (repo, foreign, type) - RepoID int64 `xorm:"UNIQUE(repo_foreign_type) INDEX(repo_local)" ` - LocalIndex int64 `xorm:"INDEX(repo_local)"` // the resource key inside Gitea, it can be IssueIndex, or some model ID. - ForeignIndex string `xorm:"INDEX UNIQUE(repo_foreign_type)"` - Type string `xorm:"VARCHAR(16) INDEX UNIQUE(repo_foreign_type)"` - } - - if err := x.Sync2(new(ForeignReference)); err != nil { - return fmt.Errorf("Sync2: %w", err) - } - return nil +func CreateForeignReferenceTable(_ *xorm.Engine) error { + return nil // This table was dropped in v1_19/v237.go } From a9b4aa4cc41c8e6e69fbb0273c82ce86682ead1d Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 24 Mar 2023 17:40:24 -0400 Subject: [PATCH 129/340] Create commit status when event is `pull_request_sync` (#23683) (#23691) Backport #23683 by @sillyguodong Fix: #23674 If the type of `hook_event` is `pull_request_sync`, also need to insert a record of `commit_status` into DB. Because `pull_request` event and `pull_request_sync` event have the same payload, so the code is reusable. Screenshot: ![image](https://user-images.githubusercontent.com/33891828/227465436-1b436807-d0b2-4a2b-8890-09d96c7f666d.png) Co-authored-by: sillyguodong <33891828+sillyguodong@users.noreply.github.com> --- models/actions/run.go | 2 +- services/actions/commit_status.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/models/actions/run.go b/models/actions/run.go index 7d5b7a5d50b6..5f0f19074243 100644 --- a/models/actions/run.go +++ b/models/actions/run.go @@ -127,7 +127,7 @@ func (run *ActionRun) GetPushEventPayload() (*api.PushPayload, error) { } func (run *ActionRun) GetPullRequestEventPayload() (*api.PullRequestPayload, error) { - if run.Event == webhook_module.HookEventPullRequest { + if run.Event == webhook_module.HookEventPullRequest || run.Event == webhook_module.HookEventPullRequestSync { var payload api.PullRequestPayload if err := json.Unmarshal([]byte(run.EventPayload), &payload); err != nil { return nil, err diff --git a/services/actions/commit_status.go b/services/actions/commit_status.go index 84de106eeca3..6604a149a5c9 100644 --- a/services/actions/commit_status.go +++ b/services/actions/commit_status.go @@ -45,7 +45,7 @@ func CreateCommitStatus(ctx context.Context, job *actions_model.ActionRunJob) er sha = payload.HeadCommit.ID creatorID = payload.Pusher.ID - case webhook_module.HookEventPullRequest: + case webhook_module.HookEventPullRequest, webhook_module.HookEventPullRequestSync: payload, err := run.GetPullRequestEventPayload() if err != nil { return fmt.Errorf("GetPullRequestEventPayload: %w", err) From 6705b215db4526c7c68c20d5e13c7d91c8dc4fba Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 24 Mar 2023 20:56:15 -0400 Subject: [PATCH 130/340] Fix incorrect `HookEventType` of pull request review comments (#23650) (#23678) Backport #23650 by @Zettat123 `HookEventType` of pull request review comments should be `HookEventPullRequestReviewComment` but some event types are `HookEventPullRequestComment` now. Co-authored-by: Zettat123 --- services/actions/notifier.go | 2 +- services/webhook/discord.go | 4 ++-- services/webhook/msteams.go | 2 +- services/webhook/notifier.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/services/actions/notifier.go b/services/actions/notifier.go index cdf9087fef16..90eed83eff5e 100644 --- a/services/actions/notifier.go +++ b/services/actions/notifier.go @@ -264,7 +264,7 @@ func (n *actionsNotifier) NotifyPullRequestReview(ctx context.Context, pr *issue case issues_model.ReviewTypeApprove: reviewHookType = webhook_module.HookEventPullRequestReviewApproved case issues_model.ReviewTypeComment: - reviewHookType = webhook_module.HookEventPullRequestComment + reviewHookType = webhook_module.HookEventPullRequestReviewComment case issues_model.ReviewTypeReject: reviewHookType = webhook_module.HookEventPullRequestReviewRejected default: diff --git a/services/webhook/discord.go b/services/webhook/discord.go index 014d409ce732..02f0fb872053 100644 --- a/services/webhook/discord.go +++ b/services/webhook/discord.go @@ -209,7 +209,7 @@ func (d *DiscordPayload) Review(p *api.PullRequestPayload, event webhook_module. color = greenColor case webhook_module.HookEventPullRequestReviewRejected: color = redColor - case webhook_module.HookEventPullRequestComment: + case webhook_module.HookEventPullRequestReviewComment: color = greyColor default: color = yellowColor @@ -277,7 +277,7 @@ func parseHookPullRequestEventType(event webhook_module.HookEventType) (string, return "approved", nil case webhook_module.HookEventPullRequestReviewRejected: return "rejected", nil - case webhook_module.HookEventPullRequestComment: + case webhook_module.HookEventPullRequestReviewComment: return "comment", nil default: diff --git a/services/webhook/msteams.go b/services/webhook/msteams.go index 03d92821b9eb..60ef334ded9a 100644 --- a/services/webhook/msteams.go +++ b/services/webhook/msteams.go @@ -223,7 +223,7 @@ func (m *MSTeamsPayload) Review(p *api.PullRequestPayload, event webhook_module. color = greenColor case webhook_module.HookEventPullRequestReviewRejected: color = redColor - case webhook_module.HookEventPullRequestComment: + case webhook_module.HookEventPullRequestReviewComment: color = greyColor default: color = yellowColor diff --git a/services/webhook/notifier.go b/services/webhook/notifier.go index b023717cd258..1f7cb8d988a3 100644 --- a/services/webhook/notifier.go +++ b/services/webhook/notifier.go @@ -685,7 +685,7 @@ func (m *webhookNotifier) NotifyPullRequestReview(ctx context.Context, pr *issue case issues_model.ReviewTypeApprove: reviewHookType = webhook_module.HookEventPullRequestReviewApproved case issues_model.ReviewTypeComment: - reviewHookType = webhook_module.HookEventPullRequestComment + reviewHookType = webhook_module.HookEventPullRequestReviewComment case issues_model.ReviewTypeReject: reviewHookType = webhook_module.HookEventPullRequestReviewRejected default: From 305cac291d114f9f0fa82b6e31ef645cf13f3f0c Mon Sep 17 00:00:00 2001 From: Giteabot Date: Sat, 25 Mar 2023 19:21:40 -0400 Subject: [PATCH 131/340] Remove row clicking from notification table (#22695) (#23706) Backport #22695 by @jolheiser Resolves #22692 Signed-off-by: jolheiser Co-authored-by: John Olheiser Co-authored-by: wxiaoguang --- .../user/notification/notification_div.tmpl | 6 ++-- web_src/css/user.css | 33 ++++++++----------- web_src/js/features/common-global.js | 15 --------- 3 files changed, 17 insertions(+), 37 deletions(-) diff --git a/templates/user/notification/notification_div.tmpl b/templates/user/notification/notification_div.tmpl index 9a4fbe786eab..101e4d24e46b 100644 --- a/templates/user/notification/notification_div.tmpl +++ b/templates/user/notification/notification_div.tmpl @@ -35,7 +35,7 @@ {{$issue := .Issue}} {{$repo := .Repository}}     - - - and or - {{else}} {{$inlineDiff := $.section.GetComputedInlineDiffFor $line $.locale}} - - + + + + + + + + + {{range $j, $section := $file.Sections}} {{range $k, $line := $section.Lines}} {{$hasmatch := ne $line.Match -1}} @@ -33,7 +43,7 @@ - - - - - - - - - - - - - - - - + + + + + + {{range $j, $section := $file.Sections}} {{range $k, $line := $section.Lines}} @@ -49,7 +56,6 @@ {{if gt (len $line.Comments) 0}} - diff --git a/templates/repo/settings/lfs_file.tmpl b/templates/repo/settings/lfs_file.tmpl index 7a1e3e9421c0..2ad3458501c3 100644 --- a/templates/repo/settings/lfs_file.tmpl +++ b/templates/repo/settings/lfs_file.tmpl @@ -48,7 +48,7 @@ {{else}} - + {{end}} diff --git a/web_src/css/repository.css b/web_src/css/repository.css index e84e80b679a3..4bb49dc439c9 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -1801,8 +1801,14 @@ padding: 0 !important; } -.repository .diff-file-box .code-diff tbody tr td.halfwidth { - width: 49%; /* halfwidth is used in split view - and in that case, 1% of each */ +.repository .diff-file-box .code-diff table { + table-layout: fixed; +} + +.repository .diff-file-box .code-diff tbody tr td.lines-num, +.repository .diff-file-box .code-diff tbody tr td.lines-escape, +.repository .diff-file-box .code-diff tbody tr td.lines-type-marker { + white-space: nowrap; } .repository .diff-file-box .code-diff tbody tr td.center { diff --git a/web_src/css/review.css b/web_src/css/review.css index 05456c381bc1..7e628a9dfc29 100644 --- a/web_src/css/review.css +++ b/web_src/css/review.css @@ -53,12 +53,6 @@ margin-bottom: 0.5em; } -.add-comment .lines-num, -.add-comment .lines-escape, -.add-comment .lines-type-marker { - display: none; -} - .show-outdated:hover, .hide-outdated:hover { text-decoration: underline; diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index 7265873b1b02..8305038eacef 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -548,18 +548,9 @@ export function initRepoPullRequestReview() { ntr = $(` ${isSplit ? ` - - - - - - ` : ` - - - `} `); From 1a8da2e08f05d4f953ed50ffdb16d34eea45e438 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 4 Apr 2023 23:27:38 +0800 Subject: [PATCH 171/340] Update docs markdown file weight to make it clear (#23909) (#23921) backport #23909 --- docs/content/doc/administration/adding-legal-pages.en-us.md | 2 +- docs/content/doc/administration/cmd-embedded.en-us.md | 2 +- docs/content/doc/administration/command-line.en-us.md | 2 +- docs/content/doc/administration/config-cheat-sheet.en-us.md | 2 +- docs/content/doc/administration/config-cheat-sheet.zh-cn.md | 2 +- docs/content/doc/administration/customizing-gitea.en-us.md | 2 +- docs/content/doc/administration/customizing-gitea.zh-cn.md | 2 +- .../content/doc/administration/environment-variables.en-us.md | 2 +- .../content/doc/administration/environment-variables.zh-cn.md | 2 +- docs/content/doc/administration/external-renderers.en-us.md | 2 +- .../content/doc/administration/logging-documentation.en-us.md | 2 +- docs/content/doc/administration/reverse-proxies.en-us.md | 2 +- docs/content/doc/administration/reverse-proxies.zh-cn.md | 2 +- .../doc/administration/search-engines-indexation.en-us.md | 2 +- docs/content/doc/administration/signing.en-us.md | 2 +- docs/content/doc/contributing/localization.zh-cn.md | 2 +- docs/content/doc/contributing/localization.zh-tw.md | 2 +- docs/content/doc/contributing/translation.de-de.md | 2 +- docs/content/doc/contributing/translation.en-us.md | 2 +- docs/content/doc/development/integrations.en-us.md | 2 +- docs/content/doc/development/integrations.zh-tw.md | 2 +- docs/content/doc/development/migrations.en-us.md | 2 +- docs/content/doc/development/migrations.zh-tw.md | 2 +- docs/content/doc/help/search.de-de.md | 4 ++-- docs/content/doc/help/search.en-us.md | 4 ++-- docs/content/doc/help/search.fr-fr.md | 4 ++-- docs/content/doc/help/search.nl-nl.md | 4 ++-- docs/content/doc/help/search.pt-br.md | 4 ++-- docs/content/doc/help/search.zh-cn.md | 4 ++-- docs/content/doc/help/search.zh-tw.md | 4 ++-- docs/content/doc/help/seek-help.en-us.md | 2 +- docs/content/doc/help/seek-help.zh-cn.md | 2 +- docs/content/doc/help/seek-help.zh-tw.md | 2 +- docs/content/doc/installation/database-preparation.en-us.md | 2 +- docs/content/doc/installation/from-binary.en-us.md | 4 ++-- docs/content/doc/installation/from-binary.fr-fr.md | 4 ++-- docs/content/doc/installation/from-binary.zh-cn.md | 4 ++-- docs/content/doc/installation/from-binary.zh-tw.md | 4 ++-- docs/content/doc/installation/from-package.fr-fr.md | 2 +- docs/content/doc/installation/from-package.zh-cn.md | 2 +- docs/content/doc/installation/from-package.zh-tw.md | 2 +- docs/content/doc/installation/from-source.en-us.md | 2 +- docs/content/doc/installation/from-source.fr-fr.md | 2 +- docs/content/doc/installation/from-source.zh-cn.md | 2 +- docs/content/doc/installation/from-source.zh-tw.md | 2 +- docs/content/doc/installation/on-cloud-provider.en-us.md | 4 ++-- docs/content/doc/installation/on-kubernetes.en-us.md | 4 ++-- docs/content/doc/installation/on-kubernetes.zh-cn.md | 4 ++-- docs/content/doc/installation/on-kubernetes.zh-tw.md | 4 ++-- .../doc/installation/run-as-service-in-ubuntu.en-us.md | 4 ++-- .../doc/installation/run-as-service-in-ubuntu.zh-cn.md | 4 ++-- .../doc/installation/run-as-service-in-ubuntu.zh-tw.md | 4 ++-- docs/content/doc/installation/upgrade-from-gitea.en-us.md | 2 +- docs/content/doc/installation/upgrade-from-gogs.en-us.md | 2 +- docs/content/doc/installation/upgrade-from-gogs.fr-fr.md | 2 +- docs/content/doc/installation/upgrade-from-gogs.zh-cn.md | 2 +- docs/content/doc/installation/upgrade-from-gogs.zh-tw.md | 2 +- docs/content/doc/installation/windows-service.en-us.md | 4 ++-- docs/content/doc/installation/windows-service.fr-fr.md | 4 ++-- docs/content/doc/installation/windows-service.zh-cn.md | 4 ++-- docs/content/doc/installation/windows-service.zh-tw.md | 4 ++-- docs/content/doc/installation/with-docker-rootless.en-us.md | 4 ++-- docs/content/doc/installation/with-docker.en-us.md | 4 ++-- docs/content/doc/installation/with-docker.fr-fr.md | 4 ++-- docs/content/doc/installation/with-docker.zh-cn.md | 4 ++-- docs/content/doc/installation/with-docker.zh-tw.md | 4 ++-- docs/content/doc/packages/cargo.en-us.md | 1 + docs/content/doc/packages/chef.en-us.md | 1 + docs/content/doc/packages/composer.en-us.md | 1 + docs/content/doc/packages/conan.en-us.md | 1 + docs/content/doc/packages/conda.en-us.md | 1 + docs/content/doc/packages/container.en-us.md | 1 + docs/content/doc/packages/generic.en-us.md | 1 + docs/content/doc/packages/helm.en-us.md | 1 + docs/content/doc/packages/maven.en-us.md | 1 + docs/content/doc/packages/npm.en-us.md | 1 + docs/content/doc/packages/nuget.en-us.md | 1 + docs/content/doc/packages/overview.en-us.md | 1 + docs/content/doc/packages/pub.en-us.md | 1 + docs/content/doc/packages/pypi.en-us.md | 1 + docs/content/doc/packages/rubygems.en-us.md | 1 + docs/content/doc/packages/storage.en-us.md | 1 + docs/content/doc/packages/vagrant.en-us.md | 1 + docs/content/doc/usage/incoming-email.en-us.md | 1 + docs/content/doc/usage/secrets.en-us.md | 3 ++- docs/content/doc/usage/webhooks.en-us.md | 2 +- docs/content/doc/usage/webhooks.zh-cn.md | 2 +- docs/content/doc/usage/webhooks.zh-tw.md | 2 +- 88 files changed, 116 insertions(+), 97 deletions(-) diff --git a/docs/content/doc/administration/adding-legal-pages.en-us.md b/docs/content/doc/administration/adding-legal-pages.en-us.md index 9ba8c4fd81c6..48aa21154ce5 100644 --- a/docs/content/doc/administration/adding-legal-pages.en-us.md +++ b/docs/content/doc/administration/adding-legal-pages.en-us.md @@ -2,7 +2,7 @@ date: "2019-12-28" title: "Adding Legal Pages" slug: adding-legal-pages -weight: 9 +weight: 110 toc: false draft: false menu: diff --git a/docs/content/doc/administration/cmd-embedded.en-us.md b/docs/content/doc/administration/cmd-embedded.en-us.md index cad0de9787fe..229a1c01d6d9 100644 --- a/docs/content/doc/administration/cmd-embedded.en-us.md +++ b/docs/content/doc/administration/cmd-embedded.en-us.md @@ -2,7 +2,7 @@ date: "2020-01-25T21:00:00-03:00" title: "Embedded data extraction tool" slug: "cmd-embedded" -weight: 40 +weight: 20 toc: false draft: false menu: diff --git a/docs/content/doc/administration/command-line.en-us.md b/docs/content/doc/administration/command-line.en-us.md index 3dfad62f3d88..20b788510d26 100644 --- a/docs/content/doc/administration/command-line.en-us.md +++ b/docs/content/doc/administration/command-line.en-us.md @@ -2,7 +2,7 @@ date: "2017-01-01T16:00:00+02:00" title: "Usage: Command Line" slug: "command-line" -weight: 10 +weight: 1 toc: false draft: false menu: diff --git a/docs/content/doc/administration/config-cheat-sheet.en-us.md b/docs/content/doc/administration/config-cheat-sheet.en-us.md index b9d550124a32..0b45c7e7c267 100644 --- a/docs/content/doc/administration/config-cheat-sheet.en-us.md +++ b/docs/content/doc/administration/config-cheat-sheet.en-us.md @@ -2,7 +2,7 @@ date: "2016-12-26T16:00:00+02:00" title: "Config Cheat Sheet" slug: "config-cheat-sheet" -weight: 20 +weight: 30 toc: false draft: false menu: diff --git a/docs/content/doc/administration/config-cheat-sheet.zh-cn.md b/docs/content/doc/administration/config-cheat-sheet.zh-cn.md index 2fc5a149ae4f..df8a7b1f5801 100644 --- a/docs/content/doc/administration/config-cheat-sheet.zh-cn.md +++ b/docs/content/doc/administration/config-cheat-sheet.zh-cn.md @@ -2,7 +2,7 @@ date: "2016-12-26T16:00:00+02:00" title: "配置说明" slug: "config-cheat-sheet" -weight: 20 +weight: 30 toc: false draft: false menu: diff --git a/docs/content/doc/administration/customizing-gitea.en-us.md b/docs/content/doc/administration/customizing-gitea.en-us.md index 9a4c5639a3c3..db31dc949b7d 100644 --- a/docs/content/doc/administration/customizing-gitea.en-us.md +++ b/docs/content/doc/administration/customizing-gitea.en-us.md @@ -2,7 +2,7 @@ date: "2017-04-15T14:56:00+02:00" title: "Customizing Gitea" slug: "customizing-gitea" -weight: 9 +weight: 100 toc: false draft: false menu: diff --git a/docs/content/doc/administration/customizing-gitea.zh-cn.md b/docs/content/doc/administration/customizing-gitea.zh-cn.md index 200f958245ce..38729153f50a 100644 --- a/docs/content/doc/administration/customizing-gitea.zh-cn.md +++ b/docs/content/doc/administration/customizing-gitea.zh-cn.md @@ -2,7 +2,7 @@ date: "2017-04-15T14:56:00+02:00" title: "自定义 Gitea 配置" slug: "customizing-gitea" -weight: 9 +weight: 100 toc: false draft: false menu: diff --git a/docs/content/doc/administration/environment-variables.en-us.md b/docs/content/doc/administration/environment-variables.en-us.md index 17a02501644e..83ff6f359aa2 100644 --- a/docs/content/doc/administration/environment-variables.en-us.md +++ b/docs/content/doc/administration/environment-variables.en-us.md @@ -2,7 +2,7 @@ date: "2017-04-08T11:34:00+02:00" title: "Environment variables" slug: "environment-variables" -weight: 20 +weight: 10 toc: false draft: false menu: diff --git a/docs/content/doc/administration/environment-variables.zh-cn.md b/docs/content/doc/administration/environment-variables.zh-cn.md index c8a8fcba7188..e1488385811c 100644 --- a/docs/content/doc/administration/environment-variables.zh-cn.md +++ b/docs/content/doc/administration/environment-variables.zh-cn.md @@ -2,7 +2,7 @@ date: "2017-04-08T11:34:00+02:00" title: "环境变量清单" slug: "environment-variables" -weight: 20 +weight: 10 toc: false draft: false menu: diff --git a/docs/content/doc/administration/external-renderers.en-us.md b/docs/content/doc/administration/external-renderers.en-us.md index da2f493c71a6..a62c20e32677 100644 --- a/docs/content/doc/administration/external-renderers.en-us.md +++ b/docs/content/doc/administration/external-renderers.en-us.md @@ -2,7 +2,7 @@ date: "2018-11-23:00:00+02:00" title: "External renderers" slug: "external-renderers" -weight: 40 +weight: 60 toc: false draft: false menu: diff --git a/docs/content/doc/administration/logging-documentation.en-us.md b/docs/content/doc/administration/logging-documentation.en-us.md index 8d49ff3f14ef..08e7c9b15c7a 100644 --- a/docs/content/doc/administration/logging-documentation.en-us.md +++ b/docs/content/doc/administration/logging-documentation.en-us.md @@ -2,7 +2,7 @@ date: "2019-04-02T17:06:00+01:00" title: "Advanced: Logging Configuration" slug: "logging-configuration" -weight: 55 +weight: 40 toc: false draft: false menu: diff --git a/docs/content/doc/administration/reverse-proxies.en-us.md b/docs/content/doc/administration/reverse-proxies.en-us.md index 10d93a7a4ec3..70ca85ddc4fe 100644 --- a/docs/content/doc/administration/reverse-proxies.en-us.md +++ b/docs/content/doc/administration/reverse-proxies.en-us.md @@ -2,7 +2,7 @@ date: "2018-05-22T11:00:00+00:00" title: "Usage: Reverse Proxies" slug: "reverse-proxies" -weight: 17 +weight: 16 toc: false draft: false menu: diff --git a/docs/content/doc/administration/reverse-proxies.zh-cn.md b/docs/content/doc/administration/reverse-proxies.zh-cn.md index 1355d09e8a6f..e622773df1bd 100644 --- a/docs/content/doc/administration/reverse-proxies.zh-cn.md +++ b/docs/content/doc/administration/reverse-proxies.zh-cn.md @@ -2,7 +2,7 @@ date: "2018-05-22T11:00:00+00:00" title: "使用：反向代理" slug: "reverse-proxies" -weight: 17 +weight: 16 toc: false draft: false menu: diff --git a/docs/content/doc/administration/search-engines-indexation.en-us.md b/docs/content/doc/administration/search-engines-indexation.en-us.md index cabedb3a5d4f..4452fd77f6d1 100644 --- a/docs/content/doc/administration/search-engines-indexation.en-us.md +++ b/docs/content/doc/administration/search-engines-indexation.en-us.md @@ -2,7 +2,7 @@ date: "2019-12-31T13:55:00+05:00" title: "Advanced: Search Engines Indexation" slug: "search-engines-indexation" -weight: 30 +weight: 60 toc: false draft: false menu: diff --git a/docs/content/doc/administration/signing.en-us.md b/docs/content/doc/administration/signing.en-us.md index 8dd4ffdfb709..34580ab42828 100644 --- a/docs/content/doc/administration/signing.en-us.md +++ b/docs/content/doc/administration/signing.en-us.md @@ -2,7 +2,7 @@ date: "2019-08-17T10:20:00+01:00" title: "GPG Commit Signatures" slug: "signing" -weight: 20 +weight: 50 toc: false draft: false menu: diff --git a/docs/content/doc/contributing/localization.zh-cn.md b/docs/content/doc/contributing/localization.zh-cn.md index 3ce518e1a403..d6c7fc11c2ce 100644 --- a/docs/content/doc/contributing/localization.zh-cn.md +++ b/docs/content/doc/contributing/localization.zh-cn.md @@ -2,7 +2,7 @@ date: "2016-12-01T16:00:00+02:00" title: "本地化" slug: "localization" -weight: 10 +weight: 20 toc: false draft: false menu: diff --git a/docs/content/doc/contributing/localization.zh-tw.md b/docs/content/doc/contributing/localization.zh-tw.md index 562aa4ecaf1e..815fbc311912 100644 --- a/docs/content/doc/contributing/localization.zh-tw.md +++ b/docs/content/doc/contributing/localization.zh-tw.md @@ -2,7 +2,7 @@ date: "2016-12-01T16:00:00+02:00" title: "在地化" slug: "localization" -weight: 10 +weight: 20 toc: false draft: false menu: diff --git a/docs/content/doc/contributing/translation.de-de.md b/docs/content/doc/contributing/translation.de-de.md index 16cb2679311c..abfc46e9fd2f 100644 --- a/docs/content/doc/contributing/translation.de-de.md +++ b/docs/content/doc/contributing/translation.de-de.md @@ -1,7 +1,7 @@ --- date: "2021-01-22T00:00:00+02:00" title: "Übersetzungs Richtlinien" -weight: 10 +weight: 70 toc: true draft: false menu: diff --git a/docs/content/doc/contributing/translation.en-us.md b/docs/content/doc/contributing/translation.en-us.md index 23ff18a5b21a..6459bcbcf499 100644 --- a/docs/content/doc/contributing/translation.en-us.md +++ b/docs/content/doc/contributing/translation.en-us.md @@ -1,7 +1,7 @@ --- date: "2021-01-22T00:00:00+02:00" title: "Translation Guidelines" -weight: 10 +weight: 70 toc: true draft: false menu: diff --git a/docs/content/doc/development/integrations.en-us.md b/docs/content/doc/development/integrations.en-us.md index c6321e2d07da..dae557c9b8a7 100644 --- a/docs/content/doc/development/integrations.en-us.md +++ b/docs/content/doc/development/integrations.en-us.md @@ -2,7 +2,7 @@ date: "2019-04-15T17:29:00+08:00" title: "Integrations" slug: "integrations" -weight: 40 +weight: 65 toc: false draft: false menu: diff --git a/docs/content/doc/development/integrations.zh-tw.md b/docs/content/doc/development/integrations.zh-tw.md index eb828592b41a..fdc210399089 100644 --- a/docs/content/doc/development/integrations.zh-tw.md +++ b/docs/content/doc/development/integrations.zh-tw.md @@ -2,7 +2,7 @@ date: "2019-04-15T17:29:00+08:00" title: "整合" slug: "integrations" -weight: 40 +weight: 65 toc: false draft: false menu: diff --git a/docs/content/doc/development/migrations.en-us.md b/docs/content/doc/development/migrations.en-us.md index 8647bdbc4bce..1d9103254b29 100644 --- a/docs/content/doc/development/migrations.en-us.md +++ b/docs/content/doc/development/migrations.en-us.md @@ -2,7 +2,7 @@ date: "2019-04-15T17:29:00+08:00" title: "Migrations Interfaces" slug: "migrations-interfaces" -weight: 30 +weight: 55 toc: false draft: false menu: diff --git a/docs/content/doc/development/migrations.zh-tw.md b/docs/content/doc/development/migrations.zh-tw.md index 09af350d3527..bf995598f5fe 100644 --- a/docs/content/doc/development/migrations.zh-tw.md +++ b/docs/content/doc/development/migrations.zh-tw.md @@ -2,7 +2,7 @@ date: "2019-04-15T17:29:00+08:00" title: "遷移介面" slug: "migrations-interfaces" -weight: 30 +weight: 55 toc: false draft: false menu: diff --git a/docs/content/doc/help/search.de-de.md b/docs/content/doc/help/search.de-de.md index cfacfe737e0f..d22e9c1b2e6a 100644 --- a/docs/content/doc/help/search.de-de.md +++ b/docs/content/doc/help/search.de-de.md @@ -2,11 +2,11 @@ date: "2019-11-12T16:00:00+02:00" title: "Search" slug: "search" -weight: 4 +weight: 1 toc: false draft: false sitemap: - priority : 0.1 + priority : 1 layout: "search" --- diff --git a/docs/content/doc/help/search.en-us.md b/docs/content/doc/help/search.en-us.md index cfacfe737e0f..d22e9c1b2e6a 100644 --- a/docs/content/doc/help/search.en-us.md +++ b/docs/content/doc/help/search.en-us.md @@ -2,11 +2,11 @@ date: "2019-11-12T16:00:00+02:00" title: "Search" slug: "search" -weight: 4 +weight: 1 toc: false draft: false sitemap: - priority : 0.1 + priority : 1 layout: "search" --- diff --git a/docs/content/doc/help/search.fr-fr.md b/docs/content/doc/help/search.fr-fr.md index bfcd6f3c440a..421f7830b2aa 100644 --- a/docs/content/doc/help/search.fr-fr.md +++ b/docs/content/doc/help/search.fr-fr.md @@ -2,11 +2,11 @@ date: "2019-11-12T16:00:00+02:00" title: "Chercher" slug: "search" -weight: 4 +weight: 1 toc: false draft: false sitemap: - priority : 0.1 + priority : 1 layout: "search" --- diff --git a/docs/content/doc/help/search.nl-nl.md b/docs/content/doc/help/search.nl-nl.md index cfacfe737e0f..d22e9c1b2e6a 100644 --- a/docs/content/doc/help/search.nl-nl.md +++ b/docs/content/doc/help/search.nl-nl.md @@ -2,11 +2,11 @@ date: "2019-11-12T16:00:00+02:00" title: "Search" slug: "search" -weight: 4 +weight: 1 toc: false draft: false sitemap: - priority : 0.1 + priority : 1 layout: "search" --- diff --git a/docs/content/doc/help/search.pt-br.md b/docs/content/doc/help/search.pt-br.md index cfacfe737e0f..d22e9c1b2e6a 100644 --- a/docs/content/doc/help/search.pt-br.md +++ b/docs/content/doc/help/search.pt-br.md @@ -2,11 +2,11 @@ date: "2019-11-12T16:00:00+02:00" title: "Search" slug: "search" -weight: 4 +weight: 1 toc: false draft: false sitemap: - priority : 0.1 + priority : 1 layout: "search" --- diff --git a/docs/content/doc/help/search.zh-cn.md b/docs/content/doc/help/search.zh-cn.md index f6243d1e8f47..778df0d47d55 100644 --- a/docs/content/doc/help/search.zh-cn.md +++ b/docs/content/doc/help/search.zh-cn.md @@ -2,11 +2,11 @@ date: "2019-11-12T16:00:00+02:00" title: "搜索" slug: "search" -weight: 4 +weight: 1 toc: false draft: false sitemap: - priority : 0.1 + priority : 1 layout: "search" --- diff --git a/docs/content/doc/help/search.zh-tw.md b/docs/content/doc/help/search.zh-tw.md index 335f95571372..8f2ce17ec682 100644 --- a/docs/content/doc/help/search.zh-tw.md +++ b/docs/content/doc/help/search.zh-tw.md @@ -2,11 +2,11 @@ date: "2019-11-12T16:00:00+02:00" title: "搜尋" slug: "search" -weight: 4 +weight: 1 toc: false draft: false sitemap: - priority : 0.1 + priority : 1 layout: "search" --- diff --git a/docs/content/doc/help/seek-help.en-us.md b/docs/content/doc/help/seek-help.en-us.md index fe47481600a6..0e56b9a57554 100644 --- a/docs/content/doc/help/seek-help.en-us.md +++ b/docs/content/doc/help/seek-help.en-us.md @@ -2,7 +2,7 @@ date: "2018-05-21T15:00:00+00:00" title: "Support Options" slug: "seek-help" -weight: 10 +weight: 20 toc: false draft: false menu: diff --git a/docs/content/doc/help/seek-help.zh-cn.md b/docs/content/doc/help/seek-help.zh-cn.md index b1b93304308e..80febad24863 100644 --- a/docs/content/doc/help/seek-help.zh-cn.md +++ b/docs/content/doc/help/seek-help.zh-cn.md @@ -2,7 +2,7 @@ date: "2017-01-20T15:00:00+08:00" title: "需要帮助" slug: "seek-help" -weight: 10 +weight: 20 toc: false draft: false menu: diff --git a/docs/content/doc/help/seek-help.zh-tw.md b/docs/content/doc/help/seek-help.zh-tw.md index f9107a026b1b..f87dad547aa8 100644 --- a/docs/content/doc/help/seek-help.zh-tw.md +++ b/docs/content/doc/help/seek-help.zh-tw.md @@ -2,7 +2,7 @@ date: "2018-05-21T15:00:00+00:00" title: "取得協助" slug: "seek-help" -weight: 10 +weight: 20 toc: false draft: false menu: diff --git a/docs/content/doc/installation/database-preparation.en-us.md b/docs/content/doc/installation/database-preparation.en-us.md index e8ab02caa9ae..1b86df978ab2 100644 --- a/docs/content/doc/installation/database-preparation.en-us.md +++ b/docs/content/doc/installation/database-preparation.en-us.md @@ -9,7 +9,7 @@ menu: sidebar: parent: "installation" name: "Database preparation" - weight: 5 + weight: 10 identifier: "database-prep" --- diff --git a/docs/content/doc/installation/from-binary.en-us.md b/docs/content/doc/installation/from-binary.en-us.md index fc17373ea5c8..ce1d7e5a2c25 100644 --- a/docs/content/doc/installation/from-binary.en-us.md +++ b/docs/content/doc/installation/from-binary.en-us.md @@ -2,14 +2,14 @@ date: "2017-06-19T12:00:00+02:00" title: "Installation from binary" slug: "install-from-binary" -weight: 10 +weight: 15 toc: false draft: false menu: sidebar: parent: "installation" name: "From binary" - weight: 20 + weight: 15 identifier: "install-from-binary" --- diff --git a/docs/content/doc/installation/from-binary.fr-fr.md b/docs/content/doc/installation/from-binary.fr-fr.md index b923814840a5..7dfbe7dd5f08 100644 --- a/docs/content/doc/installation/from-binary.fr-fr.md +++ b/docs/content/doc/installation/from-binary.fr-fr.md @@ -2,14 +2,14 @@ date: "2017-08-23T09:00:00+02:00" title: "Installation avec le binaire pré-compilé" slug: "install-from-binary" -weight: 10 +weight: 15 toc: false draft: false menu: sidebar: parent: "installation" name: "Binaire pré-compilé" - weight: 20 + weight: 15 identifier: "install-from-binary" --- diff --git a/docs/content/doc/installation/from-binary.zh-cn.md b/docs/content/doc/installation/from-binary.zh-cn.md index ad14c2d6251d..55cf6c1da2c1 100644 --- a/docs/content/doc/installation/from-binary.zh-cn.md +++ b/docs/content/doc/installation/from-binary.zh-cn.md @@ -2,14 +2,14 @@ date: "2016-12-01T16:00:00+02:00" title: "从二进制安装" slug: "install-from-binary" -weight: 10 +weight: 15 toc: false draft: false menu: sidebar: parent: "installation" name: "从二进制安装" - weight: 20 + weight: 15 identifier: "install-from-binary" --- diff --git a/docs/content/doc/installation/from-binary.zh-tw.md b/docs/content/doc/installation/from-binary.zh-tw.md index 48c764fa5243..3991b101ae1b 100644 --- a/docs/content/doc/installation/from-binary.zh-tw.md +++ b/docs/content/doc/installation/from-binary.zh-tw.md @@ -2,14 +2,14 @@ date: "2016-12-01T16:00:00+02:00" title: "執行檔安裝" slug: "install-from-binary" -weight: 10 +weight: 15 toc: false draft: false menu: sidebar: parent: "installation" name: "執行檔" - weight: 20 + weight: 15 identifier: "install-from-binary" --- diff --git a/docs/content/doc/installation/from-package.fr-fr.md b/docs/content/doc/installation/from-package.fr-fr.md index 130dd261642b..eff74c31e53b 100644 --- a/docs/content/doc/installation/from-package.fr-fr.md +++ b/docs/content/doc/installation/from-package.fr-fr.md @@ -2,7 +2,7 @@ date: "2016-12-01T16:00:00+02:00" title: "Installation depuis le gestionnaire de paquets" slug: "install-from-package" -weight: 10 +weight: 20 toc: false draft: false menu: diff --git a/docs/content/doc/installation/from-package.zh-cn.md b/docs/content/doc/installation/from-package.zh-cn.md index dd56ebdaa2d5..93d3c125d583 100644 --- a/docs/content/doc/installation/from-package.zh-cn.md +++ b/docs/content/doc/installation/from-package.zh-cn.md @@ -2,7 +2,7 @@ date: "2016-12-01T16:00:00+02:00" title: "使用包管理器安装" slug: "install-from-package" -weight: 10 +weight: 20 toc: false draft: false menu: diff --git a/docs/content/doc/installation/from-package.zh-tw.md b/docs/content/doc/installation/from-package.zh-tw.md index 5b4e4c9f9777..1616ba6655e3 100644 --- a/docs/content/doc/installation/from-package.zh-tw.md +++ b/docs/content/doc/installation/from-package.zh-tw.md @@ -2,7 +2,7 @@ date: "2016-12-01T16:00:00+02:00" title: "套件安裝" slug: "install-from-package" -weight: 10 +weight: 20 toc: false draft: false menu: diff --git a/docs/content/doc/installation/from-source.en-us.md b/docs/content/doc/installation/from-source.en-us.md index acea3e38a92c..d531dee850f0 100644 --- a/docs/content/doc/installation/from-source.en-us.md +++ b/docs/content/doc/installation/from-source.en-us.md @@ -2,7 +2,7 @@ date: "2016-12-01T16:00:00+02:00" title: "Installation from source" slug: "install-from-source" -weight: 10 +weight: 30 toc: false draft: false menu: diff --git a/docs/content/doc/installation/from-source.fr-fr.md b/docs/content/doc/installation/from-source.fr-fr.md index 2a3ba6dfa41b..ebb094175419 100644 --- a/docs/content/doc/installation/from-source.fr-fr.md +++ b/docs/content/doc/installation/from-source.fr-fr.md @@ -2,7 +2,7 @@ date: "2017-08-23T09:00:00+02:00" title: "Installation depuis le code source" slug: "install-from-source" -weight: 10 +weight: 30 toc: false draft: false menu: diff --git a/docs/content/doc/installation/from-source.zh-cn.md b/docs/content/doc/installation/from-source.zh-cn.md index 73833ec51b78..9d5c50cbda1b 100644 --- a/docs/content/doc/installation/from-source.zh-cn.md +++ b/docs/content/doc/installation/from-source.zh-cn.md @@ -2,7 +2,7 @@ date: "2016-12-01T16:00:00+02:00" title: "从源代码安装" slug: "install-from-source" -weight: 10 +weight: 30 toc: false draft: false menu: diff --git a/docs/content/doc/installation/from-source.zh-tw.md b/docs/content/doc/installation/from-source.zh-tw.md index 2b65d554ab7f..fc9c2dca4caf 100644 --- a/docs/content/doc/installation/from-source.zh-tw.md +++ b/docs/content/doc/installation/from-source.zh-tw.md @@ -2,7 +2,7 @@ date: "2016-12-01T16:00:00+02:00" title: "原始碼安裝" slug: "install-from-source" -weight: 10 +weight: 30 toc: false draft: false menu: diff --git a/docs/content/doc/installation/on-cloud-provider.en-us.md b/docs/content/doc/installation/on-cloud-provider.en-us.md index 7f5dc719056e..550ef3f677eb 100644 --- a/docs/content/doc/installation/on-cloud-provider.en-us.md +++ b/docs/content/doc/installation/on-cloud-provider.en-us.md @@ -2,14 +2,14 @@ date: "2016-12-01T16:00:00+02:00" title: "Install on Cloud Provider" slug: "install-on-cloud-provider" -weight: 20 +weight: 90 toc: false draft: false menu: sidebar: parent: "installation" name: "On cloud provider" - weight: 20 + weight: 90 identifier: "install-on-cloud-provider" --- diff --git a/docs/content/doc/installation/on-kubernetes.en-us.md b/docs/content/doc/installation/on-kubernetes.en-us.md index abfbdf16798b..e8f3612ea41c 100644 --- a/docs/content/doc/installation/on-kubernetes.en-us.md +++ b/docs/content/doc/installation/on-kubernetes.en-us.md @@ -2,14 +2,14 @@ date: "2020-03-19T19:27:00+02:00" title: "Install on Kubernetes" slug: "install-on-kubernetes" -weight: 10 +weight: 80 toc: false draft: false menu: sidebar: parent: "installation" name: "Kubernetes" - weight: 50 + weight: 80 identifier: "install-on-kubernetes" --- diff --git a/docs/content/doc/installation/on-kubernetes.zh-cn.md b/docs/content/doc/installation/on-kubernetes.zh-cn.md index b1556a26f44d..91dec2e73a29 100644 --- a/docs/content/doc/installation/on-kubernetes.zh-cn.md +++ b/docs/content/doc/installation/on-kubernetes.zh-cn.md @@ -2,14 +2,14 @@ date: "2020-03-19T19:27:00+02:00" title: "在 Kubernetes 安装 Gitea" slug: "install-on-kubernetes" -weight: 10 +weight: 80 toc: false draft: false menu: sidebar: parent: "installation" name: "Kubernetes" - weight: 50 + weight: 80 identifier: "install-on-kubernetes" --- diff --git a/docs/content/doc/installation/on-kubernetes.zh-tw.md b/docs/content/doc/installation/on-kubernetes.zh-tw.md index 345ff7ac2c30..6d31a14b05c6 100644 --- a/docs/content/doc/installation/on-kubernetes.zh-tw.md +++ b/docs/content/doc/installation/on-kubernetes.zh-tw.md @@ -2,14 +2,14 @@ date: "2020-03-19T19:27:00+02:00" title: "在 Kubernetes 安裝" slug: "install-on-kubernetes" -weight: 10 +weight: 80 toc: false draft: false menu: sidebar: parent: "installation" name: "Kubernetes" - weight: 50 + weight: 80 identifier: "install-on-kubernetes" --- diff --git a/docs/content/doc/installation/run-as-service-in-ubuntu.en-us.md b/docs/content/doc/installation/run-as-service-in-ubuntu.en-us.md index 9f65eaca9f9a..19b3be1a22a9 100644 --- a/docs/content/doc/installation/run-as-service-in-ubuntu.en-us.md +++ b/docs/content/doc/installation/run-as-service-in-ubuntu.en-us.md @@ -2,14 +2,14 @@ date: "2017-07-21T12:00:00+02:00" title: "Run as service in Linux" slug: "linux-service" -weight: 10 +weight: 40 toc: false draft: false menu: sidebar: parent: "installation" name: "Linux service" - weight: 20 + weight: 40 identifier: "linux-service" --- diff --git a/docs/content/doc/installation/run-as-service-in-ubuntu.zh-cn.md b/docs/content/doc/installation/run-as-service-in-ubuntu.zh-cn.md index c76350ecdcfb..aa00a42aa6b4 100644 --- a/docs/content/doc/installation/run-as-service-in-ubuntu.zh-cn.md +++ b/docs/content/doc/installation/run-as-service-in-ubuntu.zh-cn.md @@ -2,14 +2,14 @@ date: "2017-07-21T12:00:00+02:00" title: "在 Linux 中以 service 方式运行" slug: "linux-service" -weight: 10 +weight: 40 toc: false draft: false menu: sidebar: parent: "installation" name: "在Linux中以service方式运行" - weight: 20 + weight: 40 identifier: "linux-service" --- diff --git a/docs/content/doc/installation/run-as-service-in-ubuntu.zh-tw.md b/docs/content/doc/installation/run-as-service-in-ubuntu.zh-tw.md index 2bd1f92aef3d..de811d73e77a 100644 --- a/docs/content/doc/installation/run-as-service-in-ubuntu.zh-tw.md +++ b/docs/content/doc/installation/run-as-service-in-ubuntu.zh-tw.md @@ -2,14 +2,14 @@ date: "2017-07-21T12:00:00+02:00" title: "在 Linux 中以服務執行" slug: "linux-service" -weight: 10 +weight: 40 toc: false draft: false menu: sidebar: parent: "installation" name: "Linux 服務" - weight: 20 + weight: 40 identifier: "linux-service" --- diff --git a/docs/content/doc/installation/upgrade-from-gitea.en-us.md b/docs/content/doc/installation/upgrade-from-gitea.en-us.md index 5f958876c345..8748573a2f4c 100644 --- a/docs/content/doc/installation/upgrade-from-gitea.en-us.md +++ b/docs/content/doc/installation/upgrade-from-gitea.en-us.md @@ -2,7 +2,7 @@ date: "2021-09-02T16:00:00+08:00" title: "Upgrade from an old Gitea" slug: "upgrade-from-gitea" -weight: 10 +weight: 100 toc: false draft: false menu: diff --git a/docs/content/doc/installation/upgrade-from-gogs.en-us.md b/docs/content/doc/installation/upgrade-from-gogs.en-us.md index 7ac83367ccdb..5b08ed2f6aab 100644 --- a/docs/content/doc/installation/upgrade-from-gogs.en-us.md +++ b/docs/content/doc/installation/upgrade-from-gogs.en-us.md @@ -2,7 +2,7 @@ date: "2016-12-01T16:00:00+02:00" title: "Upgrade from Gogs" slug: "upgrade-from-gogs" -weight: 10 +weight: 101 toc: false draft: false menu: diff --git a/docs/content/doc/installation/upgrade-from-gogs.fr-fr.md b/docs/content/doc/installation/upgrade-from-gogs.fr-fr.md index 066002bcc152..2ce1b4bf3d32 100644 --- a/docs/content/doc/installation/upgrade-from-gogs.fr-fr.md +++ b/docs/content/doc/installation/upgrade-from-gogs.fr-fr.md @@ -2,7 +2,7 @@ date: "2017-08-23T09:00:00+02:00" title: "Mise à jour depuis Gogs" slug: "upgrade-from-gogs" -weight: 10 +weight: 101 toc: false draft: false menu: diff --git a/docs/content/doc/installation/upgrade-from-gogs.zh-cn.md b/docs/content/doc/installation/upgrade-from-gogs.zh-cn.md index eac4f24f533b..048cfee79372 100644 --- a/docs/content/doc/installation/upgrade-from-gogs.zh-cn.md +++ b/docs/content/doc/installation/upgrade-from-gogs.zh-cn.md @@ -2,7 +2,7 @@ date: "2016-12-01T16:00:00+02:00" title: "从 Gogs 升级" slug: "upgrade-from-gogs" -weight: 10 +weight: 101 toc: false draft: false menu: diff --git a/docs/content/doc/installation/upgrade-from-gogs.zh-tw.md b/docs/content/doc/installation/upgrade-from-gogs.zh-tw.md index 3b98b5f8f04d..0082bf73cb28 100644 --- a/docs/content/doc/installation/upgrade-from-gogs.zh-tw.md +++ b/docs/content/doc/installation/upgrade-from-gogs.zh-tw.md @@ -2,7 +2,7 @@ date: "2016-12-01T16:00:00+02:00" title: "從 Gogs 升級" slug: "upgrade-from-gogs" -weight: 10 +weight: 101 toc: false draft: false menu: diff --git a/docs/content/doc/installation/windows-service.en-us.md b/docs/content/doc/installation/windows-service.en-us.md index 176d667d1c3c..6efc1fd58263 100644 --- a/docs/content/doc/installation/windows-service.en-us.md +++ b/docs/content/doc/installation/windows-service.en-us.md @@ -2,14 +2,14 @@ date: "2016-12-21T15:00:00-02:00" title: "Register as a Windows Service" slug: "windows-service" -weight: 10 +weight: 50 toc: false draft: false menu: sidebar: parent: "installation" name: "Windows Service" - weight: 30 + weight: 50 identifier: "windows-service" --- diff --git a/docs/content/doc/installation/windows-service.fr-fr.md b/docs/content/doc/installation/windows-service.fr-fr.md index df6bbdf785d4..a0f8f057c03b 100644 --- a/docs/content/doc/installation/windows-service.fr-fr.md +++ b/docs/content/doc/installation/windows-service.fr-fr.md @@ -2,14 +2,14 @@ date: "2017-08-23T09:00:00+02:00" title: "Démarrer en tant que service Windows" slug: "windows-service" -weight: 10 +weight: 50 toc: false draft: false menu: sidebar: parent: "installation" name: "Service Windows" - weight: 30 + weight: 50 identifier: "windows-service" --- diff --git a/docs/content/doc/installation/windows-service.zh-cn.md b/docs/content/doc/installation/windows-service.zh-cn.md index 1e968528646b..8388a057b35f 100644 --- a/docs/content/doc/installation/windows-service.zh-cn.md +++ b/docs/content/doc/installation/windows-service.zh-cn.md @@ -2,14 +2,14 @@ date: "2016-12-21T15:00:00-02:00" title: "注册为Windows服务" slug: "windows-service" -weight: 10 +weight: 50 toc: false draft: false menu: sidebar: parent: "installation" name: "Windows服务" - weight: 30 + weight: 50 identifier: "windows-service" --- diff --git a/docs/content/doc/installation/windows-service.zh-tw.md b/docs/content/doc/installation/windows-service.zh-tw.md index 158ac56c81ea..a2934a52d1b6 100644 --- a/docs/content/doc/installation/windows-service.zh-tw.md +++ b/docs/content/doc/installation/windows-service.zh-tw.md @@ -2,14 +2,14 @@ date: "2016-12-21T15:00:00-02:00" title: "註冊為 Windows 服務" slug: "windows-service" -weight: 10 +weight: 50 toc: false draft: false menu: sidebar: parent: "installation" name: "Windows 服務" - weight: 30 + weight: 50 identifier: "windows-service" --- diff --git a/docs/content/doc/installation/with-docker-rootless.en-us.md b/docs/content/doc/installation/with-docker-rootless.en-us.md index 36ecf6277a97..f33e99c58096 100644 --- a/docs/content/doc/installation/with-docker-rootless.en-us.md +++ b/docs/content/doc/installation/with-docker-rootless.en-us.md @@ -2,14 +2,14 @@ date: "2020-02-09T20:00:00+02:00" title: "Installation with Docker (rootless)" slug: "install-with-docker-rootless" -weight: 10 +weight: 60 toc: false draft: false menu: sidebar: parent: "installation" name: "With Docker Rootless" - weight: 48 + weight: 60 identifier: "install-with-docker-rootless" --- diff --git a/docs/content/doc/installation/with-docker.en-us.md b/docs/content/doc/installation/with-docker.en-us.md index 396bc67bd39b..05764e0bc9f5 100644 --- a/docs/content/doc/installation/with-docker.en-us.md +++ b/docs/content/doc/installation/with-docker.en-us.md @@ -2,14 +2,14 @@ date: "2020-03-19T19:27:00+02:00" title: "Installation with Docker" slug: "install-with-docker" -weight: 10 +weight: 70 toc: false draft: false menu: sidebar: parent: "installation" name: "With Docker" - weight: 49 + weight: 70 identifier: "install-with-docker" --- diff --git a/docs/content/doc/installation/with-docker.fr-fr.md b/docs/content/doc/installation/with-docker.fr-fr.md index 4db26405b173..59f2b0752a0e 100644 --- a/docs/content/doc/installation/with-docker.fr-fr.md +++ b/docs/content/doc/installation/with-docker.fr-fr.md @@ -2,14 +2,14 @@ date: "2017-08-23T09:00:00+02:00" title: "Installation avec Docker" slug: "install-with-docker" -weight: 10 +weight: 70 toc: false draft: false menu: sidebar: parent: "installation" name: "Docker" - weight: 49 + weight: 70 identifier: "install-with-docker" --- diff --git a/docs/content/doc/installation/with-docker.zh-cn.md b/docs/content/doc/installation/with-docker.zh-cn.md index e89fb762bbf0..e5bb07b4951f 100644 --- a/docs/content/doc/installation/with-docker.zh-cn.md +++ b/docs/content/doc/installation/with-docker.zh-cn.md @@ -2,14 +2,14 @@ date: "2016-12-01T16:00:00+02:00" title: "使用 Docker 安装" slug: "install-with-docker" -weight: 10 +weight: 70 toc: false draft: false menu: sidebar: parent: "installation" name: "使用 Docker 安装" - weight: 49 + weight: 70 identifier: "install-with-docker" --- diff --git a/docs/content/doc/installation/with-docker.zh-tw.md b/docs/content/doc/installation/with-docker.zh-tw.md index f432957d87e9..e2e47e87023a 100644 --- a/docs/content/doc/installation/with-docker.zh-tw.md +++ b/docs/content/doc/installation/with-docker.zh-tw.md @@ -2,14 +2,14 @@ date: "2016-12-01T16:00:00+02:00" title: "Docker 安裝" slug: "install-with-docker" -weight: 10 +weight: 70 toc: false draft: false menu: sidebar: parent: "installation" name: "Docker 安裝" - weight: 49 + weight: 70 identifier: "install-with-docker" --- diff --git a/docs/content/doc/packages/cargo.en-us.md b/docs/content/doc/packages/cargo.en-us.md index 62c8c41aaed8..1beeba407b6e 100644 --- a/docs/content/doc/packages/cargo.en-us.md +++ b/docs/content/doc/packages/cargo.en-us.md @@ -2,6 +2,7 @@ date: "2022-11-20T00:00:00+00:00" title: "Cargo Packages Repository" slug: "usage/packages/cargo" +weight: 5 draft: false toc: false menu: diff --git a/docs/content/doc/packages/chef.en-us.md b/docs/content/doc/packages/chef.en-us.md index 67322fdbf2d6..ab7150a2a207 100644 --- a/docs/content/doc/packages/chef.en-us.md +++ b/docs/content/doc/packages/chef.en-us.md @@ -2,6 +2,7 @@ date: "2023-01-20T00:00:00+00:00" title: "Chef Packages Repository" slug: "usage/packages/chef" +weight: 5 draft: false toc: false menu: diff --git a/docs/content/doc/packages/composer.en-us.md b/docs/content/doc/packages/composer.en-us.md index dba3f31364d5..6055ff319447 100644 --- a/docs/content/doc/packages/composer.en-us.md +++ b/docs/content/doc/packages/composer.en-us.md @@ -2,6 +2,7 @@ date: "2021-07-20T00:00:00+00:00" title: "Composer Packages Repository" slug: "usage/packages/composer" +weight: 10 draft: false toc: false menu: diff --git a/docs/content/doc/packages/conan.en-us.md b/docs/content/doc/packages/conan.en-us.md index c40bb583e673..ff89fc153ef6 100644 --- a/docs/content/doc/packages/conan.en-us.md +++ b/docs/content/doc/packages/conan.en-us.md @@ -2,6 +2,7 @@ date: "2021-07-20T00:00:00+00:00" title: "Conan Packages Repository" slug: "usage/packages/conan" +weight: 20 draft: false toc: false menu: diff --git a/docs/content/doc/packages/conda.en-us.md b/docs/content/doc/packages/conda.en-us.md index 5fca9997de10..1a7cd8633450 100644 --- a/docs/content/doc/packages/conda.en-us.md +++ b/docs/content/doc/packages/conda.en-us.md @@ -2,6 +2,7 @@ date: "2022-12-28T00:00:00+00:00" title: "Conda Packages Repository" slug: "usage/packages/conda" +weight: 25 draft: false toc: false menu: diff --git a/docs/content/doc/packages/container.en-us.md b/docs/content/doc/packages/container.en-us.md index 732249529db9..5fd990b4b2fd 100644 --- a/docs/content/doc/packages/container.en-us.md +++ b/docs/content/doc/packages/container.en-us.md @@ -2,6 +2,7 @@ date: "2021-07-20T00:00:00+00:00" title: "Container Registry" slug: "usage/packages/container" +weight: 30 draft: false toc: false menu: diff --git a/docs/content/doc/packages/generic.en-us.md b/docs/content/doc/packages/generic.en-us.md index ce6661a87c19..55b1868bfbc7 100644 --- a/docs/content/doc/packages/generic.en-us.md +++ b/docs/content/doc/packages/generic.en-us.md @@ -2,6 +2,7 @@ date: "2021-07-20T00:00:00+00:00" title: "Generic Packages Repository" slug: "usage/packages/generic" +weight: 40 draft: false toc: false menu: diff --git a/docs/content/doc/packages/helm.en-us.md b/docs/content/doc/packages/helm.en-us.md index 01352237668a..263218b31eef 100644 --- a/docs/content/doc/packages/helm.en-us.md +++ b/docs/content/doc/packages/helm.en-us.md @@ -2,6 +2,7 @@ date: "2022-04-14T00:00:00+00:00" title: "Helm Chart Registry" slug: "usage/packages/helm" +weight: 50 draft: false toc: false menu: diff --git a/docs/content/doc/packages/maven.en-us.md b/docs/content/doc/packages/maven.en-us.md index e44768dc191e..f5583f181aaa 100644 --- a/docs/content/doc/packages/maven.en-us.md +++ b/docs/content/doc/packages/maven.en-us.md @@ -2,6 +2,7 @@ date: "2021-07-20T00:00:00+00:00" title: "Maven Packages Repository" slug: "usage/packages/maven" +weight: 60 draft: false toc: false menu: diff --git a/docs/content/doc/packages/npm.en-us.md b/docs/content/doc/packages/npm.en-us.md index f6ca9fb93f17..fb13510840ce 100644 --- a/docs/content/doc/packages/npm.en-us.md +++ b/docs/content/doc/packages/npm.en-us.md @@ -2,6 +2,7 @@ date: "2021-07-20T00:00:00+00:00" title: "npm Packages Repository" slug: "usage/packages/npm" +weight: 70 draft: false toc: false menu: diff --git a/docs/content/doc/packages/nuget.en-us.md b/docs/content/doc/packages/nuget.en-us.md index c40461cf8c92..1309b4cab69c 100644 --- a/docs/content/doc/packages/nuget.en-us.md +++ b/docs/content/doc/packages/nuget.en-us.md @@ -2,6 +2,7 @@ date: "2021-07-20T00:00:00+00:00" title: "NuGet Packages Repository" slug: "usage/packages/nuget" +weight: 80 draft: false toc: false menu: diff --git a/docs/content/doc/packages/overview.en-us.md b/docs/content/doc/packages/overview.en-us.md index 8c20ecd41e5e..21be4663a0be 100644 --- a/docs/content/doc/packages/overview.en-us.md +++ b/docs/content/doc/packages/overview.en-us.md @@ -2,6 +2,7 @@ date: "2021-07-20T00:00:00+00:00" title: "Package Registry" slug: "usage/packages/overview" +weight: 1 draft: false toc: false menu: diff --git a/docs/content/doc/packages/pub.en-us.md b/docs/content/doc/packages/pub.en-us.md index ef7be1be5927..ebe42f18224e 100644 --- a/docs/content/doc/packages/pub.en-us.md +++ b/docs/content/doc/packages/pub.en-us.md @@ -2,6 +2,7 @@ date: "2022-07-31T00:00:00+00:00" title: "Pub Packages Repository" slug: "usage/packages/pub" +weight: 90 draft: false toc: false menu: diff --git a/docs/content/doc/packages/pypi.en-us.md b/docs/content/doc/packages/pypi.en-us.md index f99dfb5acc28..163eaa964682 100644 --- a/docs/content/doc/packages/pypi.en-us.md +++ b/docs/content/doc/packages/pypi.en-us.md @@ -2,6 +2,7 @@ date: "2021-07-20T00:00:00+00:00" title: "PyPI Packages Repository" slug: "usage/packages/pypi" +weight: 100 draft: false toc: false menu: diff --git a/docs/content/doc/packages/rubygems.en-us.md b/docs/content/doc/packages/rubygems.en-us.md index a7aa36aef474..cb53b137d513 100644 --- a/docs/content/doc/packages/rubygems.en-us.md +++ b/docs/content/doc/packages/rubygems.en-us.md @@ -2,6 +2,7 @@ date: "2021-07-20T00:00:00+00:00" title: "RubyGems Packages Repository" slug: "usage/packages/rubygems" +weight: 110 draft: false toc: false menu: diff --git a/docs/content/doc/packages/storage.en-us.md b/docs/content/doc/packages/storage.en-us.md index 000752b774ab..cd5952eb242e 100644 --- a/docs/content/doc/packages/storage.en-us.md +++ b/docs/content/doc/packages/storage.en-us.md @@ -2,6 +2,7 @@ date: "2022-11-01T00:00:00+00:00" title: "Storage" slug: "usage/packages/storage" +weight: 5 draft: false toc: false menu: diff --git a/docs/content/doc/packages/vagrant.en-us.md b/docs/content/doc/packages/vagrant.en-us.md index 4cd066feca73..e224a9955416 100644 --- a/docs/content/doc/packages/vagrant.en-us.md +++ b/docs/content/doc/packages/vagrant.en-us.md @@ -2,6 +2,7 @@ date: "2022-08-23T00:00:00+00:00" title: "Vagrant Packages Repository" slug: "usage/packages/vagrant" +weight: 120 draft: false toc: false menu: diff --git a/docs/content/doc/usage/incoming-email.en-us.md b/docs/content/doc/usage/incoming-email.en-us.md index 9f1f28e6681a..867e9d8a69f3 100644 --- a/docs/content/doc/usage/incoming-email.en-us.md +++ b/docs/content/doc/usage/incoming-email.en-us.md @@ -2,6 +2,7 @@ date: "2022-12-01T00:00:00+00:00" title: "Incoming Email" slug: "incoming-email" +weight: 13 draft: false toc: false menu: diff --git a/docs/content/doc/usage/secrets.en-us.md b/docs/content/doc/usage/secrets.en-us.md index 341ccbae1279..b45044cc3315 100644 --- a/docs/content/doc/usage/secrets.en-us.md +++ b/docs/content/doc/usage/secrets.en-us.md @@ -2,13 +2,14 @@ date: "2022-12-19T21:26:00+08:00" title: "Secrets" slug: "usage/secrets" +weight: 50 draft: false toc: false menu: sidebar: parent: "usage" name: "Secrets" - weight: 1 + weight: 50 identifier: "usage-secrets" --- diff --git a/docs/content/doc/usage/webhooks.en-us.md b/docs/content/doc/usage/webhooks.en-us.md index 2cf60cc9cd1b..457113c5cf74 100644 --- a/docs/content/doc/usage/webhooks.en-us.md +++ b/docs/content/doc/usage/webhooks.en-us.md @@ -2,7 +2,7 @@ date: "2016-12-01T16:00:00+02:00" title: "Webhooks" slug: "webhooks" -weight: 10 +weight: 30 toc: false draft: false menu: diff --git a/docs/content/doc/usage/webhooks.zh-cn.md b/docs/content/doc/usage/webhooks.zh-cn.md index 00ebd7aa9dd0..9e9f2bf502f4 100644 --- a/docs/content/doc/usage/webhooks.zh-cn.md +++ b/docs/content/doc/usage/webhooks.zh-cn.md @@ -2,7 +2,7 @@ date: "2016-12-01T16:00:00+02:00" title: "Webhooks" slug: "webhooks" -weight: 10 +weight: 30 toc: false draft: false menu: diff --git a/docs/content/doc/usage/webhooks.zh-tw.md b/docs/content/doc/usage/webhooks.zh-tw.md index 9e918739a477..9afad4236998 100644 --- a/docs/content/doc/usage/webhooks.zh-tw.md +++ b/docs/content/doc/usage/webhooks.zh-tw.md @@ -2,7 +2,7 @@ date: "2016-12-01T16:00:00+02:00" title: "Webhook" slug: "webhooks" -weight: 10 +weight: 30 toc: false draft: false menu: From 7bfab90a8fa834d75ff476d0dd9ad3f6b79b4b4b Mon Sep 17 00:00:00 2001 From: Giteabot Date: Tue, 4 Apr 2023 12:13:09 -0400 Subject: [PATCH 172/340] docs: fix typo (#23924) (#23925) Backport #23924 by @teauxfu fixes a minor typo in the email templates page Co-authored-by: alex --- docs/content/doc/administration/mail-templates.en-us.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/doc/administration/mail-templates.en-us.md b/docs/content/doc/administration/mail-templates.en-us.md index a4dc7453eea3..bc4b2ead309b 100644 --- a/docs/content/doc/administration/mail-templates.en-us.md +++ b/docs/content/doc/administration/mail-templates.en-us.md @@ -39,7 +39,7 @@ Currently, the following notification events make use of templates: | `approve` | The head comment of a approving review for a pull request. | | `reject` | The head comment of a review requesting changes for a pull request. | | `code` | A single comment on the code of a pull request. | -| `assigned` | Used was assigned to an issue or pull request. | +| `assigned` | User was assigned to an issue or pull request. | | `default` | Any action not included in the above categories, or when the corresponding category template is not present. | The path for the template of a particular message type is: From 8d88f148d7799ef7ea2c5eba4434f776bce15580 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Tue, 4 Apr 2023 15:06:54 -0400 Subject: [PATCH 173/340] docs: make the required backticks in email password more explicit (#23923) (#23926) Backport #23923 by @teauxfu updated the example config to make the needed backticks around the password more obvious Co-authored-by: alex --- docs/content/doc/administration/email-setup.en-us.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/doc/administration/email-setup.en-us.md b/docs/content/doc/administration/email-setup.en-us.md index 27ecb0d2f2ed..05a69d56ade2 100644 --- a/docs/content/doc/administration/email-setup.en-us.md +++ b/docs/content/doc/administration/email-setup.en-us.md @@ -81,7 +81,7 @@ SMTP_ADDR = smtp.gmail.com SMTP_PORT = 465 FROM = example.user@gmail.com USER = example.user -PASSWD = *** +PASSWD = `***` MAILER_TYPE = smtp IS_TLS_ENABLED = true ``` From df74ee0376875007d8ab4d0271a679b9d1846325 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Wed, 5 Apr 2023 06:49:22 -0400 Subject: [PATCH 174/340] Scroll collapsed file into view (#23702) (#23929) Backport #23702 by @jpraet Fixes #23701, #23515. Alternate approach to #23604 using CSS scroll-margin-top, which is also taken into account for direct links to files in a diff: * On the PR diff, this currently shows the previous file first: https://try.gitea.io/jpraet/test/pulls/13/files#diff-b94d08b409f9d05fb65b6cccaf7b3e4ecc7cc333 * On the commit diff, the first line of the linked file is currently under the sticky header: https://try.gitea.io/jpraet/test/commit/1a19e6b14e31d295b7372f3346580c3e85690ff5#diff-b94d08b409f9d05fb65b6cccaf7b3e4ecc7cc333 Co-authored-by: Jimmy Praet --- web_src/css/repository.css | 7 +++++++ web_src/css/review.css | 4 ++-- web_src/js/features/file-fold.js | 3 +++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/web_src/css/repository.css b/web_src/css/repository.css index 4bb49dc439c9..d67442b00af2 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -1862,6 +1862,13 @@ .diff-file-box { border: 1px solid transparent; border-radius: var(--border-radius); + scroll-margin-top: 47px; /* match .repository .diff-detail-box */ +} + +@media (max-width: 991px) { + .diff-file-box { + scroll-margin-top: 77px; /* match .repository .diff-detail-box */ + } } /* TODO: this can potentially be made "global" by removing the class prefix */ diff --git a/web_src/css/review.css b/web_src/css/review.css index 7e628a9dfc29..9e06ba133eec 100644 --- a/web_src/css/review.css +++ b/web_src/css/review.css @@ -242,12 +242,12 @@ a.blob-excerpt:hover { display: none; } -.pull.files.diff [id] { +.pull.files.diff .comment { scroll-margin-top: 99px; } @media (max-width: 991px) { - .pull.files.diff [id] { + .pull.files.diff .comment { scroll-margin-top: 130px; } } diff --git a/web_src/js/features/file-fold.js b/web_src/js/features/file-fold.js index 0d5be7cf60d2..8321b9b19e05 100644 --- a/web_src/js/features/file-fold.js +++ b/web_src/js/features/file-fold.js @@ -8,6 +8,9 @@ import {svg} from '../svg.js'; export function setFileFolding(fileContentBox, foldArrow, newFold) { foldArrow.innerHTML = svg(`octicon-chevron-${newFold ? 'right' : 'down'}`, 18); fileContentBox.setAttribute('data-folded', newFold); + if (newFold && fileContentBox.getBoundingClientRect().top < 0) { + fileContentBox.scrollIntoView(); + } } // Like `setFileFolding`, except that it automatically inverts the current file folding state. From 55239cbab74ac71047782a79ef6b2416e287aa22 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Wed, 5 Apr 2023 11:07:44 -0400 Subject: [PATCH 175/340] Fix image border-radius (#23886) (#23930) Backport #23886 by @wxiaoguang 1. Instead of polluting the `border-radius` style globally, each "img" usage should declare their own styles. 2. There were some bugs in code, I believe the `.img` selector was done by mistake. After: ![image](https://user-images.githubusercontent.com/2114189/229415742-161b018f-14c3-471d-bcf7-34f83e5c2d89.png) ![image](https://user-images.githubusercontent.com/2114189/229415789-829d364a-76da-47a5-8c61-398cc990873c.png) Co-authored-by: wxiaoguang --- web_src/css/base.css | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/web_src/css/base.css b/web_src/css/base.css index 15e93490a8dd..343ffff82e54 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -230,10 +230,6 @@ body { } } -img { - border-radius: 3px; -} - table { border-collapse: collapse; } @@ -865,10 +861,6 @@ a.label, margin-bottom: -0.25rem; } -.ui.dropdown .menu > .item > svg.img { - margin-right: 0.78571429rem; -} - .ui.selection.dropdown .menu > .item { border-color: var(--color-secondary); } @@ -1181,9 +1173,9 @@ a.ui.card:hover, border-color: var(--color-secondary); } +img.ui.avatar, .ui.avatar img, .ui.avatar svg, -.ui.avatar.img, .ui.cards > .card img.avatar, .ui.cards > .card .avatar img, .ui.card img.avatar, From 80922511338a2fe66246c035898d25749b2368a1 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 6 Apr 2023 09:45:45 +0200 Subject: [PATCH 176/340] Left-align review comments (#23937) Small extract from https://github.com/go-gitea/gitea/pull/23553 for 1.19: Before: Screenshot 2023-04-05 at 21 47 55 After: Screenshot 2023-04-05 at 21 47 38 --- web_src/css/review.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web_src/css/review.css b/web_src/css/review.css index 9e06ba133eec..9d98ed9f0dd5 100644 --- a/web_src/css/review.css +++ b/web_src/css/review.css @@ -61,8 +61,7 @@ .comment-code-cloud { padding: 0.5rem 1rem !important; position: relative; - margin: 0 auto; - max-width: 1000px; + max-width: 820px; } @media (max-width: 767px) { From 001d3fb8209302d3083aae4017c932cbf53e0bef Mon Sep 17 00:00:00 2001 From: Giteabot Date: Thu, 6 Apr 2023 18:38:34 -0400 Subject: [PATCH 177/340] Delete deleted release attachments immediately from storage (#23913) (#23958) Backport #23913 by @lunny Previously, deleted release attachments were kept forever on the external storage. Note: It may be very slow now if there are many attachments to be deleted on this release. Fix #23728 Co-authored-by: Lunny Xiao --- services/release/release.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/release/release.go b/services/release/release.go index eec03b46883e..a9a523119776 100644 --- a/services/release/release.go +++ b/services/release/release.go @@ -227,7 +227,7 @@ func UpdateRelease(doer *user_model.User, gitRepo *git.Repository, rel *repo_mod deletedUUIDs.Add(attach.UUID) } - if _, err := repo_model.DeleteAttachments(ctx, attachments, false); err != nil { + if _, err := repo_model.DeleteAttachments(ctx, attachments, true); err != nil { return fmt.Errorf("DeleteAttachments [uuids: %v]: %w", delAttachmentUUIDs, err) } } From ac658bb92caaa5dce2a37f3f068b2871ec08b33a Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Fri, 7 Apr 2023 15:29:54 +0800 Subject: [PATCH 178/340] Backport locales to 1.19 (#23960) This time the backport is done by `backport-locales.go` automatically, no manual fix. However, there are some new broken translations in 1.20 (main branch), so we must fix our ini package next time, then the broken could be resolved fundmentally. --- options/locale/locale_cs-CZ.ini | 1 + options/locale/locale_el-GR.ini | 1 + options/locale/locale_fa-IR.ini | 3 +- options/locale/locale_fi-FI.ini | 2 +- options/locale/locale_it-IT.ini | 6 +- options/locale/locale_ja-JP.ini | 6 +- options/locale/locale_lv-LV.ini | 1 + options/locale/locale_nl-NL.ini | 2 +- options/locale/locale_pl-PL.ini | 2 +- options/locale/locale_pt-BR.ini | 1 + options/locale/locale_pt-PT.ini | 1 + options/locale/locale_ru-RU.ini | 150 +++++++++++++++++++------------- options/locale/locale_si-LK.ini | 20 ++--- options/locale/locale_sv-SE.ini | 2 +- options/locale/locale_uk-UA.ini | 2 +- options/locale/locale_zh-CN.ini | 3 +- options/locale/locale_zh-HK.ini | 2 +- options/locale/locale_zh-TW.ini | 1 + 18 files changed, 121 insertions(+), 85 deletions(-) diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini index b7fb5e221131..36b9f8c14459 100644 --- a/options/locale/locale_cs-CZ.ini +++ b/options/locale/locale_cs-CZ.ini @@ -2247,6 +2247,7 @@ settings.authorization_header=Autorizační hlavička settings.authorization_header_desc=Pokud vyplněno, bude připojeno k požadavkům jako autorizační hlavička. Příklady: %s. settings.protected_branch.save_rule=Uložit pravidlo settings.protected_branch.delete_rule=Odstranit pravidlo +actions=Akce [org] org_name_holder=Název organizace diff --git a/options/locale/locale_el-GR.ini b/options/locale/locale_el-GR.ini index 15422057b640..0a7602d7c1e2 100644 --- a/options/locale/locale_el-GR.ini +++ b/options/locale/locale_el-GR.ini @@ -2271,6 +2271,7 @@ settings.protected_branch_required_rule_name=Απαιτούμενο όνομα settings.protected_branch_duplicate_rule_name=Διπλότυπο όνομα κανόνα release.releases_for=Κυκλοφορίες για %s release.tags_for=Ετικέτες για %s +actions=Δράσεις [org] org_name_holder=Όνομα Οργανισμού diff --git a/options/locale/locale_fa-IR.ini b/options/locale/locale_fa-IR.ini index 4e58e3887410..24ff5dd5148c 100644 --- a/options/locale/locale_fa-IR.ini +++ b/options/locale/locale_fa-IR.ini @@ -2029,6 +2029,7 @@ search.code_no_results=کد منبعی مطابق با جستجوی شما یا settings.event_wiki=دانشنامه branch.create_branch_operation=ایجاد شاخه issues.remove_assignee_at=جدا شده توسط %s %s +issues.add_assignee_at=اختصاص داده شده توسط %s %s [org] org_name_holder=نام سازمان @@ -2619,7 +2620,7 @@ create_repo=مخزن ایجاد شده %s rename_repo=مخزن تغییر نام داد از %[1]s به %[3]s commit_repo=به %[3]s در %[4]s push شد create_issue=مشکل باز %[3]s#%[2]s -close_issue="مشکل بسته %[3]s#%[2]s +close_issue=مشکل بسته %[3]s#%[2]s reopen_issue=مشکل دوباره باز شد %[3]s#%[2]s create_pull_request=درخواست pull ایجاد شده %[3]s#%[2]s close_pull_request=درخواست pull بسته %[3]s#%[2]s diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini index 4679c3c1e4e7..e70dd4b31e34 100644 --- a/options/locale/locale_fi-FI.ini +++ b/options/locale/locale_fi-FI.ini @@ -733,7 +733,7 @@ editor.commit_changes=Commitoi muutokset editor.add_tmpl=Lisää '' editor.add=Lisää "%s editor.update=Päivitä '%s' -editor.delete=Poista "%s +editor.delete=Poista %s editor.commit_directly_to_this_branch=Commitoi suoraan %s haaraan. editor.create_new_branch=Luo uusi haara tälle commitille ja aloita vetopyyntö. editor.create_new_branch_np=Luo uusi haara tälle commitille. diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini index 61c69bc27ccd..c86e7bb50a76 100644 --- a/options/locale/locale_it-IT.ini +++ b/options/locale/locale_it-IT.ini @@ -416,7 +416,7 @@ size_error=deve essere %s. min_size_error=" deve contenere almeno %s caratteri." max_size_error=" deve contenere massimo %s caratteri." email_error=" non è un indirizzo e-mail valido." -url_error=%s" non è un URL valido. +url_error=%s non è un URL valido. include_error=" deve contenere la stringa '%s'." glob_pattern_error=" il pattern glob non è valido: %s." regex_pattern_error=" modello regex non valido: %s." @@ -1326,7 +1326,7 @@ issues.delete.text=Vuoi davvero eliminare questo problema? (Questo rimuoverà pe issues.tracker=Cronografo issues.start_tracking_short=Avvia timer issues.start_tracking=Avvia cronografo -issues.start_tracking_history="""'ha iniziato a lavorare %s`""" +issues.start_tracking_history=ha iniziato a lavorare %s issues.tracker_auto_close=Il timer verrà interrotto automaticamente una volta che il problema verrá chiuso issues.tracking_already_started=Hai già avviato il monitoraggio del tempo su un altro problema! issues.stop_tracking=Ferma timer @@ -2597,7 +2597,7 @@ auths.sspi_default_language=Lingua predefinita dell'utente auths.sspi_default_language_helper=Lingua predefinita per gli utenti creati automaticamente dal metodo di autenticazione SSPI. Lascia vuoto se preferisci che la lingua venga rilevata automaticamente. auths.tips=Consigli auths.tips.oauth2.general=Autenticazione OAuth2 -auths.tips.oauth2.general.tip="Quando si registra una nuova autenticazione OAuth2, l'URL di callback/reindirizzamento deve essere:/user/oauth2//callback +auths.tips.oauth2.general.tip=Quando si registra una nuova autenticazione OAuth2, l'URL di callback/reindirizzamento deve essere:/user/oauth2//callback auths.tip.oauth2_provider=OAuth2 Provider auths.tip.bitbucket=Registra un nuovo cliente OAuth su https://bitbucket.org/account/user//oauth-consumers/new e aggiungi il permesso 'Account' - 'Read' auths.tip.nextcloud=Registra un nuovo OAuth sulla tua istanza utilizzando il seguente menu "Impostazioni -> Sicurezza -> OAuth 2.0 client" diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini index 5eb628d83a02..f265cdd4a79d 100644 --- a/options/locale/locale_ja-JP.ini +++ b/options/locale/locale_ja-JP.ini @@ -2020,9 +2020,9 @@ settings.dismiss_stale_approvals_desc=プルリクエストの内容を変える settings.require_signed_commits=コミット署名必須 settings.require_signed_commits_desc=署名されていない場合、または署名が検証できなかった場合は、このブランチへのプッシュを拒否します。 settings.protect_protected_file_patterns=保護されるファイルのパターン (セミコロン';'で区切る): -settings.protect_protected_file_patterns_desc=保護されたファイルは、このブランチにファイルを追加・編集・削除する権限を持つユーザーであっても、直接変更することができなくなります。 セミコロン(';')で区切って複数のパターンを指定できます。 パターンの文法については github.com/gobwas/glob を参照してください。 例: .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=保護しないファイルは、ユーザーに書き込み権限があればプッシュ制限をバイパスして直接変更できます。 セミコロン(';')で区切って複数のパターンを指定できます。 パターンの文法については github.com/gobwas/glob を参照してください。 例: .drone.yml, /docs/**/*.txt +settings.protect_unprotected_file_patterns_desc=保護しないファイルは、ユーザーに書き込み権限があればプッシュ制限をバイパスして直接変更できます。 セミコロン(';')で区切って複数のパターンを指定できます。 パターンの文法については github.com/gobwas/glob を参照してください。 例: .drone.yml, /docs/**/*.txt settings.add_protected_branch=保護を有効にする settings.delete_protected_branch=保護を無効にする settings.update_protect_branch_success=ルール '%s' に対するブランチ保護を更新しました。 @@ -2271,6 +2271,7 @@ settings.protected_branch_required_rule_name=ルール名は必須です settings.protected_branch_duplicate_rule_name=ルール名が重複しています release.releases_for=%s のリリース release.tags_for=%s のタグ +actions=Actions [org] org_name_holder=組織名 @@ -3234,3 +3235,4 @@ runs.open_tab=%d オープン runs.closed_tab=%d クローズ runs.commit=コミット runs.pushed_by=Pushed by +runners.reset_registration_token_success=ランナー登録トークンをリセットしました diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini index d70c169f4faa..a4e6dfecad8e 100644 --- a/options/locale/locale_lv-LV.ini +++ b/options/locale/locale_lv-LV.ini @@ -2271,6 +2271,7 @@ settings.protected_branch_required_rule_name=Nav norādīts noteikuma nosaukums settings.protected_branch_duplicate_rule_name=Dublējošs noteikuma nosaukumu release.releases_for=Repozitorja %s laidieni release.tags_for=Repozitorija %s tagi +actions=Darbības [org] org_name_holder=Organizācijas nosaukums diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini index d5b985b0940a..2cb42841b670 100644 --- a/options/locale/locale_nl-NL.ini +++ b/options/locale/locale_nl-NL.ini @@ -2473,7 +2473,7 @@ auths.tip.github=Registreer een nieuwe OAuth toepassing op https://github.com/se 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 https://console.developers.google.com/ 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 applicatie aan op https://oauth.yandex.com/client/new. 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.tip.yandex=Maak een nieuwe applicatie aan op https://oauth.yandex.com/client/new. 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.new_success=De authenticatie-bron '%s' is toegevoegd. diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini index 0f8791d76bdd..55981583204b 100644 --- a/options/locale/locale_pl-PL.ini +++ b/options/locale/locale_pl-PL.ini @@ -2297,7 +2297,7 @@ auths.sspi_auto_create_users_helper=Zezwól metodzie uwierzytelniania SSPI na au auths.sspi_auto_activate_users=Automatycznie aktywuj użytkowników auths.sspi_auto_activate_users_helper=Zezwól metodzie uwierzytelnienia SSPI na automatyczne aktywowanie nowych kont użytkowników auths.sspi_strip_domain_names=Usuwaj nazwy domen z nazw użytkowników -auths.sspi_strip_domain_names_helper=Gdy zaznaczone, nazwy domen będą usuwane z nazw logowania (np. zamiast "DOMENA\osoba", czy osoba@example.org" będą po prostu "osoba"). +auths.sspi_strip_domain_names_helper=Gdy zaznaczone, nazwy domen będą usuwane z nazw logowania (np. zamiast "DOMENA\osoba", "czy osoba@example.org" będą po prostu "osoba"). auths.sspi_separator_replacement=Używany separator zamiast \, / oraz @ auths.sspi_separator_replacement_helper=Znak używany do zastępowania separatorów nazw logowania niskiego poziomu (np. znak \ w "DOMENA\osoba") i nazw głównych użytkowników (np. @ w "osoba@example.org"). auths.sspi_default_language=Domyślny język użytkownika diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini index d081cf262f8a..b21c2346a309 100644 --- a/options/locale/locale_pt-BR.ini +++ b/options/locale/locale_pt-BR.ini @@ -2271,6 +2271,7 @@ settings.protected_branch_required_rule_name=Nome da regra é obrigatório settings.protected_branch_duplicate_rule_name=Regra com nome duplicado release.releases_for=Versões para %s release.tags_for=Tags para %s +actions=Ações [org] org_name_holder=Nome da organização diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini index e3c6235f43c1..45d5187eeca3 100644 --- a/options/locale/locale_pt-PT.ini +++ b/options/locale/locale_pt-PT.ini @@ -2271,6 +2271,7 @@ settings.protected_branch_required_rule_name=Nome de regra obrigatório settings.protected_branch_duplicate_rule_name=Nome de regra duplicado release.releases_for=Lançamentos para %s release.tags_for=Etiquetas para %s +actions=Operações [org] org_name_holder=Nome da organização diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini index 1a970f389f21..99c4f29cc714 100644 --- a/options/locale/locale_ru-RU.ini +++ b/options/locale/locale_ru-RU.ini @@ -103,6 +103,7 @@ occurred=Произошла ошибка missing_csrf=Некорректный запрос: CSRF токен отсутствует invalid_csrf=Некорректный запрос: неверный CSRF токен network_error=Ошибка сети +report_message=Если вы уверены, что это баг Gitea, пожалуйста, поищите задачу на GitHub или создайте новую при необходимости. [startpage] app_desc=Удобный сервис собственного хостинга репозиториев Git @@ -378,7 +379,7 @@ 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.subject=%s добавил(а) вас в %s repo.collaborator.added.text=Вы были добавлены в качестве соавтора репозитория: [modal] @@ -609,18 +610,18 @@ gpg_key_matched_identities_long=Встроенные в этот ключ иде gpg_key_verified=Проверенный ключ gpg_key_verified_long=Ключ был проверен токеном и может быть использован для проверки коммитов, соответствующих любым активным адресом электронной почты этого пользователя в дополнение к любым соответствующим идентификаторам этого ключа. gpg_key_verify=Проверить -gpg_invalid_token_signature=Предоставленный GPG ключ, подпись и токен не совпадают или токен устарел. +gpg_invalid_token_signature=Предоставленный ключ GPG, подпись и токен не совпадают, либо токен устарел. gpg_token_required=Вы должны предоставить подпись для токена ниже gpg_token=Токен gpg_token_help=Вы можете сгенерировать подпись с помощью: gpg_token_code=echo "%s" | gpg -a --default-key %s --detach-sig -gpg_token_signature=Бронированная GPG подпись +gpg_token_signature=Текстовая подпись GPG key_signature_gpg_placeholder=Начинается с '-----BEGIN PGP SIGNATURE-----' verify_gpg_key_success=GPG ключ '%s' проверен. ssh_key_verified=Проверенный ключ ssh_key_verified_long=Ключ был проверен токеном и может быть использован для проверки коммитов, соответствующих любым активным адресом электронной почты этого пользователя. ssh_key_verify=Проверить -ssh_invalid_token_signature=Предоставленный SSH ключ, подпись или токен не совпадают, или токен устарел. +ssh_invalid_token_signature=Предоставленный ключ SSH, подпись или токен не совпадают, либо токен устарел. ssh_token_required=Вы должны предоставить подпись для токена ниже ssh_token=Токен ssh_token_help=Вы можете сгенерировать подпись с помощью: @@ -807,7 +808,7 @@ mirror_prune_desc=Удаление устаревших отслеживаемы mirror_interval_invalid=Недопустимый интервал зеркалирования. mirror_address=Клонировать по URL mirror_address_desc=Поместите необходимые учетные данные в секцию авторизации. -mirror_address_url_invalid=Указанный url неверный. Вы должны правильно экранировать все компоненты url. +mirror_address_url_invalid=Указанный URL некорректен. Нужно правильно экранировать все компоненты URL. mirror_address_protocol_invalid=Указанный url неверный. Только http(s):// или git:// местоположения могут быть зеркалированы. mirror_lfs=Хранилище больших файлов (LFS) mirror_lfs_desc=Активировать зеркалирование данных LFS. @@ -1053,9 +1054,9 @@ commits.gpg_key_id=Идентификатор GPG ключа commit.revert=Откатить commit.revert-header=Откат: %s commit.revert-content=Выбрать ветку для отката: -commit.cherry-pick=Cherry-pick +commit.cherry-pick=Перенос commit.cherry-pick-header=Cherry-pick: %s -commit.cherry-pick-content=Выбрать ветку для cherry-pick: +commit.cherry-pick-content=Выбрать ветку для переноса: ext_issues.desc=Ссылка на внешнюю систему отслеживания ошибок. projects=Проекты projects.desc=Управление задачами и pull'ами в досках проекта. @@ -1136,11 +1137,11 @@ issues.label_templates.info=Меток пока не существует. Со issues.label_templates.helper=Выберите метку issues.label_templates.use=Использовать набор меток issues.label_templates.fail_to_load_file=Не удалось загрузить файл шаблона метки «%s»: %v -issues.add_label=добавлен %s с меткой %s -issues.add_labels=добавлен %s с метками %s -issues.remove_label=удалён %s с меткой %s +issues.add_label=добавил(а) метку %s %s +issues.add_labels=добавил(а) метки %s %s +issues.remove_label=удалил(а) метку %s %s issues.remove_labels=удалён %s с метками %s -issues.add_remove_labels=добавлен %s и удалён %s с метками %s +issues.add_remove_labels=добавил(а) метки %s и удалил(а) %s %s issues.add_milestone_at=добавил(а) к этапу %s %s issues.add_project_at=добавил(а) в %s проект %s issues.change_milestone_at=поменял(а) целевой этап с %s на %s %s @@ -1295,7 +1296,7 @@ issues.del_time=Удалить этот журнал времени issues.add_time_short=Добавить время issues.add_time_cancel=Отмена issues.add_time_history=добавил(а) к затраченному времени %s -issues.del_time_history=удалил потраченное время %s +issues.del_time_history=удалил(а) потраченное время %s issues.add_time_hours=Часы issues.add_time_minutes=Минуты issues.add_time_sum_to_small=Время не было введено. @@ -1314,7 +1315,7 @@ issues.due_date_form_edit=Редактировать issues.due_date_form_remove=Удалить issues.due_date_not_writer=Для обновления срока выполнения необходим доступ на запись в репозиторий. issues.due_date_not_set=Срок выполнения не установлен. -issues.due_date_added=добавлено в срок выполнения %s %s +issues.due_date_added=добавил(а) срок выполнения %s %s issues.due_date_remove=удалён срок выполнения %s %s issues.due_date_overdue=Просроченные issues.due_date_invalid=Срок действия недействителен или находится за пределами допустимого диапазона. Пожалуйста, используйте формат 'гггг-мм-дд'. @@ -1325,7 +1326,7 @@ issues.dependency.add=Добавить зависимость… issues.dependency.cancel=Отменить issues.dependency.remove=Удалить issues.dependency.remove_info=Удалить эту зависимость -issues.dependency.added_dependency=добавить новую зависимость %s +issues.dependency.added_dependency=добавил(а) новую зависимость %s issues.dependency.removed_dependency=убрал зависимость %s issues.dependency.pr_closing_blockedby=Закрытие этого запроса на слияние блокируется следующими задачами issues.dependency.issue_closing_blockedby=Закрытие этой задачи блокируется следующими задачами @@ -1394,7 +1395,7 @@ 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=хочет смерджить %[1]d коммит(ов) из %[2]s в %[3]s +pulls.title_desc=хочет влить %[1]d коммит(ов) из %[2]s в %[3]s pulls.merged_title_desc=слито %[1]d коммит(ов) из %[2]s в %[3]s %[4]s pulls.change_target_branch_at=изменил целевую ветку с %s на %s %s pulls.tab_conversation=Обсуждение @@ -1459,7 +1460,7 @@ pulls.unrelated_histories=Слияние не удалось: У источни pulls.merge_out_of_date=Ошибка слияния: при создании слияния база данных была обновлена. Подсказка: попробуйте ещё раз. pulls.push_rejected=Слияние не удалось: push был отклонён. Проверьте Git-хуки для этого репозитория. pulls.push_rejected_summary=Полная ошибка отклонения -pulls.push_rejected_no_message=Слияние не удалось: push был отклонён, но сервер не указал причину.
    Проверьте Git-хуки для этого репозитория +pulls.push_rejected_no_message=Слияние не удалось: отправка была отклонена, но сервер не указал причину.
    Проверьте Git-хуки для этого репозитория pulls.open_unmerged_pull_exists=Вы не можете снова открыть, поскольку уже существует запрос на слияние (#%d) из того же репозитория с той же информацией о слиянии и ожидающий слияния. pulls.status_checking=Выполняются некоторые проверки pulls.status_checks_success=Все проверки выполнены успешно @@ -1798,8 +1799,8 @@ settings.event_fork=Форкнуть settings.event_fork_desc=Репозиторий форкнут. settings.event_release=Релиз settings.event_release_desc=Релиз опубликован, обновлён или удалён из репозитория. -settings.event_push=Push -settings.event_push_desc=Push в репозиторий. +settings.event_push=Отправка +settings.event_push_desc=Отправка в репозиторий. settings.event_repository=Репозиторий settings.event_repository_desc=Репозиторий создан или удален. settings.event_header_issue=События задачи @@ -1850,38 +1851,38 @@ settings.web_hook_name_discord=Discord settings.web_hook_name_dingtalk=DingTalk settings.web_hook_name_msteams=Microsoft Teams settings.web_hook_name_feishu_or_larksuite=Feishu / Lark Suite -settings.deploy_keys=Ключи развертывания -settings.add_deploy_key=Добавить ключ развертывания -settings.deploy_key_desc=Ключи развёртывания доступны только для чтения. Это не то же самое что и SSH-ключи аккаунта. +settings.deploy_keys=Ключи развёртывания +settings.add_deploy_key=Добавить ключ развёртывания +settings.deploy_key_desc=Ключи развёртывания предоставляют доступ к репозиторию только для чтения. settings.is_writable=Разрешить запись settings.is_writable_info=Может ли этот ключ быть использован для выполнения push в репозиторий? Ключи развёртывания всегда имеют доступ на pull. -settings.no_deploy_keys=Вы не добавляли ключи развертывания. +settings.no_deploy_keys=Вы не добавляли ключи развёртывания. settings.title=Заголовок settings.deploy_key_content=Содержимое -settings.key_been_used=Содержимое ключа развертывания уже используется. -settings.key_name_used=Ключ развертывания с таким заголовком уже существует. -settings.add_key_success=Новый ключ развертывания '%s' успешно добавлен. -settings.deploy_key_deletion=Удалить ключ развертывания +settings.key_been_used=Идентичный ключ развёртывания уже используется. +settings.key_name_used=Ключ развёртывания с таким именем уже существует. +settings.add_key_success=Новый ключ развёртывания '%s' успешно добавлен. +settings.deploy_key_deletion=Удалить ключ развёртывания settings.deploy_key_deletion_desc=Удаление ключа развёртки сделает невозможным доступ к репозиторию с его помощью. Вы уверены? settings.deploy_key_deletion_success=Ключ развёртки был успешно удалён. settings.branches=Ветки settings.protected_branch=Защита веток -settings.protected_branch_can_push=Разрешить push? -settings.protected_branch_can_push_yes=Вы можете выполнять push -settings.protected_branch_can_push_no=Вы не можете выполнять push +settings.protected_branch_can_push=Разрешить отправку? +settings.protected_branch_can_push_yes=Вы можете выполнять отправку +settings.protected_branch_can_push_no=Вы не можете выполнять отправку settings.branch_protection=Защита ветки %s settings.protect_this_branch=Защитить эту ветку settings.protect_this_branch_desc=Предотвращает удаление, ограничивает Push и слияние Git в ветку. -settings.protect_disable_push=Отключить Push +settings.protect_disable_push=Отключить отправку settings.protect_disable_push_desc=Отправка не будет разрешена в эту ветку. -settings.protect_enable_push=Включить Push +settings.protect_enable_push=Включить отправку settings.protect_enable_push_desc=Любой, у кого есть доступ на запись, будет разрешен push в эту ветку (но не принудительно push). settings.protect_whitelist_committers=Ограниченный белый список Push settings.protect_whitelist_committers_desc=Только пользователям или командам из белого списка будут разрешены push в эту ветку (но не принудительно push). settings.protect_whitelist_deploy_keys=Белый список развёртываемых ключей с доступом на запись в push. -settings.protect_whitelist_users=Пользователи, которые могут делать push в эту ветку: +settings.protect_whitelist_users=Пользователи, которые могут отправлять изменения в эту ветку: settings.protect_whitelist_search_users=Поиск пользователей… -settings.protect_whitelist_teams=Команды, члены которых могут делать push в эту ветку: +settings.protect_whitelist_teams=Команды, члены которых могут отправлять изменения в эту ветку: settings.protect_whitelist_search_teams=Поиск команд… settings.protect_merge_whitelist_committers=Ограничить право на слияние белым списком settings.protect_merge_whitelist_committers_desc=Вы можете добавлять пользователей или целые команды в "белый" список этой ветки. Только присутствующие в списке смогут принимать запросы на слияние. В противном случае любой с правами на запись в репозиторий будет обладать такой возможностью. @@ -1899,7 +1900,7 @@ settings.protect_approvals_whitelist_teams=Команды в белом спис settings.dismiss_stale_approvals=Отклонить устаревшие разрешения settings.dismiss_stale_approvals_desc=Когда новые коммиты, изменяющие содержимое запроса на слияние, отправляются в ветку, старые разрешения будут отклонены. settings.require_signed_commits=Требовать подписанные коммиты -settings.require_signed_commits_desc=Отклонить push'ы в эту ветку, если они не подписаны или не проверены. +settings.require_signed_commits_desc=Отклонить отправку изменений в эту ветку, если они не подписаны или не проверяемы. settings.protect_protected_file_patterns=Защищённые шаблоны файлов (разделённые через ';'): settings.protect_protected_file_patterns_desc=Защищенные файлы, которые не могут быть изменены напрямую, даже если пользователь имеет право добавлять, редактировать или удалять файлы в этой ветке. Шаблоны могут быть разделены точкой с запятой (';'). Смотрите github.com/gobwas/glob документацию для синтаксиса шаблонов. Например: .drone.yml, /docs/**/*.txt. settings.protect_unprotected_file_patterns=Незащищённые шаблоны файлов (разделённые через ';'): @@ -1985,7 +1986,7 @@ settings.rename_branch_to=новое название ветки settings.rename_branch=Переименовать ветку diff.browse_source=Просмотр исходного кода diff.parent=Родитель -diff.commit=Сommit +diff.commit=Коммит diff.git-notes=Заметки diff.data_not_available=Разница недоступна diff.options_button=Опции Diff @@ -2080,10 +2081,10 @@ branch.already_exists=Ветка с именем '%s' уже существуе branch.delete_head=Удалить branch.delete=Удалить ветку '%s' branch.delete_html=Удалить ветку -branch.delete_desc=Удаление ветки НЕОБРАТИМО. Действие никак нельзя отменить. +branch.delete_desc=Удаление ветки НЕОБРАТИМО. Действительно удалить? branch.deletion_success=Ветка %s удалена. branch.deletion_failed=Не удалось удалить ветку %s. -branch.delete_branch_has_new_commits=%s нельзя удалить, поскольку после слияния были добавлены новые коммиты. +branch.delete_branch_has_new_commits=Ветку '%s' нельзя удалить, поскольку после слияния были добавлены новые коммиты. branch.create_branch=Создать ветку %s branch.create_from=из '%s' branch.create_success=Ветка '%s' создана. @@ -2119,6 +2120,15 @@ error.csv.invalid_field_count=Не удается отобразить этот packages=Пакеты issues.filter_project_none=Нет проекта settings.event_wiki=Вики +settings.event_wiki_desc=Страница вики создана, переименована, изменена или удалена. +settings.web_hook_name_telegram=Telegram +settings.web_hook_name_matrix=Matrix +settings.web_hook_name_feishu=Feishu +settings.web_hook_name_larksuite=Lark Suite +settings.web_hook_name_wechatwork=WeCom (Wechat Work) +settings.packagist_api_token=Токен API +settings.protected_branch.save_rule=Сохранить правило +settings.protected_branch.delete_rule=Удалить правило [org] org_name_holder=Название организации @@ -2136,12 +2146,12 @@ org_desc=Описание team_name=Название команды team_desc=Описание team_name_helper=Названия команд должны быть короткими и запоминающимися. -team_desc_helper=Что это за команда? +team_desc_helper=Опишите назначение или роль команды. team_access_desc=Доступ к репозиторию team_permission_desc=Разрешение team_unit_desc=Разрешить доступ к разделам репозитория team_unit_disabled=(Отключено) -form.name_reserved=Наименование организации '%s' зарезервированно. +form.name_reserved=Наименование организации '%s' зарезервировано. form.name_pattern_not_allowed=Шаблон организации '%s' не допускается. form.create_org_not_allowed=Этому пользователю не разрешено создавать организацию. settings=Настройки @@ -2153,9 +2163,9 @@ 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=Приватный (Видимый только для участников организации) settings.visibility.private_shortname=Приватный settings.update_settings=Обновить настройки settings.update_setting_success=Настройки организации обновлены. @@ -2164,7 +2174,7 @@ settings.change_orgname_redirect_prompt=Старое имя будет пере settings.update_avatar_success=Аватар организации обновлён. settings.delete=Удалить организацию settings.delete_account=Удалить эту организацию -settings.delete_prompt=Это действие БЕЗВОЗВРАТНО удалит эту организацию навсегда. +settings.delete_prompt=Это действие БЕЗВОЗВРАТНО удалит эту организацию навсегда! settings.confirm_delete_account=Подтвердить удаление settings.delete_org_title=Удалить организацию settings.delete_org_desc=Эта организация будет безвозвратно удалена. Продолжить? @@ -2207,7 +2217,7 @@ teams.delete_team_desc=Удаление команды отменяет дост teams.delete_team_success=Команда удалена. teams.read_permission_desc=Эта команда предоставляет доступ на Чтение: члены могут просматривать и клонировать репозитории команды. teams.write_permission_desc=Эта команда предоставляет доступ на Запись: члены могут получать и выполнять push команды в репозитории. -teams.admin_permission_desc=Эта команда дает административный доступ: участники могут читать, пушить и добавлять соавторов к ее репозиториям. +teams.admin_permission_desc=Эта команда даёт административный доступ: участники могут читать, отправлять изменения и добавлять соавторов к её репозиториям. teams.create_repo_permission_desc=Кроме того, эта команда предоставляет право Создание репозитория: члены команды могут создавать новые репозитории в организации. teams.repositories=Репозитории группы разработки teams.search_repo_placeholder=Поиск репозитория… @@ -2227,6 +2237,7 @@ teams.all_repositories_read_permission_desc=Эта команда предост teams.all_repositories_write_permission_desc=Эта команда предоставляет Написать доступ к всем репозиториям: участники могут читать и выполнять push в репозитории. teams.all_repositories_admin_permission_desc=Эта команда предоставляет администратору доступ к всем репозиториям: участники могут читать, отправлять сообщения и добавлять соавторов в репозитории. members=Участники +teams.general_access_helper=Разрешения участников будут определяться таблицей разрешений ниже. [admin] dashboard=Панель @@ -2244,7 +2255,7 @@ last_page=Последняя total=Всего: %d dashboard.statistic=Статистика dashboard.operations=Операции -dashboard.system_status=Статус системного монитора +dashboard.system_status=Состояние системы dashboard.operation_name=Имя операции dashboard.operation_switch=Переключить dashboard.operation_run=Запуск @@ -2266,7 +2277,7 @@ dashboard.delete_inactive_accounts.started=Удалить все запущен dashboard.delete_repo_archives=Удалить все архивы репозиториев (ZIP, TAR.GZ, и т.д..) dashboard.delete_repo_archives.started=Удаление всех архивов репозитория началось. dashboard.delete_missing_repos=Удалить все записи о репозиториях с отсутствующими файлами Git -dashboard.delete_missing_repos.started=Задача по удалению всех репозиториев, в которых отсутствуют их git-файлы, начата. +dashboard.delete_missing_repos.started=Начато удаление всех репозиториев без Git-файлов. dashboard.delete_generated_repository_avatars=Удалить генерированные аватары репозитория dashboard.update_mirrors=Обновить зеркала dashboard.repo_health_check=Проверка состояния всех репозиториев @@ -2328,28 +2339,28 @@ users.created=Создано users.last_login=Последний вход users.never_login=Никогда не входил users.send_register_notify=Отправить пользователю уведомление о регистрации -users.new_success=Учетная запись '%s' создана. +users.new_success=Учётная запись '%s' создана. users.edit=Редактировать users.auth_source=Источник аутентификации users.local=Локальный users.auth_login_name=Логин для авторизации users.password_helper=Оставьте пустым, чтобы оставить без изменений. users.update_profile_success=Профиль учётной записи обновлён успешно. -users.edit_account=Изменение учетной записи +users.edit_account=Изменение учётной записи users.max_repo_creation=Максимальное количество репозиториев users.max_repo_creation_desc=(Установите -1 для использования стандартного глобального значения предела) -users.is_activated=Эта учетная запись активирована +users.is_activated=Эта учётная запись активирована users.prohibit_login=Этой учетной записи запрещён вход в систему -users.is_admin=У этой учетной записи есть права администратора +users.is_admin=У этой учётной записи есть права администратора users.is_restricted=Ограничен -users.allow_git_hook=Эта учётная запись имеет разрешение на создание Git hook'ов +users.allow_git_hook=Может создавать Git-хуки users.allow_git_hook_tooltip=Git Hooks выполняется как пользователь ОС с Gitea и будет иметь одинаковый уровень доступа к хосту. В результате пользователи с привилегией Git Hook могут получить доступ и модифицировать все репозитории Gitea, а также базу данных, используемую Gitea. Следовательно, они также могут получить привилегии администратора Gitea. users.allow_import_local=Пользователь имеет право импортировать локальные репозитории -users.allow_create_organization=Эта учетная запись имеет разрешения на создание организаций -users.update_profile=Обновить профиль учетной записи -users.delete_account=Удалить эту учетную запись -users.still_own_repo=На вашем аккаунте все еще остается один или более репозиториев, сначала вам нужно удалить или передать их. -users.still_has_org=Эта учетная запись все еще является членом одной или более организаций. Для продолжения, покиньте или удалите организации. +users.allow_create_organization=Эта учётная запись имеет разрешения на создание организаций +users.update_profile=Обновить профиль пользователя +users.delete_account=Удалить эту учётную запись +users.still_own_repo=Этот пользователь всё ещё является владельцем одного или более репозиториев. Сначала удалите или передайте эти репозитории. +users.still_has_org=Этот пользователь всё ещё является членом одной или более организаций. Сначала удалите пользователя из всех организаций. users.deletion_success=Учётная запись успешно удалена. users.reset_2fa=Сброс 2FA users.list_status_filter.menu_text=Фильтр @@ -2430,7 +2441,7 @@ auths.attribute_username_placeholder=Оставьте пустым, чтобы auths.attribute_name=Атрибут First Name auths.attribute_surname=Атрибут Surname auths.attribute_mail=Атрибут электронной почты -auths.attribute_ssh_public_key=Атрибут Открытый SSH ключ +auths.attribute_ssh_public_key=Атрибут Открытый ключ SSH auths.attribute_avatar=Характеристики аватара auths.attributes_in_bind=Извлекать атрибуты в контексте Bind DN auths.allow_deactivate_all=Разрешить пустой результат поиска для отключения всех пользователей @@ -2439,7 +2450,7 @@ auths.search_page_size=Размер страницы auths.filter=Фильтр пользователя auths.admin_filter=Фильтр администратора auths.restricted_filter=Ограниченный фильтр -auths.restricted_filter_helper=Оставьте пустым, чтобы не устанавливать никаких пользователей как ограниченные. Используйте звездочку ('*'), чтобы установить всех пользователей, не соответствующих фильтру администратора. +auths.restricted_filter_helper=Оставьте пустым, чтобы не назначать никаких пользователей ограниченными. Используйте звёздочку ('*'), чтобы сделать ограниченными всех пользователей, не соответствующих фильтру администратора. auths.group_search_base=Поисковая база групп DN auths.group_attribute_list_users=Атрибут группы, содержащий список пользователей auths.user_attribute_in_group=Атрибут пользователя в группе @@ -2491,7 +2502,7 @@ auths.tip.dropbox=Добавьте новое приложение на https:// auths.tip.facebook=Создайте новое приложение на https://developers.facebook.com/apps и добавьте модуль "Facebook Login" auths.tip.github=Добавьте OAuth приложение на https://github.com/settings/applications/new auths.tip.gitlab=Добавьте новое приложение на https://gitlab.com/profile/applications -auths.tip.google_plus=Получите учетные данные клиента OAuth2 в консоли Google API на странице https://console.developers.google.com/ +auths.tip.google_plus=Получите учётные данные клиента OAuth2 в консоли Google API на странице https://console.developers.google.com/ auths.tip.openid_connect=Используйте OpenID Connect Discovery URL (/.well-known/openid-configuration) для автоматической настройки входа OAuth auths.tip.twitter=Перейдите на https://dev.twitter.com/apps, создайте приложение и убедитесь, что включена опция «Разрешить это приложение для входа в систему с помощью Twitter» auths.tip.discord=Добавьте новое приложение на https://discordapp.com/developers/applications/me @@ -2507,7 +2518,7 @@ auths.delete=Удалить этот источник аутентификаци auths.delete_auth_title=Удалить источник аутентификации auths.delete_auth_desc=Этот источник аутентификации будет удалён, вы уверены, что вы хотите продолжить? auths.still_in_used=Эта проверка подлинности до сих пор используется некоторыми пользователями, удалите или преобразуйте этих пользователей в другой тип входа в систему. -auths.deletion_success=Канал аутентификации успешно удалён! +auths.deletion_success=Канал аутентификации успешно удалён. auths.login_source_exist=Источник входа '%s' уже существует. auths.login_source_of_type_exist=Источник аутентификации этого типа уже существует. config.server_config=Конфигурация сервера @@ -2715,6 +2726,7 @@ notices.desc=Описание notices.op=Oп. notices.delete_success=Уведомления системы были удалены. config.mailer_smtp_port=SMTP-порт +users.purge_help=Принудительное удаление пользователя и любых репозиториев, организаций и пакетов, принадлежащих пользователю. Комментарии тоже будут удалены. [action] create_repo=создал(а) репозиторий %s @@ -2738,7 +2750,7 @@ 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 из зеркала +mirror_sync_delete=синхронизированные и удалённые ссылки %[2]s на %[3]s из зеркала approve_pull_request=утвердил(а) задачу %[3]s#%[2]s reject_pull_request=предложил(а) изменения для %[3]s#%[2]s publish_release=выпустил(а) "%[4]s" в %[3]s @@ -2792,9 +2804,9 @@ default_key=Подписано ключом по умолчанию error.extract_sign=Не удалось извлечь подпись error.generate_hash=Не удается создать хэш коммита error.no_committer_account=Аккаунт пользователя с такой электронной почтой не найден -error.no_gpg_keys_found=Не найден GPG ключ соответствующий данной подписи +error.no_gpg_keys_found=Не найден ключ, соответствующий данной подписи error.not_signed_commit=Неподписанный коммит -error.failed_retrieval_gpg_keys=Не удалось получить соответствующий GPG ключ пользователя +error.failed_retrieval_gpg_keys=Не удалось получить ни одного ключа GPG автора коммита error.probable_bad_signature=ПРЕДУПРЕЖДЕНИЕ! Хотя в базе данных есть ключ с этим идентификатором! Это коммит SUSPICIOUS (подозрительный). error.probable_bad_default_signature=ПРЕДУПРЕЖДЕНИЕ! Хотя ключ по умолчанию имеет этот идентификатор, он не проверяет это коммит! Это коммит SUSPICIOUS (подозрительный). @@ -2822,6 +2834,18 @@ container.labels.value=Значение dependency.version=Версия npm.dependencies=Зависимости owner.settings.cleanuprules.enabled=Включено +composer.install=Чтобы установить пакет с помощью Composer, выполните следующую команду: +conan.install=Чтобы установить пакет с помощью Conan, выполните следующую команду: +container.labels=Метки +generic.documentation=Для получения дополнительной информации об общем реестре смотрите документацию. +rubygems.required.ruby=Требуется версия Ruby +rubygems.required.rubygems=Требуется версия RubyGem +settings.link.button=Обновить ссылку на репозиторий +settings.delete=Удалить пакет +settings.delete.notice=Вы собираетесь удалить %s (%s). Эта операция необратима, вы уверены? +settings.delete.success=Пакет был удалён. +settings.delete.error=Не удалось удалить пакет. +owner.settings.cleanuprules.success.delete=Правило очистки удалено. [aria] @@ -2838,3 +2862,5 @@ runners.task_list.repository=Репозиторий runners.task_list.commit=коммит runners.status.active=Активный runs.commit=коммит +runners.labels=Метки +runners.delete_runner_success=Раннер успешно удалён diff --git a/options/locale/locale_si-LK.ini b/options/locale/locale_si-LK.ini index 74dfdb703f10..bf098607573a 100644 --- a/options/locale/locale_si-LK.ini +++ b/options/locale/locale_si-LK.ini @@ -106,7 +106,7 @@ host=සත්කාරක user=පරිශීලක නාමය password=මුරපදය db_name=දත්ත සමුදායේ නම -db_helper=MySQL පරිශීලකයින්ට සටහන: කරුණාකර InnodB ගබඩා එන්ජිම භාවිතා කරන්න. ඔබ “utf8mb4" භාවිතා කරන්නේ නම්, ඔබේ InnodB අනුවාදය 5.6 ට වඩා වැඩි විය යුතුය. +db_helper=MySQL පරිශීලකයින්ට සටහන: කරුණාකර InnodB ගබඩා එන්ජිම භාවිතා කරන්න. ඔබ "utf8mb4" භාවිතා කරන්නේ නම්, ඔබේ InnodB අනුවාදය 5.6 ට වඩා වැඩි විය යුතුය. db_schema=යෝජනා ක්රමය db_schema_helper=දත්ත සමුදා පෙරනිමි සඳහා හිස්ව තබන්න (“පොදු”). charset=චාසෙට් @@ -1105,10 +1105,10 @@ issues.closed_at=මෙම ගැටළුව වසා %[2]s issues.ref_issue_from=මෙම නිකුතුව%[4]හි %[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_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_reopened_from=මෙම නිකුතුව%[4]s %[2]sනැවත විවෘත කරන ලදි issues.ref_from=හිම%[1]s issues.poster=පෝස්ටර් issues.collaborator=සහයෝගීතාව @@ -1140,7 +1140,7 @@ issues.label.filter_sort.by_size=කුඩාම ප්‍රමාණය issues.label.filter_sort.reverse_by_size=විශාලම ප්‍රමාණය issues.num_participants=සහභාගිවන්නන් %d issues.attachment.open_tab=නව වගුවක "%s" බැලීමට ක්ලික් කරන්න -issues.attachment.download="%s“ බාගැනීමට ඔබන්න +issues.attachment.download="%s" බාගැනීමට ඔබන්න issues.subscribe=දායක වන්න issues.unsubscribe=දායක වන්න issues.lock=ලොක් සංවාදය @@ -1182,7 +1182,7 @@ issues.add_time_hours=පැය issues.add_time_minutes=විනාඩි issues.add_time_sum_to_small=කාලයක් ඇතුළු නොවීය. issues.time_spent_total=වැය කළ මුළු කාලය -issues.time_spent_from_all_authors="""වැය කළ මුළු කාලය: %s`""" +issues.time_spent_from_all_authors=වැය කළ මුළු කාලය: %s issues.due_date=නියමිත දිනය issues.invalid_due_date_format=නියමිත දින ආකෘතිය 'yyy-mm-dd' විය යුතුය. issues.error_modifying_due_date=නියමිත දිනය වෙනස් කිරීමට අපොහොසත් විය. @@ -1287,7 +1287,7 @@ pulls.manually_merged=අතින් සංයුක්ත කර ඇත pulls.manually_merged_as=මෙම අදින්න ඉල්ලීම අතින් %[2]ගේලෙස ඒකාබද්ධ කර ඇත. pulls.is_closed=අදින්න ඉල්ලීම වසා දමා ඇත. pulls.has_merged=මෙම අදින්න ඉල්ලීම ඒකාබද්ධ කර ඇත. -pulls.title_wip_desc="""0අහම්බෙන් ඒකාබද්ධ කිරීමෙන් අදින්න ඉල්ලීම වැළැක්වීම සඳහා %s සමඟ මාතෘකාව ආරම්භ කරන්න. `""" +pulls.title_wip_desc=අහම්බෙන් ඒකාබද්ධ කිරීමෙන් අදින්න ඉල්ලීම වැළැක්වීම සඳහා %s සමඟ මාතෘකාව ආරම්භ කරන්න. pulls.cannot_merge_work_in_progress=මෙම අදින්න ඉල්ලීම ක්රියාත්මක වන කාර්යයක් ලෙස සලකුණු කර ඇත. pulls.still_in_progress=තවමත් ක්රියාත්මක වෙමින් තිබේද? pulls.add_prefix=%s උපසර්ගය එකතු කරන්න @@ -1337,7 +1337,7 @@ pulls.rebase_conflict_summary=දෝෂ පණිවිඩය pulls.unrelated_histories=ඒකාබද්ධ කිරීම අසමත් විය: ඒකාබද්ධ හිස සහ පාදය පොදු ඉතිහාසයක් බෙදා නොගනී. ඉඟිය: වෙනත් උපාය මාර්ගයක් උත්සාහ කරන්න pulls.merge_out_of_date=ඒකාබද්ධ කිරීම අසමත් විය: ඒකාබද්ධ කිරීම ජනනය කරන අතර, පදනම යාවත්කාලීන කරන ලදී. ඉඟිය: නැවත උත්සාහ කරන්න. pulls.push_rejected_summary=පූර්ණ ප්රතික්ෂේප පණිවිඩය -pulls.open_unmerged_pull_exists="""සමාන ගුණාංග සහිත අදින්න ඉල්ලීමක් (#%d) ඇති බැවින් ඔබට නැවත විවෘත කිරීමේ මෙහෙයුමක් කළ නොහැක. `""" +pulls.open_unmerged_pull_exists=සමාන ගුණාංග සහිත අදින්න ඉල්ලීමක් (#%d) ඇති බැවින් ඔබට නැවත විවෘත කිරීමේ මෙහෙයුමක් කළ නොහැක. pulls.status_checking=සමහර චෙක්පත් බලා ඇත pulls.status_checks_success=සියලුම චෙක්පත් සාර්ථක විය pulls.status_checks_warning=සමහර චෙක්පත් අනතුරු ඇඟවීම් වාර්තා කරයි @@ -1576,7 +1576,7 @@ settings.transfer_notices_2=- ඔබ එය ඔබට (co-) අයිති ස settings.transfer_notices_3=- ගබඩාව පුද්ගලික වන අතර එය තනි පරිශීලකයෙකුට මාරු කරනු ලැබේ නම්, මෙම ක්රියාව පරිශීලකයාට අවම වශයෙන් කියවීමට අවසර ලබා ඇති බවට වග බලා ගනී (සහ අවශ්ය නම් අවසර වෙනස් කරයි). settings.transfer_owner=නව හිමිකරු settings.transfer_perform=මාරු කිරීම සිදු කරන්න -settings.transfer_started=මෙම ගබඩාව මාරු කිරීම සඳහා සලකුණු කර ඇති අතර "%s” වෙතින් තහවුරු කර ගැනීමට බලාපොරොත්තු වේ +settings.transfer_started=මෙම ගබඩාව මාරු කිරීම සඳහා සලකුණු කර ඇති අතර "%s" වෙතින් තහවුරු කර ගැනීමට බලාපොරොත්තු වේ settings.transfer_succeed=ගබඩාව මාරු කර ඇත. settings.signing_settings=සත්යාපන සැකසුම් අත්සන් කිරීම settings.trust_model=අත්සන භාර ආකෘතිය @@ -2322,7 +2322,7 @@ auths.sspi_auto_activate_users_helper=නව පරිශීලකයින් auths.sspi_strip_domain_names=පරිශීලක නාම වලින් වසම් නාම ඉවත් කරන්න auths.sspi_strip_domain_names_helper=පරීක්ෂා කර ඇත්නම්, ඩොමේන් නම් ලොගන් නම් වලින් ඉවත් කරනු ලැබේ (උදා. “ඩොමේන්\ පරිශීලක” සහ "user@example.org" යන දෙකම හුදෙක් “පරිශීලක” බවට පත්වනු ඇත). auths.sspi_separator_replacement=\,/සහ @ වෙනුවට භාවිතා කිරීමට වෙන්කර -auths.sspi_separator_replacement_helper=පහළ මට්ටමේ පිවිසුම් නාම (ද. “ඩොමේන්\ පරිශීලක” හි) සහ පරිශීලක ප්රධාන නම් (ද. @ in "user@example.org “). +auths.sspi_separator_replacement_helper=පහළ මට්ටමේ පිවිසුම් නාම (ද. "ඩොමේන්\ පරිශීලක" හි) සහ පරිශීලක ප්රධාන නම් (ද. @ in "user@example.org"). auths.sspi_default_language=පෙරනිමි පරිශීලක භාෂාව auths.sspi_default_language_helper=SSPI auth ක්රමය මගින් ස්වයංක්රීයව නිර්මාණය කරන ලද පරිශීලකයින් සඳහා පෙරනිමි භාෂාව. ඔබ භාෂාව ස්වයංක්රීයව හඳුනා ගැනීමට කැමති නම් හිස්ව තබන්න. auths.tips=ඉඟි diff --git a/options/locale/locale_sv-SE.ini b/options/locale/locale_sv-SE.ini index f6053e5b7c2c..c2eb8d930834 100644 --- a/options/locale/locale_sv-SE.ini +++ b/options/locale/locale_sv-SE.ini @@ -311,7 +311,7 @@ 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 ('.')." -git_ref_name_error=" måste vara ett för Git välformaterat referensnamn." +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." max_size_error=" får inte innehålla mer än %s tecken." diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini index f9761a8d83e7..1ac122e95458 100644 --- a/options/locale/locale_uk-UA.ini +++ b/options/locale/locale_uk-UA.ini @@ -2349,7 +2349,7 @@ auths.search_page_size=Розмір сторінки auths.filter=Користувацький фільтр auths.admin_filter=Фільтр адміністратора auths.restricted_filter=Обмежуючий фільтр -auths.restricted_filter_helper=Залиште пустим, щоб не встановлювати обмеження на жодного з користувачів. Використовуйте зірочку ("*') щоб встановити обмеження на всіх користувачів, які не відповідають фільтру Адміністратора. +auths.restricted_filter_helper=Залиште пустим, щоб не встановлювати обмеження на жодного з користувачів. Використовуйте зірочку ('*') щоб встановити обмеження на всіх користувачів, які не відповідають фільтру Адміністратора. auths.group_search_base=Пошукова база груп DN auths.group_attribute_list_users=Атрибут групи зі списком користувачів auths.user_attribute_in_group=Атрибути користувача в групі diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 60faa66453a4..6d9ed8bf3e07 100644 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -2271,6 +2271,7 @@ settings.protected_branch_required_rule_name=必须填写规则名称 settings.protected_branch_duplicate_rule_name=规则名称已存在 release.releases_for=%s 的版本发布 release.tags_for=%s 的标签 +actions=Actions [org] org_name_holder=组织名称 @@ -2662,7 +2663,7 @@ auths.sspi_auto_activate_users_helper=允许 SSPI 认证自动激活新用户 auths.sspi_strip_domain_names=从用户名中删除域名部分 auths.sspi_strip_domain_names_helper=如果选中此项，域名将从登录名中删除(例如，"DOMAIN\user"和"user@example.org"，两者都将变成只是“用户”)。 auths.sspi_separator_replacement=要使用的分隔符代替\, / 和 @ -auths.sspi_separator_replacement_helper=用于替换下级登录名称分隔符的字符 (例如) "DOMAIN\user") 中的 \ 和用户主名字(如"user@example.org中的 @ )。 +auths.sspi_separator_replacement_helper=用于替换下级登录名称分隔符的字符 (例如 "DOMAIN\user") 中的 \ 和用户主名字(如"user@example.org"中的 @)。 auths.sspi_default_language=默认语言 auths.sspi_default_language_helper=SSPI 认证方法为用户自动创建的默认语言。如果您想要自动检测到语言，请留空。 auths.tips=帮助提示 diff --git a/options/locale/locale_zh-HK.ini b/options/locale/locale_zh-HK.ini index 0a2505712760..23a1d1e24ce3 100644 --- a/options/locale/locale_zh-HK.ini +++ b/options/locale/locale_zh-HK.ini @@ -684,7 +684,7 @@ auths.tips.oauth2.general=OAuth2 認證 auths.tips.oauth2.general.tip=當註冊一個新的 OAuth2 認證，callback/redirect 網址應該是：/user/oauth2//callback auths.tip.oauth2_provider=OAuth2 提供者 auths.tip.dropbox=建立新 App 在 https://www.dropbox.com/developers/apps -auths.tip.facebook=在 https://developers.facebook.com/apps 註冊一個新的應用，並且新增一個產品 "Facebook Login +auths.tip.facebook=在 https://developers.facebook.com/apps 註冊一個新的應用，並且新增一個產品 "Facebook Login" auths.tip.github=在 https://github.com/settings/applications/new 註冊一個新的 OAuth 應用程式 auths.tip.gitlab=在 https://gitlab.com/profile/applications 註冊一個新的應用程式 auths.tip.openid_connect=使用 OpenID 連接探索 URL (/.well-known/openid-configuration) 來指定節點 diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini index 1fe4fb12d351..87c300db97a6 100644 --- a/options/locale/locale_zh-TW.ini +++ b/options/locale/locale_zh-TW.ini @@ -2271,6 +2271,7 @@ settings.protected_branch_required_rule_name=必須填寫規則名稱 settings.protected_branch_duplicate_rule_name=規則名稱已存在 release.releases_for=%s 的版本發佈 release.tags_for=%s 的標籤 +actions=Actions [org] org_name_holder=組織名稱 From 5066b208dea8056d16b000789a41166b5db63605 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 7 Apr 2023 15:49:26 +0800 Subject: [PATCH 179/340] Merge `push to create`, `open PR from push`, and `push options` docs articles into one (#23744) (#23959) backport #23744 --- docs/content/doc/usage/push-options.en-us.md | 33 --------- docs/content/doc/usage/push-options.zh-tw.md | 33 --------- docs/content/doc/usage/push.en-us.md | 71 +++++++++++++++++++ docs/content/doc/usage/push.zh-tw.md | 69 ++++++++++++++++++ docs/static/gitea-push-hint.png | Bin 0 -> 421775 bytes 5 files changed, 140 insertions(+), 66 deletions(-) delete mode 100644 docs/content/doc/usage/push-options.en-us.md delete mode 100644 docs/content/doc/usage/push-options.zh-tw.md create mode 100644 docs/content/doc/usage/push.en-us.md create mode 100644 docs/content/doc/usage/push.zh-tw.md create mode 100644 docs/static/gitea-push-hint.png diff --git a/docs/content/doc/usage/push-options.en-us.md b/docs/content/doc/usage/push-options.en-us.md deleted file mode 100644 index 8d7de19609c8..000000000000 --- a/docs/content/doc/usage/push-options.en-us.md +++ /dev/null @@ -1,33 +0,0 @@ ---- -date: "2020-07-06T16:00:00+02:00" -title: "Usage: Push Options" -slug: "push-options" -weight: 15 -toc: false -draft: false -menu: - sidebar: - parent: "usage" - name: "Push Options" - weight: 15 - identifier: "push-options" ---- - -# Push Options - -In Gitea `1.13`, support for some [push options](https://git-scm.com/docs/git-push#Documentation/git-push.txt--oltoptiongt) -were added. - -## Supported Options - -- `repo.private` (true|false) - Change the repository's visibility. - - This is particularly useful when combined with push-to-create. - -- `repo.template` (true|false) - Change whether the repository is a template. - -Example of changing a repository's visibility to public: - -```shell -git push -o repo.private=false -u origin master -``` diff --git a/docs/content/doc/usage/push-options.zh-tw.md b/docs/content/doc/usage/push-options.zh-tw.md deleted file mode 100644 index d6ffbe695b40..000000000000 --- a/docs/content/doc/usage/push-options.zh-tw.md +++ /dev/null @@ -1,33 +0,0 @@ ---- -date: "2020-07-06T16:00:00+02:00" -title: "使用: Push Options" -slug: "push-options" -weight: 15 -toc: false -draft: false -menu: - sidebar: - parent: "usage" - name: "Push Options" - weight: 15 - identifier: "push-options" ---- - -# Push Options - -Gitea 從 `1.13` 版開始支援某些 [push options](https://git-scm.com/docs/git-push#Documentation/git-push.txt--oltoptiongt) -。 - -## 支援的 Options - -- `repo.private` (true|false) - 修改儲存庫的可見性。 - - 與 push-to-create 一起使用時特別有用。 - -- `repo.template` (true|false) - 修改儲存庫是否為範本儲存庫。 - -以下範例修改儲存庫的可見性為公開： - -```shell -git push -o repo.private=false -u origin master -``` diff --git a/docs/content/doc/usage/push.en-us.md b/docs/content/doc/usage/push.en-us.md new file mode 100644 index 000000000000..cf858e4e511b --- /dev/null +++ b/docs/content/doc/usage/push.en-us.md @@ -0,0 +1,71 @@ +--- +date: "2020-07-06T16:00:00+02:00" +title: "Usage: Push" +slug: "push" +weight: 15 +toc: false +draft: false +menu: + sidebar: + parent: "usage" + name: "Push" + weight: 15 + identifier: "push" +--- + +**Table of Contents** + +{{< toc >}} + +There are some additional features when pushing commits to Gitea server. + +# Open PR through Push + +When you push commits to a non-default branch for the first time, +you will receive a link you can click on to visit the compare page of your branch compared to your main branch. +From there, it's easy to create a pull request, even if you want to target another branch. + +![Gitea Push Hint](/gitea-push-hint.png) + +# Push Options + +In Gitea `1.13`, support for some [push options](https://git-scm.com/docs/git-push#Documentation/git-push.txt--oltoptiongt) +were added. + +## Supported Options + +- `repo.private` (true|false) - Change the repository's visibility. + + This is particularly useful when combined with push-to-create. + +- `repo.template` (true|false) - Change whether the repository is a template. + +Example of changing a repository's visibility to public: + +```shell +git push -o repo.private=false -u origin main +``` + +# Push To Create + +Push to create is a feature that allows you to push to a repository that does not exist yet in Gitea. This is useful for automation and for allowing users to create repositories without having to go through the web interface. This feature is disabled by default. + +## Enabling Push To Create + +In the `app.ini` file, set `ENABLE_PUSH_CREATE_USER` to `true` and `ENABLE_PUSH_CREATE_ORG` to `true` if you want to allow users to create repositories in their own user account and in organizations they are a member of respectively. Restart Gitea for the changes to take effect. You can read more about these two options in the [Configuration Cheat Sheet]({{< relref "doc/administration/config-cheat-sheet.en-us.md#repository-repository" >}}). + +## Using Push To Create + +Assuming you have a git repository in the current directory, you can push to a repository that does not exist yet in Gitea by running the following command: + +```shell +# Add the remote you want to push to +git remote add origin git@{domain}:{username}/{repo name that does not exist yet}.git + +# push to the remote +git push -u origin main +``` + +This assumes you are using an SSH remote, but you can also use HTTPS remotes as well. + +Push-to-create will default to the visibility defined by `DEFAULT_PUSH_CREATE_PRIVATE` in `app.ini`. diff --git a/docs/content/doc/usage/push.zh-tw.md b/docs/content/doc/usage/push.zh-tw.md new file mode 100644 index 000000000000..f97d4285cc06 --- /dev/null +++ b/docs/content/doc/usage/push.zh-tw.md @@ -0,0 +1,69 @@ +--- +date: "2020-07-06T16:00:00+02:00" +title: "使用: Push" +slug: "push" +weight: 15 +toc: false +draft: false +menu: + sidebar: + parent: "usage" + name: "Push" + weight: 15 + identifier: "push" +--- + +**Table of Contents** + +{{< toc >}} + +There are some additional features when pushing commits to Gitea server. + +# Push Merge Hint + +When you pushing commits to a non-default branch, you will get an information from +Gitea which is a link, you can click the link and go to a compare page. It's a quick +way to create a pull request or a code review yourself in the Gitea UI. + +![Gitea Push Hint](/gitea-push-hint.png) + +# Push Options + +Gitea 從 `1.13` 版開始支援某些 [push options](https://git-scm.com/docs/git-push#Documentation/git-push.txt--oltoptiongt) +。 + +## 支援的 Options + +- `repo.private` (true|false) - 修改儲存庫的可見性。 + + 與 push-to-create 一起使用時特別有用。 + +- `repo.template` (true|false) - 修改儲存庫是否為範本儲存庫。 + +以下範例修改儲存庫的可見性為公開： + +```shell +git push -o repo.private=false -u origin main +``` + +# Push To Create + +Push to create is a feature that allows you to push to a repository that does not exist yet in Gitea. This is useful for automation and for allowing users to create repositories without having to go through the web interface. This feature is disabled by default. + +## Enabling Push To Create + +In the `app.ini` file, set `ENABLE_PUSH_CREATE_USER` to `true` and `ENABLE_PUSH_CREATE_ORG` to `true` if you want to allow users to create repositories in their own user account and in organizations they are a member of respectively. Restart Gitea for the changes to take effect. You can read more about these two options in the [Configuration Cheat Sheet]({{< relref "doc/administration/config-cheat-sheet.zh-tw.md#repository-repository" >}}). + +## Using Push To Create + +Assuming you have a git repository in the current directory, you can push to a repository that does not exist yet in Gitea by running the following command: + +```shell +# Add the remote you want to push to +git remote add origin git@{domain}:{username}/{repo name that does not exist yet}.git + +# push to the remote +git push -u origin main +``` + +This assumes you are using an SSH remote, but you can also use HTTPS remotes as well. diff --git a/docs/static/gitea-push-hint.png b/docs/static/gitea-push-hint.png new file mode 100644 index 0000000000000000000000000000000000000000..6f3ab3c60682295c35f5bcef1311e40b533a2cca GIT binary patch literal 421775 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[ti}Ky>vS*)m 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≫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

    M@!Y&rMX21C3*;oUPcm`(OOHgd46 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 VTy&(-oN?^PEU(#^<4ipg{{tY7lfeK0 literal 0 HcmV?d00001 From 085b56302cfd9a949319a3a1e32e008b4a0d0772 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 7 Apr 2023 12:10:17 +0200 Subject: [PATCH 180/340] Support "." char as user name for User/Orgs in RSS/ATOM/GPG/KEYS path ... (#23874) (#23878) Backport #23874 --- models/fixtures/action.yml | 9 +++++ models/fixtures/user.yml | 38 +++++++++++++++++++ models/user/user_test.go | 4 +- routers/web/web.go | 52 +++++++++++++++++++++----- tests/integration/api_nodeinfo_test.go | 2 +- tests/integration/setting_test.go | 4 +- tests/integration/user_test.go | 13 +++++++ 7 files changed, 107 insertions(+), 15 deletions(-) diff --git a/models/fixtures/action.yml b/models/fixtures/action.yml index a75092feb0ec..af9ce93ba5c5 100644 --- a/models/fixtures/action.yml +++ b/models/fixtures/action.yml @@ -64,3 +64,12 @@ repo_id: 1700 # dangling intentional is_private: false created_unix: 1603011541 + +- id: 9 + user_id: 34 + op_type: 12 # close issue + act_user_id: 34 + repo_id: 1 # public + is_private: false + created_unix: 1680454039 + content: '4|' # issueId 5 diff --git a/models/fixtures/user.yml b/models/fixtures/user.yml index b1c7fc003067..0624d4903d8f 100644 --- a/models/fixtures/user.yml +++ b/models/fixtures/user.yml @@ -1220,3 +1220,41 @@ repo_admin_change_team_access: false theme: "" keep_activity_private: false + +- + id: 34 + lower_name: the_34-user.with.all.allowedchars + name: the_34-user.with.all.allowedChars + full_name: the_1-user.with.all.allowedChars + description: 'some [commonmark](https://commonmark.org/)!' + email: user34@example.com + keep_email_private: false + email_notifications_preference: enabled + passwd: ZogKvWdyEx:password + passwd_hash_algo: dummy + must_change_password: false + login_source: 0 + login_name: the_34-user.with.all.allowedchars + type: 0 + salt: ZogKvWdyEx + max_repo_creation: -1 + is_active: true + is_admin: false + is_restricted: false + allow_git_hook: false + allow_import_local: false + allow_create_organization: false + prohibit_login: false + avatar: avatar34 + avatar_email: user34@example.com + use_custom_avatar: true + num_followers: 0 + num_following: 0 + num_stars: 0 + num_repos: 0 + num_teams: 0 + num_members: 0 + visibility: 0 + repo_admin_change_team_access: false + theme: "" + keep_activity_private: false diff --git a/models/user/user_test.go b/models/user/user_test.go index fc8f6b8d515c..8e78fee6b31d 100644 --- a/models/user/user_test.go +++ b/models/user/user_test.go @@ -99,13 +99,13 @@ func TestSearchUsers(t *testing.T) { } testUserSuccess(&user_model.SearchUserOptions{OrderBy: "id ASC", ListOptions: db.ListOptions{Page: 1}}, - []int64{1, 2, 4, 5, 8, 9, 10, 11, 12, 13, 14, 15, 16, 18, 20, 21, 24, 27, 28, 29, 30, 32}) + []int64{1, 2, 4, 5, 8, 9, 10, 11, 12, 13, 14, 15, 16, 18, 20, 21, 24, 27, 28, 29, 30, 32, 34}) testUserSuccess(&user_model.SearchUserOptions{ListOptions: db.ListOptions{Page: 1}, IsActive: util.OptionalBoolFalse}, []int64{9}) testUserSuccess(&user_model.SearchUserOptions{OrderBy: "id ASC", ListOptions: db.ListOptions{Page: 1}, IsActive: util.OptionalBoolTrue}, - []int64{1, 2, 4, 5, 8, 10, 11, 12, 13, 14, 15, 16, 18, 20, 21, 24, 27, 28, 29, 30, 32}) + []int64{1, 2, 4, 5, 8, 10, 11, 12, 13, 14, 15, 16, 18, 20, 21, 24, 27, 28, 29, 30, 32, 34}) testUserSuccess(&user_model.SearchUserOptions{Keyword: "user1", OrderBy: "id ASC", ListOptions: db.ListOptions{Page: 1}, IsActive: util.OptionalBoolTrue}, []int64{1, 10, 11, 12, 13, 14, 15, 16, 18}) diff --git a/routers/web/web.go b/routers/web/web.go index 843d7b36b8d6..aa198c0032f4 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -8,6 +8,7 @@ import ( "net/http" "os" "path" + "strings" "code.gitea.io/gitea/models/perm" "code.gitea.io/gitea/models/unit" @@ -651,16 +652,47 @@ func RegisterRoutes(m *web.Route) { }) http.ServeFile(ctx.Resp, ctx.Req, path.Join(setting.StaticRootPath, "public/img/favicon.png")) }) - m.Group("/{username}", func() { - m.Get(".png", user.AvatarByUserName) - m.Get(".keys", user.ShowSSHKeys) - m.Get(".gpg", user.ShowGPGKeys) - m.Get(".rss", feedEnabled, feed.ShowUserFeedRSS) - m.Get(".atom", feedEnabled, feed.ShowUserFeedAtom) - m.Get("", user.Profile) - }, func(ctx *context.Context) { - ctx.Data["EnableFeed"] = setting.EnableFeed - }, context_service.UserAssignmentWeb()) + m.Get("/{username}", func(ctx *context.Context) { + // WORKAROUND to support usernames with "." in it + // https://github.com/go-chi/chi/issues/781 + username := ctx.Params("username") + reloadParam := func(suffix string) (success bool) { + ctx.SetParams("username", strings.TrimSuffix(username, suffix)) + context_service.UserAssignmentWeb()(ctx) + return !ctx.Written() + } + switch { + case strings.HasSuffix(username, ".png"): + if reloadParam(".png") { + user.AvatarByUserName(ctx) + } + case strings.HasSuffix(username, ".keys"): + if reloadParam(".keys") { + user.ShowSSHKeys(ctx) + } + case strings.HasSuffix(username, ".gpg"): + if reloadParam(".gpg") { + user.ShowGPGKeys(ctx) + } + case strings.HasSuffix(username, ".rss"): + feedEnabled(ctx) + if !ctx.Written() && reloadParam(".rss") { + context_service.UserAssignmentWeb()(ctx) + feed.ShowUserFeedRSS(ctx) + } + case strings.HasSuffix(username, ".atom"): + feedEnabled(ctx) + if !ctx.Written() && reloadParam(".atom") { + feed.ShowUserFeedAtom(ctx) + } + default: + context_service.UserAssignmentWeb()(ctx) + if !ctx.Written() { + ctx.Data["EnableFeed"] = setting.EnableFeed + user.Profile(ctx) + } + } + }) m.Get("/attachments/{uuid}", repo.GetAttachment) }, ignSignIn) diff --git a/tests/integration/api_nodeinfo_test.go b/tests/integration/api_nodeinfo_test.go index 29fff8ba7261..bc2f11a7f298 100644 --- a/tests/integration/api_nodeinfo_test.go +++ b/tests/integration/api_nodeinfo_test.go @@ -33,7 +33,7 @@ func TestNodeinfo(t *testing.T) { DecodeJSON(t, resp, &nodeinfo) assert.True(t, nodeinfo.OpenRegistrations) assert.Equal(t, "gitea", nodeinfo.Software.Name) - assert.Equal(t, 24, nodeinfo.Usage.Users.Total) + assert.Equal(t, 25, nodeinfo.Usage.Users.Total) assert.Equal(t, 18, nodeinfo.Usage.LocalPosts) assert.Equal(t, 2, nodeinfo.Usage.LocalComments) }) diff --git a/tests/integration/setting_test.go b/tests/integration/setting_test.go index 54819c5b7d78..777faf8cc051 100644 --- a/tests/integration/setting_test.go +++ b/tests/integration/setting_test.go @@ -25,7 +25,7 @@ func TestSettingShowUserEmailExplore(t *testing.T) { htmlDoc := NewHTMLParser(t, resp.Body) assert.Contains(t, htmlDoc.doc.Find(".ui.user.list").Text(), - "user4@example.com", + "user34@example.com", ) setting.UI.ShowUserEmail = false @@ -35,7 +35,7 @@ func TestSettingShowUserEmailExplore(t *testing.T) { htmlDoc = NewHTMLParser(t, resp.Body) assert.NotContains(t, htmlDoc.doc.Find(".ui.user.list").Text(), - "user4@example.com", + "user34@example.com", ) setting.UI.ShowUserEmail = showUserEmail diff --git a/tests/integration/user_test.go b/tests/integration/user_test.go index febfe576cf9b..fa8e6e85c7a3 100644 --- a/tests/integration/user_test.go +++ b/tests/integration/user_test.go @@ -241,6 +241,19 @@ func testExportUserGPGKeys(t *testing.T, user, expected string) { assert.Equal(t, expected, resp.Body.String()) } +func TestGetUserRss(t *testing.T) { + user34 := "the_34-user.with.all.allowedChars" + req := NewRequestf(t, "GET", "/%s.rss", user34) + resp := MakeRequest(t, req, http.StatusOK) + if assert.EqualValues(t, "application/rss+xml;charset=utf-8", resp.Header().Get("Content-Type")) { + rssDoc := NewHTMLParser(t, resp.Body).Find("channel") + title, _ := rssDoc.ChildrenFiltered("title").Html() + assert.EqualValues(t, "Feed of "the_1-user.with.all.allowedChars"", title) + description, _ := rssDoc.ChildrenFiltered("description").Html() + assert.EqualValues(t, "<p>some <a href="https://commonmark.org/" rel="nofollow">commonmark</a>!</p>\n", description) + } +} + func TestListStopWatches(t *testing.T) { defer tests.PrepareTestEnv(t)() From 1b8ecd179bdb58427b99c2c2eb9ad5a45abf7055 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 7 Apr 2023 08:13:57 -0400 Subject: [PATCH 181/340] Title can be empty when creating tag only (#23917) (#23961) Backport #23917 by @Zettat123 Fixes #23809 Make the title not required. If the title is empty when creating release (not tag), an error message will be displayed. ![image](https://user-images.githubusercontent.com/15528715/229761056-c52e338b-5f25-4d7d-bb44-2cb0304abcee.png) Co-authored-by: Zettat123 --- options/locale/locale_en-US.ini | 1 + routers/web/repo/release.go | 6 ++++++ services/forms/repo_form.go | 2 +- templates/repo/release/new.tmpl | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 081ffb7abf29..5154aadb68c8 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2288,6 +2288,7 @@ release.tag_name = Tag name release.target = Target release.tag_helper = Choose an existing tag or create a new tag. release.title = Title +release.title_empty = Title cannot be empty. release.content = Content release.prerelease_desc = Mark as Pre-Release release.prerelease_helper = Mark this release unsuitable for production use. diff --git a/routers/web/repo/release.go b/routers/web/repo/release.go index e969fdc5ab37..63c8797fe56a 100644 --- a/routers/web/repo/release.go +++ b/routers/web/repo/release.go @@ -357,6 +357,12 @@ func NewReleasePost(ctx *context.Context) { return } + // Title of release cannot be empty + if len(form.TagOnly) == 0 && len(form.Title) == 0 { + ctx.RenderWithErr(ctx.Tr("repo.release.title_empty"), tplReleaseNew, &form) + return + } + var attachmentUUIDs []string if setting.Attachment.Enabled { attachmentUUIDs = form.Files diff --git a/services/forms/repo_form.go b/services/forms/repo_form.go index e9645b5ab737..a08f9bc9e434 100644 --- a/services/forms/repo_form.go +++ b/services/forms/repo_form.go @@ -693,7 +693,7 @@ type UpdateAllowEditsForm struct { type NewReleaseForm struct { TagName string `binding:"Required;GitRefName;MaxSize(255)"` Target string `form:"tag_target" binding:"Required;MaxSize(255)"` - Title string `binding:"Required;MaxSize(255)"` + Title string `binding:"MaxSize(255)"` Content string Draft string TagOnly string diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl index 37d7ca032196..0cac6705224d 100644 --- a/templates/repo/release/new.tmpl +++ b/templates/repo/release/new.tmpl @@ -42,7 +42,7 @@
    - +
    From 833a4b177596debc138e5723219fd063d067bd5b Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 7 Apr 2023 08:54:28 -0400 Subject: [PATCH 182/340] Hardcode path to docker images (#23955) (#23968) Backport #23955 by @techknowlogick Fix #23954 This allows for building on platforms that don't have docker hub as the default container registry. Co-authored-by: techknowlogick --- Dockerfile | 4 ++-- Dockerfile.rootless | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index fad8ae1790d5..3623085e4744 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ #Build stage -FROM golang:1.20-alpine3.17 AS build-env +FROM docker.io/library/golang:1.20-alpine3.17 AS build-env ARG GOPROXY ENV GOPROXY ${GOPROXY:-direct} @@ -23,7 +23,7 @@ RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \ # Begin env-to-ini build RUN go build contrib/environment-to-ini/environment-to-ini.go -FROM alpine:3.17 +FROM docker.io/library/alpine:3.17 LABEL maintainer="maintainers@gitea.io" EXPOSE 22 3000 diff --git a/Dockerfile.rootless b/Dockerfile.rootless index 98051f7ddba7..67bd9c4880fb 100644 --- a/Dockerfile.rootless +++ b/Dockerfile.rootless @@ -1,5 +1,5 @@ #Build stage -FROM golang:1.20-alpine3.17 AS build-env +FROM docker.io/library/golang:1.20-alpine3.17 AS build-env ARG GOPROXY ENV GOPROXY ${GOPROXY:-direct} @@ -23,7 +23,7 @@ RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \ # Begin env-to-ini build RUN go build contrib/environment-to-ini/environment-to-ini.go -FROM alpine:3.17 +FROM docker.io/library/alpine:3.17 LABEL maintainer="maintainers@gitea.io" EXPOSE 2222 3000 From 5b7df685554434d95d812191bf6d093d82993758 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 7 Apr 2023 08:55:30 -0400 Subject: [PATCH 183/340] Ensure RSS icon is present on all repo tabs (#23904) (#23973) Backport #23904 by @silverwind Previously, not all repo tabs had shown the RSS icon in the repo header because the context data was not being set. Added this context data in a new function. Before: image After: Screenshot 2023-04-04 at 00 16 17 Co-authored-by: silverwind --- modules/context/repo.go | 5 +++++ routers/web/repo/view.go | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/context/repo.go b/modules/context/repo.go index e4ac65e9618c..15c88d0b57ce 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -529,6 +529,11 @@ func RepoAssignment(ctx *Context) (cancel context.CancelFunc) { ctx.Data["RepoLink"] = ctx.Repo.RepoLink ctx.Data["RepoRelPath"] = ctx.Repo.Owner.Name + "/" + ctx.Repo.Repository.Name + if setting.EnableFeed { + ctx.Data["EnableFeed"] = true + ctx.Data["FeedURL"] = ctx.Repo.RepoLink + } + unit, err := ctx.Repo.Repository.GetUnit(ctx, unit_model.TypeExternalTracker) if err == nil { ctx.Data["RepoExternalIssuesLink"] = unit.ExternalTrackerConfig().ExternalTrackerURL diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go index 8663e1138208..866939702721 100644 --- a/routers/web/repo/view.go +++ b/routers/web/repo/view.go @@ -707,9 +707,6 @@ func Home(ctx *context.Context) { feed.ShowRepoFeed(ctx, ctx.Repo.Repository, showFeedType) return } - - ctx.Data["EnableFeed"] = true - ctx.Data["FeedURL"] = ctx.Repo.Repository.Link() } checkHomeCodeViewable(ctx) From f317186aa6318407eb428626521498c8fea00fd9 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 7 Apr 2023 09:55:59 -0400 Subject: [PATCH 184/340] Do not crash when parsing an invalid workflow file (#23972) (#23976) Backport #23972 by @wolfogre Fix #23658. Related to https://gitea.com/gitea/act/pulls/39 Co-authored-by: Jason Song --- go.mod | 2 +- go.sum | 4 ++-- modules/actions/workflows.go | 10 ++++++++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 8bb76673cebd..487d69fb46b2 100644 --- a/go.mod +++ b/go.mod @@ -285,7 +285,7 @@ replace github.com/shurcooL/vfsgen => github.com/lunny/vfsgen v0.0.0-20220105142 replace github.com/blevesearch/zapx/v15 v15.3.6 => github.com/zeripath/zapx/v15 v15.3.6-alignment-fix -replace github.com/nektos/act => gitea.com/gitea/act v0.243.2-0.20230329055922-5e76853b55ab +replace github.com/nektos/act => gitea.com/gitea/act v0.243.3-0.20230407083103-5c4a96bcb797 exclude github.com/gofrs/uuid v3.2.0+incompatible diff --git a/go.sum b/go.sum index 89a4d6a5512b..7d18293ef21c 100644 --- a/go.sum +++ b/go.sum @@ -70,8 +70,8 @@ codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570/go.mod h1:IIAjsi dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 h1:cliQ4HHsCo6xi2oWZYKWW4bly/Ory9FuTpFPRxj/mAg= git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078/go.mod h1:g/V2Hjas6Z1UHUp4yIx6bATpNzJ7DYtD0FG3+xARWxs= -gitea.com/gitea/act v0.243.2-0.20230329055922-5e76853b55ab h1:HDImhO/XpMJrw2PJcADI/wgur9Gro/pegLFaRt8Wpg0= -gitea.com/gitea/act v0.243.2-0.20230329055922-5e76853b55ab/go.mod h1:mabw6AZAiDgxGlK83orWLrNERSPvgBJzEUS3S7u2bHI= +gitea.com/gitea/act v0.243.3-0.20230407083103-5c4a96bcb797 h1:QdQ+pHxpbIi2qsgZbYVxqYV7trfW3P5M/T4AfpoM7iw= +gitea.com/gitea/act v0.243.3-0.20230407083103-5c4a96bcb797/go.mod h1:mabw6AZAiDgxGlK83orWLrNERSPvgBJzEUS3S7u2bHI= gitea.com/go-chi/binding v0.0.0-20221013104517-b29891619681 h1:MMSPgnVULVwV9kEBgvyEUhC9v/uviZ55hPJEMjpbNR4= gitea.com/go-chi/binding v0.0.0-20221013104517-b29891619681/go.mod h1:77TZu701zMXWJFvB8gvTbQ92zQ3DQq/H7l5wAEjQRKc= gitea.com/go-chi/cache v0.0.0-20210110083709-82c4c9ce2d5e/go.mod h1:k2V/gPDEtXGjjMGuBJiapffAXTv76H4snSmlJRLUhH0= diff --git a/modules/actions/workflows.go b/modules/actions/workflows.go index b0e70628a8e7..e9ff70156ffb 100644 --- a/modules/actions/workflows.go +++ b/modules/actions/workflows.go @@ -17,8 +17,18 @@ import ( "github.com/nektos/act/pkg/jobparser" "github.com/nektos/act/pkg/model" "github.com/nektos/act/pkg/workflowpattern" + "gopkg.in/yaml.v3" ) +func init() { + model.OnDecodeNodeError = func(node yaml.Node, out interface{}, err error) { + // Log the error instead of panic or fatal. + // It will be a big job to refactor act/pkg/model to return decode error, + // so we just log the error and return empty value, and improve it later. + log.Error("Failed to decode node %v into %T: %v", node, out, err) + } +} + func ListWorkflows(commit *git.Commit) (git.Entries, error) { tree, err := commit.SubTree(".gitea/workflows") if _, ok := err.(git.ErrNotExist); ok { From 3a7cb1a83b4ecd89421b5656b8caeb30c2b13c7c Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 7 Apr 2023 15:21:20 -0400 Subject: [PATCH 185/340] Use Get/Set instead of Rename when Regenerate session id (#23975) (#23983) Backport #23975 by @wxiaoguang Do not use Rename here, because the old sid and new sid may be in different redis cluster slot. Fix #23869 Co-authored-by: wxiaoguang --- modules/session/redis.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/modules/session/redis.go b/modules/session/redis.go index 5fb59e480457..b7cdbef6f8bf 100644 --- a/modules/session/redis.go +++ b/modules/session/redis.go @@ -183,16 +183,21 @@ func (p *RedisProvider) Regenerate(oldsid, sid string) (_ session.RawStore, err } } - if err = p.c.Rename(graceful.GetManager().HammerContext(), poldsid, psid).Err(); err != nil { + // do not use Rename here, because the old sid and new sid may be in different redis cluster slot. + kvs, err := p.c.Get(graceful.GetManager().HammerContext(), poldsid).Result() + if err != nil { return nil, err } - var kv map[interface{}]interface{} - kvs, err := p.c.Get(graceful.GetManager().HammerContext(), psid).Result() - if err != nil { + if err = p.c.Del(graceful.GetManager().HammerContext(), poldsid).Err(); err != nil { return nil, err } + if err = p.c.Set(graceful.GetManager().HammerContext(), psid, kvs, p.duration).Err(); err != nil { + return nil, err + } + + var kv map[interface{}]interface{} if len(kvs) == 0 { kv = make(map[interface{}]interface{}) } else { From 0487e39f8285b07c2cbc947a6f7552e8fc966fbe Mon Sep 17 00:00:00 2001 From: Jason Song Date: Sat, 8 Apr 2023 05:43:12 +0800 Subject: [PATCH 186/340] Treat PRs with agit flow as fork PRs when triggering actions. (#23884) (#23967) Backport #23884. There is no fork concept in agit flow, anyone with read permission can push `refs/for//` to the repo. So we should treat it as a fork pull request because it may be from an untrusted user. --- services/actions/notifier_helper.go | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/services/actions/notifier_helper.go b/services/actions/notifier_helper.go index f4f6a3aa5287..e9e8d5f4e01e 100644 --- a/services/actions/notifier_helper.go +++ b/services/actions/notifier_helper.go @@ -152,6 +152,21 @@ func notify(ctx context.Context, input *notifyInput) error { return fmt.Errorf("json.Marshal: %w", err) } + isForkPullRequest := false + if pr := input.PullRequest; pr != nil { + switch pr.Flow { + case issues_model.PullRequestFlowGithub: + isForkPullRequest = pr.IsFromFork() + case issues_model.PullRequestFlowAGit: + // There is no fork concept in agit flow, anyone with read permission can push refs/for// to the repo. + // So we can treat it as a fork pull request because it may be from an untrusted user + isForkPullRequest = true + default: + // unknown flow, assume it's a fork pull request to be safe + isForkPullRequest = true + } + } + for id, content := range workflows { run := actions_model.ActionRun{ Title: strings.SplitN(commit.CommitMessage, "\n", 2)[0], @@ -161,7 +176,7 @@ func notify(ctx context.Context, input *notifyInput) error { TriggerUserID: input.Doer.ID, Ref: ref, CommitSHA: commit.ID.String(), - IsForkPullRequest: input.PullRequest != nil && input.PullRequest.IsFromFork(), + IsForkPullRequest: isForkPullRequest, Event: input.Event, EventPayload: string(p), Status: actions_model.StatusWaiting, From 4019a6d4b2b6f702bbdc99d5ed478e01ba243d28 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 7 Apr 2023 22:32:42 -0400 Subject: [PATCH 187/340] Discolor pull request tab labels (#23950) (#23987) Backport #23950 by @silverwind https://github.com/go-gitea/gitea/pull/22687 has discolored the repo tab labels. This does the same for PR tabs for consistency. Value `0` is still rendered like before. Before: Screenshot 2023-04-06 at 19 35 24 After: Screenshot 2023-04-06 at 19 35 07 Screenshot 2023-04-06 at 19 38 37 Co-authored-by: silverwind --- templates/repo/pulls/tab_menu.tmpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/repo/pulls/tab_menu.tmpl b/templates/repo/pulls/tab_menu.tmpl index f6554c676d99..5e4390937c5f 100644 --- a/templates/repo/pulls/tab_menu.tmpl +++ b/templates/repo/pulls/tab_menu.tmpl @@ -2,16 +2,16 @@ {{svg "octicon-comment-discussion"}} {{$.locale.Tr "repo.pulls.tab_conversation"}} - {{.Issue.NumComments}} + {{.Issue.NumComments}} {{svg "octicon-git-commit"}} {{$.locale.Tr "repo.pulls.tab_commits"}} - {{if .NumCommits}}{{.NumCommits}}{{else}}N/A{{end}} + {{if .NumCommits}}{{.NumCommits}}{{else}}N/A{{end}} {{svg "octicon-diff"}} {{$.locale.Tr "repo.pulls.tab_files"}} - {{if .NumFiles}}{{.NumFiles}}{{else}}N/A{{end}} + {{if .NumFiles}}{{.NumFiles}}{{else}}N/A{{end}}
    From a00e4733415ede1dbf5af63b8fad1412bb4fe24c Mon Sep 17 00:00:00 2001 From: Giteabot Date: Sat, 8 Apr 2023 04:16:21 -0400 Subject: [PATCH 188/340] Remove `Repository.getFilesChanged` to fix Actions `paths` and `paths-ignore` filter (#23920) (#23969) Backport #23920 by @ChristopherHX Remove the misbehaving function and call Repository.GetFilesChangedBetween instead. Fixes #23919 --- ~~_TODO_ test this~~ `Repository.getFilesChanged` seems to be only used by Gitea Actions, but a similar function already exists **Update** I tested this change and the issue is gone. Co-authored-by: ChristopherHX --- modules/git/commit.go | 2 +- modules/git/repo_commit.go | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/modules/git/commit.go b/modules/git/commit.go index 4a55645d3034..2deda231147e 100644 --- a/modules/git/commit.go +++ b/modules/git/commit.go @@ -278,7 +278,7 @@ func (c *Commit) SearchCommits(opts SearchCommitsOptions) ([]*Commit, error) { // GetFilesChangedSinceCommit get all changed file names between pastCommit to current revision func (c *Commit) GetFilesChangedSinceCommit(pastCommit string) ([]string, error) { - return c.repo.getFilesChanged(pastCommit, c.ID.String()) + return c.repo.GetFilesChangedBetween(pastCommit, c.ID.String()) } // FileChangedSinceCommit Returns true if the file given has changed since the the past commit diff --git a/modules/git/repo_commit.go b/modules/git/repo_commit.go index a62e0670fedc..d566b62c582c 100644 --- a/modules/git/repo_commit.go +++ b/modules/git/repo_commit.go @@ -182,14 +182,6 @@ func (repo *Repository) searchCommits(id SHA1, opts SearchCommitsOptions) ([]*Co return repo.parsePrettyFormatLogToList(bytes.TrimSuffix(stdout, []byte{'\n'})) } -func (repo *Repository) getFilesChanged(id1, id2 string) ([]string, error) { - stdout, _, err := NewCommand(repo.Ctx, "diff", "--name-only").AddDynamicArguments(id1, id2).RunStdBytes(&RunOpts{Dir: repo.Path}) - if err != nil { - return nil, err - } - return strings.Split(string(stdout), "\n"), nil -} - // FileChangedBetweenCommits Returns true if the file changed between commit IDs id1 and id2 // You must ensure that id1 and id2 are valid commit ids. func (repo *Repository) FileChangedBetweenCommits(filename, id1, id2 string) (bool, error) { From 6a5b8eb7b6b73a2e78f4db6d7eb5d4c18a410b3a Mon Sep 17 00:00:00 2001 From: Giteabot Date: Sat, 8 Apr 2023 06:38:56 -0400 Subject: [PATCH 189/340] Fix redirect bug when creating issue from a project (#23971) (#23997) Backport #23971 by @lunny Fix #23966 Co-authored-by: Lunny Xiao --- routers/web/repo/issue.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 2b1991f262d8..1a17afeef34d 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -1150,8 +1150,8 @@ func NewIssuePost(ctx *context.Context) { } log.Trace("Issue created: %d/%d", repo.ID, issue.ID) - if ctx.FormString("redirect_after_creation") == "project" { - ctx.Redirect(ctx.Repo.RepoLink + "/projects/" + strconv.FormatInt(form.ProjectID, 10)) + if ctx.FormString("redirect_after_creation") == "project" && projectID > 0 { + ctx.Redirect(ctx.Repo.RepoLink + "/projects/" + strconv.FormatInt(projectID, 10)) } else { ctx.Redirect(issue.Link()) } From 4aabd8e82379fdda19f277dbc73a63333df75692 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Sat, 8 Apr 2023 08:43:46 -0400 Subject: [PATCH 190/340] Set `ref` to fully-formed of the tag when trigger event is `release` (#23944) (#23989) Backport #23944 by @sillyguodong Fix #23943 When trigger event is `release`, ref should be like `refs/tags/` instead of `CommitID` Co-authored-by: sillyguodong <33891828+sillyguodong@users.noreply.github.com> --- routers/api/actions/runner/utils.go | 3 ++- services/actions/notifier.go | 6 +++--- services/actions/notifier_helper.go | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/routers/api/actions/runner/utils.go b/routers/api/actions/runner/utils.go index 80e71941f21c..82f0da24492b 100644 --- a/routers/api/actions/runner/utils.go +++ b/routers/api/actions/runner/utils.go @@ -9,6 +9,7 @@ import ( actions_model "code.gitea.io/gitea/models/actions" secret_model "code.gitea.io/gitea/models/secret" + "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" secret_module "code.gitea.io/gitea/modules/secret" @@ -95,7 +96,7 @@ func generateTaskContext(t *actions_model.ActionTask) *structpb.Struct { "head_ref": "", // string, The head_ref or source branch of the pull request in a workflow run. This property is only available when the event that triggers a workflow run is either pull_request or pull_request_target. "job": fmt.Sprint(t.JobID), // string, The job_id of the current job. "ref": t.Job.Run.Ref, // string, The fully-formed ref of the branch or tag that triggered the workflow run. For workflows triggered by push, this is the branch or tag ref that was pushed. For workflows triggered by pull_request, this is the pull request merge branch. For workflows triggered by release, this is the release tag created. For other triggers, this is the branch or tag ref that triggered the workflow run. This is only set if a branch or tag is available for the event type. The ref given is fully-formed, meaning that for branches the format is refs/heads/, for pull requests it is refs/pull//merge, and for tags it is refs/tags/. For example, refs/heads/feature-branch-1. - "ref_name": t.Job.Run.Ref, // string, The short ref name of the branch or tag that triggered the workflow run. This value matches the branch or tag name shown on GitHub. For example, feature-branch-1. + "ref_name": git.RefEndName(t.Job.Run.Ref), // string, The short ref name of the branch or tag that triggered the workflow run. This value matches the branch or tag name shown on GitHub. For example, feature-branch-1. "ref_protected": false, // boolean, true if branch protections are configured for the ref that triggered the workflow run. "ref_type": "", // string, The type of ref that triggered the workflow run. Valid values are branch or tag. "path": "", // string, Path on the runner to the file that sets system PATH variables from workflow commands. This file is unique to the current step and is a different file for each step in a job. For more information, see "Workflow commands for GitHub Actions." diff --git a/services/actions/notifier.go b/services/actions/notifier.go index 90eed83eff5e..6956c25cee2f 100644 --- a/services/actions/notifier.go +++ b/services/actions/notifier.go @@ -443,17 +443,17 @@ func (n *actionsNotifier) NotifySyncDeleteRef(ctx context.Context, pusher *user_ func (n *actionsNotifier) NotifyNewRelease(ctx context.Context, rel *repo_model.Release) { ctx = withMethod(ctx, "NotifyNewRelease") - notifyRelease(ctx, rel.Publisher, rel, rel.Sha1, api.HookReleasePublished) + notifyRelease(ctx, rel.Publisher, rel, api.HookReleasePublished) } func (n *actionsNotifier) NotifyUpdateRelease(ctx context.Context, doer *user_model.User, rel *repo_model.Release) { ctx = withMethod(ctx, "NotifyUpdateRelease") - notifyRelease(ctx, doer, rel, rel.Sha1, api.HookReleaseUpdated) + notifyRelease(ctx, doer, rel, api.HookReleaseUpdated) } func (n *actionsNotifier) NotifyDeleteRelease(ctx context.Context, doer *user_model.User, rel *repo_model.Release) { ctx = withMethod(ctx, "NotifyDeleteRelease") - notifyRelease(ctx, doer, rel, rel.Sha1, api.HookReleaseDeleted) + notifyRelease(ctx, doer, rel, api.HookReleaseDeleted) } func (n *actionsNotifier) NotifyPackageCreate(ctx context.Context, doer *user_model.User, pd *packages_model.PackageDescriptor) { diff --git a/services/actions/notifier_helper.go b/services/actions/notifier_helper.go index e9e8d5f4e01e..32af1d26f660 100644 --- a/services/actions/notifier_helper.go +++ b/services/actions/notifier_helper.go @@ -209,7 +209,7 @@ func newNotifyInputFromIssue(issue *issues_model.Issue, event webhook_module.Hoo return newNotifyInput(issue.Repo, issue.Poster, event) } -func notifyRelease(ctx context.Context, doer *user_model.User, rel *repo_model.Release, ref string, action api.HookReleaseAction) { +func notifyRelease(ctx context.Context, doer *user_model.User, rel *repo_model.Release, action api.HookReleaseAction) { if err := rel.LoadAttributes(ctx); err != nil { log.Error("LoadAttributes: %v", err) return @@ -218,7 +218,7 @@ func notifyRelease(ctx context.Context, doer *user_model.User, rel *repo_model.R mode, _ := access_model.AccessLevel(ctx, doer, rel.Repo) newNotifyInput(rel.Repo, doer, webhook_module.HookEventRelease). - WithRef(ref). + WithRef(git.TagPrefix + rel.TagName). WithPayload(&api.ReleasePayload{ Action: action, Release: convert.ToRelease(ctx, rel), From 3dbc63777fd624b69511bea8638c5da034a3a670 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Sat, 8 Apr 2023 12:36:11 -0400 Subject: [PATCH 191/340] Adjust sticky pr header to cover background (#23956) (#23999) Backport #23956 by @silverwind Very minor CSS tweak: Adjust sticky PR header to cover the box-shadow of selected files. Before: Screenshot 2023-04-06 at 22 54 59 After: Screenshot 2023-04-06 at 22 54 46 Co-authored-by: silverwind Co-authored-by: Lunny Xiao --- web_src/css/repository.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web_src/css/repository.css b/web_src/css/repository.css index d67442b00af2..0ac254b37152 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -1631,10 +1631,10 @@ top: 0; z-index: 8; border-bottom: none; - padding-left: 2px; - padding-right: 2px; - margin-left: -1px; - margin-right: -1px; + padding-left: 5px; + padding-right: 5px; + margin-left: -4px; + margin-right: -4px; } .repository .diff-detail-box > div::after { From cfde557e231417b7fb3cde3e9bab70d05b7d182f Mon Sep 17 00:00:00 2001 From: Giteabot Date: Sat, 8 Apr 2023 17:13:43 -0400 Subject: [PATCH 192/340] =?UTF-8?q?fix:=20do=20not=20escape=20space=20betw?= =?UTF-8?q?een=20PyPI=20repository=20url=20and=20package=20name=E2=80=A6?= =?UTF-8?q?=20(#23981)=20(#24008)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Backport #23981 by @Gunzinger …; add trailing slash to PyPI repository URL (in accordance to PEP-503) This should solve Issue #23980, by moving the space in front of the package name and the package name out of the `gitea-origin-url` block. It also adds a trailing slash to the PyPI repository URL in accordance to [Python PEP-503](https://peps.python.org/pep-0503/). Co-authored-by: Daniel Gunzinger --- templates/package/content/pypi.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/package/content/pypi.tmpl b/templates/package/content/pypi.tmpl index 8dbed5395ebd..2576bdd9dea3 100644 --- a/templates/package/content/pypi.tmpl +++ b/templates/package/content/pypi.tmpl @@ -4,7 +4,7 @@
    - 
    pip install --index-url
    + 
    pip install --index-url  {{.PackageDescriptor.Package.Name}}
    From 695738fb31eb2d8ddbec489e3f30e2e89315cddc Mon Sep 17 00:00:00 2001 From: Giteabot Date: Sun, 9 Apr 2023 08:06:16 -0400 Subject: [PATCH 193/340] Show protected branch rule names again (#23907) (#24018) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Backport #23907 by @HesterG `!important`s for one of the primary label selectors are removed by #23774, so the repository branch protection settings ui will not have the demanding css. This PR modifies `.ui.primary.label` to fix it. Before: 飞书20230404-115410 After: 截屏2023-04-04 11 56 32 Co-authored-by: Hester Gong Co-authored-by: delvh Co-authored-by: Lunny Xiao --- web_src/css/base.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/web_src/css/base.css b/web_src/css/base.css index 343ffff82e54..51b2929c7cb1 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -2384,9 +2384,10 @@ a.ui.label:hover { } .ui.primary.label, -.ui.primary.labels .label { - background-color: var(--color-primary) !important; - border-color: var(--color-primary-dark-2) !important; +.ui.primary.labels .label, +.ui.ui.ui.primary.label { + background-color: var(--color-primary); + border-color: var(--color-primary-dark-2); } .ui.basic.labels .primary.label, From 2b10eebed8ba9eac88e7eadb2f3781059059c7d1 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Sun, 9 Apr 2023 08:48:28 -0400 Subject: [PATCH 194/340] Show errors for KaTeX and mermaid on the preview tab (#24009) (#24019) Backport #24009 by @silverwind There is a conflicting fomantic rule that hid the error messages inside the markdown preview tab for things like mermaid or katex. Overruled it to always show these errors. image Co-authored-by: silverwind --- web_src/css/markup/content.css | 1 + 1 file changed, 1 insertion(+) diff --git a/web_src/css/markup/content.css b/web_src/css/markup/content.css index 00283dd0a254..b87383bca8b0 100644 --- a/web_src/css/markup/content.css +++ b/web_src/css/markup/content.css @@ -540,6 +540,7 @@ } .markup-block-error { + display: block !important; /* override fomantic .ui.form .error.message {display: none} */ border: 1px solid var(--color-error-border) !important; margin-bottom: 0 !important; border-bottom-left-radius: 0 !important; From abf0386e2ef6b56c048c04cd3d6913f453c87cb1 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 10 Apr 2023 02:48:02 -0400 Subject: [PATCH 195/340] Fix protected branch for API (#24013) (#24027) Backport #24013 by @lunny Fix #23998 Co-authored-by: Lunny Xiao --- routers/api/v1/repo/branch.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go index 8acaeaffb417..114497d1af05 100644 --- a/routers/api/v1/repo/branch.go +++ b/routers/api/v1/repo/branch.go @@ -421,6 +421,10 @@ func CreateBranchProtection(ctx *context.APIContext) { if ruleName == "" { ruleName = form.BranchName //nolint } + if len(ruleName) == 0 { + ctx.Error(http.StatusBadRequest, "both rule_name and branch_name are empty", "both rule_name and branch_name are empty") + return + } isPlainRule := !git_model.IsRuleNameSpecial(ruleName) var isBranchExist bool @@ -502,7 +506,7 @@ func CreateBranchProtection(ctx *context.APIContext) { protectBranch = &git_model.ProtectedBranch{ RepoID: ctx.Repo.Repository.ID, - RuleName: form.RuleName, + RuleName: ruleName, CanPush: form.EnablePush, EnableWhitelist: form.EnablePush && form.EnablePushWhitelist, EnableMergeWhitelist: form.EnableMergeWhitelist, @@ -534,7 +538,7 @@ func CreateBranchProtection(ctx *context.APIContext) { } if isBranchExist { - if err = pull_service.CheckPRsForBaseBranch(ctx.Repo.Repository, form.RuleName); err != nil { + if err = pull_service.CheckPRsForBaseBranch(ctx.Repo.Repository, ruleName); err != nil { ctx.Error(http.StatusInternalServerError, "CheckPRsForBaseBranch", err) return } @@ -552,7 +556,7 @@ func CreateBranchProtection(ctx *context.APIContext) { }() } // FIXME: since we only need to recheck files protected rules, we could improve this - matchedBranches, err := git_model.FindAllMatchedBranches(ctx, ctx.Repo.GitRepo, form.RuleName) + matchedBranches, err := git_model.FindAllMatchedBranches(ctx, ctx.Repo.GitRepo, ruleName) if err != nil { ctx.Error(http.StatusInternalServerError, "FindAllMatchedBranches", err) return @@ -568,7 +572,7 @@ func CreateBranchProtection(ctx *context.APIContext) { } // Reload from db to get all whitelists - bp, err := git_model.GetProtectedBranchRuleByName(ctx, ctx.Repo.Repository.ID, form.RuleName) + bp, err := git_model.GetProtectedBranchRuleByName(ctx, ctx.Repo.Repository.ID, ruleName) if err != nil { ctx.Error(http.StatusInternalServerError, "GetProtectedBranchByID", err) return From 27dbe9754289135a8c1514c72ecbde727a213c8c Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 10 Apr 2023 04:36:21 -0400 Subject: [PATCH 196/340] Add actions support to package auth verification (#23729) (#24028) Backport #23729 by @yp05327 Partly fixes https://github.com/go-gitea/gitea/issues/23642 Error info: ![image](https://user-images.githubusercontent.com/18380374/227827027-4280a368-ec9e-49e0-bb93-6b496ada7cd9.png) ActionsUser (userID -2) is used to login in to docker in action jobs. Due to we have no permission policy settings of ActionsUser now, ActionsUser can only access public registry by this quick fix. Co-authored-by: yp05327 <576951401@qq.com> --- routers/api/packages/api.go | 52 ++++++++++---------------- routers/api/packages/container/auth.go | 7 +--- 2 files changed, 22 insertions(+), 37 deletions(-) diff --git a/routers/api/packages/api.go b/routers/api/packages/api.go index 0e3d8b7a02d7..c2841e19037f 100644 --- a/routers/api/packages/api.go +++ b/routers/api/packages/api.go @@ -43,35 +43,38 @@ func reqPackageAccess(accessMode perm.AccessMode) func(ctx *context.Context) { } } -// CommonRoutes provide endpoints for most package managers (except containers - see below) -// These are mounted on `/api/packages` (not `/api/v1/packages`) -func CommonRoutes(ctx gocontext.Context) *web.Route { - r := web.NewRoute() - - r.Use(context.PackageContexter(ctx)) - - authMethods := []auth.Method{ - &auth.OAuth2{}, - &auth.Basic{}, - &nuget.Auth{}, - &conan.Auth{}, - &chef.Auth{}, - } +func verifyAuth(r *web.Route, authMethods []auth.Method) { if setting.Service.EnableReverseProxyAuth { authMethods = append(authMethods, &auth.ReverseProxy{}) } - authGroup := auth.NewGroup(authMethods...) + r.Use(func(ctx *context.Context) { var err error ctx.Doer, err = authGroup.Verify(ctx.Req, ctx.Resp, ctx, ctx.Session) if err != nil { - log.Error("Verify: %v", err) + log.Error("Failed to verify user: %v", err) ctx.Error(http.StatusUnauthorized, "authGroup.Verify") return } ctx.IsSigned = ctx.Doer != nil }) +} + +// CommonRoutes provide endpoints for most package managers (except containers - see below) +// These are mounted on `/api/packages` (not `/api/v1/packages`) +func CommonRoutes(ctx gocontext.Context) *web.Route { + r := web.NewRoute() + + r.Use(context.PackageContexter(ctx)) + + verifyAuth(r, []auth.Method{ + &auth.OAuth2{}, + &auth.Basic{}, + &nuget.Auth{}, + &conan.Auth{}, + &chef.Auth{}, + }) r.Group("/{username}", func() { r.Group("/cargo", func() { @@ -401,24 +404,9 @@ func ContainerRoutes(ctx gocontext.Context) *web.Route { r.Use(context.PackageContexter(ctx)) - authMethods := []auth.Method{ + verifyAuth(r, []auth.Method{ &auth.Basic{}, &container.Auth{}, - } - if setting.Service.EnableReverseProxyAuth { - authMethods = append(authMethods, &auth.ReverseProxy{}) - } - - authGroup := auth.NewGroup(authMethods...) - r.Use(func(ctx *context.Context) { - var err error - ctx.Doer, err = authGroup.Verify(ctx.Req, ctx.Resp, ctx, ctx.Session) - if err != nil { - log.Error("Failed to verify user: %v", err) - ctx.Error(http.StatusUnauthorized, "Verify") - return - } - ctx.IsSigned = ctx.Doer != nil }) r.Get("", container.ReqContainerAccess, container.DetermineSupport) diff --git a/routers/api/packages/container/auth.go b/routers/api/packages/container/auth.go index 33f439ec3e58..6fb32c389d86 100644 --- a/routers/api/packages/container/auth.go +++ b/routers/api/packages/container/auth.go @@ -30,13 +30,10 @@ func (a *Auth) Verify(req *http.Request, w http.ResponseWriter, store auth.DataS if uid == 0 { return nil, nil } - if uid == -1 { - return user_model.NewGhostUser(), nil - } - u, err := user_model.GetUserByID(req.Context(), uid) + u, err := user_model.GetPossibleUserByID(req.Context(), uid) if err != nil { - log.Error("GetUserByID: %v", err) + log.Error("GetPossibleUserByID: %v", err) return nil, err } From f55fe989a47d492cfe5631a4eb1e7b362821f5e8 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Mon, 10 Apr 2023 21:46:36 +0800 Subject: [PATCH 197/340] Use actions job link as commit status URL instead of run link (#24023) (#24032) Backport #24023. A commit status is bound to a job, not a run. --- services/actions/commit_status.go | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/services/actions/commit_status.go b/services/actions/commit_status.go index 6604a149a5c9..7d674f7906e6 100644 --- a/services/actions/commit_status.go +++ b/services/actions/commit_status.go @@ -88,13 +88,18 @@ func CreateCommitStatus(ctx context.Context, job *actions_model.ActionRunJob) er return fmt.Errorf("GetLatestCommitStatus: %w", err) } + index, err := getIndexOfJob(ctx, job) + if err != nil { + return fmt.Errorf("getIndexOfJob: %w", err) + } + if err := git_model.NewCommitStatus(ctx, git_model.NewCommitStatusOptions{ Repo: repo, SHA: sha, Creator: creator, CommitStatus: &git_model.CommitStatus{ SHA: sha, - TargetURL: run.Link(), + TargetURL: fmt.Sprintf("%s/jobs/%d", run.Link(), index), Description: "", Context: ctxname, CreatorID: creatorID, @@ -121,3 +126,17 @@ func toCommitStatus(status actions_model.Status) api.CommitStatusState { return api.CommitStatusError } } + +func getIndexOfJob(ctx context.Context, job *actions_model.ActionRunJob) (int, error) { + // TODO: store job index as a field in ActionRunJob to avoid this + jobs, err := actions_model.GetRunJobsByRunID(ctx, job.RunID) + if err != nil { + return 0, err + } + for i, v := range jobs { + if v.ID == job.ID { + return i, nil + } + } + return 0, nil +} From 864499369981a3b27f83936beee013ca42f0c3df Mon Sep 17 00:00:00 2001 From: Giteabot Date: Tue, 11 Apr 2023 12:43:35 -0400 Subject: [PATCH 198/340] Update documentation to explain which projects allow Gitea to host static pages (#23993) (#24058) Backport #23993 by @6543 close #23521 Signed-off-by: 6543 <6543@obermui.de> Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: delvh Co-authored-by: a1012112796 <1012112796@qq.com> Co-authored-by: wxiaoguang --- docs/content/doc/help/faq.en-us.md | 8 ++++++++ docs/content/doc/installation/comparison.en-us.md | 7 ++++++- docs/content/doc/installation/comparison.zh-cn.md | 7 ++++++- docs/content/doc/installation/comparison.zh-tw.md | 7 ++++++- 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/docs/content/doc/help/faq.en-us.md b/docs/content/doc/help/faq.en-us.md index 60e11d4459f2..4847e8e03bef 100644 --- a/docs/content/doc/help/faq.en-us.md +++ b/docs/content/doc/help/faq.en-us.md @@ -118,6 +118,14 @@ The correct path for the template(s) will be relative to the `CustomPath` 2. If you are still unable to find a path, the default can be [calculated above](#where-does-gitea-store-what-file) 3. Once you have figured out the correct custom path, you can refer to the [customizing Gitea]({{< relref "doc/administration/customizing-gitea.en-us.md" >}}) page to add your template to the correct location. +## Does Gitea have a "GitHub/GitLab pages" feature? + +Gitea doesn't provide a built-in Pages server. You need a dedicated domain to serve static pages to avoid CSRF security risks. + +For simple usage, you can use a reverse proxy to rewrite & serve static contents from Gitea's raw file URLs. + +And there are already available third-party services, like a standalone [pages server](https://codeberg.org/Codeberg/pages-server) or a [caddy plugin](https://github.com/42wim/caddy-gitea), that can provide the required functionality. + ## Active user vs login prohibited user In Gitea, an "active" user refers to a user that has activated their account via email. diff --git a/docs/content/doc/installation/comparison.en-us.md b/docs/content/doc/installation/comparison.en-us.md index 36bef3841784..0c340eb94c07 100644 --- a/docs/content/doc/installation/comparison.en-us.md +++ b/docs/content/doc/installation/comparison.en-us.md @@ -31,6 +31,8 @@ _Symbols used in table:_ - _✘ - unsupported_ +- _⚙️ - supported through third-party software_ + ## General Features | Feature | Gitea | Gogs | GitHub EE | GitLab CE | GitLab EE | BitBucket | RhodeCode CE | @@ -51,7 +53,7 @@ _Symbols used in table:_ | Custom Theme Support | ✓ | ✓ | ✘ | ✘ | ✘ | ✓ | ✘ | | Markdown support | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | CSV support | ✓ | ✘ | ✓ | ✘ | ✘ | ✓ | ? | -| 'GitHub / GitLab pages' | [✘](https://github.com/go-gitea/gitea/issues/302) | ✘ | ✓ | ✓ | ✓ | ✘ | ✘ | +| 'GitHub / GitLab pages' | [⚙️][gitea-pages-server], [⚙️][gitea-caddy-plugin] | ✘ | ✓ | ✓ | ✓ | ✘ | ✘ | | Repo-specific wiki (as a repo itself) | ✓ | ✓ | ✓ | ✓ | ✓ | / | ✘ | | Deploy Tokens | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | Repository Tokens with write rights | ✓ | ✘ | ✓ | ✓ | ✓ | ✓ | ✓ | @@ -141,3 +143,6 @@ _Symbols used in table:_ | Two factor authentication (2FA) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✘ | | Integration with the most common services | ✓ | / | ⁄ | ✓ | ✓ | ⁄ | ✓ | | Incorporate external CI/CD | ✓ | ✘ | ✓ | ✓ | ✓ | ✓ | ✓ | + +[gitea-caddy-plugin]: https://github.com/42wim/caddy-gitea +[gitea-pages-server]: https://codeberg.org/Codeberg/pages-server diff --git a/docs/content/doc/installation/comparison.zh-cn.md b/docs/content/doc/installation/comparison.zh-cn.md index b254cf749636..7dfca526ebb8 100644 --- a/docs/content/doc/installation/comparison.zh-cn.md +++ b/docs/content/doc/installation/comparison.zh-cn.md @@ -29,6 +29,8 @@ _表格中的符号含义:_ * _? - 不确定_ +* _⚙️ - 由第三方服务或插件支持_ + #### 主要特性 | 特性 | Gitea | Gogs | GitHub EE | GitLab CE | GitLab EE | BitBucket | RhodeCode CE | @@ -42,7 +44,7 @@ _表格中的符号含义:_ | 支持 Orgmode | ✓ | ✘ | ✓ | ✘ | ✘ | ✘ | ? | | 支持 CSV | ✓ | ✘ | ✓ | ✘ | ✘ | ✓ | ? | | 支持第三方渲染工具 | ✓ | ✘ | ✘ | ✘ | ✘ | ✓ | ? | -| Git 驱动的静态 pages | [✘](https://github.com/go-gitea/gitea/issues/302) | ✘ | ✓ | ✓ | ✓ | ✘ | ✘ | +| Git 驱动的静态 pages | [⚙️][gitea-pages-server], [⚙️][gitea-caddy-plugin] | ✘ | ✓ | ✓ | ✓ | ✘ | ✘ | | Git 驱动的集成化 wiki | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ (cloud only) | ✘ | | 部署令牌 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | 仓库写权限令牌 | ✓ | ✘ | ✓ | ✓ | ✓ | ✓ | ✓ | @@ -129,3 +131,6 @@ _表格中的符号含义:_ | 集成 Discord | ✓ | ✓ | ✓ | ✓ | ✓ | ✘ | ✘ | | 集成 Microsoft Teams | ✓ | ✘ | ✓ | ✓ | ✓ | ✓ | ✘ | | 显示外部 CI/CD 的状态 | ✓ | ✘ | ✓ | ✓ | ✓ | ✓ | ✓ | + +[gitea-caddy-plugin]: https://github.com/42wim/caddy-gitea +[gitea-pages-server]: https://codeberg.org/Codeberg/pages-server diff --git a/docs/content/doc/installation/comparison.zh-tw.md b/docs/content/doc/installation/comparison.zh-tw.md index f918fbad7524..89190523434b 100644 --- a/docs/content/doc/installation/comparison.zh-tw.md +++ b/docs/content/doc/installation/comparison.zh-tw.md @@ -31,6 +31,8 @@ menu: - ✘ - 不支援 +- _⚙️ - 由第三方服務或外掛程式支援_ + ## 一般功能 | 功能 | Gitea | Gogs | GitHub EE | GitLab CE | GitLab EE | BitBucket | RhodeCode CE | @@ -44,7 +46,7 @@ menu: | 支援 Orgmode | ✓ | ✘ | ✓ | ✘ | ✘ | ✘ | ? | | 支援 CSV | ✓ | ✘ | ✓ | ✘ | ✘ | ✓ | ? | | 支援第三方渲染工具 | ✓ | ✘ | ✘ | ✘ | ✘ | ✓ | ? | -| Git 驅動的靜態頁面 | [✘](https://github.com/go-gitea/gitea/issues/302) | ✘ | ✓ | ✓ | ✓ | ✘ | ✘ | +| Git 驅動的靜態頁面 | [⚙️][gitea-pages-server], [⚙️][gitea-caddy-plugin] | ✘ | ✓ | ✓ | ✓ | ✘ | ✘ | | Git 驅動的整合 wiki | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✘ | | 部署 Token | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | 有寫入權限的儲存庫 Token | ✓ | ✘ | ✓ | ✓ | ✓ | ✘ | ✓ | @@ -130,3 +132,6 @@ menu: | 整合 Discord | ✓ | ✓ | ✓ | ✓ | ✓ | ✘ | ✘ | | 整合 Microsoft Teams | ✓ | ✘ | ✓ | ✓ | ✓ | ✓ | ✘ | | 顯示外部 CI/CD 狀態 | ✓ | ✘ | ✓ | ✓ | ✓ | ✓ | ✓ | + +[gitea-caddy-plugin]: https://github.com/42wim/caddy-gitea +[gitea-pages-server]: https://codeberg.org/Codeberg/pages-server From 580da8f35320dbd15b168bf8ccfaff6187ff87e0 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Tue, 11 Apr 2023 15:07:38 -0400 Subject: [PATCH 199/340] Fix branch protection priority (#24045) (#24061) Backport #24045 by @lunny Fix #24044 Co-authored-by: Lunny Xiao --- models/git/protected_banch_list_test.go | 76 +++++++++++++++++++++++++ models/git/protected_branch_list.go | 10 +--- 2 files changed, 79 insertions(+), 7 deletions(-) create mode 100644 models/git/protected_banch_list_test.go diff --git a/models/git/protected_banch_list_test.go b/models/git/protected_banch_list_test.go new file mode 100644 index 000000000000..4bb3136d580b --- /dev/null +++ b/models/git/protected_banch_list_test.go @@ -0,0 +1,76 @@ +// Copyright 2023 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package git + +import ( + "fmt" + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestBranchRuleMatchPriority(t *testing.T) { + kases := []struct { + Rules []string + BranchName string + ExpectedMatchIdx int + }{ + { + Rules: []string{"release/*", "release/v1.17"}, + BranchName: "release/v1.17", + ExpectedMatchIdx: 1, + }, + { + Rules: []string{"release/v1.17", "release/*"}, + BranchName: "release/v1.17", + ExpectedMatchIdx: 0, + }, + { + Rules: []string{"release/**/v1.17", "release/test/v1.17"}, + BranchName: "release/test/v1.17", + ExpectedMatchIdx: 1, + }, + { + Rules: []string{"release/test/v1.17", "release/**/v1.17"}, + BranchName: "release/test/v1.17", + ExpectedMatchIdx: 0, + }, + { + Rules: []string{"release/**", "release/v1.0.0"}, + BranchName: "release/v1.0.0", + ExpectedMatchIdx: 1, + }, + { + Rules: []string{"release/v1.0.0", "release/**"}, + BranchName: "release/v1.0.0", + ExpectedMatchIdx: 0, + }, + { + Rules: []string{"release/**", "release/v1.0.0"}, + BranchName: "release/v2.0.0", + ExpectedMatchIdx: 0, + }, + { + Rules: []string{"release/*", "release/v1.0.0"}, + BranchName: "release/1/v2.0.0", + ExpectedMatchIdx: -1, + }, + } + + for _, kase := range kases { + var pbs ProtectedBranchRules + for _, rule := range kase.Rules { + pbs = append(pbs, &ProtectedBranch{RuleName: rule}) + } + pbs.sort() + matchedPB := pbs.GetFirstMatched(kase.BranchName) + if matchedPB == nil { + if kase.ExpectedMatchIdx >= 0 { + assert.Error(t, fmt.Errorf("no matched rules but expected %s[%d]", kase.Rules[kase.ExpectedMatchIdx], kase.ExpectedMatchIdx)) + } + } else { + assert.EqualValues(t, kase.Rules[kase.ExpectedMatchIdx], matchedPB.RuleName) + } + } +} diff --git a/models/git/protected_branch_list.go b/models/git/protected_branch_list.go index 99c433aa000f..17fe6d701fb4 100644 --- a/models/git/protected_branch_list.go +++ b/models/git/protected_branch_list.go @@ -28,12 +28,8 @@ func (rules ProtectedBranchRules) sort() { sort.Slice(rules, func(i, j int) bool { rules[i].loadGlob() rules[j].loadGlob() - if rules[i].isPlainName { - if !rules[j].isPlainName { - return true - } - } else if rules[j].isPlainName { - return true + if rules[i].isPlainName != rules[j].isPlainName { + return rules[i].isPlainName // plain name comes first, so plain name means "less" } return rules[i].CreatedUnix < rules[j].CreatedUnix }) @@ -46,7 +42,7 @@ func FindRepoProtectedBranchRules(ctx context.Context, repoID int64) (ProtectedB if err != nil { return nil, err } - rules.sort() + rules.sort() // to make non-glob rules have higher priority, and for same glob/non-glob rules, first created rules have higher priority return rules, nil } From 29724f31c5c48820df16ccf7a2a3aded24ab8b78 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Wed, 12 Apr 2023 04:37:34 +0200 Subject: [PATCH 200/340] Refactor commit status for Actions jobs (#23786) (#24060) Backport #23786 Refactor commit status for Actions jobs (#23786) Highlights: - Treat `StatusSkipped` as `CommitStatusSuccess` instead of `CommitStatusFailure`, so it fixed #23599. - Use the bot user `gitea-actions` instead of the trigger as the creator of commit status. - New format ` / / ()` for the context of commit status to avoid conflicts. - Add descriptions for commit status. - Add the missing calls to `CreateCommitStatus`. - Refactor `CreateCommitStatus` to make it easier to use. Co-authored-by: Jason Song --- routers/api/actions/runner/runner.go | 5 +- routers/api/actions/runner/utils.go | 3 + routers/web/repo/actions/view.go | 13 +---- services/actions/clear_tasks.go | 12 +--- services/actions/commit_status.go | 87 +++++++++++++++++----------- services/actions/job_emitter.go | 16 +++-- services/actions/notifier_helper.go | 7 +-- 7 files changed, 73 insertions(+), 70 deletions(-) diff --git a/routers/api/actions/runner/runner.go b/routers/api/actions/runner/runner.go index 839f776fe8de..a1086227eb17 100644 --- a/routers/api/actions/runner/runner.go +++ b/routers/api/actions/runner/runner.go @@ -149,10 +149,7 @@ func (s *Service) UpdateTask( return nil, status.Errorf(codes.Internal, "load job: %v", err) } - if err := actions_service.CreateCommitStatus(ctx, task.Job); err != nil { - log.Error("Update commit status for job %v failed: %v", task.Job.ID, err) - // go on - } + actions_service.CreateCommitStatus(ctx, task.Job) if req.Msg.State.Result != runnerv1.Result_RESULT_UNSPECIFIED { if err := actions_service.EmitJobsIfReady(task.Job.RunID); err != nil { diff --git a/routers/api/actions/runner/utils.go b/routers/api/actions/runner/utils.go index 82f0da24492b..cbfcd79a9d99 100644 --- a/routers/api/actions/runner/utils.go +++ b/routers/api/actions/runner/utils.go @@ -14,6 +14,7 @@ import ( "code.gitea.io/gitea/modules/log" secret_module "code.gitea.io/gitea/modules/secret" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/services/actions" runnerv1 "code.gitea.io/actions-proto-go/runner/v1" "google.golang.org/protobuf/types/known/structpb" @@ -28,6 +29,8 @@ func pickTask(ctx context.Context, runner *actions_model.ActionRunner) (*runnerv return nil, false, nil } + actions.CreateCommitStatus(ctx, t.Job) + task := &runnerv1.Task{ Id: t.ID, WorkflowPayload: t.Job.WorkflowPayload, diff --git a/routers/web/repo/actions/view.go b/routers/web/repo/actions/view.go index 86894ce55b11..8a208a1113f3 100644 --- a/routers/web/repo/actions/view.go +++ b/routers/web/repo/actions/view.go @@ -15,7 +15,6 @@ import ( "code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/modules/actions" context_module "code.gitea.io/gitea/modules/context" - "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/modules/web" @@ -215,10 +214,7 @@ func Rerun(ctx *context_module.Context) { return } - if err := actions_service.CreateCommitStatus(ctx, job); err != nil { - log.Error("Update commit status for job %v failed: %v", job.ID, err) - // go on - } + actions_service.CreateCommitStatus(ctx, job) ctx.JSON(http.StatusOK, struct{}{}) } @@ -259,12 +255,7 @@ func Cancel(ctx *context_module.Context) { return } - for _, job := range jobs { - if err := actions_service.CreateCommitStatus(ctx, job); err != nil { - log.Error("Update commit status for job %v failed: %v", job.ID, err) - // go on - } - } + actions_service.CreateCommitStatus(ctx, jobs...) ctx.JSON(http.StatusOK, struct{}{}) } diff --git a/services/actions/clear_tasks.go b/services/actions/clear_tasks.go index 6f8e95218d67..0616a5fc0dcb 100644 --- a/services/actions/clear_tasks.go +++ b/services/actions/clear_tasks.go @@ -64,12 +64,7 @@ func stopTasks(ctx context.Context, opts actions_model.FindTaskOptions) error { } } - for _, job := range jobs { - if err := CreateCommitStatus(ctx, job); err != nil { - log.Error("Update commit status for job %v failed: %v", job.ID, err) - // go on - } - } + CreateCommitStatus(ctx, jobs...) return nil } @@ -96,10 +91,7 @@ func CancelAbandonedJobs(ctx context.Context) error { log.Warn("cancel abandoned job %v: %v", job.ID, err) // go on } - if err := CreateCommitStatus(ctx, job); err != nil { - log.Error("Update commit status for job %v failed: %v", job.ID, err) - // go on - } + CreateCommitStatus(ctx, job) } return nil diff --git a/services/actions/commit_status.go b/services/actions/commit_status.go index 7d674f7906e6..a7304bc77510 100644 --- a/services/actions/commit_status.go +++ b/services/actions/commit_status.go @@ -6,79 +6,80 @@ package actions import ( "context" "fmt" + "path" actions_model "code.gitea.io/gitea/models/actions" "code.gitea.io/gitea/models/db" git_model "code.gitea.io/gitea/models/git" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/log" api "code.gitea.io/gitea/modules/structs" webhook_module "code.gitea.io/gitea/modules/webhook" + + "github.com/nektos/act/pkg/jobparser" ) -func CreateCommitStatus(ctx context.Context, job *actions_model.ActionRunJob) error { +// CreateCommitStatus creates a commit status for the given job. +// It won't return an error failed, but will log it, because it's not critical. +func CreateCommitStatus(ctx context.Context, jobs ...*actions_model.ActionRunJob) { + for _, job := range jobs { + if err := createCommitStatus(ctx, job); err != nil { + log.Error("Failed to create commit status for job %d: %v", job.ID, err) + } + } +} + +func createCommitStatus(ctx context.Context, job *actions_model.ActionRunJob) error { if err := job.LoadAttributes(ctx); err != nil { return fmt.Errorf("load run: %w", err) } run := job.Run + var ( - sha string - creatorID int64 + sha string + event string ) - switch run.Event { case webhook_module.HookEventPush: + event = "push" payload, err := run.GetPushEventPayload() if err != nil { return fmt.Errorf("GetPushEventPayload: %w", err) } - - // Since the payload comes from json data, we should check if it's broken, or it will cause panic - switch { - case payload.Repo == nil: - return fmt.Errorf("repo is missing in event payload") - case payload.Pusher == nil: - return fmt.Errorf("pusher is missing in event payload") - case payload.HeadCommit == nil: + if payload.HeadCommit == nil { return fmt.Errorf("head commit is missing in event payload") } - sha = payload.HeadCommit.ID - creatorID = payload.Pusher.ID case webhook_module.HookEventPullRequest, webhook_module.HookEventPullRequestSync: + event = "pull_request" payload, err := run.GetPullRequestEventPayload() if err != nil { return fmt.Errorf("GetPullRequestEventPayload: %w", err) } - - switch { - case payload.PullRequest == nil: + if payload.PullRequest == nil { return fmt.Errorf("pull request is missing in event payload") - case payload.PullRequest.Head == nil: + } else if payload.PullRequest.Head == nil { return fmt.Errorf("head of pull request is missing in event payload") - case payload.PullRequest.Head.Repository == nil: - return fmt.Errorf("head repository of pull request is missing in event payload") - case payload.PullRequest.Head.Repository.Owner == nil: - return fmt.Errorf("owner of head repository of pull request is missing in evnt payload") } - sha = payload.PullRequest.Head.Sha - creatorID = payload.PullRequest.Head.Repository.Owner.ID default: return nil } repo := run.Repo - ctxname := job.Name - state := toCommitStatus(job.Status) - creator, err := user_model.GetUserByID(ctx, creatorID) - if err != nil { - return fmt.Errorf("GetUserByID: %w", err) + // TODO: store workflow name as a field in ActionRun to avoid parsing + runName := path.Base(run.WorkflowID) + if wfs, err := jobparser.Parse(job.WorkflowPayload); err == nil && len(wfs) > 0 { + runName = wfs[0].Name } + ctxname := fmt.Sprintf("%s / %s (%s)", runName, job.Name, event) + state := toCommitStatus(job.Status) if statuses, _, err := git_model.GetLatestCommitStatus(ctx, repo.ID, sha, db.ListOptions{}); err == nil { for _, v := range statuses { if v.Context == ctxname { if v.State == state { + // no need to update return nil } break @@ -93,6 +94,26 @@ func CreateCommitStatus(ctx context.Context, job *actions_model.ActionRunJob) er return fmt.Errorf("getIndexOfJob: %w", err) } + description := "" + switch job.Status { + // TODO: if we want support description in different languages, we need to support i18n placeholders in it + case actions_model.StatusSuccess: + description = fmt.Sprintf("Successful in %s", job.Duration()) + case actions_model.StatusFailure: + description = fmt.Sprintf("Failing after %s", job.Duration()) + case actions_model.StatusCancelled: + description = "Has been cancelled" + case actions_model.StatusSkipped: + description = "Has been skipped" + case actions_model.StatusRunning: + description = "Has started running" + case actions_model.StatusWaiting: + description = "Waiting to run" + case actions_model.StatusBlocked: + description = "Blocked by required conditions" + } + + creator := user_model.NewActionsUser() if err := git_model.NewCommitStatus(ctx, git_model.NewCommitStatusOptions{ Repo: repo, SHA: sha, @@ -100,9 +121,9 @@ func CreateCommitStatus(ctx context.Context, job *actions_model.ActionRunJob) er CommitStatus: &git_model.CommitStatus{ SHA: sha, TargetURL: fmt.Sprintf("%s/jobs/%d", run.Link(), index), - Description: "", + Description: description, Context: ctxname, - CreatorID: creatorID, + CreatorID: creator.ID, State: state, }, }); err != nil { @@ -114,9 +135,9 @@ func CreateCommitStatus(ctx context.Context, job *actions_model.ActionRunJob) er func toCommitStatus(status actions_model.Status) api.CommitStatusState { switch status { - case actions_model.StatusSuccess: + case actions_model.StatusSuccess, actions_model.StatusSkipped: return api.CommitStatusSuccess - case actions_model.StatusFailure, actions_model.StatusCancelled, actions_model.StatusSkipped: + case actions_model.StatusFailure, actions_model.StatusCancelled: return api.CommitStatusFailure case actions_model.StatusWaiting, actions_model.StatusBlocked: return api.CommitStatusPending diff --git a/services/actions/job_emitter.go b/services/actions/job_emitter.go index cb2cc8d1ac06..c6b6fc551e00 100644 --- a/services/actions/job_emitter.go +++ b/services/actions/job_emitter.go @@ -45,11 +45,11 @@ func jobEmitterQueueHandle(data ...queue.Data) []queue.Data { } func checkJobsOfRun(ctx context.Context, runID int64) error { - return db.WithTx(ctx, func(ctx context.Context) error { - jobs, _, err := actions_model.FindRunJobs(ctx, actions_model.FindRunJobOptions{RunID: runID}) - if err != nil { - return err - } + jobs, _, err := actions_model.FindRunJobs(ctx, actions_model.FindRunJobOptions{RunID: runID}) + if err != nil { + return err + } + if err := db.WithTx(ctx, func(ctx context.Context) error { idToJobs := make(map[string][]*actions_model.ActionRunJob, len(jobs)) for _, job := range jobs { idToJobs[job.JobID] = append(idToJobs[job.JobID], job) @@ -67,7 +67,11 @@ func checkJobsOfRun(ctx context.Context, runID int64) error { } } return nil - }) + }); err != nil { + return err + } + CreateCommitStatus(ctx, jobs...) + return nil } type jobStatusResolver struct { diff --git a/services/actions/notifier_helper.go b/services/actions/notifier_helper.go index 32af1d26f660..06c461e8b559 100644 --- a/services/actions/notifier_helper.go +++ b/services/actions/notifier_helper.go @@ -193,12 +193,7 @@ func notify(ctx context.Context, input *notifyInput) error { if jobs, _, err := actions_model.FindRunJobs(ctx, actions_model.FindRunJobOptions{RunID: run.ID}); err != nil { log.Error("FindRunJobs: %v", err) } else { - for _, job := range jobs { - if err := CreateCommitStatus(ctx, job); err != nil { - log.Error("Update commit status for job %v failed: %v", job.ID, err) - // go on - } - } + CreateCommitStatus(ctx, jobs...) } } From 37d3e0ec336f0fdc2a6f3c4828dd74005d2d9448 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Wed, 12 Apr 2023 07:22:02 -0400 Subject: [PATCH 201/340] Fix accidental overwriting of LDAP team memberships (#24050) (#24065) Backport #24050 by @sillyguodong In the `for` loop, the value of `membershipsToAdd[org]` and `membershipsToRemove[org]` is a slice that should be appended instead of overwritten. Due to the current overwrite, the LDAP group sync only matches the last group at the moment. ## Example reproduction - an LDAP user is both a member of `cn=admin_staff,ou=people,dc=planetexpress,dc=com` and `cn=ship_crew,ou=people,dc=planetexpress,dc=com`. - configuration of `Map LDAP groups to Organization teams ` in `Authentication Sources`: ```json { "cn=admin_staff,ou=people,dc=planetexpress,dc=com":{ "test_organization":[ "admin_staff", "test_add" ] }, "cn=ship_crew,ou=people,dc=planetexpress,dc=com":{ "test_organization":[ "ship_crew" ] } ``` - start `Synchronize external user data` task in the `Dashboard`. - the user was only added for the team `test_organization.ship_crew` Co-authored-by: sillyguodong <33891828+sillyguodong@users.noreply.github.com> --- services/auth/source/source_group_sync.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/auth/source/source_group_sync.go b/services/auth/source/source_group_sync.go index 20b609534537..e42f60bde248 100644 --- a/services/auth/source/source_group_sync.go +++ b/services/auth/source/source_group_sync.go @@ -52,11 +52,11 @@ func resolveMappedMemberships(sourceUserGroups container.Set[string], sourceGrou isUserInGroup := sourceUserGroups.Contains(group) if isUserInGroup { for org, teams := range memberships { - membershipsToAdd[org] = teams + membershipsToAdd[org] = append(membershipsToAdd[org], teams...) } } else { for org, teams := range memberships { - membershipsToRemove[org] = teams + membershipsToRemove[org] = append(membershipsToRemove[org], teams...) } } } From 5482602ba8fc84f716e4742467bc429037f45f88 Mon Sep 17 00:00:00 2001 From: Hester Gong Date: Wed, 12 Apr 2023 20:23:05 +0800 Subject: [PATCH 202/340] Add cardtype to org/user level project on creation, edit and view (#24043) (#24066) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Backport #24043 Part of #23318 The way to fix the missing cardtype for user/org level projects in this PR is to port the cardtype related part from #22112 to org/user level projects' template and router functions. Before: 截屏2023-04-11 13 55 49 截屏2023-04-11 13 55 59 After: Create 截屏2023-04-11 13 27 16 Edit 截屏2023-04-11 13 27 05 View 截屏2023-04-11 13 26 56 --------- Co-authored-by: silverwind --- routers/web/org/projects.go | 22 ++++++++++++++++++++++ templates/projects/new.tmpl | 18 ++++++++++++++++++ templates/projects/view.tmpl | 7 +++++++ 3 files changed, 47 insertions(+) diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go index 080388f01f8c..129864f9c462 100644 --- a/routers/web/org/projects.go +++ b/routers/web/org/projects.go @@ -13,6 +13,7 @@ import ( issues_model "code.gitea.io/gitea/models/issues" project_model "code.gitea.io/gitea/models/project" + attachment_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" @@ -122,6 +123,7 @@ func canWriteProjects(ctx *context.Context) bool { func NewProject(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("repo.projects.new") ctx.Data["BoardTypes"] = project_model.GetBoardConfig() + ctx.Data["CardTypes"] = project_model.GetCardConfig() ctx.Data["CanWriteProjects"] = canWriteProjects(ctx) ctx.Data["PageIsViewProjects"] = true ctx.Data["HomeLink"] = ctx.ContextUser.HomeLink() @@ -139,6 +141,7 @@ func NewProjectPost(ctx *context.Context) { ctx.Data["CanWriteProjects"] = canWriteProjects(ctx) ctx.Data["PageIsViewProjects"] = true ctx.Data["BoardTypes"] = project_model.GetBoardConfig() + ctx.Data["CardTypes"] = project_model.GetCardConfig() ctx.HTML(http.StatusOK, tplProjectsNew) return } @@ -149,6 +152,7 @@ func NewProjectPost(ctx *context.Context) { Description: form.Content, CreatorID: ctx.Doer.ID, BoardType: form.BoardType, + CardType: form.CardType, Type: project_model.TypeOrganization, }); err != nil { ctx.ServerError("NewProject", err) @@ -216,6 +220,8 @@ func EditProject(ctx *context.Context) { ctx.Data["PageIsEditProjects"] = true ctx.Data["PageIsViewProjects"] = true ctx.Data["CanWriteProjects"] = canWriteProjects(ctx) + ctx.Data["CardTypes"] = project_model.GetCardConfig() + shared_user.RenderUserHeader(ctx) p, err := project_model.GetProjectByID(ctx, ctx.ParamsInt64(":id")) @@ -237,6 +243,7 @@ func EditProject(ctx *context.Context) { ctx.Data["content"] = p.Description ctx.Data["redirect"] = ctx.FormString("redirect") ctx.Data["HomeLink"] = ctx.ContextUser.HomeLink() + ctx.Data["card_type"] = p.CardType ctx.HTML(http.StatusOK, tplProjectsNew) } @@ -248,6 +255,8 @@ func EditProjectPost(ctx *context.Context) { ctx.Data["PageIsEditProjects"] = true ctx.Data["PageIsViewProjects"] = true ctx.Data["CanWriteProjects"] = canWriteProjects(ctx) + ctx.Data["CardTypes"] = project_model.GetCardConfig() + shared_user.RenderUserHeader(ctx) if ctx.HasError() { @@ -271,6 +280,7 @@ func EditProjectPost(ctx *context.Context) { p.Title = form.Title p.Description = form.Content + p.CardType = form.CardType if err = project_model.UpdateProject(ctx, p); err != nil { ctx.ServerError("UpdateProjects", err) return @@ -316,6 +326,18 @@ func ViewProject(ctx *context.Context) { return } + if project.CardType != project_model.CardTypeTextOnly { + issuesAttachmentMap := make(map[int64][]*attachment_model.Attachment) + for _, issuesList := range issuesMap { + for _, issue := range issuesList { + if issueAttachment, err := attachment_model.GetAttachmentsByIssueIDImagesLatest(ctx, issue.ID); err == nil { + issuesAttachmentMap[issue.ID] = issueAttachment + } + } + } + ctx.Data["issuesAttachmentMap"] = issuesAttachmentMap + } + linkedPrsMap := make(map[int64][]*issues_model.Issue) for _, issuesList := range issuesMap { for _, issue := range issuesList { diff --git a/templates/projects/new.tmpl b/templates/projects/new.tmpl index 1314884da6a0..cb3214c49dfb 100644 --- a/templates/projects/new.tmpl +++ b/templates/projects/new.tmpl @@ -43,6 +43,24 @@
    {{end}} + +
    + +
    + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + {{range $element := .CardTypes}} + {{if or (eq $.card_type $element.CardType) (and (not $.PageIsEditProjects) (eq $element.CardType 1))}} + +
    {{$.locale.Tr $element.Translation}}
    + {{end}} + {{end}} +
    + {{range $element := .CardTypes}} +
    {{$.locale.Tr $element.Translation}}
    + {{end}} +
    +
    +
    diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index c815ec4f6ac4..c1f52cefd4ba 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -175,6 +175,13 @@
    + {{if eq $.Project.CardType 1}}{{/* Images and Text*/}} +
    + {{range (index $.issuesAttachmentMap .ID)}} + {{.Name}} + {{end}} +
    + {{end}}
    From d562b419b6e13ca5e1b601f0e967b00d6826c3de Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 12 Apr 2023 22:05:10 +0800 Subject: [PATCH 203/340] Make label templates have consistent behavior and priority (#23749) (#24071) Backport #23749 Fix https://github.com/go-gitea/gitea/issues/23715 Backported manually and tested manually. --- modules/label/parser.go | 48 +++---- modules/repository/create.go | 3 +- modules/repository/init.go | 117 +++++++++++------- modules/repository/init_test.go | 30 +++++ routers/web/org/setting.go | 2 +- routers/web/repo/issue_label.go | 2 +- routers/web/repo/issue_label_test.go | 2 + routers/web/repo/repo.go | 4 +- services/repository/repository.go | 4 +- templates/repo/create.tmpl | 4 +- .../issue/labels/label_load_template.tmpl | 4 +- 11 files changed, 133 insertions(+), 87 deletions(-) create mode 100644 modules/repository/init_test.go diff --git a/modules/label/parser.go b/modules/label/parser.go index 768c72a61b01..511bac823ff8 100644 --- a/modules/label/parser.go +++ b/modules/label/parser.go @@ -30,31 +30,23 @@ func IsErrTemplateLoad(err error) bool { } func (err ErrTemplateLoad) Error() string { - return fmt.Sprintf("Failed to load label template file '%s': %v", err.TemplateFile, err.OriginalError) + return fmt.Sprintf("failed to load label template file %q: %v", err.TemplateFile, err.OriginalError) } -// GetTemplateFile loads the label template file by given name, -// then parses and returns a list of name-color pairs and optionally description. -func GetTemplateFile(name string) ([]*Label, error) { - data, err := options.GetRepoInitFile("label", name+".yaml") - if err == nil && len(data) > 0 { - return parseYamlFormat(name+".yaml", data) - } - - data, err = options.GetRepoInitFile("label", name+".yml") - if err == nil && len(data) > 0 { - return parseYamlFormat(name+".yml", data) - } - - data, err = options.GetRepoInitFile("label", name) +// LoadTemplateFile loads the label template file by given file name, returns a slice of Label structs. +func LoadTemplateFile(fileName string) ([]*Label, error) { + data, err := options.Labels(fileName) if err != nil { - return nil, ErrTemplateLoad{name, fmt.Errorf("GetRepoInitFile: %w", err)} + return nil, ErrTemplateLoad{fileName, fmt.Errorf("LoadTemplateFile: %w", err)} } - return parseLegacyFormat(name, data) + if strings.HasSuffix(fileName, ".yaml") || strings.HasSuffix(fileName, ".yml") { + return parseYamlFormat(fileName, data) + } + return parseLegacyFormat(fileName, data) } -func parseYamlFormat(name string, data []byte) ([]*Label, error) { +func parseYamlFormat(fileName string, data []byte) ([]*Label, error) { lf := &labelFile{} if err := yaml.Unmarshal(data, lf); err != nil { @@ -65,11 +57,11 @@ func parseYamlFormat(name string, data []byte) ([]*Label, error) { for _, l := range lf.Labels { l.Color = strings.TrimSpace(l.Color) if len(l.Name) == 0 || len(l.Color) == 0 { - return nil, ErrTemplateLoad{name, errors.New("label name and color are required fields")} + return nil, ErrTemplateLoad{fileName, errors.New("label name and color are required fields")} } color, err := NormalizeColor(l.Color) if err != nil { - return nil, ErrTemplateLoad{name, fmt.Errorf("bad HTML color code '%s' in label: %s", l.Color, l.Name)} + return nil, ErrTemplateLoad{fileName, fmt.Errorf("bad HTML color code '%s' in label: %s", l.Color, l.Name)} } l.Color = color } @@ -77,7 +69,7 @@ func parseYamlFormat(name string, data []byte) ([]*Label, error) { return lf.Labels, nil } -func parseLegacyFormat(name string, data []byte) ([]*Label, error) { +func parseLegacyFormat(fileName string, data []byte) ([]*Label, error) { lines := strings.Split(string(data), "\n") list := make([]*Label, 0, len(lines)) for i := 0; i < len(lines); i++ { @@ -88,18 +80,18 @@ func parseLegacyFormat(name string, data []byte) ([]*Label, error) { parts, description, _ := strings.Cut(line, ";") - color, name, ok := strings.Cut(parts, " ") + color, labelName, ok := strings.Cut(parts, " ") if !ok { - return nil, ErrTemplateLoad{name, fmt.Errorf("line is malformed: %s", line)} + return nil, ErrTemplateLoad{fileName, fmt.Errorf("line is malformed: %s", line)} } color, err := NormalizeColor(color) if err != nil { - return nil, ErrTemplateLoad{name, fmt.Errorf("bad HTML color code '%s' in line: %s", color, line)} + return nil, ErrTemplateLoad{fileName, fmt.Errorf("bad HTML color code '%s' in line: %s", color, line)} } list = append(list, &Label{ - Name: strings.TrimSpace(name), + Name: strings.TrimSpace(labelName), Color: color, Description: strings.TrimSpace(description), }) @@ -108,10 +100,10 @@ func parseLegacyFormat(name string, data []byte) ([]*Label, error) { return list, nil } -// LoadFormatted loads the labels' list of a template file as a string separated by comma -func LoadFormatted(name string) (string, error) { +// LoadTemplateDescription loads the labels from a template file, returns a description string by joining each Label.Name with comma +func LoadTemplateDescription(fileName string) (string, error) { var buf strings.Builder - list, err := GetTemplateFile(name) + list, err := LoadTemplateFile(fileName) if err != nil { return "", err } diff --git a/modules/repository/create.go b/modules/repository/create.go index 6a1fa41b6b87..c1395242c577 100644 --- a/modules/repository/create.go +++ b/modules/repository/create.go @@ -23,7 +23,6 @@ import ( user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/models/webhook" "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/label" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" @@ -190,7 +189,7 @@ func CreateRepository(doer, u *user_model.User, opts CreateRepoOptions) (*repo_m // Check if label template exist if len(opts.IssueLabels) > 0 { - if _, err := label.GetTemplateFile(opts.IssueLabels); err != nil { + if _, err := LoadTemplateLabelsByDisplayName(opts.IssueLabels); err != nil { return nil, err } } diff --git a/modules/repository/init.go b/modules/repository/init.go index 49c8d2a904d1..c579fac62078 100644 --- a/modules/repository/init.go +++ b/modules/repository/init.go @@ -8,7 +8,6 @@ import ( "context" "fmt" "os" - "path" "path/filepath" "sort" "strings" @@ -27,6 +26,11 @@ import ( asymkey_service "code.gitea.io/gitea/services/asymkey" ) +type OptionFile struct { + DisplayName string + Description string +} + var ( // Gitignores contains the gitiginore files Gitignores []string @@ -37,65 +41,73 @@ var ( // Readmes contains the readme files Readmes []string - // LabelTemplates contains the label template files and the list of labels for each file - LabelTemplates map[string]string + // LabelTemplateFiles contains the label template files, each item has its DisplayName and Description + LabelTemplateFiles []OptionFile + labelTemplateFileMap = map[string]string{} // DisplayName => FileName mapping ) +type optionFileList struct { + all []string // all files provided by bindata & custom-path. Sorted. + custom []string // custom files provided by custom-path. Non-sorted, internal use only. +} + +// mergeCustomLabelFiles merges the custom label files. Always use the file's main name (DisplayName) as the key to de-duplicate. +func mergeCustomLabelFiles(fl optionFileList) []string { + exts := map[string]int{"": 0, ".yml": 1, ".yaml": 2} // "yaml" file has the highest priority to be used. + + m := map[string]string{} + merge := func(list []string) { + sort.Slice(list, func(i, j int) bool { return exts[filepath.Ext(list[i])] < exts[filepath.Ext(list[j])] }) + for _, f := range list { + m[strings.TrimSuffix(f, filepath.Ext(f))] = f + } + } + merge(fl.all) + merge(fl.custom) + + files := make([]string, 0, len(m)) + for _, f := range m { + files = append(files, f) + } + sort.Strings(files) + return files +} + // LoadRepoConfig loads the repository config -func LoadRepoConfig() { - // Load .gitignore and license files and readme templates. - types := []string{"gitignore", "license", "readme", "label"} - typeFiles := make([][]string, 4) +func LoadRepoConfig() error { + types := []string{"gitignore", "license", "readme", "label"} // option file directories + typeFiles := make([]optionFileList, len(types)) for i, t := range types { - files, err := options.Dir(t) - if err != nil { - log.Fatal("Failed to get %s files: %v", t, err) + var err error + if typeFiles[i].all, err = options.Dir(t); err != nil { + return fmt.Errorf("failed to list %s files: %w", t, err) } - if t == "label" { - for i, f := range files { - ext := strings.ToLower(filepath.Ext(f)) - if ext == ".yaml" || ext == ".yml" { - files[i] = f[:len(f)-len(ext)] - } + sort.Strings(typeFiles[i].all) + customPath := filepath.Join(setting.CustomPath, "options", t) + if isDir, err := util.IsDir(customPath); err != nil { + return fmt.Errorf("failed to check custom %s dir: %w", t, err) + } else if isDir { + if typeFiles[i].custom, err = util.StatDir(customPath); err != nil { + return fmt.Errorf("failed to list custom %s files: %w", t, err) } } - customPath := path.Join(setting.CustomPath, "options", t) - isDir, err := util.IsDir(customPath) - if err != nil { - log.Fatal("Failed to get custom %s files: %v", t, err) - } - if isDir { - customFiles, err := util.StatDir(customPath) - if err != nil { - log.Fatal("Failed to get custom %s files: %v", t, err) - } - - for _, f := range customFiles { - if !util.SliceContainsString(files, f, true) { - files = append(files, f) - } - } - } - typeFiles[i] = files } - Gitignores = typeFiles[0] - Licenses = typeFiles[1] - Readmes = typeFiles[2] - LabelTemplatesFiles := typeFiles[3] - sort.Strings(Gitignores) - sort.Strings(Licenses) - sort.Strings(Readmes) - sort.Strings(LabelTemplatesFiles) + Gitignores = typeFiles[0].all + Licenses = typeFiles[1].all + Readmes = typeFiles[2].all // Load label templates - LabelTemplates = make(map[string]string) - for _, templateFile := range LabelTemplatesFiles { - labels, err := label.LoadFormatted(templateFile) + LabelTemplateFiles = nil + labelTemplateFileMap = map[string]string{} + for _, file := range mergeCustomLabelFiles(typeFiles[3]) { + description, err := label.LoadTemplateDescription(file) if err != nil { - log.Error("Failed to load labels: %v", err) + return fmt.Errorf("failed to load labels: %w", err) } - LabelTemplates[templateFile] = labels + displayName := strings.TrimSuffix(file, filepath.Ext(file)) + labelTemplateFileMap[displayName] = file + LabelTemplateFiles = append(LabelTemplateFiles, OptionFile{DisplayName: displayName, Description: description}) } // Filter out invalid names and promote preferred licenses. @@ -111,6 +123,7 @@ func LoadRepoConfig() { } } Licenses = sortedLicenses + return nil } func prepareRepoCommit(ctx context.Context, repo *repo_model.Repository, tmpDir, repoPath string, opts CreateRepoOptions) error { @@ -344,7 +357,7 @@ func initRepository(ctx context.Context, repoPath string, u *user_model.User, re // InitializeLabels adds a label set to a repository using a template func InitializeLabels(ctx context.Context, id int64, labelTemplate string, isOrg bool) error { - list, err := label.GetTemplateFile(labelTemplate) + list, err := LoadTemplateLabelsByDisplayName(labelTemplate) if err != nil { return err } @@ -370,3 +383,11 @@ func InitializeLabels(ctx context.Context, id int64, labelTemplate string, isOrg } return nil } + +// LoadTemplateLabelsByDisplayName loads a label template by its display name +func LoadTemplateLabelsByDisplayName(displayName string) ([]*label.Label, error) { + if fileName, ok := labelTemplateFileMap[displayName]; ok { + return label.LoadTemplateFile(fileName) + } + return nil, label.ErrTemplateLoad{TemplateFile: displayName, OriginalError: fmt.Errorf("label template %q not found", displayName)} +} diff --git a/modules/repository/init_test.go b/modules/repository/init_test.go new file mode 100644 index 000000000000..227efdc1db0c --- /dev/null +++ b/modules/repository/init_test.go @@ -0,0 +1,30 @@ +// Copyright 2023 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package repository + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestMergeCustomLabels(t *testing.T) { + files := mergeCustomLabelFiles(optionFileList{ + all: []string{"a", "a.yaml", "a.yml"}, + custom: nil, + }) + assert.EqualValues(t, []string{"a.yaml"}, files, "yaml file should win") + + files = mergeCustomLabelFiles(optionFileList{ + all: []string{"a", "a.yaml"}, + custom: []string{"a"}, + }) + assert.EqualValues(t, []string{"a"}, files, "custom file should win") + + files = mergeCustomLabelFiles(optionFileList{ + all: []string{"a", "a.yml", "a.yaml"}, + custom: []string{"a", "a.yml"}, + }) + assert.EqualValues(t, []string{"a.yml"}, files, "custom yml file should win if no yaml") +} diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go index 5c9b7967c3dc..0363c228c9d5 100644 --- a/routers/web/org/setting.go +++ b/routers/web/org/setting.go @@ -247,6 +247,6 @@ func Labels(ctx *context.Context) { ctx.Data["PageIsOrgSettings"] = true ctx.Data["PageIsOrgSettingsLabels"] = true ctx.Data["RequireTribute"] = true - ctx.Data["LabelTemplates"] = repo_module.LabelTemplates + ctx.Data["LabelTemplateFiles"] = repo_module.LabelTemplateFiles ctx.HTML(http.StatusOK, tplSettingsLabels) } diff --git a/routers/web/repo/issue_label.go b/routers/web/repo/issue_label.go index 31bf85fedb29..a4ea53d13d63 100644 --- a/routers/web/repo/issue_label.go +++ b/routers/web/repo/issue_label.go @@ -29,7 +29,7 @@ func Labels(ctx *context.Context) { ctx.Data["PageIsIssueList"] = true ctx.Data["PageIsLabels"] = true ctx.Data["RequireTribute"] = true - ctx.Data["LabelTemplates"] = repo_module.LabelTemplates + ctx.Data["LabelTemplateFiles"] = repo_module.LabelTemplateFiles ctx.HTML(http.StatusOK, tplLabels) } diff --git a/routers/web/repo/issue_label_test.go b/routers/web/repo/issue_label_test.go index a62d2afaa830..c24fe898b6bc 100644 --- a/routers/web/repo/issue_label_test.go +++ b/routers/web/repo/issue_label_test.go @@ -10,6 +10,7 @@ import ( issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/unittest" + "code.gitea.io/gitea/modules/repository" "code.gitea.io/gitea/modules/test" "code.gitea.io/gitea/modules/web" "code.gitea.io/gitea/services/forms" @@ -30,6 +31,7 @@ func int64SliceToCommaSeparated(a []int64) string { func TestInitializeLabels(t *testing.T) { unittest.PrepareTestEnv(t) + assert.NoError(t, repository.LoadRepoConfig()) ctx := test.MockContext(t, "user2/repo1/labels/initialize") test.LoadUser(t, ctx, 2) test.LoadRepo(t, ctx, 2) diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go index 9f2add1fe6de..30c2500200c5 100644 --- a/routers/web/repo/repo.go +++ b/routers/web/repo/repo.go @@ -132,7 +132,7 @@ func Create(ctx *context.Context) { // Give default value for template to render. ctx.Data["Gitignores"] = repo_module.Gitignores - ctx.Data["LabelTemplates"] = repo_module.LabelTemplates + ctx.Data["LabelTemplateFiles"] = repo_module.LabelTemplateFiles ctx.Data["Licenses"] = repo_module.Licenses ctx.Data["Readmes"] = repo_module.Readmes ctx.Data["readme"] = "Default" @@ -200,7 +200,7 @@ func CreatePost(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("new_repo") ctx.Data["Gitignores"] = repo_module.Gitignores - ctx.Data["LabelTemplates"] = repo_module.LabelTemplates + ctx.Data["LabelTemplateFiles"] = repo_module.LabelTemplateFiles ctx.Data["Licenses"] = repo_module.Licenses ctx.Data["Readmes"] = repo_module.Readmes diff --git a/services/repository/repository.go b/services/repository/repository.go index 3c3e7e82c3f8..275b511dc7c0 100644 --- a/services/repository/repository.go +++ b/services/repository/repository.go @@ -81,7 +81,9 @@ func PushCreateRepo(authUser, owner *user_model.User, repoName string) (*repo_mo // Init start repository service func Init() error { - repo_module.LoadRepoConfig() + if err := repo_module.LoadRepoConfig(); err != nil { + return err + } system_model.RemoveAllWithNotice(db.DefaultContext, "Clean up temporary repository uploads", setting.Repository.Upload.TempPath) system_model.RemoveAllWithNotice(db.DefaultContext, "Clean up temporary repositories", repo_module.LocalCopyPath()) return initPushQueue() diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index 3887706c27df..49817e9a0ca0 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -117,8 +117,8 @@
    {{.locale.Tr "repo.issue_labels_helper"}}
    {{.locale.Tr "repo.issue_labels_helper"}}
    - {{range $template, $labels := .LabelTemplates}} -
    {{$template}}
    ({{$labels}})
    + {{range .LabelTemplateFiles}} +
    {{.DisplayName}}
    ({{.Description}})
    {{end}}
    diff --git a/templates/repo/issue/labels/label_load_template.tmpl b/templates/repo/issue/labels/label_load_template.tmpl index 010b69163846..bd55ce712f1b 100644 --- a/templates/repo/issue/labels/label_load_template.tmpl +++ b/templates/repo/issue/labels/label_load_template.tmpl @@ -10,8 +10,8 @@
    {{.locale.Tr "repo.issues.label_templates.helper"}}
    - {{range $template, $labels := .LabelTemplates}} -
    {{$template}}
    ({{$labels}})
    + {{range .LabelTemplateFiles}} +
    {{.DisplayName}}
    ({{.Description}})
    {{end}}
    {{svg "octicon-triangle-down" 18 "dropdown icon"}} From 16d2cf05ab691adb839e2d979a25285764111f7e Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 13 Apr 2023 00:16:40 +0800 Subject: [PATCH 204/340] Fix custom mailer template on Windows (#24081) Fix #24075 Fix #23873 From the log: ``` 2023/04/02 19:41:46 .../templates/mailer.go:68:1() [T] Adding mailer template for \issue\default from "C:\gitea\custom\templates\mail\issue\default.tmpl" ``` That `assetName ` on Windows is wrong. Gitea only uses slash `/`. --- modules/templates/mailer.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/templates/mailer.go b/modules/templates/mailer.go index a257e7c1da3e..355a9d6daff1 100644 --- a/modules/templates/mailer.go +++ b/modules/templates/mailer.go @@ -13,6 +13,7 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/modules/watcher" ) @@ -65,6 +66,7 @@ func Mailer(ctx context.Context) (*texttmpl.Template, *template.Template) { } assetName := strings.TrimSuffix(name, ".tmpl") + assetName = util.PathJoinRelX(assetName) log.Trace("Adding mailer template for %s from %q", assetName, path) buildSubjectBodyTemplate(subjectTemplates, bodyTemplates, From 607801ec41bcb85bc24dbdf31ad37a04735dce27 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Wed, 12 Apr 2023 15:27:53 -0400 Subject: [PATCH 205/340] Update the value of the `diffEnd` when click `Show More` btn in the DiffFileTree (#24069) (#24078) Backport #24069 by @sillyguodong In the component `DiffFileTree`,if don't update the value of the `diffEnd` in the callback of ajax request, click `Show More` btn will always return the same response, duplicate files are appended to the file list. Before: https://user-images.githubusercontent.com/33891828/231371188-82d169af-10bb-47e2-8aca-83ced2597f2d.mov After: https://user-images.githubusercontent.com/33891828/231369805-39a5a4d0-662c-4f08-bc5a-7d31e8782453.mov Co-authored-by: sillyguodong <33891828+sillyguodong@users.noreply.github.com> --- web_src/js/components/DiffFileTree.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web_src/js/components/DiffFileTree.vue b/web_src/js/components/DiffFileTree.vue index fa59768ee588..7ed1ef151e16 100644 --- a/web_src/js/components/DiffFileTree.vue +++ b/web_src/js/components/DiffFileTree.vue @@ -123,6 +123,8 @@ export default { this.isLoadingNewData = true; doLoadMoreFiles(this.link, this.diffEnd, () => { this.isLoadingNewData = false; + const {pageData} = window.config; + this.diffEnd = pageData.diffFileInfo.diffEnd; }); }, }, From 93c7611c323e08e795dbf8c295eed451d89bf37e Mon Sep 17 00:00:00 2001 From: Giteabot Date: Wed, 12 Apr 2023 16:23:57 -0400 Subject: [PATCH 206/340] Improve LFS error logs (#24072) (#24082) Backport #24072 by @wxiaoguang The error logs were not clear. Help (but not fix) #24053 Co-authored-by: wxiaoguang --- services/lfs/server.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/services/lfs/server.go b/services/lfs/server.go index 758f4ebfe0c5..d63d08ce0181 100644 --- a/services/lfs/server.go +++ b/services/lfs/server.go @@ -126,7 +126,6 @@ func DownloadHandler(ctx *context.Context) { _, err = content.Seek(fromByte, io.SeekStart) if err != nil { log.Error("Whilst trying to read LFS OID[%s]: Unable to seek to %d Error: %v", meta.Oid, fromByte, err) - writeStatus(ctx, http.StatusInternalServerError) return } @@ -334,10 +333,11 @@ func UploadHandler(ctx *context.Context) { log.Error("Upload does not match LFS MetaObject [%s]. Error: %v", p.Oid, err) writeStatusMessage(ctx, http.StatusUnprocessableEntity, err.Error()) } else { + log.Error("Error whilst uploadOrVerify LFS OID[%s]: %v", p.Oid, err) writeStatus(ctx, http.StatusInternalServerError) } if _, err = git_model.RemoveLFSMetaObjectByOid(ctx, repository.ID, p.Oid); err != nil { - log.Error("Error whilst removing metaobject for LFS OID[%s]: %v", p.Oid, err) + log.Error("Error whilst removing MetaObject for LFS OID[%s]: %v", p.Oid, err) } return } @@ -365,6 +365,7 @@ func VerifyHandler(ctx *context.Context) { status := http.StatusOK if err != nil { + log.Error("Error whilst verifying LFS OID[%s]: %v", p.Oid, err) status = http.StatusInternalServerError } else if !ok { status = http.StatusNotFound From 2398a23562ff15fd63d04ea9ed353f3ec2db19c6 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 13 Apr 2023 05:07:43 +0800 Subject: [PATCH 207/340] Backport locales to 1.19 (#24083) Backport locales Generated by `go run build/backport-locales.go release/v1.19` --- options/locale/locale_ja-JP.ini | 11 +- options/locale/locale_pt-PT.ini | 9 +- options/locale/locale_ru-RU.ini | 233 +++++++++++++++++++++++++------- options/locale/locale_zh-TW.ini | 9 +- 4 files changed, 197 insertions(+), 65 deletions(-) diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini index f265cdd4a79d..e40d2f3f95c4 100644 --- a/options/locale/locale_ja-JP.ini +++ b/options/locale/locale_ja-JP.ini @@ -613,7 +613,7 @@ add_email_success=新しいメールアドレスを追加しました。 email_preference_set_success=メール設定を保存しました。 add_openid_success=新しいOpenIDアドレスを追加しました。 keep_email_private=メールアドレスを隠す -keep_email_private_popup=あなたのメールアドレスは他のユーザーから隠されます。 +keep_email_private_popup=あなたのメールアドレスは、あなたと管理者にのみ表示されます openid_desc=OpenIDを使うと外部プロバイダーに認証を委任することができます。 manage_ssh_keys=SSHキーの管理 manage_ssh_principals=SSH証明書プリンシパルの管理 @@ -779,9 +779,9 @@ email_notifications.submit=メール設定を保存 email_notifications.andyourown=自分に関する通知も含める visibility=ユーザーの公開範囲 visibility.public=パブリック -visibility.public_tooltip=すべてのユーザーに表示します +visibility.public_tooltip=全員に表示します visibility.limited=限定 -visibility.limited_tooltip=ログインしているユーザーにのみ表示します +visibility.limited_tooltip=認証済みユーザーにのみ表示します visibility.private=プライベート visibility.private_tooltip=組織のメンバーにのみ表示します select_scopes=スコープを選択 @@ -1272,7 +1272,7 @@ issues.open_title=オープン issues.closed_title=クローズ issues.draft_title=ドラフト issues.num_comments=%d件のコメント -issues.commented_at=が %s にコメント +issues.commented_at=がコメント %s issues.delete_comment_confirm=このコメントを削除してよろしいですか？ issues.context.copy_link=リンクをコピー issues.context.quote_reply=引用して返信 @@ -2272,6 +2272,7 @@ settings.protected_branch_duplicate_rule_name=ルール名が重複していま release.releases_for=%s のリリース release.tags_for=%s のタグ actions=Actions +release.title_empty=タイトルは空にできません。 [org] org_name_holder=組織名 @@ -2307,7 +2308,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=プライベート diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini index 45d5187eeca3..a1ed987d9c86 100644 --- a/options/locale/locale_pt-PT.ini +++ b/options/locale/locale_pt-PT.ini @@ -613,7 +613,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=Seu endereço de email será escondido dos outros utilizadores. +keep_email_private_popup=O seu endereço de email será visível apenas para si e para os administradores openid_desc=O OpenID permite delegar a autenticação num fornecedor externo. manage_ssh_keys=Gerir chaves SSH manage_ssh_principals=Gerir Protagonistas de Certificados SSH @@ -779,9 +779,9 @@ email_notifications.submit=Definir preferência do email email_notifications.andyourown=e as suas próprias notificações visibility=Visibilidade do utilizador visibility.public=Pública -visibility.public_tooltip=Visível para todos os utilizadores +visibility.public_tooltip=Visível para todos visibility.limited=Limitada -visibility.limited_tooltip=Visível apenas para utilizadores com sessão iniciada +visibility.limited_tooltip=Visível apenas para utilizadores autenticados visibility.private=Privada visibility.private_tooltip=Visível apenas para membros da organização select_scopes=Escolha os âmbitos @@ -2272,6 +2272,7 @@ settings.protected_branch_duplicate_rule_name=Nome de regra duplicado release.releases_for=Lançamentos para %s release.tags_for=Etiquetas para %s actions=Operações +release.title_empty=O título não pode estar vazio. [org] org_name_holder=Nome da organização @@ -2307,7 +2308,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=Limitado (visível apenas para utilizadores com sessão iniciada) +settings.visibility.limited=Limitada (visível apenas para utilizadores autenticados) settings.visibility.limited_shortname=Limitada settings.visibility.private=Privada (visível apenas para os membros da organização) settings.visibility.private_shortname=Privado diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini index 99c4f29cc714..5d9a2654fa86 100644 --- a/options/locale/locale_ru-RU.ini +++ b/options/locale/locale_ru-RU.ini @@ -19,7 +19,7 @@ active_stopwatch=Трекер рабочего времени create_new=Создать… user_profile_and_more=Профиль и настройки... signed_in_as=Вы вошли как -enable_javascript=Пожалуйста, включите JavaScript. +enable_javascript=Для этого сайта требуется поддержка JavaScript. toc=Содержание licenses=Лицензии return_to_gitea=Вернуться к Gitea @@ -95,8 +95,12 @@ never=Никогда rss_feed=RSS-лента enabled=Включено disabled=Отключен +copy_content=Скопировать содержимое +copy_type_unsupported=Невозможно скопировать файл этого типа [filter] +string.asc=A - Я +string.desc=Я - А [error] occurred=Произошла ошибка @@ -161,7 +165,7 @@ ssh_port=Порт SSH сервера ssh_port_helper=Номер порта, который использует SSH сервер. Оставьте пустым, чтобы отключить SSH. http_port=Gitea HTTP порт http_port_helper=Номер порта, который будет прослушиваться Gitea веб-сервером. -app_url=Базовый URL-адрес Gitea +app_url=Базовый URL Gitea app_url_helper=Этот параметр влияет на URL для клонирования по HTTP/HTTPS и на некоторые уведомления по электронной почте. log_root_path=Путь к журналу log_root_path_helper=Файлы журнала будут записываться в этот каталог. @@ -223,6 +227,8 @@ password_algorithm=Алгоритм хеширования пароля password_algorithm_helper="""Задайте алгоритм хеширования паролей. Алгоритмы имеют различные требования и стойкость. У алгоритма `argon2` хорошие характеристики, но он использует много памяти и может не подходить для слабых систем.""" smtp_addr=Узел SMTP smtp_port=SMTP-порт +invalid_password_algorithm=Некорректный алгоритм хеширования пароля +enable_update_checker=Включить проверку обновлений [home] uname_holder=Имя пользователя / Адрес эл. почты @@ -263,6 +269,7 @@ org_no_results=Подходящие организации не найдены. code_no_results=Соответствующий поисковому запросу исходный код не найден. code_search_results=Результаты поиска для '%s' code_last_indexed_at=Последний проиндексированный %s +search.match.tooltip=Включать только результаты, которые точно соответствуют поисковому запросу [auth] create_new_account=Регистрация аккаунта @@ -381,6 +388,8 @@ repo.transfer.to_you=вам repo.transfer.body=Для того чтобы принять или отклонить перейдите по ссылке %s или просто проигнорируйте данный запрос. repo.collaborator.added.subject=%s добавил(а) вас в %s repo.collaborator.added.text=Вы были добавлены в качестве соавтора репозитория: +reply=или ответьте на это письмо +team_invite.subject=%[1] приглашает вас присоединиться к организации %[2] [modal] yes=Да @@ -463,6 +472,8 @@ still_own_packages=Ваша учётная запись владеет одни org_still_own_repo=Эта организация по-прежнему владеет одним или несколькими репозиториями; сначала удалите или перенесите их. org_still_own_packages=Эта организация всё ещё имеет пакеты, сначала удалите их. target_branch_not_exist=Целевая ветка не существует. +url_error='%s' не является допустимым URL. +username_error=" может содержать только алфавитно-цифровые символы ('0-9','a-z','A-Z'), тире ('-'), подчеркивания ('_') и точку ('.'). Первый символ должен быть алфавитно-цифровым, последовательности из нескольких не алфавитно-цифровых символов запрещены." [user] change_avatar=Изменить свой аватар… @@ -482,6 +493,7 @@ disabled_public_activity=Этот пользователь отключил пу form.name_reserved=Имя пользователя '%s' зарезервировано. form.name_pattern_not_allowed=Шаблон '%s' не допускается в имени пользователя. form.name_chars_not_allowed=Имя пользователя '%s' содержит недопустимые символы. +code=Код [settings] profile=Профиль @@ -515,7 +527,7 @@ update_language_not_found=Язык '%s' недоступен. update_language_success=Язык обновлён. update_profile_success=Ваш профиль успешно обновлён. change_username=Ваше имя пользователя было изменено. -change_username_prompt=Примечание: изменения имени пользователя также изменяют URL-адрес учётной записи. +change_username_prompt=Примечание: изменения имени пользователя также изменяют URL учётной записи. change_username_redirect_prompt=Старое имя пользователя будет перенаправлять на новое до тех пор, пока его не займут. continue=Далее cancel=Отмена @@ -584,7 +596,7 @@ add_email_success=Добавлен новый адрес электронной email_preference_set_success=Настройки электронной почты были успешно установлены. add_openid_success=Добавлен новый адрес OpenID. keep_email_private=Скрыть адрес электронной почты -keep_email_private_popup=Ваш адрес электронной почты будет скрыт от других пользователей. +keep_email_private_popup=Ваш адрес электронной почты будет виден только вам и администраторам openid_desc=OpenID позволяет делегировать проверку подлинности внешнему поставщику. manage_ssh_keys=Управление SSH ключами manage_ssh_principals=Управление SSH сертификатами участников @@ -676,9 +688,9 @@ delete_token=Удалить access_token_deletion=Удалить токен доступа delete_token_success=Токен удалён. Приложения, использующие его, больше не имеют доступа к вашему аккаунту. manage_oauth2_applications=Управление приложениями OAuth2 -edit_oauth2_application=Изменить OAuth2 приложение +edit_oauth2_application=Изменить приложение OAuth2 oauth2_applications_desc=Приложения OAuth2 позволяет стороннему приложению к безопасно аутентифицировать пользователей данной установки Gitea. -remove_oauth2_application=Удалить OAuth2 приложение +remove_oauth2_application=Удалить приложение OAuth2 remove_oauth2_application_desc=Удаление приложения OAuth2 отменит доступ ко всем подписанным токенам доступа. Продолжить? remove_oauth2_application_success=Приложение было удалено. create_oauth2_application=Создать новое OAuth2 приложение @@ -744,14 +756,15 @@ email_notifications.disable=Отключить почтовые уведомле email_notifications.submit=Установить настройки электронной почты visibility=Видимость пользователя visibility.public=Публичный -visibility.public_tooltip=Видимый для всех пользователей +visibility.public_tooltip=Видимый для всех visibility.limited=Ограниченный -visibility.limited_tooltip=Видимый только авторизованным пользователям +visibility.limited_tooltip=Видимый только выполнившим вход пользователям visibility.private=Приватный visibility.private_tooltip=Видимый только членам организации access_token_deletion_cancel_action=Отменить access_token_deletion_confirm_action=Удалить link_account=Привязать аккаунт +comment_type_group_project=Проект [repo] new_repo_helper=Репозиторий содержит все файлы проекта, включая историю ревизии. Уже есть где-то еще? Мигрировать репозиторий. @@ -809,11 +822,11 @@ mirror_interval_invalid=Недопустимый интервал зеркали mirror_address=Клонировать по URL mirror_address_desc=Поместите необходимые учетные данные в секцию авторизации. mirror_address_url_invalid=Указанный URL некорректен. Нужно правильно экранировать все компоненты URL. -mirror_address_protocol_invalid=Указанный url неверный. Только http(s):// или git:// местоположения могут быть зеркалированы. +mirror_address_protocol_invalid=Указанный URL неверный. Только местоположения, начинающиеся с http(s):// или git://, могут быть зеркалированы. mirror_lfs=Хранилище больших файлов (LFS) mirror_lfs_desc=Активировать зеркалирование данных LFS. mirror_lfs_endpoint=LFS Endpoint -mirror_lfs_endpoint_desc=Sync попытается использовать URL-адрес клона для определения сервера LFS. Вы также можете указать пользовательскую конечную точку, если данные хранится где-то в хранилище. +mirror_lfs_endpoint_desc=Sync попытается использовать URL клона для определения сервера LFS. Вы также можете указать пользовательскую конечную точку, если данные хранится где-то в хранилище. mirror_last_synced=Последняя синхронизация mirror_password_placeholder=(Неизменный) mirror_password_blank_placeholder=(Отменено) @@ -834,7 +847,7 @@ delete_preexisting_label=Удалить delete_preexisting=Удалить уже существующие файлы delete_preexisting_content=Удалить файлы из %s delete_preexisting_success=Удалены непринятые файлы в %s -blame_prior=Посмотреть авторство до этих изменений +blame_prior=Показать авторство предшествующих изменений transfer.accept=Принять трансфер transfer.accept_desc=Переместить в "%s" transfer.reject=Отказаться от перемещения @@ -850,8 +863,8 @@ desc.internal_template=Внутренний шаблон desc.archived=Архивировано template.items=Элементы шаблона template.git_content=Содержимое Git (ветвь по умолчанию) -template.git_hooks=Git hook'и -template.git_hooks_tooltip=В настоящее время вы не можете изменить или удалить Git hook'и после добавления. Выберите это только если вы доверяете репозиторию шаблона. +template.git_hooks=Git-хуки +template.git_hooks_tooltip=В настоящее время вы не можете изменить или удалить Git-хуки после добавления. Выберите это только если вы доверяете репозиторию шаблона. template.webhooks=Веб-хуки template.topics=Темы template.avatar=Аватар @@ -971,7 +984,7 @@ commit_graph.select=Выбрать ветку commit_graph.hide_pr_refs=Скрыть запросы на слияние commit_graph.monochrome=Моно commit_graph.color=Цвет -blame=Вина +blame=Ответственный download_file=Скачать файл normal_view=Обычный вид line=строка @@ -1039,7 +1052,7 @@ commits.commits=Коммитов commits.no_commits=Ничего общего в коммитах. '%s' и '%s' имеют совершенно разные истории. commits.nothing_to_compare=Эти ветки одинаковы. commits.search=Поиск коммитов… -commits.search.tooltip=Вы можете предварять ключевые слова словами "author:", "committer:", "after:", или "before:", например, "revert author:Alice before:2019-04-01". +commits.search.tooltip=Можно предварять ключевые слова префиксами "author:", "committer:", "after:", или "before:", например "revert author:Alice before:2019-01-13". commits.find=Поиск commits.search_all=Все ветки commits.author=Автор @@ -1140,7 +1153,7 @@ issues.label_templates.fail_to_load_file=Не удалось загрузить issues.add_label=добавил(а) метку %s %s issues.add_labels=добавил(а) метки %s %s issues.remove_label=удалил(а) метку %s %s -issues.remove_labels=удалён %s с метками %s +issues.remove_labels=удалил(а) метки %s %s issues.add_remove_labels=добавил(а) метки %s и удалил(а) %s %s issues.add_milestone_at=добавил(а) к этапу %s %s issues.add_project_at=добавил(а) в %s проект %s @@ -1627,14 +1640,14 @@ settings.collaboration.read=Просмотр settings.collaboration.owner=Владелец settings.collaboration.undefined=Не определено settings.hooks=Веб-хуки -settings.githooks=Git Hook'и +settings.githooks=Git-хуки settings.basic_settings=Основные параметры settings.mirror_settings=Настройки зеркалирования settings.mirror_settings.docs=Настройте свой проект, чтобы автоматически отправлять и/или получать изменения из другого репозитория. Ветки, теги и коммиты будут синхронизированы автоматически. Как мне зеркалировать репозитории? settings.mirror_settings.mirrored_repository=Синхронизированное хранилище settings.mirror_settings.direction=Направление settings.mirror_settings.direction.pull=Отправка -settings.mirror_settings.direction.push=Получение +settings.mirror_settings.direction.push=Отправка settings.mirror_settings.last_update=Последнее обновление settings.mirror_settings.push_mirror.none=Push-зеркало не добавлено settings.mirror_settings.push_mirror.remote_url=URL удалённого хранилища @@ -1648,17 +1661,17 @@ settings.advanced_settings=Расширенные настройки settings.wiki_desc=Включить Вики для репозитория settings.use_internal_wiki=Использовать встроенную вики-систему settings.use_external_wiki=Использовать внешнюю вики-систему -settings.external_wiki_url=URL-адрес внешней Вики -settings.external_wiki_url_error=URL внешней вики не является допустимым URL-адресом. -settings.external_wiki_url_desc=Посетители будут перенаправлены на URL-адрес, когда они кликнут по вкладке. +settings.external_wiki_url=URL внешней Вики +settings.external_wiki_url_error=URL внешней вики не является корректным URL. +settings.external_wiki_url_desc=Посетители будут перенаправлены на URL, когда они кликнут по вкладке. settings.issues_desc=Включить систему учёта задач репозитория settings.use_internal_issue_tracker=Использовать встроенную систему учета задач settings.use_external_issue_tracker=Использовать внешнюю систему учета задач settings.external_tracker_url=URL внешней системы отслеживания ошибок -settings.external_tracker_url_error=URL внешнего баг-трекера не является допустимым URL-адресом. -settings.external_tracker_url_desc=Посетители будут перенаправлены на URL-адрес, когда они кликнут по вкладке. +settings.external_tracker_url_error=URL внешнего баг-трекера не является корректным URL. +settings.external_tracker_url_desc=Посетители будут перенаправлены на URL, когда они кликнут по вкладке. settings.tracker_url_format=Внешний формат ссылки системы отслеживания ошибок. -settings.tracker_url_format_error=URL внешнего баг-трекера не является допустимым URL-адресом. +settings.tracker_url_format_error=Формат URL внешнего баг-трекера некорректен. settings.tracker_issue_style=Формат нумерации для внешней системы учета задач settings.tracker_issue_style.numeric=Цифровой settings.tracker_issue_style.alphanumeric=Буквенноцифровой @@ -1758,12 +1771,12 @@ settings.search_team=Поиск команды… settings.change_team_permission_tip=Разрешение команды установлено на странице настройки команды и не может быть изменено для каждого репозитория settings.delete_team_tip=Эта команда имеет доступ ко всем репозиториям и не может быть удалена settings.remove_team_success=Доступ команды к репозиторию был удалён. -settings.add_webhook=Добавить Вебхук -settings.add_webhook.invalid_channel_name=Название канала вебхука не может быть пустым или состоять только из символа #. -settings.hooks_desc=Вебхуки позволяют внешним службам получать уведомления при возникновении определенных событий на Gitea. При возникновении указанных событий мы отправим запрос POST на каждый заданный вами URL. Узнать больше можно в нашем руководстве по вебхукам. -settings.webhook_deletion=Удалить вебхук +settings.add_webhook=Добавить веб-хук +settings.add_webhook.invalid_channel_name=Название канала веб-хука не может быть пустым или состоять только из символа #. +settings.hooks_desc=Веб-хуки позволяют внешним службам получать уведомления при возникновении определенных событий на Gitea. При возникновении указанных событий мы отправим запрос POST на каждый заданный вами URL. Узнать больше можно в нашем руководстве по веб-хукам. +settings.webhook_deletion=Удалить веб-хук settings.webhook_deletion_desc=Удаление этого веб-хука приведет к удалению всей связанной с ним информации, включая историю. Хотите продолжить? -settings.webhook_deletion_success=Вебхук был удалён. +settings.webhook_deletion_success=Веб-хук был удалён. settings.webhook.test_delivery=Проверить доставку settings.webhook.test_delivery_desc=Отправить тестовое событие для тестирования настройки веб-хука. settings.webhook.request=Запрос @@ -1773,10 +1786,10 @@ settings.webhook.payload=Содержимое settings.webhook.body=Тело ответа settings.webhook.replay.description=Повторить этот веб-хук. settings.githook_edit_desc=Если хук не активен, будет подставлен пример содержимого. Пустое значение в этом поле приведёт к отключению хука. -settings.githook_name=Название Hook'a -settings.githook_content=Содержание hook'а -settings.update_githook=Обновить Hook -settings.add_webhook_desc=Gitea будет оправлять POST запросы на указанный URL адрес, с информацией о происходящих событиях. Подробности на странице инструкции по использованию вебхуков. +settings.githook_name=Название хукa +settings.githook_content=Содержимое хука +settings.update_githook=Обновить хук +settings.add_webhook_desc=Gitea будет оправлять POST запросы на указанный URL адрес, с информацией о происходящих событиях. Подробности на странице инструкции по использованию веб-хуков. settings.payload_url=URL обработчика settings.http_method=Метод HTTP settings.content_type=Тип содержимого @@ -1834,11 +1847,11 @@ settings.event_package_desc=Пакет создан или удален в ре settings.branch_filter=Фильтр веток settings.branch_filter_desc=Белый список ветвей для событий Push, создания ветвей и удаления ветвей, указанных в виде глоб-шаблона. Если пустой или *, то все событий для всех ветвей будут зарегистрированы. Перейдите по ссылке github.com/gobwas/glob на документацию по синтаксису. Примеры: master, {master,release*}. settings.active=Активный -settings.active_helper=Информация о происходящих событиях будет отправляться на URL-адрес этого вебхука. -settings.add_hook_success=Вебхук был добавлен. -settings.update_webhook=Обновление вебхука -settings.update_hook_success=Вебхук был обновлён. -settings.delete_webhook=Удалить вебхук +settings.active_helper=Информация о происходящих событиях будет отправляться на URL этого веб-хука. +settings.add_hook_success=Веб-хук был добавлен. +settings.update_webhook=Обновление веб-хука +settings.update_hook_success=Веб-хук был обновлён. +settings.delete_webhook=Удалить веб-хук settings.recent_deliveries=Недавние рассылки settings.hook_type=Тип hook'а settings.slack_token=Slack токен @@ -2052,7 +2065,7 @@ release.edit_subheader=Подробный журнал изменений мож release.tag_name=Имя тега release.target=Цель release.tag_helper=Выберите существующий тег, или создайте новый. -release.title=Заголовок +release.title=Название релиза release.content=Содержимое release.prerelease_desc=Это предварительный релиз release.prerelease_helper=Отдельно отметим, что этот релиз не готов к использованию в продакшене. @@ -2129,6 +2142,51 @@ settings.web_hook_name_wechatwork=WeCom (Wechat Work) settings.packagist_api_token=Токен API settings.protected_branch.save_rule=Сохранить правило settings.protected_branch.delete_rule=Удалить правило +mirror_sync_on_commit=Синхронизировать при отправке коммитов +migrate_options_mirror_helper=Этот репозиторий будет зеркалом +invisible_runes_header=Этот файл содержит невидимые символы Юникода! +invisible_runes_description=Этот файл содержит невидимые символы Юникода, которые могут быть отображены не так, как показано ниже. Если это намеренно, можете спокойно проигнорировать это предупреждение. Используйте кнопку Экранировать, чтобы показать скрытые символы. +ambiguous_runes_header=Этот файл содержит неоднозначные символы Юникода! +ambiguous_runes_description=Этот файл содержит неоднозначные символы Юникода, которые могут быть перепутаны с другими в текущей локали. Если это намеренно, можете спокойно проигнорировать это предупреждение. Используйте кнопку Экранировать, чтобы подсветить эти символы. +invisible_runes_line=В этой строке есть невидимые символы Юникода +ambiguous_runes_line=В этой строке есть неоднозначные символы Юникода +ambiguous_character=%[1]c [U+%04[1]X] можно спутать с %[2]c [U+%04[2]X] +escape_control_characters=Экранировать +unescape_control_characters=Убрать экранирование +view_git_blame=Показать git blame +editor.add_file=Добавить файл +editor.patching=Исправление: +editor.fail_to_apply_patch=Невозможно применить патч '%s' +editor.new_branch_name=Укажите имя новой ветки для этого коммита +editor.push_rejected_no_message=Изменение отклонено сервером без сообщения. Пожалуйста, проверьте хуки Git. +editor.push_rejected=Изменение отклонено сервером. Пожалуйста, проверьте хуки Git. +editor.cherry_pick=Перенести изменения %s в: +editor.revert=Откатить %s к: +commits.ssh_key_fingerprint=Отпечаток ключа SSH +commit.operations=Операции +ext_issues=Доступ к внешним задачам +issues.filter_project=Проект +issues.filter_project_all=Все проекты +issues.filter_poster=Автор +issues.filter_poster_no_select=Все авторы +issues.keyword_search_unavailable=В настоящее время поиск по ключевым словам недоступен. Обратитесь к администратору сайта. +issues.action_check=Выбрать/отменить выбор +issues.action_check_all=Выбрать/отменить выбор всех элементов +pulls.merged_by=от %[3]s был слит %[1]s +pulls.merged_by_fake=от %[2]s был слит %[1]s +issues.closed_by=от %[3]s была закрыта %[1]s +search.match.tooltip=Включать только результаты, которые точно соответствуют поисковому запросу +settings.githooks_desc=Git-хуки предоставляются самим Git. Вы можете изменять файлы хуков из списка ниже, чтобы настроить собственные операции. +settings.authorization_header=Заголовок Authorization +settings.add_web_hook_desc=Интегрировать %s в ваш репозиторий. +settings.web_hook_name_packagist=Packagist +settings.packagist_username=Имя пользователя Packagist +settings.packagist_package_url=Ссылка на пакет Packagist +diff.has_escaped=В этой строке есть невидимые символы Юникода +release.title_empty=Заголовок не может быть пустым. +tag.create_tag_from=Создать новый тег из '%s' +find_file.go_to_file=Перейти к файлу +find_file.no_matching=Совпадающих файлов не найдено [org] org_name_holder=Название организации @@ -2163,7 +2221,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=Приватный @@ -2178,7 +2236,7 @@ settings.delete_prompt=Это действие БЕЗВОЗВРАТНО< settings.confirm_delete_account=Подтвердить удаление settings.delete_org_title=Удалить организацию settings.delete_org_desc=Эта организация будет безвозвратно удалена. Продолжить? -settings.hooks_desc=Добавьте вебхуки, которые будет вызываться для всех репозиториев под этой организации. +settings.hooks_desc=Добавьте веб-хуки, которые будет вызываться для всех репозиториев под этой организации. settings.labels_desc=Добавьте метки, которые могут быть использованы в задачах для всех репозиториев этой организации. members.membership_visibility=Видимость участника команды: members.public=Видимый @@ -2238,6 +2296,9 @@ teams.all_repositories_write_permission_desc=Эта команда предос teams.all_repositories_admin_permission_desc=Эта команда предоставляет администратору доступ к всем репозиториям: участники могут читать, отправлять сообщения и добавлять соавторов в репозитории. members=Участники teams.general_access_helper=Разрешения участников будут определяться таблицей разрешений ниже. +code=Код +teams.none_access=Нет доступа +teams.invite_team_member=Пригласить в %s [admin] dashboard=Панель @@ -2412,13 +2473,13 @@ packages.repository=Репозиторий packages.size=Размер packages.published=Опубликовано defaulthooks=Стандартные Веб-хуки -defaulthooks.desc=Вебхуки автоматически делают HTTP-POST запросы на сервер, когда вызываются определенные события Gitea. Вебхуки, определённые здесь, по умолчанию и будут скопированы во все новые репозитории. Подробнее читайте в руководстве по вебхукам. +defaulthooks.desc=Веб-хуки автоматически делают HTTP-POST запросы на сервер, когда вызываются определенные события Gitea. Веб-хуки, определённые здесь, по умолчанию и будут скопированы во все новые репозитории. Подробнее читайте в руководстве по веб-хукам. defaulthooks.add_webhook=Добавить стандартный Веб-хук defaulthooks.update_webhook=Обновить стандартный Веб-хук -systemhooks=Системные вебхуки -systemhooks.desc=Вебхуки автоматически делают HTTP-POST запросы на сервер, когда вызываются определённые события Gitea. Определённые вебхуки будут действовать на всех репозиториях системы, поэтому пожалуйста, учитывайте любые последствия для производительности. Подробнее читайте в руководстве по вебхукам. -systemhooks.add_webhook=Добавить системный вебхук -systemhooks.update_webhook=Обновить системный вебхук +systemhooks=Системные веб-хуки +systemhooks.desc=Веб-хуки автоматически делают HTTP-POST запросы на сервер, когда вызываются определённые события Gitea. Определённые веб-хуки будут действовать на всех репозиториях системы, поэтому пожалуйста, учитывайте любые последствия для производительности. Подробнее читайте в руководстве по веб-хукам. +systemhooks.add_webhook=Добавить системный веб-хук +systemhooks.update_webhook=Обновить системный веб-хук auths.auth_manage_panel=Управление аутентификацией auths.new=Добавить новый источник auths.name=Имя @@ -2477,7 +2538,7 @@ auths.oauth2_use_custom_url=Использовать пользовательс auths.oauth2_tokenURL=URL токена auths.oauth2_authURL=URL авторизации auths.oauth2_profileURL=URL аккаунта -auths.oauth2_emailURL=URL-адрес электронной почты +auths.oauth2_emailURL=URL электронной почты auths.skip_local_two_fa=Пропустить локальную двухфакторную аутентификацию auths.skip_local_two_fa_helper=Если значение не задано, локальным пользователям с установленной двухфакторной аутентификацией все равно придется пройти двухфакторную аутентификацию для входа в систему auths.oauth2_tenant=Tenant @@ -2493,8 +2554,8 @@ 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.tip=При добавлении нового OAuth2 провайдера, URL адрес переадресации по завершении аутентификации должен выглядеть так: /user/oauth2//callback +auths.tips.oauth2.general=Аутентификация OAuth2 +auths.tips.oauth2.general.tip=При добавлении нового провайдера OAuth2 URL переадресации по завершении аутентификации должен выглядеть так: /user/oauth2//callback auths.tip.oauth2_provider=Поставщик OAuth2 auths.tip.bitbucket=Создайте OAuth URI на странице https://bitbucket.org/account/user/<имя пользователя>/oauth-consumers/new и добавьте права "Account" - "Read" auths.tip.nextcloud=Зарегистрируйте нового потребителя OAuth в вашем экземпляре, используя меню "Settings -> Security -> OAuth 2.0 client" @@ -2524,7 +2585,7 @@ auths.login_source_of_type_exist=Источник аутентификации config.server_config=Конфигурация сервера config.app_name=Название сайта config.app_ver=Версия Gitea -config.app_url=Базовый URL-адрес Gitea +config.app_url=Базовый URL Gitea config.custom_conf=Путь к файлу конфигурации config.custom_file_root_path=Пользовательский путь до папки с файлами config.domain=Домен сервера @@ -2584,7 +2645,7 @@ config.default_allow_only_contributors_to_track_time=Учитывать толь config.no_reply_address=No-reply адрес config.default_visibility_organization=Видимость по умолчанию для новых организаций config.default_enable_dependencies=Включение зависимостей для задач по умолчанию -config.webhook_config=Конфигурация вебхуков +config.webhook_config=Конфигурация веб-хуков config.queue_length=Длина очереди config.deliver_timeout=Задержка доставки config.skip_tls_verify=Пропустить проверку TLS @@ -2727,6 +2788,24 @@ notices.op=Oп. notices.delete_success=Уведомления системы были удалены. config.mailer_smtp_port=SMTP-порт users.purge_help=Принудительное удаление пользователя и любых репозиториев, организаций и пакетов, принадлежащих пользователю. Комментарии тоже будут удалены. +dashboard.statistic_info=В базе данных Gitea записано %d пользователей, %d организаций, %d публичных ключей, %d репозиториев, %d подписок на репозитории, %d добавлений в избранное, ~%d действий, %d доступов, %d задач, %d комментариев, %d социальных учетных записей, %d подписок на пользователей, %d зеркал, %d релизов, %d источников входа, %d веб-хуков, %d этапов, %d меток, %d задач хуков, %d команд, %d задач по обновлению, %d присоединённых файлов. +dashboard.cleanup_packages=Очистка устаревших пакетов +dashboard.delete_old_system_notices=Удалить все старые системные уведомления из базы данных +users.cannot_delete_self=Вы не можете удалить собственную учётную запись +users.purge=Удалить пользователя +packages.package_manage_panel=Управление пакетами +auths.enable_ldap_groups=Включить группы LDAP +config.mailer_config=Настройки почты +config.mailer_enable_helo=Включить HELO +config.mailer_protocol=Протокол +config.mailer_smtp_addr=Адрес SMTP +config.mailer_use_dummy=Заглушка +config.get_setting_failed=Получить параметр %s не удалось +config.set_setting_failed=Задать параметр %s не удалось +monitor.stacktrace=Трассировки стека +monitor.queue.numberinqueue=Позиция в очереди +monitor.queue.pool.pause.title=Приостановка очереди +notices.operations=Операции [action] create_repo=создал(а) репозиторий %s @@ -2798,6 +2877,9 @@ pin=Прикрепить уведомление mark_as_read=Отметить как прочитанное mark_as_unread=Пометить как непрочитанное mark_all_as_read=Пометить все как прочитанные +subscriptions=Подписки +watching=Наблюдение +no_subscriptions=Нет подписок [gpg] default_key=Подписано ключом по умолчанию @@ -2818,7 +2900,7 @@ error.unit_not_allowed=У вас нет доступа к этому разде title=Пакеты desc=Управление пакетами репозитория. empty=Пока нет пакетов. -empty.documentation=Дополнительную информацию о реестре пакетов можно найти в документации. +empty.documentation=Дополнительную информацию о реестре пакетов можно найти в документации. filter.type=Тип filter.type.all=Все filter.no_result=Фильтр не дал результатов. @@ -2846,8 +2928,55 @@ settings.delete.notice=Вы собираетесь удалить %s (%s). Эт settings.delete.success=Пакет был удалён. settings.delete.error=Не удалось удалить пакет. owner.settings.cleanuprules.success.delete=Правило очистки удалено. +empty.repo=Вы загрузили пакет, но он здесь не отображается? Перейдите в настройки пакета и свяжите его с этим репозиторием. +published_by=Опубликовано %[1]s %[3]s +published_by_in=Опубликовано %[1]s %[3]s в %[5]s +keywords=Ключевые слова +details=Подробнее +details.author=Автор +details.project_site=Сайт проекта +details.license=Лицензия +versions=Версии +versions.view_all=Показать всё +chef.install=Чтобы установить пакет, выполните следующую команду: +composer.registry=Настройте этот реестр в файле ~/.composer/config.json: +composer.documentation=Для получения дополнительной информации о реестре Composer смотрите документацию. +conan.registry=Настроить реестр из командной строки: +conan.documentation=Для получения дополнительной информации о реестре Conan смотрите документацию. +container.details.type=Тип образа +container.details.platform=Платформа +container.digest=Отпечаток: +container.documentation=Для получения дополнительной информации о реестре контейнеров смотрите документацию. +helm.registry=Настроить реестр из командной строки: +helm.install=Чтобы установить пакет, выполните следующую команду: +helm.documentation=Для получения дополнительной информации о реестре Helm смотрите документацию. +maven.install2=Выполнить через командную строку: +nuget.registry=Настроить реестр из командной строки: +nuget.install=Чтобы установить пакет с помощью NuGet, выполните следующую команду: +nuget.documentation=Для получения дополнительной информации о реестре NuGet смотрите документацию. +npm.install=Чтобы установить пакет с помощью npm, выполните следующую команду: +npm.install2=или добавьте его в файл package.json: +npm.documentation=Для получения дополнительной информации о реестре npm смотрите документацию. +npm.dependencies.peer=Одноранговые зависимости +npm.dependencies.optional=Необязательные зависимости +npm.details.tag=Тег +pypi.requires=Требуется Python +pypi.documentation=Для получения дополнительной информации о реестре PyPI смотрите документацию. +rubygems.install=Чтобы установить пакет с помощью gem, выполните следующую команду: +rubygems.install2=или добавьте его в Gemfile: +rubygems.documentation=Для получения дополнительной информации о реестре RubyGems смотрите документацию. +settings.link=Связать этот пакет с репозиторием +settings.link.description=Если связать пакет с репозиторием, он добавится в список пакетов репозитория. +settings.link.select=Выберите репозиторий +settings.link.success=Связь с репозиторием успешно обновлена. +settings.link.error=Не удалось обновить привязку к репозиторию. +settings.delete.description=Удаление пакета необратимо и не может быть отменено. [aria] +navbar=Панель навигации +footer=Подвал +footer.software=О программе +footer.links=Ссылки [secrets] value=Значение diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini index 87c300db97a6..499e3bfd3ba0 100644 --- a/options/locale/locale_zh-TW.ini +++ b/options/locale/locale_zh-TW.ini @@ -613,7 +613,7 @@ add_email_success=已加入新的電子信箱。 email_preference_set_success=已套用郵件偏好設定 add_openid_success=已加入新的 OpenID 地址。 keep_email_private=隱藏電子信箱 -keep_email_private_popup=您的電子信箱將對其他使用者隱藏。 +keep_email_private_popup=將只有您和系統管理員可以看到您的電子信箱地址 openid_desc=OpenID 讓你可以授權認證給外部服務。 manage_ssh_keys=管理 SSH 金鑰 manage_ssh_principals=管理 SSH 認證主體 @@ -778,9 +778,9 @@ email_notifications.submit=套用郵件偏好設定 email_notifications.andyourown=和您自己的通知 visibility=使用者瀏覽權限 visibility.public=公開 -visibility.public_tooltip=對所有人公開 +visibility.public_tooltip=所有人都可以看到 visibility.limited=受限 -visibility.limited_tooltip=只有登入的使用者才能看到 +visibility.limited_tooltip=只有已驗證的使用者才可以看到 visibility.private=私人 visibility.private_tooltip=只有組織成員才能看到 select_scopes=選擇範圍 (Scope) @@ -2272,6 +2272,7 @@ settings.protected_branch_duplicate_rule_name=規則名稱已存在 release.releases_for=%s 的版本發佈 release.tags_for=%s 的標籤 actions=Actions +release.title_empty=標題不可為空。 [org] org_name_holder=組織名稱 @@ -2307,7 +2308,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=私有 From 447fa6715ca56ea0a7d2d411d82bced4a6ffec31 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Thu, 13 Apr 2023 03:38:06 +0200 Subject: [PATCH 208/340] Changelog v1.19.1 (#24079) --- CHANGELOG.md | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 324b0cdfd602..0bdd4c04f09c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,96 @@ This changelog goes through all the changes that have been made in each release without substantial changes to our git log; to see the highlights of what has been added to each release, please refer to the [blog](https://blog.gitea.io). -## [1.19.0](https://github.com/go-gitea/gitea/releases/tag/1.19.0) - 2023-03-19 +## [1.19.1](https://github.com/go-gitea/gitea/releases/tag/v1.19.1) - 2023-04-12 + +* BREAKING + * Rename actions unit to `repo.actions` and add docs for it (#23733) (#23881) +* ENHANCEMENTS + * Add card type to org/user level project on creation, edit and view (#24043) (#24066) + * Refactor commit status for Actions jobs (#23786) (#24060) + * Show errors for KaTeX and mermaid on the preview tab (#24009) (#24019) + * Show protected branch rule names again (#23907) (#24018) + * Adjust sticky PR header to cover background (#23956) (#23999) + * Discolor pull request tab labels (#23950) (#23987) + * Treat PRs with agit flow as fork PRs when triggering actions. (#23884) (#23967) + * Left-align review comments (#23937) + * Fix image border-radius (#23886) (#23930) + * Scroll collapsed file into view (#23702) (#23929) + * Fix code view (diff) broken layout (#23096) (#23918) + * Org pages style fixes (#23901) (#23914) + * Fix user profile description rendering (#23882) (#23902) + * Fix review box viewport overflow issue (#23800) (#23898) + * Prefill input values in OAuth settings as intended (#23829) (#23871) + * CSS color tweaks (#23828) (#23842) + * Fix incorrect visibility dropdown list in add/edit user page (#23804) (#23833) + * Add CSS rules for basic colored labels (#23774) (#23777) + * Add creation time in tag list page (#23693) (#23773) + * Fix br display for packages curls (#23737) (#23764) + * Fix issue due date edit toggle bug (#23723) (#23758) + * Improve commit graph page UI alignment (#23751) (#23754) + * Use GitHub Actions compatible globbing for `branches`, `tag`, `path` filter (#22804) (#23740) + * Redirect to project again after editing it (#23326) (#23739) + * Remove row clicking from notification table (#22695) (#23706) + * Remove conflicting CSS rules on notifications, improve notifications table (#23565) (#23621) + * Fix diff tree height and adjust target file style (#23616) +* BUGFIXES + * Improve error logging for LFS (#24072) (#24082) + * Fix custom mailer template on Windows platform (#24081) + * Update the value of `diffEnd` when clicking the `Show More` button in the DiffFileTree (#24069) (#24078) + * Make label templates have consistent behavior and priority (#23749) + * Fix accidental overwriting of LDAP team memberships (#24050) (#24065) + * Fix branch protection priority (#24045) (#24061) + * Use actions job link as commit status URL instead of run link (#24023) (#24032) + * Add actions support to package auth verification (#23729) (#24028) + * Fix protected branch for API (#24013) (#24027) + * Do not escape space between PyPI repository URL and package name… (#23981) (#24008) + * Fix redirect bug when creating issue from a project (#23971) (#23997) + * Set `ref` to fully-formed of the tag when trigger event is `release` (#23944) (#23989) + * Use Get/Set instead of Rename when regenerating session ID (#23975) (#23983) + * Ensure RSS icon is present on all repo tabs (#23904) (#23973) + * Remove `Repository.getFilesChanged` to fix Actions `paths` and `paths-ignore` filter (#23920) (#23969) + * Delete deleted release attachments immediately from storage (#23913) (#23958) + * Use ghost user if package creator does not exist (#23822) (#23915) + * User/Org Feed render description as per web (#23887) (#23906) + * Fix `cases.Title` crash for concurrency (#23885) (#23903) + * Convert .Source.SkipVerify to $cfg.SkipVerify (#23839) (#23899) + * Support "." char as user name for User/Orgs in RSS/ATOM/GPG/KEYS path ... (#23874) (#23878) + * Fix JS error when changing PR's target branch (#23862) (#23864) + * Fix 500 error if there is a name conflict when editing authentication source (#23832) (#23852) + * Fix closed PR also triggers Webhooks and actions (#23782) (#23834) + * Fix checks for `needs` in Actions (#23789) (#23831) + * Fix "Updating branch by merge" bug in "update_branch_by_merge.tmpl" (#23790) (#23825) + * Fix cancel button in the page of project edit not work (#23655) (#23813) + * Don't apply the group filter when listing LDAP group membership if it is empty (#23745) (#23788) + * Fix profile page email display, respect settings (#23747) (#23756) + * Fix project card preview select and template select (#23684) (#23731) + * Check LFS/Packages settings in dump and doctor command (#23631) (#23730) + * Add git dashes separator to some "log" and "diff" commands (#23606) (#23720) + * Create commit status when event is `pull_request_sync` (#23683) (#23691) + * Fix incorrect `HookEventType` of pull request review comments (#23650) (#23678) + * Fix incorrect `show-modal` and `show-panel` class (#23660) (#23663) + * Improve workflow event triggers (#23613) (#23648) + * Introduce path Clean/Join helper functions, partially backport&refactor (#23495) (#23607) + * Fix pagination on `/notifications/watching` (#23564) (#23603) + * Fix submodule is nil panic (#23588) (#23601) + * Polyfill the window.customElements (#23592) (#23595) + * Avoid too long names for actions (#23162) (#23190) +* TRANSLATION + * Backport locales (with manual fixes) (#23808, #23634, #24083) +* BUILD + * Hardcode the path to docker images (#23955) (#23968) +* DOCS + * Update documentation to explain which projects allow Gitea to host static pages (#23993) (#24058) + * Merge `push to create`, `open PR from push`, and `push options` docs articles into one (#23744) (#23959) + * Fix code blocks in the cheat sheet (#23664) (#23669) +* MISC + * Do not crash when parsing an invalid workflow file (#23972) (#23976) + * Remove assertion debug code for show/hide refactoring (#23576) (#23868) + * Add ONLY_SHOW_RELEVANT_REPOS back, fix explore page bug, make code more strict (#23766) (#23791) + * Make minio package support legacy MD5 checksum (#23768) (#23770) + * Improve template error reporting (#23396) (#23600) + +## [1.19.0](https://github.com/go-gitea/gitea/releases/tag/v1.19.0) - 2023-03-19 * BREAKING * Add loading yaml label template files (#22976) (#23232) From 893c97dd71cebde02d826db3a235dadd2e273bd2 Mon Sep 17 00:00:00 2001 From: Zettat123 Date: Thu, 13 Apr 2023 15:19:41 +0800 Subject: [PATCH 209/340] Fix mismatch between hook events and github event types (#24048) (#24091) Backport https://github.com/go-gitea/gitea/pull/24048 Some workflow trigger events can have multiple activity types, such as `issues` and `pull_request`, and user can specify which types can trigger the workflow. See GitHub documentation: https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows Now some hook events cannot match the workflow trigger events correctly because we don't check the activity types. For example, `pull_request_label` is an individual hook event. But there isn't a `pull_request_label` workflow trigger event, we can only use `pull_request` event's `label` activity type. If we don't check the activity types, the workflows without the `label` activity type may be triggered by the `pull_request_label` event by mistake. We need to improve the match logic. - [x] [`issues` ](https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#issues) - [x] [`issue_comment`](https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#issue_comment) - [x] [`pull_request`](https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request) - [x] [`pull_request_review`](https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_review) - [x] [`pull_request_review_comment`](https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_review_comment) - [x] [`release`](https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#release) - [x] [`registry_package`](https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#registry_package) --- modules/actions/workflows.go | 282 +++++++++++++++++++++++++++--- modules/actions/workflows_test.go | 111 ++++++++++++ 2 files changed, 368 insertions(+), 25 deletions(-) create mode 100644 modules/actions/workflows_test.go diff --git a/modules/actions/workflows.go b/modules/actions/workflows.go index e9ff70156ffb..e22ad9f85100 100644 --- a/modules/actions/workflows.go +++ b/modules/actions/workflows.go @@ -99,40 +99,60 @@ func detectMatched(commit *git.Commit, triggedEvent webhook_module.HookEventType } switch triggedEvent { - case webhook_module.HookEventCreate, + case // events with no activity types + webhook_module.HookEventCreate, webhook_module.HookEventDelete, webhook_module.HookEventFork, - webhook_module.HookEventIssueAssign, - webhook_module.HookEventIssueLabel, - webhook_module.HookEventIssueMilestone, - webhook_module.HookEventPullRequestAssign, - webhook_module.HookEventPullRequestLabel, - webhook_module.HookEventPullRequestMilestone, - webhook_module.HookEventPullRequestComment, - webhook_module.HookEventPullRequestReviewApproved, - webhook_module.HookEventPullRequestReviewRejected, - webhook_module.HookEventPullRequestReviewComment, - webhook_module.HookEventWiki, - webhook_module.HookEventRepository, - webhook_module.HookEventRelease, - webhook_module.HookEventPackage: + // FIXME: `wiki` event should match `gollum` event + // See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#gollum + webhook_module.HookEventWiki: if len(evt.Acts()) != 0 { log.Warn("Ignore unsupported %s event arguments %v", triggedEvent, evt.Acts()) } // no special filter parameters for these events, just return true if name matched return true - case webhook_module.HookEventPush: + case // push + webhook_module.HookEventPush: return matchPushEvent(commit, payload.(*api.PushPayload), evt) - case webhook_module.HookEventIssues: + case // issues + webhook_module.HookEventIssues, + webhook_module.HookEventIssueAssign, + webhook_module.HookEventIssueLabel, + webhook_module.HookEventIssueMilestone: return matchIssuesEvent(commit, payload.(*api.IssuePayload), evt) - case webhook_module.HookEventPullRequest, webhook_module.HookEventPullRequestSync: + case // issue_comment + webhook_module.HookEventIssueComment, + // `pull_request_comment` is same as `issue_comment` + // See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_comment-use-issue_comment + webhook_module.HookEventPullRequestComment: + return matchIssueCommentEvent(commit, payload.(*api.IssueCommentPayload), evt) + + case // pull_request + webhook_module.HookEventPullRequest, + webhook_module.HookEventPullRequestSync, + webhook_module.HookEventPullRequestAssign, + webhook_module.HookEventPullRequestLabel: return matchPullRequestEvent(commit, payload.(*api.PullRequestPayload), evt) - case webhook_module.HookEventIssueComment: - return matchIssueCommentEvent(commit, payload.(*api.IssueCommentPayload), evt) + case // pull_request_review + webhook_module.HookEventPullRequestReviewApproved, + webhook_module.HookEventPullRequestReviewRejected: + return matchPullRequestReviewEvent(commit, payload.(*api.PullRequestPayload), evt) + + case // pull_request_review_comment + webhook_module.HookEventPullRequestReviewComment: + return matchPullRequestReviewCommentEvent(commit, payload.(*api.PullRequestPayload), evt) + + case // release + webhook_module.HookEventRelease: + return matchReleaseEvent(commit, payload.(*api.ReleasePayload), evt) + + case // registry_package + webhook_module.HookEventPackage: + return matchPackageEvent(commit, payload.(*api.PackagePayload), evt) default: log.Warn("unsupported event %q", triggedEvent) @@ -249,8 +269,24 @@ func matchIssuesEvent(commit *git.Commit, issuePayload *api.IssuePayload, evt *j for cond, vals := range evt.Acts() { switch cond { case "types": + // See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#issues + // Actions with the same name: + // opened, edited, closed, reopened, assigned, unassigned, milestoned, demilestoned + // Actions need to be converted: + // label_updated -> labeled + // label_cleared -> unlabeled + // Unsupported activity types: + // deleted, transferred, pinned, unpinned, locked, unlocked + + action := issuePayload.Action + switch action { + case api.HookIssueLabelUpdated: + action = "labeled" + case api.HookIssueLabelCleared: + action = "unlabeled" + } for _, val := range vals { - if glob.MustCompile(val, '/').Match(string(issuePayload.Action)) { + if glob.MustCompile(val, '/').Match(string(action)) { matchTimes++ break } @@ -265,8 +301,9 @@ func matchIssuesEvent(commit *git.Commit, issuePayload *api.IssuePayload, evt *j func matchPullRequestEvent(commit *git.Commit, prPayload *api.PullRequestPayload, evt *jobparser.Event) bool { // with no special filter parameters if len(evt.Acts()) == 0 { - // defaultly, only pull request opened and synchronized will trigger workflow - return prPayload.Action == api.HookIssueSynchronized || prPayload.Action == api.HookIssueOpened + // defaultly, only pull request `opened`, `reopened` and `synchronized` will trigger workflow + // See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request + return prPayload.Action == api.HookIssueSynchronized || prPayload.Action == api.HookIssueOpened || prPayload.Action == api.HookIssueReOpened } matchTimes := 0 @@ -274,9 +311,24 @@ func matchPullRequestEvent(commit *git.Commit, prPayload *api.PullRequestPayload for cond, vals := range evt.Acts() { switch cond { case "types": + // See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request + // Actions with the same name: + // opened, edited, closed, reopened, assigned, unassigned + // Actions need to be converted: + // synchronized -> synchronize + // label_updated -> labeled + // label_cleared -> unlabeled + // Unsupported activity types: + // converted_to_draft, ready_for_review, locked, unlocked, review_requested, review_request_removed, auto_merge_enabled, auto_merge_disabled + action := prPayload.Action - if prPayload.Action == api.HookIssueSynchronized { + switch action { + case api.HookIssueSynchronized: action = "synchronize" + case api.HookIssueLabelUpdated: + action = "labeled" + case api.HookIssueLabelCleared: + action = "unlabeled" } log.Trace("matching pull_request %s with %v", action, vals) for _, val := range vals { @@ -347,6 +399,14 @@ func matchIssueCommentEvent(commit *git.Commit, issueCommentPayload *api.IssueCo for cond, vals := range evt.Acts() { switch cond { case "types": + // See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#issue_comment + // Actions with the same name: + // created, edited, deleted + // Actions need to be converted: + // NONE + // Unsupported activity types: + // NONE + for _, val := range vals { if glob.MustCompile(val, '/').Match(string(issueCommentPayload.Action)) { matchTimes++ @@ -354,7 +414,179 @@ func matchIssueCommentEvent(commit *git.Commit, issueCommentPayload *api.IssueCo } } default: - log.Warn("issue comment unsupported condition %q", cond) + log.Warn("issue comment event unsupported condition %q", cond) + } + } + return matchTimes == len(evt.Acts()) +} + +func matchPullRequestReviewEvent(commit *git.Commit, prPayload *api.PullRequestPayload, evt *jobparser.Event) bool { + // with no special filter parameters + if len(evt.Acts()) == 0 { + return true + } + + matchTimes := 0 + // all acts conditions should be satisfied + for cond, vals := range evt.Acts() { + switch cond { + case "types": + // See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_review + // Activity types with the same name: + // NONE + // Activity types need to be converted: + // reviewed -> submitted + // reviewed -> edited + // Unsupported activity types: + // dismissed + + actions := make([]string, 0) + if prPayload.Action == api.HookIssueReviewed { + // the `reviewed` HookIssueAction can match the two activity types: `submitted` and `edited` + // See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_review + actions = append(actions, "submitted", "edited") + } + + matched := false + for _, val := range vals { + for _, action := range actions { + if glob.MustCompile(val, '/').Match(action) { + matched = true + break + } + } + if matched { + break + } + } + if matched { + matchTimes++ + } + default: + log.Warn("pull request review event unsupported condition %q", cond) + } + } + return matchTimes == len(evt.Acts()) +} + +func matchPullRequestReviewCommentEvent(commit *git.Commit, prPayload *api.PullRequestPayload, evt *jobparser.Event) bool { + // with no special filter parameters + if len(evt.Acts()) == 0 { + return true + } + + matchTimes := 0 + // all acts conditions should be satisfied + for cond, vals := range evt.Acts() { + switch cond { + case "types": + // See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_review_comment + // Activity types with the same name: + // NONE + // Activity types need to be converted: + // reviewed -> created + // reviewed -> edited + // Unsupported activity types: + // deleted + + actions := make([]string, 0) + if prPayload.Action == api.HookIssueReviewed { + // the `reviewed` HookIssueAction can match the two activity types: `created` and `edited` + // See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_review_comment + actions = append(actions, "created", "edited") + } + + matched := false + for _, val := range vals { + for _, action := range actions { + if glob.MustCompile(val, '/').Match(action) { + matched = true + break + } + } + if matched { + break + } + } + if matched { + matchTimes++ + } + default: + log.Warn("pull request review comment event unsupported condition %q", cond) + } + } + return matchTimes == len(evt.Acts()) +} + +func matchReleaseEvent(commit *git.Commit, payload *api.ReleasePayload, evt *jobparser.Event) bool { + // with no special filter parameters + if len(evt.Acts()) == 0 { + return true + } + + matchTimes := 0 + // all acts conditions should be satisfied + for cond, vals := range evt.Acts() { + switch cond { + case "types": + // See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#release + // Activity types with the same name: + // published + // Activity types need to be converted: + // updated -> edited + // Unsupported activity types: + // unpublished, created, deleted, prereleased, released + + action := payload.Action + switch action { + case api.HookReleaseUpdated: + action = "edited" + } + for _, val := range vals { + if glob.MustCompile(val, '/').Match(string(action)) { + matchTimes++ + break + } + } + default: + log.Warn("release event unsupported condition %q", cond) + } + } + return matchTimes == len(evt.Acts()) +} + +func matchPackageEvent(commit *git.Commit, payload *api.PackagePayload, evt *jobparser.Event) bool { + // with no special filter parameters + if len(evt.Acts()) == 0 { + return true + } + + matchTimes := 0 + // all acts conditions should be satisfied + for cond, vals := range evt.Acts() { + switch cond { + case "types": + // See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#registry_package + // Activity types with the same name: + // NONE + // Activity types need to be converted: + // created -> published + // Unsupported activity types: + // updated + + action := payload.Action + switch action { + case api.HookPackageCreated: + action = "published" + } + for _, val := range vals { + if glob.MustCompile(val, '/').Match(string(action)) { + matchTimes++ + break + } + } + default: + log.Warn("package event unsupported condition %q", cond) } } return matchTimes == len(evt.Acts()) diff --git a/modules/actions/workflows_test.go b/modules/actions/workflows_test.go new file mode 100644 index 000000000000..219229c51f8b --- /dev/null +++ b/modules/actions/workflows_test.go @@ -0,0 +1,111 @@ +// Copyright 2023 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package actions + +import ( + "bytes" + "testing" + + "code.gitea.io/gitea/modules/git" + api "code.gitea.io/gitea/modules/structs" + webhook_module "code.gitea.io/gitea/modules/webhook" + + "github.com/nektos/act/pkg/jobparser" + "github.com/nektos/act/pkg/model" + "github.com/stretchr/testify/assert" +) + +func TestDetectMatched(t *testing.T) { + testCases := []struct { + desc string + commit *git.Commit + triggedEvent webhook_module.HookEventType + payload api.Payloader + yamlOn string + expected bool + }{ + { + desc: "HookEventCreate(create) matches githubEventCreate(create)", + triggedEvent: webhook_module.HookEventCreate, + payload: nil, + yamlOn: "on: create", + expected: true, + }, + { + desc: "HookEventIssues(issues) `opened` action matches githubEventIssues(issues)", + triggedEvent: webhook_module.HookEventIssues, + payload: &api.IssuePayload{Action: api.HookIssueOpened}, + yamlOn: "on: issues", + expected: true, + }, + { + desc: "HookEventIssues(issues) `milestoned` action matches githubEventIssues(issues)", + triggedEvent: webhook_module.HookEventIssues, + payload: &api.IssuePayload{Action: api.HookIssueMilestoned}, + yamlOn: "on: issues", + expected: true, + }, + { + desc: "HookEventPullRequestSync(pull_request_sync) matches githubEventPullRequest(pull_request)", + triggedEvent: webhook_module.HookEventPullRequestSync, + payload: &api.PullRequestPayload{Action: api.HookIssueSynchronized}, + yamlOn: "on: pull_request", + expected: true, + }, + { + desc: "HookEventPullRequest(pull_request) `label_updated` action doesn't match githubEventPullRequest(pull_request) with no activity type", + triggedEvent: webhook_module.HookEventPullRequest, + payload: &api.PullRequestPayload{Action: api.HookIssueLabelUpdated}, + yamlOn: "on: pull_request", + expected: false, + }, + { + desc: "HookEventPullRequest(pull_request) `label_updated` action matches githubEventPullRequest(pull_request) with `label` activity type", + triggedEvent: webhook_module.HookEventPullRequest, + payload: &api.PullRequestPayload{Action: api.HookIssueLabelUpdated}, + yamlOn: "on:\n pull_request:\n types: [labeled]", + expected: true, + }, + { + desc: "HookEventPullRequestReviewComment(pull_request_review_comment) matches githubEventPullRequestReviewComment(pull_request_review_comment)", + triggedEvent: webhook_module.HookEventPullRequestReviewComment, + payload: &api.PullRequestPayload{Action: api.HookIssueReviewed}, + yamlOn: "on:\n pull_request_review_comment:\n types: [created]", + expected: true, + }, + { + desc: "HookEventPullRequestReviewRejected(pull_request_review_rejected) doesn't match githubEventPullRequestReview(pull_request_review) with `dismissed` activity type (we don't support `dismissed` at present)", + triggedEvent: webhook_module.HookEventPullRequestReviewRejected, + payload: &api.PullRequestPayload{Action: api.HookIssueReviewed}, + yamlOn: "on:\n pull_request_review:\n types: [dismissed]", + expected: false, + }, + { + desc: "HookEventRelease(release) `published` action matches githubEventRelease(release) with `published` activity type", + triggedEvent: webhook_module.HookEventRelease, + payload: &api.ReleasePayload{Action: api.HookReleasePublished}, + yamlOn: "on:\n release:\n types: [published]", + expected: true, + }, + { + desc: "HookEventPackage(package) `created` action doesn't match githubEventRegistryPackage(registry_package) with `updated` activity type", + triggedEvent: webhook_module.HookEventPackage, + payload: &api.PackagePayload{Action: api.HookPackageCreated}, + yamlOn: "on:\n registry_package:\n types: [updated]", + expected: false, + }, + } + + for _, tc := range testCases { + t.Run(tc.desc, func(t *testing.T) { + workflow, err := model.ReadWorkflow(bytes.NewReader([]byte(tc.yamlOn))) + assert.NoError(t, err) + evts, err := jobparser.ParseRawOn(&workflow.RawOn) + assert.NoError(t, err) + assert.NoError(t, err) + assert.Len(t, evts, 1) + assert.Equal(t, tc.expected, detectMatched(tc.commit, tc.triggedEvent, tc.payload, evts[0])) + }) + } +} From 67a73dd05f21b6bd21e2b2b7a8299864c31659fb Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 14 Apr 2023 00:52:21 -0400 Subject: [PATCH 210/340] Fix incorrect server error content in RunnersList (#24118) (#24121) Backport #24118 by @yp05327 Co-authored-by: yp05327 <576951401@qq.com> --- routers/web/shared/actions/runners.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/routers/web/shared/actions/runners.go b/routers/web/shared/actions/runners.go index f63d37f165b8..2c3614cbbcb2 100644 --- a/routers/web/shared/actions/runners.go +++ b/routers/web/shared/actions/runners.go @@ -22,13 +22,13 @@ import ( func RunnersList(ctx *context.Context, tplName base.TplName, opts actions_model.FindRunnerOptions) { count, err := actions_model.CountRunners(ctx, opts) if err != nil { - ctx.ServerError("AdminRunners", err) + ctx.ServerError("CountRunners", err) return } runners, err := actions_model.FindRunners(ctx, opts) if err != nil { - ctx.ServerError("AdminRunners", err) + ctx.ServerError("FindRunners", err) return } if err := runners.LoadAttributes(ctx); err != nil { From 10f93995e95e62c262d0134080950cdd3a774a78 Mon Sep 17 00:00:00 2001 From: sillyguodong <33891828+sillyguodong@users.noreply.github.com> Date: Fri, 14 Apr 2023 17:54:22 +0800 Subject: [PATCH 211/340] Highlight selected file in the PR file tree (#23947) (#24126) backport #23947 by @yusifeng before ![before](https://user-images.githubusercontent.com/36984894/230327904-6e712ca2-f777-4cad-99f3-53bc20008180.gif) after ![after](https://user-images.githubusercontent.com/36984894/230327966-6e5dd971-f0df-427a-a80b-6a9b6db6065d.gif) Co-authored-by: yusifeng <36984894+yusifeng@users.noreply.github.com> --- web_src/js/components/DiffFileTree.vue | 14 ++++++++++-- web_src/js/components/DiffFileTreeItem.vue | 26 ++++++++++++++-------- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/web_src/js/components/DiffFileTree.vue b/web_src/js/components/DiffFileTree.vue index 7ed1ef151e16..e978d7bce618 100644 --- a/web_src/js/components/DiffFileTree.vue +++ b/web_src/js/components/DiffFileTree.vue @@ -5,7 +5,7 @@ >
    - +
    {{ tooManyFilesMessage }}{{ showMoreMessage }} @@ -25,7 +25,10 @@ export default { data: () => { const fileTreeIsVisible = localStorage.getItem(LOCAL_STORAGE_KEY) === 'true'; pageData.diffFileInfo.fileTreeIsVisible = fileTreeIsVisible; - return pageData.diffFileInfo; + return { + ...pageData.diffFileInfo, + selectedFile: '' + }; }, computed: { fileTree() { @@ -98,9 +101,16 @@ export default { pageData.diffFileInfo.files = this.files; document.querySelector('.diff-toggle-file-tree-button').addEventListener('click', this.toggleVisibility); + + this.hashChangeListener = () => { + this.selectedFile = window.location.hash; + }; + this.hashListener = window.addEventListener('hashchange', this.hashChangeListener); + this.selectedFile = window.location.hash; }, unmounted() { document.querySelector('.diff-toggle-file-tree-button').removeEventListener('click', this.toggleVisibility); + window.removeEventListener('hashchange', this.hashChangeListener); }, methods: { toggleVisibility() { diff --git a/web_src/js/components/DiffFileTreeItem.vue b/web_src/js/components/DiffFileTreeItem.vue index f0a3d909b9fc..ea5d48840cb2 100644 --- a/web_src/js/components/DiffFileTreeItem.vue +++ b/web_src/js/components/DiffFileTreeItem.vue @@ -1,7 +1,7 @@

    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

    {{FileSize .Size}} {{TimeSince .CreatedUnix.AsTime $.locale}} - {{$.locale.Tr "repo.settings.lfs_findcommits"}} + {{$.locale.Tr "repo.settings.lfs_findcommits"}} diff --git a/templates/repo/settings/lfs_file.tmpl b/templates/repo/settings/lfs_file.tmpl index 450601dc9be5..7a1e3e9421c0 100644 --- a/templates/repo/settings/lfs_file.tmpl +++ b/templates/repo/settings/lfs_file.tmpl @@ -12,7 +12,7 @@ {{.locale.Tr "repo.unescape_control_characters"}} {{.locale.Tr "repo.escape_control_characters"}} {{end}} - {{$.locale.Tr "repo.settings.lfs_findcommits"}} + {{$.locale.Tr "repo.settings.lfs_findcommits"}}
    diff --git a/templates/repo/settings/lfs_pointers.tmpl b/templates/repo/settings/lfs_pointers.tmpl index 8eebc6e870a1..436081beb3ca 100644 --- a/templates/repo/settings/lfs_pointers.tmpl +++ b/templates/repo/settings/lfs_pointers.tmpl @@ -56,7 +56,7 @@
    		- {{$.locale.Tr "repo.settings.lfs_findcommits"}} + {{$.locale.Tr "repo.settings.lfs_findcommits"}} {{if .InRepo}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}} {{if .Exists}}{{svg "octicon-check"}}{{else}}{{svg "octicon-x"}}{{end}}
    + {{if eq .Status 3}} {{svg "octicon-pin" 16 "text blue"}} {{else if not $issue}} @@ -58,7 +58,7 @@ {{end}} {{end}} + {{if $issue}} #{{$issue.Index}} - {{$issue.Title}} @@ -67,7 +67,7 @@ {{end}} + {{$repo.FullName}} diff --git a/web_src/css/user.css b/web_src/css/user.css index c2e08a26857d..b6a8aa211ad7 100644 --- a/web_src/css/user.css +++ b/web_src/css/user.css @@ -85,23 +85,6 @@ padding: 8px 15px; } -.user.notification .content { - float: left; - margin-left: 7px; -} - -.user.notification table form { - display: inline-block; -} - -.user.notification table button { - padding: 3px 3px 3px 5px; -} - -.user.notification table tr { - cursor: pointer; -} - .user .button.adopt, .user .button.delete { margin-top: -15px; @@ -147,15 +130,27 @@ object-fit: contain; } +.user.notification table button { + padding: 3px 3px 3px 5px; +} + #notification_div .tab.segment { overflow-x: auto; - padding: 0; } -#notification_div .menu .active.item { +#notification_div .tabular.menu .active.item { background: var(--color-box-body); } #notification_table { border: none; } + +#notification_table tr { + cursor: default; +} + +#notification_table td a { + width: 100%; + display: inline-block; +} diff --git a/web_src/js/features/common-global.js b/web_src/js/features/common-global.js index a7118068bb35..508749de0069 100644 --- a/web_src/js/features/common-global.js +++ b/web_src/js/features/common-global.js @@ -134,21 +134,6 @@ export function initGlobalCommon() { toggleElem($($(this).data('target'))); }); - // make table
    elements clickable like a link - $('tr[data-href], td[data-href]').on('click', function (e) { - const href = $(this).data('href'); - if (e.target.nodeName === 'A') { - // if a user clicks on , then the
    should not act as a link. - return; - } - if (e.ctrlKey || e.metaKey) { - // ctrl+click or meta+click opens a new window in modern browsers - window.open(href); - } else { - window.location = href; - } - }); - // prevent multiple form submissions on forms containing .loading-button document.addEventListener('submit', (e) => { const btn = e.target.querySelector('.loading-button'); From f23b587fe7d440eb2937f29ff5de1c4ddf97f0fd Mon Sep 17 00:00:00 2001 From: Giteabot Date: Sun, 26 Mar 2023 05:33:32 -0400 Subject: [PATCH 132/340] Describe Gitea's purpose more accurately (#23698) (#23710) --- docs/content/page/index.en-us.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/content/page/index.en-us.md b/docs/content/page/index.en-us.md index 60e50efad38c..93fbc0a8b1d8 100644 --- a/docs/content/page/index.en-us.md +++ b/docs/content/page/index.en-us.md @@ -10,8 +10,8 @@ draft: false # What is Gitea? -Gitea is a painless self-hosted Git service. It is similar to GitHub, Bitbucket, and GitLab. -Gitea is a fork of [Gogs](http://gogs.io). See the [Gitea Announcement](https://blog.gitea.io/2016/12/welcome-to-gitea/) +Gitea is a painless self-hosted all-in-one software development service, it includes Git hosting, code review, team collaboration, package registry and CI/CD. It is similar to GitHub, Bitbucket and GitLab. +Gitea was forked from [Gogs](http://gogs.io) originally and almost all the code has been changed. See the [Gitea Announcement](https://blog.gitea.io/2016/12/welcome-to-gitea/) blog post to read about the justification for a fork. ## Purpose From b6a2323981a7a89205a382ddf0542e205e292d3d Mon Sep 17 00:00:00 2001 From: Zettat123 Date: Mon, 27 Mar 2023 16:28:22 +0800 Subject: [PATCH 133/340] Check LFS/Packages settings in dump and doctor command (#23631) (#23730) Backport #23631 Close #23622 As described in the issue, disabling the LFS/Package settings will cause errors when running `gitea dump` or `gitea doctor`. We need to check the settings and the related operations should be skipped if the settings are disabled. --- cmd/dump.go | 4 ++++ modules/doctor/storage.go | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/cmd/dump.go b/cmd/dump.go index c802849f8e50..ab426fe68771 100644 --- a/cmd/dump.go +++ b/cmd/dump.go @@ -250,6 +250,8 @@ func runDump(ctx *cli.Context) error { if ctx.IsSet("skip-lfs-data") && ctx.Bool("skip-lfs-data") { log.Info("Skip dumping LFS data") + } else if !setting.LFS.StartServer { + log.Info("LFS isn't enabled. Skip dumping LFS data") } else if err := storage.LFS.IterateObjects(func(objPath string, object storage.Object) error { info, err := object.Stat() if err != nil { @@ -364,6 +366,8 @@ func runDump(ctx *cli.Context) error { if ctx.IsSet("skip-package-data") && ctx.Bool("skip-package-data") { log.Info("Skip dumping package data") + } else if !setting.Packages.Enabled { + log.Info("Packages isn't enabled. Skip dumping package data") } else if err := storage.Packages.IterateObjects(func(objPath string, object storage.Object) error { info, err := object.Stat() if err != nil { diff --git a/modules/doctor/storage.go b/modules/doctor/storage.go index aa987de4477b..12ce446c00ae 100644 --- a/modules/doctor/storage.go +++ b/modules/doctor/storage.go @@ -16,6 +16,7 @@ import ( "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/log" packages_module "code.gitea.io/gitea/modules/packages" + "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/storage" "code.gitea.io/gitea/modules/util" ) @@ -111,6 +112,10 @@ func checkStorage(opts *checkStorageOptions) func(ctx context.Context, logger lo } if opts.LFS || opts.All { + if !setting.LFS.StartServer { + logger.Info("LFS isn't enabled (skipped)") + return nil + } if err := commonCheckStorage(ctx, logger, autofix, &commonStorageCheckOptions{ storer: storage.LFS, @@ -173,6 +178,10 @@ func checkStorage(opts *checkStorageOptions) func(ctx context.Context, logger lo } if opts.Packages || opts.All { + if !setting.Packages.Enabled { + logger.Info("Packages isn't enabled (skipped)") + return nil + } if err := commonCheckStorage(ctx, logger, autofix, &commonStorageCheckOptions{ storer: storage.Packages, From 62afc0a727610aba6462f51b040032dcdb8c9a36 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 27 Mar 2023 09:42:47 -0400 Subject: [PATCH 134/340] Redirect to project again after editing it (#23326) (#23739) Backport #23326 by @yp05327 A part of https://github.com/go-gitea/gitea/pull/22865 We have edit buttons in projects list page and project view page. But after user edit a project, it will always redirect to the projects list page. Co-authored-by: yp05327 <576951401@qq.com> --- routers/web/org/projects.go | 7 ++++++- routers/web/repo/projects.go | 7 ++++++- templates/projects/new.tmpl | 1 + templates/projects/view.tmpl | 2 +- templates/repo/projects/new.tmpl | 1 + templates/repo/projects/view.tmpl | 2 +- 6 files changed, 16 insertions(+), 4 deletions(-) diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go index 8db42689d852..c9d63fec5df0 100644 --- a/routers/web/org/projects.go +++ b/routers/web/org/projects.go @@ -234,6 +234,7 @@ func EditProject(ctx *context.Context) { ctx.Data["title"] = p.Title ctx.Data["content"] = p.Description + ctx.Data["redirect"] = ctx.FormString("redirect") ctx.HTML(http.StatusOK, tplProjectsNew) } @@ -274,7 +275,11 @@ func EditProjectPost(ctx *context.Context) { } ctx.Flash.Success(ctx.Tr("repo.projects.edit_success", p.Title)) - ctx.Redirect(ctx.Repo.RepoLink + "/projects") + if ctx.FormString("redirect") == "project" { + ctx.Redirect(p.Link()) + } else { + ctx.Redirect(ctx.ContextUser.HomeLink() + "/-/projects") + } } // ViewProject renders the project board for a project diff --git a/routers/web/repo/projects.go b/routers/web/repo/projects.go index 521256584a9c..e15f548a38dc 100644 --- a/routers/web/repo/projects.go +++ b/routers/web/repo/projects.go @@ -235,6 +235,7 @@ func EditProject(ctx *context.Context) { ctx.Data["title"] = p.Title ctx.Data["content"] = p.Description ctx.Data["card_type"] = p.CardType + ctx.Data["redirect"] = ctx.FormString("redirect") ctx.HTML(http.StatusOK, tplProjectsNew) } @@ -275,7 +276,11 @@ func EditProjectPost(ctx *context.Context) { } ctx.Flash.Success(ctx.Tr("repo.projects.edit_success", p.Title)) - ctx.Redirect(ctx.Repo.RepoLink + "/projects") + if ctx.FormString("redirect") == "project" { + ctx.Redirect(p.Link()) + } else { + ctx.Redirect(ctx.Repo.RepoLink + "/projects") + } } // ViewProject renders the project board for a project diff --git a/templates/projects/new.tmpl b/templates/projects/new.tmpl index 19bf50369238..85ceddec6055 100644 --- a/templates/projects/new.tmpl +++ b/templates/projects/new.tmpl @@ -21,6 +21,7 @@ {{.CsrfTokenHtml}}
    +
    diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index 00e5c9038ca1..c815ec4f6ac4 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -46,7 +46,7 @@ {{if $.CanWriteProjects}}
    - + {{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}} diff --git a/templates/repo/projects/new.tmpl b/templates/repo/projects/new.tmpl index c90fa4369c40..5beaab10b6c4 100644 --- a/templates/repo/projects/new.tmpl +++ b/templates/repo/projects/new.tmpl @@ -24,6 +24,7 @@ {{.CsrfTokenHtml}}
    +
    diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index 4ec12bb0601e..0f6ff79f34c6 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -50,7 +50,7 @@ {{if and (or $.CanWriteIssues $.CanWritePulls) (not $.Repository.IsArchived)}}
    - + {{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}} From 35039b85630ed0eb9119973d152348ffbb597005 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 27 Mar 2023 14:01:46 -0400 Subject: [PATCH 135/340] Use GitHub Actions compatible globbing for `branches`, `tag`, `path` filter (#22804) (#23740) Backport #22804 by @ChristopherHX Replaces the current globbing library with a https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet compatible one. This adds support for - `paths-ignore`, `tags-ignore` and `branches-ignore` filters. - negative patterns in `paths`, `tags` and `branches` filters - using both `tags` and `paths` filter on the push event Original PR https://gitea.com/gitea/act/pulls/13. nektos/act PR https://github.com/nektos/act/pull/1618 for the workflowpattern package (It can take some months for it to appear in https://gitea.com/gitea/act) Related to https://github.com/go-gitea/gitea/issues/13539 Co-authored-by: ChristopherHX --- modules/actions/workflows.go | 142 ++++++++++++++++++++++++++--------- 1 file changed, 107 insertions(+), 35 deletions(-) diff --git a/modules/actions/workflows.go b/modules/actions/workflows.go index 7ce05582ea04..f80047b15890 100644 --- a/modules/actions/workflows.go +++ b/modules/actions/workflows.go @@ -16,6 +16,7 @@ import ( "github.com/gobwas/glob" "github.com/nektos/act/pkg/jobparser" "github.com/nektos/act/pkg/model" + "github.com/nektos/act/pkg/workflowpattern" ) func ListWorkflows(commit *git.Commit) (git.Entries, error) { @@ -136,40 +137,94 @@ func matchPushEvent(commit *git.Commit, pushPayload *api.PushPayload, evt *jobpa } matchTimes := 0 + hasBranchFilter := false + hasTagFilter := false + refName := git.RefName(pushPayload.Ref) // all acts conditions should be satisfied for cond, vals := range evt.Acts { switch cond { - case "branches", "tags": - refShortName := git.RefName(pushPayload.Ref).ShortName() - for _, val := range vals { - if glob.MustCompile(val, '/').Match(refShortName) { - matchTimes++ + case "branches": + hasBranchFilter = true + if !refName.IsBranch() { + break + } + patterns, err := workflowpattern.CompilePatterns(vals...) + if err != nil { + break + } + if !workflowpattern.Skip(patterns, []string{refName.ShortName()}, &workflowpattern.EmptyTraceWriter{}) { + matchTimes++ + } + case "branches-ignore": + hasBranchFilter = true + if !refName.IsBranch() { + break + } + patterns, err := workflowpattern.CompilePatterns(vals...) + if err != nil { + break + } + if !workflowpattern.Filter(patterns, []string{refName.ShortName()}, &workflowpattern.EmptyTraceWriter{}) { + matchTimes++ + } + case "tags": + hasTagFilter = true + if !refName.IsTag() { + break + } + patterns, err := workflowpattern.CompilePatterns(vals...) + if err != nil { + break + } + if !workflowpattern.Skip(patterns, []string{refName.ShortName()}, &workflowpattern.EmptyTraceWriter{}) { + matchTimes++ + } + case "tags-ignore": + hasTagFilter = true + if !refName.IsTag() { + break + } + patterns, err := workflowpattern.CompilePatterns(vals...) + if err != nil { + break + } + if !workflowpattern.Filter(patterns, []string{refName.ShortName()}, &workflowpattern.EmptyTraceWriter{}) { + matchTimes++ + } + case "paths": + filesChanged, err := commit.GetFilesChangedSinceCommit(pushPayload.Before) + if err != nil { + log.Error("GetFilesChangedSinceCommit [commit_sha1: %s]: %v", commit.ID.String(), err) + } else { + patterns, err := workflowpattern.CompilePatterns(vals...) + if err != nil { break } + if !workflowpattern.Skip(patterns, filesChanged, &workflowpattern.EmptyTraceWriter{}) { + matchTimes++ + } } - case "paths": + case "paths-ignore": filesChanged, err := commit.GetFilesChangedSinceCommit(pushPayload.Before) if err != nil { log.Error("GetFilesChangedSinceCommit [commit_sha1: %s]: %v", commit.ID.String(), err) } else { - for _, val := range vals { - matched := false - for _, file := range filesChanged { - if glob.MustCompile(val, '/').Match(file) { - matched = true - break - } - } - if matched { - matchTimes++ - break - } + patterns, err := workflowpattern.CompilePatterns(vals...) + if err != nil { + break + } + if !workflowpattern.Filter(patterns, filesChanged, &workflowpattern.EmptyTraceWriter{}) { + matchTimes++ } } default: log.Warn("push event unsupported condition %q", cond) } } + // if both branch and tag filter are defined in the workflow only one needs to match + if hasBranchFilter && hasTagFilter { + matchTimes++ + } return matchTimes == len(evt.Acts) } @@ -221,30 +276,47 @@ func matchPullRequestEvent(commit *git.Commit, prPayload *api.PullRequestPayload } } case "branches": - refShortName := git.RefName(prPayload.PullRequest.Base.Ref).ShortName() - for _, val := range vals { - if glob.MustCompile(val, '/').Match(refShortName) { - matchTimes++ + refName := git.RefName(prPayload.PullRequest.Base.Ref) + patterns, err := workflowpattern.CompilePatterns(vals...) + if err != nil { + break + } + if !workflowpattern.Skip(patterns, []string{refName.ShortName()}, &workflowpattern.EmptyTraceWriter{}) { + matchTimes++ + } + case "branches-ignore": + refName := git.RefName(prPayload.PullRequest.Base.Ref) + patterns, err := workflowpattern.CompilePatterns(vals...) + if err != nil { + break + } + if !workflowpattern.Filter(patterns, []string{refName.ShortName()}, &workflowpattern.EmptyTraceWriter{}) { + matchTimes++ + } + case "paths": + filesChanged, err := commit.GetFilesChangedSinceCommit(prPayload.PullRequest.Base.Ref) + if err != nil { + log.Error("GetFilesChangedSinceCommit [commit_sha1: %s]: %v", commit.ID.String(), err) + } else { + patterns, err := workflowpattern.CompilePatterns(vals...) + if err != nil { break } + if !workflowpattern.Skip(patterns, filesChanged, &workflowpattern.EmptyTraceWriter{}) { + matchTimes++ + } } - case "paths": + case "paths-ignore": filesChanged, err := commit.GetFilesChangedSinceCommit(prPayload.PullRequest.Base.Ref) if err != nil { log.Error("GetFilesChangedSinceCommit [commit_sha1: %s]: %v", commit.ID.String(), err) } else { - for _, val := range vals { - matched := false - for _, file := range filesChanged { - if glob.MustCompile(val, '/').Match(file) { - matched = true - break - } - } - if matched { - matchTimes++ - break - } + patterns, err := workflowpattern.CompilePatterns(vals...) + if err != nil { + break + } + if !workflowpattern.Filter(patterns, filesChanged, &workflowpattern.EmptyTraceWriter{}) { + matchTimes++ } } default: From 88a652fa92d0dea6d52767939fb958aaddb244c9 Mon Sep 17 00:00:00 2001 From: zeripath Date: Mon, 27 Mar 2023 22:27:08 +0100 Subject: [PATCH 136/340] Improve commit graph page UI alignment (#23751) (#23754) Backport #23751 Fix the UI alignment by the way (adding some `gt-mr-xx`) Before: ![image](https://user-images.githubusercontent.com/2114189/228034794-7a6ac8d6-01fa-4dd2-97d4-0df0368f8ee0.png) After: ![image](https://user-images.githubusercontent.com/2114189/228034938-64edeadf-7c99-4e74-b658-0ca62b72d596.png) Co-authored-by: wxiaoguang --- templates/repo/graph/commits.tmpl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/repo/graph/commits.tmpl b/templates/repo/graph/commits.tmpl index 0c1e777c34e8..4a01fefeddc1 100644 --- a/templates/repo/graph/commits.tmpl +++ b/templates/repo/graph/commits.tmpl @@ -28,10 +28,10 @@ {{- end -}} - + {{RenderCommitMessage $.Context $commit.Subject $.RepoLink $.Repository.ComposeMetas}} - + {{range $commit.Refs}} {{$refGroup := .RefGroup}} {{if eq $refGroup "pull"}} @@ -54,20 +54,20 @@ {{svg "octicon-git-branch" 16 "gt-mr-2"}}{{.ShortName}} {{else}} - + {{end}} {{end}} - + {{$userName := $commit.Commit.Author.Name}} {{if $commit.User}} {{if $commit.User.FullName}} {{$userName = $commit.User.FullName}} {{end}} - {{avatar $.Context $commit.User}} + {{avatar $.Context $commit.User}} {{$userName}} {{else}} - {{avatarByEmail $.Context $commit.Commit.Author.Email $userName}} + {{avatarByEmail $.Context $commit.Commit.Author.Email $userName}} {{$userName}} {{end}} From 1fed0e1adc8dd2d27d2d7e34dda29c8e79e5e6e8 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 27 Mar 2023 19:55:20 -0400 Subject: [PATCH 137/340] Fix profile page email display, respect settings (#23747) (#23756) Backport #23747 by @wxiaoguang Always respect the `setting.UI.ShowUserEmail` and `KeepEmailPrivate` setting. * It doesn't make sense to show user's own E-mail to themself. * Always hide the E-mail if KeepEmailPrivate=true, then the user could know how their profile page looks like for others. * Revert the `setting.UI.ShowUserEmail` change from #4981 . This setting is used to control the E-mail display, not only for the user list page. ps: the incorrect `
    ` tag on the profile page has been fixed by #23748 together, so this PR becomes simpler. Co-authored-by: wxiaoguang --- routers/web/user/profile.go | 2 +- tests/integration/setting_test.go | 49 +++++++++++++++++++------------ 2 files changed, 31 insertions(+), 20 deletions(-) diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go index 0a215e920344..b5eb2c078170 100644 --- a/routers/web/user/profile.go +++ b/routers/web/user/profile.go @@ -292,7 +292,7 @@ func Profile(ctx *context.Context) { ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled - ctx.Data["ShowUserEmail"] = len(ctx.ContextUser.Email) > 0 && ctx.IsSigned && (!ctx.ContextUser.KeepEmailPrivate || ctx.ContextUser.ID == ctx.Doer.ID) + ctx.Data["ShowUserEmail"] = setting.UI.ShowUserEmail && ctx.ContextUser.Email != "" && ctx.IsSigned && !ctx.ContextUser.KeepEmailPrivate ctx.HTML(http.StatusOK, tplProfile) } diff --git a/tests/integration/setting_test.go b/tests/integration/setting_test.go index 71b28a625878..54819c5b7d78 100644 --- a/tests/integration/setting_test.go +++ b/tests/integration/setting_test.go @@ -45,38 +45,49 @@ func TestSettingShowUserEmailProfile(t *testing.T) { defer tests.PrepareTestEnv(t)() showUserEmail := setting.UI.ShowUserEmail + + // user1: keep_email_private = false, user2: keep_email_private = true + setting.UI.ShowUserEmail = true - session := loginUser(t, "user2") - req := NewRequest(t, "GET", "/user2") + // user1 can see self + session := loginUser(t, "user1") + req := NewRequest(t, "GET", "/user1") resp := session.MakeRequest(t, req, http.StatusOK) htmlDoc := NewHTMLParser(t, resp.Body) - assert.Contains(t, - htmlDoc.doc.Find(".user.profile").Text(), - "user2@example.com", - ) - - setting.UI.ShowUserEmail = false + assert.Contains(t, htmlDoc.doc.Find(".user.profile").Text(), "user1@example.com") + // user1 can not see user2 req = NewRequest(t, "GET", "/user2") resp = session.MakeRequest(t, req, http.StatusOK) htmlDoc = NewHTMLParser(t, resp.Body) - // Should contain since this user owns the profile page - assert.Contains(t, - htmlDoc.doc.Find(".user.profile").Text(), - "user2@example.com", - ) + // Should not contain even if the user visits their own profile page + assert.NotContains(t, htmlDoc.doc.Find(".user.profile").Text(), "user2@example.com") - setting.UI.ShowUserEmail = showUserEmail + // user2 can see user1 + session = loginUser(t, "user2") + req = NewRequest(t, "GET", "/user1") + resp = session.MakeRequest(t, req, http.StatusOK) + htmlDoc = NewHTMLParser(t, resp.Body) + assert.Contains(t, htmlDoc.doc.Find(".user.profile").Text(), "user1@example.com") - session = loginUser(t, "user4") + // user2 can not see self + session = loginUser(t, "user2") req = NewRequest(t, "GET", "/user2") resp = session.MakeRequest(t, req, http.StatusOK) htmlDoc = NewHTMLParser(t, resp.Body) - assert.NotContains(t, - htmlDoc.doc.Find(".user.profile").Text(), - "user2@example.com", - ) + assert.NotContains(t, htmlDoc.doc.Find(".user.profile").Text(), "user2@example.com") + + setting.UI.ShowUserEmail = false + + // user1 can not see self + session = loginUser(t, "user1") + req = NewRequest(t, "GET", "/user1") + resp = session.MakeRequest(t, req, http.StatusOK) + htmlDoc = NewHTMLParser(t, resp.Body) + assert.NotContains(t, htmlDoc.doc.Find(".user.profile").Text(), "user1@example.com") + + setting.UI.ShowUserEmail = showUserEmail } func TestSettingLandingPage(t *testing.T) { From a254c26df907e4dea401320091a16342616f3a2a Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 27 Mar 2023 22:13:11 -0400 Subject: [PATCH 138/340] Fix issue due date edit toggle bug (#23723) (#23758) Backport #23723 by @wxiaoguang Use `toggleElem` instead of jQuery's `fadeToggle`, which can't be caught by eslint jquery plugin. Hopefully this could be the last bug for the jQuery show/hide refactoring. Need to backport. Co-authored-by: wxiaoguang --- web_src/js/features/repo-issue.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index 52f777b6a00c..eb0015727908 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -78,7 +78,7 @@ function updateDeadline(deadlineString) { export function initRepoIssueDue() { $(document).on('click', '.issue-due-edit', () => { - $('#deadlineForm').fadeToggle(150); + toggleElem('#deadlineForm'); }); $(document).on('click', '.issue-due-remove', () => { updateDeadline(''); From 428d26d4a8afe1b2777a992723168117d0bf9699 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Tue, 28 Mar 2023 02:31:42 -0400 Subject: [PATCH 139/340] fix br display for packages curls (#23737) (#23764) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Backport #23737 by @HesterG Before: 截屏2023-03-27 15 48 23 This happens because the `
    ` matches this [rule](https://github.com/go-gitea/gitea/blob/e6e602fd8d35471f1e2f4a42669a1f17e76e0176/web_src/css/markup/content.css#L428), which is not necessary here (This is introduced by #22861, did a quick check, and this is the only place used `
    ` inside `` from the PR): ```css .markup code br, .markup tt br { display: none; } ``` After: 截屏2023-03-27 15 46 50 Co-authored-by: Hester Gong Co-authored-by: wxiaoguang --- templates/package/content/generic.tmpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/package/content/generic.tmpl b/templates/package/content/generic.tmpl index eae4d670f9c6..2674a155d33c 100644 --- a/templates/package/content/generic.tmpl +++ b/templates/package/content/generic.tmpl @@ -5,9 +5,9 @@ 
    
-					{{- range .PackageDescriptor.Files -}}
-curl 
    
-					{{- end -}}
+{{- range .PackageDescriptor.Files -}}
+curl 
+{{end -}}
    From b73d1ac1eb7d5c985749dc721bbea7ebd14f9c83 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 29 Mar 2023 00:02:13 +0800 Subject: [PATCH 140/340] Make minio package support legacy MD5 checksum (#23768) (#23770) Backport #23768 (no source code conflict, only some unrelated docs/test-ini conflicts) Some storages like: * https://developers.cloudflare.com/r2/api/s3/api/ * https://www.backblaze.com/b2/docs/s3_compatible_api.html They do not support "x-amz-checksum-algorithm" header But minio recently uses that header with CRC32C by default. So we have to tell minio to use legacy MD5 checksum. --- cmd/migrate_storage.go | 27 +++++++++---- custom/conf/app.example.ini | 3 ++ .../config-cheat-sheet.en-us.md | 1 + modules/lfs/content_store.go | 40 ++++++++++++++----- modules/setting/storage.go | 1 + modules/storage/minio.go | 21 ++++++++-- tests/mysql.ini.tmpl | 1 + 7 files changed, 72 insertions(+), 22 deletions(-) diff --git a/cmd/migrate_storage.go b/cmd/migrate_storage.go index dfa7212e5b0c..9798913705f2 100644 --- a/cmd/migrate_storage.go +++ b/cmd/migrate_storage.go @@ -72,12 +72,21 @@ var CmdMigrateStorage = cli.Command{ cli.StringFlag{ Name: "minio-base-path", Value: "", - Usage: "Minio storage basepath on the bucket", + Usage: "Minio storage base path on the bucket", }, cli.BoolFlag{ Name: "minio-use-ssl", Usage: "Enable SSL for minio", }, + cli.BoolFlag{ + Name: "minio-insecure-skip-verify", + Usage: "Skip SSL verification", + }, + cli.StringFlag{ + Name: "minio-checksum-algorithm", + Value: "", + Usage: "Minio checksum algorithm (default/md5)", + }, }, } @@ -168,13 +177,15 @@ func runMigrateStorage(ctx *cli.Context) error { dstStorage, err = storage.NewMinioStorage( stdCtx, storage.MinioStorageConfig{ - Endpoint: ctx.String("minio-endpoint"), - AccessKeyID: ctx.String("minio-access-key-id"), - SecretAccessKey: ctx.String("minio-secret-access-key"), - Bucket: ctx.String("minio-bucket"), - Location: ctx.String("minio-location"), - BasePath: ctx.String("minio-base-path"), - UseSSL: ctx.Bool("minio-use-ssl"), + Endpoint: ctx.String("minio-endpoint"), + AccessKeyID: ctx.String("minio-access-key-id"), + SecretAccessKey: ctx.String("minio-secret-access-key"), + Bucket: ctx.String("minio-bucket"), + Location: ctx.String("minio-location"), + BasePath: ctx.String("minio-base-path"), + UseSSL: ctx.Bool("minio-use-ssl"), + InsecureSkipVerify: ctx.Bool("minio-insecure-skip-verify"), + ChecksumAlgorithm: ctx.String("minio-checksum-algorithm"), }) default: return fmt.Errorf("unsupported storage type: %s", ctx.String("storage")) diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index 674d1941367d..19ee56ef8ed4 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -1874,6 +1874,9 @@ ROUTER = console ;; ;; Minio skip SSL verification available when STORAGE_TYPE is `minio` ;MINIO_INSECURE_SKIP_VERIFY = false +;; +;; Minio checksum algorithm: default (for MinIO or AWS S3) or md5 (for Cloudflare or Backblaze) +;MINIO_CHECKSUM_ALGORITHM = default ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/docs/content/doc/administration/config-cheat-sheet.en-us.md b/docs/content/doc/administration/config-cheat-sheet.en-us.md index 85c931651b59..952723788e86 100644 --- a/docs/content/doc/administration/config-cheat-sheet.en-us.md +++ b/docs/content/doc/administration/config-cheat-sheet.en-us.md @@ -855,6 +855,7 @@ Default templates for project boards: - `MINIO_BASE_PATH`: **attachments/**: Minio base path on the bucket only available when STORAGE_TYPE is `minio` - `MINIO_USE_SSL`: **false**: Minio enabled ssl only available when STORAGE_TYPE is `minio` - `MINIO_INSECURE_SKIP_VERIFY`: **false**: Minio skip SSL verification available when STORAGE_TYPE is `minio` +- `MINIO_CHECKSUM_ALGORITHM`: **default**: Minio checksum algorithm: `default` (for MinIO or AWS S3) or `md5` (for Cloudflare or Backblaze) ## Log (`log`) diff --git a/modules/lfs/content_store.go b/modules/lfs/content_store.go index 94277a6b8eb3..2fbe55d8132f 100644 --- a/modules/lfs/content_store.go +++ b/modules/lfs/content_store.go @@ -59,15 +59,22 @@ func (s *ContentStore) Put(pointer Pointer, r io.Reader) error { return err } - // This shouldn't happen but it is sensible to test - if written != pointer.Size { - if err := s.Delete(p); err != nil { - log.Error("Cleaning the LFS OID[%s] failed: %v", pointer.Oid, err) + // check again whether there is any error during the Save operation + // because some errors might be ignored by the Reader's caller + if wrappedRd.lastError != nil && !errors.Is(wrappedRd.lastError, io.EOF) { + err = wrappedRd.lastError + } else if written != pointer.Size { + err = ErrSizeMismatch + } + + // if the upload failed, try to delete the file + if err != nil { + if errDel := s.Delete(p); errDel != nil { + log.Error("Cleaning the LFS OID[%s] failed: %v", pointer.Oid, errDel) } - return ErrSizeMismatch } - return nil + return err } // Exists returns true if the object exists in the content store. @@ -108,6 +115,17 @@ type hashingReader struct { expectedSize int64 hash hash.Hash expectedHash string + lastError error +} + +// recordError records the last error during the Save operation +// Some callers of the Reader doesn't respect the returned "err" +// For example, MinIO's Put will ignore errors if the written size could equal to expected size +// So we must remember the error by ourselves, +// and later check again whether ErrSizeMismatch or ErrHashMismatch occurs during the Save operation +func (r *hashingReader) recordError(err error) error { + r.lastError = err + return err } func (r *hashingReader) Read(b []byte) (int, error) { @@ -117,22 +135,22 @@ func (r *hashingReader) Read(b []byte) (int, error) { r.currentSize += int64(n) wn, werr := r.hash.Write(b[:n]) if wn != n || werr != nil { - return n, werr + return n, r.recordError(werr) } } - if err != nil && err == io.EOF { + if errors.Is(err, io.EOF) || r.currentSize >= r.expectedSize { if r.currentSize != r.expectedSize { - return n, ErrSizeMismatch + return n, r.recordError(ErrSizeMismatch) } shaStr := hex.EncodeToString(r.hash.Sum(nil)) if shaStr != r.expectedHash { - return n, ErrHashMismatch + return n, r.recordError(ErrHashMismatch) } } - return n, err + return n, r.recordError(err) } func newHashingReader(expectedSize int64, expectedHash string, reader io.Reader) *hashingReader { diff --git a/modules/setting/storage.go b/modules/setting/storage.go index 4d401614e492..50d4c8439e2b 100644 --- a/modules/setting/storage.go +++ b/modules/setting/storage.go @@ -42,6 +42,7 @@ func getStorage(rootCfg ConfigProvider, name, typ string, targetSec *ini.Section sec.Key("MINIO_LOCATION").MustString("us-east-1") sec.Key("MINIO_USE_SSL").MustBool(false) sec.Key("MINIO_INSECURE_SKIP_VERIFY").MustBool(false) + sec.Key("MINIO_CHECKSUM_ALGORITHM").MustString("default") if targetSec == nil { targetSec, _ = rootCfg.NewSection(name) diff --git a/modules/storage/minio.go b/modules/storage/minio.go index c427d8d7e312..745585518df8 100644 --- a/modules/storage/minio.go +++ b/modules/storage/minio.go @@ -6,6 +6,7 @@ package storage import ( "context" "crypto/tls" + "fmt" "io" "net/http" "net/url" @@ -52,10 +53,12 @@ type MinioStorageConfig struct { BasePath string `ini:"MINIO_BASE_PATH"` UseSSL bool `ini:"MINIO_USE_SSL"` InsecureSkipVerify bool `ini:"MINIO_INSECURE_SKIP_VERIFY"` + ChecksumAlgorithm string `ini:"MINIO_CHECKSUM_ALGORITHM"` } // MinioStorage returns a minio bucket storage type MinioStorage struct { + cfg *MinioStorageConfig ctx context.Context client *minio.Client bucket string @@ -90,6 +93,10 @@ func NewMinioStorage(ctx context.Context, cfg interface{}) (ObjectStorage, error } config := configInterface.(MinioStorageConfig) + if config.ChecksumAlgorithm != "" && config.ChecksumAlgorithm != "default" && config.ChecksumAlgorithm != "md5" { + return nil, fmt.Errorf("invalid minio checksum algorithm: %s", config.ChecksumAlgorithm) + } + log.Info("Creating Minio storage at %s:%s with base path %s", config.Endpoint, config.Bucket, config.BasePath) minioClient, err := minio.New(config.Endpoint, &minio.Options{ @@ -112,6 +119,7 @@ func NewMinioStorage(ctx context.Context, cfg interface{}) (ObjectStorage, error } return &MinioStorage{ + cfg: &config, ctx: ctx, client: minioClient, bucket: config.Bucket, @@ -123,7 +131,7 @@ func (m *MinioStorage) buildMinioPath(p string) string { return strings.TrimPrefix(path.Join(m.basePath, path.Clean("/" + strings.ReplaceAll(p, "\\", "/"))[1:]), "/") } -// Open open a file +// Open opens a file func (m *MinioStorage) Open(path string) (Object, error) { opts := minio.GetObjectOptions{} object, err := m.client.GetObject(m.ctx, m.bucket, m.buildMinioPath(path), opts) @@ -133,7 +141,7 @@ func (m *MinioStorage) Open(path string) (Object, error) { return &minioObject{object}, nil } -// Save save a file to minio +// Save saves a file to minio func (m *MinioStorage) Save(path string, r io.Reader, size int64) (int64, error) { uploadInfo, err := m.client.PutObject( m.ctx, @@ -141,7 +149,14 @@ func (m *MinioStorage) Save(path string, r io.Reader, size int64) (int64, error) m.buildMinioPath(path), r, size, - minio.PutObjectOptions{ContentType: "application/octet-stream"}, + minio.PutObjectOptions{ + ContentType: "application/octet-stream", + // some storages like: + // * https://developers.cloudflare.com/r2/api/s3/api/ + // * https://www.backblaze.com/b2/docs/s3_compatible_api.html + // do not support "x-amz-checksum-algorithm" header, so use legacy MD5 checksum + SendContentMd5: m.cfg.ChecksumAlgorithm == "md5", + }, ) if err != nil { return 0, convertMinioErr(err) diff --git a/tests/mysql.ini.tmpl b/tests/mysql.ini.tmpl index 1dd7bfab2a49..a56d45b3218b 100644 --- a/tests/mysql.ini.tmpl +++ b/tests/mysql.ini.tmpl @@ -76,6 +76,7 @@ MINIO_SECRET_ACCESS_KEY = 12345678 MINIO_BUCKET = gitea MINIO_LOCATION = us-east-1 MINIO_USE_SSL = false +MINIO_CHECKSUM_ALGORITHM = md5 [mailer] ENABLED = true From d977e7ec105823106b7470cf153d45dc244890cc Mon Sep 17 00:00:00 2001 From: Giteabot Date: Tue, 28 Mar 2023 18:00:07 -0400 Subject: [PATCH 141/340] Add creation time in tag list page (#23693) (#23773) Backport #23693 by @balki Fixes #21699 Co-authored-by: Balki <189196+balki@users.noreply.github.com> --- templates/repo/release/list.tmpl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index 66147f81616c..0f0535f75a75 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -39,6 +39,9 @@
    {{if $.Permission.CanRead $.UnitTypeCode}} + {{if .CreatedUnix}} + {{svg "octicon-clock" 16 "gt-mr-2"}}{{TimeSinceUnix .CreatedUnix $.locale}} + {{end}} {{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .Sha1}} {{if not $.DisableDownloadSourceArchives}} {{svg "octicon-file-zip" 16 "gt-mr-2"}}ZIP From 81a995cd8409275d51bfb46ce07fac79d64cf5dd Mon Sep 17 00:00:00 2001 From: Zettat123 Date: Wed, 29 Mar 2023 14:52:50 +0800 Subject: [PATCH 142/340] Fix project card preview select and template select (#23684) (#23731) Backport #23684 Now user cannot set Card Previews when creating a new project. Before: https://user-images.githubusercontent.com/15528715/227488883-29bbd636-8b98-45b3-b2f8-de5206b045dc.mp4 After: https://user-images.githubusercontent.com/15528715/227488976-3447f252-805a-4f18-ae0e-1cddd921dcc3.mp4 --- templates/repo/projects/new.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/projects/new.tmpl b/templates/repo/projects/new.tmpl index 5beaab10b6c4..25959be7a3bf 100644 --- a/templates/repo/projects/new.tmpl +++ b/templates/repo/projects/new.tmpl @@ -54,7 +54,7 @@
    {{svg "octicon-triangle-down" 14 "dropdown icon"}} {{range $element := .CardTypes}} - {{if or (eq $.card_type $element.CardType) (and (not $.card_type) (eq $element.CardType 2))}} + {{if or (eq $.card_type $element.CardType) (and (not $.PageIsEditProjects) (eq $element.CardType 1))}}
    {{$.locale.Tr $element.Translation}}
    {{end}} From d27e693ecf77141fa0afe3b201915c9ad597dc11 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Wed, 29 Mar 2023 14:15:00 -0400 Subject: [PATCH 143/340] Add CSS rules for basic colored labels (#23774) (#23777) Backport #23774 by @silverwind Before: Screenshot 2023-03-28 at 23 35 46 After: Screenshot 2023-03-28 at 23 35 54 Also I removed the `!important` on the primary label as it's very likely unnecessary with the amount of specificity the selector already has. Co-authored-by: silverwind --- web_src/css/base.css | 104 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 101 insertions(+), 3 deletions(-) diff --git a/web_src/css/base.css b/web_src/css/base.css index afcbfe4cb784..5c791339f359 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -2399,9 +2399,107 @@ a.ui.label:hover { .ui.basic.labels .primary.label, .ui.ui.ui.basic.primary.label { - background: transparent !important; - border-color: var(--color-primary) !important; - color: var(--color-primary) !important; + background: transparent; + border-color: var(--color-primary); + color: var(--color-primary); +} + +.ui.basic.labels .secondary.label, +.ui.ui.ui.basic.secondary.label { + background: transparent; + border-color: var(--color-secondary); + color: var(--color-secondary); +} + +.ui.basic.labels .orange.label, +.ui.ui.ui.basic.orange.label { + background: transparent; + border-color: var(--color-orange); + color: var(--color-orange); +} + +.ui.basic.labels .green.label, +.ui.ui.ui.basic.green.label { + background: transparent; + border-color: var(--color-green); + color: var(--color-green); +} + +.ui.basic.labels .olive.label, +.ui.ui.ui.basic.olive.label { + background: transparent; + border-color: var(--color-olive); + color: var(--color-olive); +} + +.ui.basic.labels .teal.label, +.ui.ui.ui.basic.teal.label { + background: transparent; + border-color: var(--color-teal); + color: var(--color-teal); +} + +.ui.basic.labels .blue.label, +.ui.ui.ui.basic.blue.label { + background: transparent; + border-color: var(--color-blue); + color: var(--color-blue); +} + +.ui.basic.labels .violet.label, +.ui.ui.ui.basic.violet.label { + background: transparent; + border-color: var(--color-violet); + color: var(--color-violet); +} + +.ui.basic.labels .purple.label, +.ui.ui.ui.basic.purple.label { + background: transparent; + border-color: var(--color-purple); + color: var(--color-purple); +} + +.ui.basic.labels .pink.label, +.ui.ui.ui.basic.pink.label { + background: transparent; + border-color: var(--color-pink); + color: var(--color-pink); +} + +.ui.basic.labels .red.label, +.ui.ui.ui.basic.red.label { + background: transparent; + border-color: var(--color-red); + color: var(--color-red); +} + +.ui.basic.labels .brown.label, +.ui.ui.ui.basic.brown.label { + background: transparent; + border-color: var(--color-brown); + color: var(--color-brown); +} + +.ui.basic.labels .yellow.label, +.ui.ui.ui.basic.yellow.label { + background: transparent; + border-color: var(--color-yellow); + color: var(--color-yellow); +} + +.ui.basic.labels .grey.label, +.ui.ui.ui.basic.grey.label { + background: transparent; + border-color: var(--color-grey); + color: var(--color-grey); +} + +.ui.basic.labels .black.label, +.ui.ui.ui.basic.black.label { + background: transparent; + border-color: var(--color-black); + color: var(--color-black); } .ui.basic.labels .label, From 494721cc90c9d6dfc7ed136939a1bc562b08a09c Mon Sep 17 00:00:00 2001 From: Giteabot Date: Wed, 29 Mar 2023 15:00:12 -0400 Subject: [PATCH 144/340] Don't apply the group filter when listing LDAP group membership if it is empty (#23745) (#23788) Backport #23745 by @zeripath When running listLdapGroupMemberships check if the groupFilter is empty before using it to list memberships. Fix #23615 Signed-off-by: Andrew Thornton Co-authored-by: zeripath --- services/auth/source/ldap/source_search.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/auth/source/ldap/source_search.go b/services/auth/source/ldap/source_search.go index 5a2d25b0c4c1..2a61386ae106 100644 --- a/services/auth/source/ldap/source_search.go +++ b/services/auth/source/ldap/source_search.go @@ -208,7 +208,7 @@ func (source *Source) listLdapGroupMemberships(l *ldap.Conn, uid string, applyGr } var searchFilter string - if applyGroupFilter { + if applyGroupFilter && groupFilter != "" { searchFilter = fmt.Sprintf("(&(%s)(%s=%s))", groupFilter, source.GroupMemberUID, ldap.EscapeFilter(uid)) } else { searchFilter = fmt.Sprintf("(%s=%s)", source.GroupMemberUID, ldap.EscapeFilter(uid)) From edb6ba28f17a90dee89cde9189b137f85eaf0383 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Thu, 30 Mar 2023 10:05:26 +0800 Subject: [PATCH 145/340] Add missing translation for `actions.runners.reset_registration_token_success` (#23732) (#23781) Backport #23732. Used at https://github.com/go-gitea/gitea/blob/4011821c946e8db032be86266dd9364ccb204118/routers/web/shared/actions/runners.go#L157 --- options/locale/locale_en-US.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index ad7a675b7a8c..183ee83d8d31 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -3344,6 +3344,7 @@ runners.status.unspecified = Unknown runners.status.idle = Idle runners.status.active = Active runners.status.offline = Offline +runners.reset_registration_token_success = Runner registration token reset successfully runs.all_workflows = All Workflows runs.open_tab = %d Open From 1cad923b36e0a3b39788419333c8e63a7f9a7352 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 30 Mar 2023 14:58:57 +0800 Subject: [PATCH 146/340] Backport locales (with manual fix) (#23808) Backport locales (with manual fix) --- options/locale/locale_cs-CZ.ini | 43 ++------ options/locale/locale_de-DE.ini | 2 +- options/locale/locale_el-GR.ini | 188 +++++++++++++++++++++++++++++--- options/locale/locale_fa-IR.ini | 1 + options/locale/locale_fr-FR.ini | 7 +- options/locale/locale_hu-HU.ini | 15 ++- options/locale/locale_id-ID.ini | 2 +- options/locale/locale_ja-JP.ini | 10 +- options/locale/locale_lv-LV.ini | 16 +-- options/locale/locale_nl-NL.ini | 2 +- options/locale/locale_pl-PL.ini | 4 +- options/locale/locale_pt-PT.ini | 38 +++---- options/locale/locale_si-LK.ini | 6 +- options/locale/locale_sv-SE.ini | 4 +- options/locale/locale_tr-TR.ini | 16 +-- options/locale/locale_zh-CN.ini | 42 +++---- options/locale/locale_zh-TW.ini | 20 ++-- 17 files changed, 277 insertions(+), 139 deletions(-) diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini index c4c5edae9d99..b7fb5e221131 100644 --- a/options/locale/locale_cs-CZ.ini +++ b/options/locale/locale_cs-CZ.ini @@ -211,7 +211,7 @@ invalid_db_setting=Nastavení databáze je neplatné: %v invalid_db_table=Databázová tabulka „%s“ je neplatná: %v invalid_repo_path=Kořenový adresář repozitářů není správný: %v invalid_app_data_path=Cesta k datům aplikace je neplatná: %v -run_user_not_match=`"Run as" uživatelské jméno není aktuální uživatelské jméno: %s -> %s` +run_user_not_match="Run as" uživatelské jméno není aktuální uživatelské jméno: %s -> %s internal_token_failed=Nepodařilo se vytvořit interní token: %v secret_key_failed=Nepodařilo se vytvořit tajný klíč: %v save_config_failed=Uložení konfigurace se nezdařilo: %v @@ -999,13 +999,13 @@ file_view_rendered=Zobrazit vykreslené file_view_raw=Zobrazit v surovém stavu file_permalink=Trvalý odkaz file_too_large=Soubor je příliš velký pro zobrazení. -invisible_runes_header=`Tento soubor obsahuje neviditelné znaky Unicode!` -invisible_runes_description=`Tento soubor obsahuje neviditelné znaky Unicode, které mohou být zpracovány jinak než níže uvedeným způsobem. Pokud je váš případ úmyslný a legitimní, můžete toto varování bezpečně ignorovat. Použijte tlačítko Escape sekvence k odhalení skrytých znaků.` -ambiguous_runes_header=`Tento soubor obsahuje nejednoznačné znaky Unicode!` -ambiguous_runes_description=`Tento soubor obsahuje nejednoznačné znaky Unicode, které mohou být zaměněny s ostatními v aktuálním prostředí. Pokud je váš případ úmyslný a legitimní, můžete toto varování bezpečně ignorovat. Použijte tlačítko Escape sekvence pro zvýraznění těchto znaků.` -invisible_runes_line=`Tento řádek má neviditelné znaky Unicode` -ambiguous_runes_line=`Tento řádek má nejednoznačné znaky Unicode` -ambiguous_character=`%[1]c [U+%04[1]X] je zaměnitelný s %[2]c [U+%04[2]X]` +invisible_runes_header=Tento soubor obsahuje neviditelné znaky Unicode! +invisible_runes_description=Tento soubor obsahuje neviditelné znaky Unicode, které mohou být zpracovány jinak než níže uvedeným způsobem. Pokud je váš případ úmyslný a legitimní, můžete toto varování bezpečně ignorovat. Použijte tlačítko Escape sekvence k odhalení skrytých znaků. +ambiguous_runes_header=Tento soubor obsahuje nejednoznačné znaky Unicode! +ambiguous_runes_description=Tento soubor obsahuje nejednoznačné znaky Unicode, které mohou být zaměněny s ostatními v aktuálním prostředí. Pokud je váš případ úmyslný a legitimní, můžete toto varování bezpečně ignorovat. Použijte tlačítko Escape sekvence pro zvýraznění těchto znaků. +invisible_runes_line=Tento řádek má neviditelné znaky Unicode +ambiguous_runes_line=Tento řádek má nejednoznačné znaky Unicode +ambiguous_character=%[1]c [U+%04[1]X] je zaměnitelný s %[2]c [U+%04[2]X] escape_control_characters=Escape sekvence unescape_control_characters=Bez escape sekvencí file_copy_permalink=Kopírovat trvalý odkaz @@ -2235,33 +2235,6 @@ find_file.no_matching=Nebyl nalezen žádný odpovídající soubor error.csv.too_large=Tento soubor nelze vykreslit, protože je příliš velký. error.csv.unexpected=Tento soubor nelze vykreslit, protože obsahuje neočekávaný znak na řádku %d ve sloupci %d. error.csv.invalid_field_count=Soubor nelze vykreslit, protože má nesprávný počet polí na řádku %d. -filter_branch_and_tag=Filtr pro větev nebo značku -find_tag=Najít značku -branches=Větve -tags=Značky -issues=Úkoly -pulls=Požadavky na natažení -project_board=Projekty -packages=Balíčky -labels=Štítky -org_labels_desc=Štítky na úrovni organizace, které mohou být použity se všemi repozitáři v rámci této organizace -org_labels_desc_manage=spravovat -milestones=Milníky -commits=Commity -commit=Commit -release=Vydání -releases=Vydání -tag=Značka -released_this=vydal/a toto -file.title=%s v %s -file_raw=Surový -file_history=Historie -file_view_source=Zobrazit zdroj -file_view_rendered=Zobrazit vykreslené -file_view_raw=Zobrazit v surovém stavu -file_permalink=Trvalý odkaz -file_too_large=Soubor je příliš velký pro zobrazení. -invisible_runes_header=Tento soubor obsahuje neviditelné znaky Unicode! commit.operations=Operace projects.card_type.images_and_text=Obrázky a text projects.card_type.text_only=Pouze text diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini index 6d93ba40b885..013e5e9c86cd 100644 --- a/options/locale/locale_de-DE.ini +++ b/options/locale/locale_de-DE.ini @@ -328,7 +328,7 @@ authorize_application=Anwendung autorisieren authorize_redirect_notice=Du wirst zu %s weitergeleitet, wenn du diese Anwendung autorisierst. authorize_application_created_by=Diese Anwendung wurde von %s erstellt. authorize_application_description=Wenn du diese Anwendung autorisierst, wird sie die Berechtigung erhalten, alle Informationen zu deinem Account zu bearbeiten oder zu lesen. Dies beinhaltet auch private Repositorys und Organisationen. -authorize_title=`"%s" den Zugriff auf deinen Account gestatten?` +authorize_title="%s" den Zugriff auf deinen Account gestatten? authorization_failed=Autorisierung fehlgeschlagen authorization_failed_desc=Die Autorisierung ist fehlgeschlagen, da wir eine ungültige Anfrage festgestellt haben. Bitte kontaktiere den Betreiber der Anwendung, die du gerade autorisieren wolltest. sspi_auth_failed=SSPI Authentifizierung fehlgeschlagen diff --git a/options/locale/locale_el-GR.ini b/options/locale/locale_el-GR.ini index ceb1ba6e7f81..15422057b640 100644 --- a/options/locale/locale_el-GR.ini +++ b/options/locale/locale_el-GR.ini @@ -95,6 +95,8 @@ never=Ποτέ rss_feed=Ροή RSS enabled=Ενεργοποιημένο disabled=Απενεργοποιημένο +copy_content=Αντιγραφή περιεχομένου +copy_type_unsupported=Αυτός ο τύπος αρχείου δεν μπορεί να αντιγραφεί [filter] string.asc=A - Z @@ -226,6 +228,9 @@ no_reply_address=Κρυφό Όνομα Τομέα Email no_reply_address_helper=Όνομα τομέα για χρήστες με μια κρυφή διεύθυνση email. Για παράδειγμα, το όνομα χρήστη 'nikos' θα συνδεθεί στο Git ως 'nikos@noreply.example.org' αν ο κρυφός τομέας email έχει οριστεί ως 'noreply.example.org'. password_algorithm=Αλγόριθμος Hash Κωδικού Πρόσβασης password_algorithm_helper="""Ορίστε τον αλγόριθμο hash του κωδικού πρόσβασης. Οι αλγόριθμοι έχουν διαφορετικές απαιτήσεις και αντοχή. Ο `argon2` ενώ έχει καλά χαρακτηριστικά χρησιμοποιεί πολλή μνήμη και μπορεί να είναι ακατάλληλός για μικρά συστήματα.""" +invalid_password_algorithm=Μη έγκυρος αλγόριθμος κωδικού πρόσβασης +enable_update_checker=Ενεργοποίηση Ελεγκτή Ενημερώσεων +enable_update_checker_helper=Ελέγχει περιοδικά για νέες εκδόσεις κάνοντας σύνδεση στο gitea.io. [home] uname_holder=Όνομα Χρήστη ή Διεύθυνση Email @@ -274,8 +279,8 @@ relevant_repositories=Εμφανίζονται μόνο τα σχετικά απ [auth] create_new_account=Εγγραφή Λογαριασμού -register_helper_msg=Έχετε ήδη λογαριασμό? Συνδεθείτε τώρα! -social_register_helper_msg=Έχετε ήδη λογαριασμό? Συνδέστε το τώρα! +register_helper_msg=Έχετε ήδη λογαριασμό; Συνδεθείτε τώρα! +social_register_helper_msg=Έχετε ήδη λογαριασμό; Συνδέστε το τώρα! disable_register_prompt=Η εγγραφή είναι απενεργοποιημένη. Παρακαλούμε επικοινωνήστε με το διαχειριστή του ιστοτόπου. disable_register_mail=Η Επιβεβαίωση email για την εγγραφή είναι απενεργοποιημένη. manual_activation_only=Επικοινωνήστε με το διαχειριστή της υπηρεσίας για να ολοκληρώσετε την ενεργοποίηση. @@ -339,10 +344,11 @@ authorization_failed_desc=Η εξουσιοδώτηση απέτυχε επει sspi_auth_failed=Αποτυχία ταυτοποίησης SSPI password_pwned=Ο κωδικός πρόσβασης που επιλέξατε είναι σε μια λίστα κλεμμένων κωδικών πρόσβασης που έχουν προηγουμένως εκτεθεί σε δημόσιες παραβιάσεις δεδομένων. Παρακαλώ δοκιμάστε ξανά με διαφορετικό κωδικό πρόσβασης. password_pwned_err=Δεν ήταν δυνατή η ολοκλήρωση του αιτήματος προς το HaveIBeenPwned +invalid_password=Ο κωδικός πρόσβασης σας δεν ταιριάζει με τον κωδικό που χρησιμοποιήθηκε για τη δημιουργία του λογαριασμού. [mail] view_it_on=Δείτε το στο %s -link_not_working_do_paste=Δεν λειτουργεί; Δοκιμάστε να κάνετε αντιγραφή και επικόλληση στο πρόγραμμα περιήγησης. +link_not_working_do_paste=Δε λειτουργεί; Δοκιμάστε να το αντιγράψετε στο browser σας. hi_user_x=Γειά σου %s, activate_account=Παρακαλώ ενεργοποιήστε το λογαριασμό σας activate_account.title=%s, παρακαλώ ενεργοποιήστε το λογαριασμό σας @@ -393,6 +399,7 @@ team_invite.subject=%[1]s σας προσκάλεσε να συμμετέχετ team_invite.text_1=%[1]s σας προσκάλεσε να συμμετέχετε στην ομάδα %[2]s στον οργανισμός %[3]. team_invite.text_2=Παρακαλώ κάντε κλικ στον παρακάτω σύνδεσμο για να συμμετάσχετε στην ομάδα: team_invite.text_3=Σημείωση: Αυτή η πρόσκληση προοριζόταν για %[1]s. Αν δεν περιμένατε αυτή την πρόσκληση, μπορείτε να αγνοήσετε αυτό το email. +reply=ή απαντήστε απευθείας σε αυτό το email [modal] yes=Ναι @@ -477,6 +484,10 @@ still_own_packages=Ο λογαριασμός σας κατέχει ένα ή π org_still_own_repo=Αυτός ο οργανισμός εξακολουθεί να κατέχει έναν ή περισσότερα αποθετήρια, διαγράψτε ή μεταφέρετε τα πρώτα. org_still_own_packages=Αυτός ο οργανισμός εξακολουθεί να κατέχει ένα ή περισσότερα πακέτα, διαγράψτε τα πρώτα. target_branch_not_exist=Ο κλάδος προορισμού δεν υπάρχει. +username_error=" μπορεί να περιέχει μόνο αλφαριθμητικούς χαρακτήρες ('0-9','a-z','A-Z'), παύλα ('-'), κάτω παύλα ('_') και τελεία ('.'). Δεν μπορεί να ξεκινά ή να τελειώνει με μη αλφαριθμητικούς χαρακτήρες, επίσης απαγορεύονται οι διαδοχικοί μη αλφαριθμητικοί χαρακτήρες." +invalid_group_team_map_error=" η αντιστοίχιση δεν είναι έγκυρη: %s" +organization_leave_success=Έχετε εγκαταλείψει με επιτυχία τον οργανισμό %s. +must_use_public_key=Το κλειδί που δώσατε είναι ένα ιδιωτικό κλειδί. Παρακαλώ μην ανεβάζετε το ιδιωτικό σας κλειδί οπουδήποτε. Χρησιμοποιήστε το δημόσιο κλειδί αντί αυτού. [user] change_avatar=Αλλαγή του avatar σας… @@ -586,12 +597,12 @@ activate_email=Αποστολή Ενεργοποίησης activations_pending=Εκκρεμούν Ενεργοποιήσεις delete_email=Αφαίρεση email_deletion=Αφαίρεση Διεύθυνσης Email -email_deletion_desc=Η διεύθυνση ηλεκτρονικού ταχυδρομείου και οι σχετικές πληροφορίες θα αφαιρεθούν από το λογαριασμό σας. Οι υποβολές Git από αυτή τη διεύθυνση email θα παραμείνουν αμετάβλητες. Συνέχεια; +email_deletion_desc=Η διεύθυνση ηλεκτρονικού ταχυδρομείου και οι σχετικές πληροφορίες θα αφαιρεθούν από τον λογαριασμό σας. Οι υποβολές Git από αυτή τη διεύθυνση email θα παραμείνουν αμετάβλητες. Συνέχεια; email_deletion_success=Η διεύθυνση email σας έχει καταργηθεί. theme_update_success=Το θέμα διεπαφής σας ενημερώθηκε. theme_update_error=Το επιλεγμένο θέμα διεπαφής δεν υπάρχει. openid_deletion=Αφαίρεση Διεύθυνσης OpenID -openid_deletion_desc=Η κατάργηση αυτής της διεύθυνσης OpenID από το λογαριασμό σας θα σας εμποδίσει να συνδέεστε με αυτό. Συνέχεια; +openid_deletion_desc=Η κατάργηση αυτής της διεύθυνσης OpenID από τον λογαριασμό σας θα σας εμποδίσει να συνδέεστε με αυτό. Συνέχεια; openid_deletion_success=Η διεύθυνση OpenID αφαιρέθηκε. add_new_email=Προσθήκη Νέας Διεύθυνσης Email add_new_openid=Προσθήκη Νέου OpenID URI @@ -611,8 +622,8 @@ add_key=Προσθήκη Κλειδιού ssh_desc=Αυτά τα δημόσια SSH κλειδιά συνδέονται με το λογαριασμό σας. Τα αντίστοιχα ιδιωτικά κλειδιά επιτρέπουν πλήρη πρόσβαση στα αποθετήριά σας. principal_desc=Αυτές οι αρχές πιστοποιητικών SSH συνδέονται με το λογαριασμό σας και επιτρέπουν την πλήρη πρόσβαση στα αποθετήριά σας. gpg_desc=Αυτά τα δημόσια κλειδιά GPG συνδέονται με το λογαριασμό σας. Κρατήστε τα ιδιωτικά κλειδιά σας ασφαλή καθώς επιτρέπουν την επαλήθευση των υποβολών. -ssh_helper=Χρειάζεστε βοήθεια; Ρίξτε μια ματιά στον οδηγό του GitHub για να δημιουργήσετε τα δικά σας SSH κλειδιά ή να λύσετε κοινά προβλήματα που ενδέχεται να αντιμετωπίσετε χρησιμοποιώντας το SSH. -gpg_helper=Χρειάζεστε βοήθεια; Ρίξτε μια ματιά στον οδηγό του GitHub για το 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' @@ -760,7 +771,7 @@ delete_prompt=Αυτή η ενέργεια θα διαγράψει μόνιμα delete_with_all_comments=Ο λογαριασμός σας είναι νεότερος από %s. Για να αποφύγετε τα σχόλια φαντάσματα, όλα τα σχόλια σε ζητήματα/PR θα διαγραφούν από αυτόν. confirm_delete_account=Επιβεβαίωση Διαγραφής delete_account_title=Διαγραφή Λογαριασμού Χρήστη -delete_account_desc=Είστε βέβαιοι ότι θέλετε να διαγράψετε μόνιμα αυτό το λογαριασμό χρήστη; +delete_account_desc=Είστε βέβαιοι ότι θέλετε να διαγράψετε μόνιμα αυτό τον λογαριασμό χρήστη; email_notifications.enable=Ενεργοποίηση Ειδοποιήσεων Μέσω Email email_notifications.onmention=Email Μόνο κατά την Αναφορά email_notifications.disable=Απενεργοποίηση Ειδοποιήσεων μέσω Email @@ -773,9 +784,11 @@ visibility.limited=Περιορισμένη visibility.limited_tooltip=Ορατός μόνο στους συνδεδεμένους χρήστες visibility.private=Ιδιωτική visibility.private_tooltip=Ορατός μόνο στα μέλη της οργάνωσης +select_scopes=Επιλογή πεδίων +scopes_list=Πεδία: [repo] -new_repo_helper=Ένα αποθετήριο περιέχει όλα τα αρχεία του έργου, συμπεριλαμβανομένου του ιστορικού τους. Ήδη το έχετε κάπου αλλού; Μεταφορά αποθετηρίου. +new_repo_helper=Ένα αποθετήριο περιέχει όλα τα αρχεία του έργου, συμπεριλαμβανομένου του ιστορικού αναθεωρήσεων. Ήδη το έχετε κάπου αλλού; Μετεγκατάσταση αποθετηρίου. owner=Ιδιοκτήτης owner_helper=Ορισμένοι οργανισμοί ενδέχεται να μην εμφανίζονται στο αναπτυσσόμενο μενού λόγω του μέγιστου αριθμού αποθετηρίων. repo_name=Όνομα αποθετηρίου @@ -812,7 +825,7 @@ issue_labels=Σήματα Ζητήματος issue_labels_helper=Επιλέξτε ένα σύνολο σημάτων ζητημάτων. license=Άδεια license_helper=Επιλέξτε ένα αρχείο άδειας. -license_helper_desc=Μια άδεια διέπει τι άλλοι μπορούν και δεν μπορούν να κάνουν με τον κώδικά σας. Δεν είστε σίγουροι ποια είναι η σωστή για το έργο σας; Δείτε το Επιλέξτε μια άδεια. +license_helper_desc=Μια άδεια διέπει τι άλλοι μπορούν και δεν μπορούν να κάνουν με τον κώδικά σας. Δεν είστε σίγουροι ποια είναι η σωστή για το έργο σας; Δείτε το πως επιλέγω μια άδεια. readme=README readme_helper=Επιλέξτε ένα πρότυπο αρχείου README. readme_helper_desc=Αυτό είναι το μέρος όπου μπορείτε να γράψετε μια πλήρη περιγραφή για το έργο σας. @@ -836,14 +849,14 @@ mirror_address_url_invalid=Η διεύθυνση url που δώσατε δεν mirror_address_protocol_invalid=Το παρεχόμενο url δεν είναι έγκυρο. Μόνο οι τοποθεσίες http(s):// ή git:// μπορούν να αντικατοπτρίζονται. mirror_lfs=Large File Storage (LFS) mirror_lfs_desc=Ενεργοποίηση αντικατοπτρισμού δεδομένων LFS. -mirror_lfs_endpoint=LFS Endpoint +mirror_lfs_endpoint=Άκρο LFS mirror_lfs_endpoint_desc=Ο συγχρονισμός θα προσπαθήσει να χρησιμοποιήσει το url κλωνοποίησης για να καθορίσει τον διακομιστή LFS. Μπορείτε επίσης να καθορίσετε μια άλλη διεύθυνση αν τα δεδομένα LFS του αποθετηρίου αποθηκεύονται κάπου αλλού. mirror_last_synced=Τελευταίος Συγχρονισμός mirror_password_placeholder=(Χωρίς αλλαγή) mirror_password_blank_placeholder=(Μη ορισμένο) mirror_password_help=Αλλάξτε το όνομα χρήστη για να διαγράψετε έναν αποθηκευμένο κωδικό πρόσβασης. watchers=Παρατηρητές -stargazers=Stargazers +stargazers=Θαυμαστές forks=Forks pick_reaction=Διαλέξτε την αντίδρασή σας reactions_more=και %d περισσότερα @@ -894,7 +907,7 @@ migrate_options=Επιλογές Μεταφοράς migrate_service=Υπηρεσία Μεταφοράς migrate_options_mirror_helper=Αυτό το αποθετήριο θα είναι είδωλο migrate_options_lfs=Μεταφορά αρχείων LFS -migrate_options_lfs_endpoint.label=LFS Endpoint +migrate_options_lfs_endpoint.label=Άκρο LFS migrate_options_lfs_endpoint.description=Η μεταφορά θα προσπαθήσει να χρησιμοποιήσει το Git remote για να καθορίσει τον διακομιστή LFS. Μπορείτε επίσης να καθορίσετε ένα δικό σας endpoint αν τα δεδομένα LFS του αποθετηρίου αποθηκεύονται κάπου αλλού. migrate_options_lfs_endpoint.description.local=Μια διαδρομή στο τοπικό διακομιστή επίσης υποστηρίζεται. migrate_options_lfs_endpoint.placeholder=Αφήστε κενό για να αντληθεί από το URL κλωνοποίησης @@ -1306,7 +1319,7 @@ issues.label_edit=Επεξεργασία issues.label_delete=Διαγραφή issues.label_modify=Επεξεργασία Σήματος issues.label_deletion=Διαγραφή Σήματος -issues.label_deletion_desc=Η διαγραφή ενός σήματος την αφαιρεί από όλα τα ζητήματα. Συνέχεια; +issues.label_deletion_desc=Η διαγραφή ενός σήματος την αφαιρεί από όλα τα ζητήματα. Συνέχεια issues.label_deletion_success=Το σήμα έχει διαγραφεί. issues.label.filter_sort.alphabetically=Αλφαβητικά issues.label.filter_sort.reverse_alphabetically=Αντίστροφα αλφαβητικά @@ -1338,7 +1351,7 @@ issues.unlock.title=Ξεκλείδωμα συνομιλίας σε αυτό το issues.comment_on_locked=Δεν μπορείτε να σχολιάσετε ένα κλειδωμένο ζήτημα. issues.delete=Διαγραφή issues.delete.title=Διαγραφή αυτού του ζητήματος; -issues.delete.text=Θέλετε πραγματικά να διαγράψετε αυτό το ζήτημα; (Αυτό θα καταργήσει οριστικά όλο το περιεχόμενο. Επιλέξτε το κλείσιμο, αν σκοπεύετε να το αρχειοθετήσετε) +issues.delete.text=Θέλετε πραγματικά να διαγράψετε αυτό το ζήτημα; (Αυτό θα σβήσει οριστικά όλο το περιεχόμενο του. Εξετάστε αν θέλετε να το κλείσετε, αν σκοπεύεται να το αρχειοθετήσετε) issues.tracker=Καταγραφή Χρόνου issues.start_tracking_short=Εκκίνηση Χρονομέτρου issues.start_tracking=Εκκίνηση Καταγραφής Χρόνου @@ -1559,7 +1572,7 @@ pulls.auto_merge_canceled_schedule=Η αυτόματη συγχώνευση ακ pulls.auto_merge_newly_scheduled_comment=προγραμμάτισε αυτό το PR να συγχωνευτεί αυτόματα όταν όλοι οι έλεγχοι πετύχουν %[1]s pulls.auto_merge_canceled_schedule_comment=ακύρωσε την αυτόματη συγχώνευση αυτού του pull request όταν όλοι οι έλεγχοι πετύχουν %[1]s pulls.delete.title=Διαγραφή αυτού του pull request; -pulls.delete.text=Θέλετε πραγματικά να διαγράψετε αυτό το pull request; (Αυτό θα αφαιρέσει μόνιμα όλο το περιεχόμενο. Κλείστε το, αν σκοπεύετε να το κρατήσετε αρχειοθετημένο) +pulls.delete.text=Θέλετε πραγματικά να διαγράψετε αυτό το pull request; (Αυτό θα σβήσει οριστικά όλο το περιεχόμενο του. Εξετάστε αν θέλετε να το κλείσετε, αν σκοπεύεται να το αρχειοθετήσετε) milestones.new=Νέο Ορόσημο milestones.closed=Έκλεισε %s milestones.update_ago=Ενημερώθηκε πριν από %s @@ -2230,6 +2243,34 @@ issues.filter_project=Έργο issues.filter_project_none=Χωρίς έργα settings.authorization_header=Κεφαλίδα Authorization settings.authorization_header_desc=Αν υπάρχει, θα προστίθεται ως κεφαλίδα authorization στις αιτήσεις HTTP. Παραδείγματα: %s. +more_operations=Περισσότερες Λειτουργίες +cite_this_repo=Αναφορά σε αυτό το αποθετήριο +editor.new_branch_name=Ονόμασε τον νέο κλάδο για αυτήν την υποβολή +commit.operations=Λειτουργίες +projects.card_type.desc=Προεπισκοπήσεις Καρτών +projects.card_type.images_and_text=Εικόνες και Κείμενο +projects.card_type.text_only=Μόνο Κείμενο +issues.filter_project_all=Όλα τα έργα +issues.action_check=Επιλογή/Αποεπιλογή +issues.action_check_all=Επιλογή/Αποεπιλογή όλων των αντικειμένων +issues.label_exclusive=Αποκλειστικό +issues.label_exclusive_desc=Ονομάστε το σήμα πεδίο/στοιχείο για να το κάνετε αμοιβαία αποκλειστικό με άλλα σήματα πεδίου/. +issues.label_exclusive_warning=Τυχόν συγκρουόμενα σήματα θα αφαιρεθούν κατά την επεξεργασία των σημάτων ενός ζητήματος ή pull request. +pulls.clear_merge_message=Εκκαθάριση μηνύματος συγχώνευσης +pulls.clear_merge_message_hint=Η εκκαθάριση του μηνύματος συγχώνευσης θα αφαιρέσει μόνο το περιεχόμενο του μηνύματος υποβολής και θα διατηρήσει τα παραγόμενα git trailers όπως "Co-Authored-By …". +settings.branches.add_new_rule=Προσθήκη Νέου Κανόνα +settings.pulls.default_allow_edits_from_maintainers=Να επιτρέπονται από προεπιλογή οι αλλαγές από τους συντηρητές +settings.releases_desc=Ενεργοποίηση Εκδόσεων Αποθετηρίου +settings.actions_desc=Ενεργοποίηση Δράσεων Αποθετηρίου +settings.protected_branch.save_rule=Αποθήκευση Κανόνα +settings.protected_branch.delete_rule=Διαγραφή Κανόνα +settings.protect_branch_name_pattern=Μοτίβο Προστατευμένου Ονόματος Κλάδου +settings.remove_protected_branch_failed=Αποτυχία αφαίρεσης του κανόνα προστασίας κλάδου '%s. +settings.merge_style_desc=Συγχώνευση Στυλ +settings.protected_branch_required_rule_name=Απαιτούμενο όνομα κανόνα +settings.protected_branch_duplicate_rule_name=Διπλότυπο όνομα κανόνα +release.releases_for=Κυκλοφορίες για %s +release.tags_for=Ετικέτες για %s [org] org_name_holder=Όνομα Οργανισμού @@ -2595,7 +2636,7 @@ auths.pam_email_domain=PAM Email Domain (προαιρετικό) auths.oauth2_provider=Πάροχος OAuth2 auths.oauth2_icon_url=URL Εικονιδίου auths.oauth2_clientID=Client ID (Κλειδί) -auths.oauth2_clientSecret=Client Secret +auths.oauth2_clientSecret=Μυστικό Πελάτη auths.openIdConnectAutoDiscoveryURL=URL Αυτόματης Ανακάλυψης OpenID Connect auths.oauth2_use_custom_url=Χρήση Προσαρμοσμένων URLs Αντί των Προεπιλεγμένων URLs auths.oauth2_tokenURL=URL Διακριτικού @@ -2869,6 +2910,18 @@ notices.type_2=Εργασία notices.desc=Περιγραφή notices.op=Λειτ. notices.delete_success=Οι ειδοποιήσεις του συστήματος έχουν διαγραφεί. +dashboard.gc_lfs=Συλλογή απορριμάτων στα μετα-αντικείμενα LFS +dashboard.stop_zombie_tasks=Διακοπή εργασιών ζόμπι +dashboard.stop_endless_tasks=Διακοπή ατελείωτων εργασιών +dashboard.cancel_abandoned_jobs=Ακύρωση εγκαταλελειμμένων εργασιών +packages.unreferenced_size=Μέγεθος Χωρίς Αναφορά: %s +auths.oauth2_map_group_to_team=Αντιστοίχιση των απαιτούμενων ομάδων σε ομάδες Οργανισμού. (Προαιρετικό - απαιτείται το όνομα της απαίτησης παραπάνω) +auths.oauth2_map_group_to_team_removal=Αφαίρεση χρηστών από τις συγχρονισμένες ομάδες, εάν ένας χρήστης δεν ανήκει στην αντίστοιχη ομάδα. +auths.unable_to_initialize_openid=Αδυναμία εκκίνησης του παρόχου OpenID Connect: %s +auths.invalid_openIdConnectAutoDiscoveryURL=Μη έγκυρο Auto Discovery URL (πρέπει να είναι ένα έγκυρο URL που ξεκινά με http:// ή https://) +config.git_enable_reflogs=Ενεργοποίηση Reflogs +config.git_reflog_expiry_time=Χρόνος Λήξης +notices.operations=Λειτουργίες [action] create_repo=δημιούργησε το αποθετήριο %s @@ -3062,12 +3115,73 @@ settings.delete.success=Το πακέτο έχει διαγραφεί. settings.delete.error=Αποτυχία διαγραφής του πακέτου. chef.install=Για να εγκαταστήσετε το πακέτο, εκτελέστε την ακόλουθη εντολή: owner.settings.cleanuprules.enabled=Ενεργοποιημένο +details.repository_site=Ιστοσελίδα Αποθετηρίου +details.documentation_site=Ιστοσελίδα Τεκμηρίωσης +cargo.registry=Ρυθμίστε αυτό το μητρώο στις ρυθμίσεις του Cargo (για παράδειγμα ~/.cargo/config.toml): +cargo.install=Για να εγκαταστήσετε το πακέτο χρησιμοποιώντας το Cargo, εκτελέστε την ακόλουθη εντολή: +cargo.documentation=Για περισσότερες πληροφορίες σχετικά με το μητρώο Cargo, ανατρέξτε στην τεκμηρίωση. +cargo.details.repository_site=Ιστοσελίδα Αποθετηρίου +cargo.details.documentation_site=Ιστοσελίδα Τεκμηρίωσης +chef.registry=Ρυθμίστε αυτό το μητρώο στο αρχείο ~/.chef/config.rb: +chef.documentation=Για περισσότερες πληροφορίες σχετικά με το μητρώο Chef, ανατρέξτε στην τεκμηρίωση. +conda.registry=Ρυθμίστε αυτό το μητρώο ως αποθετήριο Conda στο αρχείο .condarc: +conda.install=Για να εγκαταστήσετε το πακέτο χρησιμοποιώντας το Conda, εκτελέστε την ακόλουθη εντολή: +conda.documentation=Για περισσότερες πληροφορίες σχετικά με το μητρώο Conda, ανατρέξτε στην τεκμηρίωση. +conda.details.repository_site=Ιστοσελίδα Αποθετηρίου +conda.details.documentation_site=Ιστοσελίδα Τεκμηρίωσης +owner.settings.cargo.title=Ευρετήριο Μητρώου Cargo +owner.settings.cargo.initialize=Αρχικοποίηση Ευρετηρίου +owner.settings.cargo.initialize.description=Για να χρησιμοποιήσετε το μητρώο Cargo απαιτείται ένα ειδικό git repository. Εδώ μπορείτε να το δημιουργήσετε με τις απαιτούμενες ρυθμίσεις. +owner.settings.cargo.initialize.error=Αποτυχία αρχικοποίησης ευρετηρίου Cargo: %v +owner.settings.cargo.initialize.success=Ο ευρετήριο Cargo δημιουργήθηκε με επιτυχία. +owner.settings.cargo.rebuild=Αναδημιουργία Ευρετηρίου +owner.settings.cargo.rebuild.description=Αν το ευρετήριο είναι εκτός συγχρονισμού με τα αποθηκευμένα πακέτα cargo, μπορείτε να το αναδομήσετε. +owner.settings.cargo.rebuild.error=Αποτυχία αναδόμησης του ευρετηρίου Cargo: %v +owner.settings.cargo.rebuild.success=Το ευρετήριο Cargo αναδομήθηκε με επιτυχία. +owner.settings.cleanuprules.title=Διαχείριση Κανόνων Εκκαθάρισης +owner.settings.cleanuprules.add=Προσθήκη Κανόνα Εκκαθάρισης +owner.settings.cleanuprules.edit=Επεξεργασία Κανόνα Εκκαθάρισης +owner.settings.cleanuprules.none=Δεν υπάρχουν διαθέσιμοι κανόνες εκκαθάρισης. Συμβουλευτείτε την τεκμηρίωση. +owner.settings.cleanuprules.preview=Προεπισκόπηση Κανόνα Εκκαθάρισης +owner.settings.cleanuprules.preview.overview=%d πακέτα έχουν προγραμματιστεί να αφαιρεθούν. +owner.settings.cleanuprules.preview.none=Ο κανόνας εκκαθάρισης δεν ταιριάζει με κανένα πακέτο. +owner.settings.cleanuprules.pattern_full_match=Εφαρμογή μοτίβου στο πλήρες όνομα του πακέτου +owner.settings.cleanuprules.keep.title=Οι εκδόσεις που ταιριάζουν με αυτούς τους κανόνες παραμένουν, ακόμη και αν ταιριάζουν με έναν κανόνα αφαίρεσης παρακάτω. +owner.settings.cleanuprules.keep.count=Κράτησε το πιο πρόσφατο +owner.settings.cleanuprules.keep.count.1=1 έκδοση ανά πακέτο +owner.settings.cleanuprules.keep.count.n=%d εκδόσεις ανά πακέτο +owner.settings.cleanuprules.keep.pattern=Διατήρηση εκδόσεων που ταιριάζουν +owner.settings.cleanuprules.keep.pattern.container=Η τελευταία έκδοση διατηρείται πάντα για τα πακέτα Container. +owner.settings.cleanuprules.remove.title=Οι εκδόσεις που ταιριάζουν με αυτούς τους κανόνες καταργούνται, εκτός και αν ένας παραπάνω κανόνας ορίζει να μείνουν. +owner.settings.cleanuprules.remove.days=Αφαίρεση εκδόσεων παλαιότερων από +owner.settings.cleanuprules.remove.pattern=Αφαίρεση εκδόσεων που ταιριάζουν +owner.settings.cleanuprules.success.update=Ο κανόνας καθαρισμού ενημερώθηκε. +owner.settings.cleanuprules.success.delete=Ο κανόνας καθαρισμού διαγράφηκε. +owner.settings.chef.title=Μητρώο Chef +owner.settings.chef.keypair=Δημιουργία ζεύγους κλειδιών +owner.settings.chef.keypair.description=Δημιουργία ζεύγους κλειδιών για την πιστοποίηση στο μητρώο Chef. Το προηγούμενο κλειδί δεν μπορεί να χρησιμοποιηθεί πια. [aria] +navbar=Γραμμή Πλοήγησης +footer=Υποσέλιδο +footer.software=Σχετικά με το Λογισμικό +footer.links=Συνδέσεις [secrets] value=Τιμή name=Όνομα +secrets=Μυστικά +description=Τα μυστικά θα περάσουν σε ορισμένες δράσεις και δεν μπορούν να αναγνωστούν αλλού. +none=Δεν υπάρχουν ακόμα μυστικά. +creation=Προσθήκη Μυστικού +creation.name_placeholder=αλφαριθμητικοί χαρακτήρες ή κάτω παύλες μόνο, δεν μπορούν να ξεκινούν με GITEA_ ή GITHUB_ +creation.value_placeholder=Εισάγετε οποιοδήποτε περιεχόμενο. Τα κενά στην αρχή παραλείπονται. +creation.success=Το μυστικό '%s' έχει δημιουργηθεί. +creation.failed=Αποτυχία δημιουργίας μυστικού. +deletion=Αφαίρεση μυστικού +deletion.description=Η αφαίρεση ενός μυστικού είναι μόνιμη και δεν μπορεί να αναιρεθεί. Συνέχεια; +deletion.success=Το μυστικό έχει αφαιρεθεί. +deletion.failed=Αποτυχία αφαίρεσης μυστικού. [actions] runners.id=ID @@ -3080,3 +3194,43 @@ runners.task_list.repository=Αποθετήριο runners.task_list.commit=Υποβολή runners.status.active=Ενεργό runs.commit=Υποβολή +actions=Δράσεις +unit.desc=Διαχείριση δράσεων +status.unknown=Άγνωστη +status.waiting=Αναμονή +status.running=Εκτελείται +status.success=Επιτυχές +status.failure=Αποτυχία +status.cancelled=Ακυρώθηκε +status.skipped=Παρακάμφθηκε +status.blocked=Αποκλείστηκε +runners=Εκτελεστές +runners.runner_manage_panel=Διαχείριση Εκτελεστών +runners.new=Δημιουργία νέου Εκτελεστή +runners.new_notice=Πώς να ξεκινήσετε έναν εκτελεστή +runners.status=Κατάσταση +runners.last_online=Τελευταία Ώρα Σύνδεσης +runners.agent_labels=Ετικέτες Πράκτορα +runners.custom_labels=Προσαρμοσμένες Ετικέτες +runners.custom_labels_helper=Οι προσαρμοσμένες ετικέτες είναι ετικέτες που προστίθενται χειροκίνητα από έναν διαχειριστή. Ένα κόμμα διαχωρίζει τις ετικέτες, τα κενά στην αρχή και στο τέλος κάθε ετικέτας απαλείφονται. +runners.runner_title=Εκτελεστής +runners.task_list=Πρόσφατες εργασίες στον εκτελεστή +runners.task_list.status=Κατάσταση +runners.task_list.done_at=Ολοκλήρωσε Στις +runners.edit_runner=Επεξεργασία Εκτελεστή +runners.update_runner=Ενημέρωση Αλλαγών +runners.update_runner_success=Ο εκτελεστής ενημερώθηκε επιτυχώς +runners.update_runner_failed=Αποτυχία ενημέρωσης εκτελεστή +runners.delete_runner=Διαγραφή του εκτελεστή +runners.delete_runner_success=Ο εκτελεστής διαγράφηκε επιτυχώς +runners.delete_runner_failed=Αποτυχία διαγραφής εκτελεστή +runners.delete_runner_header=Επιβεβαιώστε για τη διαγραφή του εκτελεστή +runners.delete_runner_notice=Αν μια εργασία εκτελείται σε αυτόν τον εκτελεστή, θα τερματιστεί και θα επισημανθεί ως αποτυχημένη. Μπορεί να σπάσει το χτίσιμο της ροής εργασίας. +runners.none=Δεν υπάρχουν διαθέσιμοι εκτελεστές +runners.status.unspecified=Άγνωστη +runners.status.idle=Αδρανής +runners.status.offline=Χωρίς Σύνδεση +runs.all_workflows=Όλες Οι Ροές Εργασίας +runs.open_tab=%d Ανοιχτά +runs.closed_tab=%d Κλειστά +runs.pushed_by=Ωθήθηκε από diff --git a/options/locale/locale_fa-IR.ini b/options/locale/locale_fa-IR.ini index ef4e1e0e01b3..4e58e3887410 100644 --- a/options/locale/locale_fa-IR.ini +++ b/options/locale/locale_fa-IR.ini @@ -2028,6 +2028,7 @@ issues.delete=حذف search.code_no_results=کد منبعی مطابق با جستجوی شما یافت نشد. settings.event_wiki=دانشنامه branch.create_branch_operation=ایجاد شاخه +issues.remove_assignee_at=جدا شده توسط %s %s [org] org_name_holder=نام سازمان diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini index a8bff5562e32..ca72e1053c3d 100644 --- a/options/locale/locale_fr-FR.ini +++ b/options/locale/locale_fr-FR.ini @@ -488,7 +488,7 @@ heatmap.loading=Chargement de la Heatmap… user_bio=Biographie disabled_public_activity=Cet utilisateur a désactivé la visibilité publique de l'activité. form.name_reserved=Le nom d’utilisateur "%s" est réservé. -form.name_pattern_not_allowed=`"%s" n'est pas autorisé dans un nom d'utilisateur.` +form.name_pattern_not_allowed="%s" n'est pas autorisé dans un nom d'utilisateur. form.name_chars_not_allowed=Le nom d'utilisateur '%s' contient des caractères non valides. [settings] @@ -880,7 +880,7 @@ archive.pull.nocomment=Ce dépôt est archivé. Vous ne pouvez pas commenter de form.reach_limit_of_creation_1=Vous avez déjà atteint la limite d'%d dépôt. form.reach_limit_of_creation_n=Vous avez déjà atteint la limite de %d dépôts. form.name_reserved=Le dépôt "%s" a un nom réservé. -form.name_pattern_not_allowed=`"%s" n'est pas autorisé dans un nom de dépôt.` +form.name_pattern_not_allowed="%s" n'est pas autorisé dans un nom de dépôt. need_auth=Autorisation migrate_options=Options de migration migrate_service=Service de migration @@ -2121,7 +2121,7 @@ team_permission_desc=Autorisation team_unit_desc=Permettre l’accès aux Sections du dépôt team_unit_disabled=(Désactivé) form.name_reserved=Le nom d'organisation "%s" est réservé. -form.name_pattern_not_allowed=`"%s" n'est pas autorisé dans un nom d'organisation.` +form.name_pattern_not_allowed="%s" n'est pas autorisé dans un nom d'organisation. form.create_org_not_allowed=Vous n'êtes pas autorisé à créer une organisation. settings=Paramètres settings.options=Organisation @@ -2204,6 +2204,7 @@ teams.all_repositories_read_permission_desc=Cette équipe accorde l'accès en écriture à tous les dépôts : les membres peuvent lire et écrire dans les dépôts. teams.all_repositories_admin_permission_desc=Cette équipe accorde l'accès administrateur à tous les dépôts : les membres peuvent lire, écrire dans et ajouter des collaborateurs aux dépôts. members=Membres +teams.read_access=Lue(s) [admin] dashboard=Tableau de bord diff --git a/options/locale/locale_hu-HU.ini b/options/locale/locale_hu-HU.ini index cf714c8d88ee..c786d43ff128 100644 --- a/options/locale/locale_hu-HU.ini +++ b/options/locale/locale_hu-HU.ini @@ -1018,14 +1018,14 @@ activity.git_stats_deletion_1=%d törlés activity.git_stats_deletion_n=%d törlés search=Keresés search.search_repo=Tároló keresés -search.results=`"%s" találatok keresése itt: %s` +search.results="%s" találatok keresése itt: %s settings=Beállítások settings.desc=A beállítások menüpontban állítható a tároló paraméterei settings.options=Tároló settings.collaboration=Közreműködők settings.collaboration.admin=Rendszergazda settings.collaboration.write=Írás -settings.collaboration.read=Olvasás +settings.collaboration.read=Olvasott settings.collaboration.owner=Tulajdonos settings.collaboration.undefined=Nincs definiálva settings.hooks=Webhook-ok @@ -1034,7 +1034,7 @@ settings.basic_settings=Alap beállítások settings.mirror_settings=Tükrözési beállítások settings.sync_mirror=Szinkronizálás most settings.mirror_sync_in_progress=Tükör szinkronizálása folyamatban. Kérem várjon. -settings.site=Weboldal +settings.site=Webhely settings.update_settings=Beállítások frissítése settings.advanced_settings=Haladó beállítások settings.wiki_desc=Tároló wiki engedélyezése @@ -1092,7 +1092,7 @@ settings.add_team_duplicate=A csapat már rendelkezik a tárolóval settings.add_team_success=A csapatnak most van hozzáférése a tárolóhoz. settings.remove_team_success=A csapat hozzáférése a tárolóhoz törölve lett. settings.add_webhook=Webhook hozzáadása -settings.webhook_deletion=Webhook eltávolítása +settings.webhook_deletion=Webhook törlése settings.webhook_deletion_success=A webhook el lett távolítva. settings.webhook.test_delivery=Küldés Kipróbálása settings.webhook.request=Kérés @@ -1120,7 +1120,7 @@ settings.event_header_repository=Tárolóesemények settings.event_create=Létrehozás settings.event_create_desc=Branch vagy tag létrehozva. settings.event_delete=Törlés -settings.event_fork=Másolat +settings.event_fork=Tükrözés settings.event_release=Kiadás settings.event_release_desc=Kiadás nyilvánossára hozása, frissítése vagy törlése a tárolóban. settings.event_push=Feltöltés @@ -1233,6 +1233,11 @@ issues.new.projects=Projektek issues.deleted_project=(törölt) issues.draft_title=Piszkozat issues.delete=Törlés +search.code_no_results=Nincs találat a keresési kifejezésedre. +settings.trust_model.collaborator=Közreműködő +settings.teams=Csoportok +settings.event_wiki=Wiki +release.compare=Összehasonlítás [org] org_name_holder=Szervezet neve diff --git a/options/locale/locale_id-ID.ini b/options/locale/locale_id-ID.ini index 0f0eb08ababf..2e42454928c2 100644 --- a/options/locale/locale_id-ID.ini +++ b/options/locale/locale_id-ID.ini @@ -76,7 +76,7 @@ platform_desc=Gitea bisa digunakan di mana code.gitea.io/gitea! Mari bergabung dengan berkontribusi untuk membuat proyek ini lebih baik. Jangan malu untuk menjadi kontributor!` +license_desc=Go get (Dapatkan kode sumber dari) code.gitea.io/gitea! Mari bergabung dengan berkontribusi untuk membuat proyek ini lebih baik. Jangan malu untuk menjadi kontributor! [install] install=Pemasangan diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini index 76df73c6a71a..5eb628d83a02 100644 --- a/options/locale/locale_ja-JP.ini +++ b/options/locale/locale_ja-JP.ini @@ -19,7 +19,7 @@ active_stopwatch=進行中のタイムトラッカー create_new=作成… user_profile_and_more=プロフィールと設定… signed_in_as=サインイン済み -enable_javascript=このサイトはJavaScriptを使用しています +enable_javascript=このウェブサイトにはJavaScriptが必要です。 toc=目次 licenses=ライセンス return_to_gitea=Giteaに戻る @@ -227,7 +227,7 @@ default_enable_timetracking_popup=新しいリポジトリのタイムトラッ no_reply_address=メールを隠すときのドメイン no_reply_address_helper=メールアドレスを隠しているユーザーに使用するドメイン名。 例えば 'noreply.example.org' と設定した場合、ユーザー名 'joe' はGitに 'joe@noreply.example.org' としてログインすることになります。 password_algorithm=パスワードハッシュアルゴリズム -password_algorithm_helper="""パスワードハッシュアルゴリズムを設定します。 アルゴリズムにより動作要件と強度が異なります。 `argon2`は良い特性を備えていますが、多くのメモリを使用するため小さなシステムには適さない場合があります。""" +password_algorithm_helper=パスワードハッシュアルゴリズムを設定します。 アルゴリズムにより動作要件と強度が異なります。 argon2アルゴリズムはかなり安全ですが、多くのメモリを使用するため小さなシステムには適さない場合があります。 invalid_password_algorithm=無効なパスワードハッシュアルゴリズム enable_update_checker=アップデートチェッカーを有効にする enable_update_checker_helper=gitea.ioに接続して定期的に新しいバージョンのリリースを確認します。 @@ -1098,7 +1098,7 @@ commits.commits=コミット commits.no_commits=共通のコミットはありません。 '%s' と '%s' の履歴はすべて異なっています。 commits.nothing_to_compare=二つのブランチは同じ内容です。 commits.search=コミットの検索… -commits.search.tooltip=キーワード "author:"、"committer:"、"after:"、"before:" を付けて指定できます。 例 "revert author:Alice before:2019-04-01" +commits.search.tooltip=キーワード "author:"、"committer:"、"after:"、"before:" を付けて指定できます。 例 "revert author:Alice before:2019-01-13" commits.find=検索 commits.search_all=すべてのブランチ commits.author=作成者 @@ -2519,7 +2519,7 @@ users.still_own_repo=このユーザーはまだ1つ以上のリポジトリを users.still_has_org=このユーザーは組織のメンバーになっています。 先に組織からこのユーザーを削除してください。 users.purge=ユーザーを抹消 users.purge_help=強制的にユーザーとそのユーザーが所有していたリポジトリ、組織、パッケージを削除します。コメントもすべて削除します。 -users.still_own_packages=このユーザーはまだ1つ以上のパッケージを所有しています。最初にそれらのパッケージを削除してください。 +users.still_own_packages=このユーザーはまだ1つ以上のパッケージを所有しています。先にそれらのパッケージを削除してください。 users.deletion_success=ユーザーアカウントを削除しました。 users.reset_2fa=2要素認証をリセット users.list_status_filter.menu_text=フィルター @@ -3018,7 +3018,7 @@ error.unit_not_allowed=このセクションへのアクセスが許可されて title=パッケージ desc=リポジトリ パッケージを管理します。 empty=パッケージはまだありません。 -empty.documentation=パッケージレジストリの詳細については、 ドキュメント を参照してください。 +empty.documentation=パッケージレジストリの詳細については、 ドキュメント を参照してください。 empty.repo=パッケージはアップロードしたけども、ここに表示されない？ パッケージ設定を開いて、パッケージをこのリポジトリにリンクしてください。 filter.type=タイプ filter.type.all=すべて diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini index 7215971c46b7..d70c169f4faa 100644 --- a/options/locale/locale_lv-LV.ini +++ b/options/locale/locale_lv-LV.ini @@ -245,15 +245,15 @@ view_home=Skatīties %s search_repos=Meklēt repozitoriju… filter=Citi filtri filter_by_team_repositories=Filtrēt pēc komandas repozitorijiem -feed_of=`"%s" plūsma` +feed_of="%s" plūsma show_archived=Arhivētie -show_both_archived_unarchived=Attēlo gan arhivētie, gan nearhivētie -show_only_archived=Attēlo tikai arhivētos -show_only_unarchived=Attēlo tikai nearhivētos -show_private=Privātie -show_both_private_public=Attēlo gan publiskos, gan privātos -show_only_private=Attēlo tikai privātos -show_only_public=Attēlo tikai publiskos +show_both_archived_unarchived=Attēlot gan arhivētos, gan nearhivētos +show_only_archived=Attēlot tikai arhivētos +show_only_unarchived=Attēlot tikai nearhivētos +show_private=Privāts +show_both_private_public=Attēlot gan publiskos, gan privātos +show_only_private=Attēlot tikai privātos +show_only_public=Attēlot tikai publiskos issues.in_your_repos=Jūsu repozitorijos [explore] diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini index f828624ccea1..d5b985b0940a 100644 --- a/options/locale/locale_nl-NL.ini +++ b/options/locale/locale_nl-NL.ini @@ -1245,7 +1245,7 @@ issues.open_title=Open issues.closed_title=Gesloten issues.draft_title=Concept issues.num_comments=%d opmerkingen -issues.commented_at=`reageerde %s` +issues.commented_at=reageerde %s issues.delete_comment_confirm=Weet u zeker dat u deze reactie wilt verwijderen? issues.context.copy_link=Link kopiëren issues.context.quote_reply=Citeer antwoord diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini index 16895a3cf2ba..0f8791d76bdd 100644 --- a/options/locale/locale_pl-PL.ini +++ b/options/locale/locale_pl-PL.ini @@ -1218,12 +1218,12 @@ issues.del_time=Usuń ten dziennik czasu issues.add_time_short=Dodaj czas issues.add_time_cancel=Anuluj issues.add_time_history=dodał(-a) spędzony czas %s -issues.del_time_history='usunął(-ęła) spędzony czas %s' +issues.del_time_history=usunął(-ęła) spędzony czas %s issues.add_time_hours=Godziny issues.add_time_minutes=Minuty issues.add_time_sum_to_small=Czas nie został wprowadzony. issues.time_spent_total=Całkowity spędzony czas -issues.time_spent_from_all_authors=`Całkowity spędzony czas: %s` +issues.time_spent_from_all_authors=Całkowity spędzony czas: %s issues.due_date=Termin realizacji issues.invalid_due_date_format=Format terminu realizacji musi mieć wartość 'rrrr-mm-dd'. issues.error_modifying_due_date=Nie udało się zmodyfikować terminu realizacji. diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini index 06e658c31cfc..901ecd91de1c 100644 --- a/options/locale/locale_pt-PT.ini +++ b/options/locale/locale_pt-PT.ini @@ -19,7 +19,7 @@ active_stopwatch=Cronómetro em andamento create_new=Criar… user_profile_and_more=Perfil e configurações… signed_in_as=Sessão iniciada como -enable_javascript=Este sítio funciona melhor com JavaScript. +enable_javascript=Este website requer JavaScript. toc=Índice licenses=Licenças return_to_gitea=Retornar ao Gitea @@ -197,7 +197,7 @@ openid_signup_popup=Habilitar a utilização do OpenID para fazer auto-inscriç enable_captcha=Habilitar CAPTCHA na inscrição enable_captcha_popup=Exigir CAPTCHA na auto-inscrição de utilizadores. require_sign_in_view=Exigir sessão iniciada para visualizar páginas -require_sign_in_view_popup=Limitar o acesso às páginas aos utilizadores inscritos. Os visitantes só poderão visualizar as páginas de início de sessão e de inscrição. +require_sign_in_view_popup=Limitar o acesso às páginas aos utilizadores com sessão iniciada. Os visitantes só poderão visualizar as páginas de início de sessão e de inscrição. admin_setting_desc=A criação de uma conta de administração é opcional. O primeiro utilizador inscrito tornar-se-á automaticamente num administrador. admin_title=Configurações da conta de administração admin_name=Nome de utilizador do administrador @@ -227,7 +227,7 @@ default_enable_timetracking_popup=Habilitar, por norma, a contagem do tempo nos no_reply_address=Domínio dos emails ocultos no_reply_address_helper=Nome de domínio para utilizadores com um endereço de email oculto. Por exemplo, o nome de utilizador 'silva' será registado no Git como 'silva@semresposta.exemplo.org' se o domínio de email oculto estiver definido como 'semresposta.exemplo.org'. password_algorithm=Algoritmo de Hash da Senha -password_algorithm_helper="""Definir o algoritmo de hash da senha. Os algoritmos têm requisitos e resistência distintos. `argon2`, embora tenha boas características, usa muita memória e pode ser inapropriado para sistemas pequenos.""" +password_algorithm_helper="""Definir o algoritmo de hash da senha. Os algoritmos têm requisitos e resistência distintos. `argon2` é bastante seguro, mas usa muita memória e pode ser inapropriado para sistemas pequenos.""" enable_update_checker=Habilitar verificador de novidades enable_update_checker_helper=Verifica, periodicamente, se foi lançada alguma versão nova, fazendo uma ligação ao gitea.io. invalid_password_algorithm=Algoritmo de hash da senha inválido @@ -476,13 +476,13 @@ duplicate_invite_to_team=O(A) utilizador(a) já tinha sido convidado(a) para ser invalid_ssh_key=Não é possível validar a sua chave SSH: %s invalid_gpg_key=Não é possível validar a sua chave GPG: %s invalid_ssh_principal=Protagonista inválido: %s -unable_verify_ssh_key=Não é possível validar a chave SSH; verifique novamente se há erros. +unable_verify_ssh_key=Não é possível validar a chave SSH, verifique se tem erros. auth_failed=Falhou a autenticação: %v -still_own_repo=A sua conta possui um ou mais repositórios; deve excluí-los ou transferi-los primeiro. -still_has_org=A sua conta é membro de uma ou mais organizações; deixe-as primeiro. -still_own_packages=A sua conta possui um ou mais pacotes; elimine-os primeiro. -org_still_own_repo=Esta organização ainda possui repositórios; deve excluí-los ou transferi-los primeiro. -org_still_own_packages=Esta organização ainda possui um ou mais pacotes; elimine-os primeiro. +still_own_repo=A sua conta possui um ou mais repositórios, elimine-os ou transfira-os primeiro. +still_has_org=A sua conta é membro de uma ou mais organizações, saia delas primeiro. +still_own_packages=A sua conta possui um ou mais pacotes, elimine-os primeiro. +org_still_own_repo=Esta organização ainda possui um ou mais repositórios, elimine-os ou transfira-os primeiro. +org_still_own_packages=Esta organização ainda possui um ou mais pacotes, elimine-os primeiro. target_branch_not_exist=O ramo de destino não existe. username_error=" só pode conter caracteres alfanuméricos ('0-9','a-z','A-Z'), hífen ('-'), sublinhado ('_') e ponto ('.') Não pode começar nem terminar com caracteres não alfanuméricos, e caracteres não alfanuméricos consecutivos também são proibidos." invalid_group_team_map_error=" o mapeamento é inválido: %s" @@ -1098,7 +1098,7 @@ commits.commits=Cometimentos commits.no_commits=Não há cometimentos em comum. '%s' e '%s' têm históricos completamente diferentes. commits.nothing_to_compare=Estes ramos são iguais. commits.search=Procurar cometimentos… -commits.search.tooltip=Pode prefixar palavras-chave com "author:", "committer:", "after:", ou "before:". Por exemplo: "revert author:Alice before:2019-04-01". +commits.search.tooltip=Pode prefixar palavras-chave com "author:", "committer:", "after:", ou "before:". Por exemplo: "revert author:Alice before:2019-01-13". commits.find=Procurar commits.search_all=Todos os ramos commits.author=Autor(a) @@ -1824,7 +1824,7 @@ settings.trust_model.collaborator.long=Colaborador: Confiar nas assinaturas dos settings.trust_model.collaborator.desc=Assinaturas válidas dos colaboradores deste repositório serão marcadas como "fiável" (independentemente de corresponderem, ou não, ao autor do cometimento). Caso contrário, assinaturas válidas serão marcadas como "não fiável" se a assinatura corresponder ao autor do cometimento e "não corresponde", se não corresponder. settings.trust_model.committer=Autor do cometimento settings.trust_model.committer.long=Autor do cometimento: Confiar nas assinaturas que correspondam aos autores dos cometimentos (isto corresponde ao funcionamento do GitHub e força a que os cometimentos assinados do Gitea tenham o Gitea como autor do cometimento) -settings.trust_model.committer.desc=Assinaturas válidas apenas serão marcadas como "fiável" se corresponderem ao autor do cometimento, caso contrário serão marcadas como "não corresponde". Isto irá forçar a que o Gitea seja o autor do cometimento nos cometimentos assinados, ficando o autor real marcado como "Co-autorado-por:" e "Co-cometido-por:" no resumo do cometimento. A chave padrão do Gitea tem que corresponder a um utilizador na base de dados. +settings.trust_model.committer.desc=Assinaturas válidas apenas serão marcadas como "fiável" se corresponderem ao autor do cometimento, caso contrário serão marcadas como "não corresponde". Isto irá forçar o Gitea a ser o autor do cometimento nos cometimentos assinados, ficando o autor real marcado como "Co-autorado-por:" e "Co-cometido-por:" no resumo do cometimento. A chave padrão do Gitea tem que corresponder a um utilizador na base de dados. settings.trust_model.collaboratorcommitter=Colaborador + Autor do cometimento settings.trust_model.collaboratorcommitter.long=Colaborador + Autor do cometimento: Confiar nas assinaturas dos colaboradores que correspondam ao autor do cometimento settings.trust_model.collaboratorcommitter.desc=Assinaturas válidas feitas por colaboradores deste repositório serão marcadas como "fiável" se corresponderem ao autor do cometimento. Caso contrário, assinaturas válidas serão marcadas como "não fiável" se a assinatura corresponder ao autor do cometimento e "não corresponde" se não corresponder. Isto irá forçar a que o Gitea seja marcado como sendo o autor do cometimento nos cometimentos assinados, ficando o autor real marcado como "Co-autorado-por:" e "Co-cometido-por:" no resumo do cometimento. A chave padrão do Gitea tem que corresponder a um utilizador na base de dados. @@ -2019,10 +2019,10 @@ settings.dismiss_stale_approvals=Descartar aprovações obsoletas settings.dismiss_stale_approvals_desc=Quando novos cometimentos que mudam o conteúdo do pedido de integração forem enviados para o ramo, as aprovações antigas serão descartadas. settings.require_signed_commits=Exigir cometimentos assinados settings.require_signed_commits_desc=Rejeitar envios para este ramo que não estejam assinados ou que não sejam validáveis. -settings.protect_protected_file_patterns=Padrões de ficheiros protegidos (separados com ponto e vírgula ';'): -settings.protect_protected_file_patterns_desc=Ficheiros protegidos que não podem ser modificados, 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 se o utilizador tiver direitos de escrita, contornando a restrição no envio. 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_protected_file_patterns=Padrões de ficheiros protegidos (separados com ponto e vírgula ' ;'): +settings.protect_protected_file_patterns_desc=Não é permitido alterar imediatamente ficheiros protegidos, mesmo que o utilizador tenha autorização para adicionar, editar ou eliminar ficheiros neste ramo. Podem ser usados múltiplos padrões separados por ponto e vírgula (' ;'). See github.com/gobwas/glob documentation for pattern syntax. Examples: .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 é permitido alterar imediatamente se o utilizador tiver permissão de escrita, passando ao lado da restrição no envio. Podem ser usados múltiplos padrões separados por ponto e vírgula (' ;'). See github.com/gobwas/glob documentation for pattern syntax. Examples: .drone.yml, /docs/**/*.txt. settings.add_protected_branch=Habilitar salvaguarda settings.delete_protected_branch=Desabilitar salvaguarda settings.update_protect_branch_success=A salvaguarda do ramo '%s' foi modificada. @@ -2374,7 +2374,7 @@ teams.remove_all_repos_title=Remover todos os repositórios da equipa teams.remove_all_repos_desc=Isto irá remover todos os repositórios da equipa. 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 à equipa. -teams.add_nonexistent_repo=O repositório que está a tentar adicionar não existe; por favor, crie-o primeiro. +teams.add_nonexistent_repo=O repositório que está a tentar adicionar não existe, por favor crie-o primeiro. teams.add_duplicate_users=O utilizador já é um membro da equipa. teams.repos.none=Não há repositórios que possam ser acedidos por esta equipa. teams.members.none=Não há membros nesta equipa. @@ -2404,7 +2404,7 @@ monitor=Monitorização first_page=Primeira last_page=Última total=total: %d -dashboard.new_version_hint=O Gitea %s está agora disponível, você está a correr a versão %s. Verifique o blog para mais detalhes. +dashboard.new_version_hint=O Gitea %s está disponível, você está a correr a versão %s. Verifique o blog para mais detalhes. dashboard.statistic=Resumo dashboard.operations=Operações de manutenção dashboard.system_status=Estado do sistema @@ -2519,7 +2519,7 @@ users.still_own_repo=Este utilizador ainda possui um ou mais repositórios. Elim users.still_has_org=Este utilizador é membro de uma organização. Remova, primeiro, o utilizador de todas as organizações. users.purge=Eliminar utilizador users.purge_help=Eliminar o utilizador à força, juntamente com todos os seus repositórios, organizações e pacotes. Também serão eliminados todos os seus comentários. -users.still_own_packages=Este utilizador ainda possui um ou mais pacotes. Elimine esses pacotes primeiro. +users.still_own_packages=Este utilizador ainda possui um ou mais pacotes, elimine esses pacotes primeiro. users.deletion_success=A conta de utilizador foi eliminada. users.reset_2fa=Reinicializar a autenticação em dois passos users.list_status_filter.menu_text=Filtro @@ -3018,7 +3018,7 @@ error.unit_not_allowed=Não tem permissão para aceder a esta parte do repositó title=Pacotes desc=Gerir pacotes do repositório. empty=Ainda não há pacotes. -empty.documentation=Para obter mais informação sobre o registo de pacotes, veja a documentação. +empty.documentation=Para obter mais informação sobre o registo de pacotes, veja a documentação. empty.repo=Carregou um pacote mas este não é apresentado aqui? Vá às configurações do pacote e ligue-o a este repositório. filter.type=Tipo filter.type.all=Todos diff --git a/options/locale/locale_si-LK.ini b/options/locale/locale_si-LK.ini index 350aa51dcd3b..74dfdb703f10 100644 --- a/options/locale/locale_si-LK.ini +++ b/options/locale/locale_si-LK.ini @@ -767,7 +767,7 @@ delete_preexisting_content=%sහි ගොනු මකන්න delete_preexisting_success=%sදී සම්මත නොකළ ගොනු මකාදැමුවා blame_prior=මෙම වෙනසට පෙර දොස් බලන්න transfer.accept=මාරු කිරීම පිළිගන්න -transfer.accept_desc=`"%s" වෙත මාරු කරන්න` +transfer.accept_desc="%s" වෙත මාරු කරන්න transfer.reject_desc=" desc.private=පෞද්ගලික desc.public=ප්‍රසිද්ධ @@ -1096,7 +1096,7 @@ issues.context.delete=මකන්න issues.no_content=තවම අන්තර්ගතයක් නැත. issues.close_issue=වසන්න issues.pull_merged_at=ඒකාබද්ධ කැප %[2]ගේ %[3]ගේ %[4]දින -issues.manually_pull_merged_at=`ඒකාබද්ධ කැප %[2]ගේ %[3]ගේ අත්පොත%[4]s` +issues.manually_pull_merged_at=ඒකාබද්ධ කැප %[2]ගේ %[3]ගේ අත්පොත%[4]s issues.close_comment_issue=අදහස් දක්වා වසන්න issues.reopen_issue=නැවත විවෘත කරන්න issues.reopen_comment_issue=අදහස් දක්වා විවෘත කරන්න @@ -1337,7 +1337,7 @@ pulls.rebase_conflict_summary=දෝෂ පණිවිඩය pulls.unrelated_histories=ඒකාබද්ධ කිරීම අසමත් විය: ඒකාබද්ධ හිස සහ පාදය පොදු ඉතිහාසයක් බෙදා නොගනී. ඉඟිය: වෙනත් උපාය මාර්ගයක් උත්සාහ කරන්න pulls.merge_out_of_date=ඒකාබද්ධ කිරීම අසමත් විය: ඒකාබද්ධ කිරීම ජනනය කරන අතර, පදනම යාවත්කාලීන කරන ලදී. ඉඟිය: නැවත උත්සාහ කරන්න. pulls.push_rejected_summary=පූර්ණ ප්රතික්ෂේප පණිවිඩය -pulls.open_unmerged_pull_exists=සමාන ගුණාංග සහිත අදින්න ඉල්ලීමක් (#%d) ඇති බැවින් ඔබට නැවත විවෘත කිරීමේ මෙහෙයුමක් කළ නොහැක. +pulls.open_unmerged_pull_exists="""සමාන ගුණාංග සහිත අදින්න ඉල්ලීමක් (#%d) ඇති බැවින් ඔබට නැවත විවෘත කිරීමේ මෙහෙයුමක් කළ නොහැක. `""" pulls.status_checking=සමහර චෙක්පත් බලා ඇත pulls.status_checks_success=සියලුම චෙක්පත් සාර්ථක විය pulls.status_checks_warning=සමහර චෙක්පත් අනතුරු ඇඟවීම් වාර්තා කරයි diff --git a/options/locale/locale_sv-SE.ini b/options/locale/locale_sv-SE.ini index b5d8eef400ac..f6053e5b7c2c 100644 --- a/options/locale/locale_sv-SE.ini +++ b/options/locale/locale_sv-SE.ini @@ -311,8 +311,8 @@ 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 ('.')." -git_ref_name_error= ` måste vara ett för Git välformaterat referensnamn.` -size_error=` måste vara av storleken %s` +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." max_size_error=" får inte innehålla mer än %s tecken." email_error=" är inte en giltlig epostaddress." diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini index 87fdf1287e67..9fdc4cd21612 100644 --- a/options/locale/locale_tr-TR.ini +++ b/options/locale/locale_tr-TR.ini @@ -245,15 +245,15 @@ view_home=%s Görüntüle search_repos=Depo bul… filter=Diğer Süzgeçler filter_by_team_repositories=Takım depolarına göre süz -feed_of=`"%s" beslemesi` +feed_of="%s" beslemesi show_archived=Arşivlenmiş -show_both_archived_unarchived=Arşivlenenler ve arşivlenmeyenlerin hepsi gösteriliyor +show_both_archived_unarchived=Arşivlenenlerin ve arşivlenmeyenlerin tümü gösteriliyor show_only_archived=Yalnızca arşivlenenler gösteriliyor show_only_unarchived=Yalnızca arşivlenmeyenler gösteriliyor show_private=Özel -show_both_private_public=Hem genel hem de özel gösteriliyor -show_only_private=Yalnızca özel gösteriliyor -show_only_public=Yalnızca genel gösteriliyor +show_both_private_public=Hem açık hem de özel olanlar gösteriliyor +show_only_private=Yalnızca özel olanlar gösteriliyor +show_only_public=Yalnızca açık olanlar gösteriliyor issues.in_your_repos=Depolarınızda [explore] @@ -865,7 +865,7 @@ delete_preexisting_content=%s içindeki dosyaları sil delete_preexisting_success=%s içindeki kabul edilmeyen dosyalar silindi blame_prior=Bu değişiklikten önceki suçu görüntüle transfer.accept=Aktarımı Kabul Et -transfer.accept_desc=`"%s" tarafına aktar` +transfer.accept_desc="%s" tarafına aktar transfer.reject=Aktarımı Reddet transfer.reject_desc=" transfer.no_permission_to_accept=Kabul Etme iznine sahip değilsiniz @@ -1203,7 +1203,7 @@ issues.add_milestone_at=%[2]s %[1]s kilometre taşına ekledi issues.add_project_at=bunu %s projesine %s ekledi issues.change_milestone_at=%s kilometre taşını %s iken %s olarak değiştirdi issues.change_project_at=%s %s olan projeyi %s olarak değiştirdi -issues.remove_milestone_at=`%[2]s %[1]s kilometre taşından kaldırdı` +issues.remove_milestone_at=%[2]s %[1]s kilometre taşından kaldırdı issues.remove_project_at=bunu %s projesinden %s kaldırdı issues.deleted_milestone=(silindi) issues.deleted_project=(silindi) @@ -1704,7 +1704,7 @@ search.fuzzy=Belirsiz search.fuzzy.tooltip=Arama terimine benzeyen sonuçları da içer search.match=Eşleştir search.match.tooltip=Sadece arama terimiyle tamamen eşleşen sonuçları içer -search.results=`"%s" için %s içinde sonuçları ara` +search.results="%s" için %s içinde sonuçları ara search.code_no_results=Arama teriminizle eşleşen bir kaynak kod bulunamadı. search.code_search_unavailable=Kod arama şu an mevcut değil. Lütfen site yöneticinizle bağlantıya geçin. settings=Ayarlar diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 247f72cfbd60..e286c478254b 100644 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -19,7 +19,7 @@ active_stopwatch=活动时间跟踪器 create_new=创建… user_profile_and_more=个人信息和配置 signed_in_as=已登录用户 -enable_javascript=使用 JavaScript 能使本网站更好的工作。 +enable_javascript=此网站需要 JavaScript。 toc=目录 licenses=许可证 return_to_gitea=返回 Gitea @@ -197,7 +197,7 @@ openid_signup_popup=启用基于 OpenID 的用户自助注册。 enable_captcha=启用注册验证码 enable_captcha_popup=要求在用户注册时输入预验证码 require_sign_in_view=启用页面访问限制 -require_sign_in_view_popup=只有登录用户的才有页面访问权限。游客只会看到 "登录" 和注册页面 +require_sign_in_view_popup=仅允许已登录用户访问页面。访客只能看到注册和登录页。 admin_setting_desc=创建管理员帐户是可选的。第一个注册用户将自动成为管理员。 admin_title=管理员帐号设置 admin_name=管理员用户名 @@ -227,7 +227,7 @@ default_enable_timetracking_popup=默认情况下启用新仓库的时间跟踪 no_reply_address=隐藏电子邮件 no_reply_address_helper=具有隐藏电子邮件地址的用户的域名。例如, 用户名 "joe" 将以 "joe@noreply.example.org" 的身份登录到 Git 中. 如果隐藏的电子邮件域设置为 "noreply.example.org"。 password_algorithm=密码哈希算法 -password_algorithm_helper="""设置密码哈希算法。 算法具有不同的要求和强度。 具有良好特性的`argon2`却会占用大量内存，可能不适用于小型系统。""" +password_algorithm_helper=设置密码散列算法。算法有不同的要求和强度。 argon2 算法相当安全，但使用大量内存，因此可能不适合小型系统。 enable_update_checker=启用更新检查 enable_update_checker_helper=通过连接到 gitea.io 定期检查新版本发布。 invalid_password_algorithm=无效的密码哈希算法 @@ -476,13 +476,13 @@ duplicate_invite_to_team=此用户已被邀请为团队成员。 invalid_ssh_key=无法验证您的 SSH 密钥: %s invalid_gpg_key=无法验证您的 GPG 密钥: %s invalid_ssh_principal=无效的规则： %s -unable_verify_ssh_key=无法验证SSH密钥，再次检查是否有误。 +unable_verify_ssh_key=无法验证 SSH 密钥，请仔细检查是否有错误。 auth_failed=授权验证失败：%v still_own_repo=此帐户仍拥有至少一个仓库，您需要先删除或转移它们。 -still_has_org=此帐户仍隶属于一个或多个组织，您需要退出他们。 -still_own_packages=您的账户拥有一个或多个软件包；请先删除它们。 -org_still_own_repo=该组织仍然是某些仓库的拥有者，您必须先转移或删除它们才能执行删除组织操作！ -org_still_own_packages=该组织仍然是一个或多个软件包的拥有者，您必须先删除它们。 +still_has_org=此帐户隶属于一个或多个组织，请先退出这些组织。 +still_own_packages=您的账户拥有一个或多个软件包，请先删除它们。 +org_still_own_repo=该组织仍然是某些仓库的拥有者，请先删除或转移它们！ +org_still_own_packages=该组织仍然是一个或多个软件包的拥有者，请先删除它们。 target_branch_not_exist=目标分支不存在。 username_error=" 只能包含字母数字字符('0-9','a-z','A-Z'), 破折号 ('-'), 下划线 ('_') 和点 ('.'). 不能以非字母数字字符开头或结尾，并且不允许连续的非字母数字字符。" invalid_group_team_map_error=映射无效： %s @@ -926,7 +926,7 @@ migrate.github_token_desc=由于 GitHub API 速率限制，您可以在此处放 migrate.clone_local_path=或服务器本地路径 migrate.permission_denied=您没有获得导入本地仓库的权限。 migrate.permission_denied_blocked=您不能从不允许的主机导入，请询问管理员以检查 ALLOWED_DOMAINS/ALLOW_LOCALNETWORKS/BLOCKED_DOMAINS 设置。 -migrate.invalid_local_path=无效的本地路径，不存在或不是一个目录！ +migrate.invalid_local_path=本地路径无效。它不存在或不是一个目录。 migrate.invalid_lfs_endpoint=LFS 网址无效。 migrate.failed=迁移失败：%v migrate.migrate_items_options=需要访问令牌来迁移额外的内容 @@ -1098,7 +1098,7 @@ commits.commits=次代码提交 commits.no_commits=没有共同的提交。'%s' 和 '%s' 的历史完全不同。 commits.nothing_to_compare=这些分支是相同的。 commits.search=搜索提交历史 -commits.search.tooltip=可以指定前缀关键词 "author:"、"committer:"、"after:"、"before:"，例如 "revert author:Alice before:2019-04-01"。 +commits.search.tooltip=您可以在关键词前加上前缀，如"author:", "committer:", "after:", 或"before:", 例如 "retrin author:Alice before:2019-01-13" commits.find=搜索 commits.search_all=所有分支 commits.author=作者 @@ -1211,7 +1211,7 @@ issues.add_milestone_at=于 %[2]s 添加了里程碑 %[1]s issues.add_project_at=将此添加到 %s 项目 %s issues.change_milestone_at=%[3]s 修改了里程碑从 %[1]s 到 %[2]s issues.change_project_at=修改项目从 %s 到 %s %s -issues.remove_milestone_at=`%[2]s 删除了里程碑 %[1]s` +issues.remove_milestone_at=%[2]s 删除了里程碑 %[1]s issues.remove_project_at=从 %s 项目 %s 中删除 issues.deleted_milestone=（已删除） issues.deleted_project=(已删除) @@ -1824,7 +1824,7 @@ settings.trust_model.collaborator.long=协作者：信任协作者的签名 settings.trust_model.collaborator.desc=此仓库中协作者的有效签名将被标记为「可信」(无论它们是否是提交者)，签名只符合提交者时将标记为「不可信」，都不匹配时标记为「不匹配」。 settings.trust_model.committer=提交者 settings.trust_model.committer.long=提交者： 信任与提交者相符的签名 (此特性类似 GitHub，这会强制采用 Gitea 作为提交者和签名者) -settings.trust_model.committer.desc=提交者的有效签名将被标记为「可信」，否则将被标记为「不匹配」。这会强制 Gitea 成为签名者和提交者，实际的提交者将被标记于提交消息结尾处的「Co-Authored-By:」和「Co-Committed-By:」。默认的 Gitea 签名密钥必须匹配数据库中的一个用户密钥。 +settings.trust_model.committer.desc=有效签名只有和提交者相匹配才会被标记为“受信任”，否则它们将被标记为“不匹配”。这强制 Gitea 成为签名提交的提交者，而实际提交者被加上 Co-authored-by: 和 Co-committed-by: 的标记。 默认的 Gitea 密钥必须撇撇数据库种的一名用户。 settings.trust_model.collaboratorcommitter=协作者+提交者 settings.trust_model.collaboratorcommitter.long=协作者+提交者：信任协作者同时是提交者的签名 settings.trust_model.collaboratorcommitter.desc=此仓库中协作者的有效签名在他同时是提交者时将被标记为「可信」，签名只匹配了提交者时将标记为「不可信」，都不匹配时标记为「不匹配」。这会强制 Gitea 成为签名者和提交者，实际的提交者将被标记于提交消息结尾处的「Co-Authored-By:」和「Co-Committed-By:」。默认的 Gitea 签名密钥必须匹配数据库中的一个用户密钥。 @@ -2019,10 +2019,10 @@ settings.dismiss_stale_approvals=取消过时的批准 settings.dismiss_stale_approvals_desc=当新的提交更改合并请求内容被推送到分支时，旧的批准将被撤销。 settings.require_signed_commits=需要签名提交 settings.require_signed_commits_desc=拒绝推送未签名或无法验证的提交到分支 -settings.protect_protected_file_patterns=受保护的文件模式(使用分号分隔) -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=允许有写入权限的用户进行直接更改的不受保护的文件，可以绕过推送限制。可用分号 (';') 分隔多个模式。模式语法参见 github.com/gobwas/glob文档。示例：.drone.yml,/docs/**/*.txt。 +settings.protect_protected_file_patterns=受保护的文件模式(使用分号分隔 ' ;'): +settings.protect_protected_file_patterns_desc=即使用户有权添加、编辑或删除此分支中的文件，也不允许直接更改受保护的文件。 可以使用分号分隔多个模式(' ;'). See github.com/gobwas/glob documentation for pattern syntax. Examples: .drone.yml, /docs/**/*.txt. +settings.protect_unprotected_file_patterns=不受保护的文件模式 (使用分号分隔 ' ;'): +settings.protect_unprotected_file_patterns_desc=如果用户有写入权限，则允许直接更改的不受保护的文件，以绕过推送限制。可以使用分号分隔多重模式 (' ;'). See github.com/gobwas/glob documentation for pattern syntax. Examples: .drone.yml, /docs/**/*.txt. settings.add_protected_branch=启用保护 settings.delete_protected_branch=禁用保护 settings.update_protect_branch_success=分支 "%s" 的分支保护已更新。 @@ -2374,7 +2374,7 @@ teams.remove_all_repos_title=移除所有团队仓库 teams.remove_all_repos_desc=这将从团队中移除所有仓库。 teams.add_all_repos_title=添加所有仓库 teams.add_all_repos_desc=这将把组织的所有仓库添加到团队。 -teams.add_nonexistent_repo=您尝试添加到团队的仓库不存在，请先创建仓库！ +teams.add_nonexistent_repo=您尝试添加的仓库不存在，请先创建它。 teams.add_duplicate_users=用户已经是团队成员。 teams.repos.none=此团队无法访问任何仓库。 teams.members.none=团队中没有成员。 @@ -2404,7 +2404,7 @@ monitor=监控面板 first_page=首页 last_page=末页 total=总计：%d -dashboard.new_version_hint=Gitea %s 现已可用，您正在运行 %s。查看 博客 了解更多详情。 +dashboard.new_version_hint=Gitea %s 现已可用，您正在运行 %s。查看 博客 了解详情。 dashboard.statistic=摘要 dashboard.operations=维护操作 dashboard.system_status=系统状态 @@ -2519,7 +2519,7 @@ users.still_own_repo=此用户仍然拥有一个或多个仓库。必须首先 users.still_has_org=此用户是组织的成员。必须先从组织中删除用户。 users.purge=清理用户 users.purge_help=强制删除用户和用户拥有的任何仓库、组织和软件包。所有评论也将被删除。 -users.still_own_packages=此用户仍然拥有一个或多个软件包。请先删除这些软件包。 +users.still_own_packages=此用户仍然拥有一个或多个软件包，请先删除这些软件包。 users.deletion_success=用户帐户已被删除。 users.reset_2fa=重置两步验证 users.list_status_filter.menu_text=过滤 @@ -2918,6 +2918,10 @@ packages.unreferenced_size=未引用大小： %s auths.oauth2_map_group_to_team=映射声明的组到组织团队。（可选 - 要求在上面填写声明的名字） auths.oauth2_map_group_to_team_removal=如果用户不属于相应的组，从已同步团队中移除用户 notices.operations=操作 +auths.unable_to_initialize_openid=无法初始化 OpenID Connect 提供商： %s +auths.invalid_openIdConnectAutoDiscoveryURL=无效的 Auto Discovery URL (这必须是一个以 http:// 或 https://开头的有效的 URL) +config.git_enable_reflogs=启用 Reflog +config.git_reflog_expiry_time=过期时间 [action] create_repo=创建了仓库 %s diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini index e0c507d30049..e6f84c6e6e2f 100644 --- a/options/locale/locale_zh-TW.ini +++ b/options/locale/locale_zh-TW.ini @@ -19,7 +19,7 @@ active_stopwatch=進行中的時間追蹤 create_new=建立... user_profile_and_more=個人資料和設定... signed_in_as=已登入 -enable_javascript=本網站在啟用 JavaScript 的情況下可以運作的更好。 +enable_javascript=本網站需要 JavaScript。 toc=目錄 licenses=授權條款 return_to_gitea=返回 Gitea @@ -227,7 +227,7 @@ default_enable_timetracking_popup=預設情況下啟用新存儲庫的時間跟 no_reply_address=隱藏電子信箱域名 no_reply_address_helper=作為隱藏電子信箱使用者的域名。例如，如果隱藏的電子信箱域名設定為「noreply.example.org」，帳號「joe」將以「joe@noreply.example.org」的身分登錄到 Git 中。 password_algorithm=密碼雜湊演算法 -password_algorithm_helper=設定密碼雜湊演算法。演算法有不同的需求和強度。「argon2」雖然有優秀的特性但會占用大量記憶體，所以可能不適用於小型系統。 +password_algorithm_helper=設定密碼雜湊演算法。演算法有不同的需求與強度。argon2 演算法雖然較安全但會使用大量記憶體，可能不適用於小型系統。 invalid_password_algorithm=無效的密碼雜湊演算法 enable_update_checker=啟用更新檢查器 enable_update_checker_helper=定期連線到 gitea.io 檢查更新。 @@ -435,8 +435,8 @@ min_size_error=" 長度最小為 %s 個字元。" max_size_error=" 長度最大為 %s 個字元。" email_error=" 是無效的電子信箱。" url_error='%s' 是無效的 URL。 -include_error=` 必須包含子字串「%s」。` -glob_pattern_error=` glob 比對模式無效：%s.` +include_error=" 必須包含子字串「%s」。" +glob_pattern_error=" glob 比對模式無效：%s." regex_pattern_error=" 正規表示式模式無效：%s." unknown_error=未知錯誤： captcha_incorrect=驗證碼不正確。 @@ -475,7 +475,7 @@ cannot_add_org_to_team=組織不能被新增為團隊成員。 invalid_ssh_key=無法驗證您的 SSH 密鑰：%s invalid_gpg_key=無法驗證您的 GPG 密鑰：%s invalid_ssh_principal=無效的主體: %s -unable_verify_ssh_key=無法驗證 SSH 密鑰; 請再次檢查是否有錯誤。 +unable_verify_ssh_key=無法驗證 SSH 金鑰，請再次檢查以避免錯誤。 auth_failed=授權認證失敗：%v still_own_repo=您的帳戶擁有一個以上的儲存庫，請先刪除或轉移它們。 still_has_org=您的帳戶是一個或多個組織的成員，請先離開它們。 @@ -926,7 +926,7 @@ migrate.github_token_desc=由於 GitHub API 的速率限制，您可在此輸入 migrate.clone_local_path=或者是本地端伺服器路徑 migrate.permission_denied=您並沒有導入本地儲存庫的權限。 migrate.permission_denied_blocked=您無法從未允許的主機匯入，請聯絡管理員檢查以下設定值 ALLOWED_DOMAINS/ALLOW_LOCALNETWORKS/BLOCKED_DOMAINS -migrate.invalid_local_path=無效的本地路徑，該路徑不存在或不是一個目錄！ +migrate.invalid_local_path=無效的本地路徑，該路徑不存在或不是一個目錄。 migrate.invalid_lfs_endpoint=該 LFS 端點無效。 migrate.failed=遷移失敗：%v migrate.migrate_items_options=遷移其他項目需要 Access Token。 @@ -1098,7 +1098,7 @@ commits.commits=次程式碼提交 commits.no_commits=沒有共同的提交。「%s」和「%s」的歷史完全不同。 commits.nothing_to_compare=這些分支是相同的。 commits.search=搜尋提交歷史... -commits.search.tooltip=你可以用「author:」、「committer:」、「after:」、「before:」等作為關鍵字的前綴，例如: 「revert author:Alice before:2019-04-01」。 +commits.search.tooltip=你可以用「author:」、「committer:」、「after:」、「before:」等作為關鍵字的前綴，例如: 「revert author:Alice before:2019-01-13」。 commits.find=搜尋 commits.search_all=所有分支 commits.author=作者 @@ -2372,7 +2372,7 @@ teams.remove_all_repos_title=移除所有團隊儲存庫 teams.remove_all_repos_desc=這將從團隊中移除所有儲存庫。 teams.add_all_repos_title=增加所有儲存庫 teams.add_all_repos_desc=這將把組織的所有儲存庫增加到團隊。 -teams.add_nonexistent_repo=您嘗試新增到團隊的儲存庫不存在，請先建立儲存庫！ +teams.add_nonexistent_repo=您嘗試新增的儲存庫不存在，請先建立它。 teams.add_duplicate_users=使用者已經是團隊成員了。 teams.repos.none=這個團隊沒有可以存取的儲存庫。 teams.members.none=這個團隊沒有任何成員。 @@ -2404,7 +2404,7 @@ monitor=應用監控面版 first_page=首頁 last_page=末頁 total=總計：%d -dashboard.new_version_hint=現已推出 Gitea %s，您正在執行 %s。查看部落格以獲得更多資訊。 +dashboard.new_version_hint=現已推出 Gitea %s，您正在執行 %s。詳情請參閱部落格的說明。 dashboard.statistic=摘要 dashboard.operations=維護作業 dashboard.system_status=系統狀態 @@ -3018,7 +3018,7 @@ error.unit_not_allowed=您未被允許訪問此儲存庫區域 title=套件 desc=管理儲存庫套件。 empty=目前還沒有套件。 -empty.documentation=關於套件註冊中心的詳情請參閱說明文件。 +empty.documentation=關於套件註冊中心的詳情請參閱說明文件。 empty.repo=已經上傳了一個套件，但是沒有顯示在這裡嗎？打開套件設定並將其連結到這個儲存庫。 filter.type=類型 filter.type.all=所有 From 863da7d5a1ce8d2dcfbe38ec718ee00fe2ccdb64 Mon Sep 17 00:00:00 2001 From: sillyguodong <33891828+sillyguodong@users.noreply.github.com> Date: Thu, 30 Mar 2023 17:15:50 +0800 Subject: [PATCH 147/340] Fix cancel button in the page of project edit not work (#23655) (#23813) Backport #23655 Before, in project edit page, the cancel button is not work. https://user-images.githubusercontent.com/33891828/227182731-6478e29f-0e52-48c4-beb0-6a7d1dda6a1d.mov 1. The wrong classname `cancel` was added to the `` tag. That classname caused the default click event of `` tag to be cancelled. Because we have the following settings in the global. So I remove the classname `cancel`. https://github.com/go-gitea/gitea/blob/9be90a58754061171bbd5025d85d2b891364efd3/web_src/js/features/common-global.js#L325-L327 2. Another change is that page will redirect to the previous page. https://user-images.githubusercontent.com/33891828/227187326-c653c6d6-9715-440f-a732-ba0a6f012c81.mov --- routers/web/org/projects.go | 2 ++ routers/web/repo/projects.go | 1 + templates/projects/new.tmpl | 2 +- templates/repo/projects/new.tmpl | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go index c9d63fec5df0..080388f01f8c 100644 --- a/routers/web/org/projects.go +++ b/routers/web/org/projects.go @@ -232,9 +232,11 @@ func EditProject(ctx *context.Context) { return } + ctx.Data["projectID"] = p.ID ctx.Data["title"] = p.Title ctx.Data["content"] = p.Description ctx.Data["redirect"] = ctx.FormString("redirect") + ctx.Data["HomeLink"] = ctx.ContextUser.HomeLink() ctx.HTML(http.StatusOK, tplProjectsNew) } diff --git a/routers/web/repo/projects.go b/routers/web/repo/projects.go index e15f548a38dc..91e17dee295f 100644 --- a/routers/web/repo/projects.go +++ b/routers/web/repo/projects.go @@ -232,6 +232,7 @@ func EditProject(ctx *context.Context) { return } + ctx.Data["projectID"] = p.ID ctx.Data["title"] = p.Title ctx.Data["content"] = p.Description ctx.Data["card_type"] = p.CardType diff --git a/templates/projects/new.tmpl b/templates/projects/new.tmpl index 85ceddec6055..1314884da6a0 100644 --- a/templates/projects/new.tmpl +++ b/templates/projects/new.tmpl @@ -48,7 +48,7 @@
    {{if .PageIsEditProjects}} - + {{.locale.Tr "repo.milestones.cancel"}}
    -{{if .OnlyShowRelevant}} +{{if and .PageIsExploreRepositories .OnlyShowRelevant}}
    - {{.locale.Tr "explore.relevant_repositories" ((printf "%s%s" $.Link "?no_filter=1")|Escape) | Safe}} + {{.locale.Tr "explore.relevant_repositories" ((printf "%s%s" $.Link "?only_show_relevant=0")|Escape) | Safe}}
    {{end}}
    From a1460333dc064c99efc71f4969b3061fcb107797 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Fri, 31 Mar 2023 12:15:51 +0800 Subject: [PATCH 149/340] Fix "Updating branch by merge" bug in "update_branch_by_merge.tmpl" (#23790) (#23825) Backport #23790 Fix regression of #22683 Pass all variables into sub-template. Close #23787 --- templates/repo/issue/view_content/pull.tmpl | 5 ++--- .../view_content/update_branch_by_merge.tmpl | 19 +++++++++---------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index f0bf23c9e95f..81f9041f2ac6 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -128,7 +128,6 @@ {{- else}}red{{end}}">{{svg "octicon-git-merge" 32}}
    {{template "repo/pulls/status" .}} - {{$canAutoMerge := false}} {{$showGeneralMergeForm := false}}
    {{if .Issue.PullRequest.HasMerged}} @@ -193,7 +192,7 @@ {{end}}
    - {{template "repo/issue/view_content/update_branch_by_merge" (dict "locale" .locale "Issue" .Issue "UpdateAllowed" .UpdateAllowed "UpdateByRebaseAllowed" .UpdateByRebaseAllowed "Link" .Link)}} + {{template "repo/issue/view_content/update_branch_by_merge" $}} {{else if .Issue.PullRequest.IsChecking}}
    {{svg "octicon-sync"}} @@ -286,7 +285,7 @@
    {{end}} {{end}} - {{template "repo/issue/view_content/update_branch_by_merge" (dict "locale" .locale "Issue" .Issue "UpdateAllowed" .UpdateAllowed "UpdateByRebaseAllowed" .UpdateByRebaseAllowed "Link" .Link)}} + {{template "repo/issue/view_content/update_branch_by_merge" $}} {{if .Issue.PullRequest.IsEmpty}}
    diff --git a/templates/repo/issue/view_content/update_branch_by_merge.tmpl b/templates/repo/issue/view_content/update_branch_by_merge.tmpl index 6d36a9b45f38..84df244d8def 100644 --- a/templates/repo/issue/view_content/update_branch_by_merge.tmpl +++ b/templates/repo/issue/view_content/update_branch_by_merge.tmpl @@ -1,5 +1,4 @@ -{{$canAutoMerge := false}} -{{if and (gt .Issue.PullRequest.CommitsBehind 0) (not .Issue.IsClosed) (not .Issue.PullRequest.IsChecking) (not .IsPullFilesConflicted) (not .IsPullRequestBroken) (not $canAutoMerge)}} +{{if and (gt $.Issue.PullRequest.CommitsBehind 0) (not $.Issue.IsClosed) (not $.Issue.PullRequest.IsChecking) (not $.IsPullFilesConflicted) (not $.IsPullRequestBroken)}}
    @@ -7,10 +6,10 @@ {{$.locale.Tr "repo.pulls.outdated_with_base_branch"}}
    - {{if and .UpdateAllowed .UpdateByRebaseAllowed}} + {{if and $.UpdateAllowed $.UpdateByRebaseAllowed}}
    -
    {{end}} - {{if and .UpdateAllowed (not .UpdateByRebaseAllowed)}} -
    - {{.CsrfTokenHtml}} -
    From a04535e212b04c0f6643a4f36904a3d1bf30c63f Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 31 Mar 2023 02:29:23 -0400 Subject: [PATCH 150/340] [Patch] Fix closed PR also triggers Webhooks and actions (#23782) (#23834) Backport #23782 by @sillyguodong Fix #23707 Cause by #23189 This PR is a quick fix that, when pushing commits to closed PR, webhook and actions also be triggered. Co-authored-by: sillyguodong <33891828+sillyguodong@users.noreply.github.com> --- services/pull/pull.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/pull/pull.go b/services/pull/pull.go index a5541b84606b..73d7c571484c 100644 --- a/services/pull/pull.go +++ b/services/pull/pull.go @@ -294,6 +294,10 @@ func AddTestPullRequestTask(doer *user_model.User, repoID int64, branch string, } if err == nil { for _, pr := range prs { + if pr.Issue.IsClosed { + // The closed PR never trigger action or webhook + continue + } if newCommitID != "" && newCommitID != git.EmptySHA { changed, err := checkIfPRContentChanged(ctx, pr, oldCommitID, newCommitID) if err != nil { From 8b3dd7de5dac3eb621b3dc3a0e2cf22cd8e840d8 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 31 Mar 2023 04:25:21 -0400 Subject: [PATCH 151/340] Fix incorrect visibility dropdown list in add/edit user page (#23804) (#23833) Backport #23804 by @yp05327 Visibility dropdown list will not work in add/edit user page when error occurred Co-authored-by: yp05327 <576951401@qq.com> --- routers/web/admin/users.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/routers/web/admin/users.go b/routers/web/admin/users.go index 1bb9d0480682..5fb2a3e5d6ec 100644 --- a/routers/web/admin/users.go +++ b/routers/web/admin/users.go @@ -105,6 +105,7 @@ func NewUserPost(ctx *context.Context) { ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminUsers"] = true ctx.Data["DefaultUserVisibilityMode"] = setting.Service.DefaultUserVisibilityMode + ctx.Data["AllowedUserVisibilityModes"] = setting.Service.AllowedUserVisibilityModesSlice.ToVisibleTypeSlice() sources, err := auth.Sources() if err != nil { @@ -273,6 +274,7 @@ func EditUserPost(ctx *context.Context) { ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminUsers"] = true ctx.Data["DisableMigrations"] = setting.Repository.DisableMigrations + ctx.Data["AllowedUserVisibilityModes"] = setting.Service.AllowedUserVisibilityModesSlice.ToVisibleTypeSlice() u := prepareUserInfo(ctx) if ctx.Written() { From 503af4b807017c200999de91c155c70ebfa40b8b Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 31 Mar 2023 05:24:09 -0400 Subject: [PATCH 152/340] CSS color tweaks (#23828) (#23842) Backport #23828 by @silverwind Change grey shades in arc-green to match the theme more: Screenshot 2023-03-30 at 21 42 34 Adjusted grey shade in light theme: image Increase contrast in arc-green, change background to slightly darker shade, change forgeground to slightly brighter colors: Screenshot 2023-03-30 at 22 33 20 Increase contrast of grey text in light theme as well by making them darker: Screenshot 2023-03-30 at 22 33 35 Add color rule for border multiple select items: Screenshot 2023-03-30 at 22 29 31 Screenshot 2023-03-30 at 22 29 46 Added color rule for red `*` on required form fields: image Co-authored-by: silverwind --- web_src/css/base.css | 8 ++++++-- web_src/css/form.css | 9 +++++++++ web_src/css/themes/theme-arc-green.css | 24 ++++++++++++------------ 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/web_src/css/base.css b/web_src/css/base.css index 5c791339f359..15e93490a8dd 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -78,7 +78,6 @@ --color-purple: #a333c8; --color-pink: #e03997; --color-brown: #a5673f; - --color-grey: #888888; --color-black: #1b1c1d; /* light variants - produced via Sass scale-color(color, $lightness: +25%) */ --color-red-light: #e45e5e; @@ -92,9 +91,10 @@ --color-purple-light: #bb64d8; --color-pink-light: #e86bb1; --color-brown-light: #c58b66; - --color-grey-light: #a6a6a6; --color-black-light: #525558; /* other colors */ + --color-grey: #707070; + --color-grey-light: #838383; --color-gold: #a1882b; --color-white: #ffffff; --color-diff-removed-word-bg: #fdb8c0; @@ -2665,6 +2665,10 @@ table th[data-sortt-desc] .svg { border-radius: 0 0 var(--border-radius) var(--border-radius); } +.ui.multiple.dropdown > .label { + box-shadow: 0 0 0 1px var(--color-secondary) inset; +} + .text-label { display: inline-flex !important; align-items: center !important; diff --git a/web_src/css/form.css b/web_src/css/form.css index e325a377f8d8..76422a12dab1 100644 --- a/web_src/css/form.css +++ b/web_src/css/form.css @@ -94,6 +94,15 @@ textarea:focus, color: var(--color-text); } +.ui.form .required.fields:not(.grouped) > .field > label::after, +.ui.form .required.fields.grouped > label::after, +.ui.form .required.field > label::after, +.ui.form .required.fields:not(.grouped) > .field > .checkbox::after, +.ui.form .required.field > .checkbox::after, +.ui.form label.required::after { + color: var(--color-red); +} + .ui.input, .ui.checkbox input:focus ~ label::after, .ui.checkbox input:checked ~ label::after, diff --git a/web_src/css/themes/theme-arc-green.css b/web_src/css/themes/theme-arc-green.css index e2216085a907..5e47f8ee3eec 100644 --- a/web_src/css/themes/theme-arc-green.css +++ b/web_src/css/themes/theme-arc-green.css @@ -68,8 +68,7 @@ --color-purple: #b259d0; --color-pink: #d22e8b; --color-brown: #a47252; - --color-grey: #9ea2aa; - --color-black: #1e222e; + --color-black: #2e323e; /* light variants - produced via Sass scale-color(color, $lightness: -10%) */ --color-red-light: #c23636; --color-orange-light: #b84f0b; @@ -82,9 +81,10 @@ --color-purple-light: #a742c9; --color-pink-light: #be297d; --color-brown-light: #94674a; - --color-grey-light: #8d919b; - --color-black-light: #1b1f29; + --color-black-light: #292d38; /* other colors */ + --color-grey: #505665; + --color-grey-light: #a1a6b7; --color-gold: #b1983b; --color-white: #ffffff; --color-diff-removed-word-bg: #6f3333; @@ -124,19 +124,19 @@ --color-orange-badge-hover-bg: #f2711c4d; --color-git: #f05133; /* target-based colors */ - --color-body: #383c4a; + --color-body: #373b47; --color-box-header: #404652; --color-box-body: #2a2e3a; --color-box-body-highlight: #353945; --color-text-dark: #dbe0ea; - --color-text: #bbc0ca; - --color-text-light: #a6aab5; - --color-text-light-1: #979ba6; - --color-text-light-2: #8a8e99; - --color-text-light-3: #707687; + --color-text: #cbd0da; + --color-text-light: #bbbfca; + --color-text-light-1: #aaafb9; + --color-text-light-2: #9a9ea9; + --color-text-light-3: #8a8e99; --color-footer: #2e323e; --color-timeline: #4c525e; - --color-input-text: #d5dbe6; + --color-input-text: #dfe3ec; --color-input-background: #232933; --color-input-toggle-background: #454a57; --color-input-border: #454a57; @@ -159,7 +159,7 @@ --color-secondary-bg: #2a2e3a; --color-text-focus: #fff; --color-expand-button: #3c404d; - --color-placeholder-text: #6a737d; + --color-placeholder-text: #8a8e99; --color-editor-line-highlight: var(--color-primary-light-5); --color-project-board-bg: var(--color-secondary-light-2); --color-caret: var(--color-text); /* should ideally be --color-text-dark, see #15651 */ From 16bfe983c23c76d11eda81555e7a4598b3f29ce5 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 31 Mar 2023 12:53:25 -0400 Subject: [PATCH 153/340] Fix 500 error if there is a name conflict when edit authentication source (#23832) (#23852) Backport #23832 by @yp05327 Co-authored-by: yp05327 <576951401@qq.com> --- models/auth/source.go | 9 ++++++++- routers/web/admin/auths.go | 6 ++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/models/auth/source.go b/models/auth/source.go index bade2fecf098..0a904b777239 100644 --- a/models/auth/source.go +++ b/models/auth/source.go @@ -317,7 +317,14 @@ func UpdateSource(source *Source) error { } } - _, err := db.GetEngine(db.DefaultContext).ID(source.ID).AllCols().Update(source) + has, err := db.GetEngine(db.DefaultContext).Where("name=? AND id!=?", source.Name, source.ID).Exist(new(Source)) + if err != nil { + return err + } else if has { + return ErrSourceAlreadyExist{source.Name} + } + + _, err = db.GetEngine(db.DefaultContext).ID(source.ID).AllCols().Update(source) if err != nil { return err } diff --git a/routers/web/admin/auths.go b/routers/web/admin/auths.go index d2953f753d7a..6ebd23b7bbd5 100644 --- a/routers/web/admin/auths.go +++ b/routers/web/admin/auths.go @@ -426,9 +426,11 @@ func EditAuthSourcePost(ctx *context.Context) { source.IsActive = form.IsActive source.IsSyncEnabled = form.IsSyncEnabled source.Cfg = config - // FIXME: if the name conflicts, it will result in 500: Error 1062: Duplicate entry 'aa' for key 'login_source.UQE_login_source_name' if err := auth.UpdateSource(source); err != nil { - if oauth2.IsErrOpenIDConnectInitialize(err) { + if auth.IsErrSourceAlreadyExist(err) { + ctx.Data["Err_Name"] = true + ctx.RenderWithErr(ctx.Tr("admin.auths.login_source_exist", err.(auth.ErrSourceAlreadyExist).Name), tplAuthEdit, form) + } else if oauth2.IsErrOpenIDConnectInitialize(err) { ctx.Flash.Error(err.Error(), true) ctx.Data["Err_DiscoveryURL"] = true ctx.HTML(http.StatusOK, tplAuthEdit) From 8abfbe2165ba727685d9348921b38743ba48ce2a Mon Sep 17 00:00:00 2001 From: Giteabot Date: Sat, 1 Apr 2023 21:15:46 -0400 Subject: [PATCH 154/340] Fix JS error when changing PR's target branch (#23862) (#23864) Backport #23862 by @wxiaoguang Caught by @justusbunsi An old bug from #6488 In `pullrequest_targetbranch_change`, the `data` might be empty, because `UpdatePullRequestTarget` may respond `http.StatusNoContent`. And the old code's `$branchTarget.text(data.base_branch);` doesn't make sense, because in the end, the page will be always reloaded. So, just remove the `$branchTarget.text(data.base_branch);`, everything should be fine. Co-authored-by: wxiaoguang --- web_src/js/features/repo-issue.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index eb0015727908..7265873b1b02 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -647,8 +647,6 @@ export function initRepoIssueTitleEdit() { $.post(update_url, { _csrf: csrfToken, target_branch: targetBranch - }).done((data) => { - $branchTarget.text(data.base_branch); }).always(() => { window.location.reload(); }); From 026167f854616d9f2687d577e441af2732832b1c Mon Sep 17 00:00:00 2001 From: Giteabot Date: Sun, 2 Apr 2023 04:20:06 -0400 Subject: [PATCH 155/340] Remove assertion debug code for show/hide refactoring (#23576) (#23868) Backport #23576 by @wxiaoguang When doing the refactoring: * #22950 I added some debug mode code (assertShown) to help to catch bugs, it did catch some bugs like: * #23074 If it has been proved that there is no more bugs, this assertion could be removed easily and clearly. Feel free to decide when to remove it (feel free to convert it from Draft to Ready for Review). --- web_src/js/utils/dom.js | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/web_src/js/utils/dom.js b/web_src/js/utils/dom.js index d94d4cb09221..4ebe5eb69d42 100644 --- a/web_src/js/utils/dom.js +++ b/web_src/js/utils/dom.js @@ -1,23 +1,3 @@ -function getComputedStyleProperty(el, prop) { - const cs = el ? window.getComputedStyle(el) : null; - return cs ? cs[prop] : null; -} - -function isShown(el) { - return getComputedStyleProperty(el, 'display') !== 'none'; -} - -function assertShown(el, expectShown) { - if (window.config.runModeIsProd) return; - - // to help developers to catch display bugs, this assertion can be removed after next release cycle or if it has been proved that there is no bug. - if (expectShown && !isShown(el)) { - throw new Error('element is hidden but should be shown'); - } else if (!expectShown && isShown(el)) { - throw new Error('element is shown but should be hidden'); - } -} - function elementsCall(el, func, ...args) { if (typeof el === 'string' || el instanceof String) { el = document.querySelectorAll(el); @@ -41,16 +21,10 @@ function elementsCall(el, func, ...args) { function toggleShown(el, force) { if (force === true) { el.classList.remove('gt-hidden'); - assertShown(el, true); } else if (force === false) { el.classList.add('gt-hidden'); - assertShown(el, false); } else if (force === undefined) { - const wasShown = window.config.runModeIsProd ? undefined : isShown(el); el.classList.toggle('gt-hidden'); - if (wasShown !== undefined) { - assertShown(el, !wasShown); - } } else { throw new Error('invalid force argument'); } From fe7caa05ccafe3182db0ceb48dd36e2629f6807c Mon Sep 17 00:00:00 2001 From: Giteabot Date: Sun, 2 Apr 2023 16:30:33 -0400 Subject: [PATCH 156/340] Check `IsActionsToken` for LFS authentication (#23841) (#23875) Backport #23841 by @Zettat123 Close #23824 Actions cannot fetch LFS objects from private repos because we don't check if the user is the `ActionUser`. Co-authored-by: Zettat123 --- services/lfs/server.go | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/services/lfs/server.go b/services/lfs/server.go index 320c8e728116..758f4ebfe0c5 100644 --- a/services/lfs/server.go +++ b/services/lfs/server.go @@ -18,6 +18,7 @@ import ( "strconv" "strings" + actions_model "code.gitea.io/gitea/models/actions" git_model "code.gitea.io/gitea/models/git" "code.gitea.io/gitea/models/perm" access_model "code.gitea.io/gitea/models/perm/access" @@ -495,10 +496,27 @@ func authenticate(ctx *context.Context, repository *repo_model.Repository, autho accessMode = perm.AccessModeWrite } + if ctx.Data["IsActionsToken"] == true { + taskID := ctx.Data["ActionsTaskID"].(int64) + task, err := actions_model.GetTaskByID(ctx, taskID) + if err != nil { + log.Error("Unable to GetTaskByID for task[%d] Error: %v", taskID, err) + return false + } + if task.RepoID != repository.ID { + return false + } + + if task.IsForkPullRequest { + return accessMode <= perm.AccessModeRead + } + return accessMode <= perm.AccessModeWrite + } + // ctx.IsSigned is unnecessary here, this will be checked in perm.CanAccess perm, err := access_model.GetUserRepoPermission(ctx, repository, ctx.Doer) if err != nil { - log.Error("Unable to GetUserRepoPermission for user %-v in repo %-v Error: %v", ctx.Doer, repository) + log.Error("Unable to GetUserRepoPermission for user %-v in repo %-v Error: %v", ctx.Doer, repository, err) return false } From c68650a7fb624a296d000ebc3284d25ce5ab7b82 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Sun, 2 Apr 2023 22:33:12 -0400 Subject: [PATCH 157/340] Prefill input values in oauth settings as intended (#23829) (#23871) Backport #23829 by @yp05327 Co-authored-by: yp05327 <576951401@qq.com> --- templates/admin/auth/source/oauth.tmpl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/admin/auth/source/oauth.tmpl b/templates/admin/auth/source/oauth.tmpl index 1080937f9134..e1ff41f4b892 100644 --- a/templates/admin/auth/source/oauth.tmpl +++ b/templates/admin/auth/source/oauth.tmpl @@ -74,16 +74,16 @@
    - +
    - +

    {{.locale.Tr "admin.auths.oauth2_required_claim_name_helper"}}

    - +

    {{.locale.Tr "admin.auths.oauth2_required_claim_value_helper"}}

    @@ -92,18 +92,18 @@
    - +
    - +
    - +
    - +
    From 799536db46bdab523587f54ad0d03e98cb352a14 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Mon, 3 Apr 2023 13:24:45 +0800 Subject: [PATCH 158/340] Fix checks for `needs` in Actions (#23789) (#23831) Backport #23789. Fix: - https://gitea.com/gitea/act_runner/issues/77 - https://gitea.com/gitea/act_runner/issues/81 Before: image Highlights: - Upgrade act to make things doable, related to - https://gitea.com/gitea/act/pulls/32 - https://gitea.com/gitea/act/pulls/33 - https://gitea.com/gitea/act/pulls/35 - Make `needs` works - Sort jobs in the original order in the workflow files --- go.mod | 2 +- go.sum | 4 ++-- models/actions/run.go | 4 +++- modules/actions/workflows.go | 28 ++++++++++++++-------------- 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index 53e8b45182c6..8bb76673cebd 100644 --- a/go.mod +++ b/go.mod @@ -285,7 +285,7 @@ replace github.com/shurcooL/vfsgen => github.com/lunny/vfsgen v0.0.0-20220105142 replace github.com/blevesearch/zapx/v15 v15.3.6 => github.com/zeripath/zapx/v15 v15.3.6-alignment-fix -replace github.com/nektos/act => gitea.com/gitea/act v0.243.1 +replace github.com/nektos/act => gitea.com/gitea/act v0.243.2-0.20230329055922-5e76853b55ab exclude github.com/gofrs/uuid v3.2.0+incompatible diff --git a/go.sum b/go.sum index 31109683f877..89a4d6a5512b 100644 --- a/go.sum +++ b/go.sum @@ -70,8 +70,8 @@ codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570/go.mod h1:IIAjsi dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 h1:cliQ4HHsCo6xi2oWZYKWW4bly/Ory9FuTpFPRxj/mAg= git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078/go.mod h1:g/V2Hjas6Z1UHUp4yIx6bATpNzJ7DYtD0FG3+xARWxs= -gitea.com/gitea/act v0.243.1 h1:zIVlhGOLE4SHFPW++u3+5Y/jX5mub3QIhB13oNf6rtA= -gitea.com/gitea/act v0.243.1/go.mod h1:iLHCXqOPUElA2nSyHo4wtxSmvdkym3WU7CkP3AxF39Q= +gitea.com/gitea/act v0.243.2-0.20230329055922-5e76853b55ab h1:HDImhO/XpMJrw2PJcADI/wgur9Gro/pegLFaRt8Wpg0= +gitea.com/gitea/act v0.243.2-0.20230329055922-5e76853b55ab/go.mod h1:mabw6AZAiDgxGlK83orWLrNERSPvgBJzEUS3S7u2bHI= gitea.com/go-chi/binding v0.0.0-20221013104517-b29891619681 h1:MMSPgnVULVwV9kEBgvyEUhC9v/uviZ55hPJEMjpbNR4= gitea.com/go-chi/binding v0.0.0-20221013104517-b29891619681/go.mod h1:77TZu701zMXWJFvB8gvTbQ92zQ3DQq/H7l5wAEjQRKc= gitea.com/go-chi/cache v0.0.0-20210110083709-82c4c9ce2d5e/go.mod h1:k2V/gPDEtXGjjMGuBJiapffAXTv76H4snSmlJRLUhH0= diff --git a/models/actions/run.go b/models/actions/run.go index 5f0f19074243..e67242f64610 100644 --- a/models/actions/run.go +++ b/models/actions/run.go @@ -199,7 +199,9 @@ func InsertRun(ctx context.Context, run *ActionRun, jobs []*jobparser.SingleWork for _, v := range jobs { id, job := v.Job() needs := job.Needs() - job.EraseNeeds() + if err := v.SetJob(id, job.EraseNeeds()); err != nil { + return err + } payload, _ := v.Marshal() status := StatusWaiting if len(needs) > 0 { diff --git a/modules/actions/workflows.go b/modules/actions/workflows.go index f80047b15890..b0e70628a8e7 100644 --- a/modules/actions/workflows.go +++ b/modules/actions/workflows.go @@ -106,8 +106,8 @@ func detectMatched(commit *git.Commit, triggedEvent webhook_module.HookEventType webhook_module.HookEventRepository, webhook_module.HookEventRelease, webhook_module.HookEventPackage: - if len(evt.Acts) != 0 { - log.Warn("Ignore unsupported %s event arguments %q", triggedEvent, evt.Acts) + if len(evt.Acts()) != 0 { + log.Warn("Ignore unsupported %s event arguments %v", triggedEvent, evt.Acts()) } // no special filter parameters for these events, just return true if name matched return true @@ -132,7 +132,7 @@ func detectMatched(commit *git.Commit, triggedEvent webhook_module.HookEventType func matchPushEvent(commit *git.Commit, pushPayload *api.PushPayload, evt *jobparser.Event) bool { // with no special filter parameters - if len(evt.Acts) == 0 { + if len(evt.Acts()) == 0 { return true } @@ -141,7 +141,7 @@ func matchPushEvent(commit *git.Commit, pushPayload *api.PushPayload, evt *jobpa hasTagFilter := false refName := git.RefName(pushPayload.Ref) // all acts conditions should be satisfied - for cond, vals := range evt.Acts { + for cond, vals := range evt.Acts() { switch cond { case "branches": hasBranchFilter = true @@ -225,18 +225,18 @@ func matchPushEvent(commit *git.Commit, pushPayload *api.PushPayload, evt *jobpa if hasBranchFilter && hasTagFilter { matchTimes++ } - return matchTimes == len(evt.Acts) + return matchTimes == len(evt.Acts()) } func matchIssuesEvent(commit *git.Commit, issuePayload *api.IssuePayload, evt *jobparser.Event) bool { // with no special filter parameters - if len(evt.Acts) == 0 { + if len(evt.Acts()) == 0 { return true } matchTimes := 0 // all acts conditions should be satisfied - for cond, vals := range evt.Acts { + for cond, vals := range evt.Acts() { switch cond { case "types": for _, val := range vals { @@ -249,19 +249,19 @@ func matchIssuesEvent(commit *git.Commit, issuePayload *api.IssuePayload, evt *j log.Warn("issue event unsupported condition %q", cond) } } - return matchTimes == len(evt.Acts) + return matchTimes == len(evt.Acts()) } func matchPullRequestEvent(commit *git.Commit, prPayload *api.PullRequestPayload, evt *jobparser.Event) bool { // with no special filter parameters - if len(evt.Acts) == 0 { + if len(evt.Acts()) == 0 { // defaultly, only pull request opened and synchronized will trigger workflow return prPayload.Action == api.HookIssueSynchronized || prPayload.Action == api.HookIssueOpened } matchTimes := 0 // all acts conditions should be satisfied - for cond, vals := range evt.Acts { + for cond, vals := range evt.Acts() { switch cond { case "types": action := prPayload.Action @@ -323,18 +323,18 @@ func matchPullRequestEvent(commit *git.Commit, prPayload *api.PullRequestPayload log.Warn("pull request event unsupported condition %q", cond) } } - return matchTimes == len(evt.Acts) + return matchTimes == len(evt.Acts()) } func matchIssueCommentEvent(commit *git.Commit, issueCommentPayload *api.IssueCommentPayload, evt *jobparser.Event) bool { // with no special filter parameters - if len(evt.Acts) == 0 { + if len(evt.Acts()) == 0 { return true } matchTimes := 0 // all acts conditions should be satisfied - for cond, vals := range evt.Acts { + for cond, vals := range evt.Acts() { switch cond { case "types": for _, val := range vals { @@ -347,5 +347,5 @@ func matchIssueCommentEvent(commit *git.Commit, issueCommentPayload *api.IssueCo log.Warn("issue comment unsupported condition %q", cond) } } - return matchTimes == len(evt.Acts) + return matchTimes == len(evt.Acts()) } From 7e07f5c4dc5e862956709944240e48d7eadbfcc6 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Mon, 3 Apr 2023 15:21:42 +0800 Subject: [PATCH 159/340] Backport some locales to 1.19 (#23880) There are still broken locales (eg: #23866), so this backport is still done manually. --- options/locale/locale_pt-PT.ini | 9 +++++---- options/locale/locale_zh-CN.ini | 9 +++++---- options/locale/locale_zh-TW.ini | 9 +++++---- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini index 901ecd91de1c..e3c6235f43c1 100644 --- a/options/locale/locale_pt-PT.ini +++ b/options/locale/locale_pt-PT.ini @@ -2019,10 +2019,10 @@ settings.dismiss_stale_approvals=Descartar aprovações obsoletas settings.dismiss_stale_approvals_desc=Quando novos cometimentos que mudam o conteúdo do pedido de integração forem enviados para o ramo, as aprovações antigas serão descartadas. settings.require_signed_commits=Exigir cometimentos assinados settings.require_signed_commits_desc=Rejeitar envios para este ramo que não estejam assinados ou que não sejam validáveis. -settings.protect_protected_file_patterns=Padrões de ficheiros protegidos (separados com ponto e vírgula ' ;'): -settings.protect_protected_file_patterns_desc=Não é permitido alterar imediatamente ficheiros protegidos, mesmo que o utilizador tenha autorização para adicionar, editar ou eliminar ficheiros neste ramo. Podem ser usados múltiplos padrões separados por ponto e vírgula (' ;'). See github.com/gobwas/glob documentation for pattern syntax. Examples: .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 é permitido alterar imediatamente se o utilizador tiver permissão de escrita, passando ao lado da restrição no envio. Podem ser usados múltiplos padrões separados por ponto e vírgula (' ;'). See github.com/gobwas/glob documentation for pattern syntax. Examples: .drone.yml, /docs/**/*.txt. +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 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. 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.add_protected_branch=Habilitar salvaguarda settings.delete_protected_branch=Desabilitar salvaguarda settings.update_protect_branch_success=A salvaguarda do ramo '%s' foi modificada. @@ -3234,3 +3234,4 @@ runs.open_tab=%d abertas runs.closed_tab=%d fechadas runs.commit=Cometimento runs.pushed_by=Enviada por +runners.reset_registration_token_success=O código de incrição do executor foi reposto com sucesso diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index e286c478254b..60faa66453a4 100644 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -2019,10 +2019,10 @@ settings.dismiss_stale_approvals=取消过时的批准 settings.dismiss_stale_approvals_desc=当新的提交更改合并请求内容被推送到分支时，旧的批准将被撤销。 settings.require_signed_commits=需要签名提交 settings.require_signed_commits_desc=拒绝推送未签名或无法验证的提交到分支 -settings.protect_protected_file_patterns=受保护的文件模式(使用分号分隔 ' ;'): -settings.protect_protected_file_patterns_desc=即使用户有权添加、编辑或删除此分支中的文件，也不允许直接更改受保护的文件。 可以使用分号分隔多个模式(' ;'). See github.com/gobwas/glob documentation for pattern syntax. Examples: .drone.yml, /docs/**/*.txt. -settings.protect_unprotected_file_patterns=不受保护的文件模式 (使用分号分隔 ' ;'): -settings.protect_unprotected_file_patterns_desc=如果用户有写入权限，则允许直接更改的不受保护的文件，以绕过推送限制。可以使用分号分隔多重模式 (' ;'). See github.com/gobwas/glob documentation for pattern syntax. Examples: .drone.yml, /docs/**/*.txt. +settings.protect_protected_file_patterns=受保护的文件模式(使用分号 ';' 分隔)： +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=如果用户有写权限，则允许直接更改的不受保护的文件，以绕过推送限制。可以使用分号分隔多个模式 (';')。 见 github.com/gobwas/glob 文档了解模式语法。例如： .drone.yml, /docs/**/*.txt settings.add_protected_branch=启用保护 settings.delete_protected_branch=禁用保护 settings.update_protect_branch_success=分支 "%s" 的分支保护已更新。 @@ -3234,3 +3234,4 @@ runs.open_tab=%d 开启中 runs.closed_tab=%d 已关闭 runs.commit=提交 runs.pushed_by=推送者 +runners.reset_registration_token_success=成功重置运行器注册令牌 diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini index e6f84c6e6e2f..1fe4fb12d351 100644 --- a/options/locale/locale_zh-TW.ini +++ b/options/locale/locale_zh-TW.ini @@ -435,7 +435,7 @@ min_size_error=" 長度最小為 %s 個字元。" max_size_error=" 長度最大為 %s 個字元。" email_error=" 是無效的電子信箱。" url_error='%s' 是無效的 URL。 -include_error=" 必須包含子字串「%s」。" +include_error=必須包含子字串「%s」。 glob_pattern_error=" glob 比對模式無效：%s." regex_pattern_error=" 正規表示式模式無效：%s." unknown_error=未知錯誤： @@ -1824,7 +1824,7 @@ settings.trust_model.collaborator.long=協作者: 信任協作者的簽署 settings.trust_model.collaborator.desc=此儲存庫協作者的有效簽署將被標記為「受信任」(無論它們是否符合提交者)，簽署只符合提交者時將標記為「不受信任」，都不符合時標記為「不符合」。 settings.trust_model.committer=提交者 settings.trust_model.committer.long=提交者: 信任與提交者相符的簽署 (此選項與 GitHub 相同，這會強制 Gitea 簽署提交並以 Gitea 作為提交者) -settings.trust_model.committer.desc=提交者的有效簽署將被標記為「受信任」，否則將被標記為「不符合」。這會強制 Gitea 成為受簽署提交的提交者，實際的提交者將於提交訊息結尾被標記為「Co-authored-by:」和「Co-committed-by:」。預設的 Gitea 金鑰必須符合資料庫中的一位使用者。 +settings.trust_model.committer.desc=提交者的有效簽署將被標記為「受信任」，否則將被標記為「不符合」。這將會強制 Gitea 成為受簽署提交的提交者，實際的提交者將於提交訊息結尾被標記為「Co-authored-by:」和「Co-committed-by:」。預設的 Gitea 金鑰必須符合資料庫中的一位使用者。 settings.trust_model.collaboratorcommitter=協作者+提交者 settings.trust_model.collaboratorcommitter.long=協作者 + 提交者: 信任協作者同時是提交者的簽署 settings.trust_model.collaboratorcommitter.desc=此儲存庫協作者的有效簽署在他同時是提交者時將被標記為「受信任」，簽署只符合提交者時將標記為「不受信任」，都不符合時標記為「不符合」。這會強制 Gitea 成為受簽署提交的提交者，實際的提交者將於提交訊息結尾被標記為「Co-Authored-By:」和「Co-Committed-By:」。預設的 Gitea 金鑰必須符合資料庫中的一位使用者。 @@ -2020,9 +2020,9 @@ settings.dismiss_stale_approvals_desc=當新的提交有修改到合併請求的 settings.require_signed_commits=僅接受經簽署的提交 settings.require_signed_commits_desc=拒絕未經簽署或未經驗證的提交推送到此分支。 settings.protect_protected_file_patterns=受保護的檔案模式 (以分號區隔「;」): -settings.protect_protected_file_patterns_desc=即便使用者有權限新增、修改、刪除此分支的檔案，仍不允許直接修改受保護的檔案。可以用半形分號「;」分隔多個模式。請於github.com/gobwas/glob 文件查看模式格式。範例：.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=當使用者有寫入權限時，可繞過推送限制，直接修改未受保護的檔案。可以用半形分號「;」分隔多個模式。請於github.com/gobwas/glob 文件查看模式格式。範例：.drone.yml, /docs/**/*.txt。 +settings.protect_unprotected_file_patterns_desc=當使用者有寫入權限時，可繞過推送限制，直接修改未受保護的檔案。可以用半形分號「;」分隔多個模式。請於 github.com/gobwas/glob 文件查看模式格式。範例: .drone.yml, /docs/**/*.txt。 settings.add_protected_branch=啟用保護 settings.delete_protected_branch=停用保護 settings.update_protect_branch_success=已更新「%s」的分支保護。 @@ -3234,3 +3234,4 @@ runs.open_tab=%d 開放中 runs.closed_tab=%d 已關閉 runs.commit=提交 runs.pushed_by=推送者 +runners.reset_registration_token_success=成功重設了 Runner 註冊 Token From 1886bd6a0102710cc7c3b765f8eea866dcd4555f Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 3 Apr 2023 06:54:36 -0400 Subject: [PATCH 160/340] Rename actions unit to `repo.actions` and add docs for it (#23733) (#23881) Backport #23733 by @wolfogre I neglected that the `NameKey` of `Unit` is not only for translation, but also configuration. So it should be `repo.actions` to maintain consistency. ## :warning: BREAKING :warning: If users already use `actions.actions` in `DISABLED_REPO_UNITS` or `DEFAULT_REPO_UNITS`, it will be treated as an invalid unit key. Co-authored-by: Jason Song --- custom/conf/app.example.ini | 4 ++-- docs/content/doc/administration/config-cheat-sheet.en-us.md | 4 ++-- models/unit/unit.go | 2 +- options/locale/locale_en-US.ini | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index 1fd7bbbc2712..408ce17a89a5 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -931,10 +931,10 @@ ROUTER = console ;USE_COMPAT_SSH_URI = false ;; ;; Close issues as long as a commit on any branch marks it as fixed -;; Comma separated list of globally disabled repo units. Allowed values: repo.issues, repo.ext_issues, repo.pulls, repo.wiki, repo.ext_wiki, repo.projects, repo.packages +;; Comma separated list of globally disabled repo units. Allowed values: repo.issues, repo.ext_issues, repo.pulls, repo.wiki, repo.ext_wiki, repo.projects, repo.packages, repo.actions. ;DISABLED_REPO_UNITS = ;; -;; Comma separated list of default new repo units. Allowed values: repo.code, repo.releases, repo.issues, repo.pulls, repo.wiki, repo.projects, repo.packages. +;; Comma separated list of default new repo units. Allowed values: repo.code, repo.releases, repo.issues, repo.pulls, repo.wiki, repo.projects, repo.packages, repo.actions. ;; Note: Code and Releases can currently not be deactivated. If you specify default repo units you should still list them for future compatibility. ;; External wiki and issue tracker can't be enabled by default as it requires additional settings. ;; Disabled repo units will not be added to new repositories regardless if it is in the default list. diff --git a/docs/content/doc/administration/config-cheat-sheet.en-us.md b/docs/content/doc/administration/config-cheat-sheet.en-us.md index 4ef930cd3bca..b9d550124a32 100644 --- a/docs/content/doc/administration/config-cheat-sheet.en-us.md +++ b/docs/content/doc/administration/config-cheat-sheet.en-us.md @@ -103,8 +103,8 @@ In addition there is _`StaticRootPath`_ which can be set as a built-in at build - `DEFAULT_CLOSE_ISSUES_VIA_COMMITS_IN_ANY_BRANCH`: **false**: Close an issue if a commit on a non default branch marks it as closed. - `ENABLE_PUSH_CREATE_USER`: **false**: Allow users to push local repositories to Gitea and have them automatically created for a user. - `ENABLE_PUSH_CREATE_ORG`: **false**: Allow users to push local repositories to Gitea and have them automatically created for an org. -- `DISABLED_REPO_UNITS`: **_empty_**: Comma separated list of globally disabled repo units. Allowed values: \[repo.issues, repo.ext_issues, repo.pulls, repo.wiki, repo.ext_wiki, repo.projects\] -- `DEFAULT_REPO_UNITS`: **repo.code,repo.releases,repo.issues,repo.pulls,repo.wiki,repo.projects,repo.packages**: Comma separated list of default new repo units. Allowed values: \[repo.code, repo.releases, repo.issues, repo.pulls, repo.wiki, repo.projects\]. Note: Code and Releases can currently not be deactivated. If you specify default repo units you should still list them for future compatibility. External wiki and issue tracker can't be enabled by default as it requires additional settings. Disabled repo units will not be added to new repositories regardless if it is in the default list. +- `DISABLED_REPO_UNITS`: **_empty_**: Comma separated list of globally disabled repo units. Allowed values: \[repo.issues, repo.ext_issues, repo.pulls, repo.wiki, repo.ext_wiki, repo.projects, repo.packages, repo.actions\] +- `DEFAULT_REPO_UNITS`: **repo.code,repo.releases,repo.issues,repo.pulls,repo.wiki,repo.projects,repo.packages**: Comma separated list of default new repo units. Allowed values: \[repo.code, repo.releases, repo.issues, repo.pulls, repo.wiki, repo.projects, repo.packages, repo.actions\]. Note: Code and Releases can currently not be deactivated. If you specify default repo units you should still list them for future compatibility. External wiki and issue tracker can't be enabled by default as it requires additional settings. Disabled repo units will not be added to new repositories regardless if it is in the default list. - `DEFAULT_FORK_REPO_UNITS`: **repo.code,repo.pulls**: Comma separated list of default forked repo units. The set of allowed values and rules is the same as `DEFAULT_REPO_UNITS`. - `PREFIX_ARCHIVE_FILES`: **true**: Prefix archive files by placing them in a directory named after the repository. - `DISABLE_MIGRATIONS`: **false**: Disable migrating feature. diff --git a/models/unit/unit.go b/models/unit/unit.go index a2a9079dc25c..883f443cbe65 100644 --- a/models/unit/unit.go +++ b/models/unit/unit.go @@ -312,7 +312,7 @@ var ( UnitActions = Unit{ TypeActions, - "actions.actions", + "repo.actions", "/actions", "actions.unit.desc", 7, diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 183ee83d8d31..081ffb7abf29 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1054,6 +1054,7 @@ issues = Issues pulls = Pull Requests project_board = Projects packages = Packages +actions = Actions labels = Labels org_labels_desc = Organization level labels that can be used with all repositories under this organization org_labels_desc_manage = manage From 847f0bb9f35bcd160eb1f369a8f4d0dbdebee334 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 3 Apr 2023 12:11:08 -0400 Subject: [PATCH 161/340] Fix review box viewport overflow issue (#23800) (#23898) Backport #23800 by @silverwind Fix regression that came likely from https://github.com/go-gitea/gitea/pull/23271: Long lines of text currently cause the review box's CodeMirror element to resize which apparently is not recognized by [popper's resize detection](https://popper.js.org/docs/v2/modifiers/event-listeners/) and which causes the element to go partially out of viewport until a reflow happens: ![wrap](https://user-images.githubusercontent.com/115237/228673260-f8ffe89e-5724-4fb9-b93f-30b146c4c436.gif) Fix this by setting the element to a static width derived from viewport width and remove the previously clumsy media queries. Co-authored-by: silverwind --- web_src/css/review.css | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/web_src/css/review.css b/web_src/css/review.css index e181d0109b54..05456c381bc1 100644 --- a/web_src/css/review.css +++ b/web_src/css/review.css @@ -225,28 +225,10 @@ a.blob-excerpt:hover { max-height: calc(100vh - 360px); } -@media (max-width: 767px) { - .review-box-panel .CodeMirror-scroll { - max-width: calc(100vw - 70px); - } -} - -@media (min-width: 768px) and (max-width: 991px) { - .review-box-panel .CodeMirror-scroll { - max-width: 700px; - } -} - -@media (min-width: 992px) and (max-width: 1200px) { - .review-box-panel .CodeMirror-scroll { - max-width: 800px; - } -} - -@media (min-width: 1201px) { - .review-box-panel .CodeMirror-scroll { - max-width: 900px; - } +.review-box-panel .editor-toolbar, +.review-box-panel .CodeMirror-scroll { + width: min(calc(100vw - 2em), 800px); + max-width: none; } #review-box { From f6dab644120e68004ece9cf12febe6aba6446f29 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 3 Apr 2023 13:02:28 -0400 Subject: [PATCH 162/340] Convert .Source.SkipVerify to $cfg.SkipVerify (#23839) (#23899) Backport #23839 by @yp05327 `Source` doesn't have `SkipVerify`, it is defined in `cfg` Co-authored-by: yp05327 <576951401@qq.com> --- templates/admin/auth/edit.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl index d64ee188af15..92b3570d7bde 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -212,7 +212,7 @@
    - +
    From ac57ec5c4742bb82b4fa9c2e8eb8bf86591fc0bc Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 3 Apr 2023 17:00:24 -0400 Subject: [PATCH 163/340] Fix user profile description rendering (#23882) (#23902) Backport #23882 by @wxiaoguang Found an UI problem when testing #23874 The `ul li` styles were polluted. Before: ![image](https://user-images.githubusercontent.com/2114189/229409756-22438268-ee36-4e4a-a20b-04ee8ee4a79d.png) After: ![image](https://user-images.githubusercontent.com/2114189/229409809-25cea715-b6f1-4346-9bb4-3fbb58fcca65.png) Co-authored-by: wxiaoguang --- web_src/css/user.css | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/web_src/css/user.css b/web_src/css/user.css index b6a8aa211ad7..26d5da476de8 100644 --- a/web_src/css/user.css +++ b/web_src/css/user.css @@ -15,26 +15,26 @@ padding: 0; } -.user.profile .ui.card .extra.content ul { +.user.profile .ui.card .extra.content > ul { margin: 0; padding: 0; } -.user.profile .ui.card .extra.content ul li { +.user.profile .ui.card .extra.content > ul > li { padding: 10px; list-style: none; } -.user.profile .ui.card .extra.content ul li:not(:last-child) { +.user.profile .ui.card .extra.content > ul > li:not(:last-child) { border-bottom: 1px solid var(--color-secondary); } -.user.profile .ui.card .extra.content ul li .svg { +.user.profile .ui.card .extra.content > ul > li .svg { margin-left: 1px; margin-right: 5px; } -.user.profile .ui.card .extra.content ul li.follow .ui.button { +.user.profile .ui.card .extra.content > ul > li.follow .ui.button { width: 100%; } @@ -112,7 +112,7 @@ margin: -3px !important; } -.user-orgs li { +.user-orgs > li { display: flex; border-bottom: 0 !important; padding: 3px !important; From 669c76c0fdd006c81109ce22565a5921983d1c16 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 3 Apr 2023 19:26:14 -0400 Subject: [PATCH 164/340] Fix `cases.Title` crash for concurrency (#23885) (#23903) Backport #23885 by @wxiaoguang Regression of #19676 and #21814 Fix #23872 `cases.Title` is not thread-safe, it has internal state, so it can't be used as a global shared variable. Co-authored-by: wxiaoguang --- modules/util/util.go | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/modules/util/util.go b/modules/util/util.go index 9d3a8dcfac21..b2800d6a0c15 100644 --- a/modules/util/util.go +++ b/modules/util/util.go @@ -185,19 +185,16 @@ func ToUpperASCII(s string) string { return string(b) } -var ( - titleCaser = cases.Title(language.English) - titleCaserNoLower = cases.Title(language.English, cases.NoLower) -) - // ToTitleCase returns s with all english words capitalized func ToTitleCase(s string) string { - return titleCaser.String(s) + // `cases.Title` is not thread-safe, do not use global shared variable for it + return cases.Title(language.English).String(s) } -// ToTitleCaseNoLower returns s with all english words capitalized without lowercasing +// ToTitleCaseNoLower returns s with all english words capitalized without lower-casing func ToTitleCaseNoLower(s string) string { - return titleCaserNoLower.String(s) + // `cases.Title` is not thread-safe, do not use global shared variable for it + return cases.Title(language.English, cases.NoLower).String(s) } var ( From d752f0d7d02e3e7ce19a1f8feca9394b4f8e8c12 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 3 Apr 2023 21:43:51 -0400 Subject: [PATCH 165/340] Add git dashes separator to some "log" and "diff" commands (#23606) (#23720) Backport #23606 by @wxiaoguang Reference: https://github.com/go-gitea/gitea/issues/22578#issuecomment-1444180053 Credits to @tdesveaux , thank you very much for catching the problem. If you'd like to open a PR, feel free to replace this one. Git reports fatal errors for ambiguous arguments: ``` fatal: ambiguous argument 'refs/a...refs/b': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git [...] -- [...]' ``` So the `--` separator is necessary in some cases. Co-authored-by: wxiaoguang --- modules/git/repo_compare.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/git/repo_compare.go b/modules/git/repo_compare.go index 439455e3c295..e70627585685 100644 --- a/modules/git/repo_compare.go +++ b/modules/git/repo_compare.go @@ -92,8 +92,11 @@ func (repo *Repository) GetCompareInfo(basePath, baseBranch, headBranch string, // We have a common base - therefore we know that ... should work if !fileOnly { + // avoid: ambiguous argument 'refs/a...refs/b': unknown revision or path not in the working tree. Use '--': 'git [...] -- [...]' var logs []byte - logs, _, err = NewCommand(repo.Ctx, "log").AddDynamicArguments(baseCommitID + separator + headBranch).AddArguments(prettyLogFormat).RunStdBytes(&RunOpts{Dir: repo.Path}) + logs, _, err = NewCommand(repo.Ctx, "log").AddArguments(prettyLogFormat). + AddDynamicArguments(baseCommitID + separator + headBranch).AddArguments("--"). + RunStdBytes(&RunOpts{Dir: repo.Path}) if err != nil { return nil, err } @@ -146,7 +149,8 @@ func (repo *Repository) GetDiffNumChangedFiles(base, head string, directComparis separator = ".." } - if err := NewCommand(repo.Ctx, "diff", "-z", "--name-only").AddDynamicArguments(base + separator + head). + // avoid: ambiguous argument 'refs/a...refs/b': unknown revision or path not in the working tree. Use '--': 'git [...] -- [...]' + if err := NewCommand(repo.Ctx, "diff", "-z", "--name-only").AddDynamicArguments(base + separator + head).AddArguments("--"). Run(&RunOpts{ Dir: repo.Path, Stdout: w, @@ -157,7 +161,7 @@ func (repo *Repository) GetDiffNumChangedFiles(base, head string, directComparis // previously it would return the results of git diff -z --name-only base head so let's try that... w = &lineCountWriter{} stderr.Reset() - if err = NewCommand(repo.Ctx, "diff", "-z", "--name-only").AddDynamicArguments(base, head).Run(&RunOpts{ + if err = NewCommand(repo.Ctx, "diff", "-z", "--name-only").AddDynamicArguments(base, head).AddArguments("--").Run(&RunOpts{ Dir: repo.Path, Stdout: w, Stderr: stderr, From 9836b7db7baf896c3d141270ce8ba52944ab146c Mon Sep 17 00:00:00 2001 From: Giteabot Date: Mon, 3 Apr 2023 23:41:57 -0400 Subject: [PATCH 166/340] Use User.ID instead of User.Name in ActivityPub API for Person IRI (#23823) (#23905) Backport #23823 by @wxiaoguang Thanks to @trwnh Close #23802 The ActivityPub id is an HTTPS URI that should remain constant, even if the user changes their name. Co-authored-by: wxiaoguang --- routers/api/v1/activitypub/person.go | 20 ++++++++++-------- routers/api/v1/api.go | 5 +++++ routers/web/webfinger.go | 4 ++-- services/context/user.go | 21 +++++++++++++++++++ templates/swagger/v1_json.tmpl | 16 +++++++------- .../api_activitypub_person_test.go | 20 +++++++++--------- tests/integration/webfinger_test.go | 2 +- 7 files changed, 58 insertions(+), 30 deletions(-) diff --git a/routers/api/v1/activitypub/person.go b/routers/api/v1/activitypub/person.go index 492930b84929..bc6b82b17992 100644 --- a/routers/api/v1/activitypub/person.go +++ b/routers/api/v1/activitypub/person.go @@ -4,6 +4,7 @@ package activitypub import ( + "fmt" "net/http" "strings" @@ -18,22 +19,23 @@ import ( // Person function returns the Person actor for a user func Person(ctx *context.APIContext) { - // swagger:operation GET /activitypub/user/{username} activitypub activitypubPerson + // swagger:operation GET /activitypub/user-id/{user-id} activitypub activitypubPerson // --- // summary: Returns the Person actor for a user // produces: // - application/json // parameters: - // - name: username + // - name: user-id // in: path - // description: username of the user - // type: string + // description: user ID of the user + // type: integer // required: true // responses: // "200": // "$ref": "#/responses/ActivityPub" - link := strings.TrimSuffix(setting.AppURL, "/") + "/api/v1/activitypub/user/" + ctx.ContextUser.Name + // TODO: the setting.AppURL during the test doesn't follow the definition: "It always has a '/' suffix" + link := fmt.Sprintf("%s/api/v1/activitypub/user-id/%d", strings.TrimSuffix(setting.AppURL, "/"), ctx.ContextUser.ID) person := ap.PersonNew(ap.IRI(link)) person.Name = ap.NaturalLanguageValuesNew() @@ -85,16 +87,16 @@ func Person(ctx *context.APIContext) { // PersonInbox function handles the incoming data for a user inbox func PersonInbox(ctx *context.APIContext) { - // swagger:operation POST /activitypub/user/{username}/inbox activitypub activitypubPersonInbox + // swagger:operation POST /activitypub/user-id/{user-id}/inbox activitypub activitypubPersonInbox // --- // summary: Send to the inbox // produces: // - application/json // parameters: - // - name: username + // - name: user-id // in: path - // description: username of the user - // type: string + // description: user ID of the user + // type: integer // required: true // responses: // "204": diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 1d2f8b18e019..1b189f28a708 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -704,10 +704,15 @@ func Routes(ctx gocontext.Context) *web.Route { if setting.Federation.Enabled { m.Get("/nodeinfo", misc.NodeInfo) m.Group("/activitypub", func() { + // deprecated, remove in 1.20, use /user-id/{user-id} instead m.Group("/user/{username}", func() { m.Get("", activitypub.Person) m.Post("/inbox", activitypub.ReqHTTPSignature(), activitypub.PersonInbox) }, context_service.UserAssignmentAPI()) + m.Group("/user-id/{user-id}", func() { + m.Get("", activitypub.Person) + m.Post("/inbox", activitypub.ReqHTTPSignature(), activitypub.PersonInbox) + }, context_service.UserIDAssignmentAPI()) }) } m.Get("/signing-key.gpg", misc.SigningKey) diff --git a/routers/web/webfinger.go b/routers/web/webfinger.go index a8e816d7b7ab..1442e09a3143 100644 --- a/routers/web/webfinger.go +++ b/routers/web/webfinger.go @@ -85,7 +85,7 @@ func WebfingerQuery(ctx *context.Context) { aliases := []string{ u.HTMLURL(), - appURL.String() + "api/v1/activitypub/user/" + url.PathEscape(u.Name), + appURL.String() + "api/v1/activitypub/user-id/" + fmt.Sprint(u.ID), } if !u.KeepEmailPrivate { aliases = append(aliases, fmt.Sprintf("mailto:%s", u.Email)) @@ -104,7 +104,7 @@ func WebfingerQuery(ctx *context.Context) { { Rel: "self", Type: "application/activity+json", - Href: appURL.String() + "api/v1/activitypub/user/" + url.PathEscape(u.Name), + Href: appURL.String() + "api/v1/activitypub/user-id/" + fmt.Sprint(u.ID), }, } diff --git a/services/context/user.go b/services/context/user.go index 9dc84c3ac15e..c713667bca75 100644 --- a/services/context/user.go +++ b/services/context/user.go @@ -29,6 +29,27 @@ func UserAssignmentWeb() func(ctx *context.Context) { } } +// UserIDAssignmentAPI returns a middleware to handle context-user assignment for api routes +func UserIDAssignmentAPI() func(ctx *context.APIContext) { + return func(ctx *context.APIContext) { + userID := ctx.ParamsInt64(":user-id") + + if ctx.IsSigned && ctx.Doer.ID == userID { + ctx.ContextUser = ctx.Doer + } else { + var err error + ctx.ContextUser, err = user_model.GetUserByID(ctx, userID) + if err != nil { + if user_model.IsErrUserNotExist(err) { + ctx.Error(http.StatusNotFound, "GetUserByID", err) + } else { + ctx.Error(http.StatusInternalServerError, "GetUserByID", err) + } + } + } + } +} + // UserAssignmentAPI returns a middleware to handle context-user assignment for api routes func UserAssignmentAPI() func(ctx *context.APIContext) { return func(ctx *context.APIContext) { diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index 9bab4ced8065..c9bba3ae51d5 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -23,7 +23,7 @@ }, "basePath": "{{AppSubUrl | JSEscape | Safe}}/api/v1", "paths": { - "/activitypub/user/{username}": { + "/activitypub/user-id/{user-id}": { "get": { "produces": [ "application/json" @@ -35,9 +35,9 @@ "operationId": "activitypubPerson", "parameters": [ { - "type": "string", - "description": "username of the user", - "name": "username", + "type": "integer", + "description": "user ID of the user", + "name": "user-id", "in": "path", "required": true } @@ -49,7 +49,7 @@ } } }, - "/activitypub/user/{username}/inbox": { + "/activitypub/user-id/{user-id}/inbox": { "post": { "produces": [ "application/json" @@ -61,9 +61,9 @@ "operationId": "activitypubPersonInbox", "parameters": [ { - "type": "string", - "description": "username of the user", - "name": "username", + "type": "integer", + "description": "user ID of the user", + "name": "user-id", "in": "path", "required": true } diff --git a/tests/integration/api_activitypub_person_test.go b/tests/integration/api_activitypub_person_test.go index dadc417aa440..301cfba17262 100644 --- a/tests/integration/api_activitypub_person_test.go +++ b/tests/integration/api_activitypub_person_test.go @@ -29,8 +29,9 @@ func TestActivityPubPerson(t *testing.T) { }() onGiteaRun(t, func(*testing.T, *url.URL) { + userID := 2 username := "user2" - req := NewRequestf(t, "GET", fmt.Sprintf("/api/v1/activitypub/user/%s", username)) + req := NewRequestf(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") @@ -42,9 +43,9 @@ func TestActivityPubPerson(t *testing.T) { 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/%s$", username), keyID) - assert.Regexp(t, fmt.Sprintf("activitypub/user/%s/outbox$", username), person.Outbox.GetID().String()) - assert.Regexp(t, fmt.Sprintf("activitypub/user/%s/inbox$", username), person.Inbox.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) @@ -66,9 +67,9 @@ func TestActivityPubMissingPerson(t *testing.T) { }() onGiteaRun(t, func(*testing.T, *url.URL) { - req := NewRequestf(t, "GET", "/api/v1/activitypub/user/nonexistentuser") + req := NewRequestf(t, "GET", "/api/v1/activitypub/user-id/999999999") resp := MakeRequest(t, req, http.StatusNotFound) - assert.Contains(t, resp.Body.String(), "user redirect does not exist") + assert.Contains(t, resp.Body.String(), "user does not exist") }) } @@ -85,7 +86,7 @@ func TestActivityPubPersonInbox(t *testing.T) { onGiteaRun(t, func(*testing.T, *url.URL) { appURL := setting.AppURL - setting.AppURL = srv.URL + setting.AppURL = srv.URL + "/" defer func() { setting.Database.LogSQL = false setting.AppURL = appURL @@ -94,11 +95,10 @@ func TestActivityPubPersonInbox(t *testing.T) { ctx := context.Background() user1, err := user_model.GetUserByName(ctx, username1) assert.NoError(t, err) - user1url := fmt.Sprintf("%s/api/v1/activitypub/user/%s#main-key", srv.URL, username1) + user1url := fmt.Sprintf("%s/api/v1/activitypub/user-id/1#main-key", srv.URL) c, err := activitypub.NewClient(user1, user1url) assert.NoError(t, err) - username2 := "user2" - user2inboxurl := fmt.Sprintf("%s/api/v1/activitypub/user/%s/inbox", srv.URL, username2) + 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/webfinger_test.go b/tests/integration/webfinger_test.go index 226c25615fab..f67abdbc2a94 100644 --- a/tests/integration/webfinger_test.go +++ b/tests/integration/webfinger_test.go @@ -52,7 +52,7 @@ func TestWebfinger(t *testing.T) { var jrd webfingerJRD DecodeJSON(t, resp, &jrd) assert.Equal(t, "acct:user2@"+appURL.Host, jrd.Subject) - assert.ElementsMatch(t, []string{user.HTMLURL(), appURL.String() + "api/v1/activitypub/user/" + url.PathEscape(user.Name)}, jrd.Aliases) + assert.ElementsMatch(t, []string{user.HTMLURL(), appURL.String() + "api/v1/activitypub/user-id/" + fmt.Sprint(user.ID)}, jrd.Aliases) req = NewRequest(t, "GET", fmt.Sprintf("/.well-known/webfinger?resource=acct:%s@%s", user.LowerName, "unknown.host")) MakeRequest(t, req, http.StatusBadRequest) From dff3ce089d9e1ab685b5ae42980903566972cba3 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Tue, 4 Apr 2023 00:44:50 -0400 Subject: [PATCH 167/340] User/Org Feed render description as per web (#23887) (#23906) Backport #23887 by @6543 User descriptions should be rendered so that links and other markup appear correct in RSS feeds. test will be added by #23874 Co-authored-by: 6543 <6543@obermui.de> --- build.go | 1 - routers/web/feed/profile.go | 16 +++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/build.go b/build.go index d2e724a7f70c..234579b51499 100644 --- a/build.go +++ b/build.go @@ -1,7 +1,6 @@ // Copyright 2020 The Gitea Authors. All rights reserved. // SPDX-License-Identifier: MIT - //go:build vendor package main diff --git a/routers/web/feed/profile.go b/routers/web/feed/profile.go index 7641769192c5..d3b0c175d574 100644 --- a/routers/web/feed/profile.go +++ b/routers/web/feed/profile.go @@ -8,6 +8,8 @@ import ( activities_model "code.gitea.io/gitea/models/activities" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/markup" + "code.gitea.io/gitea/modules/markup/markdown" "github.com/gorilla/feeds" ) @@ -39,10 +41,22 @@ func showUserFeed(ctx *context.Context, formatType string) { return } + ctxUserDescription, err := markdown.RenderString(&markup.RenderContext{ + Ctx: ctx, + URLPrefix: ctx.ContextUser.HTMLURL(), + Metas: map[string]string{ + "user": ctx.ContextUser.GetDisplayName(), + }, + }, ctx.ContextUser.Description) + if err != nil { + ctx.ServerError("RenderString", err) + return + } + feed := &feeds.Feed{ Title: ctx.Tr("home.feed_of", ctx.ContextUser.DisplayName()), Link: &feeds.Link{Href: ctx.ContextUser.HTMLURL()}, - Description: ctx.ContextUser.Description, + Description: ctxUserDescription, Created: time.Now(), } From fd0baf637dc7cc884a79ae339f43482d75f27b2d Mon Sep 17 00:00:00 2001 From: Giteabot Date: Tue, 4 Apr 2023 07:05:41 -0400 Subject: [PATCH 168/340] Org pages style fixes (#23901) (#23914) Backport #23901 by @silverwind Few fixes/enhancements around org pages: Use flexbox for member and repo lists and tweak rendering of tabs and list: Screenshot 2023-04-03 at 22 54 24 Screenshot 2023-04-03 at 22 55 15 Vertically center remove/leave buttons, add link to avatar: Screenshot 2023-04-03 at 21 51 20 Co-authored-by: silverwind --- templates/org/home.tmpl | 4 +--- templates/org/member/members.tmpl | 4 ++-- templates/org/team/members.tmpl | 12 ++++++------ templates/org/team/navbar.tmpl | 2 +- templates/org/team/repositories.tmpl | 26 +++++++++++++------------- web_src/css/organization.css | 13 ++++++------- 6 files changed, 29 insertions(+), 32 deletions(-) diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index e1adaf1c1b16..66aa98e80d98 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -51,9 +51,7 @@ {{$isMember := .IsOrganizationMember}} {{range .Members}} {{if or $isMember (call $.IsPublicMember .ID)}} - - {{avatar $.Context .}} - + {{avatar $.Context . 48}} {{end}} {{end}}
    diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl index 0eae60fbfc49..511d333c29c2 100644 --- a/templates/org/member/members.tmpl +++ b/templates/org/member/members.tmpl @@ -8,7 +8,7 @@ {{range .Members}}
    - {{avatar $.Context . 48}} + {{avatar $.Context . 48}}
    {{.Name}}
    {{.FullName}}
    @@ -55,7 +55,7 @@ {{end}}
    {{end}} -
    +
    {{if eq $.SignedUser.ID .ID}}
    diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl index 6ea1614753ab..fd5e3b845816 100644 --- a/templates/org/team/members.tmpl +++ b/templates/org/team/members.tmpl @@ -25,19 +25,19 @@ {{end}}
    {{range .Team.Members}} -
    +
    + {{avatar $.Context . 48 "gt-mr-3 gt-mb-0"}} + + {{.DisplayName}} + {{if and $.IsOrganizationOwner (not (and ($.Team.IsOwnerTeam) (eq (len $.Team.Members) 1)))}} - {{end}} - - {{avatar $.Context .}} - {{.DisplayName}} -
    {{else}}
    diff --git a/templates/org/team/navbar.tmpl b/templates/org/team/navbar.tmpl index 436c69bfc607..44fe5f1c2111 100644 --- a/templates/org/team/navbar.tmpl +++ b/templates/org/team/navbar.tmpl @@ -1,4 +1,4 @@ -
    +
    {{svg "octicon-person"}} {{.Team.NumMembers}}  {{$.locale.Tr "org.lower_members"}} {{svg "octicon-repo"}} {{.Team.NumRepos}}  {{$.locale.Tr "org.lower_repositories"}}
    diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl index 0391a762faf2..c0f6b2561eff 100644 --- a/templates/org/team/repositories.tmpl +++ b/templates/org/team/repositories.tmpl @@ -33,25 +33,25 @@ {{end}}
    {{range .Team.Repos}} -
    +
    + {{if .IsPrivate}} + {{svg "octicon-lock" 16 "gt-mr-3"}} + {{else if .IsFork}} + {{svg "octicon-repo-forked" 16 "gt-mr-3"}} + {{else if .IsMirror}} + {{svg "octicon-mirror" 16 "gt-mr-3"}} + {{else}} + {{svg "octicon-repo" 16 "gt-mr-3"}} + {{end}} + + {{$.Org.Name}}/{{.Name}} + {{if $canAddRemove}}
    {{$.CsrfTokenHtml}}
    {{end}} - - {{if .IsPrivate}} - {{svg "octicon-lock"}} - {{else if .IsFork}} - {{svg "octicon-repo-forked"}} - {{else if .IsMirror}} - {{svg "octicon-mirror"}} - {{else}} - {{svg "octicon-repo"}} - {{end}} - {{$.Org.Name}}/{{.Name}} -
    {{else}}
    diff --git a/web_src/css/organization.css b/web_src/css/organization.css index 0a7cd26513db..35eaa3ae2218 100644 --- a/web_src/css/organization.css +++ b/web_src/css/organization.css @@ -156,11 +156,6 @@ padding: 10px 15px; } -.organization.teams .members a:hover, -.organization.profile .members a:hover { - text-decoration: none; -} - .organization.teams .members .ui.avatar, .organization.profile .members .ui.avatar { width: 48px; @@ -218,8 +213,7 @@ .organization.teams .repositories .item, .organization.teams .members .item { - padding: 10px 20px; - line-height: 32px; + padding: 10px 19px; } .organization.teams .repositories .item:not(:last-child), @@ -230,6 +224,7 @@ .organization.teams .repositories .item .button, .organization.teams .members .item .button { padding: 9px 10px; + margin: 0; } .organization.teams #add-repo-form input, @@ -248,3 +243,7 @@ .organization.teams #repo-top-segment { height: 60px; } + +.org-team-navbar .active.item { + background: var(--color-box-body) !important; +} From c34f7cdb1a46d98d73762c368cc53918cd291754 Mon Sep 17 00:00:00 2001 From: Giteabot Date: Tue, 4 Apr 2023 08:37:28 -0400 Subject: [PATCH 169/340] Use ghost user if package creator does not exist (#23822) (#23915) Backport #23822 by @KN4CK3R Fixes #23818 Co-authored-by: KN4CK3R --- models/packages/descriptor.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/models/packages/descriptor.go b/models/packages/descriptor.go index f4be21e74e20..e69b579f99b7 100644 --- a/models/packages/descriptor.go +++ b/models/packages/descriptor.go @@ -5,6 +5,7 @@ package packages import ( "context" + "errors" "fmt" "net/url" @@ -25,6 +26,7 @@ import ( "code.gitea.io/gitea/modules/packages/pypi" "code.gitea.io/gitea/modules/packages/rubygems" "code.gitea.io/gitea/modules/packages/vagrant" + "code.gitea.io/gitea/modules/util" "github.com/hashicorp/go-version" ) @@ -98,7 +100,11 @@ func GetPackageDescriptor(ctx context.Context, pv *PackageVersion) (*PackageDesc } creator, err := user_model.GetUserByID(ctx, pv.CreatorID) if err != nil { - return nil, err + if errors.Is(err, util.ErrNotExist) { + creator = user_model.NewGhostUser() + } else { + return nil, err + } } var semVer *version.Version if p.SemverCompatible { From 7c180ff8eb733e13b1e8449f911a3547a1c7ce8c Mon Sep 17 00:00:00 2001 From: Giteabot Date: Tue, 4 Apr 2023 10:02:29 -0400 Subject: [PATCH 170/340] Fix code view (diff) broken layout (#23096) (#23918) Backport #23096 by @wxiaoguang Close #22911 I think it's ready for review now, feel free to test it, welcome to help to improve. ### Before ![image](https://user-images.githubusercontent.com/2114189/220958734-06871615-b498-4143-8449-3d443f08ffaa.png) ### After ![image](https://user-images.githubusercontent.com/2114189/220958621-0dce2728-57b8-4a1f-ac5d-48c7c2d42f5c.png) Co-authored-by: wxiaoguang --- templates/repo/diff/blob_excerpt.tmpl | 6 ++--- templates/repo/diff/section_split.tmpl | 30 +++++++++++------------- templates/repo/diff/section_unified.tmpl | 8 ++++++- templates/repo/settings/lfs_file.tmpl | 2 +- web_src/css/repository.css | 10 ++++++-- web_src/css/review.css | 6 ----- web_src/js/features/repo-issue.js | 9 ------- 7 files changed, 33 insertions(+), 38 deletions(-) diff --git a/templates/repo/diff/blob_excerpt.tmpl b/templates/repo/diff/blob_excerpt.tmpl index f4f7732c5065..caa428dc2838 100644 --- a/templates/repo/diff/blob_excerpt.tmpl +++ b/templates/repo/diff/blob_excerpt.tmpl @@ -19,14 +19,14 @@ {{end}}
    		{{$inlineDiff := $.section.GetComputedInlineDiffFor $line $.locale}}{{/* + {{$inlineDiff := $.section.GetComputedInlineDiffFor $line $.locale}}{{/* */}}{{template "repo/diff/section_code" dict "diff" $inlineDiff "locale" $.locale}} {{if and $line.LeftIdx $inlineDiff.EscapeStatus.Escaped}}{{end}} {{if $line.LeftIdx}}{{end}}{{/* + {{/* */}}{{if $line.LeftIdx}}{{template "repo/diff/section_code" dict "diff" $inlineDiff "locale" $.locale}}{{else}}{{/* */}}{{/* */}}{{end}}{{/* @@ -34,7 +34,7 @@ {{if and $line.RightIdx $inlineDiff.EscapeStatus.Escaped}}{{end}} {{if $line.RightIdx}}{{end}}{{/* + {{/* */}}{{if $line.RightIdx}}{{template "repo/diff/section_code" dict "diff" $inlineDiff "locale" $.locale}}{{else}}{{/* */}}{{/* */}}{{end}}{{/* diff --git a/templates/repo/diff/section_split.tmpl b/templates/repo/diff/section_split.tmpl index c4b5ad042cf7..4fa81f4e620e 100644 --- a/templates/repo/diff/section_split.tmpl +++ b/templates/repo/diff/section_split.tmpl @@ -1,4 +1,14 @@ {{$file := .file}} +
    {{if $line.LeftIdx}}{{if $leftDiff.EscapeStatus.Escaped}}{{end}}{{end}} {{/* + {{/* */}}{{if and $.root.SignedUserID $.root.PageIsPullFiles}}{{/* */}}{{/* */}}{{svg "octicon-plus"}}{{/* @@ -48,7 +58,7 @@ {{if $match.RightIdx}}{{if $rightDiff.EscapeStatus.Escaped}}{{end}}{{end}} {{if $match.RightIdx}}{{end}}{{/* + {{/* */}}{{if and $.root.SignedUserID $.root.PageIsPullFiles}}{{/* */}}{{/* */}}{{svg "octicon-plus"}}{{/* @@ -65,7 +75,7 @@ {{if $line.LeftIdx}}{{if $inlineDiff.EscapeStatus.Escaped}}{{end}}{{end}} {{if $line.LeftIdx}}{{end}}{{/* + {{/* */}}{{if and $.root.SignedUserID $.root.PageIsPullFiles (not (eq .GetType 2))}}{{/* */}}{{/* */}}{{svg "octicon-plus"}}{{/* @@ -80,7 +90,7 @@ {{if $line.RightIdx}}{{if $inlineDiff.EscapeStatus.Escaped}}{{end}}{{end}} {{if $line.RightIdx}}{{end}}{{/* + {{/* */}}{{if and $.root.SignedUserID $.root.PageIsPullFiles (not (eq .GetType 3))}}{{/* */}}{{/* */}}{{svg "octicon-plus"}}{{/* @@ -98,9 +108,6 @@ {{$match := index $section.Lines $line.Match}} {{if or (gt (len $line.Comments) 0) (gt (len $match.Comments) 0)}}
    {{if gt (len $line.Comments) 0}} {{if eq $line.GetCommentSide "previous"}} @@ -113,9 +120,6 @@ {{end}} {{end}} {{if eq $line.GetCommentSide "proposed"}} {{template "repo/diff/conversation" mergeinto $.root "comments" $line.Comments}} @@ -130,9 +134,6 @@ {{end}} {{else if gt (len $line.Comments) 0}}
    {{if gt (len $line.Comments) 0}} {{if eq $line.GetCommentSide "previous"}} @@ -140,9 +141,6 @@ {{end}} {{end}} {{if eq $line.GetCommentSide "proposed"}} {{template "repo/diff/conversation" mergeinto $.root "comments" $line.Comments}} diff --git a/templates/repo/diff/section_unified.tmpl b/templates/repo/diff/section_unified.tmpl index e0ec85f9a6ac..ba4ad5b51393 100644 --- a/templates/repo/diff/section_unified.tmpl +++ b/templates/repo/diff/section_unified.tmpl @@ -1,4 +1,11 @@ {{$file := .file}} +
    {{template "repo/diff/conversation" mergeinto $.root "comments" $line.Comments}} {{.locale.Tr "repo.file_too_large"}}{{.LineNums}}
      {{.FileContent}}
      {{.FileContent}}