diff --git a/options/locale/locale_bg-BG.ini b/options/locale/locale_bg-BG.ini index 22351c04e2..af6f019e9d 100644 --- a/options/locale/locale_bg-BG.ini +++ b/options/locale/locale_bg-BG.ini @@ -771,7 +771,6 @@ pulls.no_merge_wip=Тази заявка за сливане не може да ; %[2]s
%[3]s
pulls.status_checks_success=Всички проверявания бяха успешни - milestones.new=Нов етап milestones.open_tab=%d отворени milestones.close_tab=%d затворени diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini index 9d6929de8e..098d47020e 100644 --- a/options/locale/locale_cs-CZ.ini +++ b/options/locale/locale_cs-CZ.ini @@ -1528,7 +1528,6 @@ pulls.outdated_with_base_branch=Tato větev je zastaralá oproti základní vět pulls.closed_at=`uzavřel/a tento požadavek na natažení %[2]s` pulls.reopened_at=`znovuotevřel/a tento požadavek na natažení %[2]s` pulls.merge_instruction_hint=`Můžete také zobrazit instrukce příkazové řádky.` - pulls.merge_instruction_step1_desc=Z vašeho repositáře projektu se podívejte na novou větev a vyzkoušejte změny. pulls.merge_instruction_step2_desc=Slučte změny a aktualizujte je na Gitea. diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini index da495b2feb..576117672d 100644 --- a/options/locale/locale_de-DE.ini +++ b/options/locale/locale_de-DE.ini @@ -1557,7 +1557,6 @@ pulls.outdated_with_base_branch=Dieser Branch enthält nicht die neusten Commits pulls.closed_at=`hat diesen Pull-Request %[2]s geschlossen` pulls.reopened_at=`hat diesen Pull-Request %[2]s wieder geöffnet` pulls.merge_instruction_hint=`Siehe auch die Anleitung für die Kommandozeile.` - pulls.merge_instruction_step1_desc=Wechsle auf einen neuen Branch in deinem lokalen Repository und teste die Änderungen. pulls.merge_instruction_step2_desc=Führe die Änderungen zusammen und aktualisiere den Stand online auf Gitea. diff --git a/options/locale/locale_el-GR.ini b/options/locale/locale_el-GR.ini index 0119148cd5..f802f50cfa 100644 --- a/options/locale/locale_el-GR.ini +++ b/options/locale/locale_el-GR.ini @@ -1557,7 +1557,6 @@ pulls.outdated_with_base_branch=Αυτός ο κλάδος δεν είναι ε pulls.closed_at=`έκλεισε αυτό το pull request %[2]s` pulls.reopened_at=`άνοιξε ξανά αυτό το pull request %[2]s` pulls.merge_instruction_hint=`Μπορείτε επίσης να δείτε τις οδηγίες της γραμμής εντολών.` - pulls.merge_instruction_step1_desc=Από το αποθετήριο του έργου σας, ελέγξτε έναν νέο κλάδο και τεστάρετε τις αλλαγές. pulls.merge_instruction_step2_desc=Συγχώνευσε τις αλλαγές και ενημέρωσε στο Gitea. diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini index 5311470969..d8f0deabe0 100644 --- a/options/locale/locale_es-ES.ini +++ b/options/locale/locale_es-ES.ini @@ -1554,7 +1554,6 @@ pulls.outdated_with_base_branch=Esta rama está desactualizada con la rama base pulls.closed_at=`cerró este pull request %[2]s` pulls.reopened_at=`reabrió este pull request %[2]s` pulls.merge_instruction_hint=`También puede ver instrucciones de línea de comandos.` - pulls.merge_instruction_step1_desc=Desde el repositorio de su proyecto, revisa una nueva rama y prueba los cambios. pulls.merge_instruction_step2_desc=Combine los cambios y actualice en Gitea. diff --git a/options/locale/locale_fa-IR.ini b/options/locale/locale_fa-IR.ini index 0216356d13..93a756fa5e 100644 --- a/options/locale/locale_fa-IR.ini +++ b/options/locale/locale_fa-IR.ini @@ -1477,7 +1477,6 @@ pulls.outdated_with_base_branch=این شاخه با شاخه پایه منسو pulls.closed_at=`این درخواست pull بسته شده %[2]s` pulls.reopened_at=`این درخواست pull را بازگشایی کرد %[2]s` pulls.merge_instruction_hint=`همچنین می‌توانید دستورالعمل‌های خط فرمان را مشاهده کنید.` - pulls.merge_instruction_step1_desc=از انبار پروژه خود، یک شاخه جدید را بگیرید و تغییرات را آزمایش کنید. pulls.merge_instruction_step2_desc=تغییرات را ادغام کنید و در Gitea به روز کنید. diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini index 7f9d1059c9..361ba76e74 100644 --- a/options/locale/locale_fi-FI.ini +++ b/options/locale/locale_fi-FI.ini @@ -756,7 +756,6 @@ pulls.can_auto_merge_desc=Tämä pull-pyyntö voidaan yhdistää automaattisesti ; %[2]s
%[3]s
- milestones.new=Uusi merkkipaalu milestones.open_tab=%d avoinna milestones.close_tab=%d suljettu diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini index 2f9ef3c1bc..496b3b3c0f 100644 --- a/options/locale/locale_fr-FR.ini +++ b/options/locale/locale_fr-FR.ini @@ -1390,7 +1390,6 @@ pulls.outdated_with_base_branch=Cette branche est désynchronisée avec la branc pulls.closed_at=`a fermé cette pull request %[2]s` pulls.reopened_at=`a réouvert cette pull request %[2]s` pulls.merge_instruction_hint=`Vous pouvez également voir les instructions en ligne de commande.` - pulls.merge_instruction_step1_desc=Depuis le dépôt de votre projet, sélectionnez une nouvelle branche et testez les modifications. pulls.merge_instruction_step2_desc=Fusionner les modifications et mettre à jour sur Gitea. diff --git a/options/locale/locale_hu-HU.ini b/options/locale/locale_hu-HU.ini index b830e8baf8..9b85f57e16 100644 --- a/options/locale/locale_hu-HU.ini +++ b/options/locale/locale_hu-HU.ini @@ -977,7 +977,6 @@ pulls.can_auto_merge_desc=Ez az egyesítési kérés automatikusan végrehajthat pulls.status_checking=Néhány ellenőrzés függőben van pulls.status_checks_success=Minden ellenőrzés sikeres volt - milestones.new=Új mérföldkő milestones.open_tab=%d Nyitott milestones.close_tab=%d Zárt diff --git a/options/locale/locale_id-ID.ini b/options/locale/locale_id-ID.ini index e4869c02c5..77df83eb38 100644 --- a/options/locale/locale_id-ID.ini +++ b/options/locale/locale_id-ID.ini @@ -841,7 +841,6 @@ pulls.can_auto_merge_desc=Permintaan tarik ini dapat digabung secara otomatis. ; %[2]s
%[3]s
- milestones.new=Milestone Baru milestones.open_tab=%d Terbuka milestones.close_tab=%d Tertutup diff --git a/options/locale/locale_is-IS.ini b/options/locale/locale_is-IS.ini index de89ad6385..b3d570c801 100644 --- a/options/locale/locale_is-IS.ini +++ b/options/locale/locale_is-IS.ini @@ -929,7 +929,6 @@ pulls.merge_manually=Sameinað handvirkt pulls.status_checks_requested=Nauðsynlegt pulls.status_checks_details=Nánar - milestones.new=Nýtt tímamót milestones.open_tab=%d Opin milestones.close_tab=%d Lokuð diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini index 7a547142bf..c93606c6a9 100644 --- a/options/locale/locale_it-IT.ini +++ b/options/locale/locale_it-IT.ini @@ -1250,7 +1250,6 @@ pulls.update_branch_success=Brench aggiornato con successo pulls.update_not_allowed=Non sei abilitato ad aggiornare il branch pulls.outdated_with_base_branch=Questo brench non è aggiornato con il branch di base - milestones.new=Nuova Milestone milestones.open_tab=%d Aperti milestones.close_tab=%d Chiusi diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini index a9cb8b70ad..63a2d95ed0 100644 --- a/options/locale/locale_ja-JP.ini +++ b/options/locale/locale_ja-JP.ini @@ -1587,7 +1587,6 @@ pulls.outdated_with_base_branch=このブランチはベースブランチに対 pulls.closed_at=`がプルリクエストをクローズ %[2]s` pulls.reopened_at=`がプルリクエストを再オープン %[2]s` pulls.merge_instruction_hint=`コマンドラインの手順も確認できます。` - pulls.merge_instruction_step1_desc=あなたのプロジェクトリポジトリで新しいブランチをチェックアウトし、変更内容をテストします。 pulls.merge_instruction_step2_desc=変更内容をマージして、Giteaに反映します。 diff --git a/options/locale/locale_ko-KR.ini b/options/locale/locale_ko-KR.ini index c55de5a8f9..36f616990d 100644 --- a/options/locale/locale_ko-KR.ini +++ b/options/locale/locale_ko-KR.ini @@ -864,7 +864,6 @@ pulls.no_merge_desc=모든 저장소 머지 옵션이 비활성화 되어있기 pulls.invalid_merge_option=이 풀 리퀘스트에서 설정한 머지 옵션을 사용하실 수 없습니다. ; %[2]s
%[3]s
- milestones.new=새로운 마일스톤 milestones.open_tab=%d개 열림 milestones.close_tab=%d개 닫힘 diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini index 40cb93c80a..19c256b1e1 100644 --- a/options/locale/locale_lv-LV.ini +++ b/options/locale/locale_lv-LV.ini @@ -1542,7 +1542,6 @@ pulls.outdated_with_base_branch=Atzars ir novecojis salīdzinot ar bāzes atzaru pulls.closed_at=`aizvēra šo izmaiņu pieprasījumu %[2]s` pulls.reopened_at=`atkārtoti atvēra šo izmaiņu pieprasījumu %[2]s` pulls.merge_instruction_hint=`Varat aplūkot arī komandrindas instrukcijas.` - pulls.merge_instruction_step1_desc=Projekta repozitorijā izveidojiet jaunu jaunu atzaru un pārbaudiet savas izmaiņas. pulls.merge_instruction_step2_desc=Sapludināt izmaiņas un atjaunot tās Gitea. diff --git a/options/locale/locale_ml-IN.ini b/options/locale/locale_ml-IN.ini index 31b9ca23eb..c5f7238de8 100644 --- a/options/locale/locale_ml-IN.ini +++ b/options/locale/locale_ml-IN.ini @@ -727,7 +727,6 @@ issues.dependency.add_error_dep_not_same_repo=രണ്ട് പ്രശ്ന ; %[2]s
%[3]s
- milestones.filter_sort.most_issues=മിക്ക ഇഷ്യൂകളും milestones.filter_sort.least_issues=കുറഞ്ഞ ഇഷ്യൂകളെങ്കിലും diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini index dfc7fe13ba..640c5364dd 100644 --- a/options/locale/locale_nl-NL.ini +++ b/options/locale/locale_nl-NL.ini @@ -1279,7 +1279,6 @@ pulls.outdated_with_base_branch=Deze branch is verouderd met de basis branch pulls.closed_at=`heeft deze pull request gesloten %[2]s` pulls.reopened_at=`heropende deze pull request %[2]s` - milestones.new=Nieuwe mijlpaal milestones.open_tab=%d geopend milestones.close_tab=%d gesloten diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini index 90c4d28027..6967a919af 100644 --- a/options/locale/locale_pl-PL.ini +++ b/options/locale/locale_pl-PL.ini @@ -1449,7 +1449,6 @@ pulls.outdated_with_base_branch=Ta gałąź jest przestarzała w stosunku do ga pulls.closed_at=`zamknął(-ęła) ten pull request %[2]s` pulls.reopened_at=`otworzył(-a) ponownie ten Pull Request %[2]s` pulls.merge_instruction_hint=`Możesz także zobaczyć instrukcje wiersza poleceń.` - pulls.merge_instruction_step1_desc=Z repozytorium twojego projektu, sprawdź nową gałąź i przetestuj zmiany. pulls.merge_instruction_step2_desc=Połącz zmiany i zaktualizuj na Gitea. diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini index 44c0539da1..607a915645 100644 --- a/options/locale/locale_pt-BR.ini +++ b/options/locale/locale_pt-BR.ini @@ -1489,6 +1489,7 @@ pulls.new=Novo pull request pulls.view=Ver Pull Request pulls.compare_changes=Novo pull request pulls.compare_changes_desc=Selecione o branch de destino (push) e o branch de origem (pull) para o merge. +pulls.has_viewed_file=Visto pulls.compare_base=merge em pulls.compare_compare=pull de pulls.switch_comparison_type=Mudar tipo de comparação @@ -1584,9 +1585,9 @@ pulls.outdated_with_base_branch=Este branch está desatualizado com o branch bas pulls.closed_at=`fechou este pull request %[2]s` pulls.reopened_at=`reabriu este pull request %[2]s` pulls.merge_instruction_hint=`Você também pode ver as instruções para a linha de comandos.` - pulls.merge_instruction_step1_desc=No repositório do seu projeto, crie um novo branch e teste as alterações. pulls.merge_instruction_step2_desc=Faça merge das alterações e atualize no Gitea. +pulls.merge_pull_on_success_cancel=Cancelar merge automático milestones.new=Novo marco milestones.open_tab=%d Aberto diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini index 41a3deccea..96d782a27f 100644 --- a/options/locale/locale_pt-PT.ini +++ b/options/locale/locale_pt-PT.ini @@ -1490,6 +1490,9 @@ pulls.compare_changes=Novo pedido de integração pulls.allow_edits_from_maintainers_desc=Utilizadores com acesso de escrita no ramo base também podem fazer envios para este ramo pulls.allow_edits_from_maintainers_err=Não foi possível fazer a modificação pulls.compare_changes_desc=Escolha o ramo de destino e o ramo de origem. +pulls.has_viewed_file=Visto +pulls.has_changed_since_last_review=Alterado desde a última revisão +pulls.viewed_files_label=%[1]d / %[2]d ficheiros vistos pulls.compare_base=integrar em pulls.compare_compare=puxar de pulls.switch_comparison_type=Trocar o tipo de comparação @@ -1557,6 +1560,14 @@ 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 +pulls.merge_pull_request_now=Executar agora a integração constante no pedido +pulls.rebase_merge_pull_request_now=Mudar a base e integrar agora +pulls.rebase_merge_commit_pull_request_now=Mudar a base e integrar agora (--no-ff) +pulls.squash_merge_pull_request_now=Condensar e integrar agora +pulls.merge_pull_request_on_status_success=Executar a integração constante no pedido quando todas as verificações forem bem sucedidas +pulls.rebase_merge_pull_request_on_status_success=Mudar a base e integrar quando todas as verificações forem bem sucedidas +pulls.rebase_merge_commit_pull_request_on_status_success=Mudar a base e integrar (--no-ff) quando todas as verificações forem bem sucedidas +pulls.squash_merge_pull_request_on_status_success=Condensar e integrar quando todas as verificações forem bem sucedidas pulls.invalid_merge_option=Não pode usar esta opção de integração neste pedido de integração. pulls.merge_conflict=A integração falhou: Houve um conflito durante a integração. Dica: tente uma estratégia diferente pulls.merge_conflict_summary=Mensagem de erro @@ -1585,9 +1596,16 @@ pulls.outdated_with_base_branch=Este ramo é obsoleto em relação ao ramo base pulls.closed_at=`fechou este pedido de integração %[2]s` pulls.reopened_at=`reabriu este pedido de integração %[2]s` pulls.merge_instruction_hint=`Também pode ver as instruções para a linha de comandos.` - pulls.merge_instruction_step1_desc=No seu repositório, crie um novo ramo e teste as modificações. pulls.merge_instruction_step2_desc=Integre as modificações e envie para o Gitea. +pulls.merge_on_status_success=O pedido de integração foi agendado para ser executado quando todas as verificações forem bem sucedidas. +pulls.merge_on_status_success_already_scheduled=Este pedido de integração já está agendado para ser executado quando todas as verificações forem bem sucedidas. +pulls.pr_has_pending_merge_on_success=%[1]s agendou este pedido de integração para ser executado automaticamente quando todas as verificações forem bem sucedidas %[2]s. +pulls.merge_pull_on_success_cancel=Cancelar a integração automática +pulls.pull_request_not_scheduled=Este pedido de integração não está agendado para ser executado automaticamente. +pulls.pull_request_schedule_canceled=A integração automática foi cancelada para este pedido de integração. +pulls.pull_request_scheduled_auto_merge=`agendou este pedido de integração para ser executado automaticamente quando todas as verificações forem bem sucedidas %[1]s` +pulls.pull_request_canceled_scheduled_auto_merge=`cancelou a execução automática deste pedido de integração que iria ser executando quando todas as verificações fossem bem sucedidas %[1]s` milestones.new=Nova etapa milestones.open_tab=%d abertas diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini index 20664861aa..bf29e2b411 100644 --- a/options/locale/locale_ru-RU.ini +++ b/options/locale/locale_ru-RU.ini @@ -1549,7 +1549,6 @@ pulls.outdated_with_base_branch=Эта ветка отстает от базов pulls.closed_at=`закрыл этот запрос на слияние %[2]s` pulls.reopened_at=`переоткрыл этот запрос на слияние %[2]s` pulls.merge_instruction_hint=`Вы также можете просмотреть инструкции командной строки.` - pulls.merge_instruction_step1_desc=В репозитории вашего проекта посмотрите новую ветку и протестируйте изменения. pulls.merge_instruction_step2_desc=Объединить изменения и обновить на Gitea. diff --git a/options/locale/locale_si-LK.ini b/options/locale/locale_si-LK.ini index f64c40d228..f9aef5317c 100644 --- a/options/locale/locale_si-LK.ini +++ b/options/locale/locale_si-LK.ini @@ -1421,7 +1421,6 @@ pulls.outdated_with_base_branch=මෙම ශාඛාව මූලික ශා pulls.closed_at=`මෙම අදින්න ඉල්ලීම වසා %[2]s` pulls.reopened_at=`මෙම අදින්න ඉල්ලීම නැවත විවෘත කරන ලදි %[2]s` pulls.merge_instruction_hint=`ඔබට විධාන රේඛා උපදෙස්ද නැරඹිය හැකිය. ` - pulls.merge_instruction_step1_desc=ඔබගේ ව්යාපෘති ගබඩාවෙන්, නව ශාඛාවක් පරීක්ෂා කර වෙනස්කම් පරීක්ෂා කරන්න. pulls.merge_instruction_step2_desc=Gitea හි වෙනස්කම් සහ යාවත්කාලීන කිරීම ඒකාබද්ධ කරන්න. diff --git a/options/locale/locale_sv-SE.ini b/options/locale/locale_sv-SE.ini index 88d9b8bc53..e111a81d6a 100644 --- a/options/locale/locale_sv-SE.ini +++ b/options/locale/locale_sv-SE.ini @@ -1167,7 +1167,6 @@ pulls.open_unmerged_pull_exists=`Du kan inte återuppliva denna pull-request då pulls.update_branch_success=Uppdatering av branchen lyckades pulls.outdated_with_base_branch=Denna branch är föråldrad gentemot bas-branchen - milestones.new=Ny milstolpe milestones.open_tab=%d Öppna milestones.close_tab=%d Stängda diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini index b0cea0cc08..df54622e43 100644 --- a/options/locale/locale_tr-TR.ini +++ b/options/locale/locale_tr-TR.ini @@ -1436,7 +1436,6 @@ pulls.outdated_with_base_branch=Bu dal, temel dal ile güncel değil pulls.closed_at=`%[2]s değişiklik isteğini kapattı` pulls.reopened_at=`%[2]s değişiklik isteğini yeniden açtı` pulls.merge_instruction_hint=`komut satırı talimatlarını da görüntüleyebilirsiniz.` - pulls.merge_instruction_step1_desc=Proje deponuzdan yeni bir dala göz atın ve değişiklikleri test edin. pulls.merge_instruction_step2_desc=Gitea'daki değişiklikleri ve güncellemeleri birleştirin. diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini index f9e099baa2..1b320c9463 100644 --- a/options/locale/locale_uk-UA.ini +++ b/options/locale/locale_uk-UA.ini @@ -1485,7 +1485,6 @@ pulls.outdated_with_base_branch=Ця гілка застаріла віднос pulls.closed_at=`закрив цей запит на злиття %[2]s` pulls.reopened_at=`повторно відкрив цей запит на злиття %[2]s` pulls.merge_instruction_hint=`Також можна переглянути інструкції для командного рядка.` - pulls.merge_instruction_step1_desc=У репозиторії вашого проєкту перевірте нову гілку і протестуйте зміни. pulls.merge_instruction_step2_desc=Об'єднати зміни і оновити на Gitea. diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 51b8263691..7a5d8250e5 100644 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -1582,7 +1582,6 @@ pulls.outdated_with_base_branch=此分支相比基础分支已过期 pulls.closed_at=`于 %[2]s 关闭此合并请求 ` pulls.reopened_at=`重新打开此合并请求 %[2]s` pulls.merge_instruction_hint=`你也可以查看 命令行指令` - pulls.merge_instruction_step1_desc=从你的仓库中签出一个新的分支并测试变更。 pulls.merge_instruction_step2_desc=合并变更并更新到 Gitea 上 diff --git a/options/locale/locale_zh-HK.ini b/options/locale/locale_zh-HK.ini index 89fc772ecb..b12fda1600 100644 --- a/options/locale/locale_zh-HK.ini +++ b/options/locale/locale_zh-HK.ini @@ -433,7 +433,6 @@ pulls.can_auto_merge_desc=這個拉請求可以自動合併。 ; %[2]s
%[3]s
- milestones.new=新的里程碑 milestones.open_tab=%d 開啟中 milestones.close_tab=%d 已關閉 diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini index 440bf18135..7acfb5b810 100644 --- a/options/locale/locale_zh-TW.ini +++ b/options/locale/locale_zh-TW.ini @@ -1580,7 +1580,6 @@ pulls.outdated_with_base_branch=相對於基底分支,此分支已過時 pulls.closed_at=`關閉了這個合併請求 %[2]s` pulls.reopened_at=`重新開放了這個合併請求 %[2]s` pulls.merge_instruction_hint=`您也可以查看命令列指南。` - pulls.merge_instruction_step1_desc=在您的儲存庫中切換到新分支並測試變更。 pulls.merge_instruction_step2_desc=合併變更並更新到 Gitea。