Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add links to toggle WIP status #14677

Merged
merged 21 commits into from
May 27, 2021
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion options/locale/locale_bg-BG.ini
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,8 @@ pulls.merged_as=Тази заявка за сливане е била обеди
pulls.is_closed=Тази заявка за сливане е затворена.
pulls.has_merged=Тази заявка за сливане е обединена.
pulls.title_wip_desc=`<a href="#">Започнете заглавието с <strong>%s</strong></a>, за да предотвратите случайно обединяване на заявката за сливане.`
pulls.cannot_merge_work_in_progress=Тази завка за сливане е отбелязане като работа в прогрес. Премахнете <strong>%s</strong> представката от заглавието, когато е готова
pulls.cannot_merge_work_in_progress=Тази завка за сливане е отбелязане като работа в прогрес.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please only modify the en-us language file as these other changes will be overwritten by the translation tool.

Copy link
Member Author

@jpraet jpraet Feb 14, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

Will be shown like this then in the other languages. Is that OK?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or would it be better to replace the existing pulls.cannot_merge_work_in_progress by splitting it into 2 new messages, thereby avoiding the <strong>%s</strong> issue seen above for the non-English languages. Instead, it would then show the English messages until they get translated.

pulls.remove_wip_prefix=`<a href="#">Премахнете <strong>%s</strong> представката</a> от заглавието, когато е готова`
pulls.can_auto_merge_desc=Може да се извърши обединяване на тази заявка за сливане.
pulls.num_conflicting_files_1=%d конфликтен файл
pulls.num_conflicting_files_n=%d конфликтни файлове
Expand Down
3 changes: 2 additions & 1 deletion options/locale/locale_cs-CZ.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1260,7 +1260,8 @@ pulls.merged_as=Požadavek na natažení byl sloučen jako <a rel="nofollow" cla
pulls.is_closed=Požadavek na natažení byl uzavřen.
pulls.has_merged=Požadavek na natažení byl sloučen.
pulls.title_wip_desc=`<a href="#">Začněte název s <strong>%s</strong></a> a zamezíte tak nechtěnému sloučení požadavku na natažení.`
pulls.cannot_merge_work_in_progress=Požadavek na natažení je označen jako ve vývoji. Odstraňte <strong>%s</strong> prefix z titulku, až bude hotový
pulls.cannot_merge_work_in_progress=Požadavek na natažení je označen jako ve vývoji.
pulls.remove_wip_prefix=`<a href="#">Odstraňte <strong>%s</strong> prefix</a> z titulku, až bude hotový`
pulls.data_broken=Tento požadavek na natažení je rozbitý kvůli chybějícím informacím o rozštěpení.
pulls.files_conflicted=Tento požadavek na natažení obsahuje změny, které kolidují s cílovou větví.
pulls.is_checking=Právě probíhá kontrola konfliktů při sloučení. Zkuste to za chvíli.
Expand Down
3 changes: 2 additions & 1 deletion options/locale/locale_de-DE.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1255,7 +1255,8 @@ pulls.merged_as=Der Pull Request wurde als <a rel="nofollow" class="ui sha" href
pulls.is_closed=Der Pull-Request wurde geschlossen.
pulls.has_merged=Der Pull-Request wurde gemergt.
pulls.title_wip_desc=`<a href="#">Beginne den Titel mit <strong>%s</strong></a> um zu verhindern, dass der Pull Request versehentlich gemergt wird.`
pulls.cannot_merge_work_in_progress=Dieser Pull Request wurde als Work In Progress markiert. Entferne den <strong>%s</strong>-Präfix vom Titel, wenn dieser fertig ist.
pulls.cannot_merge_work_in_progress=Dieser Pull Request wurde als Work In Progress markiert.
pulls.remove_wip_prefix=`<a href="#">Entferne den <strong>%s</strong>-Präfix</a> vom Titel, wenn dieser fertig ist.`
pulls.data_broken=Dieser Pull-Requests ist kaputt, da Fork-Informationen gelöscht wurden.
pulls.files_conflicted=Dieser Pull-Request hat Änderungen, die im Widerspruch zum Ziel-Branch stehen.
pulls.is_checking=Die Konfliktprüfung läuft noch. Bitte aktualisiere die Seite in wenigen Augenblicken.
Expand Down
4 changes: 3 additions & 1 deletion options/locale/locale_en-US.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1266,7 +1266,9 @@ pulls.merged_as = The pull request has been merged as <a rel="nofollow" class="u
pulls.is_closed = The pull request has been closed.
pulls.has_merged = The pull request has been merged.
pulls.title_wip_desc = `<a href="#">Start the title with <strong>%s</strong></a> to prevent the pull request from being merged accidentally.`
pulls.cannot_merge_work_in_progress = This pull request is marked as a work in progress. Remove the <strong>%s</strong> prefix from the title when it's ready
pulls.cannot_merge_work_in_progress = This pull request is marked as a work in progress.
pulls.remove_wip_prefix = `<a href="#">Remove the <strong>%s</strong> prefix</a> from the title when it's ready`
pulls.add_wip_prefix = `Still in progress? <a href="#">Add <strong>%s</strong> prefix</a>`
jpraet marked this conversation as resolved.
Show resolved Hide resolved
pulls.data_broken = This pull request is broken due to missing fork information.
pulls.files_conflicted = This pull request has changes conflicting with the target branch.
pulls.is_checking = "Merge conflict checking is in progress. Try again in few moments."
Expand Down
3 changes: 2 additions & 1 deletion options/locale/locale_es-ES.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1241,7 +1241,8 @@ pulls.merged_as=El Pull Request se ha fusionado como <a rel="nofollow" class="ui
pulls.is_closed=El pull request ha sido cerrado.
pulls.has_merged=El pull request ha sido fusionado.
pulls.title_wip_desc=`<a href="#">Comience el título con <strong>%s</strong></a> para prevenir que el pull request se fusione accidentalmente.`
pulls.cannot_merge_work_in_progress=Este pull request está marcado como un trabajo en progreso. Elimine el prefijo <strong>%s</strong> del título cuando esté listo
pulls.cannot_merge_work_in_progress=Este pull request está marcado como un trabajo en progreso.
pulls.remove_wip_prefix=`<a href="#">Elimine el prefijo <strong>%s</strong></a> del título cuando esté listo`
pulls.data_broken=Este pull request está rota debido a que falta información del fork.
pulls.files_conflicted=Este pull request tiene cambios en conflicto con la rama de destino.
pulls.is_checking=La comprobación de conflicto de fusión está en progreso. Inténtalo de nuevo en unos momentos.
Expand Down
3 changes: 2 additions & 1 deletion options/locale/locale_fr-FR.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1088,7 +1088,8 @@ pulls.merged_as=La demande de tirage a été fusionnée en <a rel="nofollow" cla
pulls.is_closed=La demande de fusion a été fermée.
pulls.has_merged=La pull request a été fusionnée.
pulls.title_wip_desc=`<a href="#">Préfixer le titre par <strong>%s</strong></a> pour empêcher cette demande d'ajout d'être fusionnée par erreur.`
pulls.cannot_merge_work_in_progress=Cette demande d'ajout est marquée comme en cours de chantier. Retirer le préfixe <strong>%s</strong> du titre quand elle sera prête
pulls.cannot_merge_work_in_progress=Cette demande d'ajout est marquée comme en cours de chantier.
pulls.remove_wip_prefix=`<a href="#">Retirer le préfixe <strong>%s</strong></a> du titre quand elle sera prête`
pulls.data_broken=Cette demande de fusion est impossible par manque d'informations de bifurcation.
pulls.files_conflicted=Cette demande d'ajout contient des modifications en conflit avec la branche ciblée.
pulls.is_checking=Vérification des conflits de fusion en cours. Réessayez dans quelques instants.
Expand Down
3 changes: 2 additions & 1 deletion options/locale/locale_it-IT.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1194,7 +1194,8 @@ pulls.merged_as=La pull request è stata unita come <a rel="nofollow" class="ui
pulls.is_closed=La pull request è stata chiusa.
pulls.has_merged=La pull request è stata unita.
pulls.title_wip_desc=`<a href="#">Inizia il titolo con <strong>%s</strong></a> per evitare che la pull request venga unita accidentalmente.`
pulls.cannot_merge_work_in_progress=Questa pull request è contrassegnata come un lavoro in corso. Rimuovi il prefisso <strong>%s</strong> dal titolo quando è pronta
pulls.cannot_merge_work_in_progress=Questa pull request è contrassegnata come un lavoro in corso.
pulls.remove_wip_prefix=`<a href="#">Rimuovi il prefisso <strong>%s</strong></a> dal titolo quando è pronta`
pulls.data_broken=Questa pull request è rovinata a causa di informazioni mancanti del fork.
pulls.files_conflicted=Questa pull request ha modifiche in conflitto con il branch di destinazione.
pulls.is_checking=Verifica dei conflitti di merge in corso. Riprova tra qualche istante.
Expand Down
3 changes: 2 additions & 1 deletion options/locale/locale_ja-JP.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1260,7 +1260,8 @@ pulls.merged_as=プルリクエストは <a rel="nofollow" class="ui sha" href="
pulls.is_closed=プルリクエストはクローズされています。
pulls.has_merged=プルリクエストはマージされています。
pulls.title_wip_desc=`誤ってマージされないようにするには、<a href="#">タイトルの頭に <strong>%s</strong> を付けます</a>。`
pulls.cannot_merge_work_in_progress=このプルリクエストはWork in Progressとマークされています。 マージできる状態になったら、タイトルから <strong>%s</strong> を消してください。
pulls.cannot_merge_work_in_progress=このプルリクエストはWork in Progressとマークされています。
pulls.remove_wip_prefix=`マージできる状態になったら、<a href="#">タイトルから <strong>%s</strong> を消してください</a>。`
pulls.data_broken=このプルリクエストは、フォークの情報が見つからないため壊れています。
pulls.files_conflicted=このプルリクエストは、ターゲットブランチと競合する変更を含んでいます。
pulls.is_checking=マージのコンフリクトを確認中です。 少し待ってからもう一度実行してください。
Expand Down
3 changes: 2 additions & 1 deletion options/locale/locale_lv-LV.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1207,7 +1207,8 @@ pulls.merged_as=Izmaiņu pieprasījums tika sapludināts ar revīziju <a rel="no
pulls.is_closed=Izmaiņu pieprasījums tika aizvērts.
pulls.has_merged=Šis izmaiņu pieprasījums tika veiksmīgi sapludināts.
pulls.title_wip_desc=`<a href="#">Sāciet virsrakstu ar <strong>%s</strong></a>, lai ierobežotu, ka izmaiņu pieprasījums netīšām tiktu sapludināts.`
pulls.cannot_merge_work_in_progress=Šis izmaiņu pieprasījums ir atzīmēts, ka pie tā vēl notiek izstrāde. Noņemiet <strong>%s</strong> no virsraksta sākuma, kad tas ir pabeigts.
pulls.cannot_merge_work_in_progress=Šis izmaiņu pieprasījums ir atzīmēts, ka pie tā vēl notiek izstrāde.
pulls.remove_wip_prefix=`<a href="#">Noņemiet <strong>%s</strong> no virsraksta sākuma</a>, kad tas ir pabeigts.`
pulls.data_broken=Izmaiņu pieprasījums ir bojāts, jo dzēsta informācija no atdalītā repozitorija.
pulls.files_conflicted=Šīs izmaiņu pieprasījuma izmaiņas konfliktē ar mērķa atzaru.
pulls.is_checking=Notiek konfliktu pārbaude, mirkli uzgaidiet un atjaunojiet lapu.
Expand Down
3 changes: 2 additions & 1 deletion options/locale/locale_nl-NL.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1214,7 +1214,8 @@ pulls.merged_as=De pull request is samengevoegd als <a rel="nofollow" class="ui
pulls.is_closed=Deze pull-aanvraag is gesloten.
pulls.has_merged=Deze pull-aanvraag is al samengevoegd.
pulls.title_wip_desc=`<a href="#">Start de titel met <strong>%s</strong></a> om te voorkomen dat deze pull-aanvraag per ongeluk wordt samengevoegd.`
pulls.cannot_merge_work_in_progress=Deze pull-aanvraag is als "work in progress" gemarkeerd. Verwijder de <strong>%s</strong>-prefix van de titel zodra hij klaar is
pulls.cannot_merge_work_in_progress=Deze pull-aanvraag is als "work in progress" gemarkeerd.
pulls.remove_wip_prefix=`<a href="#">Verwijder de <strong>%s</strong>-prefix</a> van de titel zodra hij klaar is`
pulls.data_broken=Deze pull-aanvraag is ongeldig wegens missende fork-informatie.
pulls.files_conflicted=Dit pull request heeft wijzigingen die strijdig zijn met de doel branch.
pulls.is_checking=Controle op samenvoegingsconflicten is nog bezig. Probeer later nog een keer.
Expand Down
3 changes: 2 additions & 1 deletion options/locale/locale_pl-PL.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1151,7 +1151,8 @@ pulls.merged_as=Pull Request został scalony jako <a rel="nofollow" class="ui sh
pulls.is_closed=Pull Request został zamknięty.
pulls.has_merged=Pull Request został scalony.
pulls.title_wip_desc=`<a href="#">Poprzedź tytuł przy pomocy <strong>%s</strong></a>, aby zapobiec przypadkowemu scaleniu tego Pull Requesta.`
pulls.cannot_merge_work_in_progress=Ten Pull Request został oznaczony jako praca w toku. Usuń prefiks <strong>%s</strong> z tytułu, kiedy będzie już gotowy.
pulls.cannot_merge_work_in_progress=Ten Pull Request został oznaczony jako praca w toku.
pulls.remove_wip_prefix=`<a href="#">Usuń prefiks <strong>%s</strong></a> z tytułu, kiedy będzie już gotowy.`
pulls.data_broken=Ten Pull Request jest uszkodzony ze względu na brakujące informacje o forku.
pulls.files_conflicted=Ten Pull Request zawiera zmiany konfliktujące z docelową gałęzią.
pulls.is_checking=Sprawdzanie konfliktów ze scalaniem w toku. Spróbuj ponownie za chwilę.
Expand Down
3 changes: 2 additions & 1 deletion options/locale/locale_pt-BR.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1063,7 +1063,8 @@ pulls.merged_as=O pull request teve merge aplicado como <a rel="nofollow" class=
pulls.is_closed=O pull request foi fechado.
pulls.has_merged=O merge deste pull request foi aplicado.
pulls.title_wip_desc=`<a href="#">Inicie o título com o prefixo <strong>%s</strong></a> para prevenir o merge do pull request até que o mesmo esteja pronto.`
pulls.cannot_merge_work_in_progress=Este pull request está marcado como um trabalho em andamento. Remova o prefixo <strong>%s</strong> do título quando estiver pronto
pulls.cannot_merge_work_in_progress=Este pull request está marcado como um trabalho em andamento.
pulls.remove_wip_prefix=`<a href="#">Remova o prefixo <strong>%s</strong></a> do título quando estiver pronto`
pulls.data_broken=Este pull request está quebrado devido a falta de informação do fork.
pulls.files_conflicted=Este pull request tem alterações conflitantes com o branch de destino.
pulls.is_checking=Verificação de conflitos do merge está em andamento. Tente novamente em alguns momentos.
Expand Down
3 changes: 2 additions & 1 deletion options/locale/locale_pt-PT.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1229,7 +1229,8 @@ pulls.merged_as=A integração constante no pedido foi executada como <a rel="no
pulls.is_closed=O pedido de integração foi fechado.
pulls.has_merged=A integração constante no pedido foi executada.
pulls.title_wip_desc=`<a href="#">Inicie o título com <strong>%s</strong></a> para evitar que o pedido de integração seja executado acidentalmente.`
pulls.cannot_merge_work_in_progress=Este pedido de integração está marcado como um trabalho em andamento. Remova o prefixo <strong>%s</strong> do título quando estiver pronto
pulls.cannot_merge_work_in_progress=Este pedido de integração está marcado como um trabalho em andamento.
pulls.remove_wip_prefix=`<a href="#">Remova o prefixo <strong>%s</strong></a> do título quando estiver pronto`
pulls.data_broken=Este pedido de integração está danificado devido à falta de informação da derivação.
pulls.files_conflicted=Este pedido de integração contém alterações que entram em conflito com o ramo de destino.
pulls.is_checking=Está em andamento uma verificação de conflitos na integração. Tente novamente daqui a alguns momentos.
Expand Down
3 changes: 2 additions & 1 deletion options/locale/locale_ru-RU.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1194,7 +1194,8 @@ pulls.merged_as=Pull Request был объединен как <a rel="nofollow"
pulls.is_closed=Слияние этого запроса успешно завершено.
pulls.has_merged=Слияние этого запроса успешно завершено.
pulls.title_wip_desc=`<a href="#">Добавьте <strong>%s</strong> в начало заголовка</a> для защиты от случайного досрочного принятия Pull Request'а.`
pulls.cannot_merge_work_in_progress=Данный Pull Request помечен как находящийся ещё в разработке. Удалите <strong>%s</strong> из названия после завершения работы над ним
pulls.cannot_merge_work_in_progress=Данный Pull Request помечен как находящийся ещё в разработке.
pulls.remove_wip_prefix=`<a href="#">Удалите <strong>%s</strong> из названия</a> после завершения работы над ним`
pulls.data_broken=Содержимое этого запроса было нарушено вследствие удаления информации форка.
pulls.files_conflicted=Этот Pull Request имеет изменения, конфликтующие с целевой веткой.
pulls.is_checking=Продолжается проверка конфликтов, пожалуйста обновите страницу несколько позже.
Expand Down
3 changes: 2 additions & 1 deletion options/locale/locale_sv-SE.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1170,7 +1170,8 @@ pulls.merged_as=Pull-förfrågan har sammanfogats som <a rel="nofollow" class="u
pulls.is_closed=Pull-förfrågan har stängts.
pulls.has_merged=Pull-requested har blivit mergad.
pulls.title_wip_desc=`<a href="#">Börja titeln med <strong>%s</strong></a> för att förhindra att pull-förfrågan sammanfogas av misstag`
pulls.cannot_merge_work_in_progress=Denna pull-förfrågan är markerad som ett pågående arbete. Ta bort prefixet <strong>%s</strong> från titeln när den är klar
pulls.cannot_merge_work_in_progress=Denna pull-förfrågan är markerad som ett pågående arbete.
pulls.remove_wip_prefix=`<a href="#">Ta bort prefixet <strong>%s</strong></a> från titeln när den är klar`
pulls.data_broken=Pull-requesten är trasig pågrund av oexisterande information on forken.
pulls.files_conflicted=Den här pull-förfrågan ha ändringar som är i konflikt med mål-branchen.
pulls.is_checking=Merge-konfliktkontroll pågår. Försök igen senare.
Expand Down
3 changes: 2 additions & 1 deletion options/locale/locale_tr-TR.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1260,7 +1260,8 @@ pulls.merged_as=Değişiklik isteği <a rel="nofollow" class="ui sha" href="%[1]
pulls.is_closed=Değişiklik isteği kapatıldı.
pulls.has_merged=Değişiklik isteği birleştirildi.
pulls.title_wip_desc=`Değişiklik isteğinin yanlışlıkla birleştirilmesini önlemek için, <a href="#">başlığı <strong>%s</strong> ile başlatın</a>`
pulls.cannot_merge_work_in_progress=Bu değişiklik isteği devam eden bir çalışma olarak işaretlendi. Hazır olduğunda <strong>%s</strong> ön ekini başlıktan kaldırın
pulls.cannot_merge_work_in_progress=Bu değişiklik isteği devam eden bir çalışma olarak işaretlendi.
pulls.remove_wip_prefix=`Hazır olduğunda <a href="#"><strong>%s</strong></a> ön ekini başlıktan kaldırın</a>`
pulls.data_broken=Bu değişiklik isteği, çatallama bilgilerinin eksik olması nedeniyle bozuldu.
pulls.files_conflicted=Bu değişiklik isteğinde, hedef dalla çakışan değişiklikler var.
pulls.is_checking=Birleştirme çakışması denetimi devam ediyor. Birkaç dakika sonra tekrar deneyin.
Expand Down
3 changes: 2 additions & 1 deletion options/locale/locale_uk-UA.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1157,7 +1157,8 @@ pulls.merged_as=Запит на злиття був влитиий як <a rel="
pulls.is_closed=Запит на злиття було закрито.
pulls.has_merged=Запит на злиття було об'єднано.
pulls.title_wip_desc=`<a href="#">Почніть заголовок з <strong>%s</strong></a> щоб запобігти випадковому злиттю запитів.`
pulls.cannot_merge_work_in_progress=Цей пулл-реквест вже в стадії виконання. Видаліть префікс <strong>%s</strong> з заголовку після того як роботи будуть завершені
pulls.cannot_merge_work_in_progress=Цей пулл-реквест вже в стадії виконання.
pulls.remove_wip_prefix=`<a href="#">Видаліть префікс <strong>%s</strong></a> з заголовку після того як роботи будуть завершені`
pulls.data_broken=Зміст цього запиту було порушено внаслідок видалення інформації Форком. Цей запит тягнеться через відсутність інформації про вилучення.
pulls.files_conflicted=Цей запит має зміни, що конфліктують з цільовою гілкою.
pulls.is_checking=Триває перевірка конфліктів, будь ласка обновіть сторінку дещо пізніше.
Expand Down
3 changes: 2 additions & 1 deletion options/locale/locale_zh-CN.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1231,7 +1231,8 @@ pulls.merged_as=该合并请求已作为 <a rel="nofollow" class="ui sha" href="
pulls.is_closed=合并请求已经关闭。
pulls.has_merged=请求已合并。
pulls.title_wip_desc=`<a href="#">标题以 <strong>%s</strong> 开头</a>以免合并请求意外合并。`
pulls.cannot_merge_work_in_progress=这个合并请求被标记为尚未完成的工作。完成后请从标题中移除<strong>%s</strong>前缀。
pulls.cannot_merge_work_in_progress=这个合并请求被标记为尚未完成的工作。
pulls.remove_wip_prefix=`<a href="#">完成后请从标题中移除<strong>%s</strong>前缀</a>。`
pulls.data_broken=此合并请求因为派生仓库信息缺失而中断。
pulls.files_conflicted=此合并请求有变更与目标分支冲突。
pulls.is_checking=正在进行合并冲突检测,请稍后再试。
Expand Down
Loading