More transifex sync.

diff --git a/.tx/merge-base b/.tx/merge-base
index 881da7bafcaeafd12f6a8af171de6a57cdcac80c..f702dee7cf323902e6e705e70421d07a106403ed 100644 (file)
--- a/.tx/merge-base
+++ b/.tx/merge-base
@@ -1 +1 @@
-Tue Dec 30 12:25:09 CET 2014
+Tue Dec 30 12:43:17 CET 2014

diff --git a/common.de.po b/common.de.po
index c5328d82d0b7792903cbc222120396e7ecf2c9ac..4458bbe7628e143f2d211d277ae9e97fe725e194 100644 (file)
--- a/common.de.po
+++ b/common.de.po
@@ -18,7 +18,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:22+0000\n"
+"PO-Revision-Date: 2014-12-30 11:30+0000\n"
 "Last-Translator: divVerent <divVerent@xonotic.org>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/xonotic/language/"
 "de/)\n"
@@ -4832,7 +4832,7 @@ msgstr "Spezielle Arenen:"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:269
 msgid "with blaster"
-msgstr ""
+msgstr "mit Blaster"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_join.c:4
 msgid "Join"
@@ -6320,11 +6320,11 @@ msgstr "Auto-Springen"
 
 #: qcsrc/menu/xonotic/dialog_settings_input.c:92
 msgid "Jetpack on jump:"
-msgstr ""
+msgstr "Jetpack aktiveren durch Springen:"
 
 #: qcsrc/menu/xonotic/dialog_settings_input.c:95
 msgid "Air only"
-msgstr ""
+msgstr "nur solange in der Luft"
 
 #: qcsrc/menu/xonotic/dialog_settings_input.c:102
 #: qcsrc/menu/xonotic/dialog_settings_input.c:107

diff --git a/common.fr.po b/common.fr.po
index 3ecb0e2ddc502a9874221c9ab08891c7f3d5b034..5e11561e45a012d99dac532c314bd9d1451e513e 100644 (file)
--- a/common.fr.po
+++ b/common.fr.po
@@ -16,8 +16,8 @@ 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:22+0000\n"
-"Last-Translator: divVerent <divVerent@xonotic.org>\n"
+"PO-Revision-Date: 2014-12-30 11:41+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"
 "Language: fr\n"
@@ -5700,13 +5700,13 @@ msgstr "Durée :"
 
 #: qcsrc/menu/xonotic/dialog_settings_effects.c:150
 msgid "Damage effects:"
-msgstr "Effets de dégâts :"
+msgstr "Effets des dégâts :"
 
 #: qcsrc/menu/xonotic/dialog_settings_effects.c:152
 #: qcsrc/menu/xonotic/dialog_settings_game_messages.c:55
 #: qcsrc/menu/xonotic/dialog_settings_input.c:94
 msgid "Disabled"
-msgstr "Désactivés"
+msgstr "Désactivé"
 
 #: qcsrc/menu/xonotic/dialog_settings_effects.c:153
 msgid "Skeletal"
@@ -5996,7 +5996,7 @@ msgstr "Seulement s'il s'agit de prouesses"
 
 #: qcsrc/menu/xonotic/dialog_settings_game_messages.c:43
 msgid "Show spree information in centerprints"
-msgstr "Les afficher dans l'affichage central"
+msgstr "Les montrer dans l'affichage central"
 
 #: qcsrc/menu/xonotic/dialog_settings_game_messages.c:47
 msgid "Show spree information in death messages"
@@ -6073,7 +6073,7 @@ msgstr "Notifications des armes dans l'affichage central"
 
 #: qcsrc/menu/xonotic/dialog_settings_game_messages.c:101
 msgid "Weapon info message notifications"
-msgstr "Notifications des messages d'information à propos des armes"
+msgstr "Notifications des messages d'information sur les armes"
 
 #: qcsrc/menu/xonotic/dialog_settings_game_messages.c:105
 msgid "Announcers"
@@ -6154,15 +6154,15 @@ msgstr "Aucun"
 
 #: qcsrc/menu/xonotic/dialog_settings_game_model.c:68
 msgid "GIBS^Few"
-msgstr "Léger"
+msgstr "Légers"
 
 #: qcsrc/menu/xonotic/dialog_settings_game_model.c:69
 msgid "GIBS^Many"
-msgstr "Moyen"
+msgstr "Quelques-uns"
 
 #: qcsrc/menu/xonotic/dialog_settings_game_model.c:70
 msgid "GIBS^Lots"
-msgstr "Gore"
+msgstr "Gores"
 
 #: qcsrc/menu/xonotic/dialog_settings_game_view.c:32
 msgid "1st person perspective"
@@ -6757,7 +6757,7 @@ msgstr "Anisotropie :"
 
 #: qcsrc/menu/xonotic/dialog_settings_video.c:57
 msgid "ANISO^Disabled"
-msgstr "Désactivé"
+msgstr "Désactivée"
 
 #: qcsrc/menu/xonotic/dialog_settings_video.c:58
 #: qcsrc/menu/xonotic/dialog_settings_video.c:68