Skip to content

Commit c8df0b2

Browse files
authored
Merge branch 'main' into fix-16600-fix-access-logger
2 parents 6d2ec31 + f03abe8 commit c8df0b2

25 files changed

+8
-86
lines changed

options/locale/locale_bg-BG.ini

Lines changed: 0 additions & 1 deletion
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=Осъвременяване на клона

options/locale/locale_cs-CZ.ini

Lines changed: 0 additions & 4 deletions
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

options/locale/locale_de-DE.ini

Lines changed: 0 additions & 4 deletions
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

options/locale/locale_es-ES.ini

Lines changed: 0 additions & 4 deletions
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

options/locale/locale_fa-IR.ini

Lines changed: 0 additions & 4 deletions
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>

options/locale/locale_fi-FI.ini

Lines changed: 0 additions & 1 deletion
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

options/locale/locale_fr-FR.ini

Lines changed: 0 additions & 4 deletions
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

options/locale/locale_hu-HU.ini

Lines changed: 0 additions & 3 deletions
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

options/locale/locale_id-ID.ini

Lines changed: 0 additions & 3 deletions
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

options/locale/locale_it-IT.ini

Lines changed: 0 additions & 4 deletions
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

options/locale/locale_ja-JP.ini

Lines changed: 0 additions & 4 deletions
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=ブランチでは署名されたコミットが必須ですが、このマージでは署名がされません

options/locale/locale_ko-KR.ini

Lines changed: 0 additions & 4 deletions
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

options/locale/locale_lv-LV.ini

Lines changed: 0 additions & 4 deletions
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

options/locale/locale_nl-NL.ini

Lines changed: 0 additions & 4 deletions
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

options/locale/locale_pl-PL.ini

Lines changed: 0 additions & 4 deletions
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>

options/locale/locale_pt-BR.ini

Lines changed: 0 additions & 4 deletions
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>

options/locale/locale_pt-PT.ini

Lines changed: 4 additions & 4 deletions
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

options/locale/locale_ru-RU.ini

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1434,10 +1434,6 @@ pulls.no_merge_helper=Включите опции слияния в настро
14341434
pulls.no_merge_wip=Данный Pull Request не может быть принят, поскольку он помечен как находящийся в разработке.
14351435
pulls.no_merge_not_ready=Этот запрос не готов к слиянию, обратите внимания на ревью и проверки.
14361436
pulls.no_merge_access=У вас нет права для слияния данного запроса.
1437-
pulls.merge_pull_request=Принять Pull Request
1438-
pulls.rebase_merge_pull_request=Выполнить rebase и принять PR
1439-
pulls.rebase_merge_commit_pull_request=Выполнить rebase и принять PR (--no-ff)
1440-
pulls.squash_merge_pull_request=Объединить и принять PR
14411437
pulls.merge_manually=Слито вручную
14421438
pulls.merge_commit_id=ID коммита слияния
14431439
pulls.require_signed_wont_sign=Данная ветка ожидает подписанные коммиты, однако слияние не будет подписано

options/locale/locale_sr-SP.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,6 @@ pulls.tab_commits=Комити
355355
pulls.merged=Спојено
356356
pulls.can_auto_merge_desc=Овај захтев за спајање може бити обављен аутоматски.
357357

358-
pulls.merge_pull_request=Обави спајање
359358
; </summary><code>%[2]s<br>%[3]s</code></details>
360359

361360

options/locale/locale_sv-SE.ini

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1199,10 +1199,6 @@ pulls.cannot_auto_merge_helper=Merga manuellt för att lösa konlifterna.
11991199

12001200
pulls.no_merge_desc=Pull-requesten kan inte mergas för alla alternativ för merging är inaktiverade för denna utvecklingskatalog.
12011201
pulls.no_merge_helper=Aktivera mergealternativ i utvecklingskatalogsinställningarna, eller merga manuellt.
1202-
pulls.merge_pull_request=Sammanfoga Pull-förfrågan
1203-
pulls.rebase_merge_pull_request=Rebase och sammanfogning
1204-
pulls.rebase_merge_commit_pull_request=Rebase och Merge (--no-ff)
1205-
pulls.squash_merge_pull_request=Squasha och sammanfogning
12061202
pulls.invalid_merge_option=Du kan inte använda detta mergealternativet för denna pull-request.
12071203
; </summary><code>%[2]s<br>%[3]s</code></details>
12081204
pulls.push_rejected_no_message=Sammanfogningen misslyckades: Push-förfrågan avvisades, men utan något meddelande från fjärrvärden.<br>Granska githookarna för denna utvecklingskatalog

options/locale/locale_tr-TR.ini

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1386,10 +1386,6 @@ pulls.no_merge_helper=Depo ayarlarındaki birleştirme seçeneklerini etkinleşt
13861386
pulls.no_merge_wip=Bu değişiklik isteği birleştirilemez çünkü devam eden bir çalışma olarak işaretlendi.
13871387
pulls.no_merge_not_ready=Bu değişiklik isteği birleştirilmeye hazır değil, inceleme durumunu ve durum kontrollerini kontrol edin.
13881388
pulls.no_merge_access=Bu değişiklik isteğini birleştirme yetkiniz yok.
1389-
pulls.merge_pull_request=Değişiklik İsteğini Birleştir
1390-
pulls.rebase_merge_pull_request=Yeniden Yapılandır ve Birleştir
1391-
pulls.rebase_merge_commit_pull_request=Yeniden Yapılandır ve Birleştir (--no-ff)
1392-
pulls.squash_merge_pull_request=Ez ve Birleştir
13931389
pulls.merge_manually=Elle birleştirildi
13941390
pulls.merge_commit_id=Birleştirme işlemesi kimliği
13951391
pulls.require_signed_wont_sign=Dal imzalı işlemeler gerektiriyor, ancak bu birleştirme imzalanmayacak

options/locale/locale_uk-UA.ini

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1416,10 +1416,6 @@ pulls.no_merge_helper=Увімкніть параметри злиття в на
14161416
pulls.no_merge_wip=Цей пулл-реквест не можливо об'єднати, тому-що він вже виконується.
14171417
pulls.no_merge_not_ready=Цей запит не готовий до злиття, перевірте статус рецензіювання і статус перевірки.
14181418
pulls.no_merge_access=Ви не авторизовані, щоб виконати цей запит на злиття.
1419-
pulls.merge_pull_request=Об'єднати запит на злиття
1420-
pulls.rebase_merge_pull_request=Зробити Rebase і злити
1421-
pulls.rebase_merge_commit_pull_request=Rebase та злитя (--no-ff)
1422-
pulls.squash_merge_pull_request=Об'єднати (Squash) і злити
14231419
pulls.merge_manually=Об’єднано вручну
14241420
pulls.merge_commit_id=ID коміту злиття
14251421
pulls.require_signed_wont_sign=Гілка вимагає підписаних комітів, але це злиття не буде підписано

options/locale/locale_zh-CN.ini

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1436,10 +1436,6 @@ pulls.no_merge_helper=在仓库设置中启用合并选项或者手工合并请
14361436
pulls.no_merge_wip=这个合并请求无法合并,因为被标记为尚未完成的工作。
14371437
pulls.no_merge_not_ready=此拉取请求尚未准备好合并,请检查审核状态和状态检查。
14381438
pulls.no_merge_access=您无权合并此拉取请求。
1439-
pulls.merge_pull_request=合并请求
1440-
pulls.rebase_merge_pull_request=变基并合并
1441-
pulls.rebase_merge_commit_pull_request=变基合并 (--no-ff)
1442-
pulls.squash_merge_pull_request=压缩提交并合并
14431439
pulls.merge_manually=手动合并
14441440
pulls.merge_commit_id=合并提交 ID
14451441
pulls.require_signed_wont_sign=分支需要签名的提交,但这个合并将不会被签名

options/locale/locale_zh-HK.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,6 @@ pulls.reopen_to_merge=請重新開啟合併請求來完成合併操作。
429429
pulls.merged=已合併
430430
pulls.can_auto_merge_desc=這個拉請求可以自動合併。
431431

432-
pulls.merge_pull_request=合併請求
433432
; </summary><code>%[2]s<br>%[3]s</code></details>
434433

435434

0 commit comments

Comments
 (0)