diff options
| author | Ira Rice <irarice@gmail.com> | 2009-01-15 11:06:32 -0700 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2009-01-15 11:06:32 -0700 |
| commit | 10a9dbacd9334caede10f1b21d42cdf7e1efcd03 (patch) | |
| tree | def2baead68de5a9ccc842e25b3cdcfe9a638c9b | |
| parent | e7f4e78f76972ca3882b9d2763ae9cab31675d3a (diff) | |
| download | mana-client-10a9dbacd9334caede10f1b21d42cdf7e1efcd03.tar.gz mana-client-10a9dbacd9334caede10f1b21d42cdf7e1efcd03.tar.bz2 mana-client-10a9dbacd9334caede10f1b21d42cdf7e1efcd03.tar.xz mana-client-10a9dbacd9334caede10f1b21d42cdf7e1efcd03.zip | |
Style cleanups throughout most of the code. Splitting function type from
the function names should no longer be around.
Signed-off-by: Ira Rice <irarice@gmail.com>
110 files changed, 5422 insertions, 1801 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 @@ -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 "" @@ -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 "" @@ -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 "" @@ -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 "" @@ -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 "" @@ -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 "" @@ -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 "" @@ -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 "" @@ -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 "" @@ -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 "" @@ -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 "" @@ -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 "" @@ -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 "" @@ -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 "" @@ -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 "" @@ -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 "" @@ -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 "" @@ -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 "" @@ -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 "" @@ -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 "" @@ -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 "" diff --git a/src/animatedsprite.h b/src/animatedsprite.h index 405bf42e..ddc663f2 100644 --- a/src/animatedsprite.h +++ b/src/animatedsprite.h @@ -60,50 +60,42 @@ class AnimatedSprite /** * Resets the animated sprite. */ - void - reset(); + void reset(); /** * Plays an action using the current direction */ - void - play(SpriteAction action); + void play(SpriteAction action); /** * Inform the animation of the passed time so that it can output the * correct animation frame. */ - void - update(int time); + void update(int time); /** * Draw the current animation frame at the coordinates given in screen * pixels. */ - bool - draw(Graphics* graphics, int posX, int posY) const; + bool draw(Graphics* graphics, int posX, int posY) const; /** * gets the width in pixels of the image of the current frame */ - int - getWidth() const; + int getWidth() const; /** * gets the height in pixels of the image of the current frame */ - int - getHeight() const; + int getHeight() const; /** * Sets the direction. */ - void - setDirection(SpriteDirection direction); + void setDirection(SpriteDirection direction); private: - bool - updateCurrentAnimation(unsigned int dt); + bool updateCurrentAnimation(unsigned int dt); SpriteDirection mDirection; /**< The sprite direction. */ int mLastTime; /**< The last time update was called. */ diff --git a/src/being.cpp b/src/being.cpp index 5eb62b2d..69da1182 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -48,9 +48,6 @@ #include "utils/tostring.h" #include "utils/xml.h" -#define BEING_EFFECTS_FILE "effects.xml" -#define HAIR_FILE "hair.xml" - int Being::instances = 0; int Being::mNumberOfHairstyles = 1; ImageSet *Being::emotionSet = NULL; diff --git a/src/configuration.cpp b/src/configuration.cpp index a2ce4500..4fb6a42b 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -87,7 +87,6 @@ void ConfigurationObject::clear(void) mOptions.clear(); } - ConfigurationObject::~ConfigurationObject(void) { clear(); @@ -190,7 +189,6 @@ void ConfigurationObject::writeToXML(xmlTextWriterPtr writer) } } - void Configuration::write() { // Do not attempt to write to file that cannot be opened for writing diff --git a/src/equipment.cpp b/src/equipment.cpp index f1d1d4f2..828de46b 100644 --- a/src/equipment.cpp +++ b/src/equipment.cpp @@ -32,8 +32,7 @@ Equipment::Equipment(): std::fill_n(mEquipment, EQUIPMENT_SIZE, 0); } -void -Equipment::setEquipment(int index, int inventoryIndex) +void Equipment::setEquipment(int index, int inventoryIndex) { mEquipment[index] = inventoryIndex; Item* item = player_node->getInventory()->getItem(inventoryIndex); diff --git a/src/floor_item.h b/src/floor_item.h index b747310b..4a4e8fb3 100644 --- a/src/floor_item.h +++ b/src/floor_item.h @@ -51,42 +51,36 @@ class FloorItem : public Sprite /** * Returns instance id of this item. */ - unsigned int - getId() const { return mId; } + unsigned int getId() const { return mId; } /** * Returns the item id. */ - unsigned int - getItemId() const { return mItem->getId(); } + unsigned int getItemId() const { return mItem->getId(); } /** * Returns the x coordinate. */ - unsigned short - getX() const { return mX; } + unsigned short getX() const { return mX; } /** * Returns the y coordinate. */ - unsigned short - getY() const { return mY; } + unsigned short getY() const { return mY; } /** * Returns the pixel y coordinate. * * @see Sprite::getPixelY() */ - int - getPixelY() const { return mY * 32; } + int getPixelY() const { return mY * 32; } /** * Draws this floor item to the given graphics context. * * @see Sprite::draw(Graphics, int, int) */ - void - draw(Graphics *graphics, int offsetX, int offsetY) const + void draw(Graphics *graphics, int offsetX, int offsetY) const { graphics->drawImage(mItem->getImage(), mX * 32 + offsetX, diff --git a/src/graphics.cpp b/src/graphics.cpp index 784e6e77..55ccc3b4 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -178,13 +178,12 @@ void Graphics::drawImagePattern(Image *image, int x, int y, int w, int h) } } -void -Graphics::drawImageRect(int x, int y, int w, int h, - Image *topLeft, Image *topRight, - Image *bottomLeft, Image *bottomRight, - Image *top, Image *right, - Image *bottom, Image *left, - Image *center) +void Graphics::drawImageRect(int x, int y, int w, int h, + Image *topLeft, Image *topRight, + Image *bottomLeft, Image *bottomRight, + Image *top, Image *right, + Image *bottom, Image *left, + Image *center) { pushClipArea(gcn::Rectangle(x, y, w, h)); @@ -222,9 +221,8 @@ Graphics::drawImageRect(int x, int y, int w, int h, popClipArea(); } -void -Graphics::drawImageRect(int x, int y, int w, int h, - const ImageRect &imgRect) +void Graphics::drawImageRect(int x, int y, int w, int h, + const ImageRect &imgRect) { drawImageRect(x, y, w, h, imgRect.grid[0], imgRect.grid[2], imgRect.grid[6], imgRect.grid[8], diff --git a/src/graphics.h b/src/graphics.h index efdd1ac1..bc9a95bd 100644 --- a/src/graphics.h +++ b/src/graphics.h @@ -95,17 +95,15 @@ class Graphics : public gcn::SDLGraphics { * @return <code>true</code> if the image was blitted properly * <code>false</code> otherwise. */ - virtual bool - drawImage(Image *image, - int srcX, int srcY, - int dstX, int dstY, - int width, int height, - bool useColor = false); - - virtual void - drawImagePattern(Image *image, - int x, int y, - int w, int h); + virtual bool drawImage(Image *image, + int srcX, int srcY, + int dstX, int dstY, + int width, int height, + bool useColor = false); + + virtual void drawImagePattern(Image *image, + int x, int y, + int w, int h); /** * Draws a rectangle using images. 4 corner images, 4 side images and 1 diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp index 8be32ebb..7621b856 100644 --- a/src/gui/browserbox.cpp +++ b/src/gui/browserbox.cpp @@ -210,8 +210,7 @@ struct MouseOverLink int mX, mY; }; -void -BrowserBox::mousePressed(gcn::MouseEvent &event) +void BrowserBox::mousePressed(gcn::MouseEvent &event) { LinkIterator i = find_if(mLinks.begin(), mLinks.end(), MouseOverLink(event.getX(), event.getY())); @@ -221,8 +220,7 @@ BrowserBox::mousePressed(gcn::MouseEvent &event) } } -void -BrowserBox::mouseMoved(gcn::MouseEvent &event) +void BrowserBox::mouseMoved(gcn::MouseEvent &event) { LinkIterator i = find_if(mLinks.begin(), mLinks.end(), MouseOverLink(event.getX(), event.getY())); @@ -230,8 +228,7 @@ BrowserBox::mouseMoved(gcn::MouseEvent &event) mSelectedLink = (i != mLinks.end()) ? (i - mLinks.begin()) : -1; } -void -BrowserBox::draw(gcn::Graphics *graphics) +void BrowserBox::draw(gcn::Graphics *graphics) { if (mOpaque) { diff --git a/src/gui/button.cpp b/src/gui/button.cpp index 40ecd1b7..9653242c 100644 --- a/src/gui/button.cpp +++ b/src/gui/button.cpp @@ -122,8 +122,7 @@ Button::~Button() } } -void -Button::draw(gcn::Graphics *graphics) +void Button::draw(gcn::Graphics *graphics) { int mode; diff --git a/src/gui/buttonbox.cpp b/src/gui/buttonbox.cpp index 903d971d..d29f3c58 100644 --- a/src/gui/buttonbox.cpp +++ b/src/gui/buttonbox.cpp @@ -34,8 +34,7 @@ ButtonBox::ButtonBox(const std::string &title, const std::string &buttonTxt, add(button); } -void -ButtonBox::action(const gcn::ActionEvent &event) +void ButtonBox::action(const gcn::ActionEvent &event) { if (event.getId() == "activate") { diff --git a/src/gui/buttonbox.h b/src/gui/buttonbox.h index edde4aa4..1741f7ba 100644 --- a/src/gui/buttonbox.h +++ b/src/gui/buttonbox.h @@ -60,8 +60,7 @@ class ButtonBox : public Window, public gcn::ActionListener * * @param event is the event that is generated */ - void - action(const gcn::ActionEvent &event); + void action(const gcn::ActionEvent &event); private: diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp index 08fcd2b2..750c6d6f 100644 --- a/src/gui/char_select.cpp +++ b/src/gui/char_select.cpp @@ -308,8 +308,7 @@ CharCreateDialog::~CharCreateDialog() charServerHandler.setCharCreateDialog(0); } -void -CharCreateDialog::action(const gcn::ActionEvent &event) +void CharCreateDialog::action(const gcn::ActionEvent &event) { int numberOfColors = ColorDB::size(); if (event.getId() == "create") { @@ -340,22 +339,19 @@ CharCreateDialog::action(const gcn::ActionEvent &event) } } -std::string -CharCreateDialog::getName() +std::string CharCreateDialog::getName() { std::string name = mNameField->getText(); trim(name); return name; } -void -CharCreateDialog::unlock() +void CharCreateDialog::unlock() { mCreateButton->setEnabled(true); } -void -CharCreateDialog::attemptCharCreate() +void CharCreateDialog::attemptCharCreate() { // Send character infos MessageOut outMsg(mNetwork); diff --git a/src/gui/char_server.cpp b/src/gui/char_server.cpp index ff401332..d5452532 100644 --- a/src/gui/char_server.cpp +++ b/src/gui/char_server.cpp @@ -98,8 +98,7 @@ ServerSelectDialog::~ServerSelectDialog() delete mServerListModel; } -void -ServerSelectDialog::action(const gcn::ActionEvent &event) +void ServerSelectDialog::action(const gcn::ActionEvent &event) { if (event.getId() == "ok") { mOkButton->setEnabled(false); @@ -114,14 +113,12 @@ ServerSelectDialog::action(const gcn::ActionEvent &event) } } -int -ServerListModel::getNumberOfElements() +int ServerListModel::getNumberOfElements() { return n_server; } -std::string -ServerListModel::getElementAt(int i) +std::string ServerListModel::getElementAt(int i) { const SERVER_INFO *si = server_info[i]; return si->name + " (" + toString(si->online_users) + ")"; diff --git a/src/gui/chat.h b/src/gui/chat.h index 437dc115..9e137499 100644 --- a/src/gui/chat.h +++ b/src/gui/chat.h @@ -107,149 +107,142 @@ struct CHATSKILL * \ingroup Interface */ class ChatWindow : public Window, public gcn::ActionListener, - public gcn::KeyListener + public gcn::KeyListener { public: - /** - * Constructor. - */ - ChatWindow(Network *network); - - /** - * Destructor: used to write back values to the config file - */ - ~ChatWindow(); - - /** - * Logic (updates components' size) - */ - void logic(); - - /** - * Adds a line of text to our message list. Parameters: - * - * @param line Text message. - * @parem own Type of message (usually the owner-type). - */ - void chatLog(std::string line, int own, bool ignoreRecord = false); - - /** - * Calls original chat_log() after processing the packet. - */ - void chatLog(CHATSKILL); - - /** - * Performs action. - */ - void action(const gcn::ActionEvent &event); - - /** - * Request focus for typing chat message. - */ - void requestChatFocus(); - - /** - * Checks whether ChatWindow is Focused or not. - */ - bool isInputFocused(); - - /** - * Determines whether to send a command or an ordinary message, then - * contructs packets & sends them. - * - * @param nick The character's name to display in front. - * @param msg The message text which is to be send. - * - * NOTE: - * The nickname is required by the server, if not specified - * the message may not be sent unless a command was intended - * which requires another packet to be constructed! you can - * achieve this by putting a slash ("/") infront of the - * message followed by the command name and the message. - * of course all slash-commands need implemented handler- - * routines. ;-) - * remember, a line starting with "@" is not a command that needs - * to be parsed rather is sent using the normal chat-packet. - * - * EXAMPLE: - * // for an global announcement /- command - * chatlog.chat_send("", "/announce Hello to all logged in users!"); - * // for simple message by a user /- message - * chatlog.chat_send("Zaeiru", "Hello to all users on the screen!"); - */ - void - chatSend(const std::string &nick, std::string msg); - - /** Called when key is pressed */ - void - keyPressed(gcn::KeyEvent &event); - - /** Called to set current text */ - void - setInputText(std::string input_str); - - /** Override to reset mTmpVisible */ - void - setVisible(bool visible); + /** + * Constructor. + */ + ChatWindow(Network *network); + + /** + * Destructor: used to write back values to the config file + */ + ~ChatWindow(); + + /** + * Logic (updates components' size) + */ + void logic(); + + /** + * Adds a line of text to our message list. Parameters: + * + * @param line Text message. + * @parem own Type of message (usually the owner-type). + */ + void chatLog(std::string line, int own, bool ignoreRecord = false); + + /** + * Calls original chat_log() after processing the packet. + */ + void chatLog(CHATSKILL); + + /** + * Performs action. + */ + void action(const gcn::ActionEvent &event); + + /** + * Request focus for typing chat message. + */ + void requestChatFocus(); + + /** + * Checks whether ChatWindow is Focused or not. + */ + bool isInputFocused(); + + /** + * Determines whether to send a command or an ordinary message, then + * contructs packets & sends them. + * + * @param nick The character's name to display in front. + * @param msg The message text which is to be send. + * + * NOTE: + * The nickname is required by the server, if not specified + * the message may not be sent unless a command was intended + * which requires another packet to be constructed! you can + * achieve this by putting a slash ("/") infront of the + * message followed by the command name and the message. + * of course all slash-commands need implemented handler- + * routines. ;-) + * remember, a line starting with "@" is not a command that needs + * to be parsed rather is sent using the normal chat-packet. + * + * EXAMPLE: + * // for an global announcement /- command + * chatlog.chat_send("", "/announce Hello to all logged in users!"); + * // for simple message by a user /- message + * chatlog.chat_send("Zaeiru", "Hello to all users on the screen!"); + */ + void chatSend(const std::string &nick, std::string msg); + + /** Called when key is pressed */ + void keyPressed(gcn::KeyEvent &event); + + /** Called to set current text */ + void setInputText(std::string input_str); + + /** Override to reset mTmpVisible */ + void setVisible(bool visible); /** - * Scrolls the chat window - * - * @param amount direction and amount to scroll. Negative numbers scroll - * up, positive numbers scroll down. The absolute amount indicates the - * amount of 1/8ths of chat window real estate that should be scrolled. - */ - void - scroll(int amount); - - /** - * party implements the partying chat commands - * - * @param command is the party command to perform - * @param msg is the remainder of the message - */ - void - party(const std::string &command, const std::string &msg); - - /** - * help implements the /help command - * - * @param msg1 is the command that the player needs help on - * @param msg2 is the sub-command relating to the command - */ - void - help(const std::string &msg1, const std::string &msg2); + * Scrolls the chat window + * + * @param amount direction and amount to scroll. Negative numbers scroll + * up, positive numbers scroll down. The absolute amount indicates the + * amount of 1/8ths of chat window real estate that should be scrolled. + */ + void scroll(int amount); + + /** + * party implements the partying chat commands + * + * @param command is the party command to perform + * @param msg is the remainder of the message + */ + void party(const std::string &command, const std::string &msg); + + /** + * help implements the /help command + * + * @param msg1 is the command that the player needs help on + * @param msg2 is the sub-command relating to the command + */ + void help(const std::string &msg1, const std::string &msg2); private: - Network *mNetwork; - bool mTmpVisible; - - /** One item in the chat log */ - struct CHATLOG - { - std::string nick; - std::string text; - int own; - }; - - /** Constructs failed messages for actions */ - std::string const_msg(CHATSKILL); - - gcn::TextField *mChatInput; /**< Input box for typing chat messages */ - BrowserBox *mTextOutput; /**< Text box for displaying chat history */ - ScrollArea *mScrollArea; /**< Scroll area around text output */ - - typedef std::list<std::string> History; - typedef History::iterator HistoryIterator; - History mHistory; /**< Command history */ - HistoryIterator mCurHist; /**< History iterator */ - Recorder *mRecorder; /**< Recording class */ - char mPartyPrefix; /**< Messages beginning with the prefix are sent to - the party */ - bool mReturnToggles; /**< Marks whether <Return> toggles the chat log - or not */ - Party *mParty; + Network *mNetwork; + bool mTmpVisible; + + /** One item in the chat log */ + struct CHATLOG + { + std::string nick; + std::string text; + int own; + }; + + /** Constructs failed messages for actions */ + std::string const_msg(CHATSKILL); + + gcn::TextField *mChatInput; /**< Input box for typing chat messages */ + BrowserBox *mTextOutput; /**< Text box for displaying chat history */ + ScrollArea *mScrollArea; /**< Scroll area around text output */ + + typedef std::list<std::string> History; + typedef History::iterator HistoryIterator; + History mHistory; /**< Command history */ + HistoryIterator mCurHist; /**< History iterator */ + Recorder *mRecorder; /**< Recording class */ + char mPartyPrefix; /**< Messages beginning with the prefix are sent to + the party */ + bool mReturnToggles; /**< Marks whether <Return> toggles the chat log + or not */ + Party *mParty; }; extern ChatWindow *chatWindow; diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp index 7fc63096..63f4762a 100644 --- a/src/gui/debugwindow.cpp +++ b/src/gui/debugwindow.cpp @@ -67,8 +67,7 @@ DebugWindow::DebugWindow(): add(mParticleCountLabel); } -void -DebugWindow::logic() +void DebugWindow::logic() { // Get the current mouse position int mouseX, mouseY; diff --git a/src/gui/emotecontainer.h b/src/gui/emotecontainer.h index f5922a9c..2a115f0b 100644 --- a/src/gui/emotecontainer.h +++ b/src/gui/emotecontainer.h @@ -33,15 +33,13 @@ #include "../resources/imageset.h" class Image; -class Inventory; -class Emote; namespace gcn { class SelectionListener; } /** - * An item container. Used to show items in inventory and trade dialog. + * An emote container. Used to show emotes in inventory and trade dialog. * * \ingroup GUI */ @@ -61,7 +59,7 @@ class EmoteContainer : public gcn::Widget, virtual ~EmoteContainer(); /** - * Draws the items. + * Draws the emotes. */ void draw(gcn::Graphics *graphics); @@ -76,12 +74,12 @@ class EmoteContainer : public gcn::Widget, void mousePressed(gcn::MouseEvent &event); /** - * Returns the selected item. + * Returns the selected emote. */ int getSelectedEmote(); /** - * Sets selected item to NULL. + * Sets selected emote to NULL. */ void selectNone(); @@ -106,12 +104,12 @@ class EmoteContainer : public gcn::Widget, private: /** - * Sets the currently selected item. Invalid (e.g., negative) indices set `no item'. + * Sets the currently selected emote. Invalid (e.g., negative) indices set `no emotr'. */ void setSelectedEmoteIndex(int index); /** - * Find the current item index by the most recently used item ID + * Find the current emote index by the most recently used emote ID */ void refindSelectedEmote(void); diff --git a/src/gui/emotewindow.h b/src/gui/emotewindow.h index a382e37d..dbe4efd7 100644 --- a/src/gui/emotewindow.h +++ b/src/gui/emotewindow.h @@ -67,7 +67,6 @@ class EmoteWindow : public Window, gcn::ActionListener, void widgetResized(const gcn::Event &event); private: - EmoteContainer *mEmotes; gcn::Button *mUseButton; diff --git a/src/gui/inttextbox.cpp b/src/gui/inttextbox.cpp index df8cf24e..4cb885c3 100644 --- a/src/gui/inttextbox.cpp +++ b/src/gui/inttextbox.cpp @@ -29,8 +29,7 @@ IntTextBox::IntTextBox(int i): { } -void -IntTextBox::keyPressed(gcn::KeyEvent &event) +void IntTextBox::keyPressed(gcn::KeyEvent &event) { const gcn::Key &key = event.getKey(); diff --git a/src/gui/inttextbox.h b/src/gui/inttextbox.h index 9c6e8bf4..d134fcd7 100644 --- a/src/gui/inttextbox.h +++ b/src/gui/inttextbox.h @@ -55,8 +55,7 @@ class IntTextBox : public TextField /** * Responds to key presses. */ - void - keyPressed(gcn::KeyEvent &event); + void keyPressed(gcn::KeyEvent &event); private: int mMin; /**< Minimum value */ diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp deleted file mode 100644 index 055cbe44..00000000 --- a/src/gui/itempopup.cpp +++ /dev/null @@ -1,113 +0,0 @@ -/* - * The Legend of Mazzeroth - * Copyright (C) 2008, The Legend of Mazzeroth Development Team - * - * This file is part of The Legend of Mazzeroth based on original code - * from The Mana World. - * - * The Legend of Mazzeroth is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Legend of Mazzeroth is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Legend of Mazzeroth; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include <guichan/widgets/label.hpp> - -#include "gui.h" -#include "itempopup.h" - -#include "widgets/layout.h" - -#include "../resources/image.h" -#include "../resources/iteminfo.h" -#include "../resources/resourcemanager.h" -#include "../utils/gettext.h" -#include "../utils/strprintf.h" - -ItemPopup::ItemPopup() -{ - - setResizable(false); - setTitleBarHeight(0); - - // Item Name - mItemName = new gcn::Label("Label"); - mItemName->setFont(gui->getFont()); - mItemName->setPosition(2, 2); - mItemName->setWidth(getWidth() - 4); - - // Item Description - mItemDesc = new TextBox(); - mItemDesc->setEditable(false); - mItemDescScroll = new ScrollArea(mItemDesc); - - mItemDescScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER); - mItemDescScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_NEVER); - mItemDescScroll->setDimension(gcn::Rectangle(0, 0, 196, 14)); - mItemDescScroll->setOpaque(false); - mItemDescScroll->setPosition(2, 15); - - // Item Effect - mItemEffect = new TextBox(); - mItemEffect->setEditable(false); - mItemEffectScroll = new ScrollArea(mItemEffect); - - mItemEffectScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER); - mItemEffectScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_NEVER); - mItemEffectScroll->setDimension(gcn::Rectangle(0, 0, 196, 14)); - mItemEffectScroll->setOpaque(false); - mItemEffectScroll->setPosition(2, 35); - - add(mItemName); - add(mItemDescScroll); - add(mItemEffectScroll); - - setLocationRelativeTo(getParent()); - - // LEEOR / TODO: This causes an exception error. - //moveToBottom(getParent()); - - mItemDesc->setTextWrapped( "" ); - mItemEffect->setTextWrapped( "" ); -} - -void ItemPopup::setItem(Item *item) -{ - - ItemInfo const *info = item ? &item->getInfo() : NULL; - - mItemName->setCaption(info->getName()); - mItemDesc->setTextWrapped( info->getDescription() ); - mItemEffect->setTextWrapped( info->getEffect() ); - - int numRowsDesc = mItemDesc->getNumberOfRows(); - int numRowsEffect = mItemEffect->getNumberOfRows(); - - if(info->getEffect() == "") - { - setContentSize(200, (numRowsDesc * 14) + 30); - } else { - setContentSize(200, (numRowsDesc * 14) + (numRowsEffect*14) + 30); - } - - mItemDescScroll->setDimension(gcn::Rectangle(2, 0, 196, numRowsDesc * 14)); - - mItemEffectScroll->setDimension(gcn::Rectangle(2, 0, 196, numRowsEffect * 14)); - - mItemDescScroll->setPosition(2, 20); - mItemEffectScroll->setPosition(2, (numRowsDesc * 15) + 25); -} - -unsigned int ItemPopup::getNumRows() -{ - return mItemDesc->getNumberOfRows(), mItemEffect->getNumberOfRows(); -} diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h deleted file mode 100644 index 0082ec2c..00000000 --- a/src/gui/itempopup.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -* - * The Legend of Mazzeroth - * Copyright (C) 2008, The Legend of Mazzeroth Development Team - * - * This file is part of The Legend of Mazzeroth based on original code - * from The Mana World. - * - * The Legend of Mazzeroth is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * The Legend of Mazzeroth is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with The Legend of Mazzeroth; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef _LOM_ITEMPOPUP_H__ -#define _LOM_ITEMPOPUP_H__ - -#include "scrollarea.h" -#include "textbox.h" -#include "window.h" - -#include "../item.h" - -class ItemPopup : public Window - { - public: - - ItemPopup(); - - void setItem(Item *item); - unsigned int getNumRows(); - - private: - gcn::Label *mItemName; - TextBox *mItemDesc; - TextBox *mItemEffect; - ScrollArea *mItemDescScroll; - ScrollArea *mItemEffectScroll; - - }; - -#endif diff --git a/src/gui/listbox.cpp b/src/gui/listbox.cpp index 4dca66a0..7e28e1f5 100644 --- a/src/gui/listbox.cpp +++ b/src/gui/listbox.cpp @@ -57,8 +57,7 @@ void ListBox::draw(gcn::Graphics *graphics) } } -void -ListBox::mouseDragged(gcn::MouseEvent &event) +void ListBox::mouseDragged(gcn::MouseEvent &event) { // Pretend mouse is pressed continuously while dragged. Causes list // selection to be updated as is default in many GUIs. diff --git a/src/gui/login.cpp b/src/gui/login.cpp index 18976b46..bba69754 100644 --- a/src/gui/login.cpp +++ b/src/gui/login.cpp @@ -188,8 +188,7 @@ bool LoginDialog::canSubmit() state == LOGIN_STATE; } -bool -LoginDialog::isUShort(const std::string &str) +bool LoginDialog::isUShort(const std::string &str) { if (str == "") { @@ -212,8 +211,7 @@ LoginDialog::isUShort(const std::string &str) return true; } -unsigned short -LoginDialog::getUShort(const std::string &str) +unsigned short LoginDialog::getUShort(const std::string &str) { unsigned long l = 0; for (std::string::const_iterator strPtr = str.begin(), strEnd = str.end(); @@ -228,9 +226,8 @@ LoginDialog::getUShort(const std::string &str) * LoginDialog::DropDownList */ -void -LoginDialog::DropDownList::saveEntry(const std::string &server, - const std::string &port, int &saved) +void LoginDialog::DropDownList::saveEntry(const std::string &server, + const std::string &port, int &saved) { if (saved < MAX_SERVER_LIST_SIZE && server != "") { @@ -272,9 +269,8 @@ LoginDialog::DropDownList::DropDownList(std::string prefix, } } -void -LoginDialog::DropDownList::save(const std::string &server, - const std::string &port) +void LoginDialog::DropDownList::save(const std::string &server, + const std::string &port) { int position = 0; saveEntry(server, port, position); @@ -292,14 +288,12 @@ LoginDialog::DropDownList::save(const std::string &server, } } -int -LoginDialog::DropDownList::getNumberOfElements() +int LoginDialog::DropDownList::getNumberOfElements() { return mServers.size(); } -std::string -LoginDialog::DropDownList::getElementAt(int i) +std::string LoginDialog::DropDownList::getElementAt(int i) { if (i < 0 || i >= getNumberOfElements()) { @@ -308,8 +302,7 @@ LoginDialog::DropDownList::getElementAt(int i) return getServerAt(i) + ":" + getPortAt(i); } -std::string -LoginDialog::DropDownList::getServerAt(int i) +std::string LoginDialog::DropDownList::getServerAt(int i) { if (i < 0 || i >= getNumberOfElements()) { @@ -318,9 +311,7 @@ LoginDialog::DropDownList::getServerAt(int i) return mServers.at(i); } - -std::string -LoginDialog::DropDownList::getPortAt(int i) +std::string LoginDialog::DropDownList::getPortAt(int i) { if (i < 0 || i >= getNumberOfElements()) { diff --git a/src/gui/login.h b/src/gui/login.h index 3b911424..d1d75ebc 100644 --- a/src/gui/login.h +++ b/src/gui/login.h @@ -74,8 +74,7 @@ class LoginDialog : public Window, public gcn::ActionListener, * Returns whether submit can be enabled. This is true in the login * state, when all necessary fields have some text. */ - bool - canSubmit(); + bool canSubmit(); /** * Function to decide whether string is an unsigned short or not @@ -84,8 +83,7 @@ class LoginDialog : public Window, public gcn::ActionListener, * * @return true is str is an unsigned short, false otherwise */ - static bool - isUShort(const std::string &str); + static bool isUShort(const std::string &str); /** * Converts string to an unsigned short (undefined if invalid) @@ -94,8 +92,7 @@ class LoginDialog : public Window, public gcn::ActionListener, * * @return the value str represents */ - static unsigned short - getUShort(const std::string &str); + static unsigned short getUShort(const std::string &str); DropDown *mServerDropDown; gcn::TextField *mUserField; diff --git a/src/gui/passwordfield.h b/src/gui/passwordfield.h index 9aa6ab49..e31b1779 100644 --- a/src/gui/passwordfield.h +++ b/src/gui/passwordfield.h @@ -31,7 +31,8 @@ * * \ingroup GUI */ -class PasswordField : public TextField { +class PasswordField : public TextField +{ public: /** * Constructor, initializes the password field with the given string. diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp index e5227e5a..92722417 100644 --- a/src/gui/playerbox.cpp +++ b/src/gui/playerbox.cpp @@ -76,8 +76,7 @@ PlayerBox::~PlayerBox() } } -void -PlayerBox::draw(gcn::Graphics *graphics) +void PlayerBox::draw(gcn::Graphics *graphics) { if (mPlayer) { @@ -90,8 +89,7 @@ PlayerBox::draw(gcn::Graphics *graphics) } } -void -PlayerBox::drawFrame(gcn::Graphics *graphics) +void PlayerBox::drawFrame(gcn::Graphics *graphics) { int w, h, bs; bs = getFrameSize(); diff --git a/src/gui/playerbox.h b/src/gui/playerbox.h index 7aec87bf..3ccb5fad 100644 --- a/src/gui/playerbox.h +++ b/src/gui/playerbox.h @@ -53,8 +53,7 @@ class PlayerBox : public gcn::ScrollArea * player to <code>NULL</code> causes the box not to draw any * character. */ - void - setPlayer(const Player *player) { mPlayer = player; } + void setPlayer(const Player *player) { mPlayer = player; } /** * Draws the scroll area. diff --git a/src/gui/progressbar.cpp b/src/gui/progressbar.cpp index 708a2991..b4117c80 100644 --- a/src/gui/progressbar.cpp +++ b/src/gui/progressbar.cpp @@ -88,8 +88,7 @@ void ProgressBar::logic() if (mBlueToGo < mBlue) mBlue--; } -void -ProgressBar::draw(gcn::Graphics *graphics) +void ProgressBar::draw(gcn::Graphics *graphics) { static_cast<Graphics*>(graphics)-> drawImageRect(0, 0, getWidth(), getHeight(), mBorder); @@ -104,16 +103,14 @@ ProgressBar::draw(gcn::Graphics *graphics) } } -void -ProgressBar::setProgress(float progress) +void ProgressBar::setProgress(float progress) { if (progress < 0.0f) mProgress = 0.0; else if (progress > 1.0f) mProgress = 1.0; else mProgress = progress; } -void -ProgressBar::setColor(Uint8 red, Uint8 green, Uint8 blue) +void ProgressBar::setColor(Uint8 red, Uint8 green, Uint8 blue) { mRedToGo = red; mGreenToGo = green; diff --git a/src/gui/progressbar.h b/src/gui/progressbar.h index a20c901f..d2ace66c 100644 --- a/src/gui/progressbar.h +++ b/src/gui/progressbar.h @@ -52,50 +52,42 @@ class ProgressBar : public gcn::Widget { /** * Performs progress bar logic (fading colors) */ - void - logic(); + void logic(); /** * Draws the progress bar. */ - void - draw(gcn::Graphics *graphics); + void draw(gcn::Graphics *graphics); /** * Sets the current progress. */ - void - setProgress(float progress); + void setProgress(float progress); /** * Returns the current progress. */ - float - getProgress() { return mProgress; } + float getProgress() { return mProgress; } /** * Change the filling of the progress bar. */ - void - setColor(Uint8, Uint8 green, Uint8 blue); + void setColor(Uint8, Uint8 green, Uint8 blue); /** * Get The red value of color */ - Uint8 - getRed() { return mRed; } + Uint8 getRed() { return mRed; } /** * Get The red value of color */ - Uint8 - getGreen() { return mGreen; } + Uint8 getGreen() { return mGreen; } /** * Get The red value of color */ - Uint8 - getBlue() { return mBlue; } + Uint8 getBlue() { return mBlue; } private: float mProgress; diff --git a/src/gui/register.cpp b/src/gui/register.cpp index 5d687425..568ec5ff 100644 --- a/src/gui/register.cpp +++ b/src/gui/register.cpp @@ -43,14 +43,12 @@ #include "../utils/gettext.h" #include "../utils/strprintf.h" -void -WrongDataNoticeListener::setTarget(gcn::TextField *textField) +void WrongDataNoticeListener::setTarget(gcn::TextField *textField) { mTarget = textField; } -void -WrongDataNoticeListener::action(const gcn::ActionEvent &event) +void WrongDataNoticeListener::action(const gcn::ActionEvent &event) { if (event.getId() == "ok") { @@ -173,8 +171,7 @@ RegisterDialog::~RegisterDialog() delete mWrongDataNoticeListener; } -void -RegisterDialog::action(const gcn::ActionEvent &event) +void RegisterDialog::action(const gcn::ActionEvent &event) { if (event.getId() == "cancel") { @@ -263,14 +260,12 @@ RegisterDialog::action(const gcn::ActionEvent &event) } } -void -RegisterDialog::keyPressed(gcn::KeyEvent &keyEvent) +void RegisterDialog::keyPressed(gcn::KeyEvent &keyEvent) { mRegisterButton->setEnabled(canSubmit()); } -bool -RegisterDialog::canSubmit() +bool RegisterDialog::canSubmit() { return !mUserField->getText().empty() && !mPasswordField->getText().empty() && @@ -280,8 +275,7 @@ RegisterDialog::canSubmit() state == REGISTER_STATE; } -bool -RegisterDialog::isUShort(const std::string &str) +bool RegisterDialog::isUShort(const std::string &str) { if (str == "") { @@ -304,8 +298,7 @@ RegisterDialog::isUShort(const std::string &str) return true; } -unsigned short -RegisterDialog::getUShort(const std::string &str) +unsigned short RegisterDialog::getUShort(const std::string &str) { unsigned long l = 0; for (std::string::const_iterator strPtr = str.begin(), strEnd = str.end(); diff --git a/src/gui/register.h b/src/gui/register.h index 87a11bb9..4c1d9f88 100644 --- a/src/gui/register.h +++ b/src/gui/register.h @@ -84,8 +84,7 @@ class RegisterDialog : public Window, public gcn::ActionListener, * Returns whether submit can be enabled. This is true in the register * state, when all necessary fields have some text. */ - bool - canSubmit(); + bool canSubmit(); /** * Function to decide whether string is an unsigned short or not @@ -94,8 +93,7 @@ class RegisterDialog : public Window, public gcn::ActionListener, * * @return true if str is an unsigned short, false otherwise */ - static bool - isUShort(const std::string &str); + static bool isUShort(const std::string &str); /** * Converts string to an unsigned short (undefined if invalid) @@ -104,8 +102,7 @@ class RegisterDialog : public Window, public gcn::ActionListener, * * @return the value str represents */ - static unsigned short - getUShort(const std::string &str); + static unsigned short getUShort(const std::string &str); gcn::TextField *mUserField; gcn::TextField *mPasswordField; diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h index dfc3da38..370a2d2e 100644 --- a/src/gui/setup_video.h +++ b/src/gui/setup_video.h @@ -42,8 +42,7 @@ class Setup_Video : public SetupTab, public gcn::ActionListener, void action(const gcn::ActionEvent &event); /** Called when key is pressed */ - void - keyPressed(gcn::KeyEvent &event); + void keyPressed(gcn::KeyEvent &event); private: bool mFullScreenEnabled; @@ -86,12 +85,10 @@ class Setup_Video : public SetupTab, public gcn::ActionListener, gcn::Slider *mParticleDetailSlider; gcn::Label *mParticleDetailField; - void - updateSliders(bool originalValues); + void updateSliders(bool originalValues); - int - updateSlider(gcn::Slider *slider, gcn::TextField *field, - const std::string &configName); + int updateSlider(gcn::Slider *slider, gcn::TextField *field, + const std::string &configName); }; #endif diff --git a/src/gui/status.h b/src/gui/status.h index eb4171c9..aa20d094 100644 --- a/src/gui/status.h +++ b/src/gui/status.h @@ -33,7 +33,6 @@ class LocalPlayer; class ProgressBar; - /** * The player status dialog. * diff --git a/src/gui/table.cpp b/src/gui/table.cpp index e4d7812e..264d9864 100644 --- a/src/gui/table.cpp +++ b/src/gui/table.cpp @@ -63,8 +63,7 @@ GuiTableActionListener::~GuiTableActionListener(void) } } -void -GuiTableActionListener::action(const gcn::ActionEvent& actionEvent) +void GuiTableActionListener::action(const gcn::ActionEvent& actionEvent) { mTable->setSelected(mRow, mColumn); mTable->distributeActionEvent(); @@ -88,14 +87,12 @@ GuiTable::~GuiTable(void) delete mModel; } -TableModel * -GuiTable::getModel(void) const +TableModel* GuiTable::getModel(void) const { return mModel; } -void -GuiTable::setModel(TableModel *new_model) +void GuiTable::setModel(TableModel *new_model) { if (mModel) { uninstallActionListeners(); @@ -112,9 +109,7 @@ GuiTable::setModel(TableModel *new_model) } } - -void -GuiTable::recomputeDimensions(void) +void GuiTable::recomputeDimensions(void) { int rows_nr = mModel->getRows(); int columns_nr = mModel->getColumns(); @@ -136,33 +131,28 @@ GuiTable::recomputeDimensions(void) setHeight(height); } -void -GuiTable::setSelected(int row, int column) +void GuiTable::setSelected(int row, int column) { mSelectedColumn = column; mSelectedRow = row; } -int -GuiTable::getSelectedRow(void) +int GuiTable::getSelectedRow(void) { return mSelectedRow; } -int -GuiTable::getSelectedColumn(void) +int GuiTable::getSelectedColumn(void) { return mSelectedColumn; } -void -GuiTable::setLinewiseSelection(bool linewise) +void GuiTable::setLinewiseSelection(bool linewise) { mLinewiseMode = linewise; } -int -GuiTable::getRowHeight(void) +int GuiTable::getRowHeight(void) { if (mModel) return mModel->getRowHeight() + 1; // border @@ -170,8 +160,7 @@ GuiTable::getRowHeight(void) return 0; } -int -GuiTable::getColumnWidth(int i) +int GuiTable::getColumnWidth(int i) { if (mModel) return mModel->getColumnWidth(i) + 1; // border @@ -179,16 +168,14 @@ GuiTable::getColumnWidth(int i) return 0; } -void -GuiTable::uninstallActionListeners(void) +void GuiTable::uninstallActionListeners(void) { for (std::vector<GuiTableActionListener *>::const_iterator it = action_listeners.begin(); it != action_listeners.end(); it++) delete *it; action_listeners.clear(); } -void -GuiTable::installActionListeners(void) +void GuiTable::installActionListeners(void) { if (!mModel) return; @@ -207,8 +194,7 @@ GuiTable::installActionListeners(void) } // -- widget ops -void -GuiTable::draw(gcn::Graphics* graphics) +void GuiTable::draw(gcn::Graphics* graphics) { graphics->setColor(getBackgroundColor()); graphics->fillRectangle(gcn::Rectangle(0, 0, getWidth(), getHeight())); @@ -282,42 +268,35 @@ GuiTable::draw(gcn::Graphics* graphics) } } -void -GuiTable::logic(void) +void GuiTable::logic(void) { } -void -GuiTable::moveToTop(gcn::Widget *widget) +void GuiTable::moveToTop(gcn::Widget *widget) { gcn::Widget::moveToTop(widget); this->mTopWidget = widget; } -void -GuiTable::moveToBottom(gcn::Widget *widget) +void GuiTable::moveToBottom(gcn::Widget *widget) { gcn::Widget::moveToBottom(widget); if (widget == this->mTopWidget) this->mTopWidget = NULL; } -gcn::Rectangle -GuiTable::getChildrenArea(void) +gcn::Rectangle GuiTable::getChildrenArea(void) { return gcn::Rectangle(0, 0, getWidth(), getHeight()); } // -- KeyListener notifications -void -GuiTable::keyPressed(gcn::KeyEvent& keyEvent) +void GuiTable::keyPressed(gcn::KeyEvent& keyEvent) { } - // -- MouseListener notifications -void -GuiTable::mousePressed(gcn::MouseEvent& mouseEvent) +void GuiTable::mousePressed(gcn::MouseEvent& mouseEvent) { if (mouseEvent.getButton() == gcn::MouseEvent::LEFT) { int row = getRowForY(mouseEvent.getY()); @@ -332,24 +311,20 @@ GuiTable::mousePressed(gcn::MouseEvent& mouseEvent) } } -void -GuiTable::mouseWheelMovedUp(gcn::MouseEvent& mouseEvent) +void GuiTable::mouseWheelMovedUp(gcn::MouseEvent& mouseEvent) { } -void -GuiTable::mouseWheelMovedDown(gcn::MouseEvent& mouseEvent) +void GuiTable::mouseWheelMovedDown(gcn::MouseEvent& mouseEvent) { } -void -GuiTable::mouseDragged(gcn::MouseEvent& mouseEvent) +void GuiTable::mouseDragged(gcn::MouseEvent& mouseEvent) { } // -- TableModelListener notifications -void -GuiTable::modelUpdated(bool completed) +void GuiTable::modelUpdated(bool completed) { if (completed) { recomputeDimensions(); @@ -360,8 +335,7 @@ GuiTable::modelUpdated(bool completed) } } -gcn::Widget * -GuiTable::getWidgetAt(int x, int y) +gcn::Widget* GuiTable::getWidgetAt(int x, int y) { int row = getRowForY(y); int column = getColumnForX(x); @@ -381,8 +355,7 @@ GuiTable::getWidgetAt(int x, int y) return NULL; } -int -GuiTable::getRowForY(int y) +int GuiTable::getRowForY(int y) { int row = y / getRowHeight(); @@ -393,8 +366,7 @@ GuiTable::getRowForY(int y) return row; } -int -GuiTable::getColumnForX(int x) +int GuiTable::getColumnForX(int x) { int column; int delta = 0; @@ -412,9 +384,7 @@ GuiTable::getColumnForX(int x) return column; } - -void -GuiTable::_setFocusHandler(gcn::FocusHandler* focusHandler) +void GuiTable::_setFocusHandler(gcn::FocusHandler* focusHandler) { gcn::Widget::_setFocusHandler(focusHandler); diff --git a/src/gui/table_model.cpp b/src/gui/table_model.cpp index e1afef96..9911eec3 100644 --- a/src/gui/table_model.cpp +++ b/src/gui/table_model.cpp @@ -25,27 +25,23 @@ #include "table_model.h" -void -TableModel::installListener(TableModelListener *listener) +void TableModel::installListener(TableModelListener *listener) { listeners.insert(listener); } -void -TableModel::removeListener(TableModelListener *listener) +void TableModel::removeListener(TableModelListener *listener) { listeners.erase(listener); } -void -TableModel::signalBeforeUpdate(void) +void TableModel::signalBeforeUpdate(void) { for (std::set<TableModelListener *>::const_iterator it = listeners.begin(); it != listeners.end(); it++) (*it)->modelUpdated(false); } -void -TableModel::signalAfterUpdate(void) +void TableModel::signalAfterUpdate(void) { for (std::set<TableModelListener *>::const_iterator it = listeners.begin(); it != listeners.end(); it++) (*it)->modelUpdated(true); @@ -72,16 +68,14 @@ StaticTableModel::~StaticTableModel(void) delete *it; } -void -StaticTableModel::resize(void) +void StaticTableModel::resize(void) { mRows = getRows(); mColumns = getColumns(); mTableModel.resize(mRows * mColumns, NULL); } -void -StaticTableModel::set(int row, int column, gcn::Widget *widget) +void StaticTableModel::set(int row, int column, gcn::Widget *widget) { if (row >= mRows || row < 0 || column >= mColumns || column < 0) @@ -106,14 +100,12 @@ StaticTableModel::set(int row, int column, gcn::Widget *widget) signalAfterUpdate(); } -gcn::Widget * -StaticTableModel::getElementAt(int row, int column) +gcn::Widget* StaticTableModel::getElementAt(int row, int column) { return mTableModel[WIDGET_AT(row, column)]; } -void -StaticTableModel::fixColumnWidth(int column, int width) +void StaticTableModel::fixColumnWidth(int column, int width) { if (width < 0 || column < 0 || column >= mColumns) @@ -122,8 +114,7 @@ StaticTableModel::fixColumnWidth(int column, int width) mWidths[column] = -width; // Negate to tag as fixed } -void -StaticTableModel::fixRowHeight(int height) +void StaticTableModel::fixRowHeight(int height) { if (height < 0) return; @@ -131,14 +122,12 @@ StaticTableModel::fixRowHeight(int height) mHeight = -height; } -int -StaticTableModel::getRowHeight(void) +int StaticTableModel::getRowHeight(void) { return abs(mHeight); } -int -StaticTableModel::getColumnWidth(int column) +int StaticTableModel::getColumnWidth(int column) { if (column < 0 || column >= mColumns) return 0; @@ -146,14 +135,12 @@ StaticTableModel::getColumnWidth(int column) return abs(mWidths[column]); } -int -StaticTableModel::getRows(void) +int StaticTableModel::getRows(void) { return mRows; } -int -StaticTableModel::getColumns(void) +int StaticTableModel::getColumns(void) { return mColumns; } diff --git a/src/gui/truetypefont.cpp b/src/gui/truetypefont.cpp index 7f9abd3a..248afcbf 100644 --- a/src/gui/truetypefont.cpp +++ b/src/gui/truetypefont.cpp @@ -17,16 +17,14 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ -#include "truetypefont.h" - #include <list> #include <guichan/exception.hpp> +#include "truetypefont.h" + #include "../graphics.h" #include "../resources/image.h" @@ -77,7 +75,6 @@ class TextChunk gcn::Color color; }; - // Word surfaces cache static std::list<TextChunk> cache; typedef std::list<TextChunk>::iterator CacheIterator; @@ -114,8 +111,8 @@ TrueTypeFont::~TrueTypeFont() } void TrueTypeFont::drawString(gcn::Graphics *graphics, - const std::string &text, - int x, int y) + const std::string &text, + int x, int y) { if (text.empty()) { diff --git a/src/gui/truetypefont.h b/src/gui/truetypefont.h index 7a4ee9ac..67c39e6a 100644 --- a/src/gui/truetypefont.h +++ b/src/gui/truetypefont.h @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #ifndef _TMW_TRUETYPEFONT_H diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp index fab048fc..9311b59b 100644 --- a/src/gui/updatewindow.cpp +++ b/src/gui/updatewindow.cpp @@ -69,8 +69,7 @@ static unsigned long fadler32(FILE *file) /** * Load the given file into a vector of strings. */ -std::vector<std::string> -loadTextFile(const std::string &fileName) +std::vector<std::string> loadTextFile(const std::string &fileName) { std::vector<std::string> lines; std::ifstream fin(fileName.c_str()); @@ -242,8 +241,7 @@ int UpdaterWindow::updateProgress(void *ptr, return 0; } -size_t -UpdaterWindow::memoryWrite(void *ptr, size_t size, size_t nmemb, FILE *stream) +size_t UpdaterWindow::memoryWrite(void *ptr, size_t size, size_t nmemb, FILE *stream) { UpdaterWindow *uw = reinterpret_cast<UpdaterWindow *>(stream); size_t totalMem = size * nmemb; diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 5bb29987..5fcb7dc9 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -46,8 +46,6 @@ extern volatile int tick_time; -extern volatile int tick_time; - Viewport::Viewport(): mMap(0), mPixelViewX(0.0f), diff --git a/src/gui/widgets/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp index 87527f0a..6009d5f5 100644 --- a/src/gui/widgets/resizegrip.cpp +++ b/src/gui/widgets/resizegrip.cpp @@ -56,8 +56,7 @@ ResizeGrip::~ResizeGrip() } } -void -ResizeGrip::draw(gcn::Graphics *graphics) +void ResizeGrip::draw(gcn::Graphics *graphics) { static_cast<Graphics*>(graphics)->drawImage(gripImage, 0, 0); } diff --git a/src/gui/window.h b/src/gui/window.h index 89cc75a5..d864290c 100644 --- a/src/gui/window.h +++ b/src/gui/window.h @@ -157,8 +157,7 @@ class Window : public gcn::Window, gcn::WidgetListener * * @return The parent window or <code>NULL</code> if there is none. */ - Window* - getParentWindow() { return mParent; } + Window* getParentWindow() { return mParent; } /** * Schedule this window for deletion. It will be deleted at the start @@ -198,14 +197,12 @@ class Window : public gcn::Window, gcn::WidgetListener /** * Sets the name of the window. This is not the window title. */ - void - setWindowName(const std::string &name) { mWindowName = name; } + void setWindowName(const std::string &name) { mWindowName = name; } /** * Returns the name of the window. This is not the window title. */ - const std::string& - getWindowName() { return mWindowName; } + const std::string& getWindowName() { return mWindowName; } /** * Reads the position (and the size for resizable windows) in the @@ -46,14 +46,12 @@ class Item /** * Sets the item id, identifying the item type. */ - void - setId(int id); + void setId(int id); /** * Returns the item id. */ - int - getId() const { return mId; } + int getId() const { return mId; } /** * Returns the item image. @@ -63,62 +61,52 @@ class Item /** * Sets the number of items. */ - void - setQuantity(int quantity) { mQuantity = quantity; } + void setQuantity(int quantity) { mQuantity = quantity; } /** * Increases the number of items by the given amount. */ - void - increaseQuantity(int amount) { mQuantity += amount; } + void increaseQuantity(int amount) { mQuantity += amount; } /** * Returns the number of items. */ - int - getQuantity() const { return mQuantity; } + int getQuantity() const { return mQuantity; } /** * Sets whether this item is considered equipment. */ - void - setEquipment(bool equipment) { mEquipment = equipment; } + void setEquipment(bool equipment) { mEquipment = equipment; } /** * Returns whether this item is considered equipment. */ - bool - isEquipment() const { return mEquipment; } + bool isEquipment() const { return mEquipment; } /** * Sets whether this item is equipped. */ - void - setEquipped(bool equipped) { mEquipped = equipped; } + void setEquipped(bool equipped) { mEquipped = equipped; } /** * Returns whether this item is equipped. */ - bool - isEquipped() const { return mEquipped; } + bool isEquipped() const { return mEquipped; } /** * Sets the inventory index of this item. */ - void - setInvIndex(int index) { mInvIndex = index; } + void setInvIndex(int index) { mInvIndex = index; } /** * Returns the inventory index of this item. */ - int - getInvIndex() const { return mInvIndex; } + int getInvIndex() const { return mInvIndex; } /** * Returns information about this item type. */ - const ItemInfo& - getInfo() const { return ItemDB::get(mId); } + const ItemInfo& getInfo() const { return ItemDB::get(mId); } protected: int mId; /**< Item type id. */ @@ -182,8 +182,7 @@ class Map : public Properties /** * Finds the tile set that a tile with the given global id is part of. */ - Tileset* - getTilesetWithGid(int gid) const; + Tileset* getTilesetWithGid(int gid) const; /** * Get tile reference. @@ -203,26 +202,22 @@ class Map : public Properties /** * Returns the width of this map. */ - int - getWidth() const { return mWidth; } + int getWidth() const { return mWidth; } /** * Returns the height of this map. */ - int - getHeight() const { return mHeight; } + int getHeight() const { return mHeight; } /** * Returns the tile width of this map. */ - int - getTileWidth() const { return mTileWidth; } + int getTileWidth() const { return mTileWidth; } /** * Returns the tile height used by this map. */ - int - getTileHeight() const { return mTileHeight; } + int getTileHeight() const { return mTileHeight; } /** * Find a path from one location to the next. @@ -232,14 +227,12 @@ class Map : public Properties /** * Adds a sprite to the map. */ - SpriteIterator - addSprite(Sprite *sprite); + SpriteIterator addSprite(Sprite *sprite); /** * Removes a sprite from the map. */ - void - removeSprite(SpriteIterator iterator); + void removeSprite(SpriteIterator iterator); /** * Adds a particle effect @@ -266,9 +259,8 @@ class Map : public Properties /** * Draws the overlay graphic to the given graphics output. */ - void - drawOverlay(Graphics *graphics, float scrollX, float scrollY, - int detail); + void drawOverlay(Graphics *graphics, float scrollX, float scrollY, + int detail); /** * Tells whether a tile is occupied by a being. diff --git a/src/monster.h b/src/monster.h index cb8f7f18..7a8cd2a7 100644 --- a/src/monster.h +++ b/src/monster.h @@ -62,8 +62,7 @@ class Monster : public Being /** * Returns the MonsterInfo, with static data about this monster. */ - const MonsterInfo& - getInfo() const; + const MonsterInfo& getInfo() const; /** * Determine whether the mob should show it's name diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp index 345e02fc..387af70c 100644 --- a/src/net/messagein.cpp +++ b/src/net/messagein.cpp @@ -38,15 +38,13 @@ MessageIn::MessageIn(const char *data, unsigned int length): mId = readInt16(); } -Sint8 -MessageIn::readInt8() +Sint8 MessageIn::readInt8() { assert(mPos < mLength); return mData[mPos++]; } -Sint16 -MessageIn::readInt16() +Sint16 MessageIn::readInt16() { assert(mPos + 2 <= mLength); mPos += 2; @@ -57,8 +55,7 @@ MessageIn::readInt16() #endif } -Sint32 -MessageIn::readInt32() +Sint32 MessageIn::readInt32() { assert(mPos + 4 <= mLength); mPos += 4; @@ -69,8 +66,7 @@ MessageIn::readInt32() #endif } -void -MessageIn::readCoordinates(Uint16 &x, Uint16 &y, Uint8 &direction) +void MessageIn::readCoordinates(Uint16 &x, Uint16 &y, Uint8 &direction) { assert(mPos + 3 <= mLength); @@ -119,8 +115,7 @@ MessageIn::readCoordinates(Uint16 &x, Uint16 &y, Uint8 &direction) mPos += 3; } -void -MessageIn::readCoordinatePair(Uint16 &srcX, Uint16 &srcY, +void MessageIn::readCoordinatePair(Uint16 &srcX, Uint16 &srcY, Uint16 &dstX, Uint16 &dstY) { assert(mPos + 5 <= mLength); @@ -142,15 +137,13 @@ MessageIn::readCoordinatePair(Uint16 &srcX, Uint16 &srcY, mPos += 5; } -void -MessageIn::skip(unsigned int length) +void MessageIn::skip(unsigned int length) { assert(mPos + length <= mLength); mPos += length; } -std::string -MessageIn::readString(int length) +std::string MessageIn::readString(int length) { // Get string length if (length < 0) { diff --git a/src/net/messagein.h b/src/net/messagein.h index 81db6cdc..90804497 100644 --- a/src/net/messagein.h +++ b/src/net/messagein.h @@ -43,14 +43,12 @@ class MessageIn /** * Returns the message ID. */ - short - getId() { return mId; } + short getId() { return mId; } /** * Returns the message length. */ - unsigned int - getLength() { return mLength; } + unsigned int getLength() { return mLength; } Sint8 readInt8(); /**< Reads a byte. */ Sint16 readInt16(); /**< Reads a short. */ @@ -60,30 +58,26 @@ class MessageIn * Reads a special 3 byte block used by eAthena, containing x and y * coordinates and direction. */ - void - readCoordinates(Uint16 &x, Uint16 &y, Uint8 &direction); + void readCoordinates(Uint16 &x, Uint16 &y, Uint8 &direction); /** * Reads a special 5 byte block used by eAthena, containing a source * and destination coordinate pair. */ - void - readCoordinatePair(Uint16 &srcX, Uint16 &srcY, - Uint16 &dstX, Uint16 &dstY); + void readCoordinatePair(Uint16 &srcX, Uint16 &srcY, + Uint16 &dstX, Uint16 &dstY); /** * Skips a given number of bytes. */ - void - skip(unsigned int length); + void skip(unsigned int length); /** * Reads a string. If a length is not given (-1), it is assumed * that the length of the string is stored in a short at the * start of the string. */ - std::string - readString(int length = -1); + std::string readString(int length = -1); private: const char* mData; /**< The message data. */ diff --git a/src/net/network.cpp b/src/net/network.cpp index c9f8d1bd..60d54a7a 100644 --- a/src/net/network.cpp +++ b/src/net/network.cpp @@ -431,8 +431,7 @@ char *iptostring(int address) return asciiIP; } -void -Network::setError(const std::string& error) +void Network::setError(const std::string& error) { logger->log("Network error: %s", error.c_str()); mError = error; diff --git a/src/net/network.h b/src/net/network.h index 43b4dbbc..6270e0de 100644 --- a/src/net/network.h +++ b/src/net/network.h @@ -46,47 +46,33 @@ class Network ~Network(); - bool - connect(const std::string &address, short port); + bool connect(const std::string &address, short port); - void - disconnect(); + void disconnect(); - void - registerHandler(MessageHandler *handler); + void registerHandler(MessageHandler *handler); - void - unregisterHandler(MessageHandler *handler); + void unregisterHandler(MessageHandler *handler); - void - clearHandlers(); + void clearHandlers(); - int - getState() const { return mState; } + int getState() const { return mState; } - const std::string& - getError() const { return mError; } + const std::string& getError() const { return mError; } - bool - isConnected() const { return mState == CONNECTED; } + bool isConnected() const { return mState == CONNECTED; } - int - getInSize() const { return mInSize; } + int getInSize() const { return mInSize; } - void - skip(int len); + void skip(int len); - bool - messageReady(); + bool messageReady(); - MessageIn - getNextMessage(); + MessageIn getNextMessage(); - void - dispatchMessages(); + void dispatchMessages(); - void - flush(); + void flush(); // ERROR replaced by NET_ERROR because already defined in Windows enum { @@ -98,17 +84,13 @@ class Network }; protected: - void - setError(const std::string& error); + void setError(const std::string& error); - Uint16 - readWord(int pos); + Uint16 readWord(int pos); - bool - realConnect(); + bool realConnect(); - void - receive(); + void receive(); TCPsocket mSocket; diff --git a/src/net/partyhandler.cpp b/src/net/partyhandler.cpp index 9b5f3080..d4b7455b 100644 --- a/src/net/partyhandler.cpp +++ b/src/net/partyhandler.cpp @@ -50,8 +50,7 @@ PartyHandler::PartyHandler(Party *party) : mParty(party) handledMessages = _messages; } -void -PartyHandler::handleMessage(MessageIn *msg) +void PartyHandler::handleMessage(MessageIn *msg) { switch (msg->getId()) { diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp index 83b26743..59c7d0d6 100644 --- a/src/net/playerhandler.cpp +++ b/src/net/playerhandler.cpp @@ -264,7 +264,7 @@ void PlayerHandler::handleMessage(MessageIn *msg) Uint32 curGp = player_node->mGp; player_node->mGp = msg->readInt32(); if (player_node->mGp > curGp) - chatWindow->chatLog("You picked up " + + chatWindow->chatLog(_("You picked up ") + toString(player_node->mGp - curGp) + " GP", BY_SERVER); } diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp index 746e1d06..07134746 100644 --- a/src/net/tradehandler.cpp +++ b/src/net/tradehandler.cpp @@ -32,6 +32,8 @@ #include "../gui/confirm_dialog.h" #include "../gui/trade.h" +#include "../utils/gettext.h" + std::string tradePartnerName; /** @@ -86,9 +88,9 @@ void TradeHandler::handleMessage(MessageIn *msg) player_node->setTrading(true); ConfirmDialog *dlg; - dlg = new ConfirmDialog("Request for trade", + dlg = new ConfirmDialog(_("Request for trade"), tradePartnerName + - " wants to trade with you, do you accept?"); + _(" wants to trade with you, do you accept?")); dlg->addActionListener(&listener); } else @@ -102,37 +104,35 @@ void TradeHandler::handleMessage(MessageIn *msg) switch (msg->readInt8()) { case 0: // Too far away - chatWindow->chatLog("Trading isn't possible. " - "Trade partner is too far away.", + chatWindow->chatLog(_("Trading isn't possible. Trade partner is too far away."), BY_SERVER); break; case 1: // Character doesn't exist - chatWindow->chatLog("Trading isn't possible. " - "Character doesn't exist.", + chatWindow->chatLog(_("Trading isn't possible. Character doesn't exist."), BY_SERVER); break; case 2: // Invite request check failed... - chatWindow->chatLog("Trade cancelled due to an " - "unknown reason.", BY_SERVER); + chatWindow->chatLog(_("Trade cancelled due to an unknown reason."), + BY_SERVER); break; case 3: // Trade accepted tradeWindow->reset(); tradeWindow->setCaption( - "Trade: You and " + tradePartnerName); + _("Trade: You and ") + tradePartnerName); tradeWindow->setVisible(true); break; case 4: // Trade cancelled if (player_relations.hasPermission(tradePartnerName, PlayerRelation::SPEECH_LOG)) - chatWindow->chatLog("Trade with " + tradePartnerName + - " cancelled", BY_SERVER); + chatWindow->chatLog(_("Trade with ") + tradePartnerName + + _(" cancelled"), BY_SERVER); // otherwise ignore silently tradeWindow->setVisible(false); player_node->setTrading(false); break; default: // Shouldn't happen as well, but to be sure - chatWindow->chatLog("Unhandled trade cancel packet", + chatWindow->chatLog(_("Unhandled trade cancel packet"), BY_SERVER); break; } @@ -182,19 +182,17 @@ void TradeHandler::handleMessage(MessageIn *msg) break; case 1: // Add item failed - player overweighted - chatWindow->chatLog("Failed adding item. Trade " - "partner is over weighted.", + chatWindow->chatLog(_("Failed adding item. Trade partner is over weighted."), BY_SERVER); break; case 2: // Add item failed - player has no free slot - chatWindow->chatLog("Failed adding item. Trade " - "partner has no free slot.", + chatWindow->chatLog(_("Failed adding item. Trade partner has no free slot."), BY_SERVER); break; default: - chatWindow->chatLog("Failed adding item for " - "unknown reason.", BY_SERVER); + chatWindow->chatLog(_("Failed adding item for unknown reason."), + BY_SERVER); break; } } @@ -206,14 +204,14 @@ void TradeHandler::handleMessage(MessageIn *msg) break; case SMSG_TRADE_CANCEL: - chatWindow->chatLog("Trade canceled.", BY_SERVER); + chatWindow->chatLog(_("Trade canceled."), BY_SERVER); tradeWindow->setVisible(false); tradeWindow->reset(); player_node->setTrading(false); break; case SMSG_TRADE_COMPLETE: - chatWindow->chatLog("Trade completed.", BY_SERVER); + chatWindow->chatLog(_("Trade completed."), BY_SERVER); tradeWindow->setVisible(false); tradeWindow->reset(); player_node->setTrading(false); diff --git a/src/npc.cpp b/src/npc.cpp index 2aa15209..a2fb7d38 100644 --- a/src/npc.cpp +++ b/src/npc.cpp @@ -111,8 +111,7 @@ NPC::getType() const return Being::NPC; } -void -NPC::talk() +void NPC::talk() { MessageOut outMsg(mNetwork); outMsg.writeInt16(CMSG_NPC_TALK); @@ -121,16 +120,14 @@ NPC::talk() current_npc = this; } -void -NPC::nextDialog() +void NPC::nextDialog() { MessageOut outMsg(mNetwork); outMsg.writeInt16(CMSG_NPC_NEXT_REQUEST); outMsg.writeInt32(mId); } -void -NPC::dialogChoice(char choice) +void NPC::dialogChoice(char choice) { MessageOut outMsg(mNetwork); outMsg.writeInt16(CMSG_NPC_LIST_CHOICE); @@ -142,8 +139,7 @@ NPC::dialogChoice(char choice) * TODO Unify the buy() and sell() methods, without sacrificing readability of * the code calling the method. buy(bool buySell) would be bad... */ -void -NPC::buy() +void NPC::buy() { MessageOut outMsg(mNetwork); outMsg.writeInt16(CMSG_NPC_BUY_SELL_REQUEST); @@ -151,8 +147,7 @@ NPC::buy() outMsg.writeInt8(0); } -void -NPC::sell() +void NPC::sell() { MessageOut outMsg(mNetwork); outMsg.writeInt16(CMSG_NPC_BUY_SELL_REQUEST); diff --git a/src/particlecontainer.cpp b/src/particlecontainer.cpp index fbfb1505..b90db9f1 100644 --- a/src/particlecontainer.cpp +++ b/src/particlecontainer.cpp @@ -36,8 +36,7 @@ ParticleContainer::~ParticleContainer() delete mNext; } -void -ParticleContainer::clear() +void ParticleContainer::clear() { clearLocally(); if (mNext) @@ -57,8 +56,7 @@ ParticleList::ParticleList(ParticleContainer *parent, bool delParent) : ParticleList::~ParticleList() {} -void -ParticleList::addLocally(Particle *particle) +void ParticleList::addLocally(Particle *particle) { if (particle) { @@ -68,8 +66,7 @@ ParticleList::addLocally(Particle *particle) } } -void -ParticleList::removeLocally(Particle *particle) +void ParticleList::removeLocally(Particle *particle) { for (std::list<Particle *>::iterator it = mElements.begin(); it != mElements.end(); it++) @@ -79,8 +76,7 @@ ParticleList::removeLocally(Particle *particle) } } -void -ParticleList::clearLocally() +void ParticleList::clearLocally() { for (std::list<Particle *>::iterator it = mElements.begin(); it != mElements.end(); it++) @@ -117,8 +113,7 @@ ParticleVector::ParticleVector(ParticleContainer *parent, bool delParent) : ParticleVector::~ParticleVector() {}; -void -ParticleVector::setLocally(int index, Particle *particle) +void ParticleVector::setLocally(int index, Particle *particle) { assert(index >= 0); @@ -130,8 +125,7 @@ ParticleVector::setLocally(int index, Particle *particle) mIndexedElements[index] = particle; } -void -ParticleVector::delLocally(int index) +void ParticleVector::delLocally(int index) { assert(index >= 0); @@ -146,8 +140,7 @@ ParticleVector::delLocally(int index) } } -void -ParticleVector::clearLocally() +void ParticleVector::clearLocally() { for (unsigned int i = 0; i < mIndexedElements.size(); i++) delLocally(i); diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp index bdfaa5ba..fef34b22 100644 --- a/src/particleemitter.cpp +++ b/src/particleemitter.cpp @@ -329,8 +329,7 @@ ParticleEmitter::readParticleEmitterProp(xmlNodePtr propertyNode, T def) } -std::list<Particle *> -ParticleEmitter::createParticles(int tick) +std::list<Particle *> ParticleEmitter::createParticles(int tick) { std::list<Particle *> newParticles; diff --git a/src/particleemitter.h b/src/particleemitter.h index 809a6ded..e16ee241 100644 --- a/src/particleemitter.h +++ b/src/particleemitter.h @@ -70,8 +70,7 @@ class ParticleEmitter /** * Sets the target of the particles that are created */ - void - setTarget(Particle *target) + void setTarget(Particle *target) { mParticleTarget = target; }; private: diff --git a/src/player_relations.cpp b/src/player_relations.cpp index ef00a738..5eb47433 100644 --- a/src/player_relations.cpp +++ b/src/player_relations.cpp @@ -91,8 +91,7 @@ PlayerRelationsManager::PlayerRelationsManager() : { } -void -PlayerRelationsManager::clear() +void PlayerRelationsManager::clear() { std::vector<std::string> *names = getPlayers(); for (std::vector<std::string>::const_iterator @@ -105,8 +104,7 @@ PlayerRelationsManager::clear() #define PLAYER_IGNORE_STRATEGY "player-ignore-strategy" #define DEFAULT_PERMISSIONS "default-player-permissions" -int -PlayerRelationsManager::getPlayerIgnoreStrategyIndex(const std::string &name) +int PlayerRelationsManager::getPlayerIgnoreStrategyIndex(const std::string &name) { std::vector<PlayerIgnoreStrategy *> *strategies = getPlayerIgnoreStrategies(); for (unsigned int i = 0; i < strategies->size(); i++) @@ -116,8 +114,7 @@ PlayerRelationsManager::getPlayerIgnoreStrategyIndex(const std::string &name) return -1; } -void -PlayerRelationsManager::load() +void PlayerRelationsManager::load() { clear(); @@ -134,8 +131,7 @@ PlayerRelationsManager::load() } -void -PlayerRelationsManager::init() +void PlayerRelationsManager::init() { load(); @@ -143,8 +139,7 @@ PlayerRelationsManager::init() clear(); // Yes, we still keep them around in the config file until the next update. } -void -PlayerRelationsManager::store() +void PlayerRelationsManager::store() { config.setList<std::map<std::string, PlayerRelation *>::const_iterator, std::pair<std::string, PlayerRelation *>, @@ -161,8 +156,7 @@ PlayerRelationsManager::store() config.write(); } -void -PlayerRelationsManager::signalUpdate(const std::string &name) +void PlayerRelationsManager::signalUpdate(const std::string &name) { store(); @@ -170,8 +164,7 @@ PlayerRelationsManager::signalUpdate(const std::string &name) (*it)->updatedPlayer(name); } -unsigned int -PlayerRelationsManager::checkPermissionSilently(const std::string &player_name, unsigned int flags) +unsigned int PlayerRelationsManager::checkPermissionSilently(const std::string &player_name, unsigned int flags) { PlayerRelation *r = mRelations[player_name]; if (!r) @@ -196,16 +189,14 @@ PlayerRelationsManager::checkPermissionSilently(const std::string &player_name, } } -bool -PlayerRelationsManager::hasPermission(Being *being, unsigned int flags) +bool PlayerRelationsManager::hasPermission(Being *being, unsigned int flags) { if (being->getType() == Being::PLAYER) return hasPermission(being->getName(), flags) == flags; return true; } -bool -PlayerRelationsManager::hasPermission(const std::string &name, unsigned int flags) +bool PlayerRelationsManager::hasPermission(const std::string &name, unsigned int flags) { unsigned int rejections = flags & ~checkPermissionSilently(name, flags); bool permitted = rejections == 0; @@ -224,8 +215,7 @@ PlayerRelationsManager::hasPermission(const std::string &name, unsigned int flag return permitted; } -void -PlayerRelationsManager::setRelation(const std::string &player_name, PlayerRelation::relation relation) +void PlayerRelationsManager::setRelation(const std::string &player_name, PlayerRelation::relation relation) { PlayerRelation *r = mRelations[player_name]; if (r == NULL) @@ -236,8 +226,7 @@ PlayerRelationsManager::setRelation(const std::string &player_name, PlayerRelati signalUpdate(player_name); } -std::vector<std::string> * -PlayerRelationsManager::getPlayers() +std::vector<std::string> * PlayerRelationsManager::getPlayers() { std::vector<std::string> *retval = new std::vector<std::string>(); @@ -250,8 +239,7 @@ PlayerRelationsManager::getPlayers() return retval; } -void -PlayerRelationsManager::removePlayer(const std::string &name) +void PlayerRelationsManager::removePlayer(const std::string &name) { if (mRelations[name]) delete mRelations[name]; @@ -262,8 +250,7 @@ PlayerRelationsManager::removePlayer(const std::string &name) } -PlayerRelation::relation -PlayerRelationsManager::getRelation(const std::string &name) +PlayerRelation::relation PlayerRelationsManager::getRelation(const std::string &name) { if (mRelations[name]) return mRelations[name]->mRelation; @@ -274,14 +261,12 @@ PlayerRelationsManager::getRelation(const std::string &name) //////////////////////////////////////// // defaults -unsigned int -PlayerRelationsManager::getDefault() const +unsigned int PlayerRelationsManager::getDefault() const { return mDefaultPermissions; } -void -PlayerRelationsManager::setDefault(unsigned int permissions) +void PlayerRelationsManager::setDefault(unsigned int permissions) { mDefaultPermissions = permissions; @@ -303,8 +288,7 @@ public: mShortName = PLAYER_IGNORE_STRATEGY_NOP; } - virtual void - ignore(Player *player, unsigned int flags) + virtual void ignore(Player *player, unsigned int flags) { } }; @@ -318,8 +302,7 @@ public: mShortName = "dotdotdot"; } - virtual void - ignore(Player *player, unsigned int flags) + virtual void ignore(Player *player, unsigned int flags) { player->setSpeech("...", 5); } @@ -335,8 +318,7 @@ public: mShortName = "blinkname"; } - virtual void - ignore(Player *player, unsigned int flags) + virtual void ignore(Player *player, unsigned int flags) { player->flash(200); } @@ -352,8 +334,7 @@ public: mShortName = shortname; } - virtual void - ignore(Player *player, unsigned int flags) + virtual void ignore(Player *player, unsigned int flags) { player->setEmote(mEmotion, IGNORE_EMOTE_TIME); } diff --git a/src/properties.h b/src/properties.h index 86fffea3..038acd91 100644 --- a/src/properties.h +++ b/src/properties.h @@ -46,8 +46,7 @@ class Properties * @return the value of the given property or the given default when it * doesn't exist. */ - const std::string& - getProperty(const std::string &name, const std::string &def = "") const + const std::string& getProperty(const std::string &name, const std::string &def = "") const { PropertyMap::const_iterator i = mProperties.find(name); return (i != mProperties.end()) ? i->second : def; @@ -81,8 +80,7 @@ class Properties * @return <code>true</code> when a property is defined, * <code>false</code> otherwise. */ - bool - hasProperty(const std::string &name) const + bool hasProperty(const std::string &name) const { return (mProperties.find(name) != mProperties.end()); } @@ -93,8 +91,7 @@ class Properties * @param name The name of the property. * @param value The value of the property. */ - void - setProperty(const std::string &name, const std::string &value) + void setProperty(const std::string &name, const std::string &value) { mProperties[name] = value; } diff --git a/src/resources/action.h b/src/resources/action.h index 09eb066e..5f159a00 100644 --- a/src/resources/action.h +++ b/src/resources/action.h @@ -44,11 +44,9 @@ class Action */ ~Action(); - void - setAnimation(int direction, Animation *animation); + void setAnimation(int direction, Animation *animation); - Animation* - getAnimation(int direction) const; + Animation* getAnimation(int direction) const; protected: typedef std::map<int, Animation*> Animations; diff --git a/src/resources/animation.cpp b/src/resources/animation.cpp index 596c5fac..5721c7f0 100644 --- a/src/resources/animation.cpp +++ b/src/resources/animation.cpp @@ -30,22 +30,19 @@ Animation::Animation(): { } -void -Animation::addFrame(Image *image, unsigned int delay, int offsetX, int offsetY) +void Animation::addFrame(Image *image, unsigned int delay, int offsetX, int offsetY) { Frame frame = { image, delay, offsetX, offsetY }; mFrames.push_back(frame); mDuration += delay; } -void -Animation::addTerminator() +void Animation::addTerminator() { addFrame(NULL, 0, 0, 0); } -bool -Animation::isTerminator(const Frame &candidate) +bool Animation::isTerminator(const Frame &candidate) { return (candidate.image == NULL); } diff --git a/src/resources/animation.h b/src/resources/animation.h index 8dfe8614..93e100bd 100644 --- a/src/resources/animation.h +++ b/src/resources/animation.h @@ -54,39 +54,33 @@ class Animation /** * Appends a new animation at the end of the sequence. */ - void - addFrame(Image *image, unsigned int delay, int offsetX, int offsetY); + void addFrame(Image *image, unsigned int delay, int offsetX, int offsetY); /** * Appends an animation terminator that states that the animation * should not loop. */ - void - addTerminator(); + void addTerminator(); /** * Returns the frame at the specified index. */ - Frame* - getFrame(int index) { return &(mFrames[index]); } + Frame* getFrame(int index) { return &(mFrames[index]); } /** * Returns the length of this animation in frames. */ - unsigned int - getLength() const { return mFrames.size(); } + unsigned int getLength() const { return mFrames.size(); } /** * Returns the duration of this animation. */ - int - getDuration() const { return mDuration; } + int getDuration() const { return mDuration; } /** * Determines whether the given animation frame is a terminator. */ - static bool - isTerminator(const Frame &phase); + static bool isTerminator(const Frame &phase); protected: std::vector<Frame> mFrames; diff --git a/src/resources/buddylist.cpp b/src/resources/buddylist.cpp index 1bd98680..8c02735a 100644 --- a/src/resources/buddylist.cpp +++ b/src/resources/buddylist.cpp @@ -111,7 +111,7 @@ bool BuddyList::removeBuddy(const std::string buddy) return false; } -int BuddyList::getNumberOfElements() +int BuddyList::getNumberOfElements() { return mBuddylist.size(); } diff --git a/src/resources/buddylist.h b/src/resources/buddylist.h index 6a3de8c4..092abc6a 100644 --- a/src/resources/buddylist.h +++ b/src/resources/buddylist.h @@ -52,7 +52,7 @@ class BuddyList : public gcn::ListModel { /** * Returns the number of buddy on the list */ - int getNumberOfElements(); + int getNumberOfElements(); /** * Returns the buddy of the number or null diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp index bdc6211a..f80ca6b3 100644 --- a/src/resources/colordb.cpp +++ b/src/resources/colordb.cpp @@ -27,6 +27,7 @@ #include "../log.h" #include "../utils/dtor.h" +#include "../utils/gettext.h" #include "../utils/xml.h" #define HAIR_COLOR_FILE "colors.xml" @@ -52,7 +53,7 @@ void ColorDB::load() if (!root || !xmlStrEqual(root->name, BAD_CAST "colors")) { - logger->log("Trying TMW's color file, %s.", TMW_COLOR_FILE); + logger->log(_("Trying TMW's color file, %s."), TMW_COLOR_FILE); TMWHair = true; @@ -62,7 +63,7 @@ void ColorDB::load() root = doc->rootNode(); if (!root || !xmlStrEqual(root->name, BAD_CAST "colors")) { - logger->log("ColorDB: Failed"); + logger->log(_("ColorDB: Failed")); mColors[0] = mFail; mLoaded = true; @@ -79,7 +80,7 @@ void ColorDB::load() if (mColors.find(id) != mColors.end()) { - logger->log("ColorDB: Redefinition of dye ID %d", id); + logger->log(_("ColorDB: Redefinition of dye ID %d"), id); } TMWHair ? mColors[id] = XML::getProperty(node, "value", "#FFFFFF") : @@ -94,7 +95,7 @@ void ColorDB::load() void ColorDB::unload() { - logger->log("Unloading color database..."); + logger->log(_("Unloading color database...")); mColors.clear(); mLoaded = false; @@ -109,7 +110,7 @@ std::string& ColorDB::get(int id) if (i == mColors.end()) { - logger->log("ColorDB: Error, unknown dye ID# %d", id); + logger->log(_("ColorDB: Error, unknown dye ID# %d"), id); return mFail; } else diff --git a/src/resources/image.h b/src/resources/image.h index 6eb33ed9..a2e52d3d 100644 --- a/src/resources/image.h +++ b/src/resources/image.h @@ -55,8 +55,7 @@ class Image : public Resource /** * Destructor. */ - virtual - ~Image(); + virtual ~Image(); /** * Loads an image from a buffer in memory. @@ -89,21 +88,17 @@ class Image : public Resource /** * Frees the resources created by SDL. */ - virtual void - unload(); + virtual void unload(); /** * Returns the width of the image. */ - virtual int - getWidth() const { return mBounds.w; } - + virtual int getWidth() const { return mBounds.w; } /** * Returns the height of the image. */ - virtual int - getHeight() const { return mBounds.h; } + virtual int getHeight() const { return mBounds.h; } /** * Creates a new image with the desired clipping rectangle. @@ -111,20 +106,17 @@ class Image : public Resource * @return <code>NULL</code> if creation failed and a valid * object otherwise. */ - virtual Image* - getSubImage(int x, int y, int width, int height); + virtual Image* getSubImage(int x, int y, int width, int height); /** * Sets the alpha value of this image. */ - void - setAlpha(float alpha); + void setAlpha(float alpha); /** * Returns the alpha value of this image. */ - float - getAlpha(); + float getAlpha(); #ifdef USE_OPENGL /** @@ -134,7 +126,6 @@ class Image : public Resource static void setLoadAsOpenGL(bool useOpenGL); #endif - protected: /** * Constructor. @@ -146,8 +137,7 @@ class Image : public Resource /** * Returns the first power of two equal or bigger than the input. */ - static int - powerOfTwo(int input); + static int powerOfTwo(int input); #endif Image(SDL_Surface *image); @@ -193,8 +183,7 @@ class SubImage : public Image * @return <code>NULL</code> if creation failed and a valid * image otherwise. */ - Image* - getSubImage(int x, int y, int width, int height); + Image* getSubImage(int x, int y, int width, int height); private: Image *mParent; diff --git a/src/resources/imagewriter.h b/src/resources/imagewriter.h index 632e2ae4..0dcc0c33 100644 --- a/src/resources/imagewriter.h +++ b/src/resources/imagewriter.h @@ -27,5 +27,5 @@ class ImageWriter { public: static bool writePNG(SDL_Surface *surface, - const std::string &filename); + const std::string &filename); }; diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index 027b9e16..270083ef 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -49,10 +49,10 @@ void ItemDB::load() if (mLoaded) return; - logger->log("Initializing item database..."); + logger->log(_("Initializing item database...")); mUnknown = new ItemInfo(); - mUnknown->setName("Unknown item"); + mUnknown->setName(_("Unknown item")); mUnknown->setImageName(""); mUnknown->setSprite("error.xml", GENDER_MALE); mUnknown->setSprite("error.xml", GENDER_FEMALE); @@ -62,7 +62,7 @@ void ItemDB::load() if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "items")) { - logger->error("ItemDB: Error while loading items.xml!"); + logger->error(_("ItemDB: Error while loading items.xml!")); } for_each_xml_child_node(node, rootNode) @@ -74,12 +74,12 @@ void ItemDB::load() if (id == 0) { - logger->log("ItemDB: Invalid or missing item ID in items.xml!"); + logger->log(_("ItemDB: Invalid or missing item ID in items.xml!")); continue; } else if (mItemInfos.find(id) != mItemInfos.end()) { - logger->log("ItemDB: Redefinition of item ID %d", id); + logger->log(_("ItemDB: Redefinition of item ID %d"), id); } int type = XML::getProperty(node, "type", 0); @@ -139,7 +139,7 @@ void ItemDB::load() void ItemDB::unload() { - logger->log("Unloading item database..."); + logger->log(_("Unloading item database...")); delete mUnknown; mUnknown = NULL; @@ -157,7 +157,7 @@ const ItemInfo& ItemDB::get(int id) if (i == mItemInfos.end()) { - logger->log("ItemDB: Error, unknown item ID# %d", id); + logger->log(_("ItemDB: Error, unknown item ID# %d"), id); return *mUnknown; } else @@ -196,7 +196,7 @@ void loadSoundRef(ItemInfo *itemInfo, xmlNodePtr node) } else { - logger->log("ItemDB: Ignoring unknown sound event '%s'", + logger->log(_("ItemDB: Ignoring unknown sound event '%s'"), event.c_str()); } } diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp index 6f669376..4c04678a 100644 --- a/src/resources/iteminfo.cpp +++ b/src/resources/iteminfo.cpp @@ -22,8 +22,7 @@ #include "itemdb.h" #include "iteminfo.h" -const std::string& -ItemInfo::getSprite(Gender gender) const +const std::string& ItemInfo::getSprite(Gender gender) const { if (mView) { @@ -66,15 +65,12 @@ void ItemInfo::setWeaponType(int type) } } -void -ItemInfo::addSound(EquipmentSoundEvent event, const std::string &filename) +void ItemInfo::addSound(EquipmentSoundEvent event, const std::string &filename) { mSounds[event].push_back("sfx/" + filename); } - -const std::string& -ItemInfo::getSound(EquipmentSoundEvent event) const +const std::string& ItemInfo::getSound(EquipmentSoundEvent event) const { static const std::string empty; std::map< EquipmentSoundEvent, std::vector<std::string> >::const_iterator i; diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp index 7e2d7a1d..92009826 100644 --- a/src/resources/monsterdb.cpp +++ b/src/resources/monsterdb.cpp @@ -25,6 +25,7 @@ #include "../log.h" #include "../utils/dtor.h" +#include "../utils/gettext.h" #include "../utils/xml.h" namespace @@ -34,23 +35,22 @@ namespace bool mLoaded = false; } -void -MonsterDB::load() +void MonsterDB::load() { if (mLoaded) return; mUnknown.addSprite("error.xml"); - mUnknown.setName("unnamed"); + mUnknown.setName(_("unnamed")); - logger->log("Initializing monster database..."); + logger->log(_("Initializing monster database...")); XML::Document doc("monsters.xml"); xmlNodePtr rootNode = doc.rootNode(); if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "monsters")) { - logger->error("Monster Database: Error while loading monster.xml!"); + logger->error(_("Monster Database: Error while loading monster.xml!")); } //iterate <monster>s @@ -81,7 +81,7 @@ MonsterDB::load() } else { - logger->log("MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one", + logger->log(_("MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"), targetCursor.c_str(), currentInfo->getName().c_str()); currentInfo->setTargetCursorSize(Being::TC_MEDIUM); } @@ -118,7 +118,7 @@ MonsterDB::load() } else { - logger->log("MonsterDB: Warning, sound effect %s for unknown event %s of monster %s", + logger->log(_("MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"), filename, event.c_str(), currentInfo->getName().c_str()); } } @@ -156,7 +156,7 @@ const MonsterInfo &MonsterDB::get(int id) if (i == mMonsterInfos.end()) { - logger->log("MonsterDB: Warning, unknown monster ID %d requested", id); + logger->log(_("MonsterDB: Warning, unknown monster ID %d requested"), id); return mUnknown; } else diff --git a/src/resources/monsterdb.h b/src/resources/monsterdb.h index f1d69e72..2e186c15 100644 --- a/src/resources/monsterdb.h +++ b/src/resources/monsterdb.h @@ -31,11 +31,9 @@ */ namespace MonsterDB { - void - load(); + void load(); - void - unload(); + void unload(); const MonsterInfo& get(int id); diff --git a/src/resources/monsterinfo.cpp b/src/resources/monsterinfo.cpp index 4a71a122..faa759af 100644 --- a/src/resources/monsterinfo.cpp +++ b/src/resources/monsterinfo.cpp @@ -36,8 +36,7 @@ MonsterInfo::~MonsterInfo() } -void -MonsterInfo::addSound(MonsterSoundEvent event, std::string filename) +void MonsterInfo::addSound(MonsterSoundEvent event, std::string filename) { if (mSounds.find(event) == mSounds.end()) { @@ -48,8 +47,7 @@ MonsterInfo::addSound(MonsterSoundEvent event, std::string filename) } -std::string -MonsterInfo::getSound(MonsterSoundEvent event) const +std::string MonsterInfo::getSound(MonsterSoundEvent event) const { std::map<MonsterSoundEvent, std::vector<std::string>* >::const_iterator i; diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h index 05a78c5a..8d36cc06 100644 --- a/src/resources/monsterinfo.h +++ b/src/resources/monsterinfo.h @@ -56,43 +56,35 @@ class MonsterInfo */ ~MonsterInfo(); - void - setName(std::string name) { mName = name; } + void setName(std::string name) { mName = name; } - void - addSprite(std::string filename) { mSprites.push_back(filename); } + void addSprite(std::string filename) { mSprites.push_back(filename); } - void - setTargetCursorSize(Being::TargetCursorSize targetCursorSize) + void setTargetCursorSize(Being::TargetCursorSize targetCursorSize) { mTargetCursorSize = targetCursorSize; } - void - addSound(MonsterSoundEvent event, std::string filename); + void addSound(MonsterSoundEvent event, std::string filename); - void - addParticleEffect(std::string filename); + void addParticleEffect(std::string filename); - const std::string& - getName() const { return mName; } + const std::string& getName() const + { return mName; } - const std::list<std::string>& - getSprites() const { return mSprites; } + const std::list<std::string>& getSprites() const + { return mSprites; } - Being::TargetCursorSize - getTargetCursorSize() const { return mTargetCursorSize; } + Being::TargetCursorSize getTargetCursorSize() const + { return mTargetCursorSize; } - std::string - getSound(MonsterSoundEvent event) const; + std::string getSound(MonsterSoundEvent event) const; - std::string - getAttackParticleEffect() const { return mAttackParticle; } + std::string getAttackParticleEffect() const { return mAttackParticle; } - void - addAttackParticleEffect(const std::string &particleEffect) + void addAttackParticleEffect(const std::string &particleEffect) { mAttackParticle = particleEffect; } - const std::list<std::string>& - getParticleEffects() const { return mParticleEffects; } + const std::list<std::string>& getParticleEffects() const + { return mParticleEffects; } private: std::string mName; diff --git a/src/resources/music.cpp b/src/resources/music.cpp index 2386aa43..ed71d62c 100644 --- a/src/resources/music.cpp +++ b/src/resources/music.cpp @@ -55,8 +55,7 @@ Resource *Music::load(void *buffer, unsigned bufferSize) } } -bool -Music::play(int loops) +bool Music::play(int loops) { /* * Warning: loops should be always set to -1 (infinite) with current @@ -71,8 +70,7 @@ Music::play(int loops) return mChannel != -1; } -void -Music::stop() +void Music::stop() { /* * Warning: very dungerous trick, it could try to stop channels occupied diff --git a/src/resources/music.h b/src/resources/music.h index d50150b8..322cfecd 100644 --- a/src/resources/music.h +++ b/src/resources/music.h @@ -56,14 +56,12 @@ class Music : public Resource * @return <code>true</code> if the playback started properly * <code>false</code> otherwise. */ - virtual bool - play(int loops); + virtual bool play(int loops); /** * Stops the music. */ - virtual void - stop(); + virtual void stop(); protected: /** diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp index 3ae58067..bfa22214 100644 --- a/src/resources/npcdb.cpp +++ b/src/resources/npcdb.cpp @@ -25,6 +25,7 @@ #include "../log.h" #include "../utils/dtor.h" +#include "../utils/gettext.h" #include "../utils/xml.h" namespace @@ -44,14 +45,14 @@ void NPCDB::load() unknownSprite->variant = 0; mUnknown.sprites.push_back(unknownSprite); - logger->log("Initializing NPC database..."); + logger->log(_("Initializing NPC database...")); XML::Document doc("npcs.xml"); xmlNodePtr rootNode = doc.rootNode(); if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "npcs")) { - logger->error("NPC Database: Error while loading items.xml!"); + logger->error(_("NPC Database: Error while loading npcs.xml!")); } //iterate <monster>s @@ -63,7 +64,7 @@ void NPCDB::load() int id = XML::getProperty(npcNode, "id", 0); if (id == 0) { - logger->log("NPC Database: NPC with missing ID in npcs.xml!"); + logger->log(_("NPC Database: NPC with missing ID in npcs.xml!")); continue; } @@ -90,8 +91,7 @@ void NPCDB::load() mLoaded = true; } -void -NPCDB::unload() +void NPCDB::unload() { for ( NPCInfosIterator i = mNPCInfos.begin(); i != mNPCInfos.end(); @@ -116,14 +116,13 @@ NPCDB::unload() mLoaded = false; } -const NPCInfo& -NPCDB::get(int id) +const NPCInfo& NPCDB::get(int id) { NPCInfosIterator i = mNPCInfos.find(id); if (i == mNPCInfos.end()) { - logger->log("NPCDB: Warning, unknown NPC ID %d requested", id); + logger->log(_("NPCDB: Warning, unknown NPC ID %d requested"), id); return mUnknown; } else diff --git a/src/resources/npcdb.h b/src/resources/npcdb.h index b4539866..1883d747 100644 --- a/src/resources/npcdb.h +++ b/src/resources/npcdb.h @@ -45,11 +45,9 @@ typedef std::map<int, NPCInfo*> NPCInfos; */ namespace NPCDB { - void - load(); + void load(); - void - unload(); + void unload(); const NPCInfo& get(int id); diff --git a/src/resources/resource.cpp b/src/resources/resource.cpp index e9310905..82562691 100644 --- a/src/resources/resource.cpp +++ b/src/resources/resource.cpp @@ -28,14 +28,12 @@ Resource::~Resource() { } -void -Resource::incRef() +void Resource::incRef() { mRefCount++; } -void -Resource::decRef() +void Resource::decRef() { // Reference may not already have reached zero assert(mRefCount != 0); diff --git a/src/resources/resource.h b/src/resources/resource.h index e85e3147..168fd70a 100644 --- a/src/resources/resource.h +++ b/src/resources/resource.h @@ -41,8 +41,7 @@ class Resource /** * Increments the internal reference count. */ - void - incRef(); + void incRef(); /** * Decrements the reference count and deletes the object @@ -51,8 +50,7 @@ class Resource * @return <code>true</code> if the object was deleted * <code>false</code> otherwise. */ - void - decRef(); + void decRef(); /** * Return the path identifying this resource. diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index a317e445..99b84506 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -418,8 +418,7 @@ void *ResourceManager::loadFile(const std::string &fileName, int &fileSize) return buffer; } -std::vector<std::string> -ResourceManager::loadTextFile(const std::string &fileName) +std::vector<std::string> ResourceManager::loadTextFile(const std::string &fileName) { int contentsLength; char *fileContents = (char*)loadFile(fileName, contentsLength); diff --git a/src/resources/soundeffect.cpp b/src/resources/soundeffect.cpp index e21fd2b0..f7b2b874 100644 --- a/src/resources/soundeffect.cpp +++ b/src/resources/soundeffect.cpp @@ -47,8 +47,7 @@ Resource *SoundEffect::load(void *buffer, unsigned bufferSize) } } -bool -SoundEffect::play(int loops, int volume) +bool SoundEffect::play(int loops, int volume) { Mix_VolumeChunk(mChunk, volume); diff --git a/src/resources/soundeffect.h b/src/resources/soundeffect.h index c3ff6668..b9abefd7 100644 --- a/src/resources/soundeffect.h +++ b/src/resources/soundeffect.h @@ -58,8 +58,7 @@ class SoundEffect : public Resource * @return <code>true</code> if the playback started properly * <code>false</code> otherwise. */ - virtual bool - play(int loops, int volume); + virtual bool play(int loops, int volume); protected: /** diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp index b4193fd3..41b1e789 100644 --- a/src/resources/spritedef.cpp +++ b/src/resources/spritedef.cpp @@ -32,8 +32,7 @@ #include "../log.h" #include "../utils/xml.h" -Action* -SpriteDef::getAction(SpriteAction action) const +Action* SpriteDef::getAction(SpriteAction action) const { Actions::const_iterator i = mActions.find(action); @@ -146,8 +145,7 @@ void SpriteDef::loadImageSet(xmlNodePtr node, std::string const &palettes) mImageSets[name] = imageSet; } -void -SpriteDef::loadAction(xmlNodePtr node, int variant_offset) +void SpriteDef::loadAction(xmlNodePtr node, int variant_offset) { const std::string actionName = XML::getProperty(node, "name", ""); const std::string imageSetName = XML::getProperty(node, "imageset", ""); @@ -187,10 +185,9 @@ SpriteDef::loadAction(xmlNodePtr node, int variant_offset) } } -void -SpriteDef::loadAnimation(xmlNodePtr animationNode, - Action *action, ImageSet *imageSet, - int variant_offset) +void SpriteDef::loadAnimation(xmlNodePtr animationNode, + Action *action, ImageSet *imageSet, + int variant_offset) { const std::string directionName = XML::getProperty(animationNode, "direction", ""); @@ -267,8 +264,7 @@ SpriteDef::loadAnimation(xmlNodePtr animationNode, } // for frameNode } -void -SpriteDef::includeSprite(xmlNodePtr includeNode) +void SpriteDef::includeSprite(xmlNodePtr includeNode) { // TODO: Perform circular dependency check, since it's easy to crash the // client this way. @@ -289,8 +285,7 @@ SpriteDef::includeSprite(xmlNodePtr includeNode) loadSprite(rootNode, 0); } -void -SpriteDef::substituteAction(SpriteAction complete, SpriteAction with) +void SpriteDef::substituteAction(SpriteAction complete, SpriteAction with) { if (mActions.find(complete) == mActions.end()) { @@ -324,8 +319,7 @@ SpriteDef::~SpriteDef() } } -SpriteAction -SpriteDef::makeSpriteAction(const std::string& action) +SpriteAction SpriteDef::makeSpriteAction(const std::string& action) { if (action == "" || action == "default") { return ACTION_DEFAULT; @@ -377,8 +371,7 @@ SpriteDef::makeSpriteAction(const std::string& action) } } -SpriteDirection -SpriteDef::makeSpriteDirection(const std::string& direction) +SpriteDirection SpriteDef::makeSpriteDirection(const std::string& direction) { if (direction == "" || direction == "default") { return DIRECTION_DEFAULT; diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h index 4b712340..033de6cd 100644 --- a/src/resources/spritedef.h +++ b/src/resources/spritedef.h @@ -103,22 +103,19 @@ class SpriteDef : public Resource /** * Loads an action element. */ - void - loadAction(xmlNodePtr node, int variant_offset); + void loadAction(xmlNodePtr node, int variant_offset); /** * Loads an animation element. */ - void - loadAnimation(xmlNodePtr animationNode, - Action *action, ImageSet *imageSet, - int variant_offset); + void loadAnimation(xmlNodePtr animationNode, + Action *action, ImageSet *imageSet, + int variant_offset); /** * Include another sprite into this one. */ - void - includeSprite(xmlNodePtr includeNode); + void includeSprite(xmlNodePtr includeNode); /** * Complete missing actions by copying existing ones. @@ -129,21 +126,17 @@ class SpriteDef : public Resource * When there are no animations defined for the action "complete", its * animations become a copy of those of the action "with". */ - void - substituteAction(SpriteAction complete, SpriteAction with); + void substituteAction(SpriteAction complete, SpriteAction with); /** * Converts a string into a SpriteAction enum. */ - static SpriteAction - makeSpriteAction(const std::string &action); + static SpriteAction makeSpriteAction(const std::string &action); /** * Converts a string into a SpriteDirection enum. */ - static SpriteDirection - makeSpriteDirection(const std::string &direction); - + static SpriteDirection makeSpriteDirection(const std::string &direction); typedef std::map<std::string, ImageSet*> ImageSets; typedef ImageSets::iterator ImageSetIterator; diff --git a/src/sprite.h b/src/sprite.h index 0e0a95db..52825db2 100644 --- a/src/sprite.h +++ b/src/sprite.h @@ -44,30 +44,26 @@ class Sprite * would support setting a translation offset. It already does this * partly with the clipping rectangle support. */ - virtual void - draw(Graphics *graphics, int offsetX, int offsetY) const = 0; + virtual void draw(Graphics *graphics, int offsetX, int offsetY) const = 0; /** * Returns the horizontal size of the sprites graphical representation * in pixels or 0 when it is undefined. */ - virtual int - getWidth() const + virtual int getWidth() const { return 0; } /** * Returns the vertical size of the sprites graphical representation * in pixels or 0 when it is undefined. */ - virtual int - getHeight() const + virtual int getHeight() const { return 0; } /** * Returns the pixel Y coordinate of the sprite. */ - virtual int - getPixelY() const = 0; + virtual int getPixelY() const = 0; }; #endif diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp index e511ced3..db78d08c 100644 --- a/src/utils/xml.cpp +++ b/src/utils/xml.cpp @@ -61,8 +61,7 @@ namespace XML return mDoc ? xmlDocGetRootElement(mDoc) : 0; } - int - getProperty(xmlNodePtr node, const char* name, int def) + int getProperty(xmlNodePtr node, const char* name, int def) { int &ret = def; @@ -75,8 +74,7 @@ namespace XML return ret; } - double - getFloatProperty(xmlNodePtr node, const char* name, double def) + double getFloatProperty(xmlNodePtr node, const char* name, double def) { double &ret = def; @@ -89,8 +87,7 @@ namespace XML return ret; } - std::string - getProperty(xmlNodePtr node, const char *name, const std::string &def) + std::string getProperty(xmlNodePtr node, const char *name, const std::string &def) { xmlChar *prop = xmlGetProp(node, BAD_CAST name); if (prop) { diff --git a/src/utils/xml.h b/src/utils/xml.h index 9e691963..403fe6d9 100644 --- a/src/utils/xml.h +++ b/src/utils/xml.h @@ -71,20 +71,17 @@ namespace XML /** * Gets an integer property from an xmlNodePtr. */ - int - getProperty(xmlNodePtr node, const char *name, int def); + int getProperty(xmlNodePtr node, const char *name, int def); /** * Gets an floating point property from an xmlNodePtr. */ - double - getFloatProperty(xmlNodePtr node, const char *name, double def); + double getFloatProperty(xmlNodePtr node, const char *name, double def); /** * Gets a string property from an xmlNodePtr. */ - std::string - getProperty(xmlNodePtr node, const char *name, const std::string &def); + std::string getProperty(xmlNodePtr node, const char *name, const std::string &def); /** * Finds the first child node with the given name |