From 6a4eb91a73fa88bfbeb8d570895052b2b28693cf Mon Sep 17 00:00:00 2001 From: Vasco Almeida Date: Fri, 17 Jun 2016 20:20:56 +0000 Subject: i18n: merge-octopus: mark messages for translation Mark messages in git-merge-octopus.sh for translation. Signed-off-by: Vasco Almeida Signed-off-by: Junio C Hamano --- git-merge-octopus.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'git-merge-octopus.sh') diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh index dc2fd1b5a..89e967abe 100755 --- a/git-merge-octopus.sh +++ b/git-merge-octopus.sh @@ -5,6 +5,8 @@ # Resolve two or more trees. # +. git-sh-i18n + LF=' ' @@ -46,7 +48,7 @@ esac if ! git diff-index --quiet --cached HEAD -- then - echo "Error: Your local changes to the following files would be overwritten by merge" + gettextln "Error: Your local changes to the following files would be overwritten by merge" git diff-index --cached --name-only HEAD -- | sed -e 's/^/ /' exit 2 fi @@ -61,8 +63,8 @@ do # We allow only last one to have a hand-resolvable # conflicts. Last round failed and we still had # a head to merge. - echo "Automated merge did not work." - echo "Should not be doing an Octopus." + gettextln "Automated merge did not work." + gettextln "Should not be doing an Octopus." exit 2 esac @@ -73,11 +75,11 @@ do eval pretty_name=\${GITHEAD_$SHA1_UP:-$pretty_name} fi common=$(git merge-base --all $SHA1 $MRC) || - die "Unable to find common commit with $pretty_name" + die "$(eval_gettext "Unable to find common commit with \$pretty_name")" case "$LF$common$LF" in *"$LF$SHA1$LF"*) - echo "Already up-to-date with $pretty_name" + eval_gettextln "Already up-to-date with \$pretty_name" continue ;; esac @@ -89,7 +91,7 @@ do # tree as the intermediate result of the merge. # We still need to count this as part of the parent set. - echo "Fast-forwarding to: $pretty_name" + eval_gettextln "Fast-forwarding to: \$pretty_name" git read-tree -u -m $head $SHA1 || exit MRC=$SHA1 MRT=$(git write-tree) continue @@ -97,12 +99,12 @@ do NON_FF_MERGE=1 - echo "Trying simple merge with $pretty_name" + eval_gettextln "Trying simple merge with \$pretty_name" git read-tree -u -m --aggressive $common $MRT $SHA1 || exit 2 next=$(git write-tree 2>/dev/null) if test $? -ne 0 then - echo "Simple merge did not work, trying automatic merge." + gettextln "Simple merge did not work, trying automatic merge." git-merge-index -o git-merge-one-file -a || OCTOPUS_FAILURE=1 next=$(git write-tree 2>/dev/null) -- cgit v1.2.1