i18n: am: mark more strings for translation
Mark strings in 'git-am.sh' for translation. In the last chunk,
change '$1' to '-b/--binary', as it is not worth turning this
message to "The %s option has been..." and using printf on it.
Also reduce one indentation level for one gettextln clause introduced
in commit de88c1c
.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Reviewed-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
c021fbf615
commit
42e6504f5e
11
git-am.sh
11
git-am.sh
@ -92,7 +92,7 @@ safe_to_abort () {
|
||||
then
|
||||
return 0
|
||||
fi
|
||||
gettextln "You seem to have moved HEAD since the last 'am' failure.
|
||||
gettextln "You seem to have moved HEAD since the last 'am' failure.
|
||||
Not rewinding to ORIG_HEAD" >&2
|
||||
return 1
|
||||
}
|
||||
@ -136,7 +136,7 @@ fall_back_3way () {
|
||||
git write-tree >"$dotest/patch-merge-base+" ||
|
||||
cannot_fallback "$(gettext "Repository lacks necessary blobs to fall back on 3-way merge.")"
|
||||
|
||||
say Using index info to reconstruct a base tree...
|
||||
say "$(gettext "Using index info to reconstruct a base tree...")"
|
||||
|
||||
cmd='GIT_INDEX_FILE="$dotest/patch-merge-tmp-index"'
|
||||
|
||||
@ -176,8 +176,7 @@ It does not apply to blobs recorded in its index.")"
|
||||
fi
|
||||
git-merge-recursive $orig_tree -- HEAD $his_tree || {
|
||||
git rerere $allow_rerere_autoupdate
|
||||
echo Failed to merge in the changes.
|
||||
exit 1
|
||||
die "$(gettext "Failed to merge in the changes.")"
|
||||
}
|
||||
unset GITHEAD_$his_tree
|
||||
}
|
||||
@ -387,8 +386,8 @@ do
|
||||
-i|--interactive)
|
||||
interactive=t ;;
|
||||
-b|--binary)
|
||||
echo >&2 "The $1 option has been a no-op for long time, and"
|
||||
echo >&2 "it will be removed. Please do not use it anymore."
|
||||
gettextln >&2 "The -b/--binary option has been a no-op for long time, and
|
||||
it will be removed. Please do not use it anymore."
|
||||
;;
|
||||
-3|--3way)
|
||||
threeway=t ;;
|
||||
|
Loading…
Reference in New Issue
Block a user