Merge branch '0.0.28'

Conflicts:
	po/POTFILES.in
	src/main.cpp
	src/main.h
	tmw.cbp

1 files changed, 75 insertions, 42 deletions

diff --git a/po/fr.po b/po/fr.po
index d2a26c42..d96f38f9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-01-25 22:01+0100\n"
+"POT-Creation-Date: 2009-02-12 20:22+0100\n"
 "PO-Revision-Date: 2008-12-26 10:43+0000\n"
 "Last-Translator: Johan Serre <Unknown>\n"
 "Language-Team: French\n"
@@ -59,7 +59,8 @@ msgstr "Vendre"
 #: src/gui/buysell.cpp:35 src/gui/char_select.cpp:85
 #: src/gui/char_select.cpp:258 src/gui/char_server.cpp:60
 #: src/gui/connection.cpp:47 src/gui/item_amount.cpp:61 src/gui/login.cpp:52
-#: src/gui/npclistdialog.cpp:45 src/gui/register.cpp:90 src/gui/setup.cpp:58
+#: src/gui/npcintegerdialog.cpp:44 src/gui/npclistdialog.cpp:45
+#: src/gui/npcstringdialog.cpp:42 src/gui/register.cpp:90 src/gui/setup.cpp:58
 #: src/gui/trade.cpp:63 src/gui/updatewindow.cpp:118
 msgid "Cancel"
 msgstr "Annuler"
@@ -105,7 +106,7 @@ msgid "Name: %s"
 msgstr "Nom : %s"
 
 #: src/gui/char_select.cpp:92 src/gui/char_select.cpp:172
-#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:232
+#: src/gui/char_select.cpp:184 src/gui/status.cpp:51 src/gui/status.cpp:235
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau : %d"
@@ -151,8 +152,9 @@ msgstr "Créer"
 msgid "Select Server"
 msgstr "Choix du personnage"
 
-#: src/gui/char_server.cpp:59 src/gui/npclistdialog.cpp:44
-#: src/gui/npc_text.cpp:46
+#: src/gui/char_server.cpp:59 src/gui/npc_text.cpp:46
+#: src/gui/npcintegerdialog.cpp:43 src/gui/npclistdialog.cpp:44
+#: src/gui/npcstringdialog.cpp:41
 msgid "OK"
 msgstr ""
 
@@ -466,7 +468,7 @@ msgstr "Compétences"
 msgid "Shortcut"
 msgstr "Raccourci"
 
-#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:716
+#: src/gui/menuwindow.cpp:66 src/gui/setup.cpp:50 src/main.cpp:725
 msgid "Setup"
 msgstr "Configuration"
 
@@ -474,10 +476,23 @@ msgstr "Configuration"
 msgid "MiniMap"
 msgstr "Plan"
 
-#: src/gui/npclistdialog.cpp:35 src/gui/npc_text.cpp:35
+#: src/gui/npc_text.cpp:35 src/gui/npclistdialog.cpp:35
 msgid "NPC"
 msgstr "PNJ"
 
+#: src/gui/npcintegerdialog.cpp:38
+msgid "NPC Number Request"
+msgstr ""
+
+#: src/gui/npcintegerdialog.cpp:45
+#, fuzzy
+msgid "Reset"
+msgstr "S'inscrire"
+
+#: src/gui/npcstringdialog.cpp:38
+msgid "NPC Text Request"
+msgstr ""
+
 #: src/gui/popupmenu.cpp:81
 #, c-format
 msgid "@@trade|Trade With %s@@"
@@ -559,22 +574,10 @@ msgstr "Le mot de passe doit faire moins de %d caractères."
 msgid "Passwords do not match."
 msgstr "Les deux mots de passe ne correspondent pas."
 
-#: src/gui/register.cpp:210 src/main.cpp:945
+#: src/gui/register.cpp:210 src/main.cpp:954
 msgid "Error"
 msgstr "Erreur"
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Son"
-
-#: src/gui/setup_audio.cpp:48
-msgid "Sfx volume"
-msgstr "Volume des effets sonores"
-
-#: src/gui/setup_audio.cpp:49
-msgid "Music volume"
-msgstr "Volume de la musique"
-
 #: src/gui/setup.cpp:58
 msgid "Apply"
 msgstr "Appliquer"
@@ -603,6 +606,18 @@ msgstr "Clavier"
 msgid "Players"
 msgstr ""
 
+#: src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Son"
+
+#: src/gui/setup_audio.cpp:48
+msgid "Sfx volume"
+msgstr "Volume des effets sonores"
+
+#: src/gui/setup_audio.cpp:49
+msgid "Music volume"
+msgstr "Volume de la musique"
+
 #: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "Presser le bouton pour démarrer la calibration"
@@ -770,16 +785,33 @@ msgstr ""
 msgid "Up"
 msgstr ""
 
-#: src/gui/status.cpp:52 src/gui/status.cpp:235
+#: src/gui/status.cpp:52 src/gui/status.cpp:238
 #, fuzzy, c-format
 msgid "Job: %d"
 msgstr "Niveau : %d"
 
-#: src/gui/status.cpp:53 src/gui/status.cpp:238
+#: src/gui/status.cpp:53 src/gui/status.cpp:241
 #, fuzzy, c-format
 msgid "Money: %d GP"
 msgstr "Argent : %d"
 
+#: src/gui/status.cpp:55
+msgid "HP:"
+msgstr ""
+
+#: src/gui/status.cpp:59
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/status.cpp:63
+msgid "MP:"
+msgstr ""
+
+#: src/gui/status.cpp:67
+#, fuzzy
+msgid "Job:"
+msgstr "Niveau : %d"
+
 #: src/gui/status.cpp:127
 #, fuzzy
 msgid "Stats"
@@ -813,50 +845,51 @@ msgstr "Attaque %+d"
 msgid "M.Defense:"
 msgstr "Défense %+d"
 
-#: src/gui/status.cpp:136
-#, c-format
+#: src/gui/status.cpp:137
+#, no-c-format
 msgid "% Accuracy:"
 msgstr ""
 
-#: src/gui/status.cpp:137
-#, c-format
+#: src/gui/status.cpp:139
+#, no-c-format
 msgid "% Evade:"
 msgstr ""
 
-#: src/gui/status.cpp:138
+#: src/gui/status.cpp:141
+#, no-c-format
 msgid "% Reflex:"
 msgstr ""
 
-#: src/gui/status.cpp:282
+#: src/gui/status.cpp:285
 #, fuzzy
 msgid "Strength"
 msgstr "Force :"
 
-#: src/gui/status.cpp:283
+#: src/gui/status.cpp:286
 #, fuzzy
 msgid "Agility"
 msgstr "Agilité :"
 
-#: src/gui/status.cpp:284
+#: src/gui/status.cpp:287
 #, fuzzy
 msgid "Vitality"
 msgstr "Vitalité :"
 
-#: src/gui/status.cpp:285
+#: src/gui/status.cpp:288
 #, fuzzy
 msgid "Intelligence"
 msgstr "Intelligence :"
 
-#: src/gui/status.cpp:286
+#: src/gui/status.cpp:289
 #, fuzzy
 msgid "Dexterity"
 msgstr "Dextérité :"
 
-#: src/gui/status.cpp:287
+#: src/gui/status.cpp:290
 msgid "Luck"
 msgstr ""
 
-#: src/gui/status.cpp:305
+#: src/gui/status.cpp:308
 #, c-format
 msgid "Remaining Status Points: %d"
 msgstr ""
@@ -894,27 +927,27 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:99
-msgid "Unnamed"
-msgstr ""
-
-#: src/main.cpp:769
+#: src/main.cpp:778
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/main.cpp:956
+#: src/main.cpp:965
 #, fuzzy
 msgid "Connecting to map server..."
 msgstr "Connexion..."
 
-#: src/main.cpp:964
+#: src/main.cpp:973
 msgid "Connecting to character server..."
 msgstr ""
 
-#: src/main.cpp:972
+#: src/main.cpp:981
 msgid "Connecting to account server..."
 msgstr ""
 
+#: src/resources/itemdb.cpp:99
+msgid "Unnamed"
+msgstr ""
+
 #~ msgid "Account and Character Management"
 #~ msgstr "Gestion du compte et du personnage"