summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
Diffstat (limited to 'po')
-rw-r--r--po/POTFILES.in4
-rw-r--r--po/ar.po243
-rw-r--r--po/ca.po237
-rw-r--r--po/cs.po238
-rw-r--r--po/da.po239
-rw-r--r--po/de.po239
-rw-r--r--po/en_GB.po239
-rw-r--r--po/eo.po237
-rw-r--r--po/es.po239
-rw-r--r--po/fi.po239
-rw-r--r--po/fr.po239
-rw-r--r--po/he.po239
-rw-r--r--po/hr.po238
-rw-r--r--po/id.po239
-rw-r--r--po/it.po239
-rw-r--r--po/ja.po238
-rw-r--r--po/nl.po239
-rw-r--r--po/pl.po239
-rw-r--r--po/pt.po244
-rw-r--r--po/pt_BR.po239
-rw-r--r--po/ru.po239
-rw-r--r--po/sk.po238
-rw-r--r--po/sv.po239
-rw-r--r--po/th.po238
-rw-r--r--po/zh_CN.po239
25 files changed, 4919 insertions, 821 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5f244d22..a3a9f01c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -37,7 +37,11 @@ src/gui/status.cpp
src/gui/trade.cpp
src/gui/updatewindow.cpp
src/net/playerhandler.cpp
+src/net/tradehandler.cpp
+src/resources/colordb.cpp
src/resources/itemdb.cpp
+src/resources/monsterdb.cpp
+src/resources/npcdb.cpp
src/being.cpp
src/game.cpp
src/main.cpp
diff --git a/po/ar.po b/po/ar.po
index baa6ca73..3710bf45 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
"PO-Revision-Date: 2008-07-16 18:28+0000\n"
"Last-Translator: صقر بن عبدالله <Unknown>\n"
"Language-Team: Arabic <ar@li.org>\n"
@@ -57,8 +57,8 @@ msgstr "بيع"
#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "إلغاء"
@@ -136,7 +136,7 @@ msgstr "إنشاء شخصيّة"
#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "الاسم:"
@@ -181,7 +181,7 @@ msgstr ""
msgid "Global announcement from "
msgstr ""
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
msgid "Server:"
msgstr "الخادوم:"
@@ -331,9 +331,8 @@ msgid "Cannot use a '/' as the prefix."
msgstr ""
#: ../src/gui/chat.cpp:663
-#, fuzzy
msgid "Changing prefix to "
-msgstr "تغيير OpenGL"
+msgstr ""
#: ../src/gui/chat.cpp:673
msgid "-- Help --"
@@ -539,12 +538,12 @@ msgstr "نعم"
msgid "No"
msgstr "لا"
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
msgid "Connecting..."
msgstr "جارِ الاتّصال..."
#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
msgid "Unable to load emotions"
msgstr ""
@@ -642,11 +641,11 @@ msgstr "انتقاء كمّيّة من المواد لإسقاطها."
msgid "Login"
msgstr "ولوج"
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
msgid "Password:"
msgstr "كلمة السرّ:"
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
msgid "Port:"
msgstr "المنفذ:"
@@ -658,8 +657,8 @@ msgstr ""
msgid "Keep"
msgstr "ترك"
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
msgid "Register"
msgstr "تسجيل"
@@ -766,49 +765,49 @@ msgstr "@@إسقاط|إسقاط@@"
msgid "@@description|Description@@"
msgstr "@@الوصف|الوصف@@"
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
msgid "Confirm:"
msgstr "تأكيد:"
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
msgid "Male"
msgstr ""
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
msgid "Female"
msgstr ""
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
#, c-format
msgid "RegisterDialog::register Username is %s"
msgstr ""
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
#, c-format
msgid "The username needs to be at least %d characters long."
msgstr "يجب أن يكون طول اسم المستخدم على الأقل %d محارف."
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
#, c-format
msgid "The username needs to be less than %d characters long."
msgstr "يجب أن يكون طول اسم المستخدم أقل من %d محارف."
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
#, c-format
msgid "The password needs to be at least %d characters long."
msgstr "يجب أن تكون طول كلمة السرّ على الأقل %d محارف."
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
#, c-format
msgid "The password needs to be less than %d characters long."
msgstr "يجب أن يكون طول كلمة السرّ أقل من %d محارف."
#. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
msgid "Passwords do not match."
msgstr "كلمات السرّ غير متطابقة."
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
msgid "Error"
msgstr "خطأ"
@@ -859,7 +858,6 @@ msgid "Players"
msgstr ""
#: ../src/gui/setup_colours.cpp:38
-#, fuzzy
msgid "Color:"
msgstr "لون الشعر:"
@@ -1229,58 +1227,58 @@ msgstr "أنت تقدّم:"
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
#, c-format
msgid "Couldn't load text file: %s"
msgstr ""
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
msgid "Updating..."
msgstr ""
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
msgid "Play"
msgstr ""
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
msgid "Couldn't load news"
msgstr ""
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
msgid "curl error "
msgstr ""
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
msgid " host: "
msgstr ""
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
#, c-format
msgid "Checksum for file %s failed: (%lx/%lx)"
msgstr ""
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
msgid "Unable to create mThread"
msgstr ""
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
msgid "##1 The update process is incomplete."
msgstr ""
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
msgid "##1 It is strongly recommended that"
msgstr ""
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
msgid "##1 you try again later"
msgstr ""
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
#, c-format
msgid "%s already here"
msgstr ""
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
msgid "Completed"
msgstr ""
@@ -1411,6 +1409,10 @@ msgstr ""
msgid "You're pining for the fjords."
msgstr ""
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
#: ../src/net/playerhandler.cpp:390
msgid "Equip arrows first"
msgstr ""
@@ -1420,10 +1422,177 @@ msgstr ""
msgid "0x013b: Unhandled message %i"
msgstr ""
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@تجارة|متاجرة مع %s@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "إلغاء"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:99
msgid "Unnamed"
msgstr ""
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
#: ../src/game.cpp:386
msgid "Screenshot saved to ~/"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 0f69f976..71f6c6da 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
"PO-Revision-Date: 2008-07-03 17:21+0000\n"
"Last-Translator: Habari <thomas.becerril@gmail.com>\n"
"Language-Team: Catalan <ca@li.org>\n"
@@ -56,8 +56,8 @@ msgstr ""
#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr ""
@@ -135,7 +135,7 @@ msgstr ""
#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "nom"
@@ -179,7 +179,7 @@ msgstr ""
msgid "Global announcement from "
msgstr ""
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
msgid "Server:"
msgstr ""
@@ -534,12 +534,12 @@ msgstr "si"
msgid "No"
msgstr "no"
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
msgid "Connecting..."
msgstr ""
#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
msgid "Unable to load emotions"
msgstr ""
@@ -633,11 +633,11 @@ msgstr ""
msgid "Login"
msgstr ""
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
msgid "Password:"
msgstr ""
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
msgid "Port:"
msgstr ""
@@ -649,8 +649,8 @@ msgstr ""
msgid "Keep"
msgstr ""
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
msgid "Register"
msgstr ""
@@ -753,49 +753,49 @@ msgstr ""
msgid "@@description|Description@@"
msgstr ""
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
msgid "Confirm:"
msgstr ""
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
msgid "Male"
msgstr ""
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
msgid "Female"
msgstr ""
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
#, c-format
msgid "RegisterDialog::register Username is %s"
msgstr ""
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
#, c-format
msgid "The username needs to be at least %d characters long."
msgstr ""
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
#, c-format
msgid "The username needs to be less than %d characters long."
msgstr ""
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
#, c-format
msgid "The password needs to be at least %d characters long."
msgstr ""
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
#, c-format
msgid "The password needs to be less than %d characters long."
msgstr ""
#. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
msgid "Passwords do not match."
msgstr ""
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
msgid "Error"
msgstr ""
@@ -1199,58 +1199,58 @@ msgstr ""
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
#, c-format
msgid "Couldn't load text file: %s"
msgstr ""
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
msgid "Updating..."
msgstr ""
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
msgid "Play"
msgstr ""
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
msgid "Couldn't load news"
msgstr ""
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
msgid "curl error "
msgstr ""
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
msgid " host: "
msgstr ""
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
#, c-format
msgid "Checksum for file %s failed: (%lx/%lx)"
msgstr ""
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
msgid "Unable to create mThread"
msgstr ""
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
msgid "##1 The update process is incomplete."
msgstr ""
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
msgid "##1 It is strongly recommended that"
msgstr ""
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
msgid "##1 you try again later"
msgstr ""
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
#, c-format
msgid "%s already here"
msgstr ""
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
msgid "Completed"
msgstr ""
@@ -1381,6 +1381,10 @@ msgstr ""
msgid "You're pining for the fjords."
msgstr ""
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
#: ../src/net/playerhandler.cpp:390
msgid "Equip arrows first"
msgstr ""
@@ -1390,10 +1394,175 @@ msgstr ""
msgid "0x013b: Unhandled message %i"
msgstr ""
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+msgid "Trade with "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:128
+msgid " cancelled"
+msgstr ""
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:99
msgid "Unnamed"
msgstr ""
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
#: ../src/game.cpp:386
msgid "Screenshot saved to ~/"
msgstr ""
diff --git a/po/cs.po b/po/cs.po
index b8e8c402..e046aad8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
"PO-Revision-Date: 2008-12-17 16:31+0000\n"
"Last-Translator: Lubos <alvinx12@centrum.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -56,8 +56,8 @@ msgstr "Prodej"
#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Zrušit"
@@ -136,7 +136,7 @@ msgstr "Vytvořit postavu"
#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Jméno:"
@@ -181,7 +181,7 @@ msgstr ""
msgid "Global announcement from "
msgstr ""
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
msgid "Server:"
msgstr "Server:"
@@ -538,12 +538,12 @@ msgstr "Ano"
msgid "No"
msgstr "Ne"
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
msgid "Connecting..."
msgstr "Připojuji se..."
#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
msgid "Unable to load emotions"
msgstr ""
@@ -639,11 +639,11 @@ msgstr "Vyberte množství zboží, které chcete upustit."
msgid "Login"
msgstr ""
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
msgid "Password:"
msgstr "Heslo:"
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
msgid "Port:"
msgstr "Port:"
@@ -655,8 +655,8 @@ msgstr ""
msgid "Keep"
msgstr ""
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
msgid "Register"
msgstr "Registrace"
@@ -760,49 +760,49 @@ msgstr ""
msgid "@@description|Description@@"
msgstr ""
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
msgid "Confirm:"
msgstr ""
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
msgid "Male"
msgstr "Muž"
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
msgid "Female"
msgstr "Žena"
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
#, c-format
msgid "RegisterDialog::register Username is %s"
msgstr ""
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
#, c-format
msgid "The username needs to be at least %d characters long."
msgstr "Uživatelské jméno musí být nejméně %d znaků dlouhé."
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
#, c-format
msgid "The username needs to be less than %d characters long."
msgstr "Uživatelské jméno musí být kratší než %d znaků."
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
#, c-format
msgid "The password needs to be at least %d characters long."
msgstr ""
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
#, c-format
msgid "The password needs to be less than %d characters long."
msgstr "Heslo musí být kratší než %d znaků."
#. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
msgid "Passwords do not match."
msgstr "Hesla se neshodují."
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
msgid "Error"
msgstr "Chyba"
@@ -1218,58 +1218,58 @@ msgstr ""
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
#, c-format
msgid "Couldn't load text file: %s"
msgstr ""
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
msgid "Updating..."
msgstr ""
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
msgid "Play"
msgstr ""
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
msgid "Couldn't load news"
msgstr ""
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
msgid "curl error "
msgstr ""
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
msgid " host: "
msgstr ""
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
#, c-format
msgid "Checksum for file %s failed: (%lx/%lx)"
msgstr ""
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
msgid "Unable to create mThread"
msgstr ""
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
msgid "##1 The update process is incomplete."
msgstr ""
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
msgid "##1 It is strongly recommended that"
msgstr ""
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
msgid "##1 you try again later"
msgstr ""
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
#, c-format
msgid "%s already here"
msgstr ""
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
msgid "Completed"
msgstr ""
@@ -1400,6 +1400,10 @@ msgstr ""
msgid "You're pining for the fjords."
msgstr ""
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
#: ../src/net/playerhandler.cpp:390
msgid "Equip arrows first"
msgstr ""
@@ -1409,10 +1413,176 @@ msgstr ""
msgid "0x013b: Unhandled message %i"
msgstr ""
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+msgid "Trade with "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Zrušit"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:99
msgid "Unnamed"
msgstr ""
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
#: ../src/game.cpp:386
msgid "Screenshot saved to ~/"
msgstr ""
diff --git a/po/da.po b/po/da.po
index b6468804..d3ffa234 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
"PO-Revision-Date: 2008-12-28 14:45+0000\n"
"Last-Translator: Niels L Ellegaard <niels.ellegaard@gmail.com>\n"
"Language-Team: Danish <da@li.org>\n"
@@ -57,8 +57,8 @@ msgstr "Sælg"
#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Fortryd"
@@ -136,7 +136,7 @@ msgstr "Lav figur."
#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Navn:"
@@ -181,7 +181,7 @@ msgstr ""
msgid "Global announcement from "
msgstr ""
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
msgid "Server:"
msgstr "Server:"
@@ -539,12 +539,12 @@ msgstr "Ja"
msgid "No"
msgstr "Nej"
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
msgid "Connecting..."
msgstr "Opretter forbindelse..."
#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
msgid "Unable to load emotions"
msgstr ""
@@ -642,11 +642,11 @@ msgstr "Vælg hvor mange du vil smide,"
msgid "Login"
msgstr "Log Ind"
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
msgid "Password:"
msgstr "Adgangskode:"
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
msgid "Port:"
msgstr "Port:"
@@ -658,8 +658,8 @@ msgstr ""
msgid "Keep"
msgstr "Behold"
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
msgid "Register"
msgstr "Registrer"
@@ -766,49 +766,49 @@ msgstr "@@drop|Smid@@"
msgid "@@description|Description@@"
msgstr "@@description|Beskrivelse@@"
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
msgid "Confirm:"
msgstr "Bekræft:"
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
msgid "Male"
msgstr "Mand"
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
msgid "Female"
msgstr "Kvinde"
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
#, c-format
msgid "RegisterDialog::register Username is %s"
msgstr ""
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
#, c-format
msgid "The username needs to be at least %d characters long."
msgstr "Brugernavnet skal mindst være %d bogstaver langt."
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
#, c-format
msgid "The username needs to be less than %d characters long."
msgstr "Brugernavnet skal være mindre end %d bogstaver langt."
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
#, c-format
msgid "The password needs to be at least %d characters long."
msgstr "Adgangskoden skal mindst være %d bogstaver langt."
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
#, c-format
msgid "The password needs to be less than %d characters long."
msgstr "Adgangskoden skal være mindre end %d bogstaver langt."
#. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
msgid "Passwords do not match."
msgstr "Adgangskoder stemmer ikke overens."
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
msgid "Error"
msgstr "Fejl"
@@ -1229,58 +1229,58 @@ msgstr "Du giver:"
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
#, c-format
msgid "Couldn't load text file: %s"
msgstr ""
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
msgid "Updating..."
msgstr ""
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
msgid "Play"
msgstr ""
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
msgid "Couldn't load news"
msgstr ""
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
msgid "curl error "
msgstr ""
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
msgid " host: "
msgstr ""
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
#, c-format
msgid "Checksum for file %s failed: (%lx/%lx)"
msgstr ""
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
msgid "Unable to create mThread"
msgstr ""
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
msgid "##1 The update process is incomplete."
msgstr ""
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
msgid "##1 It is strongly recommended that"
msgstr ""
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
msgid "##1 you try again later"
msgstr ""
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
#, c-format
msgid "%s already here"
msgstr ""
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
msgid "Completed"
msgstr ""
@@ -1411,6 +1411,10 @@ msgstr ""
msgid "You're pining for the fjords."
msgstr ""
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
#: ../src/net/playerhandler.cpp:390
msgid "Equip arrows first"
msgstr ""
@@ -1420,10 +1424,177 @@ msgstr ""
msgid "0x013b: Unhandled message %i"
msgstr ""
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@trade|Byt Med %s@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Fortryd"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:99
msgid "Unnamed"
msgstr ""
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
#: ../src/game.cpp:386
msgid "Screenshot saved to ~/"
msgstr ""
diff --git a/po/de.po b/po/de.po
index 36f02ac3..e8a39a98 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: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
"PO-Revision-Date: 2008-10-13 00:25+0000\n"
"Last-Translator: Aeneas Jaißle <Unknown>\n"
"Language-Team: German\n"
@@ -57,8 +57,8 @@ msgstr "Verkaufen"
#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Abbrechen"
@@ -136,7 +136,7 @@ msgstr "Charakter erstellen"
#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Name :"
@@ -181,7 +181,7 @@ msgstr ""
msgid "Global announcement from "
msgstr ""
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
msgid "Server:"
msgstr "Server:"
@@ -539,12 +539,12 @@ msgstr "Ja"
msgid "No"
msgstr "Nein"
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
msgid "Connecting..."
msgstr "Verbinde..."
#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
msgid "Unable to load emotions"
msgstr ""
@@ -642,11 +642,11 @@ msgstr "Wähle aus, wieviele Gegenstände Du wegwerfen möchtest."
msgid "Login"
msgstr "Anmelden"
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
msgid "Password:"
msgstr "Passwort:"
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
msgid "Port:"
msgstr "Port:"
@@ -658,8 +658,8 @@ msgstr ""
msgid "Keep"
msgstr "Erinnern"
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
msgid "Register"
msgstr "Registrieren"
@@ -766,49 +766,49 @@ msgstr "@@drop|Fallen lassen@@"
msgid "@@description|Description@@"
msgstr "@@description|Beschreibung@@"
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
msgid "Confirm:"
msgstr "Bestätigen:"
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
msgid "Male"
msgstr "Männlich"
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
msgid "Female"
msgstr "Weiblich"
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
#, c-format
msgid "RegisterDialog::register Username is %s"
msgstr ""
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
#, c-format
msgid "The username needs to be at least %d characters long."
msgstr "Der Nutzername muss aus mindestens %d Zeichen bestehen."
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
#, c-format
msgid "The username needs to be less than %d characters long."
msgstr "Der Nutzername muss kürzer als %d Zeichen sein."
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
#, c-format
msgid "The password needs to be at least %d characters long."
msgstr "Das Passwort muss aus mindestens %d bestehen."
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
#, c-format
msgid "The password needs to be less than %d characters long."
msgstr "Das Passwort muss kürzer als %d Zeichen sein."
#. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
msgid "Passwords do not match."
msgstr "Passwörter stimmen nicht überein."
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
msgid "Error"
msgstr "Fehler"
@@ -1231,58 +1231,58 @@ msgstr "Du gibst:"
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
#, c-format
msgid "Couldn't load text file: %s"
msgstr ""
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
msgid "Updating..."
msgstr ""
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
msgid "Play"
msgstr ""
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
msgid "Couldn't load news"
msgstr ""
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
msgid "curl error "
msgstr ""
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
msgid " host: "
msgstr ""
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
#, c-format
msgid "Checksum for file %s failed: (%lx/%lx)"
msgstr ""
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
msgid "Unable to create mThread"
msgstr ""
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
msgid "##1 The update process is incomplete."
msgstr ""
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
msgid "##1 It is strongly recommended that"
msgstr ""
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
msgid "##1 you try again later"
msgstr ""
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
#, c-format
msgid "%s already here"
msgstr ""
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
msgid "Completed"
msgstr ""
@@ -1413,6 +1413,10 @@ msgstr ""
msgid "You're pining for the fjords."
msgstr ""
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
#: ../src/net/playerhandler.cpp:390
msgid "Equip arrows first"
msgstr ""
@@ -1422,10 +1426,177 @@ msgstr ""
msgid "0x013b: Unhandled message %i"
msgstr ""
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@trade|Mit %s handeln@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Abbrechen"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:99
msgid "Unnamed"
msgstr ""
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
#: ../src/game.cpp:386
msgid "Screenshot saved to ~/"
msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index 3a4e4e56..93256370 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 16:41-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
"PO-Revision-Date: 2008-05-10 16:51+0000\n"
"Last-Translator: Me <Glich.Glich@googlemail.com>\n"
"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -57,8 +57,8 @@ msgstr "Sell"
#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Cancel"
@@ -136,7 +136,7 @@ msgstr "Create Character"
#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Name:"
@@ -181,7 +181,7 @@ msgstr ""
msgid "Global announcement from "
msgstr ""
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
msgid "Server:"
msgstr "Server:"
@@ -539,12 +539,12 @@ msgstr "Yes"
msgid "No"
msgstr "No"
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
msgid "Connecting..."
msgstr "Connecting..."
#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
msgid "Unable to load emotions"
msgstr ""
@@ -642,11 +642,11 @@ msgstr "Select amount of items to drop."
msgid "Login"
msgstr "Login"
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
msgid "Password:"
msgstr "Password:"
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
msgid "Port:"
msgstr "Port:"
@@ -658,8 +658,8 @@ msgstr ""
msgid "Keep"
msgstr "Keep"
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
msgid "Register"
msgstr "Register"
@@ -766,49 +766,49 @@ msgstr "@@drop|Drop@@"
msgid "@@description|Description@@"
msgstr "@@description|Description@@"
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
msgid "Confirm:"
msgstr "Confirm:"
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
msgid "Male"
msgstr ""
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
msgid "Female"
msgstr ""
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
#, c-format
msgid "RegisterDialog::register Username is %s"
msgstr ""
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
#, c-format
msgid "The username needs to be at least %d characters long."
msgstr "The username needs to be at least %d characters long."
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
#, c-format
msgid "The username needs to be less than %d characters long."
msgstr "The username needs to be less than %d characters long."
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
#, c-format
msgid "The password needs to be at least %d characters long."
msgstr "The password needs to be at least %d characters long."
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
#, c-format
msgid "The password needs to be less than %d characters long."
msgstr "The password needs to be less than %d characters long."
#. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
msgid "Passwords do not match."
msgstr "Passwords do not match."
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
msgid "Error"
msgstr "Error"
@@ -1227,58 +1227,58 @@ msgstr "You give:"
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
#, c-format
msgid "Couldn't load text file: %s"
msgstr ""
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
msgid "Updating..."
msgstr ""
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
msgid "Play"
msgstr ""
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
msgid "Couldn't load news"
msgstr ""
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
msgid "curl error "
msgstr ""
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
msgid " host: "
msgstr ""
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
#, c-format
msgid "Checksum for file %s failed: (%lx/%lx)"
msgstr ""
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
msgid "Unable to create mThread"
msgstr ""
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
msgid "##1 The update process is incomplete."
msgstr ""
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
msgid "##1 It is strongly recommended that"
msgstr ""
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
msgid "##1 you try again later"
msgstr ""
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
#, c-format
msgid "%s already here"
msgstr ""
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
msgid "Completed"
msgstr ""
@@ -1409,6 +1409,10 @@ msgstr ""
msgid "You're pining for the fjords."
msgstr ""
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
#: ../src/net/playerhandler.cpp:390
msgid "Equip arrows first"
msgstr ""
@@ -1418,10 +1422,177 @@ msgstr ""
msgid "0x013b: Unhandled message %i"
msgstr ""
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@trade|Trade With %s@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Cancel"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:99
msgid "Unnamed"
msgstr ""
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
#: ../src/game.cpp:386
msgid "Screenshot saved to ~/"
msgstr ""
diff --git a/po/eo.po b/po/eo.po
index 9b8d53a4..d7d627c8 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
"PO-Revision-Date: 2008-11-10 22:03+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Esperanto <eo@li.org>\n"
@@ -56,8 +56,8 @@ msgstr ""
#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr ""
@@ -135,7 +135,7 @@ msgstr ""
#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr ""
@@ -178,7 +178,7 @@ msgstr ""
msgid "Global announcement from "
msgstr ""
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
msgid "Server:"
msgstr ""
@@ -533,12 +533,12 @@ msgstr ""
msgid "No"
msgstr ""
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
msgid "Connecting..."
msgstr ""
#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
msgid "Unable to load emotions"
msgstr ""
@@ -631,11 +631,11 @@ msgstr ""
msgid "Login"
msgstr ""
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
msgid "Password:"
msgstr ""
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
msgid "Port:"
msgstr ""
@@ -647,8 +647,8 @@ msgstr ""
msgid "Keep"
msgstr ""
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
msgid "Register"
msgstr ""
@@ -751,49 +751,49 @@ msgstr ""
msgid "@@description|Description@@"
msgstr ""
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
msgid "Confirm:"
msgstr ""
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
msgid "Male"
msgstr ""
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
msgid "Female"
msgstr ""
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
#, c-format
msgid "RegisterDialog::register Username is %s"
msgstr ""
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
#, c-format
msgid "The username needs to be at least %d characters long."
msgstr ""
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
#, c-format
msgid "The username needs to be less than %d characters long."
msgstr ""
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
#, c-format
msgid "The password needs to be at least %d characters long."
msgstr ""
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
#, c-format
msgid "The password needs to be less than %d characters long."
msgstr ""
#. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
msgid "Passwords do not match."
msgstr ""
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
msgid "Error"
msgstr ""
@@ -1196,58 +1196,58 @@ msgstr ""
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
#, c-format
msgid "Couldn't load text file: %s"
msgstr ""
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
msgid "Updating..."
msgstr ""
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
msgid "Play"
msgstr ""
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
msgid "Couldn't load news"
msgstr ""
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
msgid "curl error "
msgstr ""
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
msgid " host: "
msgstr ""
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
#, c-format
msgid "Checksum for file %s failed: (%lx/%lx)"
msgstr ""
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
msgid "Unable to create mThread"
msgstr ""
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
msgid "##1 The update process is incomplete."
msgstr ""
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
msgid "##1 It is strongly recommended that"
msgstr ""
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
msgid "##1 you try again later"
msgstr ""
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
#, c-format
msgid "%s already here"
msgstr ""
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
msgid "Completed"
msgstr ""
@@ -1378,6 +1378,10 @@ msgstr ""
msgid "You're pining for the fjords."
msgstr ""
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
#: ../src/net/playerhandler.cpp:390
msgid "Equip arrows first"
msgstr ""
@@ -1387,10 +1391,175 @@ msgstr ""
msgid "0x013b: Unhandled message %i"
msgstr ""
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+msgid "Trade with "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:128
+msgid " cancelled"
+msgstr ""
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:99
msgid "Unnamed"
msgstr ""
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
#: ../src/game.cpp:386
msgid "Screenshot saved to ~/"
msgstr ""
diff --git a/po/es.po b/po/es.po
index a9750855..6e88cb57 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
"PO-Revision-Date: 2008-10-15 01:37+0000\n"
"Last-Translator: catalania <Unknown>\n"
"Language-Team: Spanish <es@li.org>\n"
@@ -57,8 +57,8 @@ msgstr "Vender"
#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Cancelar"
@@ -136,7 +136,7 @@ msgstr "Crear Personaje"
#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Nombre:"
@@ -181,7 +181,7 @@ msgstr ""
msgid "Global announcement from "
msgstr ""
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
msgid "Server:"
msgstr "Servidor:"
@@ -539,12 +539,12 @@ msgstr "Sí"
msgid "No"
msgstr "No"
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
msgid "Connecting..."
msgstr "Conectando…"
#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
msgid "Unable to load emotions"
msgstr ""
@@ -642,11 +642,11 @@ msgstr "Seleccione objetos para soltar."
msgid "Login"
msgstr "conectarse"
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
msgid "Password:"
msgstr "Contraseña:"
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
msgid "Port:"
msgstr "Puerto:"
@@ -658,8 +658,8 @@ msgstr ""
msgid "Keep"
msgstr "Mantener"
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
msgid "Register"
msgstr "Registrar"
@@ -766,49 +766,49 @@ msgstr "@@drop|Tirar@@"
msgid "@@description|Description@@"
msgstr "@@description|Descripción@@"
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
msgid "Confirm:"
msgstr "Confirmar:"
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
msgid "Male"
msgstr ""
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
msgid "Female"
msgstr ""
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
#, c-format
msgid "RegisterDialog::register Username is %s"
msgstr ""
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
#, c-format
msgid "The username needs to be at least %d characters long."
msgstr "El nombre de usuario debe tener al menos %d caracteres."
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
#, c-format
msgid "The username needs to be less than %d characters long."
msgstr "El nombre de usuario puede tener como máximo %d caracteres."
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
#, c-format
msgid "The password needs to be at least %d characters long."
msgstr "La contraseña debe tener al menos %d caracteres."
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
#, c-format
msgid "The password needs to be less than %d characters long."
msgstr "La contraseña puede tener como máximo %d caracteres."
#. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
msgid "Passwords do not match."
msgstr "Las contraseñas no coinciden."
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
msgid "Error"
msgstr "Error"
@@ -1229,58 +1229,58 @@ msgstr "Tu das:"
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
#, c-format
msgid "Couldn't load text file: %s"
msgstr ""
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
msgid "Updating..."
msgstr ""
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
msgid "Play"
msgstr ""
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
msgid "Couldn't load news"
msgstr ""
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
msgid "curl error "
msgstr ""
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
msgid " host: "
msgstr ""
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
#, c-format
msgid "Checksum for file %s failed: (%lx/%lx)"
msgstr ""
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
msgid "Unable to create mThread"
msgstr ""
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
msgid "##1 The update process is incomplete."
msgstr ""
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
msgid "##1 It is strongly recommended that"
msgstr ""
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
msgid "##1 you try again later"
msgstr ""
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
#, c-format
msgid "%s already here"
msgstr ""
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
msgid "Completed"
msgstr ""
@@ -1411,6 +1411,10 @@ msgstr ""
msgid "You're pining for the fjords."
msgstr ""
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
#: ../src/net/playerhandler.cpp:390
msgid "Equip arrows first"
msgstr ""
@@ -1420,10 +1424,177 @@ msgstr ""
msgid "0x013b: Unhandled message %i"
msgstr ""
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@trade|Comerciar con %s@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Cancelar"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:99
msgid "Unnamed"
msgstr ""
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
#: ../src/game.cpp:386
msgid "Screenshot saved to ~/"
msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 16f6e5ab..472fbd83 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
"PO-Revision-Date: 2008-12-30 10:23+0000\n"
"Last-Translator: ville-v <villev90@gmail.com>\n"
"Language-Team: Finnish <fi@li.org>\n"
@@ -57,8 +57,8 @@ msgstr "Myy"
#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Peru"
@@ -137,7 +137,7 @@ msgstr "Luo hahmo"
#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Nimi:"
@@ -182,7 +182,7 @@ msgstr ""
msgid "Global announcement from "
msgstr ""
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
msgid "Server:"
msgstr "Palvelin:"
@@ -540,12 +540,12 @@ msgstr "Kyllä"
msgid "No"
msgstr "Ei"
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
msgid "Connecting..."
msgstr "Yhdistetään..."
#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
msgid "Unable to load emotions"
msgstr ""
@@ -643,11 +643,11 @@ msgstr "Anna pudotettavien tavaroiden määrä."
msgid "Login"
msgstr "Kirjaudu sisään"
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
msgid "Password:"
msgstr "Salasana:"
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
msgid "Port:"
msgstr "Portti:"
@@ -659,8 +659,8 @@ msgstr ""
msgid "Keep"
msgstr ""
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
msgid "Register"
msgstr "Rekisteröidy"
@@ -767,49 +767,49 @@ msgstr "@@drop|Pudota maahan@@"
msgid "@@description|Description@@"
msgstr "@@description|Kuvaus@@"
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
msgid "Confirm:"
msgstr "Vahvista:"
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
msgid "Male"
msgstr "Miespuolinen"
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
msgid "Female"
msgstr "Naispuolinen"
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
#, c-format
msgid "RegisterDialog::register Username is %s"
msgstr ""
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
#, c-format
msgid "The username needs to be at least %d characters long."
msgstr "Käyttäjänimen tulee olla vähintään %d merkkiä pitkä"
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
#, c-format
msgid "The username needs to be less than %d characters long."
msgstr "Käyttäjänimen tulee olla alle %d merkkiä pitkä."
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
#, c-format
msgid "The password needs to be at least %d characters long."
msgstr "Salasanan tulee olla vähintään %d merkkiä pitkä"
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
#, c-format
msgid "The password needs to be less than %d characters long."
msgstr "Salasanan tulee olla alle %d merkkiä pitkä."
#. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
msgid "Passwords do not match."
msgstr "Salasanat eivät täsmää."
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
msgid "Error"
msgstr "Virhe"
@@ -1230,58 +1230,58 @@ msgstr "Annat:"
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
#, c-format
msgid "Couldn't load text file: %s"
msgstr ""
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
msgid "Updating..."
msgstr ""
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
msgid "Play"
msgstr ""
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
msgid "Couldn't load news"
msgstr ""
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
msgid "curl error "
msgstr ""
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
msgid " host: "
msgstr ""
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
#, c-format
msgid "Checksum for file %s failed: (%lx/%lx)"
msgstr ""
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
msgid "Unable to create mThread"
msgstr ""
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
msgid "##1 The update process is incomplete."
msgstr ""
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
msgid "##1 It is strongly recommended that"
msgstr ""
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
msgid "##1 you try again later"
msgstr ""
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
#, c-format
msgid "%s already here"
msgstr ""
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
msgid "Completed"
msgstr ""
@@ -1412,6 +1412,10 @@ msgstr ""
msgid "You're pining for the fjords."
msgstr ""
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
#: ../src/net/playerhandler.cpp:390
msgid "Equip arrows first"
msgstr ""
@@ -1421,10 +1425,177 @@ msgstr ""
msgid "0x013b: Unhandled message %i"
msgstr ""
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@trade|Vaihda tavaroita %s kanssa@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Peru"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:99
msgid "Unnamed"
msgstr ""
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
#: ../src/game.cpp:386
msgid "Screenshot saved to ~/"
msgstr ""
diff --git a/po/fr.po b/po/fr.po
index b1821706..7f522152 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: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
"PO-Revision-Date: 2008-12-26 10:43+0000\n"
"Last-Translator: Johan Serre <Unknown>\n"
"Language-Team: French\n"
@@ -58,8 +58,8 @@ msgstr "Vendre"
#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Annuler"
@@ -137,7 +137,7 @@ msgstr "Création du personnage"
#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Nom :"
@@ -182,7 +182,7 @@ msgstr ""
msgid "Global announcement from "
msgstr ""
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
msgid "Server:"
msgstr "Serveur :"
@@ -540,12 +540,12 @@ msgstr "Oui"
msgid "No"
msgstr "Non"
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
msgid "Connecting..."
msgstr "Connexion..."
#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
msgid "Unable to load emotions"
msgstr ""
@@ -643,11 +643,11 @@ msgstr "Choisissez le nombre d'objets à lâcher."
msgid "Login"
msgstr "Connexion"
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
msgid "Password:"
msgstr "Mot de passe :"
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
msgid "Port:"
msgstr "Port :"
@@ -659,8 +659,8 @@ msgstr ""
msgid "Keep"
msgstr "Conserver"
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
msgid "Register"
msgstr "S'inscrire"
@@ -767,49 +767,49 @@ msgstr "@@drop|Lâcher@@"
msgid "@@description|Description@@"
msgstr "@@description|Description@@"
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
msgid "Confirm:"
msgstr "Vérification :"
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
msgid "Male"
msgstr "Masculin"
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
msgid "Female"
msgstr "Féminin"
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
#, c-format
msgid "RegisterDialog::register Username is %s"
msgstr ""
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
#, c-format
msgid "The username needs to be at least %d characters long."
msgstr "Le nom d'utilisateur doit faire au moins %d caractères."
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
#, c-format
msgid "The username needs to be less than %d characters long."
msgstr "Le nom d'utilisateur doit faire moins de %d caractères."
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
#, c-format
msgid "The password needs to be at least %d characters long."
msgstr "Le mot de passe doit faire au moins %d caractères."
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
#, c-format
msgid "The password needs to be less than %d characters long."
msgstr "Le mot de passe doit faire moins de %d caractères."
#. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
msgid "Passwords do not match."
msgstr "Les deux mots de passe ne correspondent pas."
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
msgid "Error"
msgstr "Erreur"
@@ -1234,58 +1234,58 @@ msgstr "Vous donnez :"
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
#, c-format
msgid "Couldn't load text file: %s"
msgstr ""
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
msgid "Updating..."
msgstr ""
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
msgid "Play"
msgstr ""
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
msgid "Couldn't load news"
msgstr ""
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
msgid "curl error "
msgstr ""
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
msgid " host: "
msgstr ""
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
#, c-format
msgid "Checksum for file %s failed: (%lx/%lx)"
msgstr ""
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
msgid "Unable to create mThread"
msgstr ""
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
msgid "##1 The update process is incomplete."
msgstr ""
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
msgid "##1 It is strongly recommended that"
msgstr ""
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
msgid "##1 you try again later"
msgstr ""
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
#, c-format
msgid "%s already here"
msgstr ""
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
msgid "Completed"
msgstr ""
@@ -1416,6 +1416,10 @@ msgstr ""
msgid "You're pining for the fjords."
msgstr ""
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
#: ../src/net/playerhandler.cpp:390
msgid "Equip arrows first"
msgstr ""
@@ -1425,10 +1429,177 @@ msgstr ""
msgid "0x013b: Unhandled message %i"
msgstr ""
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@trade|Troquer avec %s@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Annuler"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:99
msgid "Unnamed"
msgstr ""
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
#: ../src/game.cpp:386
msgid "Screenshot saved to ~/"
msgstr ""
diff --git a/po/he.po b/po/he.po
index c8a6d581..a098c887 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
"PO-Revision-Date: 2008-10-20 00:23+0000\n"
"Last-Translator: Ddorda <d.dorda@gmail.com>\n"
"Language-Team: Hebrew <he@li.org>\n"
@@ -57,8 +57,8 @@ msgstr "מכר"
#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "ביטול"
@@ -137,7 +137,7 @@ msgstr "צור שחקן"
#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "שם:"
@@ -182,7 +182,7 @@ msgstr ""
msgid "Global announcement from "
msgstr ""
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
msgid "Server:"
msgstr "שרת:"
@@ -540,12 +540,12 @@ msgstr "כן"
msgid "No"
msgstr "לא"
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
msgid "Connecting..."
msgstr "מתחבר..."
#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
msgid "Unable to load emotions"
msgstr ""
@@ -643,11 +643,11 @@ msgstr "בחר כמות חפצים להשליך."
msgid "Login"
msgstr "התחברות"
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
msgid "Password:"
msgstr "סיסמה:"
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
msgid "Port:"
msgstr "פורט:"
@@ -659,8 +659,8 @@ msgstr ""
msgid "Keep"
msgstr ""
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
msgid "Register"
msgstr "הרשם"
@@ -767,49 +767,49 @@ msgstr "@@drop|השלך@@"
msgid "@@description|Description@@"
msgstr "@@description|תיאור@@"
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
msgid "Confirm:"
msgstr "אשר:"
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
msgid "Male"
msgstr "זכר"
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
msgid "Female"
msgstr "נקבה"
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
#, c-format
msgid "RegisterDialog::register Username is %s"
msgstr ""
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
#, c-format
msgid "The username needs to be at least %d characters long."
msgstr "שם המשתמש חייב להכיל לפחות %d תוים."
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
#, c-format
msgid "The username needs to be less than %d characters long."
msgstr "שם המשתמש חייב להכיל פחות מ-%d תוים."
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
#, c-format
msgid "The password needs to be at least %d characters long."
msgstr "הסיסמה חייבת להכיל לפחות %d תוים."
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
#, c-format
msgid "The password needs to be less than %d characters long."
msgstr "הסיסמה חייבת להכיל פחות מ-%d תוים."
#. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
msgid "Passwords do not match."
msgstr "הסיסמאות אינן תואמות."
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
msgid "Error"
msgstr "שגיאה"
@@ -1230,58 +1230,58 @@ msgstr "אתה נותן:"
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
#, c-format
msgid "Couldn't load text file: %s"
msgstr ""
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
msgid "Updating..."
msgstr ""
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
msgid "Play"
msgstr ""
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
msgid "Couldn't load news"
msgstr ""
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
msgid "curl error "
msgstr ""
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
msgid " host: "
msgstr ""
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
#, c-format
msgid "Checksum for file %s failed: (%lx/%lx)"
msgstr ""
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
msgid "Unable to create mThread"
msgstr ""
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
msgid "##1 The update process is incomplete."
msgstr ""
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
msgid "##1 It is strongly recommended that"
msgstr ""
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
msgid "##1 you try again later"
msgstr ""
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
#, c-format
msgid "%s already here"
msgstr ""
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
msgid "Completed"
msgstr ""
@@ -1412,6 +1412,10 @@ msgstr ""
msgid "You're pining for the fjords."
msgstr ""
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
#: ../src/net/playerhandler.cpp:390
msgid "Equip arrows first"
msgstr ""
@@ -1421,10 +1425,177 @@ msgstr ""
msgid "0x013b: Unhandled message %i"
msgstr ""
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@trade|סחור עם %s@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "ביטול"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:99
msgid "Unnamed"
msgstr ""
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
#: ../src/game.cpp:386
msgid "Screenshot saved to ~/"
msgstr ""
diff --git a/po/hr.po b/po/hr.po
index 786f7b3b..10e68177 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
"PO-Revision-Date: 2008-12-28 23:36+0000\n"
"Last-Translator: Dino Paskvan <dpaskvan@gmail.com>\n"
"Language-Team: Croatian <hr@li.org>\n"
@@ -56,8 +56,8 @@ msgstr ""
#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Poništi"
@@ -136,7 +136,7 @@ msgstr "Stvori Lika"
#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Ime:"
@@ -180,7 +180,7 @@ msgstr ""
msgid "Global announcement from "
msgstr ""
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
msgid "Server:"
msgstr ""
@@ -535,12 +535,12 @@ msgstr "Da"
msgid "No"
msgstr "Ne"
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
msgid "Connecting..."
msgstr "Spajanje..."
#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
msgid "Unable to load emotions"
msgstr ""
@@ -638,11 +638,11 @@ msgstr "Odaberi količinu predmeta za ispuštanje."
msgid "Login"
msgstr "Korisničko ime"
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
msgid "Password:"
msgstr "Lozinka"
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
msgid "Port:"
msgstr ""
@@ -654,8 +654,8 @@ msgstr ""
msgid "Keep"
msgstr ""
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
msgid "Register"
msgstr "Registriraj se"
@@ -760,49 +760,49 @@ msgstr ""
msgid "@@description|Description@@"
msgstr ""
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
msgid "Confirm:"
msgstr ""
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
msgid "Male"
msgstr "Muško"
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
msgid "Female"
msgstr "Žensko"
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
#, c-format
msgid "RegisterDialog::register Username is %s"
msgstr ""
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
#, c-format
msgid "The username needs to be at least %d characters long."
msgstr ""
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
#, c-format
msgid "The username needs to be less than %d characters long."
msgstr ""
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
#, c-format
msgid "The password needs to be at least %d characters long."
msgstr ""
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
#, c-format
msgid "The password needs to be less than %d characters long."
msgstr ""
#. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
msgid "Passwords do not match."
msgstr ""
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
msgid "Error"
msgstr "Greška"
@@ -1216,58 +1216,58 @@ msgstr ""
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
#, c-format
msgid "Couldn't load text file: %s"
msgstr ""
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
msgid "Updating..."
msgstr ""
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
msgid "Play"
msgstr ""
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
msgid "Couldn't load news"
msgstr ""
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
msgid "curl error "
msgstr ""
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
msgid " host: "
msgstr ""
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
#, c-format
msgid "Checksum for file %s failed: (%lx/%lx)"
msgstr ""
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
msgid "Unable to create mThread"
msgstr ""
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
msgid "##1 The update process is incomplete."
msgstr ""
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
msgid "##1 It is strongly recommended that"
msgstr ""
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
msgid "##1 you try again later"
msgstr ""
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
#, c-format
msgid "%s already here"
msgstr ""
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
msgid "Completed"
msgstr ""
@@ -1398,6 +1398,10 @@ msgstr ""
msgid "You're pining for the fjords."
msgstr ""
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
#: ../src/net/playerhandler.cpp:390
msgid "Equip arrows first"
msgstr ""
@@ -1407,10 +1411,176 @@ msgstr ""
msgid "0x013b: Unhandled message %i"
msgstr ""
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+msgid "Trade with "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Poništi"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:99
msgid "Unnamed"
msgstr ""
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
#: ../src/game.cpp:386
msgid "Screenshot saved to ~/"
msgstr ""
diff --git a/po/id.po b/po/id.po
index 084898ad..cf39a880 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
"PO-Revision-Date: 2008-03-26 09:11+0000\n"
"Last-Translator: ActiveFile <activefile@gmail.com>\n"
"Language-Team: Indonesian <id@li.org>\n"
@@ -57,8 +57,8 @@ msgstr "Jual"
#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Batal"
@@ -136,7 +136,7 @@ msgstr "Buat Karakter"
#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Nama:"
@@ -181,7 +181,7 @@ msgstr ""
msgid "Global announcement from "
msgstr ""
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
msgid "Server:"
msgstr "Server:"
@@ -539,12 +539,12 @@ msgstr "Ya"
msgid "No"
msgstr "Tidak"
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
msgid "Connecting..."
msgstr "Menyambung..."
#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
msgid "Unable to load emotions"
msgstr ""
@@ -642,11 +642,11 @@ msgstr "Pilih jumlah item yang mau di buang"
msgid "Login"
msgstr "Login"
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
msgid "Password:"
msgstr "Kata Sandi:"
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
msgid "Port:"
msgstr "Port:"
@@ -658,8 +658,8 @@ msgstr ""
msgid "Keep"
msgstr "Pertahankan"
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
msgid "Register"
msgstr "Mendaftar"
@@ -766,49 +766,49 @@ msgstr "@@drop|Buang@@"
msgid "@@description|Description@@"
msgstr "@@description|Deskripsi@@"
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
msgid "Confirm:"
msgstr "Konfirmasi:"
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
msgid "Male"
msgstr ""
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
msgid "Female"
msgstr ""
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
#, c-format
msgid "RegisterDialog::register Username is %s"
msgstr ""
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
#, c-format
msgid "The username needs to be at least %d characters long."
msgstr "Panjang username setidak-tidaknya %d karakter"
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
#, c-format
msgid "The username needs to be less than %d characters long."
msgstr ""
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
#, c-format
msgid "The password needs to be at least %d characters long."
msgstr "Panjang kata-sandi setidak-tidaknya %d karakter"
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
#, c-format
msgid "The password needs to be less than %d characters long."
msgstr ""
#. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
msgid "Passwords do not match."
msgstr "Kata sandi tidak sama."
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
msgid "Error"
msgstr "Kesalahan"
@@ -1229,58 +1229,58 @@ msgstr "Anda memberikan:"
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
#, c-format
msgid "Couldn't load text file: %s"
msgstr ""
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
msgid "Updating..."
msgstr ""
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
msgid "Play"
msgstr ""
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
msgid "Couldn't load news"
msgstr ""
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
msgid "curl error "
msgstr ""
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
msgid " host: "
msgstr ""
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
#, c-format
msgid "Checksum for file %s failed: (%lx/%lx)"
msgstr ""
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
msgid "Unable to create mThread"
msgstr ""
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
msgid "##1 The update process is incomplete."
msgstr ""
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
msgid "##1 It is strongly recommended that"
msgstr ""
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
msgid "##1 you try again later"
msgstr ""
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
#, c-format
msgid "%s already here"
msgstr ""
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
msgid "Completed"
msgstr ""
@@ -1411,6 +1411,10 @@ msgstr ""
msgid "You're pining for the fjords."
msgstr ""
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
#: ../src/net/playerhandler.cpp:390
msgid "Equip arrows first"
msgstr ""
@@ -1420,10 +1424,177 @@ msgstr ""
msgid "0x013b: Unhandled message %i"
msgstr ""
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@trade|Dagang Dengan %s@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Batal"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:99
msgid "Unnamed"
msgstr ""
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
#: ../src/game.cpp:386
msgid "Screenshot saved to ~/"
msgstr ""
diff --git a/po/it.po b/po/it.po
index 760ea76d..342aab49 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: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
"PO-Revision-Date: 2007-12-03 01:45+0000\n"
"Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
"Language-Team: Italian\n"
@@ -59,8 +59,8 @@ msgstr "Vendi"
#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Cancella"
@@ -138,7 +138,7 @@ msgstr "Crea Personaggio"
#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Nome :"
@@ -183,7 +183,7 @@ msgstr ""
msgid "Global announcement from "
msgstr ""
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
msgid "Server:"
msgstr "Server:"
@@ -541,12 +541,12 @@ msgstr "Si"
msgid "No"
msgstr "No"
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
msgid "Connecting..."
msgstr "Connessione..."
#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
msgid "Unable to load emotions"
msgstr ""
@@ -644,11 +644,11 @@ msgstr "Seleziona la quantità di oggetti da lasciare."
msgid "Login"
msgstr "Autenticazione"
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
msgid "Password:"
msgstr "Password:"
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
msgid "Port:"
msgstr "Porta:"
@@ -660,8 +660,8 @@ msgstr ""
msgid "Keep"
msgstr "Mantieni"
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
msgid "Register"
msgstr "Registra"
@@ -768,49 +768,49 @@ msgstr "@@drop|Lascia@@"
msgid "@@description|Description@@"
msgstr "@@description|Descrizione@@"
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
msgid "Confirm:"
msgstr "Conferma:"
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
msgid "Male"
msgstr ""
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
msgid "Female"
msgstr ""
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
#, c-format
msgid "RegisterDialog::register Username is %s"
msgstr ""
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
#, c-format
msgid "The username needs to be at least %d characters long."
msgstr "Il nome utente deve contenere almeno %d caratteri."
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
#, c-format
msgid "The username needs to be less than %d characters long."
msgstr "Il nome utente deve avere meno di %d caratteri."
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
#, c-format
msgid "The password needs to be at least %d characters long."
msgstr "La password deve essere lunga almeno %d caratteri."
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
#, c-format
msgid "The password needs to be less than %d characters long."
msgstr "La password deve contenere meno di %d caratteri."
#. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
msgid "Passwords do not match."
msgstr "Le password non corrispondono."
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
msgid "Error"
msgstr "Errore"
@@ -1231,58 +1231,58 @@ msgstr "Dai:"
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
#, c-format
msgid "Couldn't load text file: %s"
msgstr ""
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
msgid "Updating..."
msgstr ""
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
msgid "Play"
msgstr ""
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
msgid "Couldn't load news"
msgstr ""
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
msgid "curl error "
msgstr ""
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
msgid " host: "
msgstr ""
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
#, c-format
msgid "Checksum for file %s failed: (%lx/%lx)"
msgstr ""
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
msgid "Unable to create mThread"
msgstr ""
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
msgid "##1 The update process is incomplete."
msgstr ""
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
msgid "##1 It is strongly recommended that"
msgstr ""
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
msgid "##1 you try again later"
msgstr ""
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
#, c-format
msgid "%s already here"
msgstr ""
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
msgid "Completed"
msgstr ""
@@ -1413,6 +1413,10 @@ msgstr ""
msgid "You're pining for the fjords."
msgstr ""
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
#: ../src/net/playerhandler.cpp:390
msgid "Equip arrows first"
msgstr ""
@@ -1422,10 +1426,177 @@ msgstr ""
msgid "0x013b: Unhandled message %i"
msgstr ""
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@trade|Scambia Con %s@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Cancella"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:99
msgid "Unnamed"
msgstr ""
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
#: ../src/game.cpp:386
msgid "Screenshot saved to ~/"
msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 07dff2f7..2f0cf9f4 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
"PO-Revision-Date: 2008-06-28 16:27+0000\n"
"Last-Translator: fate <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n"
@@ -56,8 +56,8 @@ msgstr ""
#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "取消"
@@ -135,7 +135,7 @@ msgstr "キャラを作成"
#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "名前:"
@@ -180,7 +180,7 @@ msgstr ""
msgid "Global announcement from "
msgstr ""
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
msgid "Server:"
msgstr "サーバ:"
@@ -537,12 +537,12 @@ msgstr "はい"
msgid "No"
msgstr "いいえ"
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
msgid "Connecting..."
msgstr "接続しています..."
#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
msgid "Unable to load emotions"
msgstr ""
@@ -640,11 +640,11 @@ msgstr ""
msgid "Login"
msgstr "ログイン"
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
msgid "Password:"
msgstr "パスワード:"
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
msgid "Port:"
msgstr "ポート:"
@@ -656,8 +656,8 @@ msgstr ""
msgid "Keep"
msgstr ""
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
msgid "Register"
msgstr ""
@@ -762,49 +762,49 @@ msgstr ""
msgid "@@description|Description@@"
msgstr ""
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
msgid "Confirm:"
msgstr ""
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
msgid "Male"
msgstr ""
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
msgid "Female"
msgstr ""
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
#, c-format
msgid "RegisterDialog::register Username is %s"
msgstr ""
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
#, c-format
msgid "The username needs to be at least %d characters long."
msgstr ""
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
#, c-format
msgid "The username needs to be less than %d characters long."
msgstr ""
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
#, c-format
msgid "The password needs to be at least %d characters long."
msgstr ""
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
#, c-format
msgid "The password needs to be less than %d characters long."
msgstr ""
#. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
msgid "Passwords do not match."
msgstr "パスワードが一致していません。"
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
msgid "Error"
msgstr "エラー"
@@ -1218,58 +1218,58 @@ msgstr ""
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
#, c-format
msgid "Couldn't load text file: %s"
msgstr ""
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
msgid "Updating..."
msgstr ""
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
msgid "Play"
msgstr ""
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
msgid "Couldn't load news"
msgstr ""
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
msgid "curl error "
msgstr ""
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
msgid " host: "
msgstr ""
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
#, c-format
msgid "Checksum for file %s failed: (%lx/%lx)"
msgstr ""
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
msgid "Unable to create mThread"
msgstr ""
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
msgid "##1 The update process is incomplete."
msgstr ""
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
msgid "##1 It is strongly recommended that"
msgstr ""
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
msgid "##1 you try again later"
msgstr ""
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
#, c-format
msgid "%s already here"
msgstr ""
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
msgid "Completed"
msgstr ""
@@ -1400,6 +1400,10 @@ msgstr ""
msgid "You're pining for the fjords."
msgstr ""
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
#: ../src/net/playerhandler.cpp:390
msgid "Equip arrows first"
msgstr ""
@@ -1409,10 +1413,176 @@ msgstr ""
msgid "0x013b: Unhandled message %i"
msgstr ""
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+msgid "Trade with "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "取消"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:99
msgid "Unnamed"
msgstr ""
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
#: ../src/game.cpp:386
msgid "Screenshot saved to ~/"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 3cbd5247..2ee556d1 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: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
"PO-Revision-Date: 2008-10-10 00:04+0000\n"
"Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
"Language-Team: Dutch\n"
@@ -57,8 +57,8 @@ msgstr ""
#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Annuleren"
@@ -136,7 +136,7 @@ msgstr "Personage Aanmaken"
#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Naam:"
@@ -181,7 +181,7 @@ msgstr ""
msgid "Global announcement from "
msgstr ""
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
msgid "Server:"
msgstr "Server:"
@@ -539,12 +539,12 @@ msgstr "Ja"
msgid "No"
msgstr "Nee"
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
msgid "Connecting..."
msgstr "Verbinden..."
#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
msgid "Unable to load emotions"
msgstr ""
@@ -642,11 +642,11 @@ msgstr "Selecteer het aantal exemplaren om neer te leggen"
msgid "Login"
msgstr "Inloggen"
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
msgid "Password:"
msgstr "Wachtword:"
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
msgid "Port:"
msgstr "Poort:"
@@ -658,8 +658,8 @@ msgstr ""
msgid "Keep"
msgstr "Behouden"
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
msgid "Register"
msgstr "Aanmelden"
@@ -766,49 +766,49 @@ msgstr "@@drop|Neerleggen@@"
msgid "@@description|Description@@"
msgstr "@@description|Beschrijving@@"
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
msgid "Confirm:"
msgstr "Bevestigen:"
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
msgid "Male"
msgstr ""
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
msgid "Female"
msgstr ""
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
#, c-format
msgid "RegisterDialog::register Username is %s"
msgstr ""
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
#, c-format
msgid "The username needs to be at least %d characters long."
msgstr "De gebruikersnaam moet uit ten minste %d tekens bestaan."
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
#, c-format
msgid "The username needs to be less than %d characters long."
msgstr "De gebruikersnaam moet uit minder dan %d tekens bestaan."
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
#, c-format
msgid "The password needs to be at least %d characters long."
msgstr "Het wachtwoord moet uit ten minste %d tekens bestaan."
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
#, c-format
msgid "The password needs to be less than %d characters long."
msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan."
#. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
msgid "Passwords do not match."
msgstr "Wachtwoorden komen niet overeen."
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
msgid "Error"
msgstr "Fout"
@@ -1225,58 +1225,58 @@ msgstr "Je geeft:"
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
#, c-format
msgid "Couldn't load text file: %s"
msgstr ""
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
msgid "Updating..."
msgstr ""
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
msgid "Play"
msgstr ""
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
msgid "Couldn't load news"
msgstr ""
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
msgid "curl error "
msgstr ""
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
msgid " host: "
msgstr ""
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
#, c-format
msgid "Checksum for file %s failed: (%lx/%lx)"
msgstr ""
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
msgid "Unable to create mThread"
msgstr ""
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
msgid "##1 The update process is incomplete."
msgstr ""
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
msgid "##1 It is strongly recommended that"
msgstr ""
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
msgid "##1 you try again later"
msgstr ""
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
#, c-format
msgid "%s already here"
msgstr ""
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
msgid "Completed"
msgstr ""
@@ -1407,6 +1407,10 @@ msgstr ""
msgid "You're pining for the fjords."
msgstr ""
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
#: ../src/net/playerhandler.cpp:390
msgid "Equip arrows first"
msgstr ""
@@ -1416,10 +1420,177 @@ msgstr ""
msgid "0x013b: Unhandled message %i"
msgstr ""
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@trade|Handelen met %s@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Annuleren"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:99
msgid "Unnamed"
msgstr ""
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
#: ../src/game.cpp:386
msgid "Screenshot saved to ~/"
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 55371e43..d1e98691 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: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
"PO-Revision-Date: 2008-10-10 05:26+0000\n"
"Last-Translator: Michał Trzebiatowski <Unknown>\n"
"Language-Team: <pl@li.org>\n"
@@ -59,8 +59,8 @@ msgstr "Sprzedaj"
#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Anuluj"
@@ -138,7 +138,7 @@ msgstr "Stwórz postać"
#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Imię:"
@@ -183,7 +183,7 @@ msgstr ""
msgid "Global announcement from "
msgstr ""
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
msgid "Server:"
msgstr "Serwer:"
@@ -541,12 +541,12 @@ msgstr "Tak"
msgid "No"
msgstr "Nie"
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
msgid "Connecting..."
msgstr "Łączenie..."
#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
msgid "Unable to load emotions"
msgstr ""
@@ -644,11 +644,11 @@ msgstr "Wybierz ilość przedmiotów do upuszczenia."
msgid "Login"
msgstr "Użytkownik"
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
msgid "Password:"
msgstr "Hasło:"
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
msgid "Port:"
msgstr "Port:"
@@ -660,8 +660,8 @@ msgstr ""
msgid "Keep"
msgstr "Zachowaj"
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
msgid "Register"
msgstr "Rejestruj"
@@ -768,49 +768,49 @@ msgstr "@@drop|Upuść@@"
msgid "@@description|Description@@"
msgstr "@@description|Opis@@"
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
msgid "Confirm:"
msgstr "Potwierdź:"
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
msgid "Male"
msgstr "Mężczyzna"
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
msgid "Female"
msgstr "Kobieta"
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
#, c-format
msgid "RegisterDialog::register Username is %s"
msgstr ""
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
#, c-format
msgid "The username needs to be at least %d characters long."
msgstr "Nazwa użytkownika musi być długa na conajmniej %d znaków."
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
#, c-format
msgid "The username needs to be less than %d characters long."
msgstr "Nazwa użytkownika musi mieć mniej niż %d znaków."
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
#, c-format
msgid "The password needs to be at least %d characters long."
msgstr "Hasło musi mieć conajmniej %d znaków."
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
#, c-format
msgid "The password needs to be less than %d characters long."
msgstr "Hasło nie może mieć więcej jak %d znaków."
#. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
msgid "Passwords do not match."
msgstr "Hasła nie zgadzają się."
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
msgid "Error"
msgstr "Błąd"
@@ -1232,58 +1232,58 @@ msgstr "Dajesz:"
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
#, c-format
msgid "Couldn't load text file: %s"
msgstr ""
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
msgid "Updating..."
msgstr ""
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
msgid "Play"
msgstr ""
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
msgid "Couldn't load news"
msgstr ""
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
msgid "curl error "
msgstr ""
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
msgid " host: "
msgstr ""
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
#, c-format
msgid "Checksum for file %s failed: (%lx/%lx)"
msgstr ""
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
msgid "Unable to create mThread"
msgstr ""
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
msgid "##1 The update process is incomplete."
msgstr ""
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
msgid "##1 It is strongly recommended that"
msgstr ""
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
msgid "##1 you try again later"
msgstr ""
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
#, c-format
msgid "%s already here"
msgstr ""
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
msgid "Completed"
msgstr ""
@@ -1414,6 +1414,10 @@ msgstr ""
msgid "You're pining for the fjords."
msgstr ""
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
#: ../src/net/playerhandler.cpp:390
msgid "Equip arrows first"
msgstr ""
@@ -1423,10 +1427,177 @@ msgstr ""
msgid "0x013b: Unhandled message %i"
msgstr ""
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@trade|Targ z %s@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Anuluj"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:99
msgid "Unnamed"
msgstr ""
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
#: ../src/game.cpp:386
msgid "Screenshot saved to ~/"
msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 09f31b9b..72737624 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 16:41-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
"PO-Revision-Date: 2008-02-03 10:14+0000\n"
"Last-Translator: Tiago Silva <Unknown>\n"
"Language-Team: Portuguese <pt@li.org>\n"
@@ -57,8 +57,8 @@ msgstr "Vender"
#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Cancelar"
@@ -136,7 +136,7 @@ msgstr "Criar Personagem"
#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Nome:"
@@ -181,7 +181,7 @@ msgstr ""
msgid "Global announcement from "
msgstr ""
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
msgid "Server:"
msgstr "Servidor:"
@@ -539,12 +539,12 @@ msgstr "Sim"
msgid "No"
msgstr "Não"
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
msgid "Connecting..."
msgstr "Conectando..."
#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
msgid "Unable to load emotions"
msgstr ""
@@ -642,11 +642,11 @@ msgstr "Seleccionar a quantidade de itens a largar."
msgid "Login"
msgstr "Autenticar"
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
msgid "Password:"
msgstr "Senha:"
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
msgid "Port:"
msgstr "Porta:"
@@ -658,8 +658,8 @@ msgstr ""
msgid "Keep"
msgstr "Manter"
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
msgid "Register"
msgstr "Registo"
@@ -766,49 +766,49 @@ msgstr "@@drop|Largar@@"
msgid "@@description|Description@@"
msgstr "@@descrição|Descrição@@"
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
msgid "Confirm:"
msgstr "Confirmar:"
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
msgid "Male"
msgstr ""
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
msgid "Female"
msgstr ""
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
#, c-format
msgid "RegisterDialog::register Username is %s"
msgstr ""
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
#, c-format
msgid "The username needs to be at least %d characters long."
msgstr "O nome de utilizador necessita de pelo menos %d caracteres."
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
#, c-format
msgid "The username needs to be less than %d characters long."
msgstr "O nome de utilizador só pode ter %d caracteres."
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
#, c-format
msgid "The password needs to be at least %d characters long."
msgstr "A password necessita de pelo menos %d caracteres."
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
#, c-format
msgid "The password needs to be less than %d characters long."
msgstr "A password só pode ter até %d caracteres."
#. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
msgid "Passwords do not match."
msgstr "As senhas não coincidem."
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
msgid "Error"
msgstr "Erro"
@@ -850,8 +850,9 @@ msgid "Keyboard"
msgstr ""
#: ../src/gui/setup.cpp:97
-msgid "Colours"
-msgstr ""
+#, fuzzy
+msgid "Colors"
+msgstr "Cor de Cabelo:"
#: ../src/gui/setup.cpp:101
msgid "Players"
@@ -1236,58 +1237,58 @@ msgstr "Dá:"
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
#, c-format
msgid "Couldn't load text file: %s"
msgstr ""
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
msgid "Updating..."
msgstr ""
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
msgid "Play"
msgstr ""
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
msgid "Couldn't load news"
msgstr ""
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
msgid "curl error "
msgstr ""
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
msgid " host: "
msgstr ""
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
#, c-format
msgid "Checksum for file %s failed: (%lx/%lx)"
msgstr ""
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
msgid "Unable to create mThread"
msgstr ""
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
msgid "##1 The update process is incomplete."
msgstr ""
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
msgid "##1 It is strongly recommended that"
msgstr ""
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
msgid "##1 you try again later"
msgstr ""
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
#, c-format
msgid "%s already here"
msgstr ""
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
msgid "Completed"
msgstr ""
@@ -1418,6 +1419,10 @@ msgstr ""
msgid "You're pining for the fjords."
msgstr ""
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
#: ../src/net/playerhandler.cpp:390
msgid "Equip arrows first"
msgstr ""
@@ -1427,10 +1432,177 @@ msgstr ""
msgid "0x013b: Unhandled message %i"
msgstr ""
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@trade|Negociar com %s@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Cancelar"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:99
msgid "Unnamed"
msgstr ""
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
#: ../src/game.cpp:386
msgid "Screenshot saved to ~/"
msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index aaf8de44..58ec5d1b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
"PO-Revision-Date: 2008-12-14 21:37+0000\n"
"Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -57,8 +57,8 @@ msgstr "Vender"
#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Cancelar"
@@ -136,7 +136,7 @@ msgstr "Criar Personagem"
#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Nome:"
@@ -181,7 +181,7 @@ msgstr ""
msgid "Global announcement from "
msgstr ""
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
msgid "Server:"
msgstr "Servidor:"
@@ -539,12 +539,12 @@ msgstr "Sim"
msgid "No"
msgstr "Não"
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
msgid "Connecting..."
msgstr "Conectando..."
#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
msgid "Unable to load emotions"
msgstr ""
@@ -642,11 +642,11 @@ msgstr "Selecionar montante de itens para descartar."
msgid "Login"
msgstr "Login"
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
msgid "Password:"
msgstr "Senha:"
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
msgid "Port:"
msgstr "Porta:"
@@ -658,8 +658,8 @@ msgstr ""
msgid "Keep"
msgstr "Manter"
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
msgid "Register"
msgstr "Registrar"
@@ -766,49 +766,49 @@ msgstr "@@descartar|Descartar@@"
msgid "@@description|Description@@"
msgstr "@@descrição|Descrição@@"
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
msgid "Confirm:"
msgstr "Confirmar:"
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
msgid "Male"
msgstr "Homem"
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
msgid "Female"
msgstr "Mulher"
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
#, c-format
msgid "RegisterDialog::register Username is %s"
msgstr ""
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
#, c-format
msgid "The username needs to be at least %d characters long."
msgstr "O nome do usuário precisa ter pelo menos %d caracteres."
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
#, c-format
msgid "The username needs to be less than %d characters long."
msgstr "O nome do usuário tem que ser inferior a %d caracteres."
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
#, c-format
msgid "The password needs to be at least %d characters long."
msgstr "A senha deve ter pelo menos %d caracteres."
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
#, c-format
msgid "The password needs to be less than %d characters long."
msgstr "A senha deve ser menor que %d caracteres."
#. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
msgid "Passwords do not match."
msgstr "Senhas não conferem."
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
msgid "Error"
msgstr "Erro"
@@ -1229,58 +1229,58 @@ msgstr "Você dá:"
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
#, c-format
msgid "Couldn't load text file: %s"
msgstr ""
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
msgid "Updating..."
msgstr ""
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
msgid "Play"
msgstr ""
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
msgid "Couldn't load news"
msgstr ""
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
msgid "curl error "
msgstr ""
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
msgid " host: "
msgstr ""
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
#, c-format
msgid "Checksum for file %s failed: (%lx/%lx)"
msgstr ""
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
msgid "Unable to create mThread"
msgstr ""
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
msgid "##1 The update process is incomplete."
msgstr ""
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
msgid "##1 It is strongly recommended that"
msgstr ""
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
msgid "##1 you try again later"
msgstr ""
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
#, c-format
msgid "%s already here"
msgstr ""
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
msgid "Completed"
msgstr ""
@@ -1411,6 +1411,10 @@ msgstr ""
msgid "You're pining for the fjords."
msgstr ""
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
#: ../src/net/playerhandler.cpp:390
msgid "Equip arrows first"
msgstr ""
@@ -1420,10 +1424,177 @@ msgstr ""
msgid "0x013b: Unhandled message %i"
msgstr ""
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@Negociar|Negociar com %s@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Cancelar"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:99
msgid "Unnamed"
msgstr ""
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
#: ../src/game.cpp:386
msgid "Screenshot saved to ~/"
msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 82955c54..6d1d3a98 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
"PO-Revision-Date: 2008-01-08 11:50+0000\n"
"Last-Translator: idle sign <Unknown>\n"
"Language-Team: Russian <ru@li.org>\n"
@@ -57,8 +57,8 @@ msgstr "Продать"
#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Отмена"
@@ -136,7 +136,7 @@ msgstr "Создать персонажа"
#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Имя:"
@@ -181,7 +181,7 @@ msgstr ""
msgid "Global announcement from "
msgstr ""
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
msgid "Server:"
msgstr "Сервер:"
@@ -539,12 +539,12 @@ msgstr "Да"
msgid "No"
msgstr "Нет"
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
msgid "Connecting..."
msgstr "Соединение..."
#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
msgid "Unable to load emotions"
msgstr ""
@@ -642,11 +642,11 @@ msgstr "Сколько предметов сбросить."
msgid "Login"
msgstr "Вход"
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
msgid "Password:"
msgstr "Пароль:"
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
msgid "Port:"
msgstr "Порт:"
@@ -658,8 +658,8 @@ msgstr ""
msgid "Keep"
msgstr "Оставить"
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
msgid "Register"
msgstr "Зарегистрироваться"
@@ -766,49 +766,49 @@ msgstr "@@drop|Сбросить@@"
msgid "@@description|Description@@"
msgstr "@@description|Описание@@"
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
msgid "Confirm:"
msgstr "Подтвердите:"
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
msgid "Male"
msgstr ""
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
msgid "Female"
msgstr ""
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
#, c-format
msgid "RegisterDialog::register Username is %s"
msgstr ""
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
#, c-format
msgid "The username needs to be at least %d characters long."
msgstr "Имя пользователя должно содержать не менее %d символов."
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
#, c-format
msgid "The username needs to be less than %d characters long."
msgstr "Имя пользователя не должно содержать более %d символов."
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
#, c-format
msgid "The password needs to be at least %d characters long."
msgstr "Пароль должен содержать не менее %d символов."
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
#, c-format
msgid "The password needs to be less than %d characters long."
msgstr "Пароль не должен содержать более %d символов."
#. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
msgid "Passwords do not match."
msgstr "Пароли не совпадают."
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
msgid "Error"
msgstr "Ошибка"
@@ -1229,58 +1229,58 @@ msgstr "Вы отдаете:"
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
#, c-format
msgid "Couldn't load text file: %s"
msgstr ""
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
msgid "Updating..."
msgstr ""
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
msgid "Play"
msgstr ""
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
msgid "Couldn't load news"
msgstr ""
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
msgid "curl error "
msgstr ""
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
msgid " host: "
msgstr ""
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
#, c-format
msgid "Checksum for file %s failed: (%lx/%lx)"
msgstr ""
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
msgid "Unable to create mThread"
msgstr ""
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
msgid "##1 The update process is incomplete."
msgstr ""
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
msgid "##1 It is strongly recommended that"
msgstr ""
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
msgid "##1 you try again later"
msgstr ""
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
#, c-format
msgid "%s already here"
msgstr ""
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
msgid "Completed"
msgstr ""
@@ -1411,6 +1411,10 @@ msgstr ""
msgid "You're pining for the fjords."
msgstr ""
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
#: ../src/net/playerhandler.cpp:390
msgid "Equip arrows first"
msgstr ""
@@ -1420,10 +1424,177 @@ msgstr ""
msgid "0x013b: Unhandled message %i"
msgstr ""
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@trade|Торговать с %s@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Отмена"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:99
msgid "Unnamed"
msgstr ""
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
#: ../src/game.cpp:386
msgid "Screenshot saved to ~/"
msgstr ""
diff --git a/po/sk.po b/po/sk.po
index ef9d85bf..8b0eec38 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
"PO-Revision-Date: 2008-12-30 14:07+0000\n"
"Last-Translator: TomasKovacik <nail@nodomain.sk>\n"
"Language-Team: Slovak <sk@li.org>\n"
@@ -56,8 +56,8 @@ msgstr ""
#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Zrušiť"
@@ -136,7 +136,7 @@ msgstr "Vytvoriť postavu"
#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Meno"
@@ -180,7 +180,7 @@ msgstr ""
msgid "Global announcement from "
msgstr ""
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
msgid "Server:"
msgstr ""
@@ -535,12 +535,12 @@ msgstr ""
msgid "No"
msgstr ""
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
msgid "Connecting..."
msgstr ""
#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
msgid "Unable to load emotions"
msgstr ""
@@ -638,11 +638,11 @@ msgstr ""
msgid "Login"
msgstr ""
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
msgid "Password:"
msgstr ""
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
msgid "Port:"
msgstr ""
@@ -654,8 +654,8 @@ msgstr ""
msgid "Keep"
msgstr ""
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
msgid "Register"
msgstr ""
@@ -758,49 +758,49 @@ msgstr ""
msgid "@@description|Description@@"
msgstr ""
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
msgid "Confirm:"
msgstr ""
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
msgid "Male"
msgstr "Muž"
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
msgid "Female"
msgstr "Žena"
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
#, c-format
msgid "RegisterDialog::register Username is %s"
msgstr ""
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
#, c-format
msgid "The username needs to be at least %d characters long."
msgstr ""
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
#, c-format
msgid "The username needs to be less than %d characters long."
msgstr ""
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
#, c-format
msgid "The password needs to be at least %d characters long."
msgstr ""
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
#, c-format
msgid "The password needs to be less than %d characters long."
msgstr ""
#. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
msgid "Passwords do not match."
msgstr ""
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
msgid "Error"
msgstr ""
@@ -1209,58 +1209,58 @@ msgstr ""
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
#, c-format
msgid "Couldn't load text file: %s"
msgstr ""
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
msgid "Updating..."
msgstr ""
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
msgid "Play"
msgstr ""
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
msgid "Couldn't load news"
msgstr ""
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
msgid "curl error "
msgstr ""
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
msgid " host: "
msgstr ""
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
#, c-format
msgid "Checksum for file %s failed: (%lx/%lx)"
msgstr ""
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
msgid "Unable to create mThread"
msgstr ""
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
msgid "##1 The update process is incomplete."
msgstr ""
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
msgid "##1 It is strongly recommended that"
msgstr ""
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
msgid "##1 you try again later"
msgstr ""
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
#, c-format
msgid "%s already here"
msgstr ""
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
msgid "Completed"
msgstr ""
@@ -1391,6 +1391,10 @@ msgstr ""
msgid "You're pining for the fjords."
msgstr ""
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
#: ../src/net/playerhandler.cpp:390
msgid "Equip arrows first"
msgstr ""
@@ -1400,10 +1404,176 @@ msgstr ""
msgid "0x013b: Unhandled message %i"
msgstr ""
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+msgid "Trade with "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Zrušiť"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:99
msgid "Unnamed"
msgstr ""
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
#: ../src/game.cpp:386
msgid "Screenshot saved to ~/"
msgstr ""
diff --git a/po/sv.po b/po/sv.po
index b0b4dc07..88148c62 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
"PO-Revision-Date: 2008-05-07 19:04+0000\n"
"Last-Translator: Kess Vargavind <Unknown>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -57,8 +57,8 @@ msgstr "Sälj"
#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "Avbryt"
@@ -136,7 +136,7 @@ msgstr "Skapa karaktär"
#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "Namn:"
@@ -181,7 +181,7 @@ msgstr ""
msgid "Global announcement from "
msgstr ""
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
msgid "Server:"
msgstr "Server:"
@@ -539,12 +539,12 @@ msgstr "Ja"
msgid "No"
msgstr "Nej"
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
msgid "Connecting..."
msgstr "Ansluter..."
#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
msgid "Unable to load emotions"
msgstr ""
@@ -642,11 +642,11 @@ msgstr "Välj antal föremål att släppa."
msgid "Login"
msgstr "Användarnamn"
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
msgid "Password:"
msgstr "Lösenord:"
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
msgid "Port:"
msgstr "Port:"
@@ -658,8 +658,8 @@ msgstr ""
msgid "Keep"
msgstr "Behåll"
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
msgid "Register"
msgstr "Registrera"
@@ -766,49 +766,49 @@ msgstr "@@drop|Släpp@@"
msgid "@@description|Description@@"
msgstr "@@description|Beskrivning@@"
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
msgid "Confirm:"
msgstr "Bekräfta:"
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
msgid "Male"
msgstr ""
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
msgid "Female"
msgstr ""
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
#, c-format
msgid "RegisterDialog::register Username is %s"
msgstr ""
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
#, c-format
msgid "The username needs to be at least %d characters long."
msgstr "Användarnamnet måste vara minst %d tecken långt."
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
#, c-format
msgid "The username needs to be less than %d characters long."
msgstr "Användarnamnet måste vara kortare än %d tecken."
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
#, c-format
msgid "The password needs to be at least %d characters long."
msgstr "Lösenordet måste vara minst %d tecken långt."
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
#, c-format
msgid "The password needs to be less than %d characters long."
msgstr "Lösenordet måste vara kortare än %d tecken."
#. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
msgid "Passwords do not match."
msgstr "Lösenorden stämmer inte överens."
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
msgid "Error"
msgstr "Fel"
@@ -1229,58 +1229,58 @@ msgstr "Du ger:"
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
#, c-format
msgid "Couldn't load text file: %s"
msgstr ""
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
msgid "Updating..."
msgstr ""
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
msgid "Play"
msgstr ""
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
msgid "Couldn't load news"
msgstr ""
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
msgid "curl error "
msgstr ""
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
msgid " host: "
msgstr ""
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
#, c-format
msgid "Checksum for file %s failed: (%lx/%lx)"
msgstr ""
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
msgid "Unable to create mThread"
msgstr ""
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
msgid "##1 The update process is incomplete."
msgstr ""
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
msgid "##1 It is strongly recommended that"
msgstr ""
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
msgid "##1 you try again later"
msgstr ""
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
#, c-format
msgid "%s already here"
msgstr ""
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
msgid "Completed"
msgstr ""
@@ -1411,6 +1411,10 @@ msgstr ""
msgid "You're pining for the fjords."
msgstr ""
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
#: ../src/net/playerhandler.cpp:390
msgid "Equip arrows first"
msgstr ""
@@ -1420,10 +1424,177 @@ msgstr ""
msgid "0x013b: Unhandled message %i"
msgstr ""
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@trade|Handla med %s@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "Avbryt"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:99
msgid "Unnamed"
msgstr ""
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
#: ../src/game.cpp:386
msgid "Screenshot saved to ~/"
msgstr ""
diff --git a/po/th.po b/po/th.po
index 866c30ee..70a4bc2c 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
"PO-Revision-Date: 2008-11-25 06:16+0000\n"
"Last-Translator: Tharawut Paripaiboon <Unknown>\n"
"Language-Team: Thai <th@li.org>\n"
@@ -56,8 +56,8 @@ msgstr ""
#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "ยกเลิก"
@@ -136,7 +136,7 @@ msgstr "สร้างตัวละคร"
#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "ชื่อ:"
@@ -180,7 +180,7 @@ msgstr ""
msgid "Global announcement from "
msgstr ""
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
msgid "Server:"
msgstr ""
@@ -535,12 +535,12 @@ msgstr "ใช่"
msgid "No"
msgstr "ไม่"
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
msgid "Connecting..."
msgstr "กำลังเชื่อมต่อ..."
#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
msgid "Unable to load emotions"
msgstr ""
@@ -634,11 +634,11 @@ msgstr ""
msgid "Login"
msgstr "เข้าระบบ"
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
msgid "Password:"
msgstr "รหัสผ่าน:"
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
msgid "Port:"
msgstr ""
@@ -650,8 +650,8 @@ msgstr ""
msgid "Keep"
msgstr ""
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
msgid "Register"
msgstr "สมัครสมาชิก"
@@ -754,49 +754,49 @@ msgstr ""
msgid "@@description|Description@@"
msgstr ""
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
msgid "Confirm:"
msgstr "ยืนยัน:"
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
msgid "Male"
msgstr "ชาย"
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
msgid "Female"
msgstr "หญิง"
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
#, c-format
msgid "RegisterDialog::register Username is %s"
msgstr ""
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
#, c-format
msgid "The username needs to be at least %d characters long."
msgstr ""
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
#, c-format
msgid "The username needs to be less than %d characters long."
msgstr ""
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
#, c-format
msgid "The password needs to be at least %d characters long."
msgstr ""
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
#, c-format
msgid "The password needs to be less than %d characters long."
msgstr ""
#. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
msgid "Passwords do not match."
msgstr ""
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
msgid "Error"
msgstr "ผิดพลาด"
@@ -1210,58 +1210,58 @@ msgstr ""
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
#, c-format
msgid "Couldn't load text file: %s"
msgstr ""
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
msgid "Updating..."
msgstr ""
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
msgid "Play"
msgstr ""
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
msgid "Couldn't load news"
msgstr ""
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
msgid "curl error "
msgstr ""
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
msgid " host: "
msgstr ""
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
#, c-format
msgid "Checksum for file %s failed: (%lx/%lx)"
msgstr ""
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
msgid "Unable to create mThread"
msgstr ""
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
msgid "##1 The update process is incomplete."
msgstr ""
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
msgid "##1 It is strongly recommended that"
msgstr ""
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
msgid "##1 you try again later"
msgstr ""
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
#, c-format
msgid "%s already here"
msgstr ""
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
msgid "Completed"
msgstr ""
@@ -1392,6 +1392,10 @@ msgstr ""
msgid "You're pining for the fjords."
msgstr ""
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
#: ../src/net/playerhandler.cpp:390
msgid "Equip arrows first"
msgstr ""
@@ -1401,10 +1405,176 @@ msgstr ""
msgid "0x013b: Unhandled message %i"
msgstr ""
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+msgid "Trade with "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "ยกเลิก"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:99
msgid "Unnamed"
msgstr ""
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
#: ../src/game.cpp:386
msgid "Screenshot saved to ~/"
msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 05dc2b57..c69f2cf8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-12 17:52-0700\n"
+"POT-Creation-Date: 2009-01-15 11:01-0700\n"
"PO-Revision-Date: 2008-09-17 14:41+0000\n"
"Last-Translator: luojie-dune <Unknown>\n"
"Language-Team: Simplified Chinese <zh_CN@li.org>\n"
@@ -57,8 +57,8 @@ msgstr "出售"
#: ../src/gui/char_select.cpp:259 ../src/gui/char_server.cpp:59
#: ../src/gui/connection.cpp:46 ../src/gui/item_amount.cpp:60
#: ../src/gui/login.cpp:77 ../src/gui/npclistdialog.cpp:42
-#: ../src/gui/register.cpp:79 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
-#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:115
+#: ../src/gui/register.cpp:77 ../src/gui/setup.cpp:59 ../src/gui/setup.cpp:121
+#: ../src/gui/trade.cpp:63 ../src/gui/updatewindow.cpp:114
msgid "Cancel"
msgstr "取消"
@@ -136,7 +136,7 @@ msgstr "创建角色"
#: ../src/gui/char_select.cpp:251 ../src/gui/inventorywindow.cpp:66
#: ../src/gui/inventorywindow.cpp:158 ../src/gui/login.cpp:51
-#: ../src/gui/register.cpp:66
+#: ../src/gui/register.cpp:64
msgid "Name:"
msgstr "名称"
@@ -181,7 +181,7 @@ msgstr ""
msgid "Global announcement from "
msgstr ""
-#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:69
+#: ../src/gui/chat.cpp:166 ../src/gui/login.cpp:53 ../src/gui/register.cpp:67
msgid "Server:"
msgstr "服务器:"
@@ -539,12 +539,12 @@ msgstr "是"
msgid "No"
msgstr "否"
-#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:113
+#: ../src/gui/connection.cpp:48 ../src/gui/updatewindow.cpp:112
msgid "Connecting..."
msgstr "连接中..."
#: ../src/gui/emotecontainer.cpp:50 ../src/gui/emoteshortcutcontainer.cpp:52
-#: ../src/being.cpp:96
+#: ../src/being.cpp:93
msgid "Unable to load emotions"
msgstr ""
@@ -642,11 +642,11 @@ msgstr "请选择丢弃的物品数量"
msgid "Login"
msgstr "登陆"
-#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:67
+#: ../src/gui/login.cpp:52 ../src/gui/register.cpp:65
msgid "Password:"
msgstr "密码:"
-#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:70
+#: ../src/gui/login.cpp:54 ../src/gui/register.cpp:68
msgid "Port:"
msgstr "端口:"
@@ -658,8 +658,8 @@ msgstr ""
msgid "Keep"
msgstr "保持"
-#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:62
-#: ../src/gui/register.cpp:78
+#: ../src/gui/login.cpp:78 ../src/gui/register.cpp:60
+#: ../src/gui/register.cpp:76
msgid "Register"
msgstr "注册"
@@ -766,49 +766,49 @@ msgstr "@@丢弃|丢弃@@"
msgid "@@description|Description@@"
msgstr "@@描述|描述@@"
-#: ../src/gui/register.cpp:68
+#: ../src/gui/register.cpp:66
msgid "Confirm:"
msgstr "确定"
-#: ../src/gui/register.cpp:76
+#: ../src/gui/register.cpp:74
msgid "Male"
msgstr ""
-#: ../src/gui/register.cpp:77
+#: ../src/gui/register.cpp:75
msgid "Female"
msgstr ""
-#: ../src/gui/register.cpp:186
+#: ../src/gui/register.cpp:183
#, c-format
msgid "RegisterDialog::register Username is %s"
msgstr ""
-#: ../src/gui/register.cpp:195
+#: ../src/gui/register.cpp:192
#, c-format
msgid "The username needs to be at least %d characters long."
msgstr "用户名至少需要%d个字符"
-#: ../src/gui/register.cpp:203
+#: ../src/gui/register.cpp:200
#, c-format
msgid "The username needs to be less than %d characters long."
msgstr "用户名不能少于%d个字符"
-#: ../src/gui/register.cpp:211
+#: ../src/gui/register.cpp:208
#, c-format
msgid "The password needs to be at least %d characters long."
msgstr "密码需要至少%d个字符"
-#: ../src/gui/register.cpp:219
+#: ../src/gui/register.cpp:216
#, c-format
msgid "The password needs to be less than %d characters long."
msgstr "密码不能少于%d个字符"
#. Password does not match with the confirmation one
-#: ../src/gui/register.cpp:226
+#: ../src/gui/register.cpp:223
msgid "Passwords do not match."
msgstr "密码不一致."
-#: ../src/gui/register.cpp:246 ../src/main.cpp:1022
+#: ../src/gui/register.cpp:243 ../src/main.cpp:1022
msgid "Error"
msgstr "错误"
@@ -1229,58 +1229,58 @@ msgstr "你得到:"
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
-#: ../src/gui/updatewindow.cpp:79
+#: ../src/gui/updatewindow.cpp:78
#, c-format
msgid "Couldn't load text file: %s"
msgstr ""
-#: ../src/gui/updatewindow.cpp:94
+#: ../src/gui/updatewindow.cpp:93
msgid "Updating..."
msgstr ""
-#: ../src/gui/updatewindow.cpp:116
+#: ../src/gui/updatewindow.cpp:115
msgid "Play"
msgstr ""
-#: ../src/gui/updatewindow.cpp:197
+#: ../src/gui/updatewindow.cpp:196
msgid "Couldn't load news"
msgstr ""
-#: ../src/gui/updatewindow.cpp:329
+#: ../src/gui/updatewindow.cpp:327
msgid "curl error "
msgstr ""
-#: ../src/gui/updatewindow.cpp:330
+#: ../src/gui/updatewindow.cpp:328
msgid " host: "
msgstr ""
-#: ../src/gui/updatewindow.cpp:365
+#: ../src/gui/updatewindow.cpp:363
#, c-format
msgid "Checksum for file %s failed: (%lx/%lx)"
msgstr ""
-#: ../src/gui/updatewindow.cpp:415
+#: ../src/gui/updatewindow.cpp:413
msgid "Unable to create mThread"
msgstr ""
-#: ../src/gui/updatewindow.cpp:453
+#: ../src/gui/updatewindow.cpp:451
msgid "##1 The update process is incomplete."
msgstr ""
-#: ../src/gui/updatewindow.cpp:454
+#: ../src/gui/updatewindow.cpp:452
msgid "##1 It is strongly recommended that"
msgstr ""
-#: ../src/gui/updatewindow.cpp:455
+#: ../src/gui/updatewindow.cpp:453
msgid "##1 you try again later"
msgstr ""
-#: ../src/gui/updatewindow.cpp:509
+#: ../src/gui/updatewindow.cpp:507
#, c-format
msgid "%s already here"
msgstr ""
-#: ../src/gui/updatewindow.cpp:522
+#: ../src/gui/updatewindow.cpp:520
msgid "Completed"
msgstr ""
@@ -1411,6 +1411,10 @@ msgstr ""
msgid "You're pining for the fjords."
msgstr ""
+#: ../src/net/playerhandler.cpp:267
+msgid "You picked up "
+msgstr ""
+
#: ../src/net/playerhandler.cpp:390
msgid "Equip arrows first"
msgstr ""
@@ -1420,10 +1424,177 @@ msgstr ""
msgid "0x013b: Unhandled message %i"
msgstr ""
+#: ../src/net/tradehandler.cpp:91
+msgid "Request for trade"
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:93
+msgid " wants to trade with you, do you accept?"
+msgstr ""
+
+#. Too far away
+#: ../src/net/tradehandler.cpp:107
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#. Character doesn't exist
+#: ../src/net/tradehandler.cpp:111
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#. Invite request check failed...
+#: ../src/net/tradehandler.cpp:115
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:121
+msgid "Trade: You and "
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:127
+#, fuzzy
+msgid "Trade with "
+msgstr "@@交易|与%s交易@@"
+
+#: ../src/net/tradehandler.cpp:128
+#, fuzzy
+msgid " cancelled"
+msgstr "取消"
+
+#. Shouldn't happen as well, but to be sure
+#: ../src/net/tradehandler.cpp:135
+msgid "Unhandled trade cancel packet"
+msgstr ""
+
+#. Add item failed - player overweighted
+#: ../src/net/tradehandler.cpp:185
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#. Add item failed - player has no free slot
+#: ../src/net/tradehandler.cpp:190
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:194
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:207
+msgid "Trade canceled."
+msgstr ""
+
+#: ../src/net/tradehandler.cpp:214
+msgid "Trade completed."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:56
+#, c-format
+msgid "Trying TMW's color file, %s."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:66
+msgid "ColorDB: Failed"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:83
+#, c-format
+msgid "ColorDB: Redefinition of dye ID %d"
+msgstr ""
+
+#: ../src/resources/colordb.cpp:98
+msgid "Unloading color database..."
+msgstr ""
+
+#: ../src/resources/colordb.cpp:113
+#, c-format
+msgid "ColorDB: Error, unknown dye ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:52
+msgid "Initializing item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:55
+msgid "Unknown item"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:65
+msgid "ItemDB: Error while loading items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:77
+msgid "ItemDB: Invalid or missing item ID in items.xml!"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:82
+#, c-format
+msgid "ItemDB: Redefinition of item ID %d"
+msgstr ""
+
#: ../src/resources/itemdb.cpp:99
msgid "Unnamed"
msgstr ""
+#: ../src/resources/itemdb.cpp:142
+msgid "Unloading item database..."
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:160
+#, c-format
+msgid "ItemDB: Error, unknown item ID# %d"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:199
+#, c-format
+msgid "ItemDB: Ignoring unknown sound event '%s'"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:44
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:46
+msgid "Initializing monster database..."
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:53
+msgid "Monster Database: Error while loading monster.xml!"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:84
+#, c-format
+msgid ""
+"MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:121
+#, c-format
+msgid "MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"
+msgstr ""
+
+#: ../src/resources/monsterdb.cpp:159
+#, c-format
+msgid "MonsterDB: Warning, unknown monster ID %d requested"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:48
+msgid "Initializing NPC database..."
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:55
+msgid "NPC Database: Error while loading npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:67
+msgid "NPC Database: NPC with missing ID in npcs.xml!"
+msgstr ""
+
+#: ../src/resources/npcdb.cpp:125
+#, c-format
+msgid "NPCDB: Warning, unknown NPC ID %d requested"
+msgstr ""
+
#: ../src/game.cpp:386
msgid "Screenshot saved to ~/"
msgstr ""