Merge branch 'as/ll-i18n'

Some messages in low level start-up codepath have been i18n-ized.

* as/ll-i18n:
Mark messages for translations

diff --cc setup.c
Simple merge

diff --cc t/t0002-gitfile.sh
index fb8d094117b6b6ba013f86b0b1915480bb209da6,797dcf95b79577b43b6009e2dc782a6607bc3cab..3691023d510a0d97bf1390b781afe1ac9fa270f4
--- 1/t/t0002-gitfile.sh
--- 2/t/t0002-gitfile.sh
+++ b/t/t0002-gitfile.sh
@@@ -17,14 -26,30 +17,14 @@@ test_expect_success 'initial setup' 
  
  test_expect_success 'bad setup: invalid .git file format' '
        echo "gitdir $REAL" >.git &&
 -      if git rev-parse 2>.err
 -      then
 -              echo "git rev-parse accepted an invalid .git file"
 -              false
 -      fi &&
 -      if ! test_i18ngrep "invalid gitfile format" .err
 -      then
 -              echo "git rev-parse returned wrong error"
 -              false
 -      fi
 +      test_must_fail git rev-parse 2>.err &&
-       grep "Invalid gitfile format" .err
++      test_i18ngrep "invalid gitfile format" .err
  '
  
  test_expect_success 'bad setup: invalid .git file path' '
        echo "gitdir: $REAL.not" >.git &&
 -      if git rev-parse 2>.err
 -      then
 -              echo "git rev-parse accepted an invalid .git file path"
 -              false
 -      fi &&
 -      if ! test_i18ngrep "not a git repository" .err
 -      then
 -              echo "git rev-parse returned wrong error"
 -              false
 -      fi
 +      test_must_fail git rev-parse 2>.err &&
-       grep "Not a git repository" .err
++      test_i18ngrep "not a git repository" .err
  '
  
  test_expect_success 'final setup + check rev-parse --git-dir' '

diff --cc t/t0008-ignores.sh
Simple merge