X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-am.sh;h=aef2a1bd14f043b789b0b6654234bf9d2d1f99bf;hb=a424ca157fec59d0fd7f1fbd8c9b48059fa0b375;hp=b9ec69e31b023a908cdfb13f027cfb3fd1f83b6c;hpb=790872592ee51318062a2c0cc68d1040d74ca529;p=git.git diff --git a/git-am.sh b/git-am.sh index b9ec69e31..aef2a1bd1 100755 --- a/git-am.sh +++ b/git-am.sh @@ -133,7 +133,7 @@ fall_back_3way () { "$dotest/patch" && GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \ git write-tree >"$dotest/patch-merge-base+" || - cannot_fallback "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... if GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \ @@ -142,8 +142,8 @@ fall_back_3way () { mv "$dotest/patch-merge-base+" "$dotest/patch-merge-base" mv "$dotest/patch-merge-tmp-index" "$dotest/patch-merge-index" else - cannot_fallback "Did you hand edit your patch? -It does not apply to blobs recorded in its index." + cannot_fallback "$(gettext "Did you hand edit your patch? +It does not apply to blobs recorded in its index.")" fi test -f "$dotest/patch-merge-index" &&