Code

i18n: git-am "Apply?" message
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Sat, 21 May 2011 18:43:50 +0000 (18:43 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sat, 21 May 2011 18:57:14 +0000 (11:57 -0700)
Make the "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all" message
translatable, and leave a note in a TRANSLATORS comment explaining
that translators have to preserve a mention of the y/n/e/v/a
characters since the program will expect them, and not their
localized equivalents.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-am.sh

index efce63a4ee399eb38d4fa66442a9af4f50ae58ed..e1917543e4a41e44491a6b3c1eb374f3d2975a8f 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -703,7 +703,10 @@ To restore the original branch and stop patching run \"\$cmdline --abort\"."; ec
                echo "--------------------------"
                cat "$dotest/final-commit"
                echo "--------------------------"
-               printf "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
+               # TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
+               # in your translation. The program will only accept English
+               # input at this point.
+               gettext "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
                read reply
                case "$reply" in
                [yY]*) action=yes ;;