diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2015-12-11 23:33:45 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2015-12-11 23:33:45 +0800 |
| commit | c65da26899d91eeda1e2438ea6278ab5305580c8 (patch) | |
| tree | c4ad28f4f647c18579dce7cba15ead1e3e9ce479 | |
| parent | 7d722536dd86b5fbd0c0434bfcea5588132ee6ad (diff) | |
| parent | 7f0871c9549c875de2c2980ab12e3add5f2185f8 (diff) | |
| download | git-c65da26899d91eeda1e2438ea6278ab5305580c8.tar.gz git-c65da26899d91eeda1e2438ea6278ab5305580c8.tar.xz | |
Merge branch 'master' of git://github.com/git-l10n/git-po
* 'master' of git://github.com/git-l10n/git-po:
l10n: fr.po: Fix typo
l10n: fr.po: Fix typo
| -rw-r--r-- | po/fr.po | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1913,7 +1913,7 @@ msgid "" "Everything below will be removed." msgstr "" "Ne touchez pas à la ligne ci-dessus\n" -"Tout se qui suit sera éliminé." +"Tout ce qui suit sera éliminé." #: wt-status.c:948 msgid "You have unmerged paths." @@ -8862,7 +8862,7 @@ msgstr "" "Si vous souhaitez indiquer l'information de suivi distant pour cette " "branche, vous pouvez le faire avec :\n" "\n" -"git branch --set-uptream-to=%s/<branche> %s\n" +" git branch --set-upstream-to=%s/<branche> %s\n" #: builtin/pull.c:476 #, c-format |