summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Melquiond <guillaume.melquiond@gmail.com>2007-10-28 18:06:06 +0000
committerGuillaume Melquiond <guillaume.melquiond@gmail.com>2007-10-28 18:06:06 +0000
commit5b0d3767cf3fc549b3f675ad65a3339a73a54f32 (patch)
tree1264dd8a8e3ed4c9164308f8a331eb8b41d82b68
parentded755e810ef9ec94c65b0c4282d6419c84e21d0 (diff)
downloadmana-client-5b0d3767cf3fc549b3f675ad65a3339a73a54f32.tar.gz
mana-client-5b0d3767cf3fc549b3f675ad65a3339a73a54f32.tar.bz2
mana-client-5b0d3767cf3fc549b3f675ad65a3339a73a54f32.tar.xz
mana-client-5b0d3767cf3fc549b3f675ad65a3339a73a54f32.zip
Updated translation objects.
-rw-r--r--ChangeLog2
-rw-r--r--po/POTFILES.in1
-rw-r--r--po/de.po314
-rw-r--r--po/fr.po262
-rw-r--r--po/it.po310
-rw-r--r--po/nl.po255
-rw-r--r--po/pl.po248
-rw-r--r--po/tmw.pot247
8 files changed, 1044 insertions, 595 deletions
diff --git a/ChangeLog b/ChangeLog
index 64854e8b..9ab5bd10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
Fixed money handling. Fixed transaction handling.
* src/net/tradehandler.cpp, src/net/gameserver/player.h,
src/net/gameserver/player.cpp: Implemented missing trade messages.
+ * po/POTFILES.in: Marked trade window as translatable.
+ * po/tmw.pot, po/*.po: Updated translation objects.
2007-10-28 Eugenio Favalli <elvenprogrammer@gmail.com>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6b33de17..86b9de67 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -22,4 +22,5 @@ src/gui/setup_audio.cpp
src/gui/setup.cpp
src/gui/setup_joystick.cpp
src/gui/setup_video.cpp
+src/gui/trade.cpp
src/resources/itemdb.cpp
diff --git a/po/de.po b/po/de.po
index e7def322..597b0541 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,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: 2007-08-13 12:30+0200\n"
+"POT-Creation-Date: 2007-10-28 18:59+0100\n"
"PO-Revision-Date: 2007-08-27 20:39+0100\n"
"Last-Translator: Matthias Hartmann <hartmann.matthias@gmail.com>\n"
"Language-Team: German\n"
@@ -15,156 +15,169 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/gui/char_select.cpp:68
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:60
+msgid "Buy"
+msgstr ""
+
+#: src/gui/buy.cpp:57 src/gui/buy.cpp:234 src/gui/sell.cpp:61
+#: src/gui/sell.cpp:241
+#, c-format
+msgid "Price: %d GP / Total: %d GP"
+msgstr ""
+
+#: src/gui/buy.cpp:61 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
+#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:65
+msgid "Quit"
+msgstr "Beenden"
+
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:203 src/gui/buy.cpp:219
+#: src/gui/inventorywindow.cpp:75 src/gui/inventorywindow.cpp:156
+#: src/gui/sell.cpp:66 src/gui/sell.cpp:212 src/gui/sell.cpp:226
+#: src/gui/trade.cpp:84 src/gui/trade.cpp:171
+#, c-format
+msgid "Description: %s"
+msgstr "Beschreibung : %s"
+
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:205 src/gui/buy.cpp:220
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:154
+#: src/gui/sell.cpp:67 src/gui/sell.cpp:214 src/gui/sell.cpp:227
+#, c-format
+msgid "Effect: %s"
+msgstr "Effekt : %s"
+
+#: src/gui/char_select.cpp:71
msgid "Confirm"
msgstr "Bestätigen"
-#: src/gui/char_select.cpp:69
+#: src/gui/char_select.cpp:72
msgid "Are you sure you want to delete this character?"
msgstr "Bist du dir sicher ob du diese Spielfigur löschen möchtest?"
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:88
msgid "Select Character"
msgstr "Spielfigur auswählen"
-#: src/gui/char_select.cpp:89
-#: src/gui/item_amount.cpp:46
-#: src/gui/login.cpp:49
-#: src/gui/npclistdialog.cpp:41
-#: src/gui/npc_text.cpp:42
-#: src/gui/ok_dialog.cpp:37
-#: src/gui/quitdialog.cpp:44
-#: src/gui/serverdialog.cpp:138
+#: src/gui/char_select.cpp:92 src/gui/item_amount.cpp:47 src/gui/login.cpp:51
+#: src/gui/npclistdialog.cpp:41 src/gui/npc_text.cpp:42
+#: src/gui/ok_dialog.cpp:37 src/gui/quitdialog.cpp:44
+#: src/gui/serverdialog.cpp:110
msgid "Ok"
msgstr "Ok"
-#: src/gui/char_select.cpp:90
-#: src/gui/char_select.cpp:279
-#: src/gui/connection.cpp:59
-#: src/gui/item_amount.cpp:47
-#: src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:42
-#: src/gui/quitdialog.cpp:45
-#: src/gui/register.cpp:76
-#: src/gui/serverdialog.cpp:139
-#: src/gui/setup.cpp:51
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:260
+#: src/gui/connection.cpp:40 src/gui/item_amount.cpp:48 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:42 src/gui/quitdialog.cpp:45
+#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:55
+#: src/gui/trade.cpp:62
msgid "Cancel"
msgstr "Abbrechen"
-#: src/gui/char_select.cpp:91
+#: src/gui/char_select.cpp:94
msgid "New"
msgstr "Neu"
-#: src/gui/char_select.cpp:92
+#: src/gui/char_select.cpp:95
msgid "Delete"
msgstr "Löschen"
-#: src/gui/char_select.cpp:93
+#: src/gui/char_select.cpp:96
msgid "Previous"
msgstr "Vorherige"
-#: src/gui/char_select.cpp:94
+#: src/gui/char_select.cpp:97
msgid "Next"
msgstr "Nächste"
-#: src/gui/char_select.cpp:95
+#: src/gui/char_select.cpp:98
msgid "Unregister"
msgstr "Abmelden"
-#: src/gui/char_select.cpp:97
-#: src/gui/char_select.cpp:203
-#: src/gui/char_select.cpp:214
-#: src/gui/inventorywindow.cpp:66
-#: src/gui/inventorywindow.cpp:131
+#: src/gui/char_select.cpp:100 src/gui/char_select.cpp:189
+#: src/gui/char_select.cpp:200 src/gui/inventorywindow.cpp:73
+#: src/gui/inventorywindow.cpp:152 src/gui/trade.cpp:82 src/gui/trade.cpp:169
#, c-format
msgid "Name: %s"
msgstr "Name : %s"
-#: src/gui/char_select.cpp:98
-#: src/gui/char_select.cpp:204
-#: src/gui/char_select.cpp:215
+#: src/gui/char_select.cpp:101 src/gui/char_select.cpp:190
+#: src/gui/char_select.cpp:201
#, c-format
msgid "Level: %d"
msgstr "Level: %d"
-#: src/gui/char_select.cpp:99
-#: src/gui/char_select.cpp:205
-#: src/gui/char_select.cpp:216
+#: src/gui/char_select.cpp:102 src/gui/char_select.cpp:191
+#: src/gui/char_select.cpp:202
#, c-format
msgid "Money: %d"
msgstr "Geld: %d"
-#: src/gui/char_select.cpp:264
+#: src/gui/char_select.cpp:245
msgid "Create Character"
msgstr "Spielfigur erstellen"
-#: src/gui/char_select.cpp:271
-#: src/gui/login.cpp:44
-#: src/gui/register.cpp:67
+#: src/gui/char_select.cpp:252 src/gui/login.cpp:46 src/gui/register.cpp:67
msgid "Name:"
msgstr "Name :"
-#: src/gui/char_select.cpp:274
+#: src/gui/char_select.cpp:255
msgid "Hair Color:"
msgstr "Haarfarbe"
-#: src/gui/char_select.cpp:277
+#: src/gui/char_select.cpp:258
msgid "Hair Style:"
msgstr "Haarstil:"
-#: src/gui/char_select.cpp:278
+#: src/gui/char_select.cpp:259
msgid "Create"
msgstr "Erstellen"
-#: src/gui/char_select.cpp:281
+#: src/gui/char_select.cpp:262
msgid "Strength:"
msgstr "Stärke:"
-#: src/gui/char_select.cpp:282
+#: src/gui/char_select.cpp:263
msgid "Agility:"
msgstr "Agilität:"
-#: src/gui/char_select.cpp:283
+#: src/gui/char_select.cpp:264
msgid "Dexterity:"
msgstr "Geschicklichkeit:"
-#: src/gui/char_select.cpp:284
+#: src/gui/char_select.cpp:265
msgid "Vitality:"
msgstr "Vitalität:"
-#: src/gui/char_select.cpp:285
+#: src/gui/char_select.cpp:266
msgid "Intelligence:"
msgstr "Intelligenz:"
-#: src/gui/char_select.cpp:286
+#: src/gui/char_select.cpp:267
msgid "Willpower:"
msgstr "Willenskraft:"
-#: src/gui/char_select.cpp:287
+#: src/gui/char_select.cpp:268
msgid "Charisma:"
msgstr "Charisma:"
-#: src/gui/char_select.cpp:295
-#: src/gui/char_select.cpp:441
+#: src/gui/char_select.cpp:276 src/gui/char_select.cpp:424
#, c-format
msgid "Please distribute %d points"
msgstr "Bitte verteile %d points"
-#: src/gui/char_select.cpp:387
-#: src/gui/register.cpp:220
-#: src/gui/serverdialog.cpp:205
+#: src/gui/char_select.cpp:368 src/gui/register.cpp:220
+#: src/gui/serverdialog.cpp:171
msgid "Error"
msgstr "Fehler"
-#: src/gui/char_select.cpp:388
+#: src/gui/char_select.cpp:369
msgid "Your name needs to be at least 4 characters."
msgstr "Dein Name muss auch mindestens 4 Zeichen bestehen."
-#: src/gui/char_select.cpp:433
+#: src/gui/char_select.cpp:416
msgid "Character stats OK"
msgstr "Spielfigurattribute OK"
-#: src/gui/char_select.cpp:445
+#: src/gui/char_select.cpp:428
#, c-format
msgid "Please remove %d points"
msgstr "Bitte entferne %d punti"
@@ -177,101 +190,93 @@ msgstr "Ja"
msgid "No"
msgstr "Nein"
-#: src/gui/connection.cpp:62
+#: src/gui/connection.cpp:42
msgid "Connecting..."
msgstr "Verbinde..."
-#: src/gui/equipmentwindow.cpp:57
-#: src/gui/menuwindow.cpp:62
+#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:63
msgid "Equipment"
msgstr "Ausrüstung"
-#: src/gui/equipmentwindow.cpp:65
+#: src/gui/equipmentwindow.cpp:66
msgid "Unequip"
msgstr "Ablegen"
-#: src/gui/inventorywindow.cpp:48
-#: src/gui/menuwindow.cpp:63
+#: src/gui/inventorywindow.cpp:53 src/gui/menuwindow.cpp:64
msgid "Inventory"
msgstr "Inventar"
-#: src/gui/inventorywindow.cpp:56
-#: src/gui/inventorywindow.cpp:195
+#: src/gui/inventorywindow.cpp:64 src/gui/inventorywindow.cpp:197
msgid "Use"
msgstr "Nutzen"
-#: src/gui/inventorywindow.cpp:57
+#: src/gui/inventorywindow.cpp:65
msgid "Drop"
msgstr "Wegwerfen"
-#: src/gui/inventorywindow.cpp:67
-#: src/gui/inventorywindow.cpp:135
-#, c-format
-msgid "Description: %s"
-msgstr "Beschreibung : %s"
-
-#: src/gui/inventorywindow.cpp:68
-#: src/gui/inventorywindow.cpp:133
-#, c-format
-msgid "Effect: %s"
-msgstr "Effekt : %s"
+#: src/gui/inventorywindow.cpp:66
+msgid "Split"
+msgstr ""
-#: src/gui/inventorywindow.cpp:69
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:78 src/gui/inventorywindow.cpp:107
#, c-format
msgid "Total Weight: %d - Maximum Weight: %d"
msgstr "Gesamtgewicht : %d - Maximales Gewicht : %d"
-#: src/gui/inventorywindow.cpp:192
+#: src/gui/inventorywindow.cpp:194
msgid "Equip"
msgstr "Ausrüsten"
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:83
msgid "Select amount of items to trade."
msgstr "Wähle die Menge der Tauschgegenstände aus."
-#: src/gui/item_amount.cpp:83
+#: src/gui/item_amount.cpp:87
msgid "Select amount of items to drop."
msgstr "Wähle die Menge der zu wegwerfenden Gegenstände aus."
-#: src/gui/login.cpp:42
+#: src/gui/item_amount.cpp:91
+#, fuzzy
+msgid "Select amount of items to split."
+msgstr "Wähle die Menge der zu wegwerfenden Gegenstände aus."
+
+#: src/gui/login.cpp:44
msgid "Login"
msgstr "Anmelden"
-#: src/gui/login.cpp:45
-#: src/gui/register.cpp:68
+#: src/gui/login.cpp:47 src/gui/register.cpp:68
msgid "Password:"
msgstr "Passwort:"
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
msgid "Keep"
msgstr "Erinnern"
-#: src/gui/login.cpp:51
-#: src/gui/register.cpp:63
-#: src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:63 src/gui/register.cpp:75
msgid "Register"
msgstr "Registrieren"
-#: src/gui/menuwindow.cpp:61
+#: src/gui/menuwindow.cpp:62
msgid "Status"
msgstr "Status"
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:65
msgid "Skills"
msgstr "Fähigkeiten"
-#: src/gui/menuwindow.cpp:65
-#: src/gui/setup.cpp:44
+#: src/gui/menuwindow.cpp:66
+msgid "Shortcut"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:67 src/gui/setup.cpp:47
msgid "Setup"
msgstr "Einstellungen"
-#: src/gui/minimap.cpp:35
+#: src/gui/minimap.cpp:36
msgid "MiniMap"
msgstr "Minikarte"
-#: src/gui/npclistdialog.cpp:37
-#: src/gui/npc_text.cpp:37
+#: src/gui/npclistdialog.cpp:37 src/gui/npc_text.cpp:37
msgid "NPC"
msgstr "NPC"
@@ -289,9 +294,8 @@ msgstr "@@attack|Greife %s@@ an"
msgid "@@talk|Talk To NPC@@"
msgstr "@@talk|Rede mit NPC@@"
-#: src/gui/popupmenu.cpp:100
-#: src/gui/popupmenu.cpp:116
-#: src/gui/popupmenu.cpp:227
+#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:116
+#: src/gui/popupmenu.cpp:225
msgid "@@cancel|Cancel@@"
msgstr "@@cancel|Abbrechen@@"
@@ -300,27 +304,25 @@ msgstr "@@cancel|Abbrechen@@"
msgid "@@pickup|Pick Up %s@@"
msgstr "@@pickup|%s aufheben@@"
-#: src/gui/popupmenu.cpp:219
+#: src/gui/popupmenu.cpp:216
msgid "@@use|Equip@@"
msgstr "@@use|Ausrüsten@@"
-#: src/gui/popupmenu.cpp:222
+#: src/gui/popupmenu.cpp:219
msgid "@@use|Use@@"
msgstr "@@use|Nutzen@@"
-#: src/gui/popupmenu.cpp:224
+#: src/gui/popupmenu.cpp:220
msgid "@@drop|Drop@@"
msgstr "@@drop|Fallen lassen@@"
-#: src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:221
msgid "@@description|Description@@"
msgstr "@@description|Beschreibung@@"
-#: src/gui/quitdialog.cpp:37
-#: src/gui/quitdialog.cpp:40
-#: src/gui/quitdialog.cpp:41
-msgid "Quit"
-msgstr "Beenden"
+#: src/gui/popupmenu.cpp:223
+msgid "@@split|Split@@"
+msgstr ""
#: src/gui/quitdialog.cpp:42
msgid "Switch server"
@@ -362,18 +364,27 @@ msgstr "Der Nutzername muss kürzer als %d sein."
msgid "Passwords do not match."
msgstr "Passwörter stimmen nicht überein."
-#: src/gui/serverdialog.cpp:102
+#: src/gui/sell.cpp:47 src/gui/sell.cpp:64
+#, fuzzy
+msgid "Sell"
+msgstr "Fähigkeiten"
+
+#: src/gui/serverdialog.cpp:77
msgid "Choose your Mana World Server"
msgstr "Wähle deinen Mana World Spielserver"
-#: src/gui/serverdialog.cpp:104
+#: src/gui/serverdialog.cpp:79
msgid "Server:"
msgstr "Server:"
-#: src/gui/serverdialog.cpp:105
+#: src/gui/serverdialog.cpp:80
msgid "Port:"
msgstr "Port:"
+#: src/gui/serverdialog.cpp:172
+msgid "Please type both the address and the port of a server."
+msgstr ""
+
#: src/gui/setup_audio.cpp:42
msgid "Sound"
msgstr "Sound"
@@ -386,33 +397,31 @@ msgstr "Soundeffekt Lautstärke"
msgid "Music volume"
msgstr "Musik Lautstärke"
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:55
msgid "Apply"
msgstr "Anwenden"
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:55
msgid "Reset Windows"
msgstr "Fenster zurücksetzen"
-#: src/gui/setup.cpp:68
+#: src/gui/setup.cpp:72
msgid "Video"
msgstr "Video"
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:76
msgid "Audio"
msgstr "Audio"
-#: src/gui/setup.cpp:76
+#: src/gui/setup.cpp:80
msgid "Joystick"
msgstr "Joystick"
-#: src/gui/setup_joystick.cpp:38
-#: src/gui/setup_joystick.cpp:72
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:72
msgid "Press the button to start calibration"
msgstr "Knopf drücken um die Kalibrierung zu starten"
-#: src/gui/setup_joystick.cpp:39
-#: src/gui/setup_joystick.cpp:70
+#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:70
msgid "Calibrate"
msgstr "Kalibrieren"
@@ -460,18 +469,15 @@ msgstr "Scroll-Trägheit"
msgid "Ambient FX"
msgstr "Hintergrundmusik"
-#: src/gui/setup_video.cpp:209
-#: src/gui/setup_video.cpp:369
+#: src/gui/setup_video.cpp:209 src/gui/setup_video.cpp:369
msgid "off"
msgstr "Aus"
-#: src/gui/setup_video.cpp:212
-#: src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:212 src/gui/setup_video.cpp:372
msgid "low"
msgstr "Niedrig"
-#: src/gui/setup_video.cpp:215
-#: src/gui/setup_video.cpp:375
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:375
msgid "high"
msgstr "Hoch"
@@ -489,5 +495,53 @@ msgstr "Ändere OpenGL"
#: src/gui/setup_video.cpp:281
msgid "Applying change to OpenGL requires restart."
-msgstr "Änderungen an OpenGL werden erst nach einem Neustart der Anwendung übernommen."
+msgstr ""
+"Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
+"übernommen."
+
+#: src/gui/trade.cpp:61
+msgid "Add"
+msgstr ""
+#: src/gui/trade.cpp:63 src/gui/trade.cpp:65 src/gui/trade.cpp:181
+msgid "Propose trade"
+msgstr ""
+
+#: src/gui/trade.cpp:66 src/gui/trade.cpp:181
+#, fuzzy
+msgid "Confirm trade"
+msgstr "Bestätigen"
+
+#: src/gui/trade.cpp:76 src/gui/trade.cpp:118 src/gui/trade.cpp:132
+#, c-format
+msgid "You get %d GP."
+msgstr ""
+
+#: src/gui/trade.cpp:77
+msgid "You give:"
+msgstr ""
+
+#: src/gui/trade.cpp:80
+#, fuzzy
+msgid "Change"
+msgstr "Abbrechen"
+
+#: src/resources/itemdb.cpp:53
+#, c-format
+msgid "Attack %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:54
+#, c-format
+msgid "Defense %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:55
+#, c-format
+msgid "HP %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:56
+#, c-format
+msgid "MP %+d"
+msgstr ""
diff --git a/po/fr.po b/po/fr.po
index e9d99338..717edb46 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,146 +9,177 @@ 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: 2007-08-13 12:30+0200\n"
+"POT-Creation-Date: 2007-10-28 18:59+0100\n"
"PO-Revision-Date: 2007-08-13 13:14+0200\n"
"Last-Translator: Guillaume Melquiond <guillaume.melquiond@gmail.com>\n"
"Language-Team: French\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
-#: src/gui/char_select.cpp:68
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:60
+msgid "Buy"
+msgstr ""
+
+#: src/gui/buy.cpp:57 src/gui/buy.cpp:234 src/gui/sell.cpp:61
+#: src/gui/sell.cpp:241
+#, c-format
+msgid "Price: %d GP / Total: %d GP"
+msgstr ""
+
+#: src/gui/buy.cpp:61 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
+#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:65
+msgid "Quit"
+msgstr "Quitter"
+
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:203 src/gui/buy.cpp:219
+#: src/gui/inventorywindow.cpp:75 src/gui/inventorywindow.cpp:156
+#: src/gui/sell.cpp:66 src/gui/sell.cpp:212 src/gui/sell.cpp:226
+#: src/gui/trade.cpp:84 src/gui/trade.cpp:171
+#, c-format
+msgid "Description: %s"
+msgstr "Description : %s"
+
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:205 src/gui/buy.cpp:220
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:154
+#: src/gui/sell.cpp:67 src/gui/sell.cpp:214 src/gui/sell.cpp:227
+#, c-format
+msgid "Effect: %s"
+msgstr "Effet : %s"
+
+#: src/gui/char_select.cpp:71
msgid "Confirm"
msgstr "Confirmer"
-#: src/gui/char_select.cpp:69
+#: src/gui/char_select.cpp:72
msgid "Are you sure you want to delete this character?"
msgstr "Êtes-vous sûr de vouloir supprimer ce personnage ?"
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:88
msgid "Select Character"
msgstr "Choix du personnage"
-#: src/gui/char_select.cpp:89 src/gui/item_amount.cpp:46 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:92 src/gui/item_amount.cpp:47 src/gui/login.cpp:51
#: src/gui/npclistdialog.cpp:41 src/gui/npc_text.cpp:42
#: src/gui/ok_dialog.cpp:37 src/gui/quitdialog.cpp:44
-#: src/gui/serverdialog.cpp:138
+#: src/gui/serverdialog.cpp:110
msgid "Ok"
msgstr "Ok"
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:279
-#: src/gui/connection.cpp:59 src/gui/item_amount.cpp:47 src/gui/login.cpp:50
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:260
+#: src/gui/connection.cpp:40 src/gui/item_amount.cpp:48 src/gui/login.cpp:52
#: src/gui/npclistdialog.cpp:42 src/gui/quitdialog.cpp:45
-#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:139 src/gui/setup.cpp:51
+#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:55
+#: src/gui/trade.cpp:62
msgid "Cancel"
msgstr "Annuler"
-#: src/gui/char_select.cpp:91
+#: src/gui/char_select.cpp:94
msgid "New"
msgstr "Nouveau"
-#: src/gui/char_select.cpp:92
+#: src/gui/char_select.cpp:95
msgid "Delete"
msgstr "Supprimer"
-#: src/gui/char_select.cpp:93
+#: src/gui/char_select.cpp:96
msgid "Previous"
msgstr "Précédent"
-#: src/gui/char_select.cpp:94
+#: src/gui/char_select.cpp:97
msgid "Next"
msgstr "Suivant"
-#: src/gui/char_select.cpp:95
+#: src/gui/char_select.cpp:98
msgid "Unregister"
msgstr "Se désinscrire"
-#: src/gui/char_select.cpp:97 src/gui/char_select.cpp:203
-#: src/gui/char_select.cpp:214 src/gui/inventorywindow.cpp:66
-#: src/gui/inventorywindow.cpp:131
+#: src/gui/char_select.cpp:100 src/gui/char_select.cpp:189
+#: src/gui/char_select.cpp:200 src/gui/inventorywindow.cpp:73
+#: src/gui/inventorywindow.cpp:152 src/gui/trade.cpp:82 src/gui/trade.cpp:169
#, c-format
msgid "Name: %s"
msgstr "Nom : %s"
-#: src/gui/char_select.cpp:98 src/gui/char_select.cpp:204
-#: src/gui/char_select.cpp:215
+#: src/gui/char_select.cpp:101 src/gui/char_select.cpp:190
+#: src/gui/char_select.cpp:201
#, c-format
msgid "Level: %d"
msgstr "Niveau : %d"
-#: src/gui/char_select.cpp:99 src/gui/char_select.cpp:205
-#: src/gui/char_select.cpp:216
+#: src/gui/char_select.cpp:102 src/gui/char_select.cpp:191
+#: src/gui/char_select.cpp:202
#, c-format
msgid "Money: %d"
msgstr "Argent : %d"
-#: src/gui/char_select.cpp:264
+#: src/gui/char_select.cpp:245
msgid "Create Character"
msgstr "Création du personnage"
-#: src/gui/char_select.cpp:271 src/gui/login.cpp:44 src/gui/register.cpp:67
+#: src/gui/char_select.cpp:252 src/gui/login.cpp:46 src/gui/register.cpp:67
msgid "Name:"
msgstr "Nom :"
-#: src/gui/char_select.cpp:274
+#: src/gui/char_select.cpp:255
msgid "Hair Color:"
msgstr "Teinte :"
-#: src/gui/char_select.cpp:277
+#: src/gui/char_select.cpp:258
msgid "Hair Style:"
msgstr "Coiffure :"
-#: src/gui/char_select.cpp:278
+#: src/gui/char_select.cpp:259
msgid "Create"
msgstr "Créer"
-#: src/gui/char_select.cpp:281
+#: src/gui/char_select.cpp:262
msgid "Strength:"
msgstr "Force :"
-#: src/gui/char_select.cpp:282
+#: src/gui/char_select.cpp:263
msgid "Agility:"
msgstr "Agilité :"
-#: src/gui/char_select.cpp:283
+#: src/gui/char_select.cpp:264
msgid "Dexterity:"
msgstr "Dextérité :"
-#: src/gui/char_select.cpp:284
+#: src/gui/char_select.cpp:265
msgid "Vitality:"
msgstr "Vitalité :"
-#: src/gui/char_select.cpp:285
+#: src/gui/char_select.cpp:266
msgid "Intelligence:"
msgstr "Intelligence :"
-#: src/gui/char_select.cpp:286
+#: src/gui/char_select.cpp:267
msgid "Willpower:"
msgstr "Volonté :"
-#: src/gui/char_select.cpp:287
+#: src/gui/char_select.cpp:268
msgid "Charisma:"
msgstr "Charisme :"
-#: src/gui/char_select.cpp:295 src/gui/char_select.cpp:441
+#: src/gui/char_select.cpp:276 src/gui/char_select.cpp:424
#, c-format
msgid "Please distribute %d points"
msgstr "Veuillez distribuer %d points"
-#: src/gui/char_select.cpp:387 src/gui/register.cpp:220
-#: src/gui/serverdialog.cpp:205
+#: src/gui/char_select.cpp:368 src/gui/register.cpp:220
+#: src/gui/serverdialog.cpp:171
msgid "Error"
msgstr "Erreur"
-#: src/gui/char_select.cpp:388
+#: src/gui/char_select.cpp:369
msgid "Your name needs to be at least 4 characters."
msgstr "Votre nom doit faire 4 caractères au moins."
-#: src/gui/char_select.cpp:433
+#: src/gui/char_select.cpp:416
msgid "Character stats OK"
msgstr "Caractéristiques Ok"
-#: src/gui/char_select.cpp:445
+#: src/gui/char_select.cpp:428
#, c-format
msgid "Please remove %d points"
msgstr "Veuillez retirer %d points"
@@ -161,86 +192,89 @@ msgstr "Oui"
msgid "No"
msgstr "Non"
-#: src/gui/connection.cpp:62
+#: src/gui/connection.cpp:42
msgid "Connecting..."
msgstr "Connexion..."
-#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:62
+#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:63
msgid "Equipment"
msgstr "Équipement"
-#: src/gui/equipmentwindow.cpp:65
+#: src/gui/equipmentwindow.cpp:66
msgid "Unequip"
msgstr "Retirer"
-#: src/gui/inventorywindow.cpp:48 src/gui/menuwindow.cpp:63
+#: src/gui/inventorywindow.cpp:53 src/gui/menuwindow.cpp:64
msgid "Inventory"
msgstr "Inventaire"
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:195
+#: src/gui/inventorywindow.cpp:64 src/gui/inventorywindow.cpp:197
msgid "Use"
msgstr "Utiliser"
-#: src/gui/inventorywindow.cpp:57
+#: src/gui/inventorywindow.cpp:65
msgid "Drop"
msgstr "Lâcher"
-#: src/gui/inventorywindow.cpp:67 src/gui/inventorywindow.cpp:135
-#, c-format
-msgid "Description: %s"
-msgstr "Description : %s"
-
-#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:133
-#, c-format
-msgid "Effect: %s"
-msgstr "Effet : %s"
+#: src/gui/inventorywindow.cpp:66
+msgid "Split"
+msgstr ""
-#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:78 src/gui/inventorywindow.cpp:107
#, c-format
msgid "Total Weight: %d - Maximum Weight: %d"
msgstr "Poids total : %d - Poids maximal : %d"
-#: src/gui/inventorywindow.cpp:192
+#: src/gui/inventorywindow.cpp:194
msgid "Equip"
msgstr "Équiper"
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:83
msgid "Select amount of items to trade."
msgstr "Choisissez le nombre d'objets à troquer."
-#: src/gui/item_amount.cpp:83
+#: src/gui/item_amount.cpp:87
msgid "Select amount of items to drop."
msgstr "Choisissez le nombre d'objets à lâcher."
-#: src/gui/login.cpp:42
+#: src/gui/item_amount.cpp:91
+#, fuzzy
+msgid "Select amount of items to split."
+msgstr "Choisissez le nombre d'objets à lâcher."
+
+#: src/gui/login.cpp:44
msgid "Login"
msgstr "Connexion"
-#: src/gui/login.cpp:45 src/gui/register.cpp:68
+#: src/gui/login.cpp:47 src/gui/register.cpp:68
msgid "Password:"
msgstr "Mot de passe :"
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
msgid "Keep"
msgstr "Conserver"
-#: src/gui/login.cpp:51 src/gui/register.cpp:63 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:63 src/gui/register.cpp:75
msgid "Register"
msgstr "S'inscrire"
-#: src/gui/menuwindow.cpp:61
+#: src/gui/menuwindow.cpp:62
msgid "Status"
msgstr "Statut"
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:65
msgid "Skills"
msgstr "Compétences"
-#: src/gui/menuwindow.cpp:65 src/gui/setup.cpp:44
+#: src/gui/menuwindow.cpp:66
+msgid "Shortcut"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:67 src/gui/setup.cpp:47
msgid "Setup"
msgstr "Configuration"
-#: src/gui/minimap.cpp:35
+#: src/gui/minimap.cpp:36
msgid "MiniMap"
msgstr "Plan"
@@ -263,7 +297,7 @@ msgid "@@talk|Talk To NPC@@"
msgstr "@@talk|Parler au NPC@@"
#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:116
-#: src/gui/popupmenu.cpp:227
+#: src/gui/popupmenu.cpp:225
msgid "@@cancel|Cancel@@"
msgstr "@@cancel|Annuler@@"
@@ -272,26 +306,25 @@ msgstr "@@cancel|Annuler@@"
msgid "@@pickup|Pick Up %s@@"
msgstr "@@pickup|Ramasser %s@@"
-#: src/gui/popupmenu.cpp:219
+#: src/gui/popupmenu.cpp:216
msgid "@@use|Equip@@"
msgstr "@@use|Équiper@@"
-#: src/gui/popupmenu.cpp:222
+#: src/gui/popupmenu.cpp:219
msgid "@@use|Use@@"
msgstr "@@use|Utiliser@@"
-#: src/gui/popupmenu.cpp:224
+#: src/gui/popupmenu.cpp:220
msgid "@@drop|Drop@@"
msgstr "@@drop|Lâcher@@"
-#: src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:221
msgid "@@description|Description@@"
msgstr "@@description|Description@@"
-#: src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
-#: src/gui/quitdialog.cpp:41
-msgid "Quit"
-msgstr "Quitter"
+#: src/gui/popupmenu.cpp:223
+msgid "@@split|Split@@"
+msgstr ""
#: src/gui/quitdialog.cpp:42
msgid "Switch server"
@@ -333,18 +366,27 @@ 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/serverdialog.cpp:102
+#: src/gui/sell.cpp:47 src/gui/sell.cpp:64
+#, fuzzy
+msgid "Sell"
+msgstr "Compétences"
+
+#: src/gui/serverdialog.cpp:77
msgid "Choose your Mana World Server"
msgstr "Choisissez votre serveur The Mana World"
-#: src/gui/serverdialog.cpp:104
+#: src/gui/serverdialog.cpp:79
msgid "Server:"
msgstr "Serveur :"
-#: src/gui/serverdialog.cpp:105
+#: src/gui/serverdialog.cpp:80
msgid "Port:"
msgstr "Port :"
+#: src/gui/serverdialog.cpp:172
+msgid "Please type both the address and the port of a server."
+msgstr ""
+
#: src/gui/setup_audio.cpp:42
msgid "Sound"
msgstr "Son"
@@ -357,23 +399,23 @@ msgstr "Volume des effets sonores"
msgid "Music volume"
msgstr "Volume de la musique"
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:55
msgid "Apply"
msgstr "Appliquer"
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:55
msgid "Reset Windows"
msgstr "Rétablir les fenêtres"
-#: src/gui/setup.cpp:68
+#: src/gui/setup.cpp:72
msgid "Video"
msgstr "Vidéo"
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:76
msgid "Audio"
msgstr "Audio"
-#: src/gui/setup.cpp:76
+#: src/gui/setup.cpp:80
msgid "Joystick"
msgstr "Joystick"
@@ -447,7 +489,8 @@ msgstr "Passage en plein écran"
#: src/gui/setup_video.cpp:269
msgid "Restart needed for changes to take effect."
-msgstr "Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
+msgstr ""
+"Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
#: src/gui/setup_video.cpp:280
msgid "Changing OpenGL"
@@ -455,5 +498,52 @@ msgstr "Changement OpenGL"
#: src/gui/setup_video.cpp:281
msgid "Applying change to OpenGL requires restart."
-msgstr "Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
+msgstr ""
+"Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
+
+#: src/gui/trade.cpp:61
+msgid "Add"
+msgstr ""
+
+#: src/gui/trade.cpp:63 src/gui/trade.cpp:65 src/gui/trade.cpp:181
+msgid "Propose trade"
+msgstr ""
+
+#: src/gui/trade.cpp:66 src/gui/trade.cpp:181
+#, fuzzy
+msgid "Confirm trade"
+msgstr "Confirmer"
+
+#: src/gui/trade.cpp:76 src/gui/trade.cpp:118 src/gui/trade.cpp:132
+#, c-format
+msgid "You get %d GP."
+msgstr ""
+
+#: src/gui/trade.cpp:77
+msgid "You give:"
+msgstr ""
+
+#: src/gui/trade.cpp:80
+#, fuzzy
+msgid "Change"
+msgstr "Annuler"
+#: src/resources/itemdb.cpp:53
+#, c-format
+msgid "Attack %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:54
+#, c-format
+msgid "Defense %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:55
+#, c-format
+msgid "HP %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:56
+#, c-format
+msgid "MP %+d"
+msgstr ""
diff --git a/po/it.po b/po/it.po
index 5505c8bd..f0c28aec 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,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: 2007-08-13 12:30+0200\n"
+"POT-Creation-Date: 2007-10-28 18:59+0100\n"
"PO-Revision-Date: 2007-09-10 09:51+0100\n"
"Last-Translator: Eugenio Favalli <elvenprogrammer@gmail.com>\n"
"Language-Team: Italian\n"
@@ -17,156 +17,169 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/gui/char_select.cpp:68
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:60
+msgid "Buy"
+msgstr ""
+
+#: src/gui/buy.cpp:57 src/gui/buy.cpp:234 src/gui/sell.cpp:61
+#: src/gui/sell.cpp:241
+#, c-format
+msgid "Price: %d GP / Total: %d GP"
+msgstr ""
+
+#: src/gui/buy.cpp:61 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
+#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:65
+msgid "Quit"
+msgstr "Esci"
+
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:203 src/gui/buy.cpp:219
+#: src/gui/inventorywindow.cpp:75 src/gui/inventorywindow.cpp:156
+#: src/gui/sell.cpp:66 src/gui/sell.cpp:212 src/gui/sell.cpp:226
+#: src/gui/trade.cpp:84 src/gui/trade.cpp:171
+#, c-format
+msgid "Description: %s"
+msgstr "Descrizione : %s"
+
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:205 src/gui/buy.cpp:220
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:154
+#: src/gui/sell.cpp:67 src/gui/sell.cpp:214 src/gui/sell.cpp:227
+#, c-format
+msgid "Effect: %s"
+msgstr "Effetto : %s"
+
+#: src/gui/char_select.cpp:71
msgid "Confirm"
msgstr "Conferma"
-#: src/gui/char_select.cpp:69
+#: src/gui/char_select.cpp:72
msgid "Are you sure you want to delete this character?"
msgstr "Sei sicuro di voler cancellare questo personaggio?"
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:88
msgid "Select Character"
msgstr "Scelta Personaggio"
-#: src/gui/char_select.cpp:89
-#: src/gui/item_amount.cpp:46
-#: src/gui/login.cpp:49
-#: src/gui/npclistdialog.cpp:41
-#: src/gui/npc_text.cpp:42
-#: src/gui/ok_dialog.cpp:37
-#: src/gui/quitdialog.cpp:44
-#: src/gui/serverdialog.cpp:138
+#: src/gui/char_select.cpp:92 src/gui/item_amount.cpp:47 src/gui/login.cpp:51
+#: src/gui/npclistdialog.cpp:41 src/gui/npc_text.cpp:42
+#: src/gui/ok_dialog.cpp:37 src/gui/quitdialog.cpp:44
+#: src/gui/serverdialog.cpp:110
msgid "Ok"
msgstr "Ok"
-#: src/gui/char_select.cpp:90
-#: src/gui/char_select.cpp:279
-#: src/gui/connection.cpp:59
-#: src/gui/item_amount.cpp:47
-#: src/gui/login.cpp:50
-#: src/gui/npclistdialog.cpp:42
-#: src/gui/quitdialog.cpp:45
-#: src/gui/register.cpp:76
-#: src/gui/serverdialog.cpp:139
-#: src/gui/setup.cpp:51
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:260
+#: src/gui/connection.cpp:40 src/gui/item_amount.cpp:48 src/gui/login.cpp:52
+#: src/gui/npclistdialog.cpp:42 src/gui/quitdialog.cpp:45
+#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:55
+#: src/gui/trade.cpp:62
msgid "Cancel"
msgstr "Cancella"
-#: src/gui/char_select.cpp:91
+#: src/gui/char_select.cpp:94
msgid "New"
msgstr "Nuovo"
-#: src/gui/char_select.cpp:92
+#: src/gui/char_select.cpp:95
msgid "Delete"
msgstr "Elimina"
-#: src/gui/char_select.cpp:93
+#: src/gui/char_select.cpp:96
msgid "Previous"
msgstr "Precedente"
-#: src/gui/char_select.cpp:94
+#: src/gui/char_select.cpp:97
msgid "Next"
msgstr "Prossimo"
-#: src/gui/char_select.cpp:95
+#: src/gui/char_select.cpp:98
msgid "Unregister"
msgstr "Cancella registrazione"
-#: src/gui/char_select.cpp:97
-#: src/gui/char_select.cpp:203
-#: src/gui/char_select.cpp:214
-#: src/gui/inventorywindow.cpp:66
-#: src/gui/inventorywindow.cpp:131
+#: src/gui/char_select.cpp:100 src/gui/char_select.cpp:189
+#: src/gui/char_select.cpp:200 src/gui/inventorywindow.cpp:73
+#: src/gui/inventorywindow.cpp:152 src/gui/trade.cpp:82 src/gui/trade.cpp:169
#, c-format
msgid "Name: %s"
msgstr "Nome : %s"
-#: src/gui/char_select.cpp:98
-#: src/gui/char_select.cpp:204
-#: src/gui/char_select.cpp:215
+#: src/gui/char_select.cpp:101 src/gui/char_select.cpp:190
+#: src/gui/char_select.cpp:201
#, c-format
msgid "Level: %d"
msgstr "Livello: %d"
-#: src/gui/char_select.cpp:99
-#: src/gui/char_select.cpp:205
-#: src/gui/char_select.cpp:216
+#: src/gui/char_select.cpp:102 src/gui/char_select.cpp:191
+#: src/gui/char_select.cpp:202
#, c-format
msgid "Money: %d"
msgstr "Monete: %d"
-#: src/gui/char_select.cpp:264
+#: src/gui/char_select.cpp:245
msgid "Create Character"
msgstr "Crea Personaggio"
-#: src/gui/char_select.cpp:271
-#: src/gui/login.cpp:44
-#: src/gui/register.cpp:67
+#: src/gui/char_select.cpp:252 src/gui/login.cpp:46 src/gui/register.cpp:67
msgid "Name:"
msgstr "Nome :"
-#: src/gui/char_select.cpp:274
+#: src/gui/char_select.cpp:255
msgid "Hair Color:"
msgstr "Colore Capelli"
-#: src/gui/char_select.cpp:277
+#: src/gui/char_select.cpp:258
msgid "Hair Style:"
msgstr "Stile Capelli:"
-#: src/gui/char_select.cpp:278
+#: src/gui/char_select.cpp:259
msgid "Create"
msgstr "Create"
-#: src/gui/char_select.cpp:281
+#: src/gui/char_select.cpp:262
msgid "Strength:"
msgstr "Forza:"
-#: src/gui/char_select.cpp:282
+#: src/gui/char_select.cpp:263
msgid "Agility:"
msgstr "Agilità:"
-#: src/gui/char_select.cpp:283
+#: src/gui/char_select.cpp:264
msgid "Dexterity:"
msgstr "Destrezza:"
-#: src/gui/char_select.cpp:284
+#: src/gui/char_select.cpp:265
msgid "Vitality:"
msgstr "Vitalità:"
-#: src/gui/char_select.cpp:285
+#: src/gui/char_select.cpp:266
msgid "Intelligence:"
msgstr "Intelligenza:"
-#: src/gui/char_select.cpp:286
+#: src/gui/char_select.cpp:267
msgid "Willpower:"
msgstr "Volontà:"
-#: src/gui/char_select.cpp:287
+#: src/gui/char_select.cpp:268
msgid "Charisma:"
msgstr "Carisma:"
-#: src/gui/char_select.cpp:295
-#: src/gui/char_select.cpp:441
+#: src/gui/char_select.cpp:276 src/gui/char_select.cpp:424
#, c-format
msgid "Please distribute %d points"
msgstr "Prego distribuisci %d points"
-#: src/gui/char_select.cpp:387
-#: src/gui/register.cpp:220
-#: src/gui/serverdialog.cpp:205
+#: src/gui/char_select.cpp:368 src/gui/register.cpp:220
+#: src/gui/serverdialog.cpp:171
msgid "Error"
msgstr "Errore"
-#: src/gui/char_select.cpp:388
+#: src/gui/char_select.cpp:369
msgid "Your name needs to be at least 4 characters."
msgstr "Il tuo nome deve contenere almeno 4 caratteri."
-#: src/gui/char_select.cpp:433
+#: src/gui/char_select.cpp:416
msgid "Character stats OK"
msgstr "Statistiche personaggio OK"
-#: src/gui/char_select.cpp:445
+#: src/gui/char_select.cpp:428
#, c-format
msgid "Please remove %d points"
msgstr "Prego rimuovi %d punti"
@@ -179,101 +192,93 @@ msgstr "Si"
msgid "No"
msgstr "No"
-#: src/gui/connection.cpp:62
+#: src/gui/connection.cpp:42
msgid "Connecting..."
msgstr "Connessione..."
-#: src/gui/equipmentwindow.cpp:57
-#: src/gui/menuwindow.cpp:62
+#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:63
msgid "Equipment"
msgstr "Equipaggiamento"
-#: src/gui/equipmentwindow.cpp:65
+#: src/gui/equipmentwindow.cpp:66
msgid "Unequip"
msgstr "Rimuovi"
-#: src/gui/inventorywindow.cpp:48
-#: src/gui/menuwindow.cpp:63
+#: src/gui/inventorywindow.cpp:53 src/gui/menuwindow.cpp:64
msgid "Inventory"
msgstr "Inventario"
-#: src/gui/inventorywindow.cpp:56
-#: src/gui/inventorywindow.cpp:195
+#: src/gui/inventorywindow.cpp:64 src/gui/inventorywindow.cpp:197
msgid "Use"
msgstr "Usa"
-#: src/gui/inventorywindow.cpp:57
+#: src/gui/inventorywindow.cpp:65
msgid "Drop"
msgstr "Lascia"
-#: src/gui/inventorywindow.cpp:67
-#: src/gui/inventorywindow.cpp:135
-#, c-format
-msgid "Description: %s"
-msgstr "Descrizione : %s"
-
-#: src/gui/inventorywindow.cpp:68
-#: src/gui/inventorywindow.cpp:133
-#, c-format
-msgid "Effect: %s"
-msgstr "Effetto : %s"
+#: src/gui/inventorywindow.cpp:66
+msgid "Split"
+msgstr ""
-#: src/gui/inventorywindow.cpp:69
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:78 src/gui/inventorywindow.cpp:107
#, c-format
msgid "Total Weight: %d - Maximum Weight: %d"
msgstr "Peso totale : %d - Peso massimo : %d"
-#: src/gui/inventorywindow.cpp:192
+#: src/gui/inventorywindow.cpp:194
msgid "Equip"
msgstr "Equipaggia"
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:83
msgid "Select amount of items to trade."
msgstr "Seleziona la quantità di oggetti da scambiare."
-#: src/gui/item_amount.cpp:83
+#: src/gui/item_amount.cpp:87
msgid "Select amount of items to drop."
msgstr "Seleziona la quantità di oggetti da lasciare."
-#: src/gui/login.cpp:42
+#: src/gui/item_amount.cpp:91
+#, fuzzy
+msgid "Select amount of items to split."
+msgstr "Seleziona la quantità di oggetti da lasciare."
+
+#: src/gui/login.cpp:44
msgid "Login"
msgstr "Autenticazione"
-#: src/gui/login.cpp:45
-#: src/gui/register.cpp:68
+#: src/gui/login.cpp:47 src/gui/register.cpp:68
msgid "Password:"
msgstr "Password:"
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
msgid "Keep"
msgstr "Mantieni"
-#: src/gui/login.cpp:51
-#: src/gui/register.cpp:63
-#: src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:63 src/gui/register.cpp:75
msgid "Register"
msgstr "Registra"
-#: src/gui/menuwindow.cpp:61
+#: src/gui/menuwindow.cpp:62
msgid "Status"
msgstr "Stato"
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:65
msgid "Skills"
msgstr "Abilità"
-#: src/gui/menuwindow.cpp:65
-#: src/gui/setup.cpp:44
+#: src/gui/menuwindow.cpp:66
+msgid "Shortcut"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:67 src/gui/setup.cpp:47
msgid "Setup"
msgstr "Impostazioni"
-#: src/gui/minimap.cpp:35
+#: src/gui/minimap.cpp:36
msgid "MiniMap"
msgstr "Mini mappa"
-#: src/gui/npclistdialog.cpp:37
-#: src/gui/npc_text.cpp:37
+#: src/gui/npclistdialog.cpp:37 src/gui/npc_text.cpp:37
msgid "NPC"
msgstr "NPC"
@@ -291,9 +296,8 @@ msgstr "@@attack|Attacca %s@@"
msgid "@@talk|Talk To NPC@@"
msgstr "@@talk|Parla con NPC@@"
-#: src/gui/popupmenu.cpp:100
-#: src/gui/popupmenu.cpp:116
-#: src/gui/popupmenu.cpp:227
+#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:116
+#: src/gui/popupmenu.cpp:225
msgid "@@cancel|Cancel@@"
msgstr "@@cancel|Cancella@@"
@@ -302,27 +306,25 @@ msgstr "@@cancel|Cancella@@"
msgid "@@pickup|Pick Up %s@@"
msgstr "@@pickup|Raccogli %s@@"
-#: src/gui/popupmenu.cpp:219
+#: src/gui/popupmenu.cpp:216
msgid "@@use|Equip@@"
msgstr "@@use|Equipaggia@@"
-#: src/gui/popupmenu.cpp:222
+#: src/gui/popupmenu.cpp:219
msgid "@@use|Use@@"
msgstr "@@usa|Usa@@"
-#: src/gui/popupmenu.cpp:224
+#: src/gui/popupmenu.cpp:220
msgid "@@drop|Drop@@"
msgstr "@@drop|Lascia@@"
-#: src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:221
msgid "@@description|Description@@"
msgstr "@@description|Descrizione@@"
-#: src/gui/quitdialog.cpp:37
-#: src/gui/quitdialog.cpp:40
-#: src/gui/quitdialog.cpp:41
-msgid "Quit"
-msgstr "Esci"
+#: src/gui/popupmenu.cpp:223
+msgid "@@split|Split@@"
+msgstr ""
#: src/gui/quitdialog.cpp:42
msgid "Switch server"
@@ -364,18 +366,27 @@ msgstr "La password deve contenere meno di %d caratteri."
msgid "Passwords do not match."
msgstr "Le password non corrispondono."
-#: src/gui/serverdialog.cpp:102
+#: src/gui/sell.cpp:47 src/gui/sell.cpp:64
+#, fuzzy
+msgid "Sell"
+msgstr "Abilità"
+
+#: src/gui/serverdialog.cpp:77
msgid "Choose your Mana World Server"
msgstr "Scegli il tuo server Mana World"
-#: src/gui/serverdialog.cpp:104
+#: src/gui/serverdialog.cpp:79
msgid "Server:"
msgstr "Server:"
-#: src/gui/serverdialog.cpp:105
+#: src/gui/serverdialog.cpp:80
msgid "Port:"
msgstr "Porta:"
+#: src/gui/serverdialog.cpp:172
+msgid "Please type both the address and the port of a server."
+msgstr ""
+
#: src/gui/setup_audio.cpp:42
msgid "Sound"
msgstr "Suono"
@@ -388,33 +399,31 @@ msgstr "Volume effetti sonori"
msgid "Music volume"
msgstr "Volume musica"
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:55
msgid "Apply"
msgstr "Applica"
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:55
msgid "Reset Windows"
msgstr "Resetta finestre"
-#: src/gui/setup.cpp:68
+#: src/gui/setup.cpp:72
msgid "Video"
msgstr "Video"
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:76
msgid "Audio"
msgstr "Audio"
-#: src/gui/setup.cpp:76
+#: src/gui/setup.cpp:80
msgid "Joystick"
msgstr "Joystick"
-#: src/gui/setup_joystick.cpp:38
-#: src/gui/setup_joystick.cpp:72
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:72
msgid "Press the button to start calibration"
msgstr "Premi il pulsante per cominciare la calibrazione"
-#: src/gui/setup_joystick.cpp:39
-#: src/gui/setup_joystick.cpp:70
+#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:70
msgid "Calibrate"
msgstr "Calibra"
@@ -462,18 +471,15 @@ msgstr "Lentezza dello scroll"
msgid "Ambient FX"
msgstr "Suoni ambientali"
-#: src/gui/setup_video.cpp:209
-#: src/gui/setup_video.cpp:369
+#: src/gui/setup_video.cpp:209 src/gui/setup_video.cpp:369
msgid "off"
msgstr "Spento"
-#: src/gui/setup_video.cpp:212
-#: src/gui/setup_video.cpp:372
+#: src/gui/setup_video.cpp:212 src/gui/setup_video.cpp:372
msgid "low"
msgstr "Basso"
-#: src/gui/setup_video.cpp:215
-#: src/gui/setup_video.cpp:375
+#: src/gui/setup_video.cpp:215 src/gui/setup_video.cpp:375
msgid "high"
msgstr "Alto"
@@ -493,3 +499,49 @@ msgstr "Modifica OpenGL"
msgid "Applying change to OpenGL requires restart."
msgstr "Applicare le modifiche ad OpenGL richiede il riavvio."
+#: src/gui/trade.cpp:61
+msgid "Add"
+msgstr ""
+
+#: src/gui/trade.cpp:63 src/gui/trade.cpp:65 src/gui/trade.cpp:181
+msgid "Propose trade"
+msgstr ""
+
+#: src/gui/trade.cpp:66 src/gui/trade.cpp:181
+#, fuzzy
+msgid "Confirm trade"
+msgstr "Conferma"
+
+#: src/gui/trade.cpp:76 src/gui/trade.cpp:118 src/gui/trade.cpp:132
+#, c-format
+msgid "You get %d GP."
+msgstr ""
+
+#: src/gui/trade.cpp:77
+msgid "You give:"
+msgstr ""
+
+#: src/gui/trade.cpp:80
+#, fuzzy
+msgid "Change"
+msgstr "Cancella"
+
+#: src/resources/itemdb.cpp:53
+#, c-format
+msgid "Attack %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:54
+#, c-format
+msgid "Defense %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:55
+#, c-format
+msgid "HP %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:56
+#, c-format
+msgid "MP %+d"
+msgstr ""
diff --git a/po/nl.po b/po/nl.po
index e6dfc470..b674589b 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,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: 2007-08-13 12:30+0200\n"
+"POT-Creation-Date: 2007-10-28 18:59+0100\n"
"PO-Revision-Date: 2007-10-24 06:14+0000\n"
"Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
"Language-Team: Dutch\n"
@@ -17,138 +17,169 @@ msgstr ""
"X-Launchpad-Export-Date: 2007-10-24 11:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/gui/char_select.cpp:68
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:60
+msgid "Buy"
+msgstr ""
+
+#: src/gui/buy.cpp:57 src/gui/buy.cpp:234 src/gui/sell.cpp:61
+#: src/gui/sell.cpp:241
+#, c-format
+msgid "Price: %d GP / Total: %d GP"
+msgstr ""
+
+#: src/gui/buy.cpp:61 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
+#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:65
+msgid "Quit"
+msgstr "Afsluiten"
+
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:203 src/gui/buy.cpp:219
+#: src/gui/inventorywindow.cpp:75 src/gui/inventorywindow.cpp:156
+#: src/gui/sell.cpp:66 src/gui/sell.cpp:212 src/gui/sell.cpp:226
+#: src/gui/trade.cpp:84 src/gui/trade.cpp:171
+#, c-format
+msgid "Description: %s"
+msgstr "Beschrijving: %s"
+
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:205 src/gui/buy.cpp:220
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:154
+#: src/gui/sell.cpp:67 src/gui/sell.cpp:214 src/gui/sell.cpp:227
+#, c-format
+msgid "Effect: %s"
+msgstr "Effect: %s"
+
+#: src/gui/char_select.cpp:71
msgid "Confirm"
msgstr "Bevestigen"
-#: src/gui/char_select.cpp:69
+#: src/gui/char_select.cpp:72
msgid "Are you sure you want to delete this character?"
msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:88
msgid "Select Character"
msgstr "Kies Personage"
-#: src/gui/char_select.cpp:89 src/gui/item_amount.cpp:46 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:92 src/gui/item_amount.cpp:47 src/gui/login.cpp:51
#: src/gui/npclistdialog.cpp:41 src/gui/npc_text.cpp:42
#: src/gui/ok_dialog.cpp:37 src/gui/quitdialog.cpp:44
-#: src/gui/serverdialog.cpp:138
+#: src/gui/serverdialog.cpp:110
msgid "Ok"
msgstr "Oké"
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:279
-#: src/gui/connection.cpp:59 src/gui/item_amount.cpp:47 src/gui/login.cpp:50
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:260
+#: src/gui/connection.cpp:40 src/gui/item_amount.cpp:48 src/gui/login.cpp:52
#: src/gui/npclistdialog.cpp:42 src/gui/quitdialog.cpp:45
-#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:139 src/gui/setup.cpp:51
+#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:55
+#: src/gui/trade.cpp:62
msgid "Cancel"
msgstr "Annuleren"
-#: src/gui/char_select.cpp:91
+#: src/gui/char_select.cpp:94
msgid "New"
msgstr "Nieuw"
-#: src/gui/char_select.cpp:92
+#: src/gui/char_select.cpp:95
msgid "Delete"
msgstr "Verwijderen"
-#: src/gui/char_select.cpp:93
+#: src/gui/char_select.cpp:96
msgid "Previous"
msgstr "Vorige"
-#: src/gui/char_select.cpp:94
+#: src/gui/char_select.cpp:97
msgid "Next"
msgstr "Volgende"
-#: src/gui/char_select.cpp:95
+#: src/gui/char_select.cpp:98
msgid "Unregister"
msgstr "Registreren"
-#: src/gui/char_select.cpp:97 src/gui/char_select.cpp:203
-#: src/gui/char_select.cpp:214 src/gui/inventorywindow.cpp:66
-#: src/gui/inventorywindow.cpp:131
+#: src/gui/char_select.cpp:100 src/gui/char_select.cpp:189
+#: src/gui/char_select.cpp:200 src/gui/inventorywindow.cpp:73
+#: src/gui/inventorywindow.cpp:152 src/gui/trade.cpp:82 src/gui/trade.cpp:169
#, c-format
msgid "Name: %s"
msgstr "Naam: %s"
-#: src/gui/char_select.cpp:98 src/gui/char_select.cpp:204
-#: src/gui/char_select.cpp:215
+#: src/gui/char_select.cpp:101 src/gui/char_select.cpp:190
+#: src/gui/char_select.cpp:201
#, c-format
msgid "Level: %d"
msgstr "Level: %d"
-#: src/gui/char_select.cpp:99 src/gui/char_select.cpp:205
-#: src/gui/char_select.cpp:216
+#: src/gui/char_select.cpp:102 src/gui/char_select.cpp:191
+#: src/gui/char_select.cpp:202
#, c-format
msgid "Money: %d"
msgstr "Geld: %d"
-#: src/gui/char_select.cpp:264
+#: src/gui/char_select.cpp:245
msgid "Create Character"
msgstr "Personage Aanmaken"
-#: src/gui/char_select.cpp:271 src/gui/login.cpp:44 src/gui/register.cpp:67
+#: src/gui/char_select.cpp:252 src/gui/login.cpp:46 src/gui/register.cpp:67
msgid "Name:"
msgstr "Naam:"
-#: src/gui/char_select.cpp:274
+#: src/gui/char_select.cpp:255
msgid "Hair Color:"
msgstr "Haarkleur:"
-#: src/gui/char_select.cpp:277
+#: src/gui/char_select.cpp:258
msgid "Hair Style:"
msgstr "Haarstijl:"
-#: src/gui/char_select.cpp:278
+#: src/gui/char_select.cpp:259
msgid "Create"
msgstr "Aanmaken"
-#: src/gui/char_select.cpp:281
+#: src/gui/char_select.cpp:262
msgid "Strength:"
msgstr "Sterkte:"
-#: src/gui/char_select.cpp:282
+#: src/gui/char_select.cpp:263
msgid "Agility:"
msgstr "Agiliteit:"
-#: src/gui/char_select.cpp:283
+#: src/gui/char_select.cpp:264
msgid "Dexterity:"
msgstr "Dexteriteit:"
-#: src/gui/char_select.cpp:284
+#: src/gui/char_select.cpp:265
msgid "Vitality:"
msgstr "Vitaliteit:"
-#: src/gui/char_select.cpp:285
+#: src/gui/char_select.cpp:266
msgid "Intelligence:"
msgstr "Intelligentie:"
-#: src/gui/char_select.cpp:286
+#: src/gui/char_select.cpp:267
msgid "Willpower:"
msgstr "Wilskracht:"
-#: src/gui/char_select.cpp:287
+#: src/gui/char_select.cpp:268
msgid "Charisma:"
msgstr "Charisma:"
-#: src/gui/char_select.cpp:295 src/gui/char_select.cpp:441
+#: src/gui/char_select.cpp:276 src/gui/char_select.cpp:424
#, c-format
msgid "Please distribute %d points"
msgstr "Nog %d punten te verdelen"
-#: src/gui/char_select.cpp:387 src/gui/register.cpp:220
-#: src/gui/serverdialog.cpp:205
+#: src/gui/char_select.cpp:368 src/gui/register.cpp:220
+#: src/gui/serverdialog.cpp:171
msgid "Error"
msgstr "Fout"
-#: src/gui/char_select.cpp:388
+#: src/gui/char_select.cpp:369
msgid "Your name needs to be at least 4 characters."
msgstr "Je naam moet uit tenminste 4 tekens bestaan"
-#: src/gui/char_select.cpp:433
+#: src/gui/char_select.cpp:416
msgid "Character stats OK"
msgstr "Attributen van personage OK"
-#: src/gui/char_select.cpp:445
+#: src/gui/char_select.cpp:428
#, c-format
msgid "Please remove %d points"
msgstr "Verwijder alstublieft %d punten"
@@ -161,86 +192,89 @@ msgstr "Ja"
msgid "No"
msgstr "Nee"
-#: src/gui/connection.cpp:62
+#: src/gui/connection.cpp:42
msgid "Connecting..."
msgstr "Verbinden..."
-#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:62
+#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:63
msgid "Equipment"
msgstr "Uitrusting"
-#: src/gui/equipmentwindow.cpp:65
+#: src/gui/equipmentwindow.cpp:66
msgid "Unequip"
msgstr "Afdoen"
-#: src/gui/inventorywindow.cpp:48 src/gui/menuwindow.cpp:63
+#: src/gui/inventorywindow.cpp:53 src/gui/menuwindow.cpp:64
msgid "Inventory"
msgstr "Inventaris"
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:195
+#: src/gui/inventorywindow.cpp:64 src/gui/inventorywindow.cpp:197
msgid "Use"
msgstr "Gebruiken"
-#: src/gui/inventorywindow.cpp:57
+#: src/gui/inventorywindow.cpp:65
msgid "Drop"
msgstr "Neerleggen"
-#: src/gui/inventorywindow.cpp:67 src/gui/inventorywindow.cpp:135
-#, c-format
-msgid "Description: %s"
-msgstr "Beschrijving: %s"
-
-#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:133
-#, c-format
-msgid "Effect: %s"
-msgstr "Effect: %s"
+#: src/gui/inventorywindow.cpp:66
+msgid "Split"
+msgstr ""
-#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:78 src/gui/inventorywindow.cpp:107
#, c-format
msgid "Total Weight: %d - Maximum Weight: %d"
msgstr "Totaal gewicht: %d - Maximum gewicht: %d"
-#: src/gui/inventorywindow.cpp:192
+#: src/gui/inventorywindow.cpp:194
msgid "Equip"
msgstr "Uitrusten"
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:83
msgid "Select amount of items to trade."
msgstr "Selecteer het aantal exemplaren om te verhandelen"
-#: src/gui/item_amount.cpp:83
+#: src/gui/item_amount.cpp:87
msgid "Select amount of items to drop."
msgstr "Selecteer het aantal exemplaren om neer te leggen"
-#: src/gui/login.cpp:42
+#: src/gui/item_amount.cpp:91
+#, fuzzy
+msgid "Select amount of items to split."
+msgstr "Selecteer het aantal exemplaren om neer te leggen"
+
+#: src/gui/login.cpp:44
msgid "Login"
msgstr "Inloggen"
-#: src/gui/login.cpp:45 src/gui/register.cpp:68
+#: src/gui/login.cpp:47 src/gui/register.cpp:68
msgid "Password:"
msgstr "Wachtword:"
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
msgid "Keep"
msgstr "Behouden"
-#: src/gui/login.cpp:51 src/gui/register.cpp:63 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:63 src/gui/register.cpp:75
msgid "Register"
msgstr "Aanmelden"
-#: src/gui/menuwindow.cpp:61
+#: src/gui/menuwindow.cpp:62
msgid "Status"
msgstr "Status"
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:65
msgid "Skills"
msgstr "Vaardigheden"
-#: src/gui/menuwindow.cpp:65 src/gui/setup.cpp:44
+#: src/gui/menuwindow.cpp:66
+msgid "Shortcut"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:67 src/gui/setup.cpp:47
msgid "Setup"
msgstr "Configureren"
-#: src/gui/minimap.cpp:35
+#: src/gui/minimap.cpp:36
msgid "MiniMap"
msgstr "Kaartje"
@@ -263,7 +297,7 @@ msgid "@@talk|Talk To NPC@@"
msgstr "@@talk|Praat met NPC@@"
#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:116
-#: src/gui/popupmenu.cpp:227
+#: src/gui/popupmenu.cpp:225
msgid "@@cancel|Cancel@@"
msgstr "@@cancel|Annuleren@@"
@@ -272,26 +306,25 @@ msgstr "@@cancel|Annuleren@@"
msgid "@@pickup|Pick Up %s@@"
msgstr "@@pickup|%s oppakken@@"
-#: src/gui/popupmenu.cpp:219
+#: src/gui/popupmenu.cpp:216
msgid "@@use|Equip@@"
msgstr "@@use|Uitrusten@@"
-#: src/gui/popupmenu.cpp:222
+#: src/gui/popupmenu.cpp:219
msgid "@@use|Use@@"
msgstr "@@use|Gebruiken@@"
-#: src/gui/popupmenu.cpp:224
+#: src/gui/popupmenu.cpp:220
msgid "@@drop|Drop@@"
msgstr "@@drop|Neerleggen@@"
-#: src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:221
msgid "@@description|Description@@"
msgstr "@@description|Beschrijving@@"
-#: src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
-#: src/gui/quitdialog.cpp:41
-msgid "Quit"
-msgstr "Afsluiten"
+#: src/gui/popupmenu.cpp:223
+msgid "@@split|Split@@"
+msgstr ""
#: src/gui/quitdialog.cpp:42
msgid "Switch server"
@@ -333,18 +366,27 @@ msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan."
msgid "Passwords do not match."
msgstr "Wachtwoorden komen niet overeen."
-#: src/gui/serverdialog.cpp:102
+#: src/gui/sell.cpp:47 src/gui/sell.cpp:64
+#, fuzzy
+msgid "Sell"
+msgstr "Vaardigheden"
+
+#: src/gui/serverdialog.cpp:77
msgid "Choose your Mana World Server"
msgstr "Kies uw Mana World server"
-#: src/gui/serverdialog.cpp:104
+#: src/gui/serverdialog.cpp:79
msgid "Server:"
msgstr "Server:"
-#: src/gui/serverdialog.cpp:105
+#: src/gui/serverdialog.cpp:80
msgid "Port:"
msgstr "Poort:"
+#: src/gui/serverdialog.cpp:172
+msgid "Please type both the address and the port of a server."
+msgstr ""
+
#: src/gui/setup_audio.cpp:42
msgid "Sound"
msgstr "Geluid"
@@ -357,23 +399,23 @@ msgstr "Volume van geluiden"
msgid "Music volume"
msgstr "Muziek volume"
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:55
msgid "Apply"
msgstr "Toepassen"
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:55
msgid "Reset Windows"
msgstr "Vensters in beginstand"
-#: src/gui/setup.cpp:68
+#: src/gui/setup.cpp:72
msgid "Video"
msgstr "Video"
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:76
msgid "Audio"
msgstr "Audio"
-#: src/gui/setup.cpp:76
+#: src/gui/setup.cpp:80
msgid "Joystick"
msgstr "Joystick"
@@ -456,3 +498,50 @@ msgstr "Veranderen van OpenGL"
#: src/gui/setup_video.cpp:281
msgid "Applying change to OpenGL requires restart."
msgstr "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten"
+
+#: src/gui/trade.cpp:61
+msgid "Add"
+msgstr ""
+
+#: src/gui/trade.cpp:63 src/gui/trade.cpp:65 src/gui/trade.cpp:181
+msgid "Propose trade"
+msgstr ""
+
+#: src/gui/trade.cpp:66 src/gui/trade.cpp:181
+#, fuzzy
+msgid "Confirm trade"
+msgstr "Bevestigen"
+
+#: src/gui/trade.cpp:76 src/gui/trade.cpp:118 src/gui/trade.cpp:132
+#, c-format
+msgid "You get %d GP."
+msgstr ""
+
+#: src/gui/trade.cpp:77
+msgid "You give:"
+msgstr ""
+
+#: src/gui/trade.cpp:80
+#, fuzzy
+msgid "Change"
+msgstr "Annuleren"
+
+#: src/resources/itemdb.cpp:53
+#, c-format
+msgid "Attack %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:54
+#, c-format
+msgid "Defense %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:55
+#, c-format
+msgid "HP %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:56
+#, c-format
+msgid "MP %+d"
+msgstr ""
diff --git a/po/pl.po b/po/pl.po
index bb9959eb..4f8c869d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,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: 2007-09-08 16:15+0200\n"
+"POT-Creation-Date: 2007-10-28 18:59+0100\n"
"PO-Revision-Date: 2007-09-09 03:20+0200\n"
"Last-Translator: Zuzanna K. Filutowska <platyna@platinum.linux.pl>\n"
"Language-Team: <pl@li.org>\n"
@@ -18,138 +18,169 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: src/gui/char_select.cpp:68
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:60
+msgid "Buy"
+msgstr ""
+
+#: src/gui/buy.cpp:57 src/gui/buy.cpp:234 src/gui/sell.cpp:61
+#: src/gui/sell.cpp:241
+#, c-format
+msgid "Price: %d GP / Total: %d GP"
+msgstr ""
+
+#: src/gui/buy.cpp:61 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
+#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:65
+msgid "Quit"
+msgstr "Wyjdź"
+
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:203 src/gui/buy.cpp:219
+#: src/gui/inventorywindow.cpp:75 src/gui/inventorywindow.cpp:156
+#: src/gui/sell.cpp:66 src/gui/sell.cpp:212 src/gui/sell.cpp:226
+#: src/gui/trade.cpp:84 src/gui/trade.cpp:171
+#, c-format
+msgid "Description: %s"
+msgstr "Opis: %s"
+
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:205 src/gui/buy.cpp:220
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:154
+#: src/gui/sell.cpp:67 src/gui/sell.cpp:214 src/gui/sell.cpp:227
+#, c-format
+msgid "Effect: %s"
+msgstr "Efekt: %s"
+
+#: src/gui/char_select.cpp:71
msgid "Confirm"
msgstr "Potwierdź."
-#: src/gui/char_select.cpp:69
+#: src/gui/char_select.cpp:72
msgid "Are you sure you want to delete this character?"
msgstr "Czy jesteś pewien, że chcesz usunąć tę postać?"
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:88
msgid "Select Character"
msgstr "Wybierz postać."
-#: src/gui/char_select.cpp:89 src/gui/item_amount.cpp:47 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:92 src/gui/item_amount.cpp:47 src/gui/login.cpp:51
#: src/gui/npclistdialog.cpp:41 src/gui/npc_text.cpp:42
#: src/gui/ok_dialog.cpp:37 src/gui/quitdialog.cpp:44
-#: src/gui/serverdialog.cpp:138
+#: src/gui/serverdialog.cpp:110
msgid "Ok"
msgstr "Ok"
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:279
-#: src/gui/connection.cpp:59 src/gui/item_amount.cpp:48 src/gui/login.cpp:50
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:260
+#: src/gui/connection.cpp:40 src/gui/item_amount.cpp:48 src/gui/login.cpp:52
#: src/gui/npclistdialog.cpp:42 src/gui/quitdialog.cpp:45
-#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:139 src/gui/setup.cpp:51
+#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:55
+#: src/gui/trade.cpp:62
msgid "Cancel"
msgstr "Anuluj"
-#: src/gui/char_select.cpp:91
+#: src/gui/char_select.cpp:94
msgid "New"
msgstr "Nowa"
-#: src/gui/char_select.cpp:92
+#: src/gui/char_select.cpp:95
msgid "Delete"
msgstr "Usuń"
-#: src/gui/char_select.cpp:93
+#: src/gui/char_select.cpp:96
msgid "Previous"
msgstr "Poprzedni"
-#: src/gui/char_select.cpp:94
+#: src/gui/char_select.cpp:97
msgid "Next"
msgstr "Następny"
-#: src/gui/char_select.cpp:95
+#: src/gui/char_select.cpp:98
msgid "Unregister"
msgstr "Wyrejestruj"
-#: src/gui/char_select.cpp:97 src/gui/char_select.cpp:203
-#: src/gui/char_select.cpp:214 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:177
+#: src/gui/char_select.cpp:100 src/gui/char_select.cpp:189
+#: src/gui/char_select.cpp:200 src/gui/inventorywindow.cpp:73
+#: src/gui/inventorywindow.cpp:152 src/gui/trade.cpp:82 src/gui/trade.cpp:169
#, c-format
msgid "Name: %s"
msgstr "Imię: %s"
-#: src/gui/char_select.cpp:98 src/gui/char_select.cpp:204
-#: src/gui/char_select.cpp:215
+#: src/gui/char_select.cpp:101 src/gui/char_select.cpp:190
+#: src/gui/char_select.cpp:201
#, c-format
msgid "Level: %d"
msgstr "Poziom: %d"
-#: src/gui/char_select.cpp:99 src/gui/char_select.cpp:205
-#: src/gui/char_select.cpp:216
+#: src/gui/char_select.cpp:102 src/gui/char_select.cpp:191
+#: src/gui/char_select.cpp:202
#, c-format
msgid "Money: %d"
msgstr "Pieniądze: %d"
-#: src/gui/char_select.cpp:264
+#: src/gui/char_select.cpp:245
msgid "Create Character"
msgstr "Stwórz postać"
-#: src/gui/char_select.cpp:271 src/gui/login.cpp:44 src/gui/register.cpp:67
+#: src/gui/char_select.cpp:252 src/gui/login.cpp:46 src/gui/register.cpp:67
msgid "Name:"
msgstr "Imię:"
-#: src/gui/char_select.cpp:274
+#: src/gui/char_select.cpp:255
msgid "Hair Color:"
msgstr "Kolor włosów:"
-#: src/gui/char_select.cpp:277
+#: src/gui/char_select.cpp:258
msgid "Hair Style:"
msgstr "Fryzura:"
-#: src/gui/char_select.cpp:278
+#: src/gui/char_select.cpp:259
msgid "Create"
msgstr "Stwórz"
-#: src/gui/char_select.cpp:281
+#: src/gui/char_select.cpp:262
msgid "Strength:"
msgstr "Siła:"
-#: src/gui/char_select.cpp:282
+#: src/gui/char_select.cpp:263
msgid "Agility:"
msgstr "Zwinność:"
-#: src/gui/char_select.cpp:283
+#: src/gui/char_select.cpp:264
msgid "Dexterity:"
msgstr "Zręczność:"
-#: src/gui/char_select.cpp:284
+#: src/gui/char_select.cpp:265
msgid "Vitality:"
msgstr "Witalność:"
-#: src/gui/char_select.cpp:285
+#: src/gui/char_select.cpp:266
msgid "Intelligence:"
msgstr "Inteligencja:"
-#: src/gui/char_select.cpp:286
+#: src/gui/char_select.cpp:267
msgid "Willpower:"
msgstr "Siła woli:"
-#: src/gui/char_select.cpp:287
+#: src/gui/char_select.cpp:268
msgid "Charisma:"
msgstr "Charyzma:"
-#: src/gui/char_select.cpp:295 src/gui/char_select.cpp:441
+#: src/gui/char_select.cpp:276 src/gui/char_select.cpp:424
#, c-format
msgid "Please distribute %d points"
msgstr "Proszę wykorzystać %d punktów"
-#: src/gui/char_select.cpp:387 src/gui/register.cpp:220
-#: src/gui/serverdialog.cpp:205
+#: src/gui/char_select.cpp:368 src/gui/register.cpp:220
+#: src/gui/serverdialog.cpp:171
msgid "Error"
msgstr "Błąd"
-#: src/gui/char_select.cpp:388
+#: src/gui/char_select.cpp:369
msgid "Your name needs to be at least 4 characters."
msgstr "Twoje imię musi mieć conajmniej 4 znaki."
-#: src/gui/char_select.cpp:433
+#: src/gui/char_select.cpp:416
msgid "Character stats OK"
msgstr "Statystyki postaci w porządku."
-#: src/gui/char_select.cpp:445
+#: src/gui/char_select.cpp:428
#, c-format
msgid "Please remove %d points"
msgstr "Proszę usunąć %d punktów"
@@ -162,50 +193,40 @@ msgstr "Tak"
msgid "No"
msgstr "Nie"
-#: src/gui/connection.cpp:62
+#: src/gui/connection.cpp:42
msgid "Connecting..."
msgstr "Łączenie..."
-#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:62
+#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:63
msgid "Equipment"
msgstr "Ekwipunek"
-#: src/gui/equipmentwindow.cpp:65
+#: src/gui/equipmentwindow.cpp:66
msgid "Unequip"
msgstr "Zdejmij"
-#: src/gui/inventorywindow.cpp:50 src/gui/menuwindow.cpp:63
+#: src/gui/inventorywindow.cpp:53 src/gui/menuwindow.cpp:64
msgid "Inventory"
msgstr "Inwentarz"
-#: src/gui/inventorywindow.cpp:60 src/gui/inventorywindow.cpp:246
+#: src/gui/inventorywindow.cpp:64 src/gui/inventorywindow.cpp:197
msgid "Use"
msgstr "Użyj"
-#: src/gui/inventorywindow.cpp:61
+#: src/gui/inventorywindow.cpp:65
msgid "Drop"
msgstr "Upuść"
-#: src/gui/inventorywindow.cpp:62
+#: src/gui/inventorywindow.cpp:66
msgid "Split"
msgstr "Podziel"
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:181
-#, c-format
-msgid "Description: %s"
-msgstr "Opis: %s"
-
-#: src/gui/inventorywindow.cpp:77 src/gui/inventorywindow.cpp:179
-#, c-format
-msgid "Effect: %s"
-msgstr "Efekt: %s"
-
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:131
+#: src/gui/inventorywindow.cpp:78 src/gui/inventorywindow.cpp:107
#, c-format
msgid "Total Weight: %d - Maximum Weight: %d"
msgstr "Całkowita waga: %d - Maksymalna waga: %d"
-#: src/gui/inventorywindow.cpp:243
+#: src/gui/inventorywindow.cpp:194
msgid "Equip"
msgstr "Załóż"
@@ -222,35 +243,39 @@ msgstr "Wybierz ilość przedmiotów do upuszczenia."
msgid "Select amount of items to split."
msgstr "Wybierz ilość przedmiotów do upuszczenia."
-#: src/gui/login.cpp:42
+#: src/gui/login.cpp:44
msgid "Login"
msgstr "Użytkownik"
-#: src/gui/login.cpp:45 src/gui/register.cpp:68
+#: src/gui/login.cpp:47 src/gui/register.cpp:68
msgid "Password:"
msgstr "Hasło:"
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
msgid "Keep"
msgstr "Zachowaj"
-#: src/gui/login.cpp:51 src/gui/register.cpp:63 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:63 src/gui/register.cpp:75
msgid "Register"
msgstr "Rejestruj"
-#: src/gui/menuwindow.cpp:61
+#: src/gui/menuwindow.cpp:62
msgid "Status"
msgstr "Stan"
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:65
msgid "Skills"
msgstr "Zdolności"
-#: src/gui/menuwindow.cpp:65 src/gui/setup.cpp:44
+#: src/gui/menuwindow.cpp:66
+msgid "Shortcut"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:67 src/gui/setup.cpp:47
msgid "Setup"
msgstr "Konfiguracja"
-#: src/gui/minimap.cpp:35
+#: src/gui/minimap.cpp:36
msgid "MiniMap"
msgstr "MiniMapa"
@@ -273,7 +298,7 @@ msgid "@@talk|Talk To NPC@@"
msgstr "@@rozmowa|Rozmawiaj z NPC@@"
#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:116
-#: src/gui/popupmenu.cpp:231
+#: src/gui/popupmenu.cpp:225
msgid "@@cancel|Cancel@@"
msgstr "@@anulowanie|Anuluj@@"
@@ -282,31 +307,26 @@ msgstr "@@anulowanie|Anuluj@@"
msgid "@@pickup|Pick Up %s@@"
msgstr "@@podniesienie|Podnieś %s@@"
-#: src/gui/popupmenu.cpp:222
+#: src/gui/popupmenu.cpp:216
msgid "@@use|Equip@@"
msgstr "@@użycie|Załóż@@"
-#: src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:219
msgid "@@use|Use@@"
msgstr "@@użycie|Użyj@@"
-#: src/gui/popupmenu.cpp:226
+#: src/gui/popupmenu.cpp:220
msgid "@@drop|Drop@@"
msgstr "@@upuszczenie|Upuść@@"
-#: src/gui/popupmenu.cpp:227
+#: src/gui/popupmenu.cpp:221
msgid "@@description|Description@@"
msgstr "@@opis|Opis@@"
-#: src/gui/popupmenu.cpp:229
+#: src/gui/popupmenu.cpp:223
msgid "@@split|Split@@"
msgstr "@@rozdzielenie|Rozdziel@@"
-#: src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
-#: src/gui/quitdialog.cpp:41
-msgid "Quit"
-msgstr "Wyjdź"
-
#: src/gui/quitdialog.cpp:42
msgid "Switch server"
msgstr "Zmień serwer"
@@ -347,18 +367,27 @@ msgstr "Hasło nie może mieć więcej jak %d znaków."
msgid "Passwords do not match."
msgstr "Hasła nie zgadzają się."
-#: src/gui/serverdialog.cpp:102
+#: src/gui/sell.cpp:47 src/gui/sell.cpp:64
+#, fuzzy
+msgid "Sell"
+msgstr "Zdolności"
+
+#: src/gui/serverdialog.cpp:77
msgid "Choose your Mana World Server"
msgstr "Wybierz serwer Mana World"
-#: src/gui/serverdialog.cpp:104
+#: src/gui/serverdialog.cpp:79
msgid "Server:"
msgstr "Serwer:"
-#: src/gui/serverdialog.cpp:105
+#: src/gui/serverdialog.cpp:80
msgid "Port:"
msgstr "Port:"
+#: src/gui/serverdialog.cpp:172
+msgid "Please type both the address and the port of a server."
+msgstr ""
+
#: src/gui/setup_audio.cpp:42
msgid "Sound"
msgstr "Dźwięk"
@@ -371,23 +400,23 @@ msgstr "Głośność efektów dźwiękowych"
msgid "Music volume"
msgstr "Głośność muzyki"
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:55
msgid "Apply"
msgstr "Zastosuj"
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:55
msgid "Reset Windows"
msgstr "Zresetuj okna"
-#: src/gui/setup.cpp:68
+#: src/gui/setup.cpp:72
msgid "Video"
msgstr "Obraz"
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:76
msgid "Audio"
msgstr "Dźwięk"
-#: src/gui/setup.cpp:76
+#: src/gui/setup.cpp:80
msgid "Joystick"
msgstr "Joystick"
@@ -469,5 +498,52 @@ msgstr "Zmień ustawienia OpenGL"
#: src/gui/setup_video.cpp:281
msgid "Applying change to OpenGL requires restart."
-msgstr "Zastosowywanie zmian w konfiguracji OpenGL wymaga ponownego uruchomienia."
+msgstr ""
+"Zastosowywanie zmian w konfiguracji OpenGL wymaga ponownego uruchomienia."
+
+#: src/gui/trade.cpp:61
+msgid "Add"
+msgstr ""
+
+#: src/gui/trade.cpp:63 src/gui/trade.cpp:65 src/gui/trade.cpp:181
+msgid "Propose trade"
+msgstr ""
+
+#: src/gui/trade.cpp:66 src/gui/trade.cpp:181
+#, fuzzy
+msgid "Confirm trade"
+msgstr "Potwierdź."
+
+#: src/gui/trade.cpp:76 src/gui/trade.cpp:118 src/gui/trade.cpp:132
+#, c-format
+msgid "You get %d GP."
+msgstr ""
+
+#: src/gui/trade.cpp:77
+msgid "You give:"
+msgstr ""
+
+#: src/gui/trade.cpp:80
+#, fuzzy
+msgid "Change"
+msgstr "Anuluj"
+
+#: src/resources/itemdb.cpp:53
+#, c-format
+msgid "Attack %+d"
+msgstr ""
+#: src/resources/itemdb.cpp:54
+#, c-format
+msgid "Defense %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:55
+#, c-format
+msgid "HP %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:56
+#, c-format
+msgid "MP %+d"
+msgstr ""
diff --git a/po/tmw.pot b/po/tmw.pot
index 5877bec4..c5a203fb 100644
--- a/po/tmw.pot
+++ b/po/tmw.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2007-08-13 12:30+0200\n"
+"POT-Creation-Date: 2007-10-28 18:59+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,138 +16,169 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/gui/char_select.cpp:68
+#: src/gui/buy.cpp:43 src/gui/buy.cpp:60
+msgid "Buy"
+msgstr ""
+
+#: src/gui/buy.cpp:57 src/gui/buy.cpp:234 src/gui/sell.cpp:61
+#: src/gui/sell.cpp:241
+#, c-format
+msgid "Price: %d GP / Total: %d GP"
+msgstr ""
+
+#: src/gui/buy.cpp:61 src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
+#: src/gui/quitdialog.cpp:41 src/gui/sell.cpp:65
+msgid "Quit"
+msgstr ""
+
+#: src/gui/buy.cpp:62 src/gui/buy.cpp:203 src/gui/buy.cpp:219
+#: src/gui/inventorywindow.cpp:75 src/gui/inventorywindow.cpp:156
+#: src/gui/sell.cpp:66 src/gui/sell.cpp:212 src/gui/sell.cpp:226
+#: src/gui/trade.cpp:84 src/gui/trade.cpp:171
+#, c-format
+msgid "Description: %s"
+msgstr ""
+
+#: src/gui/buy.cpp:63 src/gui/buy.cpp:205 src/gui/buy.cpp:220
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:154
+#: src/gui/sell.cpp:67 src/gui/sell.cpp:214 src/gui/sell.cpp:227
+#, c-format
+msgid "Effect: %s"
+msgstr ""
+
+#: src/gui/char_select.cpp:71
msgid "Confirm"
msgstr ""
-#: src/gui/char_select.cpp:69
+#: src/gui/char_select.cpp:72
msgid "Are you sure you want to delete this character?"
msgstr ""
-#: src/gui/char_select.cpp:85
+#: src/gui/char_select.cpp:88
msgid "Select Character"
msgstr ""
-#: src/gui/char_select.cpp:89 src/gui/item_amount.cpp:46 src/gui/login.cpp:49
+#: src/gui/char_select.cpp:92 src/gui/item_amount.cpp:47 src/gui/login.cpp:51
#: src/gui/npclistdialog.cpp:41 src/gui/npc_text.cpp:42
#: src/gui/ok_dialog.cpp:37 src/gui/quitdialog.cpp:44
-#: src/gui/serverdialog.cpp:138
+#: src/gui/serverdialog.cpp:110
msgid "Ok"
msgstr ""
-#: src/gui/char_select.cpp:90 src/gui/char_select.cpp:279
-#: src/gui/connection.cpp:59 src/gui/item_amount.cpp:47 src/gui/login.cpp:50
+#: src/gui/char_select.cpp:93 src/gui/char_select.cpp:260
+#: src/gui/connection.cpp:40 src/gui/item_amount.cpp:48 src/gui/login.cpp:52
#: src/gui/npclistdialog.cpp:42 src/gui/quitdialog.cpp:45
-#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:139 src/gui/setup.cpp:51
+#: src/gui/register.cpp:76 src/gui/serverdialog.cpp:111 src/gui/setup.cpp:55
+#: src/gui/trade.cpp:62
msgid "Cancel"
msgstr ""
-#: src/gui/char_select.cpp:91
+#: src/gui/char_select.cpp:94
msgid "New"
msgstr ""
-#: src/gui/char_select.cpp:92
+#: src/gui/char_select.cpp:95
msgid "Delete"
msgstr ""
-#: src/gui/char_select.cpp:93
+#: src/gui/char_select.cpp:96
msgid "Previous"
msgstr ""
-#: src/gui/char_select.cpp:94
+#: src/gui/char_select.cpp:97
msgid "Next"
msgstr ""
-#: src/gui/char_select.cpp:95
+#: src/gui/char_select.cpp:98
msgid "Unregister"
msgstr ""
-#: src/gui/char_select.cpp:97 src/gui/char_select.cpp:203
-#: src/gui/char_select.cpp:214 src/gui/inventorywindow.cpp:66
-#: src/gui/inventorywindow.cpp:131
+#: src/gui/char_select.cpp:100 src/gui/char_select.cpp:189
+#: src/gui/char_select.cpp:200 src/gui/inventorywindow.cpp:73
+#: src/gui/inventorywindow.cpp:152 src/gui/trade.cpp:82 src/gui/trade.cpp:169
#, c-format
msgid "Name: %s"
msgstr ""
-#: src/gui/char_select.cpp:98 src/gui/char_select.cpp:204
-#: src/gui/char_select.cpp:215
+#: src/gui/char_select.cpp:101 src/gui/char_select.cpp:190
+#: src/gui/char_select.cpp:201
#, c-format
msgid "Level: %d"
msgstr ""
-#: src/gui/char_select.cpp:99 src/gui/char_select.cpp:205
-#: src/gui/char_select.cpp:216
+#: src/gui/char_select.cpp:102 src/gui/char_select.cpp:191
+#: src/gui/char_select.cpp:202
#, c-format
msgid "Money: %d"
msgstr ""
-#: src/gui/char_select.cpp:264
+#: src/gui/char_select.cpp:245
msgid "Create Character"
msgstr ""
-#: src/gui/char_select.cpp:271 src/gui/login.cpp:44 src/gui/register.cpp:67
+#: src/gui/char_select.cpp:252 src/gui/login.cpp:46 src/gui/register.cpp:67
msgid "Name:"
msgstr ""
-#: src/gui/char_select.cpp:274
+#: src/gui/char_select.cpp:255
msgid "Hair Color:"
msgstr ""
-#: src/gui/char_select.cpp:277
+#: src/gui/char_select.cpp:258
msgid "Hair Style:"
msgstr ""
-#: src/gui/char_select.cpp:278
+#: src/gui/char_select.cpp:259
msgid "Create"
msgstr ""
-#: src/gui/char_select.cpp:281
+#: src/gui/char_select.cpp:262
msgid "Strength:"
msgstr ""
-#: src/gui/char_select.cpp:282
+#: src/gui/char_select.cpp:263
msgid "Agility:"
msgstr ""
-#: src/gui/char_select.cpp:283
+#: src/gui/char_select.cpp:264
msgid "Dexterity:"
msgstr ""
-#: src/gui/char_select.cpp:284
+#: src/gui/char_select.cpp:265
msgid "Vitality:"
msgstr ""
-#: src/gui/char_select.cpp:285
+#: src/gui/char_select.cpp:266
msgid "Intelligence:"
msgstr ""
-#: src/gui/char_select.cpp:286
+#: src/gui/char_select.cpp:267
msgid "Willpower:"
msgstr ""
-#: src/gui/char_select.cpp:287
+#: src/gui/char_select.cpp:268
msgid "Charisma:"
msgstr ""
-#: src/gui/char_select.cpp:295 src/gui/char_select.cpp:441
+#: src/gui/char_select.cpp:276 src/gui/char_select.cpp:424
#, c-format
msgid "Please distribute %d points"
msgstr ""
-#: src/gui/char_select.cpp:387 src/gui/register.cpp:220
-#: src/gui/serverdialog.cpp:205
+#: src/gui/char_select.cpp:368 src/gui/register.cpp:220
+#: src/gui/serverdialog.cpp:171
msgid "Error"
msgstr ""
-#: src/gui/char_select.cpp:388
+#: src/gui/char_select.cpp:369
msgid "Your name needs to be at least 4 characters."
msgstr ""
-#: src/gui/char_select.cpp:433
+#: src/gui/char_select.cpp:416
msgid "Character stats OK"
msgstr ""
-#: src/gui/char_select.cpp:445
+#: src/gui/char_select.cpp:428
#, c-format
msgid "Please remove %d points"
msgstr ""
@@ -160,86 +191,88 @@ msgstr ""
msgid "No"
msgstr ""
-#: src/gui/connection.cpp:62
+#: src/gui/connection.cpp:42
msgid "Connecting..."
msgstr ""
-#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:62
+#: src/gui/equipmentwindow.cpp:57 src/gui/menuwindow.cpp:63
msgid "Equipment"
msgstr ""
-#: src/gui/equipmentwindow.cpp:65
+#: src/gui/equipmentwindow.cpp:66
msgid "Unequip"
msgstr ""
-#: src/gui/inventorywindow.cpp:48 src/gui/menuwindow.cpp:63
+#: src/gui/inventorywindow.cpp:53 src/gui/menuwindow.cpp:64
msgid "Inventory"
msgstr ""
-#: src/gui/inventorywindow.cpp:56 src/gui/inventorywindow.cpp:195
+#: src/gui/inventorywindow.cpp:64 src/gui/inventorywindow.cpp:197
msgid "Use"
msgstr ""
-#: src/gui/inventorywindow.cpp:57
+#: src/gui/inventorywindow.cpp:65
msgid "Drop"
msgstr ""
-#: src/gui/inventorywindow.cpp:67 src/gui/inventorywindow.cpp:135
-#, c-format
-msgid "Description: %s"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:133
-#, c-format
-msgid "Effect: %s"
+#: src/gui/inventorywindow.cpp:66
+msgid "Split"
msgstr ""
-#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:78 src/gui/inventorywindow.cpp:107
#, c-format
msgid "Total Weight: %d - Maximum Weight: %d"
msgstr ""
-#: src/gui/inventorywindow.cpp:192
+#: src/gui/inventorywindow.cpp:194
msgid "Equip"
msgstr ""
-#: src/gui/item_amount.cpp:79
+#: src/gui/item_amount.cpp:83
msgid "Select amount of items to trade."
msgstr ""
-#: src/gui/item_amount.cpp:83
+#: src/gui/item_amount.cpp:87
msgid "Select amount of items to drop."
msgstr ""
-#: src/gui/login.cpp:42
+#: src/gui/item_amount.cpp:91
+msgid "Select amount of items to split."
+msgstr ""
+
+#: src/gui/login.cpp:44
msgid "Login"
msgstr ""
-#: src/gui/login.cpp:45 src/gui/register.cpp:68
+#: src/gui/login.cpp:47 src/gui/register.cpp:68
msgid "Password:"
msgstr ""
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:50
msgid "Keep"
msgstr ""
-#: src/gui/login.cpp:51 src/gui/register.cpp:63 src/gui/register.cpp:75
+#: src/gui/login.cpp:53 src/gui/register.cpp:63 src/gui/register.cpp:75
msgid "Register"
msgstr ""
-#: src/gui/menuwindow.cpp:61
+#: src/gui/menuwindow.cpp:62
msgid "Status"
msgstr ""
-#: src/gui/menuwindow.cpp:64
+#: src/gui/menuwindow.cpp:65
msgid "Skills"
msgstr ""
-#: src/gui/menuwindow.cpp:65 src/gui/setup.cpp:44
+#: src/gui/menuwindow.cpp:66
+msgid "Shortcut"
+msgstr ""
+
+#: src/gui/menuwindow.cpp:67 src/gui/setup.cpp:47
msgid "Setup"
msgstr ""
-#: src/gui/minimap.cpp:35
+#: src/gui/minimap.cpp:36
msgid "MiniMap"
msgstr ""
@@ -262,7 +295,7 @@ msgid "@@talk|Talk To NPC@@"
msgstr ""
#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:116
-#: src/gui/popupmenu.cpp:227
+#: src/gui/popupmenu.cpp:225
msgid "@@cancel|Cancel@@"
msgstr ""
@@ -271,25 +304,24 @@ msgstr ""
msgid "@@pickup|Pick Up %s@@"
msgstr ""
-#: src/gui/popupmenu.cpp:219
+#: src/gui/popupmenu.cpp:216
msgid "@@use|Equip@@"
msgstr ""
-#: src/gui/popupmenu.cpp:222
+#: src/gui/popupmenu.cpp:219
msgid "@@use|Use@@"
msgstr ""
-#: src/gui/popupmenu.cpp:224
+#: src/gui/popupmenu.cpp:220
msgid "@@drop|Drop@@"
msgstr ""
-#: src/gui/popupmenu.cpp:225
+#: src/gui/popupmenu.cpp:221
msgid "@@description|Description@@"
msgstr ""
-#: src/gui/quitdialog.cpp:37 src/gui/quitdialog.cpp:40
-#: src/gui/quitdialog.cpp:41
-msgid "Quit"
+#: src/gui/popupmenu.cpp:223
+msgid "@@split|Split@@"
msgstr ""
#: src/gui/quitdialog.cpp:42
@@ -332,18 +364,26 @@ msgstr ""
msgid "Passwords do not match."
msgstr ""
-#: src/gui/serverdialog.cpp:102
+#: src/gui/sell.cpp:47 src/gui/sell.cpp:64
+msgid "Sell"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:77
msgid "Choose your Mana World Server"
msgstr ""
-#: src/gui/serverdialog.cpp:104
+#: src/gui/serverdialog.cpp:79
msgid "Server:"
msgstr ""
-#: src/gui/serverdialog.cpp:105
+#: src/gui/serverdialog.cpp:80
msgid "Port:"
msgstr ""
+#: src/gui/serverdialog.cpp:172
+msgid "Please type both the address and the port of a server."
+msgstr ""
+
#: src/gui/setup_audio.cpp:42
msgid "Sound"
msgstr ""
@@ -356,23 +396,23 @@ msgstr ""
msgid "Music volume"
msgstr ""
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:55
msgid "Apply"
msgstr ""
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:55
msgid "Reset Windows"
msgstr ""
-#: src/gui/setup.cpp:68
+#: src/gui/setup.cpp:72
msgid "Video"
msgstr ""
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:76
msgid "Audio"
msgstr ""
-#: src/gui/setup.cpp:76
+#: src/gui/setup.cpp:80
msgid "Joystick"
msgstr ""
@@ -455,3 +495,48 @@ msgstr ""
#: src/gui/setup_video.cpp:281
msgid "Applying change to OpenGL requires restart."
msgstr ""
+
+#: src/gui/trade.cpp:61
+msgid "Add"
+msgstr ""
+
+#: src/gui/trade.cpp:63 src/gui/trade.cpp:65 src/gui/trade.cpp:181
+msgid "Propose trade"
+msgstr ""
+
+#: src/gui/trade.cpp:66 src/gui/trade.cpp:181
+msgid "Confirm trade"
+msgstr ""
+
+#: src/gui/trade.cpp:76 src/gui/trade.cpp:118 src/gui/trade.cpp:132
+#, c-format
+msgid "You get %d GP."
+msgstr ""
+
+#: src/gui/trade.cpp:77
+msgid "You give:"
+msgstr ""
+
+#: src/gui/trade.cpp:80
+msgid "Change"
+msgstr ""
+
+#: src/resources/itemdb.cpp:53
+#, c-format
+msgid "Attack %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:54
+#, c-format
+msgid "Defense %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:55
+#, c-format
+msgid "HP %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:56
+#, c-format
+msgid "MP %+d"
+msgstr ""