Skip to content

Commit 7ce4543

Browse files
authored
Merge branch 'master' into pr-squash-comment
2 parents 853ea2c + 3a500cf commit 7ce4543

24 files changed

+11
-27
lines changed

options/locale/locale_cs-CZ.ini

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1130,7 +1130,7 @@ issues.start_tracking_short=Start
11301130
issues.start_tracking=Spustit sledování času
11311131
issues.start_tracking_history=`započal(a) práci %s`
11321132
issues.tracker_auto_close=Časovač se automaticky zastaví po zavření tohoto úkolu
1133-
issues.tracking_already_started=`Již jste spustili sledování času na tomto <a href="%s">úkolu</a>!`
1133+
issues.tracking_already_started=`Již jste spustili sledování času na <a href="%s">jiném úkolu</a>!`
11341134
issues.stop_tracking=Stop
11351135
issues.stop_tracking_history=`ukončil(a) práci %s`
11361136
issues.add_time=Přidat čas ručně
@@ -1786,6 +1786,7 @@ diff.whitespace_ignore_all_whitespace=Ignorovat bílé znaky při porovnávání
17861786
diff.whitespace_ignore_amount_changes=Ignorovat změny v množství bílých znaků
17871787
diff.whitespace_ignore_at_eol=Ignorovat změny v bílých znacích na konci řídku
17881788
diff.stats_desc=<strong> %d změnil soubory</strong>, kde provedl <strong>%d přidání</strong> a <strong>%d odebrání</strong>
1789+
diff.stats_desc_file=%d změn: %d přidání a %d smazání
17891790
diff.bin=binární
17901791
diff.view_file=Zobrazit soubor
17911792
diff.file_before=Před
@@ -1806,7 +1807,7 @@ diff.review.header=Odeslat posouzení
18061807
diff.review.placeholder=Posoudit komentář
18071808
diff.review.comment=Okomentovat
18081809
diff.review.approve=Schválit
1809-
diff.review.reject=Požadované změny
1810+
diff.review.reject=Požadovat změny
18101811
diff.committed_by=odevzdal
18111812
diff.protected=Chráněno
18121813

options/locale/locale_de-DE.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1114,7 +1114,6 @@ issues.start_tracking_short=Start
11141114
issues.start_tracking=Zeiterfassung starten
11151115
issues.start_tracking_history=hat die Zeiterfassung %s gestartet
11161116
issues.tracker_auto_close=Der Timer wird automatisch gestoppt, wenn dieser Issue geschlossen wird
1117-
issues.tracking_already_started=`Du hast die Zeiterfassung bereits in <a href="%s">diesem Issue</a> gestartet!`
11181117
issues.stop_tracking=Stopp
11191118
issues.stop_tracking_history=hat die Zeiterfassung %s angehalten
11201119
issues.add_time=Zeit manuell hinzufügen

options/locale/locale_en-US.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -654,6 +654,7 @@ email_notifications.submit = Set Email Preference
654654

655655
[repo]
656656
owner = Owner
657+
owner_helper = Some organizations may not show up in the dropdown due to a maximum repository count limit.
657658
repo_name = Repository Name
658659
repo_name_helper = Good repository names use short, memorable and unique keywords.
659660
repo_size = Repository Size

options/locale/locale_es-ES.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1128,7 +1128,6 @@ issues.start_tracking_short=Iniciar
11281128
issues.start_tracking=Inicio de seguimiento de tiempo
11291129
issues.start_tracking_history=`ha empezado a trabajar %s`
11301130
issues.tracker_auto_close=El temporizador se detendrá automáticamente cuando se cierre este problema
1131-
issues.tracking_already_started='Ya has comenzado el tiempo de seguimiento en este <a href="%s">tema</a>!'
11321131
issues.stop_tracking=Detener
11331132
issues.stop_tracking_history=`dejó de trabajar %s`
11341133
issues.add_time=Añadir tiempo gastado manualmente

options/locale/locale_fa-IR.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1027,7 +1027,6 @@ issues.start_tracking_short=آغاز
10271027
issues.start_tracking=شروع به پیگیری زمان
10281028
issues.start_tracking_history=`شروع به کار %s`
10291029
issues.tracker_auto_close=زمان‌سنج به صورت خودکار متوقف میشود زمانی که مسئله بسته شود
1030-
issues.tracking_already_started=`شما میتوانید پیگیری زمان را روی این <a href="%s"> مسئله </a> آغاز کنید!`
10311030
issues.stop_tracking=توقف
10321031
issues.stop_tracking_history=`توقف کار در %s`
10331032
issues.add_time=زمان را به صورت دستی وارد کنید

options/locale/locale_fr-FR.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -989,7 +989,6 @@ issues.start_tracking_short=Démarrer
989989
issues.start_tracking=Démarrer le suivi du temps
990990
issues.start_tracking_history=`a démarré il y a %s`
991991
issues.tracker_auto_close=Le suivi de temps sera automatiquement arrêté quand le ticket sera fermé
992-
issues.tracking_already_started=`Vous avez déjà démarré le suivi de temps pour cette <a href="%s">tâche</a>!`
993992
issues.stop_tracking=Arrêter
994993
issues.stop_tracking_history=`a fini de travaillé pour %s`
995994
issues.add_time=Ajouter un minuteur manuellement

options/locale/locale_hu-HU.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -882,7 +882,6 @@ issues.tracker=Időzítő
882882
issues.start_tracking_short=Indítás
883883
issues.start_tracking=Időmérés elkezdése
884884
issues.start_tracking_history=`elkezdett dolgozni %s`
885-
issues.tracking_already_started=`Már elindította az időzítőt a <a href="%s">hibajegyhez</a>!`
886885
issues.stop_tracking=Leállítás
887886
issues.stop_tracking_history=`abbahagyta a %s`
888887
issues.add_time=Idő kézi hozzáadása

options/locale/locale_id-ID.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,6 @@ issues.subscribe=Berlangganan
832832
issues.unsubscribe=Berhenti berlangganan
833833
issues.start_tracking_short=Mulai
834834
issues.start_tracking_history=`mulai bekerja %s`
835-
issues.tracking_already_started=`Anda telah memulai pelacakan waktu pada <a href="%s">masalah</a> ini!`
836835
issues.stop_tracking=Berhenti
837836
issues.stop_tracking_history=`berhenti bekerja %s`
838837
issues.add_time_cancel=Batalkan

options/locale/locale_it-IT.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1094,7 +1094,6 @@ issues.start_tracking_short=Inizio
10941094
issues.start_tracking=Avvia cronografo
10951095
issues.start_tracking_history='ha iniziato a lavorare %s`
10961096
issues.tracker_auto_close=Il timer verrà interrotto automaticamente una volta che il problema verrá chiuso
1097-
issues.tracking_already_started=`Hai già avviato il cronografo su questa <a href="%s">issue</a>!`
10981097
issues.stop_tracking=Interrompi
10991098
issues.stop_tracking_history=`ha smesso di funzionare %s`
11001099
issues.add_time=Aggiungi Tempo manualmente

options/locale/locale_ja-JP.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1130,7 +1130,6 @@ issues.start_tracking_short=開始
11301130
issues.start_tracking=タイムトラッキングを開始
11311131
issues.start_tracking_history=`が作業を開始 %s`
11321132
issues.tracker_auto_close=タイマーは、この課題がクローズされると自動的に終了します
1133-
issues.tracking_already_started=`この<a href="%s">課題</a>で既にタイムトラッキングを開始しています!`
11341133
issues.stop_tracking=停止
11351134
issues.stop_tracking_history=`が作業を終了 %s`
11361135
issues.add_time=手で時間を入力

options/locale/locale_ko-KR.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -801,7 +801,6 @@ issues.tracker=타임 트래커
801801
issues.start_tracking_short=시작
802802
issues.start_tracking=타임 트래킹 시작
803803
issues.start_tracking_history=`%s가 작업 시작`
804-
issues.tracking_already_started=`<a href="%s">이슈</a>에서 이미 타임 트래킹을 사용하고 있습니다!`
805804
issues.stop_tracking=중단
806805
issues.stop_tracking_history=`작업 중단 %s`
807806
issues.add_time=수동으로 시간 입력

options/locale/locale_lv-LV.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1107,7 +1107,6 @@ issues.start_tracking_short=Sākt
11071107
issues.start_tracking=Uzsākt laika uzskaiti
11081108
issues.start_tracking_history=` uzsāka darbu %s`
11091109
issues.tracker_auto_close=Taimeris tiks automātiski apturēts, kad šī problēma tiks aizvērta
1110-
issues.tracking_already_started=`Jums jau ir iesākta laika uzskaite pie citas <a href="%s">problēmas</a>!`
11111110
issues.stop_tracking=Beigt
11121111
issues.stop_tracking_history=` beidza strādāt %s`
11131112
issues.add_time=Manuāli pievienot laiku

options/locale/locale_nl-NL.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1110,7 +1110,6 @@ issues.start_tracking_short=Start
11101110
issues.start_tracking=Start tijdregistratie
11111111
issues.start_tracking_history=`%s is begonnen`
11121112
issues.tracker_auto_close=Timer wordt automatisch gestopt wanneer dit probleem wordt gesloten
1113-
issues.tracking_already_started=Je houd al tijd bij voor dit <a href="%s">issue</a>!`
11141113
issues.stop_tracking=Stop
11151114
issues.stop_tracking_history=`gestopt met werken aan %s`
11161115
issues.add_time=Tijd handmatig toevoegen

options/locale/locale_pl-PL.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1051,7 +1051,6 @@ issues.start_tracking_short=Rozpocznij
10511051
issues.start_tracking=Rozpocznij śledzenie czasu
10521052
issues.start_tracking_history=`rozpoczął(-ęła) pracę nad %s`
10531053
issues.tracker_auto_close=Licznik czasu zostanie automatycznie zatrzymany w momencie zamknięcia tego zgłoszenia
1054-
issues.tracking_already_started=`Już śledzisz czas pracy nad tym <a href="%s">zgłoszeniem</a>!`
10551054
issues.stop_tracking=Zatrzymaj
10561055
issues.stop_tracking_history=`zakończył(-a) pracę nad %s`
10571056
issues.add_time=Dodaj czas ręcznie

options/locale/locale_pt-BR.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -976,7 +976,6 @@ issues.start_tracking_short=Iniciar
976976
issues.start_tracking=Iniciar contador de tempo
977977
issues.start_tracking_history=`começou a trabalhar %s`
978978
issues.tracker_auto_close=Contador de tempo será parado automaticamente quando esta issue for fechada
979-
issues.tracking_already_started='Você já iniciou o contador de tempo para esta <a href="%s"> issue</a>!'
980979
issues.stop_tracking=Parar
981980
issues.stop_tracking_history=`parou de trabalhar %s`
982981
issues.add_time=Adicionar tempo manualmente

options/locale/locale_pt-PT.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1128,7 +1128,6 @@ issues.start_tracking_short=Iniciar
11281128
issues.start_tracking=Iniciar contagem de tempo
11291129
issues.start_tracking_history=`começou a trabalhar %s`
11301130
issues.tracker_auto_close=O temporizador será parado automaticamente quando esta questão for fechada
1131-
issues.tracking_already_started=`Já tinha iniciado a contagem de tempo para esta <a href="%s">questão</a>!`
11321131
issues.stop_tracking=Parar
11331132
issues.stop_tracking_history=`parou de trabalhar %s`
11341133
issues.add_time=Adicionar tempo manualmente

options/locale/locale_ru-RU.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1094,7 +1094,6 @@ issues.start_tracking_short=Начать
10941094
issues.start_tracking=Начать отслеживание времени
10951095
issues.start_tracking_history=`начал(а) работать %s`
10961096
issues.tracker_auto_close=Таймер будет остановлен автоматически, когда эта проблема будет закрыта
1097-
issues.tracking_already_started=`Вы уже начали отслеживать время для этой <a href="%s">задачи</a>!`
10981097
issues.stop_tracking=Остановить
10991098
issues.stop_tracking_history=`перестал работать %s`
11001099
issues.add_time=Вручную добавить время

options/locale/locale_sv-SE.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1071,7 +1071,6 @@ issues.start_tracking_short=Starta
10711071
issues.start_tracking=Starta tidsredovisning
10721072
issues.start_tracking_history=`började arbeta %s`
10731073
issues.tracker_auto_close=Timern stoppas automatiskt när ärendet stängs
1074-
issues.tracking_already_started=`Du har redan påbörjat tidredovisning på detta <a href="%s"> ärende</a>!`
10751074
issues.stop_tracking=Stoppa
10761075
issues.stop_tracking_history=`slutade arbeta %s`
10771076
issues.add_time=Lägg till tid manuellt

options/locale/locale_tr-TR.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1130,7 +1130,7 @@ issues.start_tracking_short=Başlat
11301130
issues.start_tracking=Zaman İzlemeyi Başlat
11311131
issues.start_tracking_history=`%s çalışma başlattı`
11321132
issues.tracker_auto_close=Bu konu kapatıldığında zamanlayıcı otomatik olarak durur
1133-
issues.tracking_already_started=`Bu <a href="%s">konuda</a> zaten zaman takibini başlattınız!`
1133+
issues.tracking_already_started=`<a href="%s">başka bir konuda</a> zaten zaman izleyici başlattınız!`
11341134
issues.stop_tracking=Durdur
11351135
issues.stop_tracking_history=`%s çalışmayı durdurdu`
11361136
issues.add_time=El ile Zaman Ekle

options/locale/locale_uk-UA.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1057,7 +1057,6 @@ issues.start_tracking_short=Запустити
10571057
issues.start_tracking=Почати відстеження часу
10581058
issues.start_tracking_history=`почав працювати %s`
10591059
issues.tracker_auto_close=Таймер буде автоматично зупинено, коли ця проблема буде закрита
1060-
issues.tracking_already_started=`Ви вже почали відстежувати час для цієї <a href="%s"> проблеми</a>!`
10611060
issues.stop_tracking=Стоп
10621061
issues.stop_tracking_history=`перестав(-ла) працювати %s`
10631062
issues.add_time=Вручну додати час

options/locale/locale_zh-CN.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1130,7 +1130,6 @@ issues.start_tracking_short=开始
11301130
issues.start_tracking=开始时间跟踪
11311131
issues.start_tracking_history=`开始工作 %s`
11321132
issues.tracker_auto_close=当此工单关闭时,自动停止计时器
1133-
issues.tracking_already_started=`你已经开始时间跟踪这个 <a href="%s">工单</a>!`
11341133
issues.stop_tracking=停止
11351134
issues.stop_tracking_history=`停止工作 %s`
11361135
issues.add_time=手动添加时间

options/locale/locale_zh-TW.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1129,7 +1129,6 @@ issues.start_tracking_short=開始
11291129
issues.start_tracking=開始時間追蹤
11301130
issues.start_tracking_history=`開始工作 %s`
11311131
issues.tracker_auto_close=當這個問題被關閉時,自動停止計時器
1132-
issues.tracking_already_started=`您已經開始時間追蹤這個 <a href="%s">問題</a>!`
11331132
issues.stop_tracking=停止
11341133
issues.stop_tracking_history=`結束工作 %s`
11351134
issues.add_time=手動新增時間

templates/repo/create.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
{{end}}
3232
</div>
3333
</div>
34-
<span class="help">Some organizations may not show up in the dropdown due to a maximum repository count limit</span>
34+
<span class="help">{{.i18n.Tr "repo.owner_helper"}}</span>
3535
</div>
3636

3737
<div class="inline required field {{if .Err_RepoName}}error{{end}}">

templates/shared/issuelist.tmpl

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@
3131
</div>
3232
<div class="issue-item-main f1 fc df">
3333
<div class="issue-item-top-row df ac fw">
34-
{{if eq $.listType "dashboard"}}
35-
<div class="ui label mr-3">{{.Repo.FullName}}</div>
36-
{{end}}
3734
<a class="title mr-3" href="{{if .HTMLURL}}{{.HTMLURL}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
3835
{{RenderEmoji .Title}}
3936
{{if .IsPull }}
@@ -50,7 +47,11 @@
5047
</div>
5148
<div class="desc issue-item-bottom-row df ac fw my-1">
5249
<a class="index ml-0 mr-2" href="{{if .HTMLURL}}{{.HTMLURL}}{{else}}{{$.Link}}/{{.Index}}{{end}}">
53-
#{{.Index}}
50+
{{if eq $.listType "dashboard"}}
51+
{{.Repo.FullName}}#{{.Index}}
52+
{{else}}
53+
#{{.Index}}
54+
{{end}}
5455
</a>
5556
{{ $timeStr := TimeSinceUnix .GetLastEventTimestamp $.Lang }}
5657
{{if .OriginalAuthor }}

0 commit comments

Comments
 (0)