From: Jonathan Nieder <jrnieder@gmail.com>
To: Sandy Carter <sandy.carter@savoirfairelinux.com>
Cc: git@vger.kernel.org, jn.avila@free.fr,
"Carlos Martín Nieto" <cmn@elego.de>
Subject: Re: [PATCH] i18n: proposed command missing leading dash
Date: Fri, 28 Feb 2014 13:41:40 -0800 [thread overview]
Message-ID: <20140228214140.GP7855@google.com> (raw)
In-Reply-To: <1393620766-17582-1-git-send-email-sandy.carter@savoirfairelinux.com>
Hi,
Sandy Carter wrote:
> Add missing leading dash to proposed commands in french output when
> using the command:
Thanks!
[...]
> --- 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
next prev parent reply other threads:[~2014-02-28 21:41 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-28 20:52 [PATCH] i18n: proposed command missing leading dash Sandy Carter
2014-02-28 21:41 ` Jonathan Nieder [this message]
2014-02-28 23:31 ` Junio C Hamano
2014-03-01 0:36 ` Sandy Carter
2014-03-03 14:55 ` [PATCH v2 1/2] " Sandy Carter
2014-03-03 14:55 ` [PATCH v2 2/2] i18n: assure command not corrupted by _() process Sandy Carter
2014-03-10 12:51 ` Sandy Carter
2014-03-11 11:40 ` Duy Nguyen
2014-03-04 18:40 ` [PATCH v2 1/2] i18n: proposed command missing leading dash Junio C Hamano
2014-03-05 14:14 ` Jiang Xin
2014-03-05 21:57 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140228214140.GP7855@google.com \
--to=jrnieder@gmail.com \
--cc=cmn@elego.de \
--cc=git@vger.kernel.org \
--cc=jn.avila@free.fr \
--cc=sandy.carter@savoirfairelinux.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).