Skip to content

Commit 6a5d0f1

Browse files
a1012112796a1012112796
authored
Merge branch 'main' into update-rebase
2 parents a85e039 + f03abe8 commit 6a5d0f1

40 files changed

+212
-139
lines changed

Diff for: ‎.drone.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ steps:
8484

8585
- name: build-backend-no-gcc
8686
pull: always
87-
image: golang:1.14 # this step is kept as the lowest version of golang that we support
87+
image: golang:1.16 # this step is kept as the lowest version of golang that we support
8888
environment:
8989
GO111MODULE: on
9090
GOPROXY: off

Diff for: ‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ HAS_GO = $(shell hash $(GO) > /dev/null 2>&1 && echo "GO" || echo "NOGO" )
2525
COMMA := ,
2626

2727
XGO_VERSION := go-1.16.x
28-
MIN_GO_VERSION := 001014000
28+
MIN_GO_VERSION := 001016000
2929
MIN_NODE_VERSION := 012017000
3030

3131
DOCKER_IMAGE ?= gitea/gitea
@@ -200,7 +200,7 @@ help:
200200
go-check:
201201
$(eval GO_VERSION := $(shell printf "%03d%03d%03d" $(shell $(GO) version | grep -Eo '[0-9]+\.[0-9.]+' | tr '.' ' ');))
202202
@if [ "$(GO_VERSION)" -lt "$(MIN_GO_VERSION)" ]; then \
203-
echo "Gitea requires Go 1.14 or greater to build. You can get it at https://golang.org/dl/"; \
203+
echo "Gitea requires Go 1.16 or greater to build. You can get it at https://golang.org/dl/"; \
204204
exit 1; \
205205
fi
206206

Diff for: ‎docs/config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ params:
1919
author: The Gitea Authors
2020
website: https://docs.gitea.io
2121
version: 1.14.5
22-
minGoVersion: 1.14
22+
minGoVersion: 1.16
2323
goVersion: 1.16
2424
minNodeVersion: 12.17
2525

Diff for: ‎docs/content/doc/advanced/config-cheat-sheet.en-us.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ The following configuration set `Content-Type: application/vnd.android.package-a
300300
- `LANDING_PAGE`: **home**: Landing page for unauthenticated users \[home, explore, organizations, login\].
301301

302302
- `LFS_START_SERVER`: **false**: Enables git-lfs support.
303-
- `LFS_CONTENT_PATH`: **%(APP_DATA_PATH)/lfs**: DEPRECATED: Default LFS content path. (if it is on local storage.)
303+
- `LFS_CONTENT_PATH`: **%(APP_DATA_PATH)/lfs**: Default LFS content path. (if it is on local storage.) **DEPRECATED** use settings in `[lfs]`.
304304
- `LFS_JWT_SECRET`: **\<empty\>**: LFS authentication secret, change this a unique string.
305305
- `LFS_HTTP_AUTH_EXPIRY`: **20m**: LFS authentication validity period in time.Duration, pushes taking longer than this may fail.
306306
- `LFS_MAX_FILE_SIZE`: **0**: Maximum allowed LFS file size in bytes (Set to 0 for no limit).

Diff for: ‎go.mod

+3-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ require (
5050
github.com/gogs/chardet v0.0.0-20191104214054-4b6791f73a28
5151
github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14
5252
github.com/gogs/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85
53-
github.com/golang-jwt/jwt v3.2.1+incompatible
53+
github.com/golang-jwt/jwt v3.2.2+incompatible
5454
github.com/golang/snappy v0.0.4 // indirect
5555
github.com/google/go-github/v32 v32.1.0
5656
github.com/google/go-querystring v1.1.0 // indirect
@@ -143,3 +143,5 @@ require (
143143
)
144144

145145
replace github.com/hashicorp/go-version => github.com/6543/go-version v1.3.1
146+
147+
replace github.com/golang-jwt/jwt v3.2.1+incompatible => github.com/golang-jwt/jwt v3.2.2+incompatible

Diff for: ‎go.sum

+2-4
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ gitea.com/go-chi/captcha v0.0.0-20210110083842-e7696c336a1e h1:YjaQU6XFicdhPN+Ml
4949
gitea.com/go-chi/captcha v0.0.0-20210110083842-e7696c336a1e/go.mod h1:nfA7JaGv3hbGQ1ktdhAsZhdS84qKffI8NMlHr+Opsog=
5050
gitea.com/go-chi/session v0.0.0-20210108030337-0cb48c5ba8ee h1:9U6HuKUBt/cGK6T/64dEuz0r7Yp97WAAEJvXHDlY3ws=
5151
gitea.com/go-chi/session v0.0.0-20210108030337-0cb48c5ba8ee/go.mod h1:Ozg8IchVNb/Udg+ui39iHRYqVHSvf3C99ixdpLR8Vu0=
52-
gitea.com/lunny/levelqueue v0.3.0 h1:MHn1GuSZkxvVEDMyAPqlc7A3cOW+q8RcGhRgH/xtm6I=
53-
gitea.com/lunny/levelqueue v0.3.0/go.mod h1:HBqmLbz56JWpfEGG0prskAV97ATNRoj5LDmPicD22hU=
5452
gitea.com/lunny/levelqueue v0.4.0 h1:v+bCR1lwLTBpZMshguWNhGIFLkUj+R04pgaU3TcJFS8=
5553
gitea.com/lunny/levelqueue v0.4.0/go.mod h1:HBqmLbz56JWpfEGG0prskAV97ATNRoj5LDmPicD22hU=
5654
gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s=
@@ -477,8 +475,8 @@ github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14 h1:yXtpJr/LV6PFu4nTLgfjQ
477475
github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14/go.mod h1:jPoNZLWDAqA5N3G5amEoiNbhVrmM+ZQEcnQvNQ2KaZk=
478476
github.com/gogs/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85 h1:UjoPNDAQ5JPCjlxoJd6K8ALZqSDDhk2ymieAZOVaDg0=
479477
github.com/gogs/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85/go.mod h1:fR6z1Ie6rtF7kl/vBYMfgD5/G5B1blui7z426/sj2DU=
480-
github.com/golang-jwt/jwt v3.2.1+incompatible h1:73Z+4BJcrTC+KczS6WvTPvRGOp1WmfEP4Q1lOd9Z/+c=
481-
github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
478+
github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
479+
github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
482480
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
483481
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
484482
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=

Diff for: ‎options/locale/locale_bg-BG.ini

-1
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,6 @@ pulls.num_conflicting_files_n=%d конфликтни файлове
787787
pulls.no_merge_desc=Тази заявка за сливане не може да бъде обединена, защото всички опции за обединяване на хранилището са изключени.
788788
pulls.no_merge_helper=Включете опции за сливане в настройките на хранилището или обединете заявката за сливане ръчно.
789789
pulls.no_merge_wip=Тази заявка за сливане не може да бъде обединена, защото е отбелязана като работа в прогрес.
790-
pulls.merge_pull_request=Обедини заявка за сливане
791790
; </summary><code>%[2]s<br>%[3]s</code></details>
792791
pulls.status_checks_success=Всички проверявания бяха успешни
793792
pulls.update_branch=Осъвременяване на клона

Diff for: ‎options/locale/locale_cs-CZ.ini

-4
Original file line numberDiff line numberDiff line change
@@ -1358,10 +1358,6 @@ pulls.no_merge_helper=Povolte možnosti sloučení v nastavení repozitáře neb
13581358
pulls.no_merge_wip=Požadavek na natažení nemůže být sloučen protože je označen jako nedokončený.
13591359
pulls.no_merge_not_ready=Tento požadavek na natažení není připraven na sloučení, zkontrolujte stav posouzení a kontrolu stavu.
13601360
pulls.no_merge_access=Nemáte oprávnění sloučit tento požadavek na natažení.
1361-
pulls.merge_pull_request=Sloučit požadavek na natažení
1362-
pulls.rebase_merge_pull_request=Rebase a sloučit
1363-
pulls.rebase_merge_commit_pull_request=Rebase a sloučit (--no-ff)
1364-
pulls.squash_merge_pull_request=Squash a sloučit
13651361
pulls.merge_manually=Sloučeno ručně
13661362
pulls.merge_commit_id=ID slučovací revize
13671363
pulls.require_signed_wont_sign=Větev vyžaduje podepsané revize, ale toto sloučení nebude podepsáno

Diff for: ‎options/locale/locale_de-DE.ini

-4
Original file line numberDiff line numberDiff line change
@@ -1436,10 +1436,6 @@ pulls.no_merge_helper=Aktiviere Mergeoptionen in den Repositoryeinstellungen ode
14361436
pulls.no_merge_wip=Dieser Pull Request kann nicht gemergt werden, da er als Work In Progress gekennzeichnet ist.
14371437
pulls.no_merge_not_ready=Dieser Pull-Request kann nicht gemergt werden, überprüfe den Reviewstatus und die Statusprüfungen.
14381438
pulls.no_merge_access=Du bist nicht berechtigt, diesen Pull-Request zu Mergen.
1439-
pulls.merge_pull_request=Pull-Request mergen
1440-
pulls.rebase_merge_pull_request=Rebase und Mergen
1441-
pulls.rebase_merge_commit_pull_request=Rebasen und Mergen (--no-ff)
1442-
pulls.squash_merge_pull_request=Zusammenfassen und Mergen
14431439
pulls.merge_manually=Manuell mergen
14441440
pulls.merge_commit_id=Der Mergecommit ID
14451441
pulls.require_signed_wont_sign=Der Branch erfordert einen signierten Commit, aber dieser Merge wird nicht signiert

Diff for: ‎options/locale/locale_es-ES.ini

-4
Original file line numberDiff line numberDiff line change
@@ -1436,10 +1436,6 @@ pulls.no_merge_helper=Habilite las opciones de combinación en la configuración
14361436
pulls.no_merge_wip=Este pull request no se puede combinar porque está marcada como un trabajo en progreso.
14371437
pulls.no_merge_not_ready=Este pull request no está listo para ser fusionado, compruebe el estado de revisión y las comprobaciones de estado.
14381438
pulls.no_merge_access=No está autorizado para fusionar de este pull request.
1439-
pulls.merge_pull_request=Fusionar Pull Request
1440-
pulls.rebase_merge_pull_request=Hacer Rebase y Fusionar
1441-
pulls.rebase_merge_commit_pull_request=Hacer Rebase y Fusionar (--no-ff)
1442-
pulls.squash_merge_pull_request=Hacer Squash y Fusionar
14431439
pulls.merge_manually=Fusionado manualmente
14441440
pulls.merge_commit_id=La identificación del commit fusionado
14451441
pulls.require_signed_wont_sign=Esta rama requiere commits firmados pero esta fusión no será firmada

Diff for: ‎options/locale/locale_fa-IR.ini

-4
Original file line numberDiff line numberDiff line change
@@ -1162,10 +1162,6 @@ pulls.no_merge_helper=گزینه های ادغام را در تنظیمات مخ
11621162
pulls.no_merge_wip=این تقاضای واکشی قابل ادغام نیست لذا اکنون به این مخزن درحال پردازش علامت گذاری شده است.
11631163
pulls.no_merge_not_ready=این درخواست واکشی آماده ادغام نیست، وضعیت بازبینی را چک کنید.
11641164
pulls.no_merge_access=شما مجاز به ادغام این درخواست واکشی نیستید.
1165-
pulls.merge_pull_request=ادغام تقاضای واکشی
1166-
pulls.rebase_merge_pull_request=بازگردانی و ادغام
1167-
pulls.rebase_merge_commit_pull_request=بازگردانی و ادغام (--no-ff)
1168-
pulls.squash_merge_pull_request=له کردن و ادغام
11691165
pulls.require_signed_wont_sign=انشعاب نیازمند تغییرات امضا شده است اما این ادغام امضا نخواهد شد
11701166
pulls.invalid_merge_option=شما نمی‌توانید از این گزینه برای تقاضای واکشی استفاده کنید.
11711167
; </summary><code>%[2]s<br>%[3]s</code></details>

Diff for: ‎options/locale/locale_fi-FI.ini

-1
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,6 @@ pulls.merged=Yhdistetty
777777
pulls.has_merged=Vetopyyntö on yhdistetty.
778778
pulls.can_auto_merge_desc=Tämä pull-pyyntö voidaan yhdistää automaattisesti.
779779

780-
pulls.merge_pull_request=Yhdistä Pull-pyyntö
781780
; </summary><code>%[2]s<br>%[3]s</code></details>
782781

783782

Diff for: ‎options/locale/locale_fr-FR.ini

-4
Original file line numberDiff line numberDiff line change
@@ -1384,10 +1384,6 @@ pulls.no_merge_helper=Activez des options de fusion dans les paramètres du dép
13841384
pulls.no_merge_wip=Cette demande d'ajout ne peut pas être fusionnée car elle est marquée comme en cours de chantier.
13851385
pulls.no_merge_not_ready=Cette demande d'ajout n'est pas prête à être fusionnée, vérifiez l'état de la revue et les vérifications.
13861386
pulls.no_merge_access=Vous n'êtes pas autorisé-e a fusionnée cette demande d'ajout.
1387-
pulls.merge_pull_request=Fusionner la demande d'ajout
1388-
pulls.rebase_merge_pull_request=Rebase et fusionner
1389-
pulls.rebase_merge_commit_pull_request=Rebase et Fusion (--no-ff)
1390-
pulls.squash_merge_pull_request=Squash et fusionner
13911387
pulls.merge_manually=Fusionné manuellement
13921388
pulls.merge_commit_id=L'ID de la révision de fusion
13931389
pulls.require_signed_wont_sign=La branche nécessite des révisions signées mais cette fusion ne sera pas signée

Diff for: ‎options/locale/locale_hu-HU.ini

-3
Original file line numberDiff line numberDiff line change
@@ -998,9 +998,6 @@ pulls.cant_reopen_deleted_branch=Ez a pull request nem nyitható meg újra, mive
998998
pulls.merged=Egyesítve
999999
pulls.can_auto_merge_desc=Ez az egyesítési kérés automatikusan végrehajtható.
10001000

1001-
pulls.merge_pull_request=Egyesítési kérés végrehajtása
1002-
pulls.rebase_merge_pull_request=Rebase és egyesítés
1003-
pulls.squash_merge_pull_request=Squash és egyesítés
10041001
; </summary><code>%[2]s<br>%[3]s</code></details>
10051002
pulls.status_checking=Néhány ellenőrzés függőben van
10061003
pulls.status_checks_success=Minden ellenőrzés sikeres volt

Diff for: ‎options/locale/locale_id-ID.ini

-3
Original file line numberDiff line numberDiff line change
@@ -861,9 +861,6 @@ pulls.reopen_to_merge=Tolong buka kembali permintaan tarik ini untuk melaksanaka
861861
pulls.merged=Menggabungkan
862862
pulls.can_auto_merge_desc=Permintaan tarik ini dapat digabung secara otomatis.
863863

864-
pulls.merge_pull_request=Gabungkan Permintaan Tarik
865-
pulls.rebase_merge_pull_request=Membuat Ulang Dasar dan Menggabungkan
866-
pulls.squash_merge_pull_request=Tindih dan Gabungkan
867864
; </summary><code>%[2]s<br>%[3]s</code></details>
868865

869866

Diff for: ‎options/locale/locale_it-IT.ini

-4
Original file line numberDiff line numberDiff line change
@@ -1272,10 +1272,6 @@ pulls.no_merge_helper=Attiva le opzioni di merge nelle impostazioni del reposito
12721272
pulls.no_merge_wip=Questa pull request non può essere unita perché è contrassegnata come un lavoro in corso.
12731273
pulls.no_merge_not_ready=Questa pull request non è pronta per il merge, controlla lo stato della revisione e i controlli di stato.
12741274
pulls.no_merge_access=Non sei autorizzato ad effettuare il merge su questa pull request.
1275-
pulls.merge_pull_request=Unisci Pull Request
1276-
pulls.rebase_merge_pull_request=Fai rebase e unisci
1277-
pulls.rebase_merge_commit_pull_request=Rebase e Merge (--no-ff)
1278-
pulls.squash_merge_pull_request=Fai squash e unisci
12791275
pulls.require_signed_wont_sign=Il branch richiede commit firmati ma questo merge non verrà firmato
12801276
pulls.invalid_merge_option=Non puoi utilizzare questa opzione di merge per questa pull request.
12811277
pulls.merge_conflict_summary=Messaggio d'errore

Diff for: ‎options/locale/locale_ja-JP.ini

-4
Original file line numberDiff line numberDiff line change
@@ -1437,10 +1437,6 @@ pulls.no_merge_helper=リポジトリ設定でマージを有効にするか、
14371437
pulls.no_merge_wip=このプルリクエストはWork In Progressとマークされているため、マージすることはできません。
14381438
pulls.no_merge_not_ready=このプルリクエストはマージする準備ができていません。 レビュー状況とステータスチェックを確認してください。
14391439
pulls.no_merge_access=このプルリクエストをマージする権限がありません。
1440-
pulls.merge_pull_request=プルリクエストをマージ
1441-
pulls.rebase_merge_pull_request=リベースしてマージ
1442-
pulls.rebase_merge_commit_pull_request=リベースしてマージ(--no-ff)
1443-
pulls.squash_merge_pull_request=スカッシュしてマージ
14441440
pulls.merge_manually=手動マージ済みにする
14451441
pulls.merge_commit_id=マージコミットID
14461442
pulls.require_signed_wont_sign=ブランチでは署名されたコミットが必須ですが、このマージでは署名がされません

Diff for: ‎options/locale/locale_ko-KR.ini

-4
Original file line numberDiff line numberDiff line change
@@ -887,10 +887,6 @@ pulls.can_auto_merge_desc=이 풀리퀘스트는 자동적으로 머지될 수
887887
pulls.cannot_auto_merge_helper=충돌을 해결하려면 수동으로 머지하십시오.
888888

889889
pulls.no_merge_desc=모든 저장소 머지 옵션이 비활성화 되어있기 때문에 이 풀 리퀘스트를 머지할 수 없습니다.
890-
pulls.merge_pull_request=풀리퀘스트 머지
891-
pulls.rebase_merge_pull_request=리베이스와 머지
892-
pulls.rebase_merge_commit_pull_request=리베이스와 머지 (--no-ff)
893-
pulls.squash_merge_pull_request=스쿼시하고 머지
894890
pulls.invalid_merge_option=이 풀 리퀘스트에서 설정한 머지 옵션을 사용하실 수 없습니다.
895891
; </summary><code>%[2]s<br>%[3]s</code></details>
896892

Diff for: ‎options/locale/locale_lv-LV.ini

-4
Original file line numberDiff line numberDiff line change
@@ -1436,10 +1436,6 @@ pulls.no_merge_helper=Lai sapludinātu šo izmaiņu pieprasījumu, iespējojiet
14361436
pulls.no_merge_wip=Šo izmaiņu pieprasījumu nav iespējams sapludināt, jo tas ir atzīmēts, ka darbs pie tā vēl nav pabeigts.
14371437
pulls.no_merge_not_ready=Izmaiņu pieprasījumu nav iespējams sapludināt, pārbaudiet recenziju statusu un statusa pārbaudes.
14381438
pulls.no_merge_access=Jums nav tiesību sapludināt šo izmaiņu pieprasījumu.
1439-
pulls.merge_pull_request=Izmaiņu pieprasījuma sapludināšana
1440-
pulls.rebase_merge_pull_request=Pārbāzēt un sapludināt
1441-
pulls.rebase_merge_commit_pull_request=Pārbāzēt un sapludināt (--no-ff)
1442-
pulls.squash_merge_pull_request=Saspiest un sapludināt
14431439
pulls.merge_manually=Manuāli sapludināts
14441440
pulls.merge_commit_id=Sapludināšanas revīzijas ID
14451441
pulls.require_signed_wont_sign=Atzarā var iesūtīt tikai parakstītas revīzijas, bet sapludināšanas revīzijas netiks parakstīta

Diff for: ‎options/locale/locale_nl-NL.ini

-4
Original file line numberDiff line numberDiff line change
@@ -1263,10 +1263,6 @@ pulls.no_merge_helper=Schakel samenvoegingsopties in in de repositoryinstellinge
12631263
pulls.no_merge_wip=Deze pull-aanvraag kan niet worden samengevoegd omdat hij als "work in progress" is gemarkeerd.
12641264
pulls.no_merge_not_ready=Deze pull-aanvraag is niet klaar om samen te voegen, controleer de status en status controles.
12651265
pulls.no_merge_access=Je bent niet gemachtigd om deze pull-aanvraag samen te voegen.
1266-
pulls.merge_pull_request=Samenvoegen van pull verzoek
1267-
pulls.rebase_merge_pull_request=Rebase en Merge
1268-
pulls.rebase_merge_commit_pull_request=Rebase en voeg samen (--no-ff)
1269-
pulls.squash_merge_pull_request=Squash en Merge
12701266
pulls.require_signed_wont_sign=De branch heeft ondertekende commits nodig, maar deze merge zal niet worden ondertekend
12711267
pulls.invalid_merge_option=Je kan de samenvoegingsoptie niet gebruiken voor deze pull-aanvraag.
12721268
pulls.merge_conflict=Samenvoegen mislukt: Er was een conflict tijdens het samenvoegen. Hint: Probeer een andere strategie

Diff for: ‎options/locale/locale_pl-PL.ini

-4
Original file line numberDiff line numberDiff line change
@@ -1184,10 +1184,6 @@ pulls.no_merge_helper=Włącz opcje scalania w ustawieniach repozytorium, lub sc
11841184
pulls.no_merge_wip=Ten pull request nie może być automatycznie scalony, ponieważ jest oznaczony jako praca w toku.
11851185
pulls.no_merge_not_ready=Ten Pull Request nie jest gotowy do scalenia, sprawdź status recenzji i kontrolki stanu.
11861186
pulls.no_merge_access=Nie masz uprawnień, aby scalić ten Pull Request.
1187-
pulls.merge_pull_request=Scal Pull Request
1188-
pulls.rebase_merge_pull_request=Zmień bazę i scal
1189-
pulls.rebase_merge_commit_pull_request=Zmień bazę i scal (--no-ff)
1190-
pulls.squash_merge_pull_request=Zmiażdż i scal
11911187
pulls.require_signed_wont_sign=Ta gałąź wymaga podpisanych commitów, ale to scalenie nie będzie podpisane
11921188
pulls.invalid_merge_option=Nie możesz użyć tej opcji scalania dla tego pull request'a.
11931189
; </summary><code>%[2]s<br>%[3]s</code></details>

Diff for: ‎options/locale/locale_pt-BR.ini

-4
Original file line numberDiff line numberDiff line change
@@ -1260,10 +1260,6 @@ pulls.no_merge_helper=Habilite as opções de merge nas configurações do repos
12601260
pulls.no_merge_wip=O merge deste pull request não pode ser aplicado porque está marcado como um trabalho em andamento.
12611261
pulls.no_merge_not_ready=Este pull request não está pronto para ser realizado o merge, verifique o status da revisão e as verificações de status.
12621262
pulls.no_merge_access=Você não está autorizado para realizar o merge deste pull request.
1263-
pulls.merge_pull_request=Aplicar merge do pull request
1264-
pulls.rebase_merge_pull_request=Aplicar Rebase e Merge
1265-
pulls.rebase_merge_commit_pull_request=Aplicar Rebase e Merge (--no-ff)
1266-
pulls.squash_merge_pull_request=Aplicar Squash e Merge
12671263
pulls.require_signed_wont_sign=O branch requer commits assinados, mas este merge não será assinado
12681264
pulls.invalid_merge_option=Você não pode usar esta opção de merge neste pull request.
12691265
; </summary><code>%[2]s<br>%[3]s</code></details>

Diff for: ‎options/locale/locale_pt-PT.ini

+4-4
Original file line numberDiff line numberDiff line change
@@ -1437,10 +1437,10 @@ pulls.no_merge_helper=Habilite as opções de integração nas configurações d
14371437
pulls.no_merge_wip=A integração constante neste pedido não pode ser executada porque está marcada como sendo trabalho em andamento.
14381438
pulls.no_merge_not_ready=A integração constante neste pedido não pode ser executada. Verifique o estado da revisão e as verificações de estado.
14391439
pulls.no_merge_access=Não tem autorização para executar a integração constante neste pedido.
1440-
pulls.merge_pull_request=Executar a integração
1441-
pulls.rebase_merge_pull_request=Mudar a base e integrar
1442-
pulls.rebase_merge_commit_pull_request=Mudar a base e integrar (--no-ff)
1443-
pulls.squash_merge_pull_request=Comprimir e integrar
1440+
pulls.merge_pull_request=Criar um cometimento de integração
1441+
pulls.rebase_merge_pull_request=Mudar a base e avançar rapidamente
1442+
pulls.rebase_merge_commit_pull_request=Mudar a base e criar um cometimento de integração
1443+
pulls.squash_merge_pull_request=Criar cometimento de compressão
14441444
pulls.merge_manually=Integrado manualmente
14451445
pulls.merge_commit_id=O ID de cometimento da integração
14461446
pulls.require_signed_wont_sign=O ramo requer que os cometimentos sejam assinados mas esta integração não vai ser assinada

0 commit comments

Comments
 (0)