undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n: am: mark more strings for translation

Browse Source 
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:
Jiang Xin 2012-07-25 22:53:11 +08:00 committed by Junio C Hamano
parent c021fbf615
commit 42e6504f5e
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
git-am.sh
View File

@ -92,7 +92,7 @@ safe_to_abort () {
then then
return 0 return 0
fi 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 Not rewinding to ORIG_HEAD" >&2
return 1 return 1
} }
@ -136,7 +136,7 @@ fall_back_3way () {
git write-tree >"$dotest/patch-merge-base+" || git write-tree >"$dotest/patch-merge-base+" ||
cannot_fallback "$(gettext "Repository lacks necessary blobs to fall back on 3-way merge.")" 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"' cmd='GIT_INDEX_FILE="$dotest/patch-merge-tmp-index"'
@ -176,8 +176,7 @@ It does not apply to blobs recorded in its index.")"
fi fi
git-merge-recursive $orig_tree -- HEAD $his_tree || { git-merge-recursive $orig_tree -- HEAD $his_tree || {
git rerere $allow_rerere_autoupdate git rerere $allow_rerere_autoupdate
echo Failed to merge in the changes. die "$(gettext "Failed to merge in the changes.")"
exit 1
} }
unset GITHEAD_$his_tree unset GITHEAD_$his_tree
} }
@ -387,8 +386,8 @@ do
-i|--interactive) -i|--interactive)
interactive=t ;; interactive=t ;;
-b|--binary) -b|--binary)
echo >&2 "The $1 option has been a no-op for long time, and" gettextln >&2 "The -b/--binary option has been a no-op for long time, and
echo >&2 "it will be removed. Please do not use it anymore." it will be removed. Please do not use it anymore."
;; ;;
-3|--3way) -3|--3way)
threeway=t ;; threeway=t ;;