i18n: git-am multi-line getttext $msg; echo

When we have multi-line `gettext $msg; echo' messages we can't
preserve the existing indenting because gettext(1) can't accept input
on stdin.

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

diff --git a/git-am.sh b/git-am.sh
index f54f13d984858f107aea7f2fd4b3f714f3f1dc27..5a152b0878f206539a64c90cc4f8dce969845e43 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -757,16 +757,16 @@ do
                # working tree.
                resolved=
                git diff-index --quiet --cached HEAD -- && {
                # working tree.
                resolved=
                git diff-index --quiet --cached HEAD -- && {

-                       echo "No changes - did you forget to use 'git add'?"
-                       echo "If there is nothing left to stage, chances are that something else"
-                       echo "already introduced the same changes; you might want to skip this patch."
+                       gettext "No changes - did you forget to use 'git add'?
+If there is nothing left to stage, chances are that something else
+already introduced the same changes; you might want to skip this patch."; echo

                        stop_here_user_resolve $this
                }
                unmerged=$(git ls-files -u)
                if test -n "$unmerged"
                then
                        stop_here_user_resolve $this
                }
                unmerged=$(git ls-files -u)
                if test -n "$unmerged"
                then

-                       echo "You still have unmerged paths in your index"
-                       echo "did you forget to use 'git add'?"
+                       gettext "You still have unmerged paths in your index
+did you forget to use 'git add'?"; echo

                        stop_here_user_resolve $this
                fi
                apply_status=0
                        stop_here_user_resolve $this
                fi
                apply_status=0