git-check-attr: Add an --all option to show all attributes

diff --git a/git-am.sh b/git-am.sh
index a0db15e6bbe53da0e9c2a275163e40b64c537b7e..463c741dfc259927b4429f19972ced21d87c215e 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -742,7 +742,7 @@ To restore the original branch and stop patching run \"\$cmdline --abort\"."; ec
                stop_here $this
        fi
 
-       say "Applying: $FIRSTLINE"
+       say "$(eval_gettext "Applying: \$FIRSTLINE")"
 
        case "$resolved" in
        '')
@@ -787,7 +787,7 @@ did you forget to use 'git add'?"; echo
                    # Applying the patch to an earlier tree and merging the
                    # result may have produced the same tree as ours.
                    git diff-index --quiet --cached HEAD -- && {
-                       say No changes -- Patch already applied.
+                       say "$(gettext "No changes -- Patch already applied.")"
                        go_next
                        continue
                    }
@@ -797,7 +797,7 @@ did you forget to use 'git add'?"; echo
        fi
        if test $apply_status != 0
        then
-               printf 'Patch failed at %s %s\n' "$msgnum" "$FIRSTLINE"
+               eval_gettext 'Patch failed at $msgnum $FIRSTLINE'; echo
                stop_here_user_resolve $this
        fi
 
@@ -813,7 +813,7 @@ did you forget to use 'git add'?"; echo
                        GIT_AUTHOR_DATE=
                fi
                parent=$(git rev-parse --verify -q HEAD) ||
-               say >&2 "applying to an empty history"
+               say >&2 "$(gettext "applying to an empty history")"
 
                if test -n "$committer_date_is_author_date"
                then