path: root/
diff options
authorJiang Xin <>2012-07-25 14:53:08 (GMT)
committerJunio C Hamano <>2012-07-25 17:09:14 (GMT)
commitc7108bf9ed72403bdf6274bf46263731590bffcf (patch)
tree9745d2a31c61fdb54fd69e2d7974e365df8498da /
parentc2d140db08e772e14ca17044821bcf94ae09cd0f (diff)
i18n: rebase: mark messages for translation
Mark messages in for translation. While doing this Jonathan noticed that the comma usage and sentence structure of the resolvemsg was not quite right, so correct that and its cousins in and t/ at the same time. Some tests would start to fail with GETTEXT_POISON turned on after this update. Use test_i18ncmp and test_i18ngrep where appropriate to mark strings that should only be checked in the C locale output to avoid such issues. Signed-off-by: Jiang Xin <> Reviewed-by: Stefano Lattarini <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to '')
1 files changed, 3 insertions, 3 deletions
diff --git a/ b/
index b6a5300..98eecdb 100755
--- a/
+++ b/
@@ -102,9 +102,9 @@ stop_here_user_resolve () {
printf '%s\n' "$resolvemsg"
stop_here $1
- eval_gettextln "When you have resolved this problem run \"\$cmdline --resolved\".
-If you would prefer to skip this patch, instead run \"\$cmdline --skip\".
-To restore the original branch and stop patching run \"\$cmdline --abort\"."
+ eval_gettextln "When you have resolved this problem, run \"\$cmdline --resolved\".
+If you prefer to skip this patch, run \"\$cmdline --skip\" instead.
+To restore the original branch and stop patching, run \"\$cmdline --abort\"."
stop_here $1