Re: [PATCH] i18n: proposed command missing leading dash
flat view
From: Jonathan Nieder <hidden>
Date: 2016-06-15 23:00:07
Hi, Sandy Carter wrote:
Add missing leading dash to proposed commands in french output when using the command:
Thanks! [...]
quoted hunk ↗ jump to hunk
--- a/po/fr.po +++ b/po/fr.po@@ -3266,7 +3266,7 @@ msgstr " git branch -d %s\n" #: builtin/branch.c:1027 #, c-format msgid " git branch --set-upstream-to %s\n" -msgstr " git branch -set-upstream-to %s\n" +msgstr " git branch --set-upstream-to %s\n"
To make life saner for translators, this should be either untranslatable or a single multi-line string, I suspect:
diff --git i/builtin/branch.c w/builtin/branch.c
index b4d7716..972040c 100644
--- i/builtin/branch.c
+++ w/builtin/branch.c@@ -1022,11 +1022,13 @@ int cmd_branch(int argc, const char **argv, const char *prefix) */ if (argc == 1 && track == BRANCH_TRACK_OVERRIDE && !branch_existed && remote_tracking) { - fprintf(stderr, _("\nIf you wanted to make '%s' track '%s', do this:\n\n"), head, branch->name); - fprintf(stderr, _(" git branch -d %s\n"), branch->name); - fprintf(stderr, _(" git branch --set-upstream-to %s\n"), branch->name); + fprintf(stderr, "\n"); + fprintf(stderr, _("If you wanted to make '%s' track '%s', do this:\n\n" + " git branch -d %s\n" + " git branch --set-upstream-to %s"), + head, branch->name, branch->name, branch->name); + fprintf(stderr, "\n"); } - } else usage_with_options(builtin_branch_usage, options);
What do you think? Jonathan