All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jiang Xin <worldhello.net@gmail.com>
Cc: git@vger.kernel.org, jn.avila@free.fr,
	Sandy Carter <sandy.carter@savoirfairelinux.com>
Subject: Re: [PATCH v2 1/2] i18n: proposed command missing leading dash
Date: Tue, 04 Mar 2014 10:40:32 -0800	[thread overview]
Message-ID: <xmqqa9d5lsdb.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1393858554-4392-1-git-send-email-sandy.carter@savoirfairelinux.com> (Sandy Carter's message of "Mon, 3 Mar 2014 09:55:53 -0500")

From: Sandy Carter <sandy.carter@savoirfairelinux.com>
Date: Mon,  3 Mar 2014 09:55:53 -0500

Add missing leading dash to proposed commands in french output when
using the command:
    git branch --set-upstream remotename/branchname
and when upstream is gone

Signed-off-by: Sandy Carter <sandy.carter@savoirfairelinux.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

 * Forwarding to the i18n coordinator.  I don't do French, but this
   seems trivially correct.

 po/fr.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index e10263f..0b9d59e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1075,7 +1075,7 @@ msgstr "Votre branche est basée sur '%s', mais la branche amont a disparu.\n"
 
 #: remote.c:1875
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr "  (utilisez \"git branch -unset-upstream\" pour corriger)\n"
+msgstr "  (utilisez \"git branch --unset-upstream\" pour corriger)\n"
 
 #: remote.c:1878
 #, c-format
@@ -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"
 
 #: builtin/bundle.c:47
 #, c-format
-- 
1.9.0

  parent reply	other threads:[~2014-03-04 18:40 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
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   ` Junio C Hamano [this message]
2014-03-05 14:14     ` [PATCH v2 1/2] i18n: proposed command missing leading dash 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

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

  git send-email \
    --in-reply-to=xmqqa9d5lsdb.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=jn.avila@free.fr \
    --cc=sandy.carter@savoirfairelinux.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.