Git development
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Vasco Almeida <vascomalmeida@sapo.pt>
Cc: git@vger.kernel.org, Jiang Xin <worldhello.net@gmail.com>
Subject: Re: [PATCH v3 1/7] i18n: index-pack: use plural string instead of normal one
Date: Tue, 19 Apr 2016 12:06:52 -0700	[thread overview]
Message-ID: <xmqqbn551kqb.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1461071964-323-1-git-send-email-vascomalmeida@sapo.pt> (Vasco Almeida's message of "Tue, 19 Apr 2016 13:19:18 +0000")

Hmph, two patches in the previous series seem to be missing.  On
purpose, or by mistake?  Their net-effect is shown at the end of
this message, and I thought they made sense.

Puzzled...

diff --git a/builtin/branch.c b/builtin/branch.c
index 5ab106b..32be954 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -369,12 +369,14 @@ static char *get_head_description(void)
 		strbuf_addf(&desc, _("(no branch, bisect started on %s)"),
 			    state.branch);
 	else if (state.detached_from) {
-		/* TRANSLATORS: make sure these match _("HEAD detached at ")
-		   and _("HEAD detached from ") in wt-status.c */
 		if (state.detached_at)
+			/* TRANSLATORS: make sure this matches
+			   "HEAD detached at " in wt-status.c */
 			strbuf_addf(&desc, _("(HEAD detached at %s)"),
 				state.detached_from);
 		else
+			/* TRANSLATORS: make sure this matches
+			   "HEAD detached from " in wt-status.c */
 			strbuf_addf(&desc, _("(HEAD detached from %s)"),
 				state.detached_from);
 	}
@@ -828,8 +830,8 @@ 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, "    git branch -d %s\n", branch->name);
+			fprintf(stderr, "    git branch --set-upstream-to %s\n", branch->name);
 		}
 
 	} else

  parent reply	other threads:[~2016-04-19 19:07 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-19 13:19 [PATCH v3 1/7] i18n: index-pack: use plural string instead of normal one Vasco Almeida
2016-04-19 13:19 ` [PATCH v3 2/7] i18n: unpack-trees: mark strings for translation Vasco Almeida
2016-04-19 13:19 ` [PATCH v3 3/7] i18n: git-parse-remote.sh: " Vasco Almeida
2016-04-19 13:19 ` [PATCH v3 4/7] i18n: builtin/pull.c: mark placeholders " Vasco Almeida
2016-04-19 13:19 ` [PATCH v3 5/7] i18n: builtin/pull.c: split strings marked " Vasco Almeida
2016-04-19 13:19 ` [PATCH v3 6/7] i18n: builtin/rm.c: remove a comma ',' from string Vasco Almeida
2016-04-19 13:19 ` [PATCH v3 7/7] i18n: builtin/branch.c: mark option for translation Vasco Almeida
2016-04-19 19:06 ` Junio C Hamano [this message]
2016-04-19 19:46   ` [PATCH v3 1/7] i18n: index-pack: use plural string instead of normal one Junio C Hamano
2016-05-12 19:59 ` [PATCH v4 0/7] i18n miscellaneous updates Vasco Almeida
2016-05-12 21:10   ` Junio C Hamano
2016-05-12 19:59 ` [PATCH v4 1/7] i18n: index-pack: use plural string instead of normal one Vasco Almeida
2016-05-12 19:59 ` [PATCH v4 2/7] i18n: unpack-trees: mark strings for translation Vasco Almeida
2016-05-12 22:50   ` Junio C Hamano
2016-05-12 23:16     ` [PATCH] i18n: unpack-trees: avoid substituting only a verb in sentences Vasco Almeida
2016-05-12 23:28       ` Junio C Hamano
2016-05-12 23:30         ` Junio C Hamano
2016-05-12 19:59 ` [PATCH v4 3/7] i18n: git-parse-remote.sh: mark strings for translation Vasco Almeida
2016-05-12 19:59 ` [PATCH v4 4/7] i18n: builtin/pull.c: mark placeholders " Vasco Almeida
2016-05-12 19:59 ` [PATCH v4 5/7] i18n: builtin/pull.c: split strings marked " Vasco Almeida
2016-05-12 19:59 ` [PATCH v4 6/7] i18n: builtin/rm.c: remove a comma ',' from string Vasco Almeida
2016-05-12 21:05   ` Junio C Hamano
2016-05-12 19:59 ` [PATCH v4 7/7] i18n: builtin/branch.c: mark option for translation Vasco Almeida

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqbn551kqb.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=vascomalmeida@sapo.pt \
    --cc=worldhello.net@gmail.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox