merged delta and c55

1 files changed, 402 insertions, 25 deletions

diff --git a/po/fr/minetest.po b/po/fr/minetest.po
index b060c424c..52a02c2a7 100644
--- a/po/fr/minetest.po
+++ b/po/fr/minetest.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-22 11:00+0200\n"
+"POT-Creation-Date: 2011-08-02 12:36+0200\n"
 "PO-Revision-Date: 2011-07-21 15:48+0200\n"
 "Last-Translator: Cyriaque 'Cisoun' Skrapits <cysoun@gmail.com>\n"
 "Language-Team: Français <>\n"
@@ -17,92 +17,469 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: src/guiMainMenu.cpp:180
+#: src/guiKeyChangeMenu.cpp:84
+msgid "KEYBINDINGS"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp:94
+msgid "Forward"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp:111
+msgid "Backward"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp:127 src/guiKeyChangeMenu.h:38
+msgid "Left"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp:142 src/guiKeyChangeMenu.h:38
+msgid "Right"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp:158
+msgid "Use"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp:173
+msgid "Sneak"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp:189
+msgid "Jump"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp:204
+msgid "Inventory"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp:220
+msgid "Chat"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp:236
+msgid "Toggle fly"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp:251
+msgid "Toggle fast"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp:266
+msgid "Range select"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp:283
+msgid "Print stacks"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp:298
+msgid "Save"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp:304 src/guiKeyChangeMenu.h:33
+msgid "Cancel"
+msgstr ""
+
+#: src/guiKeyChangeMenu.cpp:537 src/guiKeyChangeMenu.cpp:542
+#: src/guiKeyChangeMenu.cpp:547 src/guiKeyChangeMenu.cpp:552
+#: src/guiKeyChangeMenu.cpp:557 src/guiKeyChangeMenu.cpp:562
+#: src/guiKeyChangeMenu.cpp:567 src/guiKeyChangeMenu.cpp:572
+#: src/guiKeyChangeMenu.cpp:577 src/guiKeyChangeMenu.cpp:582
+#: src/guiKeyChangeMenu.cpp:587 src/guiKeyChangeMenu.cpp:592
+#: src/guiKeyChangeMenu.cpp:597
+msgid "press Key"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:33
+msgid "Left Button"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:33
+msgid "Middle Button"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:33
+msgid "Right Button"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:33
+msgid "X Button 1"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:34
+msgid "Back"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:34
+msgid "Clear"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:34
+msgid "Return"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:34
+msgid "Tab"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:34
+msgid "X Button 2"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:35
+msgid "Capital"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:35
+msgid "Control"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:35
+msgid "Kana"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:35
+msgid "Menu"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:35
+msgid "Pause"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:35
+msgid "Shift"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:36
+msgid "Convert"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:36
+msgid "Escape"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:36
+msgid "Final"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:36
+msgid "Junja"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:36
+msgid "Kanji"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:36
+msgid "Nonconvert"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:37
+msgid "Accept"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:37
+msgid "End"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:37
+msgid "Home"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:37
+#, fuzzy
+msgid "Mode Change"
+msgstr "Changer"
+
+#: src/guiKeyChangeMenu.h:37
+msgid "Next"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:37
+msgid "Priot"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:37
+msgid "Space"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:38
+msgid "Down"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:38
+msgid "Execute"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:38
+msgid "Print"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:38
+msgid "Select"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:38
+msgid "Up"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:39
+#, fuzzy
+msgid "Delete"
+msgstr "Supprimer carte"
+
+#: src/guiKeyChangeMenu.h:39
+msgid "Help"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:39
+msgid "Insert"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:39
+msgid "Snapshot"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:42
+msgid "Left Windows"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:43
+msgid "Apps"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:43
+msgid "Numpad 0"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:43
+msgid "Numpad 1"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:43
+msgid "Right Windows"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:43
+msgid "Sleep"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:44
+msgid "Numpad 2"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:44
+msgid "Numpad 3"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:44
+msgid "Numpad 4"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:44
+msgid "Numpad 5"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:44
+msgid "Numpad 6"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:44
+msgid "Numpad 7"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:45
+msgid "Numpad *"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:45
+msgid "Numpad +"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:45
+msgid "Numpad -"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:45
+msgid "Numpad /"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:45
+msgid "Numpad 8"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:45
+msgid "Numpad 9"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:49
+msgid "Num Lock"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:49
+msgid "Scroll Lock"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:50
+msgid "Left Shift"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:50
+msgid "Right Shight"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:51
+msgid "Left Control"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:51
+msgid "Left Menu"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:51
+msgid "Right Control"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:51
+msgid "Right Menu"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:53
+msgid "Comma"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:53
+msgid "Minus"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:53
+msgid "Period"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:53
+msgid "Plus"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:57
+msgid "Attn"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:57
+msgid "CrSel"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:58
+msgid "Erase OEF"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:58
+msgid "ExSel"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:58
+msgid "OEM Clear"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:58
+msgid "PA1"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:58
+msgid "Play"
+msgstr ""
+
+#: src/guiKeyChangeMenu.h:58
+msgid "Zoom"
+msgstr ""
+
+#: src/guiMainMenu.cpp:181
 msgid "Name/Password"
 msgstr "Nom / MdP"
 
-#: src/guiMainMenu.cpp:203
+#: src/guiMainMenu.cpp:206
 msgid "Address/Port"
 msgstr "Adresse / Port"
 
-#: src/guiMainMenu.cpp:223
+#: src/guiMainMenu.cpp:228
 msgid "Leave address blank to start a local server."
 msgstr "Laisser l'adresse vide pour lancer un serveur local."
 
-#: src/guiMainMenu.cpp:230
+#: src/guiMainMenu.cpp:235
 msgid "Fancy trees"
 msgstr "Arbres spéciaux"
 
-#: src/guiMainMenu.cpp:236
+#: src/guiMainMenu.cpp:241
 msgid "Smooth Lighting"
 msgstr "Lumière douce"
 
-#: src/guiMainMenu.cpp:244
+#: src/guiMainMenu.cpp:249
 msgid "Start Game / Connect"
 msgstr "Démarrer / Connecter"
 
-#: src/guiMainMenu.cpp:253
+#: src/guiMainMenu.cpp:258
 msgid "Change keys"
 msgstr "Changer touches"
 
-#: src/guiMainMenu.cpp:276
+#: src/guiMainMenu.cpp:281
 msgid "Creative Mode"
 msgstr "Mode créatif"
 
-#: src/guiMainMenu.cpp:282
+#: src/guiMainMenu.cpp:287
 msgid "Enable Damage"
 msgstr "Activer blessures"
 
-#: src/guiMainMenu.cpp:290
+#: src/guiMainMenu.cpp:295
 msgid "Delete map"
 msgstr "Supprimer carte"
 
-#: src/guiMessageMenu.cpp:93 src/guiTextInputMenu.cpp:111
+#: src/guiMessageMenu.cpp:94 src/guiTextInputMenu.cpp:112
 msgid "Proceed"
 msgstr "OK"
 
-#: src/guiPasswordChange.cpp:102
+#: src/guiPasswordChange.cpp:103
 msgid "Old Password"
 msgstr "Ancien mot de passe"
 
-#: src/guiPasswordChange.cpp:117
+#: src/guiPasswordChange.cpp:120
 msgid "New Password"
 msgstr "Nouveau mot de passe"
 
-#: src/guiPasswordChange.cpp:131
+#: src/guiPasswordChange.cpp:136
 msgid "Confirm Password"
 msgstr "Confirmer mot de passe"
 
-#: src/guiPasswordChange.cpp:146
+#: src/guiPasswordChange.cpp:153
 msgid "Change"
 msgstr "Changer"
 
-#: src/guiPasswordChange.cpp:155
+#: src/guiPasswordChange.cpp:162
 msgid "Passwords do not match!"
 msgstr "Mauvaise correspondance!"
 
-#: src/guiPauseMenu.cpp:110
+#: src/guiPauseMenu.cpp:111
 msgid "Continue"
 msgstr "Continuer"
 
-#: src/guiPauseMenu.cpp:117
+#: src/guiPauseMenu.cpp:118
 msgid "Change Password"
 msgstr "Changer mot de passe"
 
-#: src/guiPauseMenu.cpp:124
+#: src/guiPauseMenu.cpp:125
 msgid "Disconnect"
 msgstr "Déconnection"
 
-#: src/guiPauseMenu.cpp:131
+#: src/guiPauseMenu.cpp:132
 msgid "Exit to OS"
 msgstr "Quitter le jeu"
 
-#: src/guiPauseMenu.cpp:138
+#: src/guiPauseMenu.cpp:139
+#, fuzzy
 msgid ""
-"Keys:\n"
+"Default Controls:\n"
 "- WASD: Walk\n"
-"- Mouse left: dig blocks\n"
-"- Mouse right: place blocks\n"
+"- Mouse left: dig/hit\n"
+"- Mouse right: place/use\n"
 "- Mouse wheel: select item\n"
 "- 0...9: select item\n"
 "- Shift: sneak\n"