Merge branch 'va/i18n'

A handful of tests that were broken under gettext-poison build have
been fixed.

* va/i18n:
  t7411: become resilient to GETTEXT_POISON
  t5520: become resilient to GETTEXT_POISON
  t3404: become resilient to GETTEXT_POISON

t/t3404-rebase-interactive.sh

@@ -1286,7 +1286,7 @@ test_expect_success 'rebase -i --gpg-sign=<key-id>' '
 	set_fake_editor &&
 	FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" HEAD^ \
 		>out 2>err &&
-	grep "$SQ-S\"S I Gner\"$SQ" err
+	test_i18ngrep "$SQ-S\"S I Gner\"$SQ" err
 '
 
 test_done

t/t5520-pull.sh

@@ -270,7 +270,7 @@ test_expect_success '--rebase with conflicts shows advice' '
 	test_tick &&
 	git commit -m "Create conflict" seq.txt &&
 	test_must_fail git pull --rebase . seq 2>err >out &&
-	grep "When you have resolved this problem" out
+	test_i18ngrep "When you have resolved this problem" out
 '
 
 test_expect_success 'failed --rebase shows advice' '
@@ -284,7 +284,7 @@ test_expect_success 'failed --rebase shows advice' '
 	git checkout -f -b fails-to-rebase HEAD^ &&
 	test_commit v2-without-cr file "2" file2-lf &&
 	test_must_fail git pull --rebase . diverging 2>err >out &&
-	grep "When you have resolved this problem" out
+	test_i18ngrep "When you have resolved this problem" out
 '
 
 test_expect_success '--rebase fails with multiple branches' '

t/t7411-submodule-config.sh

@@ -89,7 +89,7 @@ test_expect_success 'error message contains blob reference' '
 			HEAD b \
 			HEAD submodule \
 				2>actual_err &&
-		grep "submodule-blob $sha1:.gitmodules" actual_err >/dev/null
+		test_i18ngrep "submodule-blob $sha1:.gitmodules" actual_err >/dev/null
 	)
 '