Merge branch 'maint'

* maint:
  i18n: proposed command missing leading dash
This commit is contained in:
Junio C Hamano 2014-03-05 15:06:59 -08:00
commit 6ab4ae2b41

View File

@ -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