Re: [PATCH v2 1/2] i18n: proposed command missing leading dash

2014-03-05 Thread Jiang Xin
2014-03-05 2:40 GMT+08:00 Junio C Hamano gits...@pobox.com:
 From: Sandy Carter sandy.car...@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.car...@savoirfairelinux.com
 Signed-off-by: Junio C Hamano gits...@pobox.com
 ---

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

Applied to maint branch of git://github.com/git-l10n/git-po, and can be
merged to master directly.

-- 
Jiang Xin
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH v2 1/2] i18n: proposed command missing leading dash

2014-03-05 Thread Junio C Hamano
Jiang Xin worldhello@gmail.com writes:

 2014-03-05 2:40 GMT+08:00 Junio C Hamano gits...@pobox.com:
 From: Sandy Carter sandy.car...@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.car...@savoirfairelinux.com
 Signed-off-by: Junio C Hamano gits...@pobox.com
 ---

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

 Applied to maint branch of git://github.com/git-l10n/git-po, and can be
 merged to master directly.

Thanks.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH v2 1/2] i18n: proposed command missing leading dash

2014-03-04 Thread Junio C Hamano
From: Sandy Carter sandy.car...@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.car...@savoirfairelinux.com
Signed-off-by: Junio C Hamano gits...@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

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH v2 1/2] i18n: proposed command missing leading dash

2014-03-03 Thread Sandy Carter
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.car...@savoirfairelinux.com
---
 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

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html