Another transifex sync :)

diff --git a/.tx/merge-base b/.tx/merge-base
index f702dee7cf323902e6e705e70421d07a106403ed..71496b639cb306e57843b65a7f772cf020c2714e 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Dec 30 12:43:17 CET 2014
+Tue Dec 30 12:52:40 CET 2014

diff --git a/common.fr.po b/common.fr.po
index 5e11561e45a012d99dac532c314bd9d1451e513e..b70be3ad85abf3205348de15c79553db257365e2 100644 (file)
--- a/common.fr.po
+++ b/common.fr.po
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: Xonotic\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-12-30 12:18+0100\n"
-"PO-Revision-Date: 2014-12-30 11:41+0000\n"
+"PO-Revision-Date: 2014-12-30 11:45+0000\n"
 "Last-Translator: Yannick Le Guen <leguen.yannick@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/xonotic/language/"
 "fr/)\n"
@@ -4858,7 +4858,7 @@ msgstr "Arènes spéciales :"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:269
 msgid "with blaster"
-msgstr ""
+msgstr "avec le blaster"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_join.c:4
 msgid "Join"
@@ -6158,7 +6158,7 @@ msgstr "Légers"
 
 #: qcsrc/menu/xonotic/dialog_settings_game_model.c:69
 msgid "GIBS^Many"
-msgstr "Quelques-uns"
+msgstr "Normaux"
 
 #: qcsrc/menu/xonotic/dialog_settings_game_model.c:70
 msgid "GIBS^Lots"
@@ -6348,11 +6348,11 @@ msgstr "Continuer de sauter en cas d'appui continu"
 
 #: qcsrc/menu/xonotic/dialog_settings_input.c:92
 msgid "Jetpack on jump:"
-msgstr ""
+msgstr "Jetpack lors du saut :"
 
 #: qcsrc/menu/xonotic/dialog_settings_input.c:95
 msgid "Air only"
-msgstr ""
+msgstr "En l'air seulement"
 
 #: qcsrc/menu/xonotic/dialog_settings_input.c:102
 #: qcsrc/menu/xonotic/dialog_settings_input.c:107

diff --git a/languages.txt b/languages.txt
index 9b58f8c692a9935575e94d43c7028e4144a0a724..eec0529cc9d9dedecca7fd50536b352dd4382f21 100644 (file)
--- a/languages.txt
+++ b/languages.txt
@@ -1,7 +1,7 @@
 de German "Deutsch (100%)"
 en English "English"
 es Spanish "Español (63%)"
-fr French "Français (99%)"
+fr French "Français (100%)"
 it Italian "Italiano (99%)"
 hu Hungarian "Magyar (53%)"
 nl Dutch "Nederlands (57%)"