diff --git a/go.mod b/go.mod index e3e2029d68163..0edd0dc2dc55b 100644 --- a/go.mod +++ b/go.mod @@ -84,7 +84,7 @@ require ( github.com/urfave/cli v1.22.5 github.com/xanzy/go-gitlab v0.58.0 github.com/yohcop/openid-go v1.0.0 - github.com/yuin/goldmark v1.4.8 + github.com/yuin/goldmark v1.4.11 github.com/yuin/goldmark-highlighting v0.0.0-20220208100518-594be1970594 github.com/yuin/goldmark-meta v1.1.0 go.jolheiser.com/hcaptcha v0.0.4 diff --git a/go.sum b/go.sum index f1e719284de2d..19ed2271c8848 100644 --- a/go.sum +++ b/go.sum @@ -1545,8 +1545,8 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.5/go.mod h1:rmuwmfZ0+bvzB24eSC//bk1R1Zp3hM0OXYv/G2LIilg= github.com/yuin/goldmark v1.4.6/go.mod h1:rmuwmfZ0+bvzB24eSC//bk1R1Zp3hM0OXYv/G2LIilg= -github.com/yuin/goldmark v1.4.8 h1:zHPiabbIRssZOI0MAzJDHsyvG4MXCGqVaMOwR+HeoQQ= -github.com/yuin/goldmark v1.4.8/go.mod h1:rmuwmfZ0+bvzB24eSC//bk1R1Zp3hM0OXYv/G2LIilg= +github.com/yuin/goldmark v1.4.11 h1:i45YIzqLnUc2tGaTlJCyUxSG8TvgyGqhqOZOUKIjJ6w= +github.com/yuin/goldmark v1.4.11/go.mod h1:rmuwmfZ0+bvzB24eSC//bk1R1Zp3hM0OXYv/G2LIilg= github.com/yuin/goldmark-highlighting v0.0.0-20220208100518-594be1970594 h1:yHfZyN55+5dp1wG7wDKv8HQ044moxkyGq12KFFMFDxg= github.com/yuin/goldmark-highlighting v0.0.0-20220208100518-594be1970594/go.mod h1:U9ihbh+1ZN7fR5Se3daSPoz1CGF9IYtSvWwVQtnzGHU= github.com/yuin/goldmark-meta v1.1.0 h1:pWw+JLHGZe8Rk0EGsMVssiNb/AaPMHfSRszZeUeiOUc= diff --git a/modules/graceful/manager.go b/modules/graceful/manager.go index f78357360746d..8766cfca0efb4 100644 --- a/modules/graceful/manager.go +++ b/modules/graceful/manager.go @@ -6,6 +6,7 @@ package graceful import ( "context" + "runtime/pprof" "sync" "time" @@ -62,7 +63,6 @@ type WithCallback func(callback func()) // Similarly the callback function provided to atTerminate must return once termination is complete. // Please note that use of the atShutdown and atTerminate callbacks will create go-routines that will wait till their respective signals // - users must therefore be careful to only call these as necessary. -// If run is not expected to run indefinitely RunWithShutdownChan is likely to be more appropriate. type RunnableWithShutdownFns func(atShutdown, atTerminate func(func())) // RunWithShutdownFns takes a function that has both atShutdown and atTerminate callbacks @@ -70,7 +70,6 @@ type RunnableWithShutdownFns func(atShutdown, atTerminate func(func())) // Similarly the callback function provided to atTerminate must return once termination is complete. // Please note that use of the atShutdown and atTerminate callbacks will create go-routines that will wait till their respective signals // - users must therefore be careful to only call these as necessary. -// If run is not expected to run indefinitely RunWithShutdownChan is likely to be more appropriate. func (g *Manager) RunWithShutdownFns(run RunnableWithShutdownFns) { g.runningServerWaitGroup.Add(1) defer g.runningServerWaitGroup.Done() @@ -98,32 +97,6 @@ func (g *Manager) RunWithShutdownFns(run RunnableWithShutdownFns) { }) } -// RunnableWithShutdownChan is a runnable with functions to run at shutdown and terminate. -// After the atShutdown channel is closed, the main function must return once shutdown is complete. -// (Optionally IsHammer may be waited for instead however, this should be avoided if possible.) -// The callback function provided to atTerminate must return once termination is complete. -// Please note that use of the atTerminate function will create a go-routine that will wait till terminate - users must therefore be careful to only call this as necessary. -type RunnableWithShutdownChan func(atShutdown <-chan struct{}, atTerminate WithCallback) - -// RunWithShutdownChan takes a function that has channel to watch for shutdown and atTerminate callbacks -// After the atShutdown channel is closed, the main function must return once shutdown is complete. -// (Optionally IsHammer may be waited for instead however, this should be avoided if possible.) -// The callback function provided to atTerminate must return once termination is complete. -// Please note that use of the atTerminate function will create a go-routine that will wait till terminate - users must therefore be careful to only call this as necessary. -func (g *Manager) RunWithShutdownChan(run RunnableWithShutdownChan) { - g.runningServerWaitGroup.Add(1) - defer g.runningServerWaitGroup.Done() - defer func() { - if err := recover(); err != nil { - log.Critical("PANIC during RunWithShutdownChan: %v\nStacktrace: %s", err, log.Stack(2)) - g.doShutdown() - } - }() - run(g.IsShutdown(), func(atTerminate func()) { - g.RunAtTerminate(atTerminate) - }) -} - // RunWithShutdownContext takes a function that has a context to watch for shutdown. // After the provided context is Done(), the main function must return once shutdown is complete. // (Optionally the HammerContext may be obtained and waited for however, this should be avoided if possible.) @@ -136,7 +109,9 @@ func (g *Manager) RunWithShutdownContext(run func(context.Context)) { g.doShutdown() } }() - run(g.ShutdownContext()) + ctx := g.ShutdownContext() + pprof.SetGoroutineLabels(ctx) // We don't have a label to restore back to but I think this is fine + run(ctx) } // RunAtTerminate adds to the terminate wait group and creates a go-routine to run the provided function at termination @@ -198,6 +173,8 @@ func (g *Manager) doShutdown() { } g.lock.Lock() g.shutdownCtxCancel() + atShutdownCtx := pprof.WithLabels(g.hammerCtx, pprof.Labels("graceful-lifecycle", "post-shutdown")) + pprof.SetGoroutineLabels(atShutdownCtx) for _, fn := range g.toRunAtShutdown { go fn() } @@ -214,7 +191,7 @@ func (g *Manager) doShutdown() { g.doTerminate() g.WaitForTerminate() g.lock.Lock() - g.doneCtxCancel() + g.managerCtxCancel() g.lock.Unlock() }() } @@ -227,6 +204,8 @@ func (g *Manager) doHammerTime(d time.Duration) { default: log.Warn("Setting Hammer condition") g.hammerCtxCancel() + atHammerCtx := pprof.WithLabels(g.terminateCtx, pprof.Labels("graceful-lifecycle", "post-hammer")) + pprof.SetGoroutineLabels(atHammerCtx) for _, fn := range g.toRunAtHammer { go fn() } @@ -244,6 +223,9 @@ func (g *Manager) doTerminate() { default: log.Warn("Terminating") g.terminateCtxCancel() + atTerminateCtx := pprof.WithLabels(g.managerCtx, pprof.Labels("graceful-lifecycle", "post-terminate")) + pprof.SetGoroutineLabels(atTerminateCtx) + for _, fn := range g.toRunAtTerminate { go fn() } @@ -331,20 +313,20 @@ func (g *Manager) InformCleanup() { // Done allows the manager to be viewed as a context.Context, it returns a channel that is closed when the server is finished terminating func (g *Manager) Done() <-chan struct{} { - return g.doneCtx.Done() + return g.managerCtx.Done() } // Err allows the manager to be viewed as a context.Context done at Terminate func (g *Manager) Err() error { - return g.doneCtx.Err() + return g.managerCtx.Err() } // Value allows the manager to be viewed as a context.Context done at Terminate func (g *Manager) Value(key interface{}) interface{} { - return g.doneCtx.Value(key) + return g.managerCtx.Value(key) } // Deadline returns nil as there is no fixed Deadline for the manager, it allows the manager to be viewed as a context.Context func (g *Manager) Deadline() (deadline time.Time, ok bool) { - return g.doneCtx.Deadline() + return g.managerCtx.Deadline() } diff --git a/modules/graceful/manager_unix.go b/modules/graceful/manager_unix.go index 99e84d73e834b..6fbb2bda29ab0 100644 --- a/modules/graceful/manager_unix.go +++ b/modules/graceful/manager_unix.go @@ -12,6 +12,7 @@ import ( "errors" "os" "os/signal" + "runtime/pprof" "sync" "syscall" "time" @@ -29,11 +30,11 @@ type Manager struct { shutdownCtx context.Context hammerCtx context.Context terminateCtx context.Context - doneCtx context.Context + managerCtx context.Context shutdownCtxCancel context.CancelFunc hammerCtxCancel context.CancelFunc terminateCtxCancel context.CancelFunc - doneCtxCancel context.CancelFunc + managerCtxCancel context.CancelFunc runningServerWaitGroup sync.WaitGroup createServerWaitGroup sync.WaitGroup terminateWaitGroup sync.WaitGroup @@ -58,7 +59,17 @@ func (g *Manager) start(ctx context.Context) { g.terminateCtx, g.terminateCtxCancel = context.WithCancel(ctx) g.shutdownCtx, g.shutdownCtxCancel = context.WithCancel(ctx) g.hammerCtx, g.hammerCtxCancel = context.WithCancel(ctx) - g.doneCtx, g.doneCtxCancel = context.WithCancel(ctx) + g.managerCtx, g.managerCtxCancel = context.WithCancel(ctx) + + // Next add pprof labels to these contexts + g.terminateCtx = pprof.WithLabels(g.terminateCtx, pprof.Labels("graceful-lifecycle", "with-terminate")) + g.shutdownCtx = pprof.WithLabels(g.shutdownCtx, pprof.Labels("graceful-lifecycle", "with-shutdown")) + g.hammerCtx = pprof.WithLabels(g.hammerCtx, pprof.Labels("graceful-lifecycle", "with-hammer")) + g.managerCtx = pprof.WithLabels(g.managerCtx, pprof.Labels("graceful-lifecycle", "with-manager")) + + // Now label this and all goroutines created by this goroutine with the graceful-lifecycle manager + pprof.SetGoroutineLabels(g.managerCtx) + defer pprof.SetGoroutineLabels(ctx) // Set the running state & handle signals g.setState(stateRunning) diff --git a/modules/graceful/manager_windows.go b/modules/graceful/manager_windows.go index e5f5541ed3c3c..66baddfa38ed1 100644 --- a/modules/graceful/manager_windows.go +++ b/modules/graceful/manager_windows.go @@ -11,6 +11,7 @@ package graceful import ( "context" "os" + "runtime/pprof" "strconv" "sync" "time" @@ -40,11 +41,11 @@ type Manager struct { shutdownCtx context.Context hammerCtx context.Context terminateCtx context.Context - doneCtx context.Context + managerCtx context.Context shutdownCtxCancel context.CancelFunc hammerCtxCancel context.CancelFunc terminateCtxCancel context.CancelFunc - doneCtxCancel context.CancelFunc + managerCtxCancel context.CancelFunc runningServerWaitGroup sync.WaitGroup createServerWaitGroup sync.WaitGroup terminateWaitGroup sync.WaitGroup @@ -71,7 +72,17 @@ func (g *Manager) start() { g.terminateCtx, g.terminateCtxCancel = context.WithCancel(g.ctx) g.shutdownCtx, g.shutdownCtxCancel = context.WithCancel(g.ctx) g.hammerCtx, g.hammerCtxCancel = context.WithCancel(g.ctx) - g.doneCtx, g.doneCtxCancel = context.WithCancel(g.ctx) + g.managerCtx, g.managerCtxCancel = context.WithCancel(g.ctx) + + // Next add pprof labels to these contexts + g.terminateCtx = pprof.WithLabels(g.terminateCtx, pprof.Labels("graceful-lifecycle", "with-terminate")) + g.shutdownCtx = pprof.WithLabels(g.shutdownCtx, pprof.Labels("graceful-lifecycle", "with-shutdown")) + g.hammerCtx = pprof.WithLabels(g.hammerCtx, pprof.Labels("graceful-lifecycle", "with-hammer")) + g.managerCtx = pprof.WithLabels(g.managerCtx, pprof.Labels("graceful-lifecycle", "with-manager")) + + // Now label this and all goroutines created by this goroutine with the graceful-lifecycle manager + pprof.SetGoroutineLabels(g.managerCtx) + defer pprof.SetGoroutineLabels(g.ctx) // Make channels g.shutdownRequested = make(chan struct{}) diff --git a/modules/markup/markdown/markdown_test.go b/modules/markup/markdown/markdown_test.go index 54c2ea87d6772..a069d402bb506 100644 --- a/modules/markup/markdown/markdown_test.go +++ b/modules/markup/markdown/markdown_test.go @@ -199,6 +199,11 @@ func testAnswers(baseURLContent, baseURLImages string) []string { +`, ` +
+

This PR has been generated by Renovate Bot.

`, } } @@ -271,6 +276,14 @@ Here is a simple footnote,[^1] and here is a longer one.[^bignote] Add as many paragraphs as you like. `, + ` +- [ ] If you want to rebase/retry this PR, click this checkbox. + +--- + +This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). + +`, } func TestTotal_RenderWiki(t *testing.T) { diff --git a/modules/process/manager.go b/modules/process/manager.go index d9d2f8c3e5f9c..50dbbbe6c807c 100644 --- a/modules/process/manager.go +++ b/modules/process/manager.go @@ -11,6 +11,7 @@ import ( "fmt" "io" "os/exec" + "runtime/pprof" "sort" "strconv" "sync" @@ -66,11 +67,9 @@ func GetManager() *Manager { // Most processes will not need to use the cancel function but there will be cases whereby you want to cancel the process but not immediately remove it from the // process table. func (pm *Manager) AddContext(parent context.Context, description string) (ctx context.Context, cancel context.CancelFunc, finished FinishedFunc) { - parentPID := GetParentPID(parent) - ctx, cancel = context.WithCancel(parent) - pid, finished := pm.Add(parentPID, description, cancel) + ctx, pid, finished := pm.Add(ctx, description, cancel) return &Context{ Context: ctx, @@ -87,11 +86,9 @@ func (pm *Manager) AddContext(parent context.Context, description string) (ctx c // Most processes will not need to use the cancel function but there will be cases whereby you want to cancel the process but not immediately remove it from the // process table. func (pm *Manager) AddContextTimeout(parent context.Context, timeout time.Duration, description string) (ctx context.Context, cancel context.CancelFunc, finshed FinishedFunc) { - parentPID := GetParentPID(parent) - ctx, cancel = context.WithTimeout(parent, timeout) - pid, finshed := pm.Add(parentPID, description, cancel) + ctx, pid, finshed := pm.Add(ctx, description, cancel) return &Context{ Context: ctx, @@ -100,7 +97,9 @@ func (pm *Manager) AddContextTimeout(parent context.Context, timeout time.Durati } // Add create a new process -func (pm *Manager) Add(parentPID IDType, description string, cancel context.CancelFunc) (IDType, FinishedFunc) { +func (pm *Manager) Add(ctx context.Context, description string, cancel context.CancelFunc) (context.Context, IDType, FinishedFunc) { + parentPID := GetParentPID(ctx) + pm.mutex.Lock() start, pid := pm.nextPID() @@ -120,6 +119,7 @@ func (pm *Manager) Add(parentPID IDType, description string, cancel context.Canc finished := func() { cancel() pm.remove(process) + pprof.SetGoroutineLabels(ctx) } if parent != nil { @@ -128,7 +128,10 @@ func (pm *Manager) Add(parentPID IDType, description string, cancel context.Canc pm.processes[pid] = process pm.mutex.Unlock() - return pid, finished + pprofCtx := pprof.WithLabels(ctx, pprof.Labels("process-description", description, "ppid", string(parentPID), "pid", string(pid))) + pprof.SetGoroutineLabels(pprofCtx) + + return pprofCtx, pid, finished } // nextPID will return the next available PID. pm.mutex should already be locked. diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini index 8818f093519fa..7f93b49078f4a 100644 --- a/options/locale/locale_cs-CZ.ini +++ b/options/locale/locale_cs-CZ.ini @@ -1246,8 +1246,6 @@ issues.due_date_remove=odstranil/a termín dokončení %s %s issues.due_date_overdue=Zpožděné issues.due_date_invalid=Termín dokončení není platný nebo je mimo rozsah. Použijte prosím formát „rrrr-mm-dd“. issues.dependency.title=Závislosti -issues.dependency.issue_no_dependencies=Tento úkol momentálně nemá žádné závislosti. -issues.dependency.pr_no_dependencies=Tento požadavek na natažení momentálně nemá žádné závislosti. issues.dependency.add=Přidat závislost… issues.dependency.cancel=Zrušit issues.dependency.remove=Odstranit diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini index 781d5516015ed..f64a3b83e140c 100644 --- a/options/locale/locale_de-DE.ini +++ b/options/locale/locale_de-DE.ini @@ -1397,8 +1397,6 @@ issues.due_date_remove=hat %[2]s das Fälligkeitsdatum %[1]s entfernt issues.due_date_overdue=Überfällig issues.due_date_invalid=Das Fälligkeitsdatum ist ungültig oder außerhalb des zulässigen Bereichs. Bitte verwende das Format „jjjj-mm-tt“. issues.dependency.title=Abhängigkeiten -issues.dependency.issue_no_dependencies=Dieses Issue hat momentan keine Abhängigkeiten. -issues.dependency.pr_no_dependencies=Dieser Pull-Request hat momentan keine Abhängigkeiten. issues.dependency.add=Abhängigkeit hinzufügen… issues.dependency.cancel=Abbrechen issues.dependency.remove=Entfernen diff --git a/options/locale/locale_el-GR.ini b/options/locale/locale_el-GR.ini index 21b48d8d08d45..9fa73e374b0f3 100644 --- a/options/locale/locale_el-GR.ini +++ b/options/locale/locale_el-GR.ini @@ -1397,8 +1397,6 @@ issues.due_date_remove=αφαίρεσε την ημερομηνία παράδο issues.due_date_overdue=Εκπρόθεσμο issues.due_date_invalid=Η ημερομηνία παράδοσης δεν είναι έγκυρη ή εκτός εύρους. Παρακαλούμε χρησιμοποιήστε τη μορφή 'εεεε-μμ-ηη'. issues.dependency.title=Εξαρτήσεις -issues.dependency.issue_no_dependencies=Αυτό το ζήτημα προς το παρόν δεν έχει καμία εξάρτηση. -issues.dependency.pr_no_dependencies=Αυτό το pull request προς το παρόν δεν έχει εξαρτήσεις. issues.dependency.add=Προσθήκη εξάρτησης… issues.dependency.cancel=Ακύρωση issues.dependency.remove=Διαγραφή diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini index 7d268275e5686..7ceac65e630a8 100644 --- a/options/locale/locale_es-ES.ini +++ b/options/locale/locale_es-ES.ini @@ -1394,8 +1394,6 @@ issues.due_date_remove=eliminó la fecha de vencimiento %s %s issues.due_date_overdue=Vencido issues.due_date_invalid=La fecha de vencimiento es inválida o está fuera de rango. Por favor utilice el formato 'aaaa-mm-dd'. issues.dependency.title=Dependencias -issues.dependency.issue_no_dependencies=Esta incidencia actualmente no tiene ninguna dependencia. -issues.dependency.pr_no_dependencies=Este pull request actualmente no tiene ninguna dependencia. issues.dependency.add=Añadir dependencia… issues.dependency.cancel=Cancelar issues.dependency.remove=Eliminar diff --git a/options/locale/locale_fa-IR.ini b/options/locale/locale_fa-IR.ini index 060eddfb2b638..2237efc0b8b62 100644 --- a/options/locale/locale_fa-IR.ini +++ b/options/locale/locale_fa-IR.ini @@ -1320,8 +1320,6 @@ issues.due_date_remove=موعد مقرر %s %s حذف شد issues.due_date_overdue=تاریخ گذشته issues.due_date_invalid=موعد مقرر نامعتبر است یا خارج از محدوده. لطفاً از قالب 'yyy-mm-dd' استفاده کنید. issues.dependency.title=وابستگی ها -issues.dependency.issue_no_dependencies=این مسئله در حال حاضر هیچ وابستگی ندارد. -issues.dependency.pr_no_dependencies=این تقاضای واکشی در حال حاضر هیچ وابستگی ندارد. issues.dependency.add=اضافه کردن وابستگی… issues.dependency.cancel=انصراف issues.dependency.remove=حذف/ساقط کردن diff --git a/options/locale/locale_fi-FI.ini b/options/locale/locale_fi-FI.ini index df78f526b7fbe..3d57ddcb2ee14 100644 --- a/options/locale/locale_fi-FI.ini +++ b/options/locale/locale_fi-FI.ini @@ -731,7 +731,6 @@ issues.due_date_form_edit=Muokkaa issues.due_date_form_remove=Poista issues.due_date_not_set=Määräpäivää ei asetettu. issues.dependency.title=Riippuvuudet -issues.dependency.pr_no_dependencies=Tällä vetopyynnöllä ei tällä hetkellä ole riippuvuuksia. issues.dependency.add=Lisää riippuvuus… issues.dependency.cancel=Peru issues.dependency.remove=Poista diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini index ce6ba75212e5f..487ae0e81f9f1 100644 --- a/options/locale/locale_fr-FR.ini +++ b/options/locale/locale_fr-FR.ini @@ -1253,8 +1253,6 @@ issues.due_date_remove=a supprimé l'échéance %s %s issues.due_date_overdue=En retard issues.due_date_invalid=La date d’échéance est invalide ou hors plage. Veuillez utiliser le format 'aaaa-mm-dd'. issues.dependency.title=Dépendances -issues.dependency.issue_no_dependencies=Ce ticket n'a actuellement pas de dépendance. -issues.dependency.pr_no_dependencies=La demande de fusion n'a actuellement pas de dépendance. issues.dependency.add=Ajouter une dépendance… issues.dependency.cancel=Annuler issues.dependency.remove=Supprimer diff --git a/options/locale/locale_hu-HU.ini b/options/locale/locale_hu-HU.ini index 2a593c56a094b..779d0be8cdc73 100644 --- a/options/locale/locale_hu-HU.ini +++ b/options/locale/locale_hu-HU.ini @@ -930,7 +930,6 @@ issues.due_date_modified=határidő módosítva %s-ről %s %s-re issues.due_date_remove=%s %s-es határidő eltávolítva issues.due_date_overdue=Lejárt issues.dependency.title=Függőségek -issues.dependency.issue_no_dependencies=Ennek a hibajegynek jelenleg nincsenek függőségei. issues.dependency.add=Függőség hozzáadása… issues.dependency.cancel=Mégse issues.dependency.remove=Eltávolítás diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini index 948b83cf2a021..91c4f4fa5b820 100644 --- a/options/locale/locale_it-IT.ini +++ b/options/locale/locale_it-IT.ini @@ -1135,8 +1135,6 @@ issues.due_date_remove=rimossa la data di scadenza %s %s issues.due_date_overdue=Scaduto issues.due_date_invalid=La data di scadenza non è valida o fuori intervallo. Si prega di utilizzare il formato 'aaaa-mm-dd'. issues.dependency.title=Dipendenze -issues.dependency.issue_no_dependencies=Questo problema attualmente non ha alcuna dipendenza. -issues.dependency.pr_no_dependencies=Questo problema attualmente non ha alcuna dipendenza. issues.dependency.add=Aggiungi dipendenza… issues.dependency.cancel=Annulla issues.dependency.remove=Rimuovi diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini index a15e4aef36507..e8a018ed2438f 100644 --- a/options/locale/locale_ja-JP.ini +++ b/options/locale/locale_ja-JP.ini @@ -1418,8 +1418,6 @@ issues.due_date_remove=が期日 %s を削除 %s issues.due_date_overdue=期日は過ぎています issues.due_date_invalid=期日が正しくないか範囲を超えています。 'yyyy-mm-dd' の形式で入力してください。 issues.dependency.title=依存関係 -issues.dependency.issue_no_dependencies=このイシューに依存関係はありません。 -issues.dependency.pr_no_dependencies=このプルリクエストに依存関係はありません。 issues.dependency.add=依存関係を追加... issues.dependency.cancel=キャンセル issues.dependency.remove=削除 diff --git a/options/locale/locale_ko-KR.ini b/options/locale/locale_ko-KR.ini index b6c1334cca435..fac82ddf8d416 100644 --- a/options/locale/locale_ko-KR.ini +++ b/options/locale/locale_ko-KR.ini @@ -816,8 +816,6 @@ issues.due_date_remove=%s %s 마감일이 삭제되었습니다. issues.due_date_overdue=기한 초과 issues.due_date_invalid=기한이 올바르지 않거나 범위를 벗어났습니다. 'yyyy-mm-dd'형식을 사용해주십시오. issues.dependency.title=의존성 -issues.dependency.issue_no_dependencies=이 이슈는 어떠한 의존성도 가지지 않습니다. -issues.dependency.pr_no_dependencies=이 풀 리퀘스트는 어떠한 의존성도 가지지 않습니다. issues.dependency.add=의존성 추가... issues.dependency.cancel=취소 issues.dependency.remove=제거 diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini index 85d44879440d9..94a8b99131dc3 100644 --- a/options/locale/locale_lv-LV.ini +++ b/options/locale/locale_lv-LV.ini @@ -1382,8 +1382,6 @@ issues.due_date_remove=noņēma izpildes termiņu %s %s issues.due_date_overdue=Nokavēts issues.due_date_invalid=Datums līdz nav korekts. Izmantojiet formātu 'gggg-mm-dd'. issues.dependency.title=Atkarības -issues.dependency.issue_no_dependencies=Šai problēmai pagaidām nav nevienas atkarības. -issues.dependency.pr_no_dependencies=Šim izmaiņu pieprasījumam pagaidām nav nevienas atkarības. issues.dependency.add=Pievienot atkarību… issues.dependency.cancel=Atcelt issues.dependency.remove=Noņemt diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini index 88ded39de251f..9023af3038c28 100644 --- a/options/locale/locale_nl-NL.ini +++ b/options/locale/locale_nl-NL.ini @@ -1152,8 +1152,6 @@ issues.due_date_remove=heeft %[2]s de deadline %[1]s verwijderd issues.due_date_overdue=Over tijd issues.due_date_invalid=De deadline is ongeldig of buiten bereik. Gebruik het formaat 'jjjj-mm-dd'. issues.dependency.title=Afhankelijkheden -issues.dependency.issue_no_dependencies=Deze kwestie heeft momenteel geen afhankelijkheden. -issues.dependency.pr_no_dependencies=Deze pull-aanvraag heeft momenteel geen afhankelijkheden. issues.dependency.add=Voeg afhankelijkheid toe… issues.dependency.cancel=Annuleer issues.dependency.remove=Verwijder diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini index f50a25582b8d3..34dab43f936fc 100644 --- a/options/locale/locale_pl-PL.ini +++ b/options/locale/locale_pl-PL.ini @@ -1312,8 +1312,6 @@ issues.due_date_remove=usuwa termin realizacji %s %s issues.due_date_overdue=Zaległe issues.due_date_invalid=Data realizacji jest niewłaściwa lub spoza zakresu. Użyj formatu 'yyyy-mm-dd'. issues.dependency.title=Zależności -issues.dependency.issue_no_dependencies=To zgłoszenie nie ma w tej chwili żadnych zależności. -issues.dependency.pr_no_dependencies=Ten Pull Request nie zawiera w tej chwili żadnych zależności. issues.dependency.add=Dodaj zależność… issues.dependency.cancel=Anuluj issues.dependency.remove=Usuń diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini index 2ec5b3de41382..ccb077e32f810 100644 --- a/options/locale/locale_pt-BR.ini +++ b/options/locale/locale_pt-BR.ini @@ -1228,8 +1228,6 @@ issues.due_date_remove=removeu a data limite %s %s issues.due_date_overdue=Em atraso issues.due_date_invalid=A data limite é inválida ou está fora do intervalo. Por favor, use o formato 'dd/mm/aaaa'. issues.dependency.title=Dependências -issues.dependency.issue_no_dependencies=Esta issue atualmente não tem dependências. -issues.dependency.pr_no_dependencies=Atualmente este pull request não tem dependências. issues.dependency.add=Adicione… issues.dependency.cancel=Cancelar issues.dependency.remove=Remover diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini index aa2c81406a862..2e276254d5589 100644 --- a/options/locale/locale_pt-PT.ini +++ b/options/locale/locale_pt-PT.ini @@ -1417,8 +1417,8 @@ issues.due_date_remove=removeu a data de vencimento %s %s issues.due_date_overdue=Em atraso issues.due_date_invalid=A data de vencimento é inválida ou está fora do intervalo permitido. Por favor, use o formato 'aaaa-mm-dd'. issues.dependency.title=Dependências -issues.dependency.issue_no_dependencies=Esta questão não tem quaisquer dependências, neste momento. -issues.dependency.pr_no_dependencies=Este pedido de integração não tem quaisquer dependências, neste momento. +issues.dependency.issue_no_dependencies=Não estão definidas dependências. +issues.dependency.pr_no_dependencies=Não estão definidas dependências. issues.dependency.add=Adicionar dependência… issues.dependency.cancel=Cancelar issues.dependency.remove=Remover diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini index 87b4f542c7e43..3bee47c690005 100644 --- a/options/locale/locale_ru-RU.ini +++ b/options/locale/locale_ru-RU.ini @@ -1343,8 +1343,6 @@ issues.due_date_remove=удалён срок выполнения %s %s issues.due_date_overdue=Просроченные issues.due_date_invalid=Срок действия недействителен или находится за пределами допустимого диапазона. Пожалуйста, используйте формат 'гггг-мм-дд'. issues.dependency.title=Зависимости -issues.dependency.issue_no_dependencies=В настоящее время эта задача не имеет зависимостей. -issues.dependency.pr_no_dependencies=Этот запрос на слияние в настоящее время не имеет никаких зависимостей. issues.dependency.add=Добавить зависимость… issues.dependency.cancel=Отменить issues.dependency.remove=Удалить diff --git a/options/locale/locale_si-LK.ini b/options/locale/locale_si-LK.ini index 8734fe79b1b5d..29f13ba209da8 100644 --- a/options/locale/locale_si-LK.ini +++ b/options/locale/locale_si-LK.ini @@ -1264,8 +1264,6 @@ issues.due_date_remove=නියමිත දිනය ඉවත් කරන issues.due_date_overdue=කල් ඉකුත්වීම issues.due_date_invalid=නියමිත දිනය අවලංගු හෝ පරාසයෙන් බැහැර වේ. කරුණාකර 'yyyy-mm-dd' ආකෘතිය භාවිතා කරන්න. issues.dependency.title=පරායත්ත -issues.dependency.issue_no_dependencies=මෙම ගැටළුව දැනට කිසිදු යැපීමක් නොමැත. -issues.dependency.pr_no_dependencies=මෙම අදින්න ඉල්ලීම දැනට කිසිදු යැපීමක් නොමැත. issues.dependency.add=පරායත්ත එක් කරන්න… issues.dependency.cancel=අවලංගු කරන්න issues.dependency.remove=ඉවත් කරන්න diff --git a/options/locale/locale_sv-SE.ini b/options/locale/locale_sv-SE.ini index 868cc9591f586..a7efb8e99a7e5 100644 --- a/options/locale/locale_sv-SE.ini +++ b/options/locale/locale_sv-SE.ini @@ -1079,8 +1079,6 @@ issues.due_date_remove=tog bort förfallodatumet %s %s issues.due_date_overdue=Försenad issues.due_date_invalid=Förfallodatumet är ogiltigt eller utanför gränserna. Använd formatet 'åååå-mm-dd'. issues.dependency.title=Beroenden -issues.dependency.issue_no_dependencies=Det här ärendet har för närvarande inga beroenden. -issues.dependency.pr_no_dependencies=Denna pull-förfrågan har för närvarande inga beroenden. issues.dependency.add=Lägg till beroende… issues.dependency.cancel=Avbryt issues.dependency.remove=Ta bort diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini index e32ad0357a5e0..298af27564de0 100644 --- a/options/locale/locale_tr-TR.ini +++ b/options/locale/locale_tr-TR.ini @@ -1286,8 +1286,6 @@ issues.due_date_remove=%[2]s %[1]s bitiş tarihini kaldırdı issues.due_date_overdue=Süresi Geçmiş issues.due_date_invalid=Bitiş tarihi geçersiz veya aralık dışında. Lütfen 'yyyy-aa-gg' biçimini kullanın. issues.dependency.title=Bağımlılıklar -issues.dependency.issue_no_dependencies=Bu konu henüz bir bağımlılık içermiyor. -issues.dependency.pr_no_dependencies=Bu değişiklik isteği henüz bir bağımlılık içermiyor. issues.dependency.add=Bağımlılık ekle… issues.dependency.cancel=İptal issues.dependency.remove=Kaldır diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini index d0a93e8508348..ac8890e661861 100644 --- a/options/locale/locale_uk-UA.ini +++ b/options/locale/locale_uk-UA.ini @@ -1328,8 +1328,6 @@ issues.due_date_remove=видалив(ла) дату завершення %s %s issues.due_date_overdue=Прострочено issues.due_date_invalid=Термін дії не дійсний або знаходиться за межами допустимого діапазону. Будь ласка використовуйте формат 'yyyy-mm-dd'. issues.dependency.title=Залежності -issues.dependency.issue_no_dependencies=Ця задача тепер не має залежностей. -issues.dependency.pr_no_dependencies=Цей запит на злиття в даний час не має залежностей. issues.dependency.add=Додати залежність… issues.dependency.cancel=Відмінити issues.dependency.remove=Видалити diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index b92151447dd83..6034730f99eb2 100644 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -1413,8 +1413,6 @@ issues.due_date_remove=到期时间 %s %s 已删除 issues.due_date_overdue=过期 issues.due_date_invalid=到期日期无效或超出范围。请使用 'yyyy-mm-dd' 格式。 issues.dependency.title=依赖工单 -issues.dependency.issue_no_dependencies=此工单当前没有任何依赖。 -issues.dependency.pr_no_dependencies=此合并请求当前没有任何依赖。 issues.dependency.add=添加依赖工单... issues.dependency.cancel=取消 issues.dependency.remove=删除 diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini index d10dd0f980cea..c949c7f3618ce 100644 --- a/options/locale/locale_zh-TW.ini +++ b/options/locale/locale_zh-TW.ini @@ -1418,8 +1418,6 @@ issues.due_date_remove=移除了截止日期 %s %s issues.due_date_overdue=逾期 issues.due_date_invalid=截止日期無效或超出範圍，請使用「yyyy-mm-dd」的格式。 issues.dependency.title=先決條件 -issues.dependency.issue_no_dependencies=此問題目前沒有任何先決條件。 -issues.dependency.pr_no_dependencies=此合併求目前沒有任何先決條件。 issues.dependency.add=加入先決條件... issues.dependency.cancel=取消 issues.dependency.remove=移除