Merge remote-tracking branch 'giteaofficial/main'

* giteaofficial/main: default show closed actions list if all actions was closed (go-gitea#24234) [skip ci] Updated translations via Crowdin update nightly drone docker tag (go-gitea#24311) Remove org users who belong to no teams (go-gitea#24247) Fix typo in API route (go-gitea#24310) Add --font-weight-bold and set previous bold to 601 (go-gitea#24307) Mark `/templates/swagger/v1_json.tmpl` as generated file (go-gitea#24306) Improve External Wiki in Repo Header (go-gitea#24304) Unify nightly naming across binaries and docker images (go-gitea#24116) Wrap too long push mirror addresses (go-gitea#21120)
zjjhot · Apr 25, 2023 · 0a90017 · 0a90017
2 parents 80833af + 74aa446
commit 0a90017
Show file tree

Hide file tree

Showing 49 changed files with 201 additions and 122 deletions.
diff --git a/.drone.yml b/.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

diff --git a/.gitattributes b/.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

diff --git a/Makefile b/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

diff --git a/docker/manifest.rootless.tmpl b/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

diff --git a/docker/manifest.tmpl b/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

diff --git a/models/org_team.go b/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
 }
 

diff --git a/options/locale/locale_cs-CZ.ini b/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á?

diff --git a/options/locale/locale_de-DE.ini b/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?

diff --git a/options/locale/locale_el-GR.ini b/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=Ακόμα είναι σε εξέλιξη;

diff --git a/options/locale/locale_es-ES.ini b/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?

diff --git a/options/locale/locale_fa-IR.ini b/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=هنوز در حال انجام؟

diff --git a/options/locale/locale_fi-FI.ini b/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

diff --git a/options/locale/locale_fr-FR.ini b/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 ?

diff --git a/options/locale/locale_hu-HU.ini b/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]

diff --git a/options/locale/locale_id-ID.ini b/options/locale/locale_id-ID.ini
@@ -225,6 +225,7 @@ register_success=Pendaftaran berhasil
 [modal]
 yes=Ya
 no=Tidak
+cancel=Membatalkan
 modify=Perbarui
 
 [form]

diff --git a/options/locale/locale_is-IS.ini b/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]

diff --git a/options/locale/locale_it-IT.ini b/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?

diff --git a/options/locale/locale_ja-JP.ini b/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=まだ作業中？

diff --git a/options/locale/locale_ko-KR.ini b/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=충돌을 해결하려면 수동으로 머지하십시오.
 

diff --git a/options/locale/locale_lv-LV.ini b/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?

diff --git a/options/locale/locale_nl-NL.ini b/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?