diff --git a/options/locale/locale_bg-BG.ini b/options/locale/locale_bg-BG.ini index ea4e2a105..ee19a6ad2 100644 --- a/options/locale/locale_bg-BG.ini +++ b/options/locale/locale_bg-BG.ini @@ -768,9 +768,13 @@ pulls.num_conflicting_files_n=%d конфликтни файлове pulls.no_merge_desc=Тази заявка за сливане не може да бъде обединена, защото всички опции за обединяване на хранилището са изключени. pulls.no_merge_helper=Включете опции за сливане в настройките на хранилището или обединете заявката за сливане ръчно. 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 896b4ee97..6ad2bd679 100644 --- a/options/locale/locale_cs-CZ.ini +++ b/options/locale/locale_cs-CZ.ini @@ -1500,6 +1500,7 @@ pulls.squash_merge_pull_request=Vytvořit squash commit pulls.merge_manually=Sloučeno ručně pulls.merge_commit_id=ID slučovacího commitu pulls.require_signed_wont_sign=Větev vyžaduje podepsané commity, ale toto sloučení nebude podepsáno + pulls.invalid_merge_option=Nemůžete použít tuto možnost sloučení pro tento požadavek na natažení. pulls.merge_conflict=Sloučení selhalo: Došlo ke konfliktu při sloučení. Tip: Zkuste jinou strategii pulls.merge_conflict_summary=Chybové hlášení @@ -1528,6 +1529,9 @@ pulls.merge_instruction_hint=`Můžete také zobrazit Anleitu 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. + + + milestones.new=Neuer Meilenstein milestones.open_tab=%d offen milestones.close_tab=%d geschlossen diff --git a/options/locale/locale_el-GR.ini b/options/locale/locale_el-GR.ini index 11d8855f9..99b90edc4 100644 --- a/options/locale/locale_el-GR.ini +++ b/options/locale/locale_el-GR.ini @@ -1568,14 +1568,7 @@ pulls.squash_merge_pull_request=Δημιουργία υποβολής squash pulls.merge_manually=Συγχωνεύτηκαν χειροκίνητα pulls.merge_commit_id=Το ID της υποβολής συγχώνευσης pulls.require_signed_wont_sign=Ο κλάδος απαιτεί υπογεγραμμένες υποβολές αλλά αυτή η συγχώνευση δεν θα υπογραφεί -pulls.merge_pull_request_now=Συγχώνευση του Pull Request Τώρα -pulls.rebase_merge_pull_request_now=Αλλαγή Βάσης και Συγχώνευση Τώρα -pulls.rebase_merge_commit_pull_request_now=Αλλαγή Βάσης και Συγχώνευση Τώρα (--no-ff) -pulls.squash_merge_pull_request_now=Στρίμωγμα και Συγχώνευση τώρα -pulls.merge_pull_request_on_status_success=Συγχώνευση Του Pull Request Όταν Όλοι Οι Έλεγχοι Επιτύχουν -pulls.rebase_merge_pull_request_on_status_success=Αλλαγή Βάσης και Συγχώνευση Όταν Όλοι Οι Έλεγχοι Πετύχουν -pulls.rebase_merge_commit_pull_request_on_status_success=Αλλαγή Βάσης και Συγχώνευση (--no-ff) Όταν Όλοι Οι Έλεγχοι Πετύχουν -pulls.squash_merge_pull_request_on_status_success=Στρίμωγμα και Συγχώνευση Όταν Όλοι Οι Έλεγχοι Επιτύχουν + pulls.invalid_merge_option=Δεν μπορείτε να χρησιμοποιήσετε αυτήν την επιλογή συγχώνευσης για αυτό το pull request. pulls.merge_conflict=Η Συγχώνευση Απέτυχε: Υπήρξε μια διένεξη κατά τη συγχώνευση. Υπόδειξη: Δοκιμάστε μια διαφορετική στρατηγική pulls.merge_conflict_summary=Μήνυμα Σφάλματος @@ -1606,14 +1599,9 @@ pulls.reopened_at=`άνοιξε ξανά αυτό το pull request τις οδηγίες της γραμμής εντολών.` pulls.merge_instruction_step1_desc=Από το αποθετήριο του έργου σας, ελέγξτε έναν νέο κλάδο και τεστάρετε τις αλλαγές. pulls.merge_instruction_step2_desc=Συγχώνευσε τις αλλαγές και ενημέρωσε στο Gitea. -pulls.merge_on_status_success=Το pull request προγραμματίστηκε για συγχώνευση όταν πετύχουν όλοι οι έλεγχοι. -pulls.merge_on_status_success_already_scheduled=Αυτό το αίτημα έλξης έχει ήδη προγραμματιστεί για συγχώνευση όταν πετύχουν όλοι οι έλεγχοι. -pulls.pr_has_pending_merge_on_success=%[1]s έχει προγραμματίσει αυτό το pull request για αυτόματη συγχώνευση όταν όλοι οι έλεγχοι επιτύχουν %[2]s. -pulls.merge_pull_on_success_cancel=Ακύρωση αυτόματης συγχώνευσης -pulls.pull_request_not_scheduled=Αυτό το pull request δεν είναι προγραμματισμένο να συγχωνευτεί αυτόματα. -pulls.pull_request_schedule_canceled=Η αυτόματη συγχώνευση ακυρώθηκε για αυτό το pull request. -pulls.pull_request_scheduled_auto_merge=`έχει προγραμματισεί αυτό το pull request για αυτόματη συγχώνευση όταν όλοι οι έλεγχοι πετύχουν %[1]s` -pulls.pull_request_canceled_scheduled_auto_merge=`ακύρωσε την αυτόματη συγχώνευση αυτού του pull request όταν όλοι οι έλεγχοι πετύχουν %[1]s` + + + milestones.new=Νέο Ορόσημο milestones.open_tab=%d Ανοιχτά diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini index a35cffe49..175895e61 100644 --- a/options/locale/locale_es-ES.ini +++ b/options/locale/locale_es-ES.ini @@ -1523,6 +1523,7 @@ pulls.squash_merge_pull_request=Crear commit squash 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 + pulls.invalid_merge_option=No puede utilizar esta opción de combinación para esta solicitud de extracción. pulls.merge_conflict=Fusión fallida: Hubo un conflicto mientras se fusionaba. Pista: Pruebe una estrategia diferente pulls.merge_conflict_summary=Mensaje de error @@ -1554,6 +1555,9 @@ pulls.merge_instruction_hint=`También puede ver ins 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. + + + milestones.new=Nuevo hito milestones.open_tab=%d abiertas milestones.close_tab=%d cerradas diff --git a/options/locale/locale_fa-IR.ini b/options/locale/locale_fa-IR.ini index 9cf067a01..0da69185f 100644 --- a/options/locale/locale_fa-IR.ini +++ b/options/locale/locale_fa-IR.ini @@ -1449,6 +1449,7 @@ pulls.squash_merge_pull_request=ایجاد commit اسکواش pulls.merge_manually=بصورت دستی ادغام شد pulls.merge_commit_id=شماره کامیت ادغام pulls.require_signed_wont_sign=انشعاب نیازمند تغییرات امضا شده است اما این ادغام امضا نخواهد شد + pulls.invalid_merge_option=شما نمی‌توانید از این گزینه برای تقاضای واکشی استفاده کنید. pulls.merge_conflict=ادغام ناموفق بود: در حین ادغام مغایرت وجود داشت. نکته: استراتژی متفاوتی را امتحان کنید pulls.merge_conflict_summary=پیغام خطا @@ -1477,6 +1478,9 @@ pulls.merge_instruction_hint=`همچنین می‌توانید %[2]s
%[3]s 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 41a9e84ad..18f3e20e6 100644 --- a/options/locale/locale_id-ID.ini +++ b/options/locale/locale_id-ID.ini @@ -838,8 +838,12 @@ 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. + ; %[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 b28196e80..dfc482760 100644 --- a/options/locale/locale_is-IS.ini +++ b/options/locale/locale_is-IS.ini @@ -925,10 +925,14 @@ pulls.waiting_count_1=%d bíður endurskoðunar pulls.waiting_count_n=%d bíða endurskoðunar pulls.merge_manually=Sameinað handvirkt + ; %[2]s
%[3]s 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 a6bd6ad1b..a8f4b534d 100644 --- a/options/locale/locale_it-IT.ini +++ b/options/locale/locale_it-IT.ini @@ -1230,6 +1230,7 @@ pulls.no_merge_wip=Questa pull request non può essere unita perché è contrass 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.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 ; %[2]s
%[3]s @@ -1247,6 +1248,9 @@ 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 887f67581..3ac355488 100644 --- a/options/locale/locale_ja-JP.ini +++ b/options/locale/locale_ja-JP.ini @@ -1568,14 +1568,7 @@ pulls.squash_merge_pull_request=スカッシュコミットを作成 pulls.merge_manually=手動マージ済みにする pulls.merge_commit_id=マージコミットID pulls.require_signed_wont_sign=ブランチでは署名されたコミットが必須ですが、このマージでは署名がされません -pulls.merge_pull_request_now=今すぐプルリクエストをマージ -pulls.rebase_merge_pull_request_now=今すぐリベースしてマージ -pulls.rebase_merge_commit_pull_request_now=今すぐリベースしてマージ(--no-ff) -pulls.squash_merge_pull_request_now=今すぐスカッシュしてマージ -pulls.merge_pull_request_on_status_success=すべてのチェックが成功したときにプルリクエストをマージ -pulls.rebase_merge_pull_request_on_status_success=すべてのチェックが成功したときにリベースしてマージ -pulls.rebase_merge_commit_pull_request_on_status_success=すべてのチェックが成功したときにリベースしてマージ(--no-ff) -pulls.squash_merge_pull_request_on_status_success=すべてのチェックが成功したときにスカッシュしてマージ + pulls.invalid_merge_option=このプルリクエストでは、指定したマージ方法は使えません。 pulls.merge_conflict=マージ失敗: マージ中にコンフリクトがありました。 ヒント: 別のストラテジーを試してみてください pulls.merge_conflict_summary=エラーメッセージ @@ -1606,14 +1599,9 @@ pulls.reopened_at=`がプルリクエストを再オープン コマンドラインの手順も確認できます。` pulls.merge_instruction_step1_desc=あなたのプロジェクトリポジトリで新しいブランチをチェックアウトし、変更内容をテストします。 pulls.merge_instruction_step2_desc=変更内容をマージして、Giteaに反映します。 -pulls.merge_on_status_success=このプルリクエストは、すべてのチェックが成功したときにマージされるようにスケジュールされました。 -pulls.merge_on_status_success_already_scheduled=このプルリクエストは、すべてのチェックが成功したときにマージされるようにスケジュールされています。 -pulls.pr_has_pending_merge_on_success=%[1]s が、すべてのチェックが成功すると自動マージを行うよう、このプルリクエストをスケジュール %[2]s。 -pulls.merge_pull_on_success_cancel=自動マージをキャンセル -pulls.pull_request_not_scheduled=このプルリクエストは自動マージとしてスケジュールされていません。 -pulls.pull_request_schedule_canceled=このプルリクエストの自動マージはキャンセルされました。 -pulls.pull_request_scheduled_auto_merge=`が、すべてのチェックが成功すると自動マージを行うよう、このプルリクエストをスケジュール %[1]s` -pulls.pull_request_canceled_scheduled_auto_merge=`が、すべてのチェックが成功したときのプルリクエストの自動マージをキャンセル %[1]s` + + + milestones.new=新しいマイルストーン milestones.open_tab=%d件 オープン中 diff --git a/options/locale/locale_ko-KR.ini b/options/locale/locale_ko-KR.ini index ed48ada22..80b598c5b 100644 --- a/options/locale/locale_ko-KR.ini +++ b/options/locale/locale_ko-KR.ini @@ -859,9 +859,13 @@ pulls.can_auto_merge_desc=이 풀리퀘스트는 자동적으로 머지될 수 pulls.cannot_auto_merge_helper=충돌을 해결하려면 수동으로 머지하십시오. 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 13aea77c7..ccc6bd280 100644 --- a/options/locale/locale_lv-LV.ini +++ b/options/locale/locale_lv-LV.ini @@ -1511,6 +1511,7 @@ pulls.squash_merge_pull_request=Izveidot saspiešanas revīziju 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 + pulls.invalid_merge_option=Nav iespējams izmantot šādu sapludināšanas veidu šim izmaiņu pieprasījumam. pulls.merge_conflict=Sapludināšana neizdevās: Veicot sapludināšanu, radās konflikts. Mēģiniet izmantot citu sapludināšanas stratēģiju pulls.merge_conflict_summary=Kļūdas paziņojums @@ -1542,6 +1543,9 @@ pulls.merge_instruction_hint=`Varat aplūkot arī ko 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. + + + milestones.new=Jauns atskaites punkts milestones.open_tab=%d atvērti milestones.close_tab=%d aizvērti diff --git a/options/locale/locale_ml-IN.ini b/options/locale/locale_ml-IN.ini index 285c7e8e4..be0668044 100644 --- a/options/locale/locale_ml-IN.ini +++ b/options/locale/locale_ml-IN.ini @@ -723,8 +723,12 @@ 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 66c3fee81..a18f6f698 100644 --- a/options/locale/locale_nl-NL.ini +++ b/options/locale/locale_nl-NL.ini @@ -1253,6 +1253,7 @@ pulls.no_merge_wip=Deze pull-aanvraag kan niet worden samengevoegd omdat hij als 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.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 pulls.merge_conflict_summary=Foutmelding @@ -1276,6 +1277,9 @@ 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 2bbf82166..06a306fe3 100644 --- a/options/locale/locale_pl-PL.ini +++ b/options/locale/locale_pl-PL.ini @@ -1421,6 +1421,7 @@ pulls.no_merge_not_ready=Ten Pull Request nie jest gotowy do scalenia, sprawdź pulls.no_merge_access=Nie masz uprawnień, aby scalić ten Pull Request. pulls.merge_manually=Ręcznie scalone 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. pulls.merge_conflict=Scalenie nie powiodło się: Wystąpił konflikt przy scalaniu. Porada: Wypróbuj innej strategii pulls.merge_conflict_summary=Komunikat o błędzie @@ -1449,6 +1450,9 @@ pulls.merge_instruction_hint=`Możesz także zobaczyć %[2]sinstruçõ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 14a8d11dc..611b71bce 100644 --- a/options/locale/locale_pt-PT.ini +++ b/options/locale/locale_pt-PT.ini @@ -1568,14 +1568,7 @@ pulls.squash_merge_pull_request=Criar cometimento de compactaçã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=Compactar 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=Compactar 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 @@ -1606,14 +1599,18 @@ pulls.reopened_at=`reabriu este pedido de integração 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` + +pulls.auto_merge_button_when_succeed=(quando as verificações forem bem-sucedidas) +pulls.auto_merge_when_succeed=Integrar automaticamente quando todas as verificações forem bem-sucedidas +pulls.auto_merge_newly_scheduled=O pedido de integração foi agendado para ser executado quando todas as verificações forem bem-sucedidas. +pulls.auto_merge_has_pending_schedule=%[1]s agendou este pedido de integração para ser executado automaticamente quando todas as verificações forem bem-sucedidas %[2]s. + +pulls.auto_merge_cancel_schedule=Cancelar a integração automática +pulls.auto_merge_not_scheduled=Este pedido de integração não está agendado para ser executado automaticamente. +pulls.auto_merge_canceled_schedule=A integração automática foi cancelada para este pedido de integração. + +pulls.auto_merge_newly_scheduled_comment=`agendou este pedido de integração para ser executado automaticamente quando todas as verificações forem bem-sucedidas %[1]s` +pulls.auto_merge_canceled_schedule_comment=`cancelou a execução automática deste pedido de integração que iria ocorrer 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 377ef1cb3..a3c1c09ac 100644 --- a/options/locale/locale_ru-RU.ini +++ b/options/locale/locale_ru-RU.ini @@ -1519,6 +1519,7 @@ pulls.squash_merge_pull_request=Создать объединенный (squash) pulls.merge_manually=Слито вручную pulls.merge_commit_id=ID коммита слияния pulls.require_signed_wont_sign=Данная ветка ожидает подписанные коммиты, однако слияние не будет подписано + pulls.invalid_merge_option=Этот параметр слияния нельзя использовать для этого запроса на слияние. pulls.merge_conflict=Слияние не удалось: Произошел конфликт во время слияния. Совет: попробуйте другую стратегию pulls.merge_conflict_summary=Сообщение об ошибке @@ -1549,6 +1550,9 @@ pulls.merge_instruction_hint=`Вы также можете просмотрет pulls.merge_instruction_step1_desc=В репозитории вашего проекта посмотрите новую ветку и протестируйте изменения. pulls.merge_instruction_step2_desc=Объединить изменения и обновить на Gitea. + + + milestones.new=Новый этап milestones.open_tab=%d открыто(ы) milestones.close_tab=%d закрыто(ы) diff --git a/options/locale/locale_si-LK.ini b/options/locale/locale_si-LK.ini index 397a85182..b6c9bc04a 100644 --- a/options/locale/locale_si-LK.ini +++ b/options/locale/locale_si-LK.ini @@ -1393,6 +1393,7 @@ pulls.squash_merge_pull_request=ස්කොෂ් කැපීමට සාද pulls.merge_manually=අතින් සංයුක්ත කර ඇත pulls.merge_commit_id=ඒකාබද්ධ කිරීමේ හැඳුනුම්පත pulls.require_signed_wont_sign=ශාඛාවට අත්සන් කළ කොපියක් අවශ්ය වුවද මෙම ඒකාබද්ධ කිරීම අත්සන් නොකෙරේ + pulls.invalid_merge_option=ඔබ මෙම අදින්න ඉල්ලීම සඳහා මෙම ඒකාබද්ධ විකල්පය භාවිතා කළ නොහැක. pulls.merge_conflict=ඒකාබද්ධ කිරීම අසමත් විය: ඒකාබද්ධ වන අතර ගැටුමක් ඇති විය. ඉඟිය: වෙනත් උපාය මාර්ගයක් උත්සාහ කරන්න pulls.merge_conflict_summary=දෝෂ පණිවිඩය @@ -1421,6 +1422,9 @@ pulls.merge_instruction_hint=`ඔබට විධා pulls.merge_instruction_step1_desc=ඔබගේ ව්යාපෘති ගබඩාවෙන්, නව ශාඛාවක් පරීක්ෂා කර වෙනස්කම් පරීක්ෂා කරන්න. pulls.merge_instruction_step2_desc=Gitea හි වෙනස්කම් සහ යාවත්කාලීන කිරීම ඒකාබද්ධ කරන්න. + + + milestones.new=නව සන්ධිස්ථානයක් milestones.open_tab=%d විවෘත milestones.close_tab=%d වසා diff --git a/options/locale/locale_sv-SE.ini b/options/locale/locale_sv-SE.ini index 25bb0aeff..182d4ca78 100644 --- a/options/locale/locale_sv-SE.ini +++ b/options/locale/locale_sv-SE.ini @@ -1158,12 +1158,16 @@ 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.invalid_merge_option=Du kan inte använda detta mergealternativet för denna pull-request. ; %[2]s
%[3]s pulls.open_unmerged_pull_exists=`Du kan inte återuppliva denna pull-request då det redan finns en identisk pull-request öppen (#%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 c7bdb9fc6..93ee7c75d 100644 --- a/options/locale/locale_tr-TR.ini +++ b/options/locale/locale_tr-TR.ini @@ -1408,6 +1408,7 @@ pulls.squash_merge_pull_request=Ezme işlemi oluştur 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 + pulls.invalid_merge_option=Bu değişiklik isteği için bu birleştirme seçeneğini kullanamazsınız. pulls.merge_conflict=Birleştirme Başarısız Oldu: Birleştirme sırasında bir çakışma oldu. İpucu: Farklı bir strateji deneyin pulls.merge_conflict_summary=Hata Mesajı @@ -1436,6 +1437,9 @@ pulls.merge_instruction_hint=`komut satırı talimat 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. + + + milestones.new=Yeni Kilometre Taşı milestones.open_tab=%d Açık milestones.close_tab=%d Kapalı diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini index 3e83932a2..c58a5d461 100644 --- a/options/locale/locale_uk-UA.ini +++ b/options/locale/locale_uk-UA.ini @@ -1457,6 +1457,7 @@ pulls.squash_merge_pull_request=Створити зварений (squash) ко pulls.merge_manually=Об’єднано вручну pulls.merge_commit_id=ID коміту злиття pulls.require_signed_wont_sign=Гілка вимагає підписаних комітів, але це злиття не буде підписано + pulls.invalid_merge_option=Цей параметр злиття не можна використовувати для цього Pull Request'а. pulls.merge_conflict=Злиття не вдалося: Був конфлікт при злиття. Підказка: спробуйте іншу стратегію pulls.merge_conflict_summary=Помилка @@ -1485,6 +1486,9 @@ pulls.merge_instruction_hint=`Також можна переглянути %[2]s pulls.merge_instruction_hint=`你也可以查看 命令行指令` pulls.merge_instruction_step1_desc=从你的仓库中签出一个新的分支并测试变更。 pulls.merge_instruction_step2_desc=合并变更并更新到 Gitea 上 -pulls.merge_on_status_success=合并请求计划在所有检查成功时合并。 -pulls.merge_on_status_success_already_scheduled=此拉取请求已安排在所有检查成功时合并。 -pulls.pr_has_pending_merge_on_success=%[1]s 安排此拉取请求在所有检查成功时自动合并 %[2]s。 -pulls.merge_pull_on_success_cancel=取消自动合并 -pulls.pull_request_not_scheduled=此拉取请求没有计划自动合并。 -pulls.pull_request_schedule_canceled=此拉取请求的自动合并已取消。 -pulls.pull_request_scheduled_auto_merge=`已安排此拉取请求在所有检查成功时自动合并 %[1]s` -pulls.pull_request_canceled_scheduled_auto_merge=`已取消当所有检查成功时自动合并此拉取请求 %[1]s` + +pulls.auto_merge_button_when_succeed=(当检查成功时) +pulls.auto_merge_when_succeed=在所有检查成功后自动合并 +pulls.auto_merge_newly_scheduled=合并请求计划在所有检查成功后合并。 +pulls.auto_merge_has_pending_schedule=%[1]s 安排此拉取请求在所有检查成功时自动合并 %[2]s。 + +pulls.auto_merge_cancel_schedule=取消自动合并 +pulls.auto_merge_not_scheduled=此拉取请求没有计划自动合并。 +pulls.auto_merge_canceled_schedule=此拉取请求的自动合并已取消。 + +pulls.auto_merge_newly_scheduled_comment=`已安排此拉取请求在所有检查成功后自动合并 %[1]s` +pulls.auto_merge_canceled_schedule_comment=`已取消当所有检查成功后自动合并此拉取请求 %[1]s` milestones.new=新的里程碑 milestones.open_tab=%d 开启中 diff --git a/options/locale/locale_zh-HK.ini b/options/locale/locale_zh-HK.ini index 97d3b8984..48f04d074 100644 --- a/options/locale/locale_zh-HK.ini +++ b/options/locale/locale_zh-HK.ini @@ -431,8 +431,12 @@ pulls.reopen_to_merge=請重新開啟合併請求來完成合併操作。 pulls.merged=已合併 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 2cf099fda..fc87cb315 100644 --- a/options/locale/locale_zh-TW.ini +++ b/options/locale/locale_zh-TW.ini @@ -1495,6 +1495,9 @@ pulls.allow_edits_from_maintainers=允許維護者編輯 pulls.allow_edits_from_maintainers_desc=對基礎分支有寫入權限的使用者也可以推送到此分支 pulls.allow_edits_from_maintainers_err=更新失敗 pulls.compare_changes_desc=選擇合併的目標分支和來源分支。 +pulls.has_viewed_file=已檢視 +pulls.has_changed_since_last_review=您上次審核後有變動 +pulls.viewed_files_label=%[1]d / %[2]d 個檔案已檢視 pulls.compare_base=合併到 pulls.compare_compare=拉取自 pulls.switch_comparison_type=切換比較類型 @@ -1562,6 +1565,7 @@ pulls.squash_merge_pull_request=建立 Squash 提交 pulls.merge_manually=手動合併 pulls.merge_commit_id=合併提交 ID pulls.require_signed_wont_sign=該分支需要經簽署的提交，但此合併將不會被簽署。 + pulls.invalid_merge_option=您無法對此合併請求使用這個合併選項。 pulls.merge_conflict=合併失敗：合併時發生衝突。 提示：請嘗試不同的策略 pulls.merge_conflict_summary=錯誤訊息 @@ -1576,7 +1580,7 @@ pulls.push_rejected_summary=完整的拒絕訊息 pulls.push_rejected_no_message=合併失敗：此推送被拒絕但未提供其他資訊。
請檢查此儲存庫的 Git Hook。 pulls.open_unmerged_pull_exists=`您不能重新開放，因為目前有相同的合併請求 (#%d) 正在進行中。` pulls.status_checking=還在進行一些檢查 -pulls.status_checks_success=所有檢查都通過 +pulls.status_checks_success=已通過所有檢查 pulls.status_checks_warning=一些檢查回報了警告 pulls.status_checks_failure=一些檢查失敗了 pulls.status_checks_error=一些檢查回報了錯誤 @@ -1593,6 +1597,18 @@ pulls.merge_instruction_hint=`您也可以查看命 pulls.merge_instruction_step1_desc=在您的儲存庫中切換到新分支並測試變更。 pulls.merge_instruction_step2_desc=合併變更並更新到 Gitea。 +pulls.auto_merge_button_when_succeed=(當通過檢查後) +pulls.auto_merge_when_succeed=通過所有檢查後自動合併 +pulls.auto_merge_newly_scheduled=合併請求排定於通過所有檢查後合併。 +pulls.auto_merge_has_pending_schedule=%[1]s 排定了在通過所有檢查後自動合併此合併請求 %[2]s。 + +pulls.auto_merge_cancel_schedule=取消自動合併 +pulls.auto_merge_not_scheduled=此合併請求未排定自動合併。 +pulls.auto_merge_canceled_schedule=此合併請求的自動合併已被取消。 + +pulls.auto_merge_newly_scheduled_comment=`排定了在通過所有檢查後自動合併此合併請求 %[1]s` +pulls.auto_merge_canceled_schedule_comment=`取消了在通過所有檢查後自動合併此合併請求 %[1]s` + milestones.new=新增里程碑 milestones.open_tab=%d 個開放中 milestones.close_tab=%d 個已關閉