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>
Jiang Xin committed
Jul 25, 2012 at 22:53 UTC
42e6504f5e1366aeda4fdcd466a2e8bc7a75235e
1 file changed
+5
-6
git-am.sh
+5
-6
@@ -92,7 +92,7 @@ safe_to_abort () {
92
then
93
return 0
94
fi
95
- gettextln "You seem to have moved HEAD since the last 'am' failure.
95
+ gettextln "You seem to have moved HEAD since the last 'am' failure.
96
Not rewinding to ORIG_HEAD" >&2
97
return 1
98
}
@@ -136,7 +136,7 @@ fall_back_3way () {
136
git write-tree >"$dotest/patch-merge-base+" ||
137
cannot_fallback "$(gettext "Repository lacks necessary blobs to fall back on 3-way merge.")"
138
139
- say Using index info to reconstruct a base tree...
139
+ say "$(gettext "Using index info to reconstruct a base tree...")"
140
141
cmd='GIT_INDEX_FILE="$dotest/patch-merge-tmp-index"'
142
@@ -176,8 +176,7 @@ It does not apply to blobs recorded in its index.")"
176
fi
177
git-merge-recursive $orig_tree -- HEAD $his_tree || {
178
git rerere $allow_rerere_autoupdate
179
- echo Failed to merge in the changes.
180
- exit 1
179
+ die "$(gettext "Failed to merge in the changes.")"
180
}
181
unset GITHEAD_$his_tree
182
}
@@ -387,8 +386,8 @@ do
386
-i|--interactive)
387
interactive=t ;;
388
-b|--binary)
390
- echo >&2 "The $1 option has been a no-op for long time, and"
391
- echo >&2 "it will be removed. Please do not use it anymore."
389
+ gettextln >&2 "The -b/--binary option has been a no-op for long time, and
390
+it will be removed. Please do not use it anymore."
391
;;
392
-3|--3way)
393
threeway=t ;;