sha1-file.c: mark more strings for translation

diff --git a/t/t7608-merge-messages.sh b/t/t7608-merge-messages.sh
index 28d56797b17d5b1426d6c7c36e37b956731f1dfd..8e7e0a5865d762c1cb859154c2d4735b9bf8722b 100755 (executable)
--- a/t/t7608-merge-messages.sh
+++ b/t/t7608-merge-messages.sh
@@ -35,7 +35,7 @@ test_expect_success 'merge tag' '
        git checkout master &&
        test_commit master-3 &&
        git merge tag-1 &&
-       check_oneline "Merge commit Qtag-1Q"
+       check_oneline "Merge tag Qtag-1Q"
 '
 
 test_expect_success 'ambiguous tag' '
@@ -44,17 +44,17 @@ test_expect_success 'ambiguous tag' '
        git checkout master &&
        test_commit master-4 &&
        git merge ambiguous &&
-       check_oneline "Merge commit QambiguousQ"
+       check_oneline "Merge tag QambiguousQ"
 '
 
-test_expect_success 'remote branch' '
+test_expect_success 'remote-tracking branch' '
        git checkout -b remote master &&
        test_commit remote-1 &&
        git update-ref refs/remotes/origin/master remote &&
        git checkout master &&
        test_commit master-5 &&
        git merge origin/master &&
-       check_oneline "Merge remote branch Qorigin/masterQ"
+       check_oneline "Merge remote-tracking branch Qorigin/masterQ"
 '
 
 test_done