Merge branch 'master' into mirceakitsune/hud_postprocessing

[xonotic/xonotic-data.pk3dir.git] / menu.dat.fr.po

diff --git a/menu.dat.fr.po b/menu.dat.fr.po
index 8200ad9ca3737ae3d6f4b7cb1d5a34ea996274cd..2f5da811278eae7d3aa2eaaf85cd8c92174433cb 100644 (file)
--- a/menu.dat.fr.po
+++ b/menu.dat.fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Xonotic 0.1preview\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-20 15:36+0200\n"
+"POT-Creation-Date: 2011-04-20 15:38+0200\n"
 "PO-Revision-Date: 2011-03-09 15:48-0500\n"
 "Last-Translator: Maxime Paradis <taximus.micro@gmail.com>\n"
 "Language-Team: French <kde-i18n-doc@kde.org>\n"
@@ -2780,14 +2780,14 @@ msgstr "Mitraillette"
 msgid "%s was riddled full of holes by %s"
 msgstr "%s s'est fait trouer par %s"
 
-#~ msgid "Crosshair color:"
-#~ msgstr "Couleur viseur:"
-
-#~ msgid "%s ran into %s's flac"
-#~ msgstr "%s n'a pas eu peur des missiles de %s"
+#~ msgid "%d/%d"
+#~ msgstr "%d/%d"
 
 #~ msgid "Waypoint settings:"
 #~ msgstr "Paramètres Waypoint (flèches 3D sur la carte):"
 
-#~ msgid "%d/%d"
-#~ msgstr "%d/%d"
+#~ msgid "%s ran into %s's flac"
+#~ msgstr "%s n'a pas eu peur des missiles de %s"
+
+#~ msgid "Crosshair color:"
+#~ msgstr "Couleur viseur:"