git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 26e4cbe 47caafd)
Merge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/git into maint
authorJiang Xin <redacted>
Sun, 24 Apr 2016 12:36:34 +0000 (20:36 +0800)
committerJiang Xin <redacted>
Sun, 24 Apr 2016 12:36:34 +0000 (20:36 +0800)
* 'fr_v2.8.0_r3' of git://github.com/jnavila/git:
  l10n: fr: don't translate "merge" as a parameter
  l10n: fr: change "id de clé" to match "id-clé"
  l10n: fr: fix wrongly translated option name
  l10n: fr: fix transcation of "dir"


Trivial merge
git clone https://git.99rst.org/PROJECT