Merge branch 'ab/i18n-fixup' into maint

diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh
index 0492877d516b8f33a8fd1555ec77a2aa3b34352c..d924056c8a16f6029f1f3227ef806f0def326bdd 100755 (executable)
--- a/t/t5541-http-push.sh
+++ b/t/t5541-http-push.sh
@@ -135,8 +135,8 @@ test_expect_success 'push fails for non-fast-forward refs unmatched by remote he
        grep "^ ! \[rejected\] *master -> retsam (non-fast-forward)$" output
 '
 
-test_expect_success C_LOCALE_OUTPUT 'push fails for non-fast-forward refs unmatched by remote helper: our output' '
-       grep "To prevent you from losing history, non-fast-forward updates were rejected" \
+test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper: our output' '
+       test_i18ngrep "To prevent you from losing history, non-fast-forward updates were rejected" \
                output
 '