From: "Kashav Madan via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Johannes Altmanninger <aclopte@gmail.com>,
Eric Sunshine <sunshine@sunshineco.com>,
kashav madan <kshvmdn@gmail.com>,
Kashav Madan <kshvmdn@gmail.com>
Subject: [PATCH v3 2/4] clean: normalize format string of yes/no prompt
Date: Thu, 16 Dec 2021 18:18:52 +0000 [thread overview]
Message-ID: <0c81a14247f9f832b5dc23de94116d8c67d81325.1639678737.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1166.v3.git.git.1639678734.gitgitgadget@gmail.com>
From: Kashav Madan <kshvmdn@gmail.com>
Move the question mark in the prompt before the choices to be more
consistent with other similar prompts.
Signed-off-by: Kashav Madan <kshvmdn@gmail.com>
---
builtin/clean.c | 2 +-
po/bg.po | 2 +-
po/ca.po | 4 ++--
po/de.po | 4 ++--
po/el.po | 2 +-
po/es.po | 4 ++--
po/fr.po | 4 ++--
po/git.pot | 2 +-
po/id.po | 4 ++--
po/it.po | 4 ++--
po/ko.po | 4 ++--
po/pl.po | 4 ++--
po/pt_PT.po | 4 ++--
po/ru.po | 4 ++--
po/sv.po | 4 ++--
po/tr.po | 4 ++--
po/vi.po | 4 ++--
po/zh_CN.po | 4 ++--
po/zh_TW.po | 4 ++--
19 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/builtin/clean.c b/builtin/clean.c
index 98a2860409b..2b52e522a82 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -752,7 +752,7 @@ static int ask_each_cmd(void)
if (!eof) {
qname = quote_path(item->string, NULL, &buf, 0);
/* TRANSLATORS: Make sure to keep [y/N] as is */
- printf(_("Remove %s [y/N]? "), qname);
+ printf(_("Remove %s? [y/N] "), qname);
if (git_read_line_interactively(&confirm) == EOF) {
putchar('\n');
eof = 1;
diff --git a/po/bg.po b/po/bg.po
index e0786caa274..10ba01d2817 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -13487,7 +13487,7 @@ msgstr "Избиране на обекти за изтриване"
#. TRANSLATORS: Make sure to keep [y/N] as is
#: builtin/clean.c:755
#, c-format
-msgid "Remove %s [y/N]? "
+msgid "Remove %s? [y/N] "
msgstr "Да се изтрие ли „%s“? „y“ — да, „N“ — НЕ"
#: builtin/clean.c:786
diff --git a/po/ca.po b/po/ca.po
index 71673d48d01..d9798fd530e 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -13211,8 +13211,8 @@ msgstr "Selecciona els ítems a suprimir"
#. TRANSLATORS: Make sure to keep [y/N] as is
#: builtin/clean.c:755
#, c-format
-msgid "Remove %s [y/N]? "
-msgstr "Voleu eliminar %s [y/N]? "
+msgid "Remove %s? [y/N] "
+msgstr "Voleu eliminar %s? [y/N] "
#: builtin/clean.c:786
msgid ""
diff --git a/po/de.po b/po/de.po
index 3e8ef2ed122..442627f3448 100644
--- a/po/de.po
+++ b/po/de.po
@@ -13274,8 +13274,8 @@ msgstr "Wählen Sie Einträge zum Löschen"
#. TRANSLATORS: Make sure to keep [y/N] as is
#: builtin/clean.c:755
#, c-format
-msgid "Remove %s [y/N]? "
-msgstr "'%s' löschen [y/N]? "
+msgid "Remove %s? [y/N] "
+msgstr "'%s' löschen? [y/N] "
#: builtin/clean.c:786
msgid ""
diff --git a/po/el.po b/po/el.po
index 27c8c488ea1..b826b73d460 100644
--- a/po/el.po
+++ b/po/el.po
@@ -9560,7 +9560,7 @@ msgstr ""
#. TRANSLATORS: Make sure to keep [y/N] as is
#: builtin/clean.c:760
#, c-format
-msgid "Remove %s [y/N]? "
+msgid "Remove %s? [y/N] "
msgstr ""
#: builtin/clean.c:785 git-add--interactive.perl:1717
diff --git a/po/es.po b/po/es.po
index ef8ae6d471e..8e9143131d0 100644
--- a/po/es.po
+++ b/po/es.po
@@ -13081,8 +13081,8 @@ msgstr "Seleccionar objetos para borrar"
#. TRANSLATORS: Make sure to keep [y/N] as is
#: builtin/clean.c:755
#, c-format
-msgid "Remove %s [y/N]? "
-msgstr "¿Borrar %s [y/N]? "
+msgid "Remove %s? [y/N] "
+msgstr "¿Borrar %s? [y/N] "
#: builtin/clean.c:786
msgid ""
diff --git a/po/fr.po b/po/fr.po
index 9812213b2fe..ebb5b73ce3b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -13282,8 +13282,8 @@ msgstr "Sélectionner les éléments à supprimer"
#. TRANSLATORS: Make sure to keep [y/N] as is
#: builtin/clean.c:755
#, c-format
-msgid "Remove %s [y/N]? "
-msgstr "Supprimer %s [y/N] ? "
+msgid "Remove %s? [y/N] "
+msgstr "Supprimer %s ? [y/N] "
#: builtin/clean.c:786
msgid ""
diff --git a/po/git.pot b/po/git.pot
index c3102deb5d2..4ef2f39b950 100644
--- a/po/git.pot
+++ b/po/git.pot
@@ -12087,7 +12087,7 @@ msgstr ""
#. TRANSLATORS: Make sure to keep [y/N] as is
#: builtin/clean.c:755
#, c-format
-msgid "Remove %s [y/N]? "
+msgid "Remove %s? [y/N] "
msgstr ""
#: builtin/clean.c:786
diff --git a/po/id.po b/po/id.po
index 3b8b0c39e51..b41e290c94a 100644
--- a/po/id.po
+++ b/po/id.po
@@ -12525,8 +12525,8 @@ msgstr "Pilih item untuk dihapus"
#. TRANSLATORS: Make sure to keep [y/N] as is
#: builtin/clean.c:755
#, c-format
-msgid "Remove %s [y/N]? "
-msgstr "Hapus %s [y/N]? "
+msgid "Remove %s? [y/N] "
+msgstr "Hapus %s? [y/N] "
#: builtin/clean.c:786
msgid ""
diff --git a/po/it.po b/po/it.po
index 01c6d1f095e..b4322699060 100644
--- a/po/it.po
+++ b/po/it.po
@@ -12508,8 +12508,8 @@ msgstr "Seleziona gli elementi da eliminare"
#. TRANSLATORS: Make sure to keep [y/N] as is
#: builtin/clean.c:758
#, c-format
-msgid "Remove %s [y/N]? "
-msgstr "Eliminare %s [y/N]? "
+msgid "Remove %s? [y/N] "
+msgstr "Eliminare %s? [y/N] "
#: builtin/clean.c:789
msgid ""
diff --git a/po/ko.po b/po/ko.po
index 96d3a2a3be4..29c7a6896fd 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7179,8 +7179,8 @@ msgstr "삭제할 항목을 선택하십시오"
#. TRANSLATORS: Make sure to keep [y/N] as is
#: builtin/clean.c:763
#, c-format
-msgid "Remove %s [y/N]? "
-msgstr "%s 제거합니까 [y/N]? "
+msgid "Remove %s? [y/N] "
+msgstr "%s 제거합니까? [y/N] "
#: builtin/clean.c:788 git-add--interactive.perl:1717
#, c-format
diff --git a/po/pl.po b/po/pl.po
index 637a328a869..4d79160a15b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -13061,8 +13061,8 @@ msgstr "Wybierz elementy do skasowania"
#. TRANSLATORS: Make sure to keep [y/N] as is
#: builtin/clean.c:755
#, c-format
-msgid "Remove %s [y/N]? "
-msgstr "Usunąć %s [y/N]? "
+msgid "Remove %s? [y/N] "
+msgstr "Usunąć %s? [y/N] "
#: builtin/clean.c:786
msgid ""
diff --git a/po/pt_PT.po b/po/pt_PT.po
index a9a67f15484..06da638e981 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -12623,8 +12623,8 @@ msgstr "Selecione itens para eliminar"
#. TRANSLATORS: Make sure to keep [y/N] as is
#: builtin/clean.c:755
#, c-format
-msgid "Remove %s [y/N]? "
-msgstr "Remover %s [y/N]? "
+msgid "Remove %s? [y/N] "
+msgstr "Remover %s? [y/N] "
#: builtin/clean.c:786
msgid ""
diff --git a/po/ru.po b/po/ru.po
index d091ea22e5a..cc886655cfd 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11466,8 +11466,8 @@ msgstr "Укажите элементы для удаления"
#. TRANSLATORS: Make sure to keep [y/N] as is
#: builtin/clean.c:758
#, c-format
-msgid "Remove %s [y/N]? "
-msgstr "Удалить %s [y - да/N - нет]? "
+msgid "Remove %s? [y/N] "
+msgstr "Удалить %s? [y - да/N - нет] "
#: builtin/clean.c:789
msgid ""
diff --git a/po/sv.po b/po/sv.po
index 6ccb7e7421c..ea9fe33cf9e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -12981,8 +12981,8 @@ msgstr "Välj poster att ta bort"
#. TRANSLATORS: Make sure to keep [y/N] as is
#: builtin/clean.c:755
#, c-format
-msgid "Remove %s [y/N]? "
-msgstr "Ta bort %s [Y=ja / N=nej]? "
+msgid "Remove %s? [y/N] "
+msgstr "Ta bort %s? [Y=ja / N=nej] "
#: builtin/clean.c:786
msgid ""
diff --git a/po/tr.po b/po/tr.po
index 686b21459a3..46a1ae5a8d2 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -13040,8 +13040,8 @@ msgstr "Silinecek ögeleri seçin"
#. TRANSLATORS: Make sure to keep [y/N] as is
#: builtin/clean.c:755
#, c-format
-msgid "Remove %s [y/N]? "
-msgstr "%s kaldırılsın mı [y/N]? "
+msgid "Remove %s? [y/N] "
+msgstr "%s kaldırılsın mı? [y/N] "
#: builtin/clean.c:786
msgid ""
diff --git a/po/vi.po b/po/vi.po
index bfb84bd0049..d9c0130af2b 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -13037,8 +13037,8 @@ msgstr "Chọn mục muốn xóa"
#. TRANSLATORS: Make sure to keep [y/N] as is
#: builtin/clean.c:755
#, c-format
-msgid "Remove %s [y/N]? "
-msgstr "Xóa bỏ “%s” [y/N]? "
+msgid "Remove %s? [y/N] "
+msgstr "Xóa bỏ “%s”? [y/N] "
#: builtin/clean.c:786
msgid ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9131b440e6f..a51c81bfc4a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12881,8 +12881,8 @@ msgstr "选择要删除的条目"
#. TRANSLATORS: Make sure to keep [y/N] as is
#: builtin/clean.c:755
#, c-format
-msgid "Remove %s [y/N]? "
-msgstr "删除 %s [y/N]？"
+msgid "Remove %s? [y/N] "
+msgstr "删除 %s? [y/N] "
#: builtin/clean.c:786
msgid ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 80e156c94fc..c5b5f756f33 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -12735,8 +12735,8 @@ msgstr "選擇要刪除的條目"
#. TRANSLATORS: Make sure to keep [y/N] as is
#: builtin/clean.c:755
#, c-format
-msgid "Remove %s [y/N]? "
-msgstr "移除 %s [y/N]？ "
+msgid "Remove %s? [y/N] "
+msgstr "移除 %s? [y/N] "
#: builtin/clean.c:786
msgid ""
--
gitgitgadget
next prev parent reply other threads:[~2021-12-16 18:19 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-15 21:41 [PATCH] help: add space after autocorrect prompt kashav madan via GitGitGadget
2021-12-15 22:32 ` Junio C Hamano
2021-12-16 6:27 ` Johannes Altmanninger
2021-12-16 15:55 ` Eric Sunshine
2021-12-16 21:32 ` Junio C Hamano
2021-12-15 22:58 ` [PATCH v2] help: make auto-correction prompt more consistent kashav madan via GitGitGadget
2021-12-16 3:12 ` Junio C Hamano
2021-12-16 18:18 ` [PATCH v3 0/4] normalize format of yes/no prompts kashav madan via GitGitGadget
2021-12-16 18:18 ` [PATCH v3 1/4] bisect--helper: normalize format string " Kashav Madan via GitGitGadget
2021-12-16 21:39 ` Junio C Hamano
2021-12-16 21:49 ` Junio C Hamano
2021-12-16 18:18 ` Kashav Madan via GitGitGadget [this message]
2021-12-16 18:18 ` [PATCH v3 3/4] add-patch: normalize format string of yes/no prompt Kashav Madan via GitGitGadget
2021-12-16 18:18 ` [PATCH v3 4/4] help: make auto-correction prompt more consistent Kashav Madan via GitGitGadget
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0c81a14247f9f832b5dc23de94116d8c67d81325.1639678737.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=aclopte@gmail.com \
--cc=git@vger.kernel.org \
--cc=kshvmdn@gmail.com \
--cc=sunshine@sunshineco.com \
/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.
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 NNTP newsgroup(s).