default show closed actions list if all actions was closed (#24234)

that's the same with issues and pull list

.drone.yml

@@ -1369,7 +1369,7 @@ steps:
     pull: always
     settings:
       auto_tag: false
-      tags: dev-linux-amd64
+      tags: nightly-linux-amd64
       repo: gitea/gitea
       build_args:
         - GOPROXY=https://goproxy.io
@@ -1391,7 +1391,7 @@ steps:
     settings:
       dockerfile: Dockerfile.rootless
       auto_tag: false
-      tags: dev-linux-amd64-rootless
+      tags: nightly-linux-amd64-rootless
       repo: gitea/gitea
       build_args:
         - GOPROXY=https://goproxy.io
@@ -1711,7 +1711,7 @@ steps:
     pull: always
     settings:
       auto_tag: false
-      tags: dev-linux-arm64
+      tags: nightly-linux-arm64
       repo: gitea/gitea
       build_args:
         - GOPROXY=https://goproxy.io
@@ -1733,7 +1733,7 @@ steps:
     settings:
       dockerfile: Dockerfile.rootless
       auto_tag: false
-      tags: dev-linux-arm64-rootless
+      tags: nightly-linux-arm64-rootless
       repo: gitea/gitea
       build_args:
         - GOPROXY=https://goproxy.io

.gitattributes

@@ -3,6 +3,7 @@
 /assets/*.json linguist-generated
 /public/img/svg/*.svg linguist-generated
 /public/vendor/** -text -eol linguist-vendored
+/templates/swagger/v1_json.tmpl linguist-generated
 /vendor/** -text -eol linguist-vendored
 /web_src/fomantic/build/** linguist-generated
 /web_src/js/vendor/** -text -eol linguist-vendored

.golangci.yml

@@ -5,6 +5,7 @@ linters:
     - depguard
     - dupl
     - errcheck
+    - forbidigo
     - gocritic
     # - gocyclo # The cyclomatic complexety of a lot of functions is too high, we should refactor those another time.
     - gofmt
@@ -105,6 +106,9 @@ issues:
         - errcheck
         - dupl
         - gosec
+    - path: cmd
+      linters:
+        - forbidigo
     - linters:
         - dupl
       text: "webhook"

Makefile

@@ -96,6 +96,11 @@ else
 	endif
 endif
 
+# if version = "main" then update version to "nightly"
+ifeq ($(VERSION),main)
+	VERSION := main-nightly
+endif
+
 LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)"
 
 LINUX_ARCHS ?= linux/amd64,linux/386,linux/arm-5,linux/arm-6,linux/arm64
@@ -278,8 +283,12 @@ clean:
 fmt:
 	GOFUMPT_PACKAGE=$(GOFUMPT_PACKAGE) $(GO) run build/code-batch-process.go gitea-fmt -w '{file-list}'
 	$(eval TEMPLATES := $(shell find templates -type f -name '*.tmpl'))
-	@# strip whitespace after '{{' and before `}}` unless there is only whitespace before it
+	@# strip whitespace after '{{' or '(' and before '}}' or ')' unless there is only
-	@$(SED_INPLACE) -e 's/{{[ 	]\{1,\}/{{/g' -e '/^[ 	]\{1,\}}}/! s/[ 	]\{1,\}}}/}}/g' $(TEMPLATES)
+	@# whitespace before it
+	@$(SED_INPLACE) \
+		-e 's/{{[ 	]\{1,\}/{{/g' -e '/^[ 	]\{1,\}}}/! s/[ 	]\{1,\}}}/}}/g' \
+	  -e 's/([ 	]\{1,\}/(/g' -e '/^[ 	]\{1,\})/! s/[ 	]\{1,\})/)/g' \
+	  $(TEMPLATES)
 
 .PHONY: fmt-check
 fmt-check: fmt

contrib/backport/backport.go

@@ -1,6 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
+//nolint:forbidigo
 package main
 
 import (

contrib/fixtures/fixture_generation.go

@@ -1,6 +1,7 @@
 // Copyright 2020 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
+//nolint:forbidigo
 package main
 
 import (

docker/manifest.rootless.tmpl

@@ -1,4 +1,4 @@
-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
+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}}nightly{{/if}}-rootless
 {{#if build.tags}}
 {{#unless (contains "-rc" build.tag)}}
 tags:
@@ -10,12 +10,12 @@ tags:
 {{/if}}
 manifests:
   -
-    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}}-linux-amd64-rootless
+    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}}nightly{{/if}}-linux-amd64-rootless
     platform:
       architecture: amd64
       os: linux
   -
-    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}}-linux-arm64-rootless
+    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}}nightly{{/if}}-linux-arm64-rootless
     platform:
       architecture: arm64
       os: linux

docker/manifest.tmpl

@@ -1,4 +1,4 @@
-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}}
+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}}nightly{{/if}}
 {{#if build.tags}}
 {{#unless (contains "-rc" build.tag)}}
 tags:
@@ -10,12 +10,12 @@ tags:
 {{/if}}
 manifests:
   -
-    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}}-linux-amd64
+    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}}nightly{{/if}}-linux-amd64
     platform:
       architecture: amd64
       os: linux
   -
-    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}}-linux-arm64
+    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}}nightly{{/if}}-linux-arm64
     platform:
       architecture: arm64
       os: linux

docs/content/doc/contributing/guidelines-frontend.en-us.md

@@ -49,6 +49,7 @@ We recommend [Google HTML/CSS Style Guide](https://google.github.io/styleguide/h
 9. Avoid unnecessary `!important` in CSS, add comments to explain why it's necessary if it can't be avoided.
 10. Avoid mixing different events in one event listener, prefer to use individual event listeners for every event.
 11. Custom event names are recommended to use `ce-` prefix.
+12. Gitea's tailwind-style CSS classes use `gt-` prefix (`gt-relative`), while Gitea's own private framework-level CSS classes use `g-` prefix (`g-modal-confirm`).
 
 ### Accessibility / ARIA
 

go.mod

@@ -291,7 +291,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.3-0.20230407083103-5c4a96bcb797
+replace github.com/nektos/act => gitea.com/gitea/act v0.243.4
 
 exclude github.com/gofrs/uuid v3.2.0+incompatible
 

go.sum

@@ -52,8 +52,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.3-0.20230407083103-5c4a96bcb797 h1:QdQ+pHxpbIi2qsgZbYVxqYV7trfW3P5M/T4AfpoM7iw=
+gitea.com/gitea/act v0.243.4 h1:MuBHBLCJfpa6mzwwvs4xqQynrSP2RRzpHpWfTV16PmI=
-gitea.com/gitea/act v0.243.3-0.20230407083103-5c4a96bcb797/go.mod h1:mabw6AZAiDgxGlK83orWLrNERSPvgBJzEUS3S7u2bHI=
+gitea.com/gitea/act v0.243.4/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=

models/migrations/base/tests.go

@@ -1,6 +1,7 @@
 // Copyright 2022 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
+//nolint:forbidigo
 package base
 
 import (

models/migrations/v1_11/v112.go

@@ -31,7 +31,7 @@ func RemoveAttachmentMissedRepo(x *xorm.Engine) error {
 		for i := 0; i < len(attachments); i++ {
 			uuid := attachments[i].UUID
 			if err = util.RemoveAll(filepath.Join(setting.Attachment.Path, uuid[0:1], uuid[1:2], uuid)); err != nil {
-				fmt.Printf("Error: %v", err)
+				fmt.Printf("Error: %v", err) //nolint:forbidigo
 			}
 		}
 

models/org_team.go

@@ -419,6 +419,12 @@ func DeleteTeam(t *organization.Team) error {
 		return err
 	}
 
+	for _, tm := range t.Members {
+		if err := removeInvalidOrgUser(ctx, tm.ID, t.OrgID); err != nil {
+			return err
+		}
+	}
+
 	// Update organization number of teams.
 	if _, err := db.Exec(ctx, "UPDATE `user` SET num_teams=num_teams-1 WHERE id=?", t.OrgID); err != nil {
 		return err
@@ -568,16 +574,19 @@ func removeTeamMember(ctx context.Context, team *organization.Team, userID int64
 		}
 	}
 
+	return removeInvalidOrgUser(ctx, userID, team.OrgID)
+}
+
+func removeInvalidOrgUser(ctx context.Context, userID, orgID int64) error {
 	// Check if the user is a member of any team in the organization.
-	if count, err := e.Count(&organization.TeamUser{
+	if count, err := db.GetEngine(ctx).Count(&organization.TeamUser{
 		UID:   userID,
-		OrgID: team.OrgID,
+		OrgID: orgID,
 	}); err != nil {
 		return err
 	} else if count == 0 {
-		return removeOrgUser(ctx, team.OrgID, userID)
+		return removeOrgUser(ctx, orgID, userID)
 	}
-
 	return nil
 }
 

models/unittest/fixtures.go

@@ -1,6 +1,7 @@
 // Copyright 2021 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
+//nolint:forbidigo
 package unittest
 
 import (

modules/doctor/paths.go

@@ -106,7 +106,7 @@ func isWritableDir(path string) error {
 		return err
 	}
 	if err := os.Remove(tmpFile.Name()); err != nil {
-		fmt.Printf("Warning: can't remove temporary file: '%s'\n", tmpFile.Name())
+		fmt.Printf("Warning: can't remove temporary file: '%s'\n", tmpFile.Name()) //nolint:forbidigo
 	}
 	tmpFile.Close()
 	return nil

modules/log/event.go

@@ -345,7 +345,7 @@ func (m *MultiChannelledLog) Start() {
 			for _, logger := range m.loggers {
 				err := logger.LogEvent(event)
 				if err != nil {
-					fmt.Println(err)
+					fmt.Println(err) //nolint:forbidigo
 				}
 			}
 			m.rwmutex.RUnlock()
@@ -379,7 +379,7 @@ func (m *MultiChannelledLog) emptyQueue() bool {
 			for _, logger := range m.loggers {
 				err := logger.LogEvent(event)
 				if err != nil {
-					fmt.Println(err)
+					fmt.Println(err) //nolint:forbidigo
 				}
 			}
 			m.rwmutex.RUnlock()

modules/queue/unique_queue_disk_channel_test.go

@@ -4,7 +4,6 @@
 package queue
 
 import (
-	"fmt"
 	"strconv"
 	"sync"
 	"testing"
@@ -17,7 +16,6 @@ import (
 
 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

modules/web/routing/logger_manager.go

@@ -31,7 +31,7 @@ const (
 type Printer func(trigger Event, record *requestRecord)
 
 type requestRecordsManager struct {
-	print Printer
+	print Printer //nolint:forbidigo
 
 	lock sync.Mutex
 

options/locale/locale_cs-CZ.ini

@@ -437,6 +437,7 @@ team_invite.text_3=Poznámka: Tato pozvánka byla určena pro %[1]s. Pokud jste
 [modal]
 yes=Ano
 no=Ne
+cancel=Zrušit
 modify=Aktualizovat
 
 [form]
@@ -1515,11 +1516,8 @@ pulls.tab_files=Změněné soubory
 pulls.reopen_to_merge=Prosíme, otevřete znovu tento požadavek na natažení, aby se provedlo sloučení.
 pulls.cant_reopen_deleted_branch=Tento požadavek na natažení nemůže být znovu otevřen protože větev byla smazána.
 pulls.merged=Sloučený
-pulls.merged_as=Požadavek na natažení byl sloučen jako <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a>.
 pulls.manually_merged=Sloučeno ručně
-pulls.manually_merged_as=Požadavek na natažení byl ručně sloučen jako <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a>.
 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=`<a href="#">Začněte název s <strong>%s</strong></a> 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á?

options/locale/locale_de-DE.ini

@@ -413,6 +413,7 @@ repo.collaborator.added.text=Du wurdest als Mitarbeiter für folgendes Repositor
 [modal]
 yes=Ja
 no=Abbrechen
+cancel=Abbrechen
 modify=Aktualisieren
 
 [form]
@@ -1462,11 +1463,8 @@ pulls.tab_files=Geänderte Dateien
 pulls.reopen_to_merge=Bitte diesen Pull-Request wieder öffnen, um zu mergen.
 pulls.cant_reopen_deleted_branch=Dieser Pull-Request kann nicht wieder geöffnet werden, da die Branch bereits gelöscht wurde.
 pulls.merged=Zusammengeführt
-pulls.merged_as=Der Pull Request wurde als <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a> gemergt.
 pulls.manually_merged=Manuell gemergt
-pulls.manually_merged_as=Dieser Pull Request wurde manuell als <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a> gemergt.
 pulls.is_closed=Der Pull-Request wurde geschlossen.
-pulls.has_merged=Der Pull-Request wurde gemergt.
 pulls.title_wip_desc=`<a href="#">Beginne den Titel mit <strong>%s</strong></a> 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?

options/locale/locale_el-GR.ini

@@ -462,6 +462,7 @@ team_invite.text_3=Σημείωση: Αυτή η πρόσκληση προορι
 [modal]
 yes=Ναι
 no=Όχι
+cancel=Ακύρωση
 modify=Ενημέρωση
 
 [form]
@@ -1621,11 +1622,8 @@ pulls.tab_files=Αρχεία Με Αλλαγές
 pulls.reopen_to_merge=Παρακαλώ ανοίξτε ξανά αυτό το pull request για να εκτελέσετε μια συγχώνευση.
 pulls.cant_reopen_deleted_branch=Αυτό το pull request δεν μπορεί να ανοίξει ξανά επειδή ο κλάδος διαγράφηκε.
 pulls.merged=Συγχωνευμένο
-pulls.merged_as=Το pull request έχει συγχωνευθεί ως <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a>.
 pulls.manually_merged=Συγχωνεύτηκαν χειροκίνητα
-pulls.manually_merged_as=Το pull request έχει συγχωνευθεί χειροκίνητα ως <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a>.
 pulls.is_closed=Το pull request έχει κλείσει.
-pulls.has_merged=Το pull request έχει συγχωνευθεί.
 pulls.title_wip_desc=`<a href="#">Ξεκινήστε τον τίτλο με <strong>%s</strong></a> για να αποτρέψετε την τυχαία συγχώνευση του pull request.`
 pulls.cannot_merge_work_in_progress=Αυτό το pull request επισημαίνεται ως μια εργασία σε εξέλιξη.
 pulls.still_in_progress=Ακόμα είναι σε εξέλιξη;

options/locale/locale_es-ES.ini

@@ -426,6 +426,7 @@ team_invite.text_3=Nota: Esta invitación estaba destinada a %[1]s. Si no espera
 [modal]
 yes=Sí
 no=No
+cancel=Cancelar
 modify=Actualizar
 
 [form]
@@ -1486,11 +1487,8 @@ pulls.tab_files=Archivos modificados
 pulls.reopen_to_merge=Vuelva a abrir este Pull Request para realizar una fusión.
 pulls.cant_reopen_deleted_branch=Este pull request no se puede reabrir porque la rama fue eliminada.
 pulls.merged=Fusionado
-pulls.merged_as=El Pull Request se ha fusionado como <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a>.
 pulls.manually_merged=Fusionado manualmente
-pulls.manually_merged_as=El Pull Request se ha fusionado manualmente como <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a>.
 pulls.is_closed=El pull request ha sido cerrado.
-pulls.has_merged=El pull request ha sido fusionado.
 pulls.title_wip_desc=`<a href="#">Comience el título con <strong>%s</strong></a> 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?

options/locale/locale_fa-IR.ini

@@ -389,6 +389,7 @@ repo.collaborator.added.text=شما به عنوان مشارکت‌کننده د
 [modal]
 yes=بله
 no=خیر
+cancel=انصراف
 modify=بروزرسانی
 
 [form]
@@ -1360,11 +1361,8 @@ pulls.tab_files=پرونده تغییر کرده
 pulls.reopen_to_merge=برای انجام عملیات ادغام، لطفا این تقاضای واکشی را بازگشایی نمایید.
 pulls.cant_reopen_deleted_branch=این تقاضای واکشی غیر قابل بازگشایی است چون شاخه حذف شده است.
 pulls.merged=ادغام شده
-pulls.merged_as=تقاضای واکشی <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a> ادغام شده است.
 pulls.manually_merged=بصورت دستی ادغام شد
-pulls.manually_merged_as=درخواست pull به صورت دستی به عنوان <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a> ادغام شده است.
 pulls.is_closed=این تقاضای واکشی بسته شد.
-pulls.has_merged=این تقاضای واکشی ادغام شد.
 pulls.title_wip_desc=`<a href="#"> شروع شذع با عنوان <strong>%s</strong></a> برای جلو گیری کردن از تقاضای واکشی که موقع ادغام دچار تصادم میشود.`
 pulls.cannot_merge_work_in_progress=این درخواست کشش به عنوان کار در حال انجام مشخص شده است.
 pulls.still_in_progress=هنوز در حال انجام؟

options/locale/locale_fi-FI.ini

@@ -370,6 +370,7 @@ repo.transfer.to_you=sinä
 [modal]
 yes=Kyllä
 no=Ei
+cancel=Peruuta
 modify=Päivitys
 
 [form]
@@ -1016,7 +1017,6 @@ pulls.tab_conversation=Keskustelu
 pulls.tab_commits=Commitit
 pulls.tab_files=Muuttuneet tiedostot
 pulls.merged=Yhdistetty
-pulls.has_merged=Vetopyyntö on yhdistetty.
 pulls.title_wip_desc=`<a href="#">Aloita otsikko sanalla <strong>%s</strong></a> estääksesi vetopyynnön yhdistämisen vahingossa.`
 pulls.add_prefix=Lisää <strong>%s</strong> etuliite
 pulls.remove_prefix=Poista <strong>%s</strong> etuliite

options/locale/locale_fr-FR.ini

@@ -420,6 +420,7 @@ repo.collaborator.added.text=Vous avez été ajouté en tant que collaborateur d
 [modal]
 yes=Oui
 no=Non
+cancel=Annuler
 modify=Mettre à jour
 
 [form]
@@ -1219,11 +1220,8 @@ pulls.tab_files=Fichiers Modifiés
 pulls.reopen_to_merge=Veuillez rouvrir cette demande d'ajout pour effectuer l'opération de fusion.
 pulls.cant_reopen_deleted_branch=Cette demande d'ajout ne peut pas être rouverte car la branche a été supprimée.
 pulls.merged=Fusionnée
-pulls.merged_as=La demande d'ajout a été fusionnée en <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a>.
 pulls.manually_merged=Fusionné manuellement
-pulls.manually_merged_as=La demande d'ajout a été fusionnée manuellement en tant que <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a>.
 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=`<a href="#">Préfixer le titre par <strong>%s</strong></a> 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 ?

options/locale/locale_hu-HU.ini

@@ -304,6 +304,7 @@ register_success=Sikeres regisztráció
 [modal]
 yes=Igen
 no=Nem
+cancel=Mégse
 modify=Frissítés
 
 [form]

options/locale/locale_id-ID.ini

@@ -225,6 +225,7 @@ register_success=Pendaftaran berhasil
 [modal]
 yes=Ya
 no=Tidak
+cancel=Membatalkan
 modify=Perbarui
 
 [form]

options/locale/locale_is-IS.ini

@@ -350,6 +350,7 @@ repo.collaborator.added.text=Þér hefur verið bætt við sem aðila hugbúnað
 [modal]
 yes=Já
 no=Nei
+cancel=Hætta við
 modify=Uppfæra
 
 [form]

options/locale/locale_it-IT.ini

@@ -415,6 +415,7 @@ repo.collaborator.added.text=Sei stato aggiunto come collaboratore del repositor
 [modal]
 yes=Sì
 no=No
+cancel=Annulla
 modify=Aggiorna
 
 [form]
@@ -1471,11 +1472,8 @@ pulls.tab_files=File modificati
 pulls.reopen_to_merge=Riapri questa pull request per effettuare l'unione.
 pulls.cant_reopen_deleted_branch=Questa pull request non può essere riaperta perché il branch è stato eliminato.
 pulls.merged=Unito
-pulls.merged_as=La pull request è stata unita come <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a>.
 pulls.manually_merged=Unito manualmente
-pulls.manually_merged_as=La pull request è stata unita manualmente come <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a>.
 pulls.is_closed=La pull request è stata chiusa.
-pulls.has_merged=La pull request è stata unita.
 pulls.title_wip_desc=`<a href="#">Inizia il titolo con <strong>%s</strong></a> 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?

options/locale/locale_ja-JP.ini

@@ -448,6 +448,7 @@ team_invite.text_3=注: この招待は %[1]s 宛です。 招待に心当たり
 [modal]
 yes=はい
 no=いいえ
+cancel=キャンセル
 modify=更新
 
 [form]
@@ -1605,11 +1606,8 @@ pulls.tab_files=変更されたファイル
 pulls.reopen_to_merge=このプルリクエストをマージする場合は再オープンしてください。
 pulls.cant_reopen_deleted_branch=このプルリクエストはブランチが削除されているため、再オープンできません。
 pulls.merged=マージ済み
-pulls.merged_as=プルリクエストは <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a> でマージされています。
 pulls.manually_merged=手動マージ済み
-pulls.manually_merged_as=プルリクエストは <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a> で手動マージされています。
 pulls.is_closed=プルリクエストはクローズされています。
-pulls.has_merged=プルリクエストはマージされています。
 pulls.title_wip_desc=`誤ってマージされないようにするには、<a href="#">タイトルの頭に <strong>%s</strong> を付けます</a>。`
 pulls.cannot_merge_work_in_progress=このプルリクエストは作業中(WIP)としてマーキングされています。
 pulls.still_in_progress=まだ作業中？

options/locale/locale_ko-KR.ini

@@ -286,6 +286,7 @@ register_success=등록 완료
 [modal]
 yes=예
 no=아니오
+cancel=취소
 modify=변경하기
 
 [form]
@@ -862,7 +863,6 @@ pulls.tab_commits=커밋
 pulls.tab_files=파일 변경됨
 pulls.reopen_to_merge=머지 작업을 수행하려면 이 풀 리퀘스트를 다시 열어주세요.
 pulls.merged=병합
-pulls.has_merged=풀 리퀘스트가 머지 되었습니다.
 pulls.can_auto_merge_desc=이 풀리퀘스트는 자동적으로 머지될 수 있습니다.
 pulls.cannot_auto_merge_helper=충돌을 해결하려면 수동으로 머지하십시오.
 

options/locale/locale_lv-LV.ini

@@ -438,6 +438,7 @@ team_invite.text_3=Piezīme: Šis uzaicinājums ir paredzēts %[1]s. Ja uzskatā
 [modal]
 yes=Jā
 no=Nē
+cancel=Atcelt
 modify=Atjaunināt
 
 [form]
@@ -1529,11 +1530,8 @@ pulls.tab_files=Izmainītie faili
 pulls.reopen_to_merge=Atkārtoti atveriet izmaiņu pieprasījumu, lai veiktu sapludināšanu.
 pulls.cant_reopen_deleted_branch=Šo izmaiņu pieprasīju nevar atkāroti atvērt, jo atzars ir izdzēsts.
 pulls.merged=Sapludināts
-pulls.merged_as=Izmaiņu pieprasījums tika sapludināts ar revīziju <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a>.
 pulls.manually_merged=Manuāli sapludināts
-pulls.manually_merged_as=Izmaiņu pieprasījums tika sapludināts manuāli ar revīziju <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a>.
 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=`<a href="#">Sāciet virsrakstu ar <strong>%s</strong></a>, 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?

options/locale/locale_nl-NL.ini

@@ -415,6 +415,7 @@ repo.collaborator.added.text=U bent toegevoegd als een medewerker van de reposit
 [modal]
 yes=Ja
 no=Nee
+cancel=Annuleren
 modify=Update
 
 [form]
@@ -1471,11 +1472,8 @@ pulls.tab_files=Bestanden gewijzigd
 pulls.reopen_to_merge=Heropen dit pull request aub om een een merge actie uit te voeren.
 pulls.cant_reopen_deleted_branch=Deze pull-aanvraag kan niet opnieuw worden geopend omdat de branch is verwijderd.
 pulls.merged=Samengevoegd
-pulls.merged_as=De pull request is samengevoegd als <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a>.
 pulls.manually_merged=Handmatig samengevoegd
-pulls.manually_merged_as=Het pull-verzoek is handmatig samengevoegd als <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a>.
 pulls.is_closed=Deze pull-aanvraag is gesloten.
-pulls.has_merged=Deze pull-aanvraag is al samengevoegd.
 pulls.title_wip_desc=`<a href="#">Start de titel met <strong>%s</strong></a> 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?

options/locale/locale_pl-PL.ini

@@ -402,6 +402,7 @@ repo.collaborator.added.text=Zostałeś dodany jako współtwórca repozytorium:
 [modal]
 yes=Tak
 no=Nie
+cancel=Anuluj
 modify=Aktualizuj
 
 [form]
@@ -1336,10 +1337,8 @@ pulls.tab_files=Zmodyfikowane pliki
 pulls.reopen_to_merge=Otwórz ponownie ten Pull Request, aby wykonać scalenie.
 pulls.cant_reopen_deleted_branch=Ten Pull Request nie może być ponownie otwarty, ponieważ jedna z gałęzi została usunięta.
 pulls.merged=Scalone
-pulls.merged_as=Pull Request został scalony jako <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a>.
 pulls.manually_merged=Ręcznie scalone
 pulls.is_closed=Pull Request został zamknięty.
-pulls.has_merged=Pull Request został scalony.
 pulls.title_wip_desc=`<a href="#">Poprzedź tytuł przy pomocy <strong>%s</strong></a>, aby zapobiec przypadkowemu scaleniu tego Pull Requesta.`
 pulls.still_in_progress=Wciąż w toku?
 pulls.add_prefix=Dodaj <strong>%s</strong> prefiks

options/locale/locale_pt-BR.ini

@@ -438,6 +438,7 @@ team_invite.text_3=Nota: este convite foi destinado a %[1]s. Se você não estav
 [modal]
 yes=Sim
 no=Não
+cancel=Cancelar
 modify=Atualizar
 
 [form]
@@ -1529,11 +1530,8 @@ pulls.tab_files=Arquivos alterados
 pulls.reopen_to_merge=Por favor reabra este pull request para aplicar o merge.
 pulls.cant_reopen_deleted_branch=Este pull request não pode ser reaberto porque o branch foi excluído.
 pulls.merged=Merge aplicado
-pulls.merged_as=O pull request teve merge aplicado como <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a>.
 pulls.manually_merged=Merge aplicado manualmente
-pulls.manually_merged_as=O pull request foi aplicado manualmente como <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a>.
 pulls.is_closed=O pull request foi fechado.
-pulls.has_merged=O merge deste pull request foi aplicado.
 pulls.title_wip_desc=`<a href="#">Inicie o título com o prefixo <strong>%s</strong></a> 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?

options/locale/locale_pt-PT.ini

@@ -462,6 +462,8 @@ team_invite.text_3=Nota: Este convite é dirigido a %[1]s. Se não estava à esp
 [modal]
 yes=Sim
 no=Não
+confirm=Confirmar
+cancel=Cancelar
 modify=Modificar
 
 [form]
@@ -1621,11 +1623,11 @@ pulls.tab_files=Ficheiros modificados
 pulls.reopen_to_merge=Reabra este pedido de integração para executar uma integração.
 pulls.cant_reopen_deleted_branch=Este pedido de integração não pode ser reaberto porque o ramo foi eliminado.
 pulls.merged=Integrado
-pulls.merged_as=A integração foi executada no cometimento <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a>.
+pulls.merged_success=A integração constante no pedido foi executada com sucesso e o pedido foi fechado
+pulls.closed=Pedido de integração fechado
 pulls.manually_merged=Integrado manualmente
-pulls.manually_merged_as=A integração foi executada manualmente no cometimento <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a>.
+pulls.merged_info_text=O ramo %s agora pode ser eliminado.
 pulls.is_closed=O pedido de integração foi fechado.
-pulls.has_merged=A integração foi executada.
 pulls.title_wip_desc=`<a href="#">Inicie o título com <strong>%s</strong></a> 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?

options/locale/locale_ru-RU.ini

@@ -459,6 +459,7 @@ team_invite.text_3=Примечание: Это приглашение было
 [modal]
 yes=Да
 no=Нет
+cancel=Отменить
 modify=Изменить
 
 [form]
@@ -497,6 +498,7 @@ include_error=` должно содержать подстроку «%s».`
 glob_pattern_error=` неверный glob шаблон: %s.`
 regex_pattern_error=` Неверный шаблон регулярного выражения: %s.`
 username_error=` может содержать только алфавитно-цифровые символы ('0-9','a-z','A-Z'), тире ('-'), подчеркивания ('_') и точку ('.'). Первый символ должен быть алфавитно-цифровым, последовательности из нескольких не алфавитно-цифровых символов запрещены.`
+invalid_group_team_map_error=` сопоставление недопустимо: %s`
 unknown_error=Неизвестная ошибка:
 captcha_incorrect=Капча не пройдена.
 password_not_match=Пароли не совпадают.
@@ -919,6 +921,7 @@ default_branch=Ветка по умолчанию
 default_branch_helper=Ветка по умолчанию является базовой веткой для запросов на слияние и коммитов кода.
 mirror_prune=Очистить
 mirror_prune_desc=Удаление устаревших отслеживаемых ссылок
+mirror_interval=Интервал зеркалирования (допустимы единицы времени 'h', 'm', 's'). Значение 0 отключает периодическую синхронизацию. (Минимальный интервал: %s)
 mirror_interval_invalid=Недопустимый интервал зеркалирования.
 mirror_sync_on_commit=Синхронизировать при отправке коммитов
 mirror_address=Клонировать по URL
@@ -1599,11 +1602,11 @@ pulls.tab_files=Изменённые файлы
 pulls.reopen_to_merge=Пожалуйста, переоткройте этот запрос на слияние для выполнения слияния.
 pulls.cant_reopen_deleted_branch=Этот запрос на слияние не может быть открыт заново, потому что ветка была удалена.
 pulls.merged=Слито
-pulls.merged_as=Запрос на слияние был объединен как <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a>.
+pulls.merged_success=Запрос на слияние удовлетворён и закрыт
+pulls.closed=Запрос на слияние закрыт
 pulls.manually_merged=Слито вручную
-pulls.manually_merged_as=Запрос на слияние был объединён вручную, как <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a>.
+pulls.merged_info_text=Ветку %s теперь можно удалить.
 pulls.is_closed=Запрос на слияние закрыт.
-pulls.has_merged=Слияние этого запроса успешно завершено.
 pulls.title_wip_desc=`<a href="#">Добавьте <strong>%s</strong> в начало заголовка</a> для защиты от случайного досрочного принятия запроса на слияние`
 pulls.cannot_merge_work_in_progress=Этот запрос на слияние помечен как в процессе работы.
 pulls.still_in_progress=Всё ещё в процессе?
@@ -2164,6 +2167,7 @@ settings.block_on_official_review_requests_desc=Слияние невозмож
 settings.block_outdated_branch=Блокировать слияние, если запрос на слияние устарел
 settings.block_outdated_branch_desc=Слияние будет невозможно, если головная ветвь находится позади базовой ветви.
 settings.default_branch_desc=Главная ветка является "базовой" для вашего репозитория, на которую по умолчанию направлены все запросы на слияние и которая является лицом вашего репозитория. Первое, что увидит посетитель — это содержимое главной ветки. Выберите её из уже существующих:
+settings.merge_style_desc=Стили слияния
 settings.default_merge_style_desc=Стиль слияния по умолчанию:
 settings.choose_branch=Выберите ветку…
 settings.no_protected_branch=Нет защищённых веток.
@@ -3148,6 +3152,7 @@ error.probable_bad_signature=ВНИМАНИЕ! Хотя в базе данных
 error.probable_bad_default_signature=ВНИМАНИЕ! Хотя ключ по умолчанию имеет этот идентификатор, он не заверяет этот коммит! Этот коммит ПОДОЗРИТЕЛЬНЫЙ.
 
 [units]
+unit=Элемент
 error.no_unit_allowed_repo=У вас нет доступа ни к одному разделу этого репозитория.
 error.unit_not_allowed=У вас нет доступа к этому разделу репозитория.
 
@@ -3242,6 +3247,7 @@ pypi.install=Чтобы установить пакет с помощью pip,
 pypi.documentation=Для получения дополнительной информации о реестре PyPI смотрите <a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/packages/pypi/">документацию</a>.
 rubygems.install=Чтобы установить пакет с помощью gem, выполните следующую команду:
 rubygems.install2=или добавьте его в Gemfile:
+rubygems.dependencies.runtime=Зависимости времени выполнения
 rubygems.dependencies.development=Зависимости для разработки
 rubygems.required.ruby=Требуется версия Ruby
 rubygems.required.rubygems=Требуется версия RubyGem
@@ -3250,6 +3256,7 @@ swift.registry=Настроить реестр из командной стро
 swift.install=Добавьте пакет в свой файл <code>Package.swift</code>:
 swift.install2=и запустите следующую команду:
 swift.documentation=Для получения дополнительной информации о реестре Swift смотрите <a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/packages/swift/">документацию</a>.
+vagrant.install=Чтобы добавить бокс Vagrant, выполните следующую команду:
 vagrant.documentation=Для получения дополнительной информации о реестре Vagrant смотрите <a target="_blank" rel="noopener noreferrer" href="https://docs.gitea.io/en-us/packages/vagrant/">документацию</a>.
 settings.link=Связать этот пакет с репозиторием
 settings.link.description=Если связать пакет с репозиторием, он добавится в список пакетов репозитория.

options/locale/locale_si-LK.ini

@@ -376,6 +376,7 @@ repo.collaborator.added.text=ඔබ ගබඩාවේ සහයෝගිතා
 [modal]
 yes=ඔව්
 no=නැහැ
+cancel=අවලංගු කරන්න
 modify=යාවත්කාල
 
 [form]
@@ -1315,11 +1316,8 @@ pulls.tab_files=වෙනස් වූ ගොනු
 pulls.reopen_to_merge=ඒකාබද්ධ කිරීම සඳහා කරුණාකර මෙම අදින්න ඉල්ලීම නැවත විවෘත කරන්න.
 pulls.cant_reopen_deleted_branch=ශාඛාව මකා දැමූ නිසා මෙම අදින්න ඉල්ලීම නැවත විවෘත කළ නොහැක.
 pulls.merged=සංයුක්ත කෙරිණි
-pulls.merged_as=මෙම අදින්න ඉල්ලීම ලෙස ඒකාබද්ධ කර ඇත <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]ගේ</code></a>.
 pulls.manually_merged=අතින් සංයුක්ත කර ඇත
-pulls.manually_merged_as=මෙම අදින්න ඉල්ලීම අතින් <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]ගේ</code></a>ලෙස ඒකාබද්ධ කර ඇත.
 pulls.is_closed=අදින්න ඉල්ලීම වසා දමා ඇත.
-pulls.has_merged=මෙම අදින්න ඉල්ලීම ඒකාබද්ධ කර ඇත.
 pulls.title_wip_desc=<a href="#">අහම්බෙන් ඒකාබද්ධ කිරීමෙන් අදින්න ඉල්ලීම වැළැක්වීම සඳහා <strong>%s</strong></a> සමඟ මාතෘකාව ආරම්භ කරන්න. 
 pulls.cannot_merge_work_in_progress=මෙම අදින්න ඉල්ලීම ක්රියාත්මක වන කාර්යයක් ලෙස සලකුණු කර ඇත.
 pulls.still_in_progress=තවමත් ක්රියාත්මක වෙමින් තිබේද?

options/locale/locale_sk-SK.ini

@@ -416,6 +416,7 @@ repo.collaborator.added.text=Boli ste pridaný ako spolupracovník repozitára:
 [modal]
 yes=Áno
 no=Nie
+cancel=Zrušiť
 modify=Aktualizovať
 
 [form]

options/locale/locale_sv-SE.ini

@@ -317,6 +317,7 @@ register_success=Registreringen lyckades
 [modal]
 yes=Ja
 no=Nej
+cancel=Avbryt
 modify=Uppdatera
 
 [form]
@@ -1130,9 +1131,7 @@ pulls.tab_files=Ändrade Filer
 pulls.reopen_to_merge=Vänligen återöppna denna Pull-förfrågan igen för att utföra sammanfogningen.
 pulls.cant_reopen_deleted_branch=Denna pull-förfrågan kan inte öppnas igen eftersom branchen tagits bort.
 pulls.merged=Sammanfogat
-pulls.merged_as=Pull-förfrågan har sammanfogats som <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a>.
 pulls.is_closed=Pull-förfrågan har stängts.
-pulls.has_merged=Pull-requested har blivit mergad.
 pulls.title_wip_desc=`<a href="#">Börja titeln med <strong>%s</strong></a> 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.

options/locale/locale_tr-TR.ini

@@ -462,6 +462,7 @@ team_invite.text_3=Not: Bu davet %[1] içindi. Bu daveti beklemiyorsanız, e-pos
 [modal]
 yes=Evet
 no=Hayır
+cancel=İptal
 modify=Güncelle
 
 [form]
@@ -1617,11 +1618,8 @@ pulls.tab_files=Değiştirilen Dosyalar
 pulls.reopen_to_merge=Lütfen birleştirme gerçekleştirmek için bu değişiklik isteğini yeniden açın.
 pulls.cant_reopen_deleted_branch=Dal silindiğinden bu değişiklik isteği yeniden açılamaz.
 pulls.merged=Birleştirildi
-pulls.merged_as=Değişiklik isteği <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a> olarak birleştirildi.
 pulls.manually_merged=Elle birleştirildi
-pulls.manually_merged_as=Değişiklik isteği <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a> 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, <a href="#">başlığı <strong>%s</strong> ile başlatın</a>`
 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?

options/locale/locale_uk-UA.ini

@@ -392,6 +392,7 @@ repo.collaborator.added.text=Ви були додані в якості спів
 [modal]
 yes=Так
 no=Ні
+cancel=Відмінити
 modify=Оновлення
 
 [form]
@@ -1370,11 +1371,8 @@ pulls.tab_files=Змінені файли
 pulls.reopen_to_merge=Будь ласка перевідкрийте цей запит щоб здіснити операцію злиття.
 pulls.cant_reopen_deleted_branch=Цей запит не можна повторно відкрити, оскільки гілку видалено.
 pulls.merged=Злито
-pulls.merged_as=Запит на злиття був влитиий як <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a>.
 pulls.manually_merged=Ручне злиття
-pulls.manually_merged_as=Запит на злиття був вручну злитиий як <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a>.
 pulls.is_closed=Запит на злиття було закрито.
-pulls.has_merged=Запит на злиття було об'єднано.
 pulls.title_wip_desc=`<a href="#">Почніть заголовок з <strong>%s</strong></a> щоб запобігти випадковому злиттю запитів.`
 pulls.cannot_merge_work_in_progress=Цей пулл-реквест позначений як прийнятий в опрацювання.
 pulls.still_in_progress=Все ще в процесі?

options/locale/locale_zh-CN.ini

@@ -442,6 +442,7 @@ team_invite.text_3=注意：这是发送给 %[1]s 的邀请。如果您未曾收
 [modal]
 yes=确认操作
 no=取消操作
+cancel=取消
 modify=更新
 
 [form]
@@ -1548,11 +1549,8 @@ pulls.tab_files=文件变动
 pulls.reopen_to_merge=请重新创建此合并请求。
 pulls.cant_reopen_deleted_branch=无法重新打开此合并请求，因为分支已删除。
 pulls.merged=已合并
-pulls.merged_as=该合并请求已作为 <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a> 被合并。
 pulls.manually_merged=已手动合并
-pulls.manually_merged_as=合并请求已被手动合并为 <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a>
 pulls.is_closed=合并请求已经关闭。
-pulls.has_merged=请求已合并。
 pulls.title_wip_desc=`<a href="#">标题以 <strong>%s</strong> 开头</a>以免合并请求意外合并。`
 pulls.cannot_merge_work_in_progress=此合并请求被标记为正在进行的工作。
 pulls.still_in_progress=仍在进行中？

options/locale/locale_zh-HK.ini

@@ -149,6 +149,7 @@ register_success=註冊成功
 [modal]
 yes=確認操作
 no=取消操作
+cancel=取消
 
 [form]
 UserName=使用者名稱

options/locale/locale_zh-TW.ini

@@ -119,6 +119,10 @@ footer.software=關於軟體
 footer.links=連結
 
 [heatmap]
+number_of_contributions_in_the_last_12_months=過去十二個月內有 %s 個貢獻
+no_contributions=沒有貢獻
+less=少
+more=多
 
 [editor]
 buttons.heading.tooltip=新增標題
@@ -186,7 +190,7 @@ no_admin_and_disable_registration=您不能夠在未建立管理員使用者的
 err_empty_admin_password=管理員密碼不能為空。
 err_empty_admin_email=管理員信箱不能為空。
 err_admin_name_is_reserved=無效的管理員帳號，帳號已被保留
-err_admin_name_pattern_not_allowed=管理員帳號無效，該帳號是保留名稱
+err_admin_name_pattern_not_allowed=無效的管理員帳號，該帳號符合保留規則
 err_admin_name_is_invalid=無效的管理員帳號
 
 general_title=一般設定
@@ -247,6 +251,7 @@ install_btn_confirm=安裝 Gitea
 test_git_failed=無法識別「git」命令：%v
 sqlite3_not_available=您目前的版本不支援 SQLite3，請從 %s 下載官方的預先編譯版本 (不是 gobuild 版本)。
 invalid_db_setting=資料庫設定不正確： %v
+invalid_db_table=資料庫的資料表「%s」無效: %v
 invalid_repo_path=儲存庫根目錄設定不正確：%v
 invalid_app_data_path=無效的應用程式資料路徑：%v
 run_user_not_match=「以...執行」的使用者名稱不是目前的使用者名稱：%s -> %s
@@ -312,6 +317,7 @@ repo_no_results=沒有找到符合的儲存庫。
 user_no_results=沒有找到符合的使用者。
 org_no_results=沒有找到符合的組織。
 code_no_results=找不到符合您關鍵字的原始碼。
+code_search_results=「%s」的搜尋結果
 code_last_indexed_at=最後索引 %s
 relevant_repositories_tooltip=已隱藏缺少主題、圖示、說明、Fork 的儲存庫。
 relevant_repositories=只顯示相關的儲存庫，<a href="%s">顯示未篩選的結果</a>。
@@ -455,6 +461,7 @@ team_invite.text_3=備註: 這是寄給 %[1]s 的邀請。若您未預期收到
 [modal]
 yes=是
 no=否
+cancel=取消
 modify=更新
 
 [form]
@@ -488,6 +495,8 @@ 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.`
 username_error=`只能包含英文字母數字 ('0-9'、'a-z'、'A-Z')、破折號 ('-')、底線 ('_')、句點 ('.')，不能以非英文字母數字開頭或結尾，也不允許連續的非英文字母數字。`
@@ -512,6 +521,7 @@ team_name_been_taken=團隊名稱已被使用。
 team_no_units_error=請至少選擇一個儲存庫區域。
 email_been_used=此電子信箱已被使用
 email_invalid=此電子信箱無效。
+openid_been_used=OpenID 位址「%s」已被使用。
 username_password_incorrect=帳號或密碼不正確
 password_complexity=密碼複雜度沒有通過以下的要求:
 password_lowercase_one=至少要有一個小寫字母
@@ -563,6 +573,9 @@ disabled_public_activity=這個使用者已對外隱藏動態
 email_visibility.limited=所有已驗證的使用者都可以看到您的電子信箱地址
 email_visibility.private=只有您和系統管理員可以看到您的電子信箱地址
 
+form.name_reserved=「%s」是保留的帳號。
+form.name_pattern_not_allowed=帳號不可包含字元「%s」。
+form.name_chars_not_allowed=帳號「%s」包含無效字元。
 
 [settings]
 profile=個人資料
@@ -593,6 +606,7 @@ location=所在地區
 update_theme=更新佈景主題
 update_profile=更新個人資料
 update_language=更新語言
+update_language_not_found=無法使用語言「%s」。
 update_language_success=已更新語言。
 update_profile_success=已更新您的個人資料。
 change_username=您的帳號已更改。
@@ -704,6 +718,7 @@ gpg_token_help=您可以使用以下方法產生簽署：
 gpg_token_code=echo "%s" | gpg -a --default-key %s --detach-sig
 gpg_token_signature=Armored GPG 簽署
 key_signature_gpg_placeholder=以「-----BEGIN PGP SIGNATURE-----」開頭
+verify_gpg_key_success=已驗證 GPG 金鑰「%s」。
 ssh_key_verified=已驗證的金鑰
 ssh_key_verified_long=金鑰已被 Token 驗證且可用來驗證符合此使用者已啟用的電子信箱的提交。
 ssh_key_verify=驗證
@@ -713,11 +728,15 @@ ssh_token=Token
 ssh_token_help=您可以使用以下方法產生簽署：
 ssh_token_signature=Armored SSH 簽署
 key_signature_ssh_placeholder=以「-----BEGIN SSH SIGNATURE-----」開頭
+verify_ssh_key_success=已驗證 SSH 金鑰「%s」。
 subkeys=次金鑰
 key_id=金鑰 ID
 key_name=金鑰名稱
 key_content=內容
 principal_content=內容
+add_key_success=已新增 SSH 金鑰「%s」。
+add_gpg_key_success=已新增 GPG 金鑰「%s」。
+add_principal_success=已新增 SSH 認證主體「%s」。
 delete_key=移除
 ssh_key_deletion=移除 SSH 金鑰
 gpg_key_deletion=移除 GPG 金鑰
@@ -971,6 +990,7 @@ archive.pull.nocomment=此存儲庫已封存，您不能在合併請求上留言
 
 form.reach_limit_of_creation_1=您已經達到了您儲存庫的數量上限 (%d 個)。
 form.reach_limit_of_creation_n=您已經達到了您儲存庫的數量上限 (%d 個)。
+form.name_reserved=「%s」是保留的儲存庫名稱。
 
 need_auth=授權
 migrate_options=遷移選項
@@ -1122,6 +1142,7 @@ editor.must_be_on_a_branch=你必須在一個分支或提出對此檔的更改
 editor.fork_before_edit=如果你想要對這個檔案進行或提出修改，請先 fork 這個儲存庫。
 editor.delete_this_file=刪除檔案
 editor.must_have_write_access=您必須擁有寫入權限才能對此檔案進行修改或提出變更。
+editor.file_delete_success=已刪除文件「%s」。
 editor.name_your_file=命名您的檔案...
 editor.filename_help=輸入名稱和斜線 ('/') 以新增目錄。在文字框的開始輸入倒退鍵以移除目錄。
 editor.or=或
@@ -1129,8 +1150,12 @@ editor.cancel_lower=取消
 editor.commit_signed_changes=提交簽署過的變更
 editor.commit_changes=提交變更
 editor.add_tmpl=新增「<filename>」
+editor.add=新增 %s
+editor.update=更新 %s
+editor.delete=刪除 %s
 editor.patch=套用 Patch
 editor.patching=正在 Patch:
+editor.fail_to_apply_patch=無法套用 Patch「%s」
 editor.new_patch=新增 Patch
 editor.commit_message_desc=(選用) 加入詳細說明...
 editor.signoff_desc=在提交訊息底部加入提交者的「Signed-off-by」資訊。
@@ -1142,15 +1167,24 @@ editor.new_branch_name=命名此提交的新分支
 editor.new_branch_name_desc=新的分支名稱...
 editor.cancel=取消
 editor.filename_cannot_be_empty=檔案名稱不能為空。
+editor.filename_is_invalid=檔名無效:「%s」。
+editor.branch_does_not_exist=此儲存庫沒有名為「%s」的分支。
+editor.branch_already_exists=此儲存庫已有名為「%s」的分支。
 editor.file_changed_while_editing=檔案內容在您編輯的途中已被變更。<a target="_blank" rel="noopener noreferrer" href="%s">按一下此處</a>查看更動的地方或<strong>再次提交</strong>以覆蓋這些變更。
+editor.file_already_exists=此儲存庫已有名為「%s」的檔案。
 editor.commit_empty_file_header=提交空白檔案
 editor.commit_empty_file_text=你準備提交的檔案是空白的，是否繼續？
 editor.no_changes_to_show=沒有可以顯示的變更。
+editor.fail_to_update_file=更新/建立檔案「%s」失敗。
 editor.fail_to_update_file_summary=錯誤訊息:
 editor.push_rejected_no_message=該變更被伺服器拒絕但未提供其他資訊。請檢查 Git Hook。
 editor.push_rejected=該變更被伺服器拒絕。請檢查 Git Hook。
 editor.push_rejected_summary=完整的拒絕訊息:
 editor.add_subdir=加入目錄
+editor.unable_to_upload_files=上傳檔案到「%s」時失敗，錯誤訊息: %v
+editor.upload_file_is_locked=檔案「%s」已被 %s 鎖定。
+editor.upload_files_to_dir=上傳檔案到「%s」
+editor.cannot_commit_to_protected_branch=無法提交到受保護的分支「%s」。
 editor.no_commit_to_branch=無法直接提交到分支因為：
 editor.user_no_push_to_branch=使用者無法推送到分支
 editor.require_signed_commit=分支僅接受經簽署的提交
@@ -1159,6 +1193,7 @@ editor.revert=還原 %s 到：
 
 commits.desc=瀏覽原始碼修改歷程。
 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-01-13」。
@@ -1194,12 +1229,14 @@ projects.create=建立專案
 projects.title=標題
 projects.new=新增專案
 projects.new_subheader=在同一個地方協調、追蹤和更新您的工作，使專案保持透明並按計畫進行。
+projects.create_success=已建立專案「%s」。
 projects.deletion=刪除專案
 projects.deletion_desc=刪除專案會從所有相關的問題移除它。是否繼續？
 projects.deletion_success=專案已被刪除。
 projects.edit=編輯專案
 projects.edit_subheader=專案可用來組織問題和追蹤進度。
 projects.modify=更新專案
+projects.edit_success=已更新專案「%s」。
 projects.type.none=無
 projects.type.basic_kanban=基本看板
 projects.type.bug_triage=Bug 檢傷分類
@@ -1271,6 +1308,7 @@ issues.label_templates.title=載入一組預定義的標籤
 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
@@ -1569,11 +1607,8 @@ pulls.tab_files=檔案變動
 pulls.reopen_to_merge=請重新開放此合併請求以進行合併作業。
 pulls.cant_reopen_deleted_branch=無法重新開放此合併請求，因為該分支已刪除。
 pulls.merged=已合併
-pulls.merged_as=此合併請求已被合併為 <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a>。
 pulls.manually_merged=手動合併
-pulls.manually_merged_as=此合併請求已被手動合併為 <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a>。
 pulls.is_closed=合併請求已被關閉。
-pulls.has_merged=合併請求已合併。
 pulls.title_wip_desc=`<a href="#">標題用 <strong>%s</strong> 開頭</a>以避免意外地合併此合併請求。`
 pulls.cannot_merge_work_in_progress=此合併請求被標記為還在進行中 (WIP)。
 pulls.still_in_progress=還在進行中嗎？
@@ -1669,6 +1704,7 @@ pulls.delete.text=您真的要刪除此合併請求嗎？(這將會永久移除
 
 milestones.new=新增里程碑
 milestones.closed=於 %s關閉
+milestones.update_ago=已更新 %s
 milestones.no_due_date=暫無截止日期
 milestones.open=開啟
 milestones.close=關閉
@@ -1680,10 +1716,12 @@ milestones.desc=描述
 milestones.due_date=截止日期 (選用)
 milestones.clear=清除
 milestones.invalid_due_date_format=截止日期的格式必須為「yyyy-mm-dd」。
+milestones.create_success=已建立里程碑「%s」。
 milestones.edit=編輯里程碑
 milestones.edit_subheader=里程碑可用來組織問題和追蹤進度。
 milestones.cancel=取消
 milestones.modify=更新里程碑
+milestones.edit_success=已更新里程碑「%s」。
 milestones.deletion=刪除里程碑
 milestones.deletion_desc=刪除里程碑會從所有相關的問題移除它。是否繼續？
 milestones.deletion_success=里程碑已刪除
@@ -1694,6 +1732,7 @@ 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=沒有金鑰可用來簽署此提交
 signing.wont_sign.never=將不會簽署提交
@@ -1729,7 +1768,9 @@ wiki.file_revision=頁面修訂記錄
 wiki.wiki_page_revisions=Wiki 頁面修訂記錄
 wiki.back_to_wiki=回到 Wiki 頁面
 wiki.delete_page_button=刪除頁面
+wiki.delete_page_notice_1=刪除 Wiki 頁面「%s」將不可還原。是否繼續？
 wiki.page_already_exists=相同名稱的 Wiki 頁面已經存在。
+wiki.reserved_page=「%s」是保留的 Wiki 頁面名稱。
 wiki.pages=所有頁面
 wiki.last_updated=最後更新於 %s
 wiki.page_name_desc=輸入此 Wiki 頁面的名稱。一些特殊名稱有：「Home」、「_Sidebar」、「_Footer」等。
@@ -2076,6 +2117,7 @@ settings.title=標題
 settings.deploy_key_content=內容
 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=部署金鑰已移除。
@@ -2306,23 +2348,41 @@ release.tags_for=%s 的標籤
 
 branch.name=分支名稱
 branch.search=搜尋分支
+branch.already_exists=已存在名為「%s」的分支。
 branch.delete_head=刪除
+branch.delete=刪除分支「%s」
 branch.delete_html=刪除分支
 branch.delete_desc=刪除分支是永久的。 此動作<strong>不可</strong>還原，是否繼續？
+branch.deletion_success=已刪除分支「%s」。
+branch.deletion_failed=刪除分支「%s」失敗。
+branch.delete_branch_has_new_commits=因為合併後已加入了新的提交，「%s」分支無法被刪除。
 branch.create_branch=建立分支 <strong>%s</strong>
+branch.create_from=從「%s」
+branch.create_success=已建立分支「%s」。
+branch.branch_already_exists=此儲存庫已有名為「%s」的分支。
+branch.branch_name_conflict=分支名稱「%s」與現有分支「%s」衝突。
 branch.deleted_by=由 %s 刪除
+branch.restore_success=已還原分支「%s」。
+branch.restore_failed=還原分支「%s」失敗。
+branch.protected_deletion_failed=分支「%s」已被保護，不能刪除。
+branch.default_deletion_failed=分支「%s」為預設分支，不能刪除。
+branch.restore=還原分支「%s」
+branch.download=下載分支「%s」
 branch.included_desc=此分支是預設分支的一部分
 branch.included=包含
 branch.create_new_branch=從下列分支建立分支：
 branch.confirm_create_branch=建立分支
 branch.create_branch_operation=建立分支
 branch.new_branch=建立新分支
+branch.new_branch_from=從「%s」建立新分支
 branch.renamed=分支 %s 被重新命名為 %s。
 
 tag.create_tag=建立標籤 <strong>%s</strong>
 tag.create_tag_operation=建立標籤
 tag.confirm_create_tag=建立標籤
+tag.create_tag_from=從「%s」建立新標籤
 
+tag.create_success=已建立標籤「%s」。
 
 topic.manage_topics=管理主題
 topic.done=完成
@@ -2359,6 +2419,7 @@ team_permission_desc=權限
 team_unit_desc=允許存取的儲存庫區域
 team_unit_disabled=(已停用)
 
+form.name_reserved=「%s」是保留的組織名稱。
 form.create_org_not_allowed=此帳號禁止建立組織。
 
 settings=組織設定
@@ -2567,6 +2628,7 @@ users.created=建立時間
 users.last_login=上次登入
 users.never_login=從未登入
 users.send_register_notify=寄送使用者註冊通知
+users.new_success=已建立新帳戶「%s」。
 users.edit=編輯
 users.auth_source=認證來源
 users.local=本地
@@ -2766,6 +2828,7 @@ auths.tip.yandex=建立新的應用程式，從「Yandex.Passport API」區塊
 auths.tip.mastodon=輸入您欲認證的 Mastodon 執行個體的自訂網址 (或使用預設值)
 auths.edit=修改認證來源
 auths.activated=該認證來源已啟用
+auths.new_success=已新增認證「%s」。
 auths.update_success=已更新認證來源。
 auths.update=更新認證來源
 auths.delete=刪除認證來源
@@ -2773,6 +2836,7 @@ 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=已經有相同類型的認證來源。
 auths.unable_to_initialize_openid=無法初始化 OpenID 連接提供者: %s
 auths.invalid_openIdConnectAutoDiscoveryURL=自動探索 URL 無效 (它必須是以 http:// 或 https:// 開頭的有效 URL)
@@ -2865,6 +2929,8 @@ config.mailer_sendmail_timeout=Sendmail 逾時
 config.mailer_use_dummy=Dummy
 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=啟用服務
@@ -3255,6 +3321,7 @@ name=名稱
 creation=加入 Secret
 creation.name_placeholder=不區分大小寫，只能包含英文字母、數字、底線 ('_')，不能以 GITEA_ 或 GITHUB_ 開頭。
 creation.value_placeholder=輸入任何內容，頭尾的空白都會被忽略。
+creation.success=已新增 Secret「%s」。
 creation.failed=加入 Secret 失敗。
 deletion=移除 Secret
 deletion.description=移除 Secret 是永久的且不可還原，是否繼續？
@@ -3319,6 +3386,7 @@ runs.closed_tab=%d 已關閉
 runs.commit=提交
 runs.pushed_by=推送者
 runs.invalid_workflow_helper=工作流程設定檔無效。請檢查您的設定檔: %s
+runs.no_matching_runner_helper=找不到符合的 Runner: %s
 
 need_approval_desc=來自 Frok 儲存庫的合併請求需要核可才能執行工作流程。
 

routers/api/v1/admin/hooks.go

@@ -142,7 +142,7 @@ func EditHook(ctx *context.APIContext) {
 
 // DeleteHook delete a system hook
 func DeleteHook(ctx *context.APIContext) {
-	// swagger:operation DELETE /amdin/hooks/{id} admin adminDeleteHook
+	// swagger:operation DELETE /admin/hooks/{id} admin adminDeleteHook
 	// ---
 	// summary: Delete a hook
 	// produces:

routers/web/repo/actions/actions.go

@@ -162,12 +162,18 @@ func List(ctx *context.Context) {
 	ctx.Data["NumClosedActionRuns"] = numClosedRuns
 
 	opts.IsClosed = util.OptionalBoolNone
-	if ctx.FormString("state") == "closed" {
+	isShowClosed := ctx.FormString("state") == "closed"
+	if len(ctx.FormString("state")) == 0 && numOpenRuns == 0 && numClosedRuns != 0 {
+		isShowClosed = true
+	}
+
+	if isShowClosed {
 		opts.IsClosed = util.OptionalBoolTrue
 		ctx.Data["IsShowClosed"] = true
 	} else {
 		opts.IsClosed = util.OptionalBoolFalse
 	}
+
 	runs, total, err := actions_model.FindRuns(ctx, opts)
 	if err != nil {
 		ctx.Error(http.StatusInternalServerError, err.Error())

templates/admin/auth/edit.tmpl

@@ -436,7 +436,7 @@
 		</div>
 	</div>
 
-<div class="ui gitea-confirm-modal delete modal">
+<div class="ui g-modal-confirm delete modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "admin.auths.delete_auth_title"}}

templates/admin/emails/list.tmpl

@@ -70,7 +70,7 @@
 
 		{{template "base/paginate" .}}
 
-		<div class="ui gitea-confirm-modal modal" id="change-email-modal">
+		<div class="ui g-modal-confirm modal" id="change-email-modal">
 			<div class="header">
 				{{.locale.Tr "admin.emails.change_email_header"}}
 			</div>

templates/admin/monitor.tmpl

@@ -34,7 +34,7 @@
 		{{template "admin/process" .}}
 	</div>
 
-<div class="ui gitea-confirm-modal delete modal">
+<div class="ui g-modal-confirm delete modal">
 	<div class="header">
 		{{.locale.Tr "admin.monitor.process.cancel"}}
 	</div>

templates/admin/packages/list.tmpl

@@ -76,7 +76,7 @@
 		{{template "base/paginate" .}}
 	</div>
 
-<div class="ui gitea-confirm-modal delete modal">
+<div class="ui g-modal-confirm delete modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "packages.settings.delete"}}

templates/admin/queue.tmpl

@@ -178,7 +178,7 @@
 		</div>
 	</div>
 
-<div class="ui gitea-confirm-modal delete modal">
+<div class="ui g-modal-confirm delete modal">
 	<div class="header">
 		{{.locale.Tr "admin.monitor.queue.pool.cancel"}}
 	</div>

templates/admin/repo/list.tmpl

@@ -91,7 +91,7 @@
 		{{template "base/paginate" .}}
 	</div>
 
-<div class="ui gitea-confirm-modal delete modal">
+<div class="ui g-modal-confirm delete modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.settings.delete"}}

templates/admin/repo/unadopted.tmpl

@@ -26,7 +26,7 @@
 									<span class="name">{{$dir}}</span>
 									<div class="right floated content">
 										<button class="ui button submit tiny green adopt show-modal" data-modal="#adopt-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-plus"}}</span><span class="label">{{$.locale.Tr "repo.adopt_preexisting_label"}}</span></button>
-										<div class="ui gitea-confirm-modal modal" id="adopt-unadopted-modal-{{$dirI}}">
+										<div class="ui g-modal-confirm modal" id="adopt-unadopted-modal-{{$dirI}}">
 											<div class="header">
 												<span class="label">{{$.locale.Tr "repo.adopt_preexisting"}}</span>
 											</div>
@@ -39,20 +39,11 @@
 												<input type="hidden" name="action" value="adopt">
 												<input type="hidden" name="q" value="{{$.Keyword}}">
 												<input type="hidden" name="page" value="{{$.CurrentPage}}">
-												<div class="actions">{{/* TODO: Convert to base/modal_actions_confirm */}}
+												{{template "base/modal_actions_confirm" (dict "locale" $.locale)}}
-													<button class="ui red basic inverted cancel button">
-														{{svg "octicon-trash" 16 "gt-mr-2"}}
-														{{$.locale.Tr "modal.no"}}
-													</button>
-													<button class="ui green basic inverted ok button">
-														{{svg "octicon-check" 16 "gt-mr-2"}}
-														{{$.locale.Tr "modal.yes"}}
-													</button>
-												</div>
 											</form>
 										</div>
 										<button class="ui button submit tiny red delete show-modal" data-modal="#delete-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-x"}}</span><span class="label">{{$.locale.Tr "repo.delete_preexisting_label"}}</span></button>
-										<div class="ui gitea-confirm-modal modal" id="delete-unadopted-modal-{{$dirI}}">
+										<div class="ui g-modal-confirm modal" id="delete-unadopted-modal-{{$dirI}}">
 											<div class="header">
 												<span class="label">{{$.locale.Tr "repo.delete_preexisting"}}</span>
 											</div>
@@ -65,16 +56,7 @@
 												<input type="hidden" name="action" value="delete">
 												<input type="hidden" name="q" value="{{$.Keyword}}">
 												<input type="hidden" name="page" value="{{$.CurrentPage}}">
-												<div class="actions">{{/* TODO: Convert to base/modal_actions_confirm */}}
+												{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonColors" "yellow")}}
-													<button class="ui red basic inverted cancel button">
-														{{svg "octicon-trash" 16 "gt-mr-2"}}
-														{{$.locale.Tr "modal.no"}}
-													</button>
-													<button class="ui green basic inverted ok button">
-														{{svg "octicon-check" 16 "gt-mr-2"}}
-														{{$.locale.Tr "modal.yes"}}
-													</button>
-												</div>
 											</form>
 										</div>
 									</div>

templates/admin/stacktrace.tmpl

@@ -15,7 +15,7 @@
 		</div>
 	</div>
 
-<div class="ui gitea-confirm-modal delete modal">
+<div class="ui g-modal-confirm delete modal">
 	<div class="header">
 		{{.locale.Tr "admin.monitor.process.cancel"}}
 	</div>

templates/admin/user/edit.tmpl

@@ -192,7 +192,7 @@
 		</div>
 	</div>
 
-<div class="ui gitea-confirm-modal delete modal" id="delete-user-modal">
+<div class="ui g-modal-confirm delete modal" id="delete-user-modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.delete_account_title"}}

templates/base/modal_actions_confirm.tmpl

@@ -1,21 +1,38 @@
 {{/*
 Template Attributes:
 * locale
-* ModalButtonStyle: "yes" (default) or "confirm"
+
+Two buttons (negative, positive):
+* ModalButtonTypes: "yes" (default) or "confirm"
+* ModalButtonColors: "green" (default) / "blue" / "yellow"
 * ModalButtonCancelText
 * ModalButtonOkText
 
+Single danger button (GitHub-like):
+* ModalButtonDangerText "This action will destroy your data"
+
 The ".ok.button" and ".cancel.button" selectors are also used by Fomantic Modal internally
 */}}
 <div class="actions">
+	{{if .ModalButtonDangerText}}
+		<button class="ui danger red ok button">{{.ModalButtonDangerText}}</button>
+	{{else}}
 		{{$textNegitive := .locale.Tr "modal.no"}}
 		{{$textPositive := .locale.Tr "modal.yes"}}
-	{{if eq .ModalButtonStyle "confirm"}}
+		{{if eq .ModalButtonTypes "confirm"}}
 			{{$textNegitive = .locale.Tr "modal.cancel"}}
 			{{$textPositive = .locale.Tr "modal.confirm"}}
 		{{end}}
 		{{if .ModalButtonCancelText}}{{$textNegitive = .ModalButtonCancelText}}{{end}}
 		{{if .ModalButtonOkText}}{{$textPositive = .ModalButtonOkText}}{{end}}
-	<button class="ui red cancel button">{{svg "octicon-x"}} {{$textNegitive}}</button>
+
-	<button class="ui green ok button">{{svg "octicon-check"}} {{$textPositive}}</button>
+		{{$stylePositive := "green"}}
+		{{if eq .ModalButtonColors "blue"}}
+			{{$stylePositive = "blue"}}
+		{{else if eq .ModalButtonColors "yellow"}}
+			{{$stylePositive = "yellow"}}
+		{{end}}
+		<button class="ui secondary basic cancel button">{{svg "octicon-x"}} {{$textNegitive}}</button>
+		<button class="ui {{$stylePositive}} ok button">{{svg "octicon-check"}} {{$textPositive}}</button>
+	{{end}}
 </div>

templates/devtest/fomantic-modal.tmpl

@@ -0,0 +1,49 @@
+{{template "base/head" .}}
+<div class="page-content devtest ui container">
+	<div class="ui g-modal-confirm modal" id="test-modal-default">
+		<div class="header">{{svg "octicon-file"}} Default dialog <span>title</span></div>
+		<div class="content">
+			very long aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+		</div>
+		{{template "base/modal_actions_confirm" (dict "locale" $.locale)}}
+	</div>
+
+	<div class="ui g-modal-confirm modal" id="test-modal-confirm">
+		<div class="header">Confirm dialog</div>
+		<div class="content">hello, this is the modal dialog content</div>
+		{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}}
+	</div>
+
+	<div class="ui g-modal-confirm modal" id="test-modal-blue">
+		<div class="header">Blue dialog</div>
+		<div class="content">hello, this is the modal dialog content</div>
+		{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonColors" "blue")}}
+	</div>
+
+	<div class="ui g-modal-confirm modal" id="test-modal-yellow">
+		<div class="header">yellow dialog</div>
+		<div class="content">hello, this is the modal dialog content</div>
+		{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonColors" "yellow")}}
+	</div>
+
+	<div class="ui g-modal-confirm modal" id="test-modal-danger">
+		{{svg "octicon-x" 16 "inside close"}}
+		<div class="header">dangerous action dialog</div>
+		<div class="content">hello, this is the modal dialog content, this is a dangerous operation</div>
+		{{template "base/modal_actions_confirm" (dict "ModalButtonDangerText" "I know and must do  this is dangerous operation")}}
+	</div>
+
+	<div class="modal-buttons"></div>
+	<script type="module">
+		for (const el of $('.ui.modal')) {
+			const $btn = $('<button>').text(`Show ${el.id}`).on('click', () => {
+				$(el).modal({onApprove() {alert('confirmed')}}).modal('show');
+			});
+			$('.modal-buttons').append($btn);
+		}
+	</script>
+	<style>
+		.modal-buttons button { margin: 5px; }
+	</style>
+</div>
+{{template "base/footer" .}}

templates/org/member/members.tmpl

@@ -81,7 +81,7 @@
 		{{template "base/paginate" .}}
 	</div>
 </div>
-<div class="ui gitea-confirm-modal delete modal" id="leave-organization">
+<div class="ui g-modal-confirm delete modal" id="leave-organization">
 	<div class="header">
 		{{$.locale.Tr "org.members.leave"}}
 	</div>
@@ -90,7 +90,7 @@
 	</div>
 	{{template "base/modal_actions_confirm" .}}
 </div>
-<div class="ui gitea-confirm-modal delete modal" id="remove-organization-member">
+<div class="ui g-modal-confirm delete modal" id="remove-organization-member">
 	<div class="header">
 		{{$.locale.Tr "org.members.remove"}}
 	</div>

templates/org/settings/delete.tmpl

@@ -21,7 +21,7 @@
 				</div>
 			</div>
 
-<div class="ui gitea-confirm-modal delete modal">
+<div class="ui g-modal-confirm delete modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "org.settings.delete_org_title"}}

templates/org/team/members.tmpl

@@ -64,7 +64,7 @@
 		</div>
 	</div>
 </div>
-<div class="ui gitea-confirm-modal delete modal" id="remove-team-member">
+<div class="ui g-modal-confirm delete modal" id="remove-team-member">
 	<div class="header">
 		{{$.locale.Tr "org.members.remove"}}
 	</div>

templates/org/team/new.tmpl

@@ -148,7 +148,7 @@
 	</div>
 </div>
 
-<div class="ui gitea-confirm-modal delete modal">
+<div class="ui g-modal-confirm delete modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "org.teams.delete_team_title"}}

templates/org/team/repositories.tmpl

@@ -64,7 +64,7 @@
 	</div>
 </div>
 
-<div class="ui gitea-confirm-modal delete modal" id="org-team-remove-all-repo">
+<div class="ui g-modal-confirm delete modal" id="org-team-remove-all-repo">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "org.teams.remove_all_repos_title"}}
@@ -75,7 +75,7 @@
 	{{template "base/modal_actions_confirm" .}}
 </div>
 
-<div class="ui gitea-confirm-modal addall modal" id="org-team-add-all-repo">
+<div class="ui g-modal-confirm addall modal" id="org-team-add-all-repo">
 	<div class="header">
 		{{svg "octicon-globe"}}
 		{{.locale.Tr "org.teams.add_all_repos_title"}}

templates/org/team/sidebar.tmpl

@@ -83,7 +83,7 @@
 		</div>
 	{{end}}
 </div>
-<div class="ui gitea-confirm-modal delete modal" id="leave-team-sidebar">
+<div class="ui g-modal-confirm delete modal" id="leave-team-sidebar">
 	<div class="header">
 		{{$.locale.Tr "org.teams.leave"}}
 	</div>

templates/org/team/teams.tmpl

@@ -43,7 +43,7 @@
 		</div>
 	</div>
 </div>
-<div class="ui gitea-confirm-modal delete modal" id="leave-team">
+<div class="ui g-modal-confirm delete modal" id="leave-team">
 	<div class="header">
 		{{$.locale.Tr "org.teams.leave"}}
 	</div>

templates/projects/list.tmpl

@@ -76,7 +76,7 @@
 </div>
 
 {{if $.CanWriteProjects}}
-<div class="ui gitea-confirm-modal delete modal">
+<div class="ui g-modal-confirm delete modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.projects.deletion"}}

templates/projects/view.tmpl

@@ -150,17 +150,17 @@
 									</div>
 								</div>
 
-								<div class="ui gitea-confirm-modal modal default-project-board-modal" id="default-project-board-modal-{{.ID}}">
+								<div class="ui g-modal-confirm modal default-project-board-modal" id="default-project-board-modal-{{.ID}}">
 									<div class="header">
 										<span id="default-project-board-header"></span>
 									</div>
 									<div class="content">
 										<label id="default-project-board-content"></label>
 									</div>
-									{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}}
+									{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}}
 								</div>
 
-								<div class="ui gitea-confirm-modal modal" id="delete-board-modal-{{.ID}}">
+								<div class="ui g-modal-confirm modal" id="delete-board-modal-{{.ID}}">
 									<div class="header">
 										{{$.locale.Tr "repo.projects.column.delete"}}
 									</div>
@@ -169,7 +169,7 @@
 											{{$.locale.Tr "repo.projects.column.deletion_desc"}}
 										</label>
 									</div>
-									{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}}
+									{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}}
 								</div>
 							</div>
 						</div>
@@ -272,7 +272,7 @@
 </div>
 
 {{if .CanWriteProjects}}
-	<div class="ui gitea-confirm-modal delete modal">
+	<div class="ui g-modal-confirm delete modal">
 		<div class="header">
 			{{svg "octicon-trash"}}
 			{{.locale.Tr "repo.projects.deletion"}}

templates/repo/branch/list.tmpl

@@ -147,7 +147,7 @@
 	</div>
 </div>
 
-<div class="ui gitea-confirm-modal delete modal">
+<div class="ui g-modal-confirm delete modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.branch.delete_html"}} <span class="name"></span>

templates/repo/commit_page.tmpl

@@ -59,7 +59,7 @@
 										data-modal-cherry-pick-header="{{$.locale.Tr "repo.commit.cherry-pick-header" (ShortSha .CommitID)}}"
 										data-modal-cherry-pick-content="{{$.locale.Tr "repo.commit.cherry-pick-content"}}"
 										data-modal-cherry-pick-submit="{{.locale.Tr "repo.commit.cherry-pick"}}">{{.locale.Tr "repo.commit.cherry-pick"}}</div>
-									<div class="ui gitea-confirm-modal modal" id="cherry-pick-modal">
+									<div class="ui g-modal-confirm modal" id="cherry-pick-modal">
 										<div class="header">
 											<span id="cherry-pick-header"></span>
 										</div>

templates/repo/editor/edit.tmpl

@@ -56,7 +56,7 @@
 	</div>
 
 
-	<div class="ui gitea-confirm-modal modal" id="edit-empty-content-modal">
+	<div class="ui g-modal-confirm modal" id="edit-empty-content-modal">
 		<div class="header">
 			{{svg "octicon-file"}}
 			{{.locale.Tr "repo.editor.commit_empty_file_header"}}
@@ -65,11 +65,11 @@
 			<p>{{.locale.Tr "repo.editor.commit_empty_file_text"}}</p>
 		</div>
 		<div class="actions">
-			<button class="ui red basic cancel inverted button">
+			<button class="ui red cancel button">
 				{{svg "octicon-x"}}
 				{{.locale.Tr "repo.editor.cancel"}}
 			</button>
-			<button class="ui green basic ok inverted button">
+			<button class="ui green ok button">
 				{{svg "fontawesome-save"}}
 				{{.locale.Tr "repo.editor.commit_changes"}}
 			</button>

templates/repo/editor/patch.tmpl

@@ -36,7 +36,7 @@
 		</form>
 	</div>
 
-	<div class="ui gitea-confirm-modal modal" id="edit-empty-content-modal">
+	<div class="ui g-modal-confirm modal" id="edit-empty-content-modal">
 		<div class="header">
 			{{svg "octicon-file"}}
 			{{.locale.Tr "repo.editor.commit_empty_file_header"}}
@@ -45,11 +45,11 @@
 			<p>{{.locale.Tr "repo.editor.commit_empty_file_text"}}</p>
 		</div>
 		<div class="actions">
-			<button class="ui red basic inverted cancel button">
+			<button class="ui red cancel button">
 				{{svg "octicon-x"}}
 				{{.locale.Tr "repo.editor.cancel"}}
 			</button>
-			<button class="ui green basic inverted ok button">
+			<button class="ui green ok button">
 				{{svg "fontawesome-save"}}
 				{{.locale.Tr "repo.editor.commit_changes"}}
 			</button>

templates/repo/header.tmpl

@@ -215,12 +215,18 @@
 				</a>
 				{{end}}
 
-				{{if or (.Permission.CanRead $.UnitTypeWiki) (.Permission.CanRead $.UnitTypeExternalWiki)}}
+				{{if .Permission.CanRead $.UnitTypeWiki}}
-					<a class="{{if .PageIsWiki}}active {{end}}item" href="{{.RepoLink}}/wiki" {{if and (.Permission.CanRead $.UnitTypeExternalWiki) (not (StringUtils.HasPrefix ((.Repository.MustGetUnit $.Context $.UnitTypeExternalWiki).ExternalWikiConfig.ExternalWikiURL) (.Repository.Link)))}} target="_blank" rel="noopener noreferrer" {{end}}>
+					<a class="{{if .PageIsWiki}}active {{end}}item" href="{{.RepoLink}}/wiki">
 						{{svg "octicon-book"}} {{.locale.Tr "repo.wiki"}}
 					</a>
 				{{end}}
 
+				{{if .Permission.CanRead $.UnitTypeExternalWiki}}
+					<a class="item" href="{{(.Repository.MustGetUnit $.Context $.UnitTypeExternalWiki).ExternalWikiConfig.ExternalWikiURL}}" target="_blank" rel="noopener noreferrer">
+						{{svg "octicon-link-external"}} {{.locale.Tr "repo.wiki"}}
+					</a>
+				{{end}}
+
 				{{if and (.Permission.CanReadAny $.UnitTypePullRequests $.UnitTypeIssues $.UnitTypeReleases) (not .IsEmptyRepo)}}
 					<a class="{{if .PageIsActivity}}active {{end}}item" href="{{.RepoLink}}/activity">
 						{{svg "octicon-pulse"}} {{.locale.Tr "repo.activity"}}

templates/repo/issue/labels/edit_delete_label.tmpl

@@ -1,4 +1,4 @@
-<div class="ui gitea-confirm-modal delete modal">
+<div class="ui g-modal-confirm delete modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.issues.label_deletion"}}

templates/repo/issue/labels/label_list.tmpl

@@ -42,7 +42,7 @@
 					{{end}}
 				</div>
 				<div class="three wide column">
-					{{if and (not $.PageIsOrgSettingsLabels ) (not $.Repository.IsArchived) (or $.CanWriteIssues $.CanWritePulls)}}
+					{{if and (not $.PageIsOrgSettingsLabels) (not $.Repository.IsArchived) (or $.CanWriteIssues $.CanWritePulls)}}
 						<a class="ui right delete-button" href="#" data-url="{{$.Link}}/delete" data-id="{{.ID}}">{{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}}</a>
 						<a class="ui right edit-label-button" href="#" data-id="{{.ID}}" data-title="{{.Name}}" {{if .Exclusive}}data-exclusive{{end}} data-num-issues="{{.NumIssues}}" data-description="{{.Description}}" data-color={{.Color}}>{{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}}</a>
 					{{else if $.PageIsOrgSettingsLabels}}

templates/repo/issue/milestones.tmpl

@@ -116,7 +116,7 @@
 </div>
 
 {{if or .CanWriteIssues .CanWritePulls}}
-	<div class="ui gitea-confirm-modal delete modal">
+	<div class="ui g-modal-confirm delete modal">
 		<div class="header">
 			{{svg "octicon-trash"}}
 			{{.locale.Tr "repo.milestones.deletion"}}

templates/repo/issue/view_content.tmpl

@@ -197,7 +197,7 @@
 	<span class="no-content">{{.locale.Tr "repo.issues.no_content"}}</span>
 </div>
 
-<div class="ui gitea-confirm-modal delete modal">
+<div class="ui g-modal-confirm delete modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.branch.delete" .HeadTarget}}

templates/repo/issue/view_content/sidebar.tmpl

@@ -542,7 +542,7 @@
 			{{if and .CanCreateIssueDependencies (not .Repository.IsArchived)}}
 				<input type="hidden" id="crossRepoSearch" value="{{.AllowCrossRepositoryDependencies}}">
 
-				<div class="ui gitea-confirm-modal modal remove-dependency">
+				<div class="ui g-modal-confirm modal remove-dependency">
 					<div class="header">
 						{{svg "octicon-trash"}}
 						{{.locale.Tr "repo.issues.dependency.remove_header"}}
@@ -656,7 +656,7 @@
 				{{svg "octicon-trash"}}
 				{{.locale.Tr "repo.issues.delete"}}
 			</button>
-			<div class="ui gitea-confirm-modal modal" id="delete">
+			<div class="ui g-modal-confirm modal" id="delete">
 				<div class="header">
 					{{if .Issue.IsPull}}
 						{{.locale.Tr "repo.pulls.delete.title"}}

templates/repo/projects/list.tmpl

@@ -78,7 +78,7 @@
 </div>
 
 {{if .CanWriteProjects}}
-<div class="ui gitea-confirm-modal delete modal">
+<div class="ui g-modal-confirm delete modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.projects.deletion"}}

templates/repo/projects/view.tmpl

@@ -47,7 +47,7 @@
 				<h2 class="project-title">{{$.Project.Title}}</h2>
 				<div class="content project-description">{{$.Project.RenderedContent|Str2html}}</div>
 			</div>
-			{{if and (or $.CanWriteIssues $.CanWritePulls) (not $.Repository.IsArchived)}}
+			{{if and $.CanWriteProjects (not $.Repository.IsArchived)}}
 				<div class="column right aligned">
 					<div class="ui compact right small menu">
 						<a class="item" href="{{$.RepoLink}}/projects/{{.Project.ID}}/edit?redirect=project" data-id={{$.Project.ID}} data-title={{$.Project.Title}}>
@@ -156,17 +156,17 @@
 									</div>
 								</div>
 
-								<div class="ui gitea-confirm-modal modal default-project-board-modal" id="default-project-board-modal-{{.ID}}">
+								<div class="ui g-modal-confirm modal default-project-board-modal" id="default-project-board-modal-{{.ID}}">
 									<div class="header">
 										<span id="default-project-board-header"></span>
 									</div>
 									<div class="content">
 										<label id="default-project-board-content"></label>
 									</div>
-									{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}}
+									{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}}
 								</div>
 
-								<div class="ui gitea-confirm-modal modal" id="delete-board-modal-{{.ID}}">
+								<div class="ui g-modal-confirm modal" id="delete-board-modal-{{.ID}}">
 									<div class="header">
 										{{$.locale.Tr "repo.projects.column.delete"}}
 									</div>
@@ -175,7 +175,7 @@
 											{{$.locale.Tr "repo.projects.column.deletion_desc"}}
 										</label>
 									</div>
-									{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonStyle" "confirm")}}
+									{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}}
 								</div>
 							</div>
 						</div>
@@ -277,8 +277,8 @@
 
 </div>
 
-{{if or .CanWriteIssues .CanWritePulls}}
+{{if .CanWriteProjects}}
-	<div class="ui gitea-confirm-modal delete modal">
+	<div class="ui g-modal-confirm delete modal">
 		<div class="header">
 			{{svg "octicon-trash"}}
 			{{.locale.Tr "repo.projects.deletion"}}

templates/repo/release/list.tmpl

@@ -184,7 +184,7 @@
 </div>
 
 {{if (and ($.Permission.CanWrite $.UnitTypeCode) .PageIsTagList)}}
-	<div class="ui gitea-confirm-modal delete modal">
+	<div class="ui g-modal-confirm delete modal">
 		<div class="header">
 			{{svg "octicon-trash"}}
 			{{.locale.Tr "repo.release.delete_tag"}}

templates/repo/release/new.tmpl

@@ -138,7 +138,7 @@
 </div>
 
 {{if .PageIsEditRelease}}
-	<div class="ui gitea-confirm-modal delete modal">
+	<div class="ui g-modal-confirm delete modal">
 		<div class="header">
 			{{svg "octicon-trash"}}
 			{{.locale.Tr "repo.release.deletion"}}

templates/repo/settings/branches.tmpl

@@ -91,7 +91,7 @@
 		{{end}}
 	</div>
 
-<div class="ui gitea-confirm-modal delete modal">
+<div class="ui g-modal-confirm delete modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.settings.protected_branch_deletion"}}

templates/repo/settings/collaboration.tmpl

@@ -52,7 +52,7 @@
 		<h4 class="ui top attached header">
 			{{$.locale.Tr "repo.settings.teams"}}
 		</h4>
-		{{$allowedToChangeTeams := ( or (.Org.RepoAdminChangeTeamAccess) (.Permission.IsOwner))}}
+		{{$allowedToChangeTeams := (or (.Org.RepoAdminChangeTeamAccess) (.Permission.IsOwner))}}
 		{{if .Teams}}
 		<div class="ui attached segment collaborator list">
 			{{range $t, $team := .Teams}}
@@ -107,7 +107,7 @@
 		{{end}}
 	</div>
 
-<div class="ui gitea-confirm-modal delete modal">
+<div class="ui g-modal-confirm delete modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.settings.collaborator_deletion"}}

templates/repo/settings/deploy_keys.tmpl

@@ -72,7 +72,7 @@
 		</div>
 	</div>
 
-<div class="ui gitea-confirm-modal delete modal">
+<div class="ui g-modal-confirm delete modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.settings.deploy_key_deletion"}}

templates/repo/settings/lfs.tmpl

@@ -36,7 +36,7 @@
 		</table>
 		{{template "base/paginate" .}}
 		{{range .LFSFiles}}
-			<div class="ui gitea-confirm-modal modal" id="delete-{{.Oid}}">
+			<div class="ui g-modal-confirm modal" id="delete-{{.Oid}}">
 				<div class="header">
 					{{$.locale.Tr "repo.settings.lfs_delete" .Oid}}
 				</div>
@@ -46,14 +46,10 @@
 					</p>
 					<form class="ui form" action="{{$.Link}}/delete/{{.Oid}}" method="post">
 						{{$.CsrfTokenHtml}}
-						<div class="actions">{{/* TODO: Convert to base/modal_actions_confirm */}}
+						{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonColors" "yellow")}}
-							<button class="ui basic cancel inverted button">{{$.locale.Tr "settings.cancel"}}</button>
-							<button class="ui basic inverted yellow button">{{$.locale.Tr "modal.yes"}}</button>
-						</div>
 					</form>
 				</div>
 			</div>
 		{{end}}
 	</div>
-</div>
 {{template "repo/settings/layout_footer" .}}

templates/repo/settings/options.tmpl

@@ -165,7 +165,7 @@
 						{{range .PushMirrors}}
 						<tr>
 							{{$address := MirrorRemoteAddress $.Context $.Repository .GetRemoteName true}}
-							<td>{{$address.Address}}</td>
+							<td class="gt-word-break">{{$address.Address}}</td>
 							<td>{{$.locale.Tr "repo.settings.mirror_settings.direction.push"}}</td>
 							<td>{{if .LastUpdateUnix}}{{DateTime "full" .LastUpdateUnix.FormatLong .LastUpdateUnix.AsTime}}{{else}}{{$.locale.Tr "never"}}{{end}} {{if .LastError}}<div class="ui red label" data-tooltip-content="{{.LastError}}">{{$.locale.Tr "error"}}</div>{{end}}</td>
 							<td class="right aligned">
@@ -963,7 +963,7 @@
 	{{end}}
 
 	{{if not .Repository.IsMirror}}
-		<div class="ui gitea-confirm-modal modal" id="archive-repo-modal">
+		<div class="ui g-modal-confirm modal" id="archive-repo-modal">
 			<div class="header">
 				{{if .Repository.IsArchived}}
 					{{.locale.Tr "repo.settings.unarchive.header"}}

templates/repo/settings/webhook/delete_modal.tmpl

@@ -1,4 +1,4 @@
-<div class="ui gitea-confirm-modal delete modal">
+<div class="ui g-modal-confirm delete modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.settings.webhook_deletion"}}

templates/repo/wiki/view.tmpl

@@ -99,7 +99,7 @@
 	</div>
 </div>
 
-<div class="ui gitea-confirm-modal delete modal">
+<div class="ui g-modal-confirm delete modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "repo.wiki.delete_page_button"}}

templates/shared/actions/runner_edit.tmpl

@@ -88,7 +88,7 @@
 		</table>
 		{{template "base/paginate" .}}
 	</div>
-	<div class="ui gitea-confirm-modal delete modal" id="runner-delete-modal">
+	<div class="ui g-modal-confirm delete modal" id="runner-delete-modal">
 		<div class="header">
 			{{svg "octicon-trash"}}
 			{{.locale.Tr "actions.runners.delete_runner_header"}}

templates/shared/secrets/add_list.tmpl

@@ -56,7 +56,7 @@
 		{{.locale.Tr "secrets.none"}}
 	{{end}}
 </div>
-<div class="ui gitea-confirm-modal delete modal">
+<div class="ui g-modal-confirm delete modal">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "secrets.deletion"}}

templates/status/500.tmpl

@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content gt-w-screen status-page-500">
+<div role="main" aria-label="{{.Title}}" class="page-content status-page-500">
 	<p class="gt-mt-5 center"><img src="{{AssetUrlPrefix}}/img/500.png" alt="Internal Server Error"></p>
 	<div class="ui divider"></div>
 

templates/swagger/v1_json.tmpl

@@ -297,6 +297,31 @@
           }
         }
       },
+      "delete": {
+        "produces": [
+          "application/json"
+        ],
+        "tags": [
+          "admin"
+        ],
+        "summary": "Delete a hook",
+        "operationId": "adminDeleteHook",
+        "parameters": [
+          {
+            "type": "integer",
+            "format": "int64",
+            "description": "id of the hook to delete",
+            "name": "id",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "204": {
+            "$ref": "#/responses/empty"
+          }
+        }
+      },
       "patch": {
         "consumes": [
           "application/json"
@@ -858,33 +883,6 @@
         }
       }
     },
-    "/amdin/hooks/{id}": {
-      "delete": {
-        "produces": [
-          "application/json"
-        ],
-        "tags": [
-          "admin"
-        ],
-        "summary": "Delete a hook",
-        "operationId": "adminDeleteHook",
-        "parameters": [
-          {
-            "type": "integer",
-            "format": "int64",
-            "description": "id of the hook to delete",
-            "name": "id",
-            "in": "path",
-            "required": true
-          }
-        ],
-        "responses": {
-          "204": {
-            "$ref": "#/responses/empty"
-          }
-        }
-      }
-    },
     "/markdown": {
       "post": {
         "consumes": [

templates/user/settings/account.tmpl

@@ -157,7 +157,7 @@
 		</div>
 	</div>
 
-<div class="ui gitea-confirm-modal delete modal" id="delete-email">
+<div class="ui g-modal-confirm delete modal" id="delete-email">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.email_deletion"}}
@@ -168,7 +168,7 @@
 	{{template "base/modal_actions_confirm" .}}
 </div>
 
-<div class="ui gitea-confirm-modal delete modal" id="delete-account">
+<div class="ui g-modal-confirm delete modal" id="delete-account">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.delete_account_title"}}

templates/user/settings/applications.tmpl

@@ -264,7 +264,7 @@
 		{{end}}
 	</div>
 
-<div class="ui gitea-confirm-modal delete modal" id="delete-token">
+<div class="ui g-modal-confirm delete modal" id="delete-token">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.access_token_deletion"}}
@@ -272,17 +272,7 @@
 	<div class="content">
 		<p>{{.locale.Tr "settings.access_token_deletion_desc"}}</p>
 	</div>
-
+	{{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonColors" "yellow")}}
-	<div class="actions">{{/* TODO: Convert to base/modal_actions_confirm.tmpl */}}
-		<button class="ui green basic inverted cancel button">
-			{{svg "octicon-x"}}
-			{{.locale.Tr "settings.access_token_deletion_cancel_action"}}
-		</button>
-		<button class="ui red basic inverted ok button">
-			{{svg "octicon-check"}}
-			{{.locale.Tr "settings.access_token_deletion_confirm_action"}}
-		</button>
-	</div>
 </div>
 
 {{template "user/settings/layout_footer" .}}

templates/user/settings/applications_oauth2_list.tmpl

@@ -47,7 +47,7 @@
 	</form>
 </div>
 
-<div class="ui gitea-confirm-modal delete modal" id="remove-gitea-oauth2-application">
+<div class="ui g-modal-confirm delete modal" id="remove-gitea-oauth2-application">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.remove_oauth2_application"}}

templates/user/settings/grants_oauth2.tmpl

@@ -28,7 +28,7 @@
 	</div>
 </div>
 
-<div class="ui gitea-confirm-modal delete modal" id="revoke-gitea-oauth2-grant">
+<div class="ui g-modal-confirm delete modal" id="revoke-gitea-oauth2-grant">
 	<div class="header">
 		{{svg "octicon-shield" 16 "gt-mr-2"}}
 		{{.locale.Tr "settings.revoke_oauth2_grant"}}

templates/user/settings/keys_gpg.tmpl

@@ -111,7 +111,7 @@
 <br>
 <p>{{.locale.Tr "settings.gpg_helper" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/about-commit-signature-verification#gpg-commit-signature-verification" | Str2html}}</p>
 
-<div class="ui gitea-confirm-modal delete modal" id="delete-gpg">
+<div class="ui g-modal-confirm delete modal" id="delete-gpg">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.gpg_key_deletion"}}

templates/user/settings/keys_principal.tmpl

@@ -54,7 +54,7 @@
 		</div>
 	</div>
 
-	<div class="ui gitea-confirm-modal delete modal" id="delete-principal">
+	<div class="ui g-modal-confirm delete modal" id="delete-principal">
 		<div class="header">
 			{{svg "octicon-trash"}}
 			{{.locale.Tr "settings.ssh_principal_deletion"}}

templates/user/settings/keys_ssh.tmpl

@@ -100,7 +100,7 @@
 <br>
 <p>{{.locale.Tr "settings.ssh_helper" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/connecting-to-github-with-ssh" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/troubleshooting-ssh" | Str2html}}</p>
 
-<div class="ui gitea-confirm-modal delete modal" id="delete-ssh">
+<div class="ui g-modal-confirm delete modal" id="delete-ssh">
 	<div class="header">
 		{{svg "octicon-trash"}}
 		{{.locale.Tr "settings.ssh_key_deletion"}}