Merge branch 'main' into fix-16600-fix-access-logger

lunny · web-flow · commit c8df0b2880a5 · 2021-08-05T00:59:42.000+08:00
diff --git a/options/locale/locale_bg-BG.ini b/options/locale/locale_bg-BG.ini
@@ -787,7 +787,6 @@ pulls.num_conflicting_files_n=%d конфликтни файлове
 pulls.no_merge_desc=Тази заявка за сливане не може да бъде обединена, защото всички опции за обединяване на хранилището са изключени.
 pulls.no_merge_helper=Включете опции за сливане в настройките на хранилището или обединете заявката за сливане ръчно.
 pulls.no_merge_wip=Тази заявка за сливане не може да бъде обединена, защото е отбелязана като работа в прогрес.
-pulls.merge_pull_request=Обедини заявка за сливане
 ; </summary><code>%[2]s<br>%[3]s</code></details>
 pulls.status_checks_success=Всички проверявания бяха успешни
 pulls.update_branch=Осъвременяване на клона
diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini
@@ -1358,10 +1358,6 @@ pulls.no_merge_helper=Povolte možnosti sloučení v nastavení repozitáře neb
 pulls.no_merge_wip=Požadavek na natažení nemůže být sloučen protože je označen jako nedokončený.
 pulls.no_merge_not_ready=Tento požadavek na natažení není připraven na sloučení, zkontrolujte stav posouzení a kontrolu stavu.
 pulls.no_merge_access=Nemáte oprávnění sloučit tento požadavek na natažení.
-pulls.merge_pull_request=Sloučit požadavek na natažení
-pulls.rebase_merge_pull_request=Rebase a sloučit
-pulls.rebase_merge_commit_pull_request=Rebase a sloučit (--no-ff)
-pulls.squash_merge_pull_request=Squash a sloučit
 pulls.merge_manually=Sloučeno ručně
 pulls.merge_commit_id=ID slučovací revize
 pulls.require_signed_wont_sign=Větev vyžaduje podepsané revize, ale toto sloučení nebude podepsáno
diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini
@@ -1436,10 +1436,6 @@ pulls.no_merge_helper=Aktiviere Mergeoptionen in den Repositoryeinstellungen ode
 pulls.no_merge_wip=Dieser Pull Request kann nicht gemergt werden, da er als Work In Progress gekennzeichnet ist.
 pulls.no_merge_not_ready=Dieser Pull-Request kann nicht gemergt werden, überprüfe den Reviewstatus und die Statusprüfungen.
 pulls.no_merge_access=Du bist nicht berechtigt, diesen Pull-Request zu Mergen.
-pulls.merge_pull_request=Pull-Request mergen
-pulls.rebase_merge_pull_request=Rebase und Mergen
-pulls.rebase_merge_commit_pull_request=Rebasen und Mergen (--no-ff)
-pulls.squash_merge_pull_request=Zusammenfassen und Mergen
 pulls.merge_manually=Manuell mergen
 pulls.merge_commit_id=Der Mergecommit ID
 pulls.require_signed_wont_sign=Der Branch erfordert einen signierten Commit, aber dieser Merge wird nicht signiert
diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini
@@ -1436,10 +1436,6 @@ pulls.no_merge_helper=Habilite las opciones de combinación en la configuración
 pulls.no_merge_wip=Este pull request no se puede combinar porque está marcada como un trabajo en progreso.
 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.
 pulls.no_merge_access=No está autorizado para fusionar de este pull request.
-pulls.merge_pull_request=Fusionar Pull Request
-pulls.rebase_merge_pull_request=Hacer Rebase y Fusionar
-pulls.rebase_merge_commit_pull_request=Hacer Rebase y Fusionar (--no-ff)
-pulls.squash_merge_pull_request=Hacer Squash y Fusionar
 pulls.merge_manually=Fusionado manualmente
 pulls.merge_commit_id=La identificación del commit fusionado
 pulls.require_signed_wont_sign=Esta rama requiere commits firmados pero esta fusión no será firmada
diff --git a/options/locale/locale_fa-IR.ini b/options/locale/locale_fa-IR.ini
@@ -1162,10 +1162,6 @@ pulls.no_merge_helper=گزینه های ادغام را در تنظیمات مخ
 pulls.no_merge_wip=این تقاضای واکشی قابل ادغام نیست لذا اکنون به این مخزن درحال پردازش علامت گذاری شده است.
 pulls.no_merge_not_ready=این درخواست واکشی آماده ادغام نیست، وضعیت بازبینی را چک کنید.
 pulls.no_merge_access=شما مجاز به ادغام این درخواست واکشی نیستید.
-pulls.merge_pull_request=ادغام تقاضای واکشی
-pulls.rebase_merge_pull_request=بازگردانی و ادغام
-pulls.rebase_merge_commit_pull_request=بازگردانی و ادغام (--no-ff)
-pulls.squash_merge_pull_request=له کردن و ادغام
 pulls.require_signed_wont_sign=انشعاب نیازمند تغییرات امضا شده است اما این ادغام امضا نخواهد شد
 pulls.invalid_merge_option=شما نمی‌توانید از این گزینه برای تقاضای واکشی استفاده کنید.
 ; </summary><code>%[2]s<br>%[3]s</code></details>
diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini
@@ -777,7 +777,6 @@ pulls.merged=Yhdistetty
 pulls.has_merged=Vetopyyntö on yhdistetty.
 pulls.can_auto_merge_desc=Tämä pull-pyyntö voidaan yhdistää automaattisesti.
 
-pulls.merge_pull_request=Yhdistä Pull-pyyntö
 ; </summary><code>%[2]s<br>%[3]s</code></details>
 
 
diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini
@@ -1384,10 +1384,6 @@ pulls.no_merge_helper=Activez des options de fusion dans les paramètres du dép
 pulls.no_merge_wip=Cette demande d'ajout ne peut pas être fusionnée car elle est marquée comme en cours de chantier.
 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.
 pulls.no_merge_access=Vous n'êtes pas autorisé-e a fusionnée cette demande d'ajout.
-pulls.merge_pull_request=Fusionner la demande d'ajout
-pulls.rebase_merge_pull_request=Rebase et fusionner
-pulls.rebase_merge_commit_pull_request=Rebase et Fusion (--no-ff)
-pulls.squash_merge_pull_request=Squash et fusionner
 pulls.merge_manually=Fusionné manuellement
 pulls.merge_commit_id=L'ID de la révision de fusion
 pulls.require_signed_wont_sign=La branche nécessite des révisions signées mais cette fusion ne sera pas signée
diff --git a/options/locale/locale_hu-HU.ini b/options/locale/locale_hu-HU.ini
@@ -998,9 +998,6 @@ pulls.cant_reopen_deleted_branch=Ez a pull request nem nyitható meg újra, mive
 pulls.merged=Egyesítve
 pulls.can_auto_merge_desc=Ez az egyesítési kérés automatikusan végrehajtható.
 
-pulls.merge_pull_request=Egyesítési kérés végrehajtása
-pulls.rebase_merge_pull_request=Rebase és egyesítés
-pulls.squash_merge_pull_request=Squash és egyesítés
 ; </summary><code>%[2]s<br>%[3]s</code></details>
 pulls.status_checking=Néhány ellenőrzés függőben van
 pulls.status_checks_success=Minden ellenőrzés sikeres volt
diff --git a/options/locale/locale_id-ID.ini b/options/locale/locale_id-ID.ini
@@ -861,9 +861,6 @@ pulls.reopen_to_merge=Tolong buka kembali permintaan tarik ini untuk melaksanaka
 pulls.merged=Menggabungkan
 pulls.can_auto_merge_desc=Permintaan tarik ini dapat digabung secara otomatis.
 
-pulls.merge_pull_request=Gabungkan Permintaan Tarik
-pulls.rebase_merge_pull_request=Membuat Ulang Dasar dan Menggabungkan
-pulls.squash_merge_pull_request=Tindih dan Gabungkan
 ; </summary><code>%[2]s<br>%[3]s</code></details>
 
 
diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini
@@ -1272,10 +1272,6 @@ pulls.no_merge_helper=Attiva le opzioni di merge nelle impostazioni del reposito
 pulls.no_merge_wip=Questa pull request non può essere unita perché è contrassegnata come un lavoro in corso.
 pulls.no_merge_not_ready=Questa pull request non è pronta per il merge, controlla lo stato della revisione e i controlli di stato.
 pulls.no_merge_access=Non sei autorizzato ad effettuare il merge su questa pull request.
-pulls.merge_pull_request=Unisci Pull Request
-pulls.rebase_merge_pull_request=Fai rebase e unisci
-pulls.rebase_merge_commit_pull_request=Rebase e Merge (--no-ff)
-pulls.squash_merge_pull_request=Fai squash e unisci
 pulls.require_signed_wont_sign=Il branch richiede commit firmati ma questo merge non verrà firmato
 pulls.invalid_merge_option=Non puoi utilizzare questa opzione di merge per questa pull request.
 pulls.merge_conflict_summary=Messaggio d'errore
diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini
@@ -1437,10 +1437,6 @@ pulls.no_merge_helper=リポジトリ設定でマージを有効にするか、
 pulls.no_merge_wip=このプルリクエストはWork In Progressとマークされているため、マージすることはできません。
 pulls.no_merge_not_ready=このプルリクエストはマージする準備ができていません。 レビュー状況とステータスチェックを確認してください。
 pulls.no_merge_access=このプルリクエストをマージする権限がありません。
-pulls.merge_pull_request=プルリクエストをマージ
-pulls.rebase_merge_pull_request=リベースしてマージ
-pulls.rebase_merge_commit_pull_request=リベースしてマージ(--no-ff)
-pulls.squash_merge_pull_request=スカッシュしてマージ
 pulls.merge_manually=手動マージ済みにする
 pulls.merge_commit_id=マージコミットID
 pulls.require_signed_wont_sign=ブランチでは署名されたコミットが必須ですが、このマージでは署名がされません
diff --git a/options/locale/locale_ko-KR.ini b/options/locale/locale_ko-KR.ini
@@ -887,10 +887,6 @@ pulls.can_auto_merge_desc=이 풀리퀘스트는 자동적으로 머지될 수 
 pulls.cannot_auto_merge_helper=충돌을 해결하려면 수동으로 머지하십시오.
 
 pulls.no_merge_desc=모든 저장소 머지 옵션이 비활성화 되어있기 때문에 이 풀 리퀘스트를 머지할 수 없습니다.
-pulls.merge_pull_request=풀리퀘스트 머지
-pulls.rebase_merge_pull_request=리베이스와 머지
-pulls.rebase_merge_commit_pull_request=리베이스와 머지 (--no-ff)
-pulls.squash_merge_pull_request=스쿼시하고 머지
 pulls.invalid_merge_option=이 풀 리퀘스트에서 설정한 머지 옵션을 사용하실 수 없습니다.
 ; </summary><code>%[2]s<br>%[3]s</code></details>
 
diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini
@@ -1436,10 +1436,6 @@ pulls.no_merge_helper=Lai sapludinātu šo izmaiņu pieprasījumu, iespējojiet
 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.
 pulls.no_merge_not_ready=Izmaiņu pieprasījumu nav iespējams sapludināt, pārbaudiet recenziju statusu un statusa pārbaudes.
 pulls.no_merge_access=Jums nav tiesību sapludināt šo izmaiņu pieprasījumu.
-pulls.merge_pull_request=Izmaiņu pieprasījuma sapludināšana
-pulls.rebase_merge_pull_request=Pārbāzēt un sapludināt
-pulls.rebase_merge_commit_pull_request=Pārbāzēt un sapludināt (--no-ff)
-pulls.squash_merge_pull_request=Saspiest un sapludināt
 pulls.merge_manually=Manuāli sapludināts
 pulls.merge_commit_id=Sapludināšanas revīzijas ID
 pulls.require_signed_wont_sign=Atzarā var iesūtīt tikai parakstītas revīzijas, bet sapludināšanas revīzijas netiks parakstīta
diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini
@@ -1263,10 +1263,6 @@ pulls.no_merge_helper=Schakel samenvoegingsopties in in de repositoryinstellinge
 pulls.no_merge_wip=Deze pull-aanvraag kan niet worden samengevoegd omdat hij als "work in progress" is gemarkeerd.
 pulls.no_merge_not_ready=Deze pull-aanvraag is niet klaar om samen te voegen, controleer de status en status controles.
 pulls.no_merge_access=Je bent niet gemachtigd om deze pull-aanvraag samen te voegen.
-pulls.merge_pull_request=Samenvoegen van pull verzoek
-pulls.rebase_merge_pull_request=Rebase en Merge
-pulls.rebase_merge_commit_pull_request=Rebase en voeg samen (--no-ff)
-pulls.squash_merge_pull_request=Squash en Merge
 pulls.require_signed_wont_sign=De branch heeft ondertekende commits nodig, maar deze merge zal niet worden ondertekend
 pulls.invalid_merge_option=Je kan de samenvoegingsoptie niet gebruiken voor deze pull-aanvraag.
 pulls.merge_conflict=Samenvoegen mislukt: Er was een conflict tijdens het samenvoegen. Hint: Probeer een andere strategie
diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini
@@ -1184,10 +1184,6 @@ pulls.no_merge_helper=Włącz opcje scalania w ustawieniach repozytorium, lub sc
 pulls.no_merge_wip=Ten pull request nie może być automatycznie scalony, ponieważ jest oznaczony jako praca w toku.
 pulls.no_merge_not_ready=Ten Pull Request nie jest gotowy do scalenia, sprawdź status recenzji i kontrolki stanu.
 pulls.no_merge_access=Nie masz uprawnień, aby scalić ten Pull Request.
-pulls.merge_pull_request=Scal Pull Request
-pulls.rebase_merge_pull_request=Zmień bazę i scal
-pulls.rebase_merge_commit_pull_request=Zmień bazę i scal (--no-ff)
-pulls.squash_merge_pull_request=Zmiażdż i scal
 pulls.require_signed_wont_sign=Ta gałąź wymaga podpisanych commitów, ale to scalenie nie będzie podpisane
 pulls.invalid_merge_option=Nie możesz użyć tej opcji scalania dla tego pull request'a.
 ; </summary><code>%[2]s<br>%[3]s</code></details>
diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini
@@ -1260,10 +1260,6 @@ pulls.no_merge_helper=Habilite as opções de merge nas configurações do repos
 pulls.no_merge_wip=O merge deste pull request não pode ser aplicado porque está marcado como um trabalho em andamento.
 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.
 pulls.no_merge_access=Você não está autorizado para realizar o merge deste pull request.
-pulls.merge_pull_request=Aplicar merge do pull request
-pulls.rebase_merge_pull_request=Aplicar Rebase e Merge
-pulls.rebase_merge_commit_pull_request=Aplicar Rebase e Merge (--no-ff)
-pulls.squash_merge_pull_request=Aplicar Squash e Merge
 pulls.require_signed_wont_sign=O branch requer commits assinados, mas este merge não será assinado
 pulls.invalid_merge_option=Você não pode usar esta opção de merge neste pull request.
 ; </summary><code>%[2]s<br>%[3]s</code></details>
diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini
@@ -1437,10 +1437,10 @@ pulls.no_merge_helper=Habilite as opções de integração nas configurações d
 pulls.no_merge_wip=A integração constante neste pedido não pode ser executada porque está marcada como sendo trabalho em andamento.
 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.
 pulls.no_merge_access=Não tem autorização para executar a integração constante neste pedido.
-pulls.merge_pull_request=Executar a integração
-pulls.rebase_merge_pull_request=Mudar a base e integrar
-pulls.rebase_merge_commit_pull_request=Mudar a base e integrar (--no-ff)
-pulls.squash_merge_pull_request=Comprimir e integrar
+pulls.merge_pull_request=Criar um cometimento de integração
+pulls.rebase_merge_pull_request=Mudar a base e avançar rapidamente
+pulls.rebase_merge_commit_pull_request=Mudar a base e criar um cometimento de integração
+pulls.squash_merge_pull_request=Criar cometimento de compressão
 pulls.merge_manually=Integrado manualmente
 pulls.merge_commit_id=O ID de cometimento da integração
 pulls.require_signed_wont_sign=O ramo requer que os cometimentos sejam assinados mas esta integração não vai ser assinada
diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini
@@ -1434,10 +1434,6 @@ pulls.no_merge_helper=Включите опции слияния в настро
 pulls.no_merge_wip=Данный Pull Request не может быть принят, поскольку он помечен как находящийся в разработке.
 pulls.no_merge_not_ready=Этот запрос не готов к слиянию, обратите внимания на ревью и проверки.
 pulls.no_merge_access=У вас нет права для слияния данного запроса.
-pulls.merge_pull_request=Принять Pull Request
-pulls.rebase_merge_pull_request=Выполнить rebase и принять PR
-pulls.rebase_merge_commit_pull_request=Выполнить rebase и принять PR (--no-ff)
-pulls.squash_merge_pull_request=Объединить и принять PR
 pulls.merge_manually=Слито вручную
 pulls.merge_commit_id=ID коммита слияния
 pulls.require_signed_wont_sign=Данная ветка ожидает подписанные коммиты, однако слияние не будет подписано
diff --git a/options/locale/locale_sr-SP.ini b/options/locale/locale_sr-SP.ini
@@ -355,7 +355,6 @@ pulls.tab_commits=Комити
 pulls.merged=Спојено
 pulls.can_auto_merge_desc=Овај захтев за спајање може бити обављен аутоматски.
 
-pulls.merge_pull_request=Обави спајање
 ; </summary><code>%[2]s<br>%[3]s</code></details>
 
 
diff --git a/options/locale/locale_sv-SE.ini b/options/locale/locale_sv-SE.ini
@@ -1199,10 +1199,6 @@ pulls.cannot_auto_merge_helper=Merga manuellt för att lösa konlifterna.
 
 pulls.no_merge_desc=Pull-requesten kan inte mergas för alla alternativ för merging är inaktiverade för denna utvecklingskatalog.
 pulls.no_merge_helper=Aktivera mergealternativ i utvecklingskatalogsinställningarna, eller merga manuellt.
-pulls.merge_pull_request=Sammanfoga Pull-förfrågan
-pulls.rebase_merge_pull_request=Rebase och sammanfogning
-pulls.rebase_merge_commit_pull_request=Rebase och Merge (--no-ff)
-pulls.squash_merge_pull_request=Squasha och sammanfogning
 pulls.invalid_merge_option=Du kan inte använda detta mergealternativet för denna pull-request.
 ; </summary><code>%[2]s<br>%[3]s</code></details>
 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
diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini
@@ -1386,10 +1386,6 @@ pulls.no_merge_helper=Depo ayarlarındaki birleştirme seçeneklerini etkinleşt
 pulls.no_merge_wip=Bu değişiklik isteği birleştirilemez çünkü devam eden bir çalışma olarak işaretlendi.
 pulls.no_merge_not_ready=Bu değişiklik isteği birleştirilmeye hazır değil, inceleme durumunu ve durum kontrollerini kontrol edin.
 pulls.no_merge_access=Bu değişiklik isteğini birleştirme yetkiniz yok.
-pulls.merge_pull_request=Değişiklik İsteğini Birleştir
-pulls.rebase_merge_pull_request=Yeniden Yapılandır ve Birleştir
-pulls.rebase_merge_commit_pull_request=Yeniden Yapılandır ve Birleştir (--no-ff)
-pulls.squash_merge_pull_request=Ez ve Birleştir
 pulls.merge_manually=Elle birleştirildi
 pulls.merge_commit_id=Birleştirme işlemesi kimliği
 pulls.require_signed_wont_sign=Dal imzalı işlemeler gerektiriyor, ancak bu birleştirme imzalanmayacak
diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini
@@ -1416,10 +1416,6 @@ pulls.no_merge_helper=Увімкніть параметри злиття в на
 pulls.no_merge_wip=Цей пулл-реквест не можливо об'єднати, тому-що він вже виконується.
 pulls.no_merge_not_ready=Цей запит не готовий до злиття, перевірте статус рецензіювання і статус перевірки.
 pulls.no_merge_access=Ви не авторизовані, щоб виконати цей запит на злиття.
-pulls.merge_pull_request=Об'єднати запит на злиття
-pulls.rebase_merge_pull_request=Зробити Rebase і злити
-pulls.rebase_merge_commit_pull_request=Rebase та злитя (--no-ff)
-pulls.squash_merge_pull_request=Об'єднати (Squash) і злити
 pulls.merge_manually=Об’єднано вручну
 pulls.merge_commit_id=ID коміту злиття
 pulls.require_signed_wont_sign=Гілка вимагає підписаних комітів, але це злиття не буде підписано
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
@@ -1436,10 +1436,6 @@ pulls.no_merge_helper=在仓库设置中启用合并选项或者手工合并请
 pulls.no_merge_wip=这个合并请求无法合并，因为被标记为尚未完成的工作。
 pulls.no_merge_not_ready=此拉取请求尚未准备好合并，请检查审核状态和状态检查。
 pulls.no_merge_access=您无权合并此拉取请求。
-pulls.merge_pull_request=合并请求
-pulls.rebase_merge_pull_request=变基并合并
-pulls.rebase_merge_commit_pull_request=变基合并 (--no-ff)
-pulls.squash_merge_pull_request=压缩提交并合并
 pulls.merge_manually=手动合并
 pulls.merge_commit_id=合并提交 ID
 pulls.require_signed_wont_sign=分支需要签名的提交，但这个合并将不会被签名
diff --git a/options/locale/locale_zh-HK.ini b/options/locale/locale_zh-HK.ini
@@ -429,7 +429,6 @@ pulls.reopen_to_merge=請重新開啟合併請求來完成合併操作。
 pulls.merged=已合併
 pulls.can_auto_merge_desc=這個拉請求可以自動合併。
 
-pulls.merge_pull_request=合併請求
 ; </summary><code>%[2]s<br>%[3]s</code></details>
 
 
diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini
