summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorLibravatar Jiang Xin <worldhello.net@gmail.com>2016-03-17 00:11:54 +0800
committerLibravatar Jiang Xin <worldhello.net@gmail.com>2016-03-17 00:11:54 +0800
commitdcb941ee47bba15a10daad3aa4de738b5850afd2 (patch)
tree3b83fe0416ef931339949c6ad2af56253d7ddbe7 /po
parentMerge branch 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-ko (diff)
parentl10n: fr.po v2.8.0 round 3 (diff)
downloadtgif-dcb941ee47bba15a10daad3aa4de738b5850afd2.tar.xz
Merge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/git
* 'fr_v2.8.0_r3' of git://github.com/jnavila/git: l10n: fr.po v2.8.0 round 3
Diffstat (limited to 'po')
-rw-r--r--po/fr.po12
1 files changed, 7 insertions, 5 deletions
diff --git a/po/fr.po b/po/fr.po
index d47ccab51b..88b0b8a78a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -73,7 +73,7 @@ msgid ""
msgstr ""
"Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2016-03-12 22:05+0800\n"
+"POT-Creation-Date: 2016-03-16 00:16+0800\n"
"PO-Revision-Date: 2016-03-14 20:26+0100\n"
"Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
@@ -1752,7 +1752,8 @@ msgstr "offset avant le début de l'index de paquet pour %s (index corrompu ?)"
#: sha1_file.c:2463
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr "offset au delà de la fin de l'index de paquet pour %s (index tronqué ?)"
+msgstr ""
+"offset au delà de la fin de l'index de paquet pour %s (index tronqué ?)"
#: sha1_name.c:462
msgid ""
@@ -2413,6 +2414,10 @@ msgstr "disparue"
msgid "behind "
msgstr "derrière "
+#: wt-status.c:1680 wt-status.c:1683
+msgid "ahead "
+msgstr "devant "
+
#: compat/precompose_utf8.c:57 builtin/clone.c:413
#, c-format
msgid "failed to unlink '%s'"
@@ -12807,9 +12812,6 @@ msgstr "Synchronisation de l'URL sous-module pour '$displaypath'"
#~ msgid "bug"
#~ msgstr "bogue"
-#~ msgid "ahead "
-#~ msgstr "devant "
-
#~ msgid ", behind "
#~ msgstr ", derrière "