From: Junio C Hamano Date: Mon, 29 Apr 2024 19:22:46 GMT Subject: Re: [PATCH v3 3/3] po: update git-tag translations Message-ID: In-Reply-To: "John Passaro via GitGitGadget" writes: > In both cases, reuse translations found elsewhere in the file. When each l10n team sees an updated code and translations together, will they have a chance to easily (1) notice that there are translations for their language that came from outside the normal process (namely, this patch), and (2) double-check such a translated text that came from sidelines are reasonable? I am wondering if we should be doing some trick that involve use of comments like "# fuzzy" in the file here. While I applaud your good intention to help reduce the workload for translators, unless you belong to all of the l10n teams for these languages (note: I did not say "unless you are fluent in these languages" here---I am playing safe by assuming that l10n teams would want to have a chance to verify even a translation that comes from a native that comes outside the usual workflow of the l10n groups), I would really want to avoid a change like this go unnoticed by l10n teams (iow, as long as we are sure they will notice and have chance to verify, I am fine with a change like this). Thanks. > Signed-off-by: John Passaro > --- > po/bg.po | 2 ++ > po/ca.po | 4 +++- > po/de.po | 2 ++ > po/el.po | 9 ++++++--- > po/es.po | 14 ++++++++------ > po/fr.po | 2 ++ > po/id.po | 2 ++ > po/it.po | 6 ++++-- > po/ko.po | 10 ++++++---- > po/pl.po | 6 ++++-- > po/ru.po | 1 + > po/sv.po | 2 ++ > po/tr.po | 2 ++ > po/uk.po | 2 ++ > po/vi.po | 2 ++ > po/zh_CN.po | 2 ++ > po/zh_TW.po | 2 ++ > 17 files changed, 52 insertions(+), 18 deletions(-) > > diff --git a/po/bg.po b/po/bg.po > index a7cbc617a53..d2fe6c87186 100644 > --- a/po/bg.po > +++ b/po/bg.po > @@ -13555,9 +13555,11 @@ msgstr "причина за обновяването" > > msgid "" > "git tag [-a | -s | -u ] [-f] [-m | -F ] [-e]\n" > +" [(--trailer [(=|:)])...]\n" > " [ | ]" > msgstr "" > "git tag [-a|-s|-u ИДЕНТИФИКАТОР_НА_КЛЮЧ] [-f] [-m СЪОБЩЕНИЕ|-F ФАЙЛ] [-e]\n" > +" [(--trailer ЛЕКСЕМА[(=|:)СТОЙНОСТ])…]\n" > " ЕТИКЕТ [ПОДАВАНЕ|ОБЕКТ]" > > msgid "git tag -d ..." > diff --git a/po/ca.po b/po/ca.po > index bcb4da80fb9..8c8f52985b7 100644 > --- a/po/ca.po > +++ b/po/ca.po > @@ -13114,10 +13114,12 @@ msgstr "raó de l'actualització" > > msgid "" > "git tag [-a | -s | -u ] [-f] [-m | -F ] [-e]\n" > +" [(--trailer [(=|:)])...]\n" > " [ | ]" > msgstr "" > "git tag [-a | -s | -u ] [-f] [-m | -F ] [-e]\n" > -" [ | ]" > +" [(--trailer [(=|:)])...]\n" > +" [ | ]" > > msgid "git tag -d ..." > msgstr "git tag -d ..." > diff --git a/po/de.po b/po/de.po > index 29465665976..5380f294920 100644 > --- a/po/de.po > +++ b/po/de.po > @@ -13297,9 +13297,11 @@ msgstr "Grund für die Aktualisierung" > > msgid "" > "git tag [-a | -s | -u ] [-f] [-m | -F ] [-e]\n" > +" [(--trailer [(=|:)])...]\n" > " [ | ]" > msgstr "" > "git tag [-a | -s | -u ] [-f] [-m | -F ] [-e]\n" > +" [(--trailer [(=|:)])...]\n" > " [ | ]" > > msgid "git tag -d ..." > diff --git a/po/el.po b/po/el.po > index 703f46d0c7c..210304b75da 100644 > --- a/po/el.po > +++ b/po/el.po > @@ -18093,11 +18093,14 @@ msgstr "" > > #: builtin/tag.c:25 > msgid "" > -"git tag [-a | -s | -u ] [-f] [-m | -F ] " > -"[]" > +"git tag [-a | -s | -u ] [-f] [-m | -F ]\n" > +" [(--trailer [(=|:)])...]\n" > +" [ | ]" > msgstr "" > "git tag [-a | -s | -u <αναγνωριστικό κλειδί>] [-f] [-m <μήνυμα> | -F " > -"<αρχείο>] <όνομα ετικέτας> []" > +"<αρχείο>]\n" > +" [(--trailer [(=|:)])...]\n" > +" <όνομα ετικέτας> [<υποβολή> | <αντικείμενο>]" > > #: builtin/tag.c:26 > msgid "git tag -d ..." > diff --git a/po/es.po b/po/es.po > index 1ff5ff3911d..b7b15ad6e4b 100644 > --- a/po/es.po > +++ b/po/es.po > @@ -12682,10 +12682,12 @@ msgstr "razón de la actualización" > > msgid "" > "git tag [-a | -s | -u ] [-f] [-m | -F ]\n" > -" []" > +" [(--trailer [(=|:)])...]\n" > +" [ | ]" > msgstr "" > -"git tag [-a | -s | -u ] [-f] [-m | -F ]\n" > -" []" > +"git tag [-a | -s | -u ] [-f] [-m | -F ]\n" > +" [(--trailer [(=|:)])...]\n" > +" [ | ]" > > msgid "git tag -d ..." > msgstr "git tag -d ..." > @@ -12697,8 +12699,8 @@ msgid "" > "[...]" > msgstr "" > "git tag -l [-n[]] [--contains ] [--no-contains ] [--" > -"points-at ]\n" > -" [--format=] [--merged ] [--no-merged ] " > +"points-at ]\n" > +" [--format=] [--merged ] [--no-merged ] " > "[...]" > > msgid "git tag -v [--format=] ..." > @@ -18461,7 +18463,7 @@ msgstr "%%(body) no toma ningún argumento" > > #, c-format > msgid "expected %%(trailers:key=)" > -msgstr "se esperaba %%(trailers:key=)" > +msgstr "se esperaba %%(trailers:key=)" > > #, c-format > msgid "unknown %%(trailers) argument: %s" > diff --git a/po/fr.po b/po/fr.po > index 837a695485a..2f7a345c74a 100644 > --- a/po/fr.po > +++ b/po/fr.po > @@ -13266,9 +13266,11 @@ msgstr "raison de la mise à jour" > > msgid "" > "git tag [-a | -s | -u ] [-f] [-m | -F ] [-e]\n" > +" [(--trailer [(=|:)])...]\n" > " [ | ]" > msgstr "" > "git tag [-a | -s | -u ] [-f] [-m | -F ] [-e]\n" > +" [(--trailer [(=|:)])...]\n" > " [ | ]" > > msgid "git tag -d ..." > diff --git a/po/id.po b/po/id.po > index 2dc4b79e8a5..85b5631b3c7 100644 > --- a/po/id.po > +++ b/po/id.po > @@ -16230,9 +16230,11 @@ msgstr "alasan pembaruan" > #: builtin/tag.c > msgid "" > "git tag [-a | -s | -u ] [-f] [-m | -F ] [-e]\n" > +" [(--trailer [(=|:)])...]\n" > " [ | ]" > msgstr "" > "git tag [-a | -s | -u ] [-f] [-m | -F ] [-e]\n" > +" [(--trailer [(=|:)])...]\n" > " [ | ]" > > #: builtin/tag.c > diff --git a/po/it.po b/po/it.po > index c31560834d8..c4ceb8b2444 100644 > --- a/po/it.po > +++ b/po/it.po > @@ -22486,10 +22486,12 @@ msgstr "motivo dell'aggiornamento" > #: builtin/tag.c:25 > msgid "" > "git tag [-a | -s | -u ] [-f] [-m | -F ]\n" > -"\t\t []" > +" [(--trailer [(=|:)])...]\n" > +" [ | ]" > msgstr "" > "git tag [-a | -s | -u ] [-f] [-m | -F ]\n" > -"\t\t []" > +" [(--trailer [(=|:)])...]\n" > +" [ | ]" > > #: builtin/tag.c:27 > msgid "git tag -d ..." > diff --git a/po/ko.po b/po/ko.po > index 5d190e52380..7484304eddb 100644 > --- a/po/ko.po > +++ b/po/ko.po > @@ -14397,11 +14397,13 @@ msgstr "업데이트의 이유" > > #: builtin/tag.c:24 > msgid "" > -"git tag [-a | -s | -u ] [-f] [-m | -F ] " > -"[]" > +"git tag [-a | -s | -u ] [-f] [-m | -F ]\n" > +" [(--trailer [(=|:)])...]\n" > +" [ | ]" > msgstr "" > -"git tag [-a | -s | -u <키-ID>] [-f] [-m <메시지> | -F <파일>] <태그이름>\n" > -"\t\t[<헤드>]" > +"git tag [-a | -s | -u <키-ID>] [-f] [-m <메시지> | -F <파일>]\n" > +" [(--trailer <토큰>[(=|:)<값>])...]\n" > +" <태그이름> [<커밋> | <오브젝트>]" > > #: builtin/tag.c:25 > msgid "git tag -d ..." > diff --git a/po/pl.po b/po/pl.po > index 0ec127e14cc..287354b17b4 100644 > --- a/po/pl.po > +++ b/po/pl.po > @@ -23549,10 +23549,12 @@ msgstr "powód aktualizacji" > #: builtin/tag.c:25 > msgid "" > "git tag [-a | -s | -u ] [-f] [-m | -F ]\n" > -" []" > +" [(--trailer [(=|:)])...]\n" > +" [ | ]" > msgstr "" > "git tag [-a | -s | -u ] [-f] [-m | -F ]\n" > -" []" > +" [(--trailer [(=|:)])...]\n" > +" [ | ]" > > #: builtin/tag.c:27 > msgid "git tag -d ..." > diff --git a/po/ru.po b/po/ru.po > index 3e56eb546ea..d357bc30c2c 100644 > --- a/po/ru.po > +++ b/po/ru.po > @@ -12490,6 +12490,7 @@ msgstr "причина обновления" > > msgid "" > "git tag [-a | -s | -u ] [-f] [-m | -F ] [-e]\n" > +" [(--trailer [(=|:)])...]\n" > " [ | ]" > msgstr "" > > diff --git a/po/sv.po b/po/sv.po > index ad1aad94fff..1f878ee28bc 100644 > --- a/po/sv.po > +++ b/po/sv.po > @@ -12835,9 +12835,11 @@ msgstr "skäl till uppdateringen" > > msgid "" > "git tag [-a | -s | -u ] [-f] [-m | -F ] [-e]\n" > +" [(--trailer [(=|:)])...]\n" > " [ | ]" > msgstr "" > "git tag [-a | -s | -u ] [-f] [-m | -F ] [-e]\n" > +" [(--trailer [(=|:)])...]\n" > " [ | ]" > > msgid "git tag -d ..." > diff --git a/po/tr.po b/po/tr.po > index 0e220e1c1cd..8c506c34a9e 100644 > --- a/po/tr.po > +++ b/po/tr.po > @@ -12975,10 +12975,12 @@ msgstr "güncelleme nedeni" > > msgid "" > "git tag [-a | -s | -u ] [-f] [-m | -F ] [-e]\n" > +" [(--trailer [(=|:)])...]\n" > " [ | ]" > msgstr "" > "git tag [-a | -s | -u ] [-f] [-m | -F ] [-" > "e]\n" > +" [(--trailer [(=|:)])...]\n" > " [ | ]" > > msgid "git tag -d ..." > diff --git a/po/uk.po b/po/uk.po > index 528a3dc6f76..e3b6441e3c1 100644 > --- a/po/uk.po > +++ b/po/uk.po > @@ -13086,10 +13086,12 @@ msgstr "причина оновлення" > > msgid "" > "git tag [-a | -s | -u ] [-f] [-m | -F ] [-e]\n" > +" [(--trailer [(=|:)])...]\n" > " [ | ]" > msgstr "" > "git tag [-a | -s | -u <ідентифікатор-ключа>] [-f] [-m <допис> | -F <файл>] [-" > "e]\n" > +" [(--trailer <токен>[(=|:)<значення>])...]\n" > " <назва-тегу> [<коміт> | <об’єкт>]" > > msgid "git tag -d ..." > diff --git a/po/vi.po b/po/vi.po > index 965e79e9658..0b206309f9b 100644 > --- a/po/vi.po > +++ b/po/vi.po > @@ -12915,9 +12915,11 @@ msgstr "lý do cập nhật" > > msgid "" > "git tag [-a | -s | -u ] [-f] [-m | -F ] [-e]\n" > +" [(--trailer [(=|:)])...]\n" > " [ | ]" > msgstr "" > "git tag [-a | -s | -u ] [-f] [-m | -F ] [-e]\n" > +" [(--trailer [(=|:)])...]\n" > " [ | <đối tượng> ]" > > msgid "git tag -d ..." > diff --git a/po/zh_CN.po b/po/zh_CN.po > index 4838c19b0be..aaedddcd864 100644 > --- a/po/zh_CN.po > +++ b/po/zh_CN.po > @@ -16033,9 +16033,11 @@ msgstr "更新的原因" > #: builtin/tag.c > msgid "" > "git tag [-a | -s | -u ] [-f] [-m | -F ] [-e]\n" > +" [(--trailer [(=|:)])...]\n" > " [ | ]" > msgstr "" > "git tag [-a | -s | -u <私钥 ID>] [-f] [-m <消息> | -F <文件>] [-e]\n" > +" [(--trailer <键>[(=|:)<值>])...]\n" > " <标签名> [<提交> | <对象>]" > > #: builtin/tag.c > diff --git a/po/zh_TW.po b/po/zh_TW.po > index f554381a7af..168591c141e 100644 > --- a/po/zh_TW.po > +++ b/po/zh_TW.po > @@ -15911,9 +15911,11 @@ msgstr "更新的原因" > #: builtin/tag.c > msgid "" > "git tag [-a | -s | -u ] [-f] [-m | -F ] [-e]\n" > +" [(--trailer [(=|:)])...]\n" > " [ | ]" > msgstr "" > "git tag [-a | -s | -u ] [-f] [-m | -F ] [-e]\n" > +" [(--trailer [(=|:)])...]\n" > " [ | ]" > > #: builtin/tag.c