From: "John Passaro via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Patrick Steinhardt <ps@pks.im>,
John Passaro <john.a.passaro@gmail.com>,
John Passaro <john.a.passaro@gmail.com>,
John Passaro <john.a.passaro@gmail.com>
Subject: [PATCH v3 3/3] po: update git-tag translations
Date: Mon, 29 Apr 2024 18:54:23 +0000 [thread overview]
Message-ID: <d5335e30b0bf8f126f5bd3ac71d8a0afb3fa86f6.1714416865.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1723.v3.git.1714416863.gitgitgadget@gmail.com>
From: John Passaro <john.a.passaro@gmail.com>
Update translation files to translate the updated git-tag help headline
with its new --trailer option.
Also perform some related cleanup. Most notably, update git-tag headline
in files where it references a stale version: i.e. where we are still
attempting to translate the former one-line description of git-tag that
described the argument as "[<head>]", instead of current "[<commit> |
<object>]".
In both cases, reuse translations found elsewhere in the file.
Signed-off-by: John Passaro <john.a.passaro@gmail.com>
---
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 <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"
+" [(--trailer <token>[(=|:)<value>])...]\n"
" <tagname> [<commit> | <object>]"
msgstr ""
"git tag [-a|-s|-u ИДЕНТИФИКАТОР_НА_КЛЮЧ] [-f] [-m СЪОБЩЕНИЕ|-F ФАЙЛ] [-e]\n"
+" [(--trailer ЛЕКСЕМА[(=|:)СТОЙНОСТ])…]\n"
" ЕТИКЕТ [ПОДАВАНЕ|ОБЕКТ]"
msgid "git tag -d <tagname>..."
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 <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"
+" [(--trailer <token>[(=|:)<value>])...]\n"
" <tagname> [<commit> | <object>]"
msgstr ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <fitxer>] [-e]\n"
-" <tagname> [<comissió> | <objecte>]"
+" [(--trailer <token>[(=|:)<value>])...]\n"
+" <nom-d'etiqueta> [<comissió> | <objecte>]"
msgid "git tag -d <tagname>..."
msgstr "git tag -d <nom-d'etiqueta>..."
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 <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"
+" [(--trailer <token>[(=|:)<value>])...]\n"
" <tagname> [<commit> | <object>]"
msgstr ""
"git tag [-a | -s | -u <Key-ID>] [-f] [-m <Beschreibung> | -F <Datei>] [-e]\n"
+" [(--trailer <Token>[(=|:)<Wert>])...]\n"
" <Tagname> [<Commit> | <Objekt>]"
msgid "git tag -d <tagname>..."
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 <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
-"[<head>]"
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
+" [(--trailer <token>[(=|:)<value>])...]\n"
+" <tagname> [<commit> | <object>]"
msgstr ""
"git tag [-a | -s | -u <αναγνωριστικό κλειδί>] [-f] [-m <μήνυμα> | -F "
-"<αρχείο>] <όνομα ετικέτας> [<head>]"
+"<αρχείο>]\n"
+" [(--trailer <token>[(=|:)<value>])...]\n"
+" <όνομα ετικέτας> [<υποβολή> | <αντικείμενο>]"
#: builtin/tag.c:26
msgid "git tag -d <tagname>..."
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 <key-id>] [-f] [-m <msg> | -F <file>]\n"
-" <tagname> [<head>]"
+" [(--trailer <token>[(=|:)<value>])...]\n"
+" <tagname> [<commit> | <object>]"
msgstr ""
-"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
-" <tagname> [<head>]"
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <archivo>]\n"
+" [(--trailer <token>[(=|:)<valor>])...]\n"
+" <nombre-de-tag> [<commit> | <objeto>]"
msgid "git tag -d <tagname>..."
msgstr "git tag -d <nombre-de-tag>..."
@@ -12697,8 +12699,8 @@ msgid ""
"[<pattern>...]"
msgstr ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
-"points-at <object>]\n"
-" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+"points-at <objeto>]\n"
+" [--format=<formato>] [--merged <commit>] [--no-merged <commit>] "
"[<pattern>...]"
msgid "git tag -v [--format=<format>] <tagname>..."
@@ -18461,7 +18463,7 @@ msgstr "%%(body) no toma ningún argumento"
#, c-format
msgid "expected %%(trailers:key=<value>)"
-msgstr "se esperaba %%(trailers:key=<value>)"
+msgstr "se esperaba %%(trailers:key=<valor>)"
#, 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 <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"
+" [(--trailer <token>[(=|:)<value>])...]\n"
" <tagname> [<commit> | <object>]"
msgstr ""
"git tag [-a | -s | -u <id-clé>] [-f] [-m <msg> | -F <fichier>] [-e]\n"
+" [(--trailer <symbole>[(=|:)<valeur>])...]\n"
" <nom-d-étiquette> [<commit> | <objet>]"
msgid "git tag -d <tagname>..."
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 <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"
+" [(--trailer <token>[(=|:)<value>])...]\n"
" <tagname> [<commit> | <object>]"
msgstr ""
"git tag [-a | -s | -u <id kunci>] [-f] [-m <pesan> | -F <berkas>] [-e]\n"
+" [(--trailer <token>[(=|:)<nilai>])...]\n"
" <nama tag> [<komit> | <objek>]"
#: 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 <key-id>] [-f] [-m <msg> | -F <file>]\n"
-"\t\t<tagname> [<head>]"
+" [(--trailer <token>[(=|:)<value>])...]\n"
+" <tagname> [<commit> | <object>]"
msgstr ""
"git tag [-a | -s | -u <ID chiave>] [-f] [-m <messaggio> | -F <file>]\n"
-"\t\t<nome tag> [<head>]"
+" [(--trailer <token>[(=|:)<valore>])...]\n"
+" <nome tag> [<commit> | <oggetto>]"
#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
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 <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
-"[<head>]"
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
+" [(--trailer <token>[(=|:)<value>])...]\n"
+" <tagname> [<commit> | <object>]"
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 <tagname>..."
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 <key-id>] [-f] [-m <msg> | -F <file>]\n"
-" <tagname> [<head>]"
+" [(--trailer <token>[(=|:)<value>])...]\n"
+" <tagname> [<commit> | <object>]"
msgstr ""
"git tag [-a | -s | -u <id-klucza>] [-f] [-m <komunikat> | -F <plik>]\n"
-" <tag> [<czoło>]"
+" [(--trailer <klucz>[(=|:)<wartość>])...]\n"
+" <nazwa-tagu> [<zapis> | <obiekt>]"
#: builtin/tag.c:27
msgid "git tag -d <tagname>..."
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 <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"
+" [(--trailer <token>[(=|:)<value>])...]\n"
" <tagname> [<commit> | <object>]"
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 <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"
+" [(--trailer <token>[(=|:)<value>])...]\n"
" <tagname> [<commit> | <object>]"
msgstr ""
"git tag [-a | -s | -u <nyckel-id>] [-f] [-m <medd> | -F <fil>] [-e]\n"
+" [(--trailer <symbol>[(=|:)<värde>])...]\n"
" <taggnamn> [<incheckning> | <objekt>]"
msgid "git tag -d <tagname>..."
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 <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"
+" [(--trailer <token>[(=|:)<value>])...]\n"
" <tagname> [<commit> | <object>]"
msgstr ""
"git tag [-a | -s | -u <anahtar-kimliği>] [-f] [-m <ileti> | -F <dosya>] [-"
"e]\n"
+" [(--trailer <jeton>[(=|:)<değer>])...]\n"
" <etiket-adı> [<işleme> | <nesne>]"
msgid "git tag -d <tagname>..."
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 <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"
+" [(--trailer <token>[(=|:)<value>])...]\n"
" <tagname> [<commit> | <object>]"
msgstr ""
"git tag [-a | -s | -u <ідентифікатор-ключа>] [-f] [-m <допис> | -F <файл>] [-"
"e]\n"
+" [(--trailer <токен>[(=|:)<значення>])...]\n"
" <назва-тегу> [<коміт> | <об’єкт>]"
msgid "git tag -d <tagname>..."
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 <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"
+" [(--trailer <token>[(=|:)<value>])...]\n"
" <tagname> [<commit> | <object>]"
msgstr ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <tập-tin>] [-e]\n"
+" [(--trailer <thẻ>[(=|:)<giá-trị>])...]\n"
" <tên-thẻ> [<lần chuyển giao> | <đối tượng> ]"
msgid "git tag -d <tagname>..."
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 <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"
+" [(--trailer <token>[(=|:)<value>])...]\n"
" <tagname> [<commit> | <object>]"
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 <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"
+" [(--trailer <token>[(=|:)<value>])...]\n"
" <tagname> [<commit> | <object>]"
msgstr ""
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"
+" [(--trailer <token>[(=|:)<value>])...]\n"
" <tagname> [<commit> | <object>]"
#: builtin/tag.c
--
gitgitgadget
next prev parent reply other threads:[~2024-04-29 18:55 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-29 4:31 [PATCH] builtin/tag.c: add --trailer arg John Passaro via GitGitGadget
2024-04-29 6:50 ` Patrick Steinhardt
2024-04-29 14:50 ` John Passaro
2024-04-29 15:05 ` John Passaro
2024-04-29 17:07 ` Junio C Hamano
2024-04-29 15:29 ` Junio C Hamano
2024-04-29 16:38 ` John Passaro
2024-04-29 17:04 ` Junio C Hamano
2024-04-29 16:53 ` [PATCH v2] " John Passaro via GitGitGadget
2024-04-29 18:54 ` [PATCH v3 0/3] builtin/tag.c: add --trailer option John Passaro via GitGitGadget
2024-04-29 18:54 ` [PATCH v3 1/3] builtin/commit.c: refactor --trailer logic John Passaro via GitGitGadget
2024-04-30 5:54 ` Patrick Steinhardt
2024-04-30 16:38 ` Junio C Hamano
2024-04-29 18:54 ` [PATCH v3 2/3] builtin/tag.c: add --trailer arg John Passaro via GitGitGadget
2024-04-30 5:54 ` Patrick Steinhardt
2024-04-30 16:53 ` Junio C Hamano
2024-04-30 21:48 ` John Passaro
2024-04-30 22:23 ` Junio C Hamano
2024-05-05 18:59 ` John Passaro
2024-04-29 18:54 ` John Passaro via GitGitGadget [this message]
2024-04-29 19:22 ` [PATCH v3 3/3] po: update git-tag translations Junio C Hamano
2024-04-29 19:28 ` John Passaro
2024-04-30 14:41 ` [PATCH v4 0/3] builtin/tag.c: add --trailer option John Passaro via GitGitGadget
2024-04-30 14:41 ` [PATCH v4 1/3] builtin/commit.c: remove bespoke option callback John Passaro via GitGitGadget
2024-05-02 6:27 ` Patrick Steinhardt
2024-04-30 14:41 ` [PATCH v4 2/3] builtin/commit.c: refactor --trailer logic John Passaro via GitGitGadget
2024-05-02 6:27 ` Patrick Steinhardt
2024-04-30 14:41 ` [PATCH v4 3/3] builtin/tag.c: add --trailer option John Passaro via GitGitGadget
2024-05-02 6:27 ` [PATCH v4 0/3] " Patrick Steinhardt
2024-05-05 18:49 ` [PATCH v5 " John Passaro via GitGitGadget
2024-05-05 18:49 ` [PATCH v5 1/3] builtin/commit: use ARGV macro to collect trailers John Passaro via GitGitGadget
2024-05-07 15:38 ` John Passaro
2024-05-07 17:06 ` Junio C Hamano
2024-05-05 18:49 ` [PATCH v5 2/3] builtin/commit: refactor --trailer logic John Passaro via GitGitGadget
2024-05-05 18:49 ` [PATCH v5 3/3] builtin/tag: add --trailer option John Passaro via GitGitGadget
2024-05-06 5:40 ` [PATCH v5 0/3] builtin/tag.c: " Patrick Steinhardt
2024-05-06 17:52 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d5335e30b0bf8f126f5bd3ac71d8a0afb3fa86f6.1714416865.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=john.a.passaro@gmail.com \
--cc=ps@pks.im \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).