i18n: status: mark parseopt strings for translation

diff --git a/t/t5800-remote-helpers.sh b/t/t5800-remote-helpers.sh
index 9db8ca884e4044411b8f37136118f265a6c517d6..57023345100d3c04f9bfb1b2a701c53b6e55deed 100755 (executable)
--- a/t/t5800-remote-helpers.sh
+++ b/t/t5800-remote-helpers.sh
@@ -72,6 +72,19 @@ test_expect_success 'pushing to local repo' '
        compare_refs localclone HEAD server HEAD
 '
 
+# Generally, skip this test.  It demonstrates a now-fixed race in
+# git-remote-testgit, but is too slow to leave in for general use.
+: test_expect_success 'racily pushing to local repo' '
+       test_when_finished "rm -rf server2 localclone2" &&
+       cp -a server server2 &&
+       git clone "testgit::${PWD}/server2" localclone2 &&
+       (cd localclone2 &&
+       echo content >>file &&
+       git commit -a -m three &&
+       GIT_REMOTE_TESTGIT_SLEEPY=2 git push) &&
+       compare_refs localclone2 HEAD server2 HEAD
+'
+
 test_expect_success 'synch with changes from localclone' '
        (cd clone &&
         git pull)
@@ -85,7 +98,7 @@ test_expect_success 'pushing remote local repo' '
        compare_refs clone HEAD server HEAD
 '
 
-test_expect_failure 'fetch new branch' '
+test_expect_success 'fetch new branch' '
        (cd public &&
         git checkout -b new &&
         echo content >>file &&
@@ -98,7 +111,7 @@ test_expect_failure 'fetch new branch' '
        compare_refs public HEAD localclone FETCH_HEAD
 '
 
-test_expect_failure 'fetch multiple branches' '
+test_expect_success 'fetch multiple branches' '
        (cd localclone &&
         git fetch
        ) &&
@@ -106,7 +119,7 @@ test_expect_failure 'fetch multiple branches' '
        compare_refs server new localclone refs/remotes/origin/new
 '
 
-test_expect_failure 'push when remote has extra refs' '
+test_expect_success 'push when remote has extra refs' '
        (cd clone &&
         echo content >>file &&
         git commit -a -m six &&
@@ -115,7 +128,7 @@ test_expect_failure 'push when remote has extra refs' '
        compare_refs clone master server master
 '
 
-test_expect_failure 'push new branch by name' '
+test_expect_success 'push new branch by name' '
        (cd clone &&
         git checkout -b new-name  &&
         echo content >>file &&